3258 files changed, 50222 insertions, 47431 deletions

diff --git a/dev-ruby/GeoRuby/GeoRuby-2.5.2-r1.ebuild b/dev-ruby/GeoRuby/GeoRuby-2.5.2-r1.ebuild
deleted file mode 100644
index b13578766edb..000000000000
--- a/dev-ruby/GeoRuby/GeoRuby-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_NAME="georuby"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby data holder for OGC Simple Features"
-HOMEPAGE="https://github.com/nofxx/georuby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid specs that are also failing in upstream Travis.
-	rm spec/geo_ruby/shp4r/shp_spec.rb || die
-}
-
-ruby_add_bdepend "test? ( dev-ruby/dbf
-	dev-ruby/nokogiri )"
diff --git a/dev-ruby/GeoRuby/GeoRuby-2.5.2-r2.ebuild b/dev-ruby/GeoRuby/GeoRuby-2.5.2-r2.ebuild
new file mode 100644
index 000000000000..a5678bfc5dcf
--- /dev/null
+++ b/dev-ruby/GeoRuby/GeoRuby-2.5.2-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_NAME="georuby"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby data holder for OGC Simple Features"
+HOMEPAGE="https://github.com/nofxx/georuby"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid specs that are also failing in upstream Travis.
+	rm spec/geo_ruby/shp4r/shp_spec.rb || die
+}
+
+ruby_add_bdepend "test? ( dev-ruby/dbf
+	dev-ruby/nokogiri )"
diff --git a/dev-ruby/abbrev/Manifest b/dev-ruby/abbrev/Manifest
new file mode 100644
index 000000000000..4c888d0da9cd
--- /dev/null
+++ b/dev-ruby/abbrev/Manifest
@@ -0,0 +1 @@
+DIST abbrev-0.1.2.tar.gz 4679 BLAKE2B 541e28fd1af522fbc813fe03168782b5b0075eed1007b5b78c78e8d605fe2b8f0c0c69b0d562584ebfb7ad5abb9c679f38343ab0dc771b772b8e29d4455c6d4e SHA512 892d2addc0456cd040d2aca5624e526a5e0a0efa199aff7156df5d1eb488a74387baffdad3ee91787fe0b2c138471b457a1b4e3b706fcae4bbee0916dcf50d57
diff --git a/dev-ruby/abbrev/abbrev-0.1.2.ebuild b/dev-ruby/abbrev/abbrev-0.1.2.ebuild
new file mode 100644
index 000000000000..4efb4e44cca5
--- /dev/null
+++ b/dev-ruby/abbrev/abbrev-0.1.2.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="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="abbrev.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Calculates a set of unique abbreviations for a given set of strings"
+HOMEPAGE="https://github.com/ruby/abbrev"
+SRC_URI="https://github.com/ruby/abbrev/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/abbrev/metadata.xml b/dev-ruby/abbrev/metadata.xml
new file mode 100644
index 000000000000..742bc69df3fc
--- /dev/null
+++ b/dev-ruby/abbrev/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/abbrev</remote-id>
+    <remote-id type="rubygems">abbrev</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/abstract/abstract-1.0.0-r4.ebuild b/dev-ruby/abstract/abstract-1.0.0-r4.ebuild
deleted file mode 100644
index a851b3e46364..000000000000
--- a/dev-ruby/abstract/abstract-1.0.0-r4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library which enable you to define abstract method in Ruby"
-HOMEPAGE="https://rubygems.org/gems/abstract"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-each_ruby_test() {
-	${RUBY} -Ilib test/test.rb || die "tests failed"
-}
diff --git a/dev-ruby/abstract/abstract-1.0.0-r5.ebuild b/dev-ruby/abstract/abstract-1.0.0-r5.ebuild
index 1febb53a86ce..55ba7c5bf887 100644
--- a/dev-ruby/abstract/abstract-1.0.0-r5.ebuild
+++ b/dev-ruby/abstract/abstract-1.0.0-r5.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
@@ -13,9 +13,9 @@ inherit ruby-fakegem
 DESCRIPTION="Library which enable you to define abstract method in Ruby"
 HOMEPAGE="https://rubygems.org/gems/abstract"
 
-LICENSE="Ruby"
+LICENSE="Ruby-BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 each_ruby_test() {
diff --git a/dev-ruby/acme-client/Manifest b/dev-ruby/acme-client/Manifest
index dfbad2782f3d..48e6b02ef889 100644
--- a/dev-ruby/acme-client/Manifest
+++ b/dev-ruby/acme-client/Manifest
@@ -1,2 +1,4 @@
-DIST acme-client-2.0.8.tar.gz 182507 BLAKE2B 97dff7043079cdb0ae5d79cc376696e3bf5a02b2629d42aeea38ef50818f27fbae5a26260b5d680812dbd501d8c6fbe5a788f9f43020ef037a2393fe07379d91 SHA512 bdef0ec8345117af1c5c5c9172fe7e03dc19017651ec7d5a414e07d6c084b25d6999cc0599aca6eeb5aef90b144e7948de7e36d1aac3a2d5c3cc438ce9be6bd9
-DIST acme-client-2.0.9.tar.gz 183081 BLAKE2B 8160b3fe7989645c395fde55624d71bdc933d114901138cb13f9c2114973f2bf65d48bba547f6c0740d0710f9a38a57cc519dbb27898a1507e875c71e5d7bcfb SHA512 a75b093046ec0360cfb78b55c0ad8350ecd1b6f612ab5ddb3956aa4cfef468bddff2dc992cddfc50860e7ea541e76ddc176ab4c7eaf5c3555beab521a6806ac8
+DIST acme-client-2.0.14.tar.gz 194698 BLAKE2B 057e968fa7b5bfcc6d3d31b9bf52eb6e9211d754be08e5eac61603a13077cd1a771f3580e42cfc19c0490931252bfdf3989958f580de025c88759f2824035370 SHA512 793b0f77b69cf00ac664a71ce12a02bf6a37683c75d6f0b4773f46ca20544b60a4892b40c6309d08bc9bbc412bcc4fc8a62730b106a6df8e36e76df3e74bdd9f
+DIST acme-client-2.0.15.tar.gz 194751 BLAKE2B 75f6507b8571de8344a777182d98346b1d516a38058d4f1d164e73b647d1953e453c59afd8550c41c711b0dd2699790737c86bd2f7919929e445179cc7098895 SHA512 0d09a09c3fb0a665e9e3263aaa4a924653195d3a64baef381069a58ee16064a4dbef40456076198a866c50765b1f68a0c3b381bcb4f35e185aef9e1ce709ff9d
+DIST acme-client-2.0.16.tar.gz 195964 BLAKE2B 0814b8aa1b60dfc0df9e82f1e5bc21c24ff38ef7737a854be93fcfe7f55a3994e61ba666d17b48ad2ee1469d874e58ed6976afa90f9f7055ec2ff476b3b0f145 SHA512 c9b0ed92767fe3c345b0dcd76263e0b7340b1c554cf366dbe121bea16fdc85b6403a2d5159c0d7e197a72286799910e054315396ea21470de73aa57d2fd5ff10
+DIST acme-client-2.0.17.tar.gz 271264 BLAKE2B a9c9f5c8ba9c7a991d34d9e9111b3ddfc39a1806811c3daddd3bff55b354eeb112d9836b70cf3c93c087fb0c6611aaee4d56bf4df01032fb725cee95c4f25032 SHA512 595d24bdf223f6d4293c2629e0379ba108a0ac223716d61b62366444f76e59202c28cd3c10ff1d82430a29c953eec36bdfeea8681159b118fe013896943b80db
diff --git a/dev-ruby/acme-client/acme-client-2.0.14.ebuild b/dev-ruby/acme-client/acme-client-2.0.14.ebuild
new file mode 100644
index 000000000000..0f83d140d8bf
--- /dev/null
+++ b/dev-ruby/acme-client/acme-client-2.0.14.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="acme-client.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby client for the letsencrypt's ACME protocol"
+HOMEPAGE="https://github.com/unixcharles/acme-client"
+SRC_URI="https://github.com/unixcharles/acme-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/faraday:2
+	dev-ruby/faraday-retry:2
+"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/vcr-2.9.3
+	>=dev-ruby/webmock-3.8:3
+)"
+
+all_ruby_prepare() {
+	# Avoid dependency on git
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '3igem "faraday", "~> 2.0"' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/acme-client/acme-client-2.0.15.ebuild b/dev-ruby/acme-client/acme-client-2.0.15.ebuild
new file mode 100644
index 000000000000..e219b7267b02
--- /dev/null
+++ b/dev-ruby/acme-client/acme-client-2.0.15.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="acme-client.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby client for the letsencrypt's ACME protocol"
+HOMEPAGE="https://github.com/unixcharles/acme-client"
+SRC_URI="https://github.com/unixcharles/acme-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/faraday:2
+	dev-ruby/faraday-retry:2
+"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/vcr-2.9.3
+	>=dev-ruby/webmock-3.8:3
+)"
+
+all_ruby_prepare() {
+	# Avoid dependency on git
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '3igem "faraday", "~> 2.0"' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/acme-client/acme-client-2.0.16.ebuild b/dev-ruby/acme-client/acme-client-2.0.16.ebuild
new file mode 100644
index 000000000000..209812a19420
--- /dev/null
+++ b/dev-ruby/acme-client/acme-client-2.0.16.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="acme-client.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby client for the letsencrypt's ACME protocol"
+HOMEPAGE="https://github.com/unixcharles/acme-client"
+SRC_URI="https://github.com/unixcharles/acme-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/faraday:2
+	dev-ruby/faraday-retry:2
+"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/vcr-2.9.3
+	>=dev-ruby/webmock-3.8:3
+)"
+
+all_ruby_prepare() {
+	# Avoid dependency on git
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '3igem "faraday", "~> 2.0"' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/acme-client/acme-client-2.0.17.ebuild b/dev-ruby/acme-client/acme-client-2.0.17.ebuild
new file mode 100644
index 000000000000..209812a19420
--- /dev/null
+++ b/dev-ruby/acme-client/acme-client-2.0.17.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="acme-client.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby client for the letsencrypt's ACME protocol"
+HOMEPAGE="https://github.com/unixcharles/acme-client"
+SRC_URI="https://github.com/unixcharles/acme-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/faraday:2
+	dev-ruby/faraday-retry:2
+"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/vcr-2.9.3
+	>=dev-ruby/webmock-3.8:3
+)"
+
+all_ruby_prepare() {
+	# Avoid dependency on git
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '3igem "faraday", "~> 2.0"' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/acme-client/acme-client-2.0.8.ebuild b/dev-ruby/acme-client/acme-client-2.0.8.ebuild
deleted file mode 100644
index 180df095b733..000000000000
--- a/dev-ruby/acme-client/acme-client-2.0.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="acme-client.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby client for the letsencrypt's ACME protocol"
-HOMEPAGE="https://github.com/unixcharles/acme-client"
-SRC_URI="https://github.com/unixcharles/acme-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "|| ( dev-ruby/faraday:1 >=dev-ruby/faraday-0.17:0 )"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/vcr-2.9.3
-	>=dev-ruby/webmock-3.8:3
-)"
-
-all_ruby_prepare() {
-	# Avoid dependency on git
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/acme-client/acme-client-2.0.9.ebuild b/dev-ruby/acme-client/acme-client-2.0.9.ebuild
deleted file mode 100644
index 3faab7452ba8..000000000000
--- a/dev-ruby/acme-client/acme-client-2.0.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="acme-client.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby client for the letsencrypt's ACME protocol"
-HOMEPAGE="https://github.com/unixcharles/acme-client"
-SRC_URI="https://github.com/unixcharles/acme-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "|| ( dev-ruby/faraday:1 >=dev-ruby/faraday-0.17:0 )"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/vcr-2.9.3
-	>=dev-ruby/webmock-3.8:3
-)"
-
-all_ruby_prepare() {
-	# Avoid dependency on git
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index 2ca4cdbed1ae..5a38fea999e2 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,15 +1,6 @@
-DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
-DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
-DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
-DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
-DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
-DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
-DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
+DIST rails-6.1.7.6.tgz 11040086 BLAKE2B 8b5311752952403cf8eae31b5d8e8d376c4b449f512e86df66b3e921375ffa3ea11e15f1d74a7f8ec9179ff70c32a6d4f8de75be5f92fe6315ee97164e22d2d0 SHA512 c4163565b2324ce97317d252f3d9e2e673a12b6ae7f54571645c958ce30221f1b357887ade80e46abdd47a422736b9946e49850d52ffd72d8acc87f35224e69f
+DIST rails-6.1.7.7.tgz 11041447 BLAKE2B 3f59325aa86d3b7d6e0773b9eb2b895a26b644109be8df0b0d9abbab8e6c77f76d316c717ecce4e2d79d3247559504a7452a8037d2d52a6cf95fbacd7f8b8612 SHA512 f9af4eebb3bffec78832f92be6158c71c147e265b54e8e368a06c762bfd1a7992256b3e9286aeb59eee69ba56be28d381a715eb13f99b9babfd9b7ce8051e210
+DIST rails-7.0.8.1.tgz 11089378 BLAKE2B 5d92087402d8aa2b86759ec92c44091a7a0f8a22959e0510f10417f88e54f9e1e6a14c4e9519033cd63bdd1f54f72b91bff8a3318a3264c39311317fb67e8b63 SHA512 74f467f7d3e5ec88560448e206a8f0cdf55bad60dd9eac019224fce86a766ee9d0c4afbd4eaae30dacfe34beebcff6aa9d3c5c99be9c8ad5c385817fe409afc8
+DIST rails-7.0.8.tgz 11073254 BLAKE2B 2aee047a365acb0890ef3afbccfe323fedccf7b54214aa1c2f92b7a7aaa64c275c1e03f8f97e6a2e30281224ba30703d18b40aeee9b4e7fb6f035a4a7716a054 SHA512 0e9feb5bd0360868c3109152d8ea414b65d36d33a5dbb96b199cfa6c4335800d6c392e0fbcbfa453a02fd75924a297a65caf04948895de53db43700478dbeb11
+DIST rails-7.1.3.2.tgz 10914950 BLAKE2B 419e6817958efcc5dbbb47d24498decff48fca9748c9f4069bcd353a4644fa623caf79c4072db0944139ac991d14623013683f69cef3126fa63348cc0612655b SHA512 0a58e7b125eb97f94a8a75bacd421d7197e6ad78d24651aecfe82e41c024ccfa42a9de0664099f55cd6ac6a41fd7f09cdc3177ed2b809b0be7d7df1639424f9d
+DIST rails-7.1.3.tgz 10900323 BLAKE2B a83ca4ee656e93241fa0460d8df197904a4eef310cf25bce6db6167bad87c8d0644533fa6e224ec959a4e10005164e0f981e14e8b23cee14e2747117be9da712 SHA512 df1128d1403ab82d218d2057c7c86e646594f97a8c6fcf5648a66440d52e5c20a4ceb0c13e70b6153152b44f62d8a1e20f3776acff5c55bc54d006cb7da32d12
diff --git a/dev-ruby/actioncable/actioncable-5.2.6.ebuild b/dev-ruby/actioncable/actioncable-5.2.6.ebuild
deleted file mode 100644
index 0236c937e0bc..000000000000
--- a/dev-ruby/actioncable/actioncable-5.2.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Integrated WebSockets for Rails"
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:0
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-5.2.7.1.ebuild b/dev-ruby/actioncable/actioncable-5.2.7.1.ebuild
deleted file mode 100644
index dab392ff470a..000000000000
--- a/dev-ruby/actioncable/actioncable-5.2.7.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Integrated WebSockets for Rails"
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:0
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-5.2.8.ebuild b/dev-ruby/actioncable/actioncable-5.2.8.ebuild
deleted file mode 100644
index dab392ff470a..000000000000
--- a/dev-ruby/actioncable/actioncable-5.2.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Integrated WebSockets for Rails"
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:0
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.0.4.1.ebuild b/dev-ruby/actioncable/actioncable-6.0.4.1.ebuild
deleted file mode 100644
index 133ed8eb6089..000000000000
--- a/dev-ruby/actioncable/actioncable-6.0.4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.0.4.4.ebuild b/dev-ruby/actioncable/actioncable-6.0.4.4.ebuild
deleted file mode 100644
index ce35cc0e8d46..000000000000
--- a/dev-ruby/actioncable/actioncable-6.0.4.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.0.4.7.ebuild b/dev-ruby/actioncable/actioncable-6.0.4.7.ebuild
deleted file mode 100644
index e1c3359d8783..000000000000
--- a/dev-ruby/actioncable/actioncable-6.0.4.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.0.4.8.ebuild b/dev-ruby/actioncable/actioncable-6.0.4.8.ebuild
deleted file mode 100644
index e1c3359d8783..000000000000
--- a/dev-ruby/actioncable/actioncable-6.0.4.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.0.5.ebuild b/dev-ruby/actioncable/actioncable-6.0.5.ebuild
deleted file mode 100644
index e1c3359d8783..000000000000
--- a/dev-ruby/actioncable/actioncable-6.0.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.1.5.1.ebuild b/dev-ruby/actioncable/actioncable-6.1.5.1.ebuild
deleted file mode 100644
index b5ec3e98161d..000000000000
--- a/dev-ruby/actioncable/actioncable-6.1.5.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activesupport-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.1.5.ebuild b/dev-ruby/actioncable/actioncable-6.1.5.ebuild
deleted file mode 100644
index 77aae4910664..000000000000
--- a/dev-ruby/actioncable/actioncable-6.1.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activesupport-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.1.6.ebuild b/dev-ruby/actioncable/actioncable-6.1.6.ebuild
deleted file mode 100644
index b5ec3e98161d..000000000000
--- a/dev-ruby/actioncable/actioncable-6.1.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activesupport-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.1.7.6.ebuild b/dev-ruby/actioncable/actioncable-6.1.7.6.ebuild
new file mode 100644
index 000000000000..6b5b03f52917
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-6.1.7.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Integrated WebSockets for Rails"
+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 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# Tests require many new dependencies, skipping for now
+RESTRICT="test"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activesupport-${PV}:*
+	dev-ruby/nio4r:2
+	>=dev-ruby/websocket-driver-0.6.1:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+	)"
diff --git a/dev-ruby/actioncable/actioncable-6.1.7.7.ebuild b/dev-ruby/actioncable/actioncable-6.1.7.7.ebuild
new file mode 100644
index 000000000000..03d1db485653
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-6.1.7.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Integrated WebSockets for Rails"
+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 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+# Tests require many new dependencies, skipping for now
+RESTRICT="test"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activesupport-${PV}:*
+	dev-ruby/nio4r:2
+	>=dev-ruby/websocket-driver-0.6.1:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+	)"
diff --git a/dev-ruby/actioncable/actioncable-7.0.2.2.ebuild b/dev-ruby/actioncable/actioncable-7.0.2.2.ebuild
deleted file mode 100644
index 6438674c5218..000000000000
--- a/dev-ruby/actioncable/actioncable-7.0.2.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-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 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activesupport-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-7.0.2.3.ebuild b/dev-ruby/actioncable/actioncable-7.0.2.3.ebuild
deleted file mode 100644
index 3243972e894c..000000000000
--- a/dev-ruby/actioncable/actioncable-7.0.2.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-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 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activesupport-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-7.0.2.4.ebuild b/dev-ruby/actioncable/actioncable-7.0.2.4.ebuild
deleted file mode 100644
index 3243972e894c..000000000000
--- a/dev-ruby/actioncable/actioncable-7.0.2.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-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 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activesupport-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-7.0.3.ebuild b/dev-ruby/actioncable/actioncable-7.0.3.ebuild
deleted file mode 100644
index 3243972e894c..000000000000
--- a/dev-ruby/actioncable/actioncable-7.0.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-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 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activesupport-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-7.0.8.1.ebuild b/dev-ruby/actioncable/actioncable-7.0.8.1.ebuild
new file mode 100644
index 000000000000..ae34b1935d23
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-7.0.8.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Integrated WebSockets for Rails"
+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 ~riscv ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+# Tests require many new dependencies, skipping for now
+RESTRICT="test"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activesupport-${PV}:*
+	dev-ruby/nio4r:2
+	>=dev-ruby/websocket-driver-0.6.1:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+	)"
diff --git a/dev-ruby/actioncable/actioncable-7.0.8.ebuild b/dev-ruby/actioncable/actioncable-7.0.8.ebuild
new file mode 100644
index 000000000000..3435ed22a5e3
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-7.0.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Integrated WebSockets for Rails"
+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 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# Tests require many new dependencies, skipping for now
+RESTRICT="test"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activesupport-${PV}:*
+	dev-ruby/nio4r:2
+	>=dev-ruby/websocket-driver-0.6.1:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+	)"
diff --git a/dev-ruby/actioncable/actioncable-7.1.3.2.ebuild b/dev-ruby/actioncable/actioncable-7.1.3.2.ebuild
new file mode 100644
index 000000000000..2a23b3ae5ec6
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-7.1.3.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Integrated WebSockets for Rails"
+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 ~riscv ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+# Tests require many new dependencies, skipping for now
+RESTRICT="test"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activesupport-${PV}:*
+	dev-ruby/nio4r:2
+	>=dev-ruby/websocket-driver-0.6.1:*
+	>=dev-ruby/zeitwerk-2.6:2
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		dev-ruby/mocha
+	)"
diff --git a/dev-ruby/actioncable/actioncable-7.1.3.ebuild b/dev-ruby/actioncable/actioncable-7.1.3.ebuild
new file mode 100644
index 000000000000..4bfbe8bd981a
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-7.1.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Integrated WebSockets for Rails"
+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 ~riscv ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+# Tests require many new dependencies, skipping for now
+RESTRICT="test"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activesupport-${PV}:*
+	dev-ruby/nio4r:2
+	>=dev-ruby/websocket-driver-0.6.1:*
+	>=dev-ruby/zeitwerk-2.6:2
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+	)"
diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index c09c30aa170e..5a38fea999e2 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,12 +1,6 @@
-DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
-DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
-DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
-DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
-DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
+DIST rails-6.1.7.6.tgz 11040086 BLAKE2B 8b5311752952403cf8eae31b5d8e8d376c4b449f512e86df66b3e921375ffa3ea11e15f1d74a7f8ec9179ff70c32a6d4f8de75be5f92fe6315ee97164e22d2d0 SHA512 c4163565b2324ce97317d252f3d9e2e673a12b6ae7f54571645c958ce30221f1b357887ade80e46abdd47a422736b9946e49850d52ffd72d8acc87f35224e69f
+DIST rails-6.1.7.7.tgz 11041447 BLAKE2B 3f59325aa86d3b7d6e0773b9eb2b895a26b644109be8df0b0d9abbab8e6c77f76d316c717ecce4e2d79d3247559504a7452a8037d2d52a6cf95fbacd7f8b8612 SHA512 f9af4eebb3bffec78832f92be6158c71c147e265b54e8e368a06c762bfd1a7992256b3e9286aeb59eee69ba56be28d381a715eb13f99b9babfd9b7ce8051e210
+DIST rails-7.0.8.1.tgz 11089378 BLAKE2B 5d92087402d8aa2b86759ec92c44091a7a0f8a22959e0510f10417f88e54f9e1e6a14c4e9519033cd63bdd1f54f72b91bff8a3318a3264c39311317fb67e8b63 SHA512 74f467f7d3e5ec88560448e206a8f0cdf55bad60dd9eac019224fce86a766ee9d0c4afbd4eaae30dacfe34beebcff6aa9d3c5c99be9c8ad5c385817fe409afc8
+DIST rails-7.0.8.tgz 11073254 BLAKE2B 2aee047a365acb0890ef3afbccfe323fedccf7b54214aa1c2f92b7a7aaa64c275c1e03f8f97e6a2e30281224ba30703d18b40aeee9b4e7fb6f035a4a7716a054 SHA512 0e9feb5bd0360868c3109152d8ea414b65d36d33a5dbb96b199cfa6c4335800d6c392e0fbcbfa453a02fd75924a297a65caf04948895de53db43700478dbeb11
+DIST rails-7.1.3.2.tgz 10914950 BLAKE2B 419e6817958efcc5dbbb47d24498decff48fca9748c9f4069bcd353a4644fa623caf79c4072db0944139ac991d14623013683f69cef3126fa63348cc0612655b SHA512 0a58e7b125eb97f94a8a75bacd421d7197e6ad78d24651aecfe82e41c024ccfa42a9de0664099f55cd6ac6a41fd7f09cdc3177ed2b809b0be7d7df1639424f9d
+DIST rails-7.1.3.tgz 10900323 BLAKE2B a83ca4ee656e93241fa0460d8df197904a4eef310cf25bce6db6167bad87c8d0644533fa6e224ec959a4e10005164e0f981e14e8b23cee14e2747117be9da712 SHA512 df1128d1403ab82d218d2057c7c86e646594f97a8c6fcf5648a66440d52e5c20a4ceb0c13e70b6153152b44f62d8a1e20f3776acff5c55bc54d006cb7da32d12
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.4.1.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.4.1.ebuild
deleted file mode 100644
index 1d727b7a3e51..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.4.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-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\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|byebug\|dalli\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.4.4.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.4.4.ebuild
deleted file mode 100644
index c4b746bc96a1..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.4.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-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\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|byebug\|dalli\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.4.7.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.4.7.ebuild
deleted file mode 100644
index 845962ff9795..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.4.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-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\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|byebug\|dalli\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.4.8.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.4.8.ebuild
deleted file mode 100644
index 845962ff9795..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.4.8.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-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\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|byebug\|dalli\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.5.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.5.ebuild
deleted file mode 100644
index 690d3c4bc215..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-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\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|byebug\|dalli\)/ s:^:#:" \
-		-e '/minitest/ s/5.15/5.16/' \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.1.5.1.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.5.1.ebuild
deleted file mode 100644
index 5fabeb5d6ccd..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.1.5.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-	dev-ruby/rexml
-	dev-ruby/sqlite3
-	dev-ruby/webmock
-)"
-
-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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\)/ s:^:#:" \
-		-e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.1.5.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.5.ebuild
deleted file mode 100644
index e387f1a6cc26..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.1.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-	dev-ruby/sqlite3
-	dev-ruby/webmock
-)"
-
-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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\|rexml\)/ s:^:#:" \
-		-e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.1.6.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.6.ebuild
deleted file mode 100644
index 5fabeb5d6ccd..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.1.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-	dev-ruby/rexml
-	dev-ruby/sqlite3
-	dev-ruby/webmock
-)"
-
-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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\)/ s:^:#:" \
-		-e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.1.7.6.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.7.6.ebuild
new file mode 100644
index 000000000000..90a90bf86e18
--- /dev/null
+++ b/dev-ruby/actionmailbox/actionmailbox-6.1.7.6.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="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+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 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.7.4-mail28.patch
+)
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/mail-2.7.1:*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	<dev-ruby/minitest-5.16
+	dev-ruby/mocha
+	dev-ruby/rexml
+	dev-ruby/sqlite3
+	dev-ruby/webmock
+	dev-ruby/rails
+)"
+
+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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|rack-test\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\)/ s:^:#:" \
+		-e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
+
+	# Avoid a test failing because the actionmailer part of the tarball
+	# is not patched for ruby32. Fixed in next upstream release.
+	rm -f test/unit/mailbox/bouncing_test.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.1.7.7.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.7.7.ebuild
new file mode 100644
index 000000000000..26ec21f10812
--- /dev/null
+++ b/dev-ruby/actionmailbox/actionmailbox-6.1.7.7.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+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 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.7.4-mail28.patch
+)
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/mail-2.7.1:*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	<dev-ruby/minitest-5.16
+	dev-ruby/mocha
+	dev-ruby/rexml
+	dev-ruby/sqlite3
+	dev-ruby/webmock
+	dev-ruby/rails
+)"
+
+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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|rack-test\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\)/ s:^:#:" \
+		-e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
+
+	# Avoid a test failing because the actionmailer part of the tarball
+	# is not patched for ruby32. Fixed in next upstream release.
+	rm -f test/unit/mailbox/bouncing_test.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionmailbox/actionmailbox-7.0.2.2.ebuild b/dev-ruby/actionmailbox/actionmailbox-7.0.2.2.ebuild
deleted file mode 100644
index 1f39947c5636..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-7.0.2.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-	dev-ruby/net-imap
-	dev-ruby/net-pop
-	dev-ruby/net-smtp
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-	dev-ruby/propshaft
-	dev-ruby/sqlite3
-	dev-ruby/webmock
-)"
-
-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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\|rexml\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-7.0.2.3.ebuild b/dev-ruby/actionmailbox/actionmailbox-7.0.2.3.ebuild
deleted file mode 100644
index f3818bd389e1..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-7.0.2.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-	dev-ruby/net-imap
-	dev-ruby/net-pop
-	dev-ruby/net-smtp
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-	dev-ruby/propshaft
-	dev-ruby/rexml
-	dev-ruby/sqlite3
-	dev-ruby/webmock
-)"
-
-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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-7.0.2.4.ebuild b/dev-ruby/actionmailbox/actionmailbox-7.0.2.4.ebuild
deleted file mode 100644
index f3818bd389e1..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-7.0.2.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-	dev-ruby/net-imap
-	dev-ruby/net-pop
-	dev-ruby/net-smtp
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-	dev-ruby/propshaft
-	dev-ruby/rexml
-	dev-ruby/sqlite3
-	dev-ruby/webmock
-)"
-
-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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-7.0.3.ebuild b/dev-ruby/actionmailbox/actionmailbox-7.0.3.ebuild
deleted file mode 100644
index f3818bd389e1..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-7.0.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-	dev-ruby/net-imap
-	dev-ruby/net-pop
-	dev-ruby/net-smtp
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-	dev-ruby/propshaft
-	dev-ruby/rexml
-	dev-ruby/sqlite3
-	dev-ruby/webmock
-)"
-
-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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-7.0.8.1.ebuild b/dev-ruby/actionmailbox/actionmailbox-7.0.8.1.ebuild
new file mode 100644
index 000000000000..0c800148b813
--- /dev/null
+++ b/dev-ruby/actionmailbox/actionmailbox-7.0.8.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+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 ~riscv ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/mail-2.7.1:*
+	dev-ruby/net-imap
+	dev-ruby/net-pop
+	dev-ruby/net-smtp
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	<dev-ruby/minitest-5.16
+	dev-ruby/mocha
+	dev-ruby/propshaft
+	dev-ruby/rexml
+	dev-ruby/sqlite3
+	dev-ruby/webmock
+	dev-ruby/rails
+)"
+
+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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|rack-test\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\|terser\|cookiejar\|cgi\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+		-e '/sqlite/ s/1.6.4/99/' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionmailbox/actionmailbox-7.0.8.ebuild b/dev-ruby/actionmailbox/actionmailbox-7.0.8.ebuild
new file mode 100644
index 000000000000..109e32888c43
--- /dev/null
+++ b/dev-ruby/actionmailbox/actionmailbox-7.0.8.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+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 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/mail-2.7.1:*
+	dev-ruby/net-imap
+	dev-ruby/net-pop
+	dev-ruby/net-smtp
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	<dev-ruby/minitest-5.16
+	dev-ruby/mocha
+	dev-ruby/propshaft
+	dev-ruby/rexml
+	dev-ruby/sqlite3
+	dev-ruby/webmock
+	dev-ruby/rails
+)"
+
+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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|rack-test\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\|terser\|cookiejar\|cgi\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+		-e '/sqlite/ s/1.6.4/99/' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionmailbox/actionmailbox-7.1.3.2.ebuild b/dev-ruby/actionmailbox/actionmailbox-7.1.3.2.ebuild
new file mode 100644
index 000000000000..04ce18c37c60
--- /dev/null
+++ b/dev-ruby/actionmailbox/actionmailbox-7.1.3.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+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 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/mail-2.7.1:*
+	dev-ruby/net-imap
+	dev-ruby/net-pop
+	dev-ruby/net-smtp
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	<dev-ruby/minitest-5.16
+	dev-ruby/mocha
+	dev-ruby/propshaft
+	dev-ruby/rexml
+	dev-ruby/sqlite3
+	dev-ruby/webmock
+	dev-ruby/rails
+)"
+
+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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|rack-test\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\|terser\|cookiejar\|cgi\|web-console\|trilogy\|error_highlight\|jbuilder\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/group :\(cable\|doc\|job\|lint\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+		-e '/sqlite/ s/1.6.4/99/' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionmailbox/actionmailbox-7.1.3.ebuild b/dev-ruby/actionmailbox/actionmailbox-7.1.3.ebuild
new file mode 100644
index 000000000000..04ce18c37c60
--- /dev/null
+++ b/dev-ruby/actionmailbox/actionmailbox-7.1.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+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 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/mail-2.7.1:*
+	dev-ruby/net-imap
+	dev-ruby/net-pop
+	dev-ruby/net-smtp
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	<dev-ruby/minitest-5.16
+	dev-ruby/mocha
+	dev-ruby/propshaft
+	dev-ruby/rexml
+	dev-ruby/sqlite3
+	dev-ruby/webmock
+	dev-ruby/rails
+)"
+
+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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|rack-test\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\|terser\|cookiejar\|cgi\|web-console\|trilogy\|error_highlight\|jbuilder\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/group :\(cable\|doc\|job\|lint\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+		-e '/sqlite/ s/1.6.4/99/' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionmailbox/files/actionmailbox-6.1.7.4-mail28.patch b/dev-ruby/actionmailbox/files/actionmailbox-6.1.7.4-mail28.patch
new file mode 100644
index 000000000000..ba4e8a822552
--- /dev/null
+++ b/dev-ruby/actionmailbox/files/actionmailbox-6.1.7.4-mail28.patch
@@ -0,0 +1,57 @@
+From f5463f314886016fb40199d1265cacddf64ea357 Mon Sep 17 00:00:00 2001
+From: Jean Boussier <jean.boussier@gmail.com>
+Date: Mon, 5 Dec 2022 11:59:45 +0100
+Subject: [PATCH] Merge pull request #46643 from ghiculescu/mail-28
+
+Fix CI for Mail 2.8+
+---
+ .../lib/action_mailbox/mail_ext/addresses.rb  | 19 +++++++++++++++----
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/actionmailbox/lib/action_mailbox/mail_ext/addresses.rb b/actionmailbox/lib/action_mailbox/mail_ext/addresses.rb
+index 5eab1feb3d563..7da7ee2586a62 100644
+--- a/lib/action_mailbox/mail_ext/addresses.rb
++++ b/lib/action_mailbox/mail_ext/addresses.rb
+@@ -3,7 +3,7 @@
+ module Mail
+   class Message
+     def from_address
+-      header[:from]&.address_list&.addresses&.first
++      address_list(header[:from])&.addresses&.first
+     end
+ 
+     def recipients_addresses
+@@ -11,19 +11,30 @@ def recipients_addresses
+     end
+ 
+     def to_addresses
+-      Array(header[:to]&.address_list&.addresses)
++      Array(address_list(header[:to])&.addresses)
+     end
+ 
+     def cc_addresses
+-      Array(header[:cc]&.address_list&.addresses)
++      Array(address_list(header[:cc])&.addresses)
+     end
+ 
+     def bcc_addresses
+-      Array(header[:bcc]&.address_list&.addresses)
++      Array(address_list(header[:bcc])&.addresses)
+     end
+ 
+     def x_original_to_addresses
+       Array(header[:x_original_to]).collect { |header| Mail::Address.new header.to_s }
+     end
++
++    private
++      def address_list(obj)
++        if obj&.respond_to?(:element)
++          # Mail 2.8+
++          obj.element
++        else
++          # Mail <= 2.7.x
++          obj&.address_list
++        end
++      end
+   end
+ end
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 2ca4cdbed1ae..5a38fea999e2 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,15 +1,6 @@
-DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
-DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
-DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
-DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
-DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
-DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
-DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
+DIST rails-6.1.7.6.tgz 11040086 BLAKE2B 8b5311752952403cf8eae31b5d8e8d376c4b449f512e86df66b3e921375ffa3ea11e15f1d74a7f8ec9179ff70c32a6d4f8de75be5f92fe6315ee97164e22d2d0 SHA512 c4163565b2324ce97317d252f3d9e2e673a12b6ae7f54571645c958ce30221f1b357887ade80e46abdd47a422736b9946e49850d52ffd72d8acc87f35224e69f
+DIST rails-6.1.7.7.tgz 11041447 BLAKE2B 3f59325aa86d3b7d6e0773b9eb2b895a26b644109be8df0b0d9abbab8e6c77f76d316c717ecce4e2d79d3247559504a7452a8037d2d52a6cf95fbacd7f8b8612 SHA512 f9af4eebb3bffec78832f92be6158c71c147e265b54e8e368a06c762bfd1a7992256b3e9286aeb59eee69ba56be28d381a715eb13f99b9babfd9b7ce8051e210
+DIST rails-7.0.8.1.tgz 11089378 BLAKE2B 5d92087402d8aa2b86759ec92c44091a7a0f8a22959e0510f10417f88e54f9e1e6a14c4e9519033cd63bdd1f54f72b91bff8a3318a3264c39311317fb67e8b63 SHA512 74f467f7d3e5ec88560448e206a8f0cdf55bad60dd9eac019224fce86a766ee9d0c4afbd4eaae30dacfe34beebcff6aa9d3c5c99be9c8ad5c385817fe409afc8
+DIST rails-7.0.8.tgz 11073254 BLAKE2B 2aee047a365acb0890ef3afbccfe323fedccf7b54214aa1c2f92b7a7aaa64c275c1e03f8f97e6a2e30281224ba30703d18b40aeee9b4e7fb6f035a4a7716a054 SHA512 0e9feb5bd0360868c3109152d8ea414b65d36d33a5dbb96b199cfa6c4335800d6c392e0fbcbfa453a02fd75924a297a65caf04948895de53db43700478dbeb11
+DIST rails-7.1.3.2.tgz 10914950 BLAKE2B 419e6817958efcc5dbbb47d24498decff48fca9748c9f4069bcd353a4644fa623caf79c4072db0944139ac991d14623013683f69cef3126fa63348cc0612655b SHA512 0a58e7b125eb97f94a8a75bacd421d7197e6ad78d24651aecfe82e41c024ccfa42a9de0664099f55cd6ac6a41fd7f09cdc3177ed2b809b0be7d7df1639424f9d
+DIST rails-7.1.3.tgz 10900323 BLAKE2B a83ca4ee656e93241fa0460d8df197904a4eef310cf25bce6db6167bad87c8d0644533fa6e224ec959a4e10005164e0f981e14e8b23cee14e2747117be9da712 SHA512 df1128d1403ab82d218d2057c7c86e646594f97a8c6fcf5648a66440d52e5c20a4ceb0c13e70b6153152b44f62d8a1e20f3776acff5c55bc54d006cb7da32d12
diff --git a/dev-ruby/actionmailer/actionmailer-5.2.6.ebuild b/dev-ruby/actionmailer/actionmailer-5.2.6.ebuild
deleted file mode 100644
index 931e1d125387..000000000000
--- a/dev-ruby/actionmailer/actionmailer-5.2.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -e '/\/load_paths/d' \
-		-e '1igem "railties", "~> 5.2.0"' \
-		-e '1igem "actionpack", "~> 5.2.0"' \
-		-e '1igem "activejob", "~> 5.2.0"' \
-		-i test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-5.2.7.1.ebuild b/dev-ruby/actionmailer/actionmailer-5.2.7.1.ebuild
deleted file mode 100644
index 66a548ab61fc..000000000000
--- a/dev-ruby/actionmailer/actionmailer-5.2.7.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -e '/\/load_paths/d' \
-		-e '1igem "railties", "~> 5.2.0"' \
-		-e '1igem "actionpack", "~> 5.2.0"' \
-		-e '1igem "activejob", "~> 5.2.0"' \
-		-i test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-5.2.8.ebuild b/dev-ruby/actionmailer/actionmailer-5.2.8.ebuild
deleted file mode 100644
index 66a548ab61fc..000000000000
--- a/dev-ruby/actionmailer/actionmailer-5.2.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -e '/\/load_paths/d' \
-		-e '1igem "railties", "~> 5.2.0"' \
-		-e '1igem "actionpack", "~> 5.2.0"' \
-		-e '1igem "activejob", "~> 5.2.0"' \
-		-i test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.4.1.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.4.1.ebuild
deleted file mode 100644
index bf9872d2db5b..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.0.4.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	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 '2igem "railties", "~> 6.0.0" ; gem "activejob", "~> 6.0.0"' test/abstract_unit.rb || die
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.4.4.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.4.4.ebuild
deleted file mode 100644
index 5c5d6a444fcc..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.0.4.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	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 '2igem "railties", "~> 6.0.0" ; gem "activejob", "~> 6.0.0"' test/abstract_unit.rb || die
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.4.7.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.4.7.ebuild
deleted file mode 100644
index 9f52f098010e..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.0.4.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	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 '2igem "railties", "~> 6.0.0" ; gem "activejob", "~> 6.0.0"' test/abstract_unit.rb || die
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.4.8.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.4.8.ebuild
deleted file mode 100644
index 9f52f098010e..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.0.4.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	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 '2igem "railties", "~> 6.0.0" ; gem "activejob", "~> 6.0.0"' test/abstract_unit.rb || die
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.5.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.5.ebuild
deleted file mode 100644
index 9f52f098010e..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.0.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	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 '2igem "railties", "~> 6.0.0" ; gem "activejob", "~> 6.0.0"' test/abstract_unit.rb || die
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.1.5.1.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.5.1.ebuild
deleted file mode 100644
index 95aa6013c4aa..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.1.5.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.1.5.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.5.ebuild
deleted file mode 100644
index 2b16b080cc19..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.1.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.1.6.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.6.ebuild
deleted file mode 100644
index 95aa6013c4aa..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.1.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.1.7.6.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.7.6.ebuild
new file mode 100644
index 000000000000..ef53533a632a
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-6.1.7.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+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 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.7.4-ruby32-keywords.patch
+)
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+	dev-ruby/rails-dom-testing:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid a test failing only on attachment ordering, since this is a
+	# security release.
+	sed -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' \
+		-i test/base_test.rb || die
+}
diff --git a/dev-ruby/actionmailer/actionmailer-6.1.7.7.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.7.7.ebuild
new file mode 100644
index 000000000000..26dfaf1ef48c
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-6.1.7.7.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+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 ~riscv ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.7.4-ruby32-keywords.patch
+)
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+	dev-ruby/rails-dom-testing:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -e '/\/load_paths/d' \
+		-e '2igem "actionview", "~> 6.1.0"; gem "actionpack", "~> 6.1.0"; gem "activejob", "~> 6.1.0"' \
+		-i test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid a test failing only on attachment ordering, since this is a
+	# security release.
+	sed -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' \
+		-i test/base_test.rb || die
+}
diff --git a/dev-ruby/actionmailer/actionmailer-7.0.2.2.ebuild b/dev-ruby/actionmailer/actionmailer-7.0.2.2.ebuild
deleted file mode 100644
index baca61a4f1fa..000000000000
--- a/dev-ruby/actionmailer/actionmailer-7.0.2.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-7.0.2.3.ebuild b/dev-ruby/actionmailer/actionmailer-7.0.2.3.ebuild
deleted file mode 100644
index 75c786bf6d3e..000000000000
--- a/dev-ruby/actionmailer/actionmailer-7.0.2.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-7.0.2.4.ebuild b/dev-ruby/actionmailer/actionmailer-7.0.2.4.ebuild
deleted file mode 100644
index 75c786bf6d3e..000000000000
--- a/dev-ruby/actionmailer/actionmailer-7.0.2.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-7.0.3.ebuild b/dev-ruby/actionmailer/actionmailer-7.0.3.ebuild
deleted file mode 100644
index 75c786bf6d3e..000000000000
--- a/dev-ruby/actionmailer/actionmailer-7.0.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-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 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-7.0.8.1.ebuild b/dev-ruby/actionmailer/actionmailer-7.0.8.1.ebuild
new file mode 100644
index 000000000000..76f7e0d1eaf9
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-7.0.8.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+	dev-ruby/rails-dom-testing:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -e '/\/load_paths/d' \
+		-e '3igem "actionpack", "~> 7.0.0"; gem "activejob", "~> 7.0.0"' \
+		-i test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid a test failing only on attachment ordering, since this is a
+	# security release.
+	sed -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' \
+		-i test/base_test.rb || die
+}
diff --git a/dev-ruby/actionmailer/actionmailer-7.0.8.ebuild b/dev-ruby/actionmailer/actionmailer-7.0.8.ebuild
new file mode 100644
index 000000000000..cd0c73169202
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-7.0.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+	dev-ruby/rails-dom-testing:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid a test failing only on attachment ordering, since this is a
+	# security release.
+	sed -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' \
+		-i test/base_test.rb || die
+}
diff --git a/dev-ruby/actionmailer/actionmailer-7.1.3.2.ebuild b/dev-ruby/actionmailer/actionmailer-7.1.3.2.ebuild
new file mode 100644
index 000000000000..87b768fa5ef5
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-7.1.3.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+	dev-ruby/net-imap
+	dev-ruby/net-pop
+	dev-ruby/net-smtp
+	>=dev-ruby/rails-dom-testing-2.2:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid a test failing only on attachment ordering, since this is a
+	# security release.
+	sed -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' \
+		-i test/base_test.rb || die
+}
diff --git a/dev-ruby/actionmailer/actionmailer-7.1.3.ebuild b/dev-ruby/actionmailer/actionmailer-7.1.3.ebuild
new file mode 100644
index 000000000000..392c6717f2ef
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-7.1.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+	dev-ruby/net-imap
+	dev-ruby/net-pop
+	dev-ruby/net-smtp
+	>=dev-ruby/rails-dom-testing-2.2:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid a test failing only on attachment ordering, since this is a
+	# security release.
+	sed -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' \
+		-i test/base_test.rb || die
+}
diff --git a/dev-ruby/actionmailer/files/actionmailer-6.1.7.4-ruby32-keywords.patch b/dev-ruby/actionmailer/files/actionmailer-6.1.7.4-ruby32-keywords.patch
new file mode 100644
index 000000000000..7f33602f13dd
--- /dev/null
+++ b/dev-ruby/actionmailer/files/actionmailer-6.1.7.4-ruby32-keywords.patch
@@ -0,0 +1,50 @@
+From 67bdba4e63cad218c02dbb3171ddd53353cc0b48 Mon Sep 17 00:00:00 2001
+From: Javier Jimenez <javiyu7@gmail.com>
+Date: Thu, 5 Jan 2023 21:34:37 +0100
+Subject: [PATCH] Backports ruby 3.2 compatibility fixes for rails 6.1
+
+---
+ actionmailer/lib/action_mailer/base.rb            |  2 +-
+ actionmailer/lib/action_mailer/rescuable.rb       | 12 ++++++++----
+ actionpack/lib/abstract_controller/base.rb        | 10 +++++++---
+ actionpack/lib/abstract_controller/callbacks.rb   |  6 +++++-
+ actionview/lib/action_view/rendering.rb           |  6 +++++-
+ activemodel/lib/active_model/attribute_methods.rb |  2 +-
+ activerecord/lib/active_record/relation.rb        |  8 ++++++--
+ 7 files changed, 33 insertions(+), 13 deletions(-)
+
+diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
+index ae04c0419fc99..4f2620e525157 100644
+--- a/lib/action_mailer/base.rb
++++ b/lib/action_mailer/base.rb
+@@ -616,6 +616,7 @@ def process(method_name, *args) #:nodoc:
+         @_message = NullMail.new unless @_mail_was_called
+       end
+     end
++    ruby2_keywords(:process) if respond_to?(:ruby2_keywords, true)
+ 
+     class NullMail #:nodoc:
+       def body; "" end
+diff --git a/actionmailer/lib/action_mailer/rescuable.rb b/actionmailer/lib/action_mailer/rescuable.rb
+index ffcaa1f79526d..d949e4681e30c 100644
+--- a/lib/action_mailer/rescuable.rb
++++ b/lib/action_mailer/rescuable.rb
+@@ -20,10 +20,14 @@ def handle_exceptions #:nodoc:
+     end
+ 
+     private
+-      def process(*)
+-        handle_exceptions do
+-          super
+-        end
++      all_args = RUBY_VERSION < "2.7" ? "*" : "..."
++
++      class_eval <<-RUBY
++    def process(#{all_args})
++      handle_exceptions do
++        super
+       end
++    end
++      RUBY
+   end
+ end
diff --git a/dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.2-r1.ebuild b/dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..ececb8b29bd5
--- /dev/null
+++ b/dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.2-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Action caching for Action Pack (removed from core in Rails 4.0)"
+HOMEPAGE="https://github.com/rails/actionpack-action_caching"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/actionpack-4.0.0:*"
+
+ruby_add_bdepend "test? ( >=dev-ruby/activerecord-4.0.0
+	|| ( dev-ruby/railties:6.1 )
+	dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" Rakefile test/abstract_unit.rb || die
+	sed -i -e "/git/d" ${PN}.gemspec || die
+	sed -i -e '1igem "activerecord", "<7"; gem "railties", "<7"' test/abstract_unit.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test test/caching_test.rb || die
+}
diff --git a/dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.2.ebuild b/dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.2.ebuild
deleted file mode 100644
index a0b93e8ad1d9..000000000000
--- a/dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Action caching for Action Pack (removed from core in Rails 4.0)"
-HOMEPAGE="https://github.com/rails/actionpack-action_caching"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/actionpack-4.0.0:*"
-
-ruby_add_bdepend "test? ( >=dev-ruby/activerecord-4.0.0
-	|| ( dev-ruby/railties:6.1 dev-ruby/railties:6.0 dev-ruby/railties:5.2 )
-	dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" Rakefile test/abstract_unit.rb || die
-	sed -i -e "/git/d" ${PN}.gemspec || die
-	sed -i -e '1igem "activerecord", "<7"; gem "railties", "<7"' test/abstract_unit.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/caching_test.rb || die
-}
diff --git a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1-r1.ebuild b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1-r1.ebuild
deleted file mode 100644
index fd564734e40c..000000000000
--- a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-inherit ruby-fakegem
-
-DESCRIPTION="XML parameters parser for Action Pack (removed from core in Rails 4.0)"
-HOMEPAGE="https://github.com/rails/actionpack-xml_parser"
-SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="2"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/actionpack-6.0*:* =dev-ruby/railties-6.0*:*"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" Rakefile test/helper.rb || die
-	sed -i -e '1igem "actionpack", "~>6.0.0"' test/helper.rb || die
-
-	# Skip test that is not compatible with Rails 5.2
-	sed -i -e '/occurring a parse error if parsing unsuccessful/askip "rails 5.2"' test/xml_params_parsing_test.rb || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true ${RUBY} -Ilib:.:test -e "Dir['test/*_test.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1-r2.ebuild b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1-r2.ebuild
deleted file mode 100644
index bf9852deb7b4..000000000000
--- a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack-xml_parser.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="XML parameters parser for Action Pack (removed from core in Rails 4.0)"
-HOMEPAGE="https://github.com/rails/actionpack-xml_parser"
-SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="2"
-IUSE=""
-
-ruby_add_rdepend "
-	|| ( dev-ruby/actionpack:6.1 dev-ruby/actionpack:6.0 dev-ruby/actionpack:5.2 )
-	|| ( dev-ruby/railties:6.1 dev-ruby/railties:6.0 dev-ruby/railties:5.2 )
-"
-
-ruby_add_bdepend "test? ( =dev-ruby/railties-6* )"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" Rakefile test/helper.rb || die
-	sed -i -e '1igem "actionpack", "~>6.0"' test/helper.rb || die
-
-	# Skip test that is not compatible with Rails 5.2
-	sed -i -e '/occurring a parse error if parsing unsuccessful/askip "rails 5.2"' test/xml_params_parsing_test.rb || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true ${RUBY} -Ilib:.:test -e "Dir['test/*_test.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1-r3.ebuild b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1-r3.ebuild
new file mode 100644
index 000000000000..94174f034697
--- /dev/null
+++ b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack-xml_parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="XML parameters parser for Action Pack (removed from core in Rails 4.0)"
+HOMEPAGE="https://github.com/rails/actionpack-xml_parser"
+SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="2"
+IUSE=""
+
+ruby_add_rdepend "
+	|| ( dev-ruby/actionpack:6.1 )
+	|| ( dev-ruby/railties:6.1 )
+"
+
+ruby_add_bdepend "test? ( =dev-ruby/railties-6* )"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" Rakefile test/helper.rb || die
+	sed -i -e '1igem "actionpack", "~>6.0"' test/helper.rb || die
+
+	# Skip test that is not compatible with Rails 5.2
+	sed -i -e '/occurring a parse error if parsing unsuccessful/askip "rails 5.2"' test/xml_params_parsing_test.rb || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:.:test -e "Dir['test/*_test.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 2ca4cdbed1ae..5a38fea999e2 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,15 +1,6 @@
-DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
-DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
-DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
-DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
-DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
-DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
-DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
+DIST rails-6.1.7.6.tgz 11040086 BLAKE2B 8b5311752952403cf8eae31b5d8e8d376c4b449f512e86df66b3e921375ffa3ea11e15f1d74a7f8ec9179ff70c32a6d4f8de75be5f92fe6315ee97164e22d2d0 SHA512 c4163565b2324ce97317d252f3d9e2e673a12b6ae7f54571645c958ce30221f1b357887ade80e46abdd47a422736b9946e49850d52ffd72d8acc87f35224e69f
+DIST rails-6.1.7.7.tgz 11041447 BLAKE2B 3f59325aa86d3b7d6e0773b9eb2b895a26b644109be8df0b0d9abbab8e6c77f76d316c717ecce4e2d79d3247559504a7452a8037d2d52a6cf95fbacd7f8b8612 SHA512 f9af4eebb3bffec78832f92be6158c71c147e265b54e8e368a06c762bfd1a7992256b3e9286aeb59eee69ba56be28d381a715eb13f99b9babfd9b7ce8051e210
+DIST rails-7.0.8.1.tgz 11089378 BLAKE2B 5d92087402d8aa2b86759ec92c44091a7a0f8a22959e0510f10417f88e54f9e1e6a14c4e9519033cd63bdd1f54f72b91bff8a3318a3264c39311317fb67e8b63 SHA512 74f467f7d3e5ec88560448e206a8f0cdf55bad60dd9eac019224fce86a766ee9d0c4afbd4eaae30dacfe34beebcff6aa9d3c5c99be9c8ad5c385817fe409afc8
+DIST rails-7.0.8.tgz 11073254 BLAKE2B 2aee047a365acb0890ef3afbccfe323fedccf7b54214aa1c2f92b7a7aaa64c275c1e03f8f97e6a2e30281224ba30703d18b40aeee9b4e7fb6f035a4a7716a054 SHA512 0e9feb5bd0360868c3109152d8ea414b65d36d33a5dbb96b199cfa6c4335800d6c392e0fbcbfa453a02fd75924a297a65caf04948895de53db43700478dbeb11
+DIST rails-7.1.3.2.tgz 10914950 BLAKE2B 419e6817958efcc5dbbb47d24498decff48fca9748c9f4069bcd353a4644fa623caf79c4072db0944139ac991d14623013683f69cef3126fa63348cc0612655b SHA512 0a58e7b125eb97f94a8a75bacd421d7197e6ad78d24651aecfe82e41c024ccfa42a9de0664099f55cd6ac6a41fd7f09cdc3177ed2b809b0be7d7df1639424f9d
+DIST rails-7.1.3.tgz 10900323 BLAKE2B a83ca4ee656e93241fa0460d8df197904a4eef310cf25bce6db6167bad87c8d0644533fa6e224ec959a4e10005164e0f981e14e8b23cee14e2747117be9da712 SHA512 df1128d1403ab82d218d2057c7c86e646594f97a8c6fcf5648a66440d52e5c20a4ceb0c13e70b6153152b44f62d8a1e20f3776acff5c55bc54d006cb7da32d12
diff --git a/dev-ruby/actionpack/actionpack-5.2.6.ebuild b/dev-ruby/actionpack/actionpack-5.2.6.ebuild
deleted file mode 100644
index ed0dd38eada0..000000000000
--- a/dev-ruby/actionpack/actionpack-5.2.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-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.0.2: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/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-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\|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 -e '1i gem "activemodel", "~> 5.2.0"' \
-		-e '1i gem "actionview", "~> 5.2.0"' \
-		-e '1i gem "railties", "~> 5.2.0"' \
-		-i 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 broken tests already fixed upstream
-	sed -i -e '/cookie syntax resilience/askip "broken test"' test/dispatch/request_test.rb || die
-	sed -i -e '/test_keeps_original_headers_behavior/askip "broken test"' test/dispatch/ssl_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-5.2.7.1.ebuild b/dev-ruby/actionpack/actionpack-5.2.7.1.ebuild
deleted file mode 100644
index 608f7bf623a0..000000000000
--- a/dev-ruby/actionpack/actionpack-5.2.7.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-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.0.2: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/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-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\|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 -e '1i gem "activemodel", "~> 5.2.0"' \
-		-e '1i gem "actionview", "~> 5.2.0"' \
-		-e '1i gem "railties", "~> 5.2.0"' \
-		-e '1i gem "psych", "~> 3.0"' \
-		-i 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 broken tests already fixed upstream
-	sed -i -e '/cookie syntax resilience/askip "broken test"' test/dispatch/request_test.rb || die
-	sed -i -e '/test_keeps_original_headers_behavior/askip "broken test"' test/dispatch/ssl_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-5.2.8.ebuild b/dev-ruby/actionpack/actionpack-5.2.8.ebuild
deleted file mode 100644
index 6328b72c5add..000000000000
--- a/dev-ruby/actionpack/actionpack-5.2.8.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-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.0.2: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/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-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\|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 -e '1i gem "activemodel", "~> 5.2.0"' \
-		-e '1i gem "actionview", "~> 5.2.0"' \
-		-e '1i gem "railties", "~> 5.2.0"' \
-		-e '1i gem "psych", "~> 3.0"' \
-		-i 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 broken tests already fixed upstream
-	sed -i -e '/cookie syntax resilience/askip "broken test"' test/dispatch/request_test.rb || die
-	sed -i -e '/test_keeps_original_headers_behavior/askip "broken test"' test/dispatch/ssl_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.0.4.1.ebuild b/dev-ruby/actionpack/actionpack-6.0.4.1.ebuild
deleted file mode 100644
index de56509c9f2e..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.4.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-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 ~riscv ~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-3.35.0
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-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\|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
-
-	# 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 depend on an old dependency
-	rm -f test/dispatch/system_testing/driver_test.rb
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.0.4.4.ebuild b/dev-ruby/actionpack/actionpack-6.0.4.4.ebuild
deleted file mode 100644
index a3bfaf000e01..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.4.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~riscv ~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-3.35.0
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-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\|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
-
-	# 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 depend on an old dependency
-	rm -f test/dispatch/system_testing/driver_test.rb
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.0.4.7.ebuild b/dev-ruby/actionpack/actionpack-6.0.4.7.ebuild
deleted file mode 100644
index eec7005b2c02..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.4.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~riscv ~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-3.35.0
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-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\|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
-
-	# 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 depend on an old dependency
-	rm -f test/dispatch/system_testing/driver_test.rb
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.0.4.8.ebuild b/dev-ruby/actionpack/actionpack-6.0.4.8.ebuild
deleted file mode 100644
index eec7005b2c02..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.4.8.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~riscv ~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-3.35.0
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-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\|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
-
-	# 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 depend on an old dependency
-	rm -f test/dispatch/system_testing/driver_test.rb
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.0.5.ebuild b/dev-ruby/actionpack/actionpack-6.0.5.ebuild
deleted file mode 100644
index eec7005b2c02..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~riscv ~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-3.35.0
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-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\|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
-
-	# 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 depend on an old dependency
-	rm -f test/dispatch/system_testing/driver_test.rb
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.1.5.1.ebuild b/dev-ruby/actionpack/actionpack-6.1.5.1.ebuild
deleted file mode 100644
index 8a43d94f6c01..000000000000
--- a/dev-ruby/actionpack/actionpack-6.1.5.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-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 ~riscv ~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
-		www-servers/puma
-	)"
-
-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\|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 '3igem "railties", "~> 6.1.0"; gem "activerecord", "~> 6.1.0"' 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 depending on an unreleased version of selenium-webdriver
-	sed -i -e '/define extra capabilities/,/^  end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.1.5.ebuild b/dev-ruby/actionpack/actionpack-6.1.5.ebuild
deleted file mode 100644
index f1c324e78586..000000000000
--- a/dev-ruby/actionpack/actionpack-6.1.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~riscv ~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
-		www-servers/puma
-	)"
-
-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\|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 '3igem "railties", "~> 6.1.0"; gem "activerecord", "~> 6.1.0"' 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 depending on an unreleased version of selenium-webdriver
-	sed -i -e '/define extra capabilities/,/^  end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.1.6.ebuild b/dev-ruby/actionpack/actionpack-6.1.6.ebuild
deleted file mode 100644
index 8a43d94f6c01..000000000000
--- a/dev-ruby/actionpack/actionpack-6.1.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-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 ~riscv ~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
-		www-servers/puma
-	)"
-
-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\|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 '3igem "railties", "~> 6.1.0"; gem "activerecord", "~> 6.1.0"' 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 depending on an unreleased version of selenium-webdriver
-	sed -i -e '/define extra capabilities/,/^  end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.1.7.6.ebuild b/dev-ruby/actionpack/actionpack-6.1.7.6.ebuild
new file mode 100644
index 000000000000..a3575cc3fceb
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-6.1.7.6.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~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
+		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 -e '3igem "railties", "~> 6.1.0"; gem "activerecord", "~> 6.1.0"; gem "minitest", "<5.16"' \
+		-i test/abstract_unit.rb || die
+
+	# Use different timezone notation, this changed at some point due to an external dependency changing.
+	sed -e 's/-0000/GMT/' \
+		-i test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
+
+	# Avoid tests depending on an unreleased version of selenium-webdriver
+	sed -e '/define extra capabilities/,/^  end/ s:^:#:' \
+		-i test/dispatch/system_testing/driver_test.rb || die
+
+	# Avoid tests that fail with a fixed cgi.rb version
+	sed -e '/test_session_store_with_all_domains/askip "Fails with fixed cgi.rb"' \
+		-i test/dispatch/session/cookie_store_test.rb || die
+}
diff --git a/dev-ruby/actionpack/actionpack-6.1.7.7.ebuild b/dev-ruby/actionpack/actionpack-6.1.7.7.ebuild
new file mode 100644
index 000000000000..3728a4e2932e
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-6.1.7.7.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+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
+		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 -e '3igem "railties", "~> 6.1.0"; gem "activerecord", "~> 6.1.0"; gem "minitest", "<5.16"' \
+		-i test/abstract_unit.rb || die
+
+	# Use different timezone notation, this changed at some point due to an external dependency changing.
+	sed -e 's/-0000/GMT/' \
+		-i test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
+
+	# Avoid tests depending on an unreleased version of selenium-webdriver
+	sed -e '/define extra capabilities/,/^  end/ s:^:#:' \
+		-i test/dispatch/system_testing/driver_test.rb || die
+
+	# Avoid tests that fail with a fixed cgi.rb version
+	sed -e '/test_session_store_with_all_domains/askip "Fails with fixed cgi.rb"' \
+		-i test/dispatch/session/cookie_store_test.rb || die
+}
diff --git a/dev-ruby/actionpack/actionpack-7.0.2.2.ebuild b/dev-ruby/actionpack/actionpack-7.0.2.2.ebuild
deleted file mode 100644
index 994dc6c53657..000000000000
--- a/dev-ruby/actionpack/actionpack-7.0.2.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_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 ~riscv ~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
-	)"
-
-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\|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
-
-	# 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 depending on an unreleased version of selenium-webdriver
-	sed -i -e '/define extra capabilities/,/^  end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-7.0.2.3.ebuild b/dev-ruby/actionpack/actionpack-7.0.2.3.ebuild
deleted file mode 100644
index f920a8e063fe..000000000000
--- a/dev-ruby/actionpack/actionpack-7.0.2.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-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 ~riscv ~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
-	)"
-
-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\|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
-
-	# 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 depending on an unreleased version of selenium-webdriver
-	sed -i -e '/define extra capabilities/,/^  end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-7.0.2.4.ebuild b/dev-ruby/actionpack/actionpack-7.0.2.4.ebuild
deleted file mode 100644
index f920a8e063fe..000000000000
--- a/dev-ruby/actionpack/actionpack-7.0.2.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-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 ~riscv ~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
-	)"
-
-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\|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
-
-	# 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 depending on an unreleased version of selenium-webdriver
-	sed -i -e '/define extra capabilities/,/^  end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-7.0.3.ebuild b/dev-ruby/actionpack/actionpack-7.0.3.ebuild
deleted file mode 100644
index f920a8e063fe..000000000000
--- a/dev-ruby/actionpack/actionpack-7.0.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-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 ~riscv ~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
-	)"
-
-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\|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
-
-	# 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 depending on an unreleased version of selenium-webdriver
-	sed -i -e '/define extra capabilities/,/^  end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-7.0.8.1.ebuild b/dev-ruby/actionpack/actionpack-7.0.8.1.ebuild
new file mode 100644
index 000000000000..fa49676482d3
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-7.0.8.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+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-3.26
+		~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 -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:^:#:' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	sed -e '3igem "rack", "<3"; gem "minitest", "<5.16"; gem "railties", "~> 7.0.0"; gem "activemodel", "~> 7.0.0"' \
+		-i test/abstract_unit.rb || die
+
+	# Use different timezone notation, this changed at some point due to an external dependency changing.
+	sed -e 's/-0000/GMT/' \
+		-i 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 -e '/test_session_store_with_all_domains/askip "Fails with fixed cgi.rb"' \
+		-i test/dispatch/session/cookie_store_test.rb || die
+}
diff --git a/dev-ruby/actionpack/actionpack-7.0.8.ebuild b/dev-ruby/actionpack/actionpack-7.0.8.ebuild
new file mode 100644
index 000000000000..3deadbaecbba
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-7.0.8.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~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-3.26
+		~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 '3igem "rack", "<3"; gem "minitest", "<5.16"' test/abstract_unit.rb || die
+
+	# Use different timezone notation, this changed at some point due to an external dependency changing.
+	sed -e 's/-0000/GMT/' \
+		-i 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 -e '/test_session_store_with_all_domains/askip "Fails with fixed cgi.rb"' \
+		-i test/dispatch/session/cookie_store_test.rb || die
+}
diff --git a/dev-ruby/actionpack/actionpack-7.1.3.2.ebuild b/dev-ruby/actionpack/actionpack-7.1.3.2.ebuild
new file mode 100644
index 000000000000..0fae64c8bb13
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-7.1.3.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/nokogiri-1.8.5
+	>=dev-ruby/rack-2.2.4
+	>=dev-ruby/rack-session-1.0.1
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/rails-dom-testing-2.2:2
+	>=dev-ruby/rails-html-sanitizer-1.6:1
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		dev-ruby/bundler
+		>=dev-ruby/capybara-3.26
+		~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
+	)"
+
+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\|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
+
+	# Fix errors loading rack/session with rack 3.0.
+	sed -i -e '2igem "rack-session"' test/abstract_unit.rb || die
+
+	# Use different timezone notation, this changed at some point due to an external dependency changing.
+	sed -e 's/-0000/GMT/' \
+		-i 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 -e '/test_session_store_with_all_domains/askip "Fails with fixed cgi.rb"' \
+		-i test/dispatch/session/cookie_store_test.rb || die
+}
diff --git a/dev-ruby/actionpack/actionpack-7.1.3.ebuild b/dev-ruby/actionpack/actionpack-7.1.3.ebuild
new file mode 100644
index 000000000000..320ea8fe809b
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-7.1.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/nokogiri-1.8.5
+	>=dev-ruby/rack-2.2.4
+	>=dev-ruby/rack-session-1.0.1
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/rails-dom-testing-2.2:2
+	>=dev-ruby/rails-html-sanitizer-1.6:1
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		dev-ruby/bundler
+		>=dev-ruby/capybara-3.26
+		~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() {
+	# 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
+
+	# Fix errors loading rack/session with rack 3.0.
+	sed -i -e '2igem "rack-session"' test/abstract_unit.rb || die
+
+	# Use different timezone notation, this changed at some point due to an external dependency changing.
+	sed -e 's/-0000/GMT/' \
+		-i 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 -e '/test_session_store_with_all_domains/askip "Fails with fixed cgi.rb"' \
+		-i test/dispatch/session/cookie_store_test.rb || die
+}
diff --git a/dev-ruby/actionpack/files/actionpack-7.0.4-rack-test-2.patch b/dev-ruby/actionpack/files/actionpack-7.0.4-rack-test-2.patch
new file mode 100644
index 000000000000..09a234d46576
--- /dev/null
+++ b/dev-ruby/actionpack/files/actionpack-7.0.4-rack-test-2.patch
@@ -0,0 +1,55 @@
+From 07be723bc1d2b6a655a589dfcd4213e251cdb453 Mon Sep 17 00:00:00 2001
+From: Aaron Patterson <aaron@rubyonrails.org>
+Date: Wed, 25 May 2022 10:46:11 -0700
+Subject: [PATCH] Ensure Rails is green with Rack-Test main branch
+
+This commit just ensures we're green with the main branch of rack test.
+The changes are things we should have done anyway, and are backwards
+compatible with older versions of rack test
+---
+ actionpack/test/controller/new_base/render_streaming_test.rb | 4 ++++
+ actionpack/test/dispatch/session/cache_store_test.rb         | 2 +-
+ actionpack/test/dispatch/session/mem_cache_store_test.rb     | 2 +-
+ 3 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
+index 23dc6bca40364..d9789355f9520 100644
+--- a/test/controller/new_base/render_streaming_test.rb
++++ b/test/controller/new_base/render_streaming_test.rb
+@@ -44,6 +44,10 @@ def explicit_cache
+   end
+ 
+   class StreamingTest < Rack::TestCase
++    def get(path, headers: { "SERVER_PROTOCOL" => "HTTP/1.1", "HTTP_VERSION" => "HTTP/1.1" })
++      super
++    end
++
+     test "rendering with streaming enabled at the class level" do
+       get "/render_streaming/basic/hello_world"
+       assert_body "b\r\nHello world\r\nb\r\n, I'm here!\r\n0\r\n\r\n"
+diff --git a/actionpack/test/dispatch/session/cache_store_test.rb b/actionpack/test/dispatch/session/cache_store_test.rb
+index 9677d177d0acc..6479654c73b37 100644
+--- a/test/dispatch/session/cache_store_test.rb
++++ b/test/dispatch/session/cache_store_test.rb
+@@ -59,7 +59,7 @@ def test_getting_session_value_after_session_reset
+       get "/set_session_value"
+       assert_response :success
+       assert cookies["_session_id"]
+-      session_cookie = cookies.send(:hash_for)["_session_id"]
++      session_cookie = cookies.get_cookie("_session_id")
+ 
+       get "/call_reset_session"
+       assert_response :success
+diff --git a/actionpack/test/dispatch/session/mem_cache_store_test.rb b/actionpack/test/dispatch/session/mem_cache_store_test.rb
+index 417a8355bfc2a..188f321c5999f 100644
+--- a/test/dispatch/session/mem_cache_store_test.rb
++++ b/test/dispatch/session/mem_cache_store_test.rb
+@@ -71,7 +71,7 @@ def test_getting_session_value_after_session_reset
+         get "/set_session_value"
+         assert_response :success
+         assert cookies["_session_id"]
+-        session_cookie = cookies.send(:hash_for)["_session_id"]
++        session_cookie = cookies.get_cookie("_session_id")
+ 
+         get "/call_reset_session"
+         assert_response :success
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index c09c30aa170e..5a38fea999e2 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,12 +1,6 @@
-DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
-DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
-DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
-DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
-DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
+DIST rails-6.1.7.6.tgz 11040086 BLAKE2B 8b5311752952403cf8eae31b5d8e8d376c4b449f512e86df66b3e921375ffa3ea11e15f1d74a7f8ec9179ff70c32a6d4f8de75be5f92fe6315ee97164e22d2d0 SHA512 c4163565b2324ce97317d252f3d9e2e673a12b6ae7f54571645c958ce30221f1b357887ade80e46abdd47a422736b9946e49850d52ffd72d8acc87f35224e69f
+DIST rails-6.1.7.7.tgz 11041447 BLAKE2B 3f59325aa86d3b7d6e0773b9eb2b895a26b644109be8df0b0d9abbab8e6c77f76d316c717ecce4e2d79d3247559504a7452a8037d2d52a6cf95fbacd7f8b8612 SHA512 f9af4eebb3bffec78832f92be6158c71c147e265b54e8e368a06c762bfd1a7992256b3e9286aeb59eee69ba56be28d381a715eb13f99b9babfd9b7ce8051e210
+DIST rails-7.0.8.1.tgz 11089378 BLAKE2B 5d92087402d8aa2b86759ec92c44091a7a0f8a22959e0510f10417f88e54f9e1e6a14c4e9519033cd63bdd1f54f72b91bff8a3318a3264c39311317fb67e8b63 SHA512 74f467f7d3e5ec88560448e206a8f0cdf55bad60dd9eac019224fce86a766ee9d0c4afbd4eaae30dacfe34beebcff6aa9d3c5c99be9c8ad5c385817fe409afc8
+DIST rails-7.0.8.tgz 11073254 BLAKE2B 2aee047a365acb0890ef3afbccfe323fedccf7b54214aa1c2f92b7a7aaa64c275c1e03f8f97e6a2e30281224ba30703d18b40aeee9b4e7fb6f035a4a7716a054 SHA512 0e9feb5bd0360868c3109152d8ea414b65d36d33a5dbb96b199cfa6c4335800d6c392e0fbcbfa453a02fd75924a297a65caf04948895de53db43700478dbeb11
+DIST rails-7.1.3.2.tgz 10914950 BLAKE2B 419e6817958efcc5dbbb47d24498decff48fca9748c9f4069bcd353a4644fa623caf79c4072db0944139ac991d14623013683f69cef3126fa63348cc0612655b SHA512 0a58e7b125eb97f94a8a75bacd421d7197e6ad78d24651aecfe82e41c024ccfa42a9de0664099f55cd6ac6a41fd7f09cdc3177ed2b809b0be7d7df1639424f9d
+DIST rails-7.1.3.tgz 10900323 BLAKE2B a83ca4ee656e93241fa0460d8df197904a4eef310cf25bce6db6167bad87c8d0644533fa6e224ec959a4e10005164e0f981e14e8b23cee14e2747117be9da712 SHA512 df1128d1403ab82d218d2057c7c86e646594f97a8c6fcf5648a66440d52e5c20a4ceb0c13e70b6153152b44f62d8a1e20f3776acff5c55bc54d006cb7da32d12
diff --git a/dev-ruby/actiontext/actiontext-6.0.4.1.ebuild b/dev-ruby/actiontext/actiontext-6.0.4.1.ebuild
deleted file mode 100644
index 6af8790fc86b..000000000000
--- a/dev-ruby/actiontext/actiontext-6.0.4.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text 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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-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\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|byebug\|dalli\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.0.4.4.ebuild b/dev-ruby/actiontext/actiontext-6.0.4.4.ebuild
deleted file mode 100644
index 6578fa8e6b1a..000000000000
--- a/dev-ruby/actiontext/actiontext-6.0.4.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text 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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-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\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|byebug\|dalli\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.0.4.7.ebuild b/dev-ruby/actiontext/actiontext-6.0.4.7.ebuild
deleted file mode 100644
index bcf2b5e89081..000000000000
--- a/dev-ruby/actiontext/actiontext-6.0.4.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text 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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-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\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|byebug\|dalli\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.0.4.8.ebuild b/dev-ruby/actiontext/actiontext-6.0.4.8.ebuild
deleted file mode 100644
index bcf2b5e89081..000000000000
--- a/dev-ruby/actiontext/actiontext-6.0.4.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text 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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-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\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|byebug\|dalli\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.0.5.ebuild b/dev-ruby/actiontext/actiontext-6.0.5.ebuild
deleted file mode 100644
index 98db26d50caf..000000000000
--- a/dev-ruby/actiontext/actiontext-6.0.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text 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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-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\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|byebug\|dalli\)/ s:^:#:" \
-		-e '/minitest/ s/5.15/5.16/' \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.1.5.1.ebuild b/dev-ruby/actiontext/actiontext-6.1.5.1.ebuild
deleted file mode 100644
index e0c1fe100689..000000000000
--- a/dev-ruby/actiontext/actiontext-6.1.5.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text 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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.1.5.ebuild b/dev-ruby/actiontext/actiontext-6.1.5.ebuild
deleted file mode 100644
index b644b504cc65..000000000000
--- a/dev-ruby/actiontext/actiontext-6.1.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text 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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.1.6.ebuild b/dev-ruby/actiontext/actiontext-6.1.6.ebuild
deleted file mode 100644
index e0c1fe100689..000000000000
--- a/dev-ruby/actiontext/actiontext-6.1.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text 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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.1.7.6.ebuild b/dev-ruby/actiontext/actiontext-6.1.7.6.ebuild
new file mode 100644
index 000000000000..40c122978979
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-6.1.7.6.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="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Edit and display rich text 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 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/nokogiri-1.8.5
+"
+
+ruby_add_bdepend "test? (
+	~dev-ruby/activerecord-${PV}[sqlite]
+	dev-ruby/bundler
+	=dev-ruby/minitest-5.15*:*
+	dev-ruby/mocha
+	dev-ruby/rails
+)"
+
+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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|rack-test\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actiontext/actiontext-6.1.7.7.ebuild b/dev-ruby/actiontext/actiontext-6.1.7.7.ebuild
new file mode 100644
index 000000000000..a36e4735a34a
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-6.1.7.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Edit and display rich text 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 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/nokogiri-1.8.5
+"
+
+ruby_add_bdepend "test? (
+	~dev-ruby/activerecord-${PV}[sqlite]
+	dev-ruby/bundler
+	=dev-ruby/minitest-5.15*:*
+	dev-ruby/mocha
+	dev-ruby/rails
+)"
+
+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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|rack-test\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actiontext/actiontext-7.0.2.2.ebuild b/dev-ruby/actiontext/actiontext-7.0.2.2.ebuild
deleted file mode 100644
index 34afde5a50f2..000000000000
--- a/dev-ruby/actiontext/actiontext-7.0.2.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text 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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.6.0
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-	dev-ruby/propshaft
-)"
-
-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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-7.0.2.3.ebuild b/dev-ruby/actiontext/actiontext-7.0.2.3.ebuild
deleted file mode 100644
index 8c0fa471c2ba..000000000000
--- a/dev-ruby/actiontext/actiontext-7.0.2.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text 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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.6.0
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-	dev-ruby/propshaft
-)"
-
-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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-7.0.2.4.ebuild b/dev-ruby/actiontext/actiontext-7.0.2.4.ebuild
deleted file mode 100644
index 8c0fa471c2ba..000000000000
--- a/dev-ruby/actiontext/actiontext-7.0.2.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text 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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.6.0
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-	dev-ruby/propshaft
-)"
-
-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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-7.0.3.ebuild b/dev-ruby/actiontext/actiontext-7.0.3.ebuild
deleted file mode 100644
index 8c0fa471c2ba..000000000000
--- a/dev-ruby/actiontext/actiontext-7.0.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text 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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.6.0
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-	dev-ruby/propshaft
-)"
-
-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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-7.0.8.1.ebuild b/dev-ruby/actiontext/actiontext-7.0.8.1.ebuild
new file mode 100644
index 000000000000..5c39b98a52c8
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-7.0.8.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Edit and display rich text 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 ~riscv ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.6.0
+	>=dev-ruby/nokogiri-1.8.5
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/minitest:5.15
+	dev-ruby/mocha
+	dev-ruby/propshaft
+	>=dev-ruby/sqlite3-1.4.0
+)"
+
+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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|rack-test\|bootsnap\|capybara\|dalli\|connection_pool\|terser\|cookiejar\|cgi\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+		-e '/sqlite/ s/1.6.4/99/' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actiontext/actiontext-7.0.8.ebuild b/dev-ruby/actiontext/actiontext-7.0.8.ebuild
new file mode 100644
index 000000000000..5ccaae7dc277
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-7.0.8.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="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Edit and display rich text 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 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.6.0
+	>=dev-ruby/nokogiri-1.8.5
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/minitest:5.15
+	dev-ruby/mocha
+	dev-ruby/propshaft
+	>=dev-ruby/sqlite3-1.4.0
+)"
+
+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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|rack-test\|bootsnap\|capybara\|dalli\|connection_pool\|terser\|cookiejar\|cgi\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+		-e '/sqlite/ s/1.6.4/99/' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actiontext/actiontext-7.1.3.2.ebuild b/dev-ruby/actiontext/actiontext-7.1.3.2.ebuild
new file mode 100644
index 000000000000..70b801b7a136
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-7.1.3.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Edit and display rich text 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 ~riscv ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.6.0
+	>=dev-ruby/nokogiri-1.8.5
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/importmap-rails
+	dev-ruby/minitest:5.15
+	dev-ruby/mocha
+	dev-ruby/propshaft
+	>=dev-ruby/sqlite3-1.4.0
+)"
+
+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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|rack-test\|bootsnap\|capybara\|dalli\|connection_pool\|terser\|cookiejar\|cgi\|web-console\|trilogy\|error_highlight\|jbuilder\)/ s:^:#:" \
+		-e '/stimulus-rails/,/cssbundling-rails/ s:^:#:' \
+		-e '/tailwindcss-rails/,/dartsass-rails/ s:^:#:' \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :\(cable\|doc\|lint\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+		-e '/sqlite/ s/1.6.4/99/' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid failing test depending on yarn
+	rm -f test/javascript_package_test.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actiontext/actiontext-7.1.3.ebuild b/dev-ruby/actiontext/actiontext-7.1.3.ebuild
new file mode 100644
index 000000000000..70b801b7a136
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-7.1.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Edit and display rich text 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 ~riscv ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.6.0
+	>=dev-ruby/nokogiri-1.8.5
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/importmap-rails
+	dev-ruby/minitest:5.15
+	dev-ruby/mocha
+	dev-ruby/propshaft
+	>=dev-ruby/sqlite3-1.4.0
+)"
+
+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\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|rack-test\|bootsnap\|capybara\|dalli\|connection_pool\|terser\|cookiejar\|cgi\|web-console\|trilogy\|error_highlight\|jbuilder\)/ s:^:#:" \
+		-e '/stimulus-rails/,/cssbundling-rails/ s:^:#:' \
+		-e '/tailwindcss-rails/,/dartsass-rails/ s:^:#:' \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :\(cable\|doc\|lint\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+		-e '/sqlite/ s/1.6.4/99/' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid failing test depending on yarn
+	rm -f test/javascript_package_test.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 2ca4cdbed1ae..5a38fea999e2 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,15 +1,6 @@
-DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
-DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
-DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
-DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
-DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
-DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
-DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
+DIST rails-6.1.7.6.tgz 11040086 BLAKE2B 8b5311752952403cf8eae31b5d8e8d376c4b449f512e86df66b3e921375ffa3ea11e15f1d74a7f8ec9179ff70c32a6d4f8de75be5f92fe6315ee97164e22d2d0 SHA512 c4163565b2324ce97317d252f3d9e2e673a12b6ae7f54571645c958ce30221f1b357887ade80e46abdd47a422736b9946e49850d52ffd72d8acc87f35224e69f
+DIST rails-6.1.7.7.tgz 11041447 BLAKE2B 3f59325aa86d3b7d6e0773b9eb2b895a26b644109be8df0b0d9abbab8e6c77f76d316c717ecce4e2d79d3247559504a7452a8037d2d52a6cf95fbacd7f8b8612 SHA512 f9af4eebb3bffec78832f92be6158c71c147e265b54e8e368a06c762bfd1a7992256b3e9286aeb59eee69ba56be28d381a715eb13f99b9babfd9b7ce8051e210
+DIST rails-7.0.8.1.tgz 11089378 BLAKE2B 5d92087402d8aa2b86759ec92c44091a7a0f8a22959e0510f10417f88e54f9e1e6a14c4e9519033cd63bdd1f54f72b91bff8a3318a3264c39311317fb67e8b63 SHA512 74f467f7d3e5ec88560448e206a8f0cdf55bad60dd9eac019224fce86a766ee9d0c4afbd4eaae30dacfe34beebcff6aa9d3c5c99be9c8ad5c385817fe409afc8
+DIST rails-7.0.8.tgz 11073254 BLAKE2B 2aee047a365acb0890ef3afbccfe323fedccf7b54214aa1c2f92b7a7aaa64c275c1e03f8f97e6a2e30281224ba30703d18b40aeee9b4e7fb6f035a4a7716a054 SHA512 0e9feb5bd0360868c3109152d8ea414b65d36d33a5dbb96b199cfa6c4335800d6c392e0fbcbfa453a02fd75924a297a65caf04948895de53db43700478dbeb11
+DIST rails-7.1.3.2.tgz 10914950 BLAKE2B 419e6817958efcc5dbbb47d24498decff48fca9748c9f4069bcd353a4644fa623caf79c4072db0944139ac991d14623013683f69cef3126fa63348cc0612655b SHA512 0a58e7b125eb97f94a8a75bacd421d7197e6ad78d24651aecfe82e41c024ccfa42a9de0664099f55cd6ac6a41fd7f09cdc3177ed2b809b0be7d7df1639424f9d
+DIST rails-7.1.3.tgz 10900323 BLAKE2B a83ca4ee656e93241fa0460d8df197904a4eef310cf25bce6db6167bad87c8d0644533fa6e224ec959a4e10005164e0f981e14e8b23cee14e2747117be9da712 SHA512 df1128d1403ab82d218d2057c7c86e646594f97a8c6fcf5648a66440d52e5c20a4ceb0c13e70b6153152b44f62d8a1e20f3776acff5c55bc54d006cb7da32d12
diff --git a/dev-ruby/actionview/actionview-5.2.6.ebuild b/dev-ruby/actionview/actionview-5.2.6.ebuild
deleted file mode 100644
index 2f55f788fce3..000000000000
--- a/dev-ruby/actionview/actionview-5.2.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-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 eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-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.0.3:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-	)"
-
-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 activerecord integration tests because they are very sensitive to the specifics
-	# of the environment.
-	sed -i -e 's/, "test:integration:active_record"//' Rakefile || die
-
-	sed -e '2igem "actionpack", "~> 5.2.0"' \
-		-e '2igem "activemodel", "~> 5.2.0"' \
-		-e '2igem "railties", "~> 5.2.0"' \
-		-e '/active_record/ s:^:#:' \
-		-i test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-5.2.7.1.ebuild b/dev-ruby/actionview/actionview-5.2.7.1.ebuild
deleted file mode 100644
index 69ed57f627d4..000000000000
--- a/dev-ruby/actionview/actionview-5.2.7.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-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 eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-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.0.3:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-	)"
-
-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 activerecord integration tests because they are very sensitive to the specifics
-	# of the environment.
-	sed -i -e 's/, "test:integration:active_record"//' Rakefile || die
-
-	sed -e '2igem "actionpack", "~> 5.2.0"' \
-		-e '2igem "activemodel", "~> 5.2.0"' \
-		-e '2igem "railties", "~> 5.2.0"' \
-		-e '/active_record/ s:^:#:' \
-		-i test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-5.2.8.ebuild b/dev-ruby/actionview/actionview-5.2.8.ebuild
deleted file mode 100644
index 7f7393b68107..000000000000
--- a/dev-ruby/actionview/actionview-5.2.8.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-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 eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-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.0.3:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-	)"
-
-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 activerecord integration tests because they are very sensitive to the specifics
-	# of the environment.
-	sed -i -e 's/, "test:integration:active_record"//' Rakefile || die
-
-	sed -e '2igem "actionpack", "~> 5.2.0"' \
-		-e '2igem "activemodel", "~> 5.2.0"' \
-		-e '2igem "railties", "~> 5.2.0"' \
-		-e '/active_record/ s:^:#:' \
-		-i test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.0.4.1.ebuild b/dev-ruby/actionview/actionview-6.0.4.1.ebuild
deleted file mode 100644
index ae4f69ac612a..000000000000
--- a/dev-ruby/actionview/actionview-6.0.4.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-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 ~riscv ~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
-	)"
-
-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/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.0.4.4.ebuild b/dev-ruby/actionview/actionview-6.0.4.4.ebuild
deleted file mode 100644
index 11c8508cdcd2..000000000000
--- a/dev-ruby/actionview/actionview-6.0.4.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~riscv ~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
-	)"
-
-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/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.0.4.7.ebuild b/dev-ruby/actionview/actionview-6.0.4.7.ebuild
deleted file mode 100644
index 0021524ea0b6..000000000000
--- a/dev-ruby/actionview/actionview-6.0.4.7.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~riscv ~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
-	)"
-
-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/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.0.4.8.ebuild b/dev-ruby/actionview/actionview-6.0.4.8.ebuild
deleted file mode 100644
index 0021524ea0b6..000000000000
--- a/dev-ruby/actionview/actionview-6.0.4.8.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~riscv ~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
-	)"
-
-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/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.0.5.ebuild b/dev-ruby/actionview/actionview-6.0.5.ebuild
deleted file mode 100644
index 0021524ea0b6..000000000000
--- a/dev-ruby/actionview/actionview-6.0.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~riscv ~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
-	)"
-
-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/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.1.5.1.ebuild b/dev-ruby/actionview/actionview-6.1.5.1.ebuild
deleted file mode 100644
index 7beb67cb12f0..000000000000
--- a/dev-ruby/actionview/actionview-6.1.5.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-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 ~riscv ~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
-	)"
-
-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
-
-	sed -i -e '3igem "railties", "~> 6.1.0"; gem "activerecord", "~> 6.1.0"' test/abstract_unit.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/actionview/actionview-6.1.5.ebuild b/dev-ruby/actionview/actionview-6.1.5.ebuild
deleted file mode 100644
index 85b9d4b84d88..000000000000
--- a/dev-ruby/actionview/actionview-6.1.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~riscv ~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
-	)"
-
-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
-
-	sed -i -e '3igem "railties", "~> 6.1.0"; gem "activerecord", "~> 6.1.0"' test/abstract_unit.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/actionview/actionview-6.1.6.ebuild b/dev-ruby/actionview/actionview-6.1.6.ebuild
deleted file mode 100644
index 7beb67cb12f0..000000000000
--- a/dev-ruby/actionview/actionview-6.1.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-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 ~riscv ~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
-	)"
-
-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
-
-	sed -i -e '3igem "railties", "~> 6.1.0"; gem "activerecord", "~> 6.1.0"' test/abstract_unit.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/actionview/actionview-6.1.7.6.ebuild b/dev-ruby/actionview/actionview-6.1.7.6.ebuild
new file mode 100644
index 000000000000..98353cc161c3
--- /dev/null
+++ b/dev-ruby/actionview/actionview-6.1.7.6.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~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
+
+	sed -e '3igem "railties", "~> 6.1.0"; gem "activerecord", "~> 6.1.0"; gem "minitest", "<5.16"' \
+		-i test/abstract_unit.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
+
+	# Avoid test failing on capitalization difference
+	sed -e '/test_raise_arg_overrides_raise_config_option/askip "Capitalization difference"' \
+		-i test/template/translation_helper_test.rb || die
+
+	# Remove tests that are coupled to the Sanitizer (already removed upstream)
+	sed -e '/test_sanitized_allowed_\(tags_class_method\|attributes_class_method\)/askip "Removed upstream"' \
+		-i test/template/sanitize_helper_test.rb || die
+}
diff --git a/dev-ruby/actionview/actionview-6.1.7.7.ebuild b/dev-ruby/actionview/actionview-6.1.7.7.ebuild
new file mode 100644
index 000000000000..cb10f084f155
--- /dev/null
+++ b/dev-ruby/actionview/actionview-6.1.7.7.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+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
+
+	sed -e '3igem "railties", "~> 6.1.0"; gem "activerecord", "~> 6.1.0"; gem "minitest", "<5.16"' \
+		-i test/abstract_unit.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
+
+	# Avoid test failing on capitalization difference
+	sed -e '/test_raise_arg_overrides_raise_config_option/askip "Capitalization difference"' \
+		-i test/template/translation_helper_test.rb || die
+
+	# Remove tests that are coupled to the Sanitizer (already removed upstream)
+	sed -e '/test_sanitized_allowed_\(tags_class_method\|attributes_class_method\)/askip "Removed upstream"' \
+		-i test/template/sanitize_helper_test.rb || die
+}
diff --git a/dev-ruby/actionview/actionview-7.0.2.2.ebuild b/dev-ruby/actionview/actionview-7.0.2.2.ebuild
deleted file mode 100644
index e0feca00fd09..000000000000
--- a/dev-ruby/actionview/actionview-7.0.2.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_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 ~riscv ~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
-	)"
-
-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/actionview/actionview-7.0.2.3.ebuild b/dev-ruby/actionview/actionview-7.0.2.3.ebuild
deleted file mode 100644
index c700736654d7..000000000000
--- a/dev-ruby/actionview/actionview-7.0.2.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-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 ~riscv ~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
-	)"
-
-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/actionview/actionview-7.0.2.4.ebuild b/dev-ruby/actionview/actionview-7.0.2.4.ebuild
deleted file mode 100644
index c700736654d7..000000000000
--- a/dev-ruby/actionview/actionview-7.0.2.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-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 ~riscv ~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
-	)"
-
-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/actionview/actionview-7.0.3.ebuild b/dev-ruby/actionview/actionview-7.0.3.ebuild
deleted file mode 100644
index c700736654d7..000000000000
--- a/dev-ruby/actionview/actionview-7.0.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-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 ~riscv ~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
-	)"
-
-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/actionview/actionview-7.0.8.1.ebuild b/dev-ruby/actionview/actionview-7.0.8.1.ebuild
new file mode 100644
index 000000000000..75529fe9f24e
--- /dev/null
+++ b/dev-ruby/actionview/actionview-7.0.8.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+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
+
+	# Use working minitest version
+	sed -i -e '3igem "minitest", "<5.16"; gem "railties", "~> 7.0.0"; gem "activerecord", "~> 7.0.0"' test/abstract_unit.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
+
+	# Avoid test failing on capitalization difference
+	sed -e '/test_raise_arg_overrides_raise_config_option/askip "Capitalization difference"' \
+		-i test/template/translation_helper_test.rb || die
+
+	# Remove tests that are coupled to the Sanitizer (already removed upstream)
+	sed -e '/test_sanitized_allowed_\(tags_class_method\|attributes_class_method\)/askip "Removed upstream"' \
+		-i test/template/sanitize_helper_test.rb || die
+}
diff --git a/dev-ruby/actionview/actionview-7.0.8.ebuild b/dev-ruby/actionview/actionview-7.0.8.ebuild
new file mode 100644
index 000000000000..3d221f2c9ed3
--- /dev/null
+++ b/dev-ruby/actionview/actionview-7.0.8.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~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
+
+	# Use working minitest version
+	sed -i -e '3igem "minitest", "<5.16"' test/abstract_unit.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
+
+	# Avoid test failing on capitalization difference
+	sed -e '/test_raise_arg_overrides_raise_config_option/askip "Capitalization difference"' \
+		-i test/template/translation_helper_test.rb || die
+
+	# Remove tests that are coupled to the Sanitizer (already removed upstream)
+	sed -e '/test_sanitized_allowed_\(tags_class_method\|attributes_class_method\)/askip "Removed upstream"' \
+		-i test/template/sanitize_helper_test.rb || die
+}
diff --git a/dev-ruby/actionview/actionview-7.1.3.2.ebuild b/dev-ruby/actionview/actionview-7.1.3.2.ebuild
new file mode 100644
index 000000000000..2de8a91a3682
--- /dev/null
+++ b/dev-ruby/actionview/actionview-7.1.3.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+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.11:0
+	>=dev-ruby/rails-dom-testing-2.2:2
+	>=dev-ruby/rails-html-sanitizer-1.6:1
+"
+
+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
+	)"
+
+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
+
+	# 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
+
+	# Avoid test failing on capitalization difference
+	sed -e '/test_raise_arg_overrides_raise_config_option/askip "Capitalization difference"' \
+		-i test/template/translation_helper_test.rb || die
+
+	# Remove tests that are coupled to the Sanitizer (already removed upstream)
+	sed -e '/test_sanitized_allowed_\(tags_class_method\|attributes_class_method\)/askip "Removed upstream"' \
+		-i test/template/sanitize_helper_test.rb || die
+}
diff --git a/dev-ruby/actionview/actionview-7.1.3.ebuild b/dev-ruby/actionview/actionview-7.1.3.ebuild
new file mode 100644
index 000000000000..fb0cee3c16ae
--- /dev/null
+++ b/dev-ruby/actionview/actionview-7.1.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+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.11:0
+	>=dev-ruby/rails-dom-testing-2.2:2
+	>=dev-ruby/rails-html-sanitizer-1.6:1
+"
+
+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
+
+	# 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
+
+	# Avoid test failing on capitalization difference
+	sed -e '/test_raise_arg_overrides_raise_config_option/askip "Capitalization difference"' \
+		-i test/template/translation_helper_test.rb || die
+
+	# Remove tests that are coupled to the Sanitizer (already removed upstream)
+	sed -e '/test_sanitized_allowed_\(tags_class_method\|attributes_class_method\)/askip "Removed upstream"' \
+		-i test/template/sanitize_helper_test.rb || die
+}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 2ca4cdbed1ae..5a38fea999e2 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,15 +1,6 @@
-DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
-DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
-DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
-DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
-DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
-DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
-DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
+DIST rails-6.1.7.6.tgz 11040086 BLAKE2B 8b5311752952403cf8eae31b5d8e8d376c4b449f512e86df66b3e921375ffa3ea11e15f1d74a7f8ec9179ff70c32a6d4f8de75be5f92fe6315ee97164e22d2d0 SHA512 c4163565b2324ce97317d252f3d9e2e673a12b6ae7f54571645c958ce30221f1b357887ade80e46abdd47a422736b9946e49850d52ffd72d8acc87f35224e69f
+DIST rails-6.1.7.7.tgz 11041447 BLAKE2B 3f59325aa86d3b7d6e0773b9eb2b895a26b644109be8df0b0d9abbab8e6c77f76d316c717ecce4e2d79d3247559504a7452a8037d2d52a6cf95fbacd7f8b8612 SHA512 f9af4eebb3bffec78832f92be6158c71c147e265b54e8e368a06c762bfd1a7992256b3e9286aeb59eee69ba56be28d381a715eb13f99b9babfd9b7ce8051e210
+DIST rails-7.0.8.1.tgz 11089378 BLAKE2B 5d92087402d8aa2b86759ec92c44091a7a0f8a22959e0510f10417f88e54f9e1e6a14c4e9519033cd63bdd1f54f72b91bff8a3318a3264c39311317fb67e8b63 SHA512 74f467f7d3e5ec88560448e206a8f0cdf55bad60dd9eac019224fce86a766ee9d0c4afbd4eaae30dacfe34beebcff6aa9d3c5c99be9c8ad5c385817fe409afc8
+DIST rails-7.0.8.tgz 11073254 BLAKE2B 2aee047a365acb0890ef3afbccfe323fedccf7b54214aa1c2f92b7a7aaa64c275c1e03f8f97e6a2e30281224ba30703d18b40aeee9b4e7fb6f035a4a7716a054 SHA512 0e9feb5bd0360868c3109152d8ea414b65d36d33a5dbb96b199cfa6c4335800d6c392e0fbcbfa453a02fd75924a297a65caf04948895de53db43700478dbeb11
+DIST rails-7.1.3.2.tgz 10914950 BLAKE2B 419e6817958efcc5dbbb47d24498decff48fca9748c9f4069bcd353a4644fa623caf79c4072db0944139ac991d14623013683f69cef3126fa63348cc0612655b SHA512 0a58e7b125eb97f94a8a75bacd421d7197e6ad78d24651aecfe82e41c024ccfa42a9de0664099f55cd6ac6a41fd7f09cdc3177ed2b809b0be7d7df1639424f9d
+DIST rails-7.1.3.tgz 10900323 BLAKE2B a83ca4ee656e93241fa0460d8df197904a4eef310cf25bce6db6167bad87c8d0644533fa6e224ec959a4e10005164e0f981e14e8b23cee14e2747117be9da712 SHA512 df1128d1403ab82d218d2057c7c86e646594f97a8c6fcf5648a66440d52e5c20a4ceb0c13e70b6153152b44f62d8a1e20f3776acff5c55bc54d006cb7da32d12
diff --git a/dev-ruby/activejob/activejob-5.2.6.ebuild b/dev-ruby/activejob/activejob-5.2.6.ebuild
deleted file mode 100644
index 8a0ddffdce1b..000000000000
--- a/dev-ruby/activejob/activejob-5.2.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-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"
-	sed -i -e '2igem "activesupport", "~> 5.2.0"' test/helper.rb || die
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-}
diff --git a/dev-ruby/activejob/activejob-5.2.7.1.ebuild b/dev-ruby/activejob/activejob-5.2.7.1.ebuild
deleted file mode 100644
index 802f472cf81e..000000000000
--- a/dev-ruby/activejob/activejob-5.2.7.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-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"
-	sed -i -e '2igem "activesupport", "~> 5.2.0"' test/helper.rb || die
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-}
diff --git a/dev-ruby/activejob/activejob-5.2.8.ebuild b/dev-ruby/activejob/activejob-5.2.8.ebuild
deleted file mode 100644
index 802f472cf81e..000000000000
--- a/dev-ruby/activejob/activejob-5.2.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-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"
-	sed -i -e '2igem "activesupport", "~> 5.2.0"' test/helper.rb || die
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-}
diff --git a/dev-ruby/activejob/activejob-6.0.4.1.ebuild b/dev-ruby/activejob/activejob-6.0.4.1.ebuild
deleted file mode 100644
index d50c12b194a0..000000000000
--- a/dev-ruby/activejob/activejob-6.0.4.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-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"
-	sed -i -e '2igem "railties", "~> 6.0.0"' test/helper.rb || die
-
-	# 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
-}
diff --git a/dev-ruby/activejob/activejob-6.0.4.4.ebuild b/dev-ruby/activejob/activejob-6.0.4.4.ebuild
deleted file mode 100644
index 095ae13c2e50..000000000000
--- a/dev-ruby/activejob/activejob-6.0.4.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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"
-	sed -i -e '2igem "railties", "~> 6.0.0"' test/helper.rb || die
-
-	# 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
-}
diff --git a/dev-ruby/activejob/activejob-6.0.4.7.ebuild b/dev-ruby/activejob/activejob-6.0.4.7.ebuild
deleted file mode 100644
index 9f6d7b2fa4fb..000000000000
--- a/dev-ruby/activejob/activejob-6.0.4.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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"
-	sed -i -e '2igem "railties", "~> 6.0.0"' test/helper.rb || die
-
-	# 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
-}
diff --git a/dev-ruby/activejob/activejob-6.0.4.8.ebuild b/dev-ruby/activejob/activejob-6.0.4.8.ebuild
deleted file mode 100644
index 9f6d7b2fa4fb..000000000000
--- a/dev-ruby/activejob/activejob-6.0.4.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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"
-	sed -i -e '2igem "railties", "~> 6.0.0"' test/helper.rb || die
-
-	# 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
-}
diff --git a/dev-ruby/activejob/activejob-6.0.5.ebuild b/dev-ruby/activejob/activejob-6.0.5.ebuild
deleted file mode 100644
index 9f6d7b2fa4fb..000000000000
--- a/dev-ruby/activejob/activejob-6.0.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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"
-	sed -i -e '2igem "railties", "~> 6.0.0"' test/helper.rb || die
-
-	# 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
-}
diff --git a/dev-ruby/activejob/activejob-6.1.5.1.ebuild b/dev-ruby/activejob/activejob-6.1.5.1.ebuild
deleted file mode 100644
index ca98657bca3d..000000000000
--- a/dev-ruby/activejob/activejob-6.1.5.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=1 test"
-
-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() {
-	sed -i -e '2igem "activesupport", "~> 6.1.0"' test/helper.rb || die
-
-	# 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
-}
diff --git a/dev-ruby/activejob/activejob-6.1.5.ebuild b/dev-ruby/activejob/activejob-6.1.5.ebuild
deleted file mode 100644
index a0adaa549825..000000000000
--- a/dev-ruby/activejob/activejob-6.1.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=1 test"
-
-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() {
-	sed -i -e '2igem "activesupport", "~> 6.1.0"' test/helper.rb || die
-
-	# 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
-}
diff --git a/dev-ruby/activejob/activejob-6.1.6.ebuild b/dev-ruby/activejob/activejob-6.1.6.ebuild
deleted file mode 100644
index ca98657bca3d..000000000000
--- a/dev-ruby/activejob/activejob-6.1.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=1 test"
-
-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() {
-	sed -i -e '2igem "activesupport", "~> 6.1.0"' test/helper.rb || die
-
-	# 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
-}
diff --git a/dev-ruby/activejob/activejob-6.1.7.6.ebuild b/dev-ruby/activejob/activejob-6.1.7.6.ebuild
new file mode 100644
index 000000000000..7342f02d1ddd
--- /dev/null
+++ b/dev-ruby/activejob/activejob-6.1.7.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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"
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=1 test"
+
+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 ~hppa ~ppc ~ppc64 ~riscv ~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() {
+	sed -i -e '2igem "activesupport", "~> 6.1.0"' test/helper.rb || die
+
+	# 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
+}
diff --git a/dev-ruby/activejob/activejob-6.1.7.7.ebuild b/dev-ruby/activejob/activejob-6.1.7.7.ebuild
new file mode 100644
index 000000000000..49f6e39d3c0b
--- /dev/null
+++ b/dev-ruby/activejob/activejob-6.1.7.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=1 test"
+
+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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+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() {
+	sed -i -e '2igem "activesupport", "~> 6.1.0"' test/helper.rb || die
+
+	# 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
+}
diff --git a/dev-ruby/activejob/activejob-7.0.2.2.ebuild b/dev-ruby/activejob/activejob-7.0.2.2.ebuild
deleted file mode 100644
index caad0a9828cd..000000000000
--- a/dev-ruby/activejob/activejob-7.0.2.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_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/activejob/activejob-7.0.2.3-r1.ebuild b/dev-ruby/activejob/activejob-7.0.2.3-r1.ebuild
deleted file mode 100644
index 250ee550689d..000000000000
--- a/dev-ruby/activejob/activejob-7.0.2.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-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 ~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/activejob/activejob-7.0.2.3.ebuild b/dev-ruby/activejob/activejob-7.0.2.3.ebuild
deleted file mode 100644
index caad0a9828cd..000000000000
--- a/dev-ruby/activejob/activejob-7.0.2.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_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/activejob/activejob-7.0.2.4.ebuild b/dev-ruby/activejob/activejob-7.0.2.4.ebuild
deleted file mode 100644
index 4702b811fda4..000000000000
--- a/dev-ruby/activejob/activejob-7.0.2.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-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/activejob/activejob-7.0.3.ebuild b/dev-ruby/activejob/activejob-7.0.3.ebuild
deleted file mode 100644
index 4702b811fda4..000000000000
--- a/dev-ruby/activejob/activejob-7.0.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-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/activejob/activejob-7.0.8.1.ebuild b/dev-ruby/activejob/activejob-7.0.8.1.ebuild
new file mode 100644
index 000000000000..961eb6a97954
--- /dev/null
+++ b/dev-ruby/activejob/activejob-7.0.8.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+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
+		dev-ruby/zeitwerk
+	)"
+
+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/activejob/activejob-7.0.8.ebuild b/dev-ruby/activejob/activejob-7.0.8.ebuild
new file mode 100644
index 000000000000..f6748f053fcd
--- /dev/null
+++ b/dev-ruby/activejob/activejob-7.0.8.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~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
+		dev-ruby/zeitwerk
+	)"
+
+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/activejob/activejob-7.1.3.2.ebuild b/dev-ruby/activejob/activejob-7.1.3.2.ebuild
new file mode 100644
index 000000000000..f936f6ce2b63
--- /dev/null
+++ b/dev-ruby/activejob/activejob-7.1.3.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+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
+		dev-ruby/zeitwerk
+	)"
+
+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/activejob/activejob-7.1.3.ebuild b/dev-ruby/activejob/activejob-7.1.3.ebuild
new file mode 100644
index 000000000000..961eb6a97954
--- /dev/null
+++ b/dev-ruby/activejob/activejob-7.1.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+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
+		dev-ruby/zeitwerk
+	)"
+
+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/activeldap/Manifest b/dev-ruby/activeldap/Manifest
index 637e8d068922..19f5ac1847d4 100644
--- a/dev-ruby/activeldap/Manifest
+++ b/dev-ruby/activeldap/Manifest
@@ -1,3 +1,2 @@
-DIST activeldap-5.2.4.gem 226304 BLAKE2B f13b5a1cf423b44087d55d3a4957be1444d598ab1d1bd7d83ee545a2806b77b47124edcb326fc567eb06e866c62a2ad0c3dafd903232588f824bc2978c197d60 SHA512 da37cfa20c8be7151669ba3b409994c668b037a2f318b1b034f6fa9c0e56a9a778b03a26415cbd98c8ba3fa1d487d42343bc0532665c1037880e75474a1c708f
-DIST activeldap-6.0.4.gem 227328 BLAKE2B 8b1307e8c4b0fffe6cbd43a71cd11d2414570e8b0c1007152b99dca467b17f60efea1ff65f2bb5bc5ec6d6dd58f7a8a44e131887927c16d6bb90371f2b82c0d6 SHA512 26517692217d2f88db61fef12c16d0916eebbb3081db6431487dfa48dba5e6757af74d0dd9779694ba04957cf8ba855b6d5dc77986f7ad705cc359353fe87469
 DIST activeldap-6.1.0.gem 227328 BLAKE2B 48cd393a294b677b373461701773d3d0c18cbe9ee5124bcbafe392ee664a0e1045feb2d808734988bfceaaf7ae7b276ea12615ae30bb8109d63daf4b6a8cbed5 SHA512 b8a8d1346d75ae1ddd15b919f2a7afbec3e62b4248144ece3e1324892899735b05aa221ecec7c07f6273f35a6ffdacf4858d57326fb9b8c096f358652ef0b99d
+DIST activeldap-7.0.0.gem 227840 BLAKE2B 2bf720efa60f2233180cf73a79da61058398a7409319c468ee96938091fd3d4eeebc904e3d8c55f51d1ca9a22f1b22e27554b78910065022ce9ebb92a883c256 SHA512 b4df5307583fc29abb74cdfd1d3b62f4bf03525e4a81397b32522ce84ee49f58fae27a7e9ba62490cfe49daa27be67440ccbaca25ba15553845d9e4a6e693bda
diff --git a/dev-ruby/activeldap/activeldap-5.2.4.ebuild b/dev-ruby/activeldap/activeldap-5.2.4.ebuild
deleted file mode 100644
index d286616fbcf2..000000000000
--- a/dev-ruby/activeldap/activeldap-5.2.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.textile TODO doc/text/*"
-RUBY_FAKEGEM_EXTRAINSTALL="po"
-
-inherit ruby-fakegem
-
-MY_P="${P/ruby-/}"
-DESCRIPTION="ActiveLDAP provides an activerecord inspired object oriented interface to LDAP"
-HOMEPAGE="https://github.com/activeldap/activeldap"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-# Most tests require a live LDAP server to run.
-RESTRICT="test"
-
-ruby_add_rdepend "
-	>dev-ruby/activemodel-4.2.0:*
-	dev-ruby/builder
-	dev-ruby/locale
-	dev-ruby/ruby-gettext
-	dev-ruby/gettext_i18n_rails
-	|| ( dev-ruby/ruby-net-ldap >=dev-ruby/ruby-ldap-0.8.2 )"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc doc/text/*
-	dodoc -r examples
-}
diff --git a/dev-ruby/activeldap/activeldap-6.0.4.ebuild b/dev-ruby/activeldap/activeldap-6.0.4.ebuild
deleted file mode 100644
index 2c07111cb086..000000000000
--- a/dev-ruby/activeldap/activeldap-6.0.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="TODO doc/text/*"
-RUBY_FAKEGEM_EXTRAINSTALL="po"
-
-inherit ruby-fakegem
-
-MY_P="${P/ruby-/}"
-DESCRIPTION="ActiveLDAP provides an activerecord inspired object oriented interface to LDAP"
-HOMEPAGE="https://github.com/activeldap/activeldap"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-# Most tests require a live LDAP server to run.
-RESTRICT="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/activemodel-5.2.0:*
-	dev-ruby/builder
-	dev-ruby/locale
-	dev-ruby/ruby-gettext
-	dev-ruby/gettext_i18n_rails
-	|| ( dev-ruby/ruby-net-ldap >=dev-ruby/ruby-ldap-0.8.2 )"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc doc/text/*
-	dodoc -r examples
-}
diff --git a/dev-ruby/activeldap/activeldap-6.1.0-r1.ebuild b/dev-ruby/activeldap/activeldap-6.1.0-r1.ebuild
new file mode 100644
index 000000000000..0ddf0824c69f
--- /dev/null
+++ b/dev-ruby/activeldap/activeldap-6.1.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="TODO doc/text/*"
+RUBY_FAKEGEM_EXTRAINSTALL="po"
+
+inherit ruby-fakegem
+
+MY_P="${P/ruby-/}"
+DESCRIPTION="ActiveLDAP provides an activerecord inspired object oriented interface to LDAP"
+HOMEPAGE="https://github.com/activeldap/activeldap"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+# Most tests require a live LDAP server to run.
+RESTRICT="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/activemodel-5.2.0:*
+	dev-ruby/builder
+	dev-ruby/locale
+	dev-ruby/ruby-gettext
+	dev-ruby/gettext_i18n_rails
+	|| ( dev-ruby/ruby-net-ldap >=dev-ruby/ruby-ldap-0.8.2 )"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc doc/text/*
+	dodoc -r examples
+}
diff --git a/dev-ruby/activeldap/activeldap-6.1.0.ebuild b/dev-ruby/activeldap/activeldap-6.1.0.ebuild
deleted file mode 100644
index 02e8ea17f669..000000000000
--- a/dev-ruby/activeldap/activeldap-6.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="TODO doc/text/*"
-RUBY_FAKEGEM_EXTRAINSTALL="po"
-
-inherit ruby-fakegem
-
-MY_P="${P/ruby-/}"
-DESCRIPTION="ActiveLDAP provides an activerecord inspired object oriented interface to LDAP"
-HOMEPAGE="https://github.com/activeldap/activeldap"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-# Most tests require a live LDAP server to run.
-RESTRICT="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/activemodel-5.2.0:*
-	dev-ruby/builder
-	dev-ruby/locale
-	dev-ruby/ruby-gettext
-	dev-ruby/gettext_i18n_rails
-	|| ( dev-ruby/ruby-net-ldap >=dev-ruby/ruby-ldap-0.8.2 )"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc doc/text/*
-	dodoc -r examples
-}
diff --git a/dev-ruby/activeldap/activeldap-7.0.0.ebuild b/dev-ruby/activeldap/activeldap-7.0.0.ebuild
new file mode 100644
index 000000000000..1540a3004f70
--- /dev/null
+++ b/dev-ruby/activeldap/activeldap-7.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="TODO doc/text/*"
+RUBY_FAKEGEM_EXTRAINSTALL="po"
+
+# Most tests require a running LDAP server
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+MY_P="${P/ruby-/}"
+DESCRIPTION="ActiveLDAP provides an activerecord inspired object oriented interface to LDAP"
+HOMEPAGE="https://github.com/activeldap/activeldap"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend "
+	>=dev-ruby/activemodel-5.2.0:*
+	dev-ruby/builder
+	dev-ruby/locale
+	dev-ruby/ruby-gettext
+	dev-ruby/gettext_i18n_rails
+	|| ( dev-ruby/ruby-net-ldap >=dev-ruby/ruby-ldap-0.8.2 )"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc doc/text/*
+	dodoc -r examples
+}
diff --git a/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2-r1.ebuild b/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2-r1.ebuild
deleted file mode 100644
index dd52b160933d..000000000000
--- a/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="XML serialization for your Active Model objects and Active Record models"
-HOMEPAGE="https://github.com/rails/activemodel-serializers-xml"
-SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/activesupport-5:*
-	>=dev-ruby/activemodel-5:*
-	=dev-ruby/builder-3*:* >=dev-ruby/builder-3.1:*
-"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activerecord-5:*
-	dev-ruby/sqlite3
-)"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/datetime.*created_at/ s:^:#:' test/helper.rb || die
-}
diff --git a/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2-r2.ebuild b/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2-r2.ebuild
index 2f4d728ed4ae..2566da0ff7b5 100644
--- a/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2-r2.ebuild
+++ b/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2-r2.ebuild
@@ -1,9 +1,9 @@
-# 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"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
 
@@ -37,4 +37,6 @@ all_ruby_prepare() {
 	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
 
 	sed -i -e '/datetime.*created_at/ s:^:#:' test/helper.rb || die
+
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
 }
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 2ca4cdbed1ae..5a38fea999e2 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,15 +1,6 @@
-DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
-DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
-DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
-DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
-DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
-DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
-DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
+DIST rails-6.1.7.6.tgz 11040086 BLAKE2B 8b5311752952403cf8eae31b5d8e8d376c4b449f512e86df66b3e921375ffa3ea11e15f1d74a7f8ec9179ff70c32a6d4f8de75be5f92fe6315ee97164e22d2d0 SHA512 c4163565b2324ce97317d252f3d9e2e673a12b6ae7f54571645c958ce30221f1b357887ade80e46abdd47a422736b9946e49850d52ffd72d8acc87f35224e69f
+DIST rails-6.1.7.7.tgz 11041447 BLAKE2B 3f59325aa86d3b7d6e0773b9eb2b895a26b644109be8df0b0d9abbab8e6c77f76d316c717ecce4e2d79d3247559504a7452a8037d2d52a6cf95fbacd7f8b8612 SHA512 f9af4eebb3bffec78832f92be6158c71c147e265b54e8e368a06c762bfd1a7992256b3e9286aeb59eee69ba56be28d381a715eb13f99b9babfd9b7ce8051e210
+DIST rails-7.0.8.1.tgz 11089378 BLAKE2B 5d92087402d8aa2b86759ec92c44091a7a0f8a22959e0510f10417f88e54f9e1e6a14c4e9519033cd63bdd1f54f72b91bff8a3318a3264c39311317fb67e8b63 SHA512 74f467f7d3e5ec88560448e206a8f0cdf55bad60dd9eac019224fce86a766ee9d0c4afbd4eaae30dacfe34beebcff6aa9d3c5c99be9c8ad5c385817fe409afc8
+DIST rails-7.0.8.tgz 11073254 BLAKE2B 2aee047a365acb0890ef3afbccfe323fedccf7b54214aa1c2f92b7a7aaa64c275c1e03f8f97e6a2e30281224ba30703d18b40aeee9b4e7fb6f035a4a7716a054 SHA512 0e9feb5bd0360868c3109152d8ea414b65d36d33a5dbb96b199cfa6c4335800d6c392e0fbcbfa453a02fd75924a297a65caf04948895de53db43700478dbeb11
+DIST rails-7.1.3.2.tgz 10914950 BLAKE2B 419e6817958efcc5dbbb47d24498decff48fca9748c9f4069bcd353a4644fa623caf79c4072db0944139ac991d14623013683f69cef3126fa63348cc0612655b SHA512 0a58e7b125eb97f94a8a75bacd421d7197e6ad78d24651aecfe82e41c024ccfa42a9de0664099f55cd6ac6a41fd7f09cdc3177ed2b809b0be7d7df1639424f9d
+DIST rails-7.1.3.tgz 10900323 BLAKE2B a83ca4ee656e93241fa0460d8df197904a4eef310cf25bce6db6167bad87c8d0644533fa6e224ec959a4e10005164e0f981e14e8b23cee14e2747117be9da712 SHA512 df1128d1403ab82d218d2057c7c86e646594f97a8c6fcf5648a66440d52e5c20a4ceb0c13e70b6153152b44f62d8a1e20f3776acff5c55bc54d006cb7da32d12
diff --git a/dev-ruby/activemodel/activemodel-5.2.6.ebuild b/dev-ruby/activemodel/activemodel-5.2.6.ebuild
deleted file mode 100644
index 0c0940bba5d3..000000000000
--- a/dev-ruby/activemodel/activemodel-5.2.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-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
-	)"
-
-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"
-	sed -i -e '2igem "railties", "~> 5.2.0"' test/cases/helper.rb || die
-}
diff --git a/dev-ruby/activemodel/activemodel-5.2.7.1.ebuild b/dev-ruby/activemodel/activemodel-5.2.7.1.ebuild
deleted file mode 100644
index 7e38ce484b6a..000000000000
--- a/dev-ruby/activemodel/activemodel-5.2.7.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-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
-	)"
-
-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"
-	sed -i -e '2igem "railties", "~> 5.2.0"; gem "psych", "~> 3.0"' test/cases/helper.rb || die
-}
diff --git a/dev-ruby/activemodel/activemodel-5.2.8.ebuild b/dev-ruby/activemodel/activemodel-5.2.8.ebuild
deleted file mode 100644
index 36dfba0c1e2f..000000000000
--- a/dev-ruby/activemodel/activemodel-5.2.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-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
-	)"
-
-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"
-	sed -i -e '2igem "railties", "~> 5.2.0"; gem "psych", "~> 3.0"' test/cases/helper.rb || die
-}
diff --git a/dev-ruby/activemodel/activemodel-6.0.4.1.ebuild b/dev-ruby/activemodel/activemodel-6.0.4.1.ebuild
deleted file mode 100644
index 9335039d63cb..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.4.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-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 ~hppa ~ppc ~ppc64 ~riscv ~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
-	)"
-
-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/activemodel/activemodel-6.0.4.4.ebuild b/dev-ruby/activemodel/activemodel-6.0.4.4.ebuild
deleted file mode 100644
index 72fd8222d8ca..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.4.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~hppa ~ppc ~ppc64 ~riscv ~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
-	)"
-
-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/activemodel/activemodel-6.0.4.7.ebuild b/dev-ruby/activemodel/activemodel-6.0.4.7.ebuild
deleted file mode 100644
index 4e43fc718e2d..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.4.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~hppa ~ppc ~ppc64 ~riscv ~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
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '3igem "psych", "~> 3.0"' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.0.4.8.ebuild b/dev-ruby/activemodel/activemodel-6.0.4.8.ebuild
deleted file mode 100644
index 4e43fc718e2d..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.4.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~hppa ~ppc ~ppc64 ~riscv ~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
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '3igem "psych", "~> 3.0"' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.0.5.ebuild b/dev-ruby/activemodel/activemodel-6.0.5.ebuild
deleted file mode 100644
index 4e43fc718e2d..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~hppa ~ppc ~ppc64 ~riscv ~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
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '3igem "psych", "~> 3.0"' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.1.5.1.ebuild b/dev-ruby/activemodel/activemodel-6.1.5.1.ebuild
deleted file mode 100644
index 72f40d438434..000000000000
--- a/dev-ruby/activemodel/activemodel-6.1.5.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-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 ~hppa ~ppc ~ppc64 ~riscv ~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
-	)"
-
-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/activemodel/activemodel-6.1.5.ebuild b/dev-ruby/activemodel/activemodel-6.1.5.ebuild
deleted file mode 100644
index 621481c37e88..000000000000
--- a/dev-ruby/activemodel/activemodel-6.1.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~hppa ~ppc ~ppc64 ~riscv ~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
-	)"
-
-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/activemodel/activemodel-6.1.6.ebuild b/dev-ruby/activemodel/activemodel-6.1.6.ebuild
deleted file mode 100644
index 72f40d438434..000000000000
--- a/dev-ruby/activemodel/activemodel-6.1.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-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 ~hppa ~ppc ~ppc64 ~riscv ~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
-	)"
-
-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/activemodel/activemodel-6.1.7.6.ebuild b/dev-ruby/activemodel/activemodel-6.1.7.6.ebuild
new file mode 100644
index 000000000000..a4754777e475
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-6.1.7.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.7.4-ruby32-keywords.patch
+)
+
+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 -e '/load_paths/d' \
+		-e '2igem "activesupport", "~> 6.1.0"; gem "railties", "~> 6.1.0"' \
+		-i test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activemodel/activemodel-6.1.7.7.ebuild b/dev-ruby/activemodel/activemodel-6.1.7.7.ebuild
new file mode 100644
index 000000000000..542013b527f4
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-6.1.7.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.7.4-ruby32-keywords.patch
+)
+
+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 -e '/load_paths/d' \
+		-e '2igem "activesupport", "~> 6.1.0"; gem "railties", "~> 6.1.0"' \
+		-i test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activemodel/activemodel-7.0.2.2.ebuild b/dev-ruby/activemodel/activemodel-7.0.2.2.ebuild
deleted file mode 100644
index c5510345e170..000000000000
--- a/dev-ruby/activemodel/activemodel-7.0.2.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_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 ~hppa ~riscv ~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
-	)"
-
-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/activemodel/activemodel-7.0.2.3.ebuild b/dev-ruby/activemodel/activemodel-7.0.2.3.ebuild
deleted file mode 100644
index ffe12032f8e3..000000000000
--- a/dev-ruby/activemodel/activemodel-7.0.2.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-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 ~hppa ~riscv ~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
-	)"
-
-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/activemodel/activemodel-7.0.2.4.ebuild b/dev-ruby/activemodel/activemodel-7.0.2.4.ebuild
deleted file mode 100644
index ffe12032f8e3..000000000000
--- a/dev-ruby/activemodel/activemodel-7.0.2.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-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 ~hppa ~riscv ~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
-	)"
-
-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/activemodel/activemodel-7.0.3.ebuild b/dev-ruby/activemodel/activemodel-7.0.3.ebuild
deleted file mode 100644
index ffe12032f8e3..000000000000
--- a/dev-ruby/activemodel/activemodel-7.0.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-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 ~hppa ~riscv ~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
-	)"
-
-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/activemodel/activemodel-7.0.8.1.ebuild b/dev-ruby/activemodel/activemodel-7.0.8.1.ebuild
new file mode 100644
index 000000000000..7e7a70d84a6e
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-7.0.8.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+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 -e '/load_paths/d' \
+		-e '2igem "activesupport", "~> 7.0.0"; gem "railties", "~> 7.0.0"' \
+		-i test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activemodel/activemodel-7.0.8.ebuild b/dev-ruby/activemodel/activemodel-7.0.8.ebuild
new file mode 100644
index 000000000000..d3612584c4c0
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-7.0.8.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="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 ~hppa ~ppc ~ppc64 ~riscv ~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/activemodel/activemodel-7.1.3.2.ebuild b/dev-ruby/activemodel/activemodel-7.1.3.2.ebuild
new file mode 100644
index 000000000000..4ac6a5e51b1f
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-7.1.3.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+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
+	)"
+
+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/activemodel/activemodel-7.1.3.ebuild b/dev-ruby/activemodel/activemodel-7.1.3.ebuild
new file mode 100644
index 000000000000..3c5cad15c9e4
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-7.1.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+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
+	)"
+
+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/activemodel/files/activemodel-6.1.7.4-ruby32-keywords.patch b/dev-ruby/activemodel/files/activemodel-6.1.7.4-ruby32-keywords.patch
new file mode 100644
index 000000000000..a44820c51a1f
--- /dev/null
+++ b/dev-ruby/activemodel/files/activemodel-6.1.7.4-ruby32-keywords.patch
@@ -0,0 +1,27 @@
+From 67bdba4e63cad218c02dbb3171ddd53353cc0b48 Mon Sep 17 00:00:00 2001
+From: Javier Jimenez <javiyu7@gmail.com>
+Date: Thu, 5 Jan 2023 21:34:37 +0100
+Subject: [PATCH] Backports ruby 3.2 compatibility fixes for rails 6.1
+
+---
+ actionmailer/lib/action_mailer/base.rb            |  2 +-
+ actionmailer/lib/action_mailer/rescuable.rb       | 12 ++++++++----
+ actionpack/lib/abstract_controller/base.rb        | 10 +++++++---
+ actionpack/lib/abstract_controller/callbacks.rb   |  6 +++++-
+ actionview/lib/action_view/rendering.rb           |  6 +++++-
+ activemodel/lib/active_model/attribute_methods.rb |  2 +-
+ activerecord/lib/active_record/relation.rb        |  8 ++++++--
+ 7 files changed, 33 insertions(+), 13 deletions(-)
+
+diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
+index 365b338d17af3..0c401f7aeb4d9 100644
+--- a/lib/active_model/attribute_methods.rb
++++ b/lib/active_model/attribute_methods.rb
+@@ -478,6 +478,7 @@ def method_missing(method, *args, &block)
+     def attribute_missing(match, *args, &block)
+       __send__(match.target, match.attr_name, *args, &block)
+     end
++    ruby2_keywords(:attribute_missing) if respond_to?(:ruby2_keywords, true)
+ 
+     # A +Person+ instance with a +name+ attribute can ask
+     # <tt>person.respond_to?(:name)</tt>, <tt>person.respond_to?(:name=)</tt>,
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 2ca4cdbed1ae..5a38fea999e2 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,15 +1,6 @@
-DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
-DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
-DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
-DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
-DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
-DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
-DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
+DIST rails-6.1.7.6.tgz 11040086 BLAKE2B 8b5311752952403cf8eae31b5d8e8d376c4b449f512e86df66b3e921375ffa3ea11e15f1d74a7f8ec9179ff70c32a6d4f8de75be5f92fe6315ee97164e22d2d0 SHA512 c4163565b2324ce97317d252f3d9e2e673a12b6ae7f54571645c958ce30221f1b357887ade80e46abdd47a422736b9946e49850d52ffd72d8acc87f35224e69f
+DIST rails-6.1.7.7.tgz 11041447 BLAKE2B 3f59325aa86d3b7d6e0773b9eb2b895a26b644109be8df0b0d9abbab8e6c77f76d316c717ecce4e2d79d3247559504a7452a8037d2d52a6cf95fbacd7f8b8612 SHA512 f9af4eebb3bffec78832f92be6158c71c147e265b54e8e368a06c762bfd1a7992256b3e9286aeb59eee69ba56be28d381a715eb13f99b9babfd9b7ce8051e210
+DIST rails-7.0.8.1.tgz 11089378 BLAKE2B 5d92087402d8aa2b86759ec92c44091a7a0f8a22959e0510f10417f88e54f9e1e6a14c4e9519033cd63bdd1f54f72b91bff8a3318a3264c39311317fb67e8b63 SHA512 74f467f7d3e5ec88560448e206a8f0cdf55bad60dd9eac019224fce86a766ee9d0c4afbd4eaae30dacfe34beebcff6aa9d3c5c99be9c8ad5c385817fe409afc8
+DIST rails-7.0.8.tgz 11073254 BLAKE2B 2aee047a365acb0890ef3afbccfe323fedccf7b54214aa1c2f92b7a7aaa64c275c1e03f8f97e6a2e30281224ba30703d18b40aeee9b4e7fb6f035a4a7716a054 SHA512 0e9feb5bd0360868c3109152d8ea414b65d36d33a5dbb96b199cfa6c4335800d6c392e0fbcbfa453a02fd75924a297a65caf04948895de53db43700478dbeb11
+DIST rails-7.1.3.2.tgz 10914950 BLAKE2B 419e6817958efcc5dbbb47d24498decff48fca9748c9f4069bcd353a4644fa623caf79c4072db0944139ac991d14623013683f69cef3126fa63348cc0612655b SHA512 0a58e7b125eb97f94a8a75bacd421d7197e6ad78d24651aecfe82e41c024ccfa42a9de0664099f55cd6ac6a41fd7f09cdc3177ed2b809b0be7d7df1639424f9d
+DIST rails-7.1.3.tgz 10900323 BLAKE2B a83ca4ee656e93241fa0460d8df197904a4eef310cf25bce6db6167bad87c8d0644533fa6e224ec959a4e10005164e0f981e14e8b23cee14e2747117be9da712 SHA512 df1128d1403ab82d218d2057c7c86e646594f97a8c6fcf5648a66440d52e5c20a4ceb0c13e70b6153152b44f62d8a1e20f3776acff5c55bc54d006cb7da32d12
diff --git a/dev-ruby/activerecord/activerecord-5.2.6.ebuild b/dev-ruby/activerecord/activerecord-5.2.6.ebuild
deleted file mode 100644
index 7d9e1a5560d9..000000000000
--- a/dev-ruby/activerecord/activerecord-5.2.6.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	dev-ruby/arel:9.0
-	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( >=dev-ruby/pg-0.18.0:* )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/actionmailer-${PV}
-		>=dev-ruby/sqlite3-1.3.6
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-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
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' \
-		../Gemfile || die
-
-	sed -e '3i gem "activesupport", "~> 5.2.0"' \
-		-e '3i gem "activerecord", "~> 5.2.0"' \
-		-e '3i gem "activemodel", "~> 5.2.0"' \
-		-i test/cases/helper.rb || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single test using mysql dependencies.
-	rm test/cases/invalid_connection_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
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		MT_NO_PLUGINS=true ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-5.2.7.1.ebuild b/dev-ruby/activerecord/activerecord-5.2.7.1.ebuild
deleted file mode 100644
index 42a1a3c55ec4..000000000000
--- a/dev-ruby/activerecord/activerecord-5.2.7.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	dev-ruby/arel:9.0
-	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( >=dev-ruby/pg-0.18.0:* )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/actionmailer-${PV}
-		>=dev-ruby/sqlite3-1.3.6
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-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
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' \
-		../Gemfile || die
-
-	sed -e '3i gem "activesupport", "~> 5.2.0"' \
-		-e '3i gem "activerecord", "~> 5.2.0"' \
-		-e '3i gem "activemodel", "~> 5.2.0"' \
-		-e '3i gem "psych", "~> 3.0"' \
-		-i test/cases/helper.rb || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single test using mysql dependencies.
-	rm test/cases/invalid_connection_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 failures due to sqlite explain changes
-	rm -f test/cases/adapters/sqlite3/explain_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		MT_NO_PLUGINS=true ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-5.2.8.ebuild b/dev-ruby/activerecord/activerecord-5.2.8.ebuild
deleted file mode 100644
index 42a1a3c55ec4..000000000000
--- a/dev-ruby/activerecord/activerecord-5.2.8.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	dev-ruby/arel:9.0
-	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( >=dev-ruby/pg-0.18.0:* )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/actionmailer-${PV}
-		>=dev-ruby/sqlite3-1.3.6
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-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
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' \
-		../Gemfile || die
-
-	sed -e '3i gem "activesupport", "~> 5.2.0"' \
-		-e '3i gem "activerecord", "~> 5.2.0"' \
-		-e '3i gem "activemodel", "~> 5.2.0"' \
-		-e '3i gem "psych", "~> 3.0"' \
-		-i test/cases/helper.rb || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single test using mysql dependencies.
-	rm test/cases/invalid_connection_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 failures due to sqlite explain changes
-	rm -f test/cases/adapters/sqlite3/explain_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		MT_NO_PLUGINS=true ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-6.0.4.1.ebuild b/dev-ruby/activerecord/activerecord-6.0.4.1.ebuild
deleted file mode 100644
index 9b348ec9a64c..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.4.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# 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 ~hppa ~ppc ~ppc64 ~riscv ~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 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-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
-
-	# 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 '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.0"' test/cases/helper.rb || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.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/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/activerecord/activerecord-6.0.4.4.ebuild b/dev-ruby/activerecord/activerecord-6.0.4.4.ebuild
deleted file mode 100644
index adc29bbec73e..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.4.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-# 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 ~hppa ~ppc ~ppc64 ~riscv ~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 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-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
-
-	# 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 '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.0"' test/cases/helper.rb || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.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/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/activerecord/activerecord-6.0.4.7.ebuild b/dev-ruby/activerecord/activerecord-6.0.4.7.ebuild
deleted file mode 100644
index dea3e73927bc..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.4.7.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-# 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 ~hppa ~ppc ~ppc64 ~riscv ~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 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-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
-
-	# 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 '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.0"; gem "psych", "~> 3.0"' test/cases/helper.rb || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.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/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 activation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-
-	# Avoid test failing due to sqlite EXPLAIN changes
-	rm -f test/cases/adapters/sqlite3/explain_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/activerecord/activerecord-6.0.4.8.ebuild b/dev-ruby/activerecord/activerecord-6.0.4.8.ebuild
deleted file mode 100644
index dea3e73927bc..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.4.8.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-# 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 ~hppa ~ppc ~ppc64 ~riscv ~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 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-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
-
-	# 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 '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.0"; gem "psych", "~> 3.0"' test/cases/helper.rb || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.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/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 activation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-
-	# Avoid test failing due to sqlite EXPLAIN changes
-	rm -f test/cases/adapters/sqlite3/explain_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/activerecord/activerecord-6.0.5.ebuild b/dev-ruby/activerecord/activerecord-6.0.5.ebuild
deleted file mode 100644
index dea3e73927bc..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-# 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 ~hppa ~ppc ~ppc64 ~riscv ~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 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-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
-
-	# 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 '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.0"; gem "psych", "~> 3.0"' test/cases/helper.rb || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.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/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 activation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-
-	# Avoid test failing due to sqlite EXPLAIN changes
-	rm -f test/cases/adapters/sqlite3/explain_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/activerecord/activerecord-6.1.5.1.ebuild b/dev-ruby/activerecord/activerecord-6.1.5.1.ebuild
deleted file mode 100644
index e6bb299bcd8d..000000000000
--- a/dev-ruby/activerecord/activerecord-6.1.5.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-# 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 ~hppa ~ppc ~ppc64 ~riscv ~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/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-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
-
-	# Load correct rails version
-	sed -i -e '2igem "activemodel", "~> 6.1.0"; gem "activejob", "~> 6.1.0"; gem "railties", "~> 6.1.0"' 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 tests that no longer work with newer sqlite versions
-	rm -f test/cases/adapters/sqlite3/explain_test.rb || die
-	sed -i -e '/test_references_stays_as_integer_column/askip "Fails on case difference"' test/cases/migration/compatibility_test.rb || die
-
-	# 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/activerecord/activerecord-6.1.5.ebuild b/dev-ruby/activerecord/activerecord-6.1.5.ebuild
deleted file mode 100644
index a98f8886dc8c..000000000000
--- a/dev-ruby/activerecord/activerecord-6.1.5.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-# 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 ~hppa ~ppc ~ppc64 ~riscv ~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/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-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
-
-	# Load correct rails version
-	sed -i -e '2igem "activemodel", "~> 6.1.0"; gem "activejob", "~> 6.1.0"; gem "railties", "~> 6.1.0"' 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 tests that no longer work with newer sqlite versions
-	rm -f test/cases/adapters/sqlite3/explain_test.rb || die
-	sed -i -e '/test_references_stays_as_integer_column/askip "Fails on case difference"' test/cases/migration/compatibility_test.rb || die
-
-	# 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/activerecord/activerecord-6.1.6.ebuild b/dev-ruby/activerecord/activerecord-6.1.6.ebuild
deleted file mode 100644
index e6bb299bcd8d..000000000000
--- a/dev-ruby/activerecord/activerecord-6.1.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-# 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 ~hppa ~ppc ~ppc64 ~riscv ~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/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-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
-
-	# Load correct rails version
-	sed -i -e '2igem "activemodel", "~> 6.1.0"; gem "activejob", "~> 6.1.0"; gem "railties", "~> 6.1.0"' 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 tests that no longer work with newer sqlite versions
-	rm -f test/cases/adapters/sqlite3/explain_test.rb || die
-	sed -i -e '/test_references_stays_as_integer_column/askip "Fails on case difference"' test/cases/migration/compatibility_test.rb || die
-
-	# 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/activerecord/activerecord-6.1.7.6.ebuild b/dev-ruby/activerecord/activerecord-6.1.7.6.ebuild
new file mode 100644
index 000000000000..58ca572f4546
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-6.1.7.6.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.7.4-ruby32-keywords.patch
+)
+
+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/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
+
+	# Load correct rails version
+	sed -i -e '2igem "activemodel", "~> 6.1.0"; gem "activejob", "~> 6.1.0"; gem "railties", "~> 6.1.0"; gem "minitest", "<5.16"' 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 tests that no longer work with newer sqlite versions
+	rm -f test/cases/adapters/sqlite3/explain_test.rb || die
+	sed -i -e '/test_references_stays_as_integer_column/askip "Fails on case difference"' test/cases/migration/compatibility_test.rb || die
+
+	# 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/activerecord/activerecord-6.1.7.7.ebuild b/dev-ruby/activerecord/activerecord-6.1.7.7.ebuild
new file mode 100644
index 000000000000..f6fed32081fc
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-6.1.7.7.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.7.4-ruby32-keywords.patch
+)
+
+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/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
+
+	# Load correct rails version
+	sed -e '2igem "activemodel", "~> 6.1.0"; gem "activejob", "~> 6.1.0"; gem "railties", "~> 6.1.0"; gem "minitest", "<5.16"' \
+		-i 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 tests that no longer work with newer sqlite versions
+	rm -f test/cases/adapters/sqlite3/explain_test.rb || die
+	sed -e '/test_references_stays_as_integer_column/askip "Fails on case difference"' \
+		-i test/cases/migration/compatibility_test.rb || die
+
+	# Avoid test failing to bind limit length in favor of security release
+	sed -e '/test_too_many_binds/askip "Fails on Gentoo"' \
+		-i test/cases/bind_parameter_test.rb || die
+
+	# Avoid test failing related to rubygems
+	sed -e '/test_generates_absolute_path_with_given_root/askip "rubygems activation monitor"' \
+		-i 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/activerecord/activerecord-7.0.2.2.ebuild b/dev-ruby/activerecord/activerecord-7.0.2.2.ebuild
deleted file mode 100644
index 47d013e257ae..000000000000
--- a/dev-ruby/activerecord/activerecord-7.0.2.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27"
-
-# 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 ~riscv ~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/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-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
-
-	# 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/activerecord/activerecord-7.0.2.3.ebuild b/dev-ruby/activerecord/activerecord-7.0.2.3.ebuild
deleted file mode 100644
index f59c119d4b8c..000000000000
--- a/dev-ruby/activerecord/activerecord-7.0.2.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-# 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 ~riscv ~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/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-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
-
-	# 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/activerecord/activerecord-7.0.2.4.ebuild b/dev-ruby/activerecord/activerecord-7.0.2.4.ebuild
deleted file mode 100644
index f59c119d4b8c..000000000000
--- a/dev-ruby/activerecord/activerecord-7.0.2.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-# 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 ~riscv ~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/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-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
-
-	# 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/activerecord/activerecord-7.0.3.ebuild b/dev-ruby/activerecord/activerecord-7.0.3.ebuild
deleted file mode 100644
index f59c119d4b8c..000000000000
--- a/dev-ruby/activerecord/activerecord-7.0.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-# 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 ~riscv ~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/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-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
-
-	# 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/activerecord/activerecord-7.0.8.1.ebuild b/dev-ruby/activerecord/activerecord-7.0.8.1.ebuild
new file mode 100644
index 000000000000..a54e5f49a275
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-7.0.8.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="mysql postgres sqlite test"
+
+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 -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:^:#:' \
+		-i ../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 -e '3igem "rack", "<3"; gem "minitest", "<5.16"; gem "activejob", "~> 7.0.0"; gem "activemodel", "~> 7.0.0"; gem "railties", "~> 7.0.0"' \
+		-i 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 -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' \
+		-i test/cases/tasks/sqlite_rake_test.rb || die
+
+	# Avoid test requiring specific locales
+	sed -i -e '/test_unicode_input_casting/askip "Requires specific locales"' test/cases/binary_test.rb || die
+
+	# Avoid test not compatible with sqlite 3.43
+	sed -e '/test_should_return_float_average_if_db_returns_such/askip "Fails with sqlite 3.43"' \
+		-i test/cases/calculations_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/activerecord/activerecord-7.0.8.ebuild b/dev-ruby/activerecord/activerecord-7.0.8.ebuild
new file mode 100644
index 000000000000..028e6a1589c3
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-7.0.8.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~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 '3igem "rack", "<3"; gem "minitest", "<5.16"' 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 -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' \
+		-i test/cases/tasks/sqlite_rake_test.rb || die
+
+	# Avoid test requiring specific locales
+	sed -i -e '/test_unicode_input_casting/askip "Requires specific locales"' test/cases/binary_test.rb || die
+
+	# Avoid test not compatible with sqlite 3.43
+	sed -e '/test_should_return_float_average_if_db_returns_such/askip "Fails with sqlite 3.43"' \
+		-i test/cases/calculations_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/activerecord/activerecord-7.1.3.2.ebuild b/dev-ruby/activerecord/activerecord-7.1.3.2.ebuild
new file mode 100644
index 000000000000..1d0cd7c9927b
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-7.1.3.2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# 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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	>=dev-ruby/timeout-0.4.0
+	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/activejob-${PV}
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/sqlite3-1.4.0
+		dev-ruby/mocha
+		dev-ruby/minitest:5
+	)"
+
+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
+
+	# 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/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 -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' \
+	#	-i test/cases/tasks/sqlite_rake_test.rb || die
+
+	# Avoid test requiring specific locales
+	sed -i -e '/test_unicode_input_casting/askip "Requires specific locales"' test/cases/binary_test.rb || die
+
+	# Avoid test not compatible with sqlite 3.43
+	sed -e '/test_should_return_float_average_if_db_returns_such/askip "Fails with sqlite 3.43"' \
+		-i test/cases/calculations_test.rb || die
+
+	# Avoid tests requiring a full Rails setup
+	rm -f test/cases/adapters/sqlite3/dbconsole_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/activerecord/activerecord-7.1.3.ebuild b/dev-ruby/activerecord/activerecord-7.1.3.ebuild
new file mode 100644
index 000000000000..f64d86b79538
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-7.1.3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	>=dev-ruby/timeout-0.4.0
+	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/activejob-${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
+
+	# 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/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 -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' \
+	#	-i test/cases/tasks/sqlite_rake_test.rb || die
+
+	# Avoid test requiring specific locales
+	sed -i -e '/test_unicode_input_casting/askip "Requires specific locales"' test/cases/binary_test.rb || die
+
+	# Avoid test not compatible with sqlite 3.43
+	sed -e '/test_should_return_float_average_if_db_returns_such/askip "Fails with sqlite 3.43"' \
+		-i test/cases/calculations_test.rb || die
+
+	# Avoid tests requiring a full Rails setup
+	rm -f test/cases/adapters/sqlite3/dbconsole_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/activerecord/files/activerecord-6.1.7.4-ruby32-keywords.patch b/dev-ruby/activerecord/files/activerecord-6.1.7.4-ruby32-keywords.patch
new file mode 100644
index 000000000000..4a82e18aaba1
--- /dev/null
+++ b/dev-ruby/activerecord/files/activerecord-6.1.7.4-ruby32-keywords.patch
@@ -0,0 +1,38 @@
+From 67bdba4e63cad218c02dbb3171ddd53353cc0b48 Mon Sep 17 00:00:00 2001
+From: Javier Jimenez <javiyu7@gmail.com>
+Date: Thu, 5 Jan 2023 21:34:37 +0100
+Subject: [PATCH] Backports ruby 3.2 compatibility fixes for rails 6.1
+
+---
+ actionmailer/lib/action_mailer/base.rb            |  2 +-
+ actionmailer/lib/action_mailer/rescuable.rb       | 12 ++++++++----
+ actionpack/lib/abstract_controller/base.rb        | 10 +++++++---
+ actionpack/lib/abstract_controller/callbacks.rb   |  6 +++++-
+ actionview/lib/action_view/rendering.rb           |  6 +++++-
+ activemodel/lib/active_model/attribute_methods.rb |  2 +-
+ activerecord/lib/active_record/relation.rb        |  8 ++++++--
+ 7 files changed, 33 insertions(+), 13 deletions(-)
+
+diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
+index 6ea5876eda1b8..9c0efb800efd0 100644
+--- a/lib/active_record/relation.rb
++++ b/lib/active_record/relation.rb
+@@ -406,12 +406,16 @@ def scoping
+       already_in_scope? ? yield : _scoping(self) { yield }
+     end
+ 
+-    def _exec_scope(*args, &block) # :nodoc:
++    all_args = RUBY_VERSION < "2.7" ? "*args, &block" : "..."
++
++    class_eval <<-RUBY
++    def _exec_scope(#{all_args}) # :nodoc:
+       @delegate_to_klass = true
+-      _scoping(nil) { instance_exec(*args, &block) || self }
++      _scoping(nil) { instance_exec(#{all_args}) || self }
+     ensure
+       @delegate_to_klass = false
+     end
++    RUBY
+ 
+     # Updates all records in the current relation with details given. This method constructs a single SQL UPDATE
+     # statement and sends it straight to the database. It does not instantiate the involved models and it does not
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index 2ca4cdbed1ae..5a38fea999e2 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,15 +1,6 @@
-DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
-DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
-DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
-DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
-DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
-DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
-DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
+DIST rails-6.1.7.6.tgz 11040086 BLAKE2B 8b5311752952403cf8eae31b5d8e8d376c4b449f512e86df66b3e921375ffa3ea11e15f1d74a7f8ec9179ff70c32a6d4f8de75be5f92fe6315ee97164e22d2d0 SHA512 c4163565b2324ce97317d252f3d9e2e673a12b6ae7f54571645c958ce30221f1b357887ade80e46abdd47a422736b9946e49850d52ffd72d8acc87f35224e69f
+DIST rails-6.1.7.7.tgz 11041447 BLAKE2B 3f59325aa86d3b7d6e0773b9eb2b895a26b644109be8df0b0d9abbab8e6c77f76d316c717ecce4e2d79d3247559504a7452a8037d2d52a6cf95fbacd7f8b8612 SHA512 f9af4eebb3bffec78832f92be6158c71c147e265b54e8e368a06c762bfd1a7992256b3e9286aeb59eee69ba56be28d381a715eb13f99b9babfd9b7ce8051e210
+DIST rails-7.0.8.1.tgz 11089378 BLAKE2B 5d92087402d8aa2b86759ec92c44091a7a0f8a22959e0510f10417f88e54f9e1e6a14c4e9519033cd63bdd1f54f72b91bff8a3318a3264c39311317fb67e8b63 SHA512 74f467f7d3e5ec88560448e206a8f0cdf55bad60dd9eac019224fce86a766ee9d0c4afbd4eaae30dacfe34beebcff6aa9d3c5c99be9c8ad5c385817fe409afc8
+DIST rails-7.0.8.tgz 11073254 BLAKE2B 2aee047a365acb0890ef3afbccfe323fedccf7b54214aa1c2f92b7a7aaa64c275c1e03f8f97e6a2e30281224ba30703d18b40aeee9b4e7fb6f035a4a7716a054 SHA512 0e9feb5bd0360868c3109152d8ea414b65d36d33a5dbb96b199cfa6c4335800d6c392e0fbcbfa453a02fd75924a297a65caf04948895de53db43700478dbeb11
+DIST rails-7.1.3.2.tgz 10914950 BLAKE2B 419e6817958efcc5dbbb47d24498decff48fca9748c9f4069bcd353a4644fa623caf79c4072db0944139ac991d14623013683f69cef3126fa63348cc0612655b SHA512 0a58e7b125eb97f94a8a75bacd421d7197e6ad78d24651aecfe82e41c024ccfa42a9de0664099f55cd6ac6a41fd7f09cdc3177ed2b809b0be7d7df1639424f9d
+DIST rails-7.1.3.tgz 10900323 BLAKE2B a83ca4ee656e93241fa0460d8df197904a4eef310cf25bce6db6167bad87c8d0644533fa6e224ec959a4e10005164e0f981e14e8b23cee14e2747117be9da712 SHA512 df1128d1403ab82d218d2057c7c86e646594f97a8c6fcf5648a66440d52e5c20a4ceb0c13e70b6153152b44f62d8a1e20f3776acff5c55bc54d006cb7da32d12
diff --git a/dev-ruby/activestorage/activestorage-5.2.6.ebuild b/dev-ruby/activestorage/activestorage-5.2.6.ebuild
deleted file mode 100644
index 15f7f10bcee4..000000000000
--- a/dev-ruby/activestorage/activestorage-5.2.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_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 eapi7-ver
-
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	dev-ruby/marcel:1.0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		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 -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\|aws-sdk-s3\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|dalli\|listen\|connection_pool\|puma\|mysql2\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Fix spec broken with ruby24
-		sed -i -e '35ibegin' -e '55iend' test/service/s3_service_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-5.2.7.1.ebuild b/dev-ruby/activestorage/activestorage-5.2.7.1.ebuild
deleted file mode 100644
index 443f3b9ac6a7..000000000000
--- a/dev-ruby/activestorage/activestorage-5.2.7.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_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 eapi7-ver
-
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	dev-ruby/marcel:1.0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		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 -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\|aws-sdk-s3\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|dalli\|listen\|connection_pool\|puma\|mysql2\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Fix spec broken with ruby24
-		sed -i -e '35ibegin' -e '55iend' test/service/s3_service_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-5.2.8.ebuild b/dev-ruby/activestorage/activestorage-5.2.8.ebuild
deleted file mode 100644
index 443f3b9ac6a7..000000000000
--- a/dev-ruby/activestorage/activestorage-5.2.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_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 eapi7-ver
-
-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 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	dev-ruby/marcel:1.0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		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 -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\|aws-sdk-s3\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|dalli\|listen\|connection_pool\|puma\|mysql2\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Fix spec broken with ruby24
-		sed -i -e '35ibegin' -e '55iend' test/service/s3_service_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.0.4.1.ebuild b/dev-ruby/activestorage/activestorage-6.0.4.1.ebuild
deleted file mode 100644
index 6220578fea14..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.4.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-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 ~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/activerecord-${PV}:*
-	dev-ruby/marcel:1.0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		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 -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\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Skip test that has already been updated in later versions upstream
-		sed -i -e '/resized variation of BMP blob/askip "broken test"' test/models/variant_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.0.4.4.ebuild b/dev-ruby/activestorage/activestorage-6.0.4.4.ebuild
deleted file mode 100644
index 4f45ca8b516b..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.4.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~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/activerecord-${PV}:*
-	dev-ruby/marcel:1.0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		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 -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\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Skip test that has already been updated in later versions upstream
-		sed -i -e '/resized variation of BMP blob/askip "broken test"' test/models/variant_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.0.4.7.ebuild b/dev-ruby/activestorage/activestorage-6.0.4.7.ebuild
deleted file mode 100644
index 2655d687a077..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.4.7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~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/activerecord-${PV}:*
-	dev-ruby/marcel:1.0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		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 -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\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Skip test that has already been updated in later versions upstream
-		sed -i -e '/resized variation of BMP blob/askip "broken test"' test/models/variant_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.0.4.8.ebuild b/dev-ruby/activestorage/activestorage-6.0.4.8.ebuild
deleted file mode 100644
index 2655d687a077..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.4.8.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~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/activerecord-${PV}:*
-	dev-ruby/marcel:1.0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		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 -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\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Skip test that has already been updated in later versions upstream
-		sed -i -e '/resized variation of BMP blob/askip "broken test"' test/models/variant_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.0.5.ebuild b/dev-ruby/activestorage/activestorage-6.0.5.ebuild
deleted file mode 100644
index 2655d687a077..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~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/activerecord-${PV}:*
-	dev-ruby/marcel:1.0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		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 -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\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Skip test that has already been updated in later versions upstream
-		sed -i -e '/resized variation of BMP blob/askip "broken test"' test/models/variant_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.1.5.1.ebuild b/dev-ruby/activestorage/activestorage-6.1.5.1.ebuild
deleted file mode 100644
index 102dbabfb7ed..000000000000
--- a/dev-ruby/activestorage/activestorage-6.1.5.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-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 ~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/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		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\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
-			-i ../Gemfile || die
-		rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.1.5.ebuild b/dev-ruby/activestorage/activestorage-6.1.5.ebuild
deleted file mode 100644
index c613c84ed18d..000000000000
--- a/dev-ruby/activestorage/activestorage-6.1.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-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 ~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/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		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\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
-			-i ../Gemfile || die
-		rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.1.6.ebuild b/dev-ruby/activestorage/activestorage-6.1.6.ebuild
deleted file mode 100644
index 102dbabfb7ed..000000000000
--- a/dev-ruby/activestorage/activestorage-6.1.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-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 ~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/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		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\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
-			-i ../Gemfile || die
-		rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.1.7.6.ebuild b/dev-ruby/activestorage/activestorage-6.1.7.6.ebuild
new file mode 100644
index 000000000000..1b24cc39c24d
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-6.1.7.6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~ppc ~ppc64 ~riscv ~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/test-unit:2
+		=dev-ruby/minitest-5.15*:*
+		dev-ruby/mini_magick
+		dev-ruby/mocha
+		dev-ruby/rake
+		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\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|rack-test\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
+			-e '/dalli/ s/2.7.7/2.7.9/' \
+			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
+			-i ../Gemfile || die
+		rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/activestorage/activestorage-6.1.7.7.ebuild b/dev-ruby/activestorage/activestorage-6.1.7.7.ebuild
new file mode 100644
index 000000000000..4cbcfad6e847
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-6.1.7.7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+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/test-unit:2
+		=dev-ruby/minitest-5.15*:*
+		dev-ruby/mini_magick
+		dev-ruby/mocha
+		dev-ruby/rake
+		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\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|rack-test\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
+		-e '/dalli/ s/2.7.7/2.7.9/' \
+		-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid test where different ffmpeg versions apply different rounding for the duration.
+	sed -i -e '/1.022000/ s:^:#:' test/analyzer/video_analyzer_test.rb || die
+
+	# Avoid test broken with ffmpeg 6
+	sed -i -e '/analyzing a rotated video/askip "Broken with ffmpeg 6.x"' test/analyzer/video_analyzer_test.rb || die
+
+}
diff --git a/dev-ruby/activestorage/activestorage-7.0.2.2.ebuild b/dev-ruby/activestorage/activestorage-7.0.2.2.ebuild
deleted file mode 100644
index af4f860483b1..000000000000
--- a/dev-ruby/activestorage/activestorage-7.0.2.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_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 ~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.0:5
-		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\)/ 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/activestorage/activestorage-7.0.2.3.ebuild b/dev-ruby/activestorage/activestorage-7.0.2.3.ebuild
deleted file mode 100644
index cdac79348cac..000000000000
--- a/dev-ruby/activestorage/activestorage-7.0.2.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-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 ~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.0:5
-		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\)/ 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/activestorage/activestorage-7.0.2.4.ebuild b/dev-ruby/activestorage/activestorage-7.0.2.4.ebuild
deleted file mode 100644
index cdac79348cac..000000000000
--- a/dev-ruby/activestorage/activestorage-7.0.2.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-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 ~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.0:5
-		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\)/ 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/activestorage/activestorage-7.0.3.ebuild b/dev-ruby/activestorage/activestorage-7.0.3.ebuild
deleted file mode 100644
index cdac79348cac..000000000000
--- a/dev-ruby/activestorage/activestorage-7.0.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-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 ~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.0:5
-		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\)/ 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/activestorage/activestorage-7.0.8.1.ebuild b/dev-ruby/activestorage/activestorage-7.0.8.1.ebuild
new file mode 100644
index 000000000000..be32815a41b1
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-7.0.8.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~riscv ~sparc ~x86"
+IUSE="test"
+
+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\|webrick\|propshaft\|sprockets-export\|rack-test\|terser\|cookiejar\|cgi\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
+		-e '/sqlite/ s/1.6.4/99/' \
+		-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 -e '/\(resized and monochrome variation of JPEG blob\|monochrome with default variant_processor\|disabled variation of JPEG blob\)/askip "No vips support"' \
+		-i test/models/variant_test.rb || die
+
+	# Avoid test where different ffmpeg versions apply different rounding for the duration.
+	sed -i -e '/1.022000/ s:^:#:' test/analyzer/video_analyzer_test.rb || die
+}
diff --git a/dev-ruby/activestorage/activestorage-7.0.8.ebuild b/dev-ruby/activestorage/activestorage-7.0.8.ebuild
new file mode 100644
index 000000000000..faf776d281a8
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-7.0.8.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~riscv ~sparc ~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\|webrick\|propshaft\|sprockets-export\|rack-test\|terser\|cookiejar\|cgi\)/ s:^:#:" \
+			-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
+			-e '/sqlite/ s/1.6.4/99/' \
+			-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 -e '/\(resized and monochrome variation of JPEG blob\|monochrome with default variant_processor\|disabled variation of JPEG blob\)/askip "No vips support"' \
+			-i test/models/variant_test.rb || die
+}
diff --git a/dev-ruby/activestorage/activestorage-7.1.3.2.ebuild b/dev-ruby/activestorage/activestorage-7.1.3.2.ebuild
new file mode 100644
index 000000000000..1fe2751e668b
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-7.1.3.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~riscv ~sparc ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+DEPEND+=" test? ( >=app-text/mupdf-1.23.7 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
+"
+
+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-1.6.6
+	)"
+
+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\|webrick\|propshaft\|sprockets-export\|rack-test\|terser\|cookiejar\|cgi\|web-console\|trilogy\|error_highlight\|jbuilder\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/group :\(doc\|job\|lint\|rubocop\|test\)/,/^end/ s:^:#:' \
+		-e '/sqlite/ s/1.6.4/99/' \
+		-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 -e '/\(resized and monochrome variation of JPEG blob\|monochrome with default variant_processor\|disabled variation of JPEG blob\)/askip "No vips support"' \
+		-i test/models/variant_test.rb || die
+
+	# Avoid test where different ffmpeg versions apply different rounding for the duration.
+	sed -i -e '/1.022000/ s:^:#:' test/analyzer/video_analyzer_test.rb || die
+
+	# Avoid failing test depending on yarn
+	rm -f test/javascript_package_test.rb || die
+}
diff --git a/dev-ruby/activestorage/activestorage-7.1.3.ebuild b/dev-ruby/activestorage/activestorage-7.1.3.ebuild
new file mode 100644
index 000000000000..1fe2751e668b
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-7.1.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~riscv ~sparc ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+DEPEND+=" test? ( >=app-text/mupdf-1.23.7 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
+"
+
+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-1.6.6
+	)"
+
+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\|webrick\|propshaft\|sprockets-export\|rack-test\|terser\|cookiejar\|cgi\|web-console\|trilogy\|error_highlight\|jbuilder\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/group :\(doc\|job\|lint\|rubocop\|test\)/,/^end/ s:^:#:' \
+		-e '/sqlite/ s/1.6.4/99/' \
+		-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 -e '/\(resized and monochrome variation of JPEG blob\|monochrome with default variant_processor\|disabled variation of JPEG blob\)/askip "No vips support"' \
+		-i test/models/variant_test.rb || die
+
+	# Avoid test where different ffmpeg versions apply different rounding for the duration.
+	sed -i -e '/1.022000/ s:^:#:' test/analyzer/video_analyzer_test.rb || die
+
+	# Avoid failing test depending on yarn
+	rm -f test/javascript_package_test.rb || die
+}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 2ca4cdbed1ae..5a38fea999e2 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,15 +1,6 @@
-DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
-DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
-DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
-DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
-DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
-DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
-DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
+DIST rails-6.1.7.6.tgz 11040086 BLAKE2B 8b5311752952403cf8eae31b5d8e8d376c4b449f512e86df66b3e921375ffa3ea11e15f1d74a7f8ec9179ff70c32a6d4f8de75be5f92fe6315ee97164e22d2d0 SHA512 c4163565b2324ce97317d252f3d9e2e673a12b6ae7f54571645c958ce30221f1b357887ade80e46abdd47a422736b9946e49850d52ffd72d8acc87f35224e69f
+DIST rails-6.1.7.7.tgz 11041447 BLAKE2B 3f59325aa86d3b7d6e0773b9eb2b895a26b644109be8df0b0d9abbab8e6c77f76d316c717ecce4e2d79d3247559504a7452a8037d2d52a6cf95fbacd7f8b8612 SHA512 f9af4eebb3bffec78832f92be6158c71c147e265b54e8e368a06c762bfd1a7992256b3e9286aeb59eee69ba56be28d381a715eb13f99b9babfd9b7ce8051e210
+DIST rails-7.0.8.1.tgz 11089378 BLAKE2B 5d92087402d8aa2b86759ec92c44091a7a0f8a22959e0510f10417f88e54f9e1e6a14c4e9519033cd63bdd1f54f72b91bff8a3318a3264c39311317fb67e8b63 SHA512 74f467f7d3e5ec88560448e206a8f0cdf55bad60dd9eac019224fce86a766ee9d0c4afbd4eaae30dacfe34beebcff6aa9d3c5c99be9c8ad5c385817fe409afc8
+DIST rails-7.0.8.tgz 11073254 BLAKE2B 2aee047a365acb0890ef3afbccfe323fedccf7b54214aa1c2f92b7a7aaa64c275c1e03f8f97e6a2e30281224ba30703d18b40aeee9b4e7fb6f035a4a7716a054 SHA512 0e9feb5bd0360868c3109152d8ea414b65d36d33a5dbb96b199cfa6c4335800d6c392e0fbcbfa453a02fd75924a297a65caf04948895de53db43700478dbeb11
+DIST rails-7.1.3.2.tgz 10914950 BLAKE2B 419e6817958efcc5dbbb47d24498decff48fca9748c9f4069bcd353a4644fa623caf79c4072db0944139ac991d14623013683f69cef3126fa63348cc0612655b SHA512 0a58e7b125eb97f94a8a75bacd421d7197e6ad78d24651aecfe82e41c024ccfa42a9de0664099f55cd6ac6a41fd7f09cdc3177ed2b809b0be7d7df1639424f9d
+DIST rails-7.1.3.tgz 10900323 BLAKE2B a83ca4ee656e93241fa0460d8df197904a4eef310cf25bce6db6167bad87c8d0644533fa6e224ec959a4e10005164e0f981e14e8b23cee14e2747117be9da712 SHA512 df1128d1403ab82d218d2057c7c86e646594f97a8c6fcf5648a66440d52e5c20a4ceb0c13e70b6153152b44f62d8a1e20f3776acff5c55bc54d006cb7da32d12
diff --git a/dev-ruby/activesupport/activesupport-5.2.6.ebuild b/dev-ruby/activesupport/activesupport-5.2.6.ebuild
deleted file mode 100644
index 02dd47811dcb..000000000000
--- a/dev-ruby/activesupport/activesupport-5.2.6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5"
-
-# memcache-client, nokogiri, and builder are not strictly
-# needed, but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/activesupport/activesupport-5.2.7.1.ebuild b/dev-ruby/activesupport/activesupport-5.2.7.1.ebuild
deleted file mode 100644
index a3e5ad214065..000000000000
--- a/dev-ruby/activesupport/activesupport-5.2.7.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5"
-
-# memcache-client, nokogiri, and builder are not strictly
-# needed, but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/activesupport/activesupport-5.2.8.ebuild b/dev-ruby/activesupport/activesupport-5.2.8.ebuild
deleted file mode 100644
index 388b98e624c0..000000000000
--- a/dev-ruby/activesupport/activesupport-5.2.8.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5"
-
-# memcache-client, nokogiri, and builder are not strictly
-# needed, but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.0.4.1.ebuild b/dev-ruby/activesupport/activesupport-6.0.4.1.ebuild
deleted file mode 100644
index aa8ba7a98a98..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.4.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.2:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.0.4.4.ebuild b/dev-ruby/activesupport/activesupport-6.0.4.4.ebuild
deleted file mode 100644
index 32b8856b4b45..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.4.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.2:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.0.4.7.ebuild b/dev-ruby/activesupport/activesupport-6.0.4.7.ebuild
deleted file mode 100644
index 42d7b05695d0..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.4.7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.2:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.0.4.8.ebuild b/dev-ruby/activesupport/activesupport-6.0.4.8.ebuild
deleted file mode 100644
index 8a635120c3c3..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.4.8.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.2:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.0.5.ebuild b/dev-ruby/activesupport/activesupport-6.0.5.ebuild
deleted file mode 100644
index 42d7b05695d0..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.2:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.1.5.1.ebuild b/dev-ruby/activesupport/activesupport-6.1.5.1.ebuild
deleted file mode 100644
index f42cc171e0c8..000000000000
--- a/dev-ruby/activesupport/activesupport-6.1.5.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	>=dev-ruby/i18n-1.6:1
-	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.3:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	dev-ruby/connection_pool
-	>=dev-ruby/nokogiri-1.8.1
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.3:3
-	dev-ruby/rack
-	dev-ruby/rexml
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\)/ s:^:#:" \
-		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\) do/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-#	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.1.5.ebuild b/dev-ruby/activesupport/activesupport-6.1.5.ebuild
deleted file mode 100644
index af3f42e0b0bc..000000000000
--- a/dev-ruby/activesupport/activesupport-6.1.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	>=dev-ruby/i18n-1.6:1
-	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.3:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	dev-ruby/connection_pool
-	>=dev-ruby/nokogiri-1.8.1
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.3:3
-	dev-ruby/rack
-	dev-ruby/rexml
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\)/ s:^:#:" \
-		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\) do/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-#	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.1.6.ebuild b/dev-ruby/activesupport/activesupport-6.1.6.ebuild
deleted file mode 100644
index f42cc171e0c8..000000000000
--- a/dev-ruby/activesupport/activesupport-6.1.6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	>=dev-ruby/i18n-1.6:1
-	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.3:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	dev-ruby/connection_pool
-	>=dev-ruby/nokogiri-1.8.1
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.3:3
-	dev-ruby/rack
-	dev-ruby/rexml
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\)/ s:^:#:" \
-		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\) do/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-#	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.1.7.6.ebuild b/dev-ruby/activesupport/activesupport-6.1.7.6.ebuild
new file mode 100644
index 000000000000..6023f1897d99
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-6.1.7.6.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	>=dev-ruby/i18n-1.6:1
+	>=dev-ruby/minitest-5.1
+	dev-ruby/tzinfo:2
+	>=dev-ruby/zeitwerk-2.3:2
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-3.0.1
+	dev-ruby/connection_pool
+	>=dev-ruby/nokogiri-1.8.1
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.3:3
+	dev-ruby/rack
+	dev-ruby/rexml
+	dev-ruby/mocha
+	<dev-ruby/minitest-5.16:*
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.7.3-ruby-thread-noise.patch
+	"${FILESDIR}"/${PN}-6.1.7.4-bytesplice.patch
+	"${FILESDIR}"/${PN}-6.1.7.4-class_serial.patch
+)
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|rack-test\|net-smtp\|net-imap\|net-pop\|digest\|matrix\)/ s:^:#:" \
+		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\) do/,/^end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"; gem "rack"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+#	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
+
+	# Avoid test that depends on timezone and test that fails on 32-bit arches
+	sed -e '/test_implicit_coercion/,/^  end/ s:^:#:' \
+		-e '/test_iso8601_output_and_reparsing/askip "Broken on 32-bit arches"' \
+		-i test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/activesupport/activesupport-6.1.7.7.ebuild b/dev-ruby/activesupport/activesupport-6.1.7.7.ebuild
new file mode 100644
index 000000000000..d2408c06c880
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-6.1.7.7.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	>=dev-ruby/i18n-1.6:1
+	>=dev-ruby/minitest-5.1
+	dev-ruby/tzinfo:2
+	>=dev-ruby/zeitwerk-2.3:2
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-3.0.1
+	dev-ruby/connection_pool
+	>=dev-ruby/nokogiri-1.8.1
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.3:3
+	dev-ruby/rack
+	dev-ruby/rexml
+	dev-ruby/mocha
+	<dev-ruby/minitest-5.16:*
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.7.3-ruby-thread-noise.patch
+	"${FILESDIR}"/${PN}-6.1.7.4-bytesplice.patch
+	"${FILESDIR}"/${PN}-6.1.7.4-class_serial.patch
+)
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|rack-test\|net-smtp\|net-imap\|net-pop\|digest\|matrix\)/ s:^:#:" \
+		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\) do/,/^end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"; gem "rack"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+#	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
+
+	# Avoid test that depends on timezone and test that fails on 32-bit arches
+	sed -e '/test_implicit_coercion/,/^  end/ s:^:#:' \
+		-e '/test_iso8601_output_and_reparsing/askip "Broken on 32-bit arches"' \
+		-i test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/activesupport/activesupport-7.0.2.2.ebuild b/dev-ruby/activesupport/activesupport-7.0.2.2.ebuild
deleted file mode 100644
index e921c0b3b547..000000000000
--- a/dev-ruby/activesupport/activesupport-7.0.2.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	>=dev-ruby/i18n-1.6:1
-	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-3.0.1
-	dev-ruby/connection_pool
-	>=dev-ruby/nokogiri-1.8.1
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.3:3
-	dev-ruby/rack
-	dev-ruby/rexml
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|propshaft\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\|view\) do/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-7.0.2.3.ebuild b/dev-ruby/activesupport/activesupport-7.0.2.3.ebuild
deleted file mode 100644
index 0a0ffb05e4cc..000000000000
--- a/dev-ruby/activesupport/activesupport-7.0.2.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	>=dev-ruby/i18n-1.6:1
-	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-3.0.1
-	dev-ruby/connection_pool
-	>=dev-ruby/nokogiri-1.8.1
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.3:3
-	dev-ruby/rack
-	dev-ruby/rexml
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|propshaft\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\|view\) do/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-7.0.2.4.ebuild b/dev-ruby/activesupport/activesupport-7.0.2.4.ebuild
deleted file mode 100644
index 111aab567962..000000000000
--- a/dev-ruby/activesupport/activesupport-7.0.2.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	>=dev-ruby/i18n-1.6:1
-	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-3.0.1
-	dev-ruby/connection_pool
-	>=dev-ruby/nokogiri-1.8.1
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.3:3
-	dev-ruby/rack
-	dev-ruby/rexml
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|propshaft\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\|view\) do/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-7.0.3.ebuild b/dev-ruby/activesupport/activesupport-7.0.3.ebuild
deleted file mode 100644
index 111aab567962..000000000000
--- a/dev-ruby/activesupport/activesupport-7.0.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	>=dev-ruby/i18n-1.6:1
-	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-3.0.1
-	dev-ruby/connection_pool
-	>=dev-ruby/nokogiri-1.8.1
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.3:3
-	dev-ruby/rack
-	dev-ruby/rexml
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|propshaft\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\|view\) do/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-7.0.8.1.ebuild b/dev-ruby/activesupport/activesupport-7.0.8.1.ebuild
new file mode 100644
index 000000000000..03675e68ef54
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-7.0.8.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	>=dev-ruby/i18n-1.6:1
+	dev-ruby/tzinfo:2
+	>=dev-ruby/minitest-5.1
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-3.0.1
+	dev-ruby/connection_pool
+	>=dev-ruby/nokogiri-1.8.1
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.3:3
+	dev-ruby/rack
+	dev-ruby/rexml
+	dev-ruby/mocha
+	dev-ruby/minitest
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|propshaft\|rack-test\|terser\|cgi\|net-smtp\|net-imap\|net-pop\|digest\|matrix\|readline-ext\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\|view\) do/,/^end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"; gem "rack"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/activesupport/activesupport-7.0.8.ebuild b/dev-ruby/activesupport/activesupport-7.0.8.ebuild
new file mode 100644
index 000000000000..ab0ce2bf70eb
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-7.0.8.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	>=dev-ruby/i18n-1.6:1
+	dev-ruby/tzinfo:2
+	>=dev-ruby/minitest-5.1
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-3.0.1
+	dev-ruby/connection_pool
+	>=dev-ruby/nokogiri-1.8.1
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.3:3
+	dev-ruby/rack
+	dev-ruby/rexml
+	dev-ruby/mocha
+	<dev-ruby/minitest-5.16:*
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|propshaft\|rack-test\|terser\|cgi\|net-smtp\|net-imap\|net-pop\|digest\|matrix\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\|view\) do/,/^end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"; gem "rack"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/activesupport/activesupport-7.1.3.2.ebuild b/dev-ruby/activesupport/activesupport-7.1.3.2.ebuild
new file mode 100644
index 000000000000..e265e8725432
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-7.1.3.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+msgpack test"
+REQUIRED_USE="test? ( msgpack )"
+
+PATCHES=( "${FILESDIR}/${PN}-7.1.1-backport-pr50097.patch" )
+
+RUBY_S="rails-${PV}/${PN}"
+
+# bigdecimal and mutex_m are bundled with ruby as default gems
+ruby_add_rdepend "
+	dev-ruby/base64
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	>=dev-ruby/connection_pool-2.2.5
+	dev-ruby/drb
+	>=dev-ruby/i18n-1.6:1
+	>=dev-ruby/minitest-5.1
+	dev-ruby/tzinfo:2
+	msgpack? ( >=dev-ruby/msgpack-1.7.0 )
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-3.0.1
+	>=dev-ruby/nokogiri-1.8.1
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.3:3
+	dev-ruby/rack:3.0
+	dev-ruby/rexml
+	dev-ruby/mocha
+	>dev-ruby/minitest-5.15.0:*
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|execjs\|jquery-rails\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|propshaft\|rack-test\|terser\|cgi\|net-smtp\|net-imap\|net-pop\|digest\|matrix\|web-console\|error_highlight\|jbuilder\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/^group :test/,/^end/ s:^:#:' \
+		-e '/^\s*group :\(db\|doc\|rubocop\|job\|cable\|lint\|mdl\|storage\|ujs\|test\|view\) do/,/^\s*end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/activesupport/activesupport-7.1.3.ebuild b/dev-ruby/activesupport/activesupport-7.1.3.ebuild
new file mode 100644
index 000000000000..e265e8725432
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-7.1.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+msgpack test"
+REQUIRED_USE="test? ( msgpack )"
+
+PATCHES=( "${FILESDIR}/${PN}-7.1.1-backport-pr50097.patch" )
+
+RUBY_S="rails-${PV}/${PN}"
+
+# bigdecimal and mutex_m are bundled with ruby as default gems
+ruby_add_rdepend "
+	dev-ruby/base64
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	>=dev-ruby/connection_pool-2.2.5
+	dev-ruby/drb
+	>=dev-ruby/i18n-1.6:1
+	>=dev-ruby/minitest-5.1
+	dev-ruby/tzinfo:2
+	msgpack? ( >=dev-ruby/msgpack-1.7.0 )
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-3.0.1
+	>=dev-ruby/nokogiri-1.8.1
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.3:3
+	dev-ruby/rack:3.0
+	dev-ruby/rexml
+	dev-ruby/mocha
+	>dev-ruby/minitest-5.15.0:*
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|execjs\|jquery-rails\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|propshaft\|rack-test\|terser\|cgi\|net-smtp\|net-imap\|net-pop\|digest\|matrix\|web-console\|error_highlight\|jbuilder\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/^group :test/,/^end/ s:^:#:' \
+		-e '/^\s*group :\(db\|doc\|rubocop\|job\|cable\|lint\|mdl\|storage\|ujs\|test\|view\) do/,/^\s*end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/activesupport/files/activesupport-6.1.7.3-ruby-thread-noise.patch b/dev-ruby/activesupport/files/activesupport-6.1.7.3-ruby-thread-noise.patch
new file mode 100644
index 000000000000..dabe1331a307
--- /dev/null
+++ b/dev-ruby/activesupport/files/activesupport-6.1.7.3-ruby-thread-noise.patch
@@ -0,0 +1,41 @@
+https://github.com/rails/rails/commit/60fc40ea58de8b6faf98081d659e7f5b232aa25e
+
+From 60fc40ea58de8b6faf98081d659e7f5b232aa25e Mon Sep 17 00:00:00 2001
+From: Jonathan Hefner <jonathan@hefner.pro>
+Date: Thu, 22 Jul 2021 13:45:57 -0500
+Subject: [PATCH] Isolate descendants garbage collection test
+
+This prevents the test from being affected by Ruby-internal thread
+locals set by other tests.
+
+Example failure: https://buildkite.com/rails/rails/builds/79505#cb261462-8e40-4adc-99fc-81708a473cc6/1076-1085
+
+Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
+--- a/test/descendants_tracker_test_cases.rb
++++ b/test/descendants_tracker_test_cases.rb
+@@ -28,11 +28,23 @@ def test_descendants
+   end
+ 
+   def test_descendants_with_garbage_collected_classes
+-    1.times do
++    # The Ruby GC (and most other GCs for that matter) are not fully precise.
++    # When GC is run, the whole stack is scanned to mark any object reference
++    # in registers. But some of these references might simply be leftovers from
++    # previous method calls waiting to be overridden, and there's no definite
++    # way to clear them. By executing this code in a distinct thread, we ensure
++    # that such references are on a stack that will be entirely garbage
++    # collected, effectively working around the problem.
++    Thread.new do
+       child_klass = Class.new(Parent)
+       assert_equal_sets [Child1, Grandchild1, Grandchild2, Child2, child_klass], Parent.descendants
++    end.join
++
++    # Calling `GC.start` 4 times should trigger a full GC run
++    4.times do
++      GC.start
+     end
+-    GC.start
++
+     assert_equal_sets [Child1, Grandchild1, Grandchild2, Child2], Parent.descendants
+   end
+ 
diff --git a/dev-ruby/activesupport/files/activesupport-6.1.7.4-bytesplice.patch b/dev-ruby/activesupport/files/activesupport-6.1.7.4-bytesplice.patch
new file mode 100644
index 000000000000..fc4096622bb4
--- /dev/null
+++ b/dev-ruby/activesupport/files/activesupport-6.1.7.4-bytesplice.patch
@@ -0,0 +1,29 @@
+From 9e1169b96164eb5ba6bf8ca7744aa3a512cf9439 Mon Sep 17 00:00:00 2001
+From: Hartley McGuire <skipkayhil@gmail.com>
+Date: Mon, 13 Mar 2023 19:05:18 -0400
+Subject: [PATCH] Fix NoMethodError in SafeBuffer#bytesplice
+
+`html_escape_interpolated_argument` was [renamed][1] to
+`implicit_html_escape_interpolated_argument` during Rails 7.0
+development, so the security fix [backport][2] ended up with the wrong
+method name.
+
+[1]: 147f207a57a03fc7a52040aa1f6878cf70ee0db7
+[2]: 3cf23c3f891e2e81c977ea4ab83b62bc2a444b70
+---
+ .../lib/active_support/core_ext/string/output_safety.rb         | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
+index a627540a353db..c5c5d4858ffec 100644
+--- a/lib/active_support/core_ext/string/output_safety.rb
++++ b/lib/active_support/core_ext/string/output_safety.rb
+@@ -217,7 +217,7 @@ def concat(value)
+     alias << concat
+ 
+     def bytesplice(*args, value)
+-      super(*args, implicit_html_escape_interpolated_argument(value))
++      super(*args, html_escape_interpolated_argument(value))
+     end
+ 
+     def insert(index, value)
diff --git a/dev-ruby/activesupport/files/activesupport-6.1.7.4-class_serial.patch b/dev-ruby/activesupport/files/activesupport-6.1.7.4-class_serial.patch
new file mode 100644
index 000000000000..18a05331ead1
--- /dev/null
+++ b/dev-ruby/activesupport/files/activesupport-6.1.7.4-class_serial.patch
@@ -0,0 +1,23 @@
+From 45e9d5ea0dc61eb8d5977ef4f0d416d0ffcb8575 Mon Sep 17 00:00:00 2001
+From: Jean Boussier <jean.boussier@gmail.com>
+Date: Thu, 15 Dec 2022 10:06:04 +0100
+Subject: [PATCH] Merge pull request #46735 from amatsuda/ruby32_class_serial
+
+A quick fix for a Ruby 3.2 + Active Support test failure
+---
+ activesupport/test/executor_test.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/activesupport/test/executor_test.rb b/activesupport/test/executor_test.rb
+index ac87780b23ccb..b3021c4e70ef8 100644
+--- a/test/executor_test.rb
++++ b/test/executor_test.rb
+@@ -194,7 +194,7 @@ def test_hook_insertion_order
+   end
+ 
+   def test_class_serial_is_unaffected
+-    skip if !defined?(RubyVM)
++    skip if !defined?(RubyVM) || !RubyVM.stat.has_key?(:class_serial)
+ 
+     hook = Class.new do
+       define_method(:run) do
diff --git a/dev-ruby/activesupport/files/activesupport-7.1.1-backport-pr50097.patch b/dev-ruby/activesupport/files/activesupport-7.1.1-backport-pr50097.patch
new file mode 100644
index 000000000000..89ac92e7f642
--- /dev/null
+++ b/dev-ruby/activesupport/files/activesupport-7.1.1-backport-pr50097.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/show_bug.cgi?id=917059
+https://github.com/rails/rails/pull/50097
+
+From 2ddb90f63e0fffea493cb1987850797608c4d895 Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Sat, 18 Nov 2023 12:46:23 -0500
+Subject: [PATCH] Skip activesupport event processing tests on platforms w/o
+ highres clock
+
+On platforms without a high-resolution (nanosecond) clock, it is likely
+that the processing of an event will take less time than one complete
+clock resolution cycle, which means that the start and end times will be
+equal and the duration zero, failing these tests.  Usually these issues
+are fixed by adding a sleep of equal to one clock resolution cycle, but
+that is not applicable here since the duration measurement occurs in the
+actual library code rather than the test code, so just skip these tests
+on such platforms.  Also tested and confirmed that the tests are not
+skipped under normal platforms with a highres clock.
+---
+ test/log_subscriber_test.rb | 9 +++++++--
+ test/notifications_test.rb  | 9 ++++++---
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/test/log_subscriber_test.rb b/test/log_subscriber_test.rb
+index 455f6952e31b..0fd3ff69eb19 100644
+--- a/test/log_subscriber_test.rb
++++ b/test/log_subscriber_test.rb
+@@ -108,10 +108,15 @@ def test_event_attributes
+       assert_equal 0, event.cpu_time
+       assert_equal 0, event.allocations
+     else
+-      assert_operator event.cpu_time, :>, 0
++      # These assertions may fail on platforms without nanosecond-resolution clocks
++      if Process.clock_getres(Process::CLOCK_MONOTONIC) <= 1.0e-09
++        assert_operator event.cpu_time, :>, 0
++      end
+       assert_operator event.allocations, :>, 0
+     end
+-    assert_operator event.duration, :>, 0
++    if Process.clock_getres(Process::CLOCK_MONOTONIC) <= 1.0e-09
++      assert_operator event.duration, :>, 0
++    end
+     assert_operator event.idle_time, :>=, 0
+   end
+ 
+diff --git a/test/notifications_test.rb b/test/notifications_test.rb
+index 87416602bb2f..9bc7e393e3a9 100644
+--- a/test/notifications_test.rb
++++ b/test/notifications_test.rb
+@@ -36,9 +36,12 @@ def test_subscribe_events
+       event = events.first
+       assert event, "should have an event"
+       assert_operator event.allocations, :>, 0
+-      assert_operator event.cpu_time, :>, 0
+-      assert_operator event.idle_time, :>=, 0
+-      assert_operator event.duration, :>, 0
++      # These assertions may fail on platforms without nanosecond-resolution clocks
++      if Process.clock_getres(Process::CLOCK_MONOTONIC) <= 1.0e-09
++        assert_operator event.cpu_time, :>, 0
++        assert_operator event.idle_time, :>=, 0
++        assert_operator event.duration, :>, 0
++      end
+     end
+ 
+     def test_subscribe_to_events_where_payload_is_changed_during_instrumentation
diff --git a/dev-ruby/activesupport/metadata.xml b/dev-ruby/activesupport/metadata.xml
index fbd27c03d85b..9a8257fab77e 100644
--- a/dev-ruby/activesupport/metadata.xml
+++ b/dev-ruby/activesupport/metadata.xml
@@ -5,6 +5,9 @@
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
+  <use>
+    <flag name="msgpack">Support ActiveSupport::MessagePack module</flag>
+  </use>
   <upstream>
     <remote-id type="github">rails/rails</remote-id>
   </upstream>
diff --git a/dev-ruby/acts_as_list/Manifest b/dev-ruby/acts_as_list/Manifest
index 547a2ea3dbae..41ed93deebb9 100644
--- a/dev-ruby/acts_as_list/Manifest
+++ b/dev-ruby/acts_as_list/Manifest
@@ -1 +1 @@
-DIST acts_as_list-1.0.4.gem 40448 BLAKE2B ac0d9e29006c052b1f421fc734d19390942fcb1eb68d33ed67944bf9bcf1dc8b73c813a2ee8ae6b358f74e019bf36d200e6fe44e01391dff68041d5263b907b1 SHA512 45cc3a2ddc3bdf245819bfe62c39cea5e9b96bf63b3e817adae2acadcf7b51f47379ae9bf1c2c1cfd6a1dc70d7279f44e0a932c838fa93fa4a0c3b9dcbcd46ea
+DIST acts_as_list-1.1.0.gem 41984 BLAKE2B abeb0325795276294451b4cb86e20dab6871003c72679ce28f9326cd844234ad56457a03d9b9ecd81b8c143deeefc25dd15df88a38ebdd1324a953b2399465e7 SHA512 bdcaf07bc4ad3854d68c8d95e666e86c2500474ffa212c315b6b4abd321341ac782c0e301f2c859c12b80ecfdd1cc743ccf8a7bdbdb36e30fafcd98d4928a00a
diff --git a/dev-ruby/acts_as_list/acts_as_list-1.0.4.ebuild b/dev-ruby/acts_as_list/acts_as_list-1.0.4.ebuild
deleted file mode 100644
index 5e517aeb7f6c..000000000000
--- a/dev-ruby/acts_as_list/acts_as_list-1.0.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-DESCRIPTION="Capabilities for sorting and reordering a number of objects in a list"
-HOMEPAGE="https://github.com/swanandp/acts_as_list"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activerecord-4.2:*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		dev-ruby/test-unit:2
-		dev-ruby/timecop
-		dev-ruby/activerecord[sqlite]
-	)"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/bundler/,/^end/ s:^:#:' test/helper.rb || die
-	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/github_changelog/,$ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/acts_as_list/acts_as_list-1.1.0.ebuild b/dev-ruby/acts_as_list/acts_as_list-1.1.0.ebuild
new file mode 100644
index 000000000000..1ea325ddf3e6
--- /dev/null
+++ b/dev-ruby/acts_as_list/acts_as_list-1.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+DESCRIPTION="Capabilities for sorting and reordering a number of objects in a list"
+HOMEPAGE="https://github.com/brendon/acts_as_list"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/activerecord-4.2:*"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		dev-ruby/test-unit:2
+		dev-ruby/timecop
+		dev-ruby/activerecord[sqlite]
+	)"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/bundler/,/^end/ s:^:#:' test/helper.rb || die
+	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/github_changelog/,$ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/acts_as_list/metadata.xml b/dev-ruby/acts_as_list/metadata.xml
index 1694873daa23..9fbe56db5480 100644
--- a/dev-ruby/acts_as_list/metadata.xml
+++ b/dev-ruby/acts_as_list/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">swanandp/acts_as_list</remote-id>
+    <remote-id type="github">brendon/acts_as_list</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/addressable/Manifest b/dev-ruby/addressable/Manifest
index d73e546c52ab..bafb50034329 100644
--- a/dev-ruby/addressable/Manifest
+++ b/dev-ruby/addressable/Manifest
@@ -1 +1,3 @@
-DIST addressable-2.8.0.gem 105984 BLAKE2B 82f053c9ad052ce1ed1b6927674bd5bcda86a3f70d46b63bfc1185d51b402996fd446647d705418791c5443a1767b4ecd0b891f26de63fbe737c62f7586bd57c SHA512 c684f17940f717c2a65f9716ab9b3659948d6d51a60c38a7295fcf6fdc1c5785d2d315d2de7dab9f66a6c31f62247177d78d5d6eb556f5bb49926d4f00f8e4c8
+DIST addressable-2.8.4.gem 105984 BLAKE2B 788d84a9fe52a05c5e8429aaea59096b604bfad22b06c48f0d8186eb4197e47171310d1d3e9ab296d08b3033443d1fdf6b9b55fdefafd51e4c88feaf5b53298d SHA512 45324e96fb4415b745eb26bd0c3e042102efbdfca879177a70288303c96a4889ff59f794ed0010ea8a95c5d6907b76b0e8c66cce0a5478832c9df465a01e3fcb
+DIST addressable-2.8.5.gem 106496 BLAKE2B 07aadf72772eb909c833079918e44231208b5d9494eac218da1ed30224eb5fabb5369b5dbb0759d328f0cc57117e26fee33ec1139f75d89b2255472df9f2f9e7 SHA512 cc35437d91dfb95f49eeba60b153b89d9f1475fd0770056c22865913629f3bf0a3545585a457bc5a42d97f2e6e81362308e9eb91fd3b2b8a571b997ba53796eb
+DIST addressable-2.8.6.gem 107008 BLAKE2B 0f831f5b2ca1f6fd8c36a5518a9b0bf5819a74f29be2f3897428ec941e40089b3bd627a5359637c7c59cd81fdec57b85c2f3a9a24501d1a425a20940e9f61c50 SHA512 a7cb784cd5564cabec99eb7582ac17969b166e38057c23f3df74707d0078d00d001c2523432ce4e52720528ee808f314f2d6c9139562de27b599363b919cca65
diff --git a/dev-ruby/addressable/addressable-2.8.0.ebuild b/dev-ruby/addressable/addressable-2.8.0.ebuild
deleted file mode 100644
index 1a492303bd01..000000000000
--- a/dev-ruby/addressable/addressable-2.8.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A replacement for the URI implementation that is part of Ruby's standard library"
-HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable"
-
-LICENSE="Apache-2.0"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend "|| ( dev-ruby/public_suffix:4 dev-ruby/public_suffix:3 )"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
-
-all_ruby_prepare() {
-	# Remove spec-related tasks so that we don't need to require rspec
-	# just to build the documentation, bug 383611.
-	sed -i -e '/spectask/d' Rakefile || die
-	rm -f tasks/rspec.rake || die
-	sed -i -e '/bundler/ s:^:#:' \
-		-e '/^begin/,/^end/ s:^:#:' \
-		spec/spec_helper.rb || die
-
-	# Remove specs requiring network connectivity
-	rm -f spec/addressable/net_http_compat_spec.rb || die
-
-	# Remove spec that tests against an unreleased github fork
-	rm -f spec/addressable/rack_mount_compat_spec.rb || die
-}
diff --git a/dev-ruby/addressable/addressable-2.8.4.ebuild b/dev-ruby/addressable/addressable-2.8.4.ebuild
new file mode 100644
index 000000000000..fb9479eda1c2
--- /dev/null
+++ b/dev-ruby/addressable/addressable-2.8.4.ebuild
@@ -0,0 +1,42 @@
+# 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_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A replacement for the URI implementation that is part of Ruby's standard library"
+HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable"
+
+LICENSE="Apache-2.0"
+
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "|| ( dev-ruby/public_suffix:5 dev-ruby/public_suffix:4 )"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
+
+all_ruby_prepare() {
+	# Remove spec-related tasks so that we don't need to require rspec
+	# just to build the documentation, bug 383611.
+	sed -i -e '/spectask/d' Rakefile || die
+	rm -f tasks/rspec.rake || die
+	sed -i -e '/bundler/ s:^:#:' \
+		-e '/^begin/,/^end/ s:^:#:' \
+		spec/spec_helper.rb || die
+
+	# Remove specs requiring network connectivity
+	rm -f spec/addressable/net_http_compat_spec.rb || die
+
+	# Remove spec that tests against an unreleased github fork
+	rm -f spec/addressable/rack_mount_compat_spec.rb || die
+}
diff --git a/dev-ruby/addressable/addressable-2.8.5.ebuild b/dev-ruby/addressable/addressable-2.8.5.ebuild
new file mode 100644
index 000000000000..8a7e82cfddef
--- /dev/null
+++ b/dev-ruby/addressable/addressable-2.8.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A replacement for the URI implementation that is part of Ruby's standard library"
+HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable"
+
+LICENSE="Apache-2.0"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "|| ( dev-ruby/public_suffix:5 dev-ruby/public_suffix:4 )"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
+
+all_ruby_prepare() {
+	# Remove spec-related tasks so that we don't need to require rspec
+	# just to build the documentation, bug 383611.
+	sed -i -e '/spectask/d' Rakefile || die
+	rm -f tasks/rspec.rake || die
+	sed -i -e '/bundler/ s:^:#:' \
+		-e '/^begin/,/^end/ s:^:#:' \
+		spec/spec_helper.rb || die
+
+	# Remove specs requiring network connectivity
+	rm -f spec/addressable/net_http_compat_spec.rb || die
+
+	# Remove spec that tests against an unreleased github fork
+	rm -f spec/addressable/rack_mount_compat_spec.rb || die
+}
diff --git a/dev-ruby/addressable/addressable-2.8.6.ebuild b/dev-ruby/addressable/addressable-2.8.6.ebuild
new file mode 100644
index 000000000000..97bce99ebf8c
--- /dev/null
+++ b/dev-ruby/addressable/addressable-2.8.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A replacement for the URI implementation that is part of Ruby's standard library"
+HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable"
+
+LICENSE="Apache-2.0"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "|| ( dev-ruby/public_suffix:5 dev-ruby/public_suffix:4 )"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
+
+all_ruby_prepare() {
+	# Remove spec-related tasks so that we don't need to require rspec
+	# just to build the documentation, bug 383611.
+	sed -i -e '/spectask/d' Rakefile || die
+	rm -f tasks/rspec.rake || die
+	sed -i -e '/bundler/ s:^:#:' \
+		-e '/^begin/,/^end/ s:^:#:' \
+		spec/spec_helper.rb || die
+
+	# Remove specs requiring network connectivity
+	rm -f spec/addressable/net_http_compat_spec.rb || die
+
+	# Remove spec that tests against an unreleased github fork
+	rm -f spec/addressable/rack_mount_compat_spec.rb || die
+}
diff --git a/dev-ruby/ae/ae-1.8.2-r1.ebuild b/dev-ruby/ae/ae-1.8.2-r1.ebuild
index fa4a6ab90d72..19fdba5afc20 100644
--- a/dev-ruby/ae/ae-1.8.2-r1.ebuild
+++ b/dev-ruby/ae/ae-1.8.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -18,4 +19,5 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 # Tests cause circular dependencies with dev-ruby/qed
+# ... and not in gem/last release?
 RESTRICT="test"
diff --git a/dev-ruby/ae/metadata.xml b/dev-ruby/ae/metadata.xml
index 658c72b1920d..d3444fd11297 100644
--- a/dev-ruby/ae/metadata.xml
+++ b/dev-ruby/ae/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">rubyworks/ae</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/afm/afm-0.2.2-r1.ebuild b/dev-ruby/afm/afm-0.2.2-r1.ebuild
deleted file mode 100644
index 753750fb5ffc..000000000000
--- a/dev-ruby/afm/afm-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A very simple library to read Adobe Font Metrics files"
-HOMEPAGE="https://github.com/halfbyte/afm"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/s/^/#/" Rakefile test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/test_afm.rb || die
-}
diff --git a/dev-ruby/afm/afm-0.2.2-r2.ebuild b/dev-ruby/afm/afm-0.2.2-r2.ebuild
new file mode 100644
index 000000000000..fc2cb0811e52
--- /dev/null
+++ b/dev-ruby/afm/afm-0.2.2-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A very simple library to read Adobe Font Metrics files"
+HOMEPAGE="https://github.com/halfbyte/afm"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/s/^/#/" Rakefile test/helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test test/test_afm.rb || die
+}
diff --git a/dev-ruby/airbrussh/Manifest b/dev-ruby/airbrussh/Manifest
index 400ce17e4b9d..d2e3d2579c06 100644
--- a/dev-ruby/airbrussh/Manifest
+++ b/dev-ruby/airbrussh/Manifest
@@ -1 +1,3 @@
-DIST airbrussh-1.4.0.tar.gz 1450070 BLAKE2B 94f128cd25c5af48f17fa771c366d3cdf744dc4e7ccef23de583b1ed60ffe1640dd7d02d76fb78573936beb3412c277151b36a870ac3e11222c3135f34b0e140 SHA512 e3a5cb80365a963875e89d15fa2b4dc86985d6b5f13ecfa9baf9ad599b5780ef8ea2c2e4040bb35498a5ecd1c6becb081b3e917cfe082d2db63fd74ba54755b7
+DIST airbrussh-1.5.0.tar.gz 1450385 BLAKE2B bc3d2be21fd6ad3e3524fcd10f0a36c9c97bd55a14c422a80b604312fd040821c9c59ca3b034acd834c9c636f99297b5f7c9b04c54edb9fb6c73c7c13fcf8e94 SHA512 540b98ec60f639cd70c705b1cd47eb4246fd49d3dfa4f0ba5163edfb72d76aab63728a2cdfa80f07c1eb7b159e4167de5392e0bb7129b58031e1a6c0733fb559
+DIST airbrussh-1.5.1.tar.gz 1450388 BLAKE2B 34bfc20db10e32f5523916cc503147283b8aee71064e197931f0774932e7c197f765a1ceca78135642e6758efe2d115b1c1da2572171b06fa622d5313710a6ac SHA512 5c34b0491432a20b4c0d30613669ffe21d431296b69ebd1eccf786d515c80067a5b6776a2b4055ea442fce61f89c130531ce4ad177f97950d9bf7ec479fb5bed
+DIST airbrussh-1.5.2.tar.gz 1450058 BLAKE2B 1e3d6957a47c1e823f5352404a55796e7e834d637c13027deac01bf38be06557dc1819f3f0c623a67e0036cd9ba6a0c9f8739a5fa6a56b6a9f003f1edcfdac13 SHA512 fe15bca2b4f922a07d69026c5b93d820943b1d2cec69ffc0190cf09eff87c2ec2cfe13c24bb7174fc9b534a64493abae1344accf91a85a5ddadcee0bd266ef44
diff --git a/dev-ruby/airbrussh/airbrussh-1.4.0-r1.ebuild b/dev-ruby/airbrussh/airbrussh-1.4.0-r1.ebuild
deleted file mode 100644
index 4915591df832..000000000000
--- a/dev-ruby/airbrussh/airbrussh-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="airbrussh.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A replacement log formatter for SSHKit"
-HOMEPAGE="https://github.com/mattbrictson/airbrussh"
-SRC_URI="https://github.com/mattbrictson/airbrussh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	rm -f test/support/minitest_reporters.rb || die
-
-	# Add missing require
-	sed -i -e '1irequire "rake" ; require "rake/task"' test/support/rake_task_definition.rb || die
-
-	# Avoid a test poluting the environment
-	sed -i -e '/test_color_is_can_be_forced_via_env/,/^  end/ s:^:#:' test/airbrussh/console_test.rb || die
-}
diff --git a/dev-ruby/airbrussh/airbrussh-1.4.0.ebuild b/dev-ruby/airbrussh/airbrussh-1.4.0.ebuild
deleted file mode 100644
index 07c738f0bde5..000000000000
--- a/dev-ruby/airbrussh/airbrussh-1.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="airbrussh.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A replacement log formatter for SSHKit"
-HOMEPAGE="https://github.com/mattbrictson/airbrussh"
-SRC_URI="https://github.com/mattbrictson/airbrussh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64"
-IUSE=""
-
-ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	rm -f test/support/minitest_reporters.rb || die
-
-	# Avoid a test poluting the environment
-	sed -i -e '/test_color_is_can_be_forced_via_env/,/^  end/ s:^:#:' test/airbrussh/console_test.rb || die
-}
diff --git a/dev-ruby/airbrussh/airbrussh-1.5.0.ebuild b/dev-ruby/airbrussh/airbrussh-1.5.0.ebuild
new file mode 100644
index 000000000000..3f165e301b56
--- /dev/null
+++ b/dev-ruby/airbrussh/airbrussh-1.5.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="airbrussh.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A replacement log formatter for SSHKit"
+HOMEPAGE="https://github.com/mattbrictson/airbrussh"
+SRC_URI="https://github.com/mattbrictson/airbrussh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/mocha:2 )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	rm -f test/support/minitest_reporters.rb || die
+
+	# Add missing require
+	sed -i -e '1irequire "rake" ; require "rake/task"' test/support/rake_task_definition.rb || die
+
+	# Avoid a test poluting the environment
+	sed -i -e '/test_color_is_can_be_forced_via_env/,/^  end/ s:^:#:' test/airbrussh/console_test.rb || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=1 ${RUBY} -Ilib:test:. -e 'Dir["test/**/*_test.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/airbrussh/airbrussh-1.5.1.ebuild b/dev-ruby/airbrussh/airbrussh-1.5.1.ebuild
new file mode 100644
index 000000000000..840bb1e7fc0c
--- /dev/null
+++ b/dev-ruby/airbrussh/airbrussh-1.5.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="airbrussh.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A replacement log formatter for SSHKit"
+HOMEPAGE="https://github.com/mattbrictson/airbrussh"
+SRC_URI="https://github.com/mattbrictson/airbrussh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/mocha:2 )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	rm -f test/support/minitest_reporters.rb || die
+
+	# Add missing require
+	sed -i -e '1irequire "rake" ; require "rake/task"' test/support/rake_task_definition.rb || die
+
+	# Avoid a test poluting the environment
+	sed -i -e '/test_color_is_can_be_forced_via_env/,/^  end/ s:^:#:' test/airbrussh/console_test.rb || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=1 ${RUBY} -Ilib:test:. -e 'Dir["test/**/*_test.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/airbrussh/airbrussh-1.5.2.ebuild b/dev-ruby/airbrussh/airbrussh-1.5.2.ebuild
new file mode 100644
index 000000000000..840bb1e7fc0c
--- /dev/null
+++ b/dev-ruby/airbrussh/airbrussh-1.5.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="airbrussh.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A replacement log formatter for SSHKit"
+HOMEPAGE="https://github.com/mattbrictson/airbrussh"
+SRC_URI="https://github.com/mattbrictson/airbrussh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/mocha:2 )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	rm -f test/support/minitest_reporters.rb || die
+
+	# Add missing require
+	sed -i -e '1irequire "rake" ; require "rake/task"' test/support/rake_task_definition.rb || die
+
+	# Avoid a test poluting the environment
+	sed -i -e '/test_color_is_can_be_forced_via_env/,/^  end/ s:^:#:' test/airbrussh/console_test.rb || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=1 ${RUBY} -Ilib:test:. -e 'Dir["test/**/*_test.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/airbrussh/metadata.xml b/dev-ruby/airbrussh/metadata.xml
index e3cfba41d99b..b3bde33b8180 100644
--- a/dev-ruby/airbrussh/metadata.xml
+++ b/dev-ruby/airbrussh/metadata.xml
@@ -9,4 +9,7 @@
 Capistrano is a utility and framework for executing commands in parallel on
 multiple remote machines, via SSH.
 </longdescription>
+<upstream>
+	<remote-id type="github">mattbrictson/airbrussh</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/allison/Manifest b/dev-ruby/allison/Manifest
deleted file mode 100644
index f3e3eeccd891..000000000000
--- a/dev-ruby/allison/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST allison-2.0.3.gem 31232 BLAKE2B d112edc2bf5a50d5b861043e567779b07b213d6f19fb6a6f3b88ba95bb123a01256b3b9b9931e6b5ff30bf7c293c804f0faef0b07d0e0d1bdbbcaf531884b19a SHA512 988ed7f244c8b4fc9f629ef2b37a0ad851d9587f688e834041624cc92d8549e403545b83eb270b127e634c99f91ff8b53d2642df73dbfafe20aa41718b97ee5d
diff --git a/dev-ruby/allison/allison-2.0.3-r4.ebuild b/dev-ruby/allison/allison-2.0.3-r4.ebuild
deleted file mode 100644
index c229db629e6a..000000000000
--- a/dev-ruby/allison/allison-2.0.3-r4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
-RUBY_FAKEGEM_EXTRAINSTALL="cache"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A modern, pretty RDoc template"
-HOMEPAGE="https://fauna.github.com/fauna/allison/files/README.html"
-
-LICENSE="AFL-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-solaris"
-IUSE=""
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r contrib
-}
diff --git a/dev-ruby/allison/metadata.xml b/dev-ruby/allison/metadata.xml
deleted file mode 100644
index 658c72b1920d..000000000000
--- a/dev-ruby/allison/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/amatch/Manifest b/dev-ruby/amatch/Manifest
index 41f68f080440..26c8eadb56a0 100644
--- a/dev-ruby/amatch/Manifest
+++ b/dev-ruby/amatch/Manifest
@@ -1,2 +1 @@
-DIST amatch-0.4.0.gem 38912 BLAKE2B 065b4c537a2727cbb7f7d52aff545a3f7f8434b37553e59b261d9760ed304c24a20e4778c375e7b7fa11f40655cac786ca15cdb11360ac7296f03186439be480 SHA512 c5a1d17b46f51796d3f082ab9d18845625a28e08339756ebc0689ad6c50b1406611fd5a316e628e4dab6d9b654c969a4fc6e8c2b2079f04c64e3d990e95a64a0
 DIST amatch-0.4.1.gem 38912 BLAKE2B b485442f9b45dcd02bdff641a68cdbce0e15e81bcaddc71a792b6707621092e0f8181d194db49e82abfb3bf692e0b7ac27b21baed3004b3b5a4dfcdb8bff7d4c SHA512 98befe4cb5a78a754eb3596a55b7c004fbf26ba04a8e8314dd6f28b50feade0fc0a7b78493310de0a75b33720204e8ba9ccb05df4478b2631d15b7d9d62a42a9
diff --git a/dev-ruby/amatch/amatch-0.4.0-r1.ebuild b/dev-ruby/amatch/amatch-0.4.0-r1.ebuild
deleted file mode 100644
index c435a13d7944..000000000000
--- a/dev-ruby/amatch/amatch-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="Approximate Matching Extension for Ruby"
-HOMEPAGE="https://flori.github.com/amatch/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/tins-1*"
-
-# These packages also provide agrep, bug 626480
-RDEPEND+=" !app-misc/glimpse !app-text/agrep !dev-libs/tre"
-
-all_ruby_prepare() {
-	# mize is listed as a dependency but not actually used
-	sed -i -e '/mize/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S testrb-2 tests/* || die
-}
diff --git a/dev-ruby/amatch/amatch-0.4.1.ebuild b/dev-ruby/amatch/amatch-0.4.1.ebuild
index c435a13d7944..4c0399a8981e 100644
--- a/dev-ruby/amatch/amatch-0.4.1.ebuild
+++ b/dev-ruby/amatch/amatch-0.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
@@ -14,7 +14,7 @@ RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
 inherit ruby-fakegem
 
 DESCRIPTION="Approximate Matching Extension for Ruby"
-HOMEPAGE="https://flori.github.com/amatch/"
+HOMEPAGE="https://github.com/flori/amatch"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-ruby/amatch/metadata.xml b/dev-ruby/amatch/metadata.xml
index 658c72b1920d..4354cf5904f4 100644
--- a/dev-ruby/amatch/metadata.xml
+++ b/dev-ruby/amatch/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">flori/amatch</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ammeter/Manifest b/dev-ruby/ammeter/Manifest
index 06b6897e19ed..4f905182b99b 100644
--- a/dev-ruby/ammeter/Manifest
+++ b/dev-ruby/ammeter/Manifest
@@ -1 +1,3 @@
 DIST ammeter-1.1.5.gem 19968 BLAKE2B e4a7af65c8ee798b24f0c8a312315461779f5e1c31d97da1663d73b1a9cc65b99ed9f693259eed01a4152ab220d34ddb91ee4632657035fc1768897fae60d60e SHA512 35758fccaa51c9873747f24710168bdc0a0b25bd825d15e434cd17341d07f73a5078293d5045dcf88061765e92fe08f9b2470b4f206d859e82ec7befe64c1d93
+DIST ammeter-1.1.6.gem 19968 BLAKE2B 875da6f9be200b6df789f75b98224e30d0223a501fb54b94b9ef1c32a2c3c78cfe54c77e926ba0d17bc64faa42a357861818448889c6c25c698101deba05460d SHA512 13883aae0258c0354d5fec17f86d4851251e2a8138830113c94c20162294852c892f580e14df6407c88b6c64dbe87f241e392a1849d126d12d556462edcda147
+DIST ammeter-1.1.7.gem 19968 BLAKE2B ac503575d9c309c20f5b9ecbc31510862223199ba0f21801be3efef24d759f42c722581b1a518bc4225fdd0d7df3110f43bff79497b224ab8bc3fc4b6d57503e SHA512 7009f8c449180680327d09d84ad4eccf0f2adbf4a0ede0cc55d412396943af874254eb7ead92c8d818f4a8247f9d43d371f54de4001b9ae5e6ad6e6a66100673
diff --git a/dev-ruby/ammeter/ammeter-1.1.5-r1.ebuild b/dev-ruby/ammeter/ammeter-1.1.5-r1.ebuild
new file mode 100644
index 000000000000..f3703c32800b
--- /dev/null
+++ b/dev-ruby/ammeter/ammeter-1.1.5-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="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Write specs for your Rails 3+ generators"
+HOMEPAGE="https://github.com/alexrothenberg/ammeter"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/activesupport-3.0:*
+	>=dev-ruby/railties-3.0:*
+	>=dev-ruby/rspec-rails-2.2:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rails-4.0
+		>=dev-ruby/uglifier-1.3
+		>=dev-ruby/rake-0.10
+		>=dev-ruby/jquery-rails-3.0
+		dev-util/cucumber
+		dev-util/aruba
+		dev-ruby/sqlite3
+		dev-ruby/bundler
+	)"
+
+all_ruby_prepare() {
+	# fix the gemspec; we remove the version dependencies from there, as
+	# it requires _older_ versions of its dependencies.. it doesn't
+	# really seem to be the case though. Also remove the references to
+	# git ls-files to avoid calling it.
+	sed -i \
+		-e '/git ls-files/d' \
+		-e '/\(cucumber\|aruba\)/s:,.*$::' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# haml-rails is not packaged, coffee-rails and sass-rails are no longer maintained
+	sed -i -e '/\(coffee\|haml\|sass\)-rails/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} Gemfile || die
+	rm -f spec/ammeter/rspec/generator/matchers/have_correct_syntax_spec.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=">=4" ${RUBY} -S bundle exec ${RUBY} -S rspec-3 spec || die
+}
diff --git a/dev-ruby/ammeter/ammeter-1.1.5.ebuild b/dev-ruby/ammeter/ammeter-1.1.5.ebuild
deleted file mode 100644
index 3de18e3f1520..000000000000
--- a/dev-ruby/ammeter/ammeter-1.1.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Write specs for your Rails 3+ generators"
-HOMEPAGE="https://github.com/alexrothenberg/ammeter"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/activesupport-3.0:*
-	>=dev-ruby/railties-3.0:*
-	>=dev-ruby/rspec-rails-2.2:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rails-4.0
-		>=dev-ruby/uglifier-1.3
-		>=dev-ruby/rake-0.10
-		>=dev-ruby/coffee-rails-4.0
-		>=dev-ruby/sass-rails-4.0
-		>=dev-ruby/jquery-rails-3.0
-		dev-util/cucumber
-		dev-util/aruba
-		dev-ruby/sqlite3
-		dev-ruby/bundler
-	)"
-
-all_ruby_prepare() {
-	# fix the gemspec; we remove the version dependencies from there, as
-	# it requires _older_ versions of its dependencies.. it doesn't
-	# really seem to be the case though. Also remove the references to
-	# git ls-files to avoid calling it.
-	sed -i \
-		-e '/git ls-files/d' \
-		-e '/\(cucumber\|aruba\)/s:,.*$::' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# haml-rails is not packaged
-	sed -i -e '/haml-rails/d' ${RUBY_FAKEGEM_GEMSPEC} Gemfile || die
-	rm -f spec/ammeter/rspec/generator/matchers/have_correct_syntax_spec.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=">=4" ${RUBY} -S bundle exec ${RUBY} -S rspec-3 spec || die
-}
diff --git a/dev-ruby/ammeter/ammeter-1.1.6.ebuild b/dev-ruby/ammeter/ammeter-1.1.6.ebuild
new file mode 100644
index 000000000000..30ef5951988d
--- /dev/null
+++ b/dev-ruby/ammeter/ammeter-1.1.6.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="ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Write specs for your Rails 3+ generators"
+HOMEPAGE="https://github.com/alexrothenberg/ammeter"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/activesupport-3.0:*
+	>=dev-ruby/railties-3.0:*
+	>=dev-ruby/rspec-rails-2.2:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rails-4.0
+		>=dev-ruby/uglifier-1.3
+		>=dev-ruby/rake-0.10
+		>=dev-ruby/jquery-rails-3.0
+		dev-util/cucumber
+		dev-util/aruba
+		dev-ruby/sqlite3
+		dev-ruby/bundler
+	)"
+
+all_ruby_prepare() {
+	# fix the gemspec; we remove the version dependencies from there, as
+	# it requires _older_ versions of its dependencies.. it doesn't
+	# really seem to be the case though. Also remove the references to
+	# git ls-files to avoid calling it.
+	sed -i \
+		-e '/git ls-files/d' \
+		-e '/\(cucumber\|aruba\)/s:,.*$::' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# haml-rails is not packaged, coffee-rails and sass-rails are no longer maintained
+	sed -i -e '/\(coffee\|haml\|sass\)-rails/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} Gemfile || die
+	rm -f spec/ammeter/rspec/generator/matchers/have_correct_syntax_spec.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=">=4" ${RUBY} -S bundle exec ${RUBY} -S rspec-3 spec || die
+}
diff --git a/dev-ruby/ammeter/ammeter-1.1.7.ebuild b/dev-ruby/ammeter/ammeter-1.1.7.ebuild
new file mode 100644
index 000000000000..f424cc1bac89
--- /dev/null
+++ b/dev-ruby/ammeter/ammeter-1.1.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Write specs for your Rails 3+ generators"
+HOMEPAGE="https://github.com/alexrothenberg/ammeter"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/activesupport-3.0:*
+	>=dev-ruby/railties-3.0:*
+	>=dev-ruby/rspec-rails-2.2:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rails-4.0
+		>=dev-ruby/uglifier-1.3
+		>=dev-ruby/rake-0.10
+		>=dev-ruby/jquery-rails-3.0
+		dev-util/cucumber
+		dev-util/aruba
+		dev-ruby/sqlite3
+		dev-ruby/bundler
+	)"
+
+all_ruby_prepare() {
+	# fix the gemspec; we remove the version dependencies from there, as
+	# it requires _older_ versions of its dependencies.. it doesn't
+	# really seem to be the case though. Also remove the references to
+	# git ls-files to avoid calling it.
+	sed -i \
+		-e '/git ls-files/d' \
+		-e '/\(cucumber\|aruba\)/s:,.*$::' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# haml-rails is not packaged, coffee-rails and sass-rails are no longer maintained
+	sed -i -e '/\(coffee\|haml\|sass\)-rails/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} Gemfile || die
+	rm -f spec/ammeter/rspec/generator/matchers/have_correct_syntax_spec.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=">=4" ${RUBY} -S bundle exec ${RUBY} -S rspec-3 spec || die
+}
diff --git a/dev-ruby/amq-client/amq-client-1.0.4-r1.ebuild b/dev-ruby/amq-client/amq-client-1.0.4-r1.ebuild
index 34a9498d3994..e1dc912c71b8 100644
--- a/dev-ruby/amq-client/amq-client-1.0.4-r1.ebuild
+++ b/dev-ruby/amq-client/amq-client-1.0.4-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.textile"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_BINWRAP=""
 
@@ -32,4 +32,8 @@ all_ruby_prepare() {
 
 	# Drop integration tests since these require a running AMQP server.
 	rm -rf spec/integration spec/regression/bad_frame_slicing_in_adapters_spec.rb spec/unit/client_spec.rb || die
+
+	# Make specs compatible with rspec 3
+	sed -e 's/be_false/be_falsey/ ; s/be_true/be_truthy/' \
+		-i spec/unit/client/*_spec.rb spec/client/protocol/*_spec.rb || die
 }
diff --git a/dev-ruby/amq-protocol/amq-protocol-2.3.2-r1.ebuild b/dev-ruby/amq-protocol/amq-protocol-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..f628619ae7be
--- /dev/null
+++ b/dev-ruby/amq-protocol/amq-protocol-2.3.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An AMQP 0.9.1 serialization library for Ruby"
+HOMEPAGE="https://github.com/ruby-amqp/amq-protocol"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/rspec-its )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(simplecov\|effin_utf8\|byebug\)/ s:^:#:' Gemfile || die
+	sed -i -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid spec where host is either nil or "" depending on ruby version
+	sed -i -e '/falls back to default nil host/ s/it/xit/' spec/amq/uri_parsing_spec.rb || die
+}
diff --git a/dev-ruby/amq-protocol/amq-protocol-2.3.2.ebuild b/dev-ruby/amq-protocol/amq-protocol-2.3.2.ebuild
deleted file mode 100644
index e56d6a9ac602..000000000000
--- a/dev-ruby/amq-protocol/amq-protocol-2.3.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An AMQP 0.9.1 serialization library for Ruby"
-HOMEPAGE="https://github.com/ruby-amqp/amq-protocol"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/rspec-its )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(simplecov\|effin_utf8\|byebug\)/ s:^:#:' Gemfile || die
-	sed -i -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/amqp/Manifest b/dev-ruby/amqp/Manifest
deleted file mode 100644
index 3de1aa7eba2e..000000000000
--- a/dev-ruby/amqp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST amqp-1.8.0.gem 1175040 BLAKE2B 5c623201a378ecbd501d0f30d31873cfdc47088659d79a89eab21b510cbacad220df0122b3164f543f00a5587b74aab4ffb5d6879f0c30fc06ee17bd55600dcd SHA512 8575b3704cbaab5937a5880858bcc4610ecab4be66b9ef8633c1d49858a95fbb48b1245ba71ebce1b0d31e319cb6f133640097aaa779b8a32282f6d442098e7f
diff --git a/dev-ruby/amqp/amqp-1.8.0-r1.ebuild b/dev-ruby/amqp/amqp-1.8.0-r1.ebuild
deleted file mode 100644
index 8dd9260cbc0a..000000000000
--- a/dev-ruby/amqp/amqp-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="AMQP client implementation in Ruby/EventMachine"
-HOMEPAGE="http://rubyamqp.info/"
-
-LICENSE="Ruby"
-SLOT="1.4"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/multi_json dev-ruby/evented-spec )"
-ruby_add_rdepend ">=dev-ruby/eventmachine-0.12.4
-	>=dev-ruby/amq-protocol-2.2.0:2"
-
-all_ruby_prepare() {
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die
-
-	# Many specs require a live rabbit server, but only root can start
-	# an instance. Skip these specs for now.
-	rm -rf spec/integration spec/unit/amqp/connection_spec.rb || die
-}
-
-all_ruby_install() {
-	dodoc -r docs examples
-}
diff --git a/dev-ruby/amqp/metadata.xml b/dev-ruby/amqp/metadata.xml
deleted file mode 100644
index 658c72b1920d..000000000000
--- a/dev-ruby/amqp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/annoy/Manifest b/dev-ruby/annoy/Manifest
deleted file mode 100644
index 3e11f1853954..000000000000
--- a/dev-ruby/annoy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST annoy-0.5.6.gem 9728 BLAKE2B e8d4c8cef99be2a380c96fa596547b108a2ed7d8b9e8f996bf8bad163d8030c73c627a17afd564cbf446660bccad1a0287c6a05db9e6d68db8b55e20a5a6bbd1 SHA512 6cade9d766fa315042ba04922bba315157872a25bc2c7e5ea428c1f2343045d0a5d400dc8eade20f650f2cc6a64492020ef608d355963c09c5e6e8d454d3cc8f
diff --git a/dev-ruby/annoy/annoy-0.5.6-r2.ebuild b/dev-ruby/annoy/annoy-0.5.6-r2.ebuild
deleted file mode 100644
index 57484bc869ab..000000000000
--- a/dev-ruby/annoy/annoy-0.5.6-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Like your annoying friend that asks you questions all the time"
-HOMEPAGE="http://solutious.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend '>=dev-ruby/highline-1.5.0:*'
diff --git a/dev-ruby/annoy/metadata.xml b/dev-ruby/annoy/metadata.xml
deleted file mode 100644
index 658c72b1920d..000000000000
--- a/dev-ruby/annoy/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/ansi/ansi-1.5.0-r1.ebuild b/dev-ruby/ansi/ansi-1.5.0-r1.ebuild
deleted file mode 100644
index 5a8e4bd43e62..000000000000
--- a/dev-ruby/ansi/ansi-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="DEMO.md HISTORY.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The Ruby ANSI project is collection of ANSI escape codes for Ruby"
-HOMEPAGE="https://rubyworks.github.io/ansi/"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-# Tests cause circular dependencies with dev-ruby/qed & dev-ruby/rubytest
-RESTRICT="test"
diff --git a/dev-ruby/ansi/ansi-1.5.0-r2.ebuild b/dev-ruby/ansi/ansi-1.5.0-r2.ebuild
new file mode 100644
index 000000000000..607f385389c2
--- /dev/null
+++ b/dev-ruby/ansi/ansi-1.5.0-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="DEMO.md HISTORY.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The Ruby ANSI project is collection of ANSI escape codes for Ruby"
+HOMEPAGE="https://rubyworks.github.io/ansi/"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+# Tests cause circular dependencies with dev-ruby/qed & dev-ruby/rubytest
+RESTRICT="test"
+
+each_ruby_test() {
+	${RUBY} -S rubytest -Ilib -Itest test/ || die 'tests failed'
+}
diff --git a/dev-ruby/ansi/metadata.xml b/dev-ruby/ansi/metadata.xml
index 658c72b1920d..e95125780249 100644
--- a/dev-ruby/ansi/metadata.xml
+++ b/dev-ruby/ansi/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">rubyworks/ansi</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/appraisal/Manifest b/dev-ruby/appraisal/Manifest
new file mode 100644
index 000000000000..4cbacc20199b
--- /dev/null
+++ b/dev-ruby/appraisal/Manifest
@@ -0,0 +1 @@
+DIST appraisal-2.5.0.gem 26112 BLAKE2B b72a994167f332f91a94c8afdb611f9cf4ac573e741ed6fb509b8ecd0767422dbff9e61d062cafb8eb527180d0951821c8ddd9e097e391f464e18c905b34d447 SHA512 8ee9a4e60c25635577b00037816c61d10623045607ef051b6508a30b9d1b0885764275a7a688473e29d8dab0af9d188916217df9fb75667139a3acd9ed0db27d
diff --git a/dev-ruby/appraisal/appraisal-2.5.0.ebuild b/dev-ruby/appraisal/appraisal-2.5.0.ebuild
new file mode 100644
index 000000000000..d61b44221fe8
--- /dev/null
+++ b/dev-ruby/appraisal/appraisal-2.5.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby library for testing your library against different versions of dependencies"
+HOMEPAGE="https://github.com/thoughtbot/appraisal"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/bundler
+	dev-ruby/rake
+	>=dev-ruby/thor-0.14.0
+"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/activesupport-3.2.21
+)"
+
+all_ruby_prepare() {
+	sed -i -e '/thor/ s:^:#:' Gemfile || die
+
+	# Skip the acceptance tests since they expect to install gems from
+	# the network and do not expect multiple ruby versions to be
+	# present.
+	rm -rf spec/acceptance || die
+	sed -i -e '/built_in/ s:^:#:' spec/appraisal/appraisal_file_spec.rb || die
+}
diff --git a/dev-ruby/appraisal/metadata.xml b/dev-ruby/appraisal/metadata.xml
new file mode 100644
index 000000000000..b4b7de864849
--- /dev/null
+++ b/dev-ruby/appraisal/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">thoughtbot/appraisal</remote-id>
+		<remote-id type="rubygems">appraisal</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/arel-helpers/Manifest b/dev-ruby/arel-helpers/Manifest
index 8dff23e42253..fc69e00d8029 100644
--- a/dev-ruby/arel-helpers/Manifest
+++ b/dev-ruby/arel-helpers/Manifest
@@ -1 +1 @@
-DIST arel-helpers-2.13.0.gem 16896 BLAKE2B 3cdf4164b20dcc3511e058666486ea0d5a5eb50a7825d56338715f5bdba2dc5124ba030ea0e27480225be9d715a86016ff0eb85d0e60f07bdd5f3f214c3f5bcc SHA512 31e88e136a85f49e6b8b6d7c244bf98744cdf0546f0916ff1b403904330a1d2acc4a4d97ba5eb59190b9c0592176e4872d0463b4d4662b63a99f9d3bbcc29c15
+DIST arel-helpers-2.14.0.tar.gz 11711 BLAKE2B 75182a17ae741b2fe62189bccf008ca9958a69d69b5c2aced227e1b77f7278565f2c6261f56e567e4534c1e0229ce00e630bb1dc77ce8e49d03267784f8f8dc2 SHA512 47edec1aaa5be14de4ee695b13096dcf3f0c30804b20dfdc84421e1a779d3faa6241c022003f4752da911d1ea71a49de6e1e3339e6a3e452ca7fa8116ff751ca
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.13.0.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.13.0.ebuild
deleted file mode 100644
index 2ce0bc2f3056..000000000000
--- a/dev-ruby/arel-helpers/arel-helpers-2.13.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools to help construct database queries"
-HOMEPAGE="https://github.com/camertron/arel-helpers"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "|| (
-			dev-ruby/activerecord:6.1
-			dev-ruby/activerecord:6.0
-			dev-ruby/activerecord:5.2
-			)"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rr
-	dev-ruby/activerecord[sqlite]
-	dev-ruby/bundler
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/pry-/ s:^:#:' spec/spec_helper.rb || die
-	sed -e '/rake/ s/~>/>=/' -e '/appraisal/ s:^:#:' -e '/database_cleaner/ s/1.8/1.7/' -i arel-helpers.gemspec || die
-}
-
-each_ruby_test() {
-	bundle exec rspec spec || die
-}
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.14.0-r1.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.14.0-r1.ebuild
new file mode 100644
index 000000000000..62e4e4422c0f
--- /dev/null
+++ b/dev-ruby/arel-helpers/arel-helpers-2.14.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_S=${PN}-*
+RUBY_FAKEGEM_VERSION="$(ver_cut 1-3)"
+inherit ruby-fakegem
+
+DESCRIPTION="Tools to help construct database queries"
+HOMEPAGE="https://github.com/camertron/arel-helpers"
+# No test data in gems
+SRC_URI="https://github.com/camertron/arel-helpers/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+
+ruby_add_rdepend "
+	|| (
+		dev-ruby/activerecord:7.0
+		dev-ruby/activerecord:6.1
+	)
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/rr
+		dev-ruby/activerecord[sqlite]
+		dev-ruby/bundler
+		dev-ruby/combustion
+		>=dev-ruby/database_cleaner-1.8
+		>=dev-ruby/sqlite3-1.4
+	)
+"
+
+all_ruby_prepare() {
+	# pry is for debugging, not useful here
+	sed -i -e '/pry-/ s:^:#:' spec/spec_helper.rb || die
+
+	sed \
+		-e '/rake/ s/~>/>=/' \
+		-e '/appraisal/ s:^:#:' \
+		-e '/database_cleaner/ s/1.8/1.7/' \
+		-e '/database_cleaner/ s/~>/>=/' \
+		-e '/sqlite3/ s/~>/>=/' \
+		-i arel-helpers.gemspec || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake spec || die
+}
diff --git a/dev-ruby/arel-helpers/metadata.xml b/dev-ruby/arel-helpers/metadata.xml
index 3a8927c992b9..df65d6814770 100644
--- a/dev-ruby/arel-helpers/metadata.xml
+++ b/dev-ruby/arel-helpers/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
     <remote-id type="github">camertron/arel-helpers</remote-id>
diff --git a/dev-ruby/arel/Manifest b/dev-ruby/arel/Manifest
deleted file mode 100644
index 018ccc00f186..000000000000
--- a/dev-ruby/arel/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST arel-9.0.0.tar.gz 59065 BLAKE2B c464c8c52d0fa7c5626fdc9254c74db00e4b43f68f38b75972623f28961565cd6764db967158c48e938620636343b15c4be9bb3237f9c7422730b4702450eb6d SHA512 9d2958765058fa8a4f6a8d7d4c9671d92054748eabe5b94796ff5611cdcd6bb24906cc5e813fb21396aaa681e5703d2d4bce8cc9884f2d057042d1b06bf6f0f5
diff --git a/dev-ruby/arel/arel-9.0.0.ebuild b/dev-ruby/arel/arel-9.0.0.ebuild
deleted file mode 100644
index 5ebc8d41dbfd..000000000000
--- a/dev-ruby/arel/arel-9.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
-
-RUBY_FAKEGEM_GEMSPEC="arel.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Arel is a Relational Algebra for Ruby"
-HOMEPAGE="https://github.com/rails/arel"
-SRC_URI="https://github.com/rails/arel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1).0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/concurrent-ruby:1
-		dev-ruby/test-unit:2
-		>=dev-ruby/minitest-5.4:5
-	)"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" \
-		-e '/specname/,$ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/arel/metadata.xml b/dev-ruby/arel/metadata.xml
deleted file mode 100644
index f2c343702276..000000000000
--- a/dev-ruby/arel/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rails/arel</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ascii85/ascii85-1.1.0-r1.ebuild b/dev-ruby/ascii85/ascii85-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..49be7903af52
--- /dev/null
+++ b/dev-ruby/ascii85/ascii85-1.1.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md History.txt"
+
+RUBY_FAKEGEM_NAME="Ascii85"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Methods for encoding/decoding Adobe's binary-to-text encoding of the same name"
+HOMEPAGE="https://github.com/datawraith/ascii85gem"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+}
diff --git a/dev-ruby/ascii85/ascii85-1.1.0.ebuild b/dev-ruby/ascii85/ascii85-1.1.0.ebuild
deleted file mode 100644
index c28d7b412d5a..000000000000
--- a/dev-ruby/ascii85/ascii85-1.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md History.txt"
-
-RUBY_FAKEGEM_NAME="Ascii85"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Methods for encoding/decoding Adobe's binary-to-text encoding of the same name"
-HOMEPAGE="https://github.com/datawraith/ascii85gem"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-}
diff --git a/dev-ruby/asciidoctor-diagram/Manifest b/dev-ruby/asciidoctor-diagram/Manifest
index 33c8364094f7..9f79f962cac3 100644
--- a/dev-ruby/asciidoctor-diagram/Manifest
+++ b/dev-ruby/asciidoctor-diagram/Manifest
@@ -1 +1,4 @@
 DIST asciidoctor-diagram-2.0.5.tar.gz 12482984 BLAKE2B b0ef8596d2f2dfcf11fcbba876141aee38e8615195159f76e07b45c00b46bd85824dd6e8e9f571b396bbd9d082c5d60d4e05cdeac27719bfca53216c0d1b1816 SHA512 7e3bfbfb08d7389a039b1727bc173fca82e05134bebd89f3ca65d5e7860555034ff5e785c32e55ea2cc9826343456c6ecdfa15fc76f4d94858461356ab3ced71
+DIST asciidoctor-diagram-2.2.11.tar.gz 15488606 BLAKE2B e0080ecafafcaef72ae1ca449d4ea2d4b69b1550d62cacb514350da047952adbddc0c9f48081fe7acae7f174c6b910c297357ef57df09c0c5a379a3332eb38e8 SHA512 233d2940516fa28863e53b7e4f43851256fdcc83e92fc5d4eafdc2e820a8040473c89f7f01397bdb26b6c4fbd9e6fcb576156c4abd949660ade37d152c8e5e40
+DIST asciidoctor-diagram-2.2.12.tar.gz 14093006 BLAKE2B 2f2349c6694c35ea74bfc74e145eb2f34a422354e1ad4bc87b23bda66443ced7b14ccbce3b015d545fd84d89a6aee44c0c98743b9410c0a460571c83ca1c03ca SHA512 0a960a0f48bd1c129b218f0b70686f7d2f5745f84e484e3152e2532c51bf2987bbefec4cef06d579de1c881545ecdc34a607a00ad1af09ed748c7c66571570ac
+DIST asciidoctor-diagram-2.2.14.tar.gz 14085153 BLAKE2B b62fbbc0ba5a5c53a92b1c9cd7d20047a0e6f4ec71ff7daeab379c3be2546b105b900e7fa6c49f00f6320de2087115d5944b9df9be443ad60cc0d330d5b12234 SHA512 8e343726788e61fa6846d756911f3df9ef276f706ec2668e7d74fc7b5b2cf3c8984f1d5031af5d8d2c55260f3bebf981d0bcd5dd1c032e504b32bee167cb626e
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5-r1.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5-r1.ebuild
index e19bb7db440a..e410dc816a2a 100644
--- a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5-r1.ebuild
+++ b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5-r1.ebuild
@@ -1,9 +1,9 @@
-# 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"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -23,6 +23,14 @@ KEYWORDS="~amd64"
 IUSE=""
 
 RDEPEND+=" virtual/jre"
+DEPEND+=" test? (
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+	media-gfx/imagemagick[png,postscript]
+	media-gfx/graphviz
+	media-sound/lilypond
+	sci-visualization/gnuplot
+)"
 ruby_add_rdepend ">=dev-ruby/asciidoctor-1.5.7 <dev-ruby/asciidoctor-3"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5.ebuild
deleted file mode 100644
index 48579c8ab99e..000000000000
--- a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc LICENSE.txt README.adoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A set of Asciidoctor extensions that enable you to add diagrams"
-HOMEPAGE="https://github.com/asciidoctor/asciidoctor-diagram"
-SRC_URI="https://github.com/asciidoctor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/asciidoctor-1.5.7 <dev-ruby/asciidoctor-3"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/c.formatter/ s:^:#:' spec/test_helper.rb || die
-
-	# Avoid specs for unpackaged tools
-	rm -f spec/{a2s,blockdiag,bpmn,bytefield,dpic,erd,mermaid,msc,nomnoml,pikchr,shaape,smcat,svgbob,symbolator,syntrax,umlet,vega,wavedrom}_spec.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-}
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.2.11.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.2.11.ebuild
new file mode 100644
index 000000000000..cb24f379e007
--- /dev/null
+++ b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.2.11.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc LICENSE.txt README.adoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A set of Asciidoctor extensions that enable you to add diagrams"
+HOMEPAGE="https://github.com/asciidoctor/asciidoctor-diagram"
+SRC_URI="https://github.com/asciidoctor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND+=" virtual/jre"
+DEPEND+=" test? (
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+	media-gfx/imagemagick[png,postscript]
+	media-gfx/graphviz
+	media-sound/lilypond
+	sci-visualization/gnuplot
+)"
+ruby_add_rdepend ">=dev-ruby/asciidoctor-1.5.7 <dev-ruby/asciidoctor-3"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -e '/c.formatter/ s:^:#:' \
+		-e '/logger.*DEBUG/ s:^:#:' \
+		-i spec/test_helper_methods.rb || die
+
+	# Remove some diagram dependencies that contains vendored code and
+	# are currently not packaged. Please file a bug if you have a need
+	# for these diagram types.
+	sed -i -e '/\(ditaamini\|plantuml\)/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs for unpackaged tools
+	rm -f spec/{a2s,barcode,blockdiag,bpmn,bytefield,d2,dbml,diagrams,ditaa,dpic,erd,graphviz_py,mermaid,msc,nomnoml,pikchr,plantuml,shaape,smcat,structurizr,svgbob,symbolator,syntrax,umlet,vega,wavedrom}_spec.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+}
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.2.12.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.2.12.ebuild
new file mode 100644
index 000000000000..cb24f379e007
--- /dev/null
+++ b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.2.12.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc LICENSE.txt README.adoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A set of Asciidoctor extensions that enable you to add diagrams"
+HOMEPAGE="https://github.com/asciidoctor/asciidoctor-diagram"
+SRC_URI="https://github.com/asciidoctor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND+=" virtual/jre"
+DEPEND+=" test? (
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+	media-gfx/imagemagick[png,postscript]
+	media-gfx/graphviz
+	media-sound/lilypond
+	sci-visualization/gnuplot
+)"
+ruby_add_rdepend ">=dev-ruby/asciidoctor-1.5.7 <dev-ruby/asciidoctor-3"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -e '/c.formatter/ s:^:#:' \
+		-e '/logger.*DEBUG/ s:^:#:' \
+		-i spec/test_helper_methods.rb || die
+
+	# Remove some diagram dependencies that contains vendored code and
+	# are currently not packaged. Please file a bug if you have a need
+	# for these diagram types.
+	sed -i -e '/\(ditaamini\|plantuml\)/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs for unpackaged tools
+	rm -f spec/{a2s,barcode,blockdiag,bpmn,bytefield,d2,dbml,diagrams,ditaa,dpic,erd,graphviz_py,mermaid,msc,nomnoml,pikchr,plantuml,shaape,smcat,structurizr,svgbob,symbolator,syntrax,umlet,vega,wavedrom}_spec.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+}
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.2.14.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.2.14.ebuild
new file mode 100644
index 000000000000..e8cf9c986fda
--- /dev/null
+++ b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.2.14.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc LICENSE.txt README.adoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A set of Asciidoctor extensions that enable you to add diagrams"
+HOMEPAGE="https://github.com/asciidoctor/asciidoctor-diagram"
+SRC_URI="https://github.com/asciidoctor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Supported backends dictionary: <backend-name> <dependencies> <removal-function>
+# backend-name: The name of the USE flag, a gem spec file in ./spec, a
+#   directory in ./lib/asciidoctor-diagram/, and a require directive in
+#   ./lib/asciidoctor.rb which will be removed if the former is unset.
+# dependencies: Dependencies for RDEPEND if the USE flag is set, and for
+#   DEPEND if the "test" USE flag is set.
+# removal-function: Additional commands to evaluate, if the USE flag is unset.
+#
+# NB: Do not implicitly use functions following a naming scheme instead
+# of an explicit <removal-function> to prevent accidental or malicious
+# injection from functions exported in the parent environment.
+backend_dict_stride=3
+backends=(
+	"barcode" "dev-ruby/rqrcode dev-ruby/barby" ""
+	"ditaa" "media-gfx/ditaa" "remove_ditaa"
+	"gnuplot" "sci-visualization/gnuplot" ""
+	"graphviz" "media-gfx/graphviz" ""
+	"lilypond" "media-sound/lilypond" ""
+	"meme" "media-gfx/imagemagick[png]" ""
+	"mscgen" "media-gfx/mscgen[png]" ""
+	"plantuml" "media-gfx/plantuml" "remove_plantuml"
+	"tikz" "dev-tex/pgf" ""
+)
+
+remove_plantuml() {
+	rm -f "spec/salt.rb"
+	sed -i "/\\/salt'/d" "lib/asciidoctor-diagram.rb"
+	sed -i "/plantuml/d" "asciidoctor-diagram.gemspec"
+}
+
+remove_ditaa() {
+	sed -i "/ditaa/d" "asciidoctor-diagram.gemspec"
+}
+
+IUSE=""
+DEPEND+="test? ("
+
+i=0
+while (( i < ${#backends[@]} ))
+do
+	backend="${backends[i]}"
+	deps="${backends[i+1]}"
+
+	IUSE+=" $backend"
+	RDEPEND+=" $backend? ( $deps )"
+	DEPEND+=" $deps"
+
+	((i+=backend_dict_stride))
+done
+
+DEPEND+=" )"
+
+ruby_add_rdepend ">=dev-ruby/asciidoctor-1.5.7 <dev-ruby/asciidoctor-3 dev-ruby/rexml"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -e '/c.formatter/ s:^:#:' \
+		-e '/logger.*DEBUG/ s:^:#:' \
+		-i spec/test_helper_methods.rb || die
+
+	# Delete everything related to unsupported backends. Obtain list of backends from spec/
+	for spec in spec/*_spec.rb
+	do
+		backend="${spec##spec/}"
+		backend="${backend%%_spec.rb}"
+
+		backend_index=0
+
+		get_backend_index() {
+			local i=0
+			while (( i < ${#backends[@]} ))
+			do
+				if [[ "${backends[i]}" == "$backend" ]]
+				then
+					echo "$i"
+					return 1
+				fi
+				((i+=backend_dict_stride))
+			done
+		}
+
+		if backend_index="$(get_backend_index)" || ! use "$backend"
+		then
+			rm -f "spec/${backend}_spec.rb"
+			rm -Rf "lib/asciidoctor-diagram/"{"$backend.rb","$backend"}
+			sed -i "/\\/$backend'/d" "lib/asciidoctor-diagram.rb"
+			removal="${backends[backend_index+2]}"
+			if [[ "$removal" ]]
+			then
+				"$removal"
+			fi
+		fi
+	done
+}
+
+all_ruby_install() {
+	all_fakegem_install
+}
diff --git a/dev-ruby/asciidoctor-diagram/metadata.xml b/dev-ruby/asciidoctor-diagram/metadata.xml
index 86e0cfdef59c..da8316aae3c5 100644
--- a/dev-ruby/asciidoctor-diagram/metadata.xml
+++ b/dev-ruby/asciidoctor-diagram/metadata.xml
@@ -8,4 +8,13 @@
   <upstream>
     <remote-id type="github">asciidoctor/asciidoctor-diagram</remote-id>
   </upstream>
+  <use>
+    <flag name="barcode">Enable diagrams with <pkg>dev-ruby/rqrcode</pkg> and <pkg>dev-ruby/barby</pkg></flag>
+    <flag name="ditaa">Enable diagrams with <pkg>media-gfx/ditaa</pkg></flag>
+    <flag name="lilypond">Enable diagrams with <pkg>media-sound/lilypond</pkg></flag>
+    <flag name="meme">Enable diagrams with <pkg>media-gfx/imagemagick</pkg></flag>
+    <flag name="mscgen">Enable diagrams with <pkg>media-gfx/mscgen</pkg></flag>
+    <flag name="plantuml">Enable diagrams with <pkg>media-gfx/plantuml</pkg></flag>
+    <flag name="tikz">Enable diagrams with <pkg>dev-tex/pgf</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
index f44d9d197471..1fd855716cb5 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -1,2 +1,3 @@
-DIST asciidoctor-2.0.15.tar.gz 1633310 BLAKE2B 58029acdf3832459dde5df2835749bb781ccbaa547fa4a09dc10a69fbef36ed690fac7cd0e2b3da1a5de847be678d0ad410c17c6768e466fffc7ad30b5d9d4bf SHA512 4cd0ce922d5db5bc5b31ebc75707c2e9e2a94a2a28eeb68ed25f55c46c416c950d28b880c4b1ab52bbcdda9ee4ee7b1c297049754d214983b68eedf2d96492d8
-DIST asciidoctor-2.0.16.tar.gz 1651396 BLAKE2B 6da2971c38e48497b482ca1bc22916a10c3505d7bd4fa802ffd4939a0c0986d650a30b5870fea7979046c4b61c6e97aec08d9ba345ce350de6721d545c2923b5 SHA512 95003640632cc99f1edd2447156135267ad78f24983418817f19256fab6e313b8faab9f676317e7cc610728abb8b047f2d2f481f4700009a2d6bdd3b9efcc463
+DIST asciidoctor-2.0.18.tar.gz 1690964 BLAKE2B 5e14371c7201f83529fa28a63b031599ebf53fda62b4701942f134e7f1dae923a07676aafeac4c5e1fc3c25b6e9044b34b9b2e5b07491f1ca8e68076aa02301b SHA512 b47b377520046d95101fc9bcd3defdf7219714ebadc0d069cb108d39a349fcf1abd1e61178e1515f75bb69e9e3d0f8cb2de67de5a0f8aa75fdd139d693c0e437
+DIST asciidoctor-2.0.20.tar.gz 1700888 BLAKE2B 0b09610cc4a642eacd608bfbe8054c9358aca908adba088a21deceb25374fa4796a53a619957c9974fcb576016ce6573c891b39a6c6d66aa73585cd637310ff0 SHA512 b6b730de8f83e36630dc6146b4c0e07a26b502b695e78e50fc87790391126d52ef0b6b02b82ecb225adff680c94305b4e31403cc067bdbf1740e2d759417f440
+DIST asciidoctor-2.0.22.tar.gz 1707063 BLAKE2B 2e1e00f9e972e58453e731e84dc176bb9d1ef7b08e47986d9a892b53a8b29fe583de193ab8baa882b60a941fb095d8253054674d15107a4fd2ef66eff1fc41e9 SHA512 8c610e3710543334707e7f8c269d061c0e7a499d6840413a84b21ebb7909f78782942f38e831858b0dc8824f39da3da9e6e97734774e58bc64cab2b41d96d222
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.15.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.15.ebuild
deleted file mode 100644
index 76217435521e..000000000000
--- a/dev-ruby/asciidoctor/asciidoctor-2.0.15.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test features"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-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/erubis
-	dev-ruby/haml
-	dev-ruby/nokogiri
-	dev-ruby/rouge
-	dev-ruby/slim
-	dev-ruby/tilt )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/asciidoctor.1
-}
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.16.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.16.ebuild
deleted file mode 100644
index 436da494edbd..000000000000
--- a/dev-ruby/asciidoctor/asciidoctor-2.0.16.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-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 ~riscv ~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/erubis
-	dev-ruby/haml
-	dev-ruby/nokogiri
-	dev-ruby/rouge
-	dev-ruby/slim
-	dev-ruby/tilt )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-
-	sed -i -e "s:_relative ': './:" ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/asciidoctor.1
-}
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/asciidoctor-2.0.18.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.18.ebuild
new file mode 100644
index 000000000000..459e77a3e9a5
--- /dev/null
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.18.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+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 ~riscv 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
+	dev-ruby/nokogiri
+	dev-ruby/rouge
+	dev-ruby/slim
+	dev-ruby/tilt )"
+
+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/asciidoctor-2.0.20.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.20.ebuild
new file mode 100644
index 000000000000..bd6c662a73d7
--- /dev/null
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.20.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="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 ~riscv ~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 )"
+
+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/asciidoctor-2.0.22.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.22.ebuild
new file mode 100644
index 000000000000..dbbcfc8b9eae
--- /dev/null
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.22.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+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 ~riscv ~x86"
+IUSE="test"
+
+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 )"
+
+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
+
+	# Avoid test depending on haml 6 binary which we currently don't install.
+	sed -e '/should \(load\|locate\) custom templates/askip "wrong haml binary"' \
+		-i test/invoker_test.rb || die
+
+	# Add missing require for URI
+	sed -e "/nokogiri/arequire 'uri'" \
+		-i test/test_helper.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/asciimath/Manifest b/dev-ruby/asciimath/Manifest
index b97e829a4f92..c79628711c21 100644
--- a/dev-ruby/asciimath/Manifest
+++ b/dev-ruby/asciimath/Manifest
@@ -1,6 +1 @@
-DIST asciimath-1.0.9.gem 18944 BLAKE2B 3ccc3f594d7a0d8b6996349d85356179ef3a9052a84f923ad1d0976e42f58670a350473b41d1c4a0c4f70a3cc4687e6adaa7987bd811ef32bd3da41f100f4246 SHA512 32c4f2cb7e9d330c371e9b9abcdf9e31bf44014c5c0b0044589302116b55840a2e1a41ab006d61a2258e4a5c2d4a772dad77f579150fc9bf099a7a4d19c6cd44
-DIST asciimath-2.0.0.gem 57344 BLAKE2B 18cb2ca27a626bbb241768d070c47c981ae1f3a626cd9f476e7511f04f73154a1c3742338d92540bbd78fadbf775f4db7d2558c451fc8a276002fc5adc044ece SHA512 4823e7fa2e3107765d2804d15f5250dc30572099405df988ffe13f17ed584043bb7e48794cabc9b9853997083c57af5f3d73d20223ada95d00f997363130bedd
-DIST asciimath-2.0.1.gem 58880 BLAKE2B 6c17698f6515468c1c0b17408968f492a40a90cbec5184e78da8c9b9c23f2a6887f4d8ed1c99a68ed36489d27187dd73dc6ce992efc3ce144091131e36bc5e40 SHA512 e8c63e5f6035189460ac4975bb0471ffa418ba139ab806ae46badb74c1164d2852aef3aa799a0713a01486cea5c6087add6115ea22908bf3b70d1ab5fe339768
-DIST asciimath-2.0.2.gem 59904 BLAKE2B 2a8d57a606412be75ef047b5af29acb519b05026b12c6b691eab0630190706e00d1d8d65101d4397321191ad6d2c8f9e359e25994dd17302ff2692ebaa025a91 SHA512 53f573a9d7b01eded3c951b42a8353716679c189edd68129c49cdf0a719316f26d39ccf2704ae24c22dd64770bb8337553aa32d4f240bf1e249133ca95d849a8
-DIST asciimath-2.0.3.gem 59392 BLAKE2B 7d1d373c5d80172e88ba5737ea2244c384f274c200fed2104b23e76b6615f5bc987e14acb5c8d9088069f590eed5c645a2f51338540197a2ef9c44696f704488 SHA512 748c8ff121190470299c1e04100e063fd7352a0adaeda160a235d1f0f0ccb02108274ffe8ab4f1f54b07eb750d637e26f2efb6aac12d3389dafe1c00be103f4c
-DIST asciimath-2.0.4.gem 60416 BLAKE2B 9a5d6bf967962d37e620d0b49204ba8dafadf65e95a613924c7c169fee98f00203861fbbb1c06db1ee833e401f9a2141566dc693237e1cb7e797e639c63dccfa SHA512 28ab7fd7f43320112c0e7166fb2a6ef269eb91314940deb88606443bec055792cf3c49bc2d9b75c1e5ee5690c3071e66f15f817c4539fc6246da7a8d792f1803
+DIST asciimath-2.0.5.gem 60928 BLAKE2B ba81e68f4ae529dab80a40e5d268137af743d8c01f22c84c39c91102bea0b2293871158d157f19bd4213a59b5808a26a5d99697d79750b8a3fc39436426979f2 SHA512 05328306e0b750baf49eb090b02d3e840e58a764ed96dc511fc9fd1b7c3fd0b49e0be0d3300acadd809c0b2860fa2ad873e979711d6725e1420782395c5a2185
diff --git a/dev-ruby/asciimath/asciimath-1.0.9.ebuild b/dev-ruby/asciimath/asciimath-1.0.9.ebuild
deleted file mode 100644
index c637713081cc..000000000000
--- a/dev-ruby/asciimath/asciimath-1.0.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby AsciiMath parsing and conversion library"
-HOMEPAGE="https://github.com/pepijnve/asciimath"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-IUSE=""
diff --git a/dev-ruby/asciimath/asciimath-2.0.0.ebuild b/dev-ruby/asciimath/asciimath-2.0.0.ebuild
deleted file mode 100644
index eb017c70ce9d..000000000000
--- a/dev-ruby/asciimath/asciimath-2.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby AsciiMath parsing and conversion library"
-HOMEPAGE="https://github.com/pepijnve/asciimath"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
diff --git a/dev-ruby/asciimath/asciimath-2.0.1.ebuild b/dev-ruby/asciimath/asciimath-2.0.1.ebuild
deleted file mode 100644
index af059ffbabe4..000000000000
--- a/dev-ruby/asciimath/asciimath-2.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby AsciiMath parsing and conversion library"
-HOMEPAGE="https://github.com/pepijnve/asciimath"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
diff --git a/dev-ruby/asciimath/asciimath-2.0.2.ebuild b/dev-ruby/asciimath/asciimath-2.0.2.ebuild
deleted file mode 100644
index d242eb5cb1d8..000000000000
--- a/dev-ruby/asciimath/asciimath-2.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby AsciiMath parsing and conversion library"
-HOMEPAGE="https://github.com/pepijnve/asciimath"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
diff --git a/dev-ruby/asciimath/asciimath-2.0.3.ebuild b/dev-ruby/asciimath/asciimath-2.0.3.ebuild
deleted file mode 100644
index 36109ee9d0c9..000000000000
--- a/dev-ruby/asciimath/asciimath-2.0.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby AsciiMath parsing and conversion library"
-HOMEPAGE="https://github.com/pepijnve/asciimath"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
diff --git a/dev-ruby/asciimath/asciimath-2.0.4.ebuild b/dev-ruby/asciimath/asciimath-2.0.4.ebuild
deleted file mode 100644
index 505bbab1dbf1..000000000000
--- a/dev-ruby/asciimath/asciimath-2.0.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby AsciiMath parsing and conversion library"
-HOMEPAGE="https://github.com/pepijnve/asciimath"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
diff --git a/dev-ruby/asciimath/asciimath-2.0.5.ebuild b/dev-ruby/asciimath/asciimath-2.0.5.ebuild
new file mode 100644
index 000000000000..d47558a02368
--- /dev/null
+++ b/dev-ruby/asciimath/asciimath-2.0.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby AsciiMath parsing and conversion library"
+HOMEPAGE="https://github.com/asciidoctor/asciimath"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
diff --git a/dev-ruby/asciimath/metadata.xml b/dev-ruby/asciimath/metadata.xml
index a4001e7edbe1..2d4ed20e31b5 100644
--- a/dev-ruby/asciimath/metadata.xml
+++ b/dev-ruby/asciimath/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">pepijnve/asciimath</remote-id>
+    <remote-id type="github">asciidoctor/asciimath</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ast/ast-2.4.2-r1.ebuild b/dev-ruby/ast/ast-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..88e47615e931
--- /dev/null
+++ b/dev-ruby/ast/ast-2.4.2-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ast.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for working with abstract syntax trees"
+HOMEPAGE="https://github.com/whitequark/ast"
+SRC_URI="https://github.com/whitequark/ast/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-ruby/bacon )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e "/git ls/d" ${PN}.gemspec || die
+	sed -i -e "/simplecov/,+11d" -e "/colored_output/d" test/helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bacon -Itest -a || die
+}
diff --git a/dev-ruby/ast/ast-2.4.2.ebuild b/dev-ruby/ast/ast-2.4.2.ebuild
deleted file mode 100644
index f2c7ef3b0b8b..000000000000
--- a/dev-ruby/ast/ast-2.4.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="ast.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for working with abstract syntax trees"
-HOMEPAGE="https://github.com/whitequark/ast"
-SRC_URI="https://github.com/whitequark/ast/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/bacon )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e "/git ls/d" ${PN}.gemspec || die
-	sed -i -e "/simplecov/,+11d" -e "/colored_output/d" test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bacon -Itest -a || die
-}
diff --git a/dev-ruby/async-container/Manifest b/dev-ruby/async-container/Manifest
new file mode 100644
index 000000000000..baad17a8a916
--- /dev/null
+++ b/dev-ruby/async-container/Manifest
@@ -0,0 +1,5 @@
+DIST async-container-0.16.12.tar.gz 22626 BLAKE2B 8e850ebededcc0110a8ddf79c23287d816973fee1c32b7e7b76a7158995ffca5476d8701b3b4499aa3c0fd023ee9f253e4d07bc9ad0562a32d529678d0569701 SHA512 d71bdd1dc22a7ebecd4fed7e17b28c9ae1c875e111db4fb9cddda3508113e3cb7fc72b820c447cac27f047606d20f62180b203e58164da18dc47cff385262441
+DIST async-container-0.16.13.tar.gz 24969 BLAKE2B 94345cff96924994b07bb70db48064122c32cf07a65736a7db709087c0f4f9bd06c3810a1b04e4d4625ebfccb6c595188e96c64025822ac318ba636a98f85a82 SHA512 c36d98eb99c65eada8463b5b95c81ffb7e80d898edea823e9e45a3dd657f81e7cc291a79b267bf26fba577b4b86844ed70c74d55c684c09da9e6f950516878a7
+DIST async-container-0.17.0.tar.gz 25019 BLAKE2B 713caa99e9649fd45dee53bf13fad75178a7f8a880f940ec422c17d3c1402099b75b70cf0c2bd93c9cbd84fc576df881559a2f6ab16e47ef780d83650c5eb66e SHA512 48b109c75b45796c95fcd938538aea8c3c829520496e58d06f1c047d83a2c3950c38fc004dcda425b42d85c626b8bbd1d3784ae23911b786fc576b13ffc6af88
+DIST async-container-0.17.1.tar.gz 25024 BLAKE2B da7d268dd7f8c599068f6f588c966866d5ea495d0f6112317f8910cb3e4974826915f9cdc3847faf09306ea01ed00cb1ced77b5197b58bbc44d584d05b1758e5 SHA512 5f57760820a621e303205bfa134da59ebbde3c017e71bf2a9bce8a511937b83060939798a9682c6eb15f99a4be657dc18cc8a5fc5f260ea8427ce2d6d70f6e44
+DIST async-container-0.18.0.tar.gz 25787 BLAKE2B 8c0d41a884231136bca19161e6d49074d0ad2571c323ff5120ce848bb7cdfbd5971724a17a6b3537c32f71731067ac2a61149d4eeb1c11e69c0f7c934a4f2412 SHA512 b7bc90173032fb6b4875d8e300748ebbf42f6088cb3c9a5249ac79c6f9cee9b4542c106e6a5f775b990e62778dd779048212f734bcec4d7cdf3dbfc7301d40cf
diff --git a/dev-ruby/async-container/async-container-0.16.12-r1.ebuild b/dev-ruby/async-container/async-container-0.16.12-r1.ebuild
new file mode 100644
index 000000000000..bcbdcd405842
--- /dev/null
+++ b/dev-ruby/async-container/async-container-0.16.12-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022-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_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Abstract container-based parallelism using threads and processes"
+HOMEPAGE="https://github.com/socketry/async-container"
+SRC_URI="https://github.com/socketry/async-container/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/async
+	dev-ruby/async-io"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	>=dev-ruby/async-rspec-1.1:1
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# spec/async/container/notify/pipe_spec.rb directly executes "bundler" command,
+	# so we can't just wipe out gems.rb as usual.  also must remove covered from gemspec
+	# for this reason.
+	sed -i -E 's/gem ".+"//g' "gems.rb" || die
+	sed -i -e '/spec.add_development_dependency "covered"/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid test dependency on unpackaged covered
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/async-container/async-container-0.16.13.ebuild b/dev-ruby/async-container/async-container-0.16.13.ebuild
new file mode 100644
index 000000000000..f5d1fac12ae8
--- /dev/null
+++ b/dev-ruby/async-container/async-container-0.16.13.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Abstract container-based parallelism using threads and processes"
+HOMEPAGE="https://github.com/socketry/async-container"
+SRC_URI="https://github.com/socketry/async-container/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/async
+	dev-ruby/async-io"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	>=dev-ruby/async-rspec-1.1:1
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# spec/async/container/notify/pipe_spec.rb directly executes "bundler" command,
+	# so we can't just wipe out gems.rb as usual.  also must remove covered from gemspec
+	# for this reason.
+	sed -i -E 's/gem ".+"//g' "gems.rb" || die
+	sed -i -e '/spec.add_development_dependency "covered"/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid test dependency on unpackaged covered
+	rm -f config/sus.rb || die
+}
diff --git a/dev-ruby/async-container/async-container-0.17.0.ebuild b/dev-ruby/async-container/async-container-0.17.0.ebuild
new file mode 100644
index 000000000000..f5d1fac12ae8
--- /dev/null
+++ b/dev-ruby/async-container/async-container-0.17.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Abstract container-based parallelism using threads and processes"
+HOMEPAGE="https://github.com/socketry/async-container"
+SRC_URI="https://github.com/socketry/async-container/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/async
+	dev-ruby/async-io"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	>=dev-ruby/async-rspec-1.1:1
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# spec/async/container/notify/pipe_spec.rb directly executes "bundler" command,
+	# so we can't just wipe out gems.rb as usual.  also must remove covered from gemspec
+	# for this reason.
+	sed -i -E 's/gem ".+"//g' "gems.rb" || die
+	sed -i -e '/spec.add_development_dependency "covered"/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid test dependency on unpackaged covered
+	rm -f config/sus.rb || die
+}
diff --git a/dev-ruby/async-container/async-container-0.17.1.ebuild b/dev-ruby/async-container/async-container-0.17.1.ebuild
new file mode 100644
index 000000000000..f5d1fac12ae8
--- /dev/null
+++ b/dev-ruby/async-container/async-container-0.17.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Abstract container-based parallelism using threads and processes"
+HOMEPAGE="https://github.com/socketry/async-container"
+SRC_URI="https://github.com/socketry/async-container/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/async
+	dev-ruby/async-io"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	>=dev-ruby/async-rspec-1.1:1
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# spec/async/container/notify/pipe_spec.rb directly executes "bundler" command,
+	# so we can't just wipe out gems.rb as usual.  also must remove covered from gemspec
+	# for this reason.
+	sed -i -E 's/gem ".+"//g' "gems.rb" || die
+	sed -i -e '/spec.add_development_dependency "covered"/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid test dependency on unpackaged covered
+	rm -f config/sus.rb || die
+}
diff --git a/dev-ruby/async-container/async-container-0.18.0.ebuild b/dev-ruby/async-container/async-container-0.18.0.ebuild
new file mode 100644
index 000000000000..f5d1fac12ae8
--- /dev/null
+++ b/dev-ruby/async-container/async-container-0.18.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Abstract container-based parallelism using threads and processes"
+HOMEPAGE="https://github.com/socketry/async-container"
+SRC_URI="https://github.com/socketry/async-container/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/async
+	dev-ruby/async-io"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	>=dev-ruby/async-rspec-1.1:1
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# spec/async/container/notify/pipe_spec.rb directly executes "bundler" command,
+	# so we can't just wipe out gems.rb as usual.  also must remove covered from gemspec
+	# for this reason.
+	sed -i -E 's/gem ".+"//g' "gems.rb" || die
+	sed -i -e '/spec.add_development_dependency "covered"/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid test dependency on unpackaged covered
+	rm -f config/sus.rb || die
+}
diff --git a/dev-ruby/async-container/metadata.xml b/dev-ruby/async-container/metadata.xml
new file mode 100644
index 000000000000..4f03304084d0
--- /dev/null
+++ b/dev-ruby/async-container/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">socketry/async-container</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/async-io/Manifest b/dev-ruby/async-io/Manifest
new file mode 100644
index 000000000000..c8b269bcbe9e
--- /dev/null
+++ b/dev-ruby/async-io/Manifest
@@ -0,0 +1,5 @@
+DIST async-io-1.37.0.tar.gz 41344 BLAKE2B a0b71d4747c7b56a6662aa45813f3ee82b539cb3f5133f1f4469bb57fe61e261e5d111ec01b96f0515858a355e43f8441442d7005bc284ae24a4902ea97dcf36 SHA512 5a631bbc79409959b95acff67a5d7de667e0361b02279b3cc98e2cc1a1baf4a8e6ea61998c6ecf5ae71658445d83a63dde8e8e4a29173de388b3b7ae0675b884
+DIST async-io-1.38.1.tar.gz 41362 BLAKE2B 9160f464a8aca07e33f60f48d3bfcce2d11bfdadccb0254cbc481ac3ac9285be66569507b7afdc7083a95d08a91d916083df31e266d42464be20ebfaa811754d SHA512 2515fb0a0493a44acb65715f1df06567fe3c6461d6e4de1c72c37a028227c37aefafd87b06560a9c1dd7d9fbc2df412ebcdebf3276e8ff48c9331aff1f1300a0
+DIST async-io-1.41.0.tar.gz 41428 BLAKE2B 21d0e900f5aaf4c1b8e3a00032833f244d6a1715637a887809e2dee839b33f29b403a0b714a1392d05a4aeade959f2162d0b434bd235a66f1f2b92a9e0e45e39 SHA512 7b87b08f6dddc1e1e27a5d4c29e0d08ffbbdacc30bba4878cdd8f7afe588c0ecae7efc22f1d0cc66d0488d02559ecf7278c860838877ab7500cb7a173c441e92
+DIST async-io-1.42.0.tar.gz 41535 BLAKE2B a8c44fea9f70dbe32ef4efd0063540da41108b3cb5ae30614a6301b27cde7de2ea402423ea469193c37dc616463a92c480e779609ccc85893e9b590e324f7dea SHA512 d35516fffbbc486865b05f7d95a693caf95dc935e5b56801f1fceed49678f8537d840b4fcaebf5b50dfcc523a5fbc8cb9929e62658252c6e9d8ab143be3ba21d
+DIST async-io-1.42.1.tar.gz 39405 BLAKE2B d64a643ad1fd4f8f9ca1e090fd19793a254f5392366f2d0a93cb63bdabbf8ea60a24ca5ab389d1b6ed1353b06713a7430e64eec89c0fc9c4dc847e87e5bcf31f SHA512 039dd1dc4b93c9cdec591b435a2834727580df6f1569956b310e1566ada1932b29fbc39515ba8bae862fb2970e3d91cbbc90d4fc3b197f8381acf6d5cdf4f2a5
diff --git a/dev-ruby/async-io/async-io-1.37.0.ebuild b/dev-ruby/async-io/async-io-1.37.0.ebuild
new file mode 100644
index 000000000000..f5bd9fe9db57
--- /dev/null
+++ b/dev-ruby/async-io/async-io-1.37.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRA_DOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides support for asynchronous TCP, UDP, UNIX and SSL sockets"
+HOMEPAGE="https://github.com/socketry/async-io"
+SRC_URI="https://github.com/socketry/async-io/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/async"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/async-container-0.15:0
+	>=dev-ruby/async-rspec-1.10:1
+	dev-ruby/rack-test
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid test dependency on covered
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/async-io/async-io-1.38.1.ebuild b/dev-ruby/async-io/async-io-1.38.1.ebuild
new file mode 100644
index 000000000000..a63a9576595f
--- /dev/null
+++ b/dev-ruby/async-io/async-io-1.38.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRA_DOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides support for asynchronous TCP, UDP, UNIX and SSL sockets"
+HOMEPAGE="https://github.com/socketry/async-io"
+SRC_URI="https://github.com/socketry/async-io/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/async"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/async-container-0.15:0
+	>=dev-ruby/async-rspec-1.10:1
+	dev-ruby/rack-test
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid test dependency on covered
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/async-io/async-io-1.41.0.ebuild b/dev-ruby/async-io/async-io-1.41.0.ebuild
new file mode 100644
index 000000000000..b67f9f17f798
--- /dev/null
+++ b/dev-ruby/async-io/async-io-1.41.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRA_DOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides support for asynchronous TCP, UDP, UNIX and SSL sockets"
+HOMEPAGE="https://github.com/socketry/async-io"
+SRC_URI="https://github.com/socketry/async-io/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/async"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/async-2.8.1:2
+	>=dev-ruby/async-container-0.15:0
+	>=dev-ruby/async-rspec-1.10:1
+	dev-ruby/rack-test
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid test dependency on covered
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/async-io/async-io-1.42.0.ebuild b/dev-ruby/async-io/async-io-1.42.0.ebuild
new file mode 100644
index 000000000000..b67f9f17f798
--- /dev/null
+++ b/dev-ruby/async-io/async-io-1.42.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRA_DOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides support for asynchronous TCP, UDP, UNIX and SSL sockets"
+HOMEPAGE="https://github.com/socketry/async-io"
+SRC_URI="https://github.com/socketry/async-io/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/async"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/async-2.8.1:2
+	>=dev-ruby/async-container-0.15:0
+	>=dev-ruby/async-rspec-1.10:1
+	dev-ruby/rack-test
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid test dependency on covered
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/async-io/async-io-1.42.1.ebuild b/dev-ruby/async-io/async-io-1.42.1.ebuild
new file mode 100644
index 000000000000..6d5424851bb8
--- /dev/null
+++ b/dev-ruby/async-io/async-io-1.42.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRA_DOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides support for asynchronous TCP, UDP, UNIX and SSL sockets"
+HOMEPAGE="https://github.com/socketry/async-io"
+SRC_URI="https://github.com/socketry/async-io/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/async"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/async-2.8.1:2
+	>=dev-ruby/async-container-0.15:0
+	>=dev-ruby/async-rspec-1.10:1
+	dev-ruby/rack-test
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid test dependency on covered
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/async-io/metadata.xml b/dev-ruby/async-io/metadata.xml
new file mode 100644
index 000000000000..2b591f89a8e8
--- /dev/null
+++ b/dev-ruby/async-io/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">socketry/async-io</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/async-process/Manifest b/dev-ruby/async-process/Manifest
new file mode 100644
index 000000000000..f94fae72a921
--- /dev/null
+++ b/dev-ruby/async-process/Manifest
@@ -0,0 +1 @@
+DIST async-process-1.3.1.tar.gz 4138 BLAKE2B 8c3b3109e016e135005dd25db96fb2d38c568ce88410ca8d1c22cfd23ea8f34f926447cb36a75d3a60fa11d8bb08cab6b46e45d88b8a42f2585e7ab0c6179c81 SHA512 13f6ded2f9001c8759350b6ade002703f3ba58dcc2960055c5e52c7e44c22af9c59c69713c55cb7e7244a7f09e3557a75f41161a7aafd5f6c279f4bdbb698e3c
diff --git a/dev-ruby/async-process/async-process-1.3.1.ebuild b/dev-ruby/async-process/async-process-1.3.1.ebuild
new file mode 100644
index 000000000000..09f289d15d43
--- /dev/null
+++ b/dev-ruby/async-process/async-process-1.3.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Abstract container-based parallelism using threads and processes"
+HOMEPAGE="https://github.com/socketry/async-process"
+SRC_URI="https://github.com/socketry/async-process/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/async
+	dev-ruby/async-io"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/async-rspec-1.1:1
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	rm gems.rb || die
+
+	# Avoid test dependency on unpackaged covered
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/async-process/metadata.xml b/dev-ruby/async-process/metadata.xml
new file mode 100644
index 000000000000..2944dc126e0b
--- /dev/null
+++ b/dev-ruby/async-process/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">socketry/async-process</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/async-rspec/Manifest b/dev-ruby/async-rspec/Manifest
new file mode 100644
index 000000000000..16d43ad063e0
--- /dev/null
+++ b/dev-ruby/async-rspec/Manifest
@@ -0,0 +1 @@
+DIST async-rspec-1.17.0.tar.gz 9536 BLAKE2B a2beeca8b6399f47faef35eaad70255cfd3ef0e691d40c20389b4683e179172694b6c8b93bd786e4032171f7000f3f77da46f6a1e73a3abacd64f3a2a6e84b24 SHA512 50cc0390aa8c636c7964de07a9dec9c8e6ed72562b93ddd0e1e9e0af0b58e9b198bfd8e709f84e9ea1b58268d00ad26c85bdacb920cf5c81597d4011751c7507
diff --git a/dev-ruby/async-rspec/async-rspec-1.17.0.ebuild b/dev-ruby/async-rspec/async-rspec-1.17.0.ebuild
new file mode 100644
index 000000000000..0527e83117e3
--- /dev/null
+++ b/dev-ruby/async-rspec/async-rspec-1.17.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Helpers for writing specs against the async gem"
+HOMEPAGE="https://github.com/socketry/async-rspec"
+SRC_URI="https://github.com/socketry/async-rspec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rspec:3
+	dev-ruby/rspec-files:1
+	dev-ruby/rspec-memory:1
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/async
+	dev-ruby/async-io
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid dependency on unpackaged covered
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/async-rspec/metadata.xml b/dev-ruby/async-rspec/metadata.xml
new file mode 100644
index 000000000000..e5fb9fc23587
--- /dev/null
+++ b/dev-ruby/async-rspec/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">socketry/async-rspec</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/async/Manifest b/dev-ruby/async/Manifest
new file mode 100644
index 000000000000..75e603ab6d62
--- /dev/null
+++ b/dev-ruby/async/Manifest
@@ -0,0 +1,6 @@
+DIST async-1.31.0.tar.gz 92889 BLAKE2B b573e3106243fd0934387254b302f541a9ebbcd34bd451562bab1d39bcd37c593e2290667b524db7bc862268812a0932a644c670cbaf2a4a5ee240a866e08726 SHA512 f60fb9f4e95d1f579ce5f664abfe96b7196e3e47baf2856b7e97815107e0aa2e807c969839d118b6144372443687568488749547d762863b31d82c8d7e5d45ac
+DIST async-2.6.2.tar.gz 86923 BLAKE2B ef1a840bd52c3713268582260a00855061fc3ee2d05fb67a2de44f9012dc419745eeac0522fb06e9689860ed23bf5dbb8280f796e645d992d1a98da7cfb4279c SHA512 627f490360d96e9ef8cfb5dc5ea929a1574cdfa6db91fcbfe5b14f6e475e03c750b2806b8d13025425b969ed44944debdcf6d573bc95eafe80a6056a0550707b
+DIST async-2.6.5.tar.gz 93305 BLAKE2B fbceff6b20eaf10a922f9993c73157cd3790263e1540167715012e39a2223f2d5e8549e7f9949d3851fdf8120763b24b468b904e668aec2927c5c2028101c1d9 SHA512 839eea7d0113d879acd1d85da4d0119c0698b8bdfe36a24450a24c2fb2151cfa4cd8987aea663ba51ff52a078693cb1ee7e0f3ac805aebf91655f3e279842caf
+DIST async-2.8.0.tar.gz 92095 BLAKE2B e9d2356071ccdcf4f0025e4a449c78bf6ae31bf0841c286a48c18f94f3c09147ba6c4da6f737fe011b3066730180f2aff3ab03efe8b61b33d05ea1d28ae6c276 SHA512 80d31531e1b830b499a4c9cac41867a8836b3a339154336363ef397dd67c41c27d0b667e2754efba65fa88e03b81d48ce9ac5c17ce1e0bd8080af1ffc9873fa2
+DIST async-2.8.1.tar.gz 92272 BLAKE2B c1f30f99c6f1ce22f6181663eae1e1ebdc9a949d059dad3ef89227bc2788b48d403be7a4986f38e177a2cb85b0a4861ba965e3b0754582fcd4436b8dc97eef4c SHA512 dee8e2116efcfbf7f174228ef7f535b5a1218a10fd646bb7877ea8f1f9caff77dbe286ce0ff4a195e5f96cd72e61baa25e2655e5f0fcba4fadca5fcabcbf386c
+DIST async-2.8.2.tar.gz 92610 BLAKE2B d120a0b136d6ce2855840576543ec7d50a88da5a78789aa8954faedf3a980a94fecd78bcec79a8abd88767ba336215977d8c2d2439a05840698b6dd989ecc4df SHA512 d43ee9f69eb3ca6ef9af118d45de1410c60d125cb1bd7d8e2c39fd51061d00dad34bcbd1afeb816b9d241a2b793ddc41677ea8e3ee004affcbf12480f89a9c2c
diff --git a/dev-ruby/async/async-1.31.0.ebuild b/dev-ruby/async/async-1.31.0.ebuild
new file mode 100644
index 000000000000..68317a242f1b
--- /dev/null
+++ b/dev-ruby/async/async-1.31.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A concurrency framework for Ruby"
+HOMEPAGE="https://github.com/socketry/async"
+SRC_URI="https://github.com/socketry/async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/console-1.10:1
+	>=dev-ruby/nio4r-2.3:2
+	>=dev-ruby/timers-4.1:4"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/async-rspec-1.1:1
+	dev-ruby/benchmark-ips
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-improve-robustness-test.patch
+)
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid network tests
+	sed -i -e '/can fetch website using Net::HTTP/askip "requires network"' spec/async/scheduler_spec.rb || die
+
+	# Avoid test dependency on unpackaged covered
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/async/async-2.6.2.ebuild b/dev-ruby/async/async-2.6.2.ebuild
new file mode 100644
index 000000000000..e1b10d5c4895
--- /dev/null
+++ b/dev-ruby/async/async-2.6.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# It really is >=ruby31 only, see:
+# https://github.com/socketry/async/issues/141
+# https://github.com/socketry/async/issues/136
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A concurrency framework for Ruby"
+HOMEPAGE="https://github.com/socketry/async"
+SRC_URI="https://github.com/socketry/async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/console-1.10:1
+	dev-ruby/fiber-annotation
+	dev-ruby/io-event:1.1
+	>=dev-ruby/timers-4.1:4
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/benchmark-ips
+	dev-ruby/sus-fixtures-async
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# network tests
+	rm test/net/http.rb \
+		test/async/scheduler/address.rb \
+		test/async/scheduler/io.rb || die
+
+	sed -i -e '/covered/Id' config/sus.rb || die
+}
diff --git a/dev-ruby/async/async-2.6.5.ebuild b/dev-ruby/async/async-2.6.5.ebuild
new file mode 100644
index 000000000000..05b46d97cf15
--- /dev/null
+++ b/dev-ruby/async/async-2.6.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A concurrency framework for Ruby"
+HOMEPAGE="https://github.com/socketry/async"
+SRC_URI="https://github.com/socketry/async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/console-1.10:1
+	dev-ruby/fiber-annotation
+	dev-ruby/io-event:1.1
+	>=dev-ruby/timers-4.1:4
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/benchmark-ips
+	dev-ruby/sus-fixtures-async
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# network tests
+	rm test/net/http.rb \
+		test/async/scheduler/address.rb \
+		test/async/scheduler/io.rb || die
+
+	sed -i -e '/covered/Id' config/sus.rb || die
+}
diff --git a/dev-ruby/async/async-2.8.0.ebuild b/dev-ruby/async/async-2.8.0.ebuild
new file mode 100644
index 000000000000..6a5daa5e4abb
--- /dev/null
+++ b/dev-ruby/async/async-2.8.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A concurrency framework for Ruby"
+HOMEPAGE="https://github.com/socketry/async"
+SRC_URI="https://github.com/socketry/async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/console-1.10:1
+	dev-ruby/fiber-annotation
+	dev-ruby/io-event:1
+	>=dev-ruby/timers-4.1:4
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/benchmark-ips
+	dev-ruby/sus-fixtures-async
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# network tests
+	rm test/net/http.rb \
+		test/async/scheduler/address.rb \
+		test/async/scheduler/io.rb || die
+
+	sed -i -e '/covered/Id' config/sus.rb || die
+}
diff --git a/dev-ruby/async/async-2.8.1.ebuild b/dev-ruby/async/async-2.8.1.ebuild
new file mode 100644
index 000000000000..6a5daa5e4abb
--- /dev/null
+++ b/dev-ruby/async/async-2.8.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A concurrency framework for Ruby"
+HOMEPAGE="https://github.com/socketry/async"
+SRC_URI="https://github.com/socketry/async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/console-1.10:1
+	dev-ruby/fiber-annotation
+	dev-ruby/io-event:1
+	>=dev-ruby/timers-4.1:4
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/benchmark-ips
+	dev-ruby/sus-fixtures-async
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# network tests
+	rm test/net/http.rb \
+		test/async/scheduler/address.rb \
+		test/async/scheduler/io.rb || die
+
+	sed -i -e '/covered/Id' config/sus.rb || die
+}
diff --git a/dev-ruby/async/async-2.8.2.ebuild b/dev-ruby/async/async-2.8.2.ebuild
new file mode 100644
index 000000000000..6a5daa5e4abb
--- /dev/null
+++ b/dev-ruby/async/async-2.8.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A concurrency framework for Ruby"
+HOMEPAGE="https://github.com/socketry/async"
+SRC_URI="https://github.com/socketry/async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/console-1.10:1
+	dev-ruby/fiber-annotation
+	dev-ruby/io-event:1
+	>=dev-ruby/timers-4.1:4
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/benchmark-ips
+	dev-ruby/sus-fixtures-async
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# network tests
+	rm test/net/http.rb \
+		test/async/scheduler/address.rb \
+		test/async/scheduler/io.rb || die
+
+	sed -i -e '/covered/Id' config/sus.rb || die
+}
diff --git a/dev-ruby/async/files/async-1.31.0-improve-robustness-test.patch b/dev-ruby/async/files/async-1.31.0-improve-robustness-test.patch
new file mode 100644
index 000000000000..240fe060e224
--- /dev/null
+++ b/dev-ruby/async/files/async-1.31.0-improve-robustness-test.patch
@@ -0,0 +1,49 @@
+https://github.com/socketry/async/commit/8f590415c08943372e0227f01d3c32e92dbcbed0
+https://github.com/socketry/async/issues/218
+
+From 8f590415c08943372e0227f01d3c32e92dbcbed0 Mon Sep 17 00:00:00 2001
+From: Samuel Williams <samuel.williams@oriontransfer.co.nz>
+Date: Sun, 12 Mar 2023 20:33:48 +1300
+Subject: [PATCH] Improve robustness of test, fixes #218.
+
+--- a/spec/async/semaphore_spec.rb
++++ b/spec/async/semaphore_spec.rb
+@@ -62,7 +62,7 @@
+ 			3.times.map do |i|
+ 				semaphore.async do |task|
+ 					order << i
+-					task.sleep(0.1)
++					task.yield
+ 					order << i
+ 				end
+ 			end.collect(&:result)
+@@ -72,17 +72,22 @@
+ 		
+ 		it 'allows tasks to execute concurrently' do
+ 			semaphore = Async::Semaphore.new(3)
+-			order = []
++			concurrency = 0
++			latch = Async::Condition.new
+ 			
+ 			3.times.map do |i|
+ 				semaphore.async do |task|
+-					order << i
+-					task.sleep(0.1)
+-					order << i
++					concurrency += 1
++					
++					if concurrency == 3
++						latch.signal
++					else
++						latch.wait
++					end
+ 				end
+-			end.collect(&:result)
++			end.each(&:wait)
+ 			
+-			expect(order).to be == [0, 1, 2, 0, 1, 2]
++			expect(concurrency).to be == 3
+ 		end
+ 	end
+ 	
+
diff --git a/dev-ruby/async/metadata.xml b/dev-ruby/async/metadata.xml
new file mode 100644
index 000000000000..c7864b34a68a
--- /dev/null
+++ b/dev-ruby/async/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">socketry/async</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/async_sinatra/Manifest b/dev-ruby/async_sinatra/Manifest
deleted file mode 100644
index cedb8d72b112..000000000000
--- a/dev-ruby/async_sinatra/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST async_sinatra-1.3.0-git.tgz 8657 BLAKE2B ba41b01a9ad00794f19273d41cceaf80ae5159e38f93c1907db5fae78d5d2f5d6d583f31ff495722b3a241f7e0d2d91c5b3202fe5a8ff39f500e6ab0e1e0030b SHA512 2975e41557da539e1b6427a43d41811f4e17315c01da8d1141dbdafad68702395bfce011844b8b1db2c24bbf19d09b5e680cd10e039ceaab1263ea66bcb8f9f6
diff --git a/dev-ruby/async_sinatra/async_sinatra-1.3.0-r1.ebuild b/dev-ruby/async_sinatra/async_sinatra-1.3.0-r1.ebuild
deleted file mode 100644
index 92ab4d1a64a7..000000000000
--- a/dev-ruby/async_sinatra/async_sinatra-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="async_sinatra.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Asynchronous response API for Sinatra and Thin"
-HOMEPAGE="https://github.com/raggi/async_sinatra"
-SRC_URI="https://github.com/raggi/async_sinatra/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/hoe-3.13
-	>=dev-ruby/minitest-5.6:5
-	>=dev-ruby/eventmachine-0.12.11
-	dev-ruby/rake
-	dev-ruby/rack-test
-	)"
-
-ruby_add_rdepend ">=dev-ruby/sinatra-1.3.2
-	>=dev-ruby/rack-1.4.1:*"
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true ${RUBY} -S rake test || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r examples
-}
diff --git a/dev-ruby/async_sinatra/metadata.xml b/dev-ruby/async_sinatra/metadata.xml
deleted file mode 100644
index fc3601f442af..000000000000
--- a/dev-ruby/async_sinatra/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">raggi/async_sinatra</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/atomic/Manifest b/dev-ruby/atomic/Manifest
deleted file mode 100644
index 8d151b413621..000000000000
--- a/dev-ruby/atomic/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST atomic-1.1.101.gem 17920 BLAKE2B 50f4efc215293e931380b6307231279b3c5ca055aa8082fee8575963a68b3d54262449bf45fb1a514dab18f53a1dd9e0467a0f7ac67dea7a45fcce09155721dd SHA512 59c82fa5ec984b7ecd97964ea075ea327511fd4e71cc5ac72d3fb573b777c9fb289f462d022ea1e0256b38dc369c9f7fa7a61b7af877bd06ec94252237111e8d
diff --git a/dev-ruby/atomic/atomic-1.1.101-r1.ebuild b/dev-ruby/atomic/atomic-1.1.101-r1.ebuild
deleted file mode 100644
index b00b7bb450c4..000000000000
--- a/dev-ruby/atomic/atomic-1.1.101-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An atomic reference implementation for JRuby, Rubinius, and MRI"
-HOMEPAGE="https://github.com/headius/ruby-atomic"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid compilation dependencies since we compile directly.
-	sed -i -e '/:test => :compile/ s:^:#:' \
-		-e '/extensiontask/,/end/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/atomic/metadata.xml b/dev-ruby/atomic/metadata.xml
deleted file mode 100644
index 8935ba895141..000000000000
--- a/dev-ruby/atomic/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">headius/ruby-atomic</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index 7665c3992e4e..0ae87a413f45 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -1,4 +1,3 @@
-DIST autoprefixer-rails-10.3.1.0.tar.gz 1357327 BLAKE2B 2071b3a9c5848e06695e32445224f6e101481fac0ca73a23b86d138bfada9f7339bd51031f121ab8b0f614d2ea1ec386cb81dbbcf8f728075b12ff2393c0c8b5 SHA512 fff90cad950228e9d3b61259f26bee26b2fe3cd87557ed81f1235630357204e3cf9ce6cc9439551727d4d62d27f3510c8c2683ab12b05ad11549945f741e5db5
-DIST autoprefixer-rails-10.4.2.0.tar.gz 1368753 BLAKE2B b5c9374f6161f9f13f78404788cdba60d88f50f68f909cead6cb5389a4f26f05cdd20925cf91d9a0b01af0ce14929b11d69f85a1ce8493c660c50c6032460a0c SHA512 00303b7dec4b261b2d3ffa72ebdfea2883cb473df3f8149853b0d2fcb5c2e48d63e24a17604619289893d0472afe237f1dc13710d2c7c3528067c143789abf61
-DIST autoprefixer-rails-10.4.7.0.tar.gz 1372138 BLAKE2B 5d4ad1cb82fc0e82557232fc1a050f87fc2758967c21e2e566049686efec41b599e3cf7e2b432d164c6a29c2463ab3c695703878c23188ee97a46e5aff6a26a2 SHA512 c1d3a1200c05a3b1219716058eb28babef4bc26eaca1ebdc09a901709435f25f097d3c39398a07283a75ed37b30a45398fbe31095e649f6d94fdc6de2346aad6
-DIST autoprefixer-rails-9.8.6.5.gem 231936 BLAKE2B 7c702f5484f9aa2318408fb8c5c8866ccf9d3565d3282e43279b9bea875ac3610b26c0ec302b2bed0779dcd46eca12badaa16faba1046585cddcfa3e8b22b51c SHA512 6b7281661fcaf0c17ee258a321f8d18664f2f305172719f76fe1f3ef6b04fa1460c7102946e95153df7ecf5c3ade3bfc8c22d302927f2e2183ef3b0f3ef8d623
+DIST autoprefixer-rails-10.4.13.0.tar.gz 1386370 BLAKE2B a96eb20ebb940a63abf22819e7b2c1727816e4e70cffff5fce3f84c09b783c7f6aac3d6af2483670bbacf4e8032e71f8b144bdc41846464935dbf57fa23d98f5 SHA512 698e8f91875d7fe73d4843cd4dda65b695e3654b9bbf02070a0fd4d61ebf9fb00aaffa8ce63b738dc5d345c5536c79fa985adfa779f47d57412c791e3388cc97
+DIST autoprefixer-rails-10.4.15.0.tar.gz 1205393 BLAKE2B 830b4f145ead0ff143296329682b2c7834a6f5599311e2d770f17db77824944aee8acb066f33e5a1bb63111ad9e37159898be698748af1032bf531e4752c4bf7 SHA512 c8bd0706d3c45406aff016463fc17d422665a396222a8b9f443f12aefd8e3f84b81aa025e7c583f1067f6f23e8eb5f2f5d84f8867e64d4adbe19d47bc3bed71c
+DIST autoprefixer-rails-10.4.16.0.tar.gz 1207675 BLAKE2B 2505dd26a2c4dec18ad6639d3bf18e2e04d0fa47bd4cd12ee51be53efa18bd21f438bff625e3b5b4807dc8a3c5311735c439f74f68cb4cad2ad73bd8aba3c30b SHA512 33f2d5f16fc2d011abb585e028179f073cdc801f880c5da9a08e8ead5470487cec5b28b9dda7c0bfdd9f032984dc6b871e1a16bbe4dbe117e0304e91b3a774b8
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.3.1.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.3.1.0.ebuild
deleted file mode 100644
index efaf80056df3..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.3.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-RUBY_FAKEGEM_GEMSPEC="autoprefixer-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-SRC_URI="https://github.com/ai/autoprefixer-rails/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/rails-5.0.0
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/ s:^:#:" \
-		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
-	rm -f spec/rails_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.13.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.13.0.ebuild
new file mode 100644
index 000000000000..9e13d7544c43
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.13.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+RUBY_FAKEGEM_GEMSPEC="autoprefixer-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
+HOMEPAGE="https://github.com/ai/autoprefixer-rails"
+SRC_URI="https://github.com/ai/autoprefixer-rails/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+DEPEND+="test? ( net-libs/nodejs )"
+
+ruby_add_rdepend "dev-ruby/execjs"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/rails-5.0.0
+	dev-ruby/rake
+	dev-ruby/rspec-rails
+	dev-ruby/sprockets-rails
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+	sed -i -e "/Bundler/ s:^:#:" \
+		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
+	rm -f spec/rails_spec.rb || die
+}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.15.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.15.0.ebuild
new file mode 100644
index 000000000000..8f557b93f687
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.15.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+RUBY_FAKEGEM_GEMSPEC="autoprefixer-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
+HOMEPAGE="https://github.com/ai/autoprefixer-rails"
+SRC_URI="https://github.com/ai/autoprefixer-rails/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+DEPEND+="test? ( net-libs/nodejs )"
+
+ruby_add_rdepend "dev-ruby/execjs"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/rails-5.0.0
+	dev-ruby/rake
+	dev-ruby/rspec-rails
+	dev-ruby/sprockets-rails
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+	sed -i -e "/Bundler/ s:^:#:" \
+		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
+	rm -f spec/rails_spec.rb || die
+}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.16.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.16.0.ebuild
new file mode 100644
index 000000000000..8f557b93f687
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.16.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+RUBY_FAKEGEM_GEMSPEC="autoprefixer-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
+HOMEPAGE="https://github.com/ai/autoprefixer-rails"
+SRC_URI="https://github.com/ai/autoprefixer-rails/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+DEPEND+="test? ( net-libs/nodejs )"
+
+ruby_add_rdepend "dev-ruby/execjs"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/rails-5.0.0
+	dev-ruby/rake
+	dev-ruby/rspec-rails
+	dev-ruby/sprockets-rails
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+	sed -i -e "/Bundler/ s:^:#:" \
+		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
+	rm -f spec/rails_spec.rb || die
+}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.2.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.2.0.ebuild
deleted file mode 100644
index 35e6cfaec0ff..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-RUBY_FAKEGEM_GEMSPEC="autoprefixer-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-SRC_URI="https://github.com/ai/autoprefixer-rails/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/rails-5.0.0
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/ s:^:#:" \
-		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
-	rm -f spec/rails_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.7.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.7.0.ebuild
deleted file mode 100644
index 85041f8e1934..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.7.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-RUBY_FAKEGEM_GEMSPEC="autoprefixer-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-SRC_URI="https://github.com/ai/autoprefixer-rails/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/rails-5.0.0
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-	dev-ruby/sprockets-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/ s:^:#:" \
-		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
-	rm -f spec/rails_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.6.5.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.6.5.ebuild
deleted file mode 100644
index e9b103efbd7d..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.6.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs:*"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/rails-5.0.0
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/ s:^:#:" \
-		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
-	sed -i -e '1igem "tzinfo", "~>1.0"' spec/spec_helper.rb || die
-	rm -f spec/rails_spec.rb || die
-}
diff --git a/dev-ruby/aws-eventstream/Manifest b/dev-ruby/aws-eventstream/Manifest
index 93b539a16ff5..f45f76aaa92b 100644
--- a/dev-ruby/aws-eventstream/Manifest
+++ b/dev-ruby/aws-eventstream/Manifest
@@ -1,3 +1,2 @@
-DIST aws-eventstream-1.1.0.gem 8704 BLAKE2B 52018f2466f24b5c4ca9463321d4bad94579c6c98ef7fe0de34376da1e9ecfa0171de3485f65266a8b6be99c6eab956b88b367b8431c62aac1b46107f47925db SHA512 40af0ad738341bd879458060c5d5b1cda3d539ecec18e3e14f2c36582368e246a1dd510480629f7f29e044dc6f9d3a028af72650a0386491931f5a2691ac5d8a
-DIST aws-eventstream-1.1.1.gem 12800 BLAKE2B 723c94153dfd0eac18ed76caea9637a483a421bec5ff361b763c772c817f99896c04283c76b81e2469f9eeda7a9fed6bb4fe976f322847f028523cb6d068194d SHA512 ffc06f10438b707696abf477da42ac753189dcd7688758998f6d0daa4ce87e5d6dc71b2b982af44d1bb33ba47bc50b18cd6023cba0f4649f20e3aa9667a845cc
 DIST aws-eventstream-1.2.0.gem 12800 BLAKE2B 3d3459894bfcfa9b4a3cb04b358e011d495250430931c638038e66ac366ad902c8e79c44afc5b123b9ef3bb82efe9a8705017898ffaf268ae829923b6b820cd0 SHA512 d7d8a318523b1d4c4d950861f8fb4fb6b65a76b8df2bd788ca1d81d40f7a1d1fd91ad9db106892b508d348fd7f8678aa387b43ac390bcd75f8fb03d081c3e60b
+DIST aws-eventstream-1.3.0.gem 12800 BLAKE2B d66c1597c63a07f8a84f0743fae5df5fd28d58fe89b821f9f68177e0d5afdc58906f020c4cacf796ac999b4f8ce4e5dae61e8e2a86fd148e19c9a28f7cdbf1c1 SHA512 98200938fb087748010b494a75b3dc69c28903175631490cc529a5f740aef217e362eb77a98aa7ae3292e14a3cc559fe3f1f263293f536d47a515e7b77d8ddd8
diff --git a/dev-ruby/aws-eventstream/aws-eventstream-1.1.0.ebuild b/dev-ruby/aws-eventstream/aws-eventstream-1.1.0.ebuild
deleted file mode 100644
index 59f8178c8b00..000000000000
--- a/dev-ruby/aws-eventstream/aws-eventstream-1.1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-# Not packaged and upstream not tagged.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Amazon Web Services event stream library"
-HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
diff --git a/dev-ruby/aws-eventstream/aws-eventstream-1.1.1.ebuild b/dev-ruby/aws-eventstream/aws-eventstream-1.1.1.ebuild
deleted file mode 100644
index 8b74ad43f326..000000000000
--- a/dev-ruby/aws-eventstream/aws-eventstream-1.1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-# Not packaged and upstream not tagged.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Amazon Web Services event stream library"
-HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
diff --git a/dev-ruby/aws-eventstream/aws-eventstream-1.2.0.ebuild b/dev-ruby/aws-eventstream/aws-eventstream-1.2.0.ebuild
index 3efd2dc85a24..f9658cfaaf22 100644
--- a/dev-ruby/aws-eventstream/aws-eventstream-1.2.0.ebuild
+++ b/dev-ruby/aws-eventstream/aws-eventstream-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 # Not packaged and upstream not tagged.
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/aws-eventstream/aws-eventstream-1.3.0.ebuild b/dev-ruby/aws-eventstream/aws-eventstream-1.3.0.ebuild
new file mode 100644
index 000000000000..dc23458e0709
--- /dev/null
+++ b/dev-ruby/aws-eventstream/aws-eventstream-1.3.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# Not packaged and upstream not tagged.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Amazon Web Services event stream library"
+HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
diff --git a/dev-ruby/aws-partitions/Manifest b/dev-ruby/aws-partitions/Manifest
index 9b57ec8f581a..c137af8cbcb3 100644
--- a/dev-ruby/aws-partitions/Manifest
+++ b/dev-ruby/aws-partitions/Manifest
@@ -1,3 +1,4 @@
-DIST aws-partitions-1.297.0.gem 20992 BLAKE2B df538a03fc579ecb65dfcadc0fb5dbef93a896a3c21d1e6cdaab75572aebc354ffe0a41cb82d5bc34e1414d560105270ede590e9a79ead1ac43a78a225bec861 SHA512 90d3484cb6d06597b1122512185dc8b0f5964a1c0748855b89c3efbefd410432ab7e88e6698d9532db7bc3db51f9dbce1f236e6745c31bf1312c6e0a1cd1f76e
-DIST aws-partitions-1.298.0.gem 20992 BLAKE2B fb6776a6f5a9d75b32142129da38470cffd8383c77ea705567220902c90967926bea149b46624ace941e9dfd67e7dbb59202d1134b392c35acaab4f858d21f2c SHA512 fe42afbc96899637918938ecb84335efdbc8746ac46a173621f176df924b857cf95de9756f242ee61adba8048192626b47b6e49a51dfb5d1f2e98b20108278a7
-DIST aws-partitions-1.370.0.gem 22528 BLAKE2B 504b25a41da2b948b00c3ea4b7e94a553ad77a471849d7e8d2d9a714860e9efce06c788dd22e6600b6885939987a1ea481dd0ef9f0e6c6ba9fa342ae24f4d627 SHA512 49bec442cad737c4781f759b7babef3d45daa49866135b4fb15aed9e248e737e95a589c0b17b86a6fe4e042c039fcdef7f2088e1eaf6738801fb314c71e0cc56
+DIST aws-partitions-1.820.0.gem 58368 BLAKE2B bd5a2986d9252e64235c8b80ba12ca3d200f47470fa45466b5e7a54b16abb975282a87fc49f611957e0e7c5e73ee02e1f3a8e77c742166597e5c4f073a9dc49e SHA512 546167240f2ed32cbfe57150eb04cb13fc8471cab7e09546d73a2ba3ea13dbf2b2ea7beccf118b93835179b0198cdfc45f8c54fdfe173871e8a62d6f9c450a89
+DIST aws-partitions-1.843.0.gem 59392 BLAKE2B eb11bf18298b6660433ec295d46dc5a7cee3ac1adf72eb8edb3320c490cc919d313aeefa224e1de4026f907b372de52c18cf8f37f07bea92ace67f11f067a0f9 SHA512 2716c25f0e7a6a7bdd4d62b74094e79e8e0f8c84581eaafc072cab76c785bbc7bcdab2cf844c084292a58a6b93cbc5c0eeee23008e30f74638e86da22a099fea
+DIST aws-partitions-1.863.0.gem 60928 BLAKE2B e0063e3a66dd95f76b8b9f957cc16330706c2aec0d5aa6d708e12c73d98e55113faf4be21580c3f7811847edd4c513af39c24e3fc1b4a5d1c0b8bd8b48e8c366 SHA512 ff85beb52bcc4ecf2c50730e1aba97fa7a8b897a87b8507a58d8ed7f0aa419831482bec326faa6123a742239959a91a159e8f211a02fc926182947446ad9c7c3
+DIST aws-partitions-1.897.0.gem 62976 BLAKE2B 6eb06f5afa95c1e71cb4b13adfc9d8496be683f6a61ea8ae3cbcdcfd5a0b1b6f37c1a5c26d8e81296a260ae31c701b8817e2365d04e453d5f0c212ba447ea709 SHA512 4c98dd8d7d888ffbbd719c154c919526e4578f4c99ba48598fd7f47c533f16e193329682bcee5700e0f27ac92f13f7bcb50be360fd07faf825a607f4fd5c6eea
diff --git a/dev-ruby/aws-partitions/aws-partitions-1.297.0.ebuild b/dev-ruby/aws-partitions/aws-partitions-1.297.0.ebuild
deleted file mode 100644
index 864a129dbc72..000000000000
--- a/dev-ruby/aws-partitions/aws-partitions-1.297.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-# Not packaged and upstream not tagged.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="partitions.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides interfaces to enumerate AWS partitions, regions, and services"
-HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/aws-partitions/aws-partitions-1.298.0.ebuild b/dev-ruby/aws-partitions/aws-partitions-1.298.0.ebuild
deleted file mode 100644
index 864a129dbc72..000000000000
--- a/dev-ruby/aws-partitions/aws-partitions-1.298.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-# Not packaged and upstream not tagged.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="partitions.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides interfaces to enumerate AWS partitions, regions, and services"
-HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/aws-partitions/aws-partitions-1.370.0.ebuild b/dev-ruby/aws-partitions/aws-partitions-1.370.0.ebuild
deleted file mode 100644
index 73c0a30e60e7..000000000000
--- a/dev-ruby/aws-partitions/aws-partitions-1.370.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# Not packaged and upstream not tagged.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="partitions.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides interfaces to enumerate AWS partitions, regions, and services"
-HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
diff --git a/dev-ruby/aws-partitions/aws-partitions-1.820.0.ebuild b/dev-ruby/aws-partitions/aws-partitions-1.820.0.ebuild
new file mode 100644
index 000000000000..904c2fb2798c
--- /dev/null
+++ b/dev-ruby/aws-partitions/aws-partitions-1.820.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+# Not packaged and upstream not tagged.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="partitions.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides interfaces to enumerate AWS partitions, regions, and services"
+HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
diff --git a/dev-ruby/aws-partitions/aws-partitions-1.843.0.ebuild b/dev-ruby/aws-partitions/aws-partitions-1.843.0.ebuild
new file mode 100644
index 000000000000..904c2fb2798c
--- /dev/null
+++ b/dev-ruby/aws-partitions/aws-partitions-1.843.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+# Not packaged and upstream not tagged.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="partitions.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides interfaces to enumerate AWS partitions, regions, and services"
+HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
diff --git a/dev-ruby/aws-partitions/aws-partitions-1.863.0.ebuild b/dev-ruby/aws-partitions/aws-partitions-1.863.0.ebuild
new file mode 100644
index 000000000000..3100f6be47ed
--- /dev/null
+++ b/dev-ruby/aws-partitions/aws-partitions-1.863.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# Not packaged and upstream not tagged.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="partitions.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides interfaces to enumerate AWS partitions, regions, and services"
+HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
diff --git a/dev-ruby/aws-partitions/aws-partitions-1.897.0.ebuild b/dev-ruby/aws-partitions/aws-partitions-1.897.0.ebuild
new file mode 100644
index 000000000000..0f6ed389ec1b
--- /dev/null
+++ b/dev-ruby/aws-partitions/aws-partitions-1.897.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# Not packaged and upstream not tagged.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="partitions.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides interfaces to enumerate AWS partitions, regions, and services"
+HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64"
diff --git a/dev-ruby/aws-sdk-core/Manifest b/dev-ruby/aws-sdk-core/Manifest
deleted file mode 100644
index 9bc3115e2a7b..000000000000
--- a/dev-ruby/aws-sdk-core/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST aws-sdk-core-3.94.0.gem 270848 BLAKE2B 427fd39d864b2b69e161c0a97cb88984c0dc3f05a07df25412f6e365ec0405a1d226e4bb1f0c024d02f1823d93b9127d96cb025362b1f0e5da259e93dadf0ae9 SHA512 30b660ea5cbea483e284ad82125e4c9e22ac6874f25c9b0d709c64c940ad03d9cc2a87af97e2c182c6720c23675467e3b0442bb7164ed36bfd36dd19dd8ec924
-DIST aws-sdk-ruby-2.11.488.tar.gz 5997468 BLAKE2B bf374a451d07052676eedf75cac71f57f4557ff3d0970593cd76f057938844e0eca28e63aa983619345a5852542a8b1fe371c1be2c6132146daa9b5c123c7869 SHA512 c2726a9afc38d579fa65977c3c1cd2af5f6b235ac84cf5b4dd8fac6040a01c753d6409fe90e1cf32d500f26366c76a3b2499a0e79ebb005601756dab068fe91f
diff --git a/dev-ruby/aws-sdk-core/aws-sdk-core-2.11.488.ebuild b/dev-ruby/aws-sdk-core/aws-sdk-core-2.11.488.ebuild
deleted file mode 100644
index 8db098173f57..000000000000
--- a/dev-ruby/aws-sdk-core/aws-sdk-core-2.11.488.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="apis ca-bundle.crt endpoints.json"
-
-GITHUB_USER="aws"
-GITHUB_PROJECT="aws-sdk-ruby"
-RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="https://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/aws-sigv4 dev-ruby/jmespath:1"
-
-ruby_add_bdepend "test? ( dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid spec that gets confused by our directory names
-	sed -i -e '/requires prefixes from plugin names when loading/,/end/ s:^:#:' \
-		spec/seahorse/client/plugin_list_spec.rb || die
-}
diff --git a/dev-ruby/aws-sdk-core/aws-sdk-core-3.94.0.ebuild b/dev-ruby/aws-sdk-core/aws-sdk-core-3.94.0.ebuild
deleted file mode 100644
index c543a1502c63..000000000000
--- a/dev-ruby/aws-sdk-core/aws-sdk-core-3.94.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-# Not packaged and upstream not tagged.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides API clients for AWS"
-HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/aws-eventstream-1.0.2:1"
-ruby_add_rdepend ">=dev-ruby/aws-partitions-1.239.0:1"
-ruby_add_rdepend ">=dev-ruby/aws-sigv4-1.1:1"
-ruby_add_rdepend "dev-ruby/jmespath:1"
diff --git a/dev-ruby/aws-sdk-core/metadata.xml b/dev-ruby/aws-sdk-core/metadata.xml
deleted file mode 100644
index 082aaa7c4632..000000000000
--- a/dev-ruby/aws-sdk-core/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">aws/aws-sdk-ruby</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/aws-sdk-resources/Manifest b/dev-ruby/aws-sdk-resources/Manifest
deleted file mode 100644
index 126827b29feb..000000000000
--- a/dev-ruby/aws-sdk-resources/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST aws-sdk-ruby-2.11.488.tar.gz 5997468 BLAKE2B bf374a451d07052676eedf75cac71f57f4557ff3d0970593cd76f057938844e0eca28e63aa983619345a5852542a8b1fe371c1be2c6132146daa9b5c123c7869 SHA512 c2726a9afc38d579fa65977c3c1cd2af5f6b235ac84cf5b4dd8fac6040a01c753d6409fe90e1cf32d500f26366c76a3b2499a0e79ebb005601756dab068fe91f
diff --git a/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.11.488.ebuild b/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.11.488.ebuild
deleted file mode 100644
index 7701f43d73cf..000000000000
--- a/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.11.488.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="resources.schema.json"
-
-GITHUB_USER="aws"
-GITHUB_PROJECT="aws-sdk-ruby"
-RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="https://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_rdepend "~dev-ruby/aws-sdk-core-${PV}"
-
-ruby_add_bdepend "dev-ruby/webmock"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/aws-sdk-resources/metadata.xml b/dev-ruby/aws-sdk-resources/metadata.xml
deleted file mode 100644
index 082aaa7c4632..000000000000
--- a/dev-ruby/aws-sdk-resources/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">aws/aws-sdk-ruby</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/aws-sdk/Manifest b/dev-ruby/aws-sdk/Manifest
deleted file mode 100644
index 126827b29feb..000000000000
--- a/dev-ruby/aws-sdk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST aws-sdk-ruby-2.11.488.tar.gz 5997468 BLAKE2B bf374a451d07052676eedf75cac71f57f4557ff3d0970593cd76f057938844e0eca28e63aa983619345a5852542a8b1fe371c1be2c6132146daa9b5c123c7869 SHA512 c2726a9afc38d579fa65977c3c1cd2af5f6b235ac84cf5b4dd8fac6040a01c753d6409fe90e1cf32d500f26366c76a3b2499a0e79ebb005601756dab068fe91f
diff --git a/dev-ruby/aws-sdk/aws-sdk-2.11.488.ebuild b/dev-ruby/aws-sdk/aws-sdk-2.11.488.ebuild
deleted file mode 100644
index 8dc1b75ba121..000000000000
--- a/dev-ruby/aws-sdk/aws-sdk-2.11.488.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST=""
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="../CHANGELOG.md ../MIGRATING.md ../README.md ../UPGRADING.md"
-
-GITHUB_USER="aws"
-GITHUB_PROJECT="${PN}-ruby"
-RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="https://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl
-	~dev-ruby/aws-sdk-resources-${PV}"
diff --git a/dev-ruby/aws-sdk/metadata.xml b/dev-ruby/aws-sdk/metadata.xml
deleted file mode 100644
index 082aaa7c4632..000000000000
--- a/dev-ruby/aws-sdk/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">aws/aws-sdk-ruby</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/aws-sigv4/Manifest b/dev-ruby/aws-sigv4/Manifest
index c8e203af2c66..d72b631fe7c3 100644
--- a/dev-ruby/aws-sigv4/Manifest
+++ b/dev-ruby/aws-sigv4/Manifest
@@ -1,4 +1,2 @@
-DIST aws-sigv4-1.2.3.gem 16384 BLAKE2B 55da04b54005107075e3e4ef6a16de03e25ee355938bb1846f2c1ab79f1d9c72b0d272acb8b8c58eb7803710f3ad9be7e2d137b0c387d84d4841f7dcb0fb82aa SHA512 5d3aa9256f5e0fec5841ca5c9ca5aeb9a32cb4cf69f30221476d380c22e8f1863d2fbb4c826b89634c65f8080b83debdd84efe6e14e31f0a01bcf18b9fd71750
-DIST aws-sigv4-1.2.4.gem 16384 BLAKE2B 31aee1c3c028b9ccd6b20e967af97394e3800d27cfec2f19a4f12b0a7f0ed2ed931b720beb7d3e3ae737ca33eb7c4271f565053f201a3e233625c5d1faf33fab SHA512 1c03bf59899c7e7f6b01a786e75985c73459f0aacd3f01df70bac562db452e369317f8cb749f30d30629f058845687d9e2f614547f6f3ca1a4378db724170e4f
-DIST aws-sigv4-1.4.0.gem 16896 BLAKE2B 42a619d5037e6974a64ba329d50b83b221177d50abe89f8cc3dd38cb8c91eb7d049fc2e93b1c3c29910778ab5254b7a65936257fb1809ca92535841a3b58b77b SHA512 250dfd5755fa5163c65c122ff33c4e3b700359281a2b7c0640fb25ad8fbd2f01afa6034413345eb395d0219dc7c4cd6f4ab899c21321b76a336fa49a7ff298de
-DIST aws-sigv4-1.5.0.gem 17920 BLAKE2B 5e9ce828e69e6cd0161ef214bab56c3bb0a2c4250622172a6c80ebfa701c6fe7ea1686e29c229fed093470723e06bff7924f3d8924cea0bb05d898cb90fe2e43 SHA512 aaca9142be244212481726fc60c8f38dcb56ffc57373e2232dbb07aa2dc917559419c56bfe17a9da4f0c0e03f88898679f844bf65f3662016f32c4daf4fa9021
+DIST aws-sigv4-1.7.0.gem 17920 BLAKE2B 1f670cb3fb816725f7002cce4851901a29b287e34006f311d037d589981e7fd3d4de5e4cf7a5422697ef3a9f68ca65aa58796f8410ce3bf952b5ae1fe57150a4 SHA512 4d3a20a807a79b2225a2a342be690c508eb2921b41de9b25aada113b9d138d3639fa276b022c031c501e62c6b08f276d7f2660fdbae24ef575bf7ff62a84ca46
+DIST aws-sigv4-1.8.0.gem 18432 BLAKE2B d15a93e86b78aad49ecebe7e104572ec18c37d2db1fb5361f1c2dd7732996b80bed81873f227d0f12ede0a5edb61fdc31c9c7f8eded2565ed1575c96647420f4 SHA512 dc4898a201f81b25f913b37bf0b302066fa9b5e4bb64e317957aa0c34090814585e371c67e1d5776d7b5ef72be25992e2224fcb4e3a1f3e3762dc1fdb54134f8
diff --git a/dev-ruby/aws-sigv4/aws-sigv4-1.2.3.ebuild b/dev-ruby/aws-sigv4/aws-sigv4-1.2.3.ebuild
deleted file mode 100644
index 972cfb7f058a..000000000000
--- a/dev-ruby/aws-sigv4/aws-sigv4-1.2.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Amazon Web Services Signature Version 4 signing library"
-HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/aws-eventstream-1.0.2:1"
diff --git a/dev-ruby/aws-sigv4/aws-sigv4-1.2.4.ebuild b/dev-ruby/aws-sigv4/aws-sigv4-1.2.4.ebuild
deleted file mode 100644
index 18a8f4abf81f..000000000000
--- a/dev-ruby/aws-sigv4/aws-sigv4-1.2.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Amazon Web Services Signature Version 4 signing library"
-HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/aws-eventstream-1.0.2:1"
diff --git a/dev-ruby/aws-sigv4/aws-sigv4-1.4.0.ebuild b/dev-ruby/aws-sigv4/aws-sigv4-1.4.0.ebuild
deleted file mode 100644
index 18a8f4abf81f..000000000000
--- a/dev-ruby/aws-sigv4/aws-sigv4-1.4.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Amazon Web Services Signature Version 4 signing library"
-HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/aws-eventstream-1.0.2:1"
diff --git a/dev-ruby/aws-sigv4/aws-sigv4-1.5.0.ebuild b/dev-ruby/aws-sigv4/aws-sigv4-1.5.0.ebuild
deleted file mode 100644
index 6a85a6fda115..000000000000
--- a/dev-ruby/aws-sigv4/aws-sigv4-1.5.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Amazon Web Services Signature Version 4 signing library"
-HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/aws-eventstream-1.0.2:1"
diff --git a/dev-ruby/aws-sigv4/aws-sigv4-1.7.0.ebuild b/dev-ruby/aws-sigv4/aws-sigv4-1.7.0.ebuild
new file mode 100644
index 000000000000..6b37f35cd46f
--- /dev/null
+++ b/dev-ruby/aws-sigv4/aws-sigv4-1.7.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md"
+RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Amazon Web Services Signature Version 4 signing library"
+HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/aws-eventstream-1.0.2:1"
diff --git a/dev-ruby/aws-sigv4/aws-sigv4-1.8.0.ebuild b/dev-ruby/aws-sigv4/aws-sigv4-1.8.0.ebuild
new file mode 100644
index 000000000000..9b07f2dc4a7d
--- /dev/null
+++ b/dev-ruby/aws-sigv4/aws-sigv4-1.8.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md"
+RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Amazon Web Services Signature Version 4 signing library"
+HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/aws-eventstream-1.0.2:1"
diff --git a/dev-ruby/axiom-types/axiom-types-0.1.1-r1.ebuild b/dev-ruby/axiom-types/axiom-types-0.1.1-r1.ebuild
index d2a557a913ef..153ff3095542 100644
--- a/dev-ruby/axiom-types/axiom-types-0.1.1-r1.ebuild
+++ b/dev-ruby/axiom-types/axiom-types-0.1.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index 890a4bee0d14..41829cbe9577 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -1,3 +1,2 @@
-DIST backports-3.20.2.tar.gz 178633 BLAKE2B 2e2f2f31099763bb218f3ada9f9d040d4b41fc842bbc8b91d703e91b89bab9d6e7bbf3aae1ecfe34abe6099d6cb34929ae72ba66d4ee473841563257fa85cf3c SHA512 a91a2c9186315fca8e0b33554ef26986abe8565e08a79b9f150f8115f998b2a7a440bbc64b92f89c4e95e1c5e852bfeea6ab337804cf017517e77229f10820e5
-DIST backports-3.21.0.tar.gz 178706 BLAKE2B b895655fbbd15e99021f3d9d4f5efe84957c43cffc4e6442a286494624af3d9afa50933cb9f46d86a752c2aa1f52e867d4063e5f8357c969c7ade75b38566f52 SHA512 9d3a5315d412f16c28172121f7b64b424d3728e76c2b9b4466937572bc922f595f5b56caa265e9b03ed44ca64643c36086d60ddc1ff8799e11d953dc75aaee65
-DIST backports-3.23.0.tar.gz 181501 BLAKE2B ef9841366b27b19837e61177f727cbd0acd58650cebab03329c174d699147fadfe51b4ac404d11332e681285c5f0ddcf387bdf6304237ff32c77048a1f5670b6 SHA512 b5b16b78c4dfbadbd60735b29541268cc6446f283ad686add208974fb861b270ffc46ec3cb6702c2ecf760e0de83d31025dbeba90e79383ffda6b4ca0b52a06c
+DIST backports-3.24.1.tar.gz 186050 BLAKE2B 5c4f22e12ff4b436c356796b1d8af4cbb8ea038536818bdf97b6c42c57c809c01954147240aa250ee7fc26abf5f9d775d3e0f9b73f6db323aec2c8481d15a68f SHA512 bc29c9eaad86ae99f4a22d6f797bd8a93769761c4bc728539a798e7d0c1fe72cedc665673607d4aab8ac0e7e890789f213842a927eac738674b6089b9961ebf0
+DIST backports-3.25.0.tar.gz 187271 BLAKE2B aad3144190cbb97f34d6ab334899ccee09a4d3b7be9aa91db8a631990124f34528b9243efe311bd4ee137c99a22b60aabda06544c23d5c4cb993dec2d42f09b2 SHA512 88083b358ecc99c9268bdcfeae6ca3503b3cbb3c379b0bae7d55ca4493eb052d6f51c6231e3bf6a9ad8b4128f788efb3766d9aed10c92932d86b7f9138d4d849
diff --git a/dev-ruby/backports/backports-3.20.2-r1.ebuild b/dev-ruby/backports/backports-3.20.2-r1.ebuild
deleted file mode 100644
index fb0a95d6b202..000000000000
--- a/dev-ruby/backports/backports-3.20.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Backports of Ruby features for older Ruby"
-HOMEPAGE="https://github.com/marcandre/backports"
-SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid activesupport test that no longer works in Rails 5. This also avoids
-	# a dependency on activesupport
-	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
-
-	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/backports/backports-3.21.0.ebuild b/dev-ruby/backports/backports-3.21.0.ebuild
deleted file mode 100644
index 20962fcf5671..000000000000
--- a/dev-ruby/backports/backports-3.21.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Backports of Ruby features for older Ruby"
-HOMEPAGE="https://github.com/marcandre/backports"
-SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid activesupport test that no longer works in Rails 5. This also avoids
-	# a dependency on activesupport
-	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
-
-	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/backports/backports-3.23.0.ebuild b/dev-ruby/backports/backports-3.23.0.ebuild
deleted file mode 100644
index 555ca131979d..000000000000
--- a/dev-ruby/backports/backports-3.23.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Backports of Ruby features for older Ruby"
-HOMEPAGE="https://github.com/marcandre/backports"
-SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid activesupport test that no longer works in Rails 5. This also avoids
-	# a dependency on activesupport
-	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
-
-	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/backports/backports-3.24.1.ebuild b/dev-ruby/backports/backports-3.24.1.ebuild
new file mode 100644
index 000000000000..d40e66bbcb4f
--- /dev/null
+++ b/dev-ruby/backports/backports-3.24.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Backports of Ruby features for older Ruby"
+HOMEPAGE="https://github.com/marcandre/backports"
+SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid activesupport test that no longer works in Rails 5. This also avoids
+	# a dependency on activesupport
+	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
+
+	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/backports/backports-3.25.0.ebuild b/dev-ruby/backports/backports-3.25.0.ebuild
new file mode 100644
index 000000000000..a0163970763a
--- /dev/null
+++ b/dev-ruby/backports/backports-3.25.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Backports of Ruby features for older Ruby"
+HOMEPAGE="https://github.com/marcandre/backports"
+SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+all_ruby_prepare() {
+	# Avoid activesupport test that no longer works in Rails 5. This also avoids
+	# a dependency on activesupport
+	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
+
+	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/bacon/bacon-1.2.0-r3.ebuild b/dev-ruby/bacon/bacon-1.2.0-r3.ebuild
deleted file mode 100644
index 3de0a90a4019..000000000000
--- a/dev-ruby/bacon/bacon-1.2.0-r3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Small RSpec clone weighing less than 350 LoC"
-HOMEPAGE="http://chneukirchen.org/repos/bacon"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/bacon/bacon-1.2.0-r4.ebuild b/dev-ruby/bacon/bacon-1.2.0-r4.ebuild
index ead575f2f4a5..8e6c88394d1b 100644
--- a/dev-ruby/bacon/bacon-1.2.0-r4.ebuild
+++ b/dev-ruby/bacon/bacon-1.2.0-r4.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="ChangeLog README.rdoc"
@@ -10,11 +10,11 @@ RUBY_FAKEGEM_EXTRADOC="ChangeLog README.rdoc"
 inherit ruby-fakegem
 
 DESCRIPTION="Small RSpec clone weighing less than 350 LoC"
-HOMEPAGE="http://chneukirchen.org/repos/bacon"
+HOMEPAGE="https://leahneukirchen.org/repos/bacon/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/barby/barby-0.6.8-r1.ebuild b/dev-ruby/barby/barby-0.6.8-r1.ebuild
new file mode 100644
index 000000000000..26423a9c0361
--- /dev/null
+++ b/dev-ruby/barby/barby-0.6.8-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby barcode generator that doesn't rely on 3rd party libraries"
+HOMEPAGE="http://toreto.re/barby/"
+
+GITHUB_USER="toretore"
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test qrcode rmagick prawn png cairo"
+
+ruby_add_rdepend "
+	rmagick? ( dev-ruby/rmagick:* )
+	cairo? ( dev-ruby/rcairo )"
+
+ruby_add_rdepend "qrcode? ( dev-ruby/rqrcode )
+	png? ( dev-ruby/chunky_png )
+	prawn? ( dev-ruby/prawn:* )"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+# testing requires imagemagick capable of png output
+DEPEND+=" test? ( media-gfx/imagemagick[png] )"
+
+# prawn breaks tests for some reasons, needs to be investigated; code
+# still works though.
+RESTRICT="!test? ( test ) prawn? ( test )"
+
+all_ruby_prepare() {
+	sed -i -e 's/README/README.md/' Rakefile || die
+
+	sed -e '/[bB]undler/s:^:#:' \
+		-e 's/MiniTest/Minitest/' \
+		-i test/test_helper.rb || die
+
+	sed -i -e 's/Fixnum/Integer/' test/outputter/svg_outputter_test.rb || die
+
+	if use qrcode; then
+		sed -i -e '/^end/i s.add_dependency "rqrcode"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/barcode/qr_code.rb \
+			test/qr_code_test.rb
+	fi
+
+	if use rmagick; then
+		sed -i -e '/^end/i s.add_dependency "rmagick"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/rmagick_outputter.rb \
+			test/outputter/rmagick_outputter_test.rb
+	fi
+
+	if use prawn; then
+		sed -i -e '/^end/i s.add_dependency "prawn"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/prawn_outputter.rb \
+			test/outputter/prawn_outputter_test.rb
+	fi
+
+	if use png; then
+		sed -i -e '/^end/i s.add_dependency "chunky_png"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/png_outputter.rb \
+			test/outputter/png_outputter_test.rb
+	fi
+
+	if use cairo; then
+		sed -i -e '/^end/i s.add_dependency "cairo"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/cairo_outputter.rb \
+			test/outputter/cairo_outputter_test.rb
+	fi
+
+	sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	rm -f \
+		lib/barby/barcode/data_matrix.rb \
+		test/data_matrix_test.rb \
+		lib/barby/outputter/pdfwriter_outputter.rb \
+		test/outputter/pdfwriter_outputter_test.rb || die
+
+	sed -i \
+		-e '/semacode/d' \
+		-e '/pdf-writer/d' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/barby/barby-0.6.8.ebuild b/dev-ruby/barby/barby-0.6.8.ebuild
deleted file mode 100644
index 4914a6e63785..000000000000
--- a/dev-ruby/barby/barby-0.6.8.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby barcode generator that doesn't rely on 3rd party libraries"
-HOMEPAGE="http://toreto.re/barby/"
-
-GITHUB_USER="toretore"
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test qrcode rmagick prawn png cairo"
-
-ruby_add_rdepend "
-	rmagick? ( dev-ruby/rmagick:* )
-	cairo? ( dev-ruby/rcairo )"
-
-ruby_add_rdepend "qrcode? ( dev-ruby/rqrcode )
-	png? ( dev-ruby/chunky_png )
-	prawn? ( dev-ruby/prawn:* )"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-# testing requires imagemagick capable of png output
-DEPEND+=" test? ( media-gfx/imagemagick[png] )"
-
-# prawn breaks tests for some reasons, needs to be investigated; code
-# still works though.
-RESTRICT="!test? ( test ) prawn? ( test )"
-
-all_ruby_prepare() {
-	sed -i -e 's/README/README.md/' Rakefile || die
-
-	sed -i -e '/[bB]undler/s:^:#:' test/test_helper.rb || die
-
-	if use qrcode; then
-		sed -i -e '/^end/i s.add_dependency "rqrcode"' ${RUBY_FAKEGEM_GEMSPEC}
-	else
-		rm \
-			lib/barby/barcode/qr_code.rb \
-			test/qr_code_test.rb
-	fi
-
-	if use rmagick; then
-		sed -i -e '/^end/i s.add_dependency "rmagick"' ${RUBY_FAKEGEM_GEMSPEC}
-	else
-		rm \
-			lib/barby/outputter/rmagick_outputter.rb \
-			test/outputter/rmagick_outputter_test.rb
-	fi
-
-	if use prawn; then
-		sed -i -e '/^end/i s.add_dependency "prawn"' ${RUBY_FAKEGEM_GEMSPEC}
-	else
-		rm \
-			lib/barby/outputter/prawn_outputter.rb \
-			test/outputter/prawn_outputter_test.rb
-	fi
-
-	if use png; then
-		sed -i -e '/^end/i s.add_dependency "chunky_png"' ${RUBY_FAKEGEM_GEMSPEC}
-	else
-		rm \
-			lib/barby/outputter/png_outputter.rb \
-			test/outputter/png_outputter_test.rb
-	fi
-
-	if use cairo; then
-		sed -i -e '/^end/i s.add_dependency "cairo"' ${RUBY_FAKEGEM_GEMSPEC}
-	else
-		rm \
-			lib/barby/outputter/cairo_outputter.rb \
-			test/outputter/cairo_outputter_test.rb
-	fi
-
-	sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	rm -f \
-		lib/barby/barcode/data_matrix.rb \
-		test/data_matrix_test.rb \
-		lib/barby/outputter/pdfwriter_outputter.rb \
-		test/outputter/pdfwriter_outputter_test.rb || die
-
-	sed -i \
-		-e '/semacode/d' \
-		-e '/pdf-writer/d' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/base32/base32-0.3.4-r1.ebuild b/dev-ruby/base32/base32-0.3.4-r1.ebuild
index ebb79637eb79..093f1ecbaee9 100644
--- a/dev-ruby/base32/base32-0.3.4-r1.ebuild
+++ b/dev-ruby/base32/base32-0.3.4-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/base32/base32-0.3.4.ebuild b/dev-ruby/base32/base32-0.3.4.ebuild
deleted file mode 100644
index f4e57bf25dd9..000000000000
--- a/dev-ruby/base32/base32-0.3.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library which provides base32 decoding and encoding"
-HOMEPAGE="https://rubygems.org/gems/base32 https://github.com/stesla/base32"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest
-	dev-ruby/rake )"
-
-all_ruby_prepare() {
-	sed -i -e "1,10d" Rakefile || die
-}
diff --git a/dev-ruby/base64/Manifest b/dev-ruby/base64/Manifest
new file mode 100644
index 000000000000..fbc53ae7f1d0
--- /dev/null
+++ b/dev-ruby/base64/Manifest
@@ -0,0 +1,2 @@
+DIST base64-0.1.1.tar.gz 4704 BLAKE2B c995292e1abd1e9c28db0cf4c6dbdf9b388062bc4f618c6fcf9404faa6516f5e9689965f63edbd44ca91d4c938be72293b3ad3aad87bed8be0c7a5f064cc83fd SHA512 3ac6dac47deba30002fb19e369fac50c1c3838c7ed8545eff462b7c6402f731d9dd1951f56bb1b2a31bec324c8a28ef94599650129f66bae72dccc72707ff7af
+DIST base64-0.2.0.tar.gz 7004 BLAKE2B a70b357f4998925dc9c6c365e23f0c45eca100170271d2daf3ead56a3656d0a5cc77f8d4e84796c486a7f96dcf520e0a4ba22d3b880926afe41f0603952a93ef SHA512 e2b8f6b28de6eba1b6fdb6496ded0b37465f848d6b338715c715289a221ea9b2df3bef15f32d686cea53a76443f0ed0a183becdb666f842e54f827e08cf0f474
diff --git a/dev-ruby/base64/base64-0.1.1.ebuild b/dev-ruby/base64/base64-0.1.1.ebuild
new file mode 100644
index 000000000000..093c9abc72b5
--- /dev/null
+++ b/dev-ruby/base64/base64-0.1.1.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="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="base64.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Support for encoding and decoding binary data using a Base64 representation."
+HOMEPAGE="https://github.com/ruby/base64"
+SRC_URI="https://github.com/ruby/base64/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/base64/base64-0.2.0.ebuild b/dev-ruby/base64/base64-0.2.0.ebuild
new file mode 100644
index 000000000000..8cecfd8aee84
--- /dev/null
+++ b/dev-ruby/base64/base64-0.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="base64.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Support for encoding and decoding binary data using a Base64 representation."
+HOMEPAGE="https://github.com/ruby/base64"
+SRC_URI="https://github.com/ruby/base64/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's/__FILE__/"base64.gemspec"/' \
+		-e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/base64/metadata.xml b/dev-ruby/base64/metadata.xml
new file mode 100644
index 000000000000..da4e24add3eb
--- /dev/null
+++ b/dev-ruby/base64/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/base64</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/bcrypt-ruby/Manifest b/dev-ruby/bcrypt-ruby/Manifest
index d345254a703b..add1a765ec4f 100644
--- a/dev-ruby/bcrypt-ruby/Manifest
+++ b/dev-ruby/bcrypt-ruby/Manifest
@@ -1,3 +1,2 @@
-DIST bcrypt-3.1.16.gem 54272 BLAKE2B df8e1169df3a67f3eedd90b4fe04224266cd41d1a0dd2866b06372805b5b00aa028c3bb077078ffde3c89a9052497016dc3fe812075d8b6f57d6dd951a6aa806 SHA512 655483d73347c20f3b04a24d625cde05fd8e1da6f022363fbb2df828aea0623cb5b4981d97791301dcd83edc2719a2238d8d377af1558ca2ce4b3c8ade9bd343
-DIST bcrypt-3.1.17.gem 55808 BLAKE2B e2e3d6ebeaf3d52fa69eb2da340c9558c09f526cc29a1230e2f439f32952a916ba6c2336a134ed0a2ca5210dbb8d2f0818c9ec56283e20f25cb9f891b07bdc60 SHA512 527103e758387031cd6153f5806eb161642547e89dda359929d88b0cc676175e4b3c63905fc8ed724914d2f8b152ecc7f6e7cf5d0c66b7c6fbf7b899bade16a7
-DIST bcrypt-3.1.18.gem 55808 BLAKE2B 03e4082f451b8410ae88c1d920625cf3249094ba2d6fc04429d5f9cd60d7e29fa1c3170e2409ba16fa8fd8c341c7471047a382ee89cb2b04dab9bbdaadc3554a SHA512 b0b44f49ac2ef7a6a75a8949943291b7d37fc80be6a4dbbbcbbf117feaa4ff09b0670c14879c358fc2dadd22866cad6e26d07cfdcbb9423d0c52a6f54ae3f8f5
+DIST bcrypt-3.1.19.gem 55296 BLAKE2B 8187a84381f9654ee271b0019dcbc0d0487b2efde384673be6838c7d019e8bebcdefd18e1d82b51e5518eeccebe673646582aaf0f9ce776db86b9d552e645330 SHA512 b34e48db1222f1c36a31afbd8a68dc87fb99431d90ec0932705999a04146886139c3654d8a9b615221dfe7048b8b0cc642a8f9819700bfa079e847d70483badf
+DIST bcrypt-ruby-3.1.20.tar.gz 51778 BLAKE2B 7278019f07aa2c0625a40a90d6a79ba99aa966ae72639427f06bc1fd4e7463d19765ceaa9700a588d168f422ad6a9ac391c683424d4bef4b30df2b667fca4bcb SHA512 a89e992a8684211fda22074269000475f7975dd41f05f9b1c2acd82e7a7e084134dc33c66053b315dc918f848330f2990545e7c806c17b69cdffbf2b382e0f4d
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16-r1.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16-r1.ebuild
deleted file mode 100644
index 079fc8ba9897..000000000000
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_NAME="bcrypt"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/mri/extconf.rb)
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An easy way to keep your users' passwords secure"
-HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/git ls-files/d' bcrypt.gemspec || die
-}
-
-each_ruby_install() {
-		each_fakegem_install
-
-		# bcrypt was called bcrypt-ruby before, so add a spec file that
-		# simply loads bcrypt to make sure that old projects load correctly
-		# we don't even need to create a file to load this: the `require
-		# bcrypt` was already part of bcrypt-ruby requirements.
-		cat - <<EOF > "${T}/bcrypt-ruby.gemspec"
-Gem::Specification.new do |s|
-	s.name = "bcrypt-ruby"
-	s.version = "${RUBY_FAKEGEM_VERSION}"
-	s.summary = "Fake gem to load bcrypt"
-	s.homepage = "${HOMEPAGE}"
-	s.specification_version = 3
-	s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
-end
-EOF
-		RUBY_FAKEGEM_NAME=bcrypt-ruby \
-				RUBY_FAKEGEM_GEMSPEC="${T}/bcrypt-ruby.gemspec" \
-				ruby_fakegem_install_gemspec
-}
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16-r2.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16-r2.ebuild
deleted file mode 100644
index c96faac55005..000000000000
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_NAME="bcrypt"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/mri/extconf.rb)
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An easy way to keep your users' passwords secure"
-HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/git ls-files/d' bcrypt.gemspec || die
-}
-
-each_ruby_install() {
-		each_fakegem_install
-
-		# bcrypt was called bcrypt-ruby before, so add a spec file that
-		# simply loads bcrypt to make sure that old projects load correctly
-		# we don't even need to create a file to load this: the `require
-		# bcrypt` was already part of bcrypt-ruby requirements.
-		cat - <<EOF > "${T}/bcrypt-ruby.gemspec"
-Gem::Specification.new do |s|
-	s.name = "bcrypt-ruby"
-	s.version = "${RUBY_FAKEGEM_VERSION}"
-	s.summary = "Fake gem to load bcrypt"
-	s.homepage = "${HOMEPAGE}"
-	s.specification_version = 3
-	s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
-end
-EOF
-		RUBY_FAKEGEM_NAME=bcrypt-ruby \
-				RUBY_FAKEGEM_GEMSPEC="${T}/bcrypt-ruby.gemspec" \
-				ruby_fakegem_install_gemspec
-}
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16.ebuild
deleted file mode 100644
index 17bacd6c56df..000000000000
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_NAME="bcrypt"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An easy way to keep your users' passwords secure"
-HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/git ls-files/d' bcrypt.gemspec || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/mri extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/mri V=1
-	cp ext/mri/*$(get_modname) lib/ || die
-}
-
-each_ruby_install() {
-		each_fakegem_install
-
-		# bcrypt was called bcrypt-ruby before, so add a spec file that
-		# simply loads bcrypt to make sure that old projects load correctly
-		# we don't even need to create a file to load this: the `require
-		# bcrypt` was already part of bcrypt-ruby requirements.
-		cat - <<EOF > "${T}/bcrypt-ruby.gemspec"
-Gem::Specification.new do |s|
-	s.name = "bcrypt-ruby"
-	s.version = "${RUBY_FAKEGEM_VERSION}"
-	s.summary = "Fake gem to load bcrypt"
-	s.homepage = "${HOMEPAGE}"
-	s.specification_version = 3
-	s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
-end
-EOF
-		RUBY_FAKEGEM_NAME=bcrypt-ruby \
-				RUBY_FAKEGEM_GEMSPEC="${T}/bcrypt-ruby.gemspec" \
-				ruby_fakegem_install_gemspec
-}
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.17.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.17.ebuild
deleted file mode 100644
index b4ec5e5c6220..000000000000
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.17.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_NAME="bcrypt"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/mri/extconf.rb)
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An easy way to keep your users' passwords secure"
-HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e 's/git ls-files/find */' bcrypt.gemspec || die
-}
-
-each_ruby_install() {
-		each_fakegem_install
-
-		# bcrypt was called bcrypt-ruby before, so add a spec file that
-		# simply loads bcrypt to make sure that old projects load correctly
-		# we don't even need to create a file to load this: the `require
-		# bcrypt` was already part of bcrypt-ruby requirements.
-		cat - <<EOF > "${T}/bcrypt-ruby.gemspec"
-Gem::Specification.new do |s|
-	s.name = "bcrypt-ruby"
-	s.version = "${RUBY_FAKEGEM_VERSION}"
-	s.summary = "Fake gem to load bcrypt"
-	s.homepage = "${HOMEPAGE}"
-	s.specification_version = 3
-	s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
-end
-EOF
-		RUBY_FAKEGEM_NAME=bcrypt-ruby \
-				RUBY_FAKEGEM_GEMSPEC="${T}/bcrypt-ruby.gemspec" \
-				ruby_fakegem_install_gemspec
-}
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.18.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.18.ebuild
deleted file mode 100644
index f12cf5ad4e33..000000000000
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.18.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_NAME="bcrypt"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/mri/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to keep your users' passwords secure"
-HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e 's/git ls-files/find */' bcrypt.gemspec || die
-}
-
-each_ruby_install() {
-		each_fakegem_install
-
-		# bcrypt was called bcrypt-ruby before, so add a spec file that
-		# simply loads bcrypt to make sure that old projects load correctly
-		# we don't even need to create a file to load this: the `require
-		# bcrypt` was already part of bcrypt-ruby requirements.
-		cat - <<EOF > "${T}/bcrypt-ruby.gemspec"
-Gem::Specification.new do |s|
-	s.name = "bcrypt-ruby"
-	s.version = "${RUBY_FAKEGEM_VERSION}"
-	s.summary = "Fake gem to load bcrypt"
-	s.homepage = "${HOMEPAGE}"
-	s.specification_version = 3
-	s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
-end
-EOF
-		RUBY_FAKEGEM_NAME=bcrypt-ruby \
-				RUBY_FAKEGEM_GEMSPEC="${T}/bcrypt-ruby.gemspec" \
-				ruby_fakegem_install_gemspec
-}
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.19.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.19.ebuild
new file mode 100644
index 000000000000..ea8b4a585fc2
--- /dev/null
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.19.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="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_NAME="bcrypt"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/mri/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to keep your users' passwords secure"
+HOMEPAGE="https://github.com/bcrypt-ruby/bcrypt-ruby"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e 's/git ls-files/find */' bcrypt.gemspec || die
+}
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.20.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.20.ebuild
new file mode 100644
index 000000000000..8579ba51f11d
--- /dev/null
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.20.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_NAME="bcrypt"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/mri/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to keep your users' passwords secure"
+HOMEPAGE="https://github.com/bcrypt-ruby/bcrypt-ruby"
+SRC_URI="https://github.com/bcrypt-ruby/bcrypt-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e 's/git ls-files/find */' bcrypt.gemspec || die
+}
diff --git a/dev-ruby/bcrypt-ruby/metadata.xml b/dev-ruby/bcrypt-ruby/metadata.xml
index da53b8838ce5..6dcce36d22a7 100644
--- a/dev-ruby/bcrypt-ruby/metadata.xml
+++ b/dev-ruby/bcrypt-ruby/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">codahale/bcrypt-ruby</remote-id>
+    <remote-id type="github">bcrypt-ruby/bcrypt-ruby</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild
deleted file mode 100644
index 904404a877ca..000000000000
--- a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/mri/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements bcrypt_pdkfd (a variant of PBKDF2 with bcrypt-based PRF)"
-HOMEPAGE="https://github.com/net-ssh/bcrypt_pbkdf-ruby"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( virtual/ruby-ssl )"
-
-all_ruby_prepare() {
-	# Don't use a ruby-bundled version of libsodium
-	sed -i -e '/rbnacl\/libsodium/ s:^:#:' test/bcrypt_pnkdf/engine_test.rb || die
-
-	# Avoid unneeded rake-compiler dependency
-	sed -e '/extensiontask/ s:^:#:' -e '/ExtensionTask/,/^end/ s:^:#:' \
-		-e '/bundler/ s:^:#:' \
-		-i Rakefile || die
-
-	sed -i -e 's/git ls-files/find * -print/' bcrypt_pbkdf.gemspec || die
-}
-
-each_ruby_configure() {
-	each_fakegem_configure
-	# Some methods may not be inlined on x86 but they are not defined either, bug 629164
-
-	sed -i -e 's:-Wl,--no-undefined::' ext/mri/Makefile || die
-}
diff --git a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r2.ebuild b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..3f22ce59f2f1
--- /dev/null
+++ b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/mri/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements bcrypt_pdkfd (a variant of PBKDF2 with bcrypt-based PRF)"
+HOMEPAGE="https://github.com/net-ssh/bcrypt_pbkdf-ruby"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( virtual/ruby-ssl )"
+
+all_ruby_prepare() {
+	# Don't use a ruby-bundled version of libsodium
+	sed -i -e '/rbnacl\/libsodium/ s:^:#:' test/bcrypt_pnkdf/engine_test.rb || die
+
+	# Avoid unneeded rake-compiler dependency
+	sed -e '/extensiontask/ s:^:#:' -e '/ExtensionTask/,/^end/ s:^:#:' \
+		-e '/bundler/ s:^:#:' \
+		-i Rakefile || die
+
+	# Fix minitest deprecation
+	sed -e 's/MiniTest::Unit::TestCase/Minitest::Test/' \
+		-i test/*/*_test.rb || die
+
+	sed -i -e 's/git ls-files/find * -print/' bcrypt_pbkdf.gemspec || die
+}
+
+each_ruby_configure() {
+	each_fakegem_configure
+	# Some methods may not be inlined on x86 but they are not defined either, bug 629164
+
+	sed -i -e 's:-Wl,--no-undefined::' ext/mri/Makefile || die
+}
diff --git a/dev-ruby/benchmark-ips/Manifest b/dev-ruby/benchmark-ips/Manifest
index c108e1b48b17..180ffe448ddf 100644
--- a/dev-ruby/benchmark-ips/Manifest
+++ b/dev-ruby/benchmark-ips/Manifest
@@ -1,2 +1,2 @@
-DIST benchmark-ips-2.10.0.tar.gz 19840 BLAKE2B 53c219921144632dc91971fa3558bcaf106887d7deafbd7145c1ad12d09d37ecbe17dd07a3da7f8a2c5bedea4a228d76d72bd8e54b14c94c4b21f2e9823cb8f6 SHA512 aeb86bfd80c6ac6a16df8dced2681e81bcb6a0a31848524956b348cd699addebdda4b1a32c6eab85884b89bfb9c26e01f40af7da5a58e187af3a737ad582b8dc
-DIST benchmark-ips-2.9.2.gem 21504 BLAKE2B e1ff44841c42a2ac919bc33be517aab8c09ede32fcf2d72d143a21bbaf8c67a99ea8abcfc10a473afc456be735836fa44135ff3c295380bf21d09cc43337977e SHA512 b20d80e42a6175a2c2b75be7a1d423b0ecd1aa201be9cb443f838bcdbfba08d54cdd5e43a203834d451b9ce37219b6e1c8227a5196ee84a132c7ed9fd9431270
+DIST benchmark-ips-2.12.0.tar.gz 20676 BLAKE2B 1473fb8cc42d62cf6b7206d91c9d959707109e3ade9d712d82ab5ccfdcc48bb4874bae4c37370561aa60fe8c99078564a22a5a216daa6b870015329db1094af1 SHA512 ad4a7133b73d3ead583513704cbf00ef858b7fc5477686d3841614f05a83f3b4551b1fcab78e9a8affe7c8487112d9fde5012bf8a8e13621d289d792ff27c061
+DIST benchmark-ips-2.13.0.tar.gz 20781 BLAKE2B 61a04395559a75b012c168345926f0f92954453081da4a0280b99f95f91c66633b04f99caf485a2b35036428719149154792e463cf7b4f6ab57c176506456235 SHA512 a167dbd4ecaf233c36da7cbfb2283447124ef190b174dc4f9f3281bf4de01b86044e55972fd25560b2612b1eed329e6f2d737f16d2e0961e04fce861b64a747f
diff --git a/dev-ruby/benchmark-ips/benchmark-ips-2.10.0.ebuild b/dev-ruby/benchmark-ips/benchmark-ips-2.10.0.ebuild
deleted file mode 100644
index ea565378aba9..000000000000
--- a/dev-ruby/benchmark-ips/benchmark-ips-2.10.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-RUBY_FAKEGEM_GEMSPEC="benchmark-ips.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A iterations per second enhancement to Benchmark"
-HOMEPAGE="https://github.com/evanphx/benchmark-ips"
-SRC_URI="https://github.com/evanphx/benchmark-ips/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc ~x86"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.6:5 )"
-
-all_ruby_prepare() {
-	sed -i -e '1i require "tempfile"' test/test_benchmark_ips.rb || die
-	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/benchmark-ips/benchmark-ips-2.12.0.ebuild b/dev-ruby/benchmark-ips/benchmark-ips-2.12.0.ebuild
new file mode 100644
index 000000000000..a04779c5d17a
--- /dev/null
+++ b/dev-ruby/benchmark-ips/benchmark-ips-2.12.0.ebuild
@@ -0,0 +1,30 @@
+# 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"
+RUBY_FAKEGEM_GEMSPEC="benchmark-ips.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A iterations per second enhancement to Benchmark"
+HOMEPAGE="https://github.com/evanphx/benchmark-ips"
+SRC_URI="https://github.com/evanphx/benchmark-ips/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.6:5 )"
+
+all_ruby_prepare() {
+	sed -i -e '1i require "tempfile"' test/test_benchmark_ips.rb || die
+	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/benchmark-ips/benchmark-ips-2.13.0.ebuild b/dev-ruby/benchmark-ips/benchmark-ips-2.13.0.ebuild
new file mode 100644
index 000000000000..de94161a5f5f
--- /dev/null
+++ b/dev-ruby/benchmark-ips/benchmark-ips-2.13.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+RUBY_FAKEGEM_GEMSPEC="benchmark-ips.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A iterations per second enhancement to Benchmark"
+HOMEPAGE="https://github.com/evanphx/benchmark-ips"
+SRC_URI="https://github.com/evanphx/benchmark-ips/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.6:5 )"
+
+all_ruby_prepare() {
+	sed -i -e '1i require "tempfile"' test/test_benchmark_ips.rb || die
+	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/benchmark-ips/benchmark-ips-2.9.2.ebuild b/dev-ruby/benchmark-ips/benchmark-ips-2.9.2.ebuild
deleted file mode 100644
index 9ded688c8038..000000000000
--- a/dev-ruby/benchmark-ips/benchmark-ips-2.9.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A iterations per second enhancement to Benchmark"
-HOMEPAGE="https://github.com/evanphx/benchmark-ips"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc ~x86"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.6:5 )"
-
-all_ruby_prepare() {
-	sed -i -e '1i require "tempfile"' test/test_benchmark_ips.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/best_in_place/Manifest b/dev-ruby/best_in_place/Manifest
deleted file mode 100644
index 96287f000a3d..000000000000
--- a/dev-ruby/best_in_place/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST best_in_place-3.1.1.gem 75264 BLAKE2B 9d37d42f44430bd4d51c3cbeff2a95a3ba9552bda1c9650c4abf2996cfa4bbe1a36b627dea61c7a0bf861b27f4e88f7c70f6859cc5bf12c705eaf1c184690fd3 SHA512 f6a26590769f8d6ab6b6bf9ef955e2c26b6116ab82ccaf3bc26cfae435cb0bc594facae6dcb052bafdaaeb5806f7091eb9ad21e51940030eadd437ae342f1d33
diff --git a/dev-ruby/best_in_place/best_in_place-3.1.1.ebuild b/dev-ruby/best_in_place/best_in_place-3.1.1.ebuild
deleted file mode 100644
index e76561a0d155..000000000000
--- a/dev-ruby/best_in_place/best_in_place-3.1.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-# if ever needed
-#GITHUB_USER="bernat"
-#GITHUB_PROJECT="${PN}"
-#RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
-
-inherit virtualx ruby-fakegem
-
-DESCRIPTION="In-place editor helper for Rails 3"
-HOMEPAGE="https://github.com/bernat/best_in_place"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/actionpack-3.2:*
-	>=dev-ruby/railties-3.2:*
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/rdiscount
-		dev-ruby/rspec-rails:3
-		>=dev-ruby/nokogiri-1.5.0
-		>=dev-ruby/capybara-1.1.2
-		>=dev-ruby/rails-3.2
-		>=dev-ruby/sqlite3-1.3.4-r1
-		dev-ruby/bundler
-		dev-ruby/combustion
-		dev-ruby/jquery-rails
-		dev-ruby/jquery-ui-rails
-		dev-ruby/sprockets-rails
-	)"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/git ls-files/d' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Tweak Gemfile so we can use it to run specs but can avoid missing
-	# dependencies. Also use packaged versions of jquery and jquery-ui.
-	sed -i -e '/\(rails-assets\|appraisal\)/ s:^:#:' \
-		-e '2agem "rspec", "~>3.0"' \
-		-e '2agem "jquery-rails"' -e '2agem "jquery-ui-rails"' \
-		-e '/byebug/ s:^:#:' \
-		-e '/\(launchy\|poltergeist\)/d' \
-		Gemfile
-	sed -i -e '/poltergeist/,/javascript_driver/ s:^:#:' spec/rails_helper.rb || die
-
-	# Remove integration tests. They fail to run and depend on obsolete
-	# poltergeist/phantomjs.
-	rm -rf spec/integration || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rspec-3 spec || die
-}
diff --git a/dev-ruby/best_in_place/metadata.xml b/dev-ruby/best_in_place/metadata.xml
deleted file mode 100644
index 63d6b68154d9..000000000000
--- a/dev-ruby/best_in_place/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">bernat/best_in_place</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/bigdecimal/Manifest b/dev-ruby/bigdecimal/Manifest
new file mode 100644
index 000000000000..9d68fe041217
--- /dev/null
+++ b/dev-ruby/bigdecimal/Manifest
@@ -0,0 +1,4 @@
+DIST bigdecimal-3.1.4.tar.gz 115069 BLAKE2B 7c7df4ceac6caa44414cf2fe4e16ee21b8d4a868097e5a6d3e7bdae8521b572b6facae5023fac28dafe9a659a93f0cb56ef2762f84b85959358ee9a33be687b1 SHA512 5e89906d4df0890d61ddca9cc88549acac6c94fc7267975a0ad8684855283c60a2f5fbd48051569c33fa513b6c25485d474446066911577f8cad00c26b57cd43
+DIST bigdecimal-3.1.5.tar.gz 105064 BLAKE2B 472f364f34ab37478e7d6570bb7cd9a35a82f973ef09806fc9229793392a5daa2f66b2303a75ca43b098c7413c9a358ffe07bd592d499d671bac5136690b2b11 SHA512 fd6c463412dbe626e98cffaf977967eb5bbaa15670131132e16050470184443b0d773ede9df1a8196f7f2c0362060f7d79727a970ad5bd6b4031d5875867b8c5
+DIST bigdecimal-3.1.6.tar.gz 104969 BLAKE2B 50c90c9d7fbce71d9a4ac1c32d6340ce07101e87cea4597c1365bdd84d24811cea2c65b7c7afb9a9d66125527ade7cc1c090aae77541d86b91d4d6990bb3cd59 SHA512 e44278f9d193575f27fd63a9a9687529295a65413ff98f07c1278328304acc4a5f9d3e1367f5bccab515f2b209465d0147661fe7f822bea901466d9dd33324c0
+DIST bigdecimal-3.1.7.tar.gz 104984 BLAKE2B 0c0a97d120edce1946bd134f810ccb7f068465d678f3396b39a6e0e540dcefe03c5b8d2cee90f5c96481513065f4645bfbfcc10116bac6b80f7e22344a34024e SHA512 567dcbd010d4879c74286f440082ea9e9b9873c53ab208db4e96a21c5d8c786c6e622a29698e9e9202803b6bf2fcef1d15ff24b784184738664c4be847d2d749
diff --git a/dev-ruby/bigdecimal/bigdecimal-3.1.4-r1.ebuild b/dev-ruby/bigdecimal/bigdecimal-3.1.4-r1.ebuild
new file mode 100644
index 000000000000..d2aa1a8266e2
--- /dev/null
+++ b/dev-ruby/bigdecimal/bigdecimal-3.1.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/bigdecimal/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+RUBY_FAKEGEM_GEMSPEC="bigdecimal.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Arbitrary-precision decimal floating-point number library for Ruby"
+HOMEPAGE="https://github.com/ruby/bigdecimal"
+SRC_URI="https://github.com/ruby/bigdecimal/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 ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -e '/^source_version/,/^end/ s:^:#:' \
+		-e "/s.version/ s/= source_version/= '${PV}'/" \
+		-e "/s.name/ s/= name/= 'bigdecimal'/" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -rtest/lib/helper -e "Dir['test/**/test_*.rb'].each { require _1 }" || die
+}
diff --git a/dev-ruby/bigdecimal/bigdecimal-3.1.5.ebuild b/dev-ruby/bigdecimal/bigdecimal-3.1.5.ebuild
new file mode 100644
index 000000000000..da315d9f8d8d
--- /dev/null
+++ b/dev-ruby/bigdecimal/bigdecimal-3.1.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/bigdecimal/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+RUBY_FAKEGEM_GEMSPEC="bigdecimal.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Arbitrary-precision decimal floating-point number library for Ruby"
+HOMEPAGE="https://github.com/ruby/bigdecimal"
+SRC_URI="https://github.com/ruby/bigdecimal/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 ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -e '/^source_version/,/^end/ s:^:#:' \
+		-e "/s.version/ s/= source_version/= '${PV}'/" \
+		-e "/s.name/ s/= name/= 'bigdecimal'/" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -rtest/lib/helper -e "Dir['test/**/test_*.rb'].each { require _1 }" || die
+}
diff --git a/dev-ruby/bigdecimal/bigdecimal-3.1.6.ebuild b/dev-ruby/bigdecimal/bigdecimal-3.1.6.ebuild
new file mode 100644
index 000000000000..26898456a09b
--- /dev/null
+++ b/dev-ruby/bigdecimal/bigdecimal-3.1.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/bigdecimal/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+RUBY_FAKEGEM_GEMSPEC="bigdecimal.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Arbitrary-precision decimal floating-point number library for Ruby"
+HOMEPAGE="https://github.com/ruby/bigdecimal"
+SRC_URI="https://github.com/ruby/bigdecimal/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 ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -e '/^source_version/,/^end/ s:^:#:' \
+		-e "/s.version/ s/= source_version/= '${PV}'/" \
+		-e "/s.name/ s/= name/= 'bigdecimal'/" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -rtest/lib/helper -e "Dir['test/**/test_*.rb'].each { require _1 }" || die
+}
diff --git a/dev-ruby/bigdecimal/bigdecimal-3.1.7.ebuild b/dev-ruby/bigdecimal/bigdecimal-3.1.7.ebuild
new file mode 100644
index 000000000000..26898456a09b
--- /dev/null
+++ b/dev-ruby/bigdecimal/bigdecimal-3.1.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/bigdecimal/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+RUBY_FAKEGEM_GEMSPEC="bigdecimal.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Arbitrary-precision decimal floating-point number library for Ruby"
+HOMEPAGE="https://github.com/ruby/bigdecimal"
+SRC_URI="https://github.com/ruby/bigdecimal/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 ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -e '/^source_version/,/^end/ s:^:#:' \
+		-e "/s.version/ s/= source_version/= '${PV}'/" \
+		-e "/s.name/ s/= name/= 'bigdecimal'/" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -rtest/lib/helper -e "Dir['test/**/test_*.rb'].each { require _1 }" || die
+}
diff --git a/dev-ruby/bigdecimal/metadata.xml b/dev-ruby/bigdecimal/metadata.xml
new file mode 100644
index 000000000000..2df3a2ecd5cf
--- /dev/null
+++ b/dev-ruby/bigdecimal/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/bigdecimal</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/bindata/Manifest b/dev-ruby/bindata/Manifest
index 8b096e8c24fb..f5415d758c68 100644
--- a/dev-ruby/bindata/Manifest
+++ b/dev-ruby/bindata/Manifest
@@ -1 +1,2 @@
-DIST bindata-2.4.10.gem 80384 BLAKE2B a95f607771cbee45e65748ff8f09a87f2fa5b1462f311a0630b4202ec99d2c20815e0ea2e451c52583e5964f29189a56a63e1a03a6193d23125d1720beccbb4f SHA512 4f3fee967fd27e5f69bcf0126582191579ff36786f9841e31253de6d5de9de21c81b71e4efbdf5a9c5d8585a8404e2064bd378feae0a9a5cc9bd3664846ea423
+DIST bindata-2.4.15.gem 80384 BLAKE2B e874f396d1ac7902db0fadca4b2d75da3af6ef553d84cea07a7fefa2fcba46d383c4c4b1ec0db8e744675253fd86dc5e9a287b3834616286a08f1e5605711443 SHA512 366b9de24ce6276832f0ea9c76cad70b433aa1f7f29839a1317b0fe2582f9c91d16ea90d74da7364d94f088b53ada2597b0e25cee859487657af4db20efed930
+DIST bindata-2.5.0.gem 83456 BLAKE2B 237ad6310c1af3af2c57637395082c65d445098a80971debcf1744f97bda027c0a6bcd21ef3f208adee3fd238f50697ec3c28537bd355d434c83f5b7efb6f0ee SHA512 17aa458d9450775f46247f97c04e9c73fbf629321404b1c785e077028ab1edaf5e9bd5cbbc606b950a7bd968b3a1460c55fbbffedad16a4d7df6fc67781ef356
diff --git a/dev-ruby/bindata/bindata-2.4.10.ebuild b/dev-ruby/bindata/bindata-2.4.10.ebuild
deleted file mode 100644
index 2f797ad91789..000000000000
--- a/dev-ruby/bindata/bindata-2.4.10.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parsing Binary Data in Ruby"
-HOMEPAGE="https://github.com/dmendel/bindata"
-
-LICENSE="BSD-2"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/[Cc]overalls/d' test/test_helper.rb || die
-}
diff --git a/dev-ruby/bindata/bindata-2.4.15.ebuild b/dev-ruby/bindata/bindata-2.4.15.ebuild
new file mode 100644
index 000000000000..a170452bcbfc
--- /dev/null
+++ b/dev-ruby/bindata/bindata-2.4.15.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parsing Binary Data in Ruby"
+HOMEPAGE="https://github.com/dmendel/bindata"
+
+LICENSE="BSD-2"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~x86"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/[Cc]overalls/d' test/test_helper.rb || die
+}
diff --git a/dev-ruby/bindata/bindata-2.5.0.ebuild b/dev-ruby/bindata/bindata-2.5.0.ebuild
new file mode 100644
index 000000000000..a30bd5321636
--- /dev/null
+++ b/dev-ruby/bindata/bindata-2.5.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parsing Binary Data in Ruby"
+HOMEPAGE="https://github.com/dmendel/bindata"
+
+LICENSE="BSD-2"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/bindata/metadata.xml b/dev-ruby/bindata/metadata.xml
index 162861c0c6c8..3d6fbecca45b 100644
--- a/dev-ruby/bindata/metadata.xml
+++ b/dev-ruby/bindata/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zerochaos@gentoo.org</email>
-		<name>Rick Farina</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">dmendel/bindata</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">dmendel/bindata</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/bindex/bindex-0.8.1-r1.ebuild b/dev-ruby/bindex/bindex-0.8.1-r1.ebuild
deleted file mode 100644
index efe790143b50..000000000000
--- a/dev-ruby/bindex/bindex-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/skiptrace/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/skiptrace/internal"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Bindings for your Ruby exceptions"
-HOMEPAGE="https://github.com/gsamokovarov/bindex"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -e '/bundler/I s:^:#:' \
-		-e '/when/ s/ruby/rubyx/' \
-		-i Rakefile || die
-}
diff --git a/dev-ruby/bindex/bindex-0.8.1-r2.ebuild b/dev-ruby/bindex/bindex-0.8.1-r2.ebuild
new file mode 100644
index 000000000000..a8ef4919be76
--- /dev/null
+++ b/dev-ruby/bindex/bindex-0.8.1-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/skiptrace/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/skiptrace/internal"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Bindings for your Ruby exceptions"
+HOMEPAGE="https://github.com/gsamokovarov/bindex"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e '/bundler/I s:^:#:' \
+		-e '/when/ s/ruby/rubyx/' \
+		-i Rakefile || die
+
+	# Fix minitest deprecation
+	sed -e 's/MiniTest/Minitest/' \
+		-i test/test_helper.rb || die
+}
diff --git a/dev-ruby/binding_of_caller/Manifest b/dev-ruby/binding_of_caller/Manifest
index edf5c7a36dde..4f507d39cba8 100644
--- a/dev-ruby/binding_of_caller/Manifest
+++ b/dev-ruby/binding_of_caller/Manifest
@@ -1 +1,2 @@
 DIST binding_of_caller-1.0.0.tar.gz 7473 BLAKE2B 2a8f3cee555e11c9eeb56935d0ee51deb037ea5fc631b4ef5eb50a831e48ba47c6a94e9104456bd8e6c4910bc76c5bc7e268db7de8c5ed283886b80c3feffd62 SHA512 89c58fec180b7bc25c5124035ed69692961148a3ddcb561643e7b8b1a78c3b103795408b52e70264db7c4b62080991219af977c5b981a135d573ecd56cebebba
+DIST binding_of_caller-1.0.1.tar.gz 7514 BLAKE2B 1a6786d4fa2a01f72bf5b38f8fced3950826488501fa15fb8b37188e345d6a93ce8a4598f7c4c0048ca05bfae8ff23daab8a0fb89da3140f83f20dbca60ae1f3 SHA512 ebdcb2e0e41efef38eec2aa814f4d875249e1fb4f4719238fae2c92533a37324fe64bc9edbebddf2d240f0c3dd213fddf1584cb9841e4fc946c6aecbe8543e34
diff --git a/dev-ruby/binding_of_caller/binding_of_caller-1.0.0-r1.ebuild b/dev-ruby/binding_of_caller/binding_of_caller-1.0.0-r1.ebuild
deleted file mode 100644
index ff79d8237c16..000000000000
--- a/dev-ruby/binding_of_caller/binding_of_caller-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="binding_of_caller.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Retrieve the binding of a method's caller"
-HOMEPAGE="https://github.com/banister/binding_of_caller"
-SRC_URI="https://github.com/banister/binding_of_caller/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/debug_inspector-0.0.1"
-
-all_ruby_prepare() {
-	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/binding_of_caller/binding_of_caller-1.0.0-r2.ebuild b/dev-ruby/binding_of_caller/binding_of_caller-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..4f1a7d57733e
--- /dev/null
+++ b/dev-ruby/binding_of_caller/binding_of_caller-1.0.0-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="binding_of_caller.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Retrieve the binding of a method's caller"
+HOMEPAGE="https://github.com/banister/binding_of_caller"
+SRC_URI="https://github.com/banister/binding_of_caller/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/debug_inspector-0.0.1"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/binding_of_caller/binding_of_caller-1.0.1.ebuild b/dev-ruby/binding_of_caller/binding_of_caller-1.0.1.ebuild
new file mode 100644
index 000000000000..90fe35a91cb9
--- /dev/null
+++ b/dev-ruby/binding_of_caller/binding_of_caller-1.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="binding_of_caller.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Retrieve the binding of a method's caller"
+HOMEPAGE="https://github.com/banister/binding_of_caller"
+SRC_URI="https://github.com/banister/binding_of_caller/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/debug_inspector-1.2.0"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/bit-struct/Manifest b/dev-ruby/bit-struct/Manifest
deleted file mode 100644
index c10d303fc16b..000000000000
--- a/dev-ruby/bit-struct/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bit-struct-0.17.gem 31232 BLAKE2B 8dd802d22b543dbde4e59f9bbdf158379045b633e427ed2d01fa0a141f48298e2d3da48f19a2c113426b8dafab7ce139948fa8d097e6b87dc9957eecf65bf95b SHA512 9f3cc652d0f2983edc5a67a5b7ad5a64a2cd73b45414b3636fdd9e6d18fe971ec9d5cd3553ef384f039bfb166489fd303724c8c0c9d882cd757610c7986b0f1f
diff --git a/dev-ruby/bit-struct/bit-struct-0.17.ebuild b/dev-ruby/bit-struct/bit-struct-0.17.ebuild
deleted file mode 100644
index 25fc8284a70f..000000000000
--- a/dev-ruby/bit-struct/bit-struct-0.17.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for packed binary data stored in ruby Strings"
-HOMEPAGE="https://github.com/vjoel/bit-struct"
-
-LICENSE="Ruby-BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/bit-struct/metadata.xml b/dev-ruby/bit-struct/metadata.xml
deleted file mode 100644
index 5c06e93a1139..000000000000
--- a/dev-ruby/bit-struct/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">vjoel/bit-struct</remote-id>
-    <remote-id type="rubygems">bit-struct</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/blankslate/blankslate-3.1.3-r1.ebuild b/dev-ruby/blankslate/blankslate-3.1.3-r1.ebuild
deleted file mode 100644
index 5e339b253e06..000000000000
--- a/dev-ruby/blankslate/blankslate-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Base class with almost all of the methods from Object and Kernel being removed"
-HOMEPAGE="https://rubygems.org/gems/blankslate"
-
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-all_ruby_prepare() {
-	# Avoid test failing with rspec 2.x.
-	sed -i -e '/cleanliness/,/^  end/ s:^:#:' spec/blankslate_spec.rb || die
-}
diff --git a/dev-ruby/blankslate/blankslate-3.1.3-r2.ebuild b/dev-ruby/blankslate/blankslate-3.1.3-r2.ebuild
new file mode 100644
index 000000000000..c5e15fc17c9a
--- /dev/null
+++ b/dev-ruby/blankslate/blankslate-3.1.3-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Base class with almost all of the methods from Object and Kernel being removed"
+HOMEPAGE="https://rubygems.org/gems/blankslate"
+
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+
+all_ruby_prepare() {
+	# Avoid test failing with rspec 2.x.
+	sed -i -e '/cleanliness/,/^  end/ s:^:#:' spec/blankslate_spec.rb || die
+}
diff --git a/dev-ruby/blinkstick/blinkstick-1.0.1_p20150901-r1.ebuild b/dev-ruby/blinkstick/blinkstick-1.0.1_p20150901-r1.ebuild
new file mode 100644
index 000000000000..6f412b025e92
--- /dev/null
+++ b/dev-ruby/blinkstick/blinkstick-1.0.1_p20150901-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_VERSION="1.0.1.1"
+
+COMMIT="89e3f621132c2571d5f7c636b3962ff1b0a64564"
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby interface for blinkstick via libusb"
+HOMEPAGE="https://github.com/arvydas/blinkstick-ruby"
+SRC_URI="https://github.com/arvydas/blinkstick-ruby/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-ruby-${COMMIT}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+ruby_add_rdepend "
+	>=dev-ruby/color-1.4.2
+	>=dev-ruby/libusb-0.4.0
+"
+
+all_ruby_install() {
+	if use examples; then
+		insinto /usr/share/${PN}
+		doins example-*.rb
+	fi
+	all_fakegem_install
+}
+
+each_ruby_install() {
+	mkdir -p lib/${PN}
+	mv ${PN}.rb lib
+	cat <<EOF >> lib/${PN}/version.rb
+class BlinkStick
+	VERSION = "1.0.1.1"
+end
+
+EOF
+	each_fakegem_install
+}
diff --git a/dev-ruby/blinkstick/blinkstick-1.0.1_p20150901.ebuild b/dev-ruby/blinkstick/blinkstick-1.0.1_p20150901.ebuild
deleted file mode 100644
index c31e21734f2a..000000000000
--- a/dev-ruby/blinkstick/blinkstick-1.0.1_p20150901.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_VERSION="1.0.1.1"
-
-COMMIT="89e3f621132c2571d5f7c636b3962ff1b0a64564"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby interface for blinkstick via libusb"
-HOMEPAGE="https://github.com/arvydas/blinkstick-ruby"
-SRC_URI="https://github.com/arvydas/blinkstick-ruby/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-ruby-${COMMIT}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-ruby_add_rdepend "
-	>=dev-ruby/color-1.4.2
-	>=dev-ruby/libusb-0.4.0
-"
-
-all_ruby_install() {
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins example-*.rb
-	fi
-	all_fakegem_install
-}
-
-each_ruby_install() {
-	mkdir -p lib/${PN}
-	mv ${PN}.rb lib
-	cat <<EOF >> lib/${PN}/version.rb
-class BlinkStick
-	VERSION = "1.0.1.1"
-end
-
-EOF
-	each_fakegem_install
-}
diff --git a/dev-ruby/blinkstick/metadata.xml b/dev-ruby/blinkstick/metadata.xml
index 394f1d579ac4..62ef42604c64 100644
--- a/dev-ruby/blinkstick/metadata.xml
+++ b/dev-ruby/blinkstick/metadata.xml
@@ -5,6 +5,10 @@
     <email>zerochaos@gentoo.org</email>
     <name>Rick Farina</name>
   </maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">arvydas/blinkstick-ruby</remote-id>
   </upstream>
diff --git a/dev-ruby/bogus/bogus-0.1.6-r1.ebuild b/dev-ruby/bogus/bogus-0.1.6-r1.ebuild
new file mode 100644
index 000000000000..bc5c0c687383
--- /dev/null
+++ b/dev-ruby/bogus/bogus-0.1.6-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ensuring that the things you stub or mock actually exist"
+HOMEPAGE="https://github.com/psyho/bogus"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/dependor-0.0.4"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/^end/ s:^:#:' \
+		-e '/SimpleCov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid dependency on unpackaged nulldb
+	rm -f spec/bogus/fakes/fake_ar_attributes_spec.rb || die
+
+	# Avoid keyword specs failing on ruby30
+	rm -r spec/bogus/ruby_2* || die
+}
diff --git a/dev-ruby/bogus/bogus-0.1.6.ebuild b/dev-ruby/bogus/bogus-0.1.6.ebuild
deleted file mode 100644
index 8bcdd5a366e5..000000000000
--- a/dev-ruby/bogus/bogus-0.1.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ensuring that the things you stub or mock actually exist"
-HOMEPAGE="https://github.com/psyho/bogus"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/dependor-0.0.4"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^end/ s:^:#:' \
-		-e '/SimpleCov/,/^end/ s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid dependency on unpackaged nulldb
-	rm -f spec/bogus/fakes/fake_ar_attributes_spec.rb || die
-}
diff --git a/dev-ruby/brass/brass-1.2.1-r1.ebuild b/dev-ruby/brass/brass-1.2.1-r1.ebuild
index 4c4b0a54f0b1..83fc1f29f193 100644
--- a/dev-ruby/brass/brass-1.2.1-r1.ebuild
+++ b/dev-ruby/brass/brass-1.2.1-r1.ebuild
@@ -1,10 +1,11 @@
-# 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"
 
-RUBY_FAKEGEM_TASK_TEST=""
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST="" # it's a tiny stub test
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
 inherit ruby-fakegem
@@ -15,4 +16,3 @@ HOMEPAGE="https://rubyworks.github.io/brass/"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
diff --git a/dev-ruby/brass/metadata.xml b/dev-ruby/brass/metadata.xml
index 658c72b1920d..165bdf961e91 100644
--- a/dev-ruby/brass/metadata.xml
+++ b/dev-ruby/brass/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">rubyworks/brass</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/brotli/Manifest b/dev-ruby/brotli/Manifest
index 777ad0cd6b98..920fd15d981e 100644
--- a/dev-ruby/brotli/Manifest
+++ b/dev-ruby/brotli/Manifest
@@ -1 +1,2 @@
 DIST brotli-0.4.0.tar.gz 9460 BLAKE2B b5d5e490c3ab086d6817c1ecc9143aefe88487d65d6774bda939b25bdb6aaaea4e28d99e01d49b90dbbccceba6643c0b5fdab0cea930eaf1661454996e61fab7 SHA512 7d1d2a1343aec11e840d840358d7d27b4ef93954bc17170d581b16d46191902b6fdf6380344f0d172e5e7f3fc0948146312659a44dc95973ec30ac3344f4a656
+DIST brotli-0.5.0.tar.gz 9449 BLAKE2B daf34e3b3bc175d883a844a9fedbbe686b2b103db9249bd47d616aafd75682d381b54de9b248ef3c44ac35e4873c7046332a2c177815f597ed6f527928728c1c SHA512 ac2b9594f4a6be95417bc1d84529e2df2cd97f23a0da77ac4fa4a0253af9dc89deae8adc226609ed7dd735b899ddcc1cafeba916a7ed928484796e16b276e010
diff --git a/dev-ruby/brotli/brotli-0.4.0-r2.ebuild b/dev-ruby/brotli/brotli-0.4.0-r2.ebuild
index 86623acf1fe8..4ddb166e4f1e 100644
--- a/dev-ruby/brotli/brotli-0.4.0-r2.ebuild
+++ b/dev-ruby/brotli/brotli-0.4.0-r2.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/miyucy/brotli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND+=" >=app-arch/brotli-1.0.7"
diff --git a/dev-ruby/brotli/brotli-0.5.0.ebuild b/dev-ruby/brotli/brotli-0.5.0.ebuild
new file mode 100644
index 000000000000..ebec173f088d
--- /dev/null
+++ b/dev-ruby/brotli/brotli-0.5.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="brotli.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/brotli/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Brotli compressor/decompressor"
+HOMEPAGE="https://github.com/miyucy/brotli"
+SRC_URI="https://github.com/miyucy/brotli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+
+RDEPEND+=" >=app-arch/brotli-1.1.0"
+DEPEND+=" >=app-arch/brotli-1.1.0"
+
+# Depends on the test data in app-arch/brotli
+RESTRICT="test"
+
+all_ruby_prepare() {
+	sed -e 's/git ls-files -z -- spec/find spec -print0/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/bsearch/bsearch-1.5.0-r3.ebuild b/dev-ruby/bsearch/bsearch-1.5.0-r3.ebuild
deleted file mode 100644
index 257d47e6baff..000000000000
--- a/dev-ruby/bsearch/bsearch-1.5.0-r3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="doc/*"
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-inherit ruby-fakegem
-DESCRIPTION="A binary search library for Ruby"
-HOMEPAGE="http://0xcc.net/ruby-bsearch/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i 's/ruby/\$\{RUBY\}/' test/test.sh || die
-}
-
-each_ruby_test() {
-	pushd test
-	RUBY=${RUBY} sh test.sh || die
-	popd
-}
diff --git a/dev-ruby/bsearch/bsearch-1.5.0-r4.ebuild b/dev-ruby/bsearch/bsearch-1.5.0-r4.ebuild
new file mode 100644
index 000000000000..752c5d0331c7
--- /dev/null
+++ b/dev-ruby/bsearch/bsearch-1.5.0-r4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="doc/*"
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-fakegem
+DESCRIPTION="A binary search library for Ruby"
+HOMEPAGE="http://0xcc.net/ruby-bsearch/"
+
+LICENSE="Ruby-BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i 's/ruby/\$\{RUBY\}/' test/test.sh || die
+}
+
+each_ruby_test() {
+	pushd test
+	RUBY=${RUBY} sh test.sh || die
+	popd
+}
diff --git a/dev-ruby/bson/Manifest b/dev-ruby/bson/Manifest
index 698796f94052..336fe437c41a 100644
--- a/dev-ruby/bson/Manifest
+++ b/dev-ruby/bson/Manifest
@@ -1 +1,2 @@
-DIST bson-4.12.0.tar.gz 161250 BLAKE2B 060c33e4192ca433287a007351e13a3de187782675d56b0b90d5dfbf4546821f483348caaab1afa0cb715b20be53028a486f9b18ee8405afc4eeebcfc91c2b53 SHA512 b91619473ba8d4f10fa2a104e26f70d49991e164dd3dc72335bf53f39be6c30dff853cae0185285bc41985ec05717a074992e40ae9b6520d09c0aeb9e0b6992d
+DIST bson-4.15.0.gem 163328 BLAKE2B 21c28ee610a2e067c528e163ac4caec0e76d0ec1a73c8c89a2c455887da54aa0dfaa7ed840736013d87766c5cd4f23dc82b4c6474b0463a32b30575b28c5b898 SHA512 954dd419ab94dfde87d8902745885184505d74333fc71608f64544ca52f728782ea6fc3233718749c110c31ee14802ff240caa8ac4c170369d4adcf45557e79d
+DIST bson-5.0.0.gem 172544 BLAKE2B 574c1e42e3b625d0b24dc21eb731bd5b2f86ccc76cceb252635f6be3e504553ab7d267f0b128ae4cfe6da0135c4e0e588a78ae1955dcc5847a32ef64d4d81157 SHA512 31e3606328749937e523a0ec4f9a14da2fe8e03070b3602fd96a3b6742f060988d227029f85768c1ad22348b7af20efbe360b93956d7dc9efba429f9f8d36a47
diff --git a/dev-ruby/bson/bson-4.12.0.ebuild b/dev-ruby/bson/bson-4.12.0.ebuild
deleted file mode 100644
index 1d9b185eacd3..000000000000
--- a/dev-ruby/bson/bson-4.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/bson/extconf.rb)
-
-GITHUB_USER="mongodb"
-GITHUB_PROJECT="bson-ruby"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
-HOMEPAGE="https://www.mongodb.org/"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="bson-ruby-${PV}"
-
-LICENSE="APSL-2"
-SLOT="4"
-KEYWORDS="~amd64"
-IUSE="test doc"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Remove project-specific rspec options
-	rm .rspec || die
-}
diff --git a/dev-ruby/bson/bson-4.15.0.ebuild b/dev-ruby/bson/bson-4.15.0.ebuild
new file mode 100644
index 000000000000..a1eba82312d8
--- /dev/null
+++ b/dev-ruby/bson/bson-4.15.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_EXTENSIONS=(ext/bson/extconf.rb)
+
+GITHUB_USER="mongodb"
+GITHUB_PROJECT="bson-ruby"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
+HOMEPAGE="https://www.mongodb.org/"
+# We prefer rubygems if we can anyway, but note that rubygems has test sources we need,
+# but github *doesn't* (other way around to usual!)
+RUBY_S="bson-ruby-${PV}"
+
+LICENSE="APSL-2"
+SLOT="4"
+KEYWORDS="~amd64"
+IUSE="test doc"
+
+ruby_add_rdepend "dev-ruby/json"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/bson/bson-5.0.0.ebuild b/dev-ruby/bson/bson-5.0.0.ebuild
new file mode 100644
index 000000000000..bd1abf9c3ce5
--- /dev/null
+++ b/dev-ruby/bson/bson-5.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_EXTENSIONS=(ext/bson/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
+HOMEPAGE="https://www.mongodb.com/"
+# We prefer rubygems if we can anyway, but note that rubygems has test sources we need,
+# but github *doesn't* (other way around to usual!)
+RUBY_S="bson-ruby-${PV}"
+
+LICENSE="APSL-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="test doc"
+
+ruby_add_rdepend "dev-ruby/base64 dev-ruby/bigdecimal"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/buftok/Manifest b/dev-ruby/buftok/Manifest
index 9fdcf09a17c1..8b9470383121 100644
--- a/dev-ruby/buftok/Manifest
+++ b/dev-ruby/buftok/Manifest
@@ -1,2 +1 @@
-DIST buftok-0.2.0.gem 8192 BLAKE2B 673a14423e6a5b3fedf078f320116c9470b49e26aa7c4ef1bda47856a4befb7653d6b62bbf621ef8614885f64fcf078d9b2e24037c663a22b350ad44dac68070 SHA512 2be11c56b49254f16cadfd8abc7c414a16a54b32ec416402a4c87be72c2ce9c524aaa17ede9bb3535555191f2a7b1d7d863199db5b4af8874880bcd16d3c3b45
 DIST buftok-0.3.0.tar.gz 5710 BLAKE2B 9c00b72e0b4f2f55d6fb66e9665a620a6fe7228293906ff1104735cafcf2043f0a98c0a3dd38e3253552eebe86622099dcc0b97a1a892c17eb1c9e707ff3c1dc SHA512 b721eeda2173cee3276329282524a7173713a901bd338bb2ce6a0e2e121cd48b6647f51579d04f7353590a0da3208f4cced5321aaee77f4b7eb9ed256b674748
diff --git a/dev-ruby/buftok/buftok-0.2.0-r2.ebuild b/dev-ruby/buftok/buftok-0.2.0-r2.ebuild
deleted file mode 100644
index 5fc6d736ddf7..000000000000
--- a/dev-ruby/buftok/buftok-0.2.0-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Statefully split input data by a specifiable token"
-HOMEPAGE="https://github.com/sferik/buftok"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-}
diff --git a/dev-ruby/buftok/buftok-0.3.0-r1.ebuild b/dev-ruby/buftok/buftok-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..1d812446bd51
--- /dev/null
+++ b/dev-ruby/buftok/buftok-0.3.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="buftok.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Statefully split input data by a specifiable token"
+HOMEPAGE="https://github.com/sferik/buftok"
+SRC_URI="https://github.com/sferik/buftok/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+}
diff --git a/dev-ruby/buftok/buftok-0.3.0.ebuild b/dev-ruby/buftok/buftok-0.3.0.ebuild
deleted file mode 100644
index dd19127abd85..000000000000
--- a/dev-ruby/buftok/buftok-0.3.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="buftok.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Statefully split input data by a specifiable token"
-HOMEPAGE="https://github.com/sferik/buftok"
-SRC_URI="https://github.com/sferik/buftok/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-}
diff --git a/dev-ruby/builder/builder-3.2.4-r1.ebuild b/dev-ruby/builder/builder-3.2.4-r1.ebuild
index 9baea544e313..5913572ef19b 100644
--- a/dev-ruby/builder/builder-3.2.4-r1.ebuild
+++ b/dev-ruby/builder/builder-3.2.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -10,12 +10,12 @@ RUBY_FAKEGEM_EXTRADOC="README.md CHANGES"
 
 inherit ruby-fakegem
 
-DESCRIPTION="A builder to facilitate programatic generation of XML markup"
-HOMEPAGE="http://onestepback.org/"
+DESCRIPTION="A builder to facilitate programmatic generation of XML markup"
+HOMEPAGE="https://onestepback.org/"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 all_ruby_prepare() {
@@ -27,11 +27,8 @@ all_ruby_prepare() {
 }
 
 each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby30|*ruby31)
-			sed -i -e '/test_late_included_module_in_kernel_is_ok/askip "broken due to different ruby behavior"' test/test_blankslate.rb || die
-			;;
-	esac
+	sed -e '/test_late_included_module_in_kernel_is_ok/askip "broken due to different ruby behavior"' \
+		-i test/test_blankslate.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/builder/builder-3.2.4.ebuild b/dev-ruby/builder/builder-3.2.4.ebuild
deleted file mode 100644
index c1f1c4381a4e..000000000000
--- a/dev-ruby/builder/builder-3.2.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGES"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A builder to facilitate programatic generation of XML markup"
-HOMEPAGE="http://onestepback.org/"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/rdoc\.template .*jamis/d' \
-		Rakefile || die
-
-	rm rakelib/* || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/bundler-audit/Manifest b/dev-ruby/bundler-audit/Manifest
index 1679d14125cd..4345b954f07c 100644
--- a/dev-ruby/bundler-audit/Manifest
+++ b/dev-ruby/bundler-audit/Manifest
@@ -1,2 +1 @@
-DIST bundler-audit-0.8.0.gem 44032 BLAKE2B 1d6de8bbca13e1e3b881ccbb4029d000c89f7b7c8f342877baa2a0ea3cf9bf87db93e22c9e622d64a4522afeb6258151293b0196b6ae8a5bbe192785e72956c6 SHA512 6a61fd191f31c153df71320e88ea84e6d93ad4d6ccacfc3f356c9486bf8adb8487aa7c5b3357cfbac0f36b8bb4b65c09845cedc0c8d86814910ea60aac7e92d5
-DIST bundler-audit-0.9.0.1.gem 48128 BLAKE2B 33afa1a7df1cecd0a0c3f155dc631fd1ce25aaa587b5dbe9042ef2983742dbb755914d9c598c832e9b9ca10dc2838bea632f3c79c2fa88a24121cc72787cf93f SHA512 248f7e6b8c7446ff0906d9be6c7bb946f901465dbff079d87aec55ff65a6a7b2e76df600d5d5d1704fd03deec7461cbe3c097bdd4f2d93ebd63c7d1dbf13ae43
+DIST bundler-audit-0.9.1.gem 49152 BLAKE2B a4942a84e8b39b6087960a2c611d5473e41076587a020aadae982c9096f91b0681f312bdbc00d73db1ba034d65e05c970532246deebd4119911ed6abfc6655d6 SHA512 86060dd95669e358d7267799b48a179469fa8aec6d97ce3d3316c974be7aa4652958ad72e5302770e3dd372026bc1054438877f1741a82a63ac6fb0fc14628f0
diff --git a/dev-ruby/bundler-audit/bundler-audit-0.8.0.ebuild b/dev-ruby/bundler-audit/bundler-audit-0.8.0.ebuild
deleted file mode 100644
index ce0f999975a0..000000000000
--- a/dev-ruby/bundler-audit/bundler-audit-0.8.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides patch-level verification for Bundled apps"
-HOMEPAGE="https://github.com/rubysec/bundler-audit"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-#tests are trying to download AND have some odd failures
-#rspec ./spec/database_spec.rb:113 # Bundler::Audit::Database#size should eq 323
-#rspec ./spec/database_spec.rb:117 # Bundler::Audit::Database#advisories should return a list of all advisories.
-RESTRICT=test
-
-ruby_add_rdepend "
-	dev-ruby/thor:1
-	dev-ruby/bundler:2
-"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid specs that require network access via 'bundle install'
-	rm spec/{integration,scanner}_spec.rb || die
-
-	# Avoid specs that only work when the source is a git repository
-	sed -i -e '/describe "path"/,/^  end/ s:^:#:' \
-		-e '/describe "update!"/,/^  end/ s:^:#:' \
-		spec/database_spec.rb || die
-}
diff --git a/dev-ruby/bundler-audit/bundler-audit-0.9.0.1.ebuild b/dev-ruby/bundler-audit/bundler-audit-0.9.0.1.ebuild
deleted file mode 100644
index 34c66400cad6..000000000000
--- a/dev-ruby/bundler-audit/bundler-audit-0.9.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides patch-level verification for Bundled apps"
-HOMEPAGE="https://github.com/rubysec/bundler-audit"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-#tests are trying to download AND have some odd failures
-#rspec ./spec/database_spec.rb:113 # Bundler::Audit::Database#size should eq 323
-#rspec ./spec/database_spec.rb:117 # Bundler::Audit::Database#advisories should return a list of all advisories.
-RESTRICT=test
-
-ruby_add_rdepend "
-	dev-ruby/thor:1
-	dev-ruby/bundler:2
-"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid specs that require network access via 'bundle install'
-	rm spec/{integration,scanner}_spec.rb || die
-
-	# Avoid specs that only work when the source is a git repository
-	sed -i -e '/describe "path"/,/^  end/ s:^:#:' \
-		-e '/describe "update!"/,/^  end/ s:^:#:' \
-		spec/database_spec.rb || die
-}
diff --git a/dev-ruby/bundler-audit/bundler-audit-0.9.1.ebuild b/dev-ruby/bundler-audit/bundler-audit-0.9.1.ebuild
new file mode 100644
index 000000000000..cdce4cce4ea2
--- /dev/null
+++ b/dev-ruby/bundler-audit/bundler-audit-0.9.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides patch-level verification for Bundled apps"
+HOMEPAGE="https://github.com/rubysec/bundler-audit"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+#tests are trying to download files
+RESTRICT=test
+
+ruby_add_rdepend "
+	dev-ruby/thor:1
+	dev-ruby/bundler:2
+"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid specs that require network access via 'bundle install'
+	rm spec/{integration,scanner}_spec.rb || die
+
+	# Avoid specs that only work when the source is a git repository
+	sed -i -e '/describe "path"/,/^  end/ s:^:#:' \
+		-e '/describe "update!"/,/^  end/ s:^:#:' \
+		spec/database_spec.rb || die
+}
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 0179e1f19ae3..fd285e3db234 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -1,8 +1,7 @@
-DIST bundler-2.1.4.gem 396800 BLAKE2B f770bd63255df09a20160369dc64e8923e996fb5ea4c11ee763d9a88e5fba142277ccd677861e3c0494b99a36261d5e7bdfb9c40c2abb76322061542f95b8505 SHA512 6c870061a78e17d97a9219433c7ef8fbf1112de17d0e0f3d8b6db1a518318528e3803184278412aabe65008e93f451ffa59465062856918ef488f9438399eff6
-DIST bundler-2.2.18.gem 390656 BLAKE2B f06d2e08134fa4e3fcee15de648121aa39742fceed004746fd42718062247a95de9ae231093ae4423f5a121c251b83a7de98e2d165c566df2d049e546b60a69b SHA512 871a98b24e7a89a554d181338d359f6b298e19f6c251b1c5fc81ad6f4ab46c49a9ae14e6fc68766b427c24e0cd25b6abe468bce5d8637fe0d4433bbecfe46418
-DIST bundler-2.2.24.gem 391168 BLAKE2B 2b70c476d2f0e400f52bf5d6caf2ad06394c3d7bf0f3abc7dd9c3b62cb6c4a1c8621589d908c39f7f434e4b204fc4c63e4f40a88f8dda55e7ba9ecab9785867c SHA512 ac50c7d2bbcfa0903511fd0b9a56ebc6da67b0bd54da67ff2f23bd8a60a90f384b6b231e8ea45588a10758d889e561ed5a12866d879c8f47fc289f0a7e650f3f
-DIST bundler-2.2.25.gem 391168 BLAKE2B 73a5872a978ed85f39e188c31b051776b8364b69d23fcb6e77a97104199aeaf2cf183702a7145d9db7ce29d93d782b29ca9a3da0d925885a2ce21b240bdd0fb2 SHA512 b52d97ef86164e44e9f02b178ecda5934c459258c55bb2e804e1d053818a1283c260e4c35e872b084e43e5f7d8bc71f13df7154d8d279d6f3aafe347514b1474
-DIST bundler-2.2.29.gem 392192 BLAKE2B 072e3c1d9a0994e96674f517be3fd1bd248cf77a10fcc50c8ed141bdc98a1395ac1a259880f56150829dc6aba186de31666b6fa3e6de5d606023d8ec871de66c SHA512 c56bf37b2c828e9dfd7260bf99d4ece1e8cfa66d0d3c5fcbdf6f69b117772af25e53f57ef2ce1f2eb0b4796e211ebb0f69244e3ae2e0e9f8ce277434912a4950
-DIST bundler-2.2.31.gem 401408 BLAKE2B 6990443b0336e5766524ec0d3e35e1a9b20ac8c35b85bf36028c5b7af68614c5cb86aa709b4646e5d2c18639d299d62c53733caab31843dc24d2407fae724f75 SHA512 c40876b51b19126607267e874b6270bb4992bfd4267aa69d5b6908da7e8e77218f11fe1ad0d9c104ca529caf69bf3d8c1a69b8c55badf4c6f94dd9adf82fee1a
 DIST bundler-2.2.33.gem 401920 BLAKE2B bfdb62c86449683d479f735ff6d65d33576ff03f1d67f6001c46839111ee3c1307db86c9d02f050c2290b1d2e3133da1010ab9d1012aa0ee4c207148ff913aac SHA512 8ac6bc00eb7a206fbd4e0d0de5d636583f48006b51352e50896230afba1098aeae2418694c8592f73af02612fe8e10dacd71b79804b724fad7633b23c81f1d14
-DIST bundler-2.3.8.gem 403968 BLAKE2B 80640d5032034be0511762c60832c85c65b7b97397eca49d2bc35977a85625104477606abd6d8b286dd4697906a5d97076cac30f7ab58f45b258ba1e637bbc2c SHA512 e04bc9762135bdab7eb70bde4f21289375b7ea9bee795775dc614f31a6f145a5406396dbc638bdac778ac7c39d60c953e5ba38376b8bc72e7a8cfd1c40b25585
+DIST bundler-2.3.26.gem 411648 BLAKE2B 5ea0ff86e0e09bf0466e4bb21502a13519515f312b3df62024f0d293a51237eb30a5b3c349fb867e9b8dbf0e50ede5bc12b14c5cc6014a717d55534bf46d18f5 SHA512 03c6310c63ec4d313d48ecb15e784ae9cb2d2cb2cefc75752bbb7c018eeec45d534259646d525e486cd746ee8c179312c167338875e13f826994617622d2330d
+DIST bundler-2.4.15.gem 412672 BLAKE2B 3c73e082fa8a007cc626fd00093bf69ddf63ea00aba137594e1112db0900f2c7688d85dc3f22c7b569b1b3abb8977f3e6f850719b4bced12db9cd7959a376dba SHA512 0f2ea2a0ba113295dea5e42383d49a30fd580376088d81642796e6bec48e38b2f56115c052079a97040c5f2a89ff7e2a5cccfa5aab1e3053cad411b47e6ccaed
+DIST bundler-2.4.19.gem 413184 BLAKE2B 34607b2fdf1c7cb36982fa7c7bbd5c6f5b7c227c525cb9abae2c1099d401818d91ba233c7d3d4e42c59e97b357065f03a1e8fa4c814e0b4cd95ac4e043984015 SHA512 ff4a7541c8110a18223df4586f636a70fe301843d80444fc4954e9ca7018da0f7a62980a0abd5d91e26f5222b224f8afc3dc51fc12e03559d77496ee1aee1296
+DIST bundler-2.4.22.gem 419840 BLAKE2B 885686da1c100181b0faf3f5eea53e9c42ada65b89fcd29a3142644f13843c677d4a26faf42587b16c9978d2a935783ae57454ef0424d0078f20bc972d839671 SHA512 4e37e92de6dafeabb54876d270819b44025f1b674c8a39a2ad06cd70fab135237e296a5fa48dd4993dd52a293d76fe73b8529185766e566d0d7d0e4e8f205d65
+DIST bundler-2.4.6.gem 409600 BLAKE2B 5470a85b7ee0a88c13795516ee317eaf227ad49023f05dbbea1bbe0b2b4f2bb93fab85101128662845d8a2ad567bec04e5238e3a2d3b81c89aea81f18d552d4e SHA512 194d432a12bde41d7bdff5aefd187b539f4ab3932d6774f171147e4da907dc77f2ff56580c53151d5fdb77de2138b668f856e410cd63b1cda2fb996074771f35
+DIST bundler-2.5.3.gem 429568 BLAKE2B d692ec7b4bdedefd3d7b5063467834d6414bed135209547ab403e529500debfce4a2cc503d0b72aceb1bdb14541de48271340bd669e4c1b7e950381ffce910bc SHA512 31dcdf401075066c46eb50adc547deffa9da71d72841a12f6cee383765e7d428ca4a8df0795f07cb401578a65899f11fcaeeccaba4d0d65967ce67aee543a8cd
diff --git a/dev-ruby/bundler/bundler-2.1.4.ebuild b/dev-ruby/bundler/bundler-2.1.4.ebuild
deleted file mode 100644
index e54f8b880962..000000000000
--- a/dev-ruby/bundler/bundler-2.1.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. They also don't work
-# when run with a path that contains "-".
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# No documentation task
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_EXTRAINSTALL="man"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/bundler/bundler-2.2.18.ebuild b/dev-ruby/bundler/bundler-2.2.18.ebuild
deleted file mode 100644
index d489e8c8abfe..000000000000
--- a/dev-ruby/bundler/bundler-2.2.18.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. They also don't work
-# when run with a path that contains "-".
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# No documentation task
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/bundler/bundler-2.2.24.ebuild b/dev-ruby/bundler/bundler-2.2.24.ebuild
deleted file mode 100644
index e03102a40889..000000000000
--- a/dev-ruby/bundler/bundler-2.2.24.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. They also don't work
-# when run with a path that contains "-".
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# No documentation task
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/bundler/bundler-2.2.25.ebuild b/dev-ruby/bundler/bundler-2.2.25.ebuild
deleted file mode 100644
index e03102a40889..000000000000
--- a/dev-ruby/bundler/bundler-2.2.25.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. They also don't work
-# when run with a path that contains "-".
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# No documentation task
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/bundler/bundler-2.2.29.ebuild b/dev-ruby/bundler/bundler-2.2.29.ebuild
deleted file mode 100644
index e03102a40889..000000000000
--- a/dev-ruby/bundler/bundler-2.2.29.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. They also don't work
-# when run with a path that contains "-".
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# No documentation task
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/bundler/bundler-2.2.31.ebuild b/dev-ruby/bundler/bundler-2.2.31.ebuild
deleted file mode 100644
index e03102a40889..000000000000
--- a/dev-ruby/bundler/bundler-2.2.31.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. They also don't work
-# when run with a path that contains "-".
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# No documentation task
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/bundler/bundler-2.2.33-r1.ebuild b/dev-ruby/bundler/bundler-2.2.33-r1.ebuild
new file mode 100644
index 000000000000..d7150828d87d
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.2.33-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/rubygems/rubygems"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/bundler/bundler-2.2.33.ebuild b/dev-ruby/bundler/bundler-2.2.33.ebuild
deleted file mode 100644
index 25b93c5fd8dd..000000000000
--- a/dev-ruby/bundler/bundler-2.2.33.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. They also don't work
-# when run with a path that contains "-".
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# No documentation task
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/bundler/bundler-2.3.26.ebuild b/dev-ruby/bundler/bundler-2.3.26.ebuild
new file mode 100644
index 000000000000..0d7d28f64890
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.3.26.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/rubygems/rubygems"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git"
diff --git a/dev-ruby/bundler/bundler-2.3.8.ebuild b/dev-ruby/bundler/bundler-2.3.8.ebuild
deleted file mode 100644
index 0a1222240786..000000000000
--- a/dev-ruby/bundler/bundler-2.3.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. They also don't work
-# when run with a path that contains "-".
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# No documentation task
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/bundler/bundler-2.4.15.ebuild b/dev-ruby/bundler/bundler-2.4.15.ebuild
new file mode 100644
index 000000000000..3d9edeb1c010
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.4.15.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/rubygems/rubygems"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git"
diff --git a/dev-ruby/bundler/bundler-2.4.19.ebuild b/dev-ruby/bundler/bundler-2.4.19.ebuild
new file mode 100644
index 000000000000..cbaa392ed78b
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.4.19.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/rubygems/rubygems"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git"
diff --git a/dev-ruby/bundler/bundler-2.4.22.ebuild b/dev-ruby/bundler/bundler-2.4.22.ebuild
new file mode 100644
index 000000000000..cbaa392ed78b
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.4.22.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/rubygems/rubygems"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git"
diff --git a/dev-ruby/bundler/bundler-2.4.6.ebuild b/dev-ruby/bundler/bundler-2.4.6.ebuild
new file mode 100644
index 000000000000..9c3683f8c7fb
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.4.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/rubygems/rubygems"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git"
diff --git a/dev-ruby/bundler/bundler-2.5.3.ebuild b/dev-ruby/bundler/bundler-2.5.3.ebuild
new file mode 100644
index 000000000000..f7ab04ebb77d
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.5.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/rubygems/rubygems"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git"
diff --git a/dev-ruby/bundler/metadata.xml b/dev-ruby/bundler/metadata.xml
index ee48a2af0c3d..a1bfd976bb6d 100644
--- a/dev-ruby/bundler/metadata.xml
+++ b/dev-ruby/bundler/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">carlhuda/bundler</remote-id>
+    <remote-id type="github">rubygems/rubygems</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/bunny/Manifest b/dev-ruby/bunny/Manifest
index 1041d6f1107f..f24e6baedf9c 100644
--- a/dev-ruby/bunny/Manifest
+++ b/dev-ruby/bunny/Manifest
@@ -1,2 +1 @@
-DIST bunny-2.17.0.gem 207872 BLAKE2B 4942c132ed2c979f878671492be9d6a0e3995286435b2c4a4360a60541f6be40e34dac43a96ffbc90622279ce5e52bc7696352136f71f8ffa1d2ae830e5a1178 SHA512 57264b195191e15a9d695017a3a126568a6f55e107b0d12db3bc162a48ece3ff50dd0334c5761cdf8b212a16f341532bf398dd496a7f544b835290cb6b3721c0
-DIST bunny-2.19.0.tar.gz 208864 BLAKE2B 81d17b98e7fd944aa0ffedc02015c7696f0553888d2c11ccb05cda977b09ca7f79746a1b1a651ca0fbd17fcbf2b56fa297919ea3d03ee77491481ebdaa27baba SHA512 39e9b785853275d469c5af0977ea8a5d0e2e13c5ca0f51dfe39552da728345b9852c637e81ad468f92f089d10fdc701abd8105d0eb336b55a071d3329018b111
+DIST bunny-2.22.0.tar.gz 264915 BLAKE2B e6be01665f764637912c6a94429b57f4dbafd57d530210592e6e7155bdf355e86c16704f84ba186393995517a3225c1b47a380a39fe040b9e17c5cbf7cade507 SHA512 1af6b3cc8de1ac3230dd57e5845ed2e06b103e1da179bf91b754e86685113813e6acf3d766e52be0e7e51e9ddd255969f1c045abbaff0d2f2f4a479b1d832314
diff --git a/dev-ruby/bunny/bunny-2.17.0.ebuild b/dev-ruby/bunny/bunny-2.17.0.ebuild
deleted file mode 100644
index 7bc6776b0c7e..000000000000
--- a/dev-ruby/bunny/bunny-2.17.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# Tests require a live AMQP server.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Another synchronous Ruby AMQP client"
-HOMEPAGE="https://github.com/celldee/bunny"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/amq-protocol-2.3.1:2"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r examples
-}
diff --git a/dev-ruby/bunny/bunny-2.19.0.ebuild b/dev-ruby/bunny/bunny-2.19.0.ebuild
deleted file mode 100644
index fb2f1ea4fe3c..000000000000
--- a/dev-ruby/bunny/bunny-2.19.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-# Tests require a live AMQP server.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="bunny.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Another synchronous Ruby AMQP client"
-HOMEPAGE="https://github.com/ruby-amqp/bunny"
-SRC_URI="https://github.com/ruby-amqp/bunny/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/amq-protocol-2.3.1:2
-	>=dev-ruby/sorted_set-1.0.2:0"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files --/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r examples
-}
diff --git a/dev-ruby/bunny/bunny-2.22.0.ebuild b/dev-ruby/bunny/bunny-2.22.0.ebuild
new file mode 100644
index 000000000000..a6f13452d496
--- /dev/null
+++ b/dev-ruby/bunny/bunny-2.22.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# Tests require a live AMQP server.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="bunny.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Another synchronous Ruby AMQP client"
+HOMEPAGE="https://github.com/ruby-amqp/bunny"
+SRC_URI="https://github.com/ruby-amqp/bunny/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/amq-protocol-2.3.1:2
+	>=dev-ruby/sorted_set-1.0.2:0"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files --/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r examples
+}
diff --git a/dev-ruby/c21e/Manifest b/dev-ruby/c21e/Manifest
deleted file mode 100644
index 9a570d87703d..000000000000
--- a/dev-ruby/c21e/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST c21e-1.2.1.gem 6656 BLAKE2B b6c1f8919206e8eea04a33fb3a21c42e1758a2dbfbf2ad06486543e8bfbd37234d3c8a113a10c8473d04873f20076baed042e90eab34b96b6ea10c7cc6684ad7 SHA512 1f36251c4c6c7923d46ab186df1f1d380cb329daa7316327f65d4221493eb988fdaf83f2b43e8eb7eebef9e58f8b475bf4b36095cd4cfdb4a787719eca4b36a7
-DIST c21e-2.0.0.gem 6656 BLAKE2B 64b840ee83bd89ae29486527f4a0f59bc029dc27217bd48944629c357a7c8845cc98521054ed88f4c1cdc967f8248b3bf7a8b74019d181c60312a35f8a6f9dbe SHA512 e36bd75c87608efb1bb776f69b3400a307a2a1d1bb6375246613a5aed53a4673599a61f7723a53cae3a639e1bb2dd03b6635d54979de4e32885fd3cb1f29a1b8
diff --git a/dev-ruby/c21e/c21e-1.2.1.ebuild b/dev-ruby/c21e/c21e-1.2.1.ebuild
deleted file mode 100644
index c942b3fb6eb3..000000000000
--- a/dev-ruby/c21e/c21e-1.2.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Run cross-platform executables"
-HOMEPAGE="https://github.com/cucumber/cucumber/blob/master/c21e/ruby"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/c21e/c21e-2.0.0.ebuild b/dev-ruby/c21e/c21e-2.0.0.ebuild
deleted file mode 100644
index 8db4c001c003..000000000000
--- a/dev-ruby/c21e/c21e-2.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Run cross-platform executables"
-HOMEPAGE="https://github.com/cucumber/cucumber/blob/master/c21e/ruby"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/c21e/metadata.xml b/dev-ruby/c21e/metadata.xml
deleted file mode 100644
index 658c72b1920d..000000000000
--- a/dev-ruby/c21e/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index dd86366a9b30..0bc6a7584ea1 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -1,3 +1,4 @@
 DIST capistrano-2.15.5.gem 132096 BLAKE2B bbaa6bd482cf9bbe7aa01540aa5dab3f32401ffa1476d9057bb8ad420194f1ab2c32d8e744d7c982ebece5c4b5369133dc8378b7adf54c78732f9cb249db2a9e SHA512 10168080c7481ec6fc6f918ac90a3b1ce8f2b36f77411375e33cc915b02d5196ab061ac47e767edd724c82cffd1c2ad0a23ba1f0519cf1f2aae5b429167b19ff
-DIST capistrano-3.16.0.gem 69120 BLAKE2B 3e1c4f639c2d5cd36ae305746f53e68350d5eee39fbd5c5ec828ea5b69f47a3a5f8b4e6f4b65de2e24717f71cf4a9443879fc3d076474ab020e2023372085180 SHA512 ec5aa465065cd115f0a1b7db06b7c68f2034e81feb3b814b730a6aca464756e545fd5c065ea941a3076bb637448e2a0f04aeb56de2578cdf22a6f208d27a2219
-DIST capistrano-3.17.0.gem 69632 BLAKE2B 57430e8e73bddb11d170c579cae8b2fa6bd1390b5aaeb5e41a81a17ffb84d02623a4ca27c518b0d2ba16c78a639d34e05e68d1fad0d94afadecb846e7d515ea1 SHA512 d4298c1d71d51a3cb5216a23fb1181ba11f544a9572939b95f1f7fef80f64e6ebb2eb5cda4b22a77092ec0bb7d7aaa2d72eff88d715290cb989b78033d6053e5
+DIST capistrano-3.17.3.gem 70144 BLAKE2B d8bd93bb41a41196394b0959fa0bdf17609c9c53771bbfbf87cbc02b169177ad7cc18613a18d362a7fc775c91a382071d2384262d5cb49b1534678aac575dc55 SHA512 b7b85ebf7309d93aed83f68dc897e5a6cb4c8a929f4427c8a29db2ef6f857ee110256ba80c2fe0ae15f8008597c47be5ec60c192f3268d0df66f761b90d0758f
+DIST capistrano-3.18.0.gem 69632 BLAKE2B 679005f347eba2bad71e49b0c591c6179edc566d342b43652dc1be6949589d3bc58b78c91cccc564e6d8bb1f541066917164e000fe41a6997a3d6d12ab9b5e7b SHA512 126abb8934bed1bd1c58f53c1e8cd0ead99499d7e99d09e51290df4619a2f570a3f2f1a5cbdb683f1286a2b9aa7b0a2690a4c165d07705c5157ebf3ed1118f3e
+DIST capistrano-3.18.1.gem 69632 BLAKE2B 65802492a93974cc8b9fdfebc189f866ae7e3b6eda92a87537106019f8605de469ff6f90439fe64db54af8bc3ff1d58082efc84b4be629368420fd6c23857374 SHA512 940e2a0cff96d99876bac1e585299edf5fcb22899bca61dcbe87b285ffd397dc916545792b58cd708f9b4e086d83f070f1bfc3bab534244c86f46d6de6323b47
diff --git a/dev-ruby/capistrano/capistrano-2.15.5-r3.ebuild b/dev-ruby/capistrano/capistrano-2.15.5-r3.ebuild
index 1aa1107403c9..d07ff2f4708b 100644
--- a/dev-ruby/capistrano/capistrano-2.15.5-r3.ebuild
+++ b/dev-ruby/capistrano/capistrano-2.15.5-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
@@ -16,7 +16,7 @@ HOMEPAGE="https://capistranorb.com/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/capistrano/capistrano-3.16.0.ebuild b/dev-ruby/capistrano/capistrano-3.16.0.ebuild
deleted file mode 100644
index c6f673eacd24..000000000000
--- a/dev-ruby/capistrano/capistrano-3.16.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A distributed application deployment system"
-HOMEPAGE="https://capistranorb.com/"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/airbrussh-1.0.0
-	>=dev-ruby/sshkit-1.9:0
-	>=dev-ruby/rake-10.0.0
-	dev-ruby/i18n:*"
-ruby_add_bdepend "
-	test? (	dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	# Avoid specs that depend on capistrano already being installed
-	rm -f spec/lib/capistrano/doctor/gems_doctor_spec.rb || die
-
-	# Avoid specs that require a TTY
-	sed -i -e '/asking for a variable/,/^  end/ s:^:#:' spec/integration/dsl_spec.rb || die
-	rm -f spec/lib/capistrano/configuration/question_spec.rb || die
-}
diff --git a/dev-ruby/capistrano/capistrano-3.17.0.ebuild b/dev-ruby/capistrano/capistrano-3.17.0.ebuild
deleted file mode 100644
index 687c83bef12a..000000000000
--- a/dev-ruby/capistrano/capistrano-3.17.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A distributed application deployment system"
-HOMEPAGE="https://capistranorb.com/"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/airbrussh-1.0.0
-	>=dev-ruby/sshkit-1.9:0
-	>=dev-ruby/rake-10.0.0
-	dev-ruby/i18n:*"
-ruby_add_bdepend "
-	test? (	dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	# Avoid specs that depend on capistrano already being installed
-	rm -f spec/lib/capistrano/doctor/gems_doctor_spec.rb || die
-
-	# Avoid specs that require a TTY
-	sed -i -e '/asking for a variable/,/^  end/ s:^:#:' spec/integration/dsl_spec.rb || die
-	rm -f spec/lib/capistrano/configuration/question_spec.rb || die
-}
diff --git a/dev-ruby/capistrano/capistrano-3.17.3.ebuild b/dev-ruby/capistrano/capistrano-3.17.3.ebuild
new file mode 100644
index 000000000000..dd6213dfb99b
--- /dev/null
+++ b/dev-ruby/capistrano/capistrano-3.17.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A distributed application deployment system"
+HOMEPAGE="https://capistranorb.com/"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/airbrussh-1.0.0
+	>=dev-ruby/sshkit-1.9:0
+	>=dev-ruby/rake-10.0.0
+	dev-ruby/i18n:*"
+ruby_add_bdepend "
+	test? (	dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	# Avoid specs that depend on capistrano already being installed
+	rm -f spec/lib/capistrano/doctor/gems_doctor_spec.rb || die
+
+	# Avoid specs that require a TTY
+	sed -i -e '/asking for a variable/,/^  end/ s:^:#:' spec/integration/dsl_spec.rb || die
+	rm -f spec/lib/capistrano/configuration/question_spec.rb spec/lib/capistrano/doctor/output_helpers_spec.rb || die
+}
diff --git a/dev-ruby/capistrano/capistrano-3.18.0.ebuild b/dev-ruby/capistrano/capistrano-3.18.0.ebuild
new file mode 100644
index 000000000000..c8d14632d8ea
--- /dev/null
+++ b/dev-ruby/capistrano/capistrano-3.18.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A distributed application deployment system"
+HOMEPAGE="https://capistranorb.com/"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/airbrussh-1.0.0
+	>=dev-ruby/sshkit-1.9:0
+	>=dev-ruby/rake-10.0.0
+	dev-ruby/i18n:*"
+ruby_add_bdepend "
+	test? (	dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	# Avoid specs that depend on capistrano already being installed
+	rm -f spec/lib/capistrano/doctor/gems_doctor_spec.rb || die
+
+	# Avoid specs that require a TTY
+	sed -i -e '/asking for a variable/,/^  end/ s:^:#:' spec/integration/dsl_spec.rb || die
+	rm -f spec/lib/capistrano/configuration/question_spec.rb spec/lib/capistrano/doctor/output_helpers_spec.rb || die
+}
diff --git a/dev-ruby/capistrano/capistrano-3.18.1.ebuild b/dev-ruby/capistrano/capistrano-3.18.1.ebuild
new file mode 100644
index 000000000000..c8d14632d8ea
--- /dev/null
+++ b/dev-ruby/capistrano/capistrano-3.18.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A distributed application deployment system"
+HOMEPAGE="https://capistranorb.com/"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/airbrussh-1.0.0
+	>=dev-ruby/sshkit-1.9:0
+	>=dev-ruby/rake-10.0.0
+	dev-ruby/i18n:*"
+ruby_add_bdepend "
+	test? (	dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	# Avoid specs that depend on capistrano already being installed
+	rm -f spec/lib/capistrano/doctor/gems_doctor_spec.rb || die
+
+	# Avoid specs that require a TTY
+	sed -i -e '/asking for a variable/,/^  end/ s:^:#:' spec/integration/dsl_spec.rb || die
+	rm -f spec/lib/capistrano/configuration/question_spec.rb spec/lib/capistrano/doctor/output_helpers_spec.rb || die
+}
diff --git a/dev-ruby/capistrano/files/capistrano-2.15.5-sudo-cleanup.patch b/dev-ruby/capistrano/files/capistrano-2.15.5-sudo-cleanup.patch
index cbe68a476fd4..5437d08113e5 100644
--- a/dev-ruby/capistrano/files/capistrano-2.15.5-sudo-cleanup.patch
+++ b/dev-ruby/capistrano/files/capistrano-2.15.5-sudo-cleanup.patch
@@ -1,6 +1,5 @@
-diff -ur /usr/lib/ruby/gems/1.9.1/gems/capistrano-2.15.5/lib/capistrano/recipes/deploy.rb ./lib/capistrano/recipes/deploy.rb
---- ./lib/capistrano/recipes/deploy.rb	2014-08-13 15:11:31.423773610 +0200
-+++ /usr/lib/ruby/gems/1.9.1/gems/capistrano-2.15.5/lib/capistrano/recipes/deploy.rb	2014-05-04 11:40:39.000000000 +0200
+--- a/lib/capistrano/recipes/deploy.rb
++++ b/lib/capistrano/recipes/deploy.rb
 @@ -462,7 +462,7 @@
    DESC
    task :cleanup, :except => { :no_release => true } do
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 4715950b8b62..21f79bafdd5f 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,4 +1,3 @@
-DIST capybara-3.35.3.gem 371712 BLAKE2B e50c892897cf2838cafb77cb7cfcb54e5fc52c3cdaf11489b60168511f3a213d2ad7f94c67ad236e6177b849f99445733aa4de9691755011bd32f524e5c440b3 SHA512 90507b2254fdd7aff375a305c1112b878d5f0a7c909e7d95b62c6728acc340f73d244304efc07c3dcc707825afcd9b23b088e5d889717efe4edc2dab4dd38d2a
-DIST capybara-3.36.0.gem 374272 BLAKE2B 51579941b95ab317fa0f7d9a21d3ad40a130a60c457f9a5d9921dac5b17bb339a423a21aa16d350da57602b22b0001c6ed2b1b5b038bb16cf56d268bd5a38ead SHA512 7ffc9d3e4058b08acd1cb223eb0313112354783cc4464f8f0747561caa45425f8623be7052f331677a66a7b9f5e645e48ae0118fe78c2d185408e5279e66f169
-DIST capybara-3.37.0.gem 376320 BLAKE2B 6e2a6f1d0edd9bc9111b4e7e3a9c32a8363b88934b47981a2d4e869700ffea2af0b90d217ab6e3f5115f168fda91498a75bb8c813986963043db3ce6dca51882 SHA512 1ba9c2bbc5082023982641eb831ebba5862396431f25b1f9fcc4e24289992980980806a7255cb08d94dafccacc6a17d047677b0411a700051b6c104eb79ac2ab
-DIST capybara-3.37.1.gem 376320 BLAKE2B 79a5f379d70d612402379ad8743384844e7ab85e40c96b8a10794d35f48f078b9e26eaef5f6311aa65b6fae1fe130436288fce2077309559703e46da9e5f12bd SHA512 6a602dfcd61529f6b89a0ad85cf567fcb952d0c8033bde605121ad867308b1a16c6b3d5bfd7f4c33c47c5616c365c6b034bdf8dca096a14b3447be6adc885111
+DIST capybara-3.39.0.gem 381952 BLAKE2B 2b70bfbf930258c2273bf0c6bddc70e455d1d717bd0ed79fc68459c6f40d47ef8149fec161dbaff08e6d8424aebbdf5160033169a6269408b368525218899e23 SHA512 0910ecef11a007d10e753887d9016bab4de74e2ddf2fa2c8b8fc32bfe7d71d64a8c0b72a0a606aa7b558922ab02b4368d1c42a0df78ecf3f68a5efc34edc8707
+DIST capybara-3.39.2.gem 381952 BLAKE2B ff73035a1942e4e418d50356b977c68ea878a27082b3684b940b69df77bd97c1a628e2346673f9e42bf0592386e470b376ce5b35d673f6fe4e74547023348be1 SHA512 498fb3880014d3cff1ec6ed68542f68eb03ebfc86e8c681623ad3549ecf8297a0313abe9dd8db0a104cc0db2a2eec8c66bac4f2e5c0d29e0785237ddfe718c59
+DIST capybara-3.40.0.gem 384000 BLAKE2B 260e2e20be7cc08410035850d087934f0fbcc8b1d602416b8f1ca1ea2fb15708b606de2db002bb620bcc7c99afb83f162dd5ed1db2109f8a0b436f90258083d1 SHA512 91c3fd98bb32359a2e168c3a69efe56f4f4952be36b26961922fe6414888191ec0f79da4cfe2adb05f74a57be03254d14fa9296aa537f419c7081f58af67e0bd
diff --git a/dev-ruby/capybara/capybara-3.35.3.ebuild b/dev-ruby/capybara/capybara-3.35.3.ebuild
deleted file mode 100644
index f6810677bedb..000000000000
--- a/dev-ruby/capybara/capybara-3.35.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-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/jnicklas/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-3.5:3
-	dev-ruby/sinatra:2
-	www-servers/puma
-)"
-
-ruby_add_rdepend "
-	dev-ruby/addressable
-	>=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/regexp_parser-1.5:1 )
-	>=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 accross 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/capybara/capybara-3.36.0.ebuild b/dev-ruby/capybara/capybara-3.36.0.ebuild
deleted file mode 100644
index 36fc914f1929..000000000000
--- a/dev-ruby/capybara/capybara-3.36.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-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/jnicklas/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/selenium-webdriver-3.142.7: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/regexp_parser-1.5:1 )
-	>=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 accross 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/capybara/capybara-3.37.0.ebuild b/dev-ruby/capybara/capybara-3.37.0.ebuild
deleted file mode 100644
index 0a7c16dcb371..000000000000
--- a/dev-ruby/capybara/capybara-3.37.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-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/jnicklas/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/selenium-webdriver-3.142.7: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/regexp_parser-1.5:1 )
-	>=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 accross 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/capybara/capybara-3.37.1.ebuild b/dev-ruby/capybara/capybara-3.37.1.ebuild
deleted file mode 100644
index 0a7c16dcb371..000000000000
--- a/dev-ruby/capybara/capybara-3.37.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-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/jnicklas/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/selenium-webdriver-3.142.7: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/regexp_parser-1.5:1 )
-	>=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 accross 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/capybara/capybara-3.39.0-r1.ebuild b/dev-ruby/capybara/capybara-3.39.0-r1.ebuild
new file mode 100644
index 000000000000..16ad1e751b2f
--- /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
+	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/capybara/capybara-3.39.2.ebuild b/dev-ruby/capybara/capybara-3.39.2.ebuild
new file mode 100644
index 000000000000..15be5c79bf33
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.39.2.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="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
+	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/capybara/capybara-3.40.0.ebuild b/dev-ruby/capybara/capybara-3.40.0.ebuild
new file mode 100644
index 000000000000..ef15a951ef9c
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.40.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+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.8:4
+	dev-ruby/sinatra:3
+	www-servers/puma
+)"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	dev-ruby/matrix
+	>=dev-ruby/mini_mime-0.1.3
+	>=dev-ruby/nokogiri-1.11: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/capybara/metadata.xml b/dev-ruby/capybara/metadata.xml
index f2c9b6d808ad..c8f186cb7600 100644
--- a/dev-ruby/capybara/metadata.xml
+++ b/dev-ruby/capybara/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">jnicklas/capybara</remote-id>
+    <remote-id type="github">teamcapybara/capybara</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/certificate_authority/Manifest b/dev-ruby/certificate_authority/Manifest
index 9e6d2f2954d2..99236981c5a3 100644
--- a/dev-ruby/certificate_authority/Manifest
+++ b/dev-ruby/certificate_authority/Manifest
@@ -1 +1 @@
-DIST certificate_authority-1.0.0.tar.gz 57104 BLAKE2B e585b19b6740349e520e021d4981c3941bca9e6c9b11867c9484e98b4e74e4ebafb47c648564c3e8b89e3591414a90ee404bab83cafd5a3354354b36b3002436 SHA512 e5f05d3df86ae7e7e6ed8937667b14229cda884996c30d9a39f1ad7db781e58abb3f61c251c21174b4988adf0ecdecb1b0f22ed97ddae071ba12c78379524785
+DIST certificate_authority-1.1.0.tar.gz 57457 BLAKE2B 6714359fd869cce2a0b43aa6321e95229dead04ed761f6239ecb7b988548aabf13c62a3c61e20d539a6003395886e5e4ff2366fabaa395bfd4b4761c55d56555 SHA512 52c79acaaacf471206912165d2b07464158b61acd8b65ad73614900baa208694f9d29107cc0e275d09baa580ecfbc95458ac7772370b423762d4e80ddf0237ca
diff --git a/dev-ruby/certificate_authority/certificate_authority-1.0.0.ebuild b/dev-ruby/certificate_authority/certificate_authority-1.0.0.ebuild
deleted file mode 100644
index 429d6079b68c..000000000000
--- a/dev-ruby/certificate_authority/certificate_authority-1.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="certificate_authority.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Managing the core functions outlined in RFC-3280 for PKI"
-HOMEPAGE="https://github.com/cchandler/certificate_authority"
-SRC_URI="https://github.com/cchandler/certificate_authority/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|pry\|overalls\)/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/spec.files/,/end/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on dev-libs/engine_pkcs11 that will be hard to
-	# make work on different arches due to hardwired load paths in
-	# specs.
-	rm -f spec/units/pkcs11_key_material_spec.rb || die
-}
diff --git a/dev-ruby/certificate_authority/certificate_authority-1.1.0.ebuild b/dev-ruby/certificate_authority/certificate_authority-1.1.0.ebuild
new file mode 100644
index 000000000000..f071d6a0c5b4
--- /dev/null
+++ b/dev-ruby/certificate_authority/certificate_authority-1.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="certificate_authority.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Managing the core functions outlined in RFC-3280 for PKI"
+HOMEPAGE="https://github.com/cchandler/certificate_authority"
+SRC_URI="https://github.com/cchandler/certificate_authority/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|pry\|overalls\)/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/spec.files/,/end/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on dev-libs/engine_pkcs11 that will be hard to
+	# make work on different arches due to hardwired load paths in
+	# specs.
+	rm -f spec/units/pkcs11_key_material_spec.rb || die
+
+	# Fix spec for OpenSSL 3.x
+	sed -i -e '426 s/keyid://' spec/units/certificate_spec.rb || die
+}
diff --git a/dev-ruby/certified/Manifest b/dev-ruby/certified/Manifest
deleted file mode 100644
index 74ec7ad30293..000000000000
--- a/dev-ruby/certified/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST certified-1.0.0.gem 143360 BLAKE2B a7fcc8b2439dbf8926f45dd6fdca93acc67c22fc7dd27099e9f626f6cf065303ec5c3c0084a243699be583f7f244aff180a36ce487622d023b1fc4ae860844af SHA512 8a331bb88f68f32c765136fad3f5b130843c8d1d0f3f5988b7ac7e3258a2ae57fe203ffc74996114dd708d017594a033faefc8e6928e24f07cac176aecbbca68
diff --git a/dev-ruby/certified/certified-1.0.0.ebuild b/dev-ruby/certified/certified-1.0.0.ebuild
deleted file mode 100644
index 54d83dad114e..000000000000
--- a/dev-ruby/certified/certified-1.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ensure using OpenSSL::SSL::VERIFY_PEER and provide certificate bundle if needed"
-HOMEPAGE="https://github.com/stevegraham/certified"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-ruby/certified/metadata.xml b/dev-ruby/certified/metadata.xml
deleted file mode 100644
index 06c61aaee4c8..000000000000
--- a/dev-ruby/certified/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type='person'>
-		<name>Florian Schmaus</name>
-		<email>flow@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/cgi/Manifest b/dev-ruby/cgi/Manifest
new file mode 100644
index 000000000000..c1461a60482e
--- /dev/null
+++ b/dev-ruby/cgi/Manifest
@@ -0,0 +1,3 @@
+DIST cgi-0.3.6.tar.gz 221001 BLAKE2B 71f5091c132ec154520f6538a2ba06c164e1ed30f4cc8018052ab49605c674430108d7a87f7bf4b9dc0e1602fd3edd273af0d918de7725ca0127f67516deb1f3 SHA512 13f620b38eb4448da4184c80ff33e64bcaacf6ebff8eed219267ec33c1ed75f119a90f37503b21a835612b417100877cacf0a683f4854f97941c9e22618bf658
+DIST cgi-0.4.0.tar.gz 209136 BLAKE2B f16b5c30381fa94ccf30f45ddeefded5fb577748d3c8cc7e00e00c2d1b0993bf8687cd461c6aaba6a54b45490b675a4133510c8520a19479e4e17128ad2e7aa1 SHA512 412c3c1549e8b2387bec33da056c72cf1ad94267bac2f575abfc022078300304fa7d704a07da67ed699917aa49a41fd2424dc3fa2adf9f1ba1641cfee5c525d3
+DIST cgi-0.4.1.tar.gz 209438 BLAKE2B 9cce9b7028ae21337686f37b10ccc0912041642407cce437d07f67a01d2cdb52319dd16686b6b33ba1757240b3876a5971892b69a04bcfa1077a1b51fec7a734 SHA512 a1224135196b02aaf418adaa21a8afbc319e49650d126baff3a965a4504e2d5eb6fa9d1cd965a0cf41b8158398b3015f3605e3390d689846a2b72f3773d8dae9
diff --git a/dev-ruby/cgi/cgi-0.3.6-r1.ebuild b/dev-ruby/cgi/cgi-0.3.6-r1.ebuild
new file mode 100644
index 000000000000..7408dc861613
--- /dev/null
+++ b/dev-ruby/cgi/cgi-0.3.6-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/cgi/escape/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="cgi.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Support for the Common Gateway Interface protocol"
+HOMEPAGE="https://github.com/ruby/cgi"
+SRC_URI="https://github.com/ruby/cgi/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 ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -e "/spec.version/ s/= version/= '${PV}'/" \
+		-e "/spec.name/ s/= name/= '${PN}'/" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -rtest/lib/helper -e "Dir['test/**/test_*.rb'].each { require _1 }" || die
+}
diff --git a/dev-ruby/cgi/cgi-0.4.0.ebuild b/dev-ruby/cgi/cgi-0.4.0.ebuild
new file mode 100644
index 000000000000..9087fea27c8e
--- /dev/null
+++ b/dev-ruby/cgi/cgi-0.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/cgi/escape/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="cgi.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Support for the Common Gateway Interface protocol"
+HOMEPAGE="https://github.com/ruby/cgi"
+SRC_URI="https://github.com/ruby/cgi/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 ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
+
+all_ruby_prepare() {
+	sed -e "/spec.version/ s/= version/= '${PV}'/" \
+		-e "/spec.name/ s/= name/= '${PN}'/" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -rtest/lib/helper -e "Dir['test/**/test_*.rb'].each { require _1 }" || die
+}
diff --git a/dev-ruby/cgi/cgi-0.4.1.ebuild b/dev-ruby/cgi/cgi-0.4.1.ebuild
new file mode 100644
index 000000000000..2024cd9d9583
--- /dev/null
+++ b/dev-ruby/cgi/cgi-0.4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/cgi/escape/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/cgi
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="cgi.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Support for the Common Gateway Interface protocol"
+HOMEPAGE="https://github.com/ruby/cgi"
+SRC_URI="https://github.com/ruby/cgi/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 ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
+
+all_ruby_prepare() {
+	sed -e "/spec.version/ s/= version/= '${PV}'/" \
+		-e "/spec.name/ s/= name/= '${PN}'/" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -rtest/lib/helper -e "Dir['test/**/test_*.rb'].each { require _1 }" || die
+}
diff --git a/dev-ruby/cgi/metadata.xml b/dev-ruby/cgi/metadata.xml
new file mode 100644
index 000000000000..e0de6a47df17
--- /dev/null
+++ b/dev-ruby/cgi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/cgi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/charlock_holmes/charlock_holmes-0.7.7-r1.ebuild b/dev-ruby/charlock_holmes/charlock_holmes-0.7.7-r1.ebuild
index c397ff037089..6fbf270000ff 100644
--- a/dev-ruby/charlock_holmes/charlock_holmes-0.7.7-r1.ebuild
+++ b/dev-ruby/charlock_holmes/charlock_holmes-0.7.7-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -35,6 +35,9 @@ all_ruby_prepare() {
 
 	# Avoid dependency on rake-compiler
 	sed -i -e '/rake-compiler/,$ s:^:#:' Rakefile || die
+
+	# Avoid minitest deprecation
+	sed -i -e 's/MiniTest/Minitest/' test/converter_test.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/chef-utils/Manifest b/dev-ruby/chef-utils/Manifest
new file mode 100644
index 000000000000..2b05f410e2ef
--- /dev/null
+++ b/dev-ruby/chef-utils/Manifest
@@ -0,0 +1,3 @@
+DIST chef-utils-18.3.0.gem 34816 BLAKE2B cafdacdf4c3923df8ba41d3d960c135d357c9712a8009cc06c5f8e43a039b83495036e46e6f2d3785f589f206a0d373ec87b8c728c99889c236b16509bc51bc0 SHA512 0a806d2b8a42f2d574c81788990e6e0b70eaf4ac25bc08836915deae8ecdc2f82415ea66d6a571b01097de1e6435d359eaabe3ec16b8f3df24d826c78c96a5a8
+DIST chef-utils-18.4.12.gem 34816 BLAKE2B 601f2ddf2dc05544d1a035fed0050a691f9e70b971bf83b3201238f788039c93d9d7163723d9cda530fa7832e8bb33f889f7e520ccb12939e8603a37f576a3de SHA512 588f95aab8db21fbefae43baa4846339fb4ac22e8ecae1a8988fd4da6fb045fcad042adf281160414cb7b2a5deca7507d99fbfab4c21a4946cce9e807f3e3874
+DIST chef-utils-18.4.2.gem 34816 BLAKE2B 31cf065f6c9879367af26e80a1201dba91863b94966a33278ed50068e796b25416327b979616a9533792c346fcc33dd61015cef42a89a11bcdfefd5e2b1f3c72 SHA512 96f083471166f5aba6eef27c8dd32c7d99d6fec558a529f469fd03677f97fccf1ca0d4a1512dedcdbb56d781858089c28dd848d8c7c675f30dc486dd6b38f574
diff --git a/dev-ruby/chef-utils/chef-utils-18.3.0.ebuild b/dev-ruby/chef-utils/chef-utils-18.3.0.ebuild
new file mode 100644
index 000000000000..bfd489e9ecc2
--- /dev/null
+++ b/dev-ruby/chef-utils/chef-utils-18.3.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRA_DOC="CHANGELOG.md README.md"
+
+#RUBY_FAKEGEM_GEMSPEC="mixlib-shellout.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Basic utility functions for Core Chef Infra development"
+HOMEPAGE="https://github.com/chef/chef/tree/main/chef-utils"
+#SRC_URI="https://github.com/chef/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/concurrent-ruby"
+
+all_ruby_prepare() {
+	# Avoid specs depending on unpackaged fauxhai
+	rm -f spec/unit/dsl/{cloud,os,platform,platform_family,virtualization}_spec.rb || die
+}
diff --git a/dev-ruby/chef-utils/chef-utils-18.4.12.ebuild b/dev-ruby/chef-utils/chef-utils-18.4.12.ebuild
new file mode 100644
index 000000000000..6d4c643d4a13
--- /dev/null
+++ b/dev-ruby/chef-utils/chef-utils-18.4.12.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRA_DOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Basic utility functions for Core Chef Infra development"
+HOMEPAGE="https://github.com/chef/chef/tree/main/chef-utils"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86"
+
+ruby_add_rdepend "dev-ruby/concurrent-ruby"
+
+all_ruby_prepare() {
+	# Avoid specs depending on unpackaged fauxhai
+	rm -f spec/unit/dsl/{cloud,os,platform,platform_family,virtualization}_spec.rb || die
+}
diff --git a/dev-ruby/chef-utils/chef-utils-18.4.2.ebuild b/dev-ruby/chef-utils/chef-utils-18.4.2.ebuild
new file mode 100644
index 000000000000..6d4c643d4a13
--- /dev/null
+++ b/dev-ruby/chef-utils/chef-utils-18.4.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRA_DOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Basic utility functions for Core Chef Infra development"
+HOMEPAGE="https://github.com/chef/chef/tree/main/chef-utils"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86"
+
+ruby_add_rdepend "dev-ruby/concurrent-ruby"
+
+all_ruby_prepare() {
+	# Avoid specs depending on unpackaged fauxhai
+	rm -f spec/unit/dsl/{cloud,os,platform,platform_family,virtualization}_spec.rb || die
+}
diff --git a/dev-ruby/chef-utils/metadata.xml b/dev-ruby/chef-utils/metadata.xml
new file mode 100644
index 000000000000..34df01545bcb
--- /dev/null
+++ b/dev-ruby/chef-utils/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">chef/chef</remote-id>
+    <remote-id type="rubygems">chef-utils</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild b/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild
index 0def3600e1e5..5de75caf1d85 100644
--- a/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild
+++ b/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
@@ -12,26 +12,30 @@ RUBY_FAKEGEM_GEMSPEC="childlabor.gemspec"
 
 inherit ruby-fakegem
 
-DESCRIPTION="A scripting framework that replaces rake and sake"
+DESCRIPTION="Gem that helps manage child processes"
 HOMEPAGE="https://github.com/carllerche/childlabor"
 COMMIT_ID="6518b939dddbad20c7f05aa075d76e3ca6e70447"
 SRC_URI="https://github.com/carllerche/childlabor/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 
 RUBY_S="${PN}-${COMMIT_ID}"
 
-ruby_add_bdepend "test? ( dev-ruby/rspec:2 )"
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
 
 all_ruby_prepare() {
 	# Avoid failing spec. The signals work, but the stdout handling
 	# doesn't seem to play nice with portage.
 	sed -i -e '/can send signals/,/^  end/ s:^:#:' spec/task_spec.rb || die
+
+	# Rspec 3 compatibility
+	sed -i -e 's/Spec::Runner/RSpec/' spec/spec_helper.rb || die
+	sed -i -e 's/be_false/be_falsey/ ; s/be_true/be true/' spec/task_spec.rb || die
 }
 
 each_ruby_test() {
-	ruby-ng_rspec -I. spec/task_spec.rb || die
+	RSPEC_VERSION=3 ruby-ng_rspec -I. spec/task_spec.rb || die
 }
diff --git a/dev-ruby/childprocess/Manifest b/dev-ruby/childprocess/Manifest
index 0f58eaa99cfe..0fc5fba1af1e 100644
--- a/dev-ruby/childprocess/Manifest
+++ b/dev-ruby/childprocess/Manifest
@@ -1 +1,2 @@
 DIST childprocess-4.1.0.gem 34304 BLAKE2B 81ca075bde9705eed57c80b0d37e1d8fcf3938bd0319a40f2178dab9be08cba570d90cc5292d585b3911eca5a90b4ff861d1fc79ba487d1a4f08b0fbd9a78c48 SHA512 e635c3acfa5ad85891c3879f240c7e96d47d7d5ec3f472f4ce6661552b0fb7bd72c5e3b9fb73f4f9312b749fbe554b4be388e56a31a3c63c39743d055d774def
+DIST childprocess-5.0.0.gem 21504 BLAKE2B dae2022506c533f3c16337600bf5f489ccb694156079a2c9f2d3b1971c7fb44524e44b49e6e51c5ab6d1350222c8a84a5053b58e299cdc5e13633de2101f3952 SHA512 9ec340c86f4fd978b7a9925bcf90811ff3443f014469e4ff121e2c4758a4068823029ab413d1a57eb9de4a864435505b1edfa60a611709f2a5f99aaf08da422d
diff --git a/dev-ruby/childprocess/childprocess-4.1.0.ebuild b/dev-ruby/childprocess/childprocess-4.1.0.ebuild
index 8f16adfff41e..8492d1813013 100644
--- a/dev-ruby/childprocess/childprocess-4.1.0.ebuild
+++ b/dev-ruby/childprocess/childprocess-4.1.0.ebuild
@@ -1,9 +1,9 @@
-# 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_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/childprocess/childprocess-5.0.0.ebuild b/dev-ruby/childprocess/childprocess-5.0.0.ebuild
new file mode 100644
index 000000000000..1d3f000e03be
--- /dev/null
+++ b/dev-ruby/childprocess/childprocess-5.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Solution for controlling external programs running in the background"
+HOMEPAGE="https://github.com/enkessler/childprocess"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/ffi-1.0.11"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	rm Gemfile || die
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e "/[Cc]overalls/d" spec/spec_helper.rb || die
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+	sed -i -e "s:'ruby':'"${RUBY}"':" spec/childprocess_spec.rb spec/spec_helper.rb || die
+	sed -i -e '/system/ s:ruby:'${RUBY}':' spec/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB=lib RSPEC_VERSION=3 ruby-ng_rspec
+}
diff --git a/dev-ruby/childprocess/metadata.xml b/dev-ruby/childprocess/metadata.xml
index 4a1d3ad00d09..4774b53ab662 100644
--- a/dev-ruby/childprocess/metadata.xml
+++ b/dev-ruby/childprocess/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">jarib/childprocess</remote-id>
+    <remote-id type="github">enkessler/childprocess</remote-id>
+    <remote-id type="rubygems">childprocess</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/chronic/chronic-0.10.2-r1.ebuild b/dev-ruby/chronic/chronic-0.10.2-r1.ebuild
index 42b160ad19dd..6a57f38eeec7 100644
--- a/dev-ruby/chronic/chronic-0.10.2-r1.ebuild
+++ b/dev-ruby/chronic/chronic-0.10.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=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
@@ -15,7 +15,7 @@ DESCRIPTION="Chronic is a natural language date/time parser written in pure Ruby
 HOMEPAGE="https://github.com/mojombo/chronic"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
 SLOT="0"
 IUSE=""
 
@@ -23,4 +23,6 @@ ruby_add_bdepend "test? ( >=dev-ruby/minitest-5 )"
 
 all_ruby_prepare() {
 	sed -i -e '/git ls-files/d' chronic.gemspec || die
+
+	sed -i -e 's/MiniTest/Minitest/' test/helper.rb || die
 }
diff --git a/dev-ruby/chunky_png/chunky_png-1.4.0-r1.ebuild b/dev-ruby/chunky_png/chunky_png-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..60b0499c8a89
--- /dev/null
+++ b/dev-ruby/chunky_png/chunky_png-1.4.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+
+RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc CHANGELOG.rdoc README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pure Ruby library that can read and write PNG images"
+HOMEPAGE="https://github.com/wvanbergen/chunky_png"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-ruby32.patch"
+)
+
+all_ruby_prepare() {
+	sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
+	rm Gemfile* || die
+
+	# Avoid git dependency
+	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/chunky_png/chunky_png-1.4.0.ebuild b/dev-ruby/chunky_png/chunky_png-1.4.0.ebuild
deleted file mode 100644
index 9a9da8027236..000000000000
--- a/dev-ruby/chunky_png/chunky_png-1.4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-
-RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc CHANGELOG.rdoc README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure Ruby library that can read and write PNG images"
-HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
-	rm Gemfile* || die
-
-	# Avoid git dependency
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/chunky_png/files/chunky_png-1.4.0-ruby32.patch b/dev-ruby/chunky_png/files/chunky_png-1.4.0-ruby32.patch
new file mode 100644
index 000000000000..75d08c9fc88d
--- /dev/null
+++ b/dev-ruby/chunky_png/files/chunky_png-1.4.0-ruby32.patch
@@ -0,0 +1,29 @@
+From 8e6f5934541833f15664398f90331f3724e40933 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka@fedoraproject.org>
+Date: Tue, 15 Nov 2022 23:22:20 +0900
+Subject: [PATCH] ruby3_2 fix: check if object responds to regex_match op
+
+Object#=~ is already deprecated since ruby2.6 and will be
+removed from ruby3.2. As the result, Array no longer
+respond to =~ from ruby3.2, for example.
+
+Check if the target object really respond to =~ .
+
+Closes #168
+---
+ lib/chunky_png/vector.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/chunky_png/vector.rb b/lib/chunky_png/vector.rb
+index 4ef965f..034104c 100644
+--- a/lib/chunky_png/vector.rb
++++ b/lib/chunky_png/vector.rb
+@@ -166,7 +166,7 @@ def dimension
+     # @return [Array<ChunkyPNG::Point>] The list of points interpreted from the input array.
+     def self.multiple_from_array(source)
+       return [] if source.empty?
+-      if source.first.is_a?(Numeric) || source.first =~ /^\d+$/
++      if source.first.is_a?(Numeric) || ( source.first.respond_to?(:=~) && source.first =~ /^\d+$/ )
+         raise ArgumentError, "The points array is expected to have an even number of items!" if source.length % 2 != 0
+ 
+         points = []
diff --git a/dev-ruby/chunky_png/metadata.xml b/dev-ruby/chunky_png/metadata.xml
index 658c72b1920d..b77f6d0887ed 100644
--- a/dev-ruby/chunky_png/metadata.xml
+++ b/dev-ruby/chunky_png/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">wvanbergen/chunky_png</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/cinch/Manifest b/dev-ruby/cinch/Manifest
deleted file mode 100644
index a3944a522009..000000000000
--- a/dev-ruby/cinch/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cinch-2.3.4.gem 80384 BLAKE2B 10ec1a96eebb04d378648e1f1e0ca9f1a35afbaa146d909158db89f604709d6b2f4abc051accc48e1034f78b32298a07fa14c64477c69603495a5cf686d2ed7e SHA512 25cb2b18f1ae5f4e7c42cbb27dd68fec3bf29091bafb9c61ecffa0743b6696cd6e99499c2e30a94f4dbaa373c979d0fbff0c685522844bdd01ad81cdf34af9d9
diff --git a/dev-ruby/cinch/cinch-2.3.4.ebuild b/dev-ruby/cinch/cinch-2.3.4.ebuild
deleted file mode 100644
index 2fa0c0f6ed50..000000000000
--- a/dev-ruby/cinch/cinch-2.3.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-# The testsuite is not in the Gem, only in the upstream repo.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="docs/*.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="IRC Bot Building Framework"
-HOMEPAGE="https://github.com/cinchrb/cinch http://cinchrb.org"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/cinch/metadata.xml b/dev-ruby/cinch/metadata.xml
deleted file mode 100644
index d963ac856f49..000000000000
--- a/dev-ruby/cinch/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>robbat2@gentoo.org</email>
-		<name>Robin H. Johnson</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">cinchrb/cinch</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/classifier-reborn/Manifest b/dev-ruby/classifier-reborn/Manifest
deleted file mode 100644
index 68ea54e90070..000000000000
--- a/dev-ruby/classifier-reborn/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST classifier-reborn-2.2.0.tar.gz 319010 BLAKE2B f4bd3259b9d6e324f3f0feb06dfd1c8736eaa8ae0f687e488b6e11b9cda8e6bf9e56a175c01dfb9352184da1a030d1330e22917c7bfdcb4242fa0102f6291940 SHA512 d299ce8f3b96de5c6194e816d880ebb895faaacdc2a19985166bdc3d9760242ec41d85f22167ea66e9afd743f5d91d63881da02882d1a412fc95a0c5db63d04c
diff --git a/dev-ruby/classifier-reborn/classifier-reborn-2.2.0.ebuild b/dev-ruby/classifier-reborn/classifier-reborn-2.2.0.ebuild
deleted file mode 100644
index 0dab37a47b84..000000000000
--- a/dev-ruby/classifier-reborn/classifier-reborn-2.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Module to allow Bayesian and other types of classifications"
-HOMEPAGE="https://github.com/jekyll/classifier-reborn"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="gsl test"
-
-ruby_add_rdepend ">=dev-ruby/fast-stemmer-1.0.0
-	!!dev-ruby/classifier
-	gsl? ( dev-ruby/rb-gsl )"
-ruby_add_bdepend "test? ( dev-ruby/redis )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	if use !gsl; then
-		sed -e 's/$GSL = true/$GSL = false/'\
-			-e 's/vector_serialize/vector/'\
-			-i lib/${PN}/lsi.rb || die
-	fi
-	# Comment out broken test
-	#sed -i -e "/assert 'Normal',/s/^/#/" test/bayes/bayesian_test.rb || die
-
-	sed -i -e '/reporters/I s:^:#:' -e '/pry/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/classifier-reborn/metadata.xml b/dev-ruby/classifier-reborn/metadata.xml
deleted file mode 100644
index ee10d60143f1..000000000000
--- a/dev-ruby/classifier-reborn/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jekyll/classifier-reborn</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/climate_control/Manifest b/dev-ruby/climate_control/Manifest
index 06e0fb17111c..3c146a2391ba 100644
--- a/dev-ruby/climate_control/Manifest
+++ b/dev-ruby/climate_control/Manifest
@@ -1,2 +1 @@
-DIST climate_control-0.2.0.gem 9728 BLAKE2B 9868eef8836189d7567d8fd8f5dade874ed4baef883f38b2d6148bde4f1e24544f31fae75ff7bcec4dc685c1fdd23d5164817460eeaf151d8eb105e023bbd741 SHA512 c264d731fb02c7a15932d2724bcd54dff91d2370a0b5336444e167e0d39596974c3826db502be7dc1b6d99cdbbc022135822222a5a6cb6b822aa32a0913c1ec9
-DIST climate_control-1.0.1.gem 9728 BLAKE2B f2d267e86c58fdbb7a85508f56a091166809d108c2e66702df50962086a89a134e6a47a1e53c36272c563f1d4a0225fc613490616d67fbe04e9647b7fe8cfda6 SHA512 2dfd790b444409275571881d19c3712c6542890499f3d55e5f8ea3775166c01adbb216a0749b0c4e126d631cba690c0edc3f8c49143fc0ff3bcc8b25545bf218
+DIST climate_control-1.2.0.gem 10752 BLAKE2B 5c7c1d0b1ec50f12139e47a0c0f2d5753c6165aa96bb995be12f65cef4a222fc4fa96b66e8c475b3ebe2f353c335a6667e12a9a2a8a869331a1f41f72d686d94 SHA512 282f40d5d9d7b4a6577ea13dd92141c985a0c1bd7d6688cb2bca2529721a0523a1e9ac4ba1c6a27a43b286ac664e502698ef2c0578a9030283a4b18f7cb0a5e8
diff --git a/dev-ruby/climate_control/climate_control-0.2.0.ebuild b/dev-ruby/climate_control/climate_control-0.2.0.ebuild
deleted file mode 100644
index 8353fa4ba4e6..000000000000
--- a/dev-ruby/climate_control/climate_control-0.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="NEWS README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Easily manage your environment"
-HOMEPAGE="https://github.com/thoughtbot/climate_control"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid dependencies on simplecov and git.
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files/echo ""/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/climate_control/climate_control-1.0.1.ebuild b/dev-ruby/climate_control/climate_control-1.0.1.ebuild
deleted file mode 100644
index afca40f5eb3b..000000000000
--- a/dev-ruby/climate_control/climate_control-1.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="NEWS README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Easily manage your environment"
-HOMEPAGE="https://github.com/thoughtbot/climate_control"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid dependencies on simplecov and git.
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/climate_control/climate_control-1.2.0.ebuild b/dev-ruby/climate_control/climate_control-1.2.0.ebuild
new file mode 100644
index 000000000000..6f4c638be0bb
--- /dev/null
+++ b/dev-ruby/climate_control/climate_control-1.2.0.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="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Easily manage your environment"
+HOMEPAGE="https://github.com/thoughtbot/climate_control"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid dependencies on simplecov and git.
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/cliver/cliver-0.3.2-r1.ebuild b/dev-ruby/cliver/cliver-0.3.2-r1.ebuild
deleted file mode 100644
index cb0672b6d985..000000000000
--- a/dev-ruby/cliver/cliver-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_GEMSPEC="cliver.gemspec"
-
-inherit ruby-fakegem
-
-COMMIT=3d72e99af19c273a3f88adcd4b96c4b65b1b6d4b
-
-DESCRIPTION="An easy way to detect and use command-line dependencies"
-HOMEPAGE="https://yaauie.github.io/cliver/"
-SRC_URI="https://github.com/yaauie/cliver/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cliver-${COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/cliver/cliver-0.3.2-r2.ebuild b/dev-ruby/cliver/cliver-0.3.2-r2.ebuild
new file mode 100644
index 000000000000..f85578090ff5
--- /dev/null
+++ b/dev-ruby/cliver/cliver-0.3.2-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="cliver.gemspec"
+
+inherit ruby-fakegem
+
+COMMIT=3d72e99af19c273a3f88adcd4b96c4b65b1b6d4b
+
+DESCRIPTION="An easy way to detect and use command-line dependencies"
+HOMEPAGE="https://yaauie.github.io/cliver/"
+SRC_URI="https://github.com/yaauie/cliver/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cliver-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/cliver/metadata.xml b/dev-ruby/cliver/metadata.xml
index 658c72b1920d..bbecac6f4213 100644
--- a/dev-ruby/cliver/metadata.xml
+++ b/dev-ruby/cliver/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">yaauie/cliver</remote-id>
+    <remote-id type="rubygems">cliver</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/cmdparse/cmdparse-3.0.7-r1.ebuild b/dev-ruby/cmdparse/cmdparse-3.0.7-r1.ebuild
index dade8609965e..9e40585d8ad3 100644
--- a/dev-ruby/cmdparse/cmdparse-3.0.7-r1.ebuild
+++ b/dev-ruby/cmdparse/cmdparse-3.0.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
@@ -12,11 +12,9 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 
 inherit ruby-fakegem
 
-IUSE=""
-
 DESCRIPTION="Advanced command line parser supporting commands"
 HOMEPAGE="https://cmdparse.gettalong.org/"
 
-KEYWORDS="~amd64 ~ppc64 ~x86"
 LICENSE="MIT"
 SLOT="3"
+KEYWORDS="~amd64 ~ppc64 ~x86"
diff --git a/dev-ruby/cmdparse/metadata.xml b/dev-ruby/cmdparse/metadata.xml
index 658c72b1920d..dac4fdd0f3ca 100644
--- a/dev-ruby/cmdparse/metadata.xml
+++ b/dev-ruby/cmdparse/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">gettalong/cmdparse</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/coderay/Manifest b/dev-ruby/coderay/Manifest
index 96ebaa024b4d..77502be2a907 100644
--- a/dev-ruby/coderay/Manifest
+++ b/dev-ruby/coderay/Manifest
@@ -1,2 +1 @@
-DIST coderay-1.1.2.tar.gz 220645 BLAKE2B 85405da2b148ae23573abf2c3fcf94a643024756308e83c4cecf0a5edae2fedc4ca7c7bdf8fb5936310f6699ca8f06f91cceb475e00511a54af0a96dd517c234 SHA512 cfce5e9f0a0d988e7920912e064ecbef3b54200a08ca2e07453452edd7f382a1eb9292bc566e069f5d1b784033e816f13d9ddfb39520e8e44a8d1e898aa33591
 DIST coderay-1.1.3.tar.gz 229139 BLAKE2B a900cc5fbac950f66814d9300876d6a273b296d07139297d5344d26c5710d23c37761e5743ef972f523afa20fa663f239c03d9d2ad47232b77e53fe5053736f0 SHA512 a5208965e8dbad53d179fdc1c57df59ba4e13522a1a57c371ccd3f9369408a1c7d878867df48b201a1d590b46ef0f9bada3f3e7810866f17d244b5b370aba3fb
diff --git a/dev-ruby/coderay/coderay-1.1.2.ebuild b/dev-ruby/coderay/coderay-1.1.2.ebuild
deleted file mode 100644
index 171b6fb51105..000000000000
--- a/dev-ruby/coderay/coderay-1.1.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-# The test target also contains test:exe but that requires
-# shoulda-context which we do not have packaged yet.
-RUBY_FAKEGEM_TASK_TEST="test:functional test:units"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="Changes-pre-1.0.textile Changes.textile FOLDERS README_INDEX.rdoc README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby library for syntax highlighting"
-HOMEPAGE="http://coderay.rubychan.de/"
-SRC_URI="https://github.com/rubychan/coderay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Redcloth is an optional but automagically tested dependency. This
-# requires redcloth-4.2.2. We don't depend on this version to make
-# bootstrapping rspec with new versions easier, since redcloth depends
-# on rake-compiler.
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e '/git ls-files/ s:^:#:' coderay.gemspec || die
-
-	# Fix failing tests for lazy evaluation in ruby26
-	sed -i -e 's/\.filter$/.filter.to_a/' test/unit/filter.rb || die
-}
diff --git a/dev-ruby/coderay/coderay-1.1.3-r1.ebuild b/dev-ruby/coderay/coderay-1.1.3-r1.ebuild
deleted file mode 100644
index 380b0699f14c..000000000000
--- a/dev-ruby/coderay/coderay-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-# The test target also contains test:exe but that requires
-# shoulda-context which we do not have packaged yet.
-RUBY_FAKEGEM_TASK_TEST="spec test:functional test:units"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="Changes-pre-1.0.textile Changes.textile FOLDERS README_INDEX.rdoc README.markdown"
-
-RUBY_FAKEGEM_GEMSPEC="coderay.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby library for syntax highlighting"
-HOMEPAGE="http://coderay.rubychan.de/"
-SRC_URI="https://github.com/rubychan/coderay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-PATCHES=("${FILESDIR}/${P}-ruby30.patch")
-
-# Redcloth is an optional but automagically tested dependency. This
-# requires redcloth-4.2.2. We don't depend on this version to make
-# bootstrapping rspec with new versions easier, since redcloth depends
-# on rake-compiler.
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e '/git ls-files/ s:^:#:' -e 's/.rc.*"/"/' coderay.gemspec || die
-	sed -i -e '/simplecov/ s:^:#:' spec/spec_helper.rb test/*/*.rb || die
-
-	# Fix failing tests for lazy evaluation in ruby26
-	sed -i -e 's/\.filter$/.filter.to_a/' test/unit/filter.rb || die
-}
diff --git a/dev-ruby/coderay/coderay-1.1.3-r2.ebuild b/dev-ruby/coderay/coderay-1.1.3-r2.ebuild
index 6f617d0935ba..5f2b9bdde80f 100644
--- a/dev-ruby/coderay/coderay-1.1.3-r2.ebuild
+++ b/dev-ruby/coderay/coderay-1.1.3-r2.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 # The test target also contains test:exe but that requires
 # shoulda-context which we do not have packaged yet.
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/rubychan/coderay/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~x64-solaris"
 IUSE=""
 
 PATCHES=("${FILESDIR}/${P}-ruby30.patch")
diff --git a/dev-ruby/coercible/Manifest b/dev-ruby/coercible/Manifest
index a4a39c67364f..ed59a2a02245 100644
--- a/dev-ruby/coercible/Manifest
+++ b/dev-ruby/coercible/Manifest
@@ -1 +1 @@
-DIST coercible-1.0.0.gem 24064 BLAKE2B 5f9708211600621869e78742dc5421672f27162c1e09e703bb2954d67b2ad281ddf59f9ecb28722f4423cbd0c7fc8bc14bda0f1f064135cbefc24ddb94ab1648 SHA512 5de43166625cca102cd048ae5cd4113ef834b273fb798490a99eeaab423174f1fa40410546de4e0224234efb996a4aa1f2c37b093298f50356f925b8a6163767
+DIST coercible-1.0.1.tar.gz 18949 BLAKE2B 92c4b2a38ac662d270aacd2d46216c188fef12b99f0a54c2642d96f72e5d45fac895c8e0c1d4300784e754f384eb86a9731c32a9780af9877668251fa39eca57 SHA512 27c563a70a028af0fdcf72200b47e29b4eb312539d16634b9533140903504a42284ff31fe73286b0944129b6481614184c2966f47b82d08ac419bdadb862f5ea
diff --git a/dev-ruby/coercible/coercible-1.0.0-r1.ebuild b/dev-ruby/coercible/coercible-1.0.0-r1.ebuild
deleted file mode 100644
index 8549f75505ec..000000000000
--- a/dev-ruby/coercible/coercible-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md Changelog.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Powerful, flexible and configurable coercion library"
-HOMEPAGE="https://github.com/solnic/coercible https://rubygems.org/gems/coercible"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/descendants_tracker-0.0.1
-	<dev-ruby/descendants_tracker-0.1"
diff --git a/dev-ruby/coercible/coercible-1.0.1.ebuild b/dev-ruby/coercible/coercible-1.0.1.ebuild
new file mode 100644
index 000000000000..17bd6be1da57
--- /dev/null
+++ b/dev-ruby/coercible/coercible-1.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md Changelog.md"
+RUBY_FAKEGEM_GEMSPEC="coercible.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+COMMIT=c076869838531abb5783280da108aa3cbddbd61a
+
+inherit ruby-fakegem
+
+DESCRIPTION="Powerful, flexible and configurable coercion library"
+HOMEPAGE="https://github.com/solnic/coercible https://rubygems.org/gems/coercible"
+SRC_URI="https://github.com/solnic/coercible/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/descendants_tracker-0.0.1
+	<dev-ruby/descendants_tracker-0.1"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/coffee-rails/coffee-rails-5.0.0-r1.ebuild b/dev-ruby/coffee-rails/coffee-rails-5.0.0-r1.ebuild
deleted file mode 100644
index 92dfe57d44e1..000000000000
--- a/dev-ruby/coffee-rails/coffee-rails-5.0.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Coffee Script adapter for the Rails asset pipeline"
-HOMEPAGE="https://github.com/rails/coffee-rails"
-SRC_URI="https://github.com/rails/coffee-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/coffee-script-2.2.0
-	>dev-ruby/railties-5.2:*"
-
-ruby_add_bdepend "test? ( dev-ruby/sprockets-rails dev-ruby/sprockets:3 )"
-
-all_ruby_prepare() {
-	# Avoid dependency on git and bundler.
-	sed -i -e 's/git ls-files/echo/' \
-		-e '/bundler/I s:^:#:' Rakefile || die
-
-	# Make sure a consistent rails version is loaded.
-	sed -i -e '4igem "railties", "<7" ; gem "sprockets", "<4"' -e '/bundler/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/coffee-rails/coffee-rails-5.0.0-r2.ebuild b/dev-ruby/coffee-rails/coffee-rails-5.0.0-r2.ebuild
new file mode 100644
index 000000000000..9b0d6cd45e97
--- /dev/null
+++ b/dev-ruby/coffee-rails/coffee-rails-5.0.0-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Coffee Script adapter for the Rails asset pipeline"
+HOMEPAGE="https://github.com/rails/coffee-rails"
+SRC_URI="https://github.com/rails/coffee-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+ruby_add_rdepend "
+	>=dev-ruby/coffee-script-2.2.0
+	<dev-ruby/railties-7:*
+"
+
+# sprockets:3 for https://github.com/rails/coffee-rails/issues/122
+ruby_add_bdepend "test? ( dev-ruby/sprockets-rails dev-ruby/sprockets:3 )"
+
+all_ruby_prepare() {
+	# Avoid dependency on git and bundler.
+	sed -i -e 's/git ls-files/echo/' \
+		-e '/bundler/I s:^:#:' Rakefile || die
+
+	# Make sure a consistent rails version is loaded.
+	sed -i -e '4igem "railties", "<7" ; gem "sprockets", "<4"' -e '/bundler/ s:^:#:' test/test_helper.rb || die
+}
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..81e3da1782e3 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=""
@@ -14,6 +14,6 @@ HOMEPAGE="https://coffeescript.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
 
 IUSE=""
diff --git a/dev-ruby/coffee-script-source/coffee-script-source-1.12.2-r2.ebuild b/dev-ruby/coffee-script-source/coffee-script-source-1.12.2-r2.ebuild
new file mode 100644
index 000000000000..d983fd3d19a8
--- /dev/null
+++ b/dev-ruby/coffee-script-source/coffee-script-source-1.12.2-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby CoffeeScript is a bridge to the official CoffeeScript compiler"
+HOMEPAGE="https://coffeescript.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
+
+IUSE=""
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..66801c7f631f 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rails/ruby-coffee-script https://github.com/rails/c
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
 
 IUSE=""
 
diff --git a/dev-ruby/color/color-1.8-r1.ebuild b/dev-ruby/color/color-1.8-r1.ebuild
index 43c9bfaf760e..8c62ed1c5c7d 100644
--- a/dev-ruby/color/color-1.8-r1.ebuild
+++ b/dev-ruby/color/color-1.8-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
 RUBY_FAKEGEM_GEMSPEC="color.gemspec"
diff --git a/dev-ruby/colorator/colorator-1.1.0-r1.ebuild b/dev-ruby/colorator/colorator-1.1.0-r1.ebuild
index e634550f7885..52f2111c32a1 100644
--- a/dev-ruby/colorator/colorator-1.1.0-r1.ebuild
+++ b/dev-ruby/colorator/colorator-1.1.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="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
 RUBY_FAKEGEM_GEMSPEC="colorator.gemspec"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/octopress/colorator/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/colored/colored-1.2-r1.ebuild b/dev-ruby/colored/colored-1.2-r1.ebuild
index 0c0e2d8559a2..58455558edd3 100644
--- a/dev-ruby/colored/colored-1.2-r1.ebuild
+++ b/dev-ruby/colored/colored-1.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=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 inherit ruby-fakegem
 
@@ -10,7 +10,7 @@ DESCRIPTION="Console coloring"
 HOMEPAGE="https://github.com/defunkt/colored"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/colored2/colored2-3.1.2-r1.ebuild b/dev-ruby/colored2/colored2-3.1.2-r1.ebuild
new file mode 100644
index 000000000000..ee045d1e61de
--- /dev/null
+++ b/dev-ruby/colored2/colored2-3.1.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Console coloring"
+HOMEPAGE="https://github.com/kigster/colored2"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+each_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+
+	sed -i -e 's/Fixnum/Integer/' lib/colored2/numbers.rb || die
+}
diff --git a/dev-ruby/colored2/colored2-3.1.2.ebuild b/dev-ruby/colored2/colored2-3.1.2.ebuild
deleted file mode 100644
index 935065681ac8..000000000000
--- a/dev-ruby/colored2/colored2-3.1.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Console coloring"
-HOMEPAGE="https://github.com/kigster/colored2"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-each_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/colorize/Manifest b/dev-ruby/colorize/Manifest
index eec357092a64..b17e558e4a3c 100644
--- a/dev-ruby/colorize/Manifest
+++ b/dev-ruby/colorize/Manifest
@@ -1 +1 @@
-DIST colorize-0.8.1.gem 15872 BLAKE2B fe8e3a3e010d55954fb9e3e26626202e1d3eba5478e27009fc86bd4029c98fe5a2ed2f2b0d5d1615e892435554272a70c1cbfcdadadea8bcaab894cb290e7992 SHA512 0819dfaa94150c85cbe633c77006f2f4bdd6c4f9bf9dfa954b8c4038b8a680c99a2b4b160da05bf426402d287a0db4c4eb1cc66a949405188b632f39da381c72
+DIST colorize-1.1.0.gem 17920 BLAKE2B 31d66bccfcd9f75175feb5f8fb1ace3e39f95255b041b9eef3171465c66b36fab548ca17625e52a9a8c93737b8c1ca54adb334ca0d5957ac157bd34752242d97 SHA512 d1257c6be909e92ef59e39536e802bbcbbc5f49b0ac0f1f372f36f9ac1a0ed9016ab374f6f6b389b5d158dcebfabc9e047d9b0d797b408b82224355e5c9a2b2a
diff --git a/dev-ruby/colorize/colorize-0.8.1-r1.ebuild b/dev-ruby/colorize/colorize-0.8.1-r1.ebuild
deleted file mode 100644
index 17c7662c97f0..000000000000
--- a/dev-ruby/colorize/colorize-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Adds methods to set color, background color and text effect on console easier"
-HOMEPAGE="https://github.com/fazibear/colorize"
-LICENSE="GPL-2+"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Cc]ode[Cc]limate/d" test/test_colorize.rb || die
-}
-
-each_ruby_test() {
-	cd test || die
-	${RUBY} test_colorize.rb || die
-}
diff --git a/dev-ruby/colorize/colorize-1.1.0.ebuild b/dev-ruby/colorize/colorize-1.1.0.ebuild
new file mode 100644
index 000000000000..c9a68eeee6fa
--- /dev/null
+++ b/dev-ruby/colorize/colorize-1.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_TASK_TEST="default"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Adds methods to set color, background color and text effect on console easier"
+HOMEPAGE="https://github.com/fazibear/colorize"
+LICENSE="GPL-2+"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Cc]ode[Cc]limate/d" test/test_colorize.rb || die
+
+	# Skip unpackaged test as this release is not tagged upstream.
+	sed -i -e '/test_\(colorize\|colorized_string\)_with_readline/,/execute/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/columnize/columnize-0.9.0-r1.ebuild b/dev-ruby/columnize/columnize-0.9.0-r1.ebuild
deleted file mode 100644
index 61dc3cc6ac28..000000000000
--- a/dev-ruby/columnize/columnize-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="AUTHORS ChangeLog NEWS README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Sorts an array in column order"
-HOMEPAGE="https://github.com/rocky/columnize"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
diff --git a/dev-ruby/columnize/columnize-0.9.0-r2.ebuild b/dev-ruby/columnize/columnize-0.9.0-r2.ebuild
new file mode 100644
index 000000000000..d99080be1757
--- /dev/null
+++ b/dev-ruby/columnize/columnize-0.9.0-r2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="AUTHORS ChangeLog NEWS README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Sorts an array in column order"
+HOMEPAGE="https://github.com/rocky/columnize"
+
+LICENSE="|| ( GPL-2 Ruby )"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
diff --git a/dev-ruby/combustion/Manifest b/dev-ruby/combustion/Manifest
index 5d6fd824df12..beff78fd18fd 100644
--- a/dev-ruby/combustion/Manifest
+++ b/dev-ruby/combustion/Manifest
@@ -1,2 +1,2 @@
-DIST combustion-1.3.4.gem 16384 BLAKE2B 305a38d4e4a59903eb23318ec64389b80b051b7e2fce1de962fec26a0ba76eff1236226aad8072615d333e1ba797153771474b7096ec1b052d2bba63f4beafdb SHA512 251f4f219048f6ce7b8236c5b35463916f3d3f6d35be392e7d7b4854f2c2d68d585e6f35040a0ae866b7339db957866c022e756f474fce9d6b6e1e63cf237c94
-DIST combustion-1.3.5.gem 16384 BLAKE2B e03ea70848b400e6ca037bb94f2d23f8bb70e7472d1d004e93fed62eace08d5adb56dcf458a506c6a2dc161001d67a71f7f75621f14e1d66da08dd858d892ed2 SHA512 6f67a09197080b4345b6b7a70531513aca1c31cb1bdb40adca760a2dda83baca8d95f924fadcf096cf2228f74222bca0f700c0cb9c22172618ef8b1ddea8573a
+DIST combustion-1.3.7.tar.gz 16922 BLAKE2B 7edb6d68751bdae2c14f564d99bd5e4815aeb0ac5cbf9f86bf265bcf1cc02f39b36c2f439d1a79930f7fee5670451dee87821150b11b765cf3a251272b6bfb46 SHA512 2aedf160b099f16b2225dacbb8198fbdca6a00196bfaf4f869d651309e36976b3a14383c9b38b4361a5174726117200e0fc9da56f2cf08ec9ea99a5f5dbecf7e
+DIST combustion-1.4.0.tar.gz 16955 BLAKE2B fa2d55b6e84316b07221c938b053869f44b23363e69b51cefadc7400f7743c5cfe4d4c36cc01b0a463c64b6c5f59736f1bfef50e3438bb3feecc3be22ac717ef SHA512 24cee50f5a05e782d228cf1987de07610a077bd85a3e46c611b6f5c4f2a7202dcb0576ccb337f8c03f7d7a5e446e05524e5686cf5fdde9e510672b722403c13c
diff --git a/dev-ruby/combustion/combustion-1.3.4.ebuild b/dev-ruby/combustion/combustion-1.3.4.ebuild
deleted file mode 100644
index 7098a4162651..000000000000
--- a/dev-ruby/combustion/combustion-1.3.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Elegant Rails Engine Testing"
-HOMEPAGE="https://github.com/pat/combustion"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/activesupport-3.0.0:*
-	>=dev-ruby/railties-3.0.0:*
-	>=dev-ruby/thor-0.14.6:*
-"
diff --git a/dev-ruby/combustion/combustion-1.3.5.ebuild b/dev-ruby/combustion/combustion-1.3.5.ebuild
deleted file mode 100644
index f4c3bac3c853..000000000000
--- a/dev-ruby/combustion/combustion-1.3.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Elegant Rails Engine Testing"
-HOMEPAGE="https://github.com/pat/combustion"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/activesupport-3.0.0:*
-	>=dev-ruby/railties-3.0.0:*
-	>=dev-ruby/thor-0.14.6:*
-"
diff --git a/dev-ruby/combustion/combustion-1.3.7-r2.ebuild b/dev-ruby/combustion/combustion-1.3.7-r2.ebuild
new file mode 100644
index 000000000000..a7313fbd40ee
--- /dev/null
+++ b/dev-ruby/combustion/combustion-1.3.7-r2.ebuild
@@ -0,0 +1,58 @@
+# 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_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+inherit ruby-fakegem
+
+DESCRIPTION="Elegant Rails Engine Testing"
+HOMEPAGE="https://github.com/pat/combustion"
+SRC_URI="https://github.com/pat/combustion/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+
+ruby_add_rdepend "
+	>=dev-ruby/activesupport-3.0.0:*
+	>=dev-ruby/railties-3.0.0:*
+	>=dev-ruby/thor-0.14.6:*
+"
+# Needed for e.g. cannot load such file -- action_mailer/railtie
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/activemodel-3.0.0:*
+		>=dev-ruby/activerecord-3.0.0:*
+		dev-ruby/bundler
+		>=dev-ruby/rails-3.0.0:*
+		dev-ruby/rspec:3
+		>=dev-ruby/sqlite3-1.4
+	)
+"
+
+each_ruby_prepare() {
+	sed -i \
+		-e '/sqlite3/s:1.3.13:1.4:' \
+		-e '/rubocop/d' \
+		Gemfile || die
+
+	# appraisal, rubocop: useless for us test deps
+	# mysql2, pg,: optional runtime deps
+	sed -i \
+		-e '/appraisal/d' \
+		-e '/mysql2/d' \
+		-e '/pg/d' \
+		-e '/rubocop/d' \
+		${PN}.gemspec || die
+
+	sed -i -e '/rubocop/d' Rakefile || die
+}
+
+each_ruby_test() {
+	local -x DB_ADAPTER=sqlite3
+	${RUBY} -S bundle exec rake spec || die
+}
diff --git a/dev-ruby/combustion/combustion-1.4.0.ebuild b/dev-ruby/combustion/combustion-1.4.0.ebuild
new file mode 100644
index 000000000000..c294438d24f5
--- /dev/null
+++ b/dev-ruby/combustion/combustion-1.4.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+inherit ruby-fakegem
+
+DESCRIPTION="Elegant Rails Engine Testing"
+HOMEPAGE="https://github.com/pat/combustion"
+SRC_URI="https://github.com/pat/combustion/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+
+ruby_add_rdepend "
+	>=dev-ruby/activesupport-3.0.0:*
+	>=dev-ruby/railties-3.0.0:*
+	>=dev-ruby/thor-0.14.6:*
+"
+# Needed for e.g. cannot load such file -- action_mailer/railtie
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/activemodel-3.0.0:*
+		>=dev-ruby/activerecord-3.0.0:*
+		dev-ruby/bundler
+		dev-ruby/net-smtp
+		>=dev-ruby/rails-3.0.0:*
+		dev-ruby/rspec:3
+		>=dev-ruby/sqlite3-1.4
+	)
+"
+
+each_ruby_prepare() {
+	sed -i \
+		-e '/rubocop/d' \
+		Gemfile || die
+
+	# appraisal, rubocop: useless for us test deps
+	# mysql2, pg,: optional runtime deps
+	sed -i \
+		-e '/appraisal/d' \
+		-e '/mysql2/d' \
+		-e '/pg/d' \
+		-e '/rubocop/d' \
+		${PN}.gemspec || die
+
+	sed -i -e '/rubocop/d' Rakefile || die
+}
+
+each_ruby_test() {
+	local -x DB_ADAPTER=sqlite3
+	${RUBY} -S bundle exec rake spec || die
+}
diff --git a/dev-ruby/commander/Manifest b/dev-ruby/commander/Manifest
index 23d645370cba..69223c5c4058 100644
--- a/dev-ruby/commander/Manifest
+++ b/dev-ruby/commander/Manifest
@@ -1,2 +1 @@
-DIST commander-4.5.2.gem 37888 BLAKE2B e78e009a414e432d24a820dea6e85c9240e3a661eb15a17d71c152616dfd32fb02eea1e513a487ae90b8dc81e6ebc208d0bf432c37dc5a116c03c9df12ed057f SHA512 22ea0a5c88d4ec03658ca8e0fe12801a5a5918bc09031400e1cde2883bf061b85feb6d77448b256bc21f5ddee00e4afb2c08b99132cd7862f00c7cad13588564
 DIST commander-4.6.0.gem 38400 BLAKE2B c4adf5b58fe679378012a893526cb00ee71c4cda5686d397ee93aeb11dcf1b32a4aa8c4e6b77c2ed07af75bf2492da65591cf49b2e05a658e753e78a9a12736a SHA512 01e7d4076b6ff632f6852e15bf995033034a71d6320c5b3b41751e86894f5eca35b408311e757c555334d220a9a811a0d60c0fc993414961f1050d948cb9f5c7
diff --git a/dev-ruby/commander/commander-4.5.2.ebuild b/dev-ruby/commander/commander-4.5.2.ebuild
deleted file mode 100644
index 0c5d1039651f..000000000000
--- a/dev-ruby/commander/commander-4.5.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The complete solution for Ruby command-line executables"
-HOMEPAGE="https://visionmedia.github.com/commander/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/highline:2"
-
-all_ruby_prepare() {
-	sed -i -e "/simplecov/,/end/ s:^:#:" spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/commander/commander-4.6.0.ebuild b/dev-ruby/commander/commander-4.6.0.ebuild
index 38630ac5c726..4259cba2fe47 100644
--- a/dev-ruby/commander/commander-4.6.0.ebuild
+++ b/dev-ruby/commander/commander-4.6.0.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_EXTRADOC="History.rdoc README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -10,7 +10,7 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 inherit ruby-fakegem
 
 DESCRIPTION="The complete solution for Ruby command-line executables"
-HOMEPAGE="https://visionmedia.github.com/commander/"
+HOMEPAGE="https://github.com/commander-rb/commander"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-ruby/commander/metadata.xml b/dev-ruby/commander/metadata.xml
index 658c72b1920d..ca849c2fa327 100644
--- a/dev-ruby/commander/metadata.xml
+++ b/dev-ruby/commander/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">commander-rb/commander</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/commonmarker/Manifest b/dev-ruby/commonmarker/Manifest
new file mode 100644
index 000000000000..2b086f25ba42
--- /dev/null
+++ b/dev-ruby/commonmarker/Manifest
@@ -0,0 +1 @@
+DIST commonmarker-0.23.10.tar.gz 172611 BLAKE2B df583a7e9f588cc726b985c90e03f7470d92d907d7507bf1a0f8c174e08a502036d2cdab6e45eb61c3c58dd810be1f682c51a787236da887a9d9f9ccf0fc13f6 SHA512 587cbf7037725bee57a61d75d83389ee209d943cc69ce32edf79fc292034a4bbede0a9f7cad7eff7a029f998572c6840a8d95d7387fb0806d79cf7351f85e5a1
diff --git a/dev-ruby/commonmarker/commonmarker-0.23.10.ebuild b/dev-ruby/commonmarker/commonmarker-0.23.10.ebuild
new file mode 100644
index 000000000000..169a2d13e2be
--- /dev/null
+++ b/dev-ruby/commonmarker/commonmarker-0.23.10.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/commonmarker/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/commonmarker"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="commonmarker.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast, safe, extensible parser for CommonMark, wrapping the libcmark library"
+HOMEPAGE="https://github.com/gjtorikian/commonmarker"
+SRC_URI="https://github.com/gjtorikian/commonmarker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+# app-text/cmark is bundled in a modified way and integrated with the gem code
+
+all_ruby_prepare() {
+	sed -i -e '/focus/ s:^:#:' test/test_helper.rb || die
+
+	# Avoid tests depending on unbundled cmark specification files
+	rm -f test/test_{spec,smartpunct}.rb || die
+
+}
+
+each_ruby_prepare() {
+	# Use current ruby version
+	sed -i -e '/make_bin/,/end/ s:ruby:'${RUBY}':' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=1 ${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/commonmarker/metadata.xml b/dev-ruby/commonmarker/metadata.xml
new file mode 100644
index 000000000000..67b2b482f495
--- /dev/null
+++ b/dev-ruby/commonmarker/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">gjtorikian/commonmarker</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/concurrent-ruby/Manifest b/dev-ruby/concurrent-ruby/Manifest
index 85cb41082024..cd5712cc14de 100644
--- a/dev-ruby/concurrent-ruby/Manifest
+++ b/dev-ruby/concurrent-ruby/Manifest
@@ -1,2 +1,3 @@
 DIST concurrent-ruby-1.1.10.tar.gz 6013684 BLAKE2B d271579a49ab52c9c41a7a0a31451775e1cba8ce19486b52a9eb3df7abbc66f7610d31284fc02747a8ee5f429983d8283b6fe92f22b911dcda5bc515da58b48f SHA512 cfb67ce806d1f2a5bae509806247bfefb05c56794741cedcaa7ab6ff708085e374d150e8f46ff8e04dcb0918fde8ab5a593c60550da9ff6dc00af116e123f064
-DIST concurrent-ruby-1.1.9.tar.gz 4923746 BLAKE2B 2bfea989db31f17c69ee479091135516e2aeef7ac74234ccea91b2e4b3626395683a7b2ebba1d13cb527903d3d83c51e873bdb859f0ff1983062fea4fa90a1e4 SHA512 243fc20795bcd7399bdf77a9b0db9b0bccb1b05edacf4fbc8f5515f59502300b4033a2a59bfb6adea9befdb20759c9f58bbf0e7744e934c85738085bef714ea6
+DIST concurrent-ruby-1.2.2.tar.gz 1161215 BLAKE2B 42f42022e469a1131d40e96a04dacb0ac49d94e96b6a8c58348d34402319ea0abff53b8b1312a274a34c332301ca17a007b685d8d9fe8c229350177abac0a285 SHA512 e2b26de147468b09403cd1727750922526ba240ad0cfe7889b722b357a3c71e709b12958cc4dad1a0d2d2c10d4dd2c67be1fe23053b98c35c7a50722fecb24b0
+DIST concurrent-ruby-1.2.3.tar.gz 1152422 BLAKE2B 72057ef4db1cc7dd0eb30122671e1c6106d1330215ded04040cbb92c10688866a643b0614bda21accbf8782470b03ea53c2b5b5e4e69a01cb73a2dac2b41d182 SHA512 6da7b3e13f7043f9fbb95b566e312584c479d7de5e34e29bfa90887ade143fca756dd40d7135dc923c41c468bc402e6fd06f33a075465ca6bde763affe50c751
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.10.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.10.ebuild
index 5f84dd6a038e..9a9ff3d060bc 100644
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.10.ebuild
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.7.4 )"
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.9.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.9.ebuild
deleted file mode 100644
index c08ce89abbe6..000000000000
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Modern concurrency tools including agents, futures, promises, thread pools, more"
-HOMEPAGE="https://github.com/ruby-concurrency/concurrent-ruby"
-SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.7.4 )"
-
-all_ruby_prepare() {
-	# Remove edge files as defined in support/file_map.rb
-	rm -rf spec/concurrent/{actor,cancellation,channel,edge,lazy_register,promises,throttle}* || die
-	rm -r spec/concurrent/executor/wrapping_executor_spec.rb || die
-	sed -i -e '/concurrent-edge/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's:lib-edge:lib/concurrent-ruby:' .rspec || die
-	sed -i -e 's:../../../::' spec/concurrent/executor/executor_quits.rb || die
-
-	# Remove specs for the ext gem
-	rm -rf spec/concurrent/atomic || die
-
-	sed -i 's/git ls-files/find . -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.2.2.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.2.2.ebuild
new file mode 100644
index 000000000000..fded7ddf7870
--- /dev/null
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.2.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Modern concurrency tools including agents, futures, promises, thread pools, more"
+HOMEPAGE="https://github.com/ruby-concurrency/concurrent-ruby"
+SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.9 )"
+
+all_ruby_prepare() {
+	# Remove edge files as defined in support/file_map.rb
+	rm -rf spec/concurrent/{actor,cancellation,channel,edge,lazy_register,processing,promises,throttle}* || die
+	rm -r spec/concurrent/executor/wrapping_executor_spec.rb || die
+	sed -i -e '/concurrent-edge/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e 's:lib-edge:lib/concurrent-ruby:' .rspec || die
+	sed -i -e 's:../../../::' spec/concurrent/executor/executor_quits.rb || die
+
+	# Remove specs for the ext gem
+	rm -rf spec/concurrent/atomic || die
+
+	sed -i 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.2.3.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.2.3.ebuild
new file mode 100644
index 000000000000..cc6cafba3b2e
--- /dev/null
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.2.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Modern concurrency tools including agents, futures, promises, thread pools, more"
+HOMEPAGE="https://github.com/ruby-concurrency/concurrent-ruby"
+SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.9 )"
+
+all_ruby_prepare() {
+	# Remove edge files as defined in support/file_map.rb
+	rm -rf spec/concurrent/{actor,cancellation,channel,edge,lazy_register,processing,promises,throttle}* || die
+	rm -r spec/concurrent/executor/wrapping_executor_spec.rb || die
+	sed -i -e '/concurrent-edge/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e 's:lib-edge:lib/concurrent-ruby:' .rspec || die
+	sed -i -e 's:../../../::' spec/concurrent/executor/executor_quits.rb || die
+
+	# Remove specs for the ext gem
+	rm -rf spec/concurrent/atomic || die
+
+	sed -i 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/connection_pool/Manifest b/dev-ruby/connection_pool/Manifest
index ace5885d27f3..b6511dbbfed6 100644
--- a/dev-ruby/connection_pool/Manifest
+++ b/dev-ruby/connection_pool/Manifest
@@ -1 +1 @@
-DIST connection_pool-2.2.5.gem 14848 BLAKE2B d3e21e5d3c330fb501e9890260c0fed003f3c8afc6a9106c139f77e879c45232de1cbc16be6088c757a1204f3c64b0797010fddc0d1c9cf555389348b6f61152 SHA512 3bc4e4d241cd4b1adb00d341aafe7795bbf0eff459ace962670d83c20c0eaa0d42f49a1f5e61c2327ff4fcbf3abfbc6f6c910f7a31d4a0f62bc55c782ab20e45
+DIST connection_pool-2.4.1.tar.gz 11425 BLAKE2B 17aae4f8ce0461554eaddb4ee3535062608d75a29219ca44b1535f087db39429ddbc591d996c020b1fa557337e75bb15b0ac218e8b9f393f94e32e70ffe76800 SHA512 4529446de89d01adee28127807fe104ada683866bc61b60ee77acb718881aced982aa1a1e6e2330077d79ed3d77af199e8612a6dc08de4c40468ac4e3623b799
diff --git a/dev-ruby/connection_pool/connection_pool-2.2.5.ebuild b/dev-ruby/connection_pool/connection_pool-2.2.5.ebuild
deleted file mode 100644
index 874f8711c51d..000000000000
--- a/dev-ruby/connection_pool/connection_pool-2.2.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rake"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changes.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Generic connection pooling for Ruby"
-HOMEPAGE="https://github.com/mperham/connection_pool"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5 )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' connection_pool.gemspec || die
-	sed -i -e '/\(bundler\|standard\)/ s:^:#:' Rakefile || die
-	sed -i -e "s/gem 'minitest'/gem 'minitest', '~> 5.0'/" test/helper.rb || die
-}
diff --git a/dev-ruby/connection_pool/connection_pool-2.4.1.ebuild b/dev-ruby/connection_pool/connection_pool-2.4.1.ebuild
new file mode 100644
index 000000000000..1afc72a959b8
--- /dev/null
+++ b/dev-ruby/connection_pool/connection_pool-2.4.1.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="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_GEMSPEC="connection_pool.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changes.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Generic connection pooling for Ruby"
+HOMEPAGE="https://github.com/mperham/connection_pool"
+SRC_URI="https://github.com/mperham/connection_pool/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5 )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' connection_pool.gemspec || die
+	sed -i -e '/\(bundler\|standard\)/ s:^:#:' Rakefile || die
+	sed -i -e "s/gem 'minitest'/gem 'minitest', '~> 5.0'/" test/helper.rb || die
+}
diff --git a/dev-ruby/console/Manifest b/dev-ruby/console/Manifest
new file mode 100644
index 000000000000..61f0fae88236
--- /dev/null
+++ b/dev-ruby/console/Manifest
@@ -0,0 +1,4 @@
+DIST console-1.23.2.tar.gz 27339 BLAKE2B 46d411a63934673bb956d9e898c00db08d16e0aec9d036f767d7dc078240934cc26695bada687a2cc7656d736d7d2622e3727470d6c864c19a85cbab586d2c9c SHA512 6dc0cc934e4f28fc196d9861676e8d4cf8f601d5ad779146b594f5847818b76620d434c9817a9944872371031d012eafe5a3b1ccb82807449584aa9c5af5282b
+DIST console-1.23.6.tar.gz 27883 BLAKE2B e70ddeb8625fb4b8f700f7e1b60295dcf2ddbd1b7cc666975aa883fccbd1cf8e3c2f177938c536e696e95bb8fa3153ce61f70710cbf5dfda6058ce085ec18792 SHA512 0ae48383dedb176bdff5ead3db97a228cee498e5f6a6938e4d9882b3c363ea8b9286bb7089806f664df635d98039c9dca52c8d8afece505d38b12af5ee3aa41c
+DIST console-1.23.7.tar.gz 27888 BLAKE2B bfbf447497b91d33248e5a502c6f4522467de3f49c4eb8f51c48f93b17fe12a15ba4352df4f5a3d9f6567fcad1edef05527aa288ef00175acc1868291e215416 SHA512 3057e8f29c8c9d8b6dd37cbf8d8daaea8d00429a623ca92161a2294feeae10f7d83cc418e008de258f84a53ee1464f091f5e7405ac347a2785f3b36d7924966f
+DIST console-1.24.0.tar.gz 28031 BLAKE2B 14126657e454739981e110c8df2ec68116ec1552a90f7c8f25032ca5901451721b69f52e6d3688c2c678a58f9414cc0f824081b8fc3a3bdc74d603e4f8c1f0d6 SHA512 4374276673b3a76f56350cd27e29a7af8158e5b53ed4c073502a84299d3d69ed395fa238999a271bb782a2292393c0cf39e64b5e6adb52abaa7c87d4e3b7097a
diff --git a/dev-ruby/console/console-1.23.2.ebuild b/dev-ruby/console/console-1.23.2.ebuild
new file mode 100644
index 000000000000..29382fc44e24
--- /dev/null
+++ b/dev-ruby/console/console-1.23.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Beautiful logging for Ruby"
+HOMEPAGE="https://github.com/socketry/console"
+SRC_URI="https://github.com/socketry/console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/fiber-annotation
+	dev-ruby/fiber-local
+"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid dependency on covered.
+	rm -f config/sus.rb || die
+
+	# Avoid sandbox violation during tests
+	sed -i -e 's:/tmp/:'"${TMPDIR}"'/:' test/console/output.rb || die
+}
diff --git a/dev-ruby/console/console-1.23.6.ebuild b/dev-ruby/console/console-1.23.6.ebuild
new file mode 100644
index 000000000000..3ddf1603f2f0
--- /dev/null
+++ b/dev-ruby/console/console-1.23.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Beautiful logging for Ruby"
+HOMEPAGE="https://github.com/socketry/console"
+SRC_URI="https://github.com/socketry/console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+ruby_add_rdepend "
+	dev-ruby/fiber-annotation
+	dev-ruby/fiber-local
+	dev-ruby/json
+"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid dependency on covered.
+	rm -f config/sus.rb || die
+
+	# Avoid sandbox violation during tests
+	sed -i -e 's:/tmp/:'"${TMPDIR}"'/:' test/console/output.rb || die
+}
diff --git a/dev-ruby/console/console-1.23.7.ebuild b/dev-ruby/console/console-1.23.7.ebuild
new file mode 100644
index 000000000000..3ddf1603f2f0
--- /dev/null
+++ b/dev-ruby/console/console-1.23.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Beautiful logging for Ruby"
+HOMEPAGE="https://github.com/socketry/console"
+SRC_URI="https://github.com/socketry/console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+ruby_add_rdepend "
+	dev-ruby/fiber-annotation
+	dev-ruby/fiber-local
+	dev-ruby/json
+"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid dependency on covered.
+	rm -f config/sus.rb || die
+
+	# Avoid sandbox violation during tests
+	sed -i -e 's:/tmp/:'"${TMPDIR}"'/:' test/console/output.rb || die
+}
diff --git a/dev-ruby/console/console-1.24.0.ebuild b/dev-ruby/console/console-1.24.0.ebuild
new file mode 100644
index 000000000000..3ddf1603f2f0
--- /dev/null
+++ b/dev-ruby/console/console-1.24.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Beautiful logging for Ruby"
+HOMEPAGE="https://github.com/socketry/console"
+SRC_URI="https://github.com/socketry/console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+ruby_add_rdepend "
+	dev-ruby/fiber-annotation
+	dev-ruby/fiber-local
+	dev-ruby/json
+"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid dependency on covered.
+	rm -f config/sus.rb || die
+
+	# Avoid sandbox violation during tests
+	sed -i -e 's:/tmp/:'"${TMPDIR}"'/:' test/console/output.rb || die
+}
diff --git a/dev-ruby/console/metadata.xml b/dev-ruby/console/metadata.xml
new file mode 100644
index 000000000000..eaf87044f48c
--- /dev/null
+++ b/dev-ruby/console/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">socketry/console</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/contracts/Manifest b/dev-ruby/contracts/Manifest
index 4a9eaebed34e..a36249134c2a 100644
--- a/dev-ruby/contracts/Manifest
+++ b/dev-ruby/contracts/Manifest
@@ -1,2 +1 @@
-DIST contracts-0.16.1.gem 57856 BLAKE2B 72978a2a47b75411d2ae74521470d5958ef711351e2ce6776f1331b0d3f4b175d43f991a73fd2332ac0e1f6732b05a65887054a0be4452fd62f058a28ba929be SHA512 bc182431de9efbc6d23603c68a64eddcd3f27ea1ac8c2c9ff00840cf38d2f58ba595304127e6b43e504d3aa387559a5c1429b671dadac175d3a4ad2c02edbf6a
 DIST contracts-0.17.gem 58368 BLAKE2B 2bccd3a552268821b3c34a08fef3d6c0e43e27f8a0e56a2b7b0291d388142a2efb3686230d4daaea6e82c45be8d42f2ab61d1aa3d6a7f682bd7d99a0af7f179d SHA512 bce1417e7b505ec35b43917d53cbdb175995ff877da2a6122e08b3c7e537d557785987a0110006525dd079f09d574be3f5f4793154f99ac91c32f83662fa311b
diff --git a/dev-ruby/contracts/contracts-0.16.1.ebuild b/dev-ruby/contracts/contracts-0.16.1.ebuild
deleted file mode 100644
index 3be3ff966b31..000000000000
--- a/dev-ruby/contracts/contracts-0.16.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.md TODO.markdown TUTORIAL.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="provides contracts for Ruby"
-HOMEPAGE="https://github.com/egonSchiele/contracts.ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
diff --git a/dev-ruby/contracts/contracts-0.17-r1.ebuild b/dev-ruby/contracts/contracts-0.17-r1.ebuild
new file mode 100644
index 000000000000..733a91667d82
--- /dev/null
+++ b/dev-ruby/contracts/contracts-0.17-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.md TODO.markdown TUTORIAL.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="provides contracts for Ruby"
+HOMEPAGE="https://github.com/egonSchiele/contracts.ruby"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ruby32.patch
+)
+
+each_ruby_test() {
+	# COLUMNS needed for:
+	# ./spec/contracts_spec.rb:654 # Contracts: Contracts to_s formatting in expected should wrap and pretty print for long return contracts
+	# ./spec/contracts_spec.rb:643 # Contracts: Contracts to_s formatting in expected should wrap and pretty print for long param contracts
+	local -x COLUMNS=80
+	each_fakegem_test
+}
diff --git a/dev-ruby/contracts/contracts-0.17.ebuild b/dev-ruby/contracts/contracts-0.17.ebuild
deleted file mode 100644
index 66484ff56a9d..000000000000
--- a/dev-ruby/contracts/contracts-0.17.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.md TODO.markdown TUTORIAL.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="provides contracts for Ruby"
-HOMEPAGE="https://github.com/egonSchiele/contracts.ruby"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
diff --git a/dev-ruby/contracts/files/contracts-0.17-ruby32.patch b/dev-ruby/contracts/files/contracts-0.17-ruby32.patch
new file mode 100644
index 000000000000..0f28e763ddac
--- /dev/null
+++ b/dev-ruby/contracts/files/contracts-0.17-ruby32.patch
@@ -0,0 +1,120 @@
+https://github.com/egonSchiele/contracts.ruby/issues/300
+https://github.com/egonSchiele/contracts.ruby/commit/88fd1d841615e59c873d7da64d050d3a251634dd
+
+From 88fd1d841615e59c873d7da64d050d3a251634dd Mon Sep 17 00:00:00 2001
+From: PikachuEXE <pikachuexe@gmail.com>
+Date: Wed, 5 Oct 2022 10:27:41 +0800
+Subject: [PATCH] * Update all references to Fixnum to Integer
+
+Deprecated in ruby 2.4
+--- a/lib/contracts/builtin_contracts.rb
++++ b/lib/contracts/builtin_contracts.rb
+@@ -95,7 +95,7 @@ def self.[](*vals)
+ 
+     # Takes a variable number of contracts.
+     # The contract passes if any of the contracts pass.
+-    # Example: <tt>Or[Fixnum, Float]</tt>
++    # Example: <tt>Or[Integer, Float]</tt>
+     class Or < CallableClass
+       def initialize(*vals)
+         super()
+@@ -120,7 +120,7 @@ def to_s
+ 
+     # Takes a variable number of contracts.
+     # The contract passes if exactly one of those contracts pass.
+-    # Example: <tt>Xor[Fixnum, Float]</tt>
++    # Example: <tt>Xor[Integer, Float]</tt>
+     class Xor < CallableClass
+       def initialize(*vals)
+         super()
+@@ -146,7 +146,7 @@ def to_s
+ 
+     # Takes a variable number of contracts.
+     # The contract passes if all contracts pass.
+-    # Example: <tt>And[Fixnum, Float]</tt>
++    # Example: <tt>And[Integer, Float]</tt>
+     class And < CallableClass
+       def initialize(*vals)
+         super()
+--- a/spec/builtin_contracts_spec.rb
++++ b/spec/builtin_contracts_spec.rb
+@@ -30,7 +30,7 @@ def passes(&some)
+   end
+ 
+   describe "Num:" do
+-    it "should pass for Fixnums" do
++    it "should pass for Integers" do
+       passes { @o.double(2) }
+     end
+ 
+--- a/spec/fixtures/fixtures.rb
++++ b/spec/fixtures/fixtures.rb
+@@ -100,11 +100,11 @@ def sum_three(vals)
+     end
+   end
+ 
+-  Contract ({ :name => String, :age => Fixnum }) => nil
++  Contract ({ :name => String, :age => Integer }) => nil
+   def person(data)
+   end
+ 
+-  Contract C::StrictHash[{ :name => String, :age => Fixnum }] => nil
++  Contract C::StrictHash[{ :name => String, :age => Integer }] => nil
+   def strict_person(data)
+   end
+ 
+@@ -119,7 +119,7 @@ def hash_complex_contracts(data)
+   def nested_hash_complex_contracts(data)
+   end
+ 
+-  Contract C::KeywordArgs[:name => String, :age => Fixnum] => nil
++  Contract C::KeywordArgs[:name => String, :age => Integer] => nil
+   def person_keywordargs(name: "name", age: 10)
+   end
+ 
+@@ -529,30 +529,30 @@ def initialize(day, month)
+     @month = month
+   end
+ 
+-  Contract C::None => Fixnum
++  Contract C::None => Integer
+   def silly_next_day!
+     self.day += 1
+   end
+ 
+-  Contract C::None => Fixnum
++  Contract C::None => Integer
+   def silly_next_month!
+     self.month += 1
+   end
+ 
+-  Contract C::None => Fixnum
++  Contract C::None => Integer
+   def clever_next_day!
+     return clever_next_month! if day == 31
+     self.day += 1
+   end
+ 
+-  Contract C::None => Fixnum
++  Contract C::None => Integer
+   def clever_next_month!
+     return next_year! if month == 12
+     self.month += 1
+     self.day = 1
+   end
+ 
+-  Contract C::None => Fixnum
++  Contract C::None => Integer
+   def next_year!
+     self.month = 1
+     self.day = 1
+@@ -610,7 +610,7 @@ def on_response(status, body)
+       body + "!"
+     end
+ 
+-    Contract Fixnum, String => String
++    Contract Integer, String => String
+     def on_response(status, body)
+       "error #{status}: #{body}"
+     end
+
diff --git a/dev-ruby/coolio/Manifest b/dev-ruby/coolio/Manifest
index b22bb8e144ac..ae5012dada98 100644
--- a/dev-ruby/coolio/Manifest
+++ b/dev-ruby/coolio/Manifest
@@ -1 +1,2 @@
 DIST cool.io-1.7.1.gem 112640 BLAKE2B 107d7541180de46c78542eab4b131220c4ae4a10210c7ff870f54eb24178b364fcac1abc4b93f8d0eccea197fb746cede95416aea8f3d5cc458626b1fa9a02f4 SHA512 9ab3e6ddd1689b2825f9bd82714b4ef5ac921dc4b2f84786971c3ec448577613cee73084c99090382878b0da43c9228cb2fd3a8627dc8f62ceeeff274dbdc929
+DIST cool.io-1.8.0.gem 113152 BLAKE2B 358fc0296636adb793a38a5763a964f6109a7884bba62f98d3ef92cd9a1a8ee038e3f2866a5f2bfad13a78519cd4299c4543a9382bc65bca59d4374102a09272 SHA512 e847bafbc157d05f1d48b262856a68d80b183a9eed29d6d454df4fbe7fabc427e6e83c873a0f36f2f8cc06bebac22cc1993f344943e43faaf556a8b235666026
diff --git a/dev-ruby/coolio/coolio-1.7.1-r1.ebuild b/dev-ruby/coolio/coolio-1.7.1-r1.ebuild
index 717ae48c1ac0..030b833390e9 100644
--- a/dev-ruby/coolio/coolio-1.7.1-r1.ebuild
+++ b/dev-ruby/coolio/coolio-1.7.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_GEMSPEC="cool.io.gemspec"
 
 RUBY_FAKEGEM_EXTENSIONS=(ext/cool.io/extconf.rb ext/iobuffer/extconf.rb)
 
-inherit ruby-fakegem
+inherit flag-o-matic ruby-fakegem
 
 DESCRIPTION="A high performance event framework for Ruby which uses the libev C library"
 HOMEPAGE="https://coolio.github.io/"
@@ -26,6 +26,10 @@ IUSE=""
 # cool.io includes a bundled version of libev that is patched to work correctly with ruby.
 
 all_ruby_prepare() {
+	# See bug #855869 and its large number of dupes in bundled libev copies.
+	filter-lto
+	append-flags -fno-strict-aliasing
+
 	rm -r Gemfile* lib/.gitignore || die
 
 	sed -i -e '/[Bb]undler/d' Rakefile || die
diff --git a/dev-ruby/coolio/coolio-1.7.1-r2.ebuild b/dev-ruby/coolio/coolio-1.7.1-r2.ebuild
new file mode 100644
index 000000000000..1dda791d8c93
--- /dev/null
+++ b/dev-ruby/coolio/coolio-1.7.1-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+RUBY_FAKEGEM_NAME="cool.io"
+
+RUBY_FAKEGEM_GEMSPEC="cool.io.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/cool.io/extconf.rb ext/iobuffer/extconf.rb)
+
+inherit flag-o-matic ruby-fakegem
+
+DESCRIPTION="A high performance event framework for Ruby which uses the libev C library"
+HOMEPAGE="https://coolio.github.io/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.1-fix-build-clang16.patch
+)
+
+# cool.io includes a bundled version of libev that is patched to work correctly with ruby.
+
+all_ruby_prepare() {
+	# See bug #855869 and its large number of dupes in bundled libev copies.
+	filter-lto
+	append-flags -fno-strict-aliasing
+
+	rm -r Gemfile* lib/.gitignore || die
+
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '28i  s.add_dependency "iobuffer"' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on rake-compiler
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^end/ s:^:#:' Rakefile || die
+
+	# Remove specs that require network connectivity
+	rm -f spec/dns_spec.rb || die
+
+	# Use one address consistently
+	sed -i -e 's/localhost/127.0.0.1/' spec/{udp_socket,tcp_server,iobuffer}_spec.rb || die
+}
diff --git a/dev-ruby/coolio/coolio-1.8.0.ebuild b/dev-ruby/coolio/coolio-1.8.0.ebuild
new file mode 100644
index 000000000000..d521e9ab6350
--- /dev/null
+++ b/dev-ruby/coolio/coolio-1.8.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+RUBY_FAKEGEM_NAME="cool.io"
+
+RUBY_FAKEGEM_GEMSPEC="cool.io.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/cool.io/extconf.rb ext/iobuffer/extconf.rb)
+
+inherit flag-o-matic ruby-fakegem
+
+DESCRIPTION="A high performance event framework for Ruby which uses the libev C library"
+HOMEPAGE="https://coolio.github.io/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# cool.io includes a bundled version of libev that is patched to work correctly with ruby.
+
+all_ruby_prepare() {
+	# See bug #855869 and its large number of dupes in bundled libev copies.
+	filter-lto
+	append-flags -fno-strict-aliasing
+
+	rm -r Gemfile* lib/.gitignore || die
+
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '28i  s.add_dependency "iobuffer"' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on rake-compiler
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^end/ s:^:#:' Rakefile || die
+
+	# Remove specs that require network connectivity
+	rm -f spec/dns_spec.rb || die
+
+	# Use one address consistently
+	sed -i -e 's/localhost/127.0.0.1/' spec/{udp_socket,tcp_server,iobuffer}_spec.rb || die
+}
diff --git a/dev-ruby/coolio/files/coolio-1.7.1-fix-build-clang16.patch b/dev-ruby/coolio/files/coolio-1.7.1-fix-build-clang16.patch
new file mode 100644
index 000000000000..909988fda7c3
--- /dev/null
+++ b/dev-ruby/coolio/files/coolio-1.7.1-fix-build-clang16.patch
@@ -0,0 +1,13 @@
+Bug: https://bugs.gentoo.org/883147
+Upstream PR: https://github.com/tarcieri/cool.io/pull/78
+--- a/ext/libev/ev.c
++++ b/ext/libev/ev.c
+@@ -3768,7 +3768,7 @@ rb_thread_unsafe_dangerous_crazy_blocking_region_end(...);
+ #if defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+         poll_args.loop = loop;
+         poll_args.waittime = waittime;
+-        rb_thread_call_without_gvl(ev_backend_poll, (void *)&poll_args, RUBY_UBF_IO, 0);
++        rb_thread_call_without_gvl((void *)ev_backend_poll, (void *)&poll_args, RUBY_UBF_IO, 0);
+ #else
+          backend_poll (EV_A_ waittime);
+ #endif
diff --git a/dev-ruby/coolio/metadata.xml b/dev-ruby/coolio/metadata.xml
index 658c72b1920d..b484ee35ee3a 100644
--- a/dev-ruby/coolio/metadata.xml
+++ b/dev-ruby/coolio/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">tarcieri/cool.io</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/countdownlatch/countdownlatch-1.0.0-r2.ebuild b/dev-ruby/countdownlatch/countdownlatch-1.0.0-r2.ebuild
index 8e91f5622a34..bf893e311197 100644
--- a/dev-ruby/countdownlatch/countdownlatch-1.0.0-r2.ebuild
+++ b/dev-ruby/countdownlatch/countdownlatch-1.0.0-r2.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/crack/Manifest b/dev-ruby/crack/Manifest
index 18047808bdc6..6a61d977ce28 100644
--- a/dev-ruby/crack/Manifest
+++ b/dev-ruby/crack/Manifest
@@ -1 +1,3 @@
 DIST crack-0.4.4.tar.gz 586633 BLAKE2B 26e2cda6e9447fb3c9fe02092a6e9d6a8097c7bca6a483a3af42aa8ba491b737bc0dc3ae1936ef8ffb5c5d5cbbed3fde69c9641f05b9e3eb3beab87c375f68fd SHA512 3f86c76718a3c2a65ee11b15434035396c2355a8562bdb642432a659b52c3e811e930318e0dc2df3ff06bd53ac14d0694471e425420ae3b7971f5d4f818bba87
+DIST crack-0.4.6.tar.gz 587341 BLAKE2B eafe4e3682cfbcfd2369c66cc47e7eab8557cce568f401599a6a72efac361be5b16f47ee7eb2916ada111b10c7ee6aa0dfa8cbb4988eb822304d22f3b8a51a6f SHA512 b004d4fc69319f4d05a79e34c04fe7d46bb78dc516d1481e09b07b9b0835e50925c5a1a89ee17070eceaf29ac1c371b6a590319b02b0d22b85c6ab26ee979d23
+DIST crack-1.0.0.tar.gz 587402 BLAKE2B 265948336f3a0567d08766ddd179502e9dac0b0ef647a636d74b2bf7b6d8a2bb08385df566f118151cf4b72c700d17c3f69bfe8d61dc7035102319c2513190c1 SHA512 01f2231033a64aa3a107de3c0185559800be32c679671835962bd4e8f74cb644b9cb1e4895880ab03bc15e82aac465875d1ce187b977be65f514282718b7837c
diff --git a/dev-ruby/crack/crack-0.4.4-r3.ebuild b/dev-ruby/crack/crack-0.4.4-r3.ebuild
new file mode 100644
index 000000000000..796ae92713f6
--- /dev/null
+++ b/dev-ruby/crack/crack-0.4.4-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md History"
+
+RUBY_FAKEGEM_GEMSPEC="crack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Really simple JSON and XML parsing, ripped from Merb and Rails"
+HOMEPAGE="https://github.com/jnunemaker/crack"
+SRC_URI="https://github.com/jnunemaker/crack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-psych4.patch" )
+
+ruby_add_rdepend "dev-ruby/rexml"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Also list rexml in the gemspec. This is fixed upstream in 0.4.5 but that version is not tagged.
+	sed -i -e '17igem.add_runtime_dependency("rexml")' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+	# Remove tests which fail when run by portage but pass when run by hand
+	sed -i -e '/{"regex": \/foo.*\/}/d' test/json_test.rb || die
+	sed -i -e '/{"regex": \/foo.*\/i}/d' test/json_test.rb || die
+	sed -i -e '/{"regex": \/foo.*\/mix}/d' test/json_test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Itest -Ilib -e 'Dir["test/*_test.rb"].each { |f| load f }' || die
+}
diff --git a/dev-ruby/crack/crack-0.4.4.ebuild b/dev-ruby/crack/crack-0.4.4.ebuild
deleted file mode 100644
index fc9731fd8cc5..000000000000
--- a/dev-ruby/crack/crack-0.4.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md History"
-
-RUBY_FAKEGEM_GEMSPEC="crack.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Really simple JSON and XML parsing, ripped from Merb and Rails"
-HOMEPAGE="https://github.com/jnunemaker/crack"
-SRC_URI="https://github.com/jnunemaker/crack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-each_ruby_prepare() {
-	# Remove tests which fail when run by portage but pass when run by hand
-	sed -i -e '/{"regex": \/foo.*\/}/d' test/json_test.rb || die
-	sed -i -e '/{"regex": \/foo.*\/i}/d' test/json_test.rb || die
-	sed -i -e '/{"regex": \/foo.*\/mix}/d' test/json_test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Itest -Ilib -e 'Dir["test/*_test.rb"].each { |f| load f }' || die
-}
diff --git a/dev-ruby/crack/crack-0.4.6.ebuild b/dev-ruby/crack/crack-0.4.6.ebuild
new file mode 100644
index 000000000000..8922e4131839
--- /dev/null
+++ b/dev-ruby/crack/crack-0.4.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md History"
+
+RUBY_FAKEGEM_GEMSPEC="crack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Really simple JSON and XML parsing, ripped from Merb and Rails"
+HOMEPAGE="https://github.com/jnunemaker/crack"
+SRC_URI="https://github.com/jnunemaker/crack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/bigdecimal dev-ruby/rexml"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Also list rexml in the gemspec. This is fixed upstream in 0.4.5 but that version is not tagged.
+	sed -i -e '17igem.add_runtime_dependency("rexml")' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+	# Remove tests which fail when run by portage but pass when run by hand
+	sed -i -e '/{"regex": \/foo.*\/}/d' test/json_test.rb || die
+	sed -i -e '/{"regex": \/foo.*\/i}/d' test/json_test.rb || die
+	sed -i -e '/{"regex": \/foo.*\/mix}/d' test/json_test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Itest -Ilib -e 'Dir["test/*_test.rb"].each { |f| load f }' || die
+}
diff --git a/dev-ruby/crack/crack-1.0.0.ebuild b/dev-ruby/crack/crack-1.0.0.ebuild
new file mode 100644
index 000000000000..55be284cf774
--- /dev/null
+++ b/dev-ruby/crack/crack-1.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md History"
+
+RUBY_FAKEGEM_GEMSPEC="crack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Really simple JSON and XML parsing, ripped from Merb and Rails"
+HOMEPAGE="https://github.com/jnunemaker/crack"
+SRC_URI="https://github.com/jnunemaker/crack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/bigdecimal dev-ruby/rexml"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Itest -Ilib -e 'Dir["test/*_test.rb"].each { |f| load f }' || die
+}
diff --git a/dev-ruby/crack/files/crack-0.4.4-psych4.patch b/dev-ruby/crack/files/crack-0.4.4-psych4.patch
new file mode 100644
index 000000000000..4c4e96661ba9
--- /dev/null
+++ b/dev-ruby/crack/files/crack-0.4.4-psych4.patch
@@ -0,0 +1,30 @@
+From 7fa8d8aea4a041969e433debef7f4d5d59881ae2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Fri, 11 Mar 2022 18:29:43 +0100
+Subject: [PATCH] Use named parameters for `safe_load`.
+
+This is available since Psych 3.1 [[1], [2]], but mandatory since Psych
+4.0 [[3]].
+
+Fixes #72
+
+[1]: https://github.com/ruby/psych/pull/358
+[2]: https://github.com/ruby/psych/pull/378
+[3]: https://github.com/ruby/psych/commit/0767227051dbddf1f949eef512c174deabf22891
+---
+ lib/crack/json.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/crack/json.rb b/lib/crack/json.rb
+index 1a27ac7..528aad6 100644
+--- a/lib/crack/json.rb
++++ b/lib/crack/json.rb
+@@ -13,7 +13,7 @@ def self.parser_exceptions
+ 
+     def self.parse(json)
+       yaml = unescape(convert_json_to_yaml(json))
+-      YAML.safe_load(yaml, [Regexp, Date, Time])
++      YAML.safe_load(yaml, permitted_classes: [Regexp, Date, Time])
+     rescue *parser_exceptions
+       raise ParseError, "Invalid JSON string"
+     rescue Psych::DisallowedClass
diff --git a/dev-ruby/crass/crass-1.0.6-r1.ebuild b/dev-ruby/crass/crass-1.0.6-r1.ebuild
index ff15460fdf3f..75d1043a002f 100644
--- a/dev-ruby/crass/crass-1.0.6-r1.ebuild
+++ b/dev-ruby/crass/crass-1.0.6-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
 
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rgrove/crass/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_bdepend ">=dev-ruby/minitest-5.0.8:5"
@@ -25,4 +25,7 @@ ruby_add_bdepend ">=dev-ruby/minitest-5.0.8:5"
 all_ruby_prepare() {
 	sed -i -e '/bundler/I s:^:#:' Rakefile || die
 	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Fix minitest deprecation
+	sed -i -e 's/MiniTest/Minitest/' test/support/common.rb || die
 }
diff --git a/dev-ruby/crass/crass-1.0.6.ebuild b/dev-ruby/crass/crass-1.0.6.ebuild
deleted file mode 100644
index e1934d3b4556..000000000000
--- a/dev-ruby/crass/crass-1.0.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="crass.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby CSS parser that's fully compliant with the CSS Syntax Level 3 specification"
-HOMEPAGE="https://github.com/rgrove/crass/"
-SRC_URI="https://github.com/rgrove/crass/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend ">=dev-ruby/minitest-5.0.8:5"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/creole/creole-0.5.0-r1.ebuild b/dev-ruby/creole/creole-0.5.0-r1.ebuild
deleted file mode 100644
index 481e13dfef48..000000000000
--- a/dev-ruby/creole/creole-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rake"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.creole"
-
-RUBY_FAKEGEM_GEMSPEC="creole.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Creole-to-HTML converter for Creole, the lightweight markup language"
-HOMEPAGE="https://github.com/minad/creole"
-SRC_URI="https://github.com/minad/creole/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bacon )"
-
-all_ruby_prepare() {
-	sed -e 's/git ls-files --/echo/' \
-		-e 's/git ls-files/find -print/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/creole/creole-0.5.0-r2.ebuild b/dev-ruby/creole/creole-0.5.0-r2.ebuild
new file mode 100644
index 000000000000..8b68666feb69
--- /dev/null
+++ b/dev-ruby/creole/creole-0.5.0-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.creole"
+
+RUBY_FAKEGEM_GEMSPEC="creole.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Creole-to-HTML converter for Creole, the lightweight markup language"
+HOMEPAGE="https://github.com/minad/creole"
+SRC_URI="https://github.com/minad/creole/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bacon )"
+
+all_ruby_prepare() {
+	sed -e 's/git ls-files --/echo/' \
+		-e 's/git ls-files/find -print/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/cri/cri-2.15.11-r1.ebuild b/dev-ruby/cri/cri-2.15.11-r1.ebuild
index ff5e36669cb0..705226a55570 100644
--- a/dev-ruby/cri/cri-2.15.11-r1.ebuild
+++ b/dev-ruby/cri/cri-2.15.11-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
@@ -25,6 +25,9 @@ all_ruby_prepare() {
 	sed -e '/coveralls/I s:^:#:' -i test/helper.rb || die
 	sed -i -e '/rubocop/ s:^:#:' \
 		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
+
+	sed -e 's/MiniTest::Unit::TestCase/Minitest::Test/' \
+		-i test/helper.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/cri/cri-2.15.11.ebuild b/dev-ruby/cri/cri-2.15.11.ebuild
deleted file mode 100644
index 30eead91442a..000000000000
--- a/dev-ruby/cri/cri-2.15.11.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cri is a library for building easy-to-use commandline tools"
-HOMEPAGE="https://rubygems.org/gems/cri"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/yard dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -e '/coveralls/I s:^:#:' -i test/helper.rb || die
-	sed -i -e '/rubocop/ s:^:#:' \
-		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S rake test_unit || die
-}
diff --git a/dev-ruby/css_parser/Manifest b/dev-ruby/css_parser/Manifest
index f2995e901e08..01817cec391d 100644
--- a/dev-ruby/css_parser/Manifest
+++ b/dev-ruby/css_parser/Manifest
@@ -1,3 +1,3 @@
-DIST css_parser-1.10.0.tar.gz 38843 BLAKE2B 8b611a270791e0f1e0b69d4ab0df3c119fc3f2631a7bcebab1030939e61d2799acfce0ca9f9b634d813c47c13a6c698f9449918fab1cdfb5aa4b14674b749c3f SHA512 979855df651ab56da5736f6646f4b4f0be5718899c4f81ae514299566e874d2f7b414d87616e5fba7390730bba1f20966e01641a47dc2cbb3e20fd7536f38580
-DIST css_parser-1.11.0.tar.gz 38987 BLAKE2B e3420b635a7604dee4ca4c5f434dc3a8f3caf27310fb8d1a947e8d6aedb47e1130846afbe989f9d2c9c52b1db9e1266849fec09253c243a1f28a3bcb6ea58785 SHA512 9dfc1aff7f05dca82a10504c6e1c42011385e17db5f43faa5c83a2c2226b2f7a524fc626c6f7ce69e49d1919a6fc12baed35823d0da07940d41804bd1590ba50
-DIST css_parser-1.9.0.tar.gz 38201 BLAKE2B 6d2042429f7347613b14649e7c205e88a26dec9759a1634a3805e79e3f8599ab6b1ab2c4283dee631476e16580f447c08cd41327a62c813eb006a7e435787f9e SHA512 79ff06b471298f2fe82b096703c828122f1ae778b71fcac3f2eea1e243145729d3871c21eb1714777a2648ba91d05b9b973691b5ff41b2361eecb4170d3a2601
+DIST css_parser-1.16.0.tar.gz 39719 BLAKE2B 19c6e741bdfac308ea2b2edc557fbbe79580cb44f7a8e8538a3fbb55dcc02a76a56ec151d26ee2af887624fbe348a29c1acfbca30f17e0f2c73850ed7d3808af SHA512 d21f07da73ec3d164f766a392d88053fb156eb15645c4dbf3e4b70b73fdfad6c0b715368d9b000e668cf40dc338611be946064d586f4efcf7e13f261df74b6fa
+DIST css_parser-1.17.0.tar.gz 39746 BLAKE2B c94f0b03d3e5e54ff390f83bc87c2bc9cd1aa0426898361d3f61fc36263fbb19251cccf346767e8d844b49471186051ffcadb3b87ad3092aa403ef02764a5e5a SHA512 9097b13c578727a7ab918be9b54f846d3f85bb666a54416f54bf509efebfbaf64dd22ec827adef61ba2fd8b46abc81cc302ba3bba35e7d87dee181d21f4cf578
+DIST css_parser-1.17.1.tar.gz 39809 BLAKE2B c8d0a05d4264432a6614cf834aeef7685710d50f44b99c2989a0e431b6894b8c1ac7ddc4f9617632f3da4a0d479acb02ef4bdb1b0ede6f098cdfbeb37c0db624 SHA512 bc22ff1be8daf72b76f611c5be27ee52a197b8e7810c61321ae7e994db771dec01b5c4725b656119d3b610214bc06d08e79bbacc1d2c4294d8ad2cd915edb2fb
diff --git a/dev-ruby/css_parser/css_parser-1.10.0.ebuild b/dev-ruby/css_parser/css_parser-1.10.0.ebuild
deleted file mode 100644
index e2ae1feb1af3..000000000000
--- a/dev-ruby/css_parser/css_parser-1.10.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_DOC_DIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md "
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="premailer"
-GITHUB_PROJECT="${PN}"
-inherit ruby-fakegem
-
-DESCRIPTION="Sass-based Stylesheet Framework"
-HOMEPAGE="https://github.com/premailer/css_parser/"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/addressable
-	virtual/ruby-ssl"
-
-ruby_add_bdepend "test? ( dev-ruby/maxitest )"
-
-all_ruby_prepare() {
-	# get rid of bundler usage
-	rm Gemfile || die
-	sed -i -e '/bundler/d' -e '/bump/d' Rakefile || die
-	sed -i -e '/bundler/d' test/test_helper.rb || die
-	# Avoid tests using the network.
-	sed -i -e '/test_loading_a_remote_file_over_ssl/,/end/ s:^:#:' test/test_css_parser_loading.rb || die
-
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/*.rb || die
-}
diff --git a/dev-ruby/css_parser/css_parser-1.11.0.ebuild b/dev-ruby/css_parser/css_parser-1.11.0.ebuild
deleted file mode 100644
index e2ae1feb1af3..000000000000
--- a/dev-ruby/css_parser/css_parser-1.11.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_DOC_DIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md "
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="premailer"
-GITHUB_PROJECT="${PN}"
-inherit ruby-fakegem
-
-DESCRIPTION="Sass-based Stylesheet Framework"
-HOMEPAGE="https://github.com/premailer/css_parser/"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/addressable
-	virtual/ruby-ssl"
-
-ruby_add_bdepend "test? ( dev-ruby/maxitest )"
-
-all_ruby_prepare() {
-	# get rid of bundler usage
-	rm Gemfile || die
-	sed -i -e '/bundler/d' -e '/bump/d' Rakefile || die
-	sed -i -e '/bundler/d' test/test_helper.rb || die
-	# Avoid tests using the network.
-	sed -i -e '/test_loading_a_remote_file_over_ssl/,/end/ s:^:#:' test/test_css_parser_loading.rb || die
-
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/*.rb || die
-}
diff --git a/dev-ruby/css_parser/css_parser-1.16.0.ebuild b/dev-ruby/css_parser/css_parser-1.16.0.ebuild
new file mode 100644
index 000000000000..220acb7872bb
--- /dev/null
+++ b/dev-ruby/css_parser/css_parser-1.16.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOC_DIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md "
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+GITHUB_USER="premailer"
+GITHUB_PROJECT="${PN}"
+inherit ruby-fakegem
+
+DESCRIPTION="Sass-based Stylesheet Framework"
+HOMEPAGE="https://github.com/premailer/css_parser/"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc test"
+
+ruby_add_rdepend "dev-ruby/addressable
+	virtual/ruby-ssl"
+
+ruby_add_bdepend "test? ( dev-ruby/maxitest dev-ruby/webrick )"
+
+all_ruby_prepare() {
+	# get rid of bundler usage
+	rm Gemfile || die
+	sed -i -e '/bundler/d' -e '/bump/d' Rakefile || die
+	sed -i -e '/bundler/d' test/test_helper.rb || die
+	# Avoid tests using the network.
+	sed -i -e '/test_loading_a_remote_file_over_ssl/,/end/ s:^:#:' test/test_css_parser_loading.rb || die
+
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib test/*.rb || die
+}
diff --git a/dev-ruby/css_parser/css_parser-1.17.0.ebuild b/dev-ruby/css_parser/css_parser-1.17.0.ebuild
new file mode 100644
index 000000000000..220acb7872bb
--- /dev/null
+++ b/dev-ruby/css_parser/css_parser-1.17.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOC_DIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md "
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+GITHUB_USER="premailer"
+GITHUB_PROJECT="${PN}"
+inherit ruby-fakegem
+
+DESCRIPTION="Sass-based Stylesheet Framework"
+HOMEPAGE="https://github.com/premailer/css_parser/"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc test"
+
+ruby_add_rdepend "dev-ruby/addressable
+	virtual/ruby-ssl"
+
+ruby_add_bdepend "test? ( dev-ruby/maxitest dev-ruby/webrick )"
+
+all_ruby_prepare() {
+	# get rid of bundler usage
+	rm Gemfile || die
+	sed -i -e '/bundler/d' -e '/bump/d' Rakefile || die
+	sed -i -e '/bundler/d' test/test_helper.rb || die
+	# Avoid tests using the network.
+	sed -i -e '/test_loading_a_remote_file_over_ssl/,/end/ s:^:#:' test/test_css_parser_loading.rb || die
+
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib test/*.rb || die
+}
diff --git a/dev-ruby/css_parser/css_parser-1.17.1.ebuild b/dev-ruby/css_parser/css_parser-1.17.1.ebuild
new file mode 100644
index 000000000000..220acb7872bb
--- /dev/null
+++ b/dev-ruby/css_parser/css_parser-1.17.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOC_DIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md "
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+GITHUB_USER="premailer"
+GITHUB_PROJECT="${PN}"
+inherit ruby-fakegem
+
+DESCRIPTION="Sass-based Stylesheet Framework"
+HOMEPAGE="https://github.com/premailer/css_parser/"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc test"
+
+ruby_add_rdepend "dev-ruby/addressable
+	virtual/ruby-ssl"
+
+ruby_add_bdepend "test? ( dev-ruby/maxitest dev-ruby/webrick )"
+
+all_ruby_prepare() {
+	# get rid of bundler usage
+	rm Gemfile || die
+	sed -i -e '/bundler/d' -e '/bump/d' Rakefile || die
+	sed -i -e '/bundler/d' test/test_helper.rb || die
+	# Avoid tests using the network.
+	sed -i -e '/test_loading_a_remote_file_over_ssl/,/end/ s:^:#:' test/test_css_parser_loading.rb || die
+
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib test/*.rb || die
+}
diff --git a/dev-ruby/css_parser/css_parser-1.9.0.ebuild b/dev-ruby/css_parser/css_parser-1.9.0.ebuild
deleted file mode 100644
index e725137e229e..000000000000
--- a/dev-ruby/css_parser/css_parser-1.9.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_DOC_DIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md "
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="premailer"
-GITHUB_PROJECT="${PN}"
-inherit ruby-fakegem
-
-DESCRIPTION="Sass-based Stylesheet Framework"
-HOMEPAGE="https://github.com/premailer/css_parser/"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/addressable
-	virtual/ruby-ssl"
-
-ruby_add_bdepend "test? ( dev-ruby/maxitest )"
-
-all_ruby_prepare() {
-	# get rid of bundler usage
-	rm Gemfile || die
-	sed -i -e '/bundler/d' -e '/bump/d' Rakefile || die
-	sed -i -e '/bundler/d' test/test_helper.rb || die
-	# Avoid tests using the network.
-	sed -i -e '/test_loading_a_remote_file_over_ssl/,/end/ s:^:#:' test/test_css_parser_loading.rb || die
-
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/*.rb || die
-}
diff --git a/dev-ruby/csv/Manifest b/dev-ruby/csv/Manifest
index d2cece4dab87..669ee510211a 100644
--- a/dev-ruby/csv/Manifest
+++ b/dev-ruby/csv/Manifest
@@ -1,2 +1,2 @@
-DIST csv-3.2.2.tar.gz 86665 BLAKE2B fcbd12d0179a4bf0a0da4f45bf271354c4a352827d4b3ef90ecd0d5b74a9428d1f2165f4f96632a4604a49f4f249fb759e92ff252395992ab564f3635dfa8fe6 SHA512 a514861ffe0d137bf0f75de9e22f9446d2fab6230c234c5dd0cbdf890b06da4be659d3ecc5a940a89b0885f788260b3b2c25373496b4702500b41f236624afd4
-DIST csv-3.2.3.tar.gz 88749 BLAKE2B ec927ae8eaaf4f050e34218cd5a6bef2cd912828e065a03b772070e0ad9f18617b55a771a1fe2a4467106cabf2d54efe84313fdecfb758104545b9874056eec9 SHA512 104b27991f43c9d18a7a0f9db38b32bf638b7b73e25376f1a404b76910a348bf8bf7850a9a671658b928bacfbe288176cfa14dce2ae1524c64dfbeb52138a482
+DIST csv-3.2.8.tar.gz 91194 BLAKE2B 827adb228acaaae30f090d0547d1d59ef6237546aff462e9d812bb854f3b331feecea9b2657acf8aad17c9ac76aad7754b2f22ae8d2e067c2d45f8cf648491a8 SHA512 87072aaca62e5d95eeb1b916eff497b2b2029efd9be6b29c9d3c4435dbfcd64a1ed045b8b3bec106ea35e11aa05f3a3d5f9f6c09c12a97bc157648be5cd2fcf7
+DIST csv-3.3.0.tar.gz 91569 BLAKE2B cacdf60e279277f7d69fd62d6cea62ce80843addab7b9f81749fabde9133d2b40b2a961b548bd55918bacbe89fe8754af87569a117d4f43a88d3ef49a792da1f SHA512 676f6c34c1466c0edb412aeba9e955cc0070c201a21e6ffe2fd47a3ad4bd7322d561c612695317e5ef34195bcc8bc7a63f3de8c55fbdcb116890a59b867c20d9
diff --git a/dev-ruby/csv/csv-3.2.2.ebuild b/dev-ruby/csv/csv-3.2.2.ebuild
deleted file mode 100644
index 3266979f415b..000000000000
--- a/dev-ruby/csv/csv-3.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The CSV library provides a complete interface to CSV files and data"
-HOMEPAGE="https://github.com/ruby/csv"
-SRC_URI="https://github.com/ruby/csv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="$(ver_cut 1)"
-
-all_ruby_prepare() {
-	sed -i -e 's:require_relative ":require "./:' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} run-test.rb || die
-}
diff --git a/dev-ruby/csv/csv-3.2.3.ebuild b/dev-ruby/csv/csv-3.2.3.ebuild
deleted file mode 100644
index 0b15ce93d71a..000000000000
--- a/dev-ruby/csv/csv-3.2.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The CSV library provides a complete interface to CSV files and data"
-HOMEPAGE="https://github.com/ruby/csv"
-SRC_URI="https://github.com/ruby/csv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="$(ver_cut 1)"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3.4.8 )"
-
-all_ruby_prepare() {
-	sed -i -e 's:require_relative ":require "./:' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} run-test.rb || die
-}
diff --git a/dev-ruby/csv/csv-3.2.8.ebuild b/dev-ruby/csv/csv-3.2.8.ebuild
new file mode 100644
index 000000000000..364154350cd8
--- /dev/null
+++ b/dev-ruby/csv/csv-3.2.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The CSV library provides a complete interface to CSV files and data"
+HOMEPAGE="https://github.com/ruby/csv"
+SRC_URI="https://github.com/ruby/csv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="$(ver_cut 1)"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3.4.8 )"
+
+all_ruby_prepare() {
+	sed -i -e 's:require_relative ":require "./:' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} run-test.rb || die
+}
diff --git a/dev-ruby/csv/csv-3.3.0.ebuild b/dev-ruby/csv/csv-3.3.0.ebuild
new file mode 100644
index 000000000000..a989a2e126c6
--- /dev/null
+++ b/dev-ruby/csv/csv-3.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The CSV library provides a complete interface to CSV files and data"
+HOMEPAGE="https://github.com/ruby/csv"
+SRC_URI="https://github.com/ruby/csv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="$(ver_cut 1)"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3.4.8 )"
+
+all_ruby_prepare() {
+	sed -i -e 's:require_relative ":require "./:' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} run-test.rb || die
+}
diff --git a/dev-ruby/csv/metadata.xml b/dev-ruby/csv/metadata.xml
index 7a38fd1850ff..45c4fb8df431 100644
--- a/dev-ruby/csv/metadata.xml
+++ b/dev-ruby/csv/metadata.xml
@@ -5,4 +5,7 @@
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/csv</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/curb/Manifest b/dev-ruby/curb/Manifest
index e43e45d5c238..546be9fd6f08 100644
--- a/dev-ruby/curb/Manifest
+++ b/dev-ruby/curb/Manifest
@@ -1,2 +1 @@
-DIST curb-0.9.11.gem 88576 BLAKE2B 1656a17070151ddd1bd63c3e23885d36d8e2b133b19e00347892363a9a20c88baa10932ceb5273733b18847d8d19dc403aa4b7f36fbd80c8dde126ae46743796 SHA512 000ee2054a5866de09042dfc5894330900e401aa94a0fe8bb133fe9c661f7899992adff0585e5ed3725d3564cd9819d76653655f3539faaa61ca6acabe3a8602
-DIST curb-1.0.1.gem 90624 BLAKE2B b54404e0ea81ccb2ea03e262abce247ca4e0db1a5208cfecd57a6c0e423c36b282cdaef7db9bd3fe70d3fdb8cfa60c6085be04ff78daac71e83b63fe25bfef06 SHA512 78eeef1b3a778c64517243a25ff82889cb4703589d27f08cff6e84d39a806610a80bb749c51ddba93a82e02a18797978b55ebc4643948caa8900e76d343f4bc6
+DIST curb-1.0.5.gem 92160 BLAKE2B 395cdbb3255d5a38dfd472787785738dfff8ec7eed69e7b93ae2d993c90635d427a6275cd3510b406fccc7b999bdedf544cb4177132cc890f0473452ad1984c9 SHA512 0b90da7757ee37bd542e2ab31407235788f103e67c987fd820073eb70ecae7cea55cc5ecdc354145ead58cb9762db0f8f27416301fbca93bc0f7a7966a5d8a63
diff --git a/dev-ruby/curb/curb-0.9.11-r1.ebuild b/dev-ruby/curb/curb-0.9.11-r1.ebuild
deleted file mode 100644
index 884ae6906585..000000000000
--- a/dev-ruby/curb/curb-0.9.11-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rake"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby-language bindings for libcurl"
-HOMEPAGE="https://github.com/taf2/curb"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND+=" net-misc/curl[ssl] test? ( net-misc/curl )"
-RDEPEND+=" net-misc/curl[ssl]"
-
-all_ruby_prepare() {
-	# fix tests when localhost is also ::1
-	sed -i -e 's|localhost:|127.0.0.1:|g' tests/*.rb || die
-
-	# avoid tests making outside network connections
-	rm tests/bug_postfields_crash.rb || die
-	sed -e '/test_easy_http_verbs_must_respond_to_str/,/^  end/ s:^:#:' \
-		-i tests/tc_curl_easy.rb || die
-	sed -e '/test_connection_keepalive/aomit "network connection needed"' \
-		-i tests/tc_curl_multi.rb || die
-
-	# Fix test that expects wrong output
-	sed -i -e 's/200 OK /200 OK/' tests/tc_curl_easy.rb || die
-
-	# avoid failing tests where failure condition seems weird, no
-	# upstream travis so not clear if the test is indeed broken.
-	sed -i -e '/test_multi_easy_http/,/^  end/ s:^:#:' tests/tc_curl_multi.rb || die
-
-	# avoid test requiring ntlm support on curl which is no longer available in gentoo
-	sed -i -e '/test_username_password/aomit "ntlm support in curl needed"' -i tests/tc_curl_easy.rb || die
-}
diff --git a/dev-ruby/curb/curb-1.0.1.ebuild b/dev-ruby/curb/curb-1.0.1.ebuild
deleted file mode 100644
index b82ed935cd1c..000000000000
--- a/dev-ruby/curb/curb-1.0.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rake"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby-language bindings for libcurl"
-HOMEPAGE="https://github.com/taf2/curb"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND+=" net-misc/curl[ssl] test? ( net-misc/curl )"
-RDEPEND+=" net-misc/curl[ssl]"
-
-all_ruby_prepare() {
-	# fix tests when localhost is also ::1
-	sed -i -e 's|localhost:|127.0.0.1:|g' tests/*.rb || die
-
-	# avoid tests making outside network connections
-	rm tests/bug_postfields_crash.rb || die
-	sed -e '/test_easy_http_verbs_must_respond_to_str/,/^  end/ s:^:#:' \
-		-i tests/tc_curl_easy.rb || die
-	sed -e '/test_connection_keepalive/aomit "network connection needed"' \
-		-i tests/tc_curl_multi.rb || die
-
-	# Fix test that expects wrong output
-	sed -i -e 's/200 OK /200 OK/' tests/tc_curl_easy.rb || die
-
-	# avoid failing tests where failure condition seems weird, no
-	# upstream travis so not clear if the test is indeed broken.
-	sed -i -e '/test_multi_easy_http/,/^  end/ s:^:#:' tests/tc_curl_multi.rb || die
-
-	# avoid test requiring ntlm support on curl which is no longer available in gentoo
-	sed -i -e '/test_username_password/aomit "ntlm support in curl needed"' -i tests/tc_curl_easy.rb || die
-}
diff --git a/dev-ruby/curb/curb-1.0.5.ebuild b/dev-ruby/curb/curb-1.0.5.ebuild
new file mode 100644
index 000000000000..35bac119ac1e
--- /dev/null
+++ b/dev-ruby/curb/curb-1.0.5.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="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby-language bindings for libcurl"
+HOMEPAGE="https://github.com/taf2/curb"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND+=" net-misc/curl[ssl] test? ( net-misc/curl )"
+RDEPEND+=" net-misc/curl[ssl]"
+
+all_ruby_prepare() {
+	# fix tests when localhost is also ::1
+	sed -i -e 's|localhost:|127.0.0.1:|g' tests/*.rb || die
+
+	# avoid tests making outside network connections
+	rm tests/bug_postfields_crash.rb || die
+	sed -e '/test_easy_http_verbs_must_respond_to_str/,/^  end/ s:^:#:' \
+		-i tests/tc_curl_easy.rb || die
+	sed -e '/test_connection_keepalive/aomit "network connection needed"' \
+		-i tests/tc_curl_multi.rb || die
+
+	# Fix test that expects wrong output
+	sed -i -e 's/200 OK /200 OK/' tests/tc_curl_easy.rb || die
+
+	# avoid failing tests where failure condition seems weird, no
+	# upstream travis so not clear if the test is indeed broken.
+	sed -i -e '/test_multi_easy_http/,/^  end/ s:^:#:' tests/tc_curl_multi.rb || die
+
+	# avoid test requiring ntlm support on curl which is no longer available in gentoo
+	sed -i -e '/test_username_password/aomit "ntlm support in curl needed"' -i tests/tc_curl_easy.rb || die
+
+	# Skip tests with currently unpackaged ruby_memcheck
+	sed -i -e '/ruby_memcheck/ s:^:#: ; /RubyMemcheck/,/^end/ s:^:#:' Rakefile
+}
diff --git a/dev-ruby/curses/Manifest b/dev-ruby/curses/Manifest
index fe082c7f966e..44b378841d99 100644
--- a/dev-ruby/curses/Manifest
+++ b/dev-ruby/curses/Manifest
@@ -1,3 +1 @@
-DIST curses-1.4.2.gem 524288 BLAKE2B eccdc0773244efbda0d96468469f69dfc8caa6949815f94a4cdfe0f19dfc4f9248ff62bf7b50619dea26ab90391ec5b732f40c0c89ebb71a2cb9677ab78439f8 SHA512 9518bd1d4195dec8ea0eed10d5a836a7bb620874a691ba1c0f76f7444be544e77da84339af38699683ebcb45760e91bb09571d00069c8cc366d3b8a8fddc4c6e
-DIST curses-1.4.3.gem 524288 BLAKE2B a4f0ab5d1bb2723ac406c8d61b0ef6ed1b257d4959d59224c8bcca0622b930c8b06f81b4fb73718922544353edd5fd53f66df22d248cbf6342998bd1df5dbc22 SHA512 b68cc9d39df7e7b176601f91b5235f2b77cb70edf3a86a2eaaf9004995fa42dd107a4becda386f37ef95e95db40798256fe1eb416960f6f14e9973a75089f766
 DIST curses-1.4.4.gem 524800 BLAKE2B 00749022a097a69b8a1a42b88b64a81a60cd6e6914dbc0636a1ed17db6f7b3f1f0e583b965b9b296ff27a5dc97786024f0511b2ed59e337ef29a799dda0fc577 SHA512 5e275b7bc035c9745ed19d563da97aba090f66d4831a4cf07144ff29f3b49a36bbee592e1292719d6bcfd1f6a77d2955de5d7e5ff34ce487d574482a0cee1a53
diff --git a/dev-ruby/curses/curses-1.4.2.ebuild b/dev-ruby/curses/curses-1.4.2.ebuild
deleted file mode 100644
index 720d16c8c1bf..000000000000
--- a/dev-ruby/curses/curses-1.4.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/curses/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby binding for curses, ncurses, and PDCurses"
-HOMEPAGE="https://github.com/ruby/curses"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~amd64 ~riscv ~x86"
-
-SLOT="1"
-IUSE=""
-
-DEPEND+=" sys-libs/ncurses:0"
-RDEPEND+=" sys-libs/ncurses:0"
diff --git a/dev-ruby/curses/curses-1.4.3.ebuild b/dev-ruby/curses/curses-1.4.3.ebuild
deleted file mode 100644
index 6b1ad29920c0..000000000000
--- a/dev-ruby/curses/curses-1.4.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/curses/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby binding for curses, ncurses, and PDCurses"
-HOMEPAGE="https://github.com/ruby/curses"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~amd64 ~riscv ~x86"
-
-SLOT="1"
-IUSE=""
-
-DEPEND+=" sys-libs/ncurses:0"
-RDEPEND+=" sys-libs/ncurses:0"
diff --git a/dev-ruby/curses/curses-1.4.4.ebuild b/dev-ruby/curses/curses-1.4.4.ebuild
index 0c4d1ba0bfb2..be1f2747cd7f 100644
--- a/dev-ruby/curses/curses-1.4.4.ebuild
+++ b/dev-ruby/curses/curses-1.4.4.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -23,3 +23,9 @@ IUSE=""
 
 DEPEND+=" sys-libs/ncurses:0"
 RDEPEND+=" sys-libs/ncurses:0"
+
+each_ruby_test() {
+	# No specs so we use the smoketest that upstream use in CI:
+	# https://github.com/ruby/curses/blob/master/.github/workflows/ubuntu.yml#L26
+	${RUBY} -Ilib:ext/curses:. -r curses -e 'puts Curses::VERSION' || die
+}
diff --git a/dev-ruby/daemon_controller/Manifest b/dev-ruby/daemon_controller/Manifest
deleted file mode 100644
index 0c84d0a33303..000000000000
--- a/dev-ruby/daemon_controller/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST daemon_controller-1.2.0.gem 37888 BLAKE2B c320d92cd3515f861e775eab72726469d7b6ed3cfd1655a67bf11458ef1ba5b43f72b8ba600f5c953b99c18f99549a48d0648b387abda45a87de99d2c9d955c5 SHA512 d22b5f37a41f2fab642cc7a6f5b5ea8a892d2c8b9eda04c9a547ee3aab3148a8897bc4737fd30fd9eb6e2a4fba458ea5811024fb5ad71b7959f3996dfa7b7705
diff --git a/dev-ruby/daemon_controller/daemon_controller-1.2.0-r2.ebuild b/dev-ruby/daemon_controller/daemon_controller-1.2.0-r2.ebuild
deleted file mode 100644
index 19cf81760874..000000000000
--- a/dev-ruby/daemon_controller/daemon_controller-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library to start and stop specific daemons programmatically in a robust manner"
-HOMEPAGE="https://github.com/FooBarWidget/daemon_controller"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# fix tests with RSpec 2
-	sed -i -e '1irequire "thread"' spec/test_helper.rb || die
-}
diff --git a/dev-ruby/daemon_controller/metadata.xml b/dev-ruby/daemon_controller/metadata.xml
deleted file mode 100644
index ea32f6fb7c18..000000000000
--- a/dev-ruby/daemon_controller/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">FooBarWidget/daemon_controller</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/daemons/Manifest b/dev-ruby/daemons/Manifest
index d372d7949134..9ac0a831676f 100644
--- a/dev-ruby/daemons/Manifest
+++ b/dev-ruby/daemons/Manifest
@@ -1,3 +1 @@
-DIST daemons-1.3.1.tar.gz 28805 BLAKE2B 4ddb9cb9a5a6de5ebeac8ac69c2712500f9dd18c9d194efce3152735533a2aef7a4cf0e034e4c1781e5d89c1be18e7e7c119455bafb0bf4d8cec279b1e8f6308 SHA512 ceeeefbf44727a1ee43b651bbc3f8e5ae83c73388d017d240d95624586b91a3b32602464f4a5ff53a854d6cc6fa1dc47e433a665f0ad7f08e440c0a798743d80
-DIST daemons-1.4.0.tar.gz 29257 BLAKE2B 6f8f108727e8d77c18435fae7a8305ecd615eb65cdd196ab36ed0787c50fddd30a5bbf8ab93e1eafff7da23143b2a6ff48781d54d10df45f40f536a7d87eff6f SHA512 cdc86bb06e5713e958b1d229da893f39d32751146c269cce5392f53bdc59cfeb93be0a6fc73bade1dc6b7a007bea16f25b070469ec48aba38cea884efaa770f9
 DIST daemons-1.4.1.tar.gz 29310 BLAKE2B 4f376f0a1a9322d95b32b74862beae93ae5d8636c0d321b059c335053760077b6ba78780cc4c22d5e98fbb95e2dffb85fd5ccfb1dc5152653698c29a0ac86577 SHA512 5b55f644a53efe93a6bb80ca534207c7a847a7c21df127d17ba6f09e2c2d8c665d87e6355382d2d51c3c9f50741fa9a31f5bfd228d9bb45ba8d5d099b7b5d026
diff --git a/dev-ruby/daemons/daemons-1.3.1.ebuild b/dev-ruby/daemons/daemons-1.3.1.ebuild
deleted file mode 100644
index 2232851699f9..000000000000
--- a/dev-ruby/daemons/daemons-1.3.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="Releases README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Wrap existing ruby scripts to be run as a daemon"
-HOMEPAGE="https://github.com/thuehlinger/daemons"
-SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples"
-
-all_ruby_prepare() {
-	sed -i -e '/\(pry\|simplecov\)/I s:^:#:' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	use examples && dodoc -r examples
-}
diff --git a/dev-ruby/daemons/daemons-1.4.0.ebuild b/dev-ruby/daemons/daemons-1.4.0.ebuild
deleted file mode 100644
index 4e4ee879decc..000000000000
--- a/dev-ruby/daemons/daemons-1.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="Releases README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="daemons.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Wrap existing ruby scripts to be run as a daemon"
-HOMEPAGE="https://github.com/thuehlinger/daemons"
-SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples"
-
-all_ruby_prepare() {
-	sed -i -e '/\(pry\|simplecov\)/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	use examples && dodoc -r examples
-}
diff --git a/dev-ruby/daemons/daemons-1.4.1.ebuild b/dev-ruby/daemons/daemons-1.4.1.ebuild
index 22f662138b2d..5d257fb36dc3 100644
--- a/dev-ruby/daemons/daemons-1.4.1.ebuild
+++ b/dev-ruby/daemons/daemons-1.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="Releases README.md"
 
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index e1622680a215..b4c8649bea05 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -1,3 +1,4 @@
-DIST dalli-2.7.11.tar.gz 52341 BLAKE2B 5b3a2bc57f4b0e3a9ac0d24ffa3bba89ea38665ac08ef3d7760fa6ce74db21d323a18e74a4f3009165364332731d7c6890df36c68409afbe21d3ac096275f028 SHA512 8f299a19d95293370564b6337bbdfeb32d928e0a95bf5f5df962ea20b039f4765da1797513ca96cabf93309484575481a02fb1e0c6d227f74c81fc72f95be22a
-DIST dalli-3.0.3.tar.gz 47633 BLAKE2B ee47bc7e4efcbd0d60c1663bf514f5a21d0fdeb70cfcf13ba46ae3c39926fd216db992c7ac1750d73ecf453d32feea9d2c22625b737e0bcbb8ae0d6870536828 SHA512 1feaecca963a6a4aa2f21e02302ddb5865fec0f5779911b4ec38a1199533b82edca46057355fa463353a8c7a6da3bf7c835ce51ca538bc38eb6014d4d362acb3
-DIST dalli-3.2.1.tar.gz 69926 BLAKE2B c3cd0c6d817b04aed786df7792b84c8659fa1ea79d69d2fc477549869fb5d7d4880c1d897f90c35020c04babc17f16ee55724339b150eec1a8b887de27b4d02e SHA512 5328ea5aecb4270a33ca08f498588f08259b56e36e1ed404f062d39b8693874878f019dbfe154892b1d192ec136f5473da5612ee7d095b8760caf628be3c67a7
+DIST dalli-3.2.5.tar.gz 72496 BLAKE2B 2a8665aad98629ccab873a2b6b6661304b25dd2374ed3685f97dee83bf43c604088e43229ced951453d889fab7a1ec35b7fb3f0028858cf890a6013ac82b64c1 SHA512 ace079e3c9f7c30e2f266a07f87e58cbf4276f5ca4744ade76782a6a6047296bf5e23d40a4c1f4596b1eb150501c460f7cf89b33f308a774bcfe5825ec635760
+DIST dalli-3.2.6.tar.gz 72683 BLAKE2B d3cf252862d796cb0e8320df0b35af91678949b1dc564054585252e98caed70681609857b7606663b4bda08a27112bc1d51779fc29ef045d0ec087ba80d6dfdd SHA512 93aa808123adb671c096543271407e497770a8f7481a961f48f11493f3a313113f0ec7829708d7352c0ade1f02a9842ecfc22ba7d93beb138db981d2bd1b94a9
+DIST dalli-3.2.7.tar.gz 73058 BLAKE2B 8baba122e1bba1254e38ed021ac0c494c27bccf65d99aa16f379824073457e2eb7f79b2e9ec4cb49153b682c48d6bdfdcbe64966a286dba7b45349ace81ca4a1 SHA512 771bb0863e86cd7c252cfc1a688dd820b3efd24d6038be8789e2d4c2604703b78b64d36d0b32bb81001d625fc116eb86b4421cb3b32de8918912a3995e68ee70
+DIST dalli-3.2.8.tar.gz 73367 BLAKE2B 1680fda0d272d135f8e88a0ea2e16a08cd1027808f0503334b8c53dd85472cc7c37df3649623f8347169f5b8cd645c9a1a4d98343e45d4369ce8d08cc1306316 SHA512 85a0d8121fd0e539b0fd6c15716971d91e91741d36850cf8e887d8fef17d6b49ea6036ce66c986aafd008aa0e744cd798bc574e9376383b9af33b0971e31e25c
diff --git a/dev-ruby/dalli/dalli-2.7.11.ebuild b/dev-ruby/dalli/dalli-2.7.11.ebuild
deleted file mode 100644
index a918291870bd..000000000000
--- a/dev-ruby/dalli/dalli-2.7.11.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.md Performance.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A high performance pure Ruby client for accessing memcached servers"
-HOMEPAGE="https://github.com/petergoldstein/dalli"
-SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4 )"
-
-ruby_add_bdepend "test? (
-		dev-ruby/minitest:5
-		>=dev-ruby/mocha-0.13
-		dev-ruby/rack
-		>=dev-ruby/activesupport-5.2
-		dev-ruby/connection_pool )"
-
-all_ruby_prepare() {
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	sed -i -e '/\(appraisal\|bundler\)/ s:^:#:' Rakefile || die
-
-	sed -i -e '3igem "minitest", "~> 5.0"; gem "activesupport", ">=5.2.0"' \
-		-e '/bundler/ s:^:#:' test/helper.rb || die
-
-	# Drop rails dependency which is only used to display the version
-	# number, so we only need to depend on activesupport and avoid
-	# complicated circular dependencies.
-	sed -i -e '/rails/I s:^:#:' \
-		-e '14irequire "active_support"' test/helper.rb || die
-
-	# Fix test compatability with memcached 1.5.4 and higher
-	# https://github.com/petergoldstein/dalli/pull/672
-	#sed -i -e '/memcached_low_mem_persistent/,/^end/ s/-M/-M -I 512k/' test/memcached_mock.rb || die
-}
diff --git a/dev-ruby/dalli/dalli-3.0.3.ebuild b/dev-ruby/dalli/dalli-3.0.3.ebuild
deleted file mode 100644
index 0288f4a55329..000000000000
--- a/dev-ruby/dalli/dalli-3.0.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.md Performance.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A high performance pure Ruby client for accessing memcached servers"
-HOMEPAGE="https://github.com/petergoldstein/dalli"
-SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4[ssl(-)] )"
-
-ruby_add_bdepend "test? (
-		dev-ruby/minitest:5
-		dev-ruby/rack
-)"
-
-all_ruby_prepare() {
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	sed -i -e '/\(appraisal\|bundler\)/ s:^:#:' Rakefile || die
-
-	sed -i -e '3igem "minitest", "~> 5.0"' \
-		-e '/bundler/ s:^:#:' test/helper.rb || die
-}
diff --git a/dev-ruby/dalli/dalli-3.2.1.ebuild b/dev-ruby/dalli/dalli-3.2.1.ebuild
deleted file mode 100644
index 3b6b5f10081f..000000000000
--- a/dev-ruby/dalli/dalli-3.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.md Performance.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A high performance pure Ruby client for accessing memcached servers"
-HOMEPAGE="https://github.com/petergoldstein/dalli"
-SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
-IUSE=""
-
-DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4[ssl(-)] )"
-
-ruby_add_bdepend "test? (
-		dev-ruby/minitest:5
-		dev-ruby/rack
-)"
-
-all_ruby_prepare() {
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	sed -i -e '/\(appraisal\|bundler\)/ s:^:#:' Rakefile || die
-
-	sed -i -e '3igem "minitest", "~> 5.0"; require "dalli"' \
-		-e '/bundler/ s:^:#:' test/helper.rb || die
-
-	sed -i -e "s:/tmp:${T}:" test/utils/certificate_generator.rb || die
-}
diff --git a/dev-ruby/dalli/dalli-3.2.5.ebuild b/dev-ruby/dalli/dalli-3.2.5.ebuild
new file mode 100644
index 000000000000..6d0b4ea322a8
--- /dev/null
+++ b/dev-ruby/dalli/dalli-3.2.5.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="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md Performance.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A high performance pure Ruby client for accessing memcached servers"
+HOMEPAGE="https://github.com/petergoldstein/dalli"
+SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 x86"
+IUSE=""
+
+DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4[ssl(-)] )"
+
+ruby_add_bdepend "test? (
+		dev-ruby/connection_pool
+		dev-ruby/minitest:5
+		dev-ruby/rack:2.2
+)"
+
+all_ruby_prepare() {
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	sed -i -e '/\(appraisal\|bundler\)/ s:^:#:' Rakefile || die
+
+	sed -i -e '3igem "minitest", "~> 5.0"; gem "rack", "~> 2.2.0"; require "dalli"' \
+		-e '/bundler/ s:^:#:' test/helper.rb || die
+
+	sed -i -e "s:/tmp:${T}:" test/utils/certificate_generator.rb || die
+}
diff --git a/dev-ruby/dalli/dalli-3.2.6.ebuild b/dev-ruby/dalli/dalli-3.2.6.ebuild
new file mode 100644
index 000000000000..9e4f2ecb1ef2
--- /dev/null
+++ b/dev-ruby/dalli/dalli-3.2.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md Performance.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A high performance pure Ruby client for accessing memcached servers"
+HOMEPAGE="https://github.com/petergoldstein/dalli"
+SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+IUSE=""
+
+DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4[ssl(-)] )"
+
+ruby_add_bdepend "test? (
+		dev-ruby/connection_pool
+		dev-ruby/minitest:5
+		dev-ruby/rack
+		dev-ruby/rack-session
+)"
+
+all_ruby_prepare() {
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	sed -i -e '/\(appraisal\|bundler\)/ s:^:#:' Rakefile || die
+
+	sed -i -e '3igem "minitest", "~> 5.0"; require "dalli"' \
+		-e '/bundler/ s:^:#:' test/helper.rb || die
+
+	sed -i -e "s:/tmp:${T}:" test/utils/certificate_generator.rb || die
+}
diff --git a/dev-ruby/dalli/dalli-3.2.7.ebuild b/dev-ruby/dalli/dalli-3.2.7.ebuild
new file mode 100644
index 000000000000..41af68f1391e
--- /dev/null
+++ b/dev-ruby/dalli/dalli-3.2.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md Performance.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A high performance pure Ruby client for accessing memcached servers"
+HOMEPAGE="https://github.com/petergoldstein/dalli"
+SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+IUSE="test"
+
+DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4[ssl(-)] )"
+
+ruby_add_bdepend "test? (
+		dev-ruby/connection_pool
+		dev-ruby/minitest:5
+		dev-ruby/rack
+		dev-ruby/rack-session
+)"
+
+all_ruby_prepare() {
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	sed -i -e '/\(appraisal\|bundler\)/ s:^:#:' Rakefile || die
+
+	sed -i -e '3igem "minitest", "~> 5.0"; require "dalli"' \
+		-e '/bundler/ s:^:#:' test/helper.rb || die
+
+	sed -i -e "s:/tmp:${T}:" test/utils/certificate_generator.rb || die
+}
diff --git a/dev-ruby/dalli/dalli-3.2.8.ebuild b/dev-ruby/dalli/dalli-3.2.8.ebuild
new file mode 100644
index 000000000000..41af68f1391e
--- /dev/null
+++ b/dev-ruby/dalli/dalli-3.2.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md Performance.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A high performance pure Ruby client for accessing memcached servers"
+HOMEPAGE="https://github.com/petergoldstein/dalli"
+SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+IUSE="test"
+
+DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4[ssl(-)] )"
+
+ruby_add_bdepend "test? (
+		dev-ruby/connection_pool
+		dev-ruby/minitest:5
+		dev-ruby/rack
+		dev-ruby/rack-session
+)"
+
+all_ruby_prepare() {
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	sed -i -e '/\(appraisal\|bundler\)/ s:^:#:' Rakefile || die
+
+	sed -i -e '3igem "minitest", "~> 5.0"; require "dalli"' \
+		-e '/bundler/ s:^:#:' test/helper.rb || die
+
+	sed -i -e "s:/tmp:${T}:" test/utils/certificate_generator.rb || die
+}
diff --git a/dev-ruby/database_cleaner-active_record/Manifest b/dev-ruby/database_cleaner-active_record/Manifest
index ffc9f0f49c4a..64275e34ca96 100644
--- a/dev-ruby/database_cleaner-active_record/Manifest
+++ b/dev-ruby/database_cleaner-active_record/Manifest
@@ -1 +1 @@
-DIST database_cleaner-active_record-2.0.1.gem 12288 BLAKE2B 3c9afbca6186d7489b271b8f52834cc30d0087176129c06403a99cbdc18b3d565ce0422e916ca7e4b2f8bbe96f1deaba1b7fd982eab676aab0fa7db55923fbb3 SHA512 5b52b1e1a3f0c75dbd699ca5a2a5e6eacb9b93ca5c69661cc277eb2b3170b93240c72b1ce4d751e768e78eb4d933a3179b3d32dd1c57ae2ffa7b572acb8e3745
+DIST database_cleaner-active_record-2.1.0.gem 13312 BLAKE2B 7afa419e19d621cfe089a790f8562f9da521d53e1683de080ab1296fd30024ac2d284777fbb374145f7e7b455b2561aac21d998b65f2cfa36da2d3f1ac76cbbe SHA512 4472a2217c0edf3fda63fa2cba7536c68764f71b6da7ec6b6d1e5a6627ff62ebfee093b17603eb287adf9eb68e8168aa06b50f87c3427153e84a163d1f68ae28
diff --git a/dev-ruby/database_cleaner-active_record/database_cleaner-active_record-2.0.1.ebuild b/dev-ruby/database_cleaner-active_record/database_cleaner-active_record-2.0.1.ebuild
deleted file mode 100644
index 5e38460e01af..000000000000
--- a/dev-ruby/database_cleaner-active_record/database_cleaner-active_record-2.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-# There are specs and features but they all require configured databases.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Strategies for cleaning databases using ActiveRecord"
-HOMEPAGE="https://github.com/bmabey/database_cleaner"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	|| ( dev-ruby/activerecord:6.1 dev-ruby/activerecord:6.0 dev-ruby/activerecord:5.2 )
-	dev-ruby/database_cleaner-core:2.0
-"
diff --git a/dev-ruby/database_cleaner-active_record/database_cleaner-active_record-2.1.0.ebuild b/dev-ruby/database_cleaner-active_record/database_cleaner-active_record-2.1.0.ebuild
new file mode 100644
index 000000000000..139ccfc602f8
--- /dev/null
+++ b/dev-ruby/database_cleaner-active_record/database_cleaner-active_record-2.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+# There are specs and features but they all require configured databases.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Strategies for cleaning databases using ActiveRecord"
+HOMEPAGE="https://github.com/DatabaseCleaner/database_cleaner-active_record"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	|| ( dev-ruby/activerecord:6.1 )
+	dev-ruby/database_cleaner-core:2.0
+"
diff --git a/dev-ruby/database_cleaner-active_record/metadata.xml b/dev-ruby/database_cleaner-active_record/metadata.xml
index 9f4afe8163af..e18d50349cb2 100644
--- a/dev-ruby/database_cleaner-active_record/metadata.xml
+++ b/dev-ruby/database_cleaner-active_record/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">bmabey/database_cleaner</remote-id>
+    <remote-id type="github">DatabaseCleaner/database_cleaner</remote-id>
+    <remote-id type="rubygems">database_cleaner-active_record</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/database_cleaner-core/database_cleaner-core-2.0.1-r1.ebuild b/dev-ruby/database_cleaner-core/database_cleaner-core-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..6d12cf4ee0fc
--- /dev/null
+++ b/dev-ruby/database_cleaner-core/database_cleaner-core-2.0.1-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.markdown"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Strategies for cleaning databases"
+HOMEPAGE="https://github.com/DatabaseCleaner/database_cleaner"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/dev-ruby/database_cleaner-core/database_cleaner-core-2.0.1.ebuild b/dev-ruby/database_cleaner-core/database_cleaner-core-2.0.1.ebuild
deleted file mode 100644
index 44e4d8c946f2..000000000000
--- a/dev-ruby/database_cleaner-core/database_cleaner-core-2.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.markdown"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Strategies for cleaning databases"
-HOMEPAGE="https://github.com/bmabey/database_cleaner"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/database_cleaner-core/metadata.xml b/dev-ruby/database_cleaner-core/metadata.xml
index 9f4afe8163af..da86a1c09f5c 100644
--- a/dev-ruby/database_cleaner-core/metadata.xml
+++ b/dev-ruby/database_cleaner-core/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">bmabey/database_cleaner</remote-id>
+    <remote-id type="github">DatabaseCleaner/database_cleaner</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/database_cleaner/Manifest b/dev-ruby/database_cleaner/Manifest
index 3dc6e40e5904..262aae73ba55 100644
--- a/dev-ruby/database_cleaner/Manifest
+++ b/dev-ruby/database_cleaner/Manifest
@@ -1,2 +1 @@
-DIST database_cleaner-1.7.0.gem 32256 BLAKE2B 496a1f02bb34aa2210e91367ade3575884e5c68ed18d1ba076fe8a5a7b0c5303a8acedec198a3de4adeb8f85cb2147d1c1d3c1f7badfb890ca1c7df8ecd7eae7 SHA512 4bdf6c66a0530a65ce2c746ff5190ef0aa42ab3d3ed787fbfe9c00de99d7ba816de3b6ad11cbaf4887760b9a19178f9968b8d604bc023dce83ec9ef748c0e336
-DIST database_cleaner-2.0.1.gem 4608 BLAKE2B 9cd2d7028a95089aa7c1e6744305724977a395136de9f1672094ca5faf48dfe875cb23d68465b78a3a00798badb1dfeb14d7bdf00a637e2e8680da32286d67e6 SHA512 e1acbf853feecbd46ce1bf021b0b8cbc96c9697d5c61ab1a2f4f92005b779102cd1ffd9bb81eae94a94d0c4a50e0bd7f55d28f0b4fdd6596f677f37edb01ca38
+DIST database_cleaner-2.0.2.gem 4608 BLAKE2B 893c17ee9d91201c84c682f38fd4175467157d9f0cbe1ba45c7e41476054174f9e80ff38e83a7a3ebc620b3a56ca2be00e8da6ef17b363a43936441d95e64b76 SHA512 4fd2be039f7e21c766bc20b9a8f20153d6ce45e5b8bf1a3927432da73abe3b36adc1a7b71c5cfbc05cff54652cf67327ed03a197692cf3d86ca22fabcb60fa25
diff --git a/dev-ruby/database_cleaner/database_cleaner-1.7.0.ebuild b/dev-ruby/database_cleaner/database_cleaner-1.7.0.ebuild
deleted file mode 100644
index 78de140ccbb4..000000000000
--- a/dev-ruby/database_cleaner/database_cleaner-1.7.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_DOC="examples"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.markdown TODO"
-
-# There are specs and features but they all require configured databases.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Strategies for cleaning databases"
-HOMEPAGE="https://github.com/bmabey/database_cleaner"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/database_cleaner/database_cleaner-2.0.1.ebuild b/dev-ruby/database_cleaner/database_cleaner-2.0.1.ebuild
deleted file mode 100644
index 8533fce64b78..000000000000
--- a/dev-ruby/database_cleaner/database_cleaner-2.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-# There are specs and features but they all require configured databases.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Strategies for cleaning databases"
-HOMEPAGE="https://github.com/bmabey/database_cleaner"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/database_cleaner-active_record:2.0"
diff --git a/dev-ruby/database_cleaner/database_cleaner-2.0.2.ebuild b/dev-ruby/database_cleaner/database_cleaner-2.0.2.ebuild
new file mode 100644
index 000000000000..b044ed3bd1b9
--- /dev/null
+++ b/dev-ruby/database_cleaner/database_cleaner-2.0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+# There are specs and features but they all require configured databases.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Strategies for cleaning databases"
+HOMEPAGE="https://github.com/DatabaseCleaner/database_cleaner"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+ruby_add_rdepend "dev-ruby/database_cleaner-active_record:2.1"
diff --git a/dev-ruby/database_cleaner/metadata.xml b/dev-ruby/database_cleaner/metadata.xml
index 34c8f531e58a..da86a1c09f5c 100644
--- a/dev-ruby/database_cleaner/metadata.xml
+++ b/dev-ruby/database_cleaner/metadata.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
   <maintainer type="project">
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">bmabey/database_cleaner</remote-id>
+    <remote-id type="github">DatabaseCleaner/database_cleaner</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/date/Manifest b/dev-ruby/date/Manifest
index 8baef840e9d3..b1c73b24510f 100644
--- a/dev-ruby/date/Manifest
+++ b/dev-ruby/date/Manifest
@@ -1 +1,2 @@
-DIST date-3.2.2.tar.gz 108973 BLAKE2B aedb4d5d43b1d7ac277bc6fd36651f36828be7a04f4eb75c45ea02bc56b3a403af9e8a26b23a9839c904ae455e6a02476fe83115d8c816f06168db6e0a788347 SHA512 5a640b550c9ea0c1fa24aa5d114ae9108fd568c8c38b20434168a92c886d66487065e0c6aedc7e55cbe59cc3338fd262ca601267ed0b55377c382fe0502e9604
+DIST date-3.3.3.tar.gz 109793 BLAKE2B c7ee6337a520172b692a48c963a67d7fe7f6f56dd6ea5a957eda32d7c21fee7d02d0616f39c32abf61ae5f33f6507c508e98c568fd8f7baf300dfc5658945917 SHA512 a2224fa191fd688593af29b95e40f67e9fb9acea93b7de613d9c4b105343434a9ef30f32599cd6af243dd3e35a9bf1f60b722e6a0bc4393e26e83734196e8193
+DIST date-3.3.4.tar.gz 99252 BLAKE2B a8fe8f4a716bb4247f00b94f2c9564a34df8fdd43d2345cfc529541bbfbf0549df1e0aac0d120de6b4cc6e6ea8e6fc38ee87cc36b16ddafb2c4589b8e96c04bd SHA512 d8b71c56316224ef7d5f0c7515adc9540eea784daa49f3c130dbbe1fcd2a90abc85b153bbca66809666c817597733f03f5acc06e883878ecc5ede3eab398c348
diff --git a/dev-ruby/date/date-3.2.2.ebuild b/dev-ruby/date/date-3.2.2.ebuild
deleted file mode 100644
index 49bab8d1e38f..000000000000
--- a/dev-ruby/date/date-3.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTENSIONS=(ext/date/extconf.rb)
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="date.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A subclass of Object includes Comparable module for handling dates"
-HOMEPAGE="https://github.com/ruby/date"
-SRC_URI="https://github.com/ruby/date/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -e 's/__dir__/"."/' \
-		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/date/date-3.3.3.ebuild b/dev-ruby/date/date-3.3.3.ebuild
new file mode 100644
index 000000000000..b5e1a3cf4ece
--- /dev/null
+++ b/dev-ruby/date/date-3.3.3.ebuild
@@ -0,0 +1,33 @@
+# 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/date/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="date.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A subclass of Object includes Comparable module for handling dates"
+HOMEPAGE="https://github.com/ruby/date"
+SRC_URI="https://github.com/ruby/date/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/date/date-3.3.4.ebuild b/dev-ruby/date/date-3.3.4.ebuild
new file mode 100644
index 000000000000..7b87d468a8bd
--- /dev/null
+++ b/dev-ruby/date/date-3.3.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/date/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="date.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A subclass of Object includes Comparable module for handling dates"
+HOMEPAGE="https://github.com/ruby/date"
+SRC_URI="https://github.com/ruby/date/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/date_validator/Manifest b/dev-ruby/date_validator/Manifest
index 30b094912f1b..4e51a0081efa 100644
--- a/dev-ruby/date_validator/Manifest
+++ b/dev-ruby/date_validator/Manifest
@@ -1,2 +1 @@
-DIST date_validator-0.11.0.gem 12800 BLAKE2B ce45caa57bd1e29900ed0732bdbfbf81c68836de71efbf099bdc595a9b586872175960af40129af6d793ed5ce49ba222a3ca7d0172ef764ee02c88f4eae04e9e SHA512 269f3e234c8157a667c81d725497eafd21621cd35811f35707590242a3dc78065bd6dbe7b772a38761fdb8c95ae40f99976919444dac061f7bd2150fc9178afa
 DIST date_validator-0.12.0.gem 12800 BLAKE2B 235434dbd7e4441698bc90e0dd37bf9e5b8f1f742424e8155876e677e5d7dbe7beb4edd2f7dda7dba2729a024dcda72ac816e4f6a7dd38fdfaa4ea79f21d078e SHA512 e7796375d6d6af2fc9ce6e7d6174d59bd35ddbac90c4e5b54b321e33ed25f3e816c58013fa61f2003724e87fc96495ce81c132d056c9c9331bd1a236eb7dec38
diff --git a/dev-ruby/date_validator/date_validator-0.11.0.ebuild b/dev-ruby/date_validator/date_validator-0.11.0.ebuild
deleted file mode 100644
index 8d4f4549e483..000000000000
--- a/dev-ruby/date_validator/date_validator-0.11.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_EXTRADOC="Readme.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-# if ever needed
-#GITHUB_USER="codegram"
-#GITHUB_PROJECT="${PN}"
-#RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails"
-HOMEPAGE="https://github.com/codegram/date_validator"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activemodel-3.0:*
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest
-		>=dev-ruby/tzinfo-0.3
-		>=dev-ruby/activesupport-3.0
-	)
-	doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/git ls-files/d' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i \
-		-e '/[Bb]undler/s/^/#/' Rakefile || die
-	# Fix tests
-	sed -i -e "1irequire 'active_support'; require 'active_support/core_ext/time/zones'" test/test_helper.rb || die
-}
diff --git a/dev-ruby/date_validator/date_validator-0.12.0.ebuild b/dev-ruby/date_validator/date_validator-0.12.0.ebuild
index 448676dfb742..8b174b7e9552 100644
--- a/dev-ruby/date_validator/date_validator-0.12.0.ebuild
+++ b/dev-ruby/date_validator/date_validator-0.12.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
diff --git a/dev-ruby/dbf/Manifest b/dev-ruby/dbf/Manifest
index c92802a39038..0b27b4947040 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -1,3 +1,3 @@
-DIST dbf-4.1.3.gem 127488 BLAKE2B aff62a0cfe636b987989a21ed5df2094ad09748603a73df42d02f8bbe1032031493d038267b7c33d928d71d164076194dbd97331e36d1e8cb2472747c92e8b7d SHA512 4baf9f69310656ba191643b315576c1020a24cec19740ce543f349996067293798989b4e203861392cbec6f06bb117b51a1f4358a6122f5e2abb9b44edf26cc9
-DIST dbf-4.1.6.gem 217088 BLAKE2B 5d0808884aaab5585e7477287539849e9386353490ec43392e8b1a1eafc1edb7b0b33b9862783c3371e3f5b02f54d9e22409868a62763950691e33552363db44 SHA512 c21aff8cebf3a8eb8b43e9b0a2a9401ddbe83c7624c2512631c1e6ab0877c49e838f8193ce6579c35441069b748b88c7bf2314b98286ee1770dcacd760722939
-DIST dbf-4.2.0.gem 218112 BLAKE2B 701939004fefa45132924ac47dc8bc908cbe5385baae86cd4b2117668a13cff3df72f4e8146000b31d3c232795eabf386e6550d05cf76587a7340189bc2162a3 SHA512 715b541d86f0737d16ed5a5609f23ae64cc07c213a3ad0c2abf6f9b731d11e460b940c6c3996229e14f744fc5c43ec0e38e705d6bd553ae26681e4bf16eac8a3
+DIST dbf-4.2.4.gem 128000 BLAKE2B 21b8a08ade1a87237868879b895d0a943fa9b971775922ba1cb30fb59f9477281f0bdcd4b3d6d3c01c3bfda6e18baf29551c14fdf1637b35d5f6d08646cdd33f SHA512 3f8f6b6a14f559a84f1efc7054366f5250fd473dd9846ec6d689a25673a564a97592e7efae78b1a11eae4d6497e115f2c2766d5badd878d332f11ad80f5f5f98
+DIST dbf-4.3.0.gem 128000 BLAKE2B f477f294d11622f4106ba825dbe03c2128c59dba5be27e28be8848812b9622312eaf41bec0c23e5e310f138725ae3fd8cfe949d1139a0db0057d2cc0de59d738 SHA512 e3046a5ca8207f95aa7195637b0aed4379c05511dd355cf27afc8a0c63c938ae5773469834e5c43a47d7f08580ad2c35691a0de063b646d2fbab658f99f0bc2e
+DIST dbf-4.3.2.gem 128000 BLAKE2B 0b86aaa024e40da731bf367e526db8551ea9a51aabfdb07117665a8ab817ff75f505e1481ff57018763310ebfbb545f23453282af1a9eaf549aae91e8eb07ed9 SHA512 8454c3946657cd51ad774a4acd1b548ef2a010518f2f1168898346153a199984215257e327bca16bc618011d447239fa35897424445a749167a846d3564b36f8
diff --git a/dev-ruby/dbf/dbf-4.1.3.ebuild b/dev-ruby/dbf/dbf-4.1.3.ebuild
deleted file mode 100644
index ab922a768cc3..000000000000
--- a/dev-ruby/dbf/dbf-4.1.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/*"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a small fast library for reading dBase, xBase, Clipper and FoxPro
-database files"
-HOMEPAGE="https://github.com/infused/dbf"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/dev-ruby/dbf/dbf-4.1.6.ebuild b/dev-ruby/dbf/dbf-4.1.6.ebuild
deleted file mode 100644
index a4db00c12b53..000000000000
--- a/dev-ruby/dbf/dbf-4.1.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="docs"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a small fast library for reading dBase, xBase, Clipper and FoxPro
-database files"
-HOMEPAGE="https://github.com/infused/dbf"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-ruby/dbf/dbf-4.2.0.ebuild b/dev-ruby/dbf/dbf-4.2.0.ebuild
deleted file mode 100644
index 9cb0c52cd377..000000000000
--- a/dev-ruby/dbf/dbf-4.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="docs"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a small fast library for reading dBase, xBase, Clipper and FoxPro
-database files"
-HOMEPAGE="https://github.com/infused/dbf"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-ruby/dbf/dbf-4.2.4.ebuild b/dev-ruby/dbf/dbf-4.2.4.ebuild
new file mode 100644
index 000000000000..7f68351f26c6
--- /dev/null
+++ b/dev-ruby/dbf/dbf-4.2.4.ebuild
@@ -0,0 +1,21 @@
+# 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_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="docs"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Small fast library for reading dBase, xBase, Clipper, FoxPro databases"
+HOMEPAGE="https://github.com/infused/dbf"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
diff --git a/dev-ruby/dbf/dbf-4.3.0.ebuild b/dev-ruby/dbf/dbf-4.3.0.ebuild
new file mode 100644
index 000000000000..c1108d62c91c
--- /dev/null
+++ b/dev-ruby/dbf/dbf-4.3.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="docs"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Small fast library for reading dBase, xBase, Clipper, FoxPro databases"
+HOMEPAGE="https://github.com/infused/dbf"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-ruby/dbf/dbf-4.3.2.ebuild b/dev-ruby/dbf/dbf-4.3.2.ebuild
new file mode 100644
index 000000000000..95eb8d4e54c0
--- /dev/null
+++ b/dev-ruby/dbf/dbf-4.3.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="docs"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Small fast library for reading dBase, xBase, Clipper, FoxPro databases"
+HOMEPAGE="https://github.com/infused/dbf"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-ruby/ddmemoize/Manifest b/dev-ruby/ddmemoize/Manifest
deleted file mode 100644
index 8a3577a94069..000000000000
--- a/dev-ruby/ddmemoize/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ddmemoize-1.0.0.gem 11776 BLAKE2B 3acf18cc70aed6c35ee98f42e6004ae13c623299abb0e8a3c0dbe7e7908775b9b6e2f81cc2977e4ca04ad584e7b5c43219979187448e3c87e6abc2d78a1c8f15 SHA512 b0a4c825c789f578031d12ff38f204bb5256db769fe71fcda98f1ab23a3d61c9d9d6cc486a2bfa566c1ea1fc8617b2563e97f05eac40b7587f35c618fd495eb2
diff --git a/dev-ruby/ddmemoize/ddmemoize-1.0.0-r1.ebuild b/dev-ruby/ddmemoize/ddmemoize-1.0.0-r1.ebuild
deleted file mode 100644
index dda4c1794412..000000000000
--- a/dev-ruby/ddmemoize/ddmemoize-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Adds support for memoizing functions"
-HOMEPAGE="https://github.com/ddfreyne/ddmemoize/"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~riscv"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/ddmetrics:1
-	dev-ruby/ref:2
-"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^SimpleCov.formatter/ s:^:#:' \
-		-e '/fuubar/,/^end/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/ddmemoize/ddmemoize-1.0.0.ebuild b/dev-ruby/ddmemoize/ddmemoize-1.0.0.ebuild
deleted file mode 100644
index a9ccc830c262..000000000000
--- a/dev-ruby/ddmemoize/ddmemoize-1.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Adds support for memoizing functions"
-HOMEPAGE="https://github.com/ddfreyne/ddmemoize/"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~riscv"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/ddmetrics:1
-	dev-ruby/ref:2
-"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^SimpleCov.formatter/ s:^:#:' \
-		-e '/fuubar/,/^end/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/ddmemoize/metadata.xml b/dev-ruby/ddmemoize/metadata.xml
deleted file mode 100644
index 5488a1f97cf0..000000000000
--- a/dev-ruby/ddmemoize/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ddfreyne/ddmemoize</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ddmetrics/Manifest b/dev-ruby/ddmetrics/Manifest
index d092dc836cda..43a5be7a8b3b 100644
--- a/dev-ruby/ddmetrics/Manifest
+++ b/dev-ruby/ddmetrics/Manifest
@@ -1 +1 @@
-DIST ddmetrics-1.0.1.gem 15872 BLAKE2B de0fbb540c45b84c36c37b652f1a987c49d416e63aff644950091f4a84a76338590e1ce62e20df092488bd43af566dfcdb4a056d57ae306f7f3855bba43326f7 SHA512 d3b97bbcfe12a666c0bf28abc076510bb1ceb8e6f0ebda3ff40bba64da50bbb2995beb09da9b2c03b8e54271b143bc0703fb1d0b1db729d092281138ba717b3c
+DIST ddmetrics-1.1.0.gem 18432 BLAKE2B 8a9b6c0555731241f77057c502962e11a0eefb771b91f30f9df8fe4277c84d8b5c50569b8758134fe0f946e9ed3dec6ebb881edd4fedb8acba2741fa0695d042 SHA512 89bd29cf0f69ae7dba017765721d9b9662cb46d03d40a7c5524d72e5be3441a6372f61360bec8a2a36403db8ae2321dfbc23c05a515bcc79824e5b69d892f054
diff --git a/dev-ruby/ddmetrics/ddmetrics-1.0.1-r1.ebuild b/dev-ruby/ddmetrics/ddmetrics-1.0.1-r1.ebuild
deleted file mode 100644
index c3e526fb27ee..000000000000
--- a/dev-ruby/ddmetrics/ddmetrics-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-timeseries measurements for Ruby programs"
-HOMEPAGE="https://github.com/ddfreyne/ddmetrics/"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~riscv"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rspec-its dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' \
-		-e '/fuubar/ s:^:#:' \
-		-e '/RSpec.configure/,/end/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/ddmetrics/ddmetrics-1.1.0.ebuild b/dev-ruby/ddmetrics/ddmetrics-1.1.0.ebuild
new file mode 100644
index 000000000000..1a9a0dd826e3
--- /dev/null
+++ b/dev-ruby/ddmetrics/ddmetrics-1.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Non-timeseries measurements for Ruby programs"
+HOMEPAGE="https://github.com/denisdefreyne/ddmetrics/"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~riscv"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-its dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/fuubar/ s:^:#:' \
+		-e '/RSpec.configure/,/end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/ddmetrics/metadata.xml b/dev-ruby/ddmetrics/metadata.xml
index a89c9ad64ebd..7f9676994366 100644
--- a/dev-ruby/ddmetrics/metadata.xml
+++ b/dev-ruby/ddmetrics/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">ddfreyne/ddmetrics</remote-id>
+    <remote-id type="github">denisdefreyne/ddmetrics</remote-id>
+    <remote-id type="rubygems">ddmetrics</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ddplugin/ddplugin-1.0.3-r1.ebuild b/dev-ruby/ddplugin/ddplugin-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..840356ef3383
--- /dev/null
+++ b/dev-ruby/ddplugin/ddplugin-1.0.3-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides plugin management for Ruby projects"
+HOMEPAGE="https://github.com/ddfreyne/ddplugin/"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~riscv"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/coverall/I s:^:#:' test/helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/ddplugin/ddplugin-1.0.3.ebuild b/dev-ruby/ddplugin/ddplugin-1.0.3.ebuild
deleted file mode 100644
index 9cc0a66225ac..000000000000
--- a/dev-ruby/ddplugin/ddplugin-1.0.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides plugin management for Ruby projects"
-HOMEPAGE="https://github.com/ddfreyne/ddplugin/"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~riscv"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/coverall/I s:^:#:' test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/debug/Manifest b/dev-ruby/debug/Manifest
new file mode 100644
index 000000000000..6e67d03b7652
--- /dev/null
+++ b/dev-ruby/debug/Manifest
@@ -0,0 +1,2 @@
+DIST debug-1.9.1.tar.gz 164276 BLAKE2B e34768dfc49230e78ffa7c5277bf80ba9abb34ac82822981e53bfb0326fb5754ae6e66946a8da8589e25aab6f5c388b266acc0a5fdf27392a570c97f90e46ea1 SHA512 eefd074968af7032410f62a0a37792fb261b3d7c1cc759d1838016bcc264baa1f205c935d76f4a8aed7ea892698d80de7db48fba1e0efd067b9b1bac9577be66
+DIST debug-1.9.2.tar.gz 167216 BLAKE2B 60696aa1e7fa3bebdfc8015a9a38d804ad64e4725e9fb08ce92c646758cbb2e3e41a7ecd97ed2f5a833a7832d1d8f7e9fe1bbe25667d17724cdc72afe241e27f SHA512 b65e7952f0020f79481273175abc382827283f667c52a29eee4f77303368e65ff71c517f8cd278b011ae81c335281d4303ab83e6c5d5c71cab9784cee56b8c63
diff --git a/dev-ruby/debug/debug-1.9.1.ebuild b/dev-ruby/debug/debug-1.9.1.ebuild
new file mode 100644
index 000000000000..e43731d48e9a
--- /dev/null
+++ b/dev-ruby/debug/debug-1.9.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="TODO.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/debug/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/debug"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Debugging functionality for Ruby"
+HOMEPAGE="https://github.com/ruby/debug"
+SRC_URI="https://github.com/ruby/debug/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="$(ver_cut 1)"
+
+# Avoid tests for now since the results in a very deep dependency list for ruby32
+#ruby_add_depend "test? ( dev-ruby/rr )"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/irb-1.10
+	>=dev-ruby/reline-0.3.8
+"
+
+all_ruby_prepare() {
+	sed -i -e "s:require_relative ':require './:" -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/debug/debug-1.9.2.ebuild b/dev-ruby/debug/debug-1.9.2.ebuild
new file mode 100644
index 000000000000..684a22aacf92
--- /dev/null
+++ b/dev-ruby/debug/debug-1.9.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="TODO.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/debug/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/debug"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Debugging functionality for Ruby"
+HOMEPAGE="https://github.com/ruby/debug"
+SRC_URI="https://github.com/ruby/debug/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="$(ver_cut 1)"
+
+# Avoid tests for now since the results in a very deep dependency list for ruby32
+#ruby_add_depend "test? ( dev-ruby/rr )"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/irb-1.10
+	>=dev-ruby/reline-0.3.8
+"
+
+all_ruby_prepare() {
+	sed -i -e "s:require_relative ':require './:" -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/debug/metadata.xml b/dev-ruby/debug/metadata.xml
new file mode 100644
index 000000000000..864ac37653a0
--- /dev/null
+++ b/dev-ruby/debug/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/debug</remote-id>
+    <remote-id type="rubygems">debug</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/debug_inspector/Manifest b/dev-ruby/debug_inspector/Manifest
index edd3e524e08b..f82742f89674 100644
--- a/dev-ruby/debug_inspector/Manifest
+++ b/dev-ruby/debug_inspector/Manifest
@@ -1 +1,2 @@
 DIST debug_inspector-1.1.0.tar.gz 5837 BLAKE2B 49f2c4b8b872ad2be0e6c41d02f7cb64e3f2928e8f02e06ed99f2f2befffe1da4c25024a2069b8d2f19dc71ab182459f6cf75c5b717662e5cfab16a5b66cf41f SHA512 c66d5bf412d9b6a61f456e943a901dbe9018cf92c171e1a7d9a19807c7894ffdb6acaeaed2c8f688927130a14909d0e0714e5b728ad7ccbff0e5f1c0ad20c600
+DIST debug_inspector-1.2.0.tar.gz 6091 BLAKE2B 9f0f584f854ee08b220fd1753c88684cb3b17c009ded18b1f26f38c8c5d67ced7bbd3dbd1ff16c01d8c527ab270d999d4a434f362ebf2b906a887f5952d370b7 SHA512 e4328b1e36c1b196219d7e278dec2da730293857a6eb147e653f9ab6ca3628f6115f7661a98f0ca828a1a9657394aeb1392f71842a5833d8bb1c438567d4096f
diff --git a/dev-ruby/debug_inspector/debug_inspector-1.1.0-r1.ebuild b/dev-ruby/debug_inspector/debug_inspector-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..12619b58d005
--- /dev/null
+++ b/dev-ruby/debug_inspector/debug_inspector-1.1.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/debug_inspector/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="debug_inspector.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby wrapper for the MRI 2.0 debug_inspector API"
+HOMEPAGE="https://github.com/banister/debug_inspector"
+SRC_URI="https://github.com/banister/debug_inspector/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/extensiontask/,$ s:^:#:' Rakefile || die
+
+	sed -i -e 's/MiniTest/Minitest/' test/basic_test.rb || die
+}
diff --git a/dev-ruby/debug_inspector/debug_inspector-1.1.0.ebuild b/dev-ruby/debug_inspector/debug_inspector-1.1.0.ebuild
deleted file mode 100644
index 4b48f59684fa..000000000000
--- a/dev-ruby/debug_inspector/debug_inspector-1.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/debug_inspector/extconf.rb)
-
-RUBY_FAKEGEM_GEMSPEC="debug_inspector.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby wrapper for the MRI 2.0 debug_inspector API"
-HOMEPAGE="https://github.com/banister/debug_inspector"
-SRC_URI="https://github.com/banister/debug_inspector/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/extensiontask/,$ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/debug_inspector/debug_inspector-1.2.0.ebuild b/dev-ruby/debug_inspector/debug_inspector-1.2.0.ebuild
new file mode 100644
index 000000000000..e14bbad65d44
--- /dev/null
+++ b/dev-ruby/debug_inspector/debug_inspector-1.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/debug_inspector/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="debug_inspector.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby wrapper for the MRI 2.0 debug_inspector API"
+HOMEPAGE="https://github.com/banister/debug_inspector"
+SRC_URI="https://github.com/banister/debug_inspector/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/extensiontask/,$ s:^:#:' Rakefile || die
+
+	sed -i -e 's/MiniTest/Minitest/' test/basic_test.rb || die
+}
diff --git a/dev-ruby/deckar01-task_list/Manifest b/dev-ruby/deckar01-task_list/Manifest
new file mode 100644
index 000000000000..254da27ff91c
--- /dev/null
+++ b/dev-ruby/deckar01-task_list/Manifest
@@ -0,0 +1,2 @@
+DIST deckar01-task_list-2.3.3.gem 66560 BLAKE2B 3423a2b18e27fb44dcedb9df786430033c8d6f314b9995193d91ab8d35f569210b3189b55b4a77bbba8d93b7316e6d2a04e2b605ba74adac776f716fcc236b0f SHA512 3331b9e1f5e110b4777da5887cf5f8691f156203ae62e8f5c5bad92c9bc60fb441bdd41f71bce2dbee94bc19c6943f6c21eaad1348ce4094148a6cb2ec98d148
+DIST deckar01-task_list-2.3.4.gem 66560 BLAKE2B e7ee4bcdbf620d8f3d7da045c0c6c916e04ba62895ac2b5489d9d0b5a558c07f4787a3391c5a0bec66c9865cd91e2df1c4437f889237fe1d24c2a8bd2fc7476c SHA512 ec551e9dbad829c99debbe0e385968a98e021db96afb7d8414dac627896b9b14e38345078c4e6a40905b956fd8552cefa1668d76e4a1055af64ebddb14c7b0a3
diff --git a/dev-ruby/deckar01-task_list/deckar01-task_list-2.3.3.ebuild b/dev-ruby/deckar01-task_list/deckar01-task_list-2.3.3.ebuild
new file mode 100644
index 000000000000..731f5450ae4c
--- /dev/null
+++ b/dev-ruby/deckar01-task_list/deckar01-task_list-2.3.3.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="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Markdown TaskList components"
+HOMEPAGE="https://github.com/deckar01/task_list"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/html-pipeline
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/commonmarker
+	dev-ruby/coffee-script
+	dev-ruby/json
+	dev-ruby/rack
+	dev-ruby/sprockets
+)"
diff --git a/dev-ruby/deckar01-task_list/deckar01-task_list-2.3.4.ebuild b/dev-ruby/deckar01-task_list/deckar01-task_list-2.3.4.ebuild
new file mode 100644
index 000000000000..2f5491f2c022
--- /dev/null
+++ b/dev-ruby/deckar01-task_list/deckar01-task_list-2.3.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Markdown TaskList components"
+HOMEPAGE="https://github.com/deckar01/task_list"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/html-pipeline
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/commonmarker
+	dev-ruby/coffee-script
+	dev-ruby/json
+	dev-ruby/rack
+	dev-ruby/sprockets
+)"
diff --git a/dev-ruby/deckar01-task_list/metadata.xml b/dev-ruby/deckar01-task_list/metadata.xml
new file mode 100644
index 000000000000..8948e6ca26ca
--- /dev/null
+++ b/dev-ruby/deckar01-task_list/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">deckar01/task_list</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/deep_merge/Manifest b/dev-ruby/deep_merge/Manifest
index d69ef8899719..6f9b32971145 100644
--- a/dev-ruby/deep_merge/Manifest
+++ b/dev-ruby/deep_merge/Manifest
@@ -1,2 +1 @@
-DIST deep_merge-1.2.1.gem 14336 BLAKE2B c122eddaf63fd885f82b292ea7d1f2b6a9a9dd50731e77b856fd02284634a699b7897a12c1856732c77b4d8ffc9f6efe06f792f42d53236a521279bff13b6dce SHA512 ef93e0c4c6a8f389338ea30b2b53271f089b0b8275adf6fc74e7d15a2faf32d62a1b297af9d31c42cb5d816066428c8407a82d874fad14d64384098fc3c5c70c
 DIST deep_merge-1.2.2.gem 14848 BLAKE2B cb79bfd2c4499b3578cb493e4a9d664a44672f01941c88f559aa110732f6fb19d3e18e32274e666a5021e35995a3f0afcdea57fcefd9ff0eb675aafdb5d6eb8d SHA512 58c6dd789812c5010a4019ec731a21dac70c135fcf54701c82fca7b43842199d8eb41c3dec3926cd953d3e5ed14039384dc270e06de5922bc438f98c6d1132a1
diff --git a/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild b/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild
deleted file mode 100644
index 6c08756662fa..000000000000
--- a/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple set of utility functions for Hash"
-HOMEPAGE="http://trac.misuse.org/science/wiki/DeepMerge"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-each_ruby_test() {
-	${RUBY} -I lib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/deep_merge/deep_merge-1.2.2.ebuild b/dev-ruby/deep_merge/deep_merge-1.2.2.ebuild
index 4398b4fe5c42..28cf571b84a9 100644
--- a/dev-ruby/deep_merge/deep_merge-1.2.2.ebuild
+++ b/dev-ruby/deep_merge/deep_merge-1.2.2.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/danielsdeleo/deep_merge"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 each_ruby_test() {
diff --git a/dev-ruby/deep_merge/metadata.xml b/dev-ruby/deep_merge/metadata.xml
index 658c72b1920d..439ca4bac0b7 100644
--- a/dev-ruby/deep_merge/metadata.xml
+++ b/dev-ruby/deep_merge/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">danielsdeleo/deep_merge</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/delayer-deferred/delayer-deferred-2.2.0-r1.ebuild b/dev-ruby/delayer-deferred/delayer-deferred-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..c867a2f86b3d
--- /dev/null
+++ b/dev-ruby/delayer-deferred/delayer-deferred-2.2.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby implementation of JSDeferred"
+HOMEPAGE="https://github.com/toshia/delayer-deferred"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/delayer:1"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile test/helper.rb || die
+	sed -i -e '/simplecov/,/^end/ s:^:#:' test/helper.rb || die
+	sed -i -e '/pry/ s:^:#:' test/sleep_test.rb || die
+}
diff --git a/dev-ruby/delayer-deferred/delayer-deferred-2.2.0.ebuild b/dev-ruby/delayer-deferred/delayer-deferred-2.2.0.ebuild
deleted file mode 100644
index 41589bc45cbf..000000000000
--- a/dev-ruby/delayer-deferred/delayer-deferred-2.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby implementation of JSDeferred"
-HOMEPAGE="https://github.com/toshia/delayer-deferred"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/delayer:1"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile test/helper.rb || die
-	sed -i -e '/simplecov/,/^end/ s:^:#:' test/helper.rb || die
-	sed -i -e '/pry/ s:^:#:' test/sleep_test.rb || die
-}
diff --git a/dev-ruby/delayer/delayer-1.2.1-r1.ebuild b/dev-ruby/delayer/delayer-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..d1ea0defe8a9
--- /dev/null
+++ b/dev-ruby/delayer/delayer-1.2.1-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Delay the processing"
+HOMEPAGE="https://rubygems.org/gems/delayer"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' Rakefile ${PN}.gemspec test/test_*.rb || die "sed failed"
+}
diff --git a/dev-ruby/delayer/delayer-1.2.1.ebuild b/dev-ruby/delayer/delayer-1.2.1.ebuild
index 30b886fe551d..2794a86fe6fc 100644
--- a/dev-ruby/delayer/delayer-1.2.1.ebuild
+++ b/dev-ruby/delayer/delayer-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# 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_EXTRADOC="README.md"
 
diff --git a/dev-ruby/dependor/dependor-1.0.1-r1.ebuild b/dev-ruby/dependor/dependor-1.0.1-r1.ebuild
index 2fc78ef81b5f..102995d6e2d4 100644
--- a/dev-ruby/dependor/dependor-1.0.1-r1.ebuild
+++ b/dev-ruby/dependor/dependor-1.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/deprecated/Manifest b/dev-ruby/deprecated/Manifest
deleted file mode 100644
index 406c80c9b870..000000000000
--- a/dev-ruby/deprecated/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST deprecated-3.0.1.gem 6144 BLAKE2B 69ef1b95168ada9e66dda556d0c6731109b2b7845f8c4be0ba75749f2e7af092c3b800d0334c4cd1c555905c09bb12dd945f4692eabf0155fc32f4ea380c52da SHA512 c4280f8bd6914a6b073cbc443db5dd5232379abb7870d90cd0146c08312f82aa8fd8c042b48c2b9b26c4120dc8afb326070a1256c51355f1cfa898905ec59e51
diff --git a/dev-ruby/deprecated/deprecated-3.0.1-r3.ebuild b/dev-ruby/deprecated/deprecated-3.0.1-r3.ebuild
deleted file mode 100644
index 1f2537e99cb1..000000000000
--- a/dev-ruby/deprecated/deprecated-3.0.1-r3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby library for handling deprecated code"
-HOMEPAGE="https://github.com/erikh/deprecated"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="amd64 ppc x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:. test/test_deprecated.rb || die "test failed"
-}
diff --git a/dev-ruby/deprecated/metadata.xml b/dev-ruby/deprecated/metadata.xml
deleted file mode 100644
index d7b4ccaf7eca..000000000000
--- a/dev-ruby/deprecated/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">erikh/deprecated</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/descendants_tracker/descendants_tracker-0.0.4-r1.ebuild b/dev-ruby/descendants_tracker/descendants_tracker-0.0.4-r1.ebuild
index 57def8104230..d659f875772c 100644
--- a/dev-ruby/descendants_tracker/descendants_tracker-0.0.4-r1.ebuild
+++ b/dev-ruby/descendants_tracker/descendants_tracker-0.0.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/did_you_mean/Manifest b/dev-ruby/did_you_mean/Manifest
index 8495455aabf9..34d16b9aa10b 100644
--- a/dev-ruby/did_you_mean/Manifest
+++ b/dev-ruby/did_you_mean/Manifest
@@ -1,3 +1 @@
-DIST did_you_mean-1.4.0.gem 33792 BLAKE2B 9052b7ba7028f963595eeb79e668296b48db8659bd07c6e00076efc372f6c64eb3ad81981013bf0ae3c37b942a459146af96fa001ba225ebf1f5486d717a7a55 SHA512 bd8e47e5d0135807d1ec0a5dbf536649cbaca13fd056cefc6f57293b7869608ef92a8cdcbaf4a4c4453738ecbe8a6d8bc450826a8dadb46fc69560ed05a97f2d
-DIST did_you_mean-1.5.0.gem 34304 BLAKE2B deefea833d1fe12733a6b1422e5ae43d0cfa7ff7ddc49665762a83866634ccd0a440e5a3b351cff6d9d308e85de0490d56d7b675d582f090e0e4fb07186c197f SHA512 7fa4cce3fb895bf026788bb5d558f88d4ddb62b7cae1e284969dc4f0570e88871d5f103514da2c9d79399dcf10ffc845a594afc9c676e90cbca4d5a38d74d7f8
-DIST did_you_mean-1.6.1.gem 35840 BLAKE2B 618e11c23135edac66cea95c0cc4212045fcced1148c46543ba243b5993e577c0ae610e168b6b3b5b178c1642ff47436ea765b4880f6cb0da505931e9643b197 SHA512 3d29ed5ea25d163963c7281be2f70d08b47f7aeedf997674e5bcab11d6dacf231ae48a5c9d2a9fcee9ca607883867a5b39c59184da722ad0f822730747380ea6
+DIST did_you_mean-1.6.3.gem 47104 BLAKE2B 48ae99218c9295a0c9a17825020e875a2ecfcf76b33859b157cfb40279574b257c58973f4b0b16f773522ea9e9d08dc13ab316d4408363aed23323da74cc2207 SHA512 5452afd2bd50d2b77d1695c83c956cf6c3a8d897e9cb3cbc372a9bc8a7d84550829ee837350a1aa55ad9ebc129b92ba78aabb9fbc266311fdc5b4b0d6ddf33d3
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild
deleted file mode 100644
index d51b2d34489a..000000000000
--- a/dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="'did you mean?'experience in Ruby"
-HOMEPAGE="https://github.com/yuki24/did_you_mean"
-
-LICENSE="MIT"
-SLOT="2.6"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.5.0.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.5.0.ebuild
deleted file mode 100644
index 39f5de037118..000000000000
--- a/dev-ruby/did_you_mean/did_you_mean-1.5.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="'did you mean?'experience in Ruby"
-HOMEPAGE="https://github.com/yuki24/did_you_mean"
-
-LICENSE="MIT"
-SLOT="2.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.6.1.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.6.1.ebuild
deleted file mode 100644
index 8cdd9ac07f46..000000000000
--- a/dev-ruby/did_you_mean/did_you_mean-1.6.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="'did you mean?'experience in Ruby"
-HOMEPAGE="https://github.com/yuki24/did_you_mean"
-
-LICENSE="MIT"
-SLOT="2.6"
-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"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild
new file mode 100644
index 000000000000..184e2de4434f
--- /dev/null
+++ b/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="'did you mean?'experience in Ruby"
+HOMEPAGE="https://github.com/yuki24/did_you_mean"
+
+LICENSE="MIT"
+SLOT="2.6"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-ruby33.patch" )
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/did_you_mean/files/did_you_mean-1.6.3-ruby33.patch b/dev-ruby/did_you_mean/files/did_you_mean-1.6.3-ruby33.patch
new file mode 100644
index 000000000000..03108b6198f2
--- /dev/null
+++ b/dev-ruby/did_you_mean/files/did_you_mean-1.6.3-ruby33.patch
@@ -0,0 +1,33 @@
+From ef0c37a35ae1216f3c804daf436254c7dee710bc Mon Sep 17 00:00:00 2001
+From: Yusuke Endoh <mame@ruby-lang.org>
+Date: Sun, 19 Feb 2023 16:10:30 +0900
+Subject: [PATCH] Support the new message format of NameError in Ruby 3.3
+ (#184)
+
+This change accepts the following change of the message of NameError in
+a test.
+
+https://bugs.ruby-lang.org/issues/18285#note-37
+
+```
+old: undefined method `sizee' for #<File:...>
+new: undefined method `sizee' for an instance of File
+```
+---
+ test/core_ext/test_name_error_extension.rb | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/core_ext/test_name_error_extension.rb b/test/core_ext/test_name_error_extension.rb
+index 1fdbd45..c58b784 100644
+--- a/test/core_ext/test_name_error_extension.rb
++++ b/test/core_ext/test_name_error_extension.rb
+@@ -49,7 +49,7 @@ def test_correctable_error_objects_are_dumpable
+ 
+     get_message(error)
+ 
+-    assert_equal "undefined method `sizee' for #<File:test_name_error_extension.rb (closed)>",
+-                 Marshal.load(Marshal.dump(error)).original_message
++    assert_match(/^undefined method `sizee' for /,
++                 Marshal.load(Marshal.dump(error)).original_message)
+   end
+ end
diff --git a/dev-ruby/diff-lcs/Manifest b/dev-ruby/diff-lcs/Manifest
index bd69af06d19a..82610ea80a0c 100644
--- a/dev-ruby/diff-lcs/Manifest
+++ b/dev-ruby/diff-lcs/Manifest
@@ -1,2 +1,2 @@
-DIST diff-lcs-1.4.4.gem 50688 BLAKE2B 0b72890b147696425120f2dc71f8d741d993411bd8e76d130d3c12e3b4f451b0812a3cd34b09e653ec7024c616d7ffb4bd1c40303b66ca4a13e26c397d5913b6 SHA512 fcc6c86f392697c4b3690827f7c20d50fe68e367626b85a56446356d7bb21b4020bdb2bc5c2faf4e82807cd9f3049d71c94d166c85a1a4231f0fd9fc032f41c7
 DIST diff-lcs-1.5.0.gem 52736 BLAKE2B ff405fd3ed5238af3eba2ab4fa277edca0eec66df93b0e8d6fba1a52980d484623e57f70587de31fec1696e556f2ae90d82af4b856a9bd4a248de12aa74ada4a SHA512 5cef9dc1d143217cc402173e2b84ffdcbb8d5a4d05716bdbca732ac00d73591e4cab2f7e792382a3686d8e72fdc32269fd7100941d602ca6d683e7645229ef8d
+DIST diff-lcs-1.5.1.gem 53248 BLAKE2B a40399223c659b548e59605eb537faae8eff139cacf793fea6af1e543016f8afa80049490dccf915edb0063bd3d71705e47c6343e1f616903b8c12a6f37c8cf4 SHA512 ad0357a047b57bb0314b158f92e83485cec9fe6a3dfeb16117d57cf746ee38545f652397093448862ff36d13945bda3b26bb22b5d0d91643b16ae11548ef463b
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.4.4.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.4.4.ebuild
deleted file mode 100644
index 4abc1edb2aa6..000000000000
--- a/dev-ruby/diff-lcs/diff-lcs-1.4.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Use the McIlroy-Hunt LCS algorithm to compute differences"
-HOMEPAGE="https://github.com/halostatue/diff-lcs"
-
-LICENSE="|| ( MIT Ruby GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid specs failing due to missing fixtures. Should be fixed in the next version.
-	rm -f spec/ldiff_spec.rb || die
-}
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.5.0.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.5.0.ebuild
index 96193d839e37..b80c3802e940 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.5.0.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.5.0.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -13,7 +13,7 @@ inherit ruby-fakegem
 DESCRIPTION="Use the McIlroy-Hunt LCS algorithm to compute differences"
 HOMEPAGE="https://github.com/halostatue/diff-lcs"
 
-LICENSE="|| ( MIT Ruby GPL-2 )"
+LICENSE="|| ( Artistic MIT GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~x64-solaris"
 IUSE=""
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.5.1.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.5.1.ebuild
new file mode 100644
index 000000000000..6c8b61e3ef2f
--- /dev/null
+++ b/dev-ruby/diff-lcs/diff-lcs-1.5.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Use the McIlroy-Hunt LCS algorithm to compute differences"
+HOMEPAGE="https://github.com/halostatue/diff-lcs"
+
+LICENSE="|| ( Artistic MIT GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+each_ruby_prepare() {
+	# Use the current ruby to test script invocation
+	sed -e "/system/ s:ruby:${RUBY}:" \
+		-i spec/ldiff_spec.rb || die
+}
diff --git a/dev-ruby/digest/Manifest b/dev-ruby/digest/Manifest
index 97e9448bfdf4..b32c8b7395bf 100644
--- a/dev-ruby/digest/Manifest
+++ b/dev-ruby/digest/Manifest
@@ -1 +1 @@
-DIST digest-3.1.0.tar.gz 58646 BLAKE2B 64ea95ccd99c518b046b0193c5e9230f0941182e527328a3568b352924766dc2b2211f52bacefcd6af87d4ec1b9ecc7d7e96ec2b3b3c29d6406e1b8da245f583 SHA512 2a5d58d4b92f5391f55e43405d515ea045f8d0b0b09602ac8dc57e784b42787956904a8c51ffba026d2f0ecc2efff17a1d39c632d59afaf7941b455d8b2dcd39
+DIST digest-3.1.1.tar.gz 59341 BLAKE2B 460ed1567b1e24d56e7be66bec06d4dac4ce86ab21392c192c7455a9d735f84a5450d2482e9844f526985dd83af290f60487c179563f1190b0acf8c6241f1b60 SHA512 7a74654f2240d21d1ffb7d8f4292f9f17c26da7e24c970964ddccc6da7ee2972b834ce0830657f87b28773c84565a172d8a1fa287656929a34a2941f9b28b028
diff --git a/dev-ruby/digest/digest-3.1.0.ebuild b/dev-ruby/digest/digest-3.1.0.ebuild
deleted file mode 100644
index ab155997e8f1..000000000000
--- a/dev-ruby/digest/digest-3.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTENSIONS="ext/digest/extconf.rb"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="digest.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a framework for message digest libraries"
-HOMEPAGE="https://github.com/ruby/digest"
-SRC_URI="https://github.com/ruby/digest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/digest/digest-3.1.1.ebuild b/dev-ruby/digest/digest-3.1.1.ebuild
new file mode 100644
index 000000000000..6fe7973ecf16
--- /dev/null
+++ b/dev-ruby/digest/digest-3.1.1.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="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/digest/extconf.rb ext/digest/bubblebabble/extconf.rb ext/digest/md5/extconf.rb ext/digest/rmd160/extconf.rb ext/digest/sha1/extconf.rb ext/digest/sha2/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="digest.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a framework for message digest libraries"
+HOMEPAGE="https://github.com/ruby/digest"
+SRC_URI="https://github.com/ruby/digest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:ext/digest/lib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/diva/Manifest b/dev-ruby/diva/Manifest
index 9050e29bb6f7..f68ce0cef242 100644
--- a/dev-ruby/diva/Manifest
+++ b/dev-ruby/diva/Manifest
@@ -1,3 +1,2 @@
-DIST diva-1.0.2.tar.gz 13638 BLAKE2B 461e8487e06749d0482b86fd30945dc83d53daea06750628839c899b6f8d419599c9cc322b62f58d3eb956a2a99a3674dd591c4bb2fc5483bd1853bc40154634 SHA512 b60d80ca55c98a2f6fcf269aa4a2188f2239b871b0e77f328490d5924a6d0e6801c67d0eef4de28b584303f38bed3752a3ceb2c1e4f2c7d17be13dad03c643b5
-DIST diva-1.1.0.tar.gz 15859 BLAKE2B 58e9ca4d9f1b8f4fb3a75cb16437d565fc99a358ce20017a6b6a6a3c505fcc07347141b51b450c8d6eb34869ad5e1040f62e8e92188736799e4d96280194cb05 SHA512 1d53618b11ab49e8c4837ea23326a8c428f1c098e1c3b6e3c3850d7d978dd5fde5a5e23287fa3eb890fbc5c9f0c5609fe92c0368ac72c6fdfbe30dca4df68de9
 DIST diva-1.1.1.tar.gz 15974 BLAKE2B 2a3b497181a931eb6cf6c43b9d43ff9e0e7a34a753864bec422b69c6d01aa39b5f9dcc6abd54b85ca27b34d38a647c3e80450c2d7dd9cea1c62859eb3366d28d SHA512 36c7048cba2774567191b40ff88fa7804b61cb9334992dadd43a62f18be6635aa48753593ccba93a7c0438adfb7d75266b26b7a62e102aaf99afff7401c4e99a
+DIST diva-2.0.1.tar.gz 16964 BLAKE2B 768f9fa670db229db424a069adcfa4706c2b9969d143cffbbaeeafc9b1a2eeaa6b4a1c53de90206a4625f65f89a2c478957c3b53a21eb00f89a470e6071a6d57 SHA512 248f2b9770bd8d097fdfd7edfd574358d3e47c907d8c7e15b6e4b9cc5b72e9b7b428bac211e4d5a4e516c206afb82ecb069103c85835a1c65ed646e68e4a0a6e
diff --git a/dev-ruby/diva/diva-1.0.2-r2.ebuild b/dev-ruby/diva/diva-1.0.2-r2.ebuild
deleted file mode 100644
index 33ea669f02bc..000000000000
--- a/dev-ruby/diva/diva-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="diva.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implementation of expression for handling things"
-HOMEPAGE="https://github.com/toshia/diva https://rubygems.org/gems/diva"
-SRC_URI="https://github.com/toshia/diva/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/addressable-2.9"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/addressable/ s/2.8/2.9/' -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/diva/diva-1.1.0.ebuild b/dev-ruby/diva/diva-1.1.0.ebuild
deleted file mode 100644
index e6aa6e3d1f78..000000000000
--- a/dev-ruby/diva/diva-1.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="diva.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implementation of expression for handling things"
-HOMEPAGE="https://github.com/toshia/diva https://rubygems.org/gems/diva"
-SRC_URI="https://github.com/toshia/diva/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/addressable-2.9"
-ruby_add_bdepend "test? ( dev-ruby/simplecov )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/addressable/ s/2.8/2.9/' -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/diva/diva-1.1.1-r1.ebuild b/dev-ruby/diva/diva-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..2ac67e714eb7
--- /dev/null
+++ b/dev-ruby/diva/diva-1.1.1-r1.ebuild
@@ -0,0 +1,33 @@
+# 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_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="diva.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implementation of expression for handling things"
+HOMEPAGE="https://github.com/toshia/diva https://rubygems.org/gems/diva"
+SRC_URI="https://github.com/toshia/diva/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+ruby_add_rdepend "<dev-ruby/addressable-2.9"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/addressable/ s/2.8/2.9/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid unneeded dependency on simplecov
+	sed -i -e '/simplecov/I s:^:#:' -e '1irequire "json"' test/test_helper.rb || die
+}
diff --git a/dev-ruby/diva/diva-1.1.1.ebuild b/dev-ruby/diva/diva-1.1.1.ebuild
deleted file mode 100644
index d17232e2a269..000000000000
--- a/dev-ruby/diva/diva-1.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="diva.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implementation of expression for handling things"
-HOMEPAGE="https://github.com/toshia/diva https://rubygems.org/gems/diva"
-SRC_URI="https://github.com/toshia/diva/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/addressable-2.9"
-ruby_add_bdepend "test? ( dev-ruby/simplecov )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/addressable/ s/2.8/2.9/' -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/diva/diva-2.0.1.ebuild b/dev-ruby/diva/diva-2.0.1.ebuild
new file mode 100644
index 000000000000..e63936b904bd
--- /dev/null
+++ b/dev-ruby/diva/diva-2.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="diva.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implementation of expression for handling things"
+HOMEPAGE="https://github.com/toshia/diva https://rubygems.org/gems/diva"
+SRC_URI="https://github.com/toshia/diva/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+ruby_add_rdepend "<dev-ruby/addressable-2.9"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/addressable/ s/2.8/2.9/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid unneeded dependency on simplecov
+	sed -i -e '/simplecov/I s:^:#:' -e '1irequire "json"' test/test_helper.rb || die
+}
diff --git a/dev-ruby/diva/metadata.xml b/dev-ruby/diva/metadata.xml
index 21017a1f88d2..0ac8e7d4d47e 100644
--- a/dev-ruby/diva/metadata.xml
+++ b/dev-ruby/diva/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">toshia/diva</remote-id>
 		<remote-id type="rubygems">diva</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/dnsruby/Manifest b/dev-ruby/dnsruby/Manifest
index b3ce8c569ae8..70305adc952b 100644
--- a/dev-ruby/dnsruby/Manifest
+++ b/dev-ruby/dnsruby/Manifest
@@ -1 +1,4 @@
-DIST dnsruby-1.61.9.gem 261632 BLAKE2B f86682fbc50bc0b20f59b3a7bb825081824a3dfa5a6de36f3083b39fac9617ff770d3a53c17f015bcaff5dfe5a96ddafd78b1aaf72bcba9bf990a649cf3a0c63 SHA512 ba692db6ab5234c0669076cb5290d5e4613886956d3cea23c22837f99ee2a970e7f86c7c7fdc7542ac4873d324f52b83b0f5e14bb9c3d5107b068fdf419f6ba1
+DIST dnsruby-1.70.0.gem 261632 BLAKE2B 07adbe23ab2d1605c1562f4403f2dd864171b047df08037763565a3a459f2d3b3cb79343da2c25aadb498a7fc5a81a42af928d65a22c6b736fa7b64fab96721f SHA512 11caddd4ea5c9b8f85c730708d3cd1e1a130059975dfdecbf307862f7cbb85285d193f9ce010a81fbd8a7518ec720a107118018146d67105f6a4dbd41149a130
+DIST dnsruby-1.71.0.gem 262144 BLAKE2B 6067bad3953eab96856adc6a30f43241c0fc6166ab3476257a502ef593ec186420d6b89c5f8e0c162bdcde5249365c02c6910e0706fbacd0425af5734b7752a8 SHA512 9488de8e6ed72708dd8ec213eb5814d8bf712a5186103cc8bcea26d9d9df1933e3d515bd2915622e643b7a37d9a94ac295f6638ac73fcf30f1dfd26c79d32c63
+DIST dnsruby-1.72.0.gem 262144 BLAKE2B 6b802c6276c32c5df6db5babb73c95f9a7c732159539197001607df89bdb144473d67252721f5f3b292cf2e5fa304611d1ce313e0cd8d09e161d4fa1867ff409 SHA512 2f2a26cc2503fb4d3521d76e4a5d476d1447439035e2bfbec0ebab34352a56f0a9c5445db15baefd7be5ba024f03d574b8b1e49a83ad4799d2c9de20e2966c83
+DIST dnsruby-1.72.1.gem 262144 BLAKE2B 5ef7b91663cb14563e75adf643eae479c787552487c826dade7cb78885ca5f6eaed8ebd7f7529853b57e3fb833c781e15c10f8f8e90241529e2c833aef160df0 SHA512 9113db85001983036ba81d230d04ce2b95fdd9ae6923d7887fe3398dfdbb91d7c005b8b92701b386ef53789b1351ff1e32bc3f00b3254ec9371f4575ea7fed3f
diff --git a/dev-ruby/dnsruby/dnsruby-1.61.9.ebuild b/dev-ruby/dnsruby/dnsruby-1.61.9.ebuild
deleted file mode 100644
index d716d4fc9d06..000000000000
--- a/dev-ruby/dnsruby/dnsruby-1.61.9.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_DOCDIR="html"
-RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README.md"
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby DNS client library"
-HOMEPAGE="https://github.com/alexdalitz/dnsruby"
-
-KEYWORDS="~amd64 ~arm ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/simpleidn-0.1:0"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Cc]overall/d" Rakefile || die
-	sed -i -e '/display/d' \
-		-e '/Display/,/^}/d' test/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	# only run offline tests
-	#${RUBY} -I .:lib test/ts_dnsruby.rb || die "test failed"
-	${RUBY} -I .:lib test/ts_offline.rb || die "test failed"
-}
diff --git a/dev-ruby/dnsruby/dnsruby-1.70.0.ebuild b/dev-ruby/dnsruby/dnsruby-1.70.0.ebuild
new file mode 100644
index 000000000000..008ef3578c1b
--- /dev/null
+++ b/dev-ruby/dnsruby/dnsruby-1.70.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_DOCDIR="html"
+RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README.md"
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby DNS client library"
+HOMEPAGE="https://github.com/alexdalitz/dnsruby"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/simpleidn-0.1:0"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Cc]overall/d" Rakefile || die
+	sed -i -e '/display/d' \
+		-e '/Display/,/^}/d' test/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	# only run offline tests
+	#${RUBY} -I .:lib test/ts_dnsruby.rb || die "test failed"
+	${RUBY} -I .:lib test/ts_offline.rb || die "test failed"
+}
diff --git a/dev-ruby/dnsruby/dnsruby-1.71.0.ebuild b/dev-ruby/dnsruby/dnsruby-1.71.0.ebuild
new file mode 100644
index 000000000000..13e241e00b9c
--- /dev/null
+++ b/dev-ruby/dnsruby/dnsruby-1.71.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_DOCDIR="html"
+RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README.md"
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby DNS client library"
+HOMEPAGE="https://github.com/alexdalitz/dnsruby"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/simpleidn-0.2.1:0 =dev-ruby/simpleidn-0.2*:0"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Cc]overall/d" Rakefile || die
+	sed -i -e '/display/d' \
+		-e '/Display/,/^}/d' test/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	# only run offline tests
+	# ${RUBY} -I .:lib test/ts_dnsruby.rb || die "test failed"
+	${RUBY} -I .:lib test/ts_offline.rb || die "test failed"
+}
diff --git a/dev-ruby/dnsruby/dnsruby-1.72.0.ebuild b/dev-ruby/dnsruby/dnsruby-1.72.0.ebuild
new file mode 100644
index 000000000000..13e241e00b9c
--- /dev/null
+++ b/dev-ruby/dnsruby/dnsruby-1.72.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_DOCDIR="html"
+RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README.md"
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby DNS client library"
+HOMEPAGE="https://github.com/alexdalitz/dnsruby"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/simpleidn-0.2.1:0 =dev-ruby/simpleidn-0.2*:0"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Cc]overall/d" Rakefile || die
+	sed -i -e '/display/d' \
+		-e '/Display/,/^}/d' test/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	# only run offline tests
+	# ${RUBY} -I .:lib test/ts_dnsruby.rb || die "test failed"
+	${RUBY} -I .:lib test/ts_offline.rb || die "test failed"
+}
diff --git a/dev-ruby/dnsruby/dnsruby-1.72.1.ebuild b/dev-ruby/dnsruby/dnsruby-1.72.1.ebuild
new file mode 100644
index 000000000000..13e241e00b9c
--- /dev/null
+++ b/dev-ruby/dnsruby/dnsruby-1.72.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_DOCDIR="html"
+RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README.md"
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby DNS client library"
+HOMEPAGE="https://github.com/alexdalitz/dnsruby"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/simpleidn-0.2.1:0 =dev-ruby/simpleidn-0.2*:0"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Cc]overall/d" Rakefile || die
+	sed -i -e '/display/d' \
+		-e '/Display/,/^}/d' test/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	# only run offline tests
+	# ${RUBY} -I .:lib test/ts_dnsruby.rb || die "test failed"
+	${RUBY} -I .:lib test/ts_offline.rb || die "test failed"
+}
diff --git a/dev-ruby/docile/Manifest b/dev-ruby/docile/Manifest
index 7eb216a1f8db..9d3bdb510036 100644
--- a/dev-ruby/docile/Manifest
+++ b/dev-ruby/docile/Manifest
@@ -1,2 +1 @@
-DIST docile-1.3.5.tar.gz 16345 BLAKE2B c06fe60bc6e0fc0dec699271fcdc0b23febeba939aab513a23d5065d33bc7ce5d1cd6391d7b05a5f163c4420c199e12c97a79855d03fb252b61661c2532ac879 SHA512 be193eff58b73e0367a109d459e28097d04e0486b152b084f2fd6bcc795aedbaa12c13dae6d845ec4ef3d52335563ce2b22d5424d689e8b93ff9adf7dbe7b0e9
 DIST docile-1.4.0.tar.gz 16932 BLAKE2B 7e2472a64bcf27899d537444f77cb1fce587400d04c64abe17e2c39b1a50af027941f6ae72d6423817dc7ddfed8e15aa113cc4d32c30b97f166ff37fb7663000 SHA512 78350144a9b0d84d6025770d05b1e9999f34ce431691c08e73232f8b10537bc265f9f06409ff6feabf2e6f20d018dbb83aaf8c0f66e7dcec3e195475820481cd
diff --git a/dev-ruby/docile/docile-1.3.5.ebuild b/dev-ruby/docile/docile-1.3.5.ebuild
deleted file mode 100644
index 3ea2744eb564..000000000000
--- a/dev-ruby/docile/docile-1.3.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
-
-RUBY_FAKEGEM_GEMSPEC="docile.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Turns any Ruby object into a DSL"
-HOMEPAGE="https://ms-ati.github.io/docile/"
-SRC_URI="https://github.com/ms-ati/docile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/require \"github\/markup\"/d' Rakefile || die
-	sed -i -e '/^unless on/,/^end/ s:^:#:' spec/spec_helper.rb || die
-
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/docile/docile-1.4.0-r1.ebuild b/dev-ruby/docile/docile-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..d60c8085eb29
--- /dev/null
+++ b/dev-ruby/docile/docile-1.4.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
+
+RUBY_FAKEGEM_GEMSPEC="docile.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Turns any Ruby object into a DSL"
+HOMEPAGE="https://ms-ati.github.io/docile/"
+SRC_URI="https://github.com/ms-ati/docile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/require \"github\/markup\"/d' Rakefile || die
+	sed -i -e '/simplecov/,/unshift/ s:^:#:' spec/spec_helper.rb || die
+
+	sed -i -e 's:_relative ": "./:' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Fix spec for different error message in ruby33 which no longer shows the class
+	sed -i -e '/undefined method/ s/nil:NilClass/nil/' spec/docile_spec.rb || die
+}
diff --git a/dev-ruby/docile/docile-1.4.0.ebuild b/dev-ruby/docile/docile-1.4.0.ebuild
deleted file mode 100644
index a32b1cd6ff1d..000000000000
--- a/dev-ruby/docile/docile-1.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
-
-RUBY_FAKEGEM_GEMSPEC="docile.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Turns any Ruby object into a DSL"
-HOMEPAGE="https://ms-ati.github.io/docile/"
-SRC_URI="https://github.com/ms-ati/docile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/require \"github\/markup\"/d' Rakefile || die
-	sed -i -e '/simplecov/,/unshift/ s:^:#:' spec/spec_helper.rb || die
-
-	sed -i -e 's:_relative ": "./:' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/docile/metadata.xml b/dev-ruby/docile/metadata.xml
index 658c72b1920d..e09f8897589e 100644
--- a/dev-ruby/docile/metadata.xml
+++ b/dev-ruby/docile/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ms-ati/docile</remote-id>
+    <remote-id type="rubygems">docile</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/docker-api/Manifest b/dev-ruby/docker-api/Manifest
new file mode 100644
index 000000000000..aa1274f3bf86
--- /dev/null
+++ b/dev-ruby/docker-api/Manifest
@@ -0,0 +1 @@
+DIST docker-api-2.2.0.tar.gz 49637 BLAKE2B 1bdcce5e0ca898128434acf7d76306f2c8c08aab8da834bcd129f8be72772073208209b55c9b0397980bdf81e3784c292fe332af5ef5f6bf44d0ab52cfc8259a SHA512 7be935dabb5faf2b05a635c55e1f687ebc16ef9155b9e0daeba7eaffa4c8fda056b54985f8c629b07cdb94558546dd497153174765d2bed6e090a44bc287c53f
diff --git a/dev-ruby/docker-api/docker-api-2.2.0.ebuild b/dev-ruby/docker-api/docker-api-2.2.0.ebuild
new file mode 100644
index 000000000000..4f6b1e3ab087
--- /dev/null
+++ b/dev-ruby/docker-api/docker-api-2.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="docker-api.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple REST client for the Docker Remote API"
+HOMEPAGE="https://github.com/upserve/docker-api"
+SRC_URI="https://github.com/upserve/docker-api/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/excon-0.47.0
+	dev-ruby/multi_json
+"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' -e '/formatter/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/\(single_cov\|SingleCov\)/ s:^:#:' spec/*.rb spec/*/*.rb || die
+	rm -f spec/cov_spec.rb || die
+
+	# Avoid specs requiring a running docker daemon
+	rm -f spec/docker_spec.rb spec/docker/{container,event,exec,image,network,volume}_spec.rb || die
+}
diff --git a/dev-ruby/docker-api/metadata.xml b/dev-ruby/docker-api/metadata.xml
new file mode 100644
index 000000000000..caf979ebb3b6
--- /dev/null
+++ b/dev-ruby/docker-api/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">upserve/docker-api</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/domain_name/Manifest b/dev-ruby/domain_name/Manifest
index df42ce9aac9b..493abe66eb36 100644
--- a/dev-ruby/domain_name/Manifest
+++ b/dev-ruby/domain_name/Manifest
@@ -1 +1,3 @@
 DIST domain_name-0.5.20190701.gem 131072 BLAKE2B 86ee60824d9480e71535312fb72c192f3d88326c72539b833132872ff15298842f09bac612e9c3d8b87a3ef6a60459b14e777105613fd76da79757d6a30abcbc SHA512 445f0e8a377bb700f8a3b926970f4351d28759e237947d6c755afff52726141c6b821b43b2a761d4d0d6237969304ef749404a5f383f69710b04803410dc70aa
+DIST domain_name-0.6.20231109.gem 148480 BLAKE2B 87a68ab758126e150193373c1f4807e16e8390f5a2fa5c1c55ad443a6cf1d16d2fb66167313f7858f2a729729222900fae57994d268b3077a7469cec375dc67a SHA512 8d9dff3943001b340d1c19303291a19b284e6f7d0165413fbd797804dc9ff13c92b09a66efdded2489961a54105f2eed91043cdde279bef4bf82628c822d9257
+DIST domain_name-0.6.20240107.gem 148480 BLAKE2B d87f505fcff0e828d7c0870b9e185bd7a3a22bee3027a1de5b3d5c80f09d06bb666b3f7d408b8418f21a57aea3400a8932b7ace070637196069a2401863cd00e SHA512 9911389bdfdae984f697726cd7feff5a41b944a98982cfa76d49002c4f64e51d0ec7db6259eddc97fecbcc13c9723134af26b83e050c31943dc8495866874d59
diff --git a/dev-ruby/domain_name/domain_name-0.5.20190701-r1.ebuild b/dev-ruby/domain_name/domain_name-0.5.20190701-r1.ebuild
deleted file mode 100644
index ed99f7e6bc39..000000000000
--- a/dev-ruby/domain_name/domain_name-0.5.20190701-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Domain Name manipulation library for Ruby"
-HOMEPAGE="https://github.com/knu/ruby-domain_name"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.5
-		dev-ruby/shoulda
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ d; i gem "unf"' test/helper.rb || die
-	rm Gemfile* || die
-
-	# Remove development dependencies
-	sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rdoc\)/d' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on git.
-	sed -i -e 's/`git ls-files`/""/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib:test test/test_*.rb
-}
diff --git a/dev-ruby/domain_name/domain_name-0.5.20190701-r2.ebuild b/dev-ruby/domain_name/domain_name-0.5.20190701-r2.ebuild
new file mode 100644
index 000000000000..d1d61e16195b
--- /dev/null
+++ b/dev-ruby/domain_name/domain_name-0.5.20190701-r2.ebuild
@@ -0,0 +1,50 @@
+# 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_TEST="none"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Domain Name manipulation library for Ruby"
+HOMEPAGE="https://github.com/knu/ruby-domain_name"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/test-unit-2.5.5
+		dev-ruby/shoulda
+	)"
+
+PATCHES=(
+	# Pending upstream and conceptually acked, unf is obsolete
+	# with > ruby22.
+	"${FILESDIR}"/${PN}-0.5.20190701-drop-unf.patch
+)
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/,/end/ d' test/helper.rb || die
+	rm Gemfile* || die
+
+	# Remove development dependencies
+	sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rdoc\)/d' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on git.
+	sed -i -e 's/`git ls-files`/""/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib:test test/test_*.rb
+}
diff --git a/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild b/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
deleted file mode 100644
index ebdf1437cf9a..000000000000
--- a/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Domain Name manipulation library for Ruby"
-HOMEPAGE="https://github.com/knu/ruby-domain_name"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.5
-		dev-ruby/shoulda
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ d; i gem "unf"' test/helper.rb || die
-	rm Gemfile* || die
-
-	# Remove development dependencies
-	sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rdoc\)/d' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on git.
-	sed -i -e 's/`git ls-files`/""/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib:test test/test_*.rb
-}
diff --git a/dev-ruby/domain_name/domain_name-0.6.20231109.ebuild b/dev-ruby/domain_name/domain_name-0.6.20231109.ebuild
new file mode 100644
index 000000000000..6e9270ee8cae
--- /dev/null
+++ b/dev-ruby/domain_name/domain_name-0.6.20231109.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Domain Name manipulation library for Ruby"
+HOMEPAGE="https://github.com/knu/ruby-domain_name"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/test-unit-2.5.5
+		dev-ruby/shoulda
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/,/end/ d' test/helper.rb || die
+	rm Gemfile* || die
+
+	# Remove development dependencies
+	sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rdoc\)/d' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on git.
+	sed -i -e 's/`git ls-files`/""/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib:test test/test_*.rb
+}
diff --git a/dev-ruby/domain_name/domain_name-0.6.20240107.ebuild b/dev-ruby/domain_name/domain_name-0.6.20240107.ebuild
new file mode 100644
index 000000000000..f64a404d9edf
--- /dev/null
+++ b/dev-ruby/domain_name/domain_name-0.6.20240107.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Domain Name manipulation library for Ruby"
+HOMEPAGE="https://github.com/knu/ruby-domain_name"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/test-unit-2.5.5
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/,/end/ d' test/helper.rb || die
+	rm Gemfile* || die
+
+	# Remove development dependencies
+	sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rdoc\)/d' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on git.
+	sed -i -e 's/`git ls-files`/""/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib:test test/test_*.rb
+}
diff --git a/dev-ruby/domain_name/files/domain_name-0.5.20190701-drop-unf.patch b/dev-ruby/domain_name/files/domain_name-0.5.20190701-drop-unf.patch
new file mode 100644
index 000000000000..d9b6c4df65a5
--- /dev/null
+++ b/dev-ruby/domain_name/files/domain_name-0.5.20190701-drop-unf.patch
@@ -0,0 +1,126 @@
+https://github.com/knu/ruby-domain_name/pull/11
+(see also https://github.com/knu/ruby-domain_name/pull/22)
+
+From 28db4ddb42adb827fc54935a6308bae03d7e8e6c Mon Sep 17 00:00:00 2001
+From: tayler1 <mtayler@gmx.com>
+Date: Sat, 4 Feb 2017 18:20:07 +0300
+Subject: [PATCH 1/3] Removed unf dependency for ruby > 2.2
+
+--- a/domain_name.gemspec
++++ b/domain_name.gemspec
+@@ -28,7 +28,7 @@ Suffix List.
+     "README.md"
+   ]
+ 
+-  gem.add_runtime_dependency("unf", ["< 1.0.0", ">= 0.0.5"])
++  gem.add_runtime_dependency("unf", ["< 1.0.0", ">= 0.0.5"]) if RUBY_VERSION < "2.2"
+   gem.add_development_dependency("test-unit", "~> 2.5.5")
+   gem.add_development_dependency("bundler", [">= 1.2.0"])
+   gem.add_development_dependency("rake", [">= 0.9.2.2", *("< 11" if RUBY_VERSION < "1.9")])
+--- a/lib/domain_name.rb
++++ b/lib/domain_name.rb
+@@ -8,7 +8,7 @@
+ require 'domain_name/version'
+ require 'domain_name/punycode'
+ require 'domain_name/etld_data'
+-require 'unf'
++require 'unf' if RUBY_VERSION < '2.2'
+ require 'ipaddr'
+ 
+ # Represents a domain name ready for extracting its registered domain
+@@ -286,7 +286,11 @@ class << self
+     # Normalizes a _domain_ using the Punycode algorithm as necessary.
+     # The result will be a downcased, ASCII-only string.
+     def normalize(domain)
+-      DomainName::Punycode.encode_hostname(domain.chomp(DOT).to_nfc).downcase
++      if RUBY_VERSION >= '2.2'
++        DomainName::Punycode.encode_hostname(domain.chomp(DOT).unicode_normalize).downcase
++      else
++        DomainName::Punycode.encode_hostname(domain.chomp(DOT).to_nfc).downcase
++      end
+     end
+   end
+ end
+--- a/test/test_domain_name-punycode.rb
++++ b/test/test_domain_name-punycode.rb
+@@ -91,7 +91,12 @@ class TestDomainName < Test::Unit::TestCase
+         '-> $1.00 <--']
+     ].each { |title, cps, punycode|
+       assert_equal punycode, DomainName::Punycode.encode(cps.pack('U*')), title
+-      assert_equal cps.pack('U*').to_nfc, DomainName::Punycode.decode(punycode), title
++      cps_norm = if RUBY_VERSION >= '2.2'
++          cps.pack('U*').unicode_normalize
++        else
++          cps.pack('U*').to_nfc
++        end
++      assert_equal cps_norm, DomainName::Punycode.decode(punycode), title
+     }
+   end
+ end
+
+From 9d2912428799cd860d96c24d51292f2b03e857e2 Mon Sep 17 00:00:00 2001
+From: tayler1 <mtayler@gmx.com>
+Date: Mon, 6 Feb 2017 01:46:03 +0300
+Subject: [PATCH 2/3] fix
+
+--- a/lib/domain_name.rb
++++ b/lib/domain_name.rb
+@@ -8,8 +8,12 @@
+ require 'domain_name/version'
+ require 'domain_name/punycode'
+ require 'domain_name/etld_data'
+-require 'unf' if RUBY_VERSION < '2.2'
+ require 'ipaddr'
++if RUBY_VERSION < '2.2'
++  require 'unf'
++else
++  require 'unicode_normalize/normalize'
++end
+ 
+ # Represents a domain name ready for extracting its registered domain
+ # and TLD.
+@@ -285,11 +289,15 @@ def inspect
+   class << self
+     # Normalizes a _domain_ using the Punycode algorithm as necessary.
+     # The result will be a downcased, ASCII-only string.
+-    def normalize(domain)
+-      if RUBY_VERSION >= '2.2'
+-        DomainName::Punycode.encode_hostname(domain.chomp(DOT).unicode_normalize).downcase
+-      else
+-        DomainName::Punycode.encode_hostname(domain.chomp(DOT).to_nfc).downcase
++    if RUBY_VERSION >= '2.2'
++      def normalize(domain)
++        domain.chomp!(DOT)        
++        DomainName::Punycode.encode_hostname(domain.unicode_normalize).downcase
++      end
++    else
++      def normalize(domain)
++        domain.chomp!(DOT)
++        DomainName::Punycode.encode_hostname(domain.to_nfc).downcase
+       end
+     end
+   end
+
+From 6d76a14ba3b7c42d4fd3f4fab30c0099ffc51c2b Mon Sep 17 00:00:00 2001
+From: tayler1 <mtayler@gmx.com>
+Date: Mon, 6 Feb 2017 02:35:55 +0300
+Subject: [PATCH 3/3] Fix frozen string
+
+--- a/lib/domain_name.rb
++++ b/lib/domain_name.rb
+@@ -291,13 +291,11 @@ class << self
+     # The result will be a downcased, ASCII-only string.
+     if RUBY_VERSION >= '2.2'
+       def normalize(domain)
+-        domain.chomp!(DOT)        
+-        DomainName::Punycode.encode_hostname(domain.unicode_normalize).downcase
++        DomainName::Punycode.encode_hostname(domain.chomp(DOT).unicode_normalize).downcase
+       end
+     else
+       def normalize(domain)
+-        domain.chomp!(DOT)
+-        DomainName::Punycode.encode_hostname(domain.to_nfc).downcase
++        DomainName::Punycode.encode_hostname(domain.chomp(DOT).to_nfc).downcase
+       end
+     end
+   end
diff --git a/dev-ruby/dotenv/Manifest b/dev-ruby/dotenv/Manifest
deleted file mode 100644
index 4fd730dc352d..000000000000
--- a/dev-ruby/dotenv/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dotenv-2.7.6.tar.gz 20343 BLAKE2B 5e6eff69a63bd9b6b6fbaa8b07ac3a3b846d8bcc39ac67dcf3bc1a9e152afe8809db1ecb55706de3fa3232e423c02d116c248925d78095b6c1d85af4289e69d2 SHA512 df017be0732d43039497b95aeffc303d9141196862270dc907181a77217cc3c525ffce5a52c7047eb51d69a37cdf51f3f2dfbdceb792c14d352f9416c50891c3
diff --git a/dev-ruby/dotenv/dotenv-2.7.6.ebuild b/dev-ruby/dotenv/dotenv-2.7.6.ebuild
deleted file mode 100644
index 31eb7242b75a..000000000000
--- a/dev-ruby/dotenv/dotenv-2.7.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="README.md Changelog.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Loads environment variables from .env into ENV"
-HOMEPAGE="https://github.com/bkeepers/dotenv"
-SRC_URI="https://github.com/bkeepers/dotenv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="2"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/spring dev-ruby/rails )"
-
-all_ruby_prepare() {
-	sed -i -e '/:guard/,/end/ s:^:#:' \
-		-e '5igem "rspec", "~> 3.0"' Gemfile || die
-
-	sed -i -e '/rubocop/ s:^:#:' -e 's/git ls-files/find/' dotenv.gemspec || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:ruby -v:${RUBY} -v:g" spec/dotenv/parser_spec.rb || die
-}
diff --git a/dev-ruby/dotenv/metadata.xml b/dev-ruby/dotenv/metadata.xml
deleted file mode 100644
index 9a87f2fefe89..000000000000
--- a/dev-ruby/dotenv/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">bkeepers/dotenv</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/drb/Manifest b/dev-ruby/drb/Manifest
new file mode 100644
index 000000000000..ba035368f212
--- /dev/null
+++ b/dev-ruby/drb/Manifest
@@ -0,0 +1,2 @@
+DIST drb-2.2.0.tar.gz 36203 BLAKE2B 5c60cd5dd8ab26434046435d98e203c7a50c6160edeb5373527140df8a26c7494a05a00b7faff11f1a8cecbeb963736e87adc1a9967e78b6c81b47d5c234eab3 SHA512 763f1ab8645d0bf168fc56bbde85fd4992405530d1764f49e18f2529713b3b2d62cc314b65e59472c11bbbb964e5133fe463b1f266ffde35f79b836a527c864a
+DIST drb-2.2.1.tar.gz 36179 BLAKE2B a09b88835cb211b9599d4b714c3921c6bd4c35171e58cfcf5b7e68e8811b6a253ecdf9ebc697d1c5007fdd4e246effb73183c2440b4187fda060fcf314764ec0 SHA512 f896c068306908977a3554ba9adc88ec8e145a6ef60c2b32ab15402a1d20ff206ddbcce955b7e7f19bdbbd8613521819a56733bf0d2ee28e72242a7f5257cf38
diff --git a/dev-ruby/drb/drb-2.2.0.ebuild b/dev-ruby/drb/drb-2.2.0.ebuild
new file mode 100644
index 000000000000..b2d9094d48d8
--- /dev/null
+++ b/dev-ruby/drb/drb-2.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="drb.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Distributed object system for Ruby"
+HOMEPAGE="https://github.com/ruby/drb"
+SRC_URI="https://github.com/ruby/drb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/ruby2_keywords"
+
+all_ruby_prepare() {
+	sed -e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/drb/drb-2.2.1.ebuild b/dev-ruby/drb/drb-2.2.1.ebuild
new file mode 100644
index 000000000000..f47a54d0c2b1
--- /dev/null
+++ b/dev-ruby/drb/drb-2.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="drb.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Distributed object system for Ruby"
+HOMEPAGE="https://github.com/ruby/drb"
+SRC_URI="https://github.com/ruby/drb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+ruby_add_rdepend "dev-ruby/ruby2_keywords"
+
+all_ruby_prepare() {
+	sed -e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/drb/metadata.xml b/dev-ruby/drb/metadata.xml
new file mode 100644
index 000000000000..d5b22652c3b4
--- /dev/null
+++ b/dev-ruby/drb/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/drb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/dry-core/Manifest b/dev-ruby/dry-core/Manifest
new file mode 100644
index 000000000000..150f22cc25c2
--- /dev/null
+++ b/dev-ruby/dry-core/Manifest
@@ -0,0 +1 @@
+DIST dry-core-1.0.1.tar.gz 44746 BLAKE2B fb85107dd68dfb2a8d3ee2e66b4bb8b416ac325be4d28bcbbf5605e0a90992eb8aa85a8fad3cba8f228a5a7e50109cd2c1dbf920eebc3423d282055204c6b0a5 SHA512 d769795459a0ffc007eb66e2b9af9be4e635c620a5ca54a76113057b495e1126600a572761d8ff33a3ee6a4fca948f6fc29d3200e7ba0b56c1bb600a4749bbd4
diff --git a/dev-ruby/dry-core/dry-core-1.0.1.ebuild b/dev-ruby/dry-core/dry-core-1.0.1.ebuild
new file mode 100644
index 000000000000..001c2b5367f1
--- /dev/null
+++ b/dev-ruby/dry-core/dry-core-1.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="dry-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A toolset of small support modules used throughout the dry-rb ecosystem"
+
+HOMEPAGE="https://dry-rb.org/gems/dry-core/"
+SRC_URI="https://github.com/dry-rb/dry-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+
+# Skip tests for now to avoid circular dependencies.
+RESTRICT=test
+
+ruby_add_rdepend "
+	dev-ruby/concurrent-ruby:1
+	>=dev-ruby/zeitwerk-2.6:2
+"
+
+#ruby_add_bdepend "test? (
+#	dev-ruby/dry-types
+#)"
diff --git a/dev-ruby/dry-core/metadata.xml b/dev-ruby/dry-core/metadata.xml
new file mode 100644
index 000000000000..20009da5e66c
--- /dev/null
+++ b/dev-ruby/dry-core/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">dry-rb/dry-core</remote-id>
+    <remote-id type="rubygems">dry-core</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/dry-inflector/Manifest b/dev-ruby/dry-inflector/Manifest
new file mode 100644
index 000000000000..3e5e59e74b71
--- /dev/null
+++ b/dev-ruby/dry-inflector/Manifest
@@ -0,0 +1 @@
+DIST dry-inflector-1.0.0.tar.gz 25030 BLAKE2B 628f5af9ac1517e6711242b6678808c0b64f1f1bb3391e0792fe85ccebfe4c334e2ee62370bd3a13f842a435028b684c09b8215c78ab7fbe2742679863f8e27d SHA512 34b5e723982621e3e090fe9273310d6dfd6e8145c274d7eefe2e7c3bdcc2c6222c2a6bc6e0bbd70d79226b81f1cd89d8364692421ef3dd361432a03b1a8d1c06
diff --git a/dev-ruby/dry-inflector/dry-inflector-1.0.0.ebuild b/dev-ruby/dry-inflector/dry-inflector-1.0.0.ebuild
new file mode 100644
index 000000000000..d51c485abdbd
--- /dev/null
+++ b/dev-ruby/dry-inflector/dry-inflector-1.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="dry-inflector.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="String inflections for dry-rb"
+
+HOMEPAGE="https://dry-rb.org/gems/dry-inflector/"
+SRC_URI="https://github.com/dry-rb/dry-inflector/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/warning )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|coverage\)/ s/^/#/' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/dry-inflector/metadata.xml b/dev-ruby/dry-inflector/metadata.xml
new file mode 100644
index 000000000000..80fa77f4fe4c
--- /dev/null
+++ b/dev-ruby/dry-inflector/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">dry-rb/dry-inflector</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/dry-logic/Manifest b/dev-ruby/dry-logic/Manifest
new file mode 100644
index 000000000000..225926e58b44
--- /dev/null
+++ b/dev-ruby/dry-logic/Manifest
@@ -0,0 +1 @@
+DIST dry-logic-1.5.0.tar.gz 38438 BLAKE2B 9b00ac4bed7c400858554b3485f0bce04633caaac2b70bd0c76c1d11cb20b1ab34136a3e2189e247b012833f10219140366c18faa7af09d603b3b8cca4778dda SHA512 cde3a01c0c16af1bd40f6c0c39b8777e464d6796f5c1eb52297453bb4301934c23ec48ac0e2bcc023844252b5da38687ae0bb8977f99c7f656d3fe18708bb7b8
diff --git a/dev-ruby/dry-logic/dry-logic-1.5.0.ebuild b/dev-ruby/dry-logic/dry-logic-1.5.0.ebuild
new file mode 100644
index 000000000000..e6064b73df3f
--- /dev/null
+++ b/dev-ruby/dry-logic/dry-logic-1.5.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="dry-logic.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Predicate logic with rule composition"
+
+HOMEPAGE="https://dry-rb.org/gems/dry-logic/"
+SRC_URI="https://github.com/dry-rb/dry-logic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/concurrent-ruby:1
+	dev-ruby/dry-core:1
+	>=dev-ruby/zeitwerk-2.6:2
+"
+
+ruby_add_bdepend "test? ( dev-ruby/warning )"
+
+all_ruby_prepare() {
+	sed -e '3irequire "uri"' -i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/dry-logic/metadata.xml b/dev-ruby/dry-logic/metadata.xml
new file mode 100644
index 000000000000..faffee60e265
--- /dev/null
+++ b/dev-ruby/dry-logic/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">dry-rb/dry-logic</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/dry-monads/Manifest b/dev-ruby/dry-monads/Manifest
new file mode 100644
index 000000000000..c6d8af4e7536
--- /dev/null
+++ b/dev-ruby/dry-monads/Manifest
@@ -0,0 +1 @@
+DIST dry-monads-1.6.0.tar.gz 77141 BLAKE2B 714b2a35b6136639e4b071f01dcdc01a83b447731906b0b98f9101a4d524f77395d8f2e77b7c09ea8bd039f53de6ba2fbaeaaf805d63d299d10fa5c92b07080a SHA512 080e02299f2a39159bdf571afa4678ccade07e363f60ad7fef397e07dfa156e9a187757cc6de199fbc876c79110e73b9541369d3d04b32fdb6bde13e96bcb300
diff --git a/dev-ruby/dry-monads/dry-monads-1.6.0.ebuild b/dev-ruby/dry-monads/dry-monads-1.6.0.ebuild
new file mode 100644
index 000000000000..c9bedd157b16
--- /dev/null
+++ b/dev-ruby/dry-monads/dry-monads-1.6.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="dry-monads.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Common monads for Ruby"
+
+HOMEPAGE="https://dry-rb.org/gems/dry-monads/"
+SRC_URI="https://github.com/dry-rb/dry-monads/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/concurrent-ruby:1
+	dev-ruby/dry-core:1
+	>=dev-ruby/zeitwerk-2.6:2
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/dry-types
+	dev-ruby/warning
+)"
diff --git a/dev-ruby/dry-monads/metadata.xml b/dev-ruby/dry-monads/metadata.xml
new file mode 100644
index 000000000000..01236a96b46e
--- /dev/null
+++ b/dev-ruby/dry-monads/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">dry-rb/dry-monads</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/dry-struct/Manifest b/dev-ruby/dry-struct/Manifest
new file mode 100644
index 000000000000..93ee03259b59
--- /dev/null
+++ b/dev-ruby/dry-struct/Manifest
@@ -0,0 +1 @@
+DIST dry-struct-1.6.0.tar.gz 37804 BLAKE2B c41a764cea576126ace4729dcc34ccd88c80f8751d8e9e11c825fc4caccd3a2cf5b7c92b129d2275cc8731f70ae98271462a359e8f6acf3c5ba2242513d20e6b SHA512 78258a74fd4b359142d42133df4f632dca7518959a15e42d544ee3b3e94ff5f2c7d14b2ed38609a125c788d092203d574d46f5a1030f9ec28738f76d24d7cdcc
diff --git a/dev-ruby/dry-struct/dry-struct-1.6.0.ebuild b/dev-ruby/dry-struct/dry-struct-1.6.0.ebuild
new file mode 100644
index 000000000000..e40ded27b8c5
--- /dev/null
+++ b/dev-ruby/dry-struct/dry-struct-1.6.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="dry-struct.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Typed structs and value objects"
+
+HOMEPAGE="https://dry-rb.org/gems/dry-struct/"
+SRC_URI="https://github.com/dry-rb/dry-struct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/dry-core:1
+	>=dev-ruby/dry-types-1.7:1
+	>=dev-ruby/ice_nine-0.11:0
+	>=dev-ruby/zeitwerk-2.6:2
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/dry-monads
+	dev-ruby/dry-struct
+	dev-ruby/warning
+)"
+
+all_ruby_prepare() {
+	# Avoid broken spec, already fixed upstream.
+	sed -e '/with Test::User/ s/context/xcontext/' \
+		-e '/with Test::SuperUSer/ s/context/xcontext/' \
+		-i spec/extensions/pretty_print_spec.rb || die
+}
diff --git a/dev-ruby/dry-struct/metadata.xml b/dev-ruby/dry-struct/metadata.xml
new file mode 100644
index 000000000000..c0346959b54a
--- /dev/null
+++ b/dev-ruby/dry-struct/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">dry-rb/dry-struct</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/dry-types/Manifest b/dev-ruby/dry-types/Manifest
new file mode 100644
index 000000000000..5fe862332caf
--- /dev/null
+++ b/dev-ruby/dry-types/Manifest
@@ -0,0 +1 @@
+DIST dry-types-1.7.2.tar.gz 101450 BLAKE2B e0ebd390bea2178a9a348b65bc7cb5af8657d61f66a77ba52ba26e64aab44c2bd6d142c164c023002244aded5da7175199108c069635b1031d469d7e678f0ed1 SHA512 401372b73b55947d1ba6619903cacd422be1a04ffdd3746d3323a68afa98fcea3d87a4bf1d81a9e9a389b2dcd8dd3a9d096f6982d168528d9fadf60e0fc33076
diff --git a/dev-ruby/dry-types/dry-types-1.7.2.ebuild b/dev-ruby/dry-types/dry-types-1.7.2.ebuild
new file mode 100644
index 000000000000..5ad028a60c15
--- /dev/null
+++ b/dev-ruby/dry-types/dry-types-1.7.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="dry-types.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Type system for Ruby supporting coercions, constraints and complex types."
+
+HOMEPAGE="https://dry-rb.org/gems/dry-types/"
+SRC_URI="https://github.com/dry-rb/dry-types/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/bigdecimal:0
+	dev-ruby/concurrent-ruby:1
+	dev-ruby/dry-core:1
+	dev-ruby/dry-inflector:1
+	>=dev-ruby/dry-logic-1.4:1
+	>=dev-ruby/zeitwerk-2.6:2
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/dry-monads
+	dev-ruby/dry-struct
+	dev-ruby/warning
+)"
diff --git a/dev-ruby/dry-types/metadata.xml b/dev-ruby/dry-types/metadata.xml
new file mode 100644
index 000000000000..8cb474b108c3
--- /dev/null
+++ b/dev-ruby/dry-types/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">dry-rb/dry-types</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/duktape-rb/Manifest b/dev-ruby/duktape-rb/Manifest
index a78c853e0a81..88d0ce3ee9fb 100644
--- a/dev-ruby/duktape-rb/Manifest
+++ b/dev-ruby/duktape-rb/Manifest
@@ -1 +1 @@
-DIST duktape-rb-2.3.0.0.tar.gz 1356464 BLAKE2B be7362ddbe6860bcb12c8f8909f66ae525585e628f7be2317b07eb07960f8f25e503dbc89e713e57144cc8108751ac856aa73a16cbd58502e928acf9e116247c SHA512 af4fd45387c3f40cd24bf3c879ef4e0d7efd43ca24f0cb866bf869db7fa9f4add9b60122c0dcfbce5491cdd7479b1414637fa1054078216b9f57fa426feb0154
+DIST duktape-rb-2.7.0.0.tar.gz 1385934 BLAKE2B 1a3a7ea2c1469ddf9ac482e4329726e0f96823e75153027cf83155cca796cd0380d816a23d617e4bc40e72215acdc524fcb9575711e585952aeb9c6ed85ede70 SHA512 e91f57c2789aeb26aecbd9759c0b8cda457f290fcbe431fee721d01c1987c64f307f0e042b50cf6b4fa468d41c6365adde8395e2a33a8c637f6524af1c7cf028
diff --git a/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r3.ebuild b/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r3.ebuild
deleted file mode 100644
index a9b26614da2f..000000000000
--- a/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_GEMSPEC="duktape.gemspec"
-RUBY_FAKEGEM_NAME="duktape"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/duktape/extconf.rb)
-
-inherit ruby-fakegem
-
-MY_PN=${PN/-/\.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Ruby bindings to the Duktape JavaScript interpeter"
-HOMEPAGE="https://github.com/judofyr/duktape.rb"
-SRC_URI="https://github.com/judofyr/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~riscv"
-
-COMMON_DEPEND="dev-lang/duktape:="
-DEPEND+="${COMMON_DEPEND}"
-RDEPEND+="${COMMON_DEPEND}"
-
-ruby_add_bdepend "
-	dev-ruby/pkg-config
-	dev-ruby/rake-compiler
-	dev-ruby/sdoc
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.0.0_duktape-2.5.0-tests.patch
-	"${FILESDIR}"/${PN}-2.3.0.0_use-system-duktape.patch
-)
-
-RUBY_S=${MY_P}
-
-all_ruby_prepare() {
-	rm ext/duktape/duktape.{c,h} ext/duktape/duk_config.h || die "Failed to remove bundled duktape"
-}
-
-each_ruby_test() {
-	${RUBY} test/test_duktape.rb || die
-}
diff --git a/dev-ruby/duktape-rb/duktape-rb-2.7.0.0.ebuild b/dev-ruby/duktape-rb/duktape-rb-2.7.0.0.ebuild
new file mode 100644
index 000000000000..4232b07c6107
--- /dev/null
+++ b/dev-ruby/duktape-rb/duktape-rb-2.7.0.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_GEMSPEC="duktape.gemspec"
+RUBY_FAKEGEM_NAME="duktape"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/duktape/extconf.rb)
+
+inherit ruby-fakegem
+
+MY_PN=${PN/-/\.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Ruby bindings to the Duktape JavaScript interpreter"
+HOMEPAGE="https://github.com/judofyr/duktape.rb"
+SRC_URI="https://github.com/judofyr/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ppc ~riscv ~sparc"
+
+COMMON_DEPEND="dev-lang/duktape:="
+DEPEND+="${COMMON_DEPEND}"
+RDEPEND+="${COMMON_DEPEND}"
+
+ruby_add_bdepend "
+	dev-ruby/pkg-config
+	dev-ruby/rake-compiler
+	dev-ruby/sdoc
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.0.0_use-system-duktape.patch
+)
+
+RUBY_S=${MY_P}
+
+all_ruby_prepare() {
+	rm ext/duktape/duktape.{c,h} ext/duktape/duk_config.h || die "Failed to remove bundled duktape"
+}
+
+each_ruby_test() {
+	${RUBY} test/test_duktape.rb || die
+}
diff --git a/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_duktape-2.5.0-tests.patch b/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_duktape-2.5.0-tests.patch
deleted file mode 100644
index 20228c480da8..000000000000
--- a/dev-ruby/duktape-rb/files/duktape-rb-2.3.0.0_duktape-2.5.0-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-The parse-error message asserted by two of the tests has changed since
-duktape-2.3.0, it is now
-
-# encoding: ASCII-8BIT
-parse error (line 1, end of input)
-
-This should hopefully cover both cases.
-
---- a/test/test_duktape.rb
-+++ b/test/test_duktape.rb
-@@ -102,7 +102,7 @@
-         @ctx.eval_string('{')
-       end
- 
--      assert_equal "parse error (line 1)", err.message
-+      assert_match /parse error [(]line 1/, err.message
-     end
- 
-     def test_type_error
-@@ -160,7 +160,7 @@
-         @ctx.exec_string('{')
-       end
- 
--      assert_equal "parse error (line 1)", err.message
-+      assert_match /parse error [(]line 1/, err.message
-     end
- 
-     def test_type_error
diff --git a/dev-ruby/dust/dust-0.1.7-r3.ebuild b/dev-ruby/dust/dust-0.1.7-r3.ebuild
index 981aa22ca32c..24399b347b55 100644
--- a/dev-ruby/dust/dust-0.1.7-r3.ebuild
+++ b/dev-ruby/dust/dust-0.1.7-r3.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="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="README"
 
diff --git a/dev-ruby/ecma-re-validator/ecma-re-validator-0.4.0.ebuild b/dev-ruby/ecma-re-validator/ecma-re-validator-0.4.0.ebuild
index 58d843ca3820..632fc394d460 100644
--- a/dev-ruby/ecma-re-validator/ecma-re-validator-0.4.0.ebuild
+++ b/dev-ruby/ecma-re-validator/ecma-re-validator-0.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/ed25519/Manifest b/dev-ruby/ed25519/Manifest
index 44bc214b2a57..1a882d1f41ae 100644
--- a/dev-ruby/ed25519/Manifest
+++ b/dev-ruby/ed25519/Manifest
@@ -1,2 +1 @@
-DIST ed25519-1.2.4.tar.gz 136685 BLAKE2B d0fd78f16df2b09f5835fca4b0963cee930e17ece2c4eea2cbf4544ed1a5e30c7dc63525b285f4e1e150e5e70d1e8207ca07ce985c27441a903c69875fd92dee SHA512 cf2de7781848d804f3a279baef26f887846d7d846d225293c74dc3f4e301d18518c9edc8b721f9637fff8f087703e91d2376119f2d8185ef19be5862f99801b3
 DIST ed25519-1.3.0.tar.gz 137160 BLAKE2B 520ffa6bd0a801faa9f5f63873d705a211c3dba0e5319246b77bd455585e60baf7c7829ddebb892a896c1ae763e6df732115675307451c33bb20f56bb7c89be4 SHA512 dbd108769e131d15e4f31eaf7f4a46530769f279ccbbe4a10b5fe9e1d394bafb0ea6af95b6b1da2d66db00072576ff9d6d5c9156d949d79daf929a9dbd22eea8
diff --git a/dev-ruby/ed25519/ed25519-1.2.4-r1.ebuild b/dev-ruby/ed25519/ed25519-1.2.4-r1.ebuild
deleted file mode 100644
index 08e98bf86a2b..000000000000
--- a/dev-ruby/ed25519/ed25519-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/ed25519_ref10/extconf.rb)
-
-RUBY_FAKEGEM_GEMSPEC="ed25519.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for the Ed25519 public-key signature system"
-HOMEPAGE="https://github.com/crypto-rb/ed25519"
-SRC_URI="https://github.com/crypto-rb/ed25519/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/ed25519/ed25519-1.3.0.ebuild b/dev-ruby/ed25519/ed25519-1.3.0.ebuild
index 259a7fcc67ec..8b3f2455d74b 100644
--- a/dev-ruby/ed25519/ed25519-1.3.0.ebuild
+++ b/dev-ruby/ed25519/ed25519-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
 
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/crypto-rb/ed25519/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/elastic-transport/Manifest b/dev-ruby/elastic-transport/Manifest
new file mode 100644
index 000000000000..5c1d070fd853
--- /dev/null
+++ b/dev-ruby/elastic-transport/Manifest
@@ -0,0 +1,6 @@
+DIST elastic-transport-8.2.2.tar.gz 55336 BLAKE2B e68c5280c706cbef9b72681c8f2e1ba1847460f6d3f04a35c4faa05a000f236fbbf19a70d129e3d0a31937626d11c7fc077046d6b843d2c3e15c908ef32e9e18 SHA512 34d52bc39f51fe5011e389de6fadaa943a11d0216198976ef06768222eb34583d0ae50d250edc3253e0956eb68e58c507e7f2598535f807425fbd8224caa1154
+DIST elastic-transport-8.2.3.tar.gz 55339 BLAKE2B 648bef27a8fb55c9d617429f8c9921963b8c79c4ed4ca47652f8ab351178b472a63b7ff3b7e3736281a2c31f26433a159acae7704d745ecda118730f091bbd47 SHA512 a35538fc9dbea9262418b34bb91cb2b48b7729536e160b2c30a0ecb2c65d81b7c749015c4254e55950687d30ba6996ad618ed3d11e975eb6a7a32c284a0ea755
+DIST elastic-transport-8.2.4.tar.gz 55964 BLAKE2B 8f995985e543dcf4a472a8b034116eede1a4ca7fd71e710cef57c4437243e9607ecf80cd8d345a09b1583df98f5539f0e9702940cdeca13845c6f3a4b6f3dbee SHA512 79ec2b0dadd4c63e502e426264ceabf8fc76c7c28c78ec3e03b91f9e09c5a347c8151c2a99a7cb775fb5558ee42e24b8c9b8cceaa112df0fc3d2b02daebb12e6
+DIST elastic-transport-8.3.0.tar.gz 59938 BLAKE2B 664bac3ba0f644657a633b32366d7f6d5b5078313b9225dbbb1f8d7bb26ee103a123664ed9f0032d82689c8e7fa3f69174da828fbf1eac250d16ecce0a89c269 SHA512 19d6c91de2891887e1f2d5203dd6e1223e6da664448ef2817370c9c67056a4d094323c80a5e5c049c61d38ce06fe93f7e7e4cf858f9c1e6cb63091dc01606bf9
+DIST elastic-transport-8.3.1.tar.gz 59992 BLAKE2B 867eadff08e73a003cf66c09616cd9430cccde0aa0a58b0a64c92775d799c606a4e592ee5e94ecf3553def7d669081ce8986a3db0a224232ac15cece5a860fd0 SHA512 55b18908b5981bb9d80a99eeef740c79cc10a3a1433b08b898cce76f2c1c4c4c38a459e8a1ba834fd240d7c519632a930182f8621bf095107984ac49012e6597
+DIST elastic-transport-8.3.2.tar.gz 60159 BLAKE2B 1eac8f50148fd48f8421922d7d5d57403ea2874642958de71812522556103e63901072f9b35edc762430353d99c7b8a843ea53153cd98deee661939687bf2cec SHA512 81eaf0fd044cf20b024d3dc865c90dabc68a1b739e2db89dfd9b29410e2c2f47930ac6c8d540817046c6e69f37617f8f21127add0b1b7ae95ad7cf6c0ff6565c
diff --git a/dev-ruby/elastic-transport/elastic-transport-8.2.2.ebuild b/dev-ruby/elastic-transport/elastic-transport-8.2.2.ebuild
new file mode 100644
index 000000000000..5a93f863ee26
--- /dev/null
+++ b/dev-ruby/elastic-transport/elastic-transport-8.2.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Transport classes and utilities shared among Ruby Elastic client libraries"
+HOMEPAGE="https://github.com/elastic/elastic-transport-ruby"
+SRC_URI="https://github.com/elastic/elastic-transport-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="elastic-transport-ruby-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 )
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/hashie
+		|| ( ( dev-ruby/faraday:2 dev-ruby/faraday-net_http_persistent ) dev-ruby/faraday:1 )
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/rspec:3
+		dev-ruby/shoulda-context
+		dev-ruby/curb
+	)
+"
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	# Tweak test setup to only run unit tests since we don't have a live cluster
+	sed -e "s/RUBY_VERSION > '1.9'/false/" \
+		-e '/module Elasticsearch/,$ s:^:#:' \
+		-e '/reporters/ s:^:#: ; /Reporters::SpecReporter/,/^end/ s:^:#: ; /Reporters.use/ s:^:#:' \
+		-i test/test_helper.rb || die
+
+	sed -e '/pry/ s:^:#:' \
+		-e '/config.formatter/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	# Avoid specs that require a running elasticsearch instance
+	sed -e '/#perform_request/ s/describe/xdescribe/' \
+		-e '/when the client connects/ s/context/xcontext/' \
+		-i spec/elastic/transport/client_spec.rb || die
+	sed -e '/retries on 404 status the specified number of max_retries/ s/it/xit/' \
+		-i spec/elastic/transport/base_spec.rb || die
+
+	# Avoid specs that require unpackaged gems
+	sed -e '/when using the HTTPClient adapter/ s/context/xcontext/' \
+		-e '/require.*httpclient/ s:^:#:' \
+		-e '/when the adapter is \(patron\|typhoeus\)/ s/context/xcontext/' \
+		-e '/require.*\(patron\|typhoeus\)/ s:^:#:' \
+		-e '/when the adapter \(can be detected\|is specified as a string key\)/ s/context/xcontext/' \
+		-e '/when the Faraday adapter is \(configured\|set in the block\)/ s/context/xcontext/' \
+		-i spec/elastic/transport/client_spec.rb || die
+	sed -e '/using \(httpclient\|patron\|typhoeus\)/ s/context/xcontext/' \
+		-i spec/elastic/transport/meta_header_spec.rb || die
+}
diff --git a/dev-ruby/elastic-transport/elastic-transport-8.2.3.ebuild b/dev-ruby/elastic-transport/elastic-transport-8.2.3.ebuild
new file mode 100644
index 000000000000..c9d6146ca24d
--- /dev/null
+++ b/dev-ruby/elastic-transport/elastic-transport-8.2.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Transport classes and utilities shared among Ruby Elastic client libraries"
+HOMEPAGE="https://github.com/elastic/elastic-transport-ruby"
+SRC_URI="https://github.com/elastic/elastic-transport-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="elastic-transport-ruby-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 )
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/hashie
+		|| ( ( dev-ruby/faraday:2 dev-ruby/faraday-net_http_persistent ) dev-ruby/faraday:1 )
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/rspec:3
+		dev-ruby/shoulda-context
+		dev-ruby/curb
+	)
+"
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	# Tweak test setup to only run unit tests since we don't have a live cluster
+	sed -e "s/RUBY_VERSION > '1.9'/false/" \
+		-e '/module Elasticsearch/,$ s:^:#:' \
+		-e '/reporters/ s:^:#: ; /Reporters::SpecReporter/,/^end/ s:^:#: ; /Reporters.use/ s:^:#:' \
+		-i test/test_helper.rb || die
+
+	sed -e '/pry/ s:^:#:' \
+		-e '/config.formatter/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	# Avoid specs that require a running elasticsearch instance
+	sed -e '/#perform_request/ s/describe/xdescribe/' \
+		-e '/when the client connects/ s/context/xcontext/' \
+		-i spec/elastic/transport/client_spec.rb || die
+	sed -e '/retries on 404 status the specified number of max_retries/ s/it/xit/' \
+		-i spec/elastic/transport/base_spec.rb || die
+
+	# Avoid specs that require unpackaged gems
+	sed -e '/when using the HTTPClient adapter/ s/context/xcontext/' \
+		-e '/require.*httpclient/ s:^:#:' \
+		-e '/when the adapter is \(patron\|typhoeus\)/ s/context/xcontext/' \
+		-e '/require.*\(patron\|typhoeus\)/ s:^:#:' \
+		-e '/when the adapter \(can be detected\|is specified as a string key\)/ s/context/xcontext/' \
+		-e '/when the Faraday adapter is \(configured\|set in the block\)/ s/context/xcontext/' \
+		-i spec/elastic/transport/client_spec.rb || die
+	sed -e '/using \(httpclient\|patron\|typhoeus\)/ s/context/xcontext/' \
+		-i spec/elastic/transport/meta_header_spec.rb || die
+}
diff --git a/dev-ruby/elastic-transport/elastic-transport-8.2.4.ebuild b/dev-ruby/elastic-transport/elastic-transport-8.2.4.ebuild
new file mode 100644
index 000000000000..c9d6146ca24d
--- /dev/null
+++ b/dev-ruby/elastic-transport/elastic-transport-8.2.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Transport classes and utilities shared among Ruby Elastic client libraries"
+HOMEPAGE="https://github.com/elastic/elastic-transport-ruby"
+SRC_URI="https://github.com/elastic/elastic-transport-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="elastic-transport-ruby-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 )
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/hashie
+		|| ( ( dev-ruby/faraday:2 dev-ruby/faraday-net_http_persistent ) dev-ruby/faraday:1 )
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/rspec:3
+		dev-ruby/shoulda-context
+		dev-ruby/curb
+	)
+"
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	# Tweak test setup to only run unit tests since we don't have a live cluster
+	sed -e "s/RUBY_VERSION > '1.9'/false/" \
+		-e '/module Elasticsearch/,$ s:^:#:' \
+		-e '/reporters/ s:^:#: ; /Reporters::SpecReporter/,/^end/ s:^:#: ; /Reporters.use/ s:^:#:' \
+		-i test/test_helper.rb || die
+
+	sed -e '/pry/ s:^:#:' \
+		-e '/config.formatter/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	# Avoid specs that require a running elasticsearch instance
+	sed -e '/#perform_request/ s/describe/xdescribe/' \
+		-e '/when the client connects/ s/context/xcontext/' \
+		-i spec/elastic/transport/client_spec.rb || die
+	sed -e '/retries on 404 status the specified number of max_retries/ s/it/xit/' \
+		-i spec/elastic/transport/base_spec.rb || die
+
+	# Avoid specs that require unpackaged gems
+	sed -e '/when using the HTTPClient adapter/ s/context/xcontext/' \
+		-e '/require.*httpclient/ s:^:#:' \
+		-e '/when the adapter is \(patron\|typhoeus\)/ s/context/xcontext/' \
+		-e '/require.*\(patron\|typhoeus\)/ s:^:#:' \
+		-e '/when the adapter \(can be detected\|is specified as a string key\)/ s/context/xcontext/' \
+		-e '/when the Faraday adapter is \(configured\|set in the block\)/ s/context/xcontext/' \
+		-i spec/elastic/transport/client_spec.rb || die
+	sed -e '/using \(httpclient\|patron\|typhoeus\)/ s/context/xcontext/' \
+		-i spec/elastic/transport/meta_header_spec.rb || die
+}
diff --git a/dev-ruby/elastic-transport/elastic-transport-8.3.0.ebuild b/dev-ruby/elastic-transport/elastic-transport-8.3.0.ebuild
new file mode 100644
index 000000000000..c9d6146ca24d
--- /dev/null
+++ b/dev-ruby/elastic-transport/elastic-transport-8.3.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Transport classes and utilities shared among Ruby Elastic client libraries"
+HOMEPAGE="https://github.com/elastic/elastic-transport-ruby"
+SRC_URI="https://github.com/elastic/elastic-transport-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="elastic-transport-ruby-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 )
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/hashie
+		|| ( ( dev-ruby/faraday:2 dev-ruby/faraday-net_http_persistent ) dev-ruby/faraday:1 )
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/rspec:3
+		dev-ruby/shoulda-context
+		dev-ruby/curb
+	)
+"
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	# Tweak test setup to only run unit tests since we don't have a live cluster
+	sed -e "s/RUBY_VERSION > '1.9'/false/" \
+		-e '/module Elasticsearch/,$ s:^:#:' \
+		-e '/reporters/ s:^:#: ; /Reporters::SpecReporter/,/^end/ s:^:#: ; /Reporters.use/ s:^:#:' \
+		-i test/test_helper.rb || die
+
+	sed -e '/pry/ s:^:#:' \
+		-e '/config.formatter/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	# Avoid specs that require a running elasticsearch instance
+	sed -e '/#perform_request/ s/describe/xdescribe/' \
+		-e '/when the client connects/ s/context/xcontext/' \
+		-i spec/elastic/transport/client_spec.rb || die
+	sed -e '/retries on 404 status the specified number of max_retries/ s/it/xit/' \
+		-i spec/elastic/transport/base_spec.rb || die
+
+	# Avoid specs that require unpackaged gems
+	sed -e '/when using the HTTPClient adapter/ s/context/xcontext/' \
+		-e '/require.*httpclient/ s:^:#:' \
+		-e '/when the adapter is \(patron\|typhoeus\)/ s/context/xcontext/' \
+		-e '/require.*\(patron\|typhoeus\)/ s:^:#:' \
+		-e '/when the adapter \(can be detected\|is specified as a string key\)/ s/context/xcontext/' \
+		-e '/when the Faraday adapter is \(configured\|set in the block\)/ s/context/xcontext/' \
+		-i spec/elastic/transport/client_spec.rb || die
+	sed -e '/using \(httpclient\|patron\|typhoeus\)/ s/context/xcontext/' \
+		-i spec/elastic/transport/meta_header_spec.rb || die
+}
diff --git a/dev-ruby/elastic-transport/elastic-transport-8.3.1.ebuild b/dev-ruby/elastic-transport/elastic-transport-8.3.1.ebuild
new file mode 100644
index 000000000000..8e048f2b7e14
--- /dev/null
+++ b/dev-ruby/elastic-transport/elastic-transport-8.3.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Transport classes and utilities shared among Ruby Elastic client libraries"
+HOMEPAGE="https://github.com/elastic/elastic-transport-ruby"
+SRC_URI="https://github.com/elastic/elastic-transport-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="elastic-transport-ruby-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+ruby_add_rdepend "
+	|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 )
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/hashie
+		|| ( ( dev-ruby/faraday:2 dev-ruby/faraday-net_http_persistent:2 ) dev-ruby/faraday:1 )
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/rspec:3
+		dev-ruby/shoulda-context
+		dev-ruby/curb
+	)
+"
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	# Tweak test setup to only run unit tests since we don't have a live cluster
+	sed -e "s/RUBY_VERSION > '1.9'/false/" \
+		-e '/module Elasticsearch/,$ s:^:#:' \
+		-e '/reporters/ s:^:#: ; /Reporters::SpecReporter/,/^end/ s:^:#: ; /Reporters.use/ s:^:#:' \
+		-i test/test_helper.rb || die
+
+	sed -e '/pry/ s:^:#:' \
+		-e '/config.formatter/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	# Avoid specs that require a running elasticsearch instance
+	sed -e '/#perform_request/ s/describe/xdescribe/' \
+		-e '/when the client connects/ s/context/xcontext/' \
+		-i spec/elastic/transport/client_spec.rb || die
+	sed -e '/retries on 404 status the specified number of max_retries/ s/it/xit/' \
+		-i spec/elastic/transport/base_spec.rb || die
+
+	# Avoid specs that require unpackaged gems
+	sed -e '/when using the HTTPClient adapter/ s/context/xcontext/' \
+		-e '/require.*httpclient/ s:^:#:' \
+		-e '/when the adapter is \(patron\|typhoeus\)/ s/context/xcontext/' \
+		-e '/require.*\(patron\|typhoeus\)/ s:^:#:' \
+		-e '/when the adapter \(can be detected\|is specified as a string key\)/ s/context/xcontext/' \
+		-e '/when the Faraday adapter is \(configured\|set in the block\)/ s/context/xcontext/' \
+		-i spec/elastic/transport/client_spec.rb || die
+	sed -e '/using \(httpclient\|patron\|typhoeus\)/ s/context/xcontext/' \
+		-i spec/elastic/transport/meta_header_spec.rb || die
+}
diff --git a/dev-ruby/elastic-transport/elastic-transport-8.3.2.ebuild b/dev-ruby/elastic-transport/elastic-transport-8.3.2.ebuild
new file mode 100644
index 000000000000..8e048f2b7e14
--- /dev/null
+++ b/dev-ruby/elastic-transport/elastic-transport-8.3.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Transport classes and utilities shared among Ruby Elastic client libraries"
+HOMEPAGE="https://github.com/elastic/elastic-transport-ruby"
+SRC_URI="https://github.com/elastic/elastic-transport-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="elastic-transport-ruby-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+ruby_add_rdepend "
+	|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 )
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/hashie
+		|| ( ( dev-ruby/faraday:2 dev-ruby/faraday-net_http_persistent:2 ) dev-ruby/faraday:1 )
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/rspec:3
+		dev-ruby/shoulda-context
+		dev-ruby/curb
+	)
+"
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	# Tweak test setup to only run unit tests since we don't have a live cluster
+	sed -e "s/RUBY_VERSION > '1.9'/false/" \
+		-e '/module Elasticsearch/,$ s:^:#:' \
+		-e '/reporters/ s:^:#: ; /Reporters::SpecReporter/,/^end/ s:^:#: ; /Reporters.use/ s:^:#:' \
+		-i test/test_helper.rb || die
+
+	sed -e '/pry/ s:^:#:' \
+		-e '/config.formatter/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	# Avoid specs that require a running elasticsearch instance
+	sed -e '/#perform_request/ s/describe/xdescribe/' \
+		-e '/when the client connects/ s/context/xcontext/' \
+		-i spec/elastic/transport/client_spec.rb || die
+	sed -e '/retries on 404 status the specified number of max_retries/ s/it/xit/' \
+		-i spec/elastic/transport/base_spec.rb || die
+
+	# Avoid specs that require unpackaged gems
+	sed -e '/when using the HTTPClient adapter/ s/context/xcontext/' \
+		-e '/require.*httpclient/ s:^:#:' \
+		-e '/when the adapter is \(patron\|typhoeus\)/ s/context/xcontext/' \
+		-e '/require.*\(patron\|typhoeus\)/ s:^:#:' \
+		-e '/when the adapter \(can be detected\|is specified as a string key\)/ s/context/xcontext/' \
+		-e '/when the Faraday adapter is \(configured\|set in the block\)/ s/context/xcontext/' \
+		-i spec/elastic/transport/client_spec.rb || die
+	sed -e '/using \(httpclient\|patron\|typhoeus\)/ s/context/xcontext/' \
+		-i spec/elastic/transport/meta_header_spec.rb || die
+}
diff --git a/dev-ruby/elastic-transport/metadata.xml b/dev-ruby/elastic-transport/metadata.xml
new file mode 100644
index 000000000000..316b36cccedc
--- /dev/null
+++ b/dev-ruby/elastic-transport/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">elastic/elastic-transport-ruby</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/elasticsearch-api/Manifest b/dev-ruby/elasticsearch-api/Manifest
index 0832a3fe08d6..01c1905bfeb6 100644
--- a/dev-ruby/elasticsearch-api/Manifest
+++ b/dev-ruby/elasticsearch-api/Manifest
@@ -1,2 +1,8 @@
-DIST elasticsearch-ruby-6.8.1.tar.gz 336746 BLAKE2B b7e7f039c1605ca808f57ee2ecb5fd346672d89b1b1cc8eb2d30c8bfcab9d7283f082d9852f0f186a36298dadae98f6951cdbd6a0f401568640f7de006976b0c SHA512 01ab96c92ff04818e29dbab34d73865c1f2adc816670e1fbdfe29a545eb224ff2c6368d7e0f90264c71db76a4f369626ed2e0a4ed3401adf749e0cac41d1f41d
 DIST elasticsearch-ruby-6.8.3.tar.gz 345447 BLAKE2B 6f10b4345d098b36c5b4d8e90e8745b10313de0df1f5bd9285e72f891a871bff8569318d5bd15ab5cca0ada722042affb6bd20ddb68117eb689eadc0c2a16706 SHA512 3001760ff49bf72ba9ac5e11f3338e320c828bfb245d45535325f422e438b693d1ae7a4f73ab766386a76282eca435849c670f3ad98e9431b80b402e97268f83
+DIST elasticsearch-ruby-7.17.10.tar.gz 1032424 BLAKE2B 72ef81b295c656ad319997c89bb065e17e7cda331572758642b028126ff82606b05fd9ba71cf56728428d5f438af69dc3d74f3a1e9733bf5c4869989b03890f0 SHA512 5921595d9f35f5610c999c8f686621212095786d1c2caffd133b315d2ae20154016160950af2bd6f0959a390b1615dbce3da2e43ff2aadbfd1be1b675455f17d
+DIST elasticsearch-ruby-7.17.8.tar.gz 1017287 BLAKE2B d204c1992d5006b386dc0996bed852132ded6b9732a38699e804e1a5ee62387ef5374836cdb4e84c6232066139422b5d1e831143dbd682e86ec30df9077b1279 SHA512 71288f31e18ff13709962848091e8e0afb128d805be9c3060421bb46fa7bf120700330beb12241b4f7385e88d9f959921fce3721a1050f89c2464ab8dd355706
+DIST elasticsearch-ruby-7.17.9.tar.gz 1030121 BLAKE2B 5acfc3f2ce9d39e9f02deed043aec90800968fef453d47802b6628598fc3c39875238d29e1c8927b88fb1e7a65960024e43874482da8a0920cca17a4beb2c0b4 SHA512 974dde6478345a22f27b4264219759a16878e29eb0aabaf6d57aa0d94d22712e35e55657ff5625a36e8643dcb12bac8aa4e6bb269ac011ca8fddcaae0083bcf0
+DIST elasticsearch-ruby-8.10.0.tar.gz 1760605 BLAKE2B c9c1d1486ebf7254e67f648b2ac6aef3c5dd17abdafcd4be503c610f0531e904c03d05391157fdc1c0f88e534886b50f978eeac03248f5a580fc1a3da8cc1a85 SHA512 d079e244095349dbab7e0cd2a962ee0bd8f1122f4ffd254fce26dea28722e79aa7251fed66091f8bb5d3128be6bf22c0c9ad3c5acb34b60b67c1505aa0093181
+DIST elasticsearch-ruby-8.12.2.tar.gz 1908814 BLAKE2B f3caffe7336a63547ba0d44a3239fb6b71ed7fb46b1136114a87e7e5f69608d69b14d12f568b6e945db0917a6913a10407cf7cae3137605adaaac5fb7fd9439b SHA512 08fe791ee20cbe9f6ad9aee1b7d9c02813895add4bb0ff7b4e063051b42e62e037d71217521f6a9cb0076c51e8f7160bad52798741435164451806932488d17c
+DIST elasticsearch-ruby-8.13.0.tar.gz 1918145 BLAKE2B ded410c9e77876dc61a942ab1de7945d28aa1c06cd7079f693119812128fdfd38c206d9644aadb79fb8c9b48e12d77fec6c313434cfb58510bc48fecc905106b SHA512 8babc5797802ae256b41a00927cd1688c2d3d90770d8a867a9b96a7a115f537f1ca301b2d6b73107995b23578abc755d7bf7dc03075520fa857dda22e6a2d32b
+DIST elasticsearch-ruby-8.9.0.tar.gz 1755804 BLAKE2B aff81b211eca6ad551fa54d949e39815eba15b579601e7af48122dacbd78836a57475c31bab6326c874dff4c6991deecb9b859866e417302b54d87f250f2695f SHA512 33b2322e83cbe08229aea81662e2ff7bd46b05a9ab85ccd61efcc8e0ffc8779699d4235bda549221f0839bbf999fefb502e44144b2bd7d0ea102a2aa54a080b1
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.1.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.1.ebuild
deleted file mode 100644
index 61690f9372e5..000000000000
--- a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
-
-inherit ruby-fakegem
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch-api module"
-HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
-SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/multi_json
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/ansi
-		dev-ruby/elasticsearch-transport
-		dev-ruby/mocha:1.0
-		dev-ruby/pry
-		dev-ruby/shoulda-context
-	)
-"
-
-RUBY_S=${MY_P}/${PN}
-
-all_ruby_prepare() {
-	# fix to work without git
-	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
-
-	# remove useless dependencies from Rakefile
-	sed -e '/bundler/d' \
-		-e '/require.*cane/,/end/d' \
-		-i Rakefile || die
-
-	sed -e '/config.formatter/ s/documentation/progress/' \
-		-e '1irequire "patron"' \
-		-i spec/spec_helper.rb || die
-
-	# Avoid tests that require unpackaged jbuilder and jsonify
-	sed -i -e '/\(pry-nav\|jbuilder\|jsonify\)/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
-
-	sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' spec/elasticsearch/api/utils_spec.rb || die
-}
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.3.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.3.ebuild
index 958f6af5d6bf..325fd49a4a7f 100644
--- a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.3.ebuild
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.3.ebuild
@@ -1,9 +1,9 @@
-# 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"
+USE_RUBY="ruby27 ruby30 ruby31"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 RUBY_FAKEGEM_TASK_DOC=doc
 
@@ -30,6 +30,7 @@ ruby_add_bdepend "
 		dev-ruby/ansi
 		dev-ruby/elasticsearch-transport
 		dev-ruby/mocha:1.0
+		dev-ruby/patron
 		dev-ruby/pry
 		dev-ruby/shoulda-context
 	)
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-7.17.10.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-7.17.10.ebuild
new file mode 100644
index 000000000000..1dd6949f7571
--- /dev/null
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-7.17.10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-api module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	sed -i -e '/config.formatter/ s/documentation/progress/' spec/spec_helper.rb || die
+
+	# Avoid tests that require unpackaged jbuilder and jsonify
+	sed -e '/\(pry-\|jbuilder\|jsonify\)/ s:^:#:' \
+		-e '/RspecJunitFormatter/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+	rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
+
+	sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' spec/elasticsearch/api/utils_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-7.17.8.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-7.17.8.ebuild
new file mode 100644
index 000000000000..6851e20568e3
--- /dev/null
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-7.17.8.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="ruby31"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-api module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/patron
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	sed -i -e '/config.formatter/ s/documentation/progress/' spec/spec_helper.rb || die
+
+	# Avoid tests that require unpackaged jbuilder and jsonify
+	sed -e '/\(pry-\|jbuilder\|jsonify\)/ s:^:#:' \
+		-e '/RspecJunitFormatter/ s:^:#:' \
+		-e '/ansi/arequire "patron"' \
+		-e '1igem "faraday", "~> 1.0"' \
+		-i spec/spec_helper.rb || die
+	rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
+
+	sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' spec/elasticsearch/api/utils_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-7.17.9.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-7.17.9.ebuild
new file mode 100644
index 000000000000..6851e20568e3
--- /dev/null
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-7.17.9.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="ruby31"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-api module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/patron
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	sed -i -e '/config.formatter/ s/documentation/progress/' spec/spec_helper.rb || die
+
+	# Avoid tests that require unpackaged jbuilder and jsonify
+	sed -e '/\(pry-\|jbuilder\|jsonify\)/ s:^:#:' \
+		-e '/RspecJunitFormatter/ s:^:#:' \
+		-e '/ansi/arequire "patron"' \
+		-e '1igem "faraday", "~> 1.0"' \
+		-i spec/spec_helper.rb || die
+	rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
+
+	sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' spec/elasticsearch/api/utils_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-8.10.0.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-8.10.0.ebuild
new file mode 100644
index 000000000000..68638e73868b
--- /dev/null
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-8.10.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-api module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch
+		dev-ruby/elastic-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/patron
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	sed -i -e '/add_formatter/ s/documentation/progress/' spec/spec_helper.rb || die
+
+	# Avoid tests that require unpackaged jbuilder and jsonify
+	sed -e '/\(pry-\|jbuilder\|jsonify\)/ s:^:#:' \
+		-e '/RspecJunitFormatter/ s:^:#:' \
+		-e '/ansi/arequire "patron"' \
+		-i spec/spec_helper.rb || die
+	rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
+
+	sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' spec/elasticsearch/api/utils_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-8.12.2.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-8.12.2.ebuild
new file mode 100644
index 000000000000..0bd7b29d948b
--- /dev/null
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-8.12.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-api module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch
+		dev-ruby/elastic-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/patron
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	sed -i -e '/add_formatter/ s/documentation/progress/' spec/spec_helper.rb || die
+
+	# Avoid tests that require unpackaged jbuilder and jsonify
+	sed -e '/\(pry-\|jbuilder\|jsonify\)/ s:^:#:' \
+		-e '/RspecJunitFormatter/ s:^:#:' \
+		-e '/ansi/arequire "patron"' \
+		-i spec/spec_helper.rb || die
+	rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
+
+	sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' spec/elasticsearch/api/utils_spec.rb || die
+
+	# Create tmp directory required for tests
+	mkdir -p ../tmp/rest-api-spec/api || die
+}
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-8.13.0.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-8.13.0.ebuild
new file mode 100644
index 000000000000..0bd7b29d948b
--- /dev/null
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-8.13.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-api module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch
+		dev-ruby/elastic-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/patron
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	sed -i -e '/add_formatter/ s/documentation/progress/' spec/spec_helper.rb || die
+
+	# Avoid tests that require unpackaged jbuilder and jsonify
+	sed -e '/\(pry-\|jbuilder\|jsonify\)/ s:^:#:' \
+		-e '/RspecJunitFormatter/ s:^:#:' \
+		-e '/ansi/arequire "patron"' \
+		-i spec/spec_helper.rb || die
+	rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
+
+	sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' spec/elasticsearch/api/utils_spec.rb || die
+
+	# Create tmp directory required for tests
+	mkdir -p ../tmp/rest-api-spec/api || die
+}
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-8.9.0.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-8.9.0.ebuild
new file mode 100644
index 000000000000..c11dc0bd9dc3
--- /dev/null
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-8.9.0.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="ruby30 ruby31 ruby32"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-api module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch
+		dev-ruby/elastic-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/patron
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	sed -i -e '/config.formatter/ s/documentation/progress/' spec/spec_helper.rb || die
+
+	# Avoid tests that require unpackaged jbuilder and jsonify
+	sed -e '/\(pry-\|jbuilder\|jsonify\)/ s:^:#:' \
+		-e '/RspecJunitFormatter/ s:^:#:' \
+		-e '/ansi/arequire "patron"' \
+		-i spec/spec_helper.rb || die
+	rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
+
+	sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' spec/elasticsearch/api/utils_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch-api/metadata.xml b/dev-ruby/elasticsearch-api/metadata.xml
index b525fceb7d13..e6adc4fb4fae 100644
--- a/dev-ruby/elasticsearch-api/metadata.xml
+++ b/dev-ruby/elasticsearch-api/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-	</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">elastic/elasticsearch-ruby</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/elasticsearch-extensions/Manifest b/dev-ruby/elasticsearch-extensions/Manifest
deleted file mode 100644
index 1cd27dfa60c1..000000000000
--- a/dev-ruby/elasticsearch-extensions/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST elasticsearch-ruby-0.0.33.tar.gz 1305021 BLAKE2B 5fce0ba8276451863519aa14bccd619a9ed4ad68220928e2f04a1349aaaefeda1027d28d3b130ab593f5643cf8af82a4bd0aeb19f79a0c9c8419a89dd70ea8a9 SHA512 db39555d418ae06f4bbcb7dd5b2c71e9c5523fa434e5acc9d6761e3d90ed64d0f282ffa3720ee4a702aade00e20bdc33935ed462910178d4cc609296970cd325
diff --git a/dev-ruby/elasticsearch-extensions/elasticsearch-extensions-0.0.33.ebuild b/dev-ruby/elasticsearch-extensions/elasticsearch-extensions-0.0.33.ebuild
deleted file mode 100644
index 7c3b937f3294..000000000000
--- a/dev-ruby/elasticsearch-extensions/elasticsearch-extensions-0.0.33.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
-
-inherit ruby-fakegem
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch-extensions module"
-HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
-SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/ansi
-	dev-ruby/elasticsearch
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha:1.0
-		dev-ruby/pry
-		dev-ruby/rspec:3
-		dev-ruby/shoulda-context
-		dev-ruby/curb
-		dev-ruby/patron
-	)
-"
-
-RUBY_S=${MY_P}/${PN}
-
-all_ruby_prepare() {
-	# fix to work without git
-	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
-
-	# remove useless dependencies from Rakefile
-	sed -e '/bundler/d' \
-		-e '/require.*cane/,/end/d' \
-		-e '/require.*yard/,/end/ s:^:#:' \
-		-i Rakefile || die
-
-	sed -e '/reporters/I s:^:#:' \
-		-i test/test_helper.rb || die
-}
diff --git a/dev-ruby/elasticsearch-extensions/metadata.xml b/dev-ruby/elasticsearch-extensions/metadata.xml
deleted file mode 100644
index b525fceb7d13..000000000000
--- a/dev-ruby/elasticsearch-extensions/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/elasticsearch-transport/Manifest b/dev-ruby/elasticsearch-transport/Manifest
index 0832a3fe08d6..2e83f579b5da 100644
--- a/dev-ruby/elasticsearch-transport/Manifest
+++ b/dev-ruby/elasticsearch-transport/Manifest
@@ -1,2 +1,5 @@
-DIST elasticsearch-ruby-6.8.1.tar.gz 336746 BLAKE2B b7e7f039c1605ca808f57ee2ecb5fd346672d89b1b1cc8eb2d30c8bfcab9d7283f082d9852f0f186a36298dadae98f6951cdbd6a0f401568640f7de006976b0c SHA512 01ab96c92ff04818e29dbab34d73865c1f2adc816670e1fbdfe29a545eb224ff2c6368d7e0f90264c71db76a4f369626ed2e0a4ed3401adf749e0cac41d1f41d
 DIST elasticsearch-ruby-6.8.3.tar.gz 345447 BLAKE2B 6f10b4345d098b36c5b4d8e90e8745b10313de0df1f5bd9285e72f891a871bff8569318d5bd15ab5cca0ada722042affb6bd20ddb68117eb689eadc0c2a16706 SHA512 3001760ff49bf72ba9ac5e11f3338e320c828bfb245d45535325f422e438b693d1ae7a4f73ab766386a76282eca435849c670f3ad98e9431b80b402e97268f83
+DIST elasticsearch-ruby-7.17.10.tar.gz 1032424 BLAKE2B 72ef81b295c656ad319997c89bb065e17e7cda331572758642b028126ff82606b05fd9ba71cf56728428d5f438af69dc3d74f3a1e9733bf5c4869989b03890f0 SHA512 5921595d9f35f5610c999c8f686621212095786d1c2caffd133b315d2ae20154016160950af2bd6f0959a390b1615dbce3da2e43ff2aadbfd1be1b675455f17d
+DIST elasticsearch-ruby-7.17.7.tar.gz 1017241 BLAKE2B 5da6a9dc39afb42c5f5b27aebc403743950d7f587229f5aae8e838e68eab760068686d96fcdc5287596130748e2d2017d56afbd72decf50cdf57eeaac4bd8436 SHA512 d19722ffd5786570f6d36e915b25916dc6879029a6b93bda2ec001209f3a2b0db1bc465ec0eedb9795addd33e2c265a39730fcac5e6ed35a6df14e08b764e83e
+DIST elasticsearch-ruby-7.17.8.tar.gz 1017287 BLAKE2B d204c1992d5006b386dc0996bed852132ded6b9732a38699e804e1a5ee62387ef5374836cdb4e84c6232066139422b5d1e831143dbd682e86ec30df9077b1279 SHA512 71288f31e18ff13709962848091e8e0afb128d805be9c3060421bb46fa7bf120700330beb12241b4f7385e88d9f959921fce3721a1050f89c2464ab8dd355706
+DIST elasticsearch-ruby-7.17.9.tar.gz 1030121 BLAKE2B 5acfc3f2ce9d39e9f02deed043aec90800968fef453d47802b6628598fc3c39875238d29e1c8927b88fb1e7a65960024e43874482da8a0920cca17a4beb2c0b4 SHA512 974dde6478345a22f27b4264219759a16878e29eb0aabaf6d57aa0d94d22712e35e55657ff5625a36e8643dcb12bac8aa4e6bb269ac011ca8fddcaae0083bcf0
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.1.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.1.ebuild
deleted file mode 100644
index 15c571ae204d..000000000000
--- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
-
-inherit ruby-fakegem
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
-HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
-SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/faraday
-	dev-ruby/multi_json
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/ansi
-		dev-ruby/mocha:1.0
-		dev-ruby/pry
-		dev-ruby/shoulda-context
-		dev-ruby/curb
-		dev-ruby/patron
-	)
-"
-
-RUBY_S=${MY_P}/${PN}
-
-all_ruby_prepare() {
-	# fix to work without git
-	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
-
-	# remove useless dependencies from Rakefile
-	sed -e '/bundler/d' \
-		-e '/require.*cane/,/end/d' \
-		-i Rakefile || die
-
-	# Tweak test setup to only run unit tests since we don't have a live cluster
-	sed -e "s/RUBY_VERSION > '1.9'/false/" \
-		-e '/module Elasticsearch/,$ s:^:#:' \
-		-e '1igem "faraday", "~> 0.9"; gem "patron"' \
-		-i test/test_helper.rb || die
-}
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3-r1.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3-r1.ebuild
new file mode 100644
index 000000000000..1aabb17a8455
--- /dev/null
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/faraday:1
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/rspec:3
+		dev-ruby/shoulda-context
+		dev-ruby/curb
+		dev-ruby/patron
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	# Tweak test setup to only run unit tests since we don't have a live cluster
+	sed -i -e "s/RUBY_VERSION > '1.9'/false/" \
+		-e '/module Elasticsearch/,$ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild
deleted file mode 100644
index fcc6c603bf6c..000000000000
--- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
-
-inherit ruby-fakegem
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
-HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
-SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/faraday:1
-	dev-ruby/multi_json
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/ansi
-		dev-ruby/mocha:1.0
-		dev-ruby/pry
-		dev-ruby/rspec:3
-		dev-ruby/shoulda-context
-		dev-ruby/curb
-		dev-ruby/patron
-	)
-"
-
-RUBY_S=${MY_P}/${PN}
-
-all_ruby_prepare() {
-	# fix to work without git
-	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
-
-	# remove useless dependencies from Rakefile
-	sed -e '/bundler/d' \
-		-e '/require.*cane/,/end/d' \
-		-i Rakefile || die
-
-	# Tweak test setup to only run unit tests since we don't have a live cluster
-	sed -i -e "s/RUBY_VERSION > '1.9'/false/" \
-		-e '/module Elasticsearch/,$ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-7.17.10.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-7.17.10.ebuild
new file mode 100644
index 000000000000..622c721b1490
--- /dev/null
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-7.17.10.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 )
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/rspec:3
+		dev-ruby/shoulda-context
+		dev-ruby/curb
+		dev-ruby/ethon
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	# Tweak test setup to only run unit tests since we don't have a live cluster
+	sed -e "s/RUBY_VERSION > '1.9'/false/" \
+		-e '/module Elasticsearch/,$ s:^:#:' \
+		-e '/reporters/ s:^:#: ; /Reporters::SpecReporter/,/^end/ s:^:#: ; /Reporters.use/ s:^:#:' \
+		-i test/test_helper.rb || die
+
+	sed -e '/pry/ s:^:#:' \
+		-e '/config.formatter/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	# Avoid specs that require a running elasticsearch instance or
+	# unpackaged Faraday adapter.
+	sed -e '/#perform_request/ s/describe/xdescribe/' \
+		-e '/when the client connects/ s/context/xcontext/' \
+		-e '/when using the \(HTTPClient\|Patron\) adapter/ s/context/xcontext/' \
+		-e '/require.*\(httpclient\|patron\)/ s:^:#:' \
+		-e '/when the adapter is \(patron\|specified as a string key\|typhoeus\)/ s/context/xcontext/' \
+		-e '/when the adapter can be detected/ s/context/xcontext/' \
+		-e '/when the Faraday adapter is configured/ s/context/xcontext/' \
+		-i spec/elasticsearch/transport/client_spec.rb || die
+	sed -e '/using \(httpclient\|typhoeus\|patron\)/ s/context/xcontext/' \
+		-e '/require.*httpclient/ s:^:#:' \
+		-i spec/elasticsearch/transport/meta_header_spec.rb || die
+	sed -e '/retries on 404 status the specified number of max_retries/ s/it/xit/' \
+		-i spec/elasticsearch/transport/base_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-7.17.7.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-7.17.7.ebuild
new file mode 100644
index 000000000000..a1d81e04c059
--- /dev/null
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-7.17.7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/faraday:1
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/rspec:3
+		dev-ruby/shoulda-context
+		dev-ruby/curb
+		dev-ruby/patron
+		dev-ruby/typhoeus
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	# Tweak test setup to only run unit tests since we don't have a live cluster
+	sed -e "s/RUBY_VERSION > '1.9'/false/" \
+		-e '/module Elasticsearch/,$ s:^:#:' \
+		-e '/reporters/ s:^:#: ; /Reporters::SpecReporter/,/^end/ s:^:#: ; /Reporters.use/ s:^:#:' \
+		-i test/test_helper.rb || die
+
+	sed -e '/pry/ s:^:#:' \
+		-e '1igem "faraday", "~> 1.0"' \
+		-e '/config.formatter/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	# Avoid specs that require a running elasticsearch instance
+	sed -e '/#perform_request/ s/describe/xdescribe/' \
+		-e '/when the client connects/ s/context/xcontext/' \
+		-i spec/elasticsearch/transport/client_spec.rb || die
+	sed -e '/retries on 404 status the specified number of max_retries/ s/it/xit/' \
+		-i spec/elasticsearch/transport/base_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-7.17.8.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-7.17.8.ebuild
new file mode 100644
index 000000000000..6b2be3fa12b7
--- /dev/null
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-7.17.8.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/faraday:1
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/rspec:3
+		dev-ruby/shoulda-context
+		dev-ruby/curb
+		dev-ruby/patron
+		dev-ruby/typhoeus
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	# Tweak test setup to only run unit tests since we don't have a live cluster
+	sed -e "s/RUBY_VERSION > '1.9'/false/" \
+		-e '/module Elasticsearch/,$ s:^:#:' \
+		-e '/reporters/ s:^:#: ; /Reporters::SpecReporter/,/^end/ s:^:#: ; /Reporters.use/ s:^:#:' \
+		-i test/test_helper.rb || die
+
+	sed -e '/pry/ s:^:#:' \
+		-e '1igem "faraday", "~> 1.0"' \
+		-e '/config.formatter/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	# Avoid specs that require a running elasticsearch instance
+	sed -e '/#perform_request/ s/describe/xdescribe/' \
+		-e '/when the client connects/ s/context/xcontext/' \
+		-i spec/elasticsearch/transport/client_spec.rb || die
+	sed -e '/retries on 404 status the specified number of max_retries/ s/it/xit/' \
+		-i spec/elasticsearch/transport/base_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-7.17.9.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-7.17.9.ebuild
new file mode 100644
index 000000000000..fe40ac511809
--- /dev/null
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-7.17.9.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/faraday:1
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/rspec:3
+		dev-ruby/shoulda-context
+		dev-ruby/curb
+		dev-ruby/ethon
+		dev-ruby/patron
+		dev-ruby/typhoeus
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	# Tweak test setup to only run unit tests since we don't have a live cluster
+	sed -e "s/RUBY_VERSION > '1.9'/false/" \
+		-e '/module Elasticsearch/,$ s:^:#:' \
+		-e '/reporters/ s:^:#: ; /Reporters::SpecReporter/,/^end/ s:^:#: ; /Reporters.use/ s:^:#:' \
+		-i test/test_helper.rb || die
+
+	sed -e '/pry/ s:^:#:' \
+		-e '1igem "faraday", "~> 1.0"' \
+		-e '/config.formatter/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	# Avoid specs that require a running elasticsearch instance
+	sed -e '/#perform_request/ s/describe/xdescribe/' \
+		-e '/when the client connects/ s/context/xcontext/' \
+		-i spec/elasticsearch/transport/client_spec.rb || die
+	sed -e '/retries on 404 status the specified number of max_retries/ s/it/xit/' \
+		-i spec/elasticsearch/transport/base_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch-transport/metadata.xml b/dev-ruby/elasticsearch-transport/metadata.xml
index b525fceb7d13..e6adc4fb4fae 100644
--- a/dev-ruby/elasticsearch-transport/metadata.xml
+++ b/dev-ruby/elasticsearch-transport/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-	</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">elastic/elasticsearch-ruby</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/elasticsearch/Manifest b/dev-ruby/elasticsearch/Manifest
index 0832a3fe08d6..01c1905bfeb6 100644
--- a/dev-ruby/elasticsearch/Manifest
+++ b/dev-ruby/elasticsearch/Manifest
@@ -1,2 +1,8 @@
-DIST elasticsearch-ruby-6.8.1.tar.gz 336746 BLAKE2B b7e7f039c1605ca808f57ee2ecb5fd346672d89b1b1cc8eb2d30c8bfcab9d7283f082d9852f0f186a36298dadae98f6951cdbd6a0f401568640f7de006976b0c SHA512 01ab96c92ff04818e29dbab34d73865c1f2adc816670e1fbdfe29a545eb224ff2c6368d7e0f90264c71db76a4f369626ed2e0a4ed3401adf749e0cac41d1f41d
 DIST elasticsearch-ruby-6.8.3.tar.gz 345447 BLAKE2B 6f10b4345d098b36c5b4d8e90e8745b10313de0df1f5bd9285e72f891a871bff8569318d5bd15ab5cca0ada722042affb6bd20ddb68117eb689eadc0c2a16706 SHA512 3001760ff49bf72ba9ac5e11f3338e320c828bfb245d45535325f422e438b693d1ae7a4f73ab766386a76282eca435849c670f3ad98e9431b80b402e97268f83
+DIST elasticsearch-ruby-7.17.10.tar.gz 1032424 BLAKE2B 72ef81b295c656ad319997c89bb065e17e7cda331572758642b028126ff82606b05fd9ba71cf56728428d5f438af69dc3d74f3a1e9733bf5c4869989b03890f0 SHA512 5921595d9f35f5610c999c8f686621212095786d1c2caffd133b315d2ae20154016160950af2bd6f0959a390b1615dbce3da2e43ff2aadbfd1be1b675455f17d
+DIST elasticsearch-ruby-7.17.8.tar.gz 1017287 BLAKE2B d204c1992d5006b386dc0996bed852132ded6b9732a38699e804e1a5ee62387ef5374836cdb4e84c6232066139422b5d1e831143dbd682e86ec30df9077b1279 SHA512 71288f31e18ff13709962848091e8e0afb128d805be9c3060421bb46fa7bf120700330beb12241b4f7385e88d9f959921fce3721a1050f89c2464ab8dd355706
+DIST elasticsearch-ruby-7.17.9.tar.gz 1030121 BLAKE2B 5acfc3f2ce9d39e9f02deed043aec90800968fef453d47802b6628598fc3c39875238d29e1c8927b88fb1e7a65960024e43874482da8a0920cca17a4beb2c0b4 SHA512 974dde6478345a22f27b4264219759a16878e29eb0aabaf6d57aa0d94d22712e35e55657ff5625a36e8643dcb12bac8aa4e6bb269ac011ca8fddcaae0083bcf0
+DIST elasticsearch-ruby-8.10.0.tar.gz 1760605 BLAKE2B c9c1d1486ebf7254e67f648b2ac6aef3c5dd17abdafcd4be503c610f0531e904c03d05391157fdc1c0f88e534886b50f978eeac03248f5a580fc1a3da8cc1a85 SHA512 d079e244095349dbab7e0cd2a962ee0bd8f1122f4ffd254fce26dea28722e79aa7251fed66091f8bb5d3128be6bf22c0c9ad3c5acb34b60b67c1505aa0093181
+DIST elasticsearch-ruby-8.12.2.tar.gz 1908814 BLAKE2B f3caffe7336a63547ba0d44a3239fb6b71ed7fb46b1136114a87e7e5f69608d69b14d12f568b6e945db0917a6913a10407cf7cae3137605adaaac5fb7fd9439b SHA512 08fe791ee20cbe9f6ad9aee1b7d9c02813895add4bb0ff7b4e063051b42e62e037d71217521f6a9cb0076c51e8f7160bad52798741435164451806932488d17c
+DIST elasticsearch-ruby-8.13.0.tar.gz 1918145 BLAKE2B ded410c9e77876dc61a942ab1de7945d28aa1c06cd7079f693119812128fdfd38c206d9644aadb79fb8c9b48e12d77fec6c313434cfb58510bc48fecc905106b SHA512 8babc5797802ae256b41a00927cd1688c2d3d90770d8a867a9b96a7a115f537f1ca301b2d6b73107995b23578abc755d7bf7dc03075520fa857dda22e6a2d32b
+DIST elasticsearch-ruby-8.9.0.tar.gz 1755804 BLAKE2B aff81b211eca6ad551fa54d949e39815eba15b579601e7af48122dacbd78836a57475c31bab6326c874dff4c6991deecb9b859866e417302b54d87f250f2695f SHA512 33b2322e83cbe08229aea81662e2ff7bd46b05a9ab85ccd61efcc8e0ffc8779699d4235bda549221f0839bbf999fefb502e44144b2bd7d0ea102a2aa54a080b1
diff --git a/dev-ruby/elasticsearch/elasticsearch-6.8.1.ebuild b/dev-ruby/elasticsearch/elasticsearch-6.8.1.ebuild
deleted file mode 100644
index d26044743ec6..000000000000
--- a/dev-ruby/elasticsearch/elasticsearch-6.8.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-inherit ruby-fakegem
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch module"
-HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
-SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/elasticsearch-api-${PV}
-	~dev-ruby/elasticsearch-transport-${PV}
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/ansi
-		dev-ruby/elasticsearch-transport
-		dev-ruby/mocha:1.0
-		dev-ruby/pry
-		dev-ruby/shoulda-context
-	)
-"
-
-# Tests need additional modules (at least 'turn') packaged. Then someone
-# should look into running them and so on.
-RESTRICT="test"
-
-RUBY_S=${MY_P}/${PN}
-
-all_ruby_prepare() {
-	# fix to work without git
-	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
-
-	# remove useless dependencies from Rakefile
-	sed -e '/bundler/d' \
-		-e '/require.*cane/,/end/d' \
-		-i Rakefile || die
-}
diff --git a/dev-ruby/elasticsearch/elasticsearch-6.8.3.ebuild b/dev-ruby/elasticsearch/elasticsearch-6.8.3.ebuild
index b19211d3f50f..b522010aad3f 100644
--- a/dev-ruby/elasticsearch/elasticsearch-6.8.3.ebuild
+++ b/dev-ruby/elasticsearch/elasticsearch-6.8.3.ebuild
@@ -1,9 +1,9 @@
-# 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"
+USE_RUBY="ruby27 ruby30 ruby31"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 RUBY_FAKEGEM_TASK_DOC=doc
 
diff --git a/dev-ruby/elasticsearch/elasticsearch-7.17.10.ebuild b/dev-ruby/elasticsearch/elasticsearch-7.17.10.ebuild
new file mode 100644
index 000000000000..4bd16db0ddb3
--- /dev/null
+++ b/dev-ruby/elasticsearch/elasticsearch-7.17.10.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	~dev-ruby/elasticsearch-api-${PV}
+	~dev-ruby/elasticsearch-transport-${PV}
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+		dev-ruby/webmock
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	sed -e '/documentation/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	# Avoid spec requiring a running elasticsearch server
+	rm -f spec/integration/{characters_escaping,client_integration,validation_integration}_spec.rb || die
+
+	# Use the Faraday default adapter instead of a random auto-detected and unpackaged one.
+	sed -e '/Elasticsearch::Client.new/ s/$/ adapter: :net_http/' \
+		-i spec/unit/wrapper_gem_spec.rb || die
+	sed -e 's/Elasticsearch::Client.new /Elasticsearch::Client.new adapter: :net_http/' \
+		-e '/Elasticsearch::Client.new(/ s/(/(adapter: :net_http, /' \
+		-i spec/unit/elasticsearch_product_validation_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch/elasticsearch-7.17.8.ebuild b/dev-ruby/elasticsearch/elasticsearch-7.17.8.ebuild
new file mode 100644
index 000000000000..88751547f4fb
--- /dev/null
+++ b/dev-ruby/elasticsearch/elasticsearch-7.17.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	~dev-ruby/elasticsearch-api-${PV}
+	~dev-ruby/elasticsearch-transport-${PV}
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	sed -e '/documentation/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	# Avoid spec requiring a running elasticsearch server
+	rm -f spec/integration/{characters_escaping,client_integration,validation_integration}_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch/elasticsearch-7.17.9.ebuild b/dev-ruby/elasticsearch/elasticsearch-7.17.9.ebuild
new file mode 100644
index 000000000000..88751547f4fb
--- /dev/null
+++ b/dev-ruby/elasticsearch/elasticsearch-7.17.9.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	~dev-ruby/elasticsearch-api-${PV}
+	~dev-ruby/elasticsearch-transport-${PV}
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	sed -e '/documentation/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	# Avoid spec requiring a running elasticsearch server
+	rm -f spec/integration/{characters_escaping,client_integration,validation_integration}_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch/elasticsearch-8.10.0.ebuild b/dev-ruby/elasticsearch/elasticsearch-8.10.0.ebuild
new file mode 100644
index 000000000000..877765963627
--- /dev/null
+++ b/dev-ruby/elasticsearch/elasticsearch-8.10.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	~dev-ruby/elasticsearch-api-${PV}
+	dev-ruby/elastic-transport:8
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	sed -e '/documentation/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	# Avoid spec requiring a running elasticsearch server
+	rm -f spec/integration/{characters_escaping,client_integration,validation_integration}_spec.rb || die
+	rm -f spec/integration/helpers/*_helper_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch/elasticsearch-8.12.2.ebuild b/dev-ruby/elasticsearch/elasticsearch-8.12.2.ebuild
new file mode 100644
index 000000000000..346bd1ac2a4d
--- /dev/null
+++ b/dev-ruby/elasticsearch/elasticsearch-8.12.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	~dev-ruby/elasticsearch-api-${PV}
+	dev-ruby/elastic-transport:8
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/base64
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	sed -e '/documentation/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	# Avoid spec requiring a running elasticsearch server
+	rm -f spec/integration/{characters_escaping,client_integration,validation_integration}_spec.rb || die
+	rm -f spec/integration/helpers/*_helper_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch/elasticsearch-8.13.0.ebuild b/dev-ruby/elasticsearch/elasticsearch-8.13.0.ebuild
new file mode 100644
index 000000000000..346bd1ac2a4d
--- /dev/null
+++ b/dev-ruby/elasticsearch/elasticsearch-8.13.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	~dev-ruby/elasticsearch-api-${PV}
+	dev-ruby/elastic-transport:8
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/base64
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	sed -e '/documentation/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	# Avoid spec requiring a running elasticsearch server
+	rm -f spec/integration/{characters_escaping,client_integration,validation_integration}_spec.rb || die
+	rm -f spec/integration/helpers/*_helper_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch/elasticsearch-8.9.0.ebuild b/dev-ruby/elasticsearch/elasticsearch-8.9.0.ebuild
new file mode 100644
index 000000000000..17df5d7d899d
--- /dev/null
+++ b/dev-ruby/elasticsearch/elasticsearch-8.9.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	~dev-ruby/elasticsearch-api-${PV}
+	dev-ruby/elastic-transport:8
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	sed -e '/documentation/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	# Avoid spec requiring a running elasticsearch server
+	rm -f spec/integration/{characters_escaping,client_integration,validation_integration}_spec.rb || die
+	rm -f spec/integration/helpers/*_helper_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch/metadata.xml b/dev-ruby/elasticsearch/metadata.xml
index b525fceb7d13..e6adc4fb4fae 100644
--- a/dev-ruby/elasticsearch/metadata.xml
+++ b/dev-ruby/elasticsearch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-	</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">elastic/elasticsearch-ruby</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/em-websocket/Manifest b/dev-ruby/em-websocket/Manifest
index 264fa5de1fff..88d50706746e 100644
--- a/dev-ruby/em-websocket/Manifest
+++ b/dev-ruby/em-websocket/Manifest
@@ -1,2 +1 @@
-DIST em-websocket-0.5.2.tar.gz 29367 BLAKE2B 91d41044e20f1f8277527205e3ee6671de2a1fb9b433c18d5b48a166c7cfa53c6553e32b726326f126981f0e014625075bc918b71e00bd8a6919670c370b6cab SHA512 46df705e2af93082884c7ca521df4f6cf33309c441eb3ba96be609b2cf280e3b72c689810d55279db6dbbc178ed843d64ccdaf9d4b39d52ddac7d84956065b06
 DIST em-websocket-0.5.3.tar.gz 29411 BLAKE2B ce38ee1adc9cd49454d74d94130e9d759c631337da9401390fae68210f7b02692a0f23eb5970aa226ab3651e1924a117ac104a01481cc954ca77ab9c27b1e5ac SHA512 28d5cf042899319f50ff0d3b140d75fb281b7e0635118a63df243151c4f442dbabf7dbe15b26b44167d925ed00819b01eeeef110107e4058d8a534f84913b232
diff --git a/dev-ruby/em-websocket/em-websocket-0.5.2.ebuild b/dev-ruby/em-websocket/em-websocket-0.5.2.ebuild
deleted file mode 100644
index 4e6a751ea511..000000000000
--- a/dev-ruby/em-websocket/em-websocket-0.5.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="EventMachine based WebSocket server"
-HOMEPAGE="https://rubygems.org/gems/em-websocket"
-SRC_URI="https://github.com/igrigorik/em-websocket/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/eventmachine-0.12.9
-	=dev-ruby/http_parser_rb-0.6*
-"
-
-all_ruby_prepare() {
-	# Avoid dependency on git
-	sed -i -e '/ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Only run unit tests since we require unpackaged code for the
-	# integration tests.
-	sed -i -e "/^require 'em-\(spec\|http\|websocket-client\)/ s:^:#:" \
-		-e "/^require 'integration/ s:^:#:" spec/helper.rb || die
-	rm -fr spec/integration || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r examples
-}
diff --git a/dev-ruby/em-websocket/em-websocket-0.5.3-r1.ebuild b/dev-ruby/em-websocket/em-websocket-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..43c8a335c529
--- /dev/null
+++ b/dev-ruby/em-websocket/em-websocket-0.5.3-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="EventMachine based WebSocket server"
+HOMEPAGE="https://rubygems.org/gems/em-websocket"
+SRC_URI="https://github.com/igrigorik/em-websocket/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/eventmachine-0.12.9
+	dev-ruby/http_parser_rb:0
+"
+
+all_ruby_prepare() {
+	# Avoid dependency on git
+	sed -i -e '/ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Only run unit tests since we require unpackaged code for the
+	# integration tests.
+	sed -i -e "/^require 'em-\(spec\|http\|websocket-client\)/ s:^:#:" \
+		-e "/^require 'integration/ s:^:#:" spec/helper.rb || die
+	rm -fr spec/integration || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r examples
+}
diff --git a/dev-ruby/em-websocket/em-websocket-0.5.3.ebuild b/dev-ruby/em-websocket/em-websocket-0.5.3.ebuild
deleted file mode 100644
index 40d23cc7ff35..000000000000
--- a/dev-ruby/em-websocket/em-websocket-0.5.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="EventMachine based WebSocket server"
-HOMEPAGE="https://rubygems.org/gems/em-websocket"
-SRC_URI="https://github.com/igrigorik/em-websocket/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/eventmachine-0.12.9
-	=dev-ruby/http_parser_rb-0.6*
-"
-
-all_ruby_prepare() {
-	# Avoid dependency on git
-	sed -i -e '/ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Only run unit tests since we require unpackaged code for the
-	# integration tests.
-	sed -i -e "/^require 'em-\(spec\|http\|websocket-client\)/ s:^:#:" \
-		-e "/^require 'integration/ s:^:#:" spec/helper.rb || die
-	rm -fr spec/integration || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r examples
-}
diff --git a/dev-ruby/em-websocket/metadata.xml b/dev-ruby/em-websocket/metadata.xml
index 607dce1783ce..b534f7a3d718 100644
--- a/dev-ruby/em-websocket/metadata.xml
+++ b/dev-ruby/em-websocket/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>bman@gentoo.org</email>
-    <name>Aaron Bauman</name>
-  </maintainer>
   <maintainer type="project">
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
diff --git a/dev-ruby/equalizer/equalizer-0.0.11-r1.ebuild b/dev-ruby/equalizer/equalizer-0.0.11-r1.ebuild
deleted file mode 100644
index 14822f7e41dc..000000000000
--- a/dev-ruby/equalizer/equalizer-0.0.11-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Module to define equality, equivalence and inspection methods"
-HOMEPAGE="https://github.com/dkubb/equalizer"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e "/devtools/d" spec/spec_helper.rb || die
-
-	# Avoid a failing spec caused by memoizable 0.4.2, and we ignore it
-	# there as well.
-	rm spec/unit/equalizer/included_spec.rb || die
-}
diff --git a/dev-ruby/equalizer/equalizer-0.0.11-r2.ebuild b/dev-ruby/equalizer/equalizer-0.0.11-r2.ebuild
new file mode 100644
index 000000000000..65106cfb6363
--- /dev/null
+++ b/dev-ruby/equalizer/equalizer-0.0.11-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Module to define equality, equivalence and inspection methods"
+HOMEPAGE="https://github.com/dkubb/equalizer"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e "/devtools/d" spec/spec_helper.rb || die
+
+	# Avoid a failing spec caused by memoizable 0.4.2, and we ignore it
+	# there as well.
+	rm spec/unit/equalizer/included_spec.rb || die
+}
diff --git a/dev-ruby/equatable/equatable-0.7.0-r1.ebuild b/dev-ruby/equatable/equatable-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..469beec18f89
--- /dev/null
+++ b/dev-ruby/equatable/equatable-0.7.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="equatable.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows ruby objects to implement equality comparison and inspection methods"
+HOMEPAGE="https://github.com/piotrmurach/equatable"
+SRC_URI="https://github.com/piotrmurach/equatable/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/equatable/equatable-0.7.0.ebuild b/dev-ruby/equatable/equatable-0.7.0.ebuild
deleted file mode 100644
index 8ab58bafe50b..000000000000
--- a/dev-ruby/equatable/equatable-0.7.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="equatable.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows ruby objects to implement equality comparison and inspection methods"
-HOMEPAGE="https://github.com/piotrmurach/equatable"
-SRC_URI="https://github.com/piotrmurach/equatable/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/erubi/Manifest b/dev-ruby/erubi/Manifest
index 011e8eeba48b..815be4bf0823 100644
--- a/dev-ruby/erubi/Manifest
+++ b/dev-ruby/erubi/Manifest
@@ -1,2 +1 @@
-DIST erubi-1.10.0.tar.gz 11212 BLAKE2B 1a31994bc02a6acd0a5ec025c71961422dc8850de1b871a23b6b89fba59b0d3221153a1e1418d2c279ae40b2a942c53290f4695793b0fedba0a4e7b7c324b41a SHA512 adf62511ce9324b4c5f7a95863254c9d95cf40f2107eddad1118ef97d7f534fb74d79b48575ff17209e492811a9a8f87c52fa7a30e4b6ea4e50504cf5572c024
-DIST erubi-1.9.0.gem 13824 BLAKE2B 00cb428e3433090370e9f61d2445f98553a45e2a92181076114db2601fa7261d8ffc44c3f4a0ecb73d616fb5e93dcc52ca6a2efab3945b11bd17d4a53c68fed1 SHA512 34770c01215b323797739af54c5c821d28e982309a76f0a212657868629625ae6dfca3e9e2f5ae16893813fc81b5afbb172c397ddad1e2f93108c5112c540bd6
+DIST erubi-1.12.0.tar.gz 12384 BLAKE2B 0299cec2a8a79492fed06105f7570aabfe7d16fd1755185fbefdd43f125c383a98a1942c9b09df3dcd0b4b20bd15c2a7e6666bf3b2ef92c579a7bb7c39b5eae5 SHA512 6243b6e1c4360ceb1eb4bc3ce4492cebcf071e526be43f7393a789e4b0eaf43b6ed770b5baec7cbab4b6a563d4dc821e56a8e4222ad7a13a852d74dcb7c5552a
diff --git a/dev-ruby/erubi/erubi-1.10.0-r1.ebuild b/dev-ruby/erubi/erubi-1.10.0-r1.ebuild
deleted file mode 100644
index b810571cdebe..000000000000
--- a/dev-ruby/erubi/erubi-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-RUBY_FAKEGEM_GEMSPEC="erubi.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a ERB template engine for ruby; a simplified fork of Erubis"
-HOMEPAGE="https://github.com/jeremyevans/erubi"
-SRC_URI="https://github.com/jeremyevans/erubi/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-global_expectations )"
diff --git a/dev-ruby/erubi/erubi-1.10.0.ebuild b/dev-ruby/erubi/erubi-1.10.0.ebuild
deleted file mode 100644
index 21d0cfcff33f..000000000000
--- a/dev-ruby/erubi/erubi-1.10.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-RUBY_FAKEGEM_GEMSPEC="erubi.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a ERB template engine for ruby; a simplified fork of Erubis"
-HOMEPAGE="https://github.com/jeremyevans/erubi"
-SRC_URI="https://github.com/jeremyevans/erubi/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-global_expectations )"
diff --git a/dev-ruby/erubi/erubi-1.12.0.ebuild b/dev-ruby/erubi/erubi-1.12.0.ebuild
new file mode 100644
index 000000000000..667ff949864a
--- /dev/null
+++ b/dev-ruby/erubi/erubi-1.12.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+RUBY_FAKEGEM_GEMSPEC="erubi.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a ERB template engine for ruby; a simplified fork of Erubis"
+HOMEPAGE="https://github.com/jeremyevans/erubi"
+SRC_URI="https://github.com/jeremyevans/erubi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-global_expectations )"
diff --git a/dev-ruby/erubi/erubi-1.9.0.ebuild b/dev-ruby/erubi/erubi-1.9.0.ebuild
deleted file mode 100644
index 1c6ae0679c7c..000000000000
--- a/dev-ruby/erubi/erubi-1.9.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a ERB template engine for ruby; a simplified fork of Erubis"
-HOMEPAGE="https://github.com/jeremyevans/erubi"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-global_expectations )"
diff --git a/dev-ruby/erubis/erubis-2.7.0-r3.ebuild b/dev-ruby/erubis/erubis-2.7.0-r3.ebuild
deleted file mode 100644
index 32a19d941df1..000000000000
--- a/dev-ruby/erubis/erubis-2.7.0-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Erubis is an implementation of eRuby"
-HOMEPAGE="http://www.kuwata-lab.com/erubis/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# http://rubyforge.org/tracker/index.php?func=detail&aid=29484&group_id=1320&atid=5201
-# Tests are not compatible with Psych as YAML module.
-RESTRICT="test"
-
-ruby_add_rdepend ">=dev-ruby/abstract-1.0.0"
-
-all_ruby_prepare() {
-	# These tests now fail due to other ordering and fact that sym
-	# are now returned.
-	rm test/test-users-guide.rb || die
-	sed -i -e '/test-users-guide/ s:^:#:' test/test.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -I. test/test.rb || die
-}
diff --git a/dev-ruby/erubis/erubis-2.7.0-r4.ebuild b/dev-ruby/erubis/erubis-2.7.0-r4.ebuild
index 92f69e6d44fe..7824b9e6cd1a 100644
--- a/dev-ruby/erubis/erubis-2.7.0-r4.ebuild
+++ b/dev-ruby/erubis/erubis-2.7.0-r4.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.kuwata-lab.com/erubis/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 # http://rubyforge.org/tracker/index.php?func=detail&aid=29484&group_id=1320&atid=5201
diff --git a/dev-ruby/ethon/Manifest b/dev-ruby/ethon/Manifest
index c2eb5654fb90..657eeb8f6af2 100644
--- a/dev-ruby/ethon/Manifest
+++ b/dev-ruby/ethon/Manifest
@@ -1,2 +1,2 @@
-DIST ethon-0.14.0.gem 57344 BLAKE2B 10dd81966e3e11607f3954616d17fed79be4ba0793cb4e67b39d5b0768ce2adcea88551238c57889b6d14b3d4d9b8e96110d622f5fc40c3856788338a288d4c6 SHA512 765454c3c9132204d6cc0ff09478b252e5cbc78d4f3ca35654942ba19b5aa541d846f1c37ec16e51c54aa41e03debdf8fc084b8f4540d230431d0e6f885f1a51
 DIST ethon-0.15.0.gem 59904 BLAKE2B 9a6bcec605d6133054c3ee9b4546aab4d9282266876cd9c6e9c923d3405a5541871ebe83385185dcc42f0cea37735cddd9977e2da72badbcaaac55b8c634b94c SHA512 6e04c70e105fb95f1e0ff62e1d6ae009bb7b39a60d85ec9e43b10c016f33f679620ded253089a738e0cef5010e9023d1093dd92b1caacdde8f6a745cbae2b5b5
+DIST ethon-0.16.0.gem 60416 BLAKE2B 6970554d8cbde18c0e08c95826f6444614d8378a3889e9347cc66170f80b947951312e3e65712106864351285f331ea0cb67c2e24e22ecc335fc0fbd571eb521 SHA512 3b31affcee0d5a5be05b5497d4a8d13515f8393f54579a3a9c8de49f78d3f065bb92659434b023f0a8bf8e0cccfbc94b617695b93c4d3f744cccd1eff2e68905
diff --git a/dev-ruby/ethon/ethon-0.14.0.ebuild b/dev-ruby/ethon/ethon-0.14.0.ebuild
deleted file mode 100644
index 92e6a1ab5fd1..000000000000
--- a/dev-ruby/ethon/ethon-0.14.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Very lightweight libcurl wrapper"
-HOMEPAGE="https://github.com/typhoeus/ethon"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND+=" net-misc/curl"
-
-ruby_add_rdepend ">=dev-ruby/ffi-1.15.0"
-
-ruby_add_bdepend "test? ( dev-ruby/sinatra dev-ruby/mime-types )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -e '/bundler/I s:^:#:' \
-		-e '1igem "sinatra"' -i Rakefile spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/ethon/ethon-0.15.0.ebuild b/dev-ruby/ethon/ethon-0.15.0.ebuild
index ff6b1a7b59ba..dceca5a0aed6 100644
--- a/dev-ruby/ethon/ethon-0.15.0.ebuild
+++ b/dev-ruby/ethon/ethon-0.15.0.ebuild
@@ -1,9 +1,9 @@
-# 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"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/ethon/ethon-0.16.0.ebuild b/dev-ruby/ethon/ethon-0.16.0.ebuild
new file mode 100644
index 000000000000..06a88849bf21
--- /dev/null
+++ b/dev-ruby/ethon/ethon-0.16.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Very lightweight libcurl wrapper"
+HOMEPAGE="https://github.com/typhoeus/ethon"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND+=" net-misc/curl"
+
+ruby_add_rdepend ">=dev-ruby/ffi-1.15.0"
+
+ruby_add_bdepend "test? ( dev-ruby/sinatra dev-ruby/mime-types )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -e '/bundler/I s:^:#:' \
+		-e '1igem "sinatra"' -i Rakefile spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/evented-spec/evented-spec-0.9.0-r1.ebuild b/dev-ruby/evented-spec/evented-spec-0.9.0-r1.ebuild
index 01f4fa2260e8..7f45e250dd7d 100644
--- a/dev-ruby/evented-spec/evented-spec-0.9.0-r1.ebuild
+++ b/dev-ruby/evented-spec/evented-spec-0.9.0-r1.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.textile"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
 inherit ruby-fakegem
 
 DESCRIPTION="A set of helpers to help you test your asynchronous code"
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.7-r1.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7-r1.ebuild
deleted file mode 100644
index b3220823080d..000000000000
--- a/dev-ruby/eventmachine/eventmachine-1.2.7-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="docs/*.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="EventMachine is a fast, simple event-processing library for Ruby programs"
-HOMEPAGE="https://github.com/eventmachine/eventmachine"
-SRC_URI="https://github.com/eventmachine/eventmachine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="${DEPEND}
-	dev-libs/openssl:0"
-RDEPEND="${RDEPEND}
-	dev-libs/openssl:0="
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Remove package tasks to avoid dependency on rake-compiler.
-	rm rakelib/package.rake || die
-
-	# Remove the resolver tests since they require network access and
-	# the localhost test fails with an IPv6 localhost.
-	rm tests/test_resolver.rb || die
-
-	# Needs a tty
-	rm tests/test_kb.rb || die
-
-	# Avoid tests that require network access
-	sed -i -e '/test_bind_connect/,/^  end/ s:^:#:' \
-		tests/test_basic.rb || die
-	sed -i -e '/test_\(cookie\|http_client\|version_1_0\)/,/^  end/ s:^:#:' \
-		tests/test_httpclient.rb || die
-	sed -i -e '/test_\(get\|https_get\)/,/^  end/ s:^:#:' \
-		tests/test_httpclient2.rb || die
-	sed -i -e '/test_connect_timeout/,/^  end/ s:^:#:' \
-		tests/test_unbind_reason.rb || die
-	sed -i -e '/test_for_real/,/^    end/ s:^:#:' \
-		tests/test_pending_connect_timeout.rb || die
-	rm -f tests/test_{get_sock_opt,set_sock_opt,idle_connection}.rb || die
-
-	# Avoid tests for insecure SSL versions that may not be available
-	sed -i -e '/test_any_to_v3/,/^    end/ s:^:#:' \
-		-e '/test_v3_/,/^    end/ s:^:#:' \
-		-e '/test_tlsv1_required_with_external_client/aomit "sslv3"' \
-		tests/test_ssl_protocols.rb || die
-
-	# Avoid test that deliberately triggers a C++ exception which causes
-	# a SEGFAULT. This does not appear to happen upstream (on travis).
-	rm -f tests/test_exc.rb || die
-}
-
-each_ruby_configure() {
-	for extdir in ext ext/fastfilereader; do
-		pushd $extdir
-		${RUBY} extconf.rb || die "extconf.rb failed for ${extdir}"
-		popd
-	done
-}
-
-each_ruby_compile() {
-	for extdir in ext ext/fastfilereader; do
-		pushd $extdir
-		# both extensions use C++, so use the CXXFLAGS not the CFLAGS
-		emake V=1 CFLAGS="${CXXFLAGS} -fPIC" archflag="${LDFLAGS}"
-		popd
-		cp $extdir/*.so lib/ || die "Unable to copy extensions for ${extdir}"
-	done
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S testrb-2 tests/test_*.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r examples
-	docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.7-r3.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7-r3.ebuild
deleted file mode 100644
index ce7cdf3ce6ad..000000000000
--- a/dev-ruby/eventmachine/eventmachine-1.2.7-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="docs/*.md CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="eventmachine.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb ext/fastfilereader/extconf.rb)
-RUBY_FAKEGEM_EXTRAINSTALL=(examples)
-
-inherit ruby-fakegem
-
-DESCRIPTION="EventMachine is a fast, simple event-processing library for Ruby programs"
-HOMEPAGE="https://github.com/eventmachine/eventmachine"
-SRC_URI="https://github.com/eventmachine/eventmachine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-# Collection of upstream patches to fix compatibility with newer OpenSSL
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-openssl-patches.tar.bz2"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="${DEPEND}
-	dev-libs/openssl:0="
-RDEPEND="${RDEPEND}
-	dev-libs/openssl:0="
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-PATCHES=(
-	# Collection of upstream patches (rebased by Fedora, thanks!) to
-	# fix (mostly test) compatibility with >= OpenSSL 1.1.1.
-	"${WORKDIR}"/all/patches/
-)
-
-all_ruby_prepare() {
-	# Remove package tasks to avoid dependency on rake-compiler.
-	rm rakelib/package.rake || die
-
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-	# Remove the resolver tests since they require network access and
-	# the localhost test fails with an IPv6 localhost.
-	rm tests/test_resolver.rb || die
-
-	# Needs a tty
-	rm tests/test_kb.rb || die
-
-	# Avoid tests that require network access
-	sed -e '/test_bind_connect/,/^  end/ s:^:#:' \
-		-e '/test_invalid_address_bind_connect_src/,/^  end/ s:^:#:' \
-		-e '/test_invalid_address_bind_connect_dst/,/^  end/ s:^:#:' \
-		-i tests/test_basic.rb || die
-	sed -e '/test_ipv6_udp_local_server/,/^    end/ s:^:#:' \
-		-e '/test_ipv6_tcp_local_server/,/^    end/ s:^:#:' \
-		-i tests/test_ipv6.rb || die
-	sed -e '/test_for_real/,/^    end/ s:^:#:' -i tests/test_pending_connect_timeout.rb || die
-	sed -e '/test_connect_timeout/,/^  end/ s:^:#:' -i tests/test_unbind_reason.rb || die
-	sed -e '/test_cookie/,/^  end/ s:^:#:' \
-		-e '/test_http_client/,/^  end/ s:^:#:' \
-		-e '/test_version_1_0/,/^  end/ s:^:#:' \
-		-i tests/test_httpclient.rb || die
-	sed -e '/test_get/,/^  end/ s:^:#:' \
-		-e '/test_https_get/,/^  end/ s:^:#:' \
-		-i tests/test_httpclient2.rb || die
-
-	# Avoid test that deliberately triggers a C++ exception which causes
-	# a SEGFAULT. This does not appear to happen upstream (on travis).
-	rm tests/test_exc.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S testrb-2 tests/test_*.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-}
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.7-r4.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7-r4.ebuild
new file mode 100644
index 000000000000..3ecd971263cb
--- /dev/null
+++ b/dev-ruby/eventmachine/eventmachine-1.2.7-r4.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"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="docs/*.md CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="eventmachine.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb ext/fastfilereader/extconf.rb)
+RUBY_FAKEGEM_EXTRAINSTALL=(examples)
+
+inherit ruby-fakegem
+
+DESCRIPTION="EventMachine is a fast, simple event-processing library for Ruby programs"
+HOMEPAGE="https://github.com/eventmachine/eventmachine"
+SRC_URI="https://github.com/eventmachine/eventmachine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# Collection of upstream patches to fix compatibility with newer OpenSSL
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-openssl-patches.tar.bz2"
+
+LICENSE="|| ( GPL-2 Ruby-BSD )"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="${DEPEND}
+	dev-libs/openssl:0="
+RDEPEND="${RDEPEND}
+	dev-libs/openssl:0="
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
+
+PATCHES=(
+	# Collection of upstream patches (rebased by Fedora, thanks!) to
+	# fix (mostly test) compatibility with >= OpenSSL 1.1.1.
+	"${WORKDIR}"/all/patches/
+	# Backport upstream changes for ruby 3
+	"${FILESDIR}"/${P}-test-processes.patch
+	"${FILESDIR}"/${P}-ruby3-process-status.patch
+)
+
+all_ruby_prepare() {
+	# Remove package tasks to avoid dependency on rake-compiler.
+	rm rakelib/package.rake || die
+
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+	# Remove the resolver tests since they require network access and
+	# the localhost test fails with an IPv6 localhost.
+	rm tests/test_resolver.rb || die
+
+	# Needs a tty
+	rm tests/test_kb.rb || die
+
+	# Avoid tests that require network access
+	sed -e '/test_bind_connect/,/^  end/ s:^:#:' \
+		-e '/test_invalid_address_bind_connect_src/,/^  end/ s:^:#:' \
+		-e '/test_invalid_address_bind_connect_dst/,/^  end/ s:^:#:' \
+		-i tests/test_basic.rb || die
+	sed -e '/test_ipv6_udp_local_server/,/^    end/ s:^:#:' \
+		-e '/test_ipv6_tcp_local_server/,/^    end/ s:^:#:' \
+		-i tests/test_ipv6.rb || die
+	sed -e '/test_for_real/,/^    end/ s:^:#:' -i tests/test_pending_connect_timeout.rb || die
+	sed -e '/test_connect_timeout/,/^  end/ s:^:#:' -i tests/test_unbind_reason.rb || die
+	sed -e '/test_cookie/,/^  end/ s:^:#:' \
+		-e '/test_http_client/,/^  end/ s:^:#:' \
+		-e '/test_version_1_0/,/^  end/ s:^:#:' \
+		-i tests/test_httpclient.rb || die
+	sed -e '/test_get/,/^  end/ s:^:#:' \
+		-e '/test_https_get/,/^  end/ s:^:#:' \
+		-i tests/test_httpclient2.rb || die
+
+	# Avoid test that deliberately triggers a C++ exception which causes
+	# a SEGFAULT. This does not appear to happen upstream (on travis).
+	rm tests/test_exc.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib -S testrb-2 tests/test_*.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+}
diff --git a/dev-ruby/eventmachine/files/eventmachine-1.2.7-ruby3-process-status.patch b/dev-ruby/eventmachine/files/eventmachine-1.2.7-ruby3-process-status.patch
new file mode 100644
index 000000000000..f836d3ff076e
--- /dev/null
+++ b/dev-ruby/eventmachine/files/eventmachine-1.2.7-ruby3-process-status.patch
@@ -0,0 +1,94 @@
+From daeb121fb5600cc0f4fc604fbf7d742578f26483 Mon Sep 17 00:00:00 2001
+From: MSP-Greg <Greg.mpls@gmail.com>
+Date: Sat, 12 Jun 2021 22:37:37 -0500
+Subject: [PATCH] Fixes for Process::Status changes in Ruby 3
+
+---
+ ext/extconf.rb   |  3 +++
+ ext/rubymain.cpp | 36 ++++++++++++++++++++++++++++++------
+ 2 files changed, 33 insertions(+), 6 deletions(-)
+
+diff --git a/ext/extconf.rb b/ext/extconf.rb
+index 0fb654104..ce83c0028 100644
+--- a/ext/extconf.rb
++++ b/ext/extconf.rb
+@@ -138,6 +138,9 @@ def find_openssl_library
+   add_define "HAVE_KQUEUE" if have_header("sys/event.h") && have_header("sys/queue.h")
+ end
+ 
++# Add for changes to Process::Status in Ruby 3
++add_define("IS_RUBY_3_OR_LATER") if RUBY_VERSION > "3.0"
++
+ # Adjust number of file descriptors (FD) on Windows
+ 
+ if RbConfig::CONFIG["host_os"] =~ /mingw/
+diff --git a/ext/rubymain.cpp b/ext/rubymain.cpp
+index 5da5c8b25..36018c63d 100644
+--- a/ext/rubymain.cpp
++++ b/ext/rubymain.cpp
+@@ -85,7 +85,24 @@ static VALUE Intern_proxy_target_unbound;
+ static VALUE Intern_proxy_completed;
+ static VALUE Intern_connection_completed;
+ 
+-static VALUE rb_cProcStatus;
++static VALUE rb_cProcessStatus;
++
++#ifdef IS_RUBY_3_OR_LATER
++struct rb_process_status {
++    rb_pid_t pid;
++    int status;
++    int error;
++};
++
++static const rb_data_type_t rb_process_status_type = {
++    .wrap_struct_name = "Process::Status",
++    .function = {
++        .dfree = RUBY_DEFAULT_FREE,
++    },
++    .data = NULL,
++    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
++};
++#endif
+ 
+ struct em_event {
+ 	uintptr_t signature;
+@@ -553,11 +570,18 @@ static VALUE t_get_subprocess_status (VALUE self UNUSED, VALUE signature)
+ 
+ 	if (evma_get_subprocess_status (NUM2BSIG (signature), &status)) {
+ 		if (evma_get_subprocess_pid (NUM2BSIG (signature), &pid)) {
+-			proc_status = rb_obj_alloc(rb_cProcStatus);
+ 
++#ifdef IS_RUBY_3_OR_LATER
++			struct rb_process_status *data = NULL;
++			proc_status = TypedData_Make_Struct(rb_cProcessStatus, struct rb_process_status, &rb_process_status_type, data);
++			data->pid = pid;
++			data->status = status;
++#else
++			proc_status = rb_obj_alloc(rb_cProcessStatus);
+ 			/* MRI Ruby uses hidden instance vars */
+-			rb_iv_set(proc_status, "status", INT2FIX(status));
+-			rb_iv_set(proc_status, "pid", INT2FIX(pid));
++			rb_ivar_set(proc_status, rb_intern_const("status"), INT2FIX(status));
++			rb_ivar_set(proc_status, rb_intern_const("pid"), INT2FIX(pid));
++#endif
+ 
+ #ifdef RUBINIUS
+ 			/* Rubinius uses standard instance vars */
+@@ -572,7 +596,7 @@ static VALUE t_get_subprocess_status (VALUE self UNUSED, VALUE signature)
+ #endif
+ 		}
+ 	}
+-
++	rb_obj_freeze(proc_status);
+ 	return proc_status;
+ }
+ 
+@@ -1431,7 +1455,7 @@ extern "C" void Init_rubyeventmachine()
+ {
+ 	// Lookup Process::Status for get_subprocess_status
+ 	VALUE rb_mProcess = rb_const_get(rb_cObject, rb_intern("Process"));
+-	rb_cProcStatus = rb_const_get(rb_mProcess, rb_intern("Status"));
++	rb_cProcessStatus = rb_const_get(rb_mProcess, rb_intern("Status"));
+ 
+ 	// Tuck away some symbol values so we don't have to look 'em up every time we need 'em.
+ 	Intern_at_signature = rb_intern ("@signature");
diff --git a/dev-ruby/eventmachine/files/eventmachine-1.2.7-test-processes.patch b/dev-ruby/eventmachine/files/eventmachine-1.2.7-test-processes.patch
new file mode 100644
index 000000000000..51e2a48c6f55
--- /dev/null
+++ b/dev-ruby/eventmachine/files/eventmachine-1.2.7-test-processes.patch
@@ -0,0 +1,73 @@
+From ec27b6250c2a00b4f2720abd86669e194ca016ac Mon Sep 17 00:00:00 2001
+From: MSP-Greg <Greg.mpls@gmail.com>
+Date: Fri, 21 May 2021 11:24:15 -0500
+Subject: [PATCH] Update test_processes.rb
+
+---
+ tests/test_processes.rb | 35 +++++++++++++++++++++++++++--------
+ 1 file changed, 27 insertions(+), 8 deletions(-)
+
+diff --git a/tests/test_processes.rb b/tests/test_processes.rb
+index eb21a6cec..9546022e7 100644
+--- a/tests/test_processes.rb
++++ b/tests/test_processes.rb
+@@ -32,23 +32,42 @@ def setup
+     end
+ 
+     def test_em_system
++      out, status = nil, nil
++
+       EM.run{
+-        EM.system('ls'){ |out,status| $out, $status = out, status; EM.stop }
++        EM.system('ls'){ |_out,_status| out, status = _out, _status; EM.stop }
+       }
+ 
+-      assert( $out.length > 0 )
+-      assert_equal(0, $status.exitstatus)
+-      assert_kind_of(Process::Status, $status)
++      assert(out.length > 0 )
++      assert_kind_of(Process::Status, status)
++      assert_equal(0, status.exitstatus)
++    end
++
++    def test_em_system_bad_exitstatus
++      status = nil
++      sys_pid = nil
++
++      EM.run{
++        sys_pid = EM.system('exit 1'){ |_out,_status| status = _status; EM.stop }
++      }
++
++      assert_kind_of(Process::Status, status)
++      refute_equal(0, status.exitstatus)
++      assert_equal sys_pid, status.pid
+     end
+ 
+     def test_em_system_pid
+-      $pids = []
++      status = nil
++      sys_pid = nil
+ 
+       EM.run{
+-        $pids << EM.system('echo hi', proc{ |out,status|$pids << status.pid; EM.stop })
++        sys_pid = EM.system('echo hi', proc{ |_out,_status| status = _status; EM.stop })
+       }
+ 
+-      assert_equal $pids[0], $pids[1]
++      refute_equal(0, sys_pid)
++      assert_kind_of(Process::Status, status)
++      refute_equal(0, status.pid)
++      assert_equal sys_pid, status.pid
+     end
+ 
+     def test_em_system_with_proc
+@@ -57,8 +76,8 @@ def test_em_system_with_proc
+       }
+ 
+       assert( $out.length > 0 )
+-      assert_equal(0, $status.exitstatus)
+       assert_kind_of(Process::Status, $status)
++      assert_equal(0, $status.exitstatus)
+     end
+ 
+     def test_em_system_with_two_procs
diff --git a/dev-ruby/eventmachine/metadata.xml b/dev-ruby/eventmachine/metadata.xml
index 9a6d487f6b15..21498041991b 100644
--- a/dev-ruby/eventmachine/metadata.xml
+++ b/dev-ruby/eventmachine/metadata.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-<longdescription>
-Ruby/EventMachine is a fast, simple event-processing library for Ruby programs. It lets you write network clients and servers without handling sockets- all you do is send and receive data. Single-threaded socket engine- scalable and FAST!
-</longdescription>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">eventmachine/eventmachine</remote-id>
+    <remote-id type="rubygems">eventmachine</remote-id>
+  </upstream>
+  <longdescription>
+    Ruby/EventMachine is a fast, simple event-processing library for
+    Ruby programs. It lets you write network clients and servers without
+    handling sockets- all you do is send and receive
+    data. Single-threaded socket engine- scalable and FAST!
+  </longdescription>
 </pkgmetadata>
diff --git a/dev-ruby/excon/Manifest b/dev-ruby/excon/Manifest
index fb8b7bd66cd7..291c611eb9df 100644
--- a/dev-ruby/excon/Manifest
+++ b/dev-ruby/excon/Manifest
@@ -1,3 +1,3 @@
-DIST excon-0.92.1.tar.gz 212980 BLAKE2B 66832dbc309c825137419296098df56510dc004195468b5584fb50faff07e79f0748a11d692b3682e29d280004a53b9f1fd4dc5da14a40853f6c1639793b580c SHA512 3e630a96e37f20484caa15a8c4582a6e5a49a4baf741b9b855cc1d6cca4eb633c6a7f194c8f851c2dc7fd51989bb7ce37122f6eaecefc6583df58918e1540c73
-DIST excon-0.92.2.tar.gz 212984 BLAKE2B 5b38a3e5435df3af6e19ac3a9bf17ee0b858470893d1fe6bcca841d21f7a7f0fbeffa79f50c98d6f278c7cc66f7e44bae95d6743575388f46c74fe02e1fcc6b8 SHA512 bc0c7d909279140b9be116b38b13b3dc2f3d8646c13732b8b9120129a645b63e0bb24e8db3d7d56072aa3f61b66bfbac6a955d8ea366dcb0c3d14f31966f95a8
-DIST excon-0.92.3.tar.gz 215423 BLAKE2B e07a2ca3289c1bbf4b0c3de1ef2802d85311461ceb931b9fa90b9b6837f779303490f8773cb71b8a977d5d87ebb60343d10a0966158541af34771d163c7cc814 SHA512 908ea503c2b7b4e865fcff080579bf18319c1b15f2e5b7ec7f52b6d4ebb0561b187cd18fad47c1ceadfa64700257ebf80e927b70f8679c8d00db3abc8d07f8c6
+DIST excon-0.104.0.tar.gz 229173 BLAKE2B b719d9391f8afc3553c45b88436725e2d7ed6495a888af95c7783d4e6bf44eecd861975119180f37bfb4617c7639c52cd0ac52ebbfce4bd6108de69df4d90cce SHA512 e06bccc0ed8fcab25b76c8500d77678c3356ff7488737bc041e9291fb7bbea5e7cb11cab85a4da81bce6c1a4422a7588f5e6e82ac14bb2b0974a7656586e1db4
+DIST excon-0.109.0.tar.gz 235632 BLAKE2B 8404cb5687cd106390dcb5e44513b4accf145d118b38bda79fdfa97ed34a33d84bf5831d3bd6b52dce2ac17267f5e6bd0d060545a98f1741d6f0a394ab0dfb08 SHA512 6374eeeff9b8501a078ea4db7d777e781a3981d1062af013e46976506b84a1afd1e2f52f97e3b7c6d57f8230534598992b8f4e978a3f077e11180cd3586e4a0e
+DIST excon-0.110.0.tar.gz 237307 BLAKE2B ac83220a9ac5d2fb3ab53e9b90068918e8ffa54246d50531a66b061bebbdd8fcc9840c2ade0de35fc995dcf400622cb1b807a8cc5e19b9dd4e481cb674e6a035 SHA512 34b6b193109515c9cb176f41a735e4a214053a2832bac0c425ace06b419daf71f0e7dd375df59a7a67d56ac331f7251fbb8778fd29acd751651411aef2081378
diff --git a/dev-ruby/excon/excon-0.104.0.ebuild b/dev-ruby/excon/excon-0.104.0.ebuild
new file mode 100644
index 000000000000..f9ccf3c220de
--- /dev/null
+++ b/dev-ruby/excon/excon-0.104.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="changelog.txt README.md"
+RUBY_FAKEGEM_GEMSPEC="excon.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="EXtended http(s) CONnections"
+HOMEPAGE="https://github.com/excon/excon"
+SRC_URI="https://github.com/excon/excon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+ruby_add_bdepend "
+	dev-ruby/rake
+	test? (
+		dev-ruby/activesupport
+		>=dev-ruby/json-1.8.5
+		dev-ruby/open4
+		>=dev-ruby/rack-2.2.7-r1:2.2
+		dev-ruby/rdoc
+		dev-ruby/sinatra
+		dev-ruby/webrick
+	)
+"
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files --/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# test that need network
+	rm -f spec/excon/test/server_spec.rb || die
+
+	# test that wrongly assumes 127.0.0.1 won't run a DNS server
+	rm -f spec/requests/{dns_timeout,resolv_resolver}_spec.rb || die
+
+	# tests that depend on eventmachine which is broken and no longer maintained
+	rm -f tests/{bad,error,pipeline,response,request}_tests.rb \
+		tests/{batch-requests,complete_responses}.rb \
+		tests/middlewares/{decompress,mock}_tests.rb  || die
+	rm -f spec/requests/eof_requests_spec.rb spec/excon/error_spec.rb || die
+
+	# Use a rackup version compatible with sinatra
+	sed -i -e '/launch_process/ s/"rackup"/"rackup-2"/' tests/test_helper.rb || die
+	sed -i -e '/open_process/ s/rackup/rackup-2/' lib/excon/test/plugin/server/webrick.rb || die
+}
diff --git a/dev-ruby/excon/excon-0.109.0.ebuild b/dev-ruby/excon/excon-0.109.0.ebuild
new file mode 100644
index 000000000000..55f5024ee4b8
--- /dev/null
+++ b/dev-ruby/excon/excon-0.109.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="changelog.txt README.md"
+RUBY_FAKEGEM_GEMSPEC="excon.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="EXtended http(s) CONnections"
+HOMEPAGE="https://github.com/excon/excon"
+SRC_URI="https://github.com/excon/excon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+ruby_add_bdepend "
+	dev-ruby/rake
+	test? (
+		dev-ruby/activesupport
+		>=dev-ruby/json-1.8.5
+		dev-ruby/open4
+		>=dev-ruby/rack-2.2.7-r1:2.2
+		dev-ruby/rdoc
+		dev-ruby/sinatra
+		dev-ruby/webrick
+	)
+"
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files --/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# test that need network
+	rm -f spec/excon/test/server_spec.rb || die
+
+	# test that wrongly assumes 127.0.0.1 won't run a DNS server
+	rm -f spec/requests/{dns_timeout,resolv_resolver}_spec.rb || die
+
+	# tests that depend on eventmachine which is broken and no longer maintained
+	rm -f tests/{bad,error,pipeline,response,request}_tests.rb \
+		tests/{batch-requests,complete_responses}.rb \
+		tests/middlewares/{decompress,mock}_tests.rb  || die
+	rm -f spec/requests/eof_requests_spec.rb spec/excon/error_spec.rb || die
+
+	# Use a rackup version compatible with sinatra
+	sed -i -e '/launch_process/ s/"rackup"/"rackup-2"/' tests/test_helper.rb || die
+	sed -i -e '/open_process/ s/rackup/rackup-2/' lib/excon/test/plugin/server/webrick.rb || die
+}
diff --git a/dev-ruby/excon/excon-0.110.0.ebuild b/dev-ruby/excon/excon-0.110.0.ebuild
new file mode 100644
index 000000000000..55f5024ee4b8
--- /dev/null
+++ b/dev-ruby/excon/excon-0.110.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="changelog.txt README.md"
+RUBY_FAKEGEM_GEMSPEC="excon.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="EXtended http(s) CONnections"
+HOMEPAGE="https://github.com/excon/excon"
+SRC_URI="https://github.com/excon/excon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+ruby_add_bdepend "
+	dev-ruby/rake
+	test? (
+		dev-ruby/activesupport
+		>=dev-ruby/json-1.8.5
+		dev-ruby/open4
+		>=dev-ruby/rack-2.2.7-r1:2.2
+		dev-ruby/rdoc
+		dev-ruby/sinatra
+		dev-ruby/webrick
+	)
+"
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files --/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# test that need network
+	rm -f spec/excon/test/server_spec.rb || die
+
+	# test that wrongly assumes 127.0.0.1 won't run a DNS server
+	rm -f spec/requests/{dns_timeout,resolv_resolver}_spec.rb || die
+
+	# tests that depend on eventmachine which is broken and no longer maintained
+	rm -f tests/{bad,error,pipeline,response,request}_tests.rb \
+		tests/{batch-requests,complete_responses}.rb \
+		tests/middlewares/{decompress,mock}_tests.rb  || die
+	rm -f spec/requests/eof_requests_spec.rb spec/excon/error_spec.rb || die
+
+	# Use a rackup version compatible with sinatra
+	sed -i -e '/launch_process/ s/"rackup"/"rackup-2"/' tests/test_helper.rb || die
+	sed -i -e '/open_process/ s/rackup/rackup-2/' lib/excon/test/plugin/server/webrick.rb || die
+}
diff --git a/dev-ruby/excon/excon-0.92.1.ebuild b/dev-ruby/excon/excon-0.92.1.ebuild
deleted file mode 100644
index 84ee1858942c..000000000000
--- a/dev-ruby/excon/excon-0.92.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="changelog.txt README.md"
-RUBY_FAKEGEM_GEMSPEC="excon.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="EXtended http(s) CONnections"
-HOMEPAGE="https://github.com/excon/excon"
-SRC_URI="https://github.com/excon/excon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-ruby_add_bdepend "
-	dev-ruby/rake
-	test? (
-		dev-ruby/activesupport
-		>=dev-ruby/eventmachine-1.0.4
-		>=dev-ruby/json-1.8.5
-		dev-ruby/open4
-		dev-ruby/rdoc
-		dev-ruby/sinatra
-	)
-"
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files --/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# test that need network
-	rm -f spec/excon/test/server_spec.rb || die
-}
diff --git a/dev-ruby/excon/excon-0.92.2.ebuild b/dev-ruby/excon/excon-0.92.2.ebuild
deleted file mode 100644
index 2f63356225e4..000000000000
--- a/dev-ruby/excon/excon-0.92.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="changelog.txt README.md"
-RUBY_FAKEGEM_GEMSPEC="excon.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="EXtended http(s) CONnections"
-HOMEPAGE="https://github.com/excon/excon"
-SRC_URI="https://github.com/excon/excon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-ruby_add_bdepend "
-	dev-ruby/rake
-	test? (
-		dev-ruby/activesupport
-		>=dev-ruby/json-1.8.5
-		dev-ruby/open4
-		dev-ruby/rdoc
-		dev-ruby/sinatra
-	)
-"
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files --/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# test that need network
-	rm -f spec/excon/test/server_spec.rb || die
-
-	# tests that depend on eventmachine which is broken and no longer maintained
-	rm -f tests/{bad,error,pipeline,response,request}_tests.rb \
-		tests/{batch-requests,complete_responses}.rb \
-		tests/middlewares/{decompress,mock}_tests.rb  || die
-	rm -f spec/requests/eof_requests_spec.rb spec/excon/error_spec.rb || die
-}
diff --git a/dev-ruby/excon/excon-0.92.3.ebuild b/dev-ruby/excon/excon-0.92.3.ebuild
deleted file mode 100644
index 2f63356225e4..000000000000
--- a/dev-ruby/excon/excon-0.92.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="changelog.txt README.md"
-RUBY_FAKEGEM_GEMSPEC="excon.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="EXtended http(s) CONnections"
-HOMEPAGE="https://github.com/excon/excon"
-SRC_URI="https://github.com/excon/excon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-ruby_add_bdepend "
-	dev-ruby/rake
-	test? (
-		dev-ruby/activesupport
-		>=dev-ruby/json-1.8.5
-		dev-ruby/open4
-		dev-ruby/rdoc
-		dev-ruby/sinatra
-	)
-"
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files --/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# test that need network
-	rm -f spec/excon/test/server_spec.rb || die
-
-	# tests that depend on eventmachine which is broken and no longer maintained
-	rm -f tests/{bad,error,pipeline,response,request}_tests.rb \
-		tests/{batch-requests,complete_responses}.rb \
-		tests/middlewares/{decompress,mock}_tests.rb  || die
-	rm -f spec/requests/eof_requests_spec.rb spec/excon/error_spec.rb || die
-}
diff --git a/dev-ruby/execjs/Manifest b/dev-ruby/execjs/Manifest
index 9bc8a12e5bc7..fa9ecbc025ea 100644
--- a/dev-ruby/execjs/Manifest
+++ b/dev-ruby/execjs/Manifest
@@ -1 +1,2 @@
 DIST execjs-2.8.1.tar.gz 425838 BLAKE2B e81c2cfb803e3ffcfb9fbde3ce907147e577f81563500dd74a6a6aa560f13a0318246530a4e54c7139f86c8fe76fe79c9a2961c3b0d685e65c5e7d9d395ba82d SHA512 ec808d3feccf1cfa2500f4ce17a497a31e5886cdd7482c56fdc0cc952aa8967ca50f09c33eb83545713e04aa73fbb8a201459cdb72647e8f8c291f8846f3f230
+DIST execjs-2.9.1.tar.gz 427442 BLAKE2B 5fbead63cfe02d3ba8c1b34fc3ff35a6971c0070f297aef20ab830ebe90e13939ef683baa21cfa921985ced7389db8c4a3fc87a86b180e5c372166685ddb9d6b SHA512 87d2c7f81c47e15c33c6752c6985823fe953d02c7bab70af8d4cda7e9e390ae8972d0077b4f955a16ac9eb9b00d3c86fe76cbc8b8ac3a67ddc9eb2e9aef182bc
diff --git a/dev-ruby/execjs/execjs-2.8.1-r1.ebuild b/dev-ruby/execjs/execjs-2.8.1-r1.ebuild
new file mode 100644
index 000000000000..3e08241f7eb5
--- /dev/null
+++ b/dev-ruby/execjs/execjs-2.8.1-r1.ebuild
@@ -0,0 +1,35 @@
+# 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_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+inherit ruby-fakegem
+
+DESCRIPTION="ExecJS lets you run JavaScript code from Ruby"
+HOMEPAGE="https://github.com/rails/execjs"
+SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
+
+IUSE="test"
+
+# execjs supports various javascript runtimes. They are listed in order
+# as per the documentation. For now only include the ones already in the
+# tree.
+
+RDEPEND+=" || ( dev-ruby/duktape-rb net-libs/nodejs )"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" Rakefile || die
+	# Avoid test requiring network connectivity. We could potentially
+	# substitute dev-ruby/coffee-script-source for this.
+	sed -i -e '/test_coffeescript/,/end/ s:^:#:' test/test_execjs.rb || die
+}
diff --git a/dev-ruby/execjs/execjs-2.8.1.ebuild b/dev-ruby/execjs/execjs-2.8.1.ebuild
deleted file mode 100644
index dd658691fdb4..000000000000
--- a/dev-ruby/execjs/execjs-2.8.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-inherit ruby-fakegem
-
-DESCRIPTION="ExecJS lets you run JavaScript code from Ruby"
-HOMEPAGE="https://github.com/rails/execjs"
-SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
-
-IUSE="test"
-
-# execjs supports various javascript runtimes. They are listed in order
-# as per the documentation. For now only include the ones already in the
-# tree.
-
-RDEPEND+=" || ( dev-ruby/duktape-rb net-libs/nodejs )"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" Rakefile || die
-	# Avoid test requiring network connectivity. We could potentially
-	# substitute dev-ruby/coffee-script-source for this.
-	sed -i -e '/test_coffeescript/,/end/ s:^:#:' test/test_execjs.rb || die
-}
diff --git a/dev-ruby/execjs/execjs-2.9.1.ebuild b/dev-ruby/execjs/execjs-2.9.1.ebuild
new file mode 100644
index 000000000000..c45b165ecb15
--- /dev/null
+++ b/dev-ruby/execjs/execjs-2.9.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+inherit ruby-fakegem
+
+DESCRIPTION="ExecJS lets you run JavaScript code from Ruby"
+HOMEPAGE="https://github.com/rails/execjs"
+SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
+
+IUSE="test"
+
+# execjs supports various javascript runtimes. They are listed in order
+# as per the documentation. For now only include the ones already in the
+# tree.
+
+RDEPEND+=" || ( dev-ruby/duktape-rb net-libs/nodejs )"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" Rakefile || die
+	# Avoid test requiring network connectivity. We could potentially
+	# substitute dev-ruby/coffee-script-source for this.
+	sed -i -e '/test_coffeescript/,/end/ s:^:#:' test/test_execjs.rb || die
+}
diff --git a/dev-ruby/exifr/Manifest b/dev-ruby/exifr/Manifest
index 183e3e620a74..7a7eb397db27 100644
--- a/dev-ruby/exifr/Manifest
+++ b/dev-ruby/exifr/Manifest
@@ -1,2 +1 @@
-DIST exifr-1.3.8.tar.gz 245288 BLAKE2B 49032ee6bd5aaf07c3ef66cd1cc0ae67adff6afc4cae058343d88c5a7dce3230fe151bbedb22c7418745953a0005f0d385a175246c5be48f33a14406914a7d13 SHA512 4e2d49418a31f4a325b9428edefe71066717335c263e0594e0f5b3707cf3fb7d5208d09efe5e2a43948c17894a841e4f1b08829d3fe7759ad3027e29989dce57
-DIST exifr-1.3.9.tar.gz 265384 BLAKE2B 39af2ce0b881fec73c38a707397dd596b1e6a020c357dfd7fb3a4032a743ec0ce175f349f9bc9ec9cd32842c43d20d8bfbf0de3a8e195b6ac028ade651cfcba7 SHA512 e9cfac2ef8da6c9d6fc0ef2463e743c3547f10f3b8fd597516b11227ee2ffbbcfd188d2b27b7ad2ebf828502919dce04139787efe7344b1ec6cc21df6bbc46c6
+DIST exifr-1.4.0.tar.gz 266179 BLAKE2B 6f729fbfdfe4128760faf7b562495518ccbaa3d5d5b5e8ffdc5e9ce613271951cc9d3d27392bf80372b66a241d1157898a25480fd44b9d18e808a23766013e37 SHA512 cd4cfcf6ebc5d88e4d41d859756a2b887a3e4954c1b548616e7aaa6485c2c46fb4e74a0e20cd3644aa0aa3afcb59dc3f9cf865d9215b8a3b7b05cdac68f2a663
diff --git a/dev-ruby/exifr/exifr-1.3.8.ebuild b/dev-ruby/exifr/exifr-1.3.8.ebuild
deleted file mode 100644
index 601d7e6393fd..000000000000
--- a/dev-ruby/exifr/exifr-1.3.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="doc/api"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library to read EXIF info from JPEG and TIFF images"
-HOMEPAGE="https://github.com/remvee/exifr/"
-SRC_URI="https://github.com/remvee/exifr/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-release-${PV}"
-
-# License is not specified in source distribution but is in the GitHub
-# repository.
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-ruby/exifr/exifr-1.3.9.ebuild b/dev-ruby/exifr/exifr-1.3.9.ebuild
deleted file mode 100644
index 601d7e6393fd..000000000000
--- a/dev-ruby/exifr/exifr-1.3.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="doc/api"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library to read EXIF info from JPEG and TIFF images"
-HOMEPAGE="https://github.com/remvee/exifr/"
-SRC_URI="https://github.com/remvee/exifr/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-release-${PV}"
-
-# License is not specified in source distribution but is in the GitHub
-# repository.
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-ruby/exifr/exifr-1.4.0.ebuild b/dev-ruby/exifr/exifr-1.4.0.ebuild
new file mode 100644
index 000000000000..931f2ee65807
--- /dev/null
+++ b/dev-ruby/exifr/exifr-1.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc/api"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library to read EXIF info from JPEG and TIFF images"
+HOMEPAGE="https://github.com/remvee/exifr/"
+SRC_URI="https://github.com/remvee/exifr/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-release-${PV}"
+
+# License is not specified in source distribution but is in the GitHub
+# repository.
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index bd6ed3fd177e..dec2bb3d1ff0 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,2 +1,7 @@
-DIST facter-3.14.21.tar.gz 410594 BLAKE2B 30b502debaec476d7ba03a73ad3a251aeabf3347c2c552204e825dea8d85807d50cd6d06de03be32a5977e5e8cefe4869e2cc453b1ea79b9045c80369df6a0d7 SHA512 69618e54d2c46ae1230fa99ead88413ca8d5be6a01c149fcc00a7485767b9e624283fdf6064679e825a1ecb426be59a86e7ef903cd0ffca58383006ba5e9cf7f
-DIST facter-3.14.23.tar.gz 410645 BLAKE2B 7455435d1ab1b1f6e97996aa54be57321bbe0e294652b1aebe0e1ee0e7be45309c1a89fae4079a4350fd6e689c0fe782a7f5d3eee3d766842fba1e8b70a702b7 SHA512 be207d37cf5eac4b6b95cb13e8c2598ccc03af3bcbeedb0d814e5c11c43eb7579427fa1fc1a29eb6db4d6c43b19b2c87c88bd0c85ac3550fa886753267626986
+DIST facter-3.14.24.tar.gz 410547 BLAKE2B 69d2fd3b1bf9f91456ca570f9fef44ddd6e7656a285c035ecb42df2553c461be137d06232fc1f96f239598143912928dcfaf0d9b3078f4335dfc83163eee5120 SHA512 88e47271f213570fb7819630f7b08076bd8b234612a2bb885de760acab48c37b588c1f214da11c5096f0db6b7df4a516b6e83abc56a1d95779b6f1353831e588
+DIST facter-4.4.1.tar.gz 492785 BLAKE2B b8f173aee1e2c3a6e9b650e1962ee6a7f860cadb0ea09254f396cce60cb01d702feaf23e0e147a80ca95554bcf835bd23df59d4faa78404dc92fd86defb65472 SHA512 c9e148141b3348977c9d6209ed3d72ab1eaaff46e0ada2ce5c3452ee71c3cbc051605bf0d9aad77c249559639e52fbb423c6b3e0cb784f2c208ea206fb3f4fd8
+DIST facter-4.4.3.tar.gz 493663 BLAKE2B 19f670e503b5ccf3d78b7fa72b0f3d25cef827eacf9939182fa4bfd6591fbfae6091425d6fc4d00c87ee587537dbcefdc1ff8d3a6d713c21ad6e167b55753835 SHA512 9e8867b00665559562e5778783247bf97a8fce154c857fc1b2e4cb193a66c9029edcfa09dd4e3ca8a0ad16b8dec272b440441f4cffab899366d543a66d1e26df
+DIST facter-4.5.0.tar.gz 494255 BLAKE2B 7ec4edc85c83fd2a4ab198e0807d705cfba7c05ae5fd6dc1954c00a6e14ab6869926d315bc6fcaf553ec3ae632452a383c6a25e5da2d9a099f24c721fd14407c SHA512 025afb1a8ce2716253cfa94f2a4692558ab1c0021afeacfe4c8e6f482fdf91e8042d0f914da04716c4c50faca5b7e89cd6e741b10d431a71ed933943ca4e712f
+DIST facter-4.5.1.tar.gz 494725 BLAKE2B d77ef233c901f41e2bfeaaf5ecd0d3be885154f5027d9e51a02815eed928ddfa6911af396b5ccfb4a33bd7814ba1e8afd77cafec76e78f2baa57a2113dfd2e0a SHA512 f89dfda26fbde74a7425159cde6eb51755238b86b4e15e2237dbfe3997032130e88f7be3d80c5fe115c6dc41cc69ef8942b826aeeb1669d94fe7a1b7824c0167
+DIST facter-4.5.2.tar.gz 465911 BLAKE2B c806d5abb14ed434a4453cbabc77edd5791788ed11eab6b6ea4c56fbfaee82c1ecbb3407b0953ea674b00b0893da1cdce4752c9ab299bdffc97aece61b14ad0b SHA512 1117845c730fa102b833deb2c1020dc82fd9a5fe3ef959e0e98b0b55b3beeb988bc9bc2dbbb04374e26a2c449815139763a107c799a075ad12f64bbf357ca9b8
+DIST facter-4.7.0.tar.gz 481862 BLAKE2B 5179a15616ca9bb2e494c77d407227b2ecb3c554e73433ff461bd19b28fa23bc89d3ce774810435efbcd80b9307340b5a18ccf5360652924f39e9da27446afa8 SHA512 cd0482bc8cd845fc1f0fa73aa3a7217ad45cced7578069317a0812daf9d1b363931edd99412777fa4db020f1407dd073c9adef425cc262755b2a0a236cd44677
diff --git a/dev-ruby/facter/facter-3.14.21.ebuild b/dev-ruby/facter/facter-3.14.21.ebuild
deleted file mode 100644
index a8b3fb88f65b..000000000000
--- a/dev-ruby/facter/facter-3.14.21.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-# git-r3 goes after ruby-ng so that it overrides src_unpack properly
-inherit cmake eutils ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
-	EGIT_BRANCH="master"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
-	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-RESTRICT="!test? ( test )"
-
-ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
-
-RDEPEND="
-	>=dev-cpp/cpp-hocon-0.2.1:=
-	>=dev-libs/leatherman-1.0.0:=
-	dev-libs/openssl:0=
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	dev-libs/boost:=[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-DEPEND="${RDEPEND}"
-
-# restore ${S} and override all phases exported by ruby-ng.eclass
-S="${WORKDIR}/${P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.14.6-fix-static-libcpp-hocon.patch
-	# be explicit about the version of rspec we test with
-	"${FILESDIR}"/${PN}-3.14.8-explicit-rspec-2.patch
-)
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-each_ruby_configure() {
-	# hack for correct calculation of relative path from facter.rb to
-	# libfacter.so
-	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
-}
-
-src_configure() {
-	ruby-ng_src_configure
-
-	local mycmakeargs=(
-		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
-		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	addpredict /proc/self/oom_score_adj
-	cmake_src_compile
-}
-
-src_test() {
-	cmake_src_test
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_install() {
-	cmake_src_install
-	ruby-ng_src_install
-}
diff --git a/dev-ruby/facter/facter-3.14.23.ebuild b/dev-ruby/facter/facter-3.14.23.ebuild
deleted file mode 100644
index a8b3fb88f65b..000000000000
--- a/dev-ruby/facter/facter-3.14.23.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-# git-r3 goes after ruby-ng so that it overrides src_unpack properly
-inherit cmake eutils ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
-	EGIT_BRANCH="master"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
-	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-RESTRICT="!test? ( test )"
-
-ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
-
-RDEPEND="
-	>=dev-cpp/cpp-hocon-0.2.1:=
-	>=dev-libs/leatherman-1.0.0:=
-	dev-libs/openssl:0=
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	dev-libs/boost:=[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-DEPEND="${RDEPEND}"
-
-# restore ${S} and override all phases exported by ruby-ng.eclass
-S="${WORKDIR}/${P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.14.6-fix-static-libcpp-hocon.patch
-	# be explicit about the version of rspec we test with
-	"${FILESDIR}"/${PN}-3.14.8-explicit-rspec-2.patch
-)
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-each_ruby_configure() {
-	# hack for correct calculation of relative path from facter.rb to
-	# libfacter.so
-	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
-}
-
-src_configure() {
-	ruby-ng_src_configure
-
-	local mycmakeargs=(
-		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
-		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	addpredict /proc/self/oom_score_adj
-	cmake_src_compile
-}
-
-src_test() {
-	cmake_src_test
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_install() {
-	cmake_src_install
-	ruby-ng_src_install
-}
diff --git a/dev-ruby/facter/facter-3.14.24.ebuild b/dev-ruby/facter/facter-3.14.24.ebuild
new file mode 100644
index 000000000000..584ef617e0a4
--- /dev/null
+++ b/dev-ruby/facter/facter-3.14.24.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby31"
+
+# git-r3 goes after ruby-ng so that it overrides src_unpack properly
+inherit cmake ruby-ng
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+RESTRICT="!test? ( test )"
+
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:3 dev-ruby/mocha:0.14 )"
+
+RDEPEND="
+	>=dev-cpp/cpp-hocon-0.2.1:=
+	>=dev-libs/leatherman-1.0.0:=
+	dev-libs/openssl:0=
+	sys-apps/util-linux
+	app-emulation/virt-what
+	net-misc/curl
+	dev-libs/boost:=[nls]
+	>=dev-cpp/yaml-cpp-0.5.1
+	!<app-admin/puppet-4.0.0"
+DEPEND="${RDEPEND}"
+
+# restore ${S} and override all phases exported by ruby-ng.eclass
+S="${WORKDIR}/${P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.14.6-fix-static-libcpp-hocon.patch
+	# be explicit about the version of rspec we test with
+	"${FILESDIR}"/${PN}-3.14.8-explicit-rspec-2.patch
+	"${FILESDIR}"/${PN}-3.14.23-gcc12.patch
+)
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+each_ruby_configure() {
+	# hack for correct calculation of relative path from facter.rb to
+	# libfacter.so
+	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
+}
+
+src_configure() {
+	ruby-ng_src_configure
+
+	local mycmakeargs=(
+		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
+		-DWITHOUT_JRUBY=ON
+		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	addpredict /proc/self/oom_score_adj
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+each_ruby_install() {
+	doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
+src_install() {
+	cmake_src_install
+	ruby-ng_src_install
+}
diff --git a/dev-ruby/facter/facter-4.4.1.ebuild b/dev-ruby/facter/facter-4.4.1.ebuild
new file mode 100644
index 000000000000..1c4e136e7a9c
--- /dev/null
+++ b/dev-ruby/facter/facter-4.4.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+RUBY_FAKEGEM_GEMSPEC="facter.gemspec"
+#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+inherit ruby-ng ruby-fakegem
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+#IUSE="test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+#RESTRICT="!test? ( test )"
+
+ruby_add_rdepend "dev-ruby/hocon <dev-ruby/thor-2.0 dev-ruby/ffi"
+#ruby_add_bdepend "test? ( dev-ruby/simplecov dev-ruby/timecop dev-ruby/webmock )"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+	ruby-ng_src_unpack
+}
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	# Breaks tests; handle deps ourselves
+	sed -e "/require 'bundler/d" -i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/facter/facter-4.4.3-r1.ebuild b/dev-ruby/facter/facter-4.4.3-r1.ebuild
new file mode 100644
index 000000000000..18070dbf7ff7
--- /dev/null
+++ b/dev-ruby/facter/facter-4.4.3-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+RUBY_FAKEGEM_GEMSPEC="facter.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+#IUSE="test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~x86"
+	#KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+#RESTRICT="!test? ( test )"
+
+ruby_add_rdepend "dev-ruby/hocon <dev-ruby/thor-2.0 dev-ruby/ffi dev-ruby/sys-filesystem"
+ruby_add_bdepend "test? ( dev-ruby/simplecov dev-ruby/timecop dev-ruby/webmock )"
+
+PATCHES=(
+	"${FILESDIR}"/facter-4.4.3-rspec-gentoo-tweak.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+	ruby-ng_src_unpack
+}
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	# Breaks tests; handle deps ourselves
+	sed -e "/require 'bundler/d" -i spec/spec_helper.rb || die
+	# dev tasks not needed, but block tests
+	for f in tasks/rubocop.rake tasks/check.rake ; do
+		test -e ${f} && mv -f ${f}{,.DISABLE}
+	done
+}
diff --git a/dev-ruby/facter/facter-4.5.0.ebuild b/dev-ruby/facter/facter-4.5.0.ebuild
new file mode 100644
index 000000000000..18070dbf7ff7
--- /dev/null
+++ b/dev-ruby/facter/facter-4.5.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+RUBY_FAKEGEM_GEMSPEC="facter.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+#IUSE="test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~x86"
+	#KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+#RESTRICT="!test? ( test )"
+
+ruby_add_rdepend "dev-ruby/hocon <dev-ruby/thor-2.0 dev-ruby/ffi dev-ruby/sys-filesystem"
+ruby_add_bdepend "test? ( dev-ruby/simplecov dev-ruby/timecop dev-ruby/webmock )"
+
+PATCHES=(
+	"${FILESDIR}"/facter-4.4.3-rspec-gentoo-tweak.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+	ruby-ng_src_unpack
+}
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	# Breaks tests; handle deps ourselves
+	sed -e "/require 'bundler/d" -i spec/spec_helper.rb || die
+	# dev tasks not needed, but block tests
+	for f in tasks/rubocop.rake tasks/check.rake ; do
+		test -e ${f} && mv -f ${f}{,.DISABLE}
+	done
+}
diff --git a/dev-ruby/facter/facter-4.5.1.ebuild b/dev-ruby/facter/facter-4.5.1.ebuild
new file mode 100644
index 000000000000..18070dbf7ff7
--- /dev/null
+++ b/dev-ruby/facter/facter-4.5.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+RUBY_FAKEGEM_GEMSPEC="facter.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+#IUSE="test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~x86"
+	#KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+#RESTRICT="!test? ( test )"
+
+ruby_add_rdepend "dev-ruby/hocon <dev-ruby/thor-2.0 dev-ruby/ffi dev-ruby/sys-filesystem"
+ruby_add_bdepend "test? ( dev-ruby/simplecov dev-ruby/timecop dev-ruby/webmock )"
+
+PATCHES=(
+	"${FILESDIR}"/facter-4.4.3-rspec-gentoo-tweak.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+	ruby-ng_src_unpack
+}
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	# Breaks tests; handle deps ourselves
+	sed -e "/require 'bundler/d" -i spec/spec_helper.rb || die
+	# dev tasks not needed, but block tests
+	for f in tasks/rubocop.rake tasks/check.rake ; do
+		test -e ${f} && mv -f ${f}{,.DISABLE}
+	done
+}
diff --git a/dev-ruby/facter/facter-4.5.2.ebuild b/dev-ruby/facter/facter-4.5.2.ebuild
new file mode 100644
index 000000000000..c2a4a652e567
--- /dev/null
+++ b/dev-ruby/facter/facter-4.5.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+RUBY_FAKEGEM_GEMSPEC="facter.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+#IUSE="test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~x86"
+	#KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+#RESTRICT="!test? ( test )"
+
+ruby_add_rdepend "dev-ruby/hocon <dev-ruby/thor-2.0 dev-ruby/ffi dev-ruby/sys-filesystem"
+ruby_add_bdepend "test? ( dev-ruby/simplecov dev-ruby/timecop dev-ruby/webmock )"
+
+PATCHES=(
+	"${FILESDIR}"/facter-4.4.3-rspec-gentoo-tweak.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+	ruby-ng_src_unpack
+}
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	# Breaks tests; handle deps ourselves
+	sed -e "/require 'bundler/d" -i spec/spec_helper.rb || die
+	# dev tasks not needed, but block tests
+	for f in tasks/rubocop.rake tasks/check.rake ; do
+		test -e ${f} && mv -f ${f}{,.DISABLE}
+	done
+}
diff --git a/dev-ruby/facter/facter-4.7.0.ebuild b/dev-ruby/facter/facter-4.7.0.ebuild
new file mode 100644
index 000000000000..c2a4a652e567
--- /dev/null
+++ b/dev-ruby/facter/facter-4.7.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+RUBY_FAKEGEM_GEMSPEC="facter.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+#IUSE="test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~x86"
+	#KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+#RESTRICT="!test? ( test )"
+
+ruby_add_rdepend "dev-ruby/hocon <dev-ruby/thor-2.0 dev-ruby/ffi dev-ruby/sys-filesystem"
+ruby_add_bdepend "test? ( dev-ruby/simplecov dev-ruby/timecop dev-ruby/webmock )"
+
+PATCHES=(
+	"${FILESDIR}"/facter-4.4.3-rspec-gentoo-tweak.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+	ruby-ng_src_unpack
+}
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	# Breaks tests; handle deps ourselves
+	sed -e "/require 'bundler/d" -i spec/spec_helper.rb || die
+	# dev tasks not needed, but block tests
+	for f in tasks/rubocop.rake tasks/check.rake ; do
+		test -e ${f} && mv -f ${f}{,.DISABLE}
+	done
+}
diff --git a/dev-ruby/facter/files/facter-3.14.23-gcc12.patch b/dev-ruby/facter/files/facter-3.14.23-gcc12.patch
new file mode 100644
index 000000000000..671b085a15b5
--- /dev/null
+++ b/dev-ruby/facter/files/facter-3.14.23-gcc12.patch
@@ -0,0 +1,10 @@
+https://bugs.gentoo.org/840116
+--- a/lib/src/facts/glib/load_average_resolver.cc
++++ b/lib/src/facts/glib/load_average_resolver.cc
+@@ -1,5 +1,6 @@
+ #include <internal/facts/glib/load_average_resolver.hpp>
+ #include <leatherman/logging/logging.hpp>
++#include <array>
+ #include <cstdlib>
+ 
+ #ifdef __sun
diff --git a/dev-ruby/facter/files/facter-4.4.3-rspec-gentoo-tweak.patch b/dev-ruby/facter/files/facter-4.4.3-rspec-gentoo-tweak.patch
new file mode 100644
index 000000000000..ce97bbbccee9
--- /dev/null
+++ b/dev-ruby/facter/files/facter-4.4.3-rspec-gentoo-tweak.patch
@@ -0,0 +1,53 @@
+These two tests fail on a Gentoo system. Mark as pending so we have coverage of the other tests.
+
+```
+ 1) Facter::Core::Execution::Base#execute with expand on posix does not expant builtin command
+     # False positive on Gentoo due to environment, returns GEM_SKIP instead of PATH
+     Failure/Error: old_require(path) unless LIBS_TO_SKIP.include?(path)
+
+       {"SHELL"=>"/bin/bash", ...,  "_"=>"/usr/bin/rspec", "RACK_ENV"=>"test",
+	   "resolution_test_foo"=>"foo"} received :[] with unexpected arguments
+         expected: ("PATH")
+              got: ("GEM_SKIP")
+        Please stub a default value first if message might be received with other args as well.
+     # ./spec/mocks/kernel.rb:7:in `require'
+     # ./lib/facter/custom_facts/core/execution/base.rb:74:in `execute_command'
+     # ./lib/facter/custom_facts/core/execution/base.rb:63:in `execute'
+     # ./spec/custom_facts/core/execution/fact_manager_spec.rb:106:in `block (4 levels) in <top (required)>'
+
+
+  2) Facter::Core::Execution::Posix when calling execute_command executes a command
+     # False positive on Gentoo due to environment, returns "" instead of ["", ""]
+     Failure/Error: expect(posix_executor.execute_command('/usr/bin/true', nil, logger)).to eq(['', ''])
+
+       expected: ["", ""]
+            got: ""
+
+       (compared using ==)
+     # ./spec/custom_facts/core/execution/posix_spec.rb:112:in `block (3 levels) in <top (required)>'
+```
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -NuarwbB --exclude '*swp' facter-4.4.3.orig/spec/custom_facts/core/execution/fact_manager_spec.rb facter-4.4.3/spec/custom_facts/core/execution/fact_manager_spec.rb
+--- facter-4.4.3.orig/spec/custom_facts/core/execution/fact_manager_spec.rb	2023-08-24 10:49:03.000000000 -0700
++++ facter-4.4.3/spec/custom_facts/core/execution/fact_manager_spec.rb	2023-09-09 21:25:03.428326009 -0700
+@@ -99,6 +99,7 @@
+       end
+
+       it 'does not expant builtin command' do
++        pending('False positive on Gentoo due to environment, returns GEM_SKIP instead of PATH')
+         allow(Facter::Core::Execution::Popen3).to receive(:popen3e).with({ 'LC_ALL' => 'C', 'LANG' => 'C' }, '/bin/foo')
+                                                                    .and_return('')
+         allow(Open3).to receive(:capture2).with('type /bin/foo').and_return('builtin')
+diff -NuarwbB --exclude '*swp' facter-4.4.3.orig/spec/custom_facts/core/execution/posix_spec.rb facter-4.4.3/spec/custom_facts/core/execution/posix_spec.rb
+--- facter-4.4.3.orig/spec/custom_facts/core/execution/posix_spec.rb	2023-08-24 10:49:03.000000000 -0700
++++ facter-4.4.3/spec/custom_facts/core/execution/posix_spec.rb	2023-09-09 21:24:39.484374593 -0700
+@@ -108,6 +108,7 @@
+     let(:logger) { instance_spy(Logger) }
+
+     it 'executes a command' do
++      pending('False positive on Gentoo due to environment, returns "" instead of ["", ""]')
+       expect(posix_executor.execute_command('/usr/bin/true', nil, logger)).to eq(['', ''])
+     end
+
diff --git a/dev-ruby/fake_ftp/Manifest b/dev-ruby/fake_ftp/Manifest
new file mode 100644
index 000000000000..139936d18829
--- /dev/null
+++ b/dev-ruby/fake_ftp/Manifest
@@ -0,0 +1 @@
+DIST fake_ftp-0.3.0.gem 94720 BLAKE2B 98d96324eb84654300785a82a1fd9a78abf44cf8fa8e062bc5dd4629147b5753aaa8554319b623bb4ea208bc055ead251ccb66d4e31ec1738d07700c9f8e4e57 SHA512 2aa106ff76d42a04863fb0db82b782b6e36d20e686ea5d1c564be32fbebd815e2d2e046e26e4fa71232e87ae523a1b5da7165fa51398b588546d561b0a565c20
diff --git a/dev-ruby/fake_ftp/fake_ftp-0.3.0.ebuild b/dev-ruby/fake_ftp/fake_ftp-0.3.0.ebuild
new file mode 100644
index 000000000000..f2bcacc3fe15
--- /dev/null
+++ b/dev-ruby/fake_ftp/fake_ftp-0.3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Testing FTP? Use this!"
+HOMEPAGE="https://github.com/livinginthepast/fake_ftp"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/fake_ftp/metadata.xml b/dev-ruby/fake_ftp/metadata.xml
new file mode 100644
index 000000000000..d126c4f79f47
--- /dev/null
+++ b/dev-ruby/fake_ftp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">livinginthepast/fake_ftp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index ab3b52a6d0bb..14fb22933864 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -1,2 +1,2 @@
-DIST fakefs-1.2.3.tar.gz 54054 BLAKE2B ae8202b7f28d4d1b326e016d96382b7cfaf012fb842d63150bb09b6ddb5de96bb6d548635877d2d057137bbc23c46c30340ebae3641d70d7955f609bb4cc4af2 SHA512 5051a3b81ba5919cdb6cd4a92f4e6af6ed5140afb35247b1775f4602083e23f903c582e038596a3bb27ab3f69128ef3d9fc2635d015fdb23babf21ff200c4692
-DIST fakefs-1.3.2.tar.gz 54762 BLAKE2B b5b8c00ffbd8974b2eb024deca4a2e48791fb542e2ad47d06d1c56ad1caab1433b240ea6af4a6836638c84bb79869dcd9d74194768d380173efe54f6765b7f7e SHA512 939dc7f28b266d8ef0cd5b4d33c6abc4a766143895d226b6a32af05f2f6e9eded63d86cf39d607094435a1b428297ad11366f645f4bf6789048b7e03357bacc6
+DIST fakefs-1.9.0.tar.gz 56514 BLAKE2B 07e84f54413052b3bf37934b395c6115455ca241d42700dc054729be2ce82eb91944b83e01933fd001b46c9db593f2fd7a9b69f5f49529fde3e1ce967498db5b SHA512 e6be021fec79517127c6f514cc3379fa9c64d75c16d0ac80ed5b677f55625f1ee464eafa0768523a4b364323cfb1aae79814057ee9be3a0d947aac22d39a88f5
+DIST fakefs-2.5.0.tar.gz 57850 BLAKE2B fc53d8f3dd40bfbbef81e9c092439a099a9964b4eff8e5fa6d59c2215aca735d02ab24f2a44c2f51fe874c2a3b088190455cff17a3bf9099e9f56effbceed61c SHA512 acc2fd6891964ce6ab3dd307d8bc90dcaa92c9c01328865bfcee5de5959089e7d7dcbb4d52576b5fb81321ad12719c7d3999d6b0102e5e2d9ef88522ca032bdc
diff --git a/dev-ruby/fakefs/fakefs-1.2.3.ebuild b/dev-ruby/fakefs/fakefs-1.2.3.ebuild
deleted file mode 100644
index 5168f0590e8a..000000000000
--- a/dev-ruby/fakefs/fakefs-1.2.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
-
-RUBY_FAKEGEM_GEMSPEC="fakefs.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fake filesystem. Use it in your tests"
-HOMEPAGE="https://github.com/defunkt/fakefs"
-SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-3.1:3
-		>=dev-ruby/maxitest-3.6:1
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-
-	# Avoid unneeded minitest-rg dependency.
-	sed -i -e '1igem "minitest", "~>5.5"' \
-		-e '/bundler/ s:^:#:' \
-		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
-
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/fakefs/fakefs-1.3.2.ebuild b/dev-ruby/fakefs/fakefs-1.3.2.ebuild
deleted file mode 100644
index 2cdfdb532bc8..000000000000
--- a/dev-ruby/fakefs/fakefs-1.3.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
-
-RUBY_FAKEGEM_GEMSPEC="fakefs.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fake filesystem. Use it in your tests"
-HOMEPAGE="https://github.com/defunkt/fakefs"
-SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-3.1:3
-		>=dev-ruby/maxitest-3.6:1
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-
-	# Avoid unneeded minitest-rg dependency.
-	sed -i -e '1igem "minitest", "~>5.5"' \
-		-e '/bundler/ s:^:#:' \
-		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
-
-	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/fakefs/fakefs-1.9.0.ebuild b/dev-ruby/fakefs/fakefs-1.9.0.ebuild
new file mode 100644
index 000000000000..863326d29b5b
--- /dev/null
+++ b/dev-ruby/fakefs/fakefs-1.9.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
+
+RUBY_FAKEGEM_GEMSPEC="fakefs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fake filesystem. Use it in your tests"
+HOMEPAGE="https://github.com/defunkt/fakefs"
+SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-3.1:3
+		>=dev-ruby/maxitest-3.6:1
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler
+	rm Gemfile || die
+
+	# Avoid unneeded minitest-rg dependency.
+	sed -i -e '1igem "minitest", "~>5.5"' \
+		-e '/bundler/ s:^:#:' \
+		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
+
+	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/fakefs/fakefs-2.5.0.ebuild b/dev-ruby/fakefs/fakefs-2.5.0.ebuild
new file mode 100644
index 000000000000..c55bf06e9f18
--- /dev/null
+++ b/dev-ruby/fakefs/fakefs-2.5.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
+
+RUBY_FAKEGEM_GEMSPEC="fakefs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fake filesystem. Use it in your tests"
+HOMEPAGE="https://github.com/fakefs/fakefs"
+SRC_URI="https://github.com/fakefs/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-3.1:3
+		>=dev-ruby/maxitest-3.6:1
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler
+	rm Gemfile || die
+
+	# Avoid unneeded minitest-rg dependency.
+	sed -i -e '1igem "maxitest"; gem "minitest", "~>5.5"' \
+		-e '/bundler/ s:^:#:' \
+		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
+
+	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid test that uses the console and hangs on user input
+	rm -f test/pry_test.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/fakefs/metadata.xml b/dev-ruby/fakefs/metadata.xml
index 292c4bc1e6c6..eb9aa0596360 100644
--- a/dev-ruby/fakefs/metadata.xml
+++ b/dev-ruby/fakefs/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">defunkt/fakefs</remote-id>
+    <remote-id type="github">fakefs/fakefs</remote-id>
+    <remote-id type="rubygems">fakefs</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/faker/Manifest b/dev-ruby/faker/Manifest
index 6238bc533e2e..a60d1d0dadf2 100644
--- a/dev-ruby/faker/Manifest
+++ b/dev-ruby/faker/Manifest
@@ -1,3 +1,4 @@
-DIST faker-2.16.0.tar.gz 1234511 BLAKE2B 99c53c85094022b33f2213af20b642fafb885ae9cb99169aa2684697e3af9d393b73476ebcd4e7e0541777d0648a53570cd93c352316a7f86c7a2026bf02b47c SHA512 b33054414ad57dd34ce0448d3b8a411d71a14bdbd66fd969007267d1969b40dc37b8d1b6622f81dfe1ed9d38b95cdd9dec699e3233195cfcdb9289d309c0a6f8
-DIST faker-2.17.0.tar.gz 1268170 BLAKE2B 560fe5ebe8384121e720b540d0375aa50cfb40717e2ea4d438cce1918a7996fa3414a01344c26c65e2e0ac6115b3694985355543290b89500359ddc523e47304 SHA512 fd5e3726d881d6378c21932d97c5d92c23e8cf0e36289f6707d76474dc5ee843a731ea6c6a29bfe33564bd7521c91e1a90adff0c205c19a77b0a944766b1d159
-DIST faker-2.19.0.tar.gz 1674687 BLAKE2B d96f30e1ab1febc4f31f4a0709b838978aa2e6ff2e218be25075cb93a19cfef40182ba71a4f7e8bcf1793ff7737a1fa9178d2b847928e40249fb546791841740 SHA512 28d0bfafafb7a2679cd0ec476d14ef79e60f85f6dad2c8ce78002a530474106b0b29191f483a7c4a8f9c1262811fbb6488badae1a400bd520c8c863902e078b6
+DIST faker-2.23.0.tar.gz 1709736 BLAKE2B e3524dbecbd1a4825ef8b38801ae1fa30a4392a7d2eb6fe1c94c3da0b0a4f18db621a42423510bf2f9c4bba175d66e10808252a923c9703aaa8de5d5ed54dd44 SHA512 b037833b3a6d07adaa70c665af66343d90389f282a2faf8ca55a5a81988163263e3b3069744e67ede206512bb67cf53a104eed34c39d92feb10a282f411bde41
+DIST faker-3.2.0.tar.gz 1741224 BLAKE2B 0ff591bda01c5009ef1303403fa954f00f4fb885ef48d4838aa471cc00f527b2a738eedc93ada1cb00c0286c53650960dbf55cbf1ac056b16c93f2489dc0f5ae SHA512 472029d6966a5583cab3991821557af25d2b2bfbbee3c9cda824503d3a0cf8f8ffc9ffaa40299cab952815a40148d20aed78c37d3dedb3c91b3f4bcdf70e5bd1
+DIST faker-3.2.1.tar.gz 1790088 BLAKE2B 87131d359c40f4a517a0aa5dfde0aa5a8807a6cfd4af31c5fd61cefcc7a4311549b98fe132c846ead0c9d2b1afd7551d3cc32d285ecedf4ee3ec733ed1d886e3 SHA512 6ee9ffacf60bee367a3590195676cc80c79625d920c52bf9dff42957c2afdb099e1fc28c3fe3d981ee163bea3cb044153396c458b3bf859e2fe3f2b6f44aea85
+DIST faker-3.2.2.tar.gz 1808552 BLAKE2B 148e821b254de61fc44ff0836e91bb66574bf913d5899410bf4e7939ccbed74a343dc6a1fa504f4cb618dcbdac949d591a36c54e02ac1ae1181cf35b3a309f97 SHA512 d13211874f74a380a21cc8940cd7e7382d404cf28b4b3e4becbf0d6b9c027ebb0e206c15febddecd4ad48bdcd59017c9e33399fa0467d0e205cad044078ba5a6
diff --git a/dev-ruby/faker/faker-2.16.0.ebuild b/dev-ruby/faker/faker-2.16.0.ebuild
deleted file mode 100644
index d9a2059ab502..000000000000
--- a/dev-ruby/faker/faker-2.16.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
-HOMEPAGE="https://github.com/stympy/faker"
-SRC_URI="https://github.com/stympy/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/i18n-1.6:1 !!<dev-ruby/faker-1.9.6-r1"
-
-ruby_add_bdepend "test? ( dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|rubocop\|yard\)/I s:^:#:' Rakefile || die
-	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/faker/faker-2.17.0.ebuild b/dev-ruby/faker/faker-2.17.0.ebuild
deleted file mode 100644
index d9a2059ab502..000000000000
--- a/dev-ruby/faker/faker-2.17.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
-HOMEPAGE="https://github.com/stympy/faker"
-SRC_URI="https://github.com/stympy/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/i18n-1.6:1 !!<dev-ruby/faker-1.9.6-r1"
-
-ruby_add_bdepend "test? ( dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|rubocop\|yard\)/I s:^:#:' Rakefile || die
-	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/faker/faker-2.19.0.ebuild b/dev-ruby/faker/faker-2.19.0.ebuild
deleted file mode 100644
index 82e8579cf790..000000000000
--- a/dev-ruby/faker/faker-2.19.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
-HOMEPAGE="https://github.com/stympy/faker"
-SRC_URI="https://github.com/stympy/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/i18n-1.6:1 !!<dev-ruby/faker-1.9.6-r1"
-
-ruby_add_bdepend "test? ( dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|rubocop\|yard\)/I s:^:#:' Rakefile || die
-	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/faker/faker-2.23.0-r1.ebuild b/dev-ruby/faker/faker-2.23.0-r1.ebuild
new file mode 100644
index 000000000000..af47ebe6e992
--- /dev/null
+++ b/dev-ruby/faker/faker-2.23.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
+HOMEPAGE="https://github.com/stympy/faker"
+SRC_URI="https://github.com/stympy/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/i18n-1.8.11:1"
+
+ruby_add_bdepend "test? ( dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|rubocop\|yard\)/I s:^:#:' Rakefile || die
+	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/faker/faker-3.2.0.ebuild b/dev-ruby/faker/faker-3.2.0.ebuild
new file mode 100644
index 000000000000..eba3f189c07d
--- /dev/null
+++ b/dev-ruby/faker/faker-3.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
+HOMEPAGE="https://github.com/faker-ruby/faker"
+SRC_URI="https://github.com/faker-ruby/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/i18n-1.8.11:1 !<dev-ruby/faker-2.23.0-r1"
+
+ruby_add_bdepend "test? ( dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|rubocop\|yard\)/I s:^:#:' Rakefile || die
+	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/faker/faker-3.2.1.ebuild b/dev-ruby/faker/faker-3.2.1.ebuild
new file mode 100644
index 000000000000..eba3f189c07d
--- /dev/null
+++ b/dev-ruby/faker/faker-3.2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
+HOMEPAGE="https://github.com/faker-ruby/faker"
+SRC_URI="https://github.com/faker-ruby/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/i18n-1.8.11:1 !<dev-ruby/faker-2.23.0-r1"
+
+ruby_add_bdepend "test? ( dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|rubocop\|yard\)/I s:^:#:' Rakefile || die
+	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/faker/faker-3.2.2.ebuild b/dev-ruby/faker/faker-3.2.2.ebuild
new file mode 100644
index 000000000000..9748849dfb16
--- /dev/null
+++ b/dev-ruby/faker/faker-3.2.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
+HOMEPAGE="https://github.com/faker-ruby/faker"
+SRC_URI="https://github.com/faker-ruby/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/i18n-1.8.11:1 !<dev-ruby/faker-2.23.0-r1"
+
+ruby_add_bdepend "test? ( dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|rubocop\|yard\)/I s:^:#:' Rakefile || die
+	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/faker/metadata.xml b/dev-ruby/faker/metadata.xml
index 945da184ae6b..76783815ac21 100644
--- a/dev-ruby/faker/metadata.xml
+++ b/dev-ruby/faker/metadata.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
   <maintainer type="project">
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">stympy/faker</remote-id>
+    <remote-id type="github">faker-ruby/faker</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/faraday-follow_redirects/Manifest b/dev-ruby/faraday-follow_redirects/Manifest
new file mode 100644
index 000000000000..3802e9907d08
--- /dev/null
+++ b/dev-ruby/faraday-follow_redirects/Manifest
@@ -0,0 +1 @@
+DIST faraday-follow_redirects-0.3.0.tar.gz 9884 BLAKE2B 463cfb9e797f21355fea5318f0a647936194b671828e55c6ad6dff1c3e853b15ed0facac28e2f59c0cccf8db5d9f11f3bd66c1c877d9a9538d5deea832c4d3d2 SHA512 357b9618f203749f806b7882b39dfd1b90a403c9a76734f4d3ae59ef2a70430254e616be66fb5a0ec74e770e2ee9df6e0f805b00f70a6f99de12ff70fa4d2bda
diff --git a/dev-ruby/faraday-follow_redirects/faraday-follow_redirects-0.3.0.ebuild b/dev-ruby/faraday-follow_redirects/faraday-follow_redirects-0.3.0.ebuild
new file mode 100644
index 000000000000..8fb5aa93a297
--- /dev/null
+++ b/dev-ruby/faraday-follow_redirects/faraday-follow_redirects-0.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Perform multipart-post requests using Faraday"
+HOMEPAGE="https://github.com/tisba/faraday-follow-redirects"
+SRC_URI="https://github.com/tisba/faraday-follow-redirects/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="faraday-follow-redirects-${PV}"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 )"
+
+ruby_add_bdepend "test? ( dev-ruby/webmock )"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ':'./:" ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/faraday-follow_redirects/metadata.xml b/dev-ruby/faraday-follow_redirects/metadata.xml
new file mode 100644
index 000000000000..42a21a64fc14
--- /dev/null
+++ b/dev-ruby/faraday-follow_redirects/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">tisba/faraday-follow-redirects</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/faraday-httpclient/Manifest b/dev-ruby/faraday-httpclient/Manifest
new file mode 100644
index 000000000000..e1598b377a3c
--- /dev/null
+++ b/dev-ruby/faraday-httpclient/Manifest
@@ -0,0 +1 @@
+DIST faraday-httpclient-1.0.1.tar.gz 8438 BLAKE2B eb642d2d69b3daeca9763df86399b1e76f2d3e84cec19218ff0c486f547594f83f30a776b0be95e5f4f976505e5a4299eec3ded9652ee61ceace63b29260d47f SHA512 440d57cad24bd7f52c4b1ea8f8062a62630791f8a5730999aa41ece5b0c759a188afbb8449e32eea03710bfc7bffbe244664d305f41457e88791f916ef142d86
diff --git a/dev-ruby/faraday-httpclient/faraday-httpclient-1.0.1.ebuild b/dev-ruby/faraday-httpclient/faraday-httpclient-1.0.1.ebuild
new file mode 100644
index 000000000000..0688a201cfa8
--- /dev/null
+++ b/dev-ruby/faraday-httpclient/faraday-httpclient-1.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faraday adapter for HTTPClient"
+HOMEPAGE="https://github.com/lostisland/faraday-httpclient"
+SRC_URI="https://github.com/lostisland/faraday-httpclient/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/webmock dev-ruby/faraday:1 dev-ruby/httpclient )"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ':'./:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '2igem "faraday", "~> 1.0"' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/faraday-httpclient/metadata.xml b/dev-ruby/faraday-httpclient/metadata.xml
new file mode 100644
index 000000000000..5450cd18f3de
--- /dev/null
+++ b/dev-ruby/faraday-httpclient/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">lostisland/faraday-httpclient</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/faraday-multipart/Manifest b/dev-ruby/faraday-multipart/Manifest
new file mode 100644
index 000000000000..9bb03d97a53e
--- /dev/null
+++ b/dev-ruby/faraday-multipart/Manifest
@@ -0,0 +1 @@
+DIST faraday-multipart-1.0.4.tar.gz 11558 BLAKE2B 3e68fa1c7d28b25a6b6b3a1a3a8c64081bfbff619eb59e2235d0853d1853e34063c96d3a450e89ef6ec383acd05b34abd0b472527f66d76528cbc65521aac64b SHA512 a155cc1cd572157c33df75f342bc9c1d8971ee3c92a3b184098b19b3bee56f1ee79e68983ccbc6df4f8e97f8ab877dca9d28b3ed22fea1d49197c07a81d8092a
diff --git a/dev-ruby/faraday-multipart/faraday-multipart-1.0.4.ebuild b/dev-ruby/faraday-multipart/faraday-multipart-1.0.4.ebuild
new file mode 100644
index 000000000000..d9f2e1563a31
--- /dev/null
+++ b/dev-ruby/faraday-multipart/faraday-multipart-1.0.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Perform multipart-post requests using Faraday"
+HOMEPAGE="https://github.com/lostisland/faraday-multipart"
+SRC_URI="https://github.com/lostisland/faraday-multipart/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/multipart-post:0"
+
+ruby_add_bdepend "test? (
+	|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 )
+	dev-ruby/multipart-parser
+)"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ':'./:" ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/faraday-multipart/metadata.xml b/dev-ruby/faraday-multipart/metadata.xml
new file mode 100644
index 000000000000..6ee43a5aeb2e
--- /dev/null
+++ b/dev-ruby/faraday-multipart/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">lostisland/faraday-multipart</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/faraday-net_http/Manifest b/dev-ruby/faraday-net_http/Manifest
index 1535934e3834..8dec1316a359 100644
--- a/dev-ruby/faraday-net_http/Manifest
+++ b/dev-ruby/faraday-net_http/Manifest
@@ -1 +1,4 @@
 DIST faraday-net_http-1.0.1.tar.gz 8436 BLAKE2B 16feb3c79af7db3b69373826a2fc55a8373620c7c6bb229ec27ada2e07a75e862e4211a13a991c9d280b9dfd9643d1eec400fb0b925a846d966cc609c562aefe SHA512 57a7ea2f452844200119cb9e99ae4bfee5e01b0630b38b4ef4e615dfcc05e1476e3da8511698bf199c62b816b5253fb364ed6cffdc59dcd4e9d706c7f1e6e56b
+DIST faraday-net_http-2.1.0.tar.gz 9061 BLAKE2B 00e461718f4a92ff424e28074aa62d79c4ebfc9ca3a22036eef28c57fe90199b6fb49f5f9a02ff89cfc701b07c5fbb798446f1cc7ebf860dfeab9208e61b92d8 SHA512 797aa930d33a372fccb6fc497fe504f15b63a2fd87aa2301b84098a23de321fe60b6af43f35d9ed670705e90284096a21e9e83c80abe800c81240dec937a27d8
+DIST faraday-net_http-3.0.2.tar.gz 8897 BLAKE2B bd69eb01e74ab00c3d14efe7cf3c74efaeb17c7a03c61916c040a79ea152c4adddb010b0767dc6eecaed072e905c5d4ec540c26abbb1d390123538c38555ea22 SHA512 e01d22c243f175f88f1a559d9c200047a28fa118225b3ad616ae0ed3e5207b6f6dd0337f8520e1b023deef18e3b1654ad84e43267971d634ba9d8e88b44627fa
+DIST faraday-net_http-3.1.0.tar.gz 8975 BLAKE2B 254f0f3eac4361866b4e8a0b2461fa4e2fb76cfbcd145e122fdbfd65a4565ffd176375fd962dbb1ec899c3be993526d3232e166105840f43af1027220d9cd245 SHA512 dfab2515f7d567d34fd11c4a5ceff2ad41399a6ff262dc4bc52349d4229cdd8d9563c31d4dee1acfcb185a5bcf647e574758965cb6324c024244c9e48a42568f
diff --git a/dev-ruby/faraday-net_http/faraday-net_http-1.0.1.ebuild b/dev-ruby/faraday-net_http/faraday-net_http-1.0.1.ebuild
index 35f84a277481..b7287199a7ef 100644
--- a/dev-ruby/faraday-net_http/faraday-net_http-1.0.1.ebuild
+++ b/dev-ruby/faraday-net_http/faraday-net_http-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32"
 
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/lostisland/faraday-net_http/archive/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/faraday-1.3.1:1 )"
diff --git a/dev-ruby/faraday-net_http/faraday-net_http-2.1.0.ebuild b/dev-ruby/faraday-net_http/faraday-net_http-2.1.0.ebuild
new file mode 100644
index 000000000000..dc7606654b71
--- /dev/null
+++ b/dev-ruby/faraday-net_http/faraday-net_http-2.1.0.ebuild
@@ -0,0 +1,30 @@
+# 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_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faraday adapter for Net::HTTP"
+HOMEPAGE="https://github.com/lostisland/faraday-net_http"
+SRC_URI="https://github.com/lostisland/faraday-net_http/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( || ( dev-ruby/faraday:2 >=dev-ruby/faraday-1.3.1:1 ) )"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ':'./:" ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/faraday-net_http/faraday-net_http-3.0.2.ebuild b/dev-ruby/faraday-net_http/faraday-net_http-3.0.2.ebuild
new file mode 100644
index 000000000000..b606f1ad6ecd
--- /dev/null
+++ b/dev-ruby/faraday-net_http/faraday-net_http-3.0.2.ebuild
@@ -0,0 +1,30 @@
+# 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_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faraday adapter for Net::HTTP"
+HOMEPAGE="https://github.com/lostisland/faraday-net_http"
+SRC_URI="https://github.com/lostisland/faraday-net_http/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/faraday-2.5 )"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ':'./:" ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/faraday-net_http/faraday-net_http-3.1.0.ebuild b/dev-ruby/faraday-net_http/faraday-net_http-3.1.0.ebuild
new file mode 100644
index 000000000000..d1f1be3f6e05
--- /dev/null
+++ b/dev-ruby/faraday-net_http/faraday-net_http-3.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faraday adapter for Net::HTTP"
+HOMEPAGE="https://github.com/lostisland/faraday-net_http"
+SRC_URI="https://github.com/lostisland/faraday-net_http/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/faraday-2.5 )"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ':'./:" ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/faraday-net_http_persistent/Manifest b/dev-ruby/faraday-net_http_persistent/Manifest
new file mode 100644
index 000000000000..8e18cf7b0e91
--- /dev/null
+++ b/dev-ruby/faraday-net_http_persistent/Manifest
@@ -0,0 +1,2 @@
+DIST faraday-net_http_persistent-1.2.0.tar.gz 6330 BLAKE2B ebd14e0035a86b2529e206704ae611ba82e35fc5296652dcb5b83b4aa9fac3b636a93baf45d7a47f3138550345920d15d87f0648b0107ed7264827b3a34d947f SHA512 4172b93aa72b5f9dcd9fa526789bc336b777fb6785753f0351410c58b8f3fe7e6f989c0812d71e1aa4f6449877cbed8908412321daefe95997483cf51158fa4c
+DIST faraday-net_http_persistent-2.1.0.tar.gz 6953 BLAKE2B 5b1c43fbd647c36315c24aa0ff12817edef9940de7f42edb59815b41ec5a5b15c137be6d9e10a07192144064e5a32fa8ab0d9fa1ec15c3e3ec064424b5f299a9 SHA512 3ad70814a231dedff56dd2891d834c6cd5f377e30bac4b31e6290097667d18b4eac5b44ad46b14fda873ee80e3b49e018337d60d666f0b32017fe0f4653d905a
diff --git a/dev-ruby/faraday-net_http_persistent/faraday-net_http_persistent-1.2.0.ebuild b/dev-ruby/faraday-net_http_persistent/faraday-net_http_persistent-1.2.0.ebuild
new file mode 100644
index 000000000000..009b56d59817
--- /dev/null
+++ b/dev-ruby/faraday-net_http_persistent/faraday-net_http_persistent-1.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faraday adapter for NetHttpPersistent"
+HOMEPAGE="https://github.com/lostisland/faraday-net_http_persistent"
+SRC_URI="https://github.com/lostisland/faraday-net_http_persistent/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+ruby_add_depend "test? (
+	dev-ruby/faraday:1
+	>=dev-ruby/net-http-persistent-3.1
+	>=dev-ruby/webmock-3.4
+)"
+
+all_ruby_prepare() {
+	sed -i -e 's:_relative ":"./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -e '/simplecov/I s:^:#:' \
+		-e '3igem "faraday", "~> 1.0"' \
+		-i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/faraday-net_http_persistent/faraday-net_http_persistent-2.1.0.ebuild b/dev-ruby/faraday-net_http_persistent/faraday-net_http_persistent-2.1.0.ebuild
new file mode 100644
index 000000000000..52c01b1eb35a
--- /dev/null
+++ b/dev-ruby/faraday-net_http_persistent/faraday-net_http_persistent-2.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faraday adapter for NetHttpPersistent"
+HOMEPAGE="https://github.com/lostisland/faraday-net_http_persistent"
+SRC_URI="https://github.com/lostisland/faraday-net_http_persistent/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/faraday-2.5:2
+	dev-ruby/net-http-persistent:4
+"
+
+ruby_add_depend "test? (
+	>=dev-ruby/webmock-3.4
+)"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ':'./:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/faraday-net_http_persistent/metadata.xml b/dev-ruby/faraday-net_http_persistent/metadata.xml
new file mode 100644
index 000000000000..6d9431f28d73
--- /dev/null
+++ b/dev-ruby/faraday-net_http_persistent/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">lostisland/faraday-net_http_persistent</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/faraday-patron/Manifest b/dev-ruby/faraday-patron/Manifest
new file mode 100644
index 000000000000..a2c95761876c
--- /dev/null
+++ b/dev-ruby/faraday-patron/Manifest
@@ -0,0 +1 @@
+DIST faraday-patron-1.0.0.tar.gz 7939 BLAKE2B 303e2186c35cffef73fab73eecdb7affe83b3fb11c861ab082c3a60fb3adceb0f5a1fdd7d26f425a0449e349868b62363ae846bde5a194c66fba0b4a0a9c6d02 SHA512 66180ab2730280635a2560839e991e562bb6ff907e483a6e75557f6d7950b0b375955eea4034c8c4820267ac82d9f9dc0f0011c4ff6a526f3499b179935a7014
diff --git a/dev-ruby/faraday-patron/faraday-patron-1.0.0.ebuild b/dev-ruby/faraday-patron/faraday-patron-1.0.0.ebuild
new file mode 100644
index 000000000000..e2969f86e71c
--- /dev/null
+++ b/dev-ruby/faraday-patron/faraday-patron-1.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faraday adapter for Patron"
+HOMEPAGE="https://github.com/lostisland/faraday-patron"
+SRC_URI="https://github.com/lostisland/faraday-patron/archive/v1.0.tar.gz -> ${P}.tar.gz"
+RUBY_S="faraday-patron-1.0"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/webmock dev-ruby/faraday:1 )"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ':'./:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '2igem "faraday", "~> 1.0"' spec/spec_helper.rb || die
+
+	# Avoid unpackaged, test-only, faraday-multipart for now.
+#	sed -i -e '/multipart/ s:^:#:' spec/spec_helper.rb || die
+#	sed -e '/should rewind files on retry/askip "faraday-multipart not packaged"' \
+#		-i spec/faraday/retry/middleware_spec.rb || die
+}
diff --git a/dev-ruby/faraday-patron/metadata.xml b/dev-ruby/faraday-patron/metadata.xml
new file mode 100644
index 000000000000..aa569be281f6
--- /dev/null
+++ b/dev-ruby/faraday-patron/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">lostisland/faraday-patron</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/faraday-rack/Manifest b/dev-ruby/faraday-rack/Manifest
new file mode 100644
index 000000000000..19860f51a18e
--- /dev/null
+++ b/dev-ruby/faraday-rack/Manifest
@@ -0,0 +1 @@
+DIST faraday-rack-1.0.0.tar.gz 8042 BLAKE2B bfeb9c4ee12a8eae657f9ea8f8144232ddfaca758b30f2af1e3b179ca38afd35755499c8f524fb1673675f5eacc93ca6fb79a78e48b68da8db298b91d5ecfb67 SHA512 c2abe89a54c41dfa336976ec0f8c86f3a1912b5a950f139f0146a27273560fa74c97c5c35d05f80ce2349de96461b7e398c79cdc3471a8fe782406df03e184ec
diff --git a/dev-ruby/faraday-rack/faraday-rack-1.0.0.ebuild b/dev-ruby/faraday-rack/faraday-rack-1.0.0.ebuild
new file mode 100644
index 000000000000..629f4cce309a
--- /dev/null
+++ b/dev-ruby/faraday-rack/faraday-rack-1.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faraday adapter for Rack"
+HOMEPAGE="https://github.com/lostisland/faraday-rack"
+SRC_URI="https://github.com/lostisland/faraday-rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/faraday:1 >=dev-ruby/rack-test-0.6 dev-ruby/webmock )"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ':'./:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '2igem "faraday", "~> 1.0"' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/faraday-rack/metadata.xml b/dev-ruby/faraday-rack/metadata.xml
new file mode 100644
index 000000000000..938a9ca9875c
--- /dev/null
+++ b/dev-ruby/faraday-rack/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">lostisland/faraday-rack</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/faraday-retry/Manifest b/dev-ruby/faraday-retry/Manifest
new file mode 100644
index 000000000000..9ee5cf628131
--- /dev/null
+++ b/dev-ruby/faraday-retry/Manifest
@@ -0,0 +1,2 @@
+DIST faraday-retry-1.0.3.tar.gz 10732 BLAKE2B 4ab94c84242b1009221e7c44273a3dc3e07ce3303b776a42ac04c6adec5439ff83ad583e2b3670638d08aa5117ee897669dc4e8e3d13e3a84672cf9001580889 SHA512 d3d50c6ccca97b3c7f076a45f0be92c9d601a005328d09397d8ac56492688296cfc2e61327389e10d4989df957bc76be7c270b6cbae3b9b2b8023fc9da265698
+DIST faraday-retry-2.2.0.tar.gz 12498 BLAKE2B a6cd459b745b219ee004cda59e4b1d9199676968ff4e6ef1ba8676badb1c10614a09a30467356032be9054d276055047a78a23b41d65ba84444680151eec688a SHA512 d7dd1bb5e7dd9b0cb94c5565bfd3a1c6c3f67277e15c0fb85a3fbd422a9939be22037089c918a607ae1cb71c18069ea766ab0fc18c9ed2b24fac820d25a6f85a
diff --git a/dev-ruby/faraday-retry/faraday-retry-1.0.3.ebuild b/dev-ruby/faraday-retry/faraday-retry-1.0.3.ebuild
new file mode 100644
index 000000000000..5e6d1400785c
--- /dev/null
+++ b/dev-ruby/faraday-retry/faraday-retry-1.0.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faraday adapter for Net::HTTP"
+HOMEPAGE="https://github.com/lostisland/faraday-retry"
+SRC_URI="https://github.com/lostisland/faraday-retry/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/faraday:1 )"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ':'./:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '2igem "faraday", "~> 1.0"' spec/spec_helper.rb || die
+
+	# Avoid unpackaged, test-only, faraday-multipart for now.
+	sed -i -e '/multipart/ s:^:#:' spec/spec_helper.rb || die
+	sed -e '/should rewind files on retry/askip "faraday-multipart not packaged"' \
+		-i spec/faraday/retry/middleware_spec.rb || die
+}
diff --git a/dev-ruby/faraday-retry/faraday-retry-2.2.0.ebuild b/dev-ruby/faraday-retry/faraday-retry-2.2.0.ebuild
new file mode 100644
index 000000000000..3a69aa71ce2d
--- /dev/null
+++ b/dev-ruby/faraday-retry/faraday-retry-2.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faraday adapter for Net::HTTP"
+HOMEPAGE="https://github.com/lostisland/faraday-retry"
+SRC_URI="https://github.com/lostisland/faraday-retry/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/faraday:2"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ':'./:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '2igem "faraday", "~> 2.0"' spec/spec_helper.rb || die
+
+	# Avoid unpackaged, test-only, faraday-multipart for now.
+	sed -i -e '/multipart/ s:^:#:' spec/spec_helper.rb || die
+	sed -e '/should rewind files on retry/askip "faraday-multipart not packaged"' \
+		-i spec/faraday/retry/middleware_spec.rb || die
+}
diff --git a/dev-ruby/faraday-retry/metadata.xml b/dev-ruby/faraday-retry/metadata.xml
new file mode 100644
index 000000000000..9230a4c30cad
--- /dev/null
+++ b/dev-ruby/faraday-retry/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">lostisland/faraday-retry</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index db9ac3f07981..46172119406a 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -1,3 +1,12 @@
-DIST faraday-0.17.3.tar.gz 76786 BLAKE2B 0706f4386233861564aa1ba5fb8da9ad374a0b553a3f6ccd4ce6509b690f6da3e9f695f90605e0e15b41b6354841943ecc4f5eb826638565687bf62b36f1f456 SHA512 346e93b5d980626a0c460d9010ca09091faf84a1a8f2717c16d345ddc51585ce45959d7fcf41fbd0ba248d38460939544945fa0e81bcb80ab73dfe080182e325
-DIST faraday-1.2.0.tar.gz 840216 BLAKE2B a52d2ddc2a57ba87b28e9143123985df12e118d6a8062b5272e77aa7807d7b2fd770408090c7e406631173eb276efcb973f96efdb17ab0f3ea684acda41b8d34 SHA512 7198e8954ec71bdbdfb58df52c6962ebe05599bf871fcb669f32ee2a5fb094b6934492396a92033e0fa858390f454f0d2daa41616f9e212f260080be016e1ea9
+DIST faraday-1.10.3.tar.gz 835008 BLAKE2B 5b2cff7877cd1e73dc52830aed67988eb5ed33a5ea1378d995f9e48bb69b8d20163a9faa69d65c9c99fddaa79e80bacee04b15141859dd81678a374b592557d1 SHA512 58b288a4d44424075f447fea982618db76b47f30e9fad69e5300b757f819bcf3cd48502b35851d186e103839538be0e52b7c222076f1399c3491335c2fe5b2c8
 DIST faraday-1.3.1.tar.gz 840638 BLAKE2B 284f7f612d3ab791a00ceab823be0246685fa38356bfeb6e01c12e81c7369c500719a6023dd929160ca598b41401b82cda0d8e9e363d0e7bdd91791742f8e68f SHA512 b89839e5d602911904ce009f52d011c124f84811e0676a3a524d22ea7084d99a971b6573dcde6d512bf933909cc461ef01cd82a8eeb9df581c56f17f31966b1b
+DIST faraday-1.4.3.tar.gz 838150 BLAKE2B 324788f73e450d386655e805163ffd6299c6d11453a7b034f55b549d3d4edcf3d2936b732e1e13fe4c38286f09b8c1aec7aa5ca42e2c2d6bd2f841a7b412e822 SHA512 7a7c370715c912434fcca5bae11543d24ef0990d24a8ab069f1bebdb534b8d1a9bc90c9625574e34f0ad9c4543391b24ce134a103ddc40b152ebd65d958c5517
+DIST faraday-1.5.1.tar.gz 836117 BLAKE2B 1522aa2bea9652549ebd3442edf2b3cee253627ffbf1afe96313d76d147dda5203e336963ef427c63356e122fffd462fb287389baa6c473188924493aab5dda8 SHA512 f210f6841d4642e55b1d09cb5a21ef684d0c6ad0afb121f8a6af9eb42066d58bf49e22234adfaa06fc03efe0d61fe2d9150d4adc5fc90fa9d5145e19f2d35729
+DIST faraday-1.6.0.tar.gz 835517 BLAKE2B ab0c1002a44045571c1d517958200173d9e76d575386e1176cdcbd356f2f39bb067e96385ff8ccc7b776eb4c1260e4587b43b19e002e6cc9ddfecc7865d91117 SHA512 67d47d4548d35532cc93b74c736b64ce952af4084f5c6c5357fe719f27309f64db35d939f53f51da6283f2fc324600976d5b0aff8413147d958099d1d515f6e2
+DIST faraday-1.9.3.tar.gz 830654 BLAKE2B d032df2cd7018f3df3b4e6e2c06dd24f19e6a409d7fab10116f667812969ee0e5f67434f42ea0f9c68d66ae0f31cc5bca1ef347d0c7f941d21998a0be957ecaf SHA512 1d4efd600515b890c4c5e06e1fd9042eb67275fc2c43f0df70c717de32d99eb445cb595f8fa2bd081cfe8fecb84c7d2a23a6aa24f992ad1de4f703369a69928c
+DIST faraday-2.7.10.tar.gz 833034 BLAKE2B dca3ef6a48aa4d14f1717344c5ec85b1e9caf7205eb7ae1be76a7a96bdee9fbef2d112c05f96f5625262d2783fc0e5e196343f67b371e480532c5e74f77b73eb SHA512 e1d2792f49df5679c16d3690a2475c56db9ae537bf53db4bb7cc256b41455d3db36d8d672eaf3f8a63fb2b04349d45dd4d32a2c194606fd795de51b1f79ead85
+DIST faraday-2.7.11.tar.gz 1029832 BLAKE2B fd5cc5a9fa0d8c40893600a89f71d906a9de0b800c9723d64e8dad5dac1bff4ec61ba2714347b38beeadafb42a29ed6fb217344ffdb122e137607ff140b6aed7 SHA512 eafbc0c88a94f03bfe659b10a86050d07e79c6c2fc81c16af9e2aad68bc5482748a4a41a0a7828b272a9e034cb77dab06e0a9a0e136a56c72b72ed97e5bad50c
+DIST faraday-2.7.12.tar.gz 1029923 BLAKE2B 267880c4d35284c1eb2f894e9c2803662cf5a901417b5a8c6934b8cef3fe842924d945b64b6617dcd017cbfdc3c9be19271c7c295e2c39518215aba3ab8304bb SHA512 e35aaa7096a77a3dc76aa0a2c262d6e83d894564474dd5b1414488615e54096e96fefa245d65804afa71fc22ef55748c18a32213ba6eaedb431246d5f8d382a1
+DIST faraday-2.8.0.tar.gz 1030670 BLAKE2B b0dc09bb4b760e1e194276709f6d2fdc391af0422f2eeba1f07e8824bb02346dcbd05dd701cb5bfbdebd32ae77bb75914955061b43e85f5e47843b11d40e3b2b SHA512 14aa19b24996140467e74abf35129d60781eefaf97fcc3eea7f83f9dd8db17318fbc57d263e1564f94cd9cd1a03129cef210b50190491e4e094092196c72aa67
+DIST faraday-2.8.1.tar.gz 1030720 BLAKE2B c52733fa00143882d43bf7e48dc6fd79621aad9b096f01eb0cc05bb0808bffff0c01282d3823d3b105554d953dc003d86f85c7ef9505a733214a4569764b45a6 SHA512 b2af1dbfcefb92969ae45138401c8cc9a8a1b10ca2bd93dc6aad66337aefbad4cf5700949fb821b93bdba46ec5c7c61b83dcc934b5797a5516c53aab50a287cb
+DIST faraday-2.9.0.tar.gz 1030759 BLAKE2B 450ca700ccf624115aaa6c5ffc873e926884ff27a520aecd890f7156f20f829a802cece461327205930dfc53d06fd837adb1bb989e9603f369f61606640acddf SHA512 f534cd0903bc5ee83a355b09c886dfdf593b842fc85863877c9e0217ba797b027acce6d36674579053ac24e180d71afe4d879cb52cadd1da803b609f2da407c3
diff --git a/dev-ruby/faraday/faraday-0.17.3.ebuild b/dev-ruby/faraday/faraday-0.17.3.ebuild
deleted file mode 100644
index 54d02ec06f78..000000000000
--- a/dev-ruby/faraday/faraday-0.17.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HTTP/REST API client library with pluggable components"
-HOMEPAGE="https://github.com/lostisland/faraday"
-SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+=" test? ( sys-process/lsof )"
-
-ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3"
-ruby_add_bdepend "test? (
-		>=dev-ruby/test-unit-2.4
-		>=dev-ruby/connection_pool-2.2.2
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
-	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
-	sed -i -e '/[Cc]overall/ s:^:#:' spec/spec_helper.rb || die
-
-	# The proxy server is already killed, may be OS X vs Linux issue.
-	#sed -i -e '138 s/^/#/' script/test || die
-
-	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	# Make sure the test scripts use the right ruby interpreter
-	sed -i -e 's:ruby:'${RUBY}':' script/* || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true each_fakegem_test
-
-	# Sleep some time to allow the sinatra test server to die
-	einfo "Waiting for test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/faraday/faraday-1.10.3.ebuild b/dev-ruby/faraday/faraday-1.10.3.ebuild
new file mode 100644
index 000000000000..d4d70fb624d6
--- /dev/null
+++ b/dev-ruby/faraday/faraday-1.10.3.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="spec"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend "
+	dev-ruby/faraday-httpclient:1
+	dev-ruby/faraday-multipart:1
+	dev-ruby/faraday-net_http_persistent:1
+	dev-ruby/faraday-net_http:1
+	dev-ruby/faraday-patron:1
+	dev-ruby/faraday-rack:1
+	dev-ruby/faraday-retry:1
+	>=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3
+	>=dev-ruby/ruby2_keywords-0.0.4
+"
+ruby_add_bdepend "test? (
+		>=dev-ruby/test-unit-2.4
+		>=dev-ruby/connection_pool-2.2.2
+		dev-ruby/patron
+		dev-ruby/rack
+		>=dev-ruby/rack-test-0.6
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
+	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
+	# Avoid loading all lib files since some of them require unpackaged dependencies.
+	sed -e '/[Cc]overall/ s:^:#:' \
+		-e '/lib\/\*\*/ s:^:#:' \
+		-e '/simplecov/ s:^:#:' \
+		-e '/SimpleCov/,/end/ s:^:#:' \
+		-e '/pry/ s:^:#:' \
+		-e '3igem "faraday-net_http", "~> 1.0"; gem "faraday-net_http_persistent", "~> 1.0"' \
+		-i spec/spec_helper.rb || die
+
+	sed -e '/git ls-files/ s:^:#:' \
+		-e "s:_relative ': './:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid multipart tests that require an unpackaged dependency
+	# that appears to be no longer maintained.
+	rm -f spec/faraday/request/multipart_spec.rb || die
+	sed -e '/multipart_parser/ s:^:#:' \
+		-i spec/support/helper_methods.rb || die
+
+	# Explicitly require the JSON code, these requires are probably
+	# implicit in other code that we remove.
+	sed -e '3irequire "faraday/request/json"' -i spec/faraday/request/json_spec.rb || die
+	sed -e '3irequire "faraday/response/json"' -i spec/faraday/response/json_spec.rb || die
+
+	# Remove specs for unpackaged adapters
+	rm -f spec/faraday/adapter/{em_http,em_synchrony,excon,httpclient,typhoeus}_spec.rb || die
+
+	# Remove unpackaged adapters. These packages where part of earlier
+	# faraday versions but since we do not package their dependencies
+	# they never worked on a pure Gentoo install. We are taking this
+	# approach so we can add ruby32 compatibility to faraday:1 for
+	# those adapters that we do support.
+	sed -e '/require.*\(em_http\|em_synchrony\|excon\)/ s:^:#:' \
+		-i lib/faraday.rb || die
+	sed -e '/\(em_http\|em_synchrony\|excon\)/ s:^:#:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Make this adapter optional since it comes with a long list of
+	# dependencies.
+	if ! has_version "dev-ruby/typhoeus:1" ; then
+		rm -f  spec/faraday/adapter/typhoeus_spec.rb || die
+	fi
+
+	# Avoid a spec that gets tripped up by recent rack encoding changes.
+	sed -e '/encodes rack compat/ s/it/xit/' -i spec/faraday/params_encoders/nested_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Make sure the test scripts use the right ruby interpreter
+	sed -i -e 's:ruby:'${RUBY}':' script/* || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true each_fakegem_test
+
+	# Sleep some time to allow the sinatra test server to die
+	einfo "Waiting for test server to stop"
+	sleep 10
+}
diff --git a/dev-ruby/faraday/faraday-1.2.0.ebuild b/dev-ruby/faraday/faraday-1.2.0.ebuild
deleted file mode 100644
index f7fb0d07d4b7..000000000000
--- a/dev-ruby/faraday/faraday-1.2.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HTTP/REST API client library with pluggable components"
-HOMEPAGE="https://github.com/lostisland/faraday"
-SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+=" test? ( sys-process/lsof )"
-
-ruby_add_rdepend "
-	>=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3
-	dev-ruby/ruby2_keywords
-"
-ruby_add_bdepend "test? (
-		>=dev-ruby/test-unit-2.4
-		>=dev-ruby/connection_pool-2.2.2
-		dev-ruby/rack
-		dev-ruby/webmock
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
-	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
-	# Avoid loading all lib files since some of them require unpackaged dependencies.
-	sed -e '/[Cc]overall/ s:^:#:' \
-		-e '/lib\/\*\*/ s:^:#:' \
-		-e '/simplecov/ s:^:#:' \
-		-e '/SimpleCov/,/end/ s:^:#:' \
-		-e '/pry/ s:^:#:' \
-		-i spec/spec_helper.rb || die
-
-	sed -e '/git ls-files/ s:^:#:' \
-		-e "s:_relative ': './:" \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid multipart tests that require an unpackaged dependency
-	# that appears to be no longer maintained.
-	rm -f spec/faraday/request/multipart_spec.rb || die
-	sed -e '/multipart_parser/ s:^:#:' \
-		-i spec/support/helper_methods.rb || die
-
-	# Remove specs for unpackaged adapters
-	rm -f spec/faraday/adapter/{em_http,em_synchrony,excon}_spec.rb || die
-
-	# Make this adapter optional since it comes with a long list of
-	# dependencies.
-	if ! has_version "dev-ruby/typhoeus:1" ; then
-		rm -f  spec/faraday/adapter/typhoeus_spec.rb || die
-	fi
-}
-
-each_ruby_prepare() {
-	# Make sure the test scripts use the right ruby interpreter
-	sed -i -e 's:ruby:'${RUBY}':' script/* || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true each_fakegem_test
-
-	# Sleep some time to allow the sinatra test server to die
-	einfo "Waiting for test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/faraday/faraday-1.3.1.ebuild b/dev-ruby/faraday/faraday-1.3.1.ebuild
index 7124c6897dbb..b746494a194f 100644
--- a/dev-ruby/faraday/faraday-1.3.1.ebuild
+++ b/dev-ruby/faraday/faraday-1.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="none"
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND+=" test? ( sys-process/lsof )"
@@ -34,7 +34,11 @@ ruby_add_rdepend "
 ruby_add_bdepend "test? (
 		>=dev-ruby/test-unit-2.4
 		>=dev-ruby/connection_pool-2.2.2
+		>=dev-ruby/httpclient-2.2
+		>=dev-ruby/net-http-persistent-3.0
+		>=dev-ruby/patron-0.4.2
 		dev-ruby/rack
+		>=dev-ruby/rack-test-0.6
 		dev-ruby/webmock
 	)"
 
diff --git a/dev-ruby/faraday/faraday-1.4.3-r1.ebuild b/dev-ruby/faraday/faraday-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..27ea533aa079
--- /dev/null
+++ b/dev-ruby/faraday/faraday-1.4.3-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="spec"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend "
+	dev-ruby/faraday-net_http_persistent:1
+	dev-ruby/faraday-net_http:1
+	>=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3
+	dev-ruby/ruby2_keywords
+"
+ruby_add_bdepend "test? (
+		>=dev-ruby/test-unit-2.4
+		>=dev-ruby/connection_pool-2.2.2
+		>=dev-ruby/patron-0.4.2
+		dev-ruby/rack
+		>=dev-ruby/rack-test-0.6
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
+	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
+	# Avoid loading all lib files since some of them require unpackaged dependencies.
+	sed -e '/[Cc]overall/ s:^:#:' \
+		-e '/lib\/\*\*/ s:^:#:' \
+		-e '/simplecov/ s:^:#:' \
+		-e '/SimpleCov/,/end/ s:^:#:' \
+		-e '/pry/ s:^:#:' \
+		-e '3igem "faraday-net_http", "~> 1.0"; gem "faraday-net_http_persistent", "~> 1.0"' \
+		-i spec/spec_helper.rb || die
+
+	sed -e '/git ls-files/ s:^:#:' \
+		-e "s:_relative ': './:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid multipart tests that require an unpackaged dependency
+	# that appears to be no longer maintained.
+	rm -f spec/faraday/request/multipart_spec.rb || die
+	sed -e '/multipart_parser/ s:^:#:' \
+		-i spec/support/helper_methods.rb || die
+
+	# Remove specs for unpackaged adapters
+	rm -f spec/faraday/adapter/{em_http,em_synchrony,excon,httpclient}_spec.rb || die
+
+	# Remove unpackaged adapters. These packages where part of earlier
+	# faraday versions but since we do not package their dependencies
+	# they never worked on a pure Gentoo install. We are taking this
+	# approach so we can add ruby32 compatibility to faraday:1 for
+	# those adapters that we do support.
+	sed -e '/require.*\(em_http\|em_synchrony\|excon\)/ s:^:#:' \
+		-i lib/faraday.rb || die
+	sed -e '/\(em_http\|em_synchrony\|excon\)/ s:^:#:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Make this adapter optional since it comes with a long list of
+	# dependencies.
+	if ! has_version "dev-ruby/typhoeus:1" ; then
+		rm -f  spec/faraday/adapter/typhoeus_spec.rb || die
+	fi
+
+	# Avoid a spec that gets tripped up by recent rack encoding changes.
+	sed -e '/encodes rack compat/ s/it/xit/' -i spec/faraday/params_encoders/nested_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Make sure the test scripts use the right ruby interpreter
+	sed -i -e 's:ruby:'${RUBY}':' script/* || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true each_fakegem_test
+
+	# Sleep some time to allow the sinatra test server to die
+	einfo "Waiting for test server to stop"
+	sleep 10
+}
diff --git a/dev-ruby/faraday/faraday-1.5.1.ebuild b/dev-ruby/faraday/faraday-1.5.1.ebuild
new file mode 100644
index 000000000000..d701aa7ece71
--- /dev/null
+++ b/dev-ruby/faraday/faraday-1.5.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="spec"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend "
+	dev-ruby/faraday-httpclient:1
+	dev-ruby/faraday-net_http_persistent:1
+	dev-ruby/faraday-net_http:1
+	dev-ruby/faraday-patron:1
+	>=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3
+	dev-ruby/ruby2_keywords
+"
+ruby_add_bdepend "test? (
+		>=dev-ruby/test-unit-2.4
+		>=dev-ruby/connection_pool-2.2.2
+		dev-ruby/rack
+		>=dev-ruby/rack-test-0.6
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
+	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
+	# Avoid loading all lib files since some of them require unpackaged dependencies.
+	sed -e '/[Cc]overall/ s:^:#:' \
+		-e '/lib\/\*\*/ s:^:#:' \
+		-e '/simplecov/ s:^:#:' \
+		-e '/SimpleCov/,/end/ s:^:#:' \
+		-e '/pry/ s:^:#:' \
+		-e '3igem "faraday-net_http", "~> 1.0"; gem "faraday-net_http_persistent", "~> 1.0"' \
+		-i spec/spec_helper.rb || die
+
+	sed -e '/git ls-files/ s:^:#:' \
+		-e "s:_relative ': './:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid multipart tests that require an unpackaged dependency
+	# that appears to be no longer maintained.
+	rm -f spec/faraday/request/multipart_spec.rb || die
+	sed -e '/multipart_parser/ s:^:#:' \
+		-i spec/support/helper_methods.rb || die
+
+	# Remove specs for unpackaged adapters
+	rm -f spec/faraday/adapter/{em_http,em_synchrony,excon,httpclient}_spec.rb || die
+
+	# Remove unpackaged adapters. These packages where part of earlier
+	# faraday versions but since we do not package their dependencies
+	# they never worked on a pure Gentoo install. We are taking this
+	# approach so we can add ruby32 compatibility to faraday:1 for
+	# those adapters that we do support.
+	sed -e '/require.*\(em_http\|em_synchrony\|excon\)/ s:^:#:' \
+		-i lib/faraday.rb || die
+	sed -e '/\(em_http\|em_synchrony\|excon\)/ s:^:#:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Make this adapter optional since it comes with a long list of
+	# dependencies.
+	if ! has_version "dev-ruby/typhoeus:1" ; then
+		rm -f  spec/faraday/adapter/typhoeus_spec.rb || die
+	fi
+
+	# Avoid a spec that gets tripped up by recent rack encoding changes.
+	sed -e '/encodes rack compat/ s/it/xit/' -i spec/faraday/params_encoders/nested_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Make sure the test scripts use the right ruby interpreter
+	sed -i -e 's:ruby:'${RUBY}':' script/* || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true each_fakegem_test
+
+	# Sleep some time to allow the sinatra test server to die
+	einfo "Waiting for test server to stop"
+	sleep 10
+}
diff --git a/dev-ruby/faraday/faraday-1.6.0.ebuild b/dev-ruby/faraday/faraday-1.6.0.ebuild
new file mode 100644
index 000000000000..c8587b35631c
--- /dev/null
+++ b/dev-ruby/faraday/faraday-1.6.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="spec"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend "
+	dev-ruby/faraday-httpclient:1
+	dev-ruby/faraday-net_http_persistent:1
+	dev-ruby/faraday-net_http:1
+	dev-ruby/faraday-patron:1
+	dev-ruby/faraday-rack:1
+	>=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3
+	>=dev-ruby/ruby2_keywords-0.0.4
+"
+ruby_add_bdepend "test? (
+		>=dev-ruby/test-unit-2.4
+		>=dev-ruby/connection_pool-2.2.2
+		dev-ruby/rack
+		>=dev-ruby/rack-test-0.6
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
+	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
+	# Avoid loading all lib files since some of them require unpackaged dependencies.
+	sed -e '/[Cc]overall/ s:^:#:' \
+		-e '/lib\/\*\*/ s:^:#:' \
+		-e '/simplecov/ s:^:#:' \
+		-e '/SimpleCov/,/end/ s:^:#:' \
+		-e '/pry/ s:^:#:' \
+		-e '3igem "faraday-net_http", "~> 1.0"; gem "faraday-net_http_persistent", "~> 1.0"' \
+		-i spec/spec_helper.rb || die
+
+	sed -e '/git ls-files/ s:^:#:' \
+		-e "s:_relative ': './:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid multipart tests that require an unpackaged dependency
+	# that appears to be no longer maintained.
+	rm -f spec/faraday/request/multipart_spec.rb || die
+	sed -e '/multipart_parser/ s:^:#:' \
+		-i spec/support/helper_methods.rb || die
+
+	# Remove specs for unpackaged adapters
+	rm -f spec/faraday/adapter/{em_http,em_synchrony,excon,httpclient}_spec.rb || die
+
+	# Remove unpackaged adapters. These packages where part of earlier
+	# faraday versions but since we do not package their dependencies
+	# they never worked on a pure Gentoo install. We are taking this
+	# approach so we can add ruby32 compatibility to faraday:1 for
+	# those adapters that we do support.
+	sed -e '/require.*\(em_http\|em_synchrony\|excon\)/ s:^:#:' \
+		-i lib/faraday.rb || die
+	sed -e '/\(em_http\|em_synchrony\|excon\)/ s:^:#:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Make this adapter optional since it comes with a long list of
+	# dependencies.
+	if ! has_version "dev-ruby/typhoeus:1" ; then
+		rm -f  spec/faraday/adapter/typhoeus_spec.rb || die
+	fi
+
+	# Avoid a spec that gets tripped up by recent rack encoding changes.
+	sed -e '/encodes rack compat/ s/it/xit/' -i spec/faraday/params_encoders/nested_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Make sure the test scripts use the right ruby interpreter
+	sed -i -e 's:ruby:'${RUBY}':' script/* || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true each_fakegem_test
+
+	# Sleep some time to allow the sinatra test server to die
+	einfo "Waiting for test server to stop"
+	sleep 10
+}
diff --git a/dev-ruby/faraday/faraday-1.9.3.ebuild b/dev-ruby/faraday/faraday-1.9.3.ebuild
new file mode 100644
index 000000000000..a6b02c760bc9
--- /dev/null
+++ b/dev-ruby/faraday/faraday-1.9.3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="spec"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend "
+	dev-ruby/faraday-httpclient:1
+	dev-ruby/faraday-multipart:1
+	dev-ruby/faraday-net_http_persistent:1
+	dev-ruby/faraday-net_http:1
+	dev-ruby/faraday-patron:1
+	dev-ruby/faraday-rack:1
+	dev-ruby/faraday-retry:1
+	>=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3
+	>=dev-ruby/ruby2_keywords-0.0.4
+"
+ruby_add_bdepend "test? (
+		>=dev-ruby/test-unit-2.4
+		>=dev-ruby/connection_pool-2.2.2
+		dev-ruby/patron
+		dev-ruby/rack
+		>=dev-ruby/rack-test-0.6
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
+	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
+	# Avoid loading all lib files since some of them require unpackaged dependencies.
+	sed -e '/[Cc]overall/ s:^:#:' \
+		-e '/lib\/\*\*/ s:^:#:' \
+		-e '/simplecov/ s:^:#:' \
+		-e '/SimpleCov/,/end/ s:^:#:' \
+		-e '/pry/ s:^:#:' \
+		-e '3igem "faraday-net_http", "~> 1.0"; gem "faraday-net_http_persistent", "~> 1.0"' \
+		-i spec/spec_helper.rb || die
+
+	sed -e '/git ls-files/ s:^:#:' \
+		-e "s:_relative ': './:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid multipart tests that require an unpackaged dependency
+	# that appears to be no longer maintained.
+	rm -f spec/faraday/request/multipart_spec.rb || die
+	sed -e '/multipart_parser/ s:^:#:' \
+		-i spec/support/helper_methods.rb || die
+
+	# Remove specs for unpackaged adapters
+	rm -f spec/faraday/adapter/{em_http,em_synchrony,excon,httpclient}_spec.rb || die
+
+	# Remove unpackaged adapters. These packages where part of earlier
+	# faraday versions but since we do not package their dependencies
+	# they never worked on a pure Gentoo install. We are taking this
+	# approach so we can add ruby32 compatibility to faraday:1 for
+	# those adapters that we do support.
+	sed -e '/require.*\(em_http\|em_synchrony\|excon\)/ s:^:#:' \
+		-i lib/faraday.rb || die
+	sed -e '/\(em_http\|em_synchrony\|excon\)/ s:^:#:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Make this adapter optional since it comes with a long list of
+	# dependencies.
+	if ! has_version "dev-ruby/typhoeus:1" ; then
+		rm -f  spec/faraday/adapter/typhoeus_spec.rb || die
+	fi
+
+	# Avoid a spec that gets tripped up by recent rack encoding changes.
+	sed -e '/encodes rack compat/ s/it/xit/' -i spec/faraday/params_encoders/nested_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Make sure the test scripts use the right ruby interpreter
+	sed -i -e 's:ruby:'${RUBY}':' script/* || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true each_fakegem_test
+
+	# Sleep some time to allow the sinatra test server to die
+	einfo "Waiting for test server to stop"
+	sleep 10
+}
diff --git a/dev-ruby/faraday/faraday-2.7.10.ebuild b/dev-ruby/faraday/faraday-2.7.10.ebuild
new file mode 100644
index 000000000000..3b3e7542cba1
--- /dev/null
+++ b/dev-ruby/faraday/faraday-2.7.10.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="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="spec"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend "
+	|| ( =dev-ruby/faraday-net_http-3.0* dev-ruby/faraday-net_http:2 )
+	>=dev-ruby/ruby2_keywords-0.0.4
+"
+ruby_add_bdepend "test? (
+		>=dev-ruby/test-unit-2.4
+		>=dev-ruby/connection_pool-2.2.2
+		dev-ruby/rack:2.2
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
+	# Avoid loading all lib files since some of them require unpackaged dependencies.
+	sed -e '/[Cc]overall/ s:^:#:' \
+		-e '/lib\/\*\*/ s:^:#:' \
+		-e '/simplecov/ s:^:#:' \
+		-e '/SimpleCov/,/end/ s:^:#:' \
+		-e '/pry/ s:^:#:' \
+		-e '3igem "rack", "~> 2.2"' \
+		-i spec/spec_helper.rb || die
+
+	sed -e '/git ls-files/ s:^:#:' \
+		-e "s:_relative ': './:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true each_fakegem_test
+}
diff --git a/dev-ruby/faraday/faraday-2.7.11.ebuild b/dev-ruby/faraday/faraday-2.7.11.ebuild
new file mode 100644
index 000000000000..a1d63144ce57
--- /dev/null
+++ b/dev-ruby/faraday/faraday-2.7.11.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="spec"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend "
+	dev-ruby/base64
+	|| ( =dev-ruby/faraday-net_http-3.0* dev-ruby/faraday-net_http:2 )
+	>=dev-ruby/ruby2_keywords-0.0.4
+"
+ruby_add_bdepend "test? (
+		>=dev-ruby/test-unit-2.4
+		>=dev-ruby/connection_pool-2.2.2
+		dev-ruby/rack:2.2
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
+	# Avoid loading all lib files since some of them require unpackaged dependencies.
+	sed -e '/[Cc]overall/ s:^:#:' \
+		-e '/lib\/\*\*/ s:^:#:' \
+		-e '/simplecov/ s:^:#:' \
+		-e '/SimpleCov/,/end/ s:^:#:' \
+		-e '/pry/ s:^:#:' \
+		-e '3igem "rack", "~> 2.2"' \
+		-i spec/spec_helper.rb || die
+
+	sed -e '/git ls-files/ s:^:#:' \
+		-e "s:_relative ': './:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true each_fakegem_test
+}
diff --git a/dev-ruby/faraday/faraday-2.7.12.ebuild b/dev-ruby/faraday/faraday-2.7.12.ebuild
new file mode 100644
index 000000000000..ce1849ffb01a
--- /dev/null
+++ b/dev-ruby/faraday/faraday-2.7.12.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="spec"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend "
+	dev-ruby/base64
+	|| ( =dev-ruby/faraday-net_http-3.0* dev-ruby/faraday-net_http:2 )
+	>=dev-ruby/ruby2_keywords-0.0.4
+"
+ruby_add_bdepend "test? (
+		>=dev-ruby/test-unit-2.4
+		>=dev-ruby/connection_pool-2.2.2
+		dev-ruby/rack:2.2
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
+	# Avoid loading all lib files since some of them require unpackaged dependencies.
+	sed -e '/[Cc]overall/ s:^:#:' \
+		-e '/lib\/\*\*/ s:^:#:' \
+		-e '/simplecov/ s:^:#:' \
+		-e '/SimpleCov/,/end/ s:^:#:' \
+		-e '/pry/ s:^:#:' \
+		-e '3igem "rack", "~> 2.2"' \
+		-i spec/spec_helper.rb || die
+
+	sed -e '/git ls-files/ s:^:#:' \
+		-e "s:_relative ': './:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true each_fakegem_test
+}
diff --git a/dev-ruby/faraday/faraday-2.8.0.ebuild b/dev-ruby/faraday/faraday-2.8.0.ebuild
new file mode 100644
index 000000000000..a1d63144ce57
--- /dev/null
+++ b/dev-ruby/faraday/faraday-2.8.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="spec"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend "
+	dev-ruby/base64
+	|| ( =dev-ruby/faraday-net_http-3.0* dev-ruby/faraday-net_http:2 )
+	>=dev-ruby/ruby2_keywords-0.0.4
+"
+ruby_add_bdepend "test? (
+		>=dev-ruby/test-unit-2.4
+		>=dev-ruby/connection_pool-2.2.2
+		dev-ruby/rack:2.2
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
+	# Avoid loading all lib files since some of them require unpackaged dependencies.
+	sed -e '/[Cc]overall/ s:^:#:' \
+		-e '/lib\/\*\*/ s:^:#:' \
+		-e '/simplecov/ s:^:#:' \
+		-e '/SimpleCov/,/end/ s:^:#:' \
+		-e '/pry/ s:^:#:' \
+		-e '3igem "rack", "~> 2.2"' \
+		-i spec/spec_helper.rb || die
+
+	sed -e '/git ls-files/ s:^:#:' \
+		-e "s:_relative ': './:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true each_fakegem_test
+}
diff --git a/dev-ruby/faraday/faraday-2.8.1.ebuild b/dev-ruby/faraday/faraday-2.8.1.ebuild
new file mode 100644
index 000000000000..a1d63144ce57
--- /dev/null
+++ b/dev-ruby/faraday/faraday-2.8.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="spec"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend "
+	dev-ruby/base64
+	|| ( =dev-ruby/faraday-net_http-3.0* dev-ruby/faraday-net_http:2 )
+	>=dev-ruby/ruby2_keywords-0.0.4
+"
+ruby_add_bdepend "test? (
+		>=dev-ruby/test-unit-2.4
+		>=dev-ruby/connection_pool-2.2.2
+		dev-ruby/rack:2.2
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
+	# Avoid loading all lib files since some of them require unpackaged dependencies.
+	sed -e '/[Cc]overall/ s:^:#:' \
+		-e '/lib\/\*\*/ s:^:#:' \
+		-e '/simplecov/ s:^:#:' \
+		-e '/SimpleCov/,/end/ s:^:#:' \
+		-e '/pry/ s:^:#:' \
+		-e '3igem "rack", "~> 2.2"' \
+		-i spec/spec_helper.rb || die
+
+	sed -e '/git ls-files/ s:^:#:' \
+		-e "s:_relative ': './:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true each_fakegem_test
+}
diff --git a/dev-ruby/faraday/faraday-2.9.0.ebuild b/dev-ruby/faraday/faraday-2.9.0.ebuild
new file mode 100644
index 000000000000..b5eb66be70ef
--- /dev/null
+++ b/dev-ruby/faraday/faraday-2.9.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="spec"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend "
+	dev-ruby/base64
+	|| ( <dev-ruby/faraday-net_http-3.2:3 dev-ruby/faraday-net_http:2 )
+	>=dev-ruby/ruby2_keywords-0.0.4
+"
+ruby_add_bdepend "test? (
+		>=dev-ruby/test-unit-2.4
+		>=dev-ruby/connection_pool-2.2.2
+		dev-ruby/rack:2.2
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
+	# Avoid loading all lib files since some of them require unpackaged dependencies.
+	sed -e '/[Cc]overall/ s:^:#:' \
+		-e '/lib\/\*\*/ s:^:#:' \
+		-e '/simplecov/ s:^:#:' \
+		-e '/SimpleCov/,/end/ s:^:#:' \
+		-e '/pry/ s:^:#:' \
+		-e '3igem "rack", "~> 2.2"' \
+		-i spec/spec_helper.rb || die
+
+	sed -e '/git ls-files/ s:^:#:' \
+		-e "s:_relative ': './:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true each_fakegem_test
+}
diff --git a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r2.ebuild b/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r2.ebuild
deleted file mode 100644
index e32a1e15b425..000000000000
--- a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Response JSON parser using MultiJson and FaradayMiddleware"
-HOMEPAGE="https://github.com/denro/faraday_middleware-multi_json"
-SRC_URI="https://github.com/denro/faraday_middleware-multi_json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/faraday_middleware:*
-	dev-ruby/multi_json"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm -f Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r3.ebuild b/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r3.ebuild
new file mode 100644
index 000000000000..6d9a7b3d4a40
--- /dev/null
+++ b/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Response JSON parser using MultiJson and FaradayMiddleware"
+HOMEPAGE="https://github.com/denro/faraday_middleware-multi_json"
+SRC_URI="https://github.com/denro/faraday_middleware-multi_json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/faraday_middleware:*
+	dev-ruby/multi_json"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm -f Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index 36579eefd0f0..ac88971867e8 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -1,4 +1 @@
-DIST faraday_middleware-0.14.0.tar.gz 26313 BLAKE2B 2d925f0bd9e4a10505bcdd3b483ac7b8ed2c42dc1187e04069505216dc739af3f10f5c7f2252e3f474e5ddaf972a7b8fe009be9957e66ab625fe49c364a0d217 SHA512 d8e86da166022c04c12acc37981de446ba30050330dc0320eec0414157bdd6c8e92ff49ce92b390a2f5d457c396144dbde698d61993302c0ac416559e7078a8d
-DIST faraday_middleware-1.0.0.tar.gz 28279 BLAKE2B d881f59e106a695e2d41936d552fe6cb16465964fcb2107806123ea1b34ee6db8e82bb1e6fe3a0135af04da70b56a3e8c933e44591b3f75901642a1fe7a3ea1a SHA512 478dd04840c27120c162e5d9c764a210d4cc55ac54f2d44935942ab5195ee5a0f198a4cc0c98805029f3eab4596cc3963a763cda1fcc1ce6daf1811186e0b5a7
-DIST faraday_middleware-1.1.0.tar.gz 28104 BLAKE2B be490abc57a11c64331c45f1529e55b38df699fe20e81f3783ca92ba7c5c573c1ba2494086f40bdcc7080581ffb2df89093bbabadf8c46721dcca2cb6a0310c1 SHA512 e9c3ada418e47c397272b52706bbcbfa1c98b7b467c148c0094b1dfe47d28fc57e397461e6e7446c5bb8d71ed968e74e1b7e67e793e30d3f47e9fb1aae549912
 DIST faraday_middleware-1.2.0.tar.gz 28332 BLAKE2B 09aefce13f0145e4098d68d2b8887fff5b535b3eda520335fdcaeea05256d1a256501fe9fee4273636fb0bb9d806d38ff7588a489840d2e425ce6666c496a4d1 SHA512 abfc6faf725c4646d0c1c59d2bde23db13dd78f81e74d313368bd0ec4945c33f24c8e8f3f252c6fa499fa845bdda19544876ea93bb9118b3fa4d3c7615366283
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.14.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-0.14.0.ebuild
deleted file mode 100644
index 335ed09890d6..000000000000
--- a/dev-ruby/faraday_middleware/faraday_middleware-0.14.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Various middleware for Faraday"
-HOMEPAGE="https://github.com/lostisland/faraday_middleware"
-SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+parsexml +oauth +mashify +rashify"
-
-ruby_add_rdepend "
-	>=dev-ruby/faraday-0.7.4 <dev-ruby/faraday-1
-	parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
-	oauth? ( >=dev-ruby/simple_oauth-0.1 )
-	mashify? ( >=dev-ruby/hashie-1.2:* )
-	rashify? ( >=dev-ruby/rash_alt-0.4.3 )"
-
-# Bundler must be used because the optional dependencies have different
-# version requirements that must be resolved.
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/addressable
-	dev-ruby/rake
-	dev-ruby/webmock:3
-	dev-ruby/json
-	>=dev-ruby/multi_xml-0.5.3
-	>=dev-ruby/rack-cache-1.1
-	>=dev-ruby/simple_oauth-0.1
-	>=dev-ruby/hashie-1.2
-	>=dev-ruby/rash_alt-0.4.3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(cane\|parallel\|simplecov\|brotli\)/ s:^:#:' \
-		-e '/rspec/ s/>=/~>/' \
-		-e "/addressable/ s/, '< 2.4'//" \
-		-e "/rake/ s/, '< 11'//" \
-		-e "/rack-cache/ s/, '< 1.3'//" \
-		-e "/simple_oauth/ s/, '< 0.3'//" \
-		-e "/webmock/ s/< 2/~> 3.0/" Gemfile || die
-
-	# Avoid unneeded dependency on git
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid unpackaged brotli dependency
-	sed -i -e 's/jruby?/true/' \
-		-e 's/gzip,deflate,br/gzip,deflate/' spec/unit/gzip_spec.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rspec-3 spec || die
-}
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild
deleted file mode 100644
index 3ad6b8513fdd..000000000000
--- a/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Various middleware for Faraday"
-HOMEPAGE="https://github.com/lostisland/faraday_middleware"
-SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE="+parsexml +oauth +mashify +rashify"
-
-ruby_add_rdepend "
-	dev-ruby/faraday:1
-	parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
-	oauth? ( >=dev-ruby/simple_oauth-0.1 )
-	mashify? ( >=dev-ruby/hashie-1.2:* )
-	rashify? ( >=dev-ruby/rash_alt-0.4.3 )"
-
-# Bundler must be used because the optional dependencies have different
-# version requirements that must be resolved.
-ruby_add_bdepend "test? (
-	>=dev-ruby/brotli-0.1.8
-	dev-ruby/bundler
-	dev-ruby/addressable
-	>=dev-ruby/rake-12.3.3
-	dev-ruby/webmock:3
-	dev-ruby/json
-	>=dev-ruby/multi_xml-0.5.3
-	>=dev-ruby/rack-cache-1.1
-	>=dev-ruby/simple_oauth-0.1
-	>=dev-ruby/hashie-1.2
-	>=dev-ruby/rash_alt-0.4.3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(cane\|parallel\|simplecov\)/ s:^:#:' \
-		-e '/rspec/ s/>=/~>/' \
-		-e "/addressable/ s/, '< 2.4'//" \
-		-e "/rack/ s/< 2/< 2.1/" \
-		-e "/rack-cache/ s/, '< 1.3'//" \
-		-e "/simple_oauth/ s/, '< 0.3'//" \
-		-e "/webmock/ s/< 2/~> 3.0/" Gemfile || die
-
-	# Avoid unneeded dependency on git
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '1irequire "fileutils"' spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rspec-3 spec || die
-}
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-1.1.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-1.1.0.ebuild
deleted file mode 100644
index a522ef25f01e..000000000000
--- a/dev-ruby/faraday_middleware/faraday_middleware-1.1.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Various middleware for Faraday"
-HOMEPAGE="https://github.com/lostisland/faraday_middleware"
-SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE="+parsexml +oauth +mashify +rashify"
-
-ruby_add_rdepend "
-	dev-ruby/faraday:1
-	parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
-	oauth? ( >=dev-ruby/simple_oauth-0.1 )
-	mashify? ( >=dev-ruby/hashie-1.2:* )
-	rashify? ( >=dev-ruby/rash_alt-0.4.3 )"
-
-# Bundler must be used because the optional dependencies have different
-# version requirements that must be resolved.
-ruby_add_bdepend "test? (
-	>=dev-ruby/brotli-0.1.8
-	dev-ruby/bundler
-	dev-ruby/addressable
-	>=dev-ruby/rake-12.3.3
-	dev-ruby/webmock:3
-	dev-ruby/json
-	>=dev-ruby/multi_xml-0.5.3
-	>=dev-ruby/rack-cache-1.1
-	>=dev-ruby/simple_oauth-0.1
-	>=dev-ruby/hashie-1.2
-	>=dev-ruby/rash_alt-0.4.3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(cane\|parallel\|rubocop\|simplecov\)/ s:^:#:' \
-		-e '/rspec/ s/>=/~>/' \
-		-e "/addressable/ s/, '< 2.4'//" \
-		-e "/rack/ s/< 2/< 2.1/" \
-		-e "/rack-cache/ s/, '< 1.3'//" \
-		-e "/simple_oauth/ s/, '< 0.3'//" \
-		-e "/webmock/ s/2.3/3.0/" Gemfile || die
-
-	# Avoid unneeded dependency on git
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '1irequire "fileutils"' spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rspec-3 spec || die
-}
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-1.2.0-r1.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..ae5aff4c339e
--- /dev/null
+++ b/dev-ruby/faraday_middleware/faraday_middleware-1.2.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Various middleware for Faraday"
+HOMEPAGE="https://github.com/lostisland/faraday_middleware"
+SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="brotli +parsexml +oauth +mashify +rashify"
+
+ruby_add_rdepend "
+	dev-ruby/faraday:1
+	brotli? ( dev-ruby/brotli )
+	parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
+	oauth? ( >=dev-ruby/simple_oauth-0.1 )
+	mashify? ( >=dev-ruby/hashie-1.2:* )
+	rashify? ( >=dev-ruby/rash_alt-0.4.3 )"
+
+# Bundler must be used because the optional dependencies have different
+# version requirements that must be resolved.
+ruby_add_bdepend "test? (
+	>=dev-ruby/brotli-0.1.8
+	dev-ruby/bundler
+	dev-ruby/addressable
+	>=dev-ruby/rake-12.3.3
+	dev-ruby/webmock:3
+	dev-ruby/json
+	>=dev-ruby/multi_xml-0.5.3
+	dev-ruby/rack:2.2
+	>=dev-ruby/rack-cache-1.1
+	>=dev-ruby/simple_oauth-0.1
+	>=dev-ruby/hashie-1.2
+	>=dev-ruby/rash_alt-0.4.3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(cane\|parallel\|rubocop\|simplecov\)/ s:^:#:' \
+		-e "/addressable/ s/, '< 2.4'//" \
+		-e "/rack/ s/< 2/< 2.3/" \
+		-e "/rack-cache/ s/, '< 1.3'//" \
+		-e "/simple_oauth/ s/, '< 0.3'//" \
+		-e "/safe_yaml/ s:^:#:" \
+		-e "/webmock/ s/2.3/3.0/" Gemfile || die
+
+	# Avoid unneeded dependency on git
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '1irequire "fileutils"' spec/spec_helper.rb || die
+
+	# Avoid safe_yaml specs since they are broken with newer ruby versions
+	# and safe_yaml is not mandatory for using faraday_middleware.
+	rm -f spec/unit/parse_yaml_spec.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rspec-3 spec || die
+}
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-1.2.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-1.2.0.ebuild
index b08b6146db7d..9ef131ff8b0a 100644
--- a/dev-ruby/faraday_middleware/faraday_middleware-1.2.0.ebuild
+++ b/dev-ruby/faraday_middleware/faraday_middleware-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+parsexml +oauth +mashify +rashify"
 
 ruby_add_rdepend "
@@ -39,6 +39,7 @@ ruby_add_bdepend "test? (
 	dev-ruby/webmock:3
 	dev-ruby/json
 	>=dev-ruby/multi_xml-0.5.3
+	dev-ruby/rack:2.2
 	>=dev-ruby/rack-cache-1.1
 	>=dev-ruby/simple_oauth-0.1
 	>=dev-ruby/hashie-1.2
@@ -46,17 +47,21 @@ ruby_add_bdepend "test? (
 
 all_ruby_prepare() {
 	sed -i -e '/\(cane\|parallel\|rubocop\|simplecov\)/ s:^:#:' \
-		-e '/rspec/ s/>=/~>/' \
 		-e "/addressable/ s/, '< 2.4'//" \
 		-e "/rack/ s/< 2/< 2.3/" \
 		-e "/rack-cache/ s/, '< 1.3'//" \
 		-e "/simple_oauth/ s/, '< 0.3'//" \
+		-e "/safe_yaml/ s:^:#:" \
 		-e "/webmock/ s/2.3/3.0/" Gemfile || die
 
 	# Avoid unneeded dependency on git
 	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
 
 	sed -i -e '1irequire "fileutils"' spec/spec_helper.rb || die
+
+	# Avoid safe_yaml specs since they are broken with newer ruby versions
+	# and safe_yaml is not mandatory for using faraday_middleware.
+	rm -f spec/unit/parse_yaml_spec.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r3.ebuild b/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r3.ebuild
deleted file mode 100644
index 03fbee88251d..000000000000
--- a/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Simple wrapper around multithreaded Porter stemming algorithm"
-HOMEPAGE="https://github.com/romanbsd/fast-stemmer"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-all_ruby_prepare() {
-	rm ext/Makefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S testrb-2 test/fast_stemmer_test.rb || die
-}
diff --git a/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r4.ebuild b/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r4.ebuild
index 7840a1559e99..4454eb8d553a 100644
--- a/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r4.ebuild
+++ b/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r4.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README"
 
diff --git a/dev-ruby/fast_gettext/Manifest b/dev-ruby/fast_gettext/Manifest
index 81e20a0ac3d7..6588f1bae0e4 100644
--- a/dev-ruby/fast_gettext/Manifest
+++ b/dev-ruby/fast_gettext/Manifest
@@ -1,2 +1,2 @@
-DIST fast_gettext-1.8.0.tar.gz 89309 BLAKE2B 8ead2922662667c24d07dbc1145002583b1a65edd3cb581ac5bc058560aca38ed083e0470d4834cfdc5abae36f1e8264171b75649343675ab415b28ea2f0e8ab SHA512 0657b5955268166787a32bb74481cd07309018429c21707e061e022d67d5d2448d2d173149f164d16ff5f6c9ffa0feef38369b79daa299e1283fdcdc019ad72e
 DIST fast_gettext-2.2.0.tar.gz 93511 BLAKE2B 8f4a8b169533194a82465ca29b4cbf52e9c724b9976355ad64459826ff9ad15da9762c6e90e237fef046fc6a8114abf54e0022eec573abf98a56bd067e7c06dd SHA512 06daacf46e4c8ef272ac2a60f8fad1abbb3eaa2bf5242991e7f32fd87e911917b6baf4965b0cbc96c11d0be0425585d501258d0c1faa065469dea6c3b8c97797
+DIST fast_gettext-2.3.0.tar.gz 93620 BLAKE2B 2f4dd0f6ad74df593573ce73ee40da549e506fc6fc7ca9ea17dacaa120cec97c202ba31b1fe32b628006fa1381572858dc314110a76c1ee7a91c049664133ede SHA512 517499785022922e54278ad4427abaabb63fd9d0470398cfca1c1804f3ca4992c01105ea727d152d2b8d1cbab86138a7552dfbbd4b3b3241b5fc1a3298db7dc2
diff --git a/dev-ruby/fast_gettext/fast_gettext-1.8.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-1.8.0.ebuild
deleted file mode 100644
index 2dc3447fb1d8..000000000000
--- a/dev-ruby/fast_gettext/fast_gettext-1.8.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!"
-HOMEPAGE="https://github.com/grosser/fast_gettext"
-SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm Gemfile.lock || die
-
-	# Remove jeweler and bump from Gemfile since they are not needed for tests.
-	sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die
-
-	# Avoid unneeded dependency on git and development dependencies.
-	sed -e '/git ls-files/ s:^:#:' \
-		-e '/\(wwtd\|bump\|sqlite3\|activerecord\|i18n\)/ s:^:#:' \
-		-i fast_gettext.gemspec || die
-
-	# Avoid a test dependency on activerecord since this is now in the
-	# dependency tree for app-admin/puppet and many arches don't have
-	# rails keyworded.
-	sed -i -e '/active_record/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/fast_gettext/translation_repository/db_spec.rb || die
-	sed -i -e '/works with DB repository/,/^    end/ s:^:#:' spec/fast_gettext/storage_spec.rb || die
-	sed -i -e '/with i18n loaded/,/^  end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die
-
-	# Don't run a test that requires safe mode which we can't provide
-	# due to insecure directory settings for the portage dir. This spec
-	# also calls out to ruby which won't work with different ruby
-	# implementations.
-	sed -i -e '/can work in SAFE mode/,/^  end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Make sure the right ruby interpreter is used
-	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
-}
diff --git a/dev-ruby/fast_gettext/fast_gettext-2.2.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-2.2.0.ebuild
index 011935009a60..0d357c632ebb 100644
--- a/dev-ruby/fast_gettext/fast_gettext-2.2.0.ebuild
+++ b/dev-ruby/fast_gettext/fast_gettext-2.2.0.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
@@ -14,13 +14,13 @@ RUBY_FAKEGEM_GEMSPEC="fast_gettext.gemspec"
 
 inherit ruby-fakegem
 
-DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!"
+DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsafe!"
 HOMEPAGE="https://github.com/grosser/fast_gettext"
 SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bundler )"
diff --git a/dev-ruby/fast_gettext/fast_gettext-2.3.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-2.3.0.ebuild
new file mode 100644
index 000000000000..3ee6d07d7a0b
--- /dev/null
+++ b/dev-ruby/fast_gettext/fast_gettext-2.3.0.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="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="fast_gettext.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsafe!"
+HOMEPAGE="https://github.com/grosser/fast_gettext"
+SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="2"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm Gemfile.lock || die
+
+	sed -i -e '/single/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/SingleCov/ s:^:#:' spec/{*,*/*}/*spec.rb || die
+
+	# Avoid unneeded dependency on git and development dependencies.
+	sed -e '/git ls-files/ s:^:#:' \
+		-e '/\(wwtd\|bump\|sqlite3\|activerecord\|i18n\|single_cov\|forking_test_runner\|rubocop\)/ s:^:#:' \
+		-e 's:require_relative ":require "./:' \
+		-i fast_gettext.gemspec || die
+
+	# Avoid a test dependency on activerecord since this is now in the
+	# dependency tree for app-admin/puppet and many arches don't have
+	# rails keyworded.
+	sed -i -e '/active_record/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/fast_gettext/translation_repository/db_spec.rb || die
+	rm -f spec/fast_gettext/storage_spec.rb || die
+	sed -i -e '/with i18n loaded/,/^  end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Make sure the right ruby interpreter is used
+	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
+}
diff --git a/dev-ruby/fast_xs/Manifest b/dev-ruby/fast_xs/Manifest
deleted file mode 100644
index aad86004e6e3..000000000000
--- a/dev-ruby/fast_xs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fast_xs-0.8.0.gem 22016 BLAKE2B b24e65c31623e86ac8ab8b5a442565083bd047e5740aeae74d74e82c09770a8149853ad021ea6c6c036d411e8f299f4a531d78b0b3314ed5bf32d7f8b9fcf697 SHA512 55fc2704fab020f03b1ce138d1631dd5ad73a8601dcd95989a59c7cccb490c70b4e1af59fb8b009bfa0899f2c23feb42cc3068e243cd539ba1cb01a9f7bc573b
diff --git a/dev-ruby/fast_xs/fast_xs-0.8.0-r3.ebuild b/dev-ruby/fast_xs/fast_xs-0.8.0-r3.ebuild
deleted file mode 100644
index 0b38660b71a8..000000000000
--- a/dev-ruby/fast_xs/fast_xs-0.8.0-r3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/fast_xs/extconf.rb ext/fast_xs_extra/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="fast_xs text escaping library ruby bindings"
-HOMEPAGE="https://github.com/brianmario/fast_xs"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rack )"
-
-PATCHES=( "${FILESDIR}/${P}+ruby-1.9.patch" )
-
-each_ruby_test() {
-	# the Rakefile tries to run all the tests in a single process, but
-	# this breaks the monkey-patchers, we're forced to run them one by
-	# one.
-	for tu in test/test_*.rb; do
-		${RUBY} -Ilib $tu || die "test $tu failed"
-	done
-}
diff --git a/dev-ruby/fast_xs/files/fast_xs-0.8.0+ruby-1.9.patch b/dev-ruby/fast_xs/files/fast_xs-0.8.0+ruby-1.9.patch
deleted file mode 100644
index cdd72f2db3fb..000000000000
--- a/dev-ruby/fast_xs/files/fast_xs-0.8.0+ruby-1.9.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: fast_xs-0.8.0/test/test_erb_util_module_overrides.rb
-===================================================================
---- fast_xs-0.8.0.orig/test/test_erb_util_module_overrides.rb
-+++ fast_xs-0.8.0/test/test_erb_util_module_overrides.rb
-@@ -35,11 +35,13 @@ class TestErbUtilModuleOverrides < Test:
- 
-   def test_preserve_encoding
-     foo = "foo"
--    foo.force_encoding Encoding::US_ASCII
--    assert_equal Encoding::US_ASCII, url_encode(foo).encoding
--    assert_equal Encoding::US_ASCII, html_escape(foo).encoding
--    assert_equal Encoding::US_ASCII, u(foo).encoding
--    assert_equal Encoding::US_ASCII, h(foo).encoding
-+    ascii_encoding = (RUBY_VERSION =~ /1\.9/) ? Encoding::ASCII_8BIT : Encoding::US_ASCII
-+
-+    foo.force_encoding ascii_encoding
-+    assert_equal ascii_encoding, url_encode(foo).encoding
-+    assert_equal ascii_encoding, html_escape(foo).encoding
-+    assert_equal ascii_encoding, u(foo).encoding
-+    assert_equal ascii_encoding, h(foo).encoding
- 
-     foo.force_encoding Encoding::BINARY
-     assert_equal Encoding::BINARY, url_encode(foo).encoding
diff --git a/dev-ruby/fast_xs/metadata.xml b/dev-ruby/fast_xs/metadata.xml
deleted file mode 100644
index 72e3f82c563f..000000000000
--- a/dev-ruby/fast_xs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">brianmario/fast_xs</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/fattr/fattr-2.4.0-r1.ebuild b/dev-ruby/fattr/fattr-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..e96dd52c3ec9
--- /dev/null
+++ b/dev-ruby/fattr/fattr-2.4.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="fattr.rb is a \"fatter attr\" for ruby"
+HOMEPAGE="https://github.com/ahoward/fattr"
+
+LICENSE="Ruby-BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+each_ruby_test() {
+	${RUBY} test/fattr_test.rb || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r samples
+}
diff --git a/dev-ruby/fattr/fattr-2.4.0.ebuild b/dev-ruby/fattr/fattr-2.4.0.ebuild
deleted file mode 100644
index 5d6cedff557b..000000000000
--- a/dev-ruby/fattr/fattr-2.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="fattr.rb is a \"fatter attr\" for ruby"
-HOMEPAGE="https://github.com/ahoward/fattr"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-each_ruby_test() {
-	${RUBY} test/fattr_test.rb || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r samples
-}
diff --git a/dev-ruby/fcgi/Manifest b/dev-ruby/fcgi/Manifest
index 765825fe0b31..3baf3c5108bc 100644
--- a/dev-ruby/fcgi/Manifest
+++ b/dev-ruby/fcgi/Manifest
@@ -1 +1 @@
-DIST fcgi-0.9.2.1.gem 15872 BLAKE2B 1f3a9cfa79f06a655bbe3ecd36be8b650f7c1f856f84f82502c87c06f43ee9c91eed75e5441c65a635c700b8c682745f631e3268701555268eb3a1568347573f SHA512 1ffdd429ce4f2bbac771b7ac2368a5194015a7327b8b43b803914257edc174235573df6bb41a53fb71db0bf179fc24ce2392b244b5b55563d67e045c47da8579
+DIST fcgi-0.9.2.2.gem 15872 BLAKE2B e1db9facc8afc00dd165c14d908176ad5e685ac23c6a236b17494928823a536ed14bde241cb6ba7f97f184397a9884d07ad0ef4398f155f917a1e9e2b35d6ff5 SHA512 2125c255cc6772eefce42b7c6d094fcced66b236f17e7f215ee421be8ea1777aec728e7919152b0f352188ea305355d74a24a61a1375a9296b3298e330b1af8a
diff --git a/dev-ruby/fcgi/fcgi-0.9.2.1-r2.ebuild b/dev-ruby/fcgi/fcgi-0.9.2.1-r2.ebuild
deleted file mode 100644
index e3ea29b2c4cf..000000000000
--- a/dev-ruby/fcgi/fcgi-0.9.2.1-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc README.signals"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/fcgi/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="FastCGI library for Ruby"
-HOMEPAGE="https://github.com/alphallc/ruby-fcgi-ng"
-
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-LICENSE="Ruby"
-
-DEPEND+=" dev-libs/fcgi"
-RDEPEND+=" dev-libs/fcgi"
-
-IUSE=""
-SLOT="0"
diff --git a/dev-ruby/fcgi/fcgi-0.9.2.2.ebuild b/dev-ruby/fcgi/fcgi-0.9.2.2.ebuild
new file mode 100644
index 000000000000..8cefcbe2866f
--- /dev/null
+++ b/dev-ruby/fcgi/fcgi-0.9.2.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc README.signals"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/fcgi/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="FastCGI library for Ruby"
+HOMEPAGE="https://github.com/alphallc/ruby-fcgi-ng"
+
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+LICENSE="MIT Ruby-BSD"
+
+DEPEND+=" dev-libs/fcgi"
+RDEPEND+=" dev-libs/fcgi"
+
+IUSE=""
+SLOT="0"
diff --git a/dev-ruby/ferret/Manifest b/dev-ruby/ferret/Manifest
deleted file mode 100644
index 49a50e2531ad..000000000000
--- a/dev-ruby/ferret/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ferret-0.11.8.7.gem 608768 BLAKE2B cc5e6769dcad4c465ae00aed972712e03ccbea304608eef5008941d5bf1eca17461f611aea7f0033d4047b7bc2474c0a93ffece40b4a6aca753a496ee34f36fa SHA512 ac7cafa25ade9741e0eb95d7372f6dd7ce4ea82368c69ace536b852fd5cc435d05764041ba1bddcc6098665c6e1aa7a12ac9739e45362007f726f3e7a8124df1
diff --git a/dev-ruby/ferret/ferret-0.11.8.7-r1.ebuild b/dev-ruby/ferret/ferret-0.11.8.7-r1.ebuild
deleted file mode 100644
index 45a3f16cd148..000000000000
--- a/dev-ruby/ferret/ferret-0.11.8.7-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ruby30 does not compile
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_NAME="ferret"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_DOCDIR="doc/api"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG RELEASE_CHANGES RELEASE_NOTES README.md TODO TUTORIAL.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit ruby-fakegem
-
-MY_P="${P/ruby-/}"
-DESCRIPTION="A ruby indexing/searching library"
-HOMEPAGE="https://github.com/jkraemer/ferret"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND+=" app-arch/bzip2"
-DEPEND+=" app-arch/bzip2"
-
-all_ruby_prepare() {
-	# Remove bundled bzlib code and use system version instead.
-	rm ext/BZLIB* ext/bzlib* || die
-	sed -i -e '14i  $LDFLAGS += " -lbz2 "' ext/extconf.rb || die
-
-	# Avoid test known to fail upstream:
-	# https://github.com/jkraemer/ferret/issues/2
-	sed -i -e '/test_adding_long_url/,/^  end/ s:^:#:' \
-		test/unit/index/tc_index_writer.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/test_all.rb || die
-}
diff --git a/dev-ruby/ferret/metadata.xml b/dev-ruby/ferret/metadata.xml
deleted file mode 100644
index 16ddf2aecbac..000000000000
--- a/dev-ruby/ferret/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jkraemer/ferret</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ffaker/Manifest b/dev-ruby/ffaker/Manifest
index 30cdf206178e..8eb5ec9ad51b 100644
--- a/dev-ruby/ffaker/Manifest
+++ b/dev-ruby/ffaker/Manifest
@@ -1,2 +1,3 @@
-DIST ffaker-2.20.0.gem 461312 BLAKE2B 1e0f38b83c957407e44a25e955ffa58b848a5a88e7200087e874d8998bbe65f49be28eb428fd28796c9f1f0663da97f0970763e767e38aed9f541edd62440b63 SHA512 aa908505c771636b307f1309511f9eb489dc14b07022960ae58f25321ebae46dc6e0406ea91863acd82b02402d5ee70aa71d77fd4aa753918c6d79c690764eb8
 DIST ffaker-2.21.0.gem 463360 BLAKE2B 90742c81b719ef6930269d2b6927add981f7d001a1465b5835894acf4e627e3870123d3e0c5c9449468c2f34c1b783e625daf668d900d6956487f6036ea8da8a SHA512 bff7f36ab6c90ac66781ddf034a628323a673a13325b93f3b12b0298d4934df3d7752e512daf7c1a893378c8d66b2d3facd2d407bfabd1dd02b64944acf73a08
+DIST ffaker-2.22.0.gem 470016 BLAKE2B be1ac238a03e2cc705327b373bf9844aaf2e80440665e46e79127c35e77d576b4de0a4d34f74f7b1e1ac6665850722fa8c4e99897576268444dcc51c9ab0a9e5 SHA512 c9b3f3ee5ccc002a9e590b37c38bd7d1d28aa1a81b7b208f94cc73643735492a804915eb6894643d5733469be6582b59d356a30f62f7cf7647a24a99cbfe019b
+DIST ffaker-2.23.0.gem 471552 BLAKE2B 57442ad9c2a38a44e78e792976238319b03475fe9b974f21d3e96901c6a4393638c0c24e4b2d12dd28d27829208a73ed2375c7f43bc9197f23449469faac68ae SHA512 fa12fc3ec6587f122b86feb3937e9d4db50283ae7370487a662e652b7e0ec4333596e183e4f41a7069d7ed3622de037fe7dea8ee2aa107f624ddf66a98542c92
diff --git a/dev-ruby/ffaker/ffaker-2.20.0.ebuild b/dev-ruby/ffaker/ffaker-2.20.0.ebuild
deleted file mode 100644
index d2dfeeaaf3a1..000000000000
--- a/dev-ruby/ffaker/ffaker-2.20.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Faster Faker, generates dummy data"
-HOMEPAGE="https://github.com/emmanueloga/ffaker"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	sed -i -e '/test_image_file/aomit "network"' test/test_image.rb || die
-}
diff --git a/dev-ruby/ffaker/ffaker-2.21.0.ebuild b/dev-ruby/ffaker/ffaker-2.21.0.ebuild
index 51cd401fe487..2d982ab3784d 100644
--- a/dev-ruby/ffaker/ffaker-2.21.0.ebuild
+++ b/dev-ruby/ffaker/ffaker-2.21.0.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="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
 
diff --git a/dev-ruby/ffaker/ffaker-2.22.0.ebuild b/dev-ruby/ffaker/ffaker-2.22.0.ebuild
new file mode 100644
index 000000000000..b14b9e27d72a
--- /dev/null
+++ b/dev-ruby/ffaker/ffaker-2.22.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faster Faker, generates dummy data"
+HOMEPAGE="https://github.com/ffaker/ffaker"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/test_image_file/aomit "network"' test/test_image.rb || die
+}
diff --git a/dev-ruby/ffaker/ffaker-2.23.0.ebuild b/dev-ruby/ffaker/ffaker-2.23.0.ebuild
new file mode 100644
index 000000000000..b14b9e27d72a
--- /dev/null
+++ b/dev-ruby/ffaker/ffaker-2.23.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faster Faker, generates dummy data"
+HOMEPAGE="https://github.com/ffaker/ffaker"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/test_image_file/aomit "network"' test/test_image.rb || die
+}
diff --git a/dev-ruby/ffaker/metadata.xml b/dev-ruby/ffaker/metadata.xml
index c80617485199..86b453d7c079 100644
--- a/dev-ruby/ffaker/metadata.xml
+++ b/dev-ruby/ffaker/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">emmanueloga/ffaker</remote-id>
+    <remote-id type="github">ffaker/ffaker</remote-id>
+    <remote-id type="rubygems">ffaker</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ffi-compiler/Manifest b/dev-ruby/ffi-compiler/Manifest
index 6e01f3b36181..63da88b1eb9a 100644
--- a/dev-ruby/ffi-compiler/Manifest
+++ b/dev-ruby/ffi-compiler/Manifest
@@ -1 +1,2 @@
-DIST ffi-compiler-1.0.1.gem 18432 BLAKE2B 9832d9836a0b55d3099085b53e0c8e15cc5ae79cfadadea942603ef8595b5fa4d781b5f031f0592b2688acb1416acffa9e525e3cbc004c2c51aaaea12a722706 SHA512 7a13625ab1c5748d05ec93d68708dd9435ec92dcd0c823109c44173fdaf8710aec5f5b4fb11966475f10ae91401c7ca3c620f9d36bb9ca665114e1ed70f4edd0
+DIST ffi-compiler-1.2.1.tar.gz 12754 BLAKE2B 7ad9b38fba6c615059deea155eda2140f61bd177fbd77867c8dd1d3bb0d5774455f9555767547fe833229faeadc5abc806aecb1c67d35b3098df9422964ca430 SHA512 0fb954e83f689be60fafe33acb0f9fd39a3904eb69ab318e01a6028617198e91db78c863e568d2748b2483b373a932b95b62852ca80f0d2bcfb7308df2a8c54a
+DIST ffi-compiler-1.3.2.tar.gz 12121 BLAKE2B dc0b9945036fa5eb65326a91c032b54e8d0ca7a8be275e85a11307ed0a31c1022a566b16e44875a63835ea5f51d3213eafedb2283d9a535c58c0e6dab8d1982e SHA512 48cabec20c099fd51ae9b14829f7bc1f1574a993e55c46d4bcb083a2bc75306345d196319cc2e12ff67011beec3b3fad122bee90f383ef8b37f91179c2fe7a9a
diff --git a/dev-ruby/ffi-compiler/ffi-compiler-1.0.1-r1.ebuild b/dev-ruby/ffi-compiler/ffi-compiler-1.0.1-r1.ebuild
deleted file mode 100644
index 0e36fcac82ef..000000000000
--- a/dev-ruby/ffi-compiler/ffi-compiler-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby FFI Rakefile generator"
-HOMEPAGE="https://github.com/ffi/ffi/wiki"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rake >=dev-ruby/ffi-1.0.0"
diff --git a/dev-ruby/ffi-compiler/ffi-compiler-1.2.1.ebuild b/dev-ruby/ffi-compiler/ffi-compiler-1.2.1.ebuild
new file mode 100644
index 000000000000..34651be4500b
--- /dev/null
+++ b/dev-ruby/ffi-compiler/ffi-compiler-1.2.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby FFI Rakefile generator"
+HOMEPAGE="https://github.com/ffi/ffi/wiki"
+SRC_URI="https://github.com/ffi/ffi-compiler/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+ruby_add_rdepend "dev-ruby/rake >=dev-ruby/ffi-1.0.0"
diff --git a/dev-ruby/ffi-compiler/ffi-compiler-1.3.2.ebuild b/dev-ruby/ffi-compiler/ffi-compiler-1.3.2.ebuild
new file mode 100644
index 000000000000..d0a6033acc30
--- /dev/null
+++ b/dev-ruby/ffi-compiler/ffi-compiler-1.3.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby FFI Rakefile generator"
+HOMEPAGE="https://github.com/ffi/ffi/wiki"
+SRC_URI="https://github.com/ffi/ffi-compiler/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+ruby_add_rdepend "dev-ruby/rake >=dev-ruby/ffi-1.15.5"
+
+all_ruby_prepare() {
+	sed -e "s:_relative ':'./:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/ffi-compiler/metadata.xml b/dev-ruby/ffi-compiler/metadata.xml
index 7a38fd1850ff..b7f236d02d94 100644
--- a/dev-ruby/ffi-compiler/metadata.xml
+++ b/dev-ruby/ffi-compiler/metadata.xml
@@ -5,4 +5,7 @@
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">ffi/ffi-compiler</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index c42bc5e908b8..3a24f1658d20 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,2 +1,3 @@
-DIST ffi-git-1.14.2.tgz 165100 BLAKE2B 598d1771860a7884f8dc6a4cf0006cb42f741308bdd01720d7ea4b63690d42ff6e93f2d48de7132f5d82b275b30672b0bf1ac586b713994b68e98da4cf71a481 SHA512 20fffab047d810ddea1d4d2b66a563adf5787a0602a26cc59724090d393852ae57464a8c7b5a47ca0534efc453bb06d2f8fbf00a203a7060cd3ac78b683119f5
 DIST ffi-git-1.15.5.tgz 168139 BLAKE2B 2ddd5bd7bfb7bcd39b6d740cbb1e0f4cd419ce6cb4ec12926f91f254b3f3142bc6166728a81a6f23dccfbf7aec911c63237c20fb0e2c70d30d48f4648e352585 SHA512 3668bafae936bf5010f014fbcf63258b023bcc318882775e7d2fcfc11334722ec2b6e8a8b9c910d406889fb173dd503c5c13f5af8e4f6927921f12f688461707
+DIST ffi-git-1.16.2.tgz 183435 BLAKE2B e2c9dad9c18f1a675905a000c8cec4ecfd0213df52476df21a035ca96faf257260896721364fcadc2e3bfec364dc7d036fc7402ebcc1c1a10af15f8ce9e2df7c SHA512 8329b67fbb6b1c9a8df1eacc2f8b1c2e2b2d80902914af76060fb9f3dad493ca4cfa0624596c080d641f38324bef165f2a6f7fafefe3e0e0653951f8189ed579
+DIST ffi-git-1.16.3.tgz 183977 BLAKE2B 97f4f0bfc8f43e3a3651b48345c72cc8913f5658c2e838835340082205880309b8f270116dffbc253c78e63ae1c94f392c6ef8741e52852890ac81d00767de19 SHA512 622aae9d55b8e859eab58988eaf976206010ab816351567f2525e606b83b3349ce6b9f114208ba9a7c6de97cc6fe73f5708cf968b7dea0944134c6cb44b55c9b
diff --git a/dev-ruby/ffi/ffi-1.14.2-r1.ebuild b/dev-ruby/ffi/ffi-1.14.2-r1.ebuild
deleted file mode 100644
index 10c95ec49b55..000000000000
--- a/dev-ruby/ffi/ffi-1.14.2-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="ffi.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/ffi_c/extconf.rb)
-
-inherit multilib ruby-fakegem toolchain-funcs
-
-DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
-HOMEPAGE="https://wiki.github.com/ffi/ffi"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-IUSE=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND+=" dev-libs/libffi:="
-DEPEND+=" dev-libs/libffi:="
-
-ruby_add_bdepend "dev-ruby/rake"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14.2-32bit-long-double.patch
-)
-
-all_ruby_prepare() {
-	sed -i -e '/tasks/ s:^:#:' \
-		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
-
-	sed -i -e '/require/c\require "./lib/ffi/version"' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Fix Makefile for tests
-	sed -i -e '/CCACHE :=/ s:^:#:' \
-		-e 's/-O2//' \
-		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
-
-	# Remove bundled version of libffi.
-	rm -rf ext/ffi_c/libffi || die
-}
-
-each_ruby_compile() {
-	each_fakegem_compile
-
-	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
-}
-
-each_ruby_test() {
-	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
diff --git a/dev-ruby/ffi/ffi-1.15.5-r1.ebuild b/dev-ruby/ffi/ffi-1.15.5-r1.ebuild
new file mode 100644
index 000000000000..6e437818f9b5
--- /dev/null
+++ b/dev-ruby/ffi/ffi-1.15.5-r1.ebuild
@@ -0,0 +1,71 @@
+# 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_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ffi.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/ffi_c/extconf.rb)
+
+inherit ruby-fakegem toolchain-funcs
+
+DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
+HOMEPAGE="https://github.com/ffi/ffi/wiki"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND+=" dev-libs/libffi:="
+DEPEND+=" dev-libs/libffi:="
+
+ruby_add_bdepend "dev-ruby/rake"
+
+PATCHES=(
+	"${FILESDIR}/backport-pr-962.patch"
+	"${FILESDIR}/pr-957-sparc.patch" # submitted upstream as https://github.com/ffi/ffi/pull/957
+	"${FILESDIR}/fix-regenerate-types-conf.patch"
+)
+
+all_ruby_prepare() {
+	sed -i -e '/tasks/ s:^:#:' \
+		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
+
+	sed -e '/require/c\require "./lib/ffi/version"' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-e '/^  lfs/,/^  end/ s:^:#:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Fix Makefile for tests
+	sed -i -e '/CCACHE :=/ s:^:#:' \
+		-e 's/-O2//' \
+		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
+
+	# Remove bundled version of libffi.
+	rm -rf ext/ffi_c/libffi || die
+}
+
+each_ruby_compile() {
+	each_fakegem_compile
+
+	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
+}
+
+each_ruby_test() {
+	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc samples/*
+}
diff --git a/dev-ruby/ffi/ffi-1.15.5-r2.ebuild b/dev-ruby/ffi/ffi-1.15.5-r2.ebuild
new file mode 100644
index 000000000000..023d26c3c3de
--- /dev/null
+++ b/dev-ruby/ffi/ffi-1.15.5-r2.ebuild
@@ -0,0 +1,74 @@
+# 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_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ffi.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/ffi_c/extconf.rb)
+
+inherit ruby-fakegem toolchain-funcs
+
+DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
+HOMEPAGE="https://github.com/ffi/ffi/wiki"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# Needs recent libffi for HPPA fixes (and probably Apple arm64 too)
+RDEPEND+=" >=dev-libs/libffi-3.4.4-r1:="
+DEPEND+=" >=dev-libs/libffi-3.4.4-r1:="
+
+ruby_add_bdepend "dev-ruby/rake"
+
+PATCHES=(
+	"${FILESDIR}/backport-pr-962.patch"
+	"${FILESDIR}/pr-957-sparc.patch" # submitted upstream as https://github.com/ffi/ffi/pull/957
+	"${FILESDIR}/fix-regenerate-types-conf.patch"
+	"${FILESDIR}/use-libffi-closure-allocations-on-hppa.patch"
+	"${FILESDIR}/add-types.conf-for-hppa2.0-linux.patch"
+)
+
+all_ruby_prepare() {
+	sed -i -e '/tasks/ s:^:#:' \
+		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
+
+	sed -e '/require/c\require "./lib/ffi/version"' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-e '/^  lfs/,/^  end/ s:^:#:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Fix Makefile for tests
+	sed -i -e '/CCACHE :=/ s:^:#:' \
+		-e 's/-O2//' \
+		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
+
+	# Remove bundled version of libffi.
+	rm -rf ext/ffi_c/libffi || die
+}
+
+each_ruby_compile() {
+	each_fakegem_compile
+
+	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
+}
+
+each_ruby_test() {
+	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc samples/*
+}
diff --git a/dev-ruby/ffi/ffi-1.15.5.ebuild b/dev-ruby/ffi/ffi-1.15.5.ebuild
deleted file mode 100644
index db12dcdf45b3..000000000000
--- a/dev-ruby/ffi/ffi-1.15.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="ffi.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/ffi_c/extconf.rb)
-
-inherit multilib ruby-fakegem toolchain-funcs
-
-DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
-HOMEPAGE="https://wiki.github.com/ffi/ffi"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-IUSE=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND+=" dev-libs/libffi:="
-DEPEND+=" dev-libs/libffi:="
-
-ruby_add_bdepend "dev-ruby/rake"
-
-all_ruby_prepare() {
-	sed -i -e '/tasks/ s:^:#:' \
-		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
-
-	sed -e '/require/c\require "./lib/ffi/version"' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-e '/^  lfs/,/^  end/ s:^:#:' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Fix Makefile for tests
-	sed -i -e '/CCACHE :=/ s:^:#:' \
-		-e 's/-O2//' \
-		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
-
-	# Remove bundled version of libffi.
-	rm -rf ext/ffi_c/libffi || die
-}
-
-each_ruby_compile() {
-	each_fakegem_compile
-
-	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
-}
-
-each_ruby_test() {
-	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
diff --git a/dev-ruby/ffi/ffi-1.16.2.ebuild b/dev-ruby/ffi/ffi-1.16.2.ebuild
new file mode 100644
index 000000000000..dd92a3fe02db
--- /dev/null
+++ b/dev-ruby/ffi/ffi-1.16.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ffi.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/ffi_c/extconf.rb)
+
+inherit ruby-fakegem toolchain-funcs
+
+DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
+HOMEPAGE="https://github.com/ffi/ffi/wiki"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# Needs recent libffi for HPPA fixes (and probably Apple arm64 too)
+RDEPEND+=" >=dev-libs/libffi-3.4.4-r1:="
+DEPEND+=" >=dev-libs/libffi-3.4.4-r1:="
+
+ruby_add_bdepend "dev-ruby/rake"
+
+all_ruby_prepare() {
+	sed -i -e '/tasks/ s:^:#:' \
+		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
+
+	sed -e '/require/c\require "./lib/ffi/version"' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-e '/^  lfs/,/^  end/ s:^:#:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Fix Makefile for tests
+	sed -i -e '/CCACHE :=/ s:^:#:' \
+		-e 's/-O2//' \
+		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
+
+	# Remove bundled version of libffi.
+	rm -rf ext/ffi_c/libffi || die
+}
+
+each_ruby_compile() {
+	each_fakegem_compile
+
+	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
+}
+
+each_ruby_test() {
+	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc samples/*
+}
diff --git a/dev-ruby/ffi/ffi-1.16.3.ebuild b/dev-ruby/ffi/ffi-1.16.3.ebuild
new file mode 100644
index 000000000000..de78f53b4b27
--- /dev/null
+++ b/dev-ruby/ffi/ffi-1.16.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ffi.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/ffi_c/extconf.rb)
+
+inherit ruby-fakegem toolchain-funcs
+
+DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
+HOMEPAGE="https://github.com/ffi/ffi/wiki"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# Needs recent libffi for HPPA fixes (and probably Apple arm64 too)
+RDEPEND+=" >=dev-libs/libffi-3.4.4-r1:="
+DEPEND+=" >=dev-libs/libffi-3.4.4-r1:="
+
+ruby_add_bdepend "dev-ruby/rake"
+
+all_ruby_prepare() {
+	sed -i -e '/tasks/ s:^:#:' \
+		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
+
+	sed -e '/require/c\require "./lib/ffi/version"' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-e '/^  lfs/,/^  end/ s:^:#:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Fix Makefile for tests
+	sed -i -e '/CCACHE :=/ s:^:#:' \
+		-e 's/-O2//' \
+		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
+
+	# Remove bundled version of libffi.
+	rm -rf ext/ffi_c/libffi || die
+}
+
+each_ruby_compile() {
+	each_fakegem_compile
+
+	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
+}
+
+each_ruby_test() {
+	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc samples/*
+}
diff --git a/dev-ruby/ffi/files/add-types.conf-for-hppa2.0-linux.patch b/dev-ruby/ffi/files/add-types.conf-for-hppa2.0-linux.patch
new file mode 100644
index 000000000000..2594d2b8359c
--- /dev/null
+++ b/dev-ruby/ffi/files/add-types.conf-for-hppa2.0-linux.patch
@@ -0,0 +1,191 @@
+https://github.com/ffi/ffi/pull/1017
+
+From 1f0a4db3d6b16142d2ef547c8dde7a36b21bd39a Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 9 Apr 2023 02:20:32 +0100
+Subject: [PATCH 2/2] Add types.conf for hppa2.0-linux
+
+--- /dev/null
++++ b/lib/ffi/platform/hppa2.0-linux/types.conf
+@@ -0,0 +1,178 @@
++rbx.platform.typedef.*__caddr_t = char
++rbx.platform.typedef.__blkcnt64_t = long_long
++rbx.platform.typedef.__blkcnt_t = long
++rbx.platform.typedef.__blksize_t = long
++rbx.platform.typedef.__clock_t = long
++rbx.platform.typedef.__clockid_t = int
++rbx.platform.typedef.__daddr_t = int
++rbx.platform.typedef.__dev_t = ulong_long
++rbx.platform.typedef.__fd_mask = long
++rbx.platform.typedef.__fsblkcnt64_t = ulong_long
++rbx.platform.typedef.__fsblkcnt_t = ulong
++rbx.platform.typedef.__fsfilcnt64_t = ulong_long
++rbx.platform.typedef.__fsfilcnt_t = ulong
++rbx.platform.typedef.__fsword_t = int
++rbx.platform.typedef.__gid_t = uint
++rbx.platform.typedef.__id_t = uint
++rbx.platform.typedef.__ino64_t = ulong_long
++rbx.platform.typedef.__ino_t = ulong
++rbx.platform.typedef.__int16_t = short
++rbx.platform.typedef.__int32_t = int
++rbx.platform.typedef.__int64_t = long_long
++rbx.platform.typedef.__int8_t = char
++rbx.platform.typedef.__int_least16_t = short
++rbx.platform.typedef.__int_least32_t = int
++rbx.platform.typedef.__int_least64_t = long_long
++rbx.platform.typedef.__int_least8_t = char
++rbx.platform.typedef.__intmax_t = long_long
++rbx.platform.typedef.__intptr_t = int
++rbx.platform.typedef.__kernel_caddr_t = string
++rbx.platform.typedef.__kernel_clock_t = long
++rbx.platform.typedef.__kernel_clockid_t = int
++rbx.platform.typedef.__kernel_daddr_t = int
++rbx.platform.typedef.__kernel_gid16_t = ushort
++rbx.platform.typedef.__kernel_gid32_t = uint
++rbx.platform.typedef.__kernel_gid_t = uint
++rbx.platform.typedef.__kernel_ino64_t = ulong_long
++rbx.platform.typedef.__kernel_ino_t = ulong
++rbx.platform.typedef.__kernel_ipc_pid_t = ushort
++rbx.platform.typedef.__kernel_key_t = int
++rbx.platform.typedef.__kernel_loff_t = long_long
++rbx.platform.typedef.__kernel_long_t = long
++rbx.platform.typedef.__kernel_mode_t = ushort
++rbx.platform.typedef.__kernel_mqd_t = int
++rbx.platform.typedef.__kernel_off64_t = long_long
++rbx.platform.typedef.__kernel_off_t = long
++rbx.platform.typedef.__kernel_old_dev_t = uint
++rbx.platform.typedef.__kernel_old_gid_t = uint
++rbx.platform.typedef.__kernel_old_time_t = long
++rbx.platform.typedef.__kernel_old_uid_t = uint
++rbx.platform.typedef.__kernel_pid_t = int
++rbx.platform.typedef.__kernel_ptrdiff_t = int
++rbx.platform.typedef.__kernel_size_t = uint
++rbx.platform.typedef.__kernel_ssize_t = int
++rbx.platform.typedef.__kernel_suseconds_t = long
++rbx.platform.typedef.__kernel_time64_t = long_long
++rbx.platform.typedef.__kernel_time_t = long
++rbx.platform.typedef.__kernel_timer_t = int
++rbx.platform.typedef.__kernel_uid16_t = ushort
++rbx.platform.typedef.__kernel_uid32_t = uint
++rbx.platform.typedef.__kernel_uid_t = uint
++rbx.platform.typedef.__kernel_ulong_t = ulong
++rbx.platform.typedef.__key_t = int
++rbx.platform.typedef.__loff_t = long_long
++rbx.platform.typedef.__mode_t = uint
++rbx.platform.typedef.__nlink_t = uint
++rbx.platform.typedef.__off64_t = long_long
++rbx.platform.typedef.__off_t = long
++rbx.platform.typedef.__pid_t = int
++rbx.platform.typedef.__priority_which_t = int
++rbx.platform.typedef.__quad_t = long_long
++rbx.platform.typedef.__rlim64_t = ulong_long
++rbx.platform.typedef.__rlim_t = ulong
++rbx.platform.typedef.__rlimit_resource_t = int
++rbx.platform.typedef.__rusage_who_t = int
++rbx.platform.typedef.__sig_atomic_t = int
++rbx.platform.typedef.__socklen_t = uint
++rbx.platform.typedef.__ssize_t = int
++rbx.platform.typedef.__suseconds64_t = long_long
++rbx.platform.typedef.__suseconds_t = long
++rbx.platform.typedef.__syscall_slong_t = long
++rbx.platform.typedef.__syscall_ulong_t = ulong
++rbx.platform.typedef.__thrd_t = ulong
++rbx.platform.typedef.__time64_t = long_long
++rbx.platform.typedef.__time_t = long
++rbx.platform.typedef.__timer_t = pointer
++rbx.platform.typedef.__tss_t = uint
++rbx.platform.typedef.__u_char = uchar
++rbx.platform.typedef.__u_int = uint
++rbx.platform.typedef.__u_long = ulong
++rbx.platform.typedef.__u_quad_t = ulong_long
++rbx.platform.typedef.__u_short = ushort
++rbx.platform.typedef.__uid_t = uint
++rbx.platform.typedef.__uint16_t = ushort
++rbx.platform.typedef.__uint32_t = uint
++rbx.platform.typedef.__uint64_t = ulong_long
++rbx.platform.typedef.__uint8_t = uchar
++rbx.platform.typedef.__uint_least16_t = ushort
++rbx.platform.typedef.__uint_least32_t = uint
++rbx.platform.typedef.__uint_least64_t = ulong_long
++rbx.platform.typedef.__uint_least8_t = uchar
++rbx.platform.typedef.__uintmax_t = ulong_long
++rbx.platform.typedef.__useconds_t = uint
++rbx.platform.typedef.blkcnt_t = long_long
++rbx.platform.typedef.blksize_t = long
++rbx.platform.typedef.clock_t = long
++rbx.platform.typedef.clockid_t = int
++rbx.platform.typedef.daddr_t = int
++rbx.platform.typedef.dev_t = ulong_long
++rbx.platform.typedef.fd_mask = long
++rbx.platform.typedef.fsblkcnt_t = ulong_long
++rbx.platform.typedef.fsfilcnt_t = ulong_long
++rbx.platform.typedef.gid_t = uint
++rbx.platform.typedef.id_t = uint
++rbx.platform.typedef.in_addr_t = uint
++rbx.platform.typedef.in_port_t = ushort
++rbx.platform.typedef.ino_t = ulong_long
++rbx.platform.typedef.int16_t = short
++rbx.platform.typedef.int32_t = int
++rbx.platform.typedef.int64_t = long_long
++rbx.platform.typedef.int8_t = char
++rbx.platform.typedef.int_fast16_t = int
++rbx.platform.typedef.int_fast32_t = int
++rbx.platform.typedef.int_fast64_t = long_long
++rbx.platform.typedef.int_fast8_t = char
++rbx.platform.typedef.int_least16_t = short
++rbx.platform.typedef.int_least32_t = int
++rbx.platform.typedef.int_least64_t = long_long
++rbx.platform.typedef.int_least8_t = char
++rbx.platform.typedef.intmax_t = long_long
++rbx.platform.typedef.intptr_t = int
++rbx.platform.typedef.key_t = int
++rbx.platform.typedef.loff_t = long_long
++rbx.platform.typedef.mode_t = uint
++rbx.platform.typedef.nlink_t = uint
++rbx.platform.typedef.off_t = long_long
++rbx.platform.typedef.pid_t = int
++rbx.platform.typedef.pthread_key_t = uint
++rbx.platform.typedef.pthread_once_t = int
++rbx.platform.typedef.pthread_t = ulong
++rbx.platform.typedef.ptrdiff_t = int
++rbx.platform.typedef.quad_t = long_long
++rbx.platform.typedef.register_t = long
++rbx.platform.typedef.rlim_t = ulong_long
++rbx.platform.typedef.sa_family_t = ushort
++rbx.platform.typedef.size_t = uint
++rbx.platform.typedef.socklen_t = uint
++rbx.platform.typedef.ssize_t = int
++rbx.platform.typedef.suseconds_t = long
++rbx.platform.typedef.time_t = long
++rbx.platform.typedef.timer_t = pointer
++rbx.platform.typedef.u_char = uchar
++rbx.platform.typedef.u_int = uint
++rbx.platform.typedef.u_int16_t = ushort
++rbx.platform.typedef.u_int32_t = uint
++rbx.platform.typedef.u_int64_t = ulong_long
++rbx.platform.typedef.u_int8_t = uchar
++rbx.platform.typedef.u_long = ulong
++rbx.platform.typedef.u_quad_t = ulong_long
++rbx.platform.typedef.u_short = ushort
++rbx.platform.typedef.uid_t = uint
++rbx.platform.typedef.uint = uint
++rbx.platform.typedef.uint16_t = ushort
++rbx.platform.typedef.uint32_t = uint
++rbx.platform.typedef.uint64_t = ulong_long
++rbx.platform.typedef.uint8_t = uchar
++rbx.platform.typedef.uint_fast16_t = uint
++rbx.platform.typedef.uint_fast32_t = uint
++rbx.platform.typedef.uint_fast64_t = ulong_long
++rbx.platform.typedef.uint_fast8_t = uchar
++rbx.platform.typedef.uint_least16_t = ushort
++rbx.platform.typedef.uint_least32_t = uint
++rbx.platform.typedef.uint_least64_t = ulong_long
++rbx.platform.typedef.uint_least8_t = uchar
++rbx.platform.typedef.uintmax_t = ulong_long
++rbx.platform.typedef.uintptr_t = uint
++rbx.platform.typedef.ulong = ulong
++rbx.platform.typedef.ushort = ushort
++rbx.platform.typedef.wchar_t = long
+-- 
+2.40.0
+
diff --git a/dev-ruby/ffi/files/backport-pr-962.patch b/dev-ruby/ffi/files/backport-pr-962.patch
new file mode 100644
index 000000000000..708c52025bd5
--- /dev/null
+++ b/dev-ruby/ffi/files/backport-pr-962.patch
@@ -0,0 +1,48 @@
+From edc54894f77d00c4ca34593c8b4c94f656f5807e Mon Sep 17 00:00:00 2001
+From: Frederick Cheung <frederick.cheung@gmail.com>
+Date: Fri, 17 Jun 2022 18:57:28 +0100
+Subject: [PATCH] Fix Pointer#initialize using NUM2LL instead of NUM2ULL
+
+If the high bit of the address was set this would raise RangeError
+(bignum too big to convert into long long). This is not uncommon on
+platforms that use the high bits of pointers for purposes such as
+pointer authentication
+
+This also now matches Pointer#address which uses ULL2NUM.
+---
+ ext/ffi_c/Pointer.c      | 2 +-
+ spec/ffi/pointer_spec.rb | 8 ++++++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/ext/ffi_c/Pointer.c b/ext/ffi_c/Pointer.c
+index 153fff101..79886811f 100644
+--- a/ext/ffi_c/Pointer.c
++++ b/ext/ffi_c/Pointer.c
+@@ -112,7 +112,7 @@ ptr_initialize(int argc, VALUE* argv, VALUE self)
+     switch (TYPE(rbAddress)) {
+         case T_FIXNUM:
+         case T_BIGNUM:
+-            p->memory.address = (void*) (uintptr_t) NUM2LL(rbAddress);
++            p->memory.address = (void*) (uintptr_t) NUM2ULL(rbAddress);
+             p->memory.size = LONG_MAX;
+             if (p->memory.address == NULL) {
+                 p->memory.flags = 0;
+diff --git a/spec/ffi/pointer_spec.rb b/spec/ffi/pointer_spec.rb
+index b216a161d..7a2ac1565 100644
+--- a/spec/ffi/pointer_spec.rb
++++ b/spec/ffi/pointer_spec.rb
+@@ -237,6 +237,14 @@ def to_ptr
+       expect(FFI::Pointer.new(0).slice(0, 10).size_limit?).to be true
+     end
+   end
++
++  describe "#initialise" do
++    it 'can use adresses with high bit set' do
++      max_address = 2**FFI::Platform::ADDRESS_SIZE - 1
++      pointer = FFI::Pointer.new(:uint8, max_address)
++      expect(pointer.address).to eq(max_address)
++    end
++  end
+ end
+ 
+ describe "AutoPointer" do
diff --git a/dev-ruby/ffi/files/ffi-1.14.2-32bit-long-double.patch b/dev-ruby/ffi/files/ffi-1.14.2-32bit-long-double.patch
deleted file mode 100644
index 7373a8c28cda..000000000000
--- a/dev-ruby/ffi/files/ffi-1.14.2-32bit-long-double.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/815130
-https://github.com/ffi/ffi/commit/315d66e7b0768856d589e15bf597f4816d5cd524
-
-From 0ef7a9d7d22c9a7779def3f8c7f0166d996a2401 Mon Sep 17 00:00:00 2001
-From: xtkoba <69125751+xtkoba@users.noreply.github.com>
-Date: Wed, 29 Sep 2021 19:24:44 +0900
-Subject: [PATCH] Keep `LONGDOUBLE_ADJ >= sizeof(long double)`
-
---- a/ext/ffi_c/Call.c
-+++ b/ext/ffi_c/Call.c
-@@ -71,7 +71,7 @@
- #define FLOAT32_ADJ (4)
- #define FLOAT64_ADJ (8)
- #define ADDRESS_ADJ (sizeof(void *))
--#define LONGDOUBLE_ADJ (ffi_type_longdouble.alignment)
-+#define LONGDOUBLE_ADJ (ffi_type_longdouble.alignment > sizeof(long double) ? ffi_type_longdouble.alignment : sizeof(long double))
- 
- #endif /* USE_RAW */
- 
diff --git a/dev-ruby/ffi/files/fix-regenerate-types-conf.patch b/dev-ruby/ffi/files/fix-regenerate-types-conf.patch
new file mode 100644
index 000000000000..1c1cca1c7d4d
--- /dev/null
+++ b/dev-ruby/ffi/files/fix-regenerate-types-conf.patch
@@ -0,0 +1,23 @@
+https://github.com/ffi/ffi/commit/19348fe09e1aeb08424abdf331c3497159139f20
+
+From 19348fe09e1aeb08424abdf331c3497159139f20 Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Tue, 14 Mar 2023 21:03:33 -0400
+Subject: [PATCH] Update gen/Rakefile for Ruby 3 compat
+
+Ruby 3 changed the 'mode' argument from an option hash to keyword
+argument.  This change is backwards-compatible with Ruby 2.
+
+See: https://github.com/ruby/fileutils/commit/482de6d397742526d1111576e2791f9b7051e3c0
+--- a/gen/Rakefile
++++ b/gen/Rakefile
+@@ -9,7 +9,7 @@ logfile = File.join(File.dirname(__FILE__), 'log')
+ 
+ file types_conf do |task|
+   options = {}
+-  FileUtils.mkdir_p(File.dirname(task.name), { :mode => 0755 })
++  FileUtils.mkdir_p(File.dirname(task.name), mode: 0755)
+   File.open(task.name, File::CREAT|File::TRUNC|File::RDWR, 0644) do |f|
+     f.puts FFI::TypesGenerator.generate(options)
+   end
+
diff --git a/dev-ruby/ffi/files/pr-957-sparc.patch b/dev-ruby/ffi/files/pr-957-sparc.patch
new file mode 100644
index 000000000000..b68b5e06a7d4
--- /dev/null
+++ b/dev-ruby/ffi/files/pr-957-sparc.patch
@@ -0,0 +1,42 @@
+From 241b10322283743b79c9489993bfb964b5167f7f Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Wed, 25 May 2022 14:23:55 -0400
+Subject: [PATCH 1/2] Rename sparc64-linux -> sparcv9-linux
+
+In https://github.com/ffi/ffi/pull/575, 64-bit sparc was changed to also
+use sparcv9 as the platform name, but the types.conf directory was never
+renamed.  This breaks only on Ruby 3.0 and later due to the fileutils
+change to use keyword arguments in
+https://github.com/ruby/fileutils/commit/482de6d397742526d1111576e2791f9b7051e3c0
+---
+ lib/ffi/platform/{sparc64-linux => sparcv9-linux}/types.conf | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename lib/ffi/platform/{sparc64-linux => sparcv9-linux}/types.conf (100%)
+
+diff --git a/lib/ffi/platform/sparc64-linux/types.conf b/lib/ffi/platform/sparcv9-linux/types.conf
+similarity index 100%
+rename from lib/ffi/platform/sparc64-linux/types.conf
+rename to lib/ffi/platform/sparcv9-linux/types.conf
+
+From 76dc5c7d69a445268f47f5b6a9185e644bcd68e8 Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Mon, 13 Jun 2022 22:56:26 -0400
+Subject: [PATCH 2/2] Also normalize sparc64 -> sparcv9 in test fixture
+
+---
+ spec/ffi/fixtures/compile.rb | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/spec/ffi/fixtures/compile.rb b/spec/ffi/fixtures/compile.rb
+index f2e831a63..58ee5611d 100644
+--- a/spec/ffi/fixtures/compile.rb
++++ b/spec/ffi/fixtures/compile.rb
+@@ -22,6 +22,8 @@ module TestLibrary
+       "powerpc64"
+     when /ppc|powerpc/
+       "powerpc"
++    when /sparcv9|sparc64/
++      "sparcv9"
+     when /^arm/
+       if RbConfig::CONFIG['host_os'] =~ /darwin/
+         "aarch64"
diff --git a/dev-ruby/ffi/files/use-libffi-closure-allocations-on-hppa.patch b/dev-ruby/ffi/files/use-libffi-closure-allocations-on-hppa.patch
new file mode 100644
index 000000000000..6a76a91c0842
--- /dev/null
+++ b/dev-ruby/ffi/files/use-libffi-closure-allocations-on-hppa.patch
@@ -0,0 +1,21 @@
+https://github.com/ffi/ffi/pull/1017
+
+From 587822fa8d21292d39400d2276ca49d37a752135 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 9 Apr 2023 02:17:23 +0100
+Subject: [PATCH 1/2] Use libffi closure allocations on hppa
+
+We currently do this for Apple arm64, but we need to do it for hppa too.
+--- a/ext/ffi_c/extconf.rb
++++ b/ext/ffi_c/extconf.rb
+@@ -61,6 +61,7 @@ if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
+   append_ldflags "-pthread"
+ 
+   ffi_alloc_default = RbConfig::CONFIG['host_os'] =~ /darwin/i && RbConfig::CONFIG['host'] =~ /arm|aarch64/i
++  ffi_alloc_default = ffi_alloc_default || RbConfig::CONFIG['host'] =~ /hppa/i
+   if enable_config('libffi-alloc', ffi_alloc_default)
+     $defs << "-DUSE_FFI_ALLOC"
+   end
+-- 
+2.40.0
+
diff --git a/dev-ruby/fiber-annotation/Manifest b/dev-ruby/fiber-annotation/Manifest
new file mode 100644
index 000000000000..859ca1bd42d8
--- /dev/null
+++ b/dev-ruby/fiber-annotation/Manifest
@@ -0,0 +1 @@
+DIST fiber-annotation-0.2.0.tar.gz 5743 BLAKE2B 87ab3601f53ecbac05ed251438b95f10d26078d319ced6fcde6e1b9c96d58bcbd5c8d5e9e15325f54c32543b61e91ce53f02964aacb8afc57d7636aa70597007 SHA512 d030ad1a3824ea2e7b31781ed31aa1fba187c44479351fb21911ade090f8596b38f5b6352420b26df705d12b086421b78a4987590169a33550de1ed565630e87
diff --git a/dev-ruby/fiber-annotation/fiber-annotation-0.2.0.ebuild b/dev-ruby/fiber-annotation/fiber-annotation-0.2.0.ebuild
new file mode 100644
index 000000000000..d7b34ae9f45a
--- /dev/null
+++ b/dev-ruby/fiber-annotation/fiber-annotation-0.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A mechanism for annotating fibers"
+HOMEPAGE="https://github.com/ioquatix/fiber-annotation"
+SRC_URI="https://github.com/ioquatix/fiber-annotation/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid unpackaged sus covered
+	rm -f config/sus.rb
+}
diff --git a/dev-ruby/fiber-annotation/metadata.xml b/dev-ruby/fiber-annotation/metadata.xml
new file mode 100644
index 000000000000..c20327fbd2e4
--- /dev/null
+++ b/dev-ruby/fiber-annotation/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ioquatix/fiber-annotation</remote-id>
+    <remote-id type="rubygems">fiber-annotation</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/fiber-local/Manifest b/dev-ruby/fiber-local/Manifest
new file mode 100644
index 000000000000..52c6faa57383
--- /dev/null
+++ b/dev-ruby/fiber-local/Manifest
@@ -0,0 +1 @@
+DIST fiber-local-1.0.0.tar.gz 3780 BLAKE2B 5360ebdc2f3958863742e5ca1e1cdefe76e4487bad2257a1bd34a8a6769b1191e1a8f0ba8c7dfe1481f73fdd8b9ee1a014b11e5527273dbb0ee6d8a94edae2ae SHA512 5f77213c3760bb7c23a6912f138e46aa54d8508c11d02dadde5ddbc4ab03976abccb37ad2b1b43b118eddfb7a5e8ca4ee647a7fea1bac5ee4d7b39e8dc8f8424
diff --git a/dev-ruby/fiber-local/fiber-local-1.0.0.ebuild b/dev-ruby/fiber-local/fiber-local-1.0.0.ebuild
new file mode 100644
index 000000000000..87e471a8fae8
--- /dev/null
+++ b/dev-ruby/fiber-local/fiber-local-1.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a class-level mixin to make fiber local state easy"
+HOMEPAGE="https://github.com/socketry/fiber-local"
+SRC_URI="https://github.com/socketry/fiber-local/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	sed -i -e '/\(bundler\|covered\)/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/fiber-local/metadata.xml b/dev-ruby/fiber-local/metadata.xml
new file mode 100644
index 000000000000..cbcf3060e8d9
--- /dev/null
+++ b/dev-ruby/fiber-local/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">socketry/fiber-local</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/file-tail/file-tail-1.2.0-r1.ebuild b/dev-ruby/file-tail/file-tail-1.2.0-r1.ebuild
index 4572ac8e387d..752ea7517b83 100644
--- a/dev-ruby/file-tail/file-tail-1.2.0-r1.ebuild
+++ b/dev-ruby/file-tail/file-tail-1.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
@@ -17,7 +17,7 @@ RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="A small ruby library that allows it to 'tail' files in Ruby"
-HOMEPAGE="https://flori.github.com/file-tail"
+HOMEPAGE="https://flori.github.io/file-tail/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-ruby/filesize/filesize-0.2.0-r1.ebuild b/dev-ruby/filesize/filesize-0.2.0-r1.ebuild
index f6d3f6f01e45..4864cb761b5a 100644
--- a/dev-ruby/filesize/filesize-0.2.0-r1.ebuild
+++ b/dev-ruby/filesize/filesize-0.2.0-r1.ebuild
@@ -1,8 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -10,10 +11,9 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 
 inherit ruby-fakegem
 
-DESCRIPTION="small ruby class for handling filesizes with both the SI and binary prefixes"
+DESCRIPTION="Small class for handling filesizes with both the SI and binary prefixes"
 HOMEPAGE="https://github.com/dominikh/filesize"
 
 LICENSE="MIT"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/filesize/filesize-0.2.0.ebuild b/dev-ruby/filesize/filesize-0.2.0.ebuild
deleted file mode 100644
index 7aeb065f1134..000000000000
--- a/dev-ruby/filesize/filesize-0.2.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="small ruby class for handling filesizes with both the SI and binary prefixes"
-HOMEPAGE="https://github.com/dominikh/filesize"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/filesize/metadata.xml b/dev-ruby/filesize/metadata.xml
index 4a361ab847a4..7cc1398d1ae2 100644
--- a/dev-ruby/filesize/metadata.xml
+++ b/dev-ruby/filesize/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
     <remote-id type="github">dominikh/filesize</remote-id>
diff --git a/dev-ruby/fileutils/Manifest b/dev-ruby/fileutils/Manifest
new file mode 100644
index 000000000000..76b5b8ff9d11
--- /dev/null
+++ b/dev-ruby/fileutils/Manifest
@@ -0,0 +1,2 @@
+DIST fileutils-1.7.1.tar.gz 40841 BLAKE2B a93a9a3357302ac420a4eec3349207d38e2b9e88cf2eb839c769c9219b3b1afa1b106dbc83e55ca907971909ae678189bc25eb7615243bebd20cab4c611a29d6 SHA512 d4aa814959a8c609aa0cf39755172db8c6efcd320cce41ac861a075c960a1dc35a1a3e5a4bea00d7051196e7f69043b4f7ef8f30ef31b8e943f4f10f926a0036
+DIST fileutils-1.7.2.tar.gz 30020 BLAKE2B 6b50a1cbeb725fbe423f602aa024169fd480dabb937a8479421a4ea86bedf90b45fdae01b4ffc46480d93e3b73805eed1bab482c41d5de69fec9ebcd7348c38e SHA512 85732efe0dfb53bbf273030f2389c82a81eca38d3f5aa77bc8bde56c0b082a247573d2adf56320c7a680ef7630c88f525baaf7b52ba3a2b0adab899d1b242f46
diff --git a/dev-ruby/fileutils/fileutils-1.7.1.ebuild b/dev-ruby/fileutils/fileutils-1.7.1.ebuild
new file mode 100644
index 000000000000..b9b8b43c76c6
--- /dev/null
+++ b/dev-ruby/fileutils/fileutils-1.7.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="fileutils.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Several file utility methods for copying, moving, removing, etc"
+HOMEPAGE="https://github.com/ruby/fileutils"
+SRC_URI="https://github.com/ruby/fileutils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/fileutils/fileutils-1.7.2.ebuild b/dev-ruby/fileutils/fileutils-1.7.2.ebuild
new file mode 100644
index 000000000000..2971c3f970ba
--- /dev/null
+++ b/dev-ruby/fileutils/fileutils-1.7.2.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="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="fileutils.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Several file utility methods for copying, moving, removing, etc"
+HOMEPAGE="https://github.com/ruby/fileutils"
+SRC_URI="https://github.com/ruby/fileutils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/fileutils/metadata.xml b/dev-ruby/fileutils/metadata.xml
new file mode 100644
index 000000000000..24eed223ef4f
--- /dev/null
+++ b/dev-ruby/fileutils/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/fileutils</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/filigree/filigree-0.4.1-r1.ebuild b/dev-ruby/filigree/filigree-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..2830fb5e7df4
--- /dev/null
+++ b/dev-ruby/filigree/filigree-0.4.1-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="New classes and extensions to core library classes"
+HOMEPAGE="https://github.com/chriswailes/filigree"
+LICENSE="UoI-NCSA"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test test/ts_filigree.rb || die
+}
diff --git a/dev-ruby/filigree/filigree-0.4.1.ebuild b/dev-ruby/filigree/filigree-0.4.1.ebuild
deleted file mode 100644
index e3c5f76a19b0..000000000000
--- a/dev-ruby/filigree/filigree-0.4.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="New classes and extensions to core library classes"
-HOMEPAGE="https://github.com/chriswailes/filigree"
-LICENSE="UoI-NCSA"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test test/ts_filigree.rb || die
-}
diff --git a/dev-ruby/fivemat/Manifest b/dev-ruby/fivemat/Manifest
deleted file mode 100644
index abb076e8a1c8..000000000000
--- a/dev-ruby/fivemat/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fivemat-1.3.7.gem 10240 BLAKE2B 624eabf458130792e6dd06667fe67f578005630e164a4ce30871204d792c5b562c1ad0fcf2470915bed877b60b3db341887735a3330cfeae181bee6775775295 SHA512 b380bef69756d0214325ee6f3f608062d63d8dd7603aac7b9af1abdf406687971cb4914634e9c807ca73819bafd8e99c5cec0a29f461a1ef3f861676bee86ddf
diff --git a/dev-ruby/fivemat/fivemat-1.3.7.ebuild b/dev-ruby/fivemat/fivemat-1.3.7.ebuild
deleted file mode 100644
index bdeb837a248b..000000000000
--- a/dev-ruby/fivemat/fivemat-1.3.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# Package does not contain tests
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="MiniTest/RSpec/Cucumber formatter that gives each test file its own line of dots"
-HOMEPAGE="https://github.com/tpope/fivemat"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/fivemat/metadata.xml b/dev-ruby/fivemat/metadata.xml
deleted file mode 100644
index f39124a2e276..000000000000
--- a/dev-ruby/fivemat/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">tpope/fivemat</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/flexmock/Manifest b/dev-ruby/flexmock/Manifest
index 4baca5b9ad94..b6e56539878f 100644
--- a/dev-ruby/flexmock/Manifest
+++ b/dev-ruby/flexmock/Manifest
@@ -1 +1,2 @@
 DIST flexmock-2.3.6.tar.gz 91601 BLAKE2B f2888891820f13f4a9812ffdfe042ccd266b0b5166fa538aba96e2c865ba55d3689d077e73fb9aa238455e90b8ea97aa60f8649c08823a753b6af8c0f550cbed SHA512 0fcc25c1a83ba1e2aed91eed98242592dfc1a69d57c033fbd363383962b16d6e72011d62a906ae8bf076801a3d5e8e8501bdb9f6ca3750c9615dfe8b9b0bdbbc
+DIST flexmock-2.3.8.tar.gz 92170 BLAKE2B 583dff030e0c828dedfbd1188a3bcca45b53d327fc9cfc5e43370c10bc6683819aa0d11e7aad0b8d26fe7576cc8a804f2103b5fa065f57381285d5de27c99ff9 SHA512 e055b5fc503967df47fcb4c5724f79efac9cebfab76a3784cf27e194c12316c4863a29c47b46256146cf2aa2f76afcd92849297310c71ac584ef8a5cc9cb40a0
diff --git a/dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-1.patch b/dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-1.patch
new file mode 100644
index 000000000000..f43c4d454992
--- /dev/null
+++ b/dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-1.patch
@@ -0,0 +1,25 @@
+From f63ba0916132e16d5eeb1a5c1ad868b0169bf7fc Mon Sep 17 00:00:00 2001
+From: Daniel Leidert <dleidert@debian.org>
+Date: Mon, 22 Nov 2021 01:34:25 +0100
+Subject: [PATCH] Properly accept argument and keywords
+
+---
+ lib/flexmock/composite_expectation.rb | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/flexmock/composite_expectation.rb b/lib/flexmock/composite_expectation.rb
+index 370046f..fbc8e54 100644
+--- a/lib/flexmock/composite_expectation.rb
++++ b/lib/flexmock/composite_expectation.rb
+@@ -16,9 +16,9 @@ def add(expectation)
+     end
+ 
+     # Apply the constraint method to all expectations in the composite.
+-    def method_missing(sym, *args, &block)
++    def method_missing(sym, *args, **keywords, &block)
+       @expectations.each do |expectation|
+-        expectation.send(sym, *args, &block)
++        expectation.send(sym, *args, **keywords, &block)
+       end
+       self
+     end
diff --git a/dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-2.patch b/dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-2.patch
new file mode 100644
index 000000000000..f7964b072df9
--- /dev/null
+++ b/dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-2.patch
@@ -0,0 +1,25 @@
+From b3a2d7984803d70778c1f585ca48fb1fd374e44c Mon Sep 17 00:00:00 2001
+From: Daniel Leidert <dleidert@debian.org>
+Date: Mon, 22 Nov 2021 01:34:48 +0100
+Subject: [PATCH] Use binding.source_location for test
+
+Fixes the warning:
+
+    warning: __FILE__ in eval may not return location in binding; use Binding#source_location instead
+---
+ test/test_helper.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test_helper.rb b/test/test_helper.rb
+index 9eb3310..c4fd622 100644
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -50,7 +50,7 @@ def assert_failure(klass, options={}, &block)
+     # added.
+     def assert_mock_failure(klass, options={}, &block)
+       ex = assert_failure(klass, options, &block)
+-      file = eval("__FILE__", block.binding)
++      file = block.binding.source_location.first
+       assert_matching_line(ex, file, options)
+     end
+ 
diff --git a/dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-3.patch b/dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-3.patch
new file mode 100644
index 000000000000..2e69627c5060
--- /dev/null
+++ b/dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-3.patch
@@ -0,0 +1,23 @@
+From 8a4be2142b37a6ab4b6b8a3f38a07f2b06752acf Mon Sep 17 00:00:00 2001
+From: Daniel Leidert <dleidert@debian.org>
+Date: Mon, 22 Nov 2021 01:35:53 +0100
+Subject: [PATCH] Relax error message on test a bit
+
+---
+ test/partial_mock_test.rb | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/test/partial_mock_test.rb b/test/partial_mock_test.rb
+index 065ecb5..3564db3 100644
+--- a/test/partial_mock_test.rb
++++ b/test/partial_mock_test.rb
+@@ -634,7 +634,8 @@ def test_partial_mocks_leaves_NoMethodError_exceptions_raised_by_the_original_me
+     exception = assert_raises(NameError) do
+         obj.mocked_method
+     end
+-    assert_equal "undefined method `does_not_exist' for #{obj}", exception.message
++    assert(/undefined method `does_not_exist' for #<#<Class:/ === exception.message, 
++        "expected #{exception.message} to match /undefined method `does_not_exist' for #<#<Class:/")
+   end
+ 
+   def test_it_checks_whether_mocks_are_forbidden_before_forwarding_the_call
diff --git a/dev-ruby/flexmock/flexmock-2.3.6-r1.ebuild b/dev-ruby/flexmock/flexmock-2.3.6-r1.ebuild
deleted file mode 100644
index eb003c501dc1..000000000000
--- a/dev-ruby/flexmock/flexmock-2.3.6-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="html"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*.rdoc doc/releases/*"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_GEMSPEC="flexmock.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple mock object library for Ruby unit testing"
-HOMEPAGE="https://github.com/doudou/flexmock"
-SRC_URI="https://github.com/doudou/flexmock/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="flexmock"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5
-		dev-ruby/rspec:3
-	)"
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec test/rspec_integration
-	${RUBY} -Ilib:.:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
-
-all_ruby_prepare() {
-	sed -i -e '1igem "minitest", "~>5.0"' test/test_helper.rb || die
-
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/flexmock/flexmock-2.3.6-r2.ebuild b/dev-ruby/flexmock/flexmock-2.3.6-r2.ebuild
new file mode 100644
index 000000000000..bfb09746a1b0
--- /dev/null
+++ b/dev-ruby/flexmock/flexmock-2.3.6-r2.ebuild
@@ -0,0 +1,44 @@
+# 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_DOCDIR="html"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*.rdoc doc/releases/*"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_GEMSPEC="flexmock.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple mock object library for Ruby unit testing"
+HOMEPAGE="https://github.com/doudou/flexmock"
+SRC_URI="https://github.com/doudou/flexmock/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="flexmock"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/flexmock-2.3.6-ruby30-{1,2,3}.patch )
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/minitest:5
+		dev-ruby/rspec:3
+	)"
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec test/rspec_integration
+	${RUBY} -Ilib:.:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
+
+all_ruby_prepare() {
+	sed -i -e '1igem "minitest", "~>5.0"' test/test_helper.rb || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/flexmock/flexmock-2.3.8.ebuild b/dev-ruby/flexmock/flexmock-2.3.8.ebuild
new file mode 100644
index 000000000000..76e598d0464d
--- /dev/null
+++ b/dev-ruby/flexmock/flexmock-2.3.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="html"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*.rdoc doc/releases/*"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_GEMSPEC="flexmock.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple mock object library for Ruby unit testing"
+HOMEPAGE="https://github.com/doudou/flexmock"
+SRC_URI="https://github.com/doudou/flexmock/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="flexmock"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/flexmock-2.3.6-ruby30-{1,2,3}.patch )
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/minitest:5
+		dev-ruby/rspec:3
+	)"
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec test/rspec_integration
+	MT_NO_PLUGINS=1 ${RUBY} -Ilib:.:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
+
+all_ruby_prepare() {
+	sed -i -e '1igem "minitest", "~>5.0"' test/test_helper.rb || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/flickraw/Manifest b/dev-ruby/flickraw/Manifest
deleted file mode 100644
index cd531c18e8a7..000000000000
--- a/dev-ruby/flickraw/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST flickraw-0.9.10.gem 19456 BLAKE2B f57d9ff600e3decdf473b86a66f7ce0ba5c1607bd2f54171f5d0793b255dc6ac6367b015cc36c113164061c8005ce18938216af2aaecf184656fafe285af4b6c SHA512 a4686f7134cb9b7d1ad7ee952137dd0e9e9653a682ba4d6e9b2b65bef6cbebee23e19970e2042bdb14860a91a07a28ce11952608231c301e086ff88652f39411
diff --git a/dev-ruby/flickraw/flickraw-0.9.10.ebuild b/dev-ruby/flickraw/flickraw-0.9.10.ebuild
deleted file mode 100644
index c069de399e24..000000000000
--- a/dev-ruby/flickraw/flickraw-0.9.10.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# Tests are against the Flickr API and require an API key.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="-r README.rdoc examples"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library to access flickr api in a simple way"
-HOMEPAGE="https://github.com/hanklords/flickraw"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/flickraw/metadata.xml b/dev-ruby/flickraw/metadata.xml
deleted file mode 100644
index 08261bd7a09e..000000000000
--- a/dev-ruby/flickraw/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">hanklords/flickraw</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/flog/Manifest b/dev-ruby/flog/Manifest
index 698f560d180c..2b6b526378cf 100644
--- a/dev-ruby/flog/Manifest
+++ b/dev-ruby/flog/Manifest
@@ -1,2 +1 @@
-DIST flog-4.6.4.gem 26624 BLAKE2B 27090f9a47619b63c8c34e0d6992c1d0ff29193a7de3af839d72d5754c2b149f38c1c1e3caec981170c408123bc38e3fc3e38e87fb9a83818e1cb356d31070c3 SHA512 495601bfc560c2d18973234c41706aa07b76ea95bc3803f93fb16b42ae071b65fc9a1c36e8d4a9bfaf3c88a1167ab714f4bbc7a982b9e606aa799f8480a23f4d
-DIST flog-4.6.5.gem 26624 BLAKE2B c1cf4377be7a2b9856e4f370b6a559ac1ebac6aba7da28bd6a27bb84fe8df613680cb7c96e3d30e42d30011b97309c60e7f4bec2c322bcc3b2ed8ad5f93172a1 SHA512 81eaf3871f6111b442fb82371720709073f00a17044885e85498e7f943e1c9f8b5345ae8ff06a56ff68db8919ee0e696284bf017b1e1e66d76419306bed90866
+DIST flog-4.8.0.gem 27136 BLAKE2B 8d7da0df6435e2320f2ea78f405a57d0f3867ad12b42891bff2a0012c489d3b7b426fa6d9dfc7bbe81586d6766c00b66e0de20593b157f200180c304f562b230 SHA512 fedc774a62cc0550ce7b12e36fe1633813fce6d6f1efd9077ecddb465245ce9b22ac3e942370f36030107e038311fea382bbccef6ba006f013d828b4a7e1a68c
diff --git a/dev-ruby/flog/flog-4.6.4.ebuild b/dev-ruby/flog/flog-4.6.4.ebuild
deleted file mode 100644
index 3d36c1b55794..000000000000
--- a/dev-ruby/flog/flog-4.6.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Flog reports the most tortured code in an easy to read pain report"
-HOMEPAGE="https://ruby.sadi.st/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-ruby_add_rdepend "
-	dev-ruby/path_expander:1
-	>dev-ruby/ruby_parser-3.1.0:3
-	>=dev-ruby/sexp_processor-4.8:4"
-
-each_ruby_test() {
-	${RUBY} -Ilib test/test_flog.rb || die
-}
diff --git a/dev-ruby/flog/flog-4.6.5.ebuild b/dev-ruby/flog/flog-4.6.5.ebuild
deleted file mode 100644
index b2b88b559e64..000000000000
--- a/dev-ruby/flog/flog-4.6.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Flog reports the most tortured code in an easy to read pain report"
-HOMEPAGE="https://ruby.sadi.st/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-ruby_add_rdepend "
-	dev-ruby/path_expander:1
-	>dev-ruby/ruby_parser-3.1.0:3
-	>=dev-ruby/sexp_processor-4.8:4"
-
-each_ruby_test() {
-	${RUBY} -Ilib test/test_flog.rb || die
-}
diff --git a/dev-ruby/flog/flog-4.8.0.ebuild b/dev-ruby/flog/flog-4.8.0.ebuild
new file mode 100644
index 000000000000..26982ce10d00
--- /dev/null
+++ b/dev-ruby/flog/flog-4.8.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Flog reports the most tortured code in an easy to read pain report"
+HOMEPAGE="https://ruby.sadi.st/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+ruby_add_rdepend "
+	dev-ruby/path_expander:1
+	>dev-ruby/ruby_parser-3.1.0:3
+	>=dev-ruby/sexp_processor-4.8:4"
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_flog.rb || die
+}
diff --git a/dev-ruby/flog/metadata.xml b/dev-ruby/flog/metadata.xml
index 658c72b1920d..fe5c4cfffa11 100644
--- a/dev-ruby/flog/metadata.xml
+++ b/dev-ruby/flog/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">seattlerb/flog</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.8.ebuild b/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.8.ebuild
index c7c5f0afb6cd..483d1c421883 100644
--- a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.8.ebuild
+++ b/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/forgery/forgery-0.8.1-r1.ebuild b/dev-ruby/forgery/forgery-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..9df1b010a15c
--- /dev/null
+++ b/dev-ruby/forgery/forgery-0.8.1-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Easy and customizable generation of forged data"
+HOMEPAGE="https://github.com/sevenwire/forgery"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/forgery/forgery-0.8.1.ebuild b/dev-ruby/forgery/forgery-0.8.1.ebuild
deleted file mode 100644
index 66650e553d57..000000000000
--- a/dev-ruby/forgery/forgery-0.8.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Easy and customizable generation of forged data"
-HOMEPAGE="https://github.com/sevenwire/forgery"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/forwardable-extended/forwardable-extended-2.6.0-r2.ebuild b/dev-ruby/forwardable-extended/forwardable-extended-2.6.0-r2.ebuild
index d17d2b52e61b..e5b8d89aba4c 100644
--- a/dev-ruby/forwardable-extended/forwardable-extended-2.6.0-r2.ebuild
+++ b/dev-ruby/forwardable-extended/forwardable-extended-2.6.0-r2.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/forwardable/Manifest b/dev-ruby/forwardable/Manifest
new file mode 100644
index 000000000000..bea83260043c
--- /dev/null
+++ b/dev-ruby/forwardable/Manifest
@@ -0,0 +1 @@
+DIST forwardable-1.3.3.tar.gz 18044 BLAKE2B 41e3299698d6c48c18a2d5468fd446154eb2813d90d05b1e2531ad48cfe2a3bc27a8b33cf7818c3c46d25ddbc1c0e61ee6d755019d68363e31fae469c3b696a0 SHA512 fe388c3377aea76d350da1a140a09a522a405307ce2566160f1dbe7d2bb46612b57fe9d3c516684402586f20a4b510ada762809192ca81dedb7a251906e56ed7
diff --git a/dev-ruby/forwardable/forwardable-1.3.3.ebuild b/dev-ruby/forwardable/forwardable-1.3.3.ebuild
new file mode 100644
index 000000000000..773e6f093d81
--- /dev/null
+++ b/dev-ruby/forwardable/forwardable-1.3.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="forwardable.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides delegation of specified methods to a designated object"
+HOMEPAGE="https://github.com/ruby/forwardable"
+SRC_URI="https://github.com/ruby/forwardable/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/forwardable/metadata.xml b/dev-ruby/forwardable/metadata.xml
new file mode 100644
index 000000000000..2e65848d57fc
--- /dev/null
+++ b/dev-ruby/forwardable/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/forwardable</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/fuubar/Manifest b/dev-ruby/fuubar/Manifest
index 8c52a4df37fe..1fd2ffa92753 100644
--- a/dev-ruby/fuubar/Manifest
+++ b/dev-ruby/fuubar/Manifest
@@ -1,2 +1 @@
-DIST fuubar-2.5.0.tar.gz 32763 BLAKE2B 841f85cc867a8215e00f720f2ffc25aaa5444ee6536cd17663b789d7a947e957987f3b60659828d310c0fd816abfedd9c7ef90effe37b6f847ac119a41f134a1 SHA512 c0ad302516a7eb7df2b574c038068298aece8bc1606adcb81c53bba1f0315a774dd65f5c742586ef2b7f188bc01ea94e0c5a3eb8b3c5f225ad76027340165453
 DIST fuubar-2.5.1.tar.gz 39138 BLAKE2B e36c5a4ca67b9c2cfd6775f554ebf1c027f9b1f24b36cfb1e3c062a07034eee472ff06f750755e7aba9e0b1f4a3704be213b44c9d9cf5c6b50cc1cf24b84c572 SHA512 d3b200690a483f131faeaa0e6164ab4103584324b02a928be1c8845f14984e3695d8cd1cf3b9edf945acbd9876dca879029c04b9d76b0ace4b7d1883c73ca924
diff --git a/dev-ruby/fuubar/fuubar-2.5.0-r1.ebuild b/dev-ruby/fuubar/fuubar-2.5.0-r1.ebuild
deleted file mode 100644
index 43b7fdc1a74b..000000000000
--- a/dev-ruby/fuubar/fuubar-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="fuubar.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Instafailing RSpec progress bar formatter"
-HOMEPAGE="https://github.com/thekompanee/fuubar"
-SRC_URI="https://github.com/thekompanee/fuubar/archive/releases/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="${PN}-releases-v${PV}"
-
-ruby_add_rdepend "dev-ruby/rspec:3 >=dev-ruby/ruby-progressbar-1.4:0"
-
-each_ruby_test() {
-	export CI=true
-	each_fakegem_test
-}
diff --git a/dev-ruby/fuubar/fuubar-2.5.1-r1.ebuild b/dev-ruby/fuubar/fuubar-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..25c375442178
--- /dev/null
+++ b/dev-ruby/fuubar/fuubar-2.5.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="fuubar.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Instafailing RSpec progress bar formatter"
+HOMEPAGE="https://github.com/thekompanee/fuubar"
+SRC_URI="https://github.com/thekompanee/fuubar/archive/releases/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+RUBY_S="${PN}-releases-v${PV}"
+
+ruby_add_rdepend "dev-ruby/rspec:3 >=dev-ruby/ruby-progressbar-1.4:0"
+
+each_ruby_test() {
+	export CI=true
+	each_fakegem_test
+}
diff --git a/dev-ruby/fuubar/fuubar-2.5.1.ebuild b/dev-ruby/fuubar/fuubar-2.5.1.ebuild
deleted file mode 100644
index f40745c62fef..000000000000
--- a/dev-ruby/fuubar/fuubar-2.5.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="fuubar.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Instafailing RSpec progress bar formatter"
-HOMEPAGE="https://github.com/thekompanee/fuubar"
-SRC_URI="https://github.com/thekompanee/fuubar/archive/releases/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="${PN}-releases-v${PV}"
-
-ruby_add_rdepend "dev-ruby/rspec:3 >=dev-ruby/ruby-progressbar-1.4:0"
-
-each_ruby_test() {
-	export CI=true
-	each_fakegem_test
-}
diff --git a/dev-ruby/fuubar/metadata.xml b/dev-ruby/fuubar/metadata.xml
index aeed2283048d..cfcd045aae68 100644
--- a/dev-ruby/fuubar/metadata.xml
+++ b/dev-ruby/fuubar/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">jeffkreeftmeijer/fuubar</remote-id>
+    <remote-id type="github">thekompanee/fuubar</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/gettext-setup/Manifest b/dev-ruby/gettext-setup/Manifest
index 66ad0258d02f..873a7e7bdc28 100644
--- a/dev-ruby/gettext-setup/Manifest
+++ b/dev-ruby/gettext-setup/Manifest
@@ -1 +1 @@
-DIST gettext-setup-0.34.tar.gz 16010 BLAKE2B 3da3810bba89205a0a2856760b7fbe7a415207ccc45a3cd2e8aad658131dc751b1ad44178beaee2d0c67164a5e3e7b1ee0aba1c4e1b099f77643d72aec753de3 SHA512 479e2a79768923796960b45f1e3b3963939a4166c636ad4c3af60840a5c8449fa7fff81271b4c938e5a441146b25fcdd9fd8bb60e1df7ef31bb39efc56577572
+DIST gettext-setup-1.1.0.tar.gz 16333 BLAKE2B a2895113db23c1235bcbc8acc01751a3d6ba0a7eedffb5c912cec21140eed076489fd7933a88a4fce4bcc165119a919c6671cd449b9e8f1984463d8c941174e7 SHA512 1ef7987ac24ca8cc95eb631d81552f35d153fd60132283dc4979473c149df8c09c8ce7a10caf53ff61f59c7c25a3921d3a367264c5a827ed491844b48def2307
diff --git a/dev-ruby/gettext-setup/gettext-setup-0.34-r2.ebuild b/dev-ruby/gettext-setup/gettext-setup-0.34-r2.ebuild
deleted file mode 100644
index af3965179305..000000000000
--- a/dev-ruby/gettext-setup/gettext-setup-0.34-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A gem to ease i18n"
-HOMEPAGE="https://github.com/puppetlabs/gettext-setup-gem"
-SRC_URI="https://github.com/puppetlabs/gettext-setup-gem/archive/${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-gem-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND+=" dev-vcs/git"
-DEPEND+=" test? ( dev-vcs/git )"
-
-ruby_add_rdepend "
-	>=dev-ruby/fast_gettext-1.1.0:0
-	>=dev-ruby/ruby-gettext-3.0.2
-	dev-ruby/locale
-"
-
-all_ruby_prepare() {
-	sed -i -e 's/1.1.0/1.1/' \
-		-e "/'gettext'/ s/, '< 3.3.0'//" \
-		-e "s/spec.version.*$/spec.version = '${PV}'/" ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/simplecov/,/^end/ s:^:#: ; 1irequire "date"' spec/spec_helper.rb || die
-
-	# Avoid spec with specific locale requirements
-	sed -i -e '/can clear the locale/,/^    end/ s:^:#:' spec/lib/gettext-setup/gettext_setup_spec.rb || die
-}
diff --git a/dev-ruby/gettext-setup/gettext-setup-1.1.0.ebuild b/dev-ruby/gettext-setup/gettext-setup-1.1.0.ebuild
new file mode 100644
index 000000000000..fbbb897f2558
--- /dev/null
+++ b/dev-ruby/gettext-setup/gettext-setup-1.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A gem to ease i18n"
+HOMEPAGE="https://github.com/puppetlabs/gettext-setup-gem"
+SRC_URI="https://github.com/puppetlabs/gettext-setup-gem/archive/${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-gem-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+IUSE=""
+
+RDEPEND+=" dev-vcs/git"
+DEPEND+=" test? ( dev-vcs/git )"
+
+ruby_add_rdepend "
+	>=dev-ruby/fast_gettext-2.1:2
+	>=dev-ruby/ruby-gettext-3.4
+	dev-ruby/locale
+"
+
+all_ruby_prepare() {
+	sed -e "s/spec.version.*$/spec.version = '${PV}'/" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/simplecov/,/^end/ s:^:#: ; 1irequire "date"' spec/spec_helper.rb || die
+
+	# Avoid spec with specific locale requirements
+	sed -i -e '/can clear the locale/,/^    end/ s:^:#:' spec/lib/gettext-setup/gettext_setup_spec.rb || die
+}
diff --git a/dev-ruby/gettext_i18n_rails/Manifest b/dev-ruby/gettext_i18n_rails/Manifest
index df3429f2b4ca..a90cabf7b5fe 100644
--- a/dev-ruby/gettext_i18n_rails/Manifest
+++ b/dev-ruby/gettext_i18n_rails/Manifest
@@ -1 +1 @@
-DIST gettext_i18n_rails-1.8.1.tar.gz 21942 BLAKE2B 7925bfad0e1033fd363ca2c376594ba8ca6a7f5c1da940c680acae53e4b3902d7c07828b6023ed208f559af1b9ded7933ffae6b7385e066c0494aa16cc728256 SHA512 711c15620a23c070f47d4846f48b74564bfc23d27e9757936b432c1b3c534121d4cf58101fe533bc58b7d3e33e899134b92cd119e2cd2cd3eb39f54e93e394e0
+DIST gettext_i18n_rails-1.12.0.tar.gz 21003 BLAKE2B 7bd7d290296ebc789fed23cb8c278a734273f5cae1e6958b29d825a1a088a845483d838e59148154c17e3dd25ba7696ed6b88e395d04057315b3953c716c293c SHA512 2934bb458df164881d3d8dbad44d98b34a6f4346331084dc03e47c0db79e2b4378b6f22d31686c6f4800805691ad95af9eac9773f7cb3b8abba2b665d3078670
diff --git a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.12.0.ebuild b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.12.0.ebuild
new file mode 100644
index 000000000000..107e4dbee181
--- /dev/null
+++ b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.12.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="gettext_i18n_rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="FastGettext / Rails integration"
+HOMEPAGE="https://github.com/grosser/gettext_i18n_rails"
+SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-ruby/rails:7.0
+	dev-ruby/activerecord:7.0[sqlite]
+	dev-ruby/temple
+	dev-ruby/ruby-gettext
+	dev-ruby/haml
+	dev-ruby/slim
+)"
+
+ruby_add_rdepend ">=dev-ruby/fast_gettext-0.9.0:*"
+
+all_ruby_prepare() {
+	rm Gemfile Gemfile.lock || die
+
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Remove specs for slim and hamlet, template engines we don't package.
+	rm spec/gettext_i18n_rails/slim_parser_spec.rb spec/gettext_i18n_rails/haml_parser_spec.rb || die
+
+	# Test against specific Rails version
+	sed -e '1igem "rails", "~>7.0.0"' -i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.8.1.ebuild b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.8.1.ebuild
deleted file mode 100644
index 10b80d88e874..000000000000
--- a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.8.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="gettext_i18n_rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="FastGettext / Rails integration"
-HOMEPAGE="https://github.com/grosser/gettext_i18n_rails"
-SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rails:6.0 dev-ruby/activerecord:6.0[sqlite] dev-ruby/temple )"
-ruby_add_rdepend ">=dev-ruby/fast_gettext-0.9.0:*"
-
-all_ruby_prepare() {
-	rm Gemfile Gemfile.lock || die
-
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove specs for slim and hamlet, template engines we don't package.
-	rm spec/gettext_i18n_rails/slim_parser_spec.rb spec/gettext_i18n_rails/haml_parser_spec.rb || die
-
-	# Test against Rails 4.2.0
-	sed -e '1igem "rails", "~>6.0.0"' -i spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/gh/Manifest b/dev-ruby/gh/Manifest
deleted file mode 100644
index 4d4d97594d08..000000000000
--- a/dev-ruby/gh/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gh-0.18.0.tar.gz 129730 BLAKE2B e4e9a3b158daf83f8a0f0a809eff87e169c7a0a23120b9ae002d0fee4be166d3e6a09ef85ed61b35148d4285dc358a8d616e09c71403b85293574f3bfbbf922c SHA512 a265d25984d4c40340d4e80ce615f2f291f5636725e7dcdc181e3351d00fe8c3355148f206807180041f20db7f09bf94f5d279ceb25ea12ec19215640fff7839
diff --git a/dev-ruby/gh/gh-0.18.0.ebuild b/dev-ruby/gh/gh-0.18.0.ebuild
deleted file mode 100644
index 8bdd3083a66c..000000000000
--- a/dev-ruby/gh/gh-0.18.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="gh.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="multi-layer client for the github api v3"
-HOMEPAGE="https://github.com/travis-ci/gh"
-SRC_URI="https://github.com/travis-ci/gh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "
-	dev-ruby/webmock
-"
-
-ruby_add_rdepend "
-	dev-ruby/activesupport:5.2
-	>=dev-ruby/addressable-2.4.0:0
-	dev-ruby/faraday:1
-	dev-ruby/faraday_middleware:1
-	>dev-ruby/multi_json-1.0
-	dev-ruby/net-http-pipeline
-	>=dev-ruby/net-http-persistent-2.9:*
-"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/net-http-persistent/ s/~> 2.9/>= 2.9/' \
-		-e 's/git ls-files/find/' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-}
diff --git a/dev-ruby/gh/metadata.xml b/dev-ruby/gh/metadata.xml
deleted file mode 100644
index 9d18cc15b04f..000000000000
--- a/dev-ruby/gh/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">travis-ci/gh</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/gherkin/Manifest b/dev-ruby/gherkin/Manifest
deleted file mode 100644
index c953982a2e97..000000000000
--- a/dev-ruby/gherkin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gherkin-5.1.0.gem 29696 BLAKE2B 2439b82a147a546e8df71e11996f9560a8720580e07795542fc81781449b483a42e54251f3d0dd3482331773b1cada1d61b468bfcec2a9464ee2542eef2ed13e SHA512 d935ccceaec493736f337a4c3db69909858d15f4c41e93ecfc6ca31a30fc48eec1cecbe71d455265e1062006f49f05461c9860c9b3cc4806bb25f42dec6f504e
diff --git a/dev-ruby/gherkin/gherkin-5.1.0.ebuild b/dev-ruby/gherkin/gherkin-5.1.0.ebuild
deleted file mode 100644
index fb6de66d1c2e..000000000000
--- a/dev-ruby/gherkin/gherkin-5.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-# Don't install support scripts to avoid slot collisions.
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Fast Gherkin lexer and parser"
-HOMEPAGE="https://github.com/cucumber/gherkin"
-LICENSE="MIT"
-
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
-SLOT="5"
-IUSE=""
diff --git a/dev-ruby/gherkin/metadata.xml b/dev-ruby/gherkin/metadata.xml
deleted file mode 100644
index 0dedc164975c..000000000000
--- a/dev-ruby/gherkin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">cucumber/gherkin</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/gist/gist-6.0.0-r1.ebuild b/dev-ruby/gist/gist-6.0.0-r1.ebuild
new file mode 100644
index 000000000000..ade2a3180d1a
--- /dev/null
+++ b/dev-ruby/gist/gist-6.0.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Potentially the best command line gister"
+HOMEPAGE="https://github.com/defunkt/gist"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# dev-python/txgithub also installs a 'gist' binary.
+RDEPEND="!dev-python/txgithub"
+
+ruby_add_bdepend "test? ( dev-ruby/webmock )"
diff --git a/dev-ruby/gist/gist-6.0.0.ebuild b/dev-ruby/gist/gist-6.0.0.ebuild
deleted file mode 100644
index cb8d1ae3d382..000000000000
--- a/dev-ruby/gist/gist-6.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Potentially the best command line gister"
-HOMEPAGE="https://github.com/defunkt/gist"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-# dev-python/txgithub also installs a 'gist' binary.
-RDEPEND="!dev-python/txgithub"
-
-ruby_add_bdepend "test? ( dev-ruby/webmock )"
diff --git a/dev-ruby/git/Manifest b/dev-ruby/git/Manifest
index 6ff924a106bc..68fbbb58db3d 100644
--- a/dev-ruby/git/Manifest
+++ b/dev-ruby/git/Manifest
@@ -1,2 +1,3 @@
-DIST git-1.10.2.tar.gz 212738 BLAKE2B 4059066fac1a22e8f19ecce1ebaed648fedc30767b91cb38cf9cf4c9f7091f55f5e9682183e188357dd12ed06dc1ad905d9b688db0c536623487e3c5431ba6f8 SHA512 5d8150a8f974c9b9f531d169e2899b311965a9e9d48d1e45c8bb778a48ea0887ccecf7681baf7cbfad4d22509ba0aafb9886559565e918b84f740b3da7430d86
-DIST git-1.11.0.tar.gz 214161 BLAKE2B 69471f89fddf18bf31d74e318141046395281ba64de1f91fd49cb866508dca9cf7c568c113ed7d7e928bf1d7dfdb0e130a193d4069b87155a4dbc046d6dd6ce9 SHA512 a71da8890622b6ad5a341908e968040ef6c00e2f9edd0bfee1a0c1e9f110cc12b9c01015605b0fb902fdf04fab6011adfbffcf5e8f853c550bff7c263d2e6bd6
+DIST git-1.18.0.tar.gz 175341 BLAKE2B 5a8dee1fef79c0386c59d37f37f2249c72600f2f11dbf2cc2c5bf63ff91f068c9c3164d24c2670585e8261d890f07b998255ddb80ce35ce53de09f402a4ec9e3 SHA512 520886b23758229cf25bfdd17e9d86e53d62feb6b2b3c155efe493db42d2f247a29bd629ff6c80ffa599ad429bcb6f09e44b015eeeecf9d9a5f4ee6ab3f1a265
+DIST git-1.19.0.tar.gz 177079 BLAKE2B 663d6303a49315567cbac77b4acfea10e24f1c61f1e1bb6d5807681eee03633edadcac9453ea4d919d3ad8b14fc0301b03e69033427b58d46b776caabd418cd9 SHA512 1935bd6bac26b46cd8563d6545bb7e4712636469624d11089bc5a7f716ee4a0f1e217167e6d0c6023a7ea4ef1644d93431bcdbd28d2a947589c288c0280a1286
+DIST git-1.19.1.tar.gz 177887 BLAKE2B 0da2a829679fd4e2d4b3aec5e88f421d221593729b827f2207bc3d26ce290ee2a41e8dde33b81138cf9df75fa1d1316fa5c69318a1247c627889f5c6971b8fd6 SHA512 4fb27cc2c59d15b0424ac16accc13d2310fec0710815b8deee399767b3cd9707cdf767a301cae271b4cd1ff6718cb955a6c86a9ea99076aaffbbadf595c64c0c
diff --git a/dev-ruby/git/git-1.10.2.ebuild b/dev-ruby/git/git-1.10.2.ebuild
deleted file mode 100644
index d643d9294e7c..000000000000
--- a/dev-ruby/git/git-1.10.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="git.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for using Git in Ruby"
-HOMEPAGE="https://github.com/schacon/ruby-git"
-SRC_URI="https://github.com/schacon/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="ruby-git-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
-RDEPEND+=">=dev-vcs/git-1.6.0.0"
-
-ruby_add_rdepend ">=dev-ruby/rchardet-1.8:1"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/minitar dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Don't use hardcoded /tmp directory.
-	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
-
-	sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	git config --global user.email "git@example.com" || die
-	git config --global user.name "GitExample" || die
-	${RUBY} -Ilib:.:test -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/git/git-1.11.0.ebuild b/dev-ruby/git/git-1.11.0.ebuild
deleted file mode 100644
index 6029dfa5687c..000000000000
--- a/dev-ruby/git/git-1.11.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="git.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for using Git in Ruby"
-HOMEPAGE="https://github.com/schacon/ruby-git"
-SRC_URI="https://github.com/schacon/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="ruby-git-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
-RDEPEND+=">=dev-vcs/git-1.6.0.0"
-
-ruby_add_rdepend ">=dev-ruby/rchardet-1.8:1"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/minitar dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Don't use hardcoded /tmp directory.
-	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
-
-	sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	git config --global user.email "git@example.com" || die
-	git config --global user.name "GitExample" || die
-	${RUBY} -Ilib:.:test -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/git/git-1.18.0.ebuild b/dev-ruby/git/git-1.18.0.ebuild
new file mode 100644
index 000000000000..a697294543e8
--- /dev/null
+++ b/dev-ruby/git/git-1.18.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="git.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for using Git in Ruby"
+HOMEPAGE="https://github.com/ruby-git/ruby-git"
+SRC_URI="https://github.com/ruby-git/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-git-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
+RDEPEND+=">=dev-vcs/git-1.6.0.0"
+
+ruby_add_rdepend ">=dev-ruby/addressable-2.8:0 >=dev-ruby/rchardet-1.8:1"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/minitar dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	# Don't use hardcoded /tmp directory.
+	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
+
+	sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	git config --global user.email "git@example.com" || die
+	git config --global user.name "GitExample" || die
+	${RUBY} -Ilib:.:tests -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/git/git-1.19.0.ebuild b/dev-ruby/git/git-1.19.0.ebuild
new file mode 100644
index 000000000000..86a5200e027c
--- /dev/null
+++ b/dev-ruby/git/git-1.19.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="git.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for using Git in Ruby"
+HOMEPAGE="https://github.com/ruby-git/ruby-git"
+SRC_URI="https://github.com/ruby-git/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-git-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
+RDEPEND+=">=dev-vcs/git-1.6.0.0"
+
+ruby_add_rdepend ">=dev-ruby/addressable-2.8:0 >=dev-ruby/rchardet-1.8:1"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/minitar dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	# Don't use hardcoded /tmp directory.
+	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
+
+	sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	git config --global user.email "git@example.com" || die
+	git config --global user.name "GitExample" || die
+	${RUBY} -Ilib:.:tests -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/git/git-1.19.1.ebuild b/dev-ruby/git/git-1.19.1.ebuild
new file mode 100644
index 000000000000..36d7c68160a4
--- /dev/null
+++ b/dev-ruby/git/git-1.19.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="git.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for using Git in Ruby"
+HOMEPAGE="https://github.com/ruby-git/ruby-git"
+SRC_URI="https://github.com/ruby-git/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-git-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
+RDEPEND+=">=dev-vcs/git-1.6.0.0"
+
+ruby_add_rdepend ">=dev-ruby/addressable-2.8:0 >=dev-ruby/rchardet-1.8:1"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/minitar >=dev-ruby/mocha-2.1:2 dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	# Don't use hardcoded /tmp directory.
+	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
+
+	sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	git config --global user.email "git@example.com" || die
+	git config --global user.name "GitExample" || die
+	${RUBY} -Ilib:.:tests -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/git/metadata.xml b/dev-ruby/git/metadata.xml
index acb202879d0a..386acdbeb589 100644
--- a/dev-ruby/git/metadata.xml
+++ b/dev-ruby/git/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">schacon/ruby-git</remote-id>
+    <remote-id type="github">ruby-git/ruby-git</remote-id>
+    <remote-id type="rubygems">git</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/globalid/Manifest b/dev-ruby/globalid/Manifest
index 9cc8470a3269..4d9e9499dfe2 100644
--- a/dev-ruby/globalid/Manifest
+++ b/dev-ruby/globalid/Manifest
@@ -1,2 +1,2 @@
-DIST globalid-0.6.0.tar.gz 20908 BLAKE2B 764d25ffb216ad73098c86aaa0ebbef412e6e97ff36beb0ad780e2613e41ed1404b1c93c27332cb3f85d29c774f243bf77caa44c179433057e92320acb8bf838 SHA512 5adc8035a10942318825c348dde8cc988255962b00d96df0f1aa7eebfa316e2637a7f5c79af559661c02837b0690e5e9c4a8cc3f4ee58ac75a6b180397485e0f
-DIST globalid-1.0.0.tar.gz 20916 BLAKE2B 4e932269cce13d319bb44ee8da878fd94d95a82badf67a8f3aa7f5c2064a401e9aaa743cbd763305de65dea242c4e8316c742a8c24e3f1a06b30a799578372f1 SHA512 228c672aa2934a726677e11a90124767f302910791153b68024aa8b44921f2ed1444903ac592c46240f19c9dae25c170405ac2a21fc269c573b066d4cd34b04d
+DIST globalid-1.1.0.tar.gz 21131 BLAKE2B 74f49046e84421df1ae4640cf1ecc23d6c09d4a7176583a4662fa89b031ec9c142c09d13b90dfd40cb23417aec3285a93366f975600b2b52b11a62f62878b313 SHA512 42d6fbdaa4de42da6677d620420c96989ed358197b36f4f0e4b4304a4c8a0f2df7d91c0de84381fb0fec87c213d3ba00335e95d92ae2bce59fe7ac7863219c1d
+DIST globalid-1.2.1.tar.gz 24210 BLAKE2B 0cd47d65b6af78b9201ba4300820f94c126e5e69683b87503967a8b7887b9638693d51a9a1d20277dc5678ca925c567d29ed21dc1805825386fe028ddc475074 SHA512 35f3252afd41226a3dd728238be226a1f2ebb62ca853874fdf35e296dd807603319105117d4585df98cdb577efda9166fc5e5733b7af5bea7073d5c44ddec2c1
diff --git a/dev-ruby/globalid/globalid-0.6.0.ebuild b/dev-ruby/globalid/globalid-0.6.0.ebuild
deleted file mode 100644
index 8795d175a2a6..000000000000
--- a/dev-ruby/globalid/globalid-0.6.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-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 ~hppa ~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/globalid/globalid-1.0.0-r1.ebuild b/dev-ruby/globalid/globalid-1.0.0-r1.ebuild
deleted file mode 100644
index c685e133c73d..000000000000
--- a/dev-ruby/globalid/globalid-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-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 ~hppa ~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/globalid/globalid-1.0.0.ebuild b/dev-ruby/globalid/globalid-1.0.0.ebuild
deleted file mode 100644
index 8795d175a2a6..000000000000
--- a/dev-ruby/globalid/globalid-1.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-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 ~hppa ~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/globalid/globalid-1.1.0-r1.ebuild b/dev-ruby/globalid/globalid-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..fc707554e48d
--- /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 ~hppa ~ppc ~ppc64 ~riscv ~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/globalid/globalid-1.2.1.ebuild b/dev-ruby/globalid/globalid-1.2.1.ebuild
new file mode 100644
index 000000000000..e2577102b660
--- /dev/null
+++ b/dev-ruby/globalid/globalid-1.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-6.1 >=dev-ruby/railties-6.1 )"
+ruby_add_rdepend ">=dev-ruby/activesupport-6.1:*"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+}
diff --git a/dev-ruby/gnuplot/gnuplot-2.6.2-r3.ebuild b/dev-ruby/gnuplot/gnuplot-2.6.2-r3.ebuild
index b8592af4af13..1c990f2def76 100644
--- a/dev-ruby/gnuplot/gnuplot-2.6.2-r3.ebuild
+++ b/dev-ruby/gnuplot/gnuplot-2.6.2-r3.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="AUTHORS.txt ChangeLog README.textile"
diff --git a/dev-ruby/google-protobuf/Manifest b/dev-ruby/google-protobuf/Manifest
index a228c5713971..d9db4ae1c0eb 100644
--- a/dev-ruby/google-protobuf/Manifest
+++ b/dev-ruby/google-protobuf/Manifest
@@ -1,2 +1,2 @@
-DIST google-protobuf-3.14.0-ruby.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5 SHA512 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11
-DIST google-protobuf-3.19.3-ruby.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
+DIST google-protobuf-3.21.12-ruby.tar.gz 5141502 BLAKE2B 2e57a401b6fc86dff2af54e3d1a32db87f6c54fed46e557964c01c2d87f333ca94dafbe2d7d9cf279ac67d53219ae0154c5a1ea5cb90cdcf72d3576cefc44653 SHA512 152f8441c325e808b942153c15e82fdb533d5273b50c25c28916ec568ada880f79242bb61ee332ac5fb0d20f21239ed6f8de02ef6256cc574b1fc354d002c6b0
+DIST google-protobuf-3.24.4-ruby.tar.gz 5179247 BLAKE2B f3b53769f31a0fc9151e90b133c836127e745f9f0c591b0d4e476ab50a6b7ca21562169bdedcd6637961131ef39484d2c945dd83d01a3839cca7f0555144d3a8 SHA512 19b8aa89647fa14b4716cfeed289233bed65be2417d9f7e2b1082975a4753e5a1f091eb36ad7cff159d125b01bfe005e2911ebda896f15cba58299e340487518
diff --git a/dev-ruby/google-protobuf/google-protobuf-3.14.0.ebuild b/dev-ruby/google-protobuf/google-protobuf-3.14.0.ebuild
deleted file mode 100644
index a59259f3ae89..000000000000
--- a/dev-ruby/google-protobuf/google-protobuf-3.14.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/google/protobuf_c/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/google
-
-inherit ruby-fakegem
-
-DESCRIPTION="Protocol Buffers are Google's data interchange format"
-HOMEPAGE="https://developers.google.com/protocol-buffers"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}-ruby.tar.gz"
-RUBY_S="protobuf-${PV}/ruby"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND+=" test? ( >=dev-libs/protobuf-3.12.0 )"
-
-all_ruby_prepare() {
-	sed -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/^  end/ s:^:#:' \
-		-e 's:../src/protoc:protoc:' \
-		-e 's/:compile,//' \
-		-i Rakefile || die
-}
diff --git a/dev-ruby/google-protobuf/google-protobuf-3.19.3.ebuild b/dev-ruby/google-protobuf/google-protobuf-3.19.3.ebuild
deleted file mode 100644
index a2c1a888a26a..000000000000
--- a/dev-ruby/google-protobuf/google-protobuf-3.19.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/google/protobuf_c/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/google
-
-inherit ruby-fakegem
-
-DESCRIPTION="Protocol Buffers are Google's data interchange format"
-HOMEPAGE="https://developers.google.com/protocol-buffers"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}-ruby.tar.gz"
-RUBY_S="protobuf-${PV}/ruby"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND+=" test? ( >=dev-libs/protobuf-3.19.0 )"
-
-all_ruby_prepare() {
-	sed -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/^  end/ s:^:#:' \
-		-e 's:../src/protoc:protoc:' \
-		-e 's/:compile,//' \
-		-e '/:test/ s/:build,//' \
-		-i Rakefile || die
-}
diff --git a/dev-ruby/google-protobuf/google-protobuf-3.21.12.ebuild b/dev-ruby/google-protobuf/google-protobuf-3.21.12.ebuild
new file mode 100644
index 000000000000..701738e78dc1
--- /dev/null
+++ b/dev-ruby/google-protobuf/google-protobuf-3.21.12.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/google/protobuf_c/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/google
+
+inherit ruby-fakegem
+
+DESCRIPTION="Protocol Buffers are Google's data interchange format"
+HOMEPAGE="https://protobuf.dev/"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}-ruby.tar.gz"
+RUBY_S="protobuf-${PV}/ruby"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND+=" >=dev-libs/protobuf-3.21.0"
+
+all_ruby_prepare() {
+	sed -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^  end/ s:^:#:' \
+		-e 's:../src/protoc:protoc:' \
+		-e 's/:compile,//' \
+		-e '/:test/ s/:build,//' \
+		-i Rakefile || die
+}
+
+each_ruby_prepare() {
+	${RUBY} -S rake genproto || die
+}
diff --git a/dev-ruby/google-protobuf/google-protobuf-3.24.4.ebuild b/dev-ruby/google-protobuf/google-protobuf-3.24.4.ebuild
new file mode 100644
index 000000000000..e259959da05c
--- /dev/null
+++ b/dev-ruby/google-protobuf/google-protobuf-3.24.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/google/protobuf_c/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/google
+
+inherit ruby-fakegem
+
+DESCRIPTION="Protocol Buffers are Google's data interchange format"
+HOMEPAGE="https://protobuf.dev/"
+SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}-ruby.tar.gz"
+RUBY_S="protobuf-${PV}/ruby"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND+=" >=dev-libs/protobuf-3.21.0"
+
+all_ruby_prepare() {
+	sed -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^  end/ s:^:#:' \
+		-e 's:../src/protoc:protoc:' \
+		-e 's/:compile,//' \
+		-e '/:test/ s/:build,//' \
+		-i Rakefile || die
+}
+
+each_ruby_prepare() {
+	${RUBY} -S rake genproto || die
+}
diff --git a/dev-ruby/google-protobuf/metadata.xml b/dev-ruby/google-protobuf/metadata.xml
index 658c72b1920d..1749282789a1 100644
--- a/dev-ruby/google-protobuf/metadata.xml
+++ b/dev-ruby/google-protobuf/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">protocolbuffers/protobuf</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/googleapis-common-protos-types/Manifest b/dev-ruby/googleapis-common-protos-types/Manifest
new file mode 100644
index 000000000000..cd489340579d
--- /dev/null
+++ b/dev-ruby/googleapis-common-protos-types/Manifest
@@ -0,0 +1 @@
+DIST googleapis-common-protos-types-1.8.0.gem 94720 BLAKE2B eccbea68644dfe9a1521e1847e5605d38c39ffc83cfa15556df38e5a90b7b47cb36169310cf47be0b67c9aadcf828151b4d2c6a659200b31ed027807974e3b75 SHA512 5d44a96a59cb8856cd9a936d994d346628d9856230ec528617d48d5fb823945a1c88a12981a0228e0bc1e7c80920383cffaa700b0a030b0cf3b49bdf4ea1fc8c
diff --git a/dev-ruby/googleapis-common-protos-types/googleapis-common-protos-types-1.8.0.ebuild b/dev-ruby/googleapis-common-protos-types/googleapis-common-protos-types-1.8.0.ebuild
new file mode 100644
index 000000000000..37bc83d1db18
--- /dev/null
+++ b/dev-ruby/googleapis-common-protos-types/googleapis-common-protos-types-1.8.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Common protocol buffer types used by Google APIs"
+HOMEPAGE="https://github.com/googleapis/common-protos-ruby"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/google-protobuf-3.18:3
+"
diff --git a/dev-ruby/googleapis-common-protos-types/metadata.xml b/dev-ruby/googleapis-common-protos-types/metadata.xml
new file mode 100644
index 000000000000..e549ffd1f5d3
--- /dev/null
+++ b/dev-ruby/googleapis-common-protos-types/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">googleapis/common-protos-ruby</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/gpgme/Manifest b/dev-ruby/gpgme/Manifest
index ef49f5c2a65f..dfd8d1acceaf 100644
--- a/dev-ruby/gpgme/Manifest
+++ b/dev-ruby/gpgme/Manifest
@@ -1 +1,3 @@
-DIST ruby-gpgme-2.0.20.tar.gz 2801991 BLAKE2B f5d4c58fd9ef38e0e843e3c59e9653166666ce3635cf479fcd007581b6c6c42ce7852bd36542b378e4152bd471af0131685c8a9f1024953f41832a54c477e1ac SHA512 3267cc77b57c22de3e505c34dfb0a8a4a76cda1fe6dbe547dfdb9ca1a75cf949ca75b3718fe6b6190c06dfdddf21d76b0d0a71631e53e4f439284ce7cf95f6df
+DIST ruby-gpgme-2.0.22.tar.gz 3432808 BLAKE2B 1aabd312f588093bff2bb3a308aaac041ebc8f989bab4aa475f74fc0675c6c4fcac474663a8f5b097b8be223b0f01e27f9e49fc014efb650df9742ddcf3fd4df SHA512 644d9640ac2bf6ce1c02747a0fbd0321337c1f3af639d650b8a669c4f835d1c03380644da2d4717a9268df434ebf41fd98388b80c63e8df97b7a23c3c260741e
+DIST ruby-gpgme-2.0.23.tar.gz 3510904 BLAKE2B 2057a6917aac14bfc82c5e718498d5dce507a4c9de4da2e0973eefee76339066c54ebf57201f739faaab118e624416d7b30d24fb4409b37d53f80dd92c2aa825 SHA512 13d9b383ba638ef1cc21870159b4e7bf3e4aa70097649da185ccd3c159247c657eae651c0fc29c2fcd1b1d2965b432b82461a2f2d85f687787f78d34ddce6da9
+DIST ruby-gpgme-2.0.24.tar.gz 3512481 BLAKE2B 69de16ca15088025c8aa5e8a7910d99df11df1e8ba522d16f9b23a89960683555dbdfe238c351532ffb57283c99b4b4c06c570e6c7755e21a40c67d9f9e00214 SHA512 d906cc669b4e55facd13838c711601ce587e197d44cdc614c4972b2fe411c6259fa236d9713e0ff716ab97fa34840feb0b503db298e6b7a3125d3bcce12d7835
diff --git a/dev-ruby/gpgme/gpgme-2.0.20-r2.ebuild b/dev-ruby/gpgme/gpgme-2.0.20-r2.ebuild
deleted file mode 100644
index 5b45be052d93..000000000000
--- a/dev-ruby/gpgme/gpgme-2.0.20-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-ng ruby-fakegem flag-o-matic
-
-DESCRIPTION="Ruby language binding for GnuPG Made Easy"
-HOMEPAGE="https://github.com/ueno/ruby-gpgme"
-SRC_URI="https://github.com/ueno/ruby-gpgme/archive/v${PV}.tar.gz -> ruby-${P}.tar.gz"
-RUBY_S="ruby-${P}"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-crypt/gpgme:="
-DEPEND="${RDEPEND}"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha:0.14 )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(coverall\|bundler\|ruby-debug\|byebug\)/I s:^:#:' \
-		-e '3igem "mocha", "~> 0.14"' \
-		test/test_helper.rb || die
-
-	# Remove failing tests for now. This package was added without
-	# running any tests :-(
-	rm -f test/{ctx,crypto}_test.rb || die
-
-	sed -i -e '/portile/d ; /rubyforge/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	append-flags -fPIC
-	export RUBY_GPGME_USE_SYSTEM_LIBRARIES=1
-	${RUBY} -C ext "${S}/ext/gpgme/extconf.rb" || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -C ext archflag="${LDFLAGS}"
-	cp -f "${S}/ext/gpgme_n.so" "${S}/lib" || die
-}
-
-each_ruby_test() {
-	unset DISPLAY GPG_AGENT_INFO GPG_TTY
-	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/gpgme/gpgme-2.0.20-r3.ebuild b/dev-ruby/gpgme/gpgme-2.0.20-r3.ebuild
deleted file mode 100644
index 27438ef561db..000000000000
--- a/dev-ruby/gpgme/gpgme-2.0.20-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/gpgme/extconf.rb)
-
-inherit ruby-fakegem flag-o-matic
-
-DESCRIPTION="Ruby language binding for GnuPG Made Easy"
-HOMEPAGE="https://github.com/ueno/ruby-gpgme"
-SRC_URI="https://github.com/ueno/ruby-gpgme/archive/v${PV}.tar.gz -> ruby-${P}.tar.gz"
-RUBY_S="ruby-${P}"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-crypt/gpgme:="
-DEPEND="${RDEPEND}"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha:0.14 )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(coverall\|bundler\|ruby-debug\|byebug\)/I s:^:#:' \
-		-e '3igem "mocha", "~> 0.14"' \
-		test/test_helper.rb || die
-
-	# Remove failing tests for now. This package was added without
-	# running any tests :-(
-	rm -f test/{ctx,crypto}_test.rb || die
-
-	sed -i -e '/portile/d ; /rubyforge/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	append-flags -fPIC
-	export RUBY_GPGME_USE_SYSTEM_LIBRARIES=1
-	each_fakegem_configure
-}
-
-each_ruby_test() {
-	unset DISPLAY GPG_AGENT_INFO GPG_TTY
-	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/gpgme/gpgme-2.0.22.ebuild b/dev-ruby/gpgme/gpgme-2.0.22.ebuild
new file mode 100644
index 000000000000..46c30017dfc9
--- /dev/null
+++ b/dev-ruby/gpgme/gpgme-2.0.22.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/gpgme/extconf.rb)
+
+inherit ruby-fakegem flag-o-matic
+
+DESCRIPTION="Ruby language binding for GnuPG Made Easy"
+HOMEPAGE="https://github.com/ueno/ruby-gpgme"
+SRC_URI="https://github.com/ueno/ruby-gpgme/archive/v${PV}.tar.gz -> ruby-${P}.tar.gz"
+RUBY_S="ruby-${P}"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-crypt/gpgme-1.18.0:=
+	>=dev-libs/libassuan-2.5.5
+	>=dev-libs/libgpg-error-1.16
+"
+DEPEND="${RDEPEND}"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha:0.14 )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(coverall\|bundler\|ruby-debug\|byebug\)/I s:^:#:' \
+		-e '3igem "mocha", "~> 0.14"' \
+		test/test_helper.rb || die
+
+	# Remove failing tests for now. This package was added without
+	# running any tests :-(
+	rm -f test/{ctx,crypto}_test.rb || die
+
+	sed -i -e '/portile/d ; /rubyforge/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	append-flags -fPIC
+	export RUBY_GPGME_USE_SYSTEM_LIBRARIES=1
+	each_fakegem_configure
+}
+
+each_ruby_test() {
+	unset DISPLAY GPG_AGENT_INFO GPG_TTY
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/gpgme/gpgme-2.0.23.ebuild b/dev-ruby/gpgme/gpgme-2.0.23.ebuild
new file mode 100644
index 000000000000..4790a69fa6b2
--- /dev/null
+++ b/dev-ruby/gpgme/gpgme-2.0.23.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/gpgme/extconf.rb)
+
+inherit ruby-fakegem flag-o-matic
+
+DESCRIPTION="Ruby language binding for GnuPG Made Easy"
+HOMEPAGE="https://github.com/ueno/ruby-gpgme"
+SRC_URI="https://github.com/ueno/ruby-gpgme/archive/v${PV}.tar.gz -> ruby-${P}.tar.gz"
+RUBY_S="ruby-${P}"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-crypt/gpgme-1.18.0:=
+	>=dev-libs/libassuan-2.5.6
+	>=dev-libs/libgpg-error-1.47
+"
+DEPEND="${RDEPEND}"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha:0.14 dev-ruby/minitest:5.15 )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(coverall\|bundler\|ruby-debug\|byebug\)/I s:^:#:' \
+		-e '3igem "mocha", "~> 0.14"; gem "minitest", "~> 5.15.0"' \
+		test/test_helper.rb || die
+
+	# Remove failing tests for now. This package was added without
+	# running any tests :-(
+	rm -f test/{ctx,crypto}_test.rb || die
+
+	sed -i -e '/portile/d ; /rubyforge/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	append-flags -fPIC
+	export RUBY_GPGME_USE_SYSTEM_LIBRARIES=1
+	each_fakegem_configure
+}
+
+each_ruby_test() {
+	unset DISPLAY GPG_AGENT_INFO GPG_TTY
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/gpgme/gpgme-2.0.24.ebuild b/dev-ruby/gpgme/gpgme-2.0.24.ebuild
new file mode 100644
index 000000000000..420e02626494
--- /dev/null
+++ b/dev-ruby/gpgme/gpgme-2.0.24.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/gpgme/extconf.rb)
+
+inherit ruby-fakegem flag-o-matic
+
+DESCRIPTION="Ruby language binding for GnuPG Made Easy"
+HOMEPAGE="https://github.com/ueno/ruby-gpgme"
+SRC_URI="https://github.com/ueno/ruby-gpgme/archive/v${PV}.tar.gz -> ruby-${P}.tar.gz"
+RUBY_S="ruby-${P}"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=app-crypt/gpgme-1.18.0:=
+	>=dev-libs/libassuan-2.5.6
+	>=dev-libs/libgpg-error-1.47
+"
+DEPEND="${RDEPEND}"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha:0.14 dev-ruby/minitest:5.15 )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(coverall\|bundler\|ruby-debug\|byebug\)/I s:^:#:' \
+		-e '3igem "mocha", "~> 0.14"; gem "minitest", "~> 5.15.0"' \
+		test/test_helper.rb || die
+
+	# Remove failing tests for now. This package was added without
+	# running any tests :-(
+	rm -f test/{ctx,crypto}_test.rb || die
+
+	sed -i -e '/portile/d ; /rubyforge/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	append-flags -fPIC
+	export RUBY_GPGME_USE_SYSTEM_LIBRARIES=1
+	each_fakegem_configure
+}
+
+each_ruby_test() {
+	unset DISPLAY GPG_AGENT_INFO GPG_TTY
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/grpc/Manifest b/dev-ruby/grpc/Manifest
new file mode 100644
index 000000000000..3bd8d43cd81d
--- /dev/null
+++ b/dev-ruby/grpc/Manifest
@@ -0,0 +1,2 @@
+DIST grpc-1.54.0.gem 6047232 BLAKE2B 66e48f27748867eb99464ecf659204a2e0f8c9ad9c998fe13dbf8daf159f928d54414d28f121ecb52f1cb8d277651f91b4259eecf9cca2836d25cacbcfe9ea3a SHA512 72e76223800078584151cf6a6833b4cb3cfc0fa0733b050b9ccf5180ef7250b26fc22d7bac52f636b5ada68723eb04f67f51d24aacf7dc1288333c7adab556d6
+DIST grpc-1.59.2.gem 6404096 BLAKE2B 6953d538cee06c1f8795ca7949c22dd60d9aa4c4aa51c8d92631b646929682089969db1d2f206cd2e4c1e3692803c2cef685edf22f6d7a2d20b79dc735c942bc SHA512 a624ddf60f5befe043cdcfa015f2541bdf5b67604f8dd51652dd13a9576673df624513048d9e591c54da6e8fa1b983e78f8ca79d301c089fca5be6f12722b827
diff --git a/dev-ruby/grpc/grpc-1.54.0.ebuild b/dev-ruby/grpc/grpc-1.54.0.ebuild
new file mode 100644
index 000000000000..934ddf075b4a
--- /dev/null
+++ b/dev-ruby/grpc/grpc-1.54.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTENSIONS=(src/ruby/ext/grpc/extconf.rb)
+RUBY_FAKEGEM_EXTRAINSTALL="etc src"
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Send RPCs from Ruby using GRPC"
+HOMEPAGE="https://github.com/grpc/grpc"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/googleapis-common-protos-types:1
+	>=dev-ruby/google-protobuf-3.24.4
+"
+
+each_ruby_install() {
+	# Remove all the "src" bits that are not needed
+	rm -rf src/core src/ruby/spec src/ruby/ext/grpc/{libs,objs} || die
+
+	each_fakegem_install
+}
diff --git a/dev-ruby/grpc/grpc-1.59.2.ebuild b/dev-ruby/grpc/grpc-1.59.2.ebuild
new file mode 100644
index 000000000000..934ddf075b4a
--- /dev/null
+++ b/dev-ruby/grpc/grpc-1.59.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTENSIONS=(src/ruby/ext/grpc/extconf.rb)
+RUBY_FAKEGEM_EXTRAINSTALL="etc src"
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Send RPCs from Ruby using GRPC"
+HOMEPAGE="https://github.com/grpc/grpc"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/googleapis-common-protos-types:1
+	>=dev-ruby/google-protobuf-3.24.4
+"
+
+each_ruby_install() {
+	# Remove all the "src" bits that are not needed
+	rm -rf src/core src/ruby/spec src/ruby/ext/grpc/{libs,objs} || die
+
+	each_fakegem_install
+}
diff --git a/dev-ruby/grpc/metadata.xml b/dev-ruby/grpc/metadata.xml
new file mode 100644
index 000000000000..ba831219e4dd
--- /dev/null
+++ b/dev-ruby/grpc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">grpc/grpc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/gruff/Manifest b/dev-ruby/gruff/Manifest
index c805f62ce87b..ae18ecd1a4af 100644
--- a/dev-ruby/gruff/Manifest
+++ b/dev-ruby/gruff/Manifest
@@ -1,3 +1,3 @@
-DIST gruff-0.14.0.tar.gz 20193671 BLAKE2B b8cdaaca71c5b034206c4f88b1e50e09f8d9c5a3227eaa59a5c66718468ffa643509acfe8bd6919fd012a50daa27709569c210b030e25207c17a0ce13b60616f SHA512 e3c3acbce0888698e2aa92b8e86d2ada5499f394d100209b94ac4284f05a6a4f64c2bdcce91f76be7cec860d0546ebf5fa24aab73b51c0ca9763dc07855c8a68
-DIST gruff-0.15.0.tar.gz 20408532 BLAKE2B 979d027b7763a03dc98e42b195df36d8095f85118187ba63c10fb504ce5e12191691d1a512e780b95030129e2c30a6b9525a4ff3424cd2638e4fa5e42578b33f SHA512 05fadae5895340130dedf2d75a4c99852602334148c7a3179e48001abdb885d519400883067599044f660ea2ef6aded815cdef96dffda307f749af3d2e7751d0
-DIST gruff-0.16.0.tar.gz 23371113 BLAKE2B 94d83e8b410c391283e06b6bde9171851599181cc553cd0e924254c07f6ba3724a8737667f56487c7ada97b28aa4b25c97585312fbc7b70b528a492359524358 SHA512 1e4199620cb049b8e70c4462cd9ce9a4d72d3639522c97bf320e176cdd3484f632533573f6ead53b881c87ef0886461c86ec5051d470febfc9cfa26d9a012c60
+DIST gruff-0.22.0.tar.gz 25772970 BLAKE2B 3a56d03f0e9a53decfa7df3b6b5cc867cfe584548fe7b1435babde1486414bc97c4a46ad574692848df6483d01592e88d22ef64eb045f271df9c1e2f7c821fa0 SHA512 6d16f8a308289453eb4a51110946aca702c725e59a3ffb8c128610cbca7f521ae5cdea64ceaa0a3382b86fe2f1de74b2d33d2a49fa033728f2f5cbc474222758
+DIST gruff-0.23.0.tar.gz 25772848 BLAKE2B 5c0f6131ec52270e6a88c469d1ddf28701ca8e6f40277f094172e14f39faeed98af19d9e85c28a38b7ade5a6e35f21ba70bd9c8cb49a90edf434d9a9fb8c4371 SHA512 47e121b56cffb941063d127ba2b6e6de0dd0e8d5544263ca0234f7fcd782294fe972921a67407956674a97b9767651d7a2c33448d38887c05a40715a06cc1c54
+DIST gruff-0.24.0.tar.gz 25940874 BLAKE2B 071cfc8283c03f1a5fb2c73e084f717de4da25e076b9a71c6ee08df86c1aa41d06916006f35591ebad4ba6e4dec75edb1d7c0d0bbe5a81e7fc828e2bb0a83589 SHA512 51d174ab2c74b67d62916259e86bebeb3cb114099b7e05299cd1f7a3609ad863b82f5f1d4e8b8181ba80ca0b891fbdabc5cca0426b6dba5e0cf8c35b6e0d2582
diff --git a/dev-ruby/gruff/gruff-0.14.0.ebuild b/dev-ruby/gruff/gruff-0.14.0.ebuild
deleted file mode 100644
index 07e87c0e3d04..000000000000
--- a/dev-ruby/gruff/gruff-0.14.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
-
-RUBY_FAKEGEM_GEMSPEC="gruff.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Beautiful graphs for one or multiple datasets"
-HOMEPAGE="https://github.com/topfunky/gruff"
-SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# imagemagick is an indirect dependency through rmagick. However, for
-# gruff to work properly imagemagick needs to be compiled with truetype
-# support and this cannot be expressed in the rmagick dependency. Tests
-# also require imagemagick to have jpeg and png support.
-DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
-RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
-
-ruby_add_rdepend "dev-ruby/histogram dev-ruby/rmagick:*"
-ruby_add_bdepend "
-	test? (
-		dev-ruby/test-unit
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/\(reporters\|simplecov\)/I s:^:#:' test/gruff_test_case.rb || die
-	sed -i -e '2irequire "date"' test/test_scatter.rb || die
-
-	sed -e 's/git ls-files/find . -print/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	# Skip the image comparison checks since the images are not
-	# pixel-perfect identical, most likely due to the use of a slightly
-	# different font.
-	SKIP_CHECK=true ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/gruff/gruff-0.15.0.ebuild b/dev-ruby/gruff/gruff-0.15.0.ebuild
deleted file mode 100644
index 7823d71da2ac..000000000000
--- a/dev-ruby/gruff/gruff-0.15.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
-
-RUBY_FAKEGEM_GEMSPEC="gruff.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Beautiful graphs for one or multiple datasets"
-HOMEPAGE="https://github.com/topfunky/gruff"
-SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# imagemagick is an indirect dependency through rmagick. However, for
-# gruff to work properly imagemagick needs to be compiled with truetype
-# support and this cannot be expressed in the rmagick dependency. Tests
-# also require imagemagick to have jpeg and png support.
-DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
-RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
-
-ruby_add_rdepend "dev-ruby/histogram >=dev-ruby/rmagick-4.2:*"
-ruby_add_bdepend "
-	test? (
-		dev-ruby/test-unit
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/\(reporters\|simplecov\)/I s:^:#:' test/gruff_test_case.rb || die
-	sed -i -e '2irequire "date"' test/test_scatter.rb || die
-
-	sed -e 's/git ls-files/find . -print/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	# Skip the image comparison checks since the images are not
-	# pixel-perfect identical, most likely due to the use of a slightly
-	# different font.
-	SKIP_CHECK=true ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/gruff/gruff-0.16.0.ebuild b/dev-ruby/gruff/gruff-0.16.0.ebuild
deleted file mode 100644
index 7823d71da2ac..000000000000
--- a/dev-ruby/gruff/gruff-0.16.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
-
-RUBY_FAKEGEM_GEMSPEC="gruff.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Beautiful graphs for one or multiple datasets"
-HOMEPAGE="https://github.com/topfunky/gruff"
-SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# imagemagick is an indirect dependency through rmagick. However, for
-# gruff to work properly imagemagick needs to be compiled with truetype
-# support and this cannot be expressed in the rmagick dependency. Tests
-# also require imagemagick to have jpeg and png support.
-DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
-RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
-
-ruby_add_rdepend "dev-ruby/histogram >=dev-ruby/rmagick-4.2:*"
-ruby_add_bdepend "
-	test? (
-		dev-ruby/test-unit
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/\(reporters\|simplecov\)/I s:^:#:' test/gruff_test_case.rb || die
-	sed -i -e '2irequire "date"' test/test_scatter.rb || die
-
-	sed -e 's/git ls-files/find . -print/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	# Skip the image comparison checks since the images are not
-	# pixel-perfect identical, most likely due to the use of a slightly
-	# different font.
-	SKIP_CHECK=true ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/gruff/gruff-0.22.0.ebuild b/dev-ruby/gruff/gruff-0.22.0.ebuild
new file mode 100644
index 000000000000..cecc2b6e8230
--- /dev/null
+++ b/dev-ruby/gruff/gruff-0.22.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
+
+RUBY_FAKEGEM_GEMSPEC="gruff.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Beautiful graphs for one or multiple datasets"
+HOMEPAGE="https://github.com/topfunky/gruff"
+SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+# imagemagick is an indirect dependency through rmagick. However, for
+# gruff to work properly imagemagick needs to be compiled with truetype
+# support and this cannot be expressed in the rmagick dependency. Tests
+# also require imagemagick to have jpeg and png support.
+DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
+RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
+
+ruby_add_rdepend "dev-ruby/histogram >=dev-ruby/rmagick-4.2:*"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/\(reporters\|simplecov\)/I s:^:#:' test/gruff_test_case.rb || die
+	sed -i -e '2irequire "date"' test/test_scatter.rb || die
+
+	sed -e 's/git ls-files/find * -print/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	# Skip the image comparison checks since the images are not
+	# pixel-perfect identical, most likely due to the use of a slightly
+	# different font.
+	SKIP_CHECK=true ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/gruff/gruff-0.23.0.ebuild b/dev-ruby/gruff/gruff-0.23.0.ebuild
new file mode 100644
index 000000000000..445d13b31227
--- /dev/null
+++ b/dev-ruby/gruff/gruff-0.23.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
+
+RUBY_FAKEGEM_GEMSPEC="gruff.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Beautiful graphs for one or multiple datasets"
+HOMEPAGE="https://github.com/topfunky/gruff"
+SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# imagemagick is an indirect dependency through rmagick. However, for
+# gruff to work properly imagemagick needs to be compiled with truetype
+# support and this cannot be expressed in the rmagick dependency. Tests
+# also require imagemagick to have jpeg and png support.
+DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
+RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
+
+ruby_add_rdepend "dev-ruby/histogram >=dev-ruby/rmagick-5.3:*"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/\(reporters\|simplecov\)/I s:^:#:' test/gruff_test_case.rb || die
+	sed -i -e '2irequire "date"' test/test_scatter.rb || die
+
+	sed -e 's/git ls-files/find * -print/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	# Skip the image comparison checks since the images are not
+	# pixel-perfect identical, most likely due to the use of a slightly
+	# different font.
+	SKIP_CHECK=true ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/gruff/gruff-0.24.0.ebuild b/dev-ruby/gruff/gruff-0.24.0.ebuild
new file mode 100644
index 000000000000..445d13b31227
--- /dev/null
+++ b/dev-ruby/gruff/gruff-0.24.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
+
+RUBY_FAKEGEM_GEMSPEC="gruff.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Beautiful graphs for one or multiple datasets"
+HOMEPAGE="https://github.com/topfunky/gruff"
+SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# imagemagick is an indirect dependency through rmagick. However, for
+# gruff to work properly imagemagick needs to be compiled with truetype
+# support and this cannot be expressed in the rmagick dependency. Tests
+# also require imagemagick to have jpeg and png support.
+DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
+RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
+
+ruby_add_rdepend "dev-ruby/histogram >=dev-ruby/rmagick-5.3:*"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/\(reporters\|simplecov\)/I s:^:#:' test/gruff_test_case.rb || die
+	sed -i -e '2irequire "date"' test/test_scatter.rb || die
+
+	sed -e 's/git ls-files/find * -print/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	# Skip the image comparison checks since the images are not
+	# pixel-perfect identical, most likely due to the use of a slightly
+	# different font.
+	SKIP_CHECK=true ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/haml-rails/Manifest b/dev-ruby/haml-rails/Manifest
index 65e7e23658dc..75c8159d4707 100644
--- a/dev-ruby/haml-rails/Manifest
+++ b/dev-ruby/haml-rails/Manifest
@@ -1 +1 @@
-DIST haml-rails-2.0.1.gem 13824 BLAKE2B 24fded0f576d92083a10737954e1a32eb8e5f6a8db11fabc55ac0de3b17377419606d44f5b2e202e0733d9f538166172a6b5f7e08ee7efd71ddf7d3e7f6c9107 SHA512 7ccf9d618ca7b7c1681a063c51cf9dae9ce5e245479e3e7ba87a170ee1ba3eb35ff59061195928792f19f7e33a12ae7de3d5a36d35958e2a1761a12dc51b26d0
+DIST haml-rails-2.1.0.gem 13824 BLAKE2B 07a07966f88a4364d917f38518b184157fcf27bf0bcbc336369607df49baa68b4e54ab13d8980a0e76ab424e28a4b4c1bf4a6e37d3a06525bc01a62d9b1626d2 SHA512 c051ed4b776c95c1bae97b544d95512ece466c665c03d615e9f583fffb6a1474cb05a22d22402cab282bf8ede8ca64ffc60b8607fbff1fe188d81ebc3fb82776
diff --git a/dev-ruby/haml-rails/haml-rails-2.0.1-r1.ebuild b/dev-ruby/haml-rails/haml-rails-2.0.1-r1.ebuild
deleted file mode 100644
index 42ee8c50bef2..000000000000
--- a/dev-ruby/haml-rails/haml-rails-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides Haml generators for Rails 4"
-HOMEPAGE="https://github.com/indirect/haml-rails"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/actionpack-5.1:*
-	>=dev-ruby/activesupport-5.1:*
-	>=dev-ruby/railties-5.1:*
-	>=dev-ruby/haml-4.0.6:* <dev-ruby/haml-6:*
-	>=dev-ruby/html2haml-1.0.1"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rails-5.1 )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-}
diff --git a/dev-ruby/haml-rails/haml-rails-2.0.1.ebuild b/dev-ruby/haml-rails/haml-rails-2.0.1.ebuild
deleted file mode 100644
index 1d5e15988629..000000000000
--- a/dev-ruby/haml-rails/haml-rails-2.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides Haml generators for Rails 4"
-HOMEPAGE="https://github.com/indirect/haml-rails"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/actionpack-5.1:*
-	>=dev-ruby/activesupport-5.1:*
-	>=dev-ruby/railties-5.1:*
-	>=dev-ruby/haml-4.0.6:* <dev-ruby/haml-6:*
-	>=dev-ruby/html2haml-1.0.1"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rails-5.1 )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-}
diff --git a/dev-ruby/haml-rails/haml-rails-2.1.0.ebuild b/dev-ruby/haml-rails/haml-rails-2.1.0.ebuild
new file mode 100644
index 000000000000..9ea2f4bd33b9
--- /dev/null
+++ b/dev-ruby/haml-rails/haml-rails-2.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides Haml generators for Rails 4"
+HOMEPAGE="https://github.com/haml/haml-rails"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/actionpack-5.1:*
+	>=dev-ruby/activesupport-5.1:*
+	>=dev-ruby/railties-5.1:*
+	>=dev-ruby/haml-4.0.6:*
+"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rails-5.1 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile test/test_helper.rb || die
+	sed -i -e 's/MiniTest/Minitest/' test/test_helper.rb || die
+}
diff --git a/dev-ruby/haml-rails/metadata.xml b/dev-ruby/haml-rails/metadata.xml
index 402241805d98..70da65b280d5 100644
--- a/dev-ruby/haml-rails/metadata.xml
+++ b/dev-ruby/haml-rails/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">indirect/haml-rails</remote-id>
+		<remote-id type="github">haml/haml-rails</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index 10b2e0f0d4a1..465520e76611 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1 +1,4 @@
 DIST haml-5.2.2.tar.gz 129833 BLAKE2B d68c24c7a3c817d6d364b2ec92b84b4f56f4fffa48b99d17b2df27da35f50b1fb1f69b184a7b21d899c476e0d4c8ad2b940a7cb2995ec24ecdafab8ef61fe393 SHA512 1aec59fab20d8139a5dfedde2007fa8137a377a345e4d30229f9d1140d56cdf970c8ae70e2647e6a408d7fa543a16050f66a8a636efa6a6b1f91ee1ffcc136c1
+DIST haml-6.1.1.tar.gz 669644 BLAKE2B 239b3a1fe02bcd1e2981198ba7c54c71ca2af0947102fcea6cd600cc6579294856baa290589a7d3a015e54df8bcecf8e50175cf2189e8f4f9c6f9721a558bcc9 SHA512 7d732be085b41b8f0eec418600a82b51c68301081165aa636fa342ae26b74215a202a4b15e592da980d9a7fbe24bad01399f599770420133c4b6ab7523386fa5
+DIST haml-6.2.3.tar.gz 666083 BLAKE2B 8f6c3e6b3538fdd8b6937278073d532245d7ce53bfbb81f2ebc394160af50e8022475bf7225d3e8f8846d0088120de58829dacf91864b91bab4f0ffc18479322 SHA512 28c0031b62c44cf6b057ee88ffb522d2081e92f5d70fc25999b64a59a4430acd63bb9ee4e3fc34139a1a6fe6f678cde6c3ce08b9a5ed5d433d30d661c5983b81
+DIST haml-6.3.0.tar.gz 666327 BLAKE2B 0672d39857fa0dac466bc29468a76e71d583da6637ce8534eb4d84aa4388bdc0f42d747d74cc5389bd24faf428076c13cf1897edc93317b2da7b770830d53b37 SHA512 64ee2eb7fad2e0b77307dd18a268b53a7f21b78b99a8bf80831cda9f8b6d8be983e7a23ba62942d251e7baf2c9732e38c18b842052690e5bbeb27961ca139c73
diff --git a/dev-ruby/haml/haml-5.2.2.ebuild b/dev-ruby/haml/haml-5.2.2.ebuild
index 7f57326a3f66..0f3fd683d7e5 100644
--- a/dev-ruby/haml/haml-5.2.2.ebuild
+++ b/dev-ruby/haml/haml-5.2.2.ebuild
@@ -1,9 +1,9 @@
-# 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"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true RUBYLIB=lib test"
 RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
@@ -21,7 +21,7 @@ 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 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 IUSE="doc test"
 
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..a301872e76ed
--- /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 ~hppa ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-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/haml/haml-6.2.3.ebuild b/dev-ruby/haml/haml-6.2.3.ebuild
new file mode 100644
index 000000000000..1d967a4cf5a2
--- /dev/null
+++ b/dev-ruby/haml/haml-6.2.3.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="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+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 ~hppa ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-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-7.1
+		<dev-ruby/activemodel-7.1
+		<dev-ruby/actionpack-7.1
+		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
+	sed -i \
+		-e '/bundler/I s:^:#:' \
+		-e '/simplecov/I s:^:#:' \
+		-e "1igem 'rails', '<7.1'" \
+		test/test_helper.rb || die
+	# Remove tests that fails when RedCloth is available
+	rm -f test/haml/filters/markdown_test.rb || die
+	# Remove tests that require coffee-script (does not work with x32
+	# and coffee-script is obsolete anyway).
+	rm -f test/haml/filters/coffee_test.rb || die
+	sed -e '/describe.*coffee filter/,/^    end/ s:^:#:' \
+		-i test/haml/line_number_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/haml/haml-6.3.0.ebuild b/dev-ruby/haml/haml-6.3.0.ebuild
new file mode 100644
index 000000000000..738977280ccf
--- /dev/null
+++ b/dev-ruby/haml/haml-6.3.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_EXTRADOC="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-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
+		dev-ruby/nokogiri
+		<dev-ruby/railties-7.2
+		<dev-ruby/activemodel-7.2
+		<dev-ruby/actionpack-7.2
+		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
+	sed -i \
+		-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
+
+	# Remove tests that require coffee-script (does not work with x32
+	# and coffee-script is obsolete anyway).
+	rm -f test/haml/filters/coffee_test.rb || die
+	sed -e '/describe.*coffee filter/,/^    end/ s:^:#:' \
+		-i test/haml/line_number_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/haml/metadata.xml b/dev-ruby/haml/metadata.xml
index 658c72b1920d..81aca44931d3 100644
--- a/dev-ruby/haml/metadata.xml
+++ b/dev-ruby/haml/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">haml/haml</remote-id>
+    <remote-id type="rubygems">haml</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/hamster/Manifest b/dev-ruby/hamster/Manifest
deleted file mode 100644
index 5d11e4a7ce1a..000000000000
--- a/dev-ruby/hamster/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hamster-3.0.0.gem 129024 BLAKE2B f2d716d9304e9dea90b9832f1ae01bc6482fb57edc72f8e4edf0646ec066d08f9aa632401ff89dd979ee6513fcae7dab3289d8fada3a0e4392c688aca3d3e009 SHA512 2e9e388ca5a6b1d52dec60ce7711bf91fba8bc51a722139168c1aafbc9bbb98602675427e23a588950f56eaaa10c4b3aefd682970a77c479f47c77f00858342a
diff --git a/dev-ruby/hamster/hamster-3.0.0-r2.ebuild b/dev-ruby/hamster/hamster-3.0.0-r2.ebuild
deleted file mode 100644
index c9a369d791e4..000000000000
--- a/dev-ruby/hamster/hamster-3.0.0-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Efficient, immutable, thread-safe collection classes for Ruby"
-HOMEPAGE="https://github.com/hamstergem/hamster"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-all_ruby_prepare() {
-	sed -i -e '/codeclimate/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb spec/lib/hamster/vector/insert_spec.rb || die
-}
diff --git a/dev-ruby/hamster/metadata.xml b/dev-ruby/hamster/metadata.xml
deleted file mode 100644
index 8646aa60c22d..000000000000
--- a/dev-ruby/hamster/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">hamstergem/hamster</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/hashdiff/Manifest b/dev-ruby/hashdiff/Manifest
index a51b18c5cd46..4baf8f6a6314 100644
--- a/dev-ruby/hashdiff/Manifest
+++ b/dev-ruby/hashdiff/Manifest
@@ -1 +1,2 @@
 DIST hashdiff-1.0.1.gem 20480 BLAKE2B 9f9723bd4e3547422b185df07d314699d0381ce6526be31c821f2d213f0721f077560567c830256a3bb2873b37a2616213113257e993fc364cd72a416b77cf10 SHA512 fa6e7ad88373038341473de25b7df5e146744efb8b5613fb4da41630498e68de585e2a8d66ba86d577ded574464948234f51e662a9caa6e695c3d6a2c3b85059
+DIST hashdiff-1.1.0.gem 20992 BLAKE2B 821bbf331f701fca924a05ca39cab4a0cff21dd4039fcfb6b6ccab8b649f2c9853edde1c12b7febd437e42ad35623b1f8d5afba92968dcba91312aa7bc09af38 SHA512 e5e76f6cdea6b94c5ee86eb17b2fae83a1acf84499b9e60aeb9b9166c468b58e2f6742893f989ee613aead3f37402f3eeb62d10df9b54b08c337a5824425b475
diff --git a/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild b/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild
index d47afa1f27ff..ea0aa306caa7 100644
--- a/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild
+++ b/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# 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_RECIPE_TEST="rspec3"
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/liufengyun/hashdiff"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/hashdiff/hashdiff-1.1.0.ebuild b/dev-ruby/hashdiff/hashdiff-1.1.0.ebuild
new file mode 100644
index 000000000000..b66ab72fa7a7
--- /dev/null
+++ b/dev-ruby/hashdiff/hashdiff-1.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="changelog.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple Hash extension to make working with nested hashes easier"
+HOMEPAGE="https://github.com/liufengyun/hashdiff"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/hashery/hashery-2.1.2-r1.ebuild b/dev-ruby/hashery/hashery-2.1.2-r1.ebuild
index d324e3ecfdf4..005a48afda8c 100644
--- a/dev-ruby/hashery/hashery-2.1.2-r1.ebuild
+++ b/dev-ruby/hashery/hashery-2.1.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="yard"
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit ruby-fakegem
 
 DESCRIPTION="The Hashery is a tight collection of Hash-like classes"
-HOMEPAGE="https://rubyworks.github.com/hashery"
+HOMEPAGE="https://rubyworks.github.io/hashery/"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r1.ebuild b/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r1.ebuild
deleted file mode 100644
index 6baa1c50195f..000000000000
--- a/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Internal HashiCorp service to check version information"
-HOMEPAGE="https://www.hashicorp.com"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# Tests require network
-RESTRICT="test"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/rspec-its )
-"
-
-all_ruby_prepare() {
-	# remove bundler support
-	sed -i '/[Bb]undler/d' Rakefile || die
-}
diff --git a/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r2.ebuild b/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r2.ebuild
new file mode 100644
index 000000000000..b591d117716f
--- /dev/null
+++ b/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r2.ebuild
@@ -0,0 +1,34 @@
+# 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_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Internal HashiCorp service to check version information"
+HOMEPAGE="https://www.hashicorp.com"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+# Tests require network
+RESTRICT="test"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/rspec-its )
+"
+
+all_ruby_prepare() {
+	# remove bundler support
+	sed -i '/[Bb]undler/d' Rakefile || die
+
+	# Make tests compatible with new ruby versions
+	sed -i -e '/check/ s/opts/**opts/' spec/checkpoint_spec.rb || die
+}
diff --git a/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r3.ebuild b/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r3.ebuild
new file mode 100644
index 000000000000..f333efc74aed
--- /dev/null
+++ b/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Internal HashiCorp service to check version information"
+HOMEPAGE="https://www.hashicorp.com"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+# Tests require network
+RESTRICT="test"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/rspec-its )
+"
+
+all_ruby_prepare() {
+	# remove bundler support
+	sed -i '/[Bb]undler/d' Rakefile || die
+
+	# Make tests compatible with new ruby versions
+	sed -i -e '/check/ s/opts/**opts/' spec/checkpoint_spec.rb || die
+}
diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest
index 6775104a7022..282a1267ae15 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -1,3 +1 @@
-DIST hashie-3.6.0.gem 74752 BLAKE2B b689843d30001dd7eaa09d62ab908d60e76128df66055283ccf0770830e5901b4e792c4bebd2cad8bb6d5e97a23016aee0d0114f2fb0f7ace8ebd722b8941020 SHA512 7b5355a2b93267d6b7c63608aeac4bb7d21f32a982e2c59771d5a791f9a0c921d11e1b4a185067447917315ce98f8cc5f2b48a31efec3068fb1f1ec0e4386e15
-DIST hashie-4.1.0.tar.gz 86972 BLAKE2B 33979037db67f8a7f20ae85e3db6e8b5415b9b2659a5961e2c2a97e3197fef1500cedd8557af314baf8395a9790e8a457633ecade944c198c295f7f13847afa5 SHA512 f2a36ee812e39d679390647514ff894d4170b61ece6d37ef42f1203212d80d2dee63b4af162d81ded451a53c058746f26fc16810db4c748cce9ca6635a300a4b
 DIST hashie-5.0.0.tar.gz 105224 BLAKE2B f15fd3ecd5dcdf88ea97d4aa5e13d984bbfb4dc54a687b4f166d9d84f07ddc0037f4fe251a4ec4950a5b89aaf4f0e43d11467018d63e3a89ae980ec06caf3dd6 SHA512 fc1f9399895f67af77af7b2d1d993eebd221d2b779781625bf1bbee579547580add7d7d0dbf1791564c8df6764c19617721ae5139ca949c81a316beacfe8c806
diff --git a/dev-ruby/hashie/files/hashie-5.0.0-ruby32-tests.patch b/dev-ruby/hashie/files/hashie-5.0.0-ruby32-tests.patch
new file mode 100644
index 000000000000..479e5a876ac2
--- /dev/null
+++ b/dev-ruby/hashie/files/hashie-5.0.0-ruby32-tests.patch
@@ -0,0 +1,71 @@
+From 2b3120ad4a6f54990dfec5b10f5769e3714ab1e8 Mon Sep 17 00:00:00 2001
+From: Peter Goldstein <peter.m.goldstein@gmail.com>
+Date: Fri, 13 Jan 2023 13:53:14 -0500
+Subject: [PATCH] Add Ruby 3.2 to the CI matrix (#571)
+
+* Adds Ruby 3.2 to the CI matrix
+
+* Use object_id rather than trust, as trust is no longer a method on Object in Ruby 3.2.  Condition checked on Psych error based on version of Psych.
+
+* Update danger token
+
+* Add CHANGELOG entry
+
+* Add use of Gem::Version for version comparison
+---
+ .github/workflows/danger.yml |  4 ++--
+ .github/workflows/test.yml   |  1 +
+ CHANGELOG.md                 |  1 +
+ spec/hashie/mash_spec.rb     | 17 ++++++++++++-----
+ spec/hashie/utils_spec.rb    |  2 +-
+ 5 files changed, 17 insertions(+), 8 deletions(-)
+
+diff --git a/spec/hashie/mash_spec.rb b/spec/hashie/mash_spec.rb
+index 03f56683..091748fc 100644
+--- a/spec/hashie/mash_spec.rb
++++ b/spec/hashie/mash_spec.rb
+@@ -137,9 +137,9 @@
+ 
+   include_context 'with a logger' do
+     it 'logs a warning when overriding built-in methods' do
+-      Hashie::Mash.new('trust' => { 'two' => 2 })
++      Hashie::Mash.new('object_id' => { 'two' => 2 })
+ 
+-      expect(logger_output).to match('Hashie::Mash#trust')
++      expect(logger_output).to match('Hashie::Mash#object_id')
+     end
+ 
+     it 'can set keys more than once and does not warn when doing so' do
+@@ -821,9 +821,16 @@ class SubMash < Hashie::Mash
+         expect(mash.company_a.accounts.admin.password).to eq('secret')
+       end
+       it 'can override the value of aliases' do
+-        expect do
+-          Hashie::Mash.load('spec/fixtures/yaml_with_aliases.yml', aliases: false)
+-        end.to raise_error Psych::BadAlias, /base_accounts/
++        require 'psych'
++        if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('5')
++          expect do
++            Hashie::Mash.load('spec/fixtures/yaml_with_aliases.yml', aliases: false)
++          end.to raise_error Psych::AliasesNotEnabled, /Alias parsing was not enabled/
++        else
++          expect do
++            Hashie::Mash.load('spec/fixtures/yaml_with_aliases.yml', aliases: false)
++          end.to raise_error Psych::BadAlias, /base_accounts/
++        end
+       end
+     end
+ 
+diff --git a/spec/hashie/utils_spec.rb b/spec/hashie/utils_spec.rb
+index 0499aa7f..c6be23b1 100644
+--- a/spec/hashie/utils_spec.rb
++++ b/spec/hashie/utils_spec.rb
+@@ -7,7 +7,7 @@ def a_method_to_match_against
+ RSpec.describe Hashie::Utils do
+   describe '.method_information' do
+     it 'states the module or class that a native method was defined in' do
+-      bound_method = method(:trust)
++      bound_method = method(:object_id)
+ 
+       message = Hashie::Utils.method_information(bound_method)
+ 
diff --git a/dev-ruby/hashie/hashie-3.6.0.ebuild b/dev-ruby/hashie/hashie-3.6.0.ebuild
deleted file mode 100644
index 1d6ac814ed5c..000000000000
--- a/dev-ruby/hashie/hashie-3.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful"
-HOMEPAGE="https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activesupport )"
-
-all_ruby_prepare() {
-	# Remove bundler and fix one spec that depends on its requires
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -e '/pry/ s:^:#:' \
-		-e '1irequire "pathname"; require "tempfile"' -i spec/spec_helper.rb || die
-
-	# Avoid dependency on rspec-pending_for and its dependencies
-	sed -i -e '/pending_for/ s:^:#:' \
-		spec/spec_helper.rb \
-		spec/hashie/mash_spec.rb \
-		spec/hashie/extensions/strict_key_access_spec.rb || die
-
-	# Avoid integration specs to avoid complicated dependencies
-	rm spec/integration/{elasticsearch,omniauth*,rails}/integration_spec.rb || die
-}
diff --git a/dev-ruby/hashie/hashie-4.1.0-r1.ebuild b/dev-ruby/hashie/hashie-4.1.0-r1.ebuild
deleted file mode 100644
index ecfb8d5798d0..000000000000
--- a/dev-ruby/hashie/hashie-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="hashie.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful"
-HOMEPAGE="https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/"
-SRC_URI="https://github.com/intridea/hashie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activesupport )"
-
-all_ruby_prepare() {
-	# Remove bundler and fix one spec that depends on its requires
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -e '/pry/ s:^:#:' \
-		-e '1irequire "pathname"; require "tempfile"; require "json"' -i spec/spec_helper.rb || die
-
-	# Avoid dependency on rspec-pending_for and its dependencies
-	sed -i -e '/pending_for/ s:^:#:' \
-		spec/spec_helper.rb \
-		spec/hashie/mash_spec.rb \
-		spec/hashie/extensions/strict_key_access_spec.rb || die
-
-	# Avoid integration specs to avoid complicated dependencies
-	rm spec/integration/{elasticsearch,omniauth*,rails}/integration_spec.rb || die
-}
diff --git a/dev-ruby/hashie/hashie-5.0.0.ebuild b/dev-ruby/hashie/hashie-5.0.0.ebuild
index 8e678376f25d..04c56f5df804 100644
--- a/dev-ruby/hashie/hashie-5.0.0.ebuild
+++ b/dev-ruby/hashie/hashie-5.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -17,13 +17,15 @@ inherit ruby-fakegem
 
 DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful"
 HOMEPAGE="https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/"
-SRC_URI="https://github.com/intridea/hashie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/hashie/hashie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
+PATCHES=( "${FILESDIR}/${P}-ruby32-tests.patch" )
+
 ruby_add_bdepend "test? ( dev-ruby/activesupport )"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/hashie/metadata.xml b/dev-ruby/hashie/metadata.xml
index 658c72b1920d..e7c6da67af9b 100644
--- a/dev-ruby/hashie/metadata.xml
+++ b/dev-ruby/hashie/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">hashie/hashie</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/hashr/hashr-2.0.1-r1.ebuild b/dev-ruby/hashr/hashr-2.0.1-r1.ebuild
index 1a13831e7cf2..e1cb77430153 100644
--- a/dev-ruby/hashr/hashr-2.0.1-r1.ebuild
+++ b/dev-ruby/hashr/hashr-2.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0-r1.ebuild b/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0-r1.ebuild
deleted file mode 100644
index 481efe779974..000000000000
--- a/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-DESCRIPTION="Removes leading whitespace from Ruby heredocs"
-HOMEPAGE="https://github.com/adrianomitre/heredoc_unindent"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "test-unit"' test/test_heredoc_unindent.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0-r2.ebuild b/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..c200a82e3231
--- /dev/null
+++ b/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
+DESCRIPTION="Removes leading whitespace from Ruby heredocs"
+HOMEPAGE="https://github.com/adrianomitre/heredoc_unindent"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '1igem "test-unit"' test/test_heredoc_unindent.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.7.4-r1.ebuild b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.7.4-r1.ebuild
new file mode 100644
index 000000000000..cf46e672e926
--- /dev/null
+++ b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.7.4-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A GPG backend for hiera-eyaml"
+HOMEPAGE="https://github.com/voxpupuli/hiera-eyaml-gpg"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/hiera-eyaml-1.3.8:*
+	>=dev-ruby/gpgme-2.0.0
+"
diff --git a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.7.4.ebuild b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.7.4.ebuild
deleted file mode 100644
index ee20f39cf7d0..000000000000
--- a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.7.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A GPG backend for hiera-eyaml"
-HOMEPAGE="https://github.com/sihil/hiera-eyaml-gpg"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/hiera-eyaml-1.3.8:*
-	>=dev-ruby/gpgme-2.0.0
-"
diff --git a/dev-ruby/hiera-eyaml-gpg/metadata.xml b/dev-ruby/hiera-eyaml-gpg/metadata.xml
index 1572e7e0cc43..90d3d734d0bf 100644
--- a/dev-ruby/hiera-eyaml-gpg/metadata.xml
+++ b/dev-ruby/hiera-eyaml-gpg/metadata.xml
@@ -10,6 +10,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">sihil/hiera-eyaml-gpg</remote-id>
+    <remote-id type="github">voxpupuli/hiera-eyaml-gpg</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/hiera-eyaml-plaintext/hiera-eyaml-plaintext-0.6-r2.ebuild b/dev-ruby/hiera-eyaml-plaintext/hiera-eyaml-plaintext-0.6-r2.ebuild
index 188d18dff865..8a85e012c2f3 100644
--- a/dev-ruby/hiera-eyaml-plaintext/hiera-eyaml-plaintext-0.6-r2.ebuild
+++ b/dev-ruby/hiera-eyaml-plaintext/hiera-eyaml-plaintext-0.6-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/gtmtechltd/hiera-eyaml-plaintext"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
diff --git a/dev-ruby/hiera-eyaml/Manifest b/dev-ruby/hiera-eyaml/Manifest
index 3c35e69a1085..91598c9819d2 100644
--- a/dev-ruby/hiera-eyaml/Manifest
+++ b/dev-ruby/hiera-eyaml/Manifest
@@ -1,2 +1 @@
-DIST hiera-eyaml-3.1.1.tar.gz 54848 BLAKE2B 8daa4925bf1fb945ddb5ce7a485c3bf2bfca8747eb0cf00530eb91307d18d3f5c73699a30631b80e7825baac3a8b0c1695bd0313906bc8c7aba9c3c00d69b9cc SHA512 3bc93ca31af96383401f28644490f5540a70cf719e47d340794daf6c8bcc7fe9800d1d1e6ba99aba344831966f8d15f1a1fd9d1522696457f0bdec79dd45a108
-DIST hiera-eyaml-3.2.2.tar.gz 59174 BLAKE2B 2e31d1d0807096757f338a3f112a2f853f9dc61d14f92720a06e8835ef5b2228cea1ef2db1d5d7a2758422158acca14e882e1fa88a3189fcc254573e15e32185 SHA512 ac7800d35cba9b11e1fcfd831419caa1fb32fc1747499f780a40005cf57a87be4562f52251b8f5482156ad98892d41fe5060e48f74a75a0d1657dd5c04b8ee92
+DIST hiera-eyaml-3.4.0.tar.gz 60920 BLAKE2B 73a2a5c15d79b8084f226173667fc29875ea4614a09030171f81a1b2c632d45071e8952765afb9900c695643016117f9e1a28f9cefe7a19a9de67315ed4d139b SHA512 64443cc49e66dd95cb85d5a2e26a50b5c60ef78dc21354fb5a3760f4e1f0005936d46ff54232e2f2e1b250628a4844b79a8ca267c4d72ab53ef318cde10a074b
diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-3.1.1.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-3.1.1.ebuild
deleted file mode 100644
index 29e79172ccd4..000000000000
--- a/dev-ruby/hiera-eyaml/hiera-eyaml-3.1.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md PLUGINS.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Encrypted YAML backend for hiera"
-HOMEPAGE="https://github.com/TomPoulton/hiera-eyaml"
-SRC_URI="https://github.com/TomPoulton/hiera-eyaml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/highline-1.6.19:*"
-ruby_add_rdepend "dev-ruby/optimist"
-ruby_add_rdepend "!!dev-ruby/hiera-eyaml:0" # both install the /usr/bin/eyaml binary
-
-ruby_add_bdepend "test? ( dev-util/cucumber ~dev-util/aruba-0.6.2 <app-admin/puppet-6 dev-ruby/hiera-eyaml-plaintext )"
-
-all_ruby_prepare() {
-	# Fix highline dependency to be compatible with more versions.
-	sed -i -e '/highline/ s/~>/>=/' \
-		-e '/gem.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e 's:/tmp:'${T}':' \
-		features/sandbox/puppet/environments/local/modules/test/manifests/run.pp \
-		features/sandbox/puppet-hiera-merge/environments/local/modules/test/manifests/run.pp \
-		features/puppet.feature
-}
-
-each_ruby_prepare() {
-	# Run tests with the correct ruby interpreter
-	sed -i -e 's:I run `eyaml:I run `'${RUBY}' '${S}'/bin/eyaml:' features/*.feature || die
-
-}
-
-each_ruby_test() {
-	${RUBY} -S cucumber --format progress features || die
-}
diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-3.2.2.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-3.2.2.ebuild
deleted file mode 100644
index 076d16797b4c..000000000000
--- a/dev-ruby/hiera-eyaml/hiera-eyaml-3.2.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md PLUGINS.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Encrypted YAML backend for hiera"
-HOMEPAGE="https://github.com/TomPoulton/hiera-eyaml"
-SRC_URI="https://github.com/TomPoulton/hiera-eyaml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/highline-1.6.19:*"
-ruby_add_rdepend "dev-ruby/optimist"
-ruby_add_rdepend "!!dev-ruby/hiera-eyaml:0" # both install the /usr/bin/eyaml binary
-
-ruby_add_bdepend "test? ( dev-util/cucumber ~dev-util/aruba-0.6.2 <app-admin/puppet-6 dev-ruby/hiera-eyaml-plaintext )"
-
-all_ruby_prepare() {
-	# Fix highline dependency to be compatible with more versions.
-	sed -i -e '/highline/ s/~>/>=/' \
-		-e '/gem.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e 's:/tmp:'${T}':' \
-		features/sandbox/puppet/environments/local/modules/test/manifests/run.pp \
-		features/sandbox/puppet-hiera-merge/environments/local/modules/test/manifests/run.pp \
-		features/sandbox/puppet-envvar/environments/local/modules/test/manifests/run.pp \
-		features/puppet.feature
-}
-
-each_ruby_prepare() {
-	# Run tests with the correct ruby interpreter
-	sed -i -e 's:I run `eyaml:I run `'${RUBY}' '${S}'/bin/eyaml:' features/*.feature || die
-
-}
-
-each_ruby_test() {
-	${RUBY} -S cucumber --format progress features || die
-}
diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-3.4.0.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-3.4.0.ebuild
new file mode 100644
index 000000000000..4d597a68a781
--- /dev/null
+++ b/dev-ruby/hiera-eyaml/hiera-eyaml-3.4.0.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="ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md PLUGINS.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Encrypted YAML backend for hiera"
+HOMEPAGE="https://github.com/voxpupuli/hiera-eyaml"
+SRC_URI="https://github.com/voxpupuli/hiera-eyaml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/highline-1.6.19:*
+	dev-ruby/optimist
+"
+
+ruby_add_bdepend "test? (
+	dev-util/cucumber
+	~dev-util/aruba-0.6.2
+	dev-ruby/hiera-eyaml-plaintext
+)"
+
+BDEPEND+=" test? ( || ( app-admin/puppet-agent app-admin/puppet ) dev-tcltk/expect )"
+
+all_ruby_prepare() {
+	# Fix highline dependency to be compatible with more versions.
+	sed -i -e '/highline/ s/~>/>=/' \
+		-e '/gem.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e "s:/tmp:${T}:" \
+		features/sandbox/puppet/environments/local/modules/test/manifests/run.pp \
+		features/sandbox/puppet-hiera-merge/environments/local/modules/test/manifests/run.pp \
+		features/sandbox/puppet-envvar/environments/local/modules/test/manifests/run.pp \
+		features/puppet.feature
+}
+
+each_ruby_prepare() {
+	# Run tests with the correct ruby interpreter
+	sed -i -e 's:I run `eyaml:I run `'${RUBY}' '"${S}"'/bin/eyaml:' features/*.feature || die
+
+}
+
+each_ruby_test() {
+	CUCUMBER_PUBLISH_QUIET=true ${RUBY} -S cucumber --format progress features || die
+}
diff --git a/dev-ruby/hiera-eyaml/metadata.xml b/dev-ruby/hiera-eyaml/metadata.xml
index 5f4ebcf1047c..07ab2adb5524 100644
--- a/dev-ruby/hiera-eyaml/metadata.xml
+++ b/dev-ruby/hiera-eyaml/metadata.xml
@@ -10,6 +10,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">TomPoulton/hiera-eyaml</remote-id>
+    <remote-id type="github">voxpupuli/hiera-eyaml</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest
index 41a00dc4b460..19762ac40c3d 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -1,2 +1 @@
-DIST hiera-3.8.0.gem 40960 BLAKE2B b368ef92bca06081c99ec7e1a1e04b69f3c1cae285fcb17f9d1b89683fd679b037d2ef26af6912a776d73d3a553a8323c6820482383065927245898c9e78daa1 SHA512 0aa8d306cce33760eee9ca702f6d1f8a0137c551321c7553a25644a4097b8539945d5432e94ff83ed9c3392603dc962b33ab1e1702ed1ab5699d3ef179de9379
-DIST hiera-3.9.0.gem 40960 BLAKE2B 863fe37ecfda2153b5e94afde6d53893a0b5baaa10aa3bc3a939cc7df54168bbcb709f85bb50ffad11376d7434337ae3c79bc5d9fac99433da31e7dd77213004 SHA512 6ce3598e7c7a628198638a4b75a65efcc529089c7c80d7f3dfc072c26e8a65054d8bc5c71f40ce2833465ccfaa333c5490ecdfe58578532eb3455be46a69ad0e
+DIST hiera-3.12.0.gem 40960 BLAKE2B b2fea317bd89b754686b1658e8baa9ab0fd2edbbc93c09edef2757ee23bd7bb76235e4a42d65993d817dd36a8f5fa3cc6ba3db7c75eea05641a264aab4c8c5b5 SHA512 bd98c4862ce936012c9761a8ba8c5fc26a1a8a700d3be8a4ed92f701ffb69858641dafea361129d44e7c67e4d462a4c61dd44d85e761b746f6443773feebcb59
diff --git a/dev-ruby/hiera/hiera-3.12.0.ebuild b/dev-ruby/hiera/hiera-3.12.0.ebuild
new file mode 100644
index 000000000000..bb64d9638f72
--- /dev/null
+++ b/dev-ruby/hiera/hiera-3.12.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple pluggable Hierarchical Database"
+HOMEPAGE="https://docs.puppet.com/hiera/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+ruby_add_rdepend "dev-ruby/deep_merge"
diff --git a/dev-ruby/hiera/hiera-3.8.0.ebuild b/dev-ruby/hiera/hiera-3.8.0.ebuild
deleted file mode 100644
index 3c2808823277..000000000000
--- a/dev-ruby/hiera/hiera-3.8.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple pluggable Hierarchical Database"
-HOMEPAGE="https://docs.puppet.com/hiera/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~sparc x86"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-ruby_add_rdepend "dev-ruby/deep_merge"
diff --git a/dev-ruby/hiera/hiera-3.9.0.ebuild b/dev-ruby/hiera/hiera-3.9.0.ebuild
deleted file mode 100644
index dc9baceecec1..000000000000
--- a/dev-ruby/hiera/hiera-3.9.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple pluggable Hierarchical Database"
-HOMEPAGE="https://docs.puppet.com/hiera/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-ruby_add_rdepend "dev-ruby/deep_merge"
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/highline/Manifest b/dev-ruby/highline/Manifest
index ccf43edf3690..fca406f8bd8f 100644
--- a/dev-ruby/highline/Manifest
+++ b/dev-ruby/highline/Manifest
@@ -1 +1,2 @@
-DIST highline-2.0.3.tar.gz 234205 BLAKE2B 4748c3ad8a15e551162ab9f2eb6e176297d833d13e6f5db7898f99c71f25e8a2a01057b0438c5d30b56a66333bbba0da1a435cfa07db97f2ffc5e301157618ef SHA512 f432c8836040bcfb147a84efa2dd3feee7f3f6e03eafbf4232e9457aeef8cb9ca83fcf854d3b261f59a166666abc3f2c8fc0f1279a7efeb07dea8a13be22ebde
+DIST highline-2.1.0.tar.gz 234116 BLAKE2B e1e899093de7e162e83f4d2e694e5841cedc336063a4410cab392702241136d5eec258b53065ffcded567f0af163d04a25bbdfd0767211b059980e9e5effe7c9 SHA512 b763428d67b1eb77762b54b8e2dd39bda720589e7030db8694e793bb432fa94caa2848b23358e7eaea0ccb22d8a93e0a64aeef3865f7e9fec348bbebee19d713
+DIST highline-3.0.1.tar.gz 236149 BLAKE2B 0aaa40ca678dc88934f55d5df9b970d8cd61e507bb4e967c72de10c5bcce94dfc5d6e4085d753124a62d46a285a096302ad127214f2aea28fa0397f40d3c6902 SHA512 e19724a473756faf57d989944b1e5cd86b97049a16ae0c33f25462f6f3d7f9948064f8e08d0b51d3a6f978acaf93c62b4965be5af829d3c07b123c96490a28b2
diff --git a/dev-ruby/highline/highline-2.0.3-r1.ebuild b/dev-ruby/highline/highline-2.0.3-r1.ebuild
deleted file mode 100644
index 7c6ab702d0ab..000000000000
--- a/dev-ruby/highline/highline-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md TODO"
-
-RUBY_FAKEGEM_GEMSPEC="highline.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Highline is a high-level command-line IO library for ruby"
-HOMEPAGE="https://github.com/JEG2/highline"
-SRC_URI="https://github.com/JEG2/highline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-IUSE=""
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-
-all_ruby_prepare() {
-	# fix up gemspec file not to call git
-	sed -i -e 's/git ls-files -z/find * -print0/' highline.gemspec || die
-
-	# Avoid unneeded dependencies
-	sed -i -e '/\(bundler\|code_statistics\)/ s:^:#:' \
-		-e '/PackageTask/,/end/ s:^:#:' Rakefile || die
-	sed -i -e '/simplecov/ s:^:#:' test/test_helper.rb || die
-
-	# Remove almost empty doc directory to allow rdoc recipe to work
-	rm -rf doc || die
-}
diff --git a/dev-ruby/highline/highline-2.0.3.ebuild b/dev-ruby/highline/highline-2.0.3.ebuild
deleted file mode 100644
index 1f0eb296ac68..000000000000
--- a/dev-ruby/highline/highline-2.0.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md TODO"
-
-RUBY_FAKEGEM_GEMSPEC="highline.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Highline is a high-level command-line IO library for ruby"
-HOMEPAGE="https://github.com/JEG2/highline"
-SRC_URI="https://github.com/JEG2/highline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-IUSE=""
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-
-all_ruby_prepare() {
-	# fix up gemspec file not to call git
-	sed -i -e 's/git ls-files -z/find -print0/' highline.gemspec || die
-
-	# Avoid unneeded dependencies
-	sed -i -e '/\(bundler\|code_statistics\)/ s:^:#:' \
-		-e '/PackageTask/,/end/ s:^:#:' Rakefile || die
-	sed -i -e '/simplecov/ s:^:#:' test/test_helper.rb || die
-
-	# Remove almost empty doc directory to allow rdoc recipe to work
-	rm -rf doc || die
-}
diff --git a/dev-ruby/highline/highline-2.1.0.ebuild b/dev-ruby/highline/highline-2.1.0.ebuild
new file mode 100644
index 000000000000..109ed48c2276
--- /dev/null
+++ b/dev-ruby/highline/highline-2.1.0.ebuild
@@ -0,0 +1,34 @@
+# 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.md TODO"
+
+RUBY_FAKEGEM_GEMSPEC="highline.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Highline is a high-level command-line IO library for ruby"
+HOMEPAGE="https://github.com/JEG2/highline"
+SRC_URI="https://github.com/JEG2/highline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE=""
+LICENSE="|| ( GPL-2 Ruby-BSD )"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+all_ruby_prepare() {
+	# fix up gemspec file not to call git
+	sed -i -e 's/git ls-files -z/find * -print0/' highline.gemspec || die
+
+	# Avoid unneeded dependencies
+	sed -i -e '/\(bundler\|code_statistics\)/ s:^:#:' \
+		-e '/PackageTask/,/end/ s:^:#:' Rakefile || die
+	sed -i -e '/simplecov/ s:^:#:' test/test_helper.rb || die
+
+	# Remove almost empty doc directory to allow rdoc recipe to work
+	rm -rf doc || die
+}
diff --git a/dev-ruby/highline/highline-3.0.1.ebuild b/dev-ruby/highline/highline-3.0.1.ebuild
new file mode 100644
index 000000000000..d966495172d7
--- /dev/null
+++ b/dev-ruby/highline/highline-3.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md TODO"
+
+RUBY_FAKEGEM_GEMSPEC="highline.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Highline is a high-level command-line IO library for ruby"
+HOMEPAGE="https://github.com/JEG2/highline"
+SRC_URI="https://github.com/JEG2/highline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="test"
+LICENSE="|| ( GPL-2 Ruby-BSD )"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+
+ruby_add_bdepend "test? ( dev-ruby/dry-types )"
+
+all_ruby_prepare() {
+	# fix up gemspec file not to call git
+	sed -i -e 's/git ls-files -z/find * -print0/' highline.gemspec || die
+
+	# Avoid unneeded dependencies
+	sed -i -e '/\(bundler\|code_statistics\)/ s:^:#:' \
+		-e '/PackageTask/,/end/ s:^:#:' Rakefile || die
+	sed -i -e '/simplecov/ s:^:#:' test/test_helper.rb || die
+
+	# Remove almost empty doc directory to allow rdoc recipe to work
+	rm -rf doc || die
+}
diff --git a/dev-ruby/hipchat/Manifest b/dev-ruby/hipchat/Manifest
deleted file mode 100644
index a9bcbc2f0b22..000000000000
--- a/dev-ruby/hipchat/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hipchat-1.6.0.tar.gz 23328 BLAKE2B b9328e339f40ff1d865af5bbd660d479e94e18be98a74171125ff9d55e96353bf0ad9420e9eacc8b1a650f873d16a197418f7cc8728042fd403a7d1bceaa0b9a SHA512 43afbc2aca234d7d3778189874013df7847f9045ecc1d5ebd6b3772dce2a9cc5000fa6075867a9b0968d49410d775f3f56ed0a4ae637d6ad3893aa668895f2a3
diff --git a/dev-ruby/hipchat/hipchat-1.6.0.ebuild b/dev-ruby/hipchat/hipchat-1.6.0.ebuild
deleted file mode 100644
index 38cb5efb61ae..000000000000
--- a/dev-ruby/hipchat/hipchat-1.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.textile"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby library to interact with HipChat"
-HOMEPAGE="https://github.com/hipchat/hipchat-rb"
-SRC_URI="https://github.com/hipchat/hipchat-rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RUBY_S="hipchat-rb-${PV}"
-
-ruby_add_rdepend "dev-ruby/httparty dev-ruby/mimemagic:*"
-ruby_add_bdepend "test? (
-		dev-ruby/rr
-		dev-ruby/rake
-		dev-ruby/webmock
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' Rakefile ${PN}.gemspec || die "sed failed"
-	sed -i -e '/git ls-files/d' ${PN}.gemspec || die "sed failed"
-
-	sed -i -e '/coveralls/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/hipchat/metadata.xml b/dev-ruby/hipchat/metadata.xml
deleted file mode 100644
index e7bcf14f2141..000000000000
--- a/dev-ruby/hipchat/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">hipchat/hipchat-rb</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/hiredis/Manifest b/dev-ruby/hiredis/Manifest
deleted file mode 100644
index fd179ef2c5bc..000000000000
--- a/dev-ruby/hiredis/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hiredis-rb-0.6.3.tar.gz 19106 BLAKE2B 2892fd28bf7e7edfc3563a0c321fd781baeca9eb31a64dd559a6c828bb9c4fe37c995748782c5222db46b5b35a4d17f5b8b4d8e5306209a0e374ec7096d3cd4b SHA512 3e081d46aeb128789fa41fe9422186dd30e88c5a7a3c16dfcf1a92fe7faf99cced352ea39a885785fc12f0a974625be329d9ff2a5936a786febe8a2c81f5e139
diff --git a/dev-ruby/hiredis/files/hiredis-0.6.1-unvendor-hiredis.patch b/dev-ruby/hiredis/files/hiredis-0.6.1-unvendor-hiredis.patch
deleted file mode 100644
index 885d6d15819e..000000000000
--- a/dev-ruby/hiredis/files/hiredis-0.6.1-unvendor-hiredis.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/ext/hiredis_ext/extconf.rb
-+++ b/ext/hiredis_ext/extconf.rb
-@@ -27,15 +27,8 @@
- end
- 
- if build_hiredis
--  # Make sure hiredis is built...
--  Dir.chdir(hiredis_dir) do
--    success = system("#{make_program} static")
--    raise "Building hiredis failed" if !success
--  end
--
--  # Statically link to hiredis (mkmf can't do this for us)
--  $CFLAGS << " -I#{hiredis_dir}"
--  $LDFLAGS << " #{hiredis_dir}/libhiredis.a"
-+  $CFLAGS << ' ' << `${PKG_CONFIG} hiredis --cflags-only-I`.chomp
-+  $LDFLAGS << ' -lhiredis'
- 
-   have_func("rb_thread_fd_select")
-   create_makefile('hiredis/ext/hiredis_ext')
diff --git a/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild b/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild
deleted file mode 100644
index ec852faec264..000000000000
--- a/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-MY_P="hiredis-rb-${PV}"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/hiredis_ext/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/hiredis/ext"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Wrapper for hiredis (protocol serialization/deserialization and blocking I/O)"
-HOMEPAGE="https://github.com/redis/hiredis-rb"
-SRC_URI="https://github.com/redis/hiredis-rb/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND+=" =dev-libs/hiredis-0.14*:="
-DEPEND+=" dev-libs/hiredis:= test? ( dev-ruby/test-unit:2 )"
-DEPEND+=" virtual/pkgconfig"
-
-RUBY_S="${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.6.1-unvendor-hiredis.patch" )
-
-all_ruby_prepare() {
-	sed -i -e 's:/tmp/:'${T}'/:' test/connection_test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/hiredis/metadata.xml b/dev-ruby/hiredis/metadata.xml
deleted file mode 100644
index 45ca92fb57f1..000000000000
--- a/dev-ruby/hiredis/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">redis/hiredis-rb</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/histogram/histogram-0.2.4.1-r1.ebuild b/dev-ruby/histogram/histogram-0.2.4.1-r1.ebuild
new file mode 100644
index 000000000000..1cc10dbbba45
--- /dev/null
+++ b/dev-ruby/histogram/histogram-0.2.4.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Gives objects the ability to 'histogram' in several useful ways"
+HOMEPAGE="https://github.com/jtprince/histogram"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/narray )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/histogram/histogram-0.2.4.1.ebuild b/dev-ruby/histogram/histogram-0.2.4.1.ebuild
deleted file mode 100644
index 1ea58acebb05..000000000000
--- a/dev-ruby/histogram/histogram-0.2.4.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Gives objects the ability to 'histogram' in several useful ways"
-HOMEPAGE="https://github.com/jtprince/histogram"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/narray )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/hitimes/hitimes-2.0.0-r1.ebuild b/dev-ruby/hitimes/hitimes-2.0.0-r1.ebuild
index 2012f619a1b4..a7537bf5a321 100644
--- a/dev-ruby/hitimes/hitimes-2.0.0-r1.ebuild
+++ b/dev-ruby/hitimes/hitimes-2.0.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="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/copiousfreetime/hitimes"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/hitimes/hitimes-2.0.0.ebuild b/dev-ruby/hitimes/hitimes-2.0.0.ebuild
deleted file mode 100644
index 8130c8f8343a..000000000000
--- a/dev-ruby/hitimes/hitimes-2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A fast, high resolution timer library"
-HOMEPAGE="https://github.com/copiousfreetime/hitimes"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e "/RUBY_VERSION >= '1.9.2'/,+4d"  spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:spec:. -e 'Dir["spec/*_spec.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/hocon/Manifest b/dev-ruby/hocon/Manifest
index 1e95dce65ed2..b4947fb43d3b 100644
--- a/dev-ruby/hocon/Manifest
+++ b/dev-ruby/hocon/Manifest
@@ -1 +1 @@
-DIST hocon-1.3.1.tar.gz 146330 BLAKE2B 4eaa791f148347cf30cea04c79ed63fbc804a0ef7f4bdf1640da706f857a46a99342d338a8444b2df316ef972e11d5a3e10aae8d82f464b2964aa30c2086274c SHA512 c73cfd8d6c77751d1d2a35d85cad2f2eef700a01e8b8de9449c0c9dfefe8d4a80c4a79dd3db8ee4a6d2c3649f26d6780cbe05fe9b067de05ee3711b00faf4255
+DIST hocon-1.4.0.tar.gz 147184 BLAKE2B 7a072b2c4e5bc0dda80b836a6b905888e2a8cf6da87403c738f62ffebc9bae6dfa71125c68f90c4b2608a36f1491f17ceb55b4628e54b44b8acb3933c2a748a9 SHA512 735cd6344d96e5e5e42a94da875476483c6cb993c9d2f6c144b74713e1eb5cbdadcd8a2c73414d456ff9fa565a6dcc575507ee1a6df339ffe1c1944ed6d15e33
diff --git a/dev-ruby/hocon/hocon-1.3.1-r1.ebuild b/dev-ruby/hocon/hocon-1.3.1-r1.ebuild
deleted file mode 100644
index 4c81ca1206b6..000000000000
--- a/dev-ruby/hocon/hocon-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_BINWRAP="hocon"
-
-RUBY_FAKEGEM_GEMSPEC="hocon.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This is a port of the Typesafe Config library to Ruby"
-HOMEPAGE="https://github.com/puppetlabs/ruby-hocon"
-SRC_URI="https://github.com/puppetlabs/ruby-hocon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="ruby-hocon-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-ruby/hocon/hocon-1.3.1.ebuild b/dev-ruby/hocon/hocon-1.3.1.ebuild
deleted file mode 100644
index 3cfb650fd657..000000000000
--- a/dev-ruby/hocon/hocon-1.3.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_BINWRAP="hocon"
-
-RUBY_FAKEGEM_GEMSPEC="hocon.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This is a port of the Typesafe Config library to Ruby"
-HOMEPAGE="https://github.com/puppetlabs/ruby-hocon"
-SRC_URI="https://github.com/puppetlabs/ruby-hocon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="ruby-hocon-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
diff --git a/dev-ruby/hocon/hocon-1.4.0.ebuild b/dev-ruby/hocon/hocon-1.4.0.ebuild
new file mode 100644
index 000000000000..a01b62f02dc0
--- /dev/null
+++ b/dev-ruby/hocon/hocon-1.4.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_BINWRAP="hocon"
+
+RUBY_FAKEGEM_GEMSPEC="hocon.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This is a port of the Typesafe Config library to Ruby"
+HOMEPAGE="https://github.com/puppetlabs/ruby-hocon"
+SRC_URI="https://github.com/puppetlabs/ruby-hocon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-hocon-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
diff --git a/dev-ruby/hocon/metadata.xml b/dev-ruby/hocon/metadata.xml
index 83e021557455..27d02209b463 100644
--- a/dev-ruby/hocon/metadata.xml
+++ b/dev-ruby/hocon/metadata.xml
@@ -12,4 +12,7 @@
 		This is a port of the Typesafe Config library to Ruby.
 		The library provides Ruby support for the HOCON configuration file format.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">puppetlabs/ruby-hocon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/hoe/Manifest b/dev-ruby/hoe/Manifest
index ef657aca310e..b54dea292164 100644
--- a/dev-ruby/hoe/Manifest
+++ b/dev-ruby/hoe/Manifest
@@ -1 +1,4 @@
-DIST hoe-3.21.0.gem 193024 BLAKE2B 2ff65edc6e0aebc93ebc8f3e628261ac3fabec4034b8e7b1bb3c38ab45c8b4641267a8c46c851ad69425c08782553c628574ae0a1417257cf64ba05a86de08f3 SHA512 39da93520bdb4efcbc58af58562ff8abbdecf45f92071ddb31f68ac799eb6f704431cea3d699aa039ba3a5217dc9b0f2d87f8b553d62860c34cb63803b625754
+DIST hoe-4.0.4.gem 190976 BLAKE2B 82e017351700a376f7e497a2e65b5e3e8331f25d5b083934f710272184016264e9b21ae4e2d25154affe901d6f426108ad29cb281cd68b30eba0910323a22544 SHA512 a7f03c171f77127d442070947193536421395a609536c45efb639c75f24605dfccb9bcf8ec6ec202956f888a3110cffa99c56bb924f7e1b982864d38673b6a4c
+DIST hoe-4.0.5.gem 190976 BLAKE2B 57622502f76a65a1d1e31bc717d125495c1f1d4e687ddf5a74c5335a58aa3a64bc0b0e2a66fe17e5b14ef92cdc72178299b2cfbb03bcb2a57d71c740d9628a6a SHA512 5f9e423dfe49d2b41ae4380a8b226a7c6efa939ba48022a0d872e9ccb4fb8aeed67ea2366034f61edc92a5be3f23014a0428ea64a48c644a2308621a0d417a23
+DIST hoe-4.1.0.gem 190976 BLAKE2B c16ccdd73235f43a8f937b52cba7d670516b86670ce5ee0a86f6167805d74f9c090b6f24d5465527c1356486a97cbdcf73f904b31e605f6f56e76dd54318d6a8 SHA512 6a90adcd2bc767ccf6e2fa425e98a9e765135cbcb39793aa0e4a1314028a8cf568a7beca2a16924abf1d0984c855b077be8123109140181ae2986c3ebc1c9010
+DIST hoe-4.2.0.gem 191488 BLAKE2B ce8ecf1ddd5c83a2b6318dfd23111bb904086897cc0e66414dbe5c7972ebb36c897de56f32964b005385136ad13aab198be7f888f65d5ae6608b99cad41e1166 SHA512 c083a7135bb751f38a5c7380f888a67232f097cb35376cb1e88d8585a97faae0a47ab4b5a22a9491526307df79efd34f65796e777563ae38549dc25edf8b05c4
diff --git a/dev-ruby/hoe/hoe-3.21.0.ebuild b/dev-ruby/hoe/hoe-3.21.0.ebuild
deleted file mode 100644
index 778e91ac9e95..000000000000
--- a/dev-ruby/hoe/hoe-3.21.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="template"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hoe extends rake to provide full project automation"
-HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
-
-ruby_add_rdepend ">=dev-ruby/rake-0.8.7 <dev-ruby/rake-15.0"
-
-all_ruby_prepare() {
-	# Skip isolation
-	sed -i -e '/isolate/ s:^:#:' Rakefile || die
-
-	# Skip test depending on specifics of gem command name
-	sed -i -e '/test_nosudo/,/^  end/ s:^:#:' test/test_hoe.rb || die
-
-	# Avoid test with random sort order
-	sed -i -e '/test_possibly_better/askip "ordering issues"' test/test_hoe.rb || die
-
-	# Avoid test that depends on specifics of merged packages
-	sed -i -e '/test_make_rdoc_cmd/askip "dependent on merged packages"' test/test_hoe_publish.rb || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		rdoc --title "seattlerb's hoe-${PV} Documentation" -o doc --main README.txt lib History.txt Manifest.txt README.txt || die
-		rm -f doc/js/*.gz || die
-	fi
-}
diff --git a/dev-ruby/hoe/hoe-4.0.4.ebuild b/dev-ruby/hoe/hoe-4.0.4.ebuild
new file mode 100644
index 000000000000..db7a4e635ceb
--- /dev/null
+++ b/dev-ruby/hoe/hoe-4.0.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="template"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Hoe extends rake to provide full project automation"
+HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
+
+ruby_add_rdepend ">=dev-ruby/rake-0.8.7 <dev-ruby/rake-15.0"
+
+all_ruby_prepare() {
+	# Skip isolation
+	sed -i -e '/isolate/ s:^:#:' Rakefile || die
+
+	# Skip test depending on specifics of gem command name
+	sed -i -e '/test_nosudo/,/^  end/ s:^:#:' test/test_hoe.rb || die
+
+	# Avoid test with random sort order
+	sed -i -e '/test_possibly_better/askip "ordering issues"' test/test_hoe.rb || die
+
+	# Avoid test that depends on specifics of merged packages
+	sed -i -e '/test_make_rdoc_cmd/askip "dependent on merged packages"' test/test_hoe_publish.rb || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		rdoc --title "seattlerb's hoe-${PV} Documentation" -o doc --main README.rdoc \
+			 lib History.rdoc Manifest.txt README.doc || die
+		rm -f doc/js/*.gz || die
+	fi
+}
+
+each_ruby_test() {
+	export -n A
+	each_fakegem_test
+}
diff --git a/dev-ruby/hoe/hoe-4.0.5.ebuild b/dev-ruby/hoe/hoe-4.0.5.ebuild
new file mode 100644
index 000000000000..96f7c8c86067
--- /dev/null
+++ b/dev-ruby/hoe/hoe-4.0.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="template"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Hoe extends rake to provide full project automation"
+HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
+
+ruby_add_rdepend ">=dev-ruby/rake-0.8.7 <dev-ruby/rake-15.0"
+
+all_ruby_prepare() {
+	# Skip isolation
+	sed -i -e '/isolate/ s:^:#:' Rakefile || die
+
+	# Skip test depending on specifics of gem command name
+	sed -i -e '/test_nosudo/,/^  end/ s:^:#:' test/test_hoe.rb || die
+
+	# Avoid test with random sort order
+	sed -i -e '/test_possibly_better/askip "ordering issues"' test/test_hoe.rb || die
+
+	# Avoid test that depends on specifics of merged packages
+	sed -i -e '/test_make_rdoc_cmd/askip "dependent on merged packages"' test/test_hoe_publish.rb || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		rdoc --title "seattlerb's hoe-${PV} Documentation" -o doc --main README.rdoc \
+			 lib History.rdoc Manifest.txt README.doc || die
+		rm -f doc/js/*.gz || die
+	fi
+}
+
+each_ruby_test() {
+	export -n A
+	each_fakegem_test
+}
diff --git a/dev-ruby/hoe/hoe-4.1.0.ebuild b/dev-ruby/hoe/hoe-4.1.0.ebuild
new file mode 100644
index 000000000000..855e986f6b15
--- /dev/null
+++ b/dev-ruby/hoe/hoe-4.1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="template"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Hoe extends rake to provide full project automation"
+HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
+
+ruby_add_rdepend ">=dev-ruby/rake-0.8.7 <dev-ruby/rake-15.0"
+
+all_ruby_prepare() {
+	# Skip isolation
+	sed -i -e '/isolate/ s:^:#:' Rakefile || die
+
+	# Skip test depending on specifics of gem command name
+	sed -i -e '/test_nosudo/,/^  end/ s:^:#:' test/test_hoe.rb || die
+
+	# Avoid test with random sort order
+	sed -i -e '/test_possibly_better/askip "ordering issues"' test/test_hoe.rb || die
+
+	# Avoid test that depends on specifics of merged packages
+	sed -i -e '/test_make_rdoc_cmd/askip "dependent on merged packages"' test/test_hoe_publish.rb || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		rdoc --title "seattlerb's hoe-${PV} Documentation" -o doc --main README.rdoc \
+			 lib History.rdoc Manifest.txt README.doc || die
+		rm -f doc/js/*.gz || die
+	fi
+}
+
+each_ruby_test() {
+	export -n A
+	each_fakegem_test
+}
diff --git a/dev-ruby/hoe/hoe-4.2.0.ebuild b/dev-ruby/hoe/hoe-4.2.0.ebuild
new file mode 100644
index 000000000000..df02e38b53d6
--- /dev/null
+++ b/dev-ruby/hoe/hoe-4.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="template"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Hoe extends rake to provide full project automation"
+HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
+
+ruby_add_rdepend ">=dev-ruby/rake-0.8.7 <dev-ruby/rake-15.0"
+
+all_ruby_prepare() {
+	# Skip isolation
+	sed -i -e '/isolate/ s:^:#:' Rakefile || die
+
+	# Skip test depending on specifics of gem command name
+	sed -i -e '/test_nosudo/,/^  end/ s:^:#:' test/test_hoe.rb || die
+
+	# Avoid test with random sort order
+	sed -i -e '/test_possibly_better/askip "ordering issues"' test/test_hoe.rb || die
+
+	# Avoid test that depends on specifics of merged packages
+	sed -i -e '/test_make_rdoc_cmd/askip "dependent on merged packages"' test/test_hoe_publish.rb || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		rdoc --title "seattlerb's hoe-${PV} Documentation" -o doc --main README.rdoc \
+			 lib History.rdoc Manifest.txt README.doc || die
+		rm -f doc/js/*.gz || die
+	fi
+}
+
+each_ruby_test() {
+	export -n A
+	each_fakegem_test
+}
diff --git a/dev-ruby/hoe/metadata.xml b/dev-ruby/hoe/metadata.xml
index daac6fdb7252..bdd51fb52dc3 100644
--- a/dev-ruby/hoe/metadata.xml
+++ b/dev-ruby/hoe/metadata.xml
@@ -5,4 +5,7 @@
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">seattlerb/hoe</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/hpricot/Manifest b/dev-ruby/hpricot/Manifest
deleted file mode 100644
index e2a1747d7308..000000000000
--- a/dev-ruby/hpricot/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hpricot-0.8.6.gem 293888 BLAKE2B 5c054c6fcd5c3365dbf44f3c502bc4c1c3885f4aa43fd1fd15365aea19600ef0ef48157c39ef1709386bda0bc3fb6bba6d98862e8e28bdb5c173429969ef5ab9 SHA512 f0ea9168ae79d099cdb751dd5a205e0896dfb229759e499fff833e94209d1497aa97becb285176dcbcc1fee19bc11913ca3ac0d7a467067e5d837c1eb6e310ad
diff --git a/dev-ruby/hpricot/files/hpricot-0.8.6-fast_xs.patch b/dev-ruby/hpricot/files/hpricot-0.8.6-fast_xs.patch
deleted file mode 100644
index 0b16b6c61b93..000000000000
--- a/dev-ruby/hpricot/files/hpricot-0.8.6-fast_xs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: hpricot-0.8.6/metadata
-===================================================================
---- hpricot-0.8.6.orig/metadata
-+++ hpricot-0.8.6/metadata
-@@ -16,7 +16,18 @@ bindir: bin
- cert_chain: []
- 
- date: 2012-01-17 00:00:00 Z
--dependencies: []
-+dependencies:
-+- !ruby/object:Gem::Dependency 
-+  name: fast_xs
-+  prerelease: false
-+  requirement: &id003 !ruby/object:Gem::Requirement 
-+    none: false
-+    requirements: 
-+    - - ">="
-+      - !ruby/object:Gem::Version 
-+        version: 0.7.3
-+  type: :runtime
-+  version_requirements: *id003
- 
- description: a swift, liberal HTML parser with a fantastic library
- email: why@ruby-lang.org
diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r6.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r6.ebuild
deleted file mode 100644
index deb64395aa5a..000000000000
--- a/dev-ruby/hpricot/hpricot-0.8.6-r6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/hpricot_scan/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast and liberal HTML parser for Ruby"
-HOMEPAGE="https://wiki.github.com/hpricot/hpricot"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "dev-ruby/rake
-	dev-ruby/rdoc
-	dev-ruby/rake-compiler"
-
-ruby_add_rdepend "dev-ruby/fast_xs"
-
-# Probably needs the same jdk as JRuby but I'm not sure how to express
-# that just yet.
-DEPEND+=" dev-util/ragel"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
-
-	# Fix encoding assumption of environment for Ruby 1.9.
-	# https://github.com/hpricot/hpricot/issues/52
-	# sed -i -e '1 iEncoding.default_external=Encoding::UTF_8 if RUBY_VERSION =~ /1.9/' test/load_files.rb || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e '/^REV/ s/.*/REV = "6"/' Rakefile || die
-
-	# Fix int size warning
-	sed -i -e 's/te - ts/(int)(te - ts)/' ext/hpricot_scan/hpricot_css.rl || die
-}
-
-each_ruby_prepare() {
-	pushd .. &>/dev/null
-	eapply "${FILESDIR}"/${P}-fast_xs.patch
-	popd .. &>/dev/null
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake ragel || die
-
-	each_fakegem_compile
-}
diff --git a/dev-ruby/hpricot/metadata.xml b/dev-ruby/hpricot/metadata.xml
deleted file mode 100644
index 658c72b1920d..000000000000
--- a/dev-ruby/hpricot/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/html-pipeline/Manifest b/dev-ruby/html-pipeline/Manifest
new file mode 100644
index 000000000000..41263ccd9f7b
--- /dev/null
+++ b/dev-ruby/html-pipeline/Manifest
@@ -0,0 +1 @@
+DIST html-pipeline-2.14.3.tar.gz 45196 BLAKE2B f9a2976188a29648b53cbb065343aa6f2f4faf8346daf65256a2178a737dd529cb87b68df6cf98ed9ba7805a73f245a97bfcbb51e35554f09172147dc74dcce1 SHA512 fe2ed353894b87f66f30498625e657593aea3a5730d122f3d57a17a53d76351ed6899c04a597b81473b22be752af044fcd13e01885851ac525913143daa8b4c6
diff --git a/dev-ruby/html-pipeline/html-pipeline-2.14.3.ebuild b/dev-ruby/html-pipeline/html-pipeline-2.14.3.ebuild
new file mode 100644
index 000000000000..e2756a54336b
--- /dev/null
+++ b/dev-ruby/html-pipeline/html-pipeline-2.14.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="html-pipeline.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="GitHub HTML processing filters and utilities"
+HOMEPAGE="https://github.com/gjtorikian/html-pipeline"
+SRC_URI="https://github.com/gjtorikian/html-pipeline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/activesupport-2:*
+	>=dev-ruby/nokogiri-1.4
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/commonmarker
+	dev-ruby/rinku
+	dev-ruby/redcloth
+	dev-ruby/rouge
+	dev-ruby/sanitize
+)"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|focus\)/ s:^:#:' Rakefile test/test_helper.rb || die
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid running tests for unpackaged optional dependencies
+	# escape_utils, email_reply_parser, gemoji
+	rm -f test/html/pipeline/{email_reply,emoji,plain_text_input,syntax_highlight,toc}_filter_test.rb || die
+}
diff --git a/dev-ruby/html-pipeline/metadata.xml b/dev-ruby/html-pipeline/metadata.xml
new file mode 100644
index 000000000000..53fbb8157b7e
--- /dev/null
+++ b/dev-ruby/html-pipeline/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">gjtorikian/html-pipeline</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/html2haml/Manifest b/dev-ruby/html2haml/Manifest
index 3a29cdfdf90b..7cd8e53b9e2b 100644
--- a/dev-ruby/html2haml/Manifest
+++ b/dev-ruby/html2haml/Manifest
@@ -1 +1 @@
-DIST html2haml-2.2.0.gem 21504 BLAKE2B ead2c636baacb8dbba7bd650356da5e2ebfa8ab565edb38ab03df287d8d0709b9271ef3f46fae0f2d2b86d37dbf6a0212fbf6803aaf7757a9f2653b773e46482 SHA512 b6988182073f35d4d9b9f07f2cc2ba01c66679fa646fd2d1e3c8cf0643c88b04a2b1a36d584bdcca897f804e32486a618abc8fbd8db023ff9c22ee66d93ed9f0
+DIST html2haml-2.3.0.gem 21504 BLAKE2B 52bfdab16a78c44f7f3f5e4be6015f236fe53b15c9fe6e595223e76fdef544f06cb4abc8b3a2c3fd904c20a404e5bb10c44546494a93ff10690bd5a023afe555 SHA512 75b3453fe919c8914d53cb5492df2377756d89fa795d5ea29a64559e7f3e4ee91e61db706e7860e214a7e6d5160e0f209c65d68d8d3ac28ec5b51fefba6a9a94
diff --git a/dev-ruby/html2haml/html2haml-2.2.0-r1.ebuild b/dev-ruby/html2haml/html2haml-2.2.0-r1.ebuild
deleted file mode 100644
index 99cad3b03a7b..000000000000
--- a/dev-ruby/html2haml/html2haml-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md Changelog.markdown"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Convert HTML and HTML+Erb to Haml"
-HOMEPAGE="https://github.com/haml/html2haml"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.6.0
-	>=dev-ruby/erubis-2.7.0
-	>=dev-ruby/ruby_parser-3.5
-	dev-ruby/haml:5"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/html2haml_test.rb || die
-	${RUBY} -Ilib:test test/erb_test.rb || die
-}
diff --git a/dev-ruby/html2haml/html2haml-2.3.0.ebuild b/dev-ruby/html2haml/html2haml-2.3.0.ebuild
new file mode 100644
index 000000000000..f33e9cbff4d4
--- /dev/null
+++ b/dev-ruby/html2haml/html2haml-2.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md Changelog.markdown"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Convert HTML and HTML+Erb to Haml"
+HOMEPAGE="https://github.com/haml/html2haml"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.6.0
+	>=dev-ruby/erubis-2.7.0
+	>=dev-ruby/ruby_parser-3.5
+	>=dev-ruby/haml-4.0"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -e "/bundler/d" \
+		-e 's/MiniTest::Unit::TestCase/Minitest::Test/' \
+		-i test/test_helper.rb || die
+	sed -e 's/MiniTest::Unit::TestCase/Minitest::Test/' \
+		-i test/*_test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test test/html2haml_test.rb || die
+	${RUBY} -Ilib:test test/erb_test.rb || die
+}
diff --git a/dev-ruby/htmlentities/htmlentities-4.3.4-r1.ebuild b/dev-ruby/htmlentities/htmlentities-4.3.4-r1.ebuild
index 9caf8cee292b..8743583188dd 100644
--- a/dev-ruby/htmlentities/htmlentities-4.3.4-r1.ebuild
+++ b/dev-ruby/htmlentities/htmlentities-4.3.4-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/http-accept/Manifest b/dev-ruby/http-accept/Manifest
index 7f5c799b9ab7..9f67a522e897 100644
--- a/dev-ruby/http-accept/Manifest
+++ b/dev-ruby/http-accept/Manifest
@@ -1,2 +1,3 @@
 DIST http-accept-1.7.0.tar.gz 12289 BLAKE2B 5eda9bd29e2dd2b52c8f2589adf57872a80aaf93c37d28b1668dc24fc1e2fa81d00ec12766dd558691dbf3e6560bba013f456a659ead47fffd77b1565c186a7f SHA512 3502bfbd07f6bb0164843c728cd5ef27adfd675317fd60372539180de212d02d6d446cff8eb081d1cbe5a19b30d5759a55b22bc63736cea83254595bd691522f
-DIST http-accept-2.1.1.tar.gz 12488 BLAKE2B b909736c0fda14b32f30c38f12f4c4c2b2bf1a36ddf753069484b6b7151d518b80a6ae8dba929e27f8f758c0c0ae0c52c24802f02b1bfd4674ca33b50d7a0de0 SHA512 e0231cae90ce9180006714485df2cf205bf1f114887dc581ea50fb558c1c7e434838d10d0c9f69c1d747249b8d0c73e628a6ea7b1ffa1ffa7059ba2447307df2
+DIST http-accept-2.2.0.tar.gz 14174 BLAKE2B b6fd0c065a1d9c798ebee8a2f82aa45738cf98721d42d9806614fd98c8ce5d571ce06ad3292e81a972e484f55c75c0e99c5ad54f138323b180bb9292f87b3049 SHA512 341b09b3f8ba132ba9394c904bbe7c95a91fe0b39b080ae96d8228b8474f2d7de6edf4d9dce0b16783ac12aa375b0cda99be67290656f3348219f52d66b7f120
+DIST http-accept-2.2.1.tar.gz 14323 BLAKE2B 9e14f2f23d87c28f234f1c18cf7780aa6c05caa7b7242a2c60ad11d0735fb67f65c162d72685f697f51bcc41f046068dfa612ea8bbf4bd10de6b1402075b92d6 SHA512 770c3b4c5d5b288bad88d6f53b9c52fc9935db5f9ef2e935ebb2dca4afca740f8731a38425acdd11fd9d5d51a8a0b087d392653dc675a349470f1e5ad4f2300d
diff --git a/dev-ruby/http-accept/http-accept-1.7.0-r1.ebuild b/dev-ruby/http-accept/http-accept-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..f33538a857c1
--- /dev/null
+++ b/dev-ruby/http-accept/http-accept-1.7.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="http-accept.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse Accept and Accept-Language HTTP headers"
+HOMEPAGE="https://github.com/socketry/http-accept"
+SRC_URI="https://github.com/socketry/http-accept/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="amd64 ~arm64 ~ppc ~riscv ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/http-accept/http-accept-1.7.0.ebuild b/dev-ruby/http-accept/http-accept-1.7.0.ebuild
deleted file mode 100644
index fe574509a5c3..000000000000
--- a/dev-ruby/http-accept/http-accept-1.7.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parse Accept and Accept-Language HTTP headers"
-HOMEPAGE="https://github.com/socketry/http-accept"
-SRC_URI="https://github.com/socketry/http-accept/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64"
-IUSE=""
diff --git a/dev-ruby/http-accept/http-accept-2.1.1-r1.ebuild b/dev-ruby/http-accept/http-accept-2.1.1-r1.ebuild
deleted file mode 100644
index ac8cdf35b333..000000000000
--- a/dev-ruby/http-accept/http-accept-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="http-accept.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parse Accept and Accept-Language HTTP headers"
-HOMEPAGE="https://github.com/socketry/http-accept"
-SRC_URI="https://github.com/socketry/http-accept/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
-	sed -e "s:_relative ': './:" \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/http-accept/http-accept-2.1.1.ebuild b/dev-ruby/http-accept/http-accept-2.1.1.ebuild
deleted file mode 100644
index 905cafe31da3..000000000000
--- a/dev-ruby/http-accept/http-accept-2.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parse Accept and Accept-Language HTTP headers"
-HOMEPAGE="https://github.com/socketry/http-accept"
-SRC_URI="https://github.com/socketry/http-accept/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/http-accept/http-accept-2.2.0.ebuild b/dev-ruby/http-accept/http-accept-2.2.0.ebuild
new file mode 100644
index 000000000000..e9ac2bd33c8b
--- /dev/null
+++ b/dev-ruby/http-accept/http-accept-2.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="http-accept.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse Accept and Accept-Language HTTP headers"
+HOMEPAGE="https://github.com/socketry/http-accept"
+SRC_URI="https://github.com/socketry/http-accept/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm64 ~ppc ~riscv ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
+	sed -e 's:_relative ": "./:' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/http-accept/http-accept-2.2.1.ebuild b/dev-ruby/http-accept/http-accept-2.2.1.ebuild
new file mode 100644
index 000000000000..132a37d10642
--- /dev/null
+++ b/dev-ruby/http-accept/http-accept-2.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="http-accept.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse Accept and Accept-Language HTTP headers"
+HOMEPAGE="https://github.com/socketry/http-accept"
+SRC_URI="https://github.com/socketry/http-accept/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~x86"
+
+all_ruby_prepare() {
+	rm -f config/sus.rb || die
+
+	sed -e 's:_relative ": "./:' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/http-cookie/Manifest b/dev-ruby/http-cookie/Manifest
index 5bfe6ed058b7..7c105791efcc 100644
--- a/dev-ruby/http-cookie/Manifest
+++ b/dev-ruby/http-cookie/Manifest
@@ -1 +1 @@
-DIST http-cookie-1.0.4.gem 39424 BLAKE2B 06ac0e667340ac17827a8eb4ed320efe77ad97509fcd444f7e77d887a77643a6b34e84486db78eba52245891d1719e750d9a446c40a4ab7804f2304b600029bd SHA512 788fdaa642e6b596e7a91c57a7942a832c09a84fed88b30fdd8e5a8ad66d72780afc1246e6c83c4dfd5af8018c278750866dd05d804aef793aa067b09519af8d
+DIST http-cookie-1.0.5.gem 39424 BLAKE2B 569a0d18c962be378f3974b400ddf2289c72490b2b93619fcd83ed6c00bbf5def76239c52163dc6231060792abf3a19988285a6cd28f158ff7339252da912e61 SHA512 d530d64b5c2fc3757a6de03384fe768317e24a523d4a4215f5bcc6b5bca9e7b94eeaad1e52fbb67548396b7b2ca7c9d8b68ea7b99109e24770fcf34c950469ef
diff --git a/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild b/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild
deleted file mode 100644
index 560386b17d90..000000000000
--- a/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby library to handle HTTP cookies"
-HOMEPAGE="https://github.com/sparklemotion/http-cookie"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/domain_name-0.5:0"
-
-all_ruby_prepare() {
-	sed -i -e "/simplecov/d" -e "/bundler/d" Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/test_http_cookie.rb || die
-	${RUBY} -Ilib test/test_http_cookie_jar.rb || die
-}
diff --git a/dev-ruby/http-cookie/http-cookie-1.0.5-r1.ebuild b/dev-ruby/http-cookie/http-cookie-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..7207f02d723d
--- /dev/null
+++ b/dev-ruby/http-cookie/http-cookie-1.0.5-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby library to handle HTTP cookies"
+HOMEPAGE="https://github.com/sparklemotion/http-cookie"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
+
+# See https://github.com/sparklemotion/http-cookie/issues/16 for dropping domain_name
+ruby_add_rdepend ">=dev-ruby/domain_name-0.5:0"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/d" -e "/bundler/d" Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_http_cookie.rb || die
+	${RUBY} -Ilib test/test_http_cookie_jar.rb || die
+}
diff --git a/dev-ruby/http-form_data/Manifest b/dev-ruby/http-form_data/Manifest
index f265faa7bc95..ec310b64af67 100644
--- a/dev-ruby/http-form_data/Manifest
+++ b/dev-ruby/http-form_data/Manifest
@@ -1,2 +1 @@
-DIST http-form_data-2.2.0.gem 17408 BLAKE2B 35669a42e366297eb54cb3b291b0cedcd70387f3e903056ff3dbbab52a6efaa9d536111f00dd9cd360268e75dffcd8cc91ad0ed898236f0e7af89f14979d3240 SHA512 dbcc2453388ba586556b86d4cff9cf12fcde4ee5f5a913e8c5f24857b10010e920fba447c1d34bed78a1e636c2ef2649ea4dd1b428c29842b3c45eeaa1281e74
 DIST http-form_data-2.3.0.gem 17408 BLAKE2B faa29c86d57fac1554680bb10e1a71e591ec873a04c63c0d0fa2c993c03df03dd35f3b762a290d188285efc0cf63d5040b262d386cdf7a4abc4b7477a6a1e00f SHA512 c070126d18a66bd505005d7dae4ece6c751e52593806daf618bbb437b7f9296a5f18aac2e317b3526c9b34adc2f4d9fc7b7bab8cf2a8c8ca67fdc5940969ff21
diff --git a/dev-ruby/http-form_data/http-form_data-2.2.0.ebuild b/dev-ruby/http-form_data/http-form_data-2.2.0.ebuild
deleted file mode 100644
index 2d3968c6b5b3..000000000000
--- a/dev-ruby/http-form_data/http-form_data-2.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility-belt to build form data request bodies"
-HOMEPAGE="https://github.com/httprb/form_data.rb"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/SimpleCov.start/ s:^:#: ; 1irequire "json"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/http-form_data/http-form_data-2.3.0-r1.ebuild b/dev-ruby/http-form_data/http-form_data-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..698ffd618758
--- /dev/null
+++ b/dev-ruby/http-form_data/http-form_data-2.3.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility-belt to build form data request bodies"
+HOMEPAGE="https://github.com/httprb/form_data.rb"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/SimpleCov.start/ s:^:#: ; 1irequire "json"' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/http-form_data/http-form_data-2.3.0.ebuild b/dev-ruby/http-form_data/http-form_data-2.3.0.ebuild
deleted file mode 100644
index 0586bf562032..000000000000
--- a/dev-ruby/http-form_data/http-form_data-2.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility-belt to build form data request bodies"
-HOMEPAGE="https://github.com/httprb/form_data.rb"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/SimpleCov.start/ s:^:#: ; 1irequire "json"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/http-parser/http-parser-1.2.3-r1.ebuild b/dev-ruby/http-parser/http-parser-1.2.3-r1.ebuild
index 8b85b5fe20db..057464373f93 100644
--- a/dev-ruby/http-parser/http-parser-1.2.3-r1.ebuild
+++ b/dev-ruby/http-parser/http-parser-1.2.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -21,7 +21,7 @@ IUSE=""
 DEPEND+=" >=net-libs/http-parser-2.8.1"
 RDEPEND+=" >=net-libs/http-parser-2.8.1"
 
-ruby_add_bdepend "dev-ruby/ffi-compiler"
+ruby_add_bdepend "dev-ruby/ffi-compiler dev-ruby/rake"
 
 each_ruby_compile() {
 	${RUBY} -C ext -S rake || die
diff --git a/dev-ruby/http-parser/http-parser-1.2.3.ebuild b/dev-ruby/http-parser/http-parser-1.2.3.ebuild
deleted file mode 100644
index 179dcdf621ab..000000000000
--- a/dev-ruby/http-parser/http-parser-1.2.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A super fast http parser for ruby"
-HOMEPAGE="https://github.com/cotag/http-parser"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+=" >=net-libs/http-parser-2.8.1"
-RDEPEND+=" >=net-libs/http-parser-2.8.1"
-
-ruby_add_bdepend "dev-ruby/ffi-compiler"
-
-each_ruby_compile() {
-	${RUBY} -C ext -S rake || die
-	mv ext/*/libhttp-parser-ext.so lib/http-parser/ || die
-}
diff --git a/dev-ruby/http/Manifest b/dev-ruby/http/Manifest
index 4cdab66abad6..e231bb5237ff 100644
--- a/dev-ruby/http/Manifest
+++ b/dev-ruby/http/Manifest
@@ -1,2 +1,2 @@
-DIST http-4.1.1.gem 74240 BLAKE2B 350d4a2eb966f8dae05a206e20a92d8ce0601df36673cae8c969b8849d6715c5d0ab0e24c4b6cc4f117e4788e535296f86d5193198df4a8229572817c9cd3f75 SHA512 89e088521212293db692b66a7058327c215bba119b3f01d4120fd32f0754294d4cbada88ed9cffb6f182f6d712a0923dadfc645c1618e25a802fcc3d467356de
-DIST http-4.4.1.gem 75776 BLAKE2B ab34a6a567842d52f9b7cbe3fc3fb8e4757f5cf1303deacdf2f2130a44e82fde64f0db561c3f8fc28100faea277a9c4a9352f95e6cb1359730b34e83a7b36d72 SHA512 6e43a8ae379d7c8a807a9a03c87bfb5ad1719f9838e26ac7a695220ee2bc50344accc2db268d30da175328fd5468b87ec8532d17ce42a5b74d6c2c4c281d1bc9
+DIST http-5.1.1.gem 82944 BLAKE2B bd44ede401712ddd13b76f9e3266622aefd78f37a89c84217c7f8206214e9e2ee994fe375a6e7897315dd83853d4e8ab2c0c9c34a59fe47c1a0617f3c126fdab SHA512 a39d88297b6f2f0a51a22fe502d1f7883d44a3fa0af250e1a8142f093fb3865b02b797bc46780d9129f0c67e18f97cc551aa1dbd794b3b4cda6bdb5495fe95e3
+DIST http-5.2.0.gem 85504 BLAKE2B 60391b959752c63e2f8cffcb86d6aad47fd30817f348ac6fc28ebce4fa5186f482c08db5e4413fc84eb54a9beb2682260c0c7241a76b40c3489fe7f2abcfb154 SHA512 88a813498db68827ea665c3a568ce45b0096203484564f3de18d46abdd87d2ecd756745f9f530965db306f8e37185d3d0b31959082bbe01fee5545b36b0716bd
diff --git a/dev-ruby/http/http-4.1.1.ebuild b/dev-ruby/http/http-4.1.1.ebuild
deleted file mode 100644
index d9ea9b87273d..000000000000
--- a/dev-ruby/http/http-4.1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy-to-use client library for making requests from Ruby"
-HOMEPAGE="https://github.com/tarcieri/http"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.3:0
-	>=dev-ruby/http-cookie-1.0:0
-	dev-ruby/http-form_data:2
-	>=dev-ruby/http_parser_rb-0.6.0 =dev-ruby/http_parser_rb-0.6*"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/certificate_authority dev-ruby/rspec-its )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/end/ s:^:#:' \
-		-e '1irequire "cgi"' spec/spec_helper.rb || die
-
-	# Avoid specs that require network access
-	sed -i -e '/.persistent/,/^  end/ s:^:#:' \
-		spec/lib/http_spec.rb || die
-	sed -i -e '/with non-ASCII URLs/,/^    end/ s:^:#:' \
-		spec/lib/http/client_spec.rb || die
-
-	# Avoid spec that may fail with a running web server
-	sed -i -e '/unifies socket errors into HTTP::ConnectionError/,/^  end/ s:^:#:' spec/lib/http_spec.rb || die
-
-	# Fix spec for production release
-	sed -i -e '/User-Agent:/ s/.dev//' spec/lib/http/features/logging_spec.rb || die
-}
diff --git a/dev-ruby/http/http-4.4.1.ebuild b/dev-ruby/http/http-4.4.1.ebuild
deleted file mode 100644
index 333cc3f6edbe..000000000000
--- a/dev-ruby/http/http-4.4.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy-to-use client library for making requests from Ruby"
-HOMEPAGE="https://github.com/tarcieri/http"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.3:0
-	>=dev-ruby/http-cookie-1.0:0
-	>=dev-ruby/http-form_data-2.2:2
-	=dev-ruby/http-parser-1.2*"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/certificate_authority dev-ruby/rspec-its )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/end/ s:^:#:' \
-		-e '1irequire "cgi"' spec/spec_helper.rb || die
-
-	# Avoid specs that require network access
-	sed -i -e '/.persistent/,/^  end/ s:^:#:' \
-		spec/lib/http_spec.rb || die
-	sed -i -e '/with non-ASCII URLs/,/^    end/ s:^:#:' \
-		spec/lib/http/client_spec.rb || die
-
-	# Avoid spec that may fail with a running web server
-	sed -i -e '/unifies socket errors into HTTP::ConnectionError/,/^  end/ s:^:#:' spec/lib/http_spec.rb || die
-
-	# Fix spec for production release
-	sed -i -e '/User-Agent:/ s/.dev//' spec/lib/http/features/logging_spec.rb || die
-
-	# Avoid specs also failing upstream due to some certificate issue
-	sed -i -e '/context "ssl"/,/^      end/ s:^:#:' spec/lib/http_spec.rb || die
-	sed -i -e '/describe "working with SSL"/,/^  end/ s:^:#:' spec/lib/http/client_spec.rb || die
-}
diff --git a/dev-ruby/http/http-5.1.1.ebuild b/dev-ruby/http/http-5.1.1.ebuild
new file mode 100644
index 000000000000..7f619c9f3bc7
--- /dev/null
+++ b/dev-ruby/http/http-5.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+inherit ruby-fakegem
+
+DESCRIPTION="An easy-to-use client library for making requests from Ruby"
+HOMEPAGE="https://github.com/tarcieri/http"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "=dev-ruby/addressable-2*
+	>=dev-ruby/addressable-2.8
+	=dev-ruby/http-cookie-1*
+	>=dev-ruby/http-form_data-2.2:2
+	>=dev-ruby/llhttp-ffi-0.4.0:0/0.4"
+
+ruby_add_bdepend "
+	test? (
+		=dev-ruby/certificate_authority-1*
+		dev-ruby/rspec-its
+		dev-ruby/webrick
+	)"
+
+all_ruby_prepare() {
+	# Avoid specs that require network access
+	sed -i -e '/.persistent/,/^  end/ s:^:#:' \
+		spec/lib/http_spec.rb || die
+	sed -i -e '/with non-ASCII URLs/,/^    end/ s:^:#:' \
+		spec/lib/http/client_spec.rb || die
+
+	# Avoid spec that may fail with a running web server
+	sed -i -e '/unifies socket errors into HTTP::ConnectionError/,/^  end/ s:^:#:' spec/lib/http_spec.rb || die
+
+	# Fix spec for production release
+	sed -i -e '/User-Agent:/ s/.dev//' spec/lib/http/features/logging_spec.rb || die
+
+	# Avoid specs also failing upstream due to some certificate issue
+	sed -i -e '/context "ssl"/,/^      end/ s:^:#:' spec/lib/http_spec.rb || die
+	sed -i -e '/describe "working with SSL"/,/^  end/ s:^:#:' spec/lib/http/client_spec.rb || die
+
+	# Disable coverage
+	sed -i -e 's/require_relative ".\/support\/simplecov"//g' "spec/spec_helper.rb" || die
+}
+
+each_ruby_test() {
+	# disables dev-ruby/fuubar dep
+	CI=1 each_fakegem_test
+}
diff --git a/dev-ruby/http/http-5.2.0.ebuild b/dev-ruby/http/http-5.2.0.ebuild
new file mode 100644
index 000000000000..d53ceb1279b4
--- /dev/null
+++ b/dev-ruby/http/http-5.2.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CHANGES_OLD.md README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+inherit ruby-fakegem
+
+DESCRIPTION="An easy-to-use client library for making requests from Ruby"
+HOMEPAGE="https://github.com/httprb/http"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "=dev-ruby/addressable-2*
+	>=dev-ruby/addressable-2.8
+	=dev-ruby/base64-0*:*
+	=dev-ruby/http-cookie-1*
+	>=dev-ruby/http-form_data-2.2:2
+	>=dev-ruby/llhttp-ffi-0.5.0:0/0.5"
+
+ruby_add_bdepend "
+	test? (
+		=dev-ruby/certificate_authority-1*
+		dev-ruby/rspec-its
+		dev-ruby/webrick
+	)"
+
+all_ruby_prepare() {
+	# Avoid specs that require network access
+	sed -i -e '/.persistent/,/^  end/ s:^:#:' \
+		spec/lib/http_spec.rb || die
+	sed -i -e '/with non-ASCII URLs/,/^    end/ s:^:#:' \
+		spec/lib/http/client_spec.rb || die
+
+	# Avoid spec that may fail with a running web server
+	sed -i -e '/unifies socket errors into HTTP::ConnectionError/,/^  end/ s:^:#:' spec/lib/http_spec.rb || die
+
+	# Fix spec for production release
+	sed -i -e '/User-Agent:/ s/.dev//' spec/lib/http/features/logging_spec.rb || die
+
+	# Avoid specs also failing upstream due to some certificate issue
+	sed -i -e '/context "ssl"/,/^      end/ s:^:#:' spec/lib/http_spec.rb || die
+	sed -i -e '/describe "working with SSL"/,/^  end/ s:^:#:' spec/lib/http/client_spec.rb || die
+
+	# Disable coverage
+	sed -i -e 's/require_relative ".\/support\/simplecov"//g' "spec/spec_helper.rb" || die
+}
+
+each_ruby_test() {
+	# disables dev-ruby/fuubar dep
+	CI=1 each_fakegem_test
+}
diff --git a/dev-ruby/http/metadata.xml b/dev-ruby/http/metadata.xml
index 6c73268a6ab9..ac2407ed53aa 100644
--- a/dev-ruby/http/metadata.xml
+++ b/dev-ruby/http/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">tarcieri/http</remote-id>
+    <remote-id type="github">httprb/http</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/http_parser_rb/Manifest b/dev-ruby/http_parser_rb/Manifest
index 255fe0ce8758..91f97441ff0b 100644
--- a/dev-ruby/http_parser_rb/Manifest
+++ b/dev-ruby/http_parser_rb/Manifest
@@ -1 +1,2 @@
 DIST http_parser.rb-0.6.0.gem 177664 BLAKE2B ecae9e862454584759cbb3158eb16dd6de09fe95c6b38099f1c6d4be2376ca1d3eb8a6713994da600c9c567193466da30f4784652e19ad796891a53d67578fff SHA512 51c29bfc85de8cedb4e98fec84c955252556abaa4d0848fbc38b232879ffc946c72acf38440e8e9f1e31a8b734a68d43a96924af5f48ac4f1a054153ec913a08
+DIST http_parser.rb-0.8.0.gem 195072 BLAKE2B e02fa70e5f5219d70c887db47541985b07f938bb32c4cca943a3d50f73e3baf820a733a2f479f5d40a2e1dabda4d8ae2466834c8b6d8167646a8fb6dcf7c792b SHA512 228e8a617154411c43a548f10d2d8d2cae2d97970f621b4ef2955de94ed1943611cff22659cd75d63a09a0a02396993ab646ee29303d99856b46a80253a618c8
diff --git a/dev-ruby/http_parser_rb/http_parser_rb-0.6.0-r2.ebuild b/dev-ruby/http_parser_rb/http_parser_rb-0.6.0-r2.ebuild
index 26c7f9681990..878bf9a1a924 100644
--- a/dev-ruby/http_parser_rb/http_parser_rb-0.6.0-r2.ebuild
+++ b/dev-ruby/http_parser_rb/http_parser_rb-0.6.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby30 ruby31 ruby32"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -22,3 +22,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE=""
+
+all_ruby_prepare() {
+	# rspec 3 compatibility
+	sed -i -e 's/be_true/be true/; s/be_false/be false/' spec/parser_spec.rb || die
+}
diff --git a/dev-ruby/http_parser_rb/http_parser_rb-0.8.0.ebuild b/dev-ruby/http_parser_rb/http_parser_rb-0.8.0.ebuild
new file mode 100644
index 000000000000..8a05223d2025
--- /dev/null
+++ b/dev-ruby/http_parser_rb/http_parser_rb-0.8.0.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="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_NAME="http_parser.rb"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/ruby_http_parser/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple callback-based HTTP request/response parser"
+HOMEPAGE="https://github.com/tmm1/http_parser.rb"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+IUSE=""
+
+all_ruby_prepare() {
+	# rspec 3 compatibility
+	sed -i -e 's/be_true/be true/; s/be_false/be false/' spec/parser_spec.rb || die
+}
diff --git a/dev-ruby/http_parser_rb/metadata.xml b/dev-ruby/http_parser_rb/metadata.xml
index 28c8973fca91..63061c24ff42 100644
--- a/dev-ruby/http_parser_rb/metadata.xml
+++ b/dev-ruby/http_parser_rb/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="github">tmm1/http_parser.rb</remote-id>
+    <remote-id type="rubygems">http_parser.rb</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/httparty/Manifest b/dev-ruby/httparty/Manifest
index 178a5d0ea0fb..701567b8a496 100644
--- a/dev-ruby/httparty/Manifest
+++ b/dev-ruby/httparty/Manifest
@@ -1,3 +1 @@
-DIST httparty-0.18.1.tar.gz 97813 BLAKE2B 3192ad5f1e8c292456710529f4e1595ea5b70ae4ad61695d6d0b036872d40b2afbc0c958ffb25b0c1222ba8004593d20c4d3954c530d6c836e915b87150d954a SHA512 fca9de534199fbf6a058c39c3ebe28587c34df2bffee313a0e05204258fb6b6b6643bd0a28deca9d0b42de21c90c54dab058124349e4774489578fb23e8bacf5
-DIST httparty-0.19.0.tar.gz 101070 BLAKE2B 921858ad7d2daf080f041b08b28b69c29b01bdbf4b399616d46fdd43570a1ec4799c61a9edbd04bcc6c6d60e59fd2a3d6a25a40808f7f294f316d644fb3c4998 SHA512 dcdb66b1940e709c58cd1dbc925a3be44db2d01e0a30992b924aa90554405f1608c3c32e8658b2754e20c822a465202e4ee382e37078e871acbbc37465971011
-DIST httparty-0.20.0.tar.gz 101975 BLAKE2B f15eb837a4bbc98de501e6dcca5a17bb0906e8ea6671c55a85d665659ab60bcee5e84d9dafad6b2450e22cedfaf5a86e10e077e52b1120ff9ae2613a1176a651 SHA512 f5770d5a64be2e80aa70334dad899fb723b08088a673a788ca1402285b77ae6b3cef21e3ed263d9618a32879711c9183f2dc82ff7b50bcf6439a8e6bb7a2eb4e
+DIST httparty-0.21.0.tar.gz 102735 BLAKE2B 131c4f3a5a403b609391ececaf079de5ed5c57ea4660fc1d1041832d8baa27b8beaf11ac2743aa6059005904d787259afec27597744bb5e35e56c3b035ca4b1b SHA512 afd50de88a6b1e1cac8c90d6e1458c41ef122b4542c3a14274aacb052f9ceafad868d1b2582d45eedd212a8037fac13238ac05c2e661c9ba9196a00ef3a0a634
diff --git a/dev-ruby/httparty/httparty-0.18.1.ebuild b/dev-ruby/httparty/httparty-0.18.1.ebuild
deleted file mode 100644
index a4fb9eb7a56d..000000000000
--- a/dev-ruby/httparty/httparty-0.18.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="httparty.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Makes http fun! Also, makes consuming restful web services dead easy"
-HOMEPAGE="https://jnunemaker.github.com/httparty"
-SRC_URI="https://github.com/jnunemaker/httparty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend 'dev-ruby/mime-types:3 >=dev-ruby/multi_xml-0.5.2'
-
-ruby_add_bdepend 'test? ( dev-ruby/webmock )'
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files \?-\?-\?/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove bundler
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
-
-	# Avoid test dependency on cucumber. We can't run the features since
-	# they depend on mongrel which is no longer packaged.
-	sed -i -e '/cucumber/I s:^:#:' Rakefile || die
-
-	# Avoid test dependency on simplecov
-	sed -i -e '/simplecov/I s:^:#:' \
-		-e '/pry/ s:^:#:' \
-		-e '1i require "cgi"; require "delegate"' spec/spec_helper.rb || die
-
-	# Avoid test that works standalone but fails in the suite
-	#sed -i -e '/calls block given to perform with each redirect/,/^        end/ s:^:#:' spec/httparty/request_spec.rb
-
-	# Avoid test that is not fully compatible with newer multi_xml
-	sed -i -e '/should be able parse response type xml automatically/askip "multi_xml"' spec/httparty_spec.rb || die
-
-	# Avoid test that fails due to unicode normalization differences
-	sed -i -e '/handles international domains/askip "unicode differences"' spec/httparty_spec.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/httparty/httparty-0.19.0.ebuild b/dev-ruby/httparty/httparty-0.19.0.ebuild
deleted file mode 100644
index 6db437819a69..000000000000
--- a/dev-ruby/httparty/httparty-0.19.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="httparty.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Makes http fun! Also, makes consuming restful web services dead easy"
-HOMEPAGE="https://jnunemaker.github.com/httparty"
-SRC_URI="https://github.com/jnunemaker/httparty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend 'dev-ruby/mime-types:3 >=dev-ruby/multi_xml-0.5.2'
-
-ruby_add_bdepend 'test? ( dev-ruby/webmock )'
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files \?-\?-\?/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove bundler
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
-
-	# Avoid test dependency on cucumber. We can't run the features since
-	# they depend on mongrel which is no longer packaged.
-	sed -i -e '/cucumber/I s:^:#:' Rakefile || die
-
-	# Avoid test dependency on simplecov
-	sed -i -e '/simplecov/I s:^:#:' \
-		-e '/pry/ s:^:#:' \
-		-e '1i require "cgi"; require "delegate"' spec/spec_helper.rb || die
-
-	# Avoid test that works standalone but fails in the suite
-	#sed -i -e '/calls block given to perform with each redirect/,/^        end/ s:^:#:' spec/httparty/request_spec.rb
-
-	# Avoid test that is not fully compatible with newer multi_xml
-	sed -i -e '/should be able parse response type xml automatically/askip "multi_xml"' spec/httparty_spec.rb || die
-
-	# Avoid test that fails due to unicode normalization differences
-	sed -i -e '/handles international domains/askip "unicode differences"' spec/httparty_spec.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/httparty/httparty-0.20.0.ebuild b/dev-ruby/httparty/httparty-0.20.0.ebuild
deleted file mode 100644
index bb9bf6443921..000000000000
--- a/dev-ruby/httparty/httparty-0.20.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="httparty.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Makes http fun! Also, makes consuming restful web services dead easy"
-HOMEPAGE="https://jnunemaker.github.com/httparty"
-SRC_URI="https://github.com/jnunemaker/httparty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend 'dev-ruby/mime-types:3 >=dev-ruby/multi_xml-0.5.2'
-
-ruby_add_bdepend 'test? ( dev-ruby/webmock )'
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files \?-\?-\?/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove bundler
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
-
-	# Avoid test dependency on cucumber. We can't run the features since
-	# they depend on mongrel which is no longer packaged.
-	sed -i -e '/cucumber/I s:^:#:' Rakefile || die
-
-	# Avoid test dependency on simplecov
-	sed -i -e '/simplecov/I s:^:#:' \
-		-e '/pry/ s:^:#:' \
-		-e '1i require "cgi"; require "delegate"' spec/spec_helper.rb || die
-
-	# Avoid test that works standalone but fails in the suite
-	#sed -i -e '/calls block given to perform with each redirect/,/^        end/ s:^:#:' spec/httparty/request_spec.rb
-
-	# Avoid test that is not fully compatible with newer multi_xml
-	sed -i -e '/should be able parse response type xml automatically/askip "multi_xml"' spec/httparty_spec.rb || die
-
-	# Avoid test that fails due to unicode normalization differences
-	sed -i -e '/handles international domains/askip "unicode differences"' spec/httparty_spec.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/httparty/httparty-0.21.0.ebuild b/dev-ruby/httparty/httparty-0.21.0.ebuild
new file mode 100644
index 000000000000..7a2dbc6be66d
--- /dev/null
+++ b/dev-ruby/httparty/httparty-0.21.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="httparty.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Makes http fun! Also, makes consuming restful web services dead easy"
+HOMEPAGE="https://www.johnnunemaker.com/httparty/"
+SRC_URI="https://github.com/jnunemaker/httparty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend '>=dev-ruby/mini_mime-1.0.0 >=dev-ruby/multi_xml-0.5.2'
+
+ruby_add_bdepend 'test? ( dev-ruby/webmock )'
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files \?-\?-\?/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Remove bundler
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
+
+	# Avoid test dependency on cucumber. We can't run the features since
+	# they depend on mongrel which is no longer packaged.
+	sed -i -e '/cucumber/I s:^:#:' Rakefile || die
+
+	# Avoid test dependency on simplecov
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/pry/ s:^:#:' \
+		-e '1i require "cgi"; require "delegate"' spec/spec_helper.rb || die
+
+	# Avoid test that works standalone but fails in the suite
+	#sed -i -e '/calls block given to perform with each redirect/,/^        end/ s:^:#:' spec/httparty/request_spec.rb
+
+	# Avoid test that is not fully compatible with newer multi_xml
+	sed -i -e '/should be able parse response type xml automatically/askip "multi_xml"' spec/httparty_spec.rb || die
+
+	# Avoid test that fails due to unicode normalization differences
+	sed -i -e '/handles international domains/askip "unicode differences"' spec/httparty_spec.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/httparty/metadata.xml b/dev-ruby/httparty/metadata.xml
index 658c72b1920d..ba99179f2314 100644
--- a/dev-ruby/httparty/metadata.xml
+++ b/dev-ruby/httparty/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">jnunemaker/httparty</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/httpauth/httpauth-0.2.1-r1.ebuild b/dev-ruby/httpauth/httpauth-0.2.1-r1.ebuild
index acedb9a1fbd0..0d4f70f1457c 100644
--- a/dev-ruby/httpauth/httpauth-0.2.1-r1.ebuild
+++ b/dev-ruby/httpauth/httpauth-0.2.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md TODO"
 RUBY_FAKEGEM_GEMSPEC="httpauth.gemspec"
diff --git a/dev-ruby/httpclient/httpclient-2.8.3-r2.ebuild b/dev-ruby/httpclient/httpclient-2.8.3-r2.ebuild
deleted file mode 100644
index 052b168dc66a..000000000000
--- a/dev-ruby/httpclient/httpclient-2.8.3-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="-Ilib test"
-RUBY_FAKEGEM_TASK_DOC="doc"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="httpclient.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="'httpclient' gives something like the functionality of libwww-perl (LWP) in Ruby"
-HOMEPAGE="https://github.com/nahi/httpclient"
-SRC_URI="https://github.com/nahi/httpclient/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="Ruby"
-SLOT="0"
-
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
-ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/http-cookie )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[bB]undler/s:^:#:' Rakefile || die
-
-	# Fix documentation task
-	sed -i -e 's/README.txt/README.md/' Rakefile || die
-
-	# Remove mandatory CI reports since we don't need this for testing.
-	sed -i -e '/reporter/s:^:#:' Rakefile || die
-
-	# Remove mandatory simplecov dependency
-	sed -i -e '/[Ss]imple[Cc]ov/ s:^:#:' test/helper.rb || die
-
-	# Comment out test requiring network access that makes assumptions
-	# about the environment, bug 395155
-	sed -i -e '/test_async_error/,/^  end/ s:^:#:' test/test_httpclient.rb || die
-
-	# Skip tests using rack-ntlm which is not packaged. Weirdly these
-	# only fail on jruby.
-	rm test/test_auth.rb || die
-
-	# Skip test failing due to hard-coded expired certificate
-	sed -i -e '/test_verification_without_httpclient/,/^  end/ s:^:#:' test/test_ssl.rb || die
-
-	# Skip test depending on obsolete and vulnerable SSLv3
-	sed -i -e '/test_no_sslv3/,/^  end/ s:^:#:' test/test_ssl.rb || die
-
-	# Do not use 11-year-old bundled certificates!
-	# fix this copy so it doesn't fail tests
-	ln -sf "${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ./dist_key/cacerts.pem
-	ln -sf "${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ./lib/httpclient/cacert.pem
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'gem "test-unit"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-	# Do not use 11-year-old bundled certificates!
-	# fix this copy for production systems
-	# do not ship the cacert1024.pem at all anymore, nobody should use RSA1024 certs!
-	rm -f "${ED}/$(ruby_fakegem_gemsdir)/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}/lib/httpclient/"{cacert.pem,cacert1024}.pem
-	dosym -r /etc/ssl/certs/ca-certificates.crt $(ruby_fakegem_gemsdir)/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}/lib/httpclient/cacert.pem
-}
diff --git a/dev-ruby/httpclient/httpclient-2.8.3-r3.ebuild b/dev-ruby/httpclient/httpclient-2.8.3-r3.ebuild
new file mode 100644
index 000000000000..383191d6c204
--- /dev/null
+++ b/dev-ruby/httpclient/httpclient-2.8.3-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 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="-Ilib test"
+RUBY_FAKEGEM_TASK_DOC="doc"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="httpclient.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="'httpclient' gives something like the functionality of libwww-perl (LWP) in Ruby"
+HOMEPAGE="https://github.com/nahi/httpclient"
+SRC_URI="https://github.com/nahi/httpclient/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="|| ( Ruby Ruby-BSD BSD-2 )"
+SLOT="0"
+
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
+ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/http-cookie dev-ruby/webrick )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[bB]undler/s:^:#:' Rakefile || die
+
+	# Fix documentation task
+	sed -i -e 's/README.txt/README.md/' Rakefile || die
+
+	# Remove mandatory CI reports since we don't need this for testing.
+	sed -i -e '/reporter/s:^:#:' Rakefile || die
+
+	# Remove mandatory simplecov dependency
+	sed -i -e '/[Ss]imple[Cc]ov/ s:^:#:' test/helper.rb || die
+
+	# Comment out test requiring network access that makes assumptions
+	# about the environment, bug 395155
+	sed -i -e '/test_async_error/,/^  end/ s:^:#:' test/test_httpclient.rb || die
+
+	# Skip tests using rack-ntlm which is not packaged. Weirdly these
+	# only fail on jruby.
+	rm test/test_auth.rb || die
+
+	# Skip tests using obsolete 1024-bit or expired certificates and
+	# won't even run anymore.
+	rm -f test/test_ssl.rb || die
+
+	# Do not use 11-year-old bundled certificates!
+	# fix this copy so it doesn't fail tests
+	ln -sf "${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ./dist_key/cacerts.pem
+	ln -sf "${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ./lib/httpclient/cacert.pem
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'gem "test-unit"; Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+	# Do not use 11-year-old bundled certificates!
+	# fix this copy for production systems
+	# do not ship the cacert1024.pem at all anymore, nobody should use RSA1024 certs!
+	rm -f "${ED}/$(ruby_fakegem_gemsdir)/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}/lib/httpclient/"{cacert.pem,cacert1024}.pem
+	dosym -r /etc/ssl/certs/ca-certificates.crt $(ruby_fakegem_gemsdir)/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}/lib/httpclient/cacert.pem
+}
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index b207c06bc8a4..3a93d50c4605 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -1,5 +1,4 @@
-DIST i18n-1.10.0.tar.gz 72745 BLAKE2B 0675af73a52eba29ead397623d602f9eec60ff21953e5f23ee986fa5506a3296d7f54e88ea8d30cd6ccf9eefdcb589bfd798e2ac2a76f5d93d44c47b9dbe0f49 SHA512 efbe3c0c21d84c0ad69bda4a6f46a2106b3d20470b7d06fb2e62a063ac9d4047e38098b69ed30a5d892331d63aaf75e0bc29ffa5ae1d14ab066d47cccfe342fc
-DIST i18n-1.8.10.tar.gz 67943 BLAKE2B 58e8041f8cf652627a305e3d987ff2450913d3dc919ea7aae641cb484524d17312ebd3e0ee68cde1c01091e42713ea229ccb41ed3998c6bbf772d32f855ca107 SHA512 e8b10bf380241d1e6b19250cd63e727366215b4ad7e63479a02cb81a5b46a48e06db827d9df9969c2052895646ee30c237fd17c3352a2bbfed97615bb9b6cfca
-DIST i18n-1.8.11.tar.gz 67964 BLAKE2B e603077c6eb02f6fd89bafd6c06f85c72528d5eb4388854f060f05a4b49a3782a3830366a1f11bd95b191048f29fae251002a34d55cb185ecefb3afc06bb2f36 SHA512 af8fcc307de9959b5a01a79ac3c99d3a3573630f8cdf91c21208e07d35d1a0db60f4995f1b77921c5374a1a19ad66770a107cc41fb29cf480d02be00bf90634a
-DIST i18n-1.8.9.tar.gz 67899 BLAKE2B 56113d0879cb644a49ef79aea892e4452b65df0769a9532af44083852ed85c5afc8ac68cd6ae4f42d4b68a5aa548f7d92cf69371685c65e4cb5e3b3a0e29445a SHA512 0dfe43bcb341c63b10ace733246c2005f1261bbed23f8f38298b0712aab5047a3ddd61aa8f42c9e0cf3dee6564b67c04595234a6dfcf95db30d9a0d044483505
-DIST i18n-1.9.1.tar.gz 68971 BLAKE2B 00fadafb96dca76f7ed180fe5af5e8b44db96262fd98868b2fad5f57a461c3abd61e17d3c8e143603108cf05a58f8a74ed8e2c8cb062d63ec4edc8081b5580c4 SHA512 661f3f62a0933188b8b09f91d816605dbd50f6afc45c54e38ae70e76f03fb428dde33070e1dde48459d0b385521535ebfff1b18323abc2a1a104c5a6097970a4
+DIST i18n-1.13.0.tar.gz 74591 BLAKE2B e8b2a624c6ea02f030eacbbdf1ca9722d23785e51f31f5dd4a640f8ab74dfafc99131773619a5e2af724c7bcdbc0e63989b1552c148137bf15cf436f340c3c96 SHA512 4c2dc75ccb09ace90a5845f4c1325f0cb144c69b06b72a35728674deea5d869ed94fa5b18cf6b56d434cbad7e528150dedbb10ed91a6d15b7e05758117cf427e
+DIST i18n-1.14.1.tar.gz 74855 BLAKE2B b01b5fefd5033352455110e4fda3d567a5033c6bb732dd11519a3859a3cc4d57bd4229ea3346f2e680575f6ac4d7038d4bcbfd0ea314d2e8b08f26858ffd22f6 SHA512 89a293c00c7e62e802823d8011142a0786268b4c8341a9e389182988f1372655b4c5410ee10d6632af2fee645fbbf2feda2ccc4669d59d44640d3fa2c34b9e86
+DIST i18n-1.14.3.tar.gz 74899 BLAKE2B aaf2041763a5c089972384bc6b5fa139cda05dfaf8ed48c4552ff83f3f114ae53dec2bf1564e8ea5e345f45cf37145eb1eb05c0f4c9fb3cbb3631d55c4c15396 SHA512 8b730dccb3584d55509be4cb0bda3fd9ffb0d2c943eb22ee592e408748bf2e3c0a98fce6ceb002093a6774d073b9a762d95589e89518e4a023f35b51d5db2ad2
+DIST i18n-1.14.4.tar.gz 74949 BLAKE2B 5b55c0d6434eec11ac2b7bc39c896381bf9f274f98a1012264a96dc2432a7ad7bababc5bb0c0980b8aeb9b644a933814a48eeef5a53825aeee553ed9631d3778 SHA512 929117b02babbc51c1dcf1643429cdef35d64d54fac7fd5d5603b85305b6e84f3cecfb4f28cf16fc708eb6252a25a22e05ac50d9a9c6def0f0ac6996b9ace7fa
diff --git a/dev-ruby/i18n/i18n-1.10.0.ebuild b/dev-ruby/i18n/i18n-1.10.0.ebuild
deleted file mode 100644
index 55a83c46c854..000000000000
--- a/dev-ruby/i18n/i18n-1.10.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-5.1
-	dev-ruby/bundler
-	>=dev-ruby/mocha-1.7.0
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-
-	# Update old test dependencies
-	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' -e '3igem "json"' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby30)
-			versions="7.0"
-			;;
-		*ruby27)
-			versions="6.0 6.1 7.0"
-			;;
-		*ruby26)
-			versions="5.2 6.0 6.1"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.13.0.ebuild b/dev-ruby/i18n/i18n-1.13.0.ebuild
new file mode 100644
index 000000000000..403d191f1a34
--- /dev/null
+++ b/dev-ruby/i18n/i18n-1.13.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add Internationalization support to your Ruby application"
+HOMEPAGE="http://rails-i18n.org/"
+SRC_URI="https://github.com/ruby-i18n/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
+
+# We need mocha:1.0 which corresponds to the Gemfiles used in each_ruby_test
+ruby_add_bdepend "test? (
+	>=dev-ruby/activesupport-5.1
+	dev-ruby/bundler
+	>=dev-ruby/minitest-5.14:5
+	>=dev-ruby/mocha-1.7.0:1.0
+	dev-ruby/test_declarative )"
+
+all_ruby_prepare() {
+	rm -f gemfiles/*.lock || die
+
+	# Remove optional unpackaged oj gem
+	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
+
+	# Update old test dependencies
+	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' -e '3igem "json"' gemfiles/* || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby32)
+			versions="6.1 7.0"
+			;;
+		*ruby31)
+			versions="6.1 7.0"
+			;;
+		*ruby30)
+			versions="6.0 6.1 7.0"
+			;;
+	esac
+
+	for version in ${versions} ; do
+		if has_version "dev-ruby/activesupport:${version}" ; then
+			einfo "Running tests with activesupport ${version}"
+			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
+		fi
+	done
+}
diff --git a/dev-ruby/i18n/i18n-1.14.1.ebuild b/dev-ruby/i18n/i18n-1.14.1.ebuild
new file mode 100644
index 000000000000..5a6083d32802
--- /dev/null
+++ b/dev-ruby/i18n/i18n-1.14.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add Internationalization support to your Ruby application"
+HOMEPAGE="http://rails-i18n.org/"
+SRC_URI="https://github.com/ruby-i18n/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/activesupport-5.1
+		dev-ruby/bundler
+		>=dev-ruby/minitest-5.14:5
+		dev-ruby/mocha:2
+		dev-ruby/test_declarative
+	)
+"
+
+all_ruby_prepare() {
+	rm -f gemfiles/*.lock || die
+
+	# Remove optional unpackaged oj gem
+	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
+
+	# Update old test dependencies
+	sed -i -e '/rake/ s/~>/>=/' -e '/mocha/ s/1.7.0/2.0/' -e '3igem "json"' -e '4igem "racc"' gemfiles/* || die
+
+	# Use mocha 2 to avoid minitest deprecation issues.
+	sed -i -e 's:mocha/setup:mocha/minitest:' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby33)
+			versions="7.0"
+			;;
+		*ruby32)
+			versions="6.1 7.0"
+			;;
+		*ruby31)
+			versions="6.1 7.0"
+			;;
+		*ruby30)
+			versions="6.0 6.1 7.0"
+			;;
+	esac
+
+	for version in ${versions} ; do
+		if has_version "dev-ruby/activesupport:${version}" ; then
+			einfo "Running tests with activesupport ${version}"
+			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
+		fi
+	done
+}
diff --git a/dev-ruby/i18n/i18n-1.14.3.ebuild b/dev-ruby/i18n/i18n-1.14.3.ebuild
new file mode 100644
index 000000000000..c0da1cda43e5
--- /dev/null
+++ b/dev-ruby/i18n/i18n-1.14.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add Internationalization support to your Ruby application"
+HOMEPAGE="http://rails-i18n.org/"
+SRC_URI="https://github.com/ruby-i18n/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+ruby_add_rdepend "
+	dev-ruby/concurrent-ruby:1
+	>=dev-ruby/racc-1.7:0
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/activesupport-5.1
+		dev-ruby/bundler
+		>=dev-ruby/minitest-5.14:5
+		dev-ruby/mocha:2
+		dev-ruby/test_declarative
+	)
+"
+
+all_ruby_prepare() {
+	rm -f gemfiles/*.lock || die
+
+	# Remove optional unpackaged oj gem
+	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
+
+	# Update old test dependencies
+	sed -i -e '3igem "json"' -e '4igem "racc"' gemfiles/* || die
+
+	# Use mocha 2 to avoid minitest deprecation issues.
+	sed -i -e 's:mocha/setup:mocha/minitest:' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby33)
+			versions="7.0 7.1"
+			;;
+		*ruby32)
+			versions="6.1 7.0 7.1"
+			;;
+		*ruby31)
+			versions="6.1 7.0 7.1"
+			;;
+	esac
+
+	for version in ${versions} ; do
+		if has_version "dev-ruby/activesupport:${version}" ; then
+			einfo "Running tests with activesupport ${version}"
+			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
+		fi
+	done
+}
diff --git a/dev-ruby/i18n/i18n-1.14.4.ebuild b/dev-ruby/i18n/i18n-1.14.4.ebuild
new file mode 100644
index 000000000000..c0da1cda43e5
--- /dev/null
+++ b/dev-ruby/i18n/i18n-1.14.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add Internationalization support to your Ruby application"
+HOMEPAGE="http://rails-i18n.org/"
+SRC_URI="https://github.com/ruby-i18n/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+ruby_add_rdepend "
+	dev-ruby/concurrent-ruby:1
+	>=dev-ruby/racc-1.7:0
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/activesupport-5.1
+		dev-ruby/bundler
+		>=dev-ruby/minitest-5.14:5
+		dev-ruby/mocha:2
+		dev-ruby/test_declarative
+	)
+"
+
+all_ruby_prepare() {
+	rm -f gemfiles/*.lock || die
+
+	# Remove optional unpackaged oj gem
+	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
+
+	# Update old test dependencies
+	sed -i -e '3igem "json"' -e '4igem "racc"' gemfiles/* || die
+
+	# Use mocha 2 to avoid minitest deprecation issues.
+	sed -i -e 's:mocha/setup:mocha/minitest:' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby33)
+			versions="7.0 7.1"
+			;;
+		*ruby32)
+			versions="6.1 7.0 7.1"
+			;;
+		*ruby31)
+			versions="6.1 7.0 7.1"
+			;;
+	esac
+
+	for version in ${versions} ; do
+		if has_version "dev-ruby/activesupport:${version}" ; then
+			einfo "Running tests with activesupport ${version}"
+			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
+		fi
+	done
+}
diff --git a/dev-ruby/i18n/i18n-1.8.10.ebuild b/dev-ruby/i18n/i18n-1.8.10.ebuild
deleted file mode 100644
index dd7b897de703..000000000000
--- a/dev-ruby/i18n/i18n-1.8.10.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-5.1
-	dev-ruby/bundler
-	>=dev-ruby/mocha-1.7.0
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-
-	# Update old test dependencies
-	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' -e '3igem "json"' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby27)
-			versions="6.0"
-			;;
-		*ruby26)
-			versions="5.2 6.0"
-			;;
-		*ruby25)
-			versions="5.2 6.0"
-			;;
-		*ruby24)
-			versions="5.2"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.8.11.ebuild b/dev-ruby/i18n/i18n-1.8.11.ebuild
deleted file mode 100644
index ad5e996d6a74..000000000000
--- a/dev-ruby/i18n/i18n-1.8.11.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-5.1
-	dev-ruby/bundler
-	>=dev-ruby/mocha-1.7.0
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-
-	# Update old test dependencies
-	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' -e '3igem "json"' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby27)
-			versions="6.0 6.1"
-			;;
-		*ruby26)
-			versions="5.2 6.0 6.1"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.8.9.ebuild b/dev-ruby/i18n/i18n-1.8.9.ebuild
deleted file mode 100644
index 31067be5e225..000000000000
--- a/dev-ruby/i18n/i18n-1.8.9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-5.1
-	dev-ruby/bundler
-	>=dev-ruby/mocha-1.7.0
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-
-	# Update old test dependencies
-	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' -e '3igem "json"' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby27)
-			versions="6.0"
-			;;
-		*ruby26)
-			versions="5.2 6.0"
-			;;
-		*ruby25)
-			versions="5.2 6.0"
-			;;
-		*ruby24)
-			versions="5.2"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.9.1.ebuild b/dev-ruby/i18n/i18n-1.9.1.ebuild
deleted file mode 100644
index 8e6fa2638e2a..000000000000
--- a/dev-ruby/i18n/i18n-1.9.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-5.1
-	dev-ruby/bundler
-	>=dev-ruby/mocha-1.7.0
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-
-	# Update old test dependencies
-	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' -e '3igem "json"' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby27)
-			versions="6.0 6.1"
-			;;
-		*ruby26)
-			versions="5.2 6.0 6.1"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/metadata.xml b/dev-ruby/i18n/metadata.xml
index dfd527c89211..3df4becf0365 100644
--- a/dev-ruby/i18n/metadata.xml
+++ b/dev-ruby/i18n/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">svenfuchs/i18n</remote-id>
+    <remote-id type="github">ruby-i18n/i18n</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild b/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
index 3e2378d72f24..ab68c22b5a07 100644
--- a/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
+++ b/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
@@ -1,9 +1,9 @@
-# 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_EXTRADOC="README.md TODO CONTRIBUTING.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/ice_nine/ice_nine-0.11.2-r2.ebuild b/dev-ruby/ice_nine/ice_nine-0.11.2-r2.ebuild
new file mode 100644
index 000000000000..f814a8391c0d
--- /dev/null
+++ b/dev-ruby/ice_nine/ice_nine-0.11.2-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md TODO CONTRIBUTING.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Deep Freeze Ruby Objects"
+HOMEPAGE="https://rubygems.org/gems/ice_nine https://github.com/dkubb/ice_nine"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+# Some tests are broken on Ruby 3 and require a new release upstream.
+RESTRICT="test"
+
+all_ruby_prepare() {
+	sed -e '/devtools/ s:^:#:' \
+		-e "/devtools/aDir['./spec/shared/**/*.rb'].each(&Kernel.method(:require))" \
+		-i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/idn-ruby/Manifest b/dev-ruby/idn-ruby/Manifest
index 3229b79997da..b538c79ade6d 100644
--- a/dev-ruby/idn-ruby/Manifest
+++ b/dev-ruby/idn-ruby/Manifest
@@ -1,2 +1 @@
-DIST idn-ruby-0.1.2.gem 18432 BLAKE2B 9bd1a280c76195a84bc996cfb68550c759a466fca4f5c88167c1e395652088b746831f3cd92a197af25d649ec18ce19ddf78402714432976c612ae38c6c64289 SHA512 404025918ca8fb49580d726b9972dbbde987bebc7fa1e42b0e7f091cd8fba38871258c18c933e49a6ee3c11a21cdd388342beb72c6ce46d8c034156eb9064ac5
-DIST idn-ruby-0.1.4.gem 18432 BLAKE2B 7c530e0d24ce515337a1810fbbc33c7598d91c9b82ed19de196aedd47a71edb50c3d6481e62d11e893418b579c58d167a24e1cdd5d9eaa99757b48a88f1943aa SHA512 b06ed738a488493aa843acd1122e40e039ebaeeb5873fc9f935edc5ee52a1f86eb0b2cb5460d211bee9d42d05491b0ee6e4a707b0840a07bc3f3174648435124
+DIST idn-ruby-0.1.5.gem 18432 BLAKE2B 802929985a96b221dcd218cea444cffcd11ae0662ed759fcdef1e5d3dd616cfaa301890f9df1b5b65ec52514ec10d2da0e4e55abf0db2da367be5ad79b91b95e SHA512 8a6c88a822991dd0a6a75030e05998df15c937348afb7e868f8bfb3710203644aab0d9308cc4569e10653a289a37625652592f676897627b75afdd386ae18757
diff --git a/dev-ruby/idn-ruby/idn-ruby-0.1.2.ebuild b/dev-ruby/idn-ruby/idn-ruby-0.1.2.ebuild
deleted file mode 100644
index 56707f390fe9..000000000000
--- a/dev-ruby/idn-ruby/idn-ruby-0.1.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="LibIDN Ruby Bindings"
-HOMEPAGE="https://github.com/deepfryed/idn-ruby"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND+=" net-dns/libidn:0"
-DEPEND+=" net-dns/libidn:0"
-
-all_ruby_prepare() {
-	# Avoid UTF-8 tests since we cannot guarantee a UTF-8 environment
-	rm -f test/tc_Stringprep.rb || die
-}
-
-each_ruby_prepare() {
-	mkdir lib || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/idn-ruby/idn-ruby-0.1.4.ebuild b/dev-ruby/idn-ruby/idn-ruby-0.1.4.ebuild
deleted file mode 100644
index 72ee7e5da432..000000000000
--- a/dev-ruby/idn-ruby/idn-ruby-0.1.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="LibIDN Ruby Bindings"
-HOMEPAGE="https://github.com/deepfryed/idn-ruby"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE=""
-
-RDEPEND+=" net-dns/libidn:0"
-DEPEND+=" net-dns/libidn:0"
-
-all_ruby_prepare() {
-	# Avoid UTF-8 tests since we cannot guarantee a UTF-8 environment
-	rm -f test/tc_Stringprep.rb || die
-}
-
-each_ruby_prepare() {
-	mkdir lib || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/idn-ruby/idn-ruby-0.1.5.ebuild b/dev-ruby/idn-ruby/idn-ruby-0.1.5.ebuild
new file mode 100644
index 000000000000..6026de8d4005
--- /dev/null
+++ b/dev-ruby/idn-ruby/idn-ruby-0.1.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="LibIDN Ruby Bindings"
+HOMEPAGE="https://github.com/deepfryed/idn-ruby"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE=""
+
+RDEPEND+=" net-dns/libidn:0"
+DEPEND+=" net-dns/libidn:0"
+
+all_ruby_prepare() {
+	# Avoid UTF-8 tests since we cannot guarantee a UTF-8 environment
+	rm -f test/tc_Stringprep.rb || die
+}
+
+each_ruby_prepare() {
+	mkdir lib || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/image_processing/image_processing-1.12.2.ebuild b/dev-ruby/image_processing/image_processing-1.12.2.ebuild
index cf316c5b6e07..0e84e582aef1 100644
--- a/dev-ruby/image_processing/image_processing-1.12.2.ebuild
+++ b/dev-ruby/image_processing/image_processing-1.12.2.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"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md doc/*.md"
@@ -17,10 +17,10 @@ SRC_URI="https://github.com/janko/image_processing/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
-DEPEND+=" test? ( media-gfx/imagemagick[jpeg,png,tiff] )"
+DEPEND+=" test? ( media-gfx/imagemagick[jpeg,png,tiff,xml] )"
 
 ruby_add_rdepend "
 	>=dev-ruby/mini_magick-4.9.5:0
@@ -42,4 +42,7 @@ all_ruby_prepare() {
 	sed -i -e '/\(assert\|refute\)_similar/ s:^:#:' test/*_test.rb || die
 
 	sed -i -e '/\(bundler\|phashion\|vips\)/ s:^:#:' Rakefile test/test_helper.rb || die
+
+	# Fix minitest deprecation
+	sed -i -e 's/MiniTest/Minitest/' test/test_helper.rb || die
 }
diff --git a/dev-ruby/imagesize/imagesize-0.1.1_p20100902-r2.ebuild b/dev-ruby/imagesize/imagesize-0.1.1_p20100902-r2.ebuild
index ec54a3561985..bf44b0a2d785 100644
--- a/dev-ruby/imagesize/imagesize-0.1.1_p20100902-r2.ebuild
+++ b/dev-ruby/imagesize/imagesize-0.1.1_p20100902-r2.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.txt"
 RUBY_FAKEGEM_GEMSPEC="imagesize.gemspec"
@@ -14,7 +14,7 @@ DESCRIPTION="Measure image size (GIF, PNG, JPEG, etc)"
 HOMEPAGE="http://imagesize.rubyforge.org/"
 COMMIT_ID="bd5be2afb088beba3f0d863cef4eac7db56ca804"
 SRC_URI="https://github.com/mattheworiordan/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-LICENSE="Ruby"
+LICENSE="Ruby-BSD"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
diff --git a/dev-ruby/immutable-ruby/Manifest b/dev-ruby/immutable-ruby/Manifest
new file mode 100644
index 000000000000..80f3707a3c20
--- /dev/null
+++ b/dev-ruby/immutable-ruby/Manifest
@@ -0,0 +1,2 @@
+DIST immutable-ruby-0.1.0.tar.gz 134479 BLAKE2B c113ab9bf6b9accdc40eed351cc3177745e52926546d3c4c001786b47790b2c2eba97dfd0751000fd51ad11eb760039c82a2c6f0618776d87a460a16bfc1b9cf SHA512 3136884f791f0d9c1e460a848192723753f5c63f230faa2cec32445ea875392871d38de09222521fd78493397561a4dddbc61e9b020d5089d1c90694c46bde19
+DIST immutable-ruby-0.2.0.tar.gz 134294 BLAKE2B dd50a191e5cf22dc80a84cea0b74f16fe635b0ef5d6f0d33e6b2c340b29b2f555a740f1260bce48f1b568019cfbd2307160acd0d88bf256cfb38017f08dbc4b2 SHA512 b98f83f4c6631018dc8215f5374ad2997e2d704fb6ef023df04f8f9df35ebe7f4db6a4a5d93404d4af276cf9c3477707f42c2dc49e1fd305c473d65115ca6689
diff --git a/dev-ruby/immutable-ruby/immutable-ruby-0.1.0.ebuild b/dev-ruby/immutable-ruby/immutable-ruby-0.1.0.ebuild
new file mode 100644
index 000000000000..34beb9b43ee5
--- /dev/null
+++ b/dev-ruby/immutable-ruby/immutable-ruby-0.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_GEMSPEC="immutable-ruby.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+# Releases are not tagged upstream
+COMMIT=84dba7382284fe7e85816a65abf5c2fc9bbc089e
+
+inherit ruby-fakegem
+
+DESCRIPTION="Efficient, immutable, thread-safe collection classes for Ruby"
+HOMEPAGE="https://github.com/immutable-ruby/immutable-ruby"
+SRC_URI="https://github.com/immutable-ruby/immutable-ruby/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.1:1
+	dev-ruby/sorted_set:0
+"
+
+all_ruby_prepare() {
+	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb spec/lib/immutable/vector/insert_spec.rb || die
+}
diff --git a/dev-ruby/immutable-ruby/immutable-ruby-0.2.0.ebuild b/dev-ruby/immutable-ruby/immutable-ruby-0.2.0.ebuild
new file mode 100644
index 000000000000..37733c45a68c
--- /dev/null
+++ b/dev-ruby/immutable-ruby/immutable-ruby-0.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_GEMSPEC="immutable-ruby.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Efficient, immutable, thread-safe collection classes for Ruby"
+HOMEPAGE="https://github.com/immutable-ruby/immutable-ruby"
+SRC_URI="https://github.com/immutable-ruby/immutable-ruby/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.1:1
+	dev-ruby/sorted_set:0
+"
+
+all_ruby_prepare() {
+	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb spec/lib/immutable/vector/insert_spec.rb || die
+}
diff --git a/dev-ruby/immutable-ruby/metadata.xml b/dev-ruby/immutable-ruby/metadata.xml
new file mode 100644
index 000000000000..061e7a1bb6bb
--- /dev/null
+++ b/dev-ruby/immutable-ruby/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">immutable-ruby/immutable-ruby</remote-id>
+    <remote-id type="rubygems">immutable-ruby</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/importmap-rails/Manifest b/dev-ruby/importmap-rails/Manifest
new file mode 100644
index 000000000000..4cf5d37a5e2b
--- /dev/null
+++ b/dev-ruby/importmap-rails/Manifest
@@ -0,0 +1,2 @@
+DIST importmap-rails-1.2.3.gem 78336 BLAKE2B e652cd14e87e0f2b05ddeb04d4a1339c30325b25e59e1645e55cfdbdbac514afe7d3ce3bf5f8a825bb365065ee665f5efda436a56dedb7290201c4cf4f3dc94e SHA512 a76b0c1d138c4302d6240be4984fc56f0700b59f73b33f5bb82b12e8b9d87f62a303d78f2a61e8305de12071581587687c6fcfac67a2ed9037c0698423da7415
+DIST importmap-rails-2.0.1.gem 16384 BLAKE2B 395671195092899210115195d3a6f1ad8b24b586d04e9a4b4d569c7be43c954b5fc9fad7743eacf2dce581e1466d7485dafb8cbf110ce63dfc95a2530f6cf802 SHA512 3b2f405fe1bf7e2945f0821ab316ecf1d1282ac1d29f6fa366bfc6abdf5afe0adcb26bfee62c868568d0e6785f252ac037180368eb486f2be6ebee32fdcf2a88
diff --git a/dev-ruby/importmap-rails/importmap-rails-1.2.3.ebuild b/dev-ruby/importmap-rails/importmap-rails-1.2.3.ebuild
new file mode 100644
index 000000000000..807850e92cad
--- /dev/null
+++ b/dev-ruby/importmap-rails/importmap-rails-1.2.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+# Depends on appraisals, unpackaged dependencies, and unpackaged rails
+# bits.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Use ESM with importmap to manage JavaScript in Rails"
+HOMEPAGE="https://github.com/rails/importmap-rails"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/actionpack-6.0.0:*
+	>=dev-ruby/railties-6.0.0:*
+"
diff --git a/dev-ruby/importmap-rails/importmap-rails-2.0.1.ebuild b/dev-ruby/importmap-rails/importmap-rails-2.0.1.ebuild
new file mode 100644
index 000000000000..0fbb243022e8
--- /dev/null
+++ b/dev-ruby/importmap-rails/importmap-rails-2.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+# Depends on appraisals, unpackaged dependencies, and unpackaged rails
+# bits.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Use ESM with importmap to manage JavaScript in Rails"
+HOMEPAGE="https://github.com/rails/importmap-rails"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/actionpack-6.0.0:*
+	>=dev-ruby/railties-6.0.0:*
+"
diff --git a/dev-ruby/importmap-rails/metadata.xml b/dev-ruby/importmap-rails/metadata.xml
new file mode 100644
index 000000000000..89e019a3c018
--- /dev/null
+++ b/dev-ruby/importmap-rails/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">rails/importmap-rails</remote-id>
+    <remote-id type="rubygems">importmap-rails</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/inflecto/Manifest b/dev-ruby/inflecto/Manifest
deleted file mode 100644
index c6afa1e8be10..000000000000
--- a/dev-ruby/inflecto/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST inflecto-0.0.2.gem 16384 BLAKE2B 08c23177c02459cd37f14dc39a838d587df775aa0ade13c9c0fc93749cc669534837f865ddff85cdc5f304d0c8582b28284d35b2061eae96469783137472b617 SHA512 dbd1aa3a199365aa301d2570894e347e4f4fe6202924d6337b936ce3e5ed934e7e5c57c6c4ade42d6e0ffa43c574f3ac530ec6dccc6ad8d16b6ff96e4d057628
diff --git a/dev-ruby/inflecto/inflecto-0.0.2-r1.ebuild b/dev-ruby/inflecto/inflecto-0.0.2-r1.ebuild
deleted file mode 100644
index 9369e3d0cfdd..000000000000
--- a/dev-ruby/inflecto/inflecto-0.0.2-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Inflector for ruby"
-HOMEPAGE="https://github.com/mbj/inflecto"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/inflecto/metadata.xml b/dev-ruby/inflecto/metadata.xml
deleted file mode 100644
index d3d80371d654..000000000000
--- a/dev-ruby/inflecto/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mjb/inflecto</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/instance_storage/instance_storage-1.0.0-r1.ebuild b/dev-ruby/instance_storage/instance_storage-1.0.0-r1.ebuild
deleted file mode 100644
index 00d83fbf0fce..000000000000
--- a/dev-ruby/instance_storage/instance_storage-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-DESCRIPTION="Manage class instances with dictionary"
-HOMEPAGE="https://rubygems.org/gems/instance_storage/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile test/instance_storage_test.rb || die
-}
diff --git a/dev-ruby/instance_storage/instance_storage-1.0.0-r2.ebuild b/dev-ruby/instance_storage/instance_storage-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..4969fc6b1dcf
--- /dev/null
+++ b/dev-ruby/instance_storage/instance_storage-1.0.0-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+DESCRIPTION="Manage class instances with dictionary"
+HOMEPAGE="https://rubygems.org/gems/instance_storage/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile test/instance_storage_test.rb || die
+}
diff --git a/dev-ruby/instance_storage/instance_storage-2.0.0-r1.ebuild b/dev-ruby/instance_storage/instance_storage-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..0c942728ebeb
--- /dev/null
+++ b/dev-ruby/instance_storage/instance_storage-2.0.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+DESCRIPTION="Manage class instances with dictionary"
+HOMEPAGE="https://rubygems.org/gems/instance_storage/"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile test/instance_storage_test.rb || die
+
+	sed -e 's/MiniTest::Unit::TestCase/Minitest::Test/' \
+		-i test/instance_storage_test.rb || die
+}
diff --git a/dev-ruby/instance_storage/instance_storage-2.0.0.ebuild b/dev-ruby/instance_storage/instance_storage-2.0.0.ebuild
deleted file mode 100644
index cbb5d0331daa..000000000000
--- a/dev-ruby/instance_storage/instance_storage-2.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-DESCRIPTION="Manage class instances with dictionary"
-HOMEPAGE="https://rubygems.org/gems/instance_storage/"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile test/instance_storage_test.rb || die
-}
diff --git a/dev-ruby/instantiator/Manifest b/dev-ruby/instantiator/Manifest
deleted file mode 100644
index fc27de477aa6..000000000000
--- a/dev-ruby/instantiator/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST instantiator-0.0.7.gem 8192 BLAKE2B c1cc0bf4a3f2aaf9afd522e33fdd2b32d78ca114fc7b113f6ae297e825177827cb6aa5398917d6d05523f912bebf22e43709e53c0dfe4e1a941ebda4350d3098 SHA512 b37a9380d787252244d2b85bb99365f4a4ecdab58f76caf5e59df00b239f4981119eb5c2eb2fe6ddcf810bb0fb43695f8926370a101f4223fa28811953e6731d
diff --git a/dev-ruby/instantiator/instantiator-0.0.7-r1.ebuild b/dev-ruby/instantiator/instantiator-0.0.7-r1.ebuild
deleted file mode 100644
index 6f6eac191a73..000000000000
--- a/dev-ruby/instantiator/instantiator-0.0.7-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Instantiate an arbitrary Ruby class"
-HOMEPAGE="https://github.com/floehopper/introspection"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/blankslate:*"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
-}
diff --git a/dev-ruby/instantiator/metadata.xml b/dev-ruby/instantiator/metadata.xml
deleted file mode 100644
index 1c04675df6c5..000000000000
--- a/dev-ruby/instantiator/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">floehopper/introspection</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/introspection/introspection-0.0.4-r1.ebuild b/dev-ruby/introspection/introspection-0.0.4-r1.ebuild
index c6de90be39d0..b8e10237506a 100644
--- a/dev-ruby/introspection/introspection-0.0.4-r1.ebuild
+++ b/dev-ruby/introspection/introspection-0.0.4-r1.ebuild
@@ -1,9 +1,9 @@
-# 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"
 
 # No documentation task
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/introspection/introspection-0.0.4-r2.ebuild b/dev-ruby/introspection/introspection-0.0.4-r2.ebuild
new file mode 100644
index 000000000000..c4905a7fbaa9
--- /dev/null
+++ b/dev-ruby/introspection/introspection-0.0.4-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# No documentation task
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Dynamic inspection of the hierarchy of method definitions on a Ruby object"
+HOMEPAGE="https://jamesmead.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/metaclass-0.0.1"
+
+ruby_add_bdepend "test? ( dev-ruby/blankslate )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
+}
diff --git a/dev-ruby/introspection/metadata.xml b/dev-ruby/introspection/metadata.xml
index 658c72b1920d..20a0055e4484 100644
--- a/dev-ruby/introspection/metadata.xml
+++ b/dev-ruby/introspection/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">floehopper/introspection</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/io-console/Manifest b/dev-ruby/io-console/Manifest
new file mode 100644
index 000000000000..afa0c8095c3d
--- /dev/null
+++ b/dev-ruby/io-console/Manifest
@@ -0,0 +1 @@
+DIST io-console-0.7.2.tar.gz 37259 BLAKE2B 22f5f3cfedf477affa1452ce7eab862d49da1943255545f15dd519f7029e61b8747341606ebc1da7bbb020ba5f0ec7e48d08ab000da3b7192cf42ceb601b0b7c SHA512 1dd99c8e9681436a68f39f89f6104a45db2d17092f64985e36a7cd37418831b81f2749922e16ee43a633a90466a8916327a7f21249ceae2f889e70ae596c5b3b
diff --git a/dev-ruby/io-console/io-console-0.7.2.ebuild b/dev-ruby/io-console/io-console-0.7.2.ebuild
new file mode 100644
index 000000000000..322683634273
--- /dev/null
+++ b/dev-ruby/io-console/io-console-0.7.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/io/console/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/io"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="io-console.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="add console capabilities to IO instances"
+HOMEPAGE="https://github.com/ruby/io-console"
+SRC_URI="https://github.com/ruby/io-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
+
+all_ruby_prepare() {
+	sed -e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/__dir__/"."/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -e '/task :test/ s:^:#:' -i Rakefile || die
+
+	# Avoid test that require a proper TTY
+	sed -e '/test_\(bad_keyword\|failed_path\)/aomit "requires TTY"' \
+		-i test/io/console/test_io_console.rb || die
+
+	# Remove ruby and ffi files in accordance with the gemspec. These
+	# are only used when using a different ruby engine like jruby.
+	rm -fr lib/io/console.rb lib/io/console/ffi || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/io-console/metadata.xml b/dev-ruby/io-console/metadata.xml
new file mode 100644
index 000000000000..e316e22be118
--- /dev/null
+++ b/dev-ruby/io-console/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/io-console</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/io-event/Manifest b/dev-ruby/io-event/Manifest
new file mode 100644
index 000000000000..b3b20a3fcfaf
--- /dev/null
+++ b/dev-ruby/io-event/Manifest
@@ -0,0 +1,7 @@
+DIST io-event-1.1.7.tar.gz 35211 BLAKE2B d288ec902c4d775b49315d4eeda8bb0582b7444e7adc60846283fbffbe8ecec6e13c1bc7ce898c4aaf3e78d5eeee2602045f9bde561f6f50c797b7aecb3d7b01 SHA512 f61d0eb7203b4bd4b38d1f42a23c67d4ae04dbbb4c7018149d52db440d769131581347198f4a6da6e99aaa1ac526ad1c1cb9d56ecf48c1fc70fbf1b62fb161e7
+DIST io-event-1.2.2.tar.gz 35405 BLAKE2B 9fb96c920524db8111b8d3650f2559df71e262f2f4cd32080a3e04f09da5df3d0f0a6777b1d37aba7848b9f7298d9fe5c5684c3211ff39b5178d452d10dede70 SHA512 6ebffd24eb40392496f488ee578f17fcc2e713d3b90cea20899c82e26a6d601b0670d21383d5e33345cad9a33ae43120e8c1d017bb7bd44ff95be2c17bab6712
+DIST io-event-1.3.2.tar.gz 45587 BLAKE2B b4a6e03d6470e0e1fd214e8d4ec9c34b44590b949dd3c2206ace0d963a7eb5f0164d4ddddbe7524e3e050869e45fdccce391174342b6185e2a8c29aaa9e8c1fb SHA512 532dcaf2fb658f4770cc99a486adf1c2d853260c9f4b9bc9d411dc1a84f439881b96ba365523c7566f8a87cfb44a375642a92f327c9ea95803183dd552dabd7a
+DIST io-event-1.3.3.tar.gz 46284 BLAKE2B f2d6fe2a1eb3c1d0f26097847b9b0d464fa274d215f620ffa46e7718d89f97a7ff8bb00b145d29763caed527410d0e3040dab313445e11b26b2ef3891d05f604 SHA512 71391822d2664f9c9534cc474b2e9b052d98f44d7c985b768c93ff2956379f2c107094ba4ab9e376bb3820e085f15187f210566229a31ae493334cf4af073bad
+DIST io-event-1.4.0.tar.gz 46329 BLAKE2B ece30e2673f14f9529b0808f5725f45ee847c337d08b5547161fa7d9cd2f807cf969ff22a25a21c0869b12b9ccd47a3d12bc6694a97ea49ab18700a30bd8365b SHA512 a7002e6df70180208c2f617d59e72bce98c13b2bde6af459f72bdf7fc0045e989225ddf39acf0be9b33d1d252443cf6cfc0076114dfc2c832732c0f7baa06569
+DIST io-event-1.4.4.tar.gz 46919 BLAKE2B c66b410c1eb3e1b398b2ff8f1cad103f0d75e680b2b79ba8e0144ebfe0d0ce29de4996c2c758447c665231c07a939e31af5f3fc47725be33733dcfed8afcd12e SHA512 f8c7503d5d924de2847a57e6af0b01cb8c1638f4b3060a3afc58ca7cc3a719d5df2fa7b83252d1d761f4a3dc8da68b759797e1d1cd6168ad16421924ef3ef316
+DIST io-event-1.5.1.tar.gz 47618 BLAKE2B 239beebca88dac137ab826df0da9f4c7a0b910a9401e46a542dd73a151009ca6d3b0d94584421a039e693e1f5e3f40e37fa98611ff8f603dc5d4bd30bc0788e3 SHA512 71f343ffdcabde14f1737574e66c198934cdf5c88db0c9dc58106da588a7156d4b36cd2a3bd0552758468bcd78c8ee3ae1d59eb0432f7e66f57e3d9dfe75fa3d
diff --git a/dev-ruby/io-event/io-event-1.1.7.ebuild b/dev-ruby/io-event/io-event-1.1.7.ebuild
new file mode 100644
index 000000000000..f8abe7887f02
--- /dev/null
+++ b/dev-ruby/io-event/io-event-1.1.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An event loop"
+HOMEPAGE="https://github.com/socketry/io-event"
+SRC_URI="https://github.com/socketry/io-event/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/sus-0.6:0 )"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid dependency on unpackaged covered package
+	rm -f config/sus.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -S sus-parallel || die
+}
diff --git a/dev-ruby/io-event/io-event-1.2.2.ebuild b/dev-ruby/io-event/io-event-1.2.2.ebuild
new file mode 100644
index 000000000000..337b2103b8db
--- /dev/null
+++ b/dev-ruby/io-event/io-event-1.2.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An event loop"
+HOMEPAGE="https://github.com/socketry/io-event"
+SRC_URI="https://github.com/socketry/io-event/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+io-uring"
+
+RDEPEND="io-uring? ( sys-libs/liburing:= )"
+DEPEND="${RDEPEND}"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid dependency on unpackaged covered package
+	rm -f config/sus.rb || die
+
+	if ! use io-uring ; then
+		sed -i -e "s:have_library('uring'):have_library('idonotexist_uring'):" ext/extconf.rb || die
+	fi
+}
diff --git a/dev-ruby/io-event/io-event-1.3.2.ebuild b/dev-ruby/io-event/io-event-1.3.2.ebuild
new file mode 100644
index 000000000000..03298eeac45f
--- /dev/null
+++ b/dev-ruby/io-event/io-event-1.3.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An event loop"
+HOMEPAGE="https://github.com/socketry/io-event"
+SRC_URI="https://github.com/socketry/io-event/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+io-uring"
+
+RDEPEND="io-uring? ( sys-libs/liburing:= )"
+DEPEND="${RDEPEND}"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid dependency on unpackaged covered package
+	rm -f config/sus.rb || die
+
+	if ! use io-uring ; then
+		sed -i -e "s:have_library('uring'):have_library('idonotexist_uring'):" ext/extconf.rb || die
+	fi
+}
diff --git a/dev-ruby/io-event/io-event-1.3.3.ebuild b/dev-ruby/io-event/io-event-1.3.3.ebuild
new file mode 100644
index 000000000000..c14052adaafa
--- /dev/null
+++ b/dev-ruby/io-event/io-event-1.3.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An event loop"
+HOMEPAGE="https://github.com/socketry/io-event"
+SRC_URI="https://github.com/socketry/io-event/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+IUSE="+io-uring"
+
+RDEPEND="io-uring? ( sys-libs/liburing:= )"
+DEPEND="${RDEPEND}"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid dependency on unpackaged covered package
+	rm -f config/sus.rb || die
+
+	if ! use io-uring ; then
+		sed -i -e "s:have_library('uring'):have_library('idonotexist_uring'):" ext/extconf.rb || die
+	fi
+}
diff --git a/dev-ruby/io-event/io-event-1.4.0.ebuild b/dev-ruby/io-event/io-event-1.4.0.ebuild
new file mode 100644
index 000000000000..9c7ed6bf4f25
--- /dev/null
+++ b/dev-ruby/io-event/io-event-1.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An event loop"
+HOMEPAGE="https://github.com/socketry/io-event"
+SRC_URI="https://github.com/socketry/io-event/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+io-uring"
+
+RDEPEND="io-uring? ( sys-libs/liburing:= )"
+DEPEND="${RDEPEND}"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid dependency on unpackaged covered package
+	rm -f config/sus.rb || die
+
+	if ! use io-uring ; then
+		sed -i -e "s:have_library('uring'):have_library('idonotexist_uring'):" ext/extconf.rb || die
+	fi
+}
diff --git a/dev-ruby/io-event/io-event-1.4.4.ebuild b/dev-ruby/io-event/io-event-1.4.4.ebuild
new file mode 100644
index 000000000000..54d45037491d
--- /dev/null
+++ b/dev-ruby/io-event/io-event-1.4.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An event loop"
+HOMEPAGE="https://github.com/socketry/io-event"
+SRC_URI="https://github.com/socketry/io-event/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+io-uring"
+
+RDEPEND="io-uring? ( sys-libs/liburing:= )"
+DEPEND="${RDEPEND}"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid dependency on unpackaged covered package
+	rm -f config/sus.rb || die
+
+	if ! use io-uring ; then
+		sed -i -e "s:have_library('uring'):have_library('idonotexist_uring'):" ext/extconf.rb || die
+	fi
+}
diff --git a/dev-ruby/io-event/io-event-1.5.1.ebuild b/dev-ruby/io-event/io-event-1.5.1.ebuild
new file mode 100644
index 000000000000..54d45037491d
--- /dev/null
+++ b/dev-ruby/io-event/io-event-1.5.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An event loop"
+HOMEPAGE="https://github.com/socketry/io-event"
+SRC_URI="https://github.com/socketry/io-event/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+io-uring"
+
+RDEPEND="io-uring? ( sys-libs/liburing:= )"
+DEPEND="${RDEPEND}"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid dependency on unpackaged covered package
+	rm -f config/sus.rb || die
+
+	if ! use io-uring ; then
+		sed -i -e "s:have_library('uring'):have_library('idonotexist_uring'):" ext/extconf.rb || die
+	fi
+}
diff --git a/dev-ruby/io-event/metadata.xml b/dev-ruby/io-event/metadata.xml
new file mode 100644
index 000000000000..7e76e28a1d14
--- /dev/null
+++ b/dev-ruby/io-event/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <use>
+    <flag name="io-uring">Enable io_uring support, and use io_uring instead of epoll</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">socketry/io-event</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/io-wait/Manifest b/dev-ruby/io-wait/Manifest
index 145f709a1d06..d52a4a63fe49 100644
--- a/dev-ruby/io-wait/Manifest
+++ b/dev-ruby/io-wait/Manifest
@@ -1,2 +1 @@
-DIST io-wait-0.2.1.tar.gz 18944 BLAKE2B c77e0f839160d0129660003586f7785447e7b2e89df47d83ff6868bbdf1e667d432f0d84afb06b5bcc8f751c433da9c8bcd7b5fc0b701adbe2f10ae338dcacab SHA512 7e914ce7d6b66fabd1799567dd448124b7c1dd266bd1ce975b24a96f18c15b7dab20d2f68a7686aa8383d518783486370225b22a07fdb3c9fddae93278282427
 DIST io-wait-0.2.3.tar.gz 22171 BLAKE2B 359bf268aafcb2dcbdf59912a0973b96bf396801678a3aa2780e3bd20e8a01471404a269eaaced939e47e4e99c417eadb86f0f2bd6ccd11fc3256bb04ca05f4f SHA512 2fbea3419152cd83e411742dd074491bd78b6a077b68a2ea5d802bac671b839bb484a06654ca11f18f45deb1e33a9019dfae0a33eeda0696c1c14b05706a95ba
diff --git a/dev-ruby/io-wait/io-wait-0.2.1.ebuild b/dev-ruby/io-wait/io-wait-0.2.1.ebuild
deleted file mode 100644
index 4def09c942da..000000000000
--- a/dev-ruby/io-wait/io-wait-0.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTENSIONS="ext/io/wait/extconf.rb"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="io-wait.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Waits until IO is readable or writable without blocking"
-HOMEPAGE="https://github.com/ruby/io-wait"
-SRC_URI="https://github.com/ruby/io-wait/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -e '/task :test/ s:^:#:' -i Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/io-wait/io-wait-0.2.3.ebuild b/dev-ruby/io-wait/io-wait-0.2.3.ebuild
index 4def09c942da..80e425823662 100644
--- a/dev-ruby/io-wait/io-wait-0.2.3.ebuild
+++ b/dev-ruby/io-wait/io-wait-0.2.3.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_EXTENSIONS="ext/io/wait/extconf.rb"
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/io-wait/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/iobuffer/Manifest b/dev-ruby/iobuffer/Manifest
deleted file mode 100644
index fe1e2ddfeba5..000000000000
--- a/dev-ruby/iobuffer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST iobuffer-git-1.1.2.tgz 9286 BLAKE2B 8e5a1fc5b33bfd40ba561c27259079c5511b7cba8b0a55bf120b1c6dcf5552cc0adcf6e08aa8f8cda083aba1013a7f690c20268908760e50ca6bc63a02ae020e SHA512 cec67ac42b3966c144fc61c8fa1a36f166d0a892ec4ebb2f6e0fc218eac5fd7bfb803973b05ae52ff05b04eb86caae0cfee4cc1430e876e58157b5bdc41723c7
diff --git a/dev-ruby/iobuffer/iobuffer-1.1.2-r4.ebuild b/dev-ruby/iobuffer/iobuffer-1.1.2-r4.ebuild
deleted file mode 100644
index 4e51dbd9bbfc..000000000000
--- a/dev-ruby/iobuffer/iobuffer-1.1.2-r4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC=iobuffer.gemspec
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit multilib ruby-fakegem
-
-GITHUB_USER="tarcieri"
-
-DESCRIPTION="IO::Buffer is a byte queue which is intended for non-blocking I/O applications"
-HOMEPAGE="https://github.com/tarcieri/iobuffer"
-SRC_URI="https://github.com/${GITHUB_USER}/iobuffer/tarball/v${PV} -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RUBY_S="${GITHUB_USER}-${PN}-*"
-
-all_ruby_prepare() {
-	rm .rspec lib/.gitignore Gemfile* || die
-}
-
-each_ruby_configure() {
-	each_fakegem_configure
-
-	sed -i -e "s/^ldflags  = /ldflags = $\(LDFLAGS\) /" ext/Makefile || die
-}
diff --git a/dev-ruby/iobuffer/metadata.xml b/dev-ruby/iobuffer/metadata.xml
deleted file mode 100644
index 0a899649106c..000000000000
--- a/dev-ruby/iobuffer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">tarcieri/iobuffer</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ipaddr/Manifest b/dev-ruby/ipaddr/Manifest
new file mode 100644
index 000000000000..f8af1ca1dfe5
--- /dev/null
+++ b/dev-ruby/ipaddr/Manifest
@@ -0,0 +1,2 @@
+DIST ipaddr-1.2.5.tar.gz 21795 BLAKE2B dfc4d50941dc9275ff45bcd35ac48ea678c6d6bd4e4227e5514ba7ba1ad2bde7e6692eb81dfc066332211fa20911c58573d9e6fd6842195cebea69f004cf4dd1 SHA512 d3741e6841ad78dba364227d7f0313843068c06dd13f2f459cc3c07e5f2a9ed7d9a9ebbeb2533235ba561a52966bbfc78375b8b0ab36a9275a49251658c6deab
+DIST ipaddr-1.2.6.tar.gz 11817 BLAKE2B fb2fefef581e372ce8130b3fef9e634218b5bd66bb579dc9909f641fb4dc7bd5f7b5252168cb0f0758874737119a163766b7c027c261f0eb386478b489633b82 SHA512 9850d26a8804a51587b7070be8bb932c312cb4d3619204df73a7d55b3f177891d18e5daf05b17f4271df9f04296f97aff607bcbc189b5c7238fd80376a13e3e7
diff --git a/dev-ruby/ipaddr/ipaddr-1.2.5.ebuild b/dev-ruby/ipaddr/ipaddr-1.2.5.ebuild
new file mode 100644
index 000000000000..befd16d48786
--- /dev/null
+++ b/dev-ruby/ipaddr/ipaddr-1.2.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="ipaddr.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="IPAddr provides a set of methods to manipulate an IPv4 or IPv6 address"
+HOMEPAGE="https://github.com/ruby/ipaddr"
+SRC_URI="https://github.com/ruby/ipaddr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/ipaddr/ipaddr-1.2.6.ebuild b/dev-ruby/ipaddr/ipaddr-1.2.6.ebuild
new file mode 100644
index 000000000000..78f9a8016fd9
--- /dev/null
+++ b/dev-ruby/ipaddr/ipaddr-1.2.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="ipaddr.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="IPAddr provides a set of methods to manipulate an IPv4 or IPv6 address"
+HOMEPAGE="https://github.com/ruby/ipaddr"
+SRC_URI="https://github.com/ruby/ipaddr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/ipaddr/metadata.xml b/dev-ruby/ipaddr/metadata.xml
new file mode 100644
index 000000000000..0057dde65dce
--- /dev/null
+++ b/dev-ruby/ipaddr/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/ipaddr</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/irb/Manifest b/dev-ruby/irb/Manifest
new file mode 100644
index 000000000000..bd873c1e4ebf
--- /dev/null
+++ b/dev-ruby/irb/Manifest
@@ -0,0 +1 @@
+DIST irb-1.11.1.tar.gz 128341 BLAKE2B ec2ebfd31b7d784668ed043d32b86bc0f77481b250170911332f4b9810f0ee5245ec65aac4d2fa4fc94f49c5d3fa59dd7c3a709f712d9f7f4c1ed6ddd7f0e2b3 SHA512 6b8eaf41410d43f4ab47961b56ce054f93e134e5cba51a08294baaa6de149a209e243a9cf649091f3176adfd0c22943fe222b61b0ab1215e0822d7007c154f17
diff --git a/dev-ruby/irb/irb-1.11.1.ebuild b/dev-ruby/irb/irb-1.11.1.ebuild
new file mode 100644
index 000000000000..a693b0845c3d
--- /dev/null
+++ b/dev-ruby/irb/irb-1.11.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINDIR="exe"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="irb.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Interactive Ruby command-line tool for REPL (Read Eval Print Loop)"
+HOMEPAGE="https://github.com/ruby/irb"
+SRC_URI="https://github.com/ruby/irb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+# Ensure a new enough eselect-ruby is present to avoid clobbering the
+# irb bin and man page.
+ruby_add_rdepend "
+	dev-ruby/rdoc
+	>=dev-ruby/reline-0.3.8
+	!<app-eselect/eselect-ruby-20231008
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		dev-ruby/debug
+		dev-ruby/test-unit
+		dev-ruby/test-unit-ruby-core
+	)"
+
+all_ruby_prepare() {
+	sed -e 's:_relative ":"./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Skip test requiring specific character set
+	sed -e '/test_raise_exception_with_different_encoding_containing_invalid_byte_sequence/aomit "charset"' \
+		-i test/irb/test_raise_exception.rb || die
+
+	# Skip tests requiring a working console
+	rm -f test/irb/test_debug_cmd.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB=lib ${RUBY} -S rake test || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/irb.1
+}
diff --git a/dev-ruby/irb/metadata.xml b/dev-ruby/irb/metadata.xml
new file mode 100644
index 000000000000..860a8cf3bc11
--- /dev/null
+++ b/dev-ruby/irb/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/irb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/itextomml/itextomml-1.6.1.ebuild b/dev-ruby/itextomml/itextomml-1.6.1.ebuild
index 57fb3df7e1f6..11a462d3e562 100644
--- a/dev-ruby/itextomml/itextomml-1.6.1.ebuild
+++ b/dev-ruby/itextomml/itextomml-1.6.1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 RUBY_FAKEGEM_EXTRADOC="README"
 
 RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
diff --git a/dev-ruby/jbuilder/Manifest b/dev-ruby/jbuilder/Manifest
index a17312792497..66af3a7b3c7c 100644
--- a/dev-ruby/jbuilder/Manifest
+++ b/dev-ruby/jbuilder/Manifest
@@ -1,3 +1 @@
-DIST jbuilder-2.10.1.gem 28160 BLAKE2B 07bde14ee6a75b5e1cec8ee1fead688c613e76713d32d419433b0f7163a9622bcc48e4b36333eb06960a9a566784d7f31843d71259226539fe569cd178315d55 SHA512 340e9d9cff969294e22a3eea57001e69402cd47b791660a1468702e046edfe4a3cc4f8fe18b87ba63e13352d020cd8fd78fcc070a287bb8da108c531f4dc22a5
-DIST jbuilder-2.11.2.gem 30208 BLAKE2B 48378a403b1949fd4dd66f468927ae9ca76ddcb88d2929ffb2c9c87b9c4d4daa4bfc147f22fc2d3578eae61e3391ecaf7dc49c324aff09c2884adcdb0aef5113 SHA512 1608649fa7f67dd09b5ac05f2e93aa78a8c25a8f29df1bacff7add554a2cb104aadaefef4b98a279a8d01fdc70372729ca05e716c81bfa55adaac7f7cfe78386
 DIST jbuilder-2.11.5.gem 27648 BLAKE2B 0a40c82ad1f68df5748be4425605eafd03bcd0262957915bc491037c45c21f5542ffae3d3f4e7dc8a20874f96dc1a7c3c3dd348a4c09b08f15117ca45103d260 SHA512 65caea9426cfe146fd4aaf0c9313e04f8f9d23d72faf959da4042d090f4e31be6a7040418fa9e6dc3f02e8acb3a0e2b5d3216af4f2fed8761b70a35101f4eb96
diff --git a/dev-ruby/jbuilder/jbuilder-2.10.1.ebuild b/dev-ruby/jbuilder/jbuilder-2.10.1.ebuild
deleted file mode 100644
index b37ef8d2e4b1..000000000000
--- a/dev-ruby/jbuilder/jbuilder-2.10.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="TRAVIS=true test"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Create JSON structures via a Builder-style DSL"
-HOMEPAGE="https://github.com/rails/jbuilder"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-5.0.0:*"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activemodel-5.0.0
-	>=dev-ruby/railties-5.0.0
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile test/test_helper.rb || die
-}
diff --git a/dev-ruby/jbuilder/jbuilder-2.11.2.ebuild b/dev-ruby/jbuilder/jbuilder-2.11.2.ebuild
deleted file mode 100644
index 8010602aa4a9..000000000000
--- a/dev-ruby/jbuilder/jbuilder-2.11.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="TRAVIS=true test"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Create JSON structures via a Builder-style DSL"
-HOMEPAGE="https://github.com/rails/jbuilder"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-5.0.0:*"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activemodel-5.0.0
-	>=dev-ruby/railties-5.0.0
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile test/test_helper.rb || die
-}
diff --git a/dev-ruby/jbuilder/jbuilder-2.11.5.ebuild b/dev-ruby/jbuilder/jbuilder-2.11.5.ebuild
index c27a00596b72..859ae269b778 100644
--- a/dev-ruby/jbuilder/jbuilder-2.11.5.ebuild
+++ b/dev-ruby/jbuilder/jbuilder-2.11.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST="CI=true test"
 
diff --git a/dev-ruby/jbuilder/metadata.xml b/dev-ruby/jbuilder/metadata.xml
index 10b423c6bcdb..85b61883d094 100644
--- a/dev-ruby/jbuilder/metadata.xml
+++ b/dev-ruby/jbuilder/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="rubygems">jbuilder</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="rubygems">jbuilder</remote-id>
+    <remote-id type="github">rails/jbuilder</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/jmespath/Manifest b/dev-ruby/jmespath/Manifest
index 1ebc44c75643..de265a541451 100644
--- a/dev-ruby/jmespath/Manifest
+++ b/dev-ruby/jmespath/Manifest
@@ -1 +1 @@
-DIST jmespath-1.6.1.tar.gz 40731 BLAKE2B 004da1c19a9990f83cc7484afccf7f7c8b6924ff538a0779752a4fd2aa0d469fd7ddf975f39e50f3f3d806109d6742adbc16237dec5760c224a59e6791954529 SHA512 8c66235463f1d83a2b061e9e01b5ef0d3d12df5a034a334d3c06a919bc2049b44dd740da0297e1774300533bc9968614f3d961deb4bfe808c9221e03d6f1bbed
+DIST jmespath-1.6.2.tar.gz 40932 BLAKE2B e19a2bacb8e207f65e45d1ad8eaaceb5ab6cbd847dc1009b45c618d426e5cc5814a1b1a806ccd935a83e3dacff3bcefedf9c7241586a348f2b705d80e63ba27d SHA512 2118c348bb25285f002fce64d0f7a00a5850c9f1b39d71d16c0c4335469069861bc51a81a9aec95f5625ae6b2d9daaa8b40ada817ac83ef83349c33e906561e7
diff --git a/dev-ruby/jmespath/jmespath-1.6.1.ebuild b/dev-ruby/jmespath/jmespath-1.6.1.ebuild
deleted file mode 100644
index d79916ac6658..000000000000
--- a/dev-ruby/jmespath/jmespath-1.6.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_GEMSPEC="jmespath.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements JMESPath for Ruby"
-HOMEPAGE="https://github.com/jmespath/jmespath.rb"
-SRC_URI="https://github.com/jmespath/jmespath.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}.rb-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' \
-		spec/{compliance_spec,compliance_without_errors_spec,spec_helper}.rb || die
-	sed -i -e '/bundler/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/jmespath/jmespath-1.6.2.ebuild b/dev-ruby/jmespath/jmespath-1.6.2.ebuild
new file mode 100644
index 000000000000..dd77c9c1f73a
--- /dev/null
+++ b/dev-ruby/jmespath/jmespath-1.6.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
+RUBY_FAKEGEM_GEMSPEC="jmespath.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements JMESPath for Ruby"
+HOMEPAGE="https://github.com/jmespath/jmespath.rb"
+SRC_URI="https://github.com/jmespath/jmespath.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}.rb-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' \
+		spec/{compliance_spec,compliance_without_errors_spec,spec_helper}.rb || die
+	sed -i -e '/bundler/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/jquery-rails/Manifest b/dev-ruby/jquery-rails/Manifest
index 7c35bbd64c8d..ff540dc45edd 100644
--- a/dev-ruby/jquery-rails/Manifest
+++ b/dev-ruby/jquery-rails/Manifest
@@ -1 +1 @@
-DIST jquery-rails-4.4.0.gem 526336 BLAKE2B d6a498424fd89ed575fe778a91ba199eb81fe7c98ac042df8602d0fd680305543d8bb1c1a663d12cf696ec50e1196c59b068051c4bf34b0e3b321cc3ea898bdf SHA512 af363fe81f9689ccb7effd8a755368245b14fdbc67e14698c7dc48e69e18b731e1c65ceefedf86638d6dca6378d21c3175b02f16f6c03bd76c45494c1d0e5eab
+DIST jquery-rails-4.6.0.gem 523776 BLAKE2B c6d283ee2739ad7ba32eae8a629836ff766693cdefef86e027db491ea104f662897f4d689beee4df01a418f93e1a57146991db09321a6f1e59fc61befd7755d3 SHA512 3b5867036f0f415f1063b9cb393d8cb4ad1d28d3a97a7d623089111dcf0abbc3cf00bde5a4a35aa8b1d2351b0398c007c71c5dd8e5e51857f24f9d4a35fc9ca9
diff --git a/dev-ruby/jquery-rails/jquery-rails-4.4.0-r1.ebuild b/dev-ruby/jquery-rails/jquery-rails-4.4.0-r1.ebuild
deleted file mode 100644
index 975df6d4e710..000000000000
--- a/dev-ruby/jquery-rails/jquery-rails-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md VERSIONS.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-RUBY_FAKEGEM_GEMSPEC="jquery-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="jQuery! For Rails! So great"
-HOMEPAGE="https://www.rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/railties-4.2.0:*
-	>=dev-ruby/thor-0.14:* <dev-ruby/thor-2:*
-	dev-ruby/rails-dom-testing:2"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' jquery-rails.gemspec || die
-}
diff --git a/dev-ruby/jquery-rails/jquery-rails-4.4.0.ebuild b/dev-ruby/jquery-rails/jquery-rails-4.4.0.ebuild
deleted file mode 100644
index 46d399100cb0..000000000000
--- a/dev-ruby/jquery-rails/jquery-rails-4.4.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md VERSIONS.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-RUBY_FAKEGEM_GEMSPEC="jquery-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="jQuery! For Rails! So great"
-HOMEPAGE="https://www.rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/railties-4.2.0:*
-	>=dev-ruby/thor-0.14:* <dev-ruby/thor-2:*
-	dev-ruby/rails-dom-testing:2"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' jquery-rails.gemspec || die
-}
diff --git a/dev-ruby/jquery-rails/jquery-rails-4.6.0.ebuild b/dev-ruby/jquery-rails/jquery-rails-4.6.0.ebuild
new file mode 100644
index 000000000000..f237dda54e78
--- /dev/null
+++ b/dev-ruby/jquery-rails/jquery-rails-4.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md VERSIONS.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+RUBY_FAKEGEM_GEMSPEC="jquery-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="jQuery! For Rails! So great"
+HOMEPAGE="https://github.com/rails/jquery-rails"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/railties-4.2.0:*
+	>=dev-ruby/thor-0.14:* <dev-ruby/thor-2:*
+	dev-ruby/rails-dom-testing:2"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' jquery-rails.gemspec || die
+}
diff --git a/dev-ruby/jquery-rails/metadata.xml b/dev-ruby/jquery-rails/metadata.xml
index 658c72b1920d..70355b65da80 100644
--- a/dev-ruby/jquery-rails/metadata.xml
+++ b/dev-ruby/jquery-rails/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">rails/jquery-rails</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/jquery-ui-rails/Manifest b/dev-ruby/jquery-ui-rails/Manifest
index 030a16d10491..33d2cf2cbc45 100644
--- a/dev-ruby/jquery-ui-rails/Manifest
+++ b/dev-ruby/jquery-ui-rails/Manifest
@@ -1 +1,2 @@
 DIST jquery-ui-rails-6.0.1.gem 175104 BLAKE2B f990968bc75d5f2c5556363f41eafd9ce2207dc08e20bbf10f857656219253fd5f29e8b4d131f7a8b942682d6c32bb11797c08621b34847f77984e7fe57e111b SHA512 ec0fd8c15ef9dbdbef01bdaca22fb36251a2ced090ade6859cff7c72e183c3c750fc384fdf757db7160ec1c6426ce84c972cce255c3d42a2bb9ebe5539390485
+DIST jquery-ui-rails-7.0.0.tar.gz 210630 BLAKE2B 8a344e188fe8da945cfda93ab7351bc431f9c8c4a2ef3bcfec596b806be767710ea94eba3d94ac02f8e112e12aa443787b36c8111f1107c97b606f2a17e470d8 SHA512 a0a50fba56469d95529253cea45e4c2c6bec8b7eeae634ef0526149b0671bc2b84895e0d374f63c9661c44327dc635d58d41560061687ef34ef2783b37017161
diff --git a/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r1.ebuild b/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r1.ebuild
deleted file mode 100644
index 2b761e269b97..000000000000
--- a/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md VERSIONS.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The jQuery UI assets for the Rails 3.2+ asset pipeline"
-HOMEPAGE="https://github.com/joliss/jquery-ui-rails"
-
-LICENSE="MIT"
-SLOT="6"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/railties-3.2.16:*"
diff --git a/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r2.ebuild b/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r2.ebuild
index 4a0026574b82..e15b14158cda 100644
--- a/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r2.ebuild
+++ b/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r2.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"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
@@ -14,7 +14,7 @@ RUBY_FAKEGEM_EXTRAINSTALL="app"
 inherit ruby-fakegem
 
 DESCRIPTION="The jQuery UI assets for the Rails 3.2+ asset pipeline"
-HOMEPAGE="https://github.com/joliss/jquery-ui-rails"
+HOMEPAGE="https://github.com/jquery-ui-rails/jquery-ui-rails"
 
 LICENSE="MIT"
 SLOT="6"
diff --git a/dev-ruby/jquery-ui-rails/jquery-ui-rails-7.0.0.ebuild b/dev-ruby/jquery-ui-rails/jquery-ui-rails-7.0.0.ebuild
new file mode 100644
index 000000000000..dc6353a5fb2e
--- /dev/null
+++ b/dev-ruby/jquery-ui-rails/jquery-ui-rails-7.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md VERSIONS.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+RUBY_FAKEGEM_GEMSPEC="jquery-ui-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The jQuery UI assets for the Rails 3.2+ asset pipeline"
+HOMEPAGE="https://github.com/jquery-ui-rails/jquery-ui-rails"
+SRC_URI="https://github.com/jquery-ui-rails/jquery-ui-rails/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+
+ruby_add_rdepend ">=dev-ruby/railties-3.2.16:*"
+
+all_ruby_prepare() {
+	sed -e '/executables/ s:^:#:' \
+		-e 's/git ls-files/find */' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/jquery-ui-rails/metadata.xml b/dev-ruby/jquery-ui-rails/metadata.xml
index b4756598f39b..9700c4a28e2f 100644
--- a/dev-ruby/jquery-ui-rails/metadata.xml
+++ b/dev-ruby/jquery-ui-rails/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">joliss/jquery-ui-rails</remote-id>
+		<remote-id type="github">jquery-ui-rails/jquery-ui-rails</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/jsobfu/jsobfu-0.4.2-r1.ebuild b/dev-ruby/jsobfu/jsobfu-0.4.2-r1.ebuild
index 3b7f60cfb522..63fdc38a7e28 100644
--- a/dev-ruby/jsobfu/jsobfu-0.4.2-r1.ebuild
+++ b/dev-ruby/jsobfu/jsobfu-0.4.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=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/jsobfu/jsobfu-0.4.2.ebuild b/dev-ruby/jsobfu/jsobfu-0.4.2.ebuild
deleted file mode 100644
index 155fb781aef3..000000000000
--- a/dev-ruby/jsobfu/jsobfu-0.4.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Javascript code obfuscator"
-HOMEPAGE="https://github.com/rapid7/jsobfu"
-
-LICENSE="BSD"
-#rapid7 gems are slotted so we can have multiple versions installed at once to support multiple versions of metasploit
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "!dev-ruby/jsobfu:0
-		>=dev-ruby/rkelly-remix-0.0.6:0"
-
-ruby_add_bdepend "test? ( dev-ruby/execjs )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/ s:^:#:' \
-		-e '/config.\(color\|tty\|formatter\)/ s:^:#:' \
-		spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper jsobfu jsobfu-${PV}
-}
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index d6608f52e84d..2e3ee93f1f48 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,3 +1,3 @@
-DIST json-2.5.1.tar.gz 131183 BLAKE2B 2ccdf5921ef476b66cb1dbf72cc01763636c82b0eb5d0a5cfc029e14177c7c6766464e7852b11c2424db401f5b931cb64c01d3952929236c9979378a7928ea59 SHA512 4df7ec9b86692376e89c2019c2c1ab3ae9af28fb4742864acc6f985c0551fc10795742cc1124d6435e820617c00d4c5f4aa6c83b21d2fff43ed05cd9d0a89087
-DIST json-2.6.1.tar.gz 132705 BLAKE2B 5a8e83b8d11e360402324427de5d2520f39ee1567e2fbf3c92c738546792bb5dec4a9a3c36f3286a3de63161bb5d9f9e7b059c2560f7a3fa50271ce2aa3dc0fc SHA512 e9d0ef77d77ae54a0300b490e3e5c445d0b5aefbce1b160454916bd4f4f8f943131223047e6a7416347cc40d9e7fb1870101c3cbf3a2663a9053f07bdfbd13cf
-DIST json-2.6.2.tar.gz 133073 BLAKE2B f81202ee284d3a6afe5c6f3ddccde76655e170b64883e37bc38c47bd63d731f8dca4e8a57da15e275ad64af5e1e967def69590d1105c0069b92f322919782a84 SHA512 9c1c16ef462e7736c0306781573f32b96a0a53368ed24b4d1ae97953df62956b6cd72dcd20ed07708b0e1e3dd71baa61551bde452c87d7efac41267c0ee60b33
+DIST json-2.6.3.tar.gz 133077 BLAKE2B f6101f533159fb689b6bf22975137d34a77bd0926c164a9c14f2d5eab982778538ec40551709e8a6470f05e78584a3e5680be740314bb7829b48feb32fb258ae SHA512 1bf9125266d8cdc565deb9e2fe3c884a1fc8d2f3b31caae67a154d0c47e30305074c1c08b49d180dd785c766762b46d3b3ef85919d53388797fcc2f37675317c
+DIST json-2.7.1.tar.gz 125655 BLAKE2B 9921b8dd26123d27b752d3dd633f788437a1aa2003b09ad6d0f43e946362f48a8e5b8dcc70d08f61cc9affa2578750e40c5a78d3bf88e0417af8890100987c79 SHA512 81e7cf51363095088142a7ac15428765f296e9b8c205946abf9ab98ddf7c57aa732c8111e6b0e239606645dfbc24dd40fbe981a52ab2d9fac97c0e3fb08133a0
+DIST json-2.7.2.tar.gz 125814 BLAKE2B 450c9495053c762446e77997bdc7e0291f8baf160a4da7e56d04ed18aa5629a11f1309e40bab0849692433392cfba8a19dda905fe5044ab363591a49e6e18b60 SHA512 5c432c293eed69b9810b5d0ca782383ba3f206d561641c354515e357c663ed4a4fb5ae35d3336d48605f9e82156d2f14a7ec6fa26642351214f60d91bac84f0e
diff --git a/dev-ruby/json/json-2.5.1-r1.ebuild b/dev-ruby/json/json-2.5.1-r1.ebuild
deleted file mode 100644
index b60bf87b53cc..000000000000
--- a/dev-ruby/json/json-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="json.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/json/ext/parser/extconf.rb ext/json/ext/generator/extconf.rb)
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A JSON implementation as a Ruby extension"
-HOMEPAGE="https://github.com/flori/json"
-SRC_URI="https://github.com/flori/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Ruby"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="2"
-IUSE=""
-
-RDEPEND="${RDEPEND}"
-DEPEND="${DEPEND}
-	dev-util/ragel"
-
-ruby_add_bdepend "dev-ruby/rake
-	doc? ( dev-ruby/rdoc )
-	test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	# And use rdoc instead of sdoc which we don't have packaged
-	# And don't call git to list files. We're using the pregenerated spec anyway.
-	sed -i \
-		-e '/task :test/ s|:compile,||' \
-		-e 's| => :clean||' \
-		-e 's|sdoc|rdoc|' \
-		-e 's|`git ls-files`|""|' \
-		Rakefile || die "rakefile fix failed"
-
-	# Remove hardcoded and broken -O setting.
-	sed -i -e '/^  \(if\|unless\)/,/^  end/ s:^:#:' \
-		-e '/^unless/,/^end/ s:^:#:' ext/json/ext/*/extconf.rb || die
-
-	# Avoid setting gem since it will not be available yet when installing
-	sed -i -e '/gem/ s:^:#:' tests/test_helper.rb || die
-}
-
-#each_ruby_compile() {
-#	for ext in parser generator ; do
-#		cp ext/json/ext/${ext}/${ext}$(get_modname) ext/json/ext/ || die
-#	done
-#}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	#ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname)
-	#ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname)
-}
diff --git a/dev-ruby/json/json-2.6.1.ebuild b/dev-ruby/json/json-2.6.1.ebuild
deleted file mode 100644
index 8645070d8ec3..000000000000
--- a/dev-ruby/json/json-2.6.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="json.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/json/ext/parser/extconf.rb ext/json/ext/generator/extconf.rb)
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A JSON implementation as a Ruby extension"
-HOMEPAGE="https://github.com/flori/json"
-SRC_URI="https://github.com/flori/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Ruby"
-
-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="2"
-IUSE=""
-
-RDEPEND="${RDEPEND}"
-DEPEND="${DEPEND}
-	dev-util/ragel"
-
-ruby_add_bdepend "dev-ruby/rake
-	doc? ( dev-ruby/rdoc )
-	test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	# And use rdoc instead of sdoc which we don't have packaged
-	# And don't call git to list files. We're using the pregenerated spec anyway.
-	sed -i \
-		-e '/task :test/ s|:compile,||' \
-		-e 's| => :clean||' \
-		-e 's|sdoc|rdoc|' \
-		-e 's|`git ls-files`|""|' \
-		Rakefile || die "rakefile fix failed"
-
-	# Remove hardcoded and broken -O setting.
-	sed -i -e '/^  \(if\|unless\)/,/^  end/ s:^:#:' \
-		-e '/^unless/,/^end/ s:^:#:' ext/json/ext/*/extconf.rb || die
-
-	# Avoid setting gem since it will not be available yet when installing
-	sed -i -e '/gem/ s:^:#:' tests/test_helper.rb || die
-}
-
-#each_ruby_compile() {
-#	for ext in parser generator ; do
-#		cp ext/json/ext/${ext}/${ext}$(get_modname) ext/json/ext/ || die
-#	done
-#}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	#ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname)
-	#ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname)
-}
diff --git a/dev-ruby/json/json-2.6.2.ebuild b/dev-ruby/json/json-2.6.2.ebuild
deleted file mode 100644
index c92a49456688..000000000000
--- a/dev-ruby/json/json-2.6.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="json.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/json/ext/parser/extconf.rb ext/json/ext/generator/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="A JSON implementation as a Ruby extension"
-HOMEPAGE="https://github.com/flori/json"
-SRC_URI="https://github.com/flori/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Ruby"
-
-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="2"
-IUSE=""
-
-RDEPEND="${RDEPEND}"
-DEPEND="${DEPEND}
-	dev-util/ragel"
-
-ruby_add_bdepend "dev-ruby/rake
-	doc? ( dev-ruby/rdoc )
-	test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	# And use rdoc instead of sdoc which we don't have packaged
-	# And don't call git to list files. We're using the pregenerated spec anyway.
-	sed -i \
-		-e '/task :test/ s|:compile,||' \
-		-e 's| => :clean||' \
-		-e 's|sdoc|rdoc|' \
-		-e 's|`git ls-files`|""|' \
-		Rakefile || die "rakefile fix failed"
-
-	# Remove hardcoded and broken -O setting.
-	sed -i -e '/^  \(if\|unless\)/,/^  end/ s:^:#:' \
-		-e '/^unless/,/^end/ s:^:#:' ext/json/ext/*/extconf.rb || die
-
-	# Avoid setting gem since it will not be available yet when installing
-	sed -i -e '/gem/ s:^:#:' tests/test_helper.rb || die
-}
diff --git a/dev-ruby/json/json-2.6.3.ebuild b/dev-ruby/json/json-2.6.3.ebuild
new file mode 100644
index 000000000000..73b8f0373091
--- /dev/null
+++ b/dev-ruby/json/json-2.6.3.ebuild
@@ -0,0 +1,46 @@
+# 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="CHANGES.md README.md"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="json.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/json/ext/parser/extconf.rb ext/json/ext/generator/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="A JSON implementation as a Ruby extension"
+HOMEPAGE="https://github.com/flori/json"
+SRC_URI="https://github.com/flori/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="|| ( BSD-2 Ruby )"
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="2"
+IUSE=""
+
+RDEPEND="${RDEPEND}"
+DEPEND="${DEPEND}
+	dev-util/ragel"
+
+ruby_add_bdepend "dev-ruby/rake
+	doc? ( dev-ruby/rdoc )
+	test? ( dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	# Avoid building the extension twice!
+	# And use rdoc instead of sdoc which we don't have packaged
+	# And don't call git to list files. We're using the pregenerated spec anyway.
+	sed -i \
+		-e '/task :test/ s|:compile,||' \
+		-e 's| => :clean||' \
+		-e 's|sdoc|rdoc|' \
+		-e 's|`git ls-files`|""|' \
+		Rakefile || die "rakefile fix failed"
+
+	# Avoid setting gem since it will not be available yet when installing
+	sed -i -e '/gem/ s:^:#:' tests/test_helper.rb || die
+}
diff --git a/dev-ruby/json/json-2.7.1-r1.ebuild b/dev-ruby/json/json-2.7.1-r1.ebuild
new file mode 100644
index 000000000000..e35c42b886fe
--- /dev/null
+++ b/dev-ruby/json/json-2.7.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="json.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/json/ext/parser/extconf.rb ext/json/ext/generator/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/json/ext
+
+inherit ruby-fakegem
+
+DESCRIPTION="A JSON implementation as a Ruby extension"
+HOMEPAGE="https://github.com/flori/json"
+SRC_URI="https://github.com/flori/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="|| ( BSD-2 Ruby )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+RDEPEND="${RDEPEND}"
+DEPEND="${DEPEND}
+	dev-util/ragel"
+
+ruby_add_bdepend "dev-ruby/rake
+	doc? ( dev-ruby/rdoc )
+	test? (
+		dev-ruby/test-unit:2
+		dev-ruby/test-unit-ruby-core
+	)"
+
+all_ruby_prepare() {
+	# Avoid building the extension twice!
+	# And use rdoc instead of sdoc which we don't have packaged
+	# And don't call git to list files. We're using the pregenerated spec anyway.
+	sed -i \
+		-e '/task :test/ s|:compile,||' \
+		-e 's| => :clean||' \
+		-e 's|sdoc|rdoc|' \
+		-e 's|`git ls-files`|""|' \
+		Rakefile || die "rakefile fix failed"
+
+	sed -e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid setting gem since it will not be available yet when installing
+	sed -i -e '/gem/ s:^:#:' tests/test_helper.rb || die
+}
diff --git a/dev-ruby/json/json-2.7.2.ebuild b/dev-ruby/json/json-2.7.2.ebuild
new file mode 100644
index 000000000000..35048694bea9
--- /dev/null
+++ b/dev-ruby/json/json-2.7.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="json.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/json/ext/parser/extconf.rb ext/json/ext/generator/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/json/ext
+
+inherit ruby-fakegem
+
+DESCRIPTION="A JSON implementation as a Ruby extension"
+HOMEPAGE="https://github.com/flori/json"
+SRC_URI="https://github.com/flori/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="|| ( BSD-2 Ruby )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="$(ver_cut 1)"
+IUSE="doc test"
+
+DEPEND="${DEPEND}
+	dev-util/ragel"
+
+ruby_add_bdepend "dev-ruby/rake
+	doc? ( dev-ruby/rdoc )
+	test? (
+		dev-ruby/test-unit:2
+		dev-ruby/test-unit-ruby-core
+	)"
+
+all_ruby_prepare() {
+	# Avoid building the extension twice!
+	# And use rdoc instead of sdoc which we don't have packaged
+	# And don't call git to list files. We're using the pregenerated spec anyway.
+	sed -i \
+		-e '/task :test/ s|:compile,||' \
+		-e 's| => :clean||' \
+		-e 's|sdoc|rdoc|' \
+		-e 's|`git ls-files`|""|' \
+		Rakefile || die "rakefile fix failed"
+
+	sed -e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid setting gem since it will not be available yet when installing
+	sed -i -e '/gem/ s:^:#:' tests/test_helper.rb || die
+}
diff --git a/dev-ruby/json_schema/Manifest b/dev-ruby/json_schema/Manifest
index c754f4d0b687..32740d6deae1 100644
--- a/dev-ruby/json_schema/Manifest
+++ b/dev-ruby/json_schema/Manifest
@@ -1,2 +1 @@
-DIST json_schema-0.20.8.tar.gz 36456 BLAKE2B 4159b8a293ab41d0d5f6c3877de98fe3ba0f1f9f151e938ebf03cdbd563fc06e80603b49ca0132877d0369901b8724229ee618bd2133a159fc34201de7d9541a SHA512 f3e2314d66fdd4fd0968a1e98f363e5f008fa91c46c068c198b89f54cd856d4d87bcab02eb23b46fbce34749885579178955a84d22aad2ae131928ceaaf80065
-DIST json_schema-0.20.9.tar.gz 36498 BLAKE2B 5eb79271b3a1627e2759783b176917d09ae9c20f84723f526f48653c99f1ce52f6e377ac9835bafee64ce2899222edc19ccbdd186e1fa82f66ab40601975800c SHA512 7dd2d7394fb7300d34dcd3e8b5fd6ee29259a762065b99cb55012248ef385dd89460fc58bfa4ac4c3f6255f1546cf3ba363310420d89057c27d1be55ef50ae73
+DIST json_schema-0.21.0.tar.gz 36563 BLAKE2B a7c0eca9ef738cdd78e6549f7ad8ec41dbde9986f957688411d65a8198c19fa235ff08730370be2397fab7bc0032bef42824bdf276b14b78da54bfd62842266f SHA512 753bcd9715ad384676c9ebb7dcaff7cb63295dc58e31fe51064c6c11ff46fdd32a4c573d6bc4722ce1def290759f28a7706a75efbc1544a56e9585435084ad1d
diff --git a/dev-ruby/json_schema/json_schema-0.20.8.ebuild b/dev-ruby/json_schema/json_schema-0.20.8.ebuild
deleted file mode 100644
index 548559b4ebb0..000000000000
--- a/dev-ruby/json_schema/json_schema-0.20.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="schemas"
-
-RUBY_FAKEGEM_GEMSPEC="json_schema.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A JSON Schema V4 and Hyperschema V4 parser and validator"
-HOMEPAGE="https://github.com/brandur/json_schema"
-SRC_URI="https://github.com/brandur/json_schema/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/ecma-re-validator )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-	sed -i -e '/^if/,/^end/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/json_schema/json_schema-0.20.9.ebuild b/dev-ruby/json_schema/json_schema-0.20.9.ebuild
deleted file mode 100644
index ec108266055b..000000000000
--- a/dev-ruby/json_schema/json_schema-0.20.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="schemas"
-
-RUBY_FAKEGEM_GEMSPEC="json_schema.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A JSON Schema V4 and Hyperschema V4 parser and validator"
-HOMEPAGE="https://github.com/brandur/json_schema"
-SRC_URI="https://github.com/brandur/json_schema/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/ecma-re-validator )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-	sed -i -e '/^if/,/^end/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/json_schema/json_schema-0.21.0.ebuild b/dev-ruby/json_schema/json_schema-0.21.0.ebuild
new file mode 100644
index 000000000000..ef72f4d04593
--- /dev/null
+++ b/dev-ruby/json_schema/json_schema-0.21.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="schemas"
+
+RUBY_FAKEGEM_GEMSPEC="json_schema.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A JSON Schema V4 and Hyperschema V4 parser and validator"
+HOMEPAGE="https://github.com/brandur/json_schema"
+SRC_URI="https://github.com/brandur/json_schema/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/ecma-re-validator )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+	sed -i -e '/^if/,/^end/ s:^:#:' test/test_helper.rb || die
+
+	sed -e '/validates date format successfully/askip "should fail like test after it"' \
+		-i test/json_schema/validator_test.rb || die
+}
diff --git a/dev-ruby/json_schema/metadata.xml b/dev-ruby/json_schema/metadata.xml
index effeb95760be..db43d014ef89 100644
--- a/dev-ruby/json_schema/metadata.xml
+++ b/dev-ruby/json_schema/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="rubygems">json_schema</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">brandur/json_schema</remote-id>
+    <remote-id type="rubygems">json_schema</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/jwt/Manifest b/dev-ruby/jwt/Manifest
index 7dfef404bedd..dcb52c43aef6 100644
--- a/dev-ruby/jwt/Manifest
+++ b/dev-ruby/jwt/Manifest
@@ -1,2 +1,4 @@
-DIST jwt-2.2.3.tar.gz 50675 BLAKE2B 904a2b9be80ece10cc046d35df784ecc4991c3b09a79c2e2e461003596e9212409ed5840282ce632d3ff499754c505cd899ca95945f562883869ff3c50c4399a SHA512 ebefbf8f825afc1a78329088012118ed681a61bdf9e1c6a3fa125d46105092f1f26a4bc88791788c0290009dbc0427128d655a301c034ac07caf14216744962c
-DIST jwt-2.3.0.tar.gz 53312 BLAKE2B 4653a786d0f5da0d7c7e160f5b0c189f0eab78d045d5af441561c953d6d42fc74d6baff95e54dd9bfd47b3245f3b628e25f99e37016631ef282d95564a08cb1d SHA512 a4dfbb119575d9b5f883c2789734180f092adc75e05310de2e523e352f47469243868480e06f9bfabfa2a48e174ea669e69bd73e0fd002c4f66134462ffe2653
+DIST jwt-2.7.0.tar.gz 75020 BLAKE2B 2bfa009912f4037dc13672ef6d43557e70bc9a06d399d949a6c5ddee641dc550a218242482ec0a66eb470ab117d1e192dd1ca6fdb5a03926d85f4902d72500e7 SHA512 8e0bb9909d123b7b73fe01fafc4088e45140e417b1bff84b240a317f3dca8085b2b987bd1e93cb1506efc66a1f7371168f8202a590308ee0e4c52820983a9789
+DIST jwt-2.7.1.tar.gz 75003 BLAKE2B 5c43fd78cf22960749358cbfcbfb5c47dce935ef8fd83235137a963572b95b19583399e142136663d113df472ebfb5dd976ce60156b75cceeff387950b6190b0 SHA512 efcdd81bc472a18764e0033f1040e9e2506952cbfb691acfc1ad90a5b34ebac864911e0cfeb28b82ac2ce1da7e3578a6677c0b113d1e45a81a3f4c4f8fed1047
+DIST jwt-2.8.0.tar.gz 71132 BLAKE2B 195bce2da7598c2c16d22db6b0322b6b8b9ab76dba70bc66f88ae44a030acc4a2d70a9864c760ebabb6b6d6ae6256fe291be33aea4e67432258f4243e939d9b6 SHA512 d2ef3505aa38f0337a658fa365258195be118939ec300dc8d17ca6cb950358b2e9a7c64c0dea3ef50df250c70da4e2233a4daccbe8fac97e902e28b7e9dcfa0d
+DIST jwt-2.8.1.tar.gz 71939 BLAKE2B 07eb3df24165c72f13a77dfff658a94574e4fc5b5aed3b56041c58cf9bfb8eba663e76de7eb91e2870bbb8dcdeb79b9c2a7888d29f41feee06e2f07a825b90b9 SHA512 df4ad49f223bba0ace69a37d229868c2deabed5c09fd84e5e4ce4021242cef9e30c07a592b5bf54af6bdcfec552487d808620cf020d242757fc4310d201469c2
diff --git a/dev-ruby/jwt/files/jwt-2.2.3-ec-test.patch b/dev-ruby/jwt/files/jwt-2.2.3-ec-test.patch
deleted file mode 100644
index 18f69cf8d44d..000000000000
--- a/dev-ruby/jwt/files/jwt-2.2.3-ec-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From c444ac978013a9e199c968fefc3c413f37c93351 Mon Sep 17 00:00:00 2001
-From: Joakim Antman <antmanj@gmail.com>
-Date: Wed, 23 Jun 2021 10:55:29 +0300
-Subject: [PATCH] Fix OpenSSL::PKey::EC public_key handing in tests
-
----
- spec/jwk/ec_spec.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spec/jwk/ec_spec.rb b/spec/jwk/ec_spec.rb
-index 3a94976..d8258bb 100644
---- a/spec/jwk/ec_spec.rb
-+++ b/spec/jwk/ec_spec.rb
-@@ -15,7 +15,7 @@
-     end
- 
-     context 'when a keypair with only public key is given' do
--      let(:keypair) { ec_key.tap { |x| x.private_key = nil } }
-+      let(:keypair) { OpenSSL::PKey::EC.new(ec_key.public_key.group).tap { |ec| ec.public_key = ec_key.public_key } }
-       it 'creates an instance of the class' do
-         expect(subject).to be_a described_class
-         expect(subject.private?).to eq false
diff --git a/dev-ruby/jwt/jwt-2.2.3.ebuild b/dev-ruby/jwt/jwt-2.2.3.ebuild
deleted file mode 100644
index bed4ee7f5a63..000000000000
--- a/dev-ruby/jwt/jwt-2.2.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_GEMSPEC="ruby-jwt.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
-HOMEPAGE="https://github.com/jwt/ruby-jwt"
-SRC_URI="https://github.com/jwt/ruby-jwt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="ruby-jwt-${PV}"
-
-PATCHES=( "${FILESDIR}/${P}-ec-test.patch" )
-
-ruby_add_bdepend "test? ( dev-ruby/rbnacl )"
-
-all_ruby_prepare() {
-	sed -i -e "/simplecov/ s:^:#:" \
-		-e '/^SimpleCov.start/,/^end/ s:^:#:' \
-		spec/spec_helper.rb || die
-
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/jwt/jwt-2.3.0.ebuild b/dev-ruby/jwt/jwt-2.3.0.ebuild
deleted file mode 100644
index 62bb08bb5f03..000000000000
--- a/dev-ruby/jwt/jwt-2.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_GEMSPEC="ruby-jwt.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
-HOMEPAGE="https://github.com/jwt/ruby-jwt"
-SRC_URI="https://github.com/jwt/ruby-jwt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="ruby-jwt-${PV}"
-
-ruby_add_bdepend "test? ( dev-ruby/rbnacl )"
-
-all_ruby_prepare() {
-	sed -i -e "/simplecov/ s:^:#:" \
-		-e '/^SimpleCov.start/,/^end/ s:^:#:' \
-		spec/spec_helper.rb || die
-
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/jwt/jwt-2.7.0.ebuild b/dev-ruby/jwt/jwt-2.7.0.ebuild
new file mode 100644
index 000000000000..5210e3c5ef34
--- /dev/null
+++ b/dev-ruby/jwt/jwt-2.7.0.ebuild
@@ -0,0 +1,33 @@
+# 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_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="ruby-jwt.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
+HOMEPAGE="https://github.com/jwt/ruby-jwt"
+SRC_URI="https://github.com/jwt/ruby-jwt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="ruby-jwt-${PV}"
+
+ruby_add_bdepend "test? ( dev-ruby/rbnacl )"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/ s:^:#:" \
+		-e '/^SimpleCov.start/,/^end/ s:^:#:' \
+		spec/spec_helper.rb || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/jwt/jwt-2.7.1.ebuild b/dev-ruby/jwt/jwt-2.7.1.ebuild
new file mode 100644
index 000000000000..3b4b7861793a
--- /dev/null
+++ b/dev-ruby/jwt/jwt-2.7.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="ruby-jwt.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
+HOMEPAGE="https://github.com/jwt/ruby-jwt"
+SRC_URI="https://github.com/jwt/ruby-jwt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="ruby-jwt-${PV}"
+
+ruby_add_bdepend "test? ( dev-ruby/rbnacl )"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/ s:^:#:" \
+		-e '/^SimpleCov.start/,/^end/ s:^:#:' \
+		spec/spec_helper.rb || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/jwt/jwt-2.8.0.ebuild b/dev-ruby/jwt/jwt-2.8.0.ebuild
new file mode 100644
index 000000000000..e092f3ff6285
--- /dev/null
+++ b/dev-ruby/jwt/jwt-2.8.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="ruby-jwt.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
+HOMEPAGE="https://github.com/jwt/ruby-jwt"
+SRC_URI="https://github.com/jwt/ruby-jwt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RUBY_S="ruby-jwt-${PV}"
+
+ruby_add_bdepend "test? ( dev-ruby/rbnacl )"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/ s:^:#:" \
+		-e '/^SimpleCov.start/,/^end/ s:^:#:' \
+		spec/spec_helper.rb || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/jwt/jwt-2.8.1.ebuild b/dev-ruby/jwt/jwt-2.8.1.ebuild
new file mode 100644
index 000000000000..e092f3ff6285
--- /dev/null
+++ b/dev-ruby/jwt/jwt-2.8.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="ruby-jwt.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
+HOMEPAGE="https://github.com/jwt/ruby-jwt"
+SRC_URI="https://github.com/jwt/ruby-jwt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RUBY_S="ruby-jwt-${PV}"
+
+ruby_add_bdepend "test? ( dev-ruby/rbnacl )"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/ s:^:#:" \
+		-e '/^SimpleCov.start/,/^end/ s:^:#:' \
+		spec/spec_helper.rb || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/kirbybase/Manifest b/dev-ruby/kirbybase/Manifest
deleted file mode 100644
index fb5c38be4203..000000000000
--- a/dev-ruby/kirbybase/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST KirbyBase-2.6.1.gem 304128 BLAKE2B 4fabc7d431b607d18b1474ba815ad1d19d3362734ac0a562858ab6deca6193e6fa13e668d17d84b228af4459b75d082aebbb04cc91c6dd7bfa667e9b38613032 SHA512 84a471b77ef9c91d50b61ad9993956fb25739155fe55049c1e20f1c87593f726604801ddb7968b19d8234d1d9ad9b112df53f1a2c8c85ec3559d88eedbd2314f
diff --git a/dev-ruby/kirbybase/kirbybase-2.6.1-r3.ebuild b/dev-ruby/kirbybase/kirbybase-2.6.1-r3.ebuild
deleted file mode 100644
index 6224407ceba4..000000000000
--- a/dev-ruby/kirbybase/kirbybase-2.6.1-r3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_NAME="KirbyBase"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="changes.txt kirbybaserubymanual.html README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple Ruby DBMS that stores data in plaintext files"
-HOMEPAGE="http://www.netpromi.com/kirbybase_ruby.html"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-each_ruby_test() {
-	${RUBY} -I.:lib -S testrb-2 test/t*.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r examples images
-}
diff --git a/dev-ruby/kirbybase/metadata.xml b/dev-ruby/kirbybase/metadata.xml
deleted file mode 100644
index 658c72b1920d..000000000000
--- a/dev-ruby/kirbybase/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/kissfft/kissfft-0.0.2-r1.ebuild b/dev-ruby/kissfft/kissfft-0.0.2-r1.ebuild
index 724b3d755b5c..a3bac09c7f68 100644
--- a/dev-ruby/kissfft/kissfft-0.0.2-r1.ebuild
+++ b/dev-ruby/kissfft/kissfft-0.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/kpeg/Manifest b/dev-ruby/kpeg/Manifest
index 21a46ceb81ca..5472ec3af188 100644
--- a/dev-ruby/kpeg/Manifest
+++ b/dev-ruby/kpeg/Manifest
@@ -1,4 +1 @@
-DIST kpeg-1.1.0.gem 57856 BLAKE2B 6aab84aec59c4962ef39f31a7de89a7bb84f0ae2b64327206fefa8bc243e0dd405db121bfe2f50c72b18933c2f4ce7a47a842c741cbd53db1ad73415d41b95dc SHA512 4ca7007bea74485ceb7c3f53eef1cd2e162fed45872f8f078d5b5d2ffd1ecaa0e8fc65ed6f1b220bf6f4642d455a582cb754cdc6350edf856b33d9908510cb66
-DIST kpeg-1.2.0.gem 57856 BLAKE2B 6397792524e00594c7f64acc79b920781b6dca28d0954fa73de0c9644afc4788969fa2e807cf196807808d93e5520db0e1b1cdd412391a592334c8811f687132 SHA512 97a1e573dcff89f4a8a6832876e4ce737a85fae63ffe6ac8dad001db8ff8237f32d437813252f3487e68a0708c161ee5731b468e5f1b039e59d714b461722e7a
-DIST kpeg-1.3.0.gem 57856 BLAKE2B 783c0f6fad341139dcf8b69adb9bee829a302997917e07cc2beb7dfbabff759e26c31bf1c9b272193919a7a78d9b793db7db85ecde1b5c6ad7c5eeefd95e103e SHA512 a84aa2afd0bb9148dae3cd3c8e1f3104bf4b4997e7c89524ef8b3be1c6fa9dfe7364c931eb9c0e641277590b634b164ab78b8e8e499937fbea65ebb7aa556fd6
-DIST kpeg-1.3.1.gem 57856 BLAKE2B 73f589e0bbd1ebefc3b9068b96476a607214bd32a44920020a57964d705ff45b103bd4846bb2355d8fe30e0c8e585a29dbd2484385b78f87533c152e9ecf496b SHA512 73baedc77d44d671e6e9d074bc4f9053a19aa50fa62f7394206d328c4c102d5a869a4b69b52de16acadafa8c88573bef9593bb4e3278ccf239e7d0850cd63ea9
+DIST kpeg-1.3.3.gem 58368 BLAKE2B 335a5940207f81b2fc2e7de2f0c11fc7bd78073792e15e4e16f041ebefb5e0fec6ebfcffb407550e6e7e73e414b49239ab3eb66f3ad25eae67f1d3da776de4d2 SHA512 7495694cfceb715d5fb2e36e4dde5302a016bf03fd9b65f6ccf0ee8f9f1f856eecd8402cb4bcae4f25a74aba2b8c02f32cb6d7913a0b5397d8fbaccb87bd1110
diff --git a/dev-ruby/kpeg/files/kpeg-1.1.0-utf8.patch b/dev-ruby/kpeg/files/kpeg-1.1.0-utf8.patch
deleted file mode 100644
index 1b565c466c2d..000000000000
--- a/dev-ruby/kpeg/files/kpeg-1.1.0-utf8.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Ensure proper encoding in non-UTF-8 locales.
-
-https://bugs.gentoo.org/640150
-
---- a/lib/kpeg/grammar.rb.orig	2018-05-20 09:26:13.597648830 +0200
-+++ b/lib/kpeg/grammar.rb	2018-05-20 09:28:19.606460712 +0200
-@@ -130,6 +130,10 @@
-           end
-         end
- 
-+	if reg =~ /\{[LMNPSZC][c-u]?\}/ && reg.encoding != Encoding::UTF_8
-+	  reg.force_encoding('UTF-8')
-+	end
-+
-         @regexp = Regexp.new(reg, flags, lang)
-       else
-         @regexp = reg
diff --git a/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild b/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
deleted file mode 100644
index 9dd6a8adb34d..000000000000
--- a/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple PEG library for Ruby"
-HOMEPAGE="https://github.com/evanphx/kpeg"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-PATCHES=( "${FILESDIR}/${P}-utf8.patch" )
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.0"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/kpeg/kpeg-1.2.0.ebuild b/dev-ruby/kpeg/kpeg-1.2.0.ebuild
deleted file mode 100644
index 7178cd2d934c..000000000000
--- a/dev-ruby/kpeg/kpeg-1.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple PEG library for Ruby"
-HOMEPAGE="https://github.com/evanphx/kpeg"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-PATCHES=( "${FILESDIR}/kpeg-1.1.0-utf8.patch" )
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.0"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/kpeg/kpeg-1.3.0.ebuild b/dev-ruby/kpeg/kpeg-1.3.0.ebuild
deleted file mode 100644
index 7178cd2d934c..000000000000
--- a/dev-ruby/kpeg/kpeg-1.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple PEG library for Ruby"
-HOMEPAGE="https://github.com/evanphx/kpeg"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-PATCHES=( "${FILESDIR}/kpeg-1.1.0-utf8.patch" )
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.0"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/kpeg/kpeg-1.3.1.ebuild b/dev-ruby/kpeg/kpeg-1.3.1.ebuild
deleted file mode 100644
index 12e389acfb60..000000000000
--- a/dev-ruby/kpeg/kpeg-1.3.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple PEG library for Ruby"
-HOMEPAGE="https://github.com/evanphx/kpeg"
-
-LICENSE="MIT"
-SLOT="1"
-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"
-IUSE="test"
-
-PATCHES=( "${FILESDIR}/kpeg-1.1.0-utf8.patch" )
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.0"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/kpeg/kpeg-1.3.3.ebuild b/dev-ruby/kpeg/kpeg-1.3.3.ebuild
new file mode 100644
index 000000000000..84720f10865a
--- /dev/null
+++ b/dev-ruby/kpeg/kpeg-1.3.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple PEG library for Ruby"
+HOMEPAGE="https://github.com/evanphx/kpeg"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.0"; Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0-r1.ebuild b/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..cdd944d891ed
--- /dev/null
+++ b/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit edo ruby-fakegem
+
+DESCRIPTION="A kramdown parser for the GFM dialect of Markdown"
+HOMEPAGE="https://github.com/kramdown/parser-gfm"
+LICENSE="MIT"
+
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="$(ver_cut 1)"
+IUSE="doc"
+
+ruby_add_rdepend "dev-ruby/kramdown:2"
+ruby_add_bdepend "test? ( dev-ruby/kramdown[latex] )"
+
+all_ruby_prepare() {
+	# Avoid testcase which is no longer compatible with newer rouge
+	rm -f test/testcases/codeblock_fenced.text || die
+
+	# Avoid test broken with current kramdown versions
+	rm -r test/testcases/header_ids.text || die
+}
+
+each_ruby_test() {
+	edo ${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0.ebuild b/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0.ebuild
deleted file mode 100644
index 6e2514be9de3..000000000000
--- a/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A kramdown parser for the GFM dialect of Markdown"
-HOMEPAGE="https://github.com/kramdown/parser-gfm"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm64"
-SLOT="$(ver_cut 1)"
-IUSE="doc"
-
-ruby_add_rdepend "dev-ruby/kramdown:2"
-ruby_add_bdepend "test? ( dev-ruby/kramdown[latex] )"
-
-all_ruby_prepare() {
-	# Avoid testcase which is no longer compatible with newer rouge
-	rm -f test/testcases/codeblock_fenced.text || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/kramdown-parser-gfm/metadata.xml b/dev-ruby/kramdown-parser-gfm/metadata.xml
index daac6fdb7252..c880b279c855 100644
--- a/dev-ruby/kramdown-parser-gfm/metadata.xml
+++ b/dev-ruby/kramdown-parser-gfm/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">kramdown/parser-gfm</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/kramdown-syntax-coderay/kramdown-syntax-coderay-1.0.1-r1.ebuild b/dev-ruby/kramdown-syntax-coderay/kramdown-syntax-coderay-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..d3b94f30cd48
--- /dev/null
+++ b/dev-ruby/kramdown-syntax-coderay/kramdown-syntax-coderay-1.0.1-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Uses coderay to highlight code blocks/spans"
+HOMEPAGE="https://github.com/kramdown/syntax-coderay"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm64"
+SLOT="$(ver_cut 1)"
+IUSE="doc"
+
+ruby_add_rdepend ">=dev-ruby/coderay-1.1:0 dev-ruby/kramdown:2"
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/kramdown-syntax-coderay/kramdown-syntax-coderay-1.0.1.ebuild b/dev-ruby/kramdown-syntax-coderay/kramdown-syntax-coderay-1.0.1.ebuild
deleted file mode 100644
index 08194eeeb809..000000000000
--- a/dev-ruby/kramdown-syntax-coderay/kramdown-syntax-coderay-1.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Uses coderay to highlight code blocks/spans"
-HOMEPAGE="https://github.com/kramdown/syntax-coderay"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm64"
-SLOT="$(ver_cut 1)"
-IUSE="doc"
-
-ruby_add_rdepend ">=dev-ruby/coderay-1.1:0 dev-ruby/kramdown:2"
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/kramdown-syntax-coderay/metadata.xml b/dev-ruby/kramdown-syntax-coderay/metadata.xml
index daac6fdb7252..28db3894ded5 100644
--- a/dev-ruby/kramdown-syntax-coderay/metadata.xml
+++ b/dev-ruby/kramdown-syntax-coderay/metadata.xml
@@ -5,4 +5,7 @@
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">kramdown/syntax-coderay</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/kramdown/Manifest b/dev-ruby/kramdown/Manifest
index 32f424774d3b..6d06c2bd7b17 100644
--- a/dev-ruby/kramdown/Manifest
+++ b/dev-ruby/kramdown/Manifest
@@ -1,3 +1 @@
-DIST kramdown-2.3.1.gem 122368 BLAKE2B 731e20904f238f44db594c7b8efac858187c935d9fbf8a421ddceeb1aa486f0980b502953f8eaa7e3100f7b7722d09b1da35091d28977c70cfd1ef24a080c3e1 SHA512 d1955065e3c5d7a60e595b647d5e453cf07a08fe25d40c67cf6f32d30f704a2c653a52959f8c71b3290e6da74836a085fa6bf8201c878303ad572dee8cc64496
-DIST kramdown-2.3.2.gem 122368 BLAKE2B cfed374793257a152e99a0417997c39de943ae8d31b178715355841248789f3986b1bee455396a5ac8ad2d6784a5fd33e82effb8430230cddec83579cb8ca2d9 SHA512 268b55b45ad2c6dd02776abd5777c7f51ea8724c64b03d8a859bd809b54b181e018fcf5ca38170c89acfac5cef2e6de253f1c6037fe642c6c093e339fd8f4d1b
 DIST kramdown-2.4.0.gem 122368 BLAKE2B 86b1232583dc88f8a576fb17e3e2ee756f109700634783815e8ba1f722dd8c872f2f6a978d33e1970814530090665eba3693206e57d3f274bb39655a7ac2d208 SHA512 8e52c5cc53d2f0085e30188aa7bf67f92dfe7f0801297c6a45293cca307e3442baa06443638c1161dad4a4aa332cbc5b4f9b6281ba4c6346122a9fff5a3743c7
diff --git a/dev-ruby/kramdown/kramdown-2.3.1-r1.ebuild b/dev-ruby/kramdown/kramdown-2.3.1-r1.ebuild
deleted file mode 100644
index d41f19d16265..000000000000
--- a/dev-ruby/kramdown/kramdown-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition"
-HOMEPAGE="https://kramdown.gettalong.org/"
-
-LICENSE="MIT"
-
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="latex"
-
-LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
-RDEPEND+=" ${LATEX_DEPS}"
-DEPEND+=" test? (
-	${LATEX_DEPS}
-	>=app-text/htmltidy-5.0.0
-)"
-
-ruby_add_rdepend "
-	dev-ruby/rexml
-	>=dev-ruby/rouge-1.8
-	>=dev-ruby/stringex-1.5.1
-	!!<dev-ruby/kramdown-1.17.0-r2:0"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )
-	test? ( >=dev-ruby/minitest-5.0 )"
-
-all_ruby_prepare() {
-	if ! use latex; then
-		# Remove latex tests. They will fail gracefully when latex isn't
-		# present at all, but not when components are missing (most
-		# notable ucs.sty).
-		sed -i -e '/latex -v/,/^  end/ s:^:#:' test/test_files.rb || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/man1/kramdown.1
-}
diff --git a/dev-ruby/kramdown/kramdown-2.3.2.ebuild b/dev-ruby/kramdown/kramdown-2.3.2.ebuild
deleted file mode 100644
index d6208fd4678a..000000000000
--- a/dev-ruby/kramdown/kramdown-2.3.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition"
-HOMEPAGE="https://kramdown.gettalong.org/"
-
-LICENSE="MIT"
-
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~s390 ~sparc ~x86"
-IUSE="latex"
-
-LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
-RDEPEND+=" ${LATEX_DEPS}"
-DEPEND+=" test? (
-	${LATEX_DEPS}
-	>=app-text/htmltidy-5.0.0
-)"
-
-ruby_add_rdepend "
-	dev-ruby/rexml
-	>=dev-ruby/rouge-3.26.0:2
-	>=dev-ruby/stringex-1.5.1
-	!!<dev-ruby/kramdown-1.17.0-r2:0"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )
-	test? ( >=dev-ruby/minitest-5.0 )"
-
-all_ruby_prepare() {
-	if ! use latex; then
-		# Remove latex tests. They will fail gracefully when latex isn't
-		# present at all, but not when components are missing (most
-		# notable ucs.sty).
-		sed -i -e '/latex -v/,/^  end/ s:^:#:' test/test_files.rb || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/man1/kramdown.1
-}
diff --git a/dev-ruby/kramdown/kramdown-2.4.0-r1.ebuild b/dev-ruby/kramdown/kramdown-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..1e939b97f322
--- /dev/null
+++ b/dev-ruby/kramdown/kramdown-2.4.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition"
+HOMEPAGE="https://kramdown.gettalong.org/"
+
+LICENSE="MIT"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos"
+IUSE="latex unicode"
+
+LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
+RDEPEND+=" ${LATEX_DEPS}"
+DEPEND+=" test? (
+	${LATEX_DEPS}
+	>=app-text/htmltidy-5.0.0
+)"
+
+ruby_add_rdepend "
+	dev-ruby/rexml
+	>=dev-ruby/rouge-3.26.0:2
+	unicode? ( >=dev-ruby/stringex-1.5.1 )
+	!!<dev-ruby/kramdown-1.17.0-r2:0"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )
+	test? ( >=dev-ruby/minitest-5.0 )"
+
+all_ruby_prepare() {
+	if ! use latex; then
+		# Remove latex tests. They will fail gracefully when latex isn't
+		# present at all, but not when components are missing (most
+		# notable ucs.sty).
+		sed -i -e '/latex -v/,/^  end/ s:^:#:' test/test_files.rb || die
+	fi
+
+	if ! use unicode; then
+		rm -f test/testcases/block/04_header/with_auto_ids.* || die
+	fi
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/man1/kramdown.1
+}
diff --git a/dev-ruby/kramdown/kramdown-2.4.0.ebuild b/dev-ruby/kramdown/kramdown-2.4.0.ebuild
deleted file mode 100644
index d6208fd4678a..000000000000
--- a/dev-ruby/kramdown/kramdown-2.4.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition"
-HOMEPAGE="https://kramdown.gettalong.org/"
-
-LICENSE="MIT"
-
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~s390 ~sparc ~x86"
-IUSE="latex"
-
-LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
-RDEPEND+=" ${LATEX_DEPS}"
-DEPEND+=" test? (
-	${LATEX_DEPS}
-	>=app-text/htmltidy-5.0.0
-)"
-
-ruby_add_rdepend "
-	dev-ruby/rexml
-	>=dev-ruby/rouge-3.26.0:2
-	>=dev-ruby/stringex-1.5.1
-	!!<dev-ruby/kramdown-1.17.0-r2:0"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )
-	test? ( >=dev-ruby/minitest-5.0 )"
-
-all_ruby_prepare() {
-	if ! use latex; then
-		# Remove latex tests. They will fail gracefully when latex isn't
-		# present at all, but not when components are missing (most
-		# notable ucs.sty).
-		sed -i -e '/latex -v/,/^  end/ s:^:#:' test/test_files.rb || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/man1/kramdown.1
-}
diff --git a/dev-ruby/kramdown/metadata.xml b/dev-ruby/kramdown/metadata.xml
index daac6fdb7252..f81794e60240 100644
--- a/dev-ruby/kramdown/metadata.xml
+++ b/dev-ruby/kramdown/metadata.xml
@@ -5,4 +5,7 @@
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">gettalong/kramdown</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/launchy/Manifest b/dev-ruby/launchy/Manifest
index 13c172ce9c99..24a854f7441e 100644
--- a/dev-ruby/launchy/Manifest
+++ b/dev-ruby/launchy/Manifest
@@ -1 +1,2 @@
-DIST launchy-2.5.0.gem 30208 BLAKE2B 30719f97fdf1bca8a66eb113992c8714103a7fe87262c3677a0fa64b58070593bcbdba7357b81e5bada9e8a143e6601e28ef2d2730f0028fdaecefad23156fd8 SHA512 d80811009155d9cea6a2e69b5f7482aaec7d0bf23ecca4cbe72e440fb4eae1c38bc5904e863998f1966c7a99b98bad1f4456cec1cb076f96f5a99b835448b39f
+DIST launchy-2.5.2.gem 30208 BLAKE2B 7e3c3464292026a93953995c5df7dd407b51bd36b363bb0c57fed6ebf2122390348f415273b6ce7ee2dcb89bd444a58458c0a95b84428fec02280654239223e0 SHA512 40777dabd25e6646c6673b33d9d296b66de7976fdf7454c9a7ae809a161ed992572b2232d94591731a7c8405875803172c6fafd09a5570f09e5eb119e23e7773
+DIST launchy-3.0.0.gem 27648 BLAKE2B 71fb8dadc37d9b25f861177c6579c9328786d16e64758d24ca297c8b6a773d307abd26b674c221b9a6318a2edd56e90d889fcf66cb1e3c279d85d045e9b1243d SHA512 6c4a8c320b4d149a3ab322f9cc03c73b7decb50d8dd2a8954bae27f5d265594fc6498af4a3d41a0693d232cbdce3dbbdf76cba3da2199a4bc85d8cda60e59187
diff --git a/dev-ruby/launchy/launchy-2.5.0.ebuild b/dev-ruby/launchy/launchy-2.5.0.ebuild
deleted file mode 100644
index 2859b5d9fcd9..000000000000
--- a/dev-ruby/launchy/launchy-2.5.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Helper class for launching cross-platform applications"
-HOMEPAGE="https://github.com/copiousfreetime/launchy"
-
-LICENSE="ISC"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/addressable-2.7"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.0:5 )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Ss]implecov/d" spec/spec_helper.rb || die
-
-	# Avoid tests depending on the current user's desktop environment.
-	sed -e '/returns NotFound if it cannot determine/askip "gentoo"' \
-		-i spec/detect/nix_desktop_environment_spec.rb || die
-	sed -e '/asssumes we open a local file if we have an exception/askip "gentoo"' \
-		-i spec/launchy_spec.rb || die
-	sed -e "/'darwin'/ s:^:#:" \
-		-i spec/applications/browser_spec.rb || die
-}
diff --git a/dev-ruby/launchy/launchy-2.5.2-r1.ebuild b/dev-ruby/launchy/launchy-2.5.2-r1.ebuild
new file mode 100644
index 000000000000..af9a65b0ed86
--- /dev/null
+++ b/dev-ruby/launchy/launchy-2.5.2-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Helper class for launching cross-platform applications"
+HOMEPAGE="https://github.com/copiousfreetime/launchy"
+
+LICENSE="ISC"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/addressable-2.8"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.0:5 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Ss]implecov/d" spec/spec_helper.rb || die
+
+	# Avoid tests depending on the current user's desktop environment.
+	sed -e '/returns NotFound if it cannot determine/askip "gentoo"' \
+		-i spec/detect/nix_desktop_environment_spec.rb || die
+	sed -e '/asssumes we open a local file if we have an exception/askip "gentoo"' \
+		-i spec/launchy_spec.rb || die
+	sed -e "/'darwin'/ s:^:#:" \
+		-i spec/applications/browser_spec.rb || die
+}
diff --git a/dev-ruby/launchy/launchy-2.5.2.ebuild b/dev-ruby/launchy/launchy-2.5.2.ebuild
new file mode 100644
index 000000000000..221221fef512
--- /dev/null
+++ b/dev-ruby/launchy/launchy-2.5.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Helper class for launching cross-platform applications"
+HOMEPAGE="https://github.com/copiousfreetime/launchy"
+
+LICENSE="ISC"
+
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/addressable-2.8"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.0:5 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Ss]implecov/d" spec/spec_helper.rb || die
+
+	# Avoid tests depending on the current user's desktop environment.
+	sed -e '/returns NotFound if it cannot determine/askip "gentoo"' \
+		-i spec/detect/nix_desktop_environment_spec.rb || die
+	sed -e '/asssumes we open a local file if we have an exception/askip "gentoo"' \
+		-i spec/launchy_spec.rb || die
+	sed -e "/'darwin'/ s:^:#:" \
+		-i spec/applications/browser_spec.rb || die
+}
diff --git a/dev-ruby/launchy/launchy-3.0.0.ebuild b/dev-ruby/launchy/launchy-3.0.0.ebuild
new file mode 100644
index 000000000000..87bd934b6635
--- /dev/null
+++ b/dev-ruby/launchy/launchy-3.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
+
+inherit ruby-fakegem virtualx
+
+DESCRIPTION="Helper class for launching cross-platform applications"
+HOMEPAGE="https://github.com/copiousfreetime/launchy"
+
+LICENSE="ISC"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.8
+	dev-ruby/childprocess:5
+	!<dev-ruby/launchy-2.5.2-r1
+"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.0:5 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Ss]implecov/d" spec/spec_helper.rb || die
+
+	# Avoid tests depending on the current user's desktop environment.
+	sed -e '/returns NotFound if it cannot determine/askip "gentoo"' \
+		-i spec/detect/nix_desktop_environment_spec.rb || die
+	sed -e '/asssumes we open a local file if we have an exception/askip "gentoo"' \
+		-i spec/launchy_spec.rb || die
+	sed -e "/'darwin'/ s:^:#:" \
+		-i spec/applications/browser_spec.rb || die
+}
+
+each_ruby_test() {
+	CI=true virtx each_fakegem_test
+}
diff --git a/dev-ruby/lemon/lemon-0.9.1-r1.ebuild b/dev-ruby/lemon/lemon-0.9.1-r1.ebuild
index 26bf227fe58e..65a2732648d8 100644
--- a/dev-ruby/lemon/lemon-0.9.1-r1.ebuild
+++ b/dev-ruby/lemon/lemon-0.9.1-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="yard"
@@ -16,13 +17,13 @@ HOMEPAGE="https://rubyworks.github.io/lemon/"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/qed )"
 ruby_add_rdepend "
 	dev-ruby/ae
 	>=dev-ruby/ansi-1.3
-	dev-ruby/rubytest"
+	dev-ruby/rubytest
+"
 
 each_ruby_test() {
 	${RUBY} -S qed || die 'tests failed'
diff --git a/dev-ruby/lemon/metadata.xml b/dev-ruby/lemon/metadata.xml
index 658c72b1920d..f3c13f7e202f 100644
--- a/dev-ruby/lemon/metadata.xml
+++ b/dev-ruby/lemon/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">rubyworks/lemon</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/leto/Manifest b/dev-ruby/leto/Manifest
new file mode 100644
index 000000000000..0fee1decd10d
--- /dev/null
+++ b/dev-ruby/leto/Manifest
@@ -0,0 +1 @@
+DIST leto-2.1.0.tar.gz 8874 BLAKE2B d7d39a13ad6ceed2d14d7e9c9a39c037115797ce00629a114bad832bc70397a90c3ba86bdc73789b0c0f852df059d15d026338324cd3de9f38a40bf4885d6a9a SHA512 c0bda72b32a96c83ad01281fd2a6e224f504aa45b030e4a203c2df0810bb6dd52dcb9c2633f2514d239a39b14b5c0428f912799eae756373dc0b15051be5e260
diff --git a/dev-ruby/leto/leto-2.1.0.ebuild b/dev-ruby/leto/leto-2.1.0.ebuild
new file mode 100644
index 000000000000..68ea6af43e47
--- /dev/null
+++ b/dev-ruby/leto/leto-2.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="leto.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Generic object traverser for Ruby"
+HOMEPAGE="https://github.com/jaynetics/leto"
+SRC_URI="https://github.com/jaynetics/leto/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's:_relative ": "./:' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/leto/metadata.xml b/dev-ruby/leto/metadata.xml
new file mode 100644
index 000000000000..8bb4371efdb1
--- /dev/null
+++ b/dev-ruby/leto/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jaynetics/leto</remote-id>
+    <remote-id type="rubygems">leto</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/letter_opener/Manifest b/dev-ruby/letter_opener/Manifest
index 899245c2e193..5e946ade9bc7 100644
--- a/dev-ruby/letter_opener/Manifest
+++ b/dev-ruby/letter_opener/Manifest
@@ -1,2 +1,3 @@
-DIST letter_opener-1.8.0.tar.gz 12661 BLAKE2B 49e2998b0d94fd89ddb72ad75e497bef9fe5ce5876897ce05925e6b3b37732c61350d2228f9c33e6fce555af301142dddb35f49f1f215b240aba3495713fc6f4 SHA512 d1985d5b67c581c976db3fb9199e5207d2a12609f49011d91a20fd71bd8b6f8e5b35b0cdbe7592ad7df8effa7de14f70d378e1f9323f5b6113b397c1992b75c5
+DIST letter_opener-1.10.0.tar.gz 12789 BLAKE2B e9c5294f4bce2998b431d5547bf3e52ca219ad8da189f3d36c447465e6730ed5647dacde50e825f67dcb2376256698ec2d571f6470f35d9acec6612859d72ddf SHA512 5675150164c144273d73524c1c4acf62fecaf1495bbdfe5825497080569a2a51d8846c99d7270017c9f540da23fdc6e401626f30c368c8e57c40ee384363db15
 DIST letter_opener-1.8.1.tar.gz 12680 BLAKE2B 3204a5f6a33f722f255f126597655f6209d87764ff9b92ac770a35342906b9d192a62aade992709aaa55baa03046a342f48c4671d3a47a5fd5350bc2e7e7d0e1 SHA512 ce360bcb9f8c07e1319f74187ff85ef799d0a3387f0081ffe3cff2e8b52a9445c22b39fed4b729aee23fb67121c5e47b280ef502f95940aacbb6be31533185be
+DIST letter_opener-1.9.0.tar.gz 12776 BLAKE2B f9ad3358d65e4943f4bfa7d19ab870277d17cbe0ed99f203a262b5070b27386ce709d02e99b9f65ec61715791a599e93c020cfe06033081a2a16e742059b21e2 SHA512 55bed88be20280757347e38cfacc031b178f65a490f26caab5a981b186df8cff1a68dc154bddf091817e415a4760ed2d6487c3453d0df93c406e13924a5715eb
diff --git a/dev-ruby/letter_opener/letter_opener-1.10.0.ebuild b/dev-ruby/letter_opener/letter_opener-1.10.0.ebuild
new file mode 100644
index 000000000000..7e076a2e7904
--- /dev/null
+++ b/dev-ruby/letter_opener/letter_opener-1.10.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Preview mail in the browser instead of sending"
+HOMEPAGE="https://github.com/ryanb/letter_opener"
+SRC_URI="https://github.com/ryanb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/mail-2.6:* )"
+ruby_add_rdepend "|| ( dev-ruby/launchy:3 >=dev-ruby/launchy-2.2:0 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile spec/spec_helper.rb || die
+	sed -i -e '4irequire "letter_opener"' spec/spec_helper.rb || die
+
+	# Avoid tests that require some kind of browser
+	sed -i -e '/opens email/askip "requires installed browser"' spec/letter_opener/delivery_method_spec.rb || die
+}
diff --git a/dev-ruby/letter_opener/letter_opener-1.8.0.ebuild b/dev-ruby/letter_opener/letter_opener-1.8.0.ebuild
deleted file mode 100644
index b5e49dfba9c7..000000000000
--- a/dev-ruby/letter_opener/letter_opener-1.8.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Preview mail in the browser instead of sending"
-HOMEPAGE="https://github.com/ryanb/letter_opener"
-SRC_URI="https://github.com/ryanb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/mail-2.6:* )"
-ruby_add_rdepend ">=dev-ruby/launchy-2.2:0"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile spec/spec_helper.rb || die
-	sed -i -e '4irequire "letter_opener"' spec/spec_helper.rb || die
-
-	# Avoid tests that require some kind of browser
-	sed -i -e '/opens email/askip "requires installed browser"' spec/letter_opener/delivery_method_spec.rb || die
-}
diff --git a/dev-ruby/letter_opener/letter_opener-1.8.1.ebuild b/dev-ruby/letter_opener/letter_opener-1.8.1.ebuild
index b5e49dfba9c7..8c45e7a6ed57 100644
--- a/dev-ruby/letter_opener/letter_opener-1.8.1.ebuild
+++ b/dev-ruby/letter_opener/letter_opener-1.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/letter_opener/letter_opener-1.9.0.ebuild b/dev-ruby/letter_opener/letter_opener-1.9.0.ebuild
new file mode 100644
index 000000000000..c74236c24c85
--- /dev/null
+++ b/dev-ruby/letter_opener/letter_opener-1.9.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Preview mail in the browser instead of sending"
+HOMEPAGE="https://github.com/ryanb/letter_opener"
+SRC_URI="https://github.com/ryanb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/mail-2.6:* )"
+ruby_add_rdepend ">=dev-ruby/launchy-2.2:0"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile spec/spec_helper.rb || die
+	sed -i -e '4irequire "letter_opener"' spec/spec_helper.rb || die
+
+	# Avoid tests that require some kind of browser
+	sed -i -e '/opens email/askip "requires installed browser"' spec/letter_opener/delivery_method_spec.rb || die
+}
diff --git a/dev-ruby/levenshtein/levenshtein-0.2.2-r3.ebuild b/dev-ruby/levenshtein/levenshtein-0.2.2-r3.ebuild
index 1799a4098688..b88ae985303a 100644
--- a/dev-ruby/levenshtein/levenshtein-0.2.2-r3.ebuild
+++ b/dev-ruby/levenshtein/levenshtein-0.2.2-r3.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/libusb/Manifest b/dev-ruby/libusb/Manifest
index e92d2a89f110..bb34cbccd709 100644
--- a/dev-ruby/libusb/Manifest
+++ b/dev-ruby/libusb/Manifest
@@ -1 +1,3 @@
 DIST libusb-0.6.4.gem 762368 BLAKE2B daca8049b82cb56fb8cac350f6953ce292c74370bf468497773b34b6017eef9c0252daf2a0213e660db99120a53193ea67943bb1d851ae1ee723ea84dbe289e0 SHA512 433425f9cc2600615a3e4baec962ff0901e9c0eae7a77c410d099f22742995b23bf9c143797b393843b3de26b8336263cd5b3d3d1cdcd8f91266d90201a6a6de
+DIST libusb-0.7.0.gem 819712 BLAKE2B a8d85731b3cff2a5ddf9391a01c54250f11b9933e7ea429031cf8879e22ee79c8c3c8669735b73b7e32ca56c77245588511df1d486a17da67215af2d052082aa SHA512 cd17e40b34bf5015e43435f8f510ce63bc2434c77680dcc8079f123ec4bb12b22b92ae59a7c8646747e5be7f6d14bf3f3a1302549e686ab3735966987311481a
+DIST libusb-0.7.1.gem 815104 BLAKE2B c72bac1f43b9cc70e9d6e2c6e48b9e4fc95f62117d26e0925f5bc5d49fca88f6610254dd0c5ed11368397e2149706f78f9919c26f01c23fa84b97fc07edcd14d SHA512 eed881ea9658911aba93dfd5c72d74ad7e9fc333d890dff872ec5ee3e8262ccbdf0e19f8f4c918d6b67438a72cde51397c652d2b9215dce4f0725cd5c8031ff6
diff --git a/dev-ruby/libusb/libusb-0.6.4-r2.ebuild b/dev-ruby/libusb/libusb-0.6.4-r2.ebuild
new file mode 100644
index 000000000000..e46f91d5705a
--- /dev/null
+++ b/dev-ruby/libusb/libusb-0.6.4-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="binding that gives Ruby programmers access to arbitrary USB devices"
+HOMEPAGE="https://github.com/larskanis/libusb"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND+="virtual/libusb:1"
+RDEPEND+="${DEPEND}"
+
+ruby_add_rdepend "dev-ruby/ffi:0"
+ruby_add_bdepend "test? ( dev-ruby/eventmachine )"
+
+all_ruby_prepare() {
+	sed -e '/mini_portile2/d' \
+		-e 's/git ls-files --/find/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid tests that try to open devices or depend on specific hardware
+	rm -f test/test_libusb_{bos,descriptors}.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -I.:lib -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	# This gem includes an extension that does not actually do anything
+	# when using the system libusb, but newer rubygems versions still
+	# require the marker to be present.
+	ruby_fakegem_extensions_installed
+}
diff --git a/dev-ruby/libusb/libusb-0.6.4.ebuild b/dev-ruby/libusb/libusb-0.6.4.ebuild
deleted file mode 100644
index 92f4a629ea74..000000000000
--- a/dev-ruby/libusb/libusb-0.6.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="binding that gives Ruby programmers access to arbitrary USB devices"
-HOMEPAGE="https://github.com/larskanis/libusb"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND+="virtual/libusb:1"
-RDEPEND+="${DEPEND}"
-
-ruby_add_rdepend "dev-ruby/ffi:0"
-
-all_ruby_prepare() {
-	sed -i '/mini_portile2/d' ${PN}.gemspec || die
-
-	# Avoid tests that try to open devices
-	rm -f test/test_libusb_bos.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -I.:lib -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/libusb/libusb-0.7.0.ebuild b/dev-ruby/libusb/libusb-0.7.0.ebuild
new file mode 100644
index 000000000000..d86ffb6892be
--- /dev/null
+++ b/dev-ruby/libusb/libusb-0.7.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="binding that gives Ruby programmers access to arbitrary USB devices"
+HOMEPAGE="https://github.com/larskanis/libusb"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND+=">=dev-libs/libusb-1.0.27:1"
+RDEPEND+="${DEPEND}"
+
+ruby_add_rdepend "dev-ruby/ffi:0"
+ruby_add_bdepend "test? ( dev-ruby/eventmachine )"
+
+all_ruby_prepare() {
+	sed -e '/mini_portile2/d' \
+		-e 's/git ls-files --/find/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid tests that try to open devices or depend on specific hardware
+	rm -f test/test_libusb_{bos,bulk_stream_transfer,descriptors}.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -I.:lib -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	# This gem includes an extension that does not actually do anything
+	# when using the system libusb, but newer rubygems versions still
+	# require the marker to be present.
+	ruby_fakegem_extensions_installed
+}
diff --git a/dev-ruby/libusb/libusb-0.7.1.ebuild b/dev-ruby/libusb/libusb-0.7.1.ebuild
new file mode 100644
index 000000000000..d86ffb6892be
--- /dev/null
+++ b/dev-ruby/libusb/libusb-0.7.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="binding that gives Ruby programmers access to arbitrary USB devices"
+HOMEPAGE="https://github.com/larskanis/libusb"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND+=">=dev-libs/libusb-1.0.27:1"
+RDEPEND+="${DEPEND}"
+
+ruby_add_rdepend "dev-ruby/ffi:0"
+ruby_add_bdepend "test? ( dev-ruby/eventmachine )"
+
+all_ruby_prepare() {
+	sed -e '/mini_portile2/d' \
+		-e 's/git ls-files --/find/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid tests that try to open devices or depend on specific hardware
+	rm -f test/test_libusb_{bos,bulk_stream_transfer,descriptors}.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -I.:lib -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	# This gem includes an extension that does not actually do anything
+	# when using the system libusb, but newer rubygems versions still
+	# require the marker to be present.
+	ruby_fakegem_extensions_installed
+}
diff --git a/dev-ruby/libusb/metadata.xml b/dev-ruby/libusb/metadata.xml
index 0d8083ebbde2..1e7c1b5e79e2 100644
--- a/dev-ruby/libusb/metadata.xml
+++ b/dev-ruby/libusb/metadata.xml
@@ -5,6 +5,10 @@
     <email>zerochaos@gentoo.org</email>
     <name>Rick Farina</name>
   </maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">larskanis/libusb</remote-id>
   </upstream>
diff --git a/dev-ruby/liquid-c/Manifest b/dev-ruby/liquid-c/Manifest
index 964f88b07993..2dd6f04c407b 100644
--- a/dev-ruby/liquid-c/Manifest
+++ b/dev-ruby/liquid-c/Manifest
@@ -1,2 +1,2 @@
-DIST liquid-c-4.0.0.gem 15872 BLAKE2B 8083ae622da685db2aa557ffff0927a900a51c92227ea2523dcf4c408ff4df6f417cbf7fe019383220c3fe580d53f40d496787d8f7328a1e42c3f17a435eebe6 SHA512 a9f3618a7286c6417e9d22cad8c0716f84f33c43e9b12708711f9c4bdebb94a30e408b3dca99cdfe0a7c5b5e5b39ffa79e978ef6b44e5359975e3d74106932be
 DIST liquid-c-4.1.0.gem 48640 BLAKE2B 4fe526b48500349526ebeb2430f87fbb8ccea2f47dcfd32f16e3db803425180955c7ae81a707628ca377fd534882d71e06aece7d4119c16cc1386d4b3b222447 SHA512 72600a5b7962b91d63350adc9f3f355255ad9b9f93b6607064a896e1e3d109a9da897f442f9fc15a7a8c2c26ccb4674e491def9e7531ef9577b790ca9a3eb884
+DIST liquid-c-4.2.0.gem 51200 BLAKE2B 16c01f099263dc415cf185114c0ae8a4953fd2a599897a3ca69e2c220643e3599e908d426bf2ffc1cea8dbfe42d640e8da60282a0b39e0df5611467afab783b1 SHA512 4d349903e507eee30be7d04d2529628fc81a2091b5ac1f15094e2769d93b337769009f38e373378fac07ef32e8bc6f53a721984411ef6f6596363b77d96789d3
diff --git a/dev-ruby/liquid-c/liquid-c-4.0.0-r1.ebuild b/dev-ruby/liquid-c/liquid-c-4.0.0-r1.ebuild
deleted file mode 100644
index 544e5d002679..000000000000
--- a/dev-ruby/liquid-c/liquid-c-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-MY_PN=${PN/-/_}
-RUBY_FAKEGEM_EXTENSIONS=(ext/${MY_PN}/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="Liquid performance extension in C"
-HOMEPAGE="https://github.com/Shopify/liquid-c"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/liquid-3.0.0:*"
-
-all_ruby_prepare() {
-	sed -i -e "s/-Werror//" ext/${MY_PN}/extconf.rb || die
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-}
diff --git a/dev-ruby/liquid-c/liquid-c-4.1.0.ebuild b/dev-ruby/liquid-c/liquid-c-4.1.0.ebuild
index 9aa91c95add5..0bd66d04ffd9 100644
--- a/dev-ruby/liquid-c/liquid-c-4.1.0.ebuild
+++ b/dev-ruby/liquid-c/liquid-c-4.1.0.ebuild
@@ -1,10 +1,10 @@
-# 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="ruby31 ruby32 ruby33"
 
-RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_TEST="test:unit"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
 MY_PN=${PN/-/_}
@@ -24,5 +24,39 @@ ruby_add_rdepend ">=dev-ruby/liquid-5.0.1:*"
 
 all_ruby_prepare() {
 	sed -i -e "s/-Werror//" ext/${MY_PN}/extconf.rb || die
-	sed -i -e "/[Bb]undler/d" Rakefile || die
+
+	sed -i \
+		-e "/[Bb]undler/d" \
+		-e "/memcheck/Id" \
+		-e '/extensiontask/ s:^:#:' \
+		Rakefile || die
+	sed -i -e 's/unit: :compile/:unit/' rakelib/unit_test.rake || die
+	rm -r rakelib/compile.rake || die
+
+	sed -i -e 's/MiniTest/Minitest/' test/unit/*_test.rb || die
+
+	# ruby_memcheck is a gem just for running w/ valgrind.
+	# We don't run tests in ebuilds with Valgrind because it's
+	# non-portable and sometimes flaky under sandbox.
+	rm rakelib/integration_test.rake || die
+	sed -i -e '/memcheck/Id' rakelib/unit_test.rake || die
+}
+
+each_ruby_test() {
+	# Backup the original extension and hide it away
+	# The tests won't build if they detect an already-built ext
+	mkdir -p "${T}"/${RUBY}.orig || die
+	mv ext "${T}"/${RUBY}.orig/ext || die
+	cp -r "${WORKDIR}"/all/${P}/ext ext || die
+
+	nonfatal each_fakegem_test --trace || failed_tests=1
+
+	# Always restore the original extension we built, even if
+	# tests failed, as FEATURES=test-fail-continue may be enabled.
+	rm -rf ext || die
+	mv "${T}"/${RUBY}.orig/ext ext || die
+
+	if [[ ${failed_tests} == 1 ]] ; then
+		die "Tests failed with ${RUBY}!"
+	fi
 }
diff --git a/dev-ruby/liquid-c/liquid-c-4.2.0.ebuild b/dev-ruby/liquid-c/liquid-c-4.2.0.ebuild
new file mode 100644
index 000000000000..7e785cccf7ee
--- /dev/null
+++ b/dev-ruby/liquid-c/liquid-c-4.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST="test:unit"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+MY_PN=${PN/-/_}
+RUBY_FAKEGEM_EXTENSIONS=(ext/${MY_PN}/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Liquid performance extension in C"
+HOMEPAGE="https://github.com/Shopify/liquid-c"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64"
+
+ruby_add_rdepend ">=dev-ruby/liquid-5.0.1:*"
+
+all_ruby_prepare() {
+	sed -i -e "s/-Werror//" ext/${MY_PN}/extconf.rb || die
+
+	sed -i \
+		-e "/[Bb]undler/d" \
+		-e "/memcheck/Id" \
+		-e '/extensiontask/ s:^:#:' \
+		Rakefile || die
+	sed -i -e 's/unit: :compile/:unit/' rakelib/unit_test.rake || die
+	rm -r rakelib/compile.rake || die
+
+	sed -i -e 's/MiniTest/Minitest/' test/unit/*_test.rb || die
+
+	# ruby_memcheck is a gem just for running w/ valgrind.
+	# We don't run tests in ebuilds with Valgrind because it's
+	# non-portable and sometimes flaky under sandbox.
+	rm rakelib/integration_test.rake || die
+	sed -i -e '/memcheck/Id' rakelib/unit_test.rake || die
+}
+
+each_ruby_test() {
+	# Backup the original extension and hide it away
+	# The tests won't build if they detect an already-built ext
+	mkdir -p "${T}"/${RUBY}.orig || die
+	mv ext "${T}"/${RUBY}.orig/ext || die
+	cp -r "${WORKDIR}"/all/${P}/ext ext || die
+
+	nonfatal each_fakegem_test --trace || failed_tests=1
+
+	# Always restore the original extension we built, even if
+	# tests failed, as FEATURES=test-fail-continue may be enabled.
+	rm -rf ext || die
+	mv "${T}"/${RUBY}.orig/ext ext || die
+
+	if [[ ${failed_tests} == 1 ]] ; then
+		die "Tests failed with ${RUBY}!"
+	fi
+}
diff --git a/dev-ruby/liquid/Manifest b/dev-ruby/liquid/Manifest
index 9296d70ace29..5a4897c0df9d 100644
--- a/dev-ruby/liquid/Manifest
+++ b/dev-ruby/liquid/Manifest
@@ -1,5 +1,3 @@
 DIST liquid-4.0.3.tar.gz 102242 BLAKE2B 4a025fd8501e237f7619ed989e185a6c55a234577c99423857a826b616c40625c1fd205d998a368488306a88c0b84fc3d3ac59bd01c1231055aa9f60a3d14338 SHA512 5aed3b98fa486a00744e0225f7a3b8004be8ded1e3347f9118fd062684fe33b725b84d1f88bdd5e881399e6efa60b4aa32f57cf10f4583aa27ec8c8288b52bf9
-DIST liquid-5.0.1.tar.gz 115523 BLAKE2B 52194481aef296785812a76979ee215e5adffbb73c4dd80de8f8dfb6995757d22a698a6acb950281f69cec32c2c06ba51fe273ba54c7454f308f5547faa9e1cf SHA512 e82fe4b67c338ef2e13652d2c5ba5d52e968c368aff724516a8ed2c157d149441fe73c66be866c0283fbd3472aeb83fec710f77afa1a92dca3206b5c8059ccf4
-DIST liquid-5.1.0.tar.gz 117155 BLAKE2B 93c609e71773b3e002134bb6caf75b43f57428aa71a9181d0a986d920490dc7246fe89cb48d54e6ac880cb28b70fd9cdf8e1a81c7df9061803880eee82ff3cf2 SHA512 27ff4392ffcd05cd11c3f104b0ee875e6043dcf057ae06fe7037dcaef528b01c3aba31df65dc4d7b41f89afeee322d3045d09fe7d1e4ec9dafe52a17b6cad672
-DIST liquid-5.2.0.tar.gz 117804 BLAKE2B bf9027265ea9e31cdb029032384ad7078f28f0aebad21538c8271d7b44aade95bb2be642443b84a0ab35907a81b30dacdfc51c0593226eb9e37b85738c4bb9d8 SHA512 69297fb5cc3ea86b47c24a0ae1f3f7ae7d4e377b0909531362fdda298c5dbc2fd4a8666baf5b462cef04278b1ed6758312f93ebb5d5b266fcbbdbc82a8288047
-DIST liquid-5.3.0.tar.gz 118704 BLAKE2B 3c7670717ea70f971a80a932e8aef24670017e9fceb9164403035a6137b4ba8a3dd77b396037fd52db71e4989a74d89b2ed63150290ba7326d35d0970a014b39 SHA512 bf295a882535b6f70f36adc62dc207ec07222e201c16adf2b56be9decf63f4f262b4e8cd31539eedf4364d6394b0136091eefcf26ee705987e82c2bf1ccf2739
+DIST liquid-5.4.0.tar.gz 123661 BLAKE2B 96fbd0d92408e1deecfd198de4ab59287820e4f8d6e8cfeb080163781c82421a1fe5286354136a787db244c3821fd3e470d2ecdcddbde3344aa71be79799894d SHA512 45b394aa945206b200a2aa30e2e0b0f0937e7e59bd213f45f0484f2f6f3d68fca96f93a7ae64ac05249439048842b53e20a58d73be88470ed94cf40cc65c4cfb
+DIST liquid-5.5.0.tar.gz 129799 BLAKE2B d46c93ca0d968b080d1bda363badb629499fa3db6aeec0c73dc7c60ba82e70f478cf136ceddb3d600dae4e2645e9a6d61521695515f0cf5253c99d3e006bce98 SHA512 6afa798052371356100a22936ba716e285302080111e833ba48927bc63b358e6d6d8fe027ad6410d2171bef59f71e30f7ddd414bda3e45c91a0e2e459aa4919e
diff --git a/dev-ruby/liquid/files/liquid-4.0.3-ruby30.patch b/dev-ruby/liquid/files/liquid-4.0.3-ruby30.patch
new file mode 100644
index 000000000000..a25f4e217929
--- /dev/null
+++ b/dev-ruby/liquid/files/liquid-4.0.3-ruby30.patch
@@ -0,0 +1,23 @@
+From abfcec9a57543d9e1bdda7dab195607f8574d8b4 Mon Sep 17 00:00:00 2001
+From: Dylan Thacker-Smith <Dylan.Smith@shopify.com>
+Date: Tue, 31 Mar 2020 10:19:25 -0400
+Subject: [PATCH] Fix ParseTreeVisitorTest for ruby 3 compatibility
+
+(cherry picked from commit 81149344a5ba53b30e8ab7d77d605dc484a0a3ff)
+---
+ test/integration/parse_tree_visitor_test.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/integration/parse_tree_visitor_test.rb b/test/integration/parse_tree_visitor_test.rb
+index 6ad6a2d00..933dbc3b0 100644
+--- a/test/integration/parse_tree_visitor_test.rb
++++ b/test/integration/parse_tree_visitor_test.rb
+@@ -238,7 +238,7 @@ def test_preserve_tree_structure
+   def traversal(template)
+     ParseTreeVisitor
+       .for(Template.parse(template).root)
+-      .add_callback_for(VariableLookup, &:name)
++      .add_callback_for(VariableLookup) { |node| node.name } # rubocop:disable Style/SymbolProc
+   end
+ 
+   def visit(template)
diff --git a/dev-ruby/liquid/liquid-4.0.3-r1.ebuild b/dev-ruby/liquid/liquid-4.0.3-r1.ebuild
new file mode 100644
index 000000000000..639c5768b21c
--- /dev/null
+++ b/dev-ruby/liquid/liquid-4.0.3-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+RUBY_FAKEGEM_GEMSPEC="liquid.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/Shopify/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Template engine for Ruby"
+HOMEPAGE="https://shopify.github.io/liquid/"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-ruby30.patch" )
+
+ruby_add_bdepend "test? ( dev-ruby/minitest
+	dev-ruby/spy )"
+
+all_ruby_prepare() {
+	# liquid-c is not packaged
+	sed -i -e '/LIQUID-C/ s:^:#:' Rakefile || die
+
+	# Avoid test requiring unpackaged stackprof
+	sed -i -e '/assert_no_object_allocations/askip "unpackaged stackprof"' test/unit/context_unit_test.rb || die
+
+	# Avoid tests using taint since this is no longer supported in ruby 2.7+
+	sed -i -e '/test.*tainted_attr/askip "taint is no longer supported"' test/integration/drop_test.rb || die
+}
diff --git a/dev-ruby/liquid/liquid-4.0.3.ebuild b/dev-ruby/liquid/liquid-4.0.3.ebuild
deleted file mode 100644
index 9dbef8117cb5..000000000000
--- a/dev-ruby/liquid/liquid-4.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/Shopify/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Template engine for Ruby"
-HOMEPAGE="https://shopify.github.io/liquid/"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest
-	dev-ruby/spy )"
-
-all_ruby_prepare() {
-	# liquid-c is not packaged
-	sed -i -e '/LIQUID-C/ s:^:#:' Rakefile || die
-
-	# Avoid test requiring unpackaged stackprof
-	sed -i -e '/assert_no_object_allocations/askip "unpackaged stackprof"' test/unit/context_unit_test.rb
-}
diff --git a/dev-ruby/liquid/liquid-5.0.1.ebuild b/dev-ruby/liquid/liquid-5.0.1.ebuild
deleted file mode 100644
index 9b9aa14a586f..000000000000
--- a/dev-ruby/liquid/liquid-5.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="liquid.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/Shopify/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Template engine for Ruby"
-HOMEPAGE="https://shopify.github.io/liquid/"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# liquid-c is not packaged
-	sed -i -e '/LIQUID_C/ s:^:#:' Rakefile || die
-
-	# Avoid test requiring unpackaged stackprof
-	sed -i -e '/assert_no_object_allocations/askip "unpackaged stackprof"' test/integration/context_test.rb || die
-}
diff --git a/dev-ruby/liquid/liquid-5.1.0.ebuild b/dev-ruby/liquid/liquid-5.1.0.ebuild
deleted file mode 100644
index 38343a72cfc3..000000000000
--- a/dev-ruby/liquid/liquid-5.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="liquid.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/Shopify/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Template engine for Ruby"
-HOMEPAGE="https://shopify.github.io/liquid/"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# liquid-c is not packaged
-	sed -i -e '/LIQUID_C/ s:^:#:' Rakefile || die
-
-	# Avoid test requiring unpackaged stackprof
-	sed -i -e '/assert_no_object_allocations/askip "unpackaged stackprof"' test/integration/context_test.rb || die
-}
diff --git a/dev-ruby/liquid/liquid-5.2.0.ebuild b/dev-ruby/liquid/liquid-5.2.0.ebuild
deleted file mode 100644
index dc56f982f6bc..000000000000
--- a/dev-ruby/liquid/liquid-5.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="liquid.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/Shopify/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Template engine for Ruby"
-HOMEPAGE="https://shopify.github.io/liquid/"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# liquid-c is not packaged
-	sed -i -e '/LIQUID_C/ s:^:#:' Rakefile || die
-
-	# Avoid test requiring unpackaged stackprof
-	sed -i -e '/assert_no_object_allocations/askip "unpackaged stackprof"' test/integration/context_test.rb || die
-}
diff --git a/dev-ruby/liquid/liquid-5.3.0.ebuild b/dev-ruby/liquid/liquid-5.3.0.ebuild
deleted file mode 100644
index dc56f982f6bc..000000000000
--- a/dev-ruby/liquid/liquid-5.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="liquid.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/Shopify/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Template engine for Ruby"
-HOMEPAGE="https://shopify.github.io/liquid/"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# liquid-c is not packaged
-	sed -i -e '/LIQUID_C/ s:^:#:' Rakefile || die
-
-	# Avoid test requiring unpackaged stackprof
-	sed -i -e '/assert_no_object_allocations/askip "unpackaged stackprof"' test/integration/context_test.rb || die
-}
diff --git a/dev-ruby/liquid/liquid-5.4.0.ebuild b/dev-ruby/liquid/liquid-5.4.0.ebuild
new file mode 100644
index 000000000000..ad5ef185e795
--- /dev/null
+++ b/dev-ruby/liquid/liquid-5.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="liquid.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/Shopify/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Template engine for Ruby"
+HOMEPAGE="https://shopify.github.io/liquid/"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	# liquid-c is not packaged
+	sed -i -e '/LIQUID_C/ s:^:#:' Rakefile || die
+
+	# Avoid test requiring unpackaged stackprof
+	sed -i -e '/assert_no_object_allocations/askip "unpackaged stackprof"' test/integration/context_test.rb || die
+}
diff --git a/dev-ruby/liquid/liquid-5.5.0.ebuild b/dev-ruby/liquid/liquid-5.5.0.ebuild
new file mode 100644
index 000000000000..5db3f91925e7
--- /dev/null
+++ b/dev-ruby/liquid/liquid-5.5.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="liquid.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/Shopify/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Template engine for Ruby"
+HOMEPAGE="https://shopify.github.io/liquid/"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	# liquid-c is not packaged
+	sed -i -e '/LIQUID_C/ s:^:#:' Rakefile || die
+
+	# Avoid test requiring unpackaged stackprof
+	sed -i -e '/assert_no_object_allocations/askip "unpackaged stackprof"' test/integration/context_test.rb || die
+}
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index 82055a440bc3..6ac01a9a06df 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -1,5 +1,2 @@
-DIST listen-1.3.1-git.tgz 35521 BLAKE2B 6b93daff2b3ba221d0c0f196c67353963e983610dd9deb3409c8ad270f7221d50e9eefee826c16c51ac0361cf7f5da727db216b1bd92a02077b0bee580fa368c SHA512 4676d030a3e676249a221cf4a136ce69651009ce5855821924be184460e404e4f33026627c9d524156a89344c826b48a690a249f1059493d7d214b922381bdd0
-DIST listen-3.5.1.tar.gz 56236 BLAKE2B e74186532d5aa9fa7488d0734867d7ec7218036b10769667b8818d057af4d8a973204ce68f687fa508d5d2ed879b0ba6287c3b93fb05eaedfc63a8dc251523b9 SHA512 d7475e295b5123c5a8f166891e866de60379f28d61ab0610774bdf499bcf0859807ea2abb31fd6e708c106f926282376aec94ce268e6709884a63852e820ae74
-DIST listen-3.6.0.tar.gz 56134 BLAKE2B 6826426c5e46fa10145148d545ebdda278af080c4ddda8b055189a9aec91c26302c991ba69199d2616ae171ac85cb0ec6cef657980e6b984bc09513adabf3d16 SHA512 32b93ee98333657f8dfcaa8e5c9aa291d5413ddfadac3c3ff34edd2a2273e119922dee71825d6b06a6e86951deb96a676a8b9cdd98431fd21c55557a154702ee
-DIST listen-3.7.0.tar.gz 56192 BLAKE2B eb7d154dc0e608d43b6751db630f0b99e89fbfefd61e718aa99cc6a03c47e1a4aaaa55d42f1ae75351f4397c60902dcc78d8c9e8250899f075c351a7fd781069 SHA512 86942d60cc57a0a960ba813c3b90ca33c47513bb609c1861c792ce2b9b37371998859c0d6e1cd979d4a3427319d3a75454dfffa068ca1dec22d38497add1335c
-DIST listen-3.7.1.tar.gz 56280 BLAKE2B 3e0409ca5d636ddde8493e6cab342ca724c98f5ceb4f4abd306d1ec081095387d7d5d6da48d05f47ee50e23475f5685bd23ab7c2592b5697de6bd8292f30c174 SHA512 f082e177b14f86c0906af3760f2da81b1574aee5931ef308c640c537bf0e70488b9854c7f1515545ddee76d4a203734b47a9a3d501955214562cec7acc590e1e
+DIST listen-3.8.0.tar.gz 56514 BLAKE2B 5b316487defe902f755bc53e40052289d03052d3fc54cf2431bb833204ea0fdee9dffa26e2d6d78267f96214a6d1ca3f097c175ec6ccf9cd3037eff64abd3169 SHA512 9f1cb065f3db96d3d416ba255b327a10dfdc6cd72f1509bd4fa95a157966bc436282fd37cf16df645ede1594e8eda62c7cc0934936db9d118d39a55521e7c35e
+DIST listen-3.9.0.tar.gz 57903 BLAKE2B 819ba309ab78179590946eca5cceb0bd8a82411f3b8af63c25a3735a7c33b1560b36d48fd0f1d4617fa84927adff0ff74cffa9682835c49089f545af68cabefb SHA512 abec4720db6331da5b3d7ea998a9e2cc77e55ad4919b473c0172f6e852dcb376671379b79cad88fb5a850cd2ba2178d36a3bd2534cd81408186805497d58238f
diff --git a/dev-ruby/listen/listen-1.3.1-r4.ebuild b/dev-ruby/listen/listen-1.3.1-r4.ebuild
deleted file mode 100644
index bb87c7b3ba7a..000000000000
--- a/dev-ruby/listen/listen-1.3.1-r4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Listens to file modifications and notifies you about the changes"
-HOMEPAGE="https://github.com/guard/listen"
-SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x64-macos"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.0"
-
-all_ruby_prepare() {
-	sed -i -e '/[Cc]overalls/d' spec/spec_helper.rb || die
-	# Drop failing test
-	sed -i -e '/#85/,+17d' spec/listen/directory_record_spec.rb || die
-
-	# Drop dependencies for file system events not available on Gentoo.
-	sed -i -e '/\(fsevent\|kqueue\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/listen/listen-3.5.1.ebuild b/dev-ruby/listen/listen-3.5.1.ebuild
deleted file mode 100644
index 36ff3d28e8e4..000000000000
--- a/dev-ruby/listen/listen-3.5.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Listens to file modifications and notifies you about the changes"
-HOMEPAGE="https://github.com/guard/listen"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
-IUSE="test"
-
-# Block on other packages trying to install a /usr/bin/listen
-RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
-
-ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
-
-ruby_add_bdepend "test? ( dev-ruby/thor )"
-
-all_ruby_prepare() {
-	rm -f Gemfile || die
-	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
-	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
-	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
-}
-
-each_ruby_prepare() {
-	mkdir spec/.fixtures || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	rm -rf spec/.fixtures || die
-}
diff --git a/dev-ruby/listen/listen-3.6.0.ebuild b/dev-ruby/listen/listen-3.6.0.ebuild
deleted file mode 100644
index 5d10bd2e1352..000000000000
--- a/dev-ruby/listen/listen-3.6.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Listens to file modifications and notifies you about the changes"
-HOMEPAGE="https://github.com/guard/listen"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-# Block on other packages trying to install a /usr/bin/listen
-RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
-
-ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
-
-ruby_add_bdepend "test? ( dev-ruby/thor )"
-
-all_ruby_prepare() {
-	rm -f Gemfile || die
-	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
-	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
-	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
-}
-
-each_ruby_prepare() {
-	mkdir spec/.fixtures || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	rm -rf spec/.fixtures || die
-}
diff --git a/dev-ruby/listen/listen-3.7.0.ebuild b/dev-ruby/listen/listen-3.7.0.ebuild
deleted file mode 100644
index 992a285023e8..000000000000
--- a/dev-ruby/listen/listen-3.7.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Listens to file modifications and notifies you about the changes"
-HOMEPAGE="https://github.com/guard/listen"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test"
-
-# Block on other packages trying to install a /usr/bin/listen
-RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
-
-ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
-
-ruby_add_bdepend "test? ( dev-ruby/thor )"
-
-all_ruby_prepare() {
-	rm -f Gemfile || die
-	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
-	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
-	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
-}
-
-each_ruby_prepare() {
-	mkdir spec/.fixtures || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	rm -rf spec/.fixtures || die
-}
diff --git a/dev-ruby/listen/listen-3.7.1.ebuild b/dev-ruby/listen/listen-3.7.1.ebuild
deleted file mode 100644
index d806ca15efe2..000000000000
--- a/dev-ruby/listen/listen-3.7.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Listens to file modifications and notifies you about the changes"
-HOMEPAGE="https://github.com/guard/listen"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test"
-
-# Block on other packages trying to install a /usr/bin/listen
-RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
-
-ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
-
-ruby_add_bdepend "test? ( dev-ruby/thor )"
-
-all_ruby_prepare() {
-	rm -f Gemfile || die
-	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
-	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
-	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
-}
-
-each_ruby_prepare() {
-	mkdir spec/.fixtures || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	rm -rf spec/.fixtures || die
-}
diff --git a/dev-ruby/listen/listen-3.8.0.ebuild b/dev-ruby/listen/listen-3.8.0.ebuild
new file mode 100644
index 000000000000..edde4af7f224
--- /dev/null
+++ b/dev-ruby/listen/listen-3.8.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Listens to file modifications and notifies you about the changes"
+HOMEPAGE="https://github.com/guard/listen"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+IUSE="test"
+
+# Block on other packages trying to install a /usr/bin/listen
+RDEPEND+="!!media-radio/ax25-apps"
+
+ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
+
+ruby_add_bdepend "test? ( dev-ruby/thor )"
+
+all_ruby_prepare() {
+	rm -f Gemfile || die
+	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
+	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
+	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
+}
+
+each_ruby_prepare() {
+	mkdir spec/.fixtures || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	rm -rf spec/.fixtures || die
+}
diff --git a/dev-ruby/listen/listen-3.9.0.ebuild b/dev-ruby/listen/listen-3.9.0.ebuild
new file mode 100644
index 000000000000..3f7e818cef6c
--- /dev/null
+++ b/dev-ruby/listen/listen-3.9.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Listens to file modifications and notifies you about the changes"
+HOMEPAGE="https://github.com/guard/listen"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+# Block on other packages trying to install a /usr/bin/listen
+RDEPEND+="!!media-radio/ax25-apps"
+
+ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
+
+ruby_add_bdepend "test? ( dev-ruby/thor )"
+
+all_ruby_prepare() {
+	rm -f Gemfile || die
+	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
+	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
+	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
+}
+
+each_ruby_prepare() {
+	mkdir spec/.fixtures || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	rm -rf spec/.fixtures || die
+}
diff --git a/dev-ruby/little-plugger/little-plugger-1.1.4-r1.ebuild b/dev-ruby/little-plugger/little-plugger-1.1.4-r1.ebuild
index 172e92a78f34..94f82f18b1ff 100644
--- a/dev-ruby/little-plugger/little-plugger-1.1.4-r1.ebuild
+++ b/dev-ruby/little-plugger/little-plugger-1.1.4-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -14,7 +14,6 @@ inherit ruby-fakegem
 DESCRIPTION="Module that provides Gem based plugin management"
 HOMEPAGE="https://github.com/TwP/little-plugger"
 
-IUSE="test"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-ruby/llhttp-ffi/Manifest b/dev-ruby/llhttp-ffi/Manifest
new file mode 100644
index 000000000000..d0446b884529
--- /dev/null
+++ b/dev-ruby/llhttp-ffi/Manifest
@@ -0,0 +1,2 @@
+DIST llhttp-0.4.0.tar.gz 98406 BLAKE2B 9f7358d988ed00558a36ae80e3c7d38cabb41a2233f32f4e3e6e9ed49a205f85ed84cb76cb07984f3b73b0a67eade4844ed5f4ee98b2453fa5c25d36fcb0082c SHA512 56a491763500b1619492173a83a227e3228847f4b85b8dadab1a9de34d65d5c662615c18d6cc6d5e11226df83381fd7f79f67e12f89f0e437ada8f9fd083ec26
+DIST llhttp-2023-03-29.tar.gz 114103 BLAKE2B 7af75703a748518c2c4b8840ac08089d3c3e79f9652278bd41e591f09b9091f5fa8195c530992e51811f065004adbc533b92d49097e9f05a2aa98b44b47da9ac SHA512 058bf8a8bd7de6bf29794bc60bd9811d769acc9488cfc535d619ee24a79ba37edf3bcbdbffd40d747576024e7aca3c99cb71d9db1aa5af00991d7672c5f4bb70
diff --git a/dev-ruby/llhttp-ffi/files/llhttp-ffi-0.5.0-fix-rake-clean.patch b/dev-ruby/llhttp-ffi/files/llhttp-ffi-0.5.0-fix-rake-clean.patch
new file mode 100644
index 000000000000..23d85a4a3bbe
--- /dev/null
+++ b/dev-ruby/llhttp-ffi/files/llhttp-ffi-0.5.0-fix-rake-clean.patch
@@ -0,0 +1,18 @@
+https://github.com/bryanp/llhttp/commit/89551cd7fa539d7073e62ba8f6ba1dd70e73c36a
+
+From 89551cd7fa539d7073e62ba8f6ba1dd70e73c36a Mon Sep 17 00:00:00 2001
+From: Bryan Powell <bryan@metabahn.com>
+Date: Wed, 29 Mar 2023 07:27:08 -0700
+Subject: [PATCH] Fix ffi clean
+
+--- a/Rakefile
++++ b/Rakefile
+@@ -16,6 +16,8 @@ task :clean do
+   [
+     "./lib/llhttp/llhttp_ext.bundle"
+   ].each do |file|
++    next unless File.exist?(file)
++
+     FileUtils.rm(file)
+   end
+ end
diff --git a/dev-ruby/llhttp-ffi/llhttp-ffi-0.4.0.ebuild b/dev-ruby/llhttp-ffi/llhttp-ffi-0.4.0.ebuild
new file mode 100644
index 000000000000..661a110f4fd1
--- /dev/null
+++ b/dev-ruby/llhttp-ffi/llhttp-ffi-0.4.0.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.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby FFI bindings for llhttp"
+HOMEPAGE="https://github.com/metabahn/llhttp"
+MY_PV="2021-09-09"
+SRC_URI="https://github.com/metabahn/llhttp/archive/refs/tags/${MY_PV}.tar.gz -> llhttp-${PV}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="$(ver_cut 1)/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+RUBY_S="llhttp-${MY_PV}/ffi"
+
+ruby_add_rdepend "=dev-ruby/ffi-compiler-1*"
+
+ruby_add_bdepend "test? (
+	dev-ruby/async-io
+	dev-ruby/rspec:3
+)"
+
+all_ruby_prepare() {
+	sed -i -e 's/gem "rake-compiler"//g' "Gemfile" || die
+}
+
+each_ruby_compile() {
+	cd ext && "${RUBY}" -S rake || die
+	local FFI_PLATFORM_NAME="$(${RUBY} --disable=did_you_mean -e "require 'ffi' ; p \"#{FFI::Platform::ARCH}-#{FFI::Platform::OS}\"" | tr -d "\"")"
+	install -D "${FFI_PLATFORM_NAME}/libllhttp-ext.so" "../lib/${FFI_PLATFORM_NAME}/libllhttp-ext.so" || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+	ruby_fakegem_extensions_installed
+}
diff --git a/dev-ruby/llhttp-ffi/llhttp-ffi-0.5.0.ebuild b/dev-ruby/llhttp-ffi/llhttp-ffi-0.5.0.ebuild
new file mode 100644
index 000000000000..6f5c38a6d836
--- /dev/null
+++ b/dev-ruby/llhttp-ffi/llhttp-ffi-0.5.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+MY_PV="2023-03-29"
+DESCRIPTION="Ruby FFI bindings for llhttp"
+HOMEPAGE="https://github.com/bryanp/llhttp"
+# Use -> ${MY_PV} in SRC_URI here to help spot forgotten MY_PV updates
+# (pkgcheck will warn on matching checksums)
+SRC_URI="https://github.com/bryanp/llhttp/archive/refs/tags/${MY_PV}.tar.gz -> llhttp-${MY_PV}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="$(ver_cut 1)/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+RUBY_S="llhttp-${MY_PV}/ffi"
+
+ruby_add_rdepend "=dev-ruby/ffi-compiler-1*"
+
+ruby_add_bdepend "test? (
+	dev-ruby/async-io
+	dev-ruby/rspec:3
+)"
+
+DEPEND+=" test? ( net-misc/curl )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.0-fix-rake-clean.patch
+)
+
+all_ruby_prepare() {
+	sed -i -e 's/gem "rake-compiler"//g' "Gemfile" || die
+}
+
+each_ruby_compile() {
+	cd ext && "${RUBY}" -S rake || die
+	local FFI_PLATFORM_NAME="$(${RUBY} --disable=did_you_mean -e "require 'ffi' ; p \"#{FFI::Platform::ARCH}-#{FFI::Platform::OS}\"" | tr -d "\"")"
+	install -D "${FFI_PLATFORM_NAME}/libllhttp-ext.so" "../lib/${FFI_PLATFORM_NAME}/libllhttp-ext.so" || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+	ruby_fakegem_extensions_installed
+}
diff --git a/dev-ruby/llhttp-ffi/metadata.xml b/dev-ruby/llhttp-ffi/metadata.xml
new file mode 100644
index 000000000000..3e85ab08b379
--- /dev/null
+++ b/dev-ruby/llhttp-ffi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">bryanp/llhttp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/locale/Manifest b/dev-ruby/locale/Manifest
index ae314a6f7b5d..5ab8984f0b2d 100644
--- a/dev-ruby/locale/Manifest
+++ b/dev-ruby/locale/Manifest
@@ -1 +1,2 @@
 DIST locale-2.1.3-git.tgz 99648 BLAKE2B e395a442f674c73ed03d0d4d55d875c796add076132964ce2abb457d5d6e2ed8643395f283728735bbbf1ffee8b03549e882e5c66f6a589106a0a36f5b9e4ff1 SHA512 77877f15914dbee5ca83155f8cb84815296b4e2e4205218c9926e0265b40940cbdbe68fb048870ce4f53a6caeeb593813a2e16e8c130a19e44a28cb67c82fe25
+DIST locale-2.1.4-git.tgz 100263 BLAKE2B 3ae8db5e940c850a10adbbafdbceab0c0e956e19be3b4442851983da44857adb8752fe1251a99c53fe6c6cf14ae4f3eb741afed2923f5d2b1503e968fdd8e156 SHA512 65f5fde22c4ab4dc404204aea8d87b53d5a2bca01fa860ac7953de3806d4ca69b36bc4fce28d57a6a9d04be5a10c2fdeadbbe10fc48fa0a495b0da4ccfc71626
diff --git a/dev-ruby/locale/locale-2.1.3-r1.ebuild b/dev-ruby/locale/locale-2.1.3-r1.ebuild
new file mode 100644
index 000000000000..8329fe6fb9e7
--- /dev/null
+++ b/dev-ruby/locale/locale-2.1.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc/reference"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog README.rdoc doc/text/news.md"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_GEMSPEC="locale.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure ruby library which provides basic APIs for localization"
+HOMEPAGE="https://github.com/ruby-gettext/locale"
+LICENSE="|| ( Ruby-BSD GPL-2 )"
+SRC_URI="https://github.com/ruby-gettext/locale/archive/${PV}.tar.gz -> ${P}-git.tgz"
+
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/test-unit-rr )"
+
+all_ruby_prepare() {
+	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		yard || die
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r samples
+}
diff --git a/dev-ruby/locale/locale-2.1.3.ebuild b/dev-ruby/locale/locale-2.1.3.ebuild
deleted file mode 100644
index 4cd1830a4ac0..000000000000
--- a/dev-ruby/locale/locale-2.1.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc/reference"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.rdoc doc/text/news.md"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_GEMSPEC="locale.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pure ruby library which provides basic APIs for localization"
-HOMEPAGE="https://github.com/ruby-gettext/locale"
-LICENSE="|| ( Ruby GPL-2 )"
-SRC_URI="https://github.com/ruby-gettext/locale/archive/${PV}.tar.gz -> ${P}-git.tgz"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/test-unit-rr )"
-
-all_ruby_prepare() {
-	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		yard || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r samples
-}
diff --git a/dev-ruby/locale/locale-2.1.4.ebuild b/dev-ruby/locale/locale-2.1.4.ebuild
new file mode 100644
index 000000000000..3a5bbbf5a83c
--- /dev/null
+++ b/dev-ruby/locale/locale-2.1.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc/reference"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog README.rdoc doc/text/news.md"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_GEMSPEC="locale.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure ruby library which provides basic APIs for localization"
+HOMEPAGE="https://github.com/ruby-gettext/locale"
+LICENSE="|| ( Ruby-BSD GPL-2 )"
+SRC_URI="https://github.com/ruby-gettext/locale/archive/${PV}.tar.gz -> ${P}-git.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/test-unit-rr )"
+
+all_ruby_prepare() {
+	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		yard || die
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r samples
+}
diff --git a/dev-ruby/localhost/Manifest b/dev-ruby/localhost/Manifest
index ed63740a7d32..758a2dce2fa3 100644
--- a/dev-ruby/localhost/Manifest
+++ b/dev-ruby/localhost/Manifest
@@ -1 +1,3 @@
-DIST localhost-1.1.9.tar.gz 2125545 BLAKE2B 5843b3857a11d9f56412f67cb15e424332b07cf81a29ae0a05a3ff20c6f06af56f6a02d8315f97c2d57fe76f7359c737cf19f116868ff532ac083070430fa22e SHA512 d46fd016957fd34309d50488dc61f23e9d47a5a6bfdeda5c049f6ffc112c13cd21394ada3e15c56f14913cba6ab503f60e32237431f7ff824fbbab8cd8a2d746
+DIST localhost-1.1.10.tar.gz 2128142 BLAKE2B 06e4ab07bc273b8beba5fb3ee3f64e171a6c4a2e944c6d5e432417560283230277213732bf23ddd12e9737b2803582a11fdaa76356d14d2bdbd4e90d402c6204 SHA512 946ef247b256165cf5c849a32c0ba8dd2007164bd1549a20aca595328174709e9213ba8a98448dc41a57558b00147c3b7428b7bc625059ab24f89c94ff8850e9
+DIST localhost-1.2.0.tar.gz 2128359 BLAKE2B 793e43779ec0b1392104914d9adc1d468820f54b920a8ec4e4f538b313e607a6016a0d2d7b8db242571bdd561161bd71ef781eae310d1f57005c2b0a0fa5c5b4 SHA512 f60cf31a31ac43962e98e933955973ce4bdf76252e43ee3ef969fe104fb71bc5d2faa3213c93532acba28650cd453663785c15b33eed65309f8c235ce116b70d
+DIST localhost-1.3.0.tar.gz 2128850 BLAKE2B fe7db9958759be39107116b45ee1f8d3678a2407f25956ee551a41a18da2bb12b46add992ca2b9615b68f69156afc384c453318af5b77751095b643fb27b7344 SHA512 6196cf4ff79cd53c222e19158a7233b8ba384225f24fd791d92952c80b11c469e99d619c3825e0f831e99e2a822aaf69e3b3a9ed0dc2e1ad0316c8b6717165c5
diff --git a/dev-ruby/localhost/localhost-1.1.10.ebuild b/dev-ruby/localhost/localhost-1.1.10.ebuild
new file mode 100644
index 000000000000..29a9d0c56b27
--- /dev/null
+++ b/dev-ruby/localhost/localhost-1.1.10.ebuild
@@ -0,0 +1,39 @@
+# 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="localhost.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Manage a local CA for self-signed localhost development servers"
+HOMEPAGE="https://github.com/socketry/localhost"
+SRC_URI="https://github.com/socketry/localhost/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/async-io
+		dev-ruby/async-process
+		dev-ruby/sus-fixtures-async
+	)
+"
+
+all_ruby_prepare() {
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/covered/Id' config/sus.rb || die
+}
+
+each_ruby_test() {
+	# Tests fail in parallel as it tries to use the same port so
+	# manually replicate ruby-ng_sus for now, as ruby-ng_sus runs sus-parallel.
+	${RUBY} -S sus || die
+}
diff --git a/dev-ruby/localhost/localhost-1.1.9.ebuild b/dev-ruby/localhost/localhost-1.1.9.ebuild
deleted file mode 100644
index fa89c38913b4..000000000000
--- a/dev-ruby/localhost/localhost-1.1.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="localhost.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Manage a local CA for self-signed localhost development servers"
-HOMEPAGE="https://github.com/socketry/localhost"
-SRC_URI="https://github.com/socketry/localhost/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-# Skip tests for now since they require a lot of
-# dependencies and this package blocks a security bug.
-RESTRICT="test"
-
-#ruby_add_bdepend "test? ( dev-ruby/async-rspec ) "
-
-all_ruby_prepare() {
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/localhost/localhost-1.2.0.ebuild b/dev-ruby/localhost/localhost-1.2.0.ebuild
new file mode 100644
index 000000000000..889710b2d342
--- /dev/null
+++ b/dev-ruby/localhost/localhost-1.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="localhost.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Manage a local CA for self-signed localhost development servers"
+HOMEPAGE="https://github.com/socketry/localhost"
+SRC_URI="https://github.com/socketry/localhost/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/async-io
+		dev-ruby/async-process
+		dev-ruby/sus-fixtures-async
+	)
+"
+
+all_ruby_prepare() {
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/covered/Id' config/sus.rb || die
+}
+
+each_ruby_test() {
+	# Tests fail in parallel as it tries to use the same port so
+	# manually replicate ruby-ng_sus for now, as ruby-ng_sus runs sus-parallel.
+	${RUBY} -S sus || die
+}
diff --git a/dev-ruby/localhost/localhost-1.3.0.ebuild b/dev-ruby/localhost/localhost-1.3.0.ebuild
new file mode 100644
index 000000000000..889710b2d342
--- /dev/null
+++ b/dev-ruby/localhost/localhost-1.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="localhost.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Manage a local CA for self-signed localhost development servers"
+HOMEPAGE="https://github.com/socketry/localhost"
+SRC_URI="https://github.com/socketry/localhost/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/async-io
+		dev-ruby/async-process
+		dev-ruby/sus-fixtures-async
+	)
+"
+
+all_ruby_prepare() {
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/covered/Id' config/sus.rb || die
+}
+
+each_ruby_test() {
+	# Tests fail in parallel as it tries to use the same port so
+	# manually replicate ruby-ng_sus for now, as ruby-ng_sus runs sus-parallel.
+	${RUBY} -S sus || die
+}
diff --git a/dev-ruby/localhost/metadata.xml b/dev-ruby/localhost/metadata.xml
index 658c72b1920d..56d29f0d02a8 100644
--- a/dev-ruby/localhost/metadata.xml
+++ b/dev-ruby/localhost/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">socketry/localhost</remote-id> 
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/lockfile/lockfile-2.1.3-r1.ebuild b/dev-ruby/lockfile/lockfile-2.1.3-r1.ebuild
index 24c4d8a527b4..fcabfc184b4c 100644
--- a/dev-ruby/lockfile/lockfile-2.1.3-r1.ebuild
+++ b/dev-ruby/lockfile/lockfile-2.1.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
@@ -13,7 +13,7 @@ inherit ruby-fakegem
 DESCRIPTION="A ruby library for creating NFS safe lockfiles"
 HOMEPAGE="https://github.com/ahoward/lockfile"
 
-LICENSE="Ruby"
+LICENSE="Ruby-BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
diff --git a/dev-ruby/log4r/log4r-1.1.10-r3.ebuild b/dev-ruby/log4r/log4r-1.1.10-r3.ebuild
index e0b2e1255f04..9be30a52c1aa 100644
--- a/dev-ruby/log4r/log4r-1.1.10-r3.ebuild
+++ b/dev-ruby/log4r/log4r-1.1.10-r3.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"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -14,7 +14,7 @@ RUBY_FAKEGEM_DOCDIR="doc"
 inherit ruby-fakegem
 
 DESCRIPTION="A comprehensive and flexible logging library written in Ruby"
-HOMEPAGE="http://log4r.sourceforge.net/"
+HOMEPAGE="https://log4r.sourceforge.net/"
 IUSE=""
 
 LICENSE="LGPL-3"
diff --git a/dev-ruby/log_buddy/Manifest b/dev-ruby/log_buddy/Manifest
deleted file mode 100644
index 84cbce50fc8e..000000000000
--- a/dev-ruby/log_buddy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST log_buddy-0.7.0.gem 11264 BLAKE2B 688d8545a57361ecdecef3021db69d285a040b6439b2391337b8842408ad5e6d4b79d0d9391db07172e0bde6e27f151f6b6f93a3e4d9448730c32e4cf21a2c56 SHA512 ce7d068157f2fc3513f330a8616dbf126f218f2f5166a91d3cd0179cd5899a696acc364001a677324581eefc0ebbe20d1e01413b1f363fd424c25232f4a791e2
diff --git a/dev-ruby/log_buddy/log_buddy-0.7.0-r1.ebuild b/dev-ruby/log_buddy/log_buddy-0.7.0-r1.ebuild
deleted file mode 100644
index 4a29b07ba29d..000000000000
--- a/dev-ruby/log_buddy/log_buddy-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.markdown examples.rb"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Log statements along with their name easily"
-HOMEPAGE="https://github.com/relevance/log_buddy"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/mocha-0.9 )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-}
diff --git a/dev-ruby/log_buddy/metadata.xml b/dev-ruby/log_buddy/metadata.xml
deleted file mode 100644
index 7c0e1c53fb19..000000000000
--- a/dev-ruby/log_buddy/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">relevance/log_buddy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/logger/Manifest b/dev-ruby/logger/Manifest
new file mode 100644
index 000000000000..398f0ec1d788
--- /dev/null
+++ b/dev-ruby/logger/Manifest
@@ -0,0 +1 @@
+DIST logger-1.6.0.tar.gz 18954 BLAKE2B 6368cd85cc36819ec3b98719befbea84ed3bbf9866ddb06ea946e6cdd0109e7c771fda673f688566f22b9654bb2ace4e196d9385b645c1d5efaeb6f708cdee29 SHA512 e2aa950132f2bd2ae4b2f0f911d84eb8843c4403028c5ef4ed5e752f397263fe251fb6296b1d5b3eea26ed79fce5bcb0e1cb8dbdc3cf24cd954522f394f5ad6d
diff --git a/dev-ruby/logger/logger-1.6.0.ebuild b/dev-ruby/logger/logger-1.6.0.ebuild
new file mode 100644
index 000000000000..54abfe5e93cf
--- /dev/null
+++ b/dev-ruby/logger/logger-1.6.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="logger.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a simple logging utility for outputting messages"
+HOMEPAGE="https://github.com/ruby/logger"
+SRC_URI="https://github.com/ruby/logger/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
+
+all_ruby_prepare() {
+	sed -e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/logger/metadata.xml b/dev-ruby/logger/metadata.xml
new file mode 100644
index 000000000000..cf66c83dd2fc
--- /dev/null
+++ b/dev-ruby/logger/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/logger</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/logue/Manifest b/dev-ruby/logue/Manifest
deleted file mode 100644
index c2c000ea88e9..000000000000
--- a/dev-ruby/logue/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST logue-git-1.0.18.tgz 13310 BLAKE2B 42669cae48b5efe5785470410b694c7330dad5273d3a788612729d0e2efb9aabb8b3024727efddb4efedc1addd377242bc5a3ad5e9ede602f0f606be4db84608 SHA512 654681b2d1735790a08d8c53f9097ca28b64c37e902ff1260c8f2fa669067d404103944f0c78c5382a10b9491d8b0a10495516d3529d68be97c62027c2812c9b
diff --git a/dev-ruby/logue/logue-1.0.18.ebuild b/dev-ruby/logue/logue-1.0.18.ebuild
deleted file mode 100644
index 4a84bec6ae19..000000000000
--- a/dev-ruby/logue/logue-1.0.18.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A module that adds logging/trace functionality"
-HOMEPAGE="https://github.com/jpace/logue"
-
-SRC_URI="https://github.com/jpace/logue/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rainbow:3"
-
-ruby_add_bdepend "test? ( dev-ruby/paramesan )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-
-	# Fix path to match installed gem path
-	sed -i -e 's:logue/lib/logue:/lib/logue:' lib/logue/stack.rb || die
-}
diff --git a/dev-ruby/logue/metadata.xml b/dev-ruby/logue/metadata.xml
deleted file mode 100644
index 2647a278e55e..000000000000
--- a/dev-ruby/logue/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jpace/logue</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/loofah/Manifest b/dev-ruby/loofah/Manifest
index ab110b25d1eb..449e364000c2 100644
--- a/dev-ruby/loofah/Manifest
+++ b/dev-ruby/loofah/Manifest
@@ -1,3 +1,3 @@
-DIST loofah-2.12.0.tar.gz 68919 BLAKE2B 3d4c95fc4b80948eae6e03fa2b24fe53ef0bde4e6a4d18d518c2f8f92abc570f3efbce3f421d75813b308e84c4576b433dc5279fb3f32606022b6cebcb00bc7e SHA512 f52a1ef20cd6364715a1421e356e1aec430e0ffc24776672b5ed8c9445ead5336d06bc35ddb4af03b57a30d95ca126596c1f3fd3f744791d691a349be6275e6d
-DIST loofah-2.14.0.tar.gz 69572 BLAKE2B 2b2609e8db6a7fc37fafcc11b376a57a237b246416b5e92302e4a054db2dc61bb5281febe3c8845a3df9804b4ebe8c74a4ca7d856a9356eeeb6ac41697a218a5 SHA512 b9911a210033b040317ff5db55c52eb0d2ddfe3d9bf31f4ad115827aef4ac0d58d0cbc58056c7fe9055a607a926cf28886006ffbf14f6275a8125072e7d57d4f
-DIST loofah-2.15.0.tar.gz 69736 BLAKE2B f5d8eb0113768b0f173aab45142056967293a1174835433b4b9a555e5039ce50e0ca29e9dbc501dcd7ab331f907e7cbbc3f08f239313f07a26d8926ef386c2cf SHA512 58536545a5c8a9d191d815634be966d0efa6cd8030d1f81c34e46ca3be4a002244eb5680f4c69ba36daa0095fc7c3548d00d57db29b2ce3cf252ef826f22d5f7
+DIST loofah-2.21.3.tar.gz 84775 BLAKE2B 89286feb0c1345d0ba5ff61f8dad4461a43afa3624cdf33787e3371f32154bc4814914f9725b48d70f5ce89f654cbbb656ff319b2aeadbbb74f9f60db386c5eb SHA512 7462bd703135bbf67dca6864169013a787cb9c16c3dc41e17ac70f8d182b9b1d2e763f719b9a52c02a6609d65f9497fe6e4b92481e95175060978009cb0aa362
+DIST loofah-2.21.4.tar.gz 85154 BLAKE2B 34357e03d32a8c3c144a596dd5a10780c9a3c930292c1130169031a6e15a2d73d1783c60f41ef49cf0938f39c8fc7fd0f0ab3d3ca6734d88a70e0cc954b181f2 SHA512 900133983a8a135e7bc52527b9e73aa640df632b16a82558b7648b3d411b61dfbd8a9d14eefd9e3acdef27466156d341d26969bc5d81243d7254eea039d58e50
+DIST loofah-2.22.0.tar.gz 85892 BLAKE2B d465dcc83cac2a994145f7840b8607f92a080fef7ef6860ae81a3eecaf41be6be7e3b59263c05d09c5a729844d4f2490ce3e39046fdd863647ac157367c16427 SHA512 b1b9ba490334563b935d8a176ba6eee8d98c5c3ebbecc878c654e64a48311c38d0684a9b8e2704797c36492a33bc1248137a7611eb9f796a5ea9aa4df1b5f90e
diff --git a/dev-ruby/loofah/loofah-2.12.0.ebuild b/dev-ruby/loofah/loofah-2.12.0.ebuild
deleted file mode 100644
index db46f958c464..000000000000
--- a/dev-ruby/loofah/loofah-2.12.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="loofah.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for manipulating and transforming HTML/XML documents and fragments"
-HOMEPAGE="https://github.com/flavorjones/loofah"
-SRC_URI="https://github.com/flavorjones/loofah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.5.9"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 )"
-
-all_ruby_prepare() {
-	# Fix version in gemspec
-	sed -i -e '/s\.version/ s/".*"/"'${PV}'"/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid unneeded development dependencies
-	sed -i -e '/concourse/I s:^:#:' Rakefile || die
-
-	# Avoid test failing on different whitespace.
-	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/loofah/loofah-2.14.0.ebuild b/dev-ruby/loofah/loofah-2.14.0.ebuild
deleted file mode 100644
index b6b5f7557b56..000000000000
--- a/dev-ruby/loofah/loofah-2.14.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="loofah.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for manipulating and transforming HTML/XML documents and fragments."
-HOMEPAGE="https://github.com/flavorjones/loofah"
-SRC_URI="https://github.com/flavorjones/loofah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.5.9"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 )"
-
-all_ruby_prepare() {
-	# Fix version in gemspec
-	sed -i -e '/s\.version/ s/".*"/"'${PV}'"/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid unneeded development dependencies
-	sed -i -e '/concourse/I s:^:#:' Rakefile || die
-
-	# Avoid test failing on different whitespace.
-	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/loofah/loofah-2.15.0.ebuild b/dev-ruby/loofah/loofah-2.15.0.ebuild
deleted file mode 100644
index b6b5f7557b56..000000000000
--- a/dev-ruby/loofah/loofah-2.15.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="loofah.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for manipulating and transforming HTML/XML documents and fragments."
-HOMEPAGE="https://github.com/flavorjones/loofah"
-SRC_URI="https://github.com/flavorjones/loofah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.5.9"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 )"
-
-all_ruby_prepare() {
-	# Fix version in gemspec
-	sed -i -e '/s\.version/ s/".*"/"'${PV}'"/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid unneeded development dependencies
-	sed -i -e '/concourse/I s:^:#:' Rakefile || die
-
-	# Avoid test failing on different whitespace.
-	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/loofah/loofah-2.21.3.ebuild b/dev-ruby/loofah/loofah-2.21.3.ebuild
new file mode 100644
index 000000000000..e203ac98f0d9
--- /dev/null
+++ b/dev-ruby/loofah/loofah-2.21.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="loofah.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for manipulating and transforming HTML/XML documents and fragments."
+HOMEPAGE="https://github.com/flavorjones/loofah"
+SRC_URI="https://github.com/flavorjones/loofah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+IUSE=""
+
+ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.12.0"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 )"
+
+all_ruby_prepare() {
+	# Fix version in gemspec
+	sed -i -e '/s\.version/ s/".*"/"'${PV}'"/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid unneeded development dependencies
+	sed -i -e '/concourse/I s:^:#:' Rakefile || die
+
+	# Avoid test failing on different whitespace.
+	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/loofah/loofah-2.21.4.ebuild b/dev-ruby/loofah/loofah-2.21.4.ebuild
new file mode 100644
index 000000000000..a17f239b0e23
--- /dev/null
+++ b/dev-ruby/loofah/loofah-2.21.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="loofah.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for manipulating and transforming HTML/XML documents and fragments."
+HOMEPAGE="https://github.com/flavorjones/loofah"
+SRC_URI="https://github.com/flavorjones/loofah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+IUSE=""
+
+ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.12.0"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 )"
+
+all_ruby_prepare() {
+	# Fix version in gemspec
+	sed -i -e '/s\.version/ s/".*"/"'${PV}'"/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid unneeded development dependencies
+	sed -i -e '/concourse/I s:^:#:' Rakefile || die
+
+	# Avoid test failing on different whitespace.
+	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/loofah/loofah-2.22.0.ebuild b/dev-ruby/loofah/loofah-2.22.0.ebuild
new file mode 100644
index 000000000000..47b158d37fc8
--- /dev/null
+++ b/dev-ruby/loofah/loofah-2.22.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="loofah.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for manipulating and transforming HTML/XML documents and fragments."
+HOMEPAGE="https://github.com/flavorjones/loofah"
+SRC_URI="https://github.com/flavorjones/loofah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+IUSE=""
+
+ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.12.0"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 )"
+
+all_ruby_prepare() {
+	# Fix version in gemspec
+	sed -i -e '/s\.version/ s/".*"/"'${PV}'"/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid unneeded development dependencies
+	sed -i -e '/concourse/I s:^:#:' Rakefile || die
+
+	# Avoid test failing on different whitespace.
+	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/loquacious/loquacious-1.9.1-r3.ebuild b/dev-ruby/loquacious/loquacious-1.9.1-r3.ebuild
deleted file mode 100644
index 745757a703e4..000000000000
--- a/dev-ruby/loquacious/loquacious-1.9.1-r3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Descriptive configuration files for Ruby written in Ruby"
-HOMEPAGE="https://github.com/TwP/loquacious"
-
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/loquacious/loquacious-1.9.1-r4.ebuild b/dev-ruby/loquacious/loquacious-1.9.1-r4.ebuild
new file mode 100644
index 000000000000..f7d7247862d8
--- /dev/null
+++ b/dev-ruby/loquacious/loquacious-1.9.1-r4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Descriptive configuration files for Ruby written in Ruby"
+HOMEPAGE="https://github.com/TwP/loquacious"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+all_ruby_prepare() {
+	sed -i -e 's/be_true/be true/' -e 's/be_false/be false/' spec/*_spec.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/lumberjack/Manifest b/dev-ruby/lumberjack/Manifest
index b58e0b1f5c49..b30ae3eba8a9 100644
--- a/dev-ruby/lumberjack/Manifest
+++ b/dev-ruby/lumberjack/Manifest
@@ -1,2 +1 @@
-DIST lumberjack-1.2.7.tar.gz 39559 BLAKE2B 2f7a5630baa5f683e137f717a7482b4bb889ccf71293b2f52a799effc23bb94ee90ed10c1bf0c9ad649de12347f22a5a66398344d0dcdde3626427fa09782c9a SHA512 356fc44669e70d8fbc05c4f8cb8296a19d7918dd34f0232a750d714fcb511146423920baf7aec8e58e099e3c72ea4d0ad63bc0b3cfd7d337603ec0958efbb008
-DIST lumberjack-1.2.8.tar.gz 40896 BLAKE2B 5a2ee1ff750e29c0869ddc8991fd58e2b4dbf69132e2a1c16e414c5373eebb0249ada7fe922666a3cfcd6875aa98e8b2e0f5f73b391ece2fe75e13fb2968b29f SHA512 8b1d9a402112ae3279e3f2b0d498e6d40faca3ed9046bab1b35d3e863dd0d8f143700f0b7039c8d6b24bde517fceeb9d1b7a8b4259a97908a34a94338f1fd995
+DIST lumberjack-1.2.10.tar.gz 44396 BLAKE2B 4916444660a1b7b1332582e4dec737c181dcd32947d1fa6fbea008b10c6762280bbffe4cf0419200c54e6a956260c25327b9d84b7c2dbda3bd2525d09401f3ce SHA512 f187125814fc8a54231bbfd4d8bfd684f3cf21e3f292598a002427a573838c259c3f12804d49ee4e2b708e734e84a354749a6219c7c9d3befcc1632d8c651d01
diff --git a/dev-ruby/lumberjack/lumberjack-1.2.10.ebuild b/dev-ruby/lumberjack/lumberjack-1.2.10.ebuild
new file mode 100644
index 000000000000..0c2dc83ef313
--- /dev/null
+++ b/dev-ruby/lumberjack/lumberjack-1.2.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="lumberjack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple, powerful, and very fast logging utility"
+HOMEPAGE="https://github.com/bdurand/lumberjack"
+SRC_URI="https://github.com/bdurand/lumberjack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.8 )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/lumberjack/lumberjack-1.2.7.ebuild b/dev-ruby/lumberjack/lumberjack-1.2.7.ebuild
deleted file mode 100644
index 941c0d361977..000000000000
--- a/dev-ruby/lumberjack/lumberjack-1.2.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="lumberjack.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple, powerful, and very fast logging utility"
-HOMEPAGE="https://github.com/bdurand/lumberjack"
-SRC_URI="https://github.com/bdurand/lumberjack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.8 )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/lumberjack/lumberjack-1.2.8.ebuild b/dev-ruby/lumberjack/lumberjack-1.2.8.ebuild
deleted file mode 100644
index 7c80c08102c3..000000000000
--- a/dev-ruby/lumberjack/lumberjack-1.2.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="lumberjack.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple, powerful, and very fast logging utility"
-HOMEPAGE="https://github.com/bdurand/lumberjack"
-SRC_URI="https://github.com/bdurand/lumberjack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.8 )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/mab/mab-0.0.3-r2.ebuild b/dev-ruby/mab/mab-0.0.3-r2.ebuild
index 2806926c3384..e263676514bb 100644
--- a/dev-ruby/mab/mab-0.0.3-r2.ebuild
+++ b/dev-ruby/mab/mab-0.0.3-r2.ebuild
@@ -1,10 +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"
-
-RUBY_FAKEGEM_TASK_TEST="test"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/magic/magic-0.2.9-r1.ebuild b/dev-ruby/magic/magic-0.2.9-r1.ebuild
deleted file mode 100644
index 5de63843ea67..000000000000
--- a/dev-ruby/magic/magic-0.2.9-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/qoobaa/magic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Ruby FFI bindings to libmagic"
-HOMEPAGE="https://github.com/qoobaa/magic"
-
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND+="sys-apps/file"
-DEPEND+="test? ( sys-apps/file )"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-ruby_add_rdepend "dev-ruby/ffi"
-
-each_ruby_test() {
-	${RUBY} -Ilib -Itest test/test_magic.rb || die
-}
diff --git a/dev-ruby/magic/magic-0.2.9-r2.ebuild b/dev-ruby/magic/magic-0.2.9-r2.ebuild
index 0640c4315f96..0c4ee3c75584 100644
--- a/dev-ruby/magic/magic-0.2.9-r2.ebuild
+++ b/dev-ruby/magic/magic-0.2.9-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
 RUBY_FAKEGEM_GEMSPEC="magic.gemspec"
@@ -28,6 +28,9 @@ ruby_add_rdepend "dev-ruby/ffi"
 
 all_ruby_prepare() {
 	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Fix File.exists? deprecation
+	sed -i -e 's/File.exists?/File.exist?/' lib/magic/database.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/mail/Manifest b/dev-ruby/mail/Manifest
index 8063e96e4fd4..bd644fdbc596 100644
--- a/dev-ruby/mail/Manifest
+++ b/dev-ruby/mail/Manifest
@@ -1 +1 @@
-DIST mail-2.7.1-git.tar.gz 625251 BLAKE2B c1efbb259042155e983c1971fe9821eb0dd850089bd04cb0c74513f6f17dabf8ecc3155d9e5846ae657383f522872323f8fba37d51fba4318ac682d18a6d4c50 SHA512 17c601c86715135331f750048339a11a67a17f34486dbafa3ba7e9af9970d60927a2fa95c72a398418548df1fdf5addb2ed3afe9da7dff1f0bd949438726be1b
+DIST mail-2.8.1-git.tar.gz 621412 BLAKE2B f39c3087bf5d064fd9a96b93ccac2fd0060c53a53c900658e3907dce311aabba8136ce96bcd4937f5a9852ed3d046e1354c3c2757330d80f9b3d0542fc27cd12 SHA512 2c176361285b17b10ab3e518502b05ac582f033f81fc45df0b61bfcb5b645ea22139ef3abf67240adb27a39834dfee59bb0777c6de5448c2fe2e52d5dde3465a
diff --git a/dev-ruby/mail/mail-2.7.1-r1.ebuild b/dev-ruby/mail/mail-2.7.1-r1.ebuild
deleted file mode 100644
index 300d06e0d751..000000000000
--- a/dev-ruby/mail/mail-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
-
-RUBY_FAKEGEM_GEMSPEC="mail.gemspec"
-
-inherit ruby-fakegem
-
-GITHUB_USER="mikel"
-
-DESCRIPTION="An email handling library"
-HOMEPAGE="https://github.com/mikel/mail"
-SRC_URI="https://github.com/${GITHUB_USER}/mail/archive/${PV}.tar.gz -> ${P}-git.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/mini_mime-0.1.1"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undle/d' -e '6d' Rakefile || die "Unable to remove Bundler code."
-}
diff --git a/dev-ruby/mail/mail-2.7.1.ebuild b/dev-ruby/mail/mail-2.7.1.ebuild
deleted file mode 100644
index 8e17aa55074e..000000000000
--- a/dev-ruby/mail/mail-2.7.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
-
-RUBY_FAKEGEM_GEMSPEC="mail.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-GITHUB_USER="mikel"
-
-DESCRIPTION="An email handling library"
-HOMEPAGE="https://github.com/mikel/mail"
-SRC_URI="https://github.com/${GITHUB_USER}/mail/archive/${PV}.tar.gz -> ${P}-git.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/mini_mime-0.1.1"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undle/d' -e '6d' Rakefile || die "Unable to remove Bundler code."
-}
diff --git a/dev-ruby/mail/mail-2.8.1.ebuild b/dev-ruby/mail/mail-2.8.1.ebuild
new file mode 100644
index 000000000000..fd546683fa89
--- /dev/null
+++ b/dev-ruby/mail/mail-2.8.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
+
+RUBY_FAKEGEM_GEMSPEC="mail.gemspec"
+
+inherit ruby-fakegem
+
+GITHUB_USER="mikel"
+
+DESCRIPTION="An email handling library"
+HOMEPAGE="https://github.com/mikel/mail"
+SRC_URI="https://github.com/${GITHUB_USER}/mail/archive/${PV}.tar.gz -> ${P}-git.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/mini_mime-0.1.1
+	dev-ruby/net-imap
+	dev-ruby/net-pop
+	dev-ruby/net-smtp
+"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undle/d' -e '6d' Rakefile || die "Unable to remove Bundler code."
+
+	sed -i -e '/benchmark/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/maildir/maildir-2.2.3-r1.ebuild b/dev-ruby/maildir/maildir-2.2.3-r1.ebuild
new file mode 100644
index 000000000000..dd920095148a
--- /dev/null
+++ b/dev-ruby/maildir/maildir-2.2.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRAINSTALL="README.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for reading and writing arbitrary messages in DJB's maildir format"
+HOMEPAGE="https://github.com/ktheory/maildir"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="2"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/fakefs-0.3.2 dev-ruby/mail dev-ruby/shoulda dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile test/helper.rb || die
+
+	# Avoid tests that appear to need activesupport for .blank? support
+	sed -i -e '/add and remove flags/,/^    end/ s:^:#:' test/test_message.rb || die
+	sed -i -e '/be removed from flag list/,/^    end/ s:^:#:' test/test_maildir.rb || die
+}
diff --git a/dev-ruby/maildir/maildir-2.2.3.ebuild b/dev-ruby/maildir/maildir-2.2.3.ebuild
deleted file mode 100644
index 70359bdf5d60..000000000000
--- a/dev-ruby/maildir/maildir-2.2.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRAINSTALL="README.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for reading and writing arbitrary messages in DJB's maildir format"
-HOMEPAGE="https://github.com/ktheory/maildir"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="2"
-IUSE="test"
-
-ruby_add_bdepend "
-	test? ( >=dev-ruby/fakefs-0.3.2 dev-ruby/mail dev-ruby/shoulda-context dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile test/helper.rb || die
-	sed -i -e 's/shoulda/shoulda-context/' test/helper.rb || die
-
-	# Avoid tests that appear to need activesupport for .blank? support
-	sed -i -e '/add and remove flags/,/^    end/ s:^:#:' test/test_message.rb || die
-	sed -i -e '/be removed from flag list/,/^    end/ s:^:#:' test/test_maildir.rb || die
-}
diff --git a/dev-ruby/marcel/Manifest b/dev-ruby/marcel/Manifest
index 8440ba1b68f8..b0f1ac5afb18 100644
--- a/dev-ruby/marcel/Manifest
+++ b/dev-ruby/marcel/Manifest
@@ -1,2 +1,2 @@
-DIST marcel-0.3.3.tar.gz 7845456 BLAKE2B e27d851119f434144a790cd1bfb1ca21662357b1875ae9193273e00c5abc6156c217efeb961356d4967d984b4c8fb4b4047620fa5d0448cc20651aa1ce05bb69 SHA512 d9be185fd6f5185fc67f3eed931ecf3084da671840b6e464bf341f51c9dec4ab1b4650abd1916e640b7caced230d6cb90370bffb559151e0047a8b03211dc751
 DIST marcel-1.0.2.tar.gz 8305198 BLAKE2B 264737cdb29852a186bf0e719748caca6c63626528f486dbefc3eedc7df6d7fe6f34e5cf68eb8b04f8b2b75c52bed59222d5f7bbcf60047cd5db7c4c935802ff SHA512 cd159545b246dcbd26ca07ac69e36ff13a965ac0e99ebd040c53b6a92f8ec8fd65786783c9a173d669fe6b32340a23d72c83c483011eec2e1097bdea73810ed6
+DIST marcel-1.0.4.tar.gz 8340487 BLAKE2B 6f5260408de9997f8515619a661ea5b5293182a73cb45671aa2b5302e99b73b0ecb148acbeca2b8afdab8991fdd7ff789d2d79075fb5d37b0166c6a776802d03 SHA512 68811c3116ecafdea322c97637b3566102c21363de05678862fe1d9f1300ff6c0056449440169a69a353d77b568d0401930fbeac1651e0fea8189ae4960ce189
diff --git a/dev-ruby/marcel/marcel-0.3.3-r1.ebuild b/dev-ruby/marcel/marcel-0.3.3-r1.ebuild
deleted file mode 100644
index 10ac4471b7ec..000000000000
--- a/dev-ruby/marcel/marcel-0.3.3-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple mime type detection using magic numbers, filenames, and extensions"
-HOMEPAGE="https://github.com/basecamp/marcel"
-SRC_URI="https://github.com/basecamp/marcel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/mimemagic-0.3.2:0"
-
-ruby_add_bdepend "test? ( dev-ruby/rack )"
-
-all_ruby_prepare() {
-	sed -i -e '2irequire "pathname"' test/test_helper.rb || die
-
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-
-	# Account for changes in shared-mime-info 1.10
-	mkdir test/fixtures/{magic,name}/font || die
-	mv test/fixtures/magic/application/x-font-ttf.ttf test/fixtures/magic/font/ttf.ttf || die
-	mv test/fixtures/name/application/x-font-ttf.ttf test/fixtures/name/font/ttf.ttf || die
-}
diff --git a/dev-ruby/marcel/marcel-1.0.2.ebuild b/dev-ruby/marcel/marcel-1.0.2.ebuild
index 822c13dedc89..5975b0f8af3d 100644
--- a/dev-ruby/marcel/marcel-1.0.2.ebuild
+++ b/dev-ruby/marcel/marcel-1.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -11,18 +11,24 @@ RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Simple mime type detection using magic numbers, filenames, and extensions"
-HOMEPAGE="https://github.com/basecamp/marcel"
-SRC_URI="https://github.com/basecamp/marcel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/rails/marcel"
+SRC_URI="https://github.com/rails/marcel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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
+
+	sed -i -e 's/MiniTest/Minitest/' test/test_helper.rb || die
 }
diff --git a/dev-ruby/marcel/marcel-1.0.4.ebuild b/dev-ruby/marcel/marcel-1.0.4.ebuild
new file mode 100644
index 000000000000..14e9c91fdd92
--- /dev/null
+++ b/dev-ruby/marcel/marcel-1.0.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple mime type detection using magic numbers, filenames, and extensions"
+HOMEPAGE="https://github.com/rails/marcel"
+SRC_URI="https://github.com/rails/marcel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/rack:2.2 )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '1igem "rack", "~> 2.0"' \
+		-e '2irequire "pathname"' \
+		test/test_helper.rb || die
+
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/marcel/metadata.xml b/dev-ruby/marcel/metadata.xml
index 1706a7058f4b..491a91b5d488 100644
--- a/dev-ruby/marcel/metadata.xml
+++ b/dev-ruby/marcel/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">basecamp/marcel</remote-id>
+    <remote-id type="github">rails/marcel</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/maruku/maruku-0.7.3-r1.ebuild b/dev-ruby/maruku/maruku-0.7.3-r1.ebuild
index f5687ce1e7e2..6a6ff581e503 100644
--- a/dev-ruby/maruku/maruku-0.7.3-r1.ebuild
+++ b/dev-ruby/maruku/maruku-0.7.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/bhollis/maruku"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="highlight test"
 
 ruby_add_bdepend "test? ( dev-ruby/nokogiri-diff dev-ruby/syntax )"
diff --git a/dev-ruby/mash/mash-0.1.1-r3.ebuild b/dev-ruby/mash/mash-0.1.1-r3.ebuild
index 0f82122dc1c7..6bba1dcb06b8 100644
--- a/dev-ruby/mash/mash-0.1.1-r3.ebuild
+++ b/dev-ruby/mash/mash-0.1.1-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby31 ruby32 ruby33"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
@@ -18,3 +18,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/be_true/be true/' -e 's/be_false/be false/' spec/mash_spec.rb || die
+}
diff --git a/dev-ruby/matrix/matrix-0.4.2.ebuild b/dev-ruby/matrix/matrix-0.4.2.ebuild
index 27da3bcb74de..1df2d66edd6e 100644
--- a/dev-ruby/matrix/matrix-0.4.2.ebuild
+++ b/dev-ruby/matrix/matrix-0.4.2.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/matrix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~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 ~x64-solaris"
 SLOT="$(ver_cut 1)"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/matrix/metadata.xml b/dev-ruby/matrix/metadata.xml
index 7a38fd1850ff..c16f2db61922 100644
--- a/dev-ruby/matrix/metadata.xml
+++ b/dev-ruby/matrix/metadata.xml
@@ -5,4 +5,8 @@
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/matrix</remote-id>
+    <remote-id type="rubygems">matrix</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/maxitest/Manifest b/dev-ruby/maxitest/Manifest
index 82c5ff71cf77..c7a70cb45168 100644
--- a/dev-ruby/maxitest/Manifest
+++ b/dev-ruby/maxitest/Manifest
@@ -1 +1,4 @@
-DIST maxitest-3.7.0.tar.gz 62716 BLAKE2B 9919702c3b6c701edf6a5de8c1054547edaeeda518a7b7bae3f419cba9f92f535ec7870ece080fb472d7635243afec4aeed4a27fd839874aa40d63d6ce4ecab8 SHA512 4843f9d405a40177622e9892d1e5fffe297ae03cfef68b73ce3ee966cc3a36e126a9f5a5018b898465f5ad40f8d4fc1e6bf53f5c76b376efeff669b57dd1e8aa
+DIST maxitest-4.4.1.tar.gz 62757 BLAKE2B 0023472200643dcc17aa7fc3720ebdaccb988628eedd55d69c47a0702b4700760dcc9178f1d63a29d8b0a461ceb7195f9d13579cf0393a3ca669515bcf77239a SHA512 927c5619541f13b2af064f1adb01670ec43570252a62d32b98674b7d4dd72ebc02594c000f6dfae7b9de275086df23e418f13c4c21595d47f429b86d0941dbc2
+DIST maxitest-5.2.0.tar.gz 63610 BLAKE2B 98efc803f43d02cfdec0431279446e555650928442593be436e0ebfcb0d21e505e69b9e26fd8560b12c4feb2ce307d9d46954ff8a82a80b328c2d0442c451f5a SHA512 10251961613a6a014c868c3fd2a8c4c51253b2dee058561450e88ef628de25b6042b17d04d7338afd400ca30e8c3c12923f0976ec28578b726630699d2a0d5b5
+DIST maxitest-5.3.1.tar.gz 64755 BLAKE2B 8de322902638a284dadcf269fc16d82ee70a4b5fe4211c1859ce832a8b424c98347b005f103e9a2342df8384591ff98b23171bf2f61285177aa3bf1a0520bac9 SHA512 a287f880a1eb8695e716654c3921ffcf27430657285ec29002834145f87db620ae481f9dd5c023edec0473ce947c366eaeb78ddbbf556d26e08605f0b9341f69
+DIST maxitest-5.4.0.tar.gz 64727 BLAKE2B 99751c419386ab1b2a10233371c151f8d7a55315dca223e65a72ccab5b6aabb655c2e853190dc94c09dacb77542a0cdadc4121f45207d1d756f5d8b0d727f457 SHA512 7bdff3081b294fa43fc9a03352eb8c3be4b1a0010de5ea6a3027a9207ffcee09aeb69cec5faf430cba8ed094e76e75e6b46c6ab60f749cde1f4fcfe763ab1242
diff --git a/dev-ruby/maxitest/maxitest-3.7.0.ebuild b/dev-ruby/maxitest/maxitest-3.7.0.ebuild
deleted file mode 100644
index 5be938ace85c..000000000000
--- a/dev-ruby/maxitest/maxitest-3.7.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Minitest + all the features you always wanted"
-HOMEPAGE="https://github.com/grosser/maxitest"
-SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/minitest-5.15:5"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-	# Remove developer-only gems from the gemspec and avoid git issues
-	sed -i -e '/wwtd/ s:^:#:' \
-		-e 's/git ls-files/find */' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/\(byebug\|bump\)/ s:^:#:' Gemfile || die
-
-	sed -e '/shows short backtraces/askip "fails on ruby27"' \
-		-e '/fails when not used/askip "fails with newer maxitest by design"' \
-		-i spec/maxitest_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Use the correct target
-	sed -i -e '/sh/ s:ruby:'${RUBY}':' \
-		-e '/sh/ s:mtest:'${RUBY}' -S mtest:' \
-		spec/maxitest_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RSPEC_VERSION=3 ruby-ng_rspec spec
-}
diff --git a/dev-ruby/maxitest/maxitest-4.4.1-r1.ebuild b/dev-ruby/maxitest/maxitest-4.4.1-r1.ebuild
new file mode 100644
index 000000000000..2c0f44548410
--- /dev/null
+++ b/dev-ruby/maxitest/maxitest-4.4.1-r1.ebuild
@@ -0,0 +1,51 @@
+# 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_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Minitest + all the features you always wanted"
+HOMEPAGE="https://github.com/grosser/maxitest"
+SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "<dev-ruby/minitest-5.18:*"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	# Remove developer-only gems from the gemspec and avoid git issues
+	sed -i -e '/wwtd/ s:^:#:' \
+		-e 's/git ls-files/find */' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/\(byebug\|bump\)/ s:^:#:' Gemfile || die
+
+	sed -e '/shows short backtraces/askip "fails on ruby27"' \
+		-e '/fails when not used/askip "fails with newer maxitest by design"' \
+		-e '/shows version/askip "fails due to missing require for version"' \
+		-i spec/maxitest_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Use the correct target
+	sed -i -e '/sh/ s:ruby:'${RUBY}':' \
+		-e '/sh/ s:mtest:'${RUBY}' -S mtest:' \
+		spec/maxitest_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" RSPEC_VERSION=3 ruby-ng_rspec spec
+}
diff --git a/dev-ruby/maxitest/maxitest-5.2.0.ebuild b/dev-ruby/maxitest/maxitest-5.2.0.ebuild
new file mode 100644
index 000000000000..254679bd2a01
--- /dev/null
+++ b/dev-ruby/maxitest/maxitest-5.2.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Minitest + all the features you always wanted"
+HOMEPAGE="https://github.com/grosser/maxitest"
+SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/minitest-5.14.0:* <dev-ruby/minitest-5.20.0:*"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	# Remove developer-only gems from the gemspec and avoid git issues
+	sed -e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/\(debug\|bump\)/ s:^:#:' Gemfile || die
+
+	sed -e '/shows backtrace for/askip' \
+		-e '/describe.*line/ s/describe/xdescribe/' \
+		-e '/describe.*color/ s/describe/xdescribe/' \
+		-i spec/maxitest_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Use the correct target
+	sed -e '/\(run_cmd\|sh\)/ s:ruby:'${RUBY}':' \
+		-e '/\(run_cmd\|sh\)/ s:mtest:'${RUBY}' -S bin/mtest:' \
+		-i spec/maxitest_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" RSPEC_VERSION=3 ruby-ng_rspec spec
+}
diff --git a/dev-ruby/maxitest/maxitest-5.3.1.ebuild b/dev-ruby/maxitest/maxitest-5.3.1.ebuild
new file mode 100644
index 000000000000..254679bd2a01
--- /dev/null
+++ b/dev-ruby/maxitest/maxitest-5.3.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Minitest + all the features you always wanted"
+HOMEPAGE="https://github.com/grosser/maxitest"
+SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/minitest-5.14.0:* <dev-ruby/minitest-5.20.0:*"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	# Remove developer-only gems from the gemspec and avoid git issues
+	sed -e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/\(debug\|bump\)/ s:^:#:' Gemfile || die
+
+	sed -e '/shows backtrace for/askip' \
+		-e '/describe.*line/ s/describe/xdescribe/' \
+		-e '/describe.*color/ s/describe/xdescribe/' \
+		-i spec/maxitest_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Use the correct target
+	sed -e '/\(run_cmd\|sh\)/ s:ruby:'${RUBY}':' \
+		-e '/\(run_cmd\|sh\)/ s:mtest:'${RUBY}' -S bin/mtest:' \
+		-i spec/maxitest_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" RSPEC_VERSION=3 ruby-ng_rspec spec
+}
diff --git a/dev-ruby/maxitest/maxitest-5.4.0.ebuild b/dev-ruby/maxitest/maxitest-5.4.0.ebuild
new file mode 100644
index 000000000000..014c2e859dc8
--- /dev/null
+++ b/dev-ruby/maxitest/maxitest-5.4.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Minitest + all the features you always wanted"
+HOMEPAGE="https://github.com/grosser/maxitest"
+SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/minitest-5.14.0:* <dev-ruby/minitest-5.21.0:*"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	# Remove developer-only gems from the gemspec and avoid git issues
+	sed -e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -e '/\(debug\|bump\)/ s:^:#:' \
+		-e 'agem "mutex_m"' \
+		-i Gemfile || die
+
+	sed -e '/shows backtrace for/askip' \
+		-e '/describe.*line/ s/describe/xdescribe/' \
+		-e '/describe.*color/ s/describe/xdescribe/' \
+		-i spec/maxitest_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Use the correct target
+	sed -e '/\(run_cmd\|sh\)/ s:ruby:'${RUBY}':' \
+		-e '/\(run_cmd\|sh\)/ s:mtest:'${RUBY}' -S bin/mtest:' \
+		-i spec/maxitest_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" RSPEC_VERSION=3 ruby-ng_rspec spec
+}
diff --git a/dev-ruby/mecab-ruby/mecab-ruby-0.996-r1.ebuild b/dev-ruby/mecab-ruby/mecab-ruby-0.996-r1.ebuild
deleted file mode 100644
index e1ef087a3172..000000000000
--- a/dev-ruby/mecab-ruby/mecab-ruby-0.996-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-inherit ruby-ng
-
-DESCRIPTION="Ruby binding for MeCab"
-HOMEPAGE="http://taku910.github.io/mecab/"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN%-*}/${P}.tar.gz"
-
-LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="~app-text/mecab-${PV}"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS README test.rb )
-HTML_DOCS=( bindings.html )
-
-each_ruby_configure() {
-	${RUBY} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1
-}
-
-each_ruby_install() {
-	emake DESTDIR="${D}" install
-}
-
-all_ruby_install() {
-	einstalldocs
-}
diff --git a/dev-ruby/mecab-ruby/mecab-ruby-0.996-r2.ebuild b/dev-ruby/mecab-ruby/mecab-ruby-0.996-r2.ebuild
index 706c47049361..d080cb6c7ec6 100644
--- a/dev-ruby/mecab-ruby/mecab-ruby-0.996-r2.ebuild
+++ b/dev-ruby/mecab-ruby/mecab-ruby-0.996-r2.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby30 ruby31 ruby32"
 
 inherit ruby-ng
 
@@ -13,7 +13,7 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
 
 LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 DEPEND="~app-text/mecab-${PV}"
diff --git a/dev-ruby/mechanize/Manifest b/dev-ruby/mechanize/Manifest
index 0af6901d8988..4306fd4784be 100644
--- a/dev-ruby/mechanize/Manifest
+++ b/dev-ruby/mechanize/Manifest
@@ -1,2 +1,3 @@
-DIST mechanize-2.8.3.gem 142336 BLAKE2B 2d71d4ba4db477c5049df1f7847c12945a5926a6d3746bbfd680606ee10beb04c5528e3073b86996e20e82a1f9a00066fe772396141860e3fd65a59c977fea2b SHA512 be467e995fd0a943b8db1588862f82c3d04b55a830dd1ca1d6c6cb3f65e446c1dd5ecea62d57639192e6caa521450ee31ac683ff9038c06578cb74b9557b6736
-DIST mechanize-2.8.4.gem 142336 BLAKE2B d09cdf7fcb250894b358c479dff60e6f72675574ce62e3f267717538761a322730b25798ea981ccb33eaa6617d88f96942be23ff5fdc6b4c35218b64569d97b5 SHA512 3b5a82d69070a8ad57e73527519efe91e5af8c9b3b75fcd38f598d37475ea8933b8799c12a6c59edd705936bdaab12fe1cd6cb024e165df99fe3cce18f0b7d01
+DIST mechanize-2.10.0.gem 144384 BLAKE2B 8a317b78c28d85f957cc50e54139305b2e64409b992ad5558385609d28986b33bfcbd947e7be3688524be0b2840a978004f4ea89b5d68fa5c52b2130ece0fc48 SHA512 e97d2b29326a12c2f5a7e2d997997c95a814fc127097bfd0786d2388ffec43a5a5bca05d5c4956fed6833b5aee84913cc2a275f56712a66651d3993ae0a46cb9
+DIST mechanize-2.9.1.gem 143872 BLAKE2B 0e5d9f8e2f6eadf8de1f252518646b58117e1151be595edb5827a69b1bc83ce063690fe41ea3ec38a66565d44cb46141e4a0b34c878308c69dbc1249304d6f0a SHA512 6525cf8ea31c36fb20f5d83bebdb647942f24ddee979a832343ea964de11e31421e4f68943c1b15c9bb519b9b11cda9ab2a1c10ceca412e1854b5b20dda7ac78
+DIST mechanize-2.9.2.gem 144384 BLAKE2B 8271f86ad29f720f196941cf151690a7ee76600d5045c0ff672dedbb8cf852c954fa4b765d158525a1deee14f508915c03b4ab1a50d0a02655b037492dfb3fdb SHA512 1b7ef1acf41dc2080d64ca3052380b988403cb64ee748a1d052153c8e3bc167f3fe98f7d2c80a706906ca1a5abab5209a87ebda04cd8a068d8be8e8223a23829
diff --git a/dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-1.patch b/dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-1.patch
new file mode 100644
index 000000000000..e2b72f2d8adf
--- /dev/null
+++ b/dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-1.patch
@@ -0,0 +1,64 @@
+From 762df0c71705d1c054aca4abd95a638774a47242 Mon Sep 17 00:00:00 2001
+From: Mike Dalessio <mike.dalessio@gmail.com>
+Date: Wed, 7 Jun 2023 10:30:37 -0400
+Subject: [PATCH] test: work around libxml2 encoding changes
+
+versions 2.11.0..2.11.4 do not recover from encoding errors. upcoming
+release will change the encoding of the resulting doc as a result of
+recovery changes in libxml2.
+
+See https://gitlab.gnome.org/GNOME/libxml2/-/issues/543 for more
+context.
+---
+ test/test_mechanize_page_link.rb | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/test/test_mechanize_page_link.rb b/test/test_mechanize_page_link.rb
+index 5e77dcc0..988328cc 100644
+--- a/test/test_mechanize_page_link.rb
++++ b/test/test_mechanize_page_link.rb
+@@ -1,5 +1,7 @@
+ # coding: utf-8
+ 
++puts "Nokogiri::VERSION_INFO: #{Nokogiri::VERSION_INFO}"
++
+ require 'mechanize/test_case'
+ 
+ class TestMechanizePageLink < Mechanize::TestCase
+@@ -111,11 +113,15 @@ def test_encoding_charset_after_title
+   def test_encoding_charset_after_title_bad
+     skip_if_nkf_dependency
+ 
++    # https://gitlab.gnome.org/GNOME/libxml2/-/issues/543
++    skip if Nokogiri.uses_libxml?([">= 2.11.0", "<= 2.11.4"])
++    expected_encoding = Nokogiri.uses_libxml?("< 2.11.0") ? 'UTF-8' : 'Shift_JIS'
++
+     page = util_page UTF8
+ 
+     assert_equal false, page.encoding_error?
+ 
+-    assert_equal 'UTF-8', page.encoding
++    assert_equal expected_encoding, page.encoding
+   end
+ 
+   def test_encoding_charset_after_title_double_bad
+@@ -131,6 +137,10 @@ def test_encoding_charset_after_title_double_bad
+   def test_encoding_charset_bad
+     skip_if_nkf_dependency
+ 
++    # https://gitlab.gnome.org/GNOME/libxml2/-/issues/543
++    skip if Nokogiri.uses_libxml?([">= 2.11.0", "<= 2.11.4"])
++    expected_encoding = Nokogiri.uses_libxml?("< 2.11.0") ? 'UTF-8' : 'Shift_JIS'
++
+     page = util_page "<title>#{UTF8_TITLE}</title>"
+     page.encodings.replace %w[
+       UTF-8
+@@ -139,7 +149,7 @@ def test_encoding_charset_bad
+ 
+     assert_equal false, page.encoding_error?
+ 
+-    assert_equal 'UTF-8', page.encoding
++    assert_equal expected_encoding, page.encoding
+   end
+ 
+   def test_encoding_meta_charset
diff --git a/dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-2.patch b/dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-2.patch
new file mode 100644
index 000000000000..3fcd8a270b16
--- /dev/null
+++ b/dev-ruby/mechanize/files/mechanize-2.9.1-libxml2-2.patch
@@ -0,0 +1,34 @@
+From 0ba09f46be6f1ce4adb94baca9867ed769f6535a Mon Sep 17 00:00:00 2001
+From: Mike Dalessio <mike.dalessio@gmail.com>
+Date: Fri, 11 Aug 2023 09:29:06 -0400
+Subject: [PATCH] test: work around libxml2 encoding changes
+
+Related to 762df0c7, we're seeing the upstream fixes did not ship in
+v2.11.5 so let's change the version test to assume it won't land until
+v2.12.0.
+---
+ test/test_mechanize_page_link.rb | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/test_mechanize_page_link.rb b/test/test_mechanize_page_link.rb
+index 988328cc..04294420 100644
+--- a/test/test_mechanize_page_link.rb
++++ b/test/test_mechanize_page_link.rb
+@@ -114,7 +114,7 @@ def test_encoding_charset_after_title_bad
+     skip_if_nkf_dependency
+ 
+     # https://gitlab.gnome.org/GNOME/libxml2/-/issues/543
+-    skip if Nokogiri.uses_libxml?([">= 2.11.0", "<= 2.11.4"])
++    skip if Nokogiri.uses_libxml?([">= 2.11.0", "< 2.12.0"])
+     expected_encoding = Nokogiri.uses_libxml?("< 2.11.0") ? 'UTF-8' : 'Shift_JIS'
+ 
+     page = util_page UTF8
+@@ -138,7 +138,7 @@ def test_encoding_charset_bad
+     skip_if_nkf_dependency
+ 
+     # https://gitlab.gnome.org/GNOME/libxml2/-/issues/543
+-    skip if Nokogiri.uses_libxml?([">= 2.11.0", "<= 2.11.4"])
++    skip if Nokogiri.uses_libxml?([">= 2.11.0", "< 2.12.0"])
+     expected_encoding = Nokogiri.uses_libxml?("< 2.11.0") ? 'UTF-8' : 'Shift_JIS'
+ 
+     page = util_page "<title>#{UTF8_TITLE}</title>"
diff --git a/dev-ruby/mechanize/mechanize-2.10.0.ebuild b/dev-ruby/mechanize/mechanize-2.10.0.ebuild
new file mode 100644
index 000000000000..4a9eec5d11bb
--- /dev/null
+++ b/dev-ruby/mechanize/mechanize-2.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md EXAMPLES.rdoc GUIDE.rdoc README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby library used for automating interaction with websites"
+HOMEPAGE="https://github.com/sparklemotion/mechanize"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="test"
+
+ruby_add_bdepend ">=dev-ruby/hoe-3.7
+	test? ( dev-ruby/minitest:5 )"
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.8:0
+	dev-ruby/base64
+	>=dev-ruby/domain_name-0.5.20190701:0
+	>=dev-ruby/http-cookie-1.0.3:0
+	dev-ruby/mime-types:3
+	>=dev-ruby/net-http-digest_auth-1.4.1:0
+	dev-ruby/net-http-persistent:4
+	>=dev-ruby/nokogiri-1.11.2:0
+	>=dev-ruby/rubyntlm-0.6.3:0
+	>=dev-ruby/webrick-1.7:0
+	>=dev-ruby/webrobots-0.1.2 =dev-ruby/webrobots-0.1*
+"
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e '$VERBOSE=true; Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/mechanize/mechanize-2.8.3.ebuild b/dev-ruby/mechanize/mechanize-2.8.3.ebuild
deleted file mode 100644
index 40c13a9b98e4..000000000000
--- a/dev-ruby/mechanize/mechanize-2.8.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md EXAMPLES.rdoc GUIDE.rdoc README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby library used for automating interaction with websites"
-HOMEPAGE="https://github.com/sparklemotion/mechanize"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend ">=dev-ruby/hoe-3.7
-	test? ( dev-ruby/minitest:5 )"
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.8:0
-	>=dev-ruby/domain_name-0.5.20190701:0
-	>=dev-ruby/http-cookie-1.0.3:0
-	dev-ruby/mime-types:3
-	>=dev-ruby/net-http-digest_auth-1.4.1:0
-	|| ( dev-ruby/net-http-persistent:4 dev-ruby/net-http-persistent:3 )
-	>=dev-ruby/nokogiri-1.11.2:0
-	>=dev-ruby/rubyntlm-0.6.3:0
-	>=dev-ruby/webrick-1.7:0
-	>=dev-ruby/webrobots-0.1.2 =dev-ruby/webrobots-0.1*
-"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/mechanize/mechanize-2.8.4.ebuild b/dev-ruby/mechanize/mechanize-2.8.4.ebuild
deleted file mode 100644
index 1cea8314b068..000000000000
--- a/dev-ruby/mechanize/mechanize-2.8.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md EXAMPLES.rdoc GUIDE.rdoc README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby library used for automating interaction with websites"
-HOMEPAGE="https://github.com/sparklemotion/mechanize"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend ">=dev-ruby/hoe-3.7
-	test? ( dev-ruby/minitest:5 )"
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.8:0
-	>=dev-ruby/domain_name-0.5.20190701:0
-	>=dev-ruby/http-cookie-1.0.3:0
-	dev-ruby/mime-types:3
-	>=dev-ruby/net-http-digest_auth-1.4.1:0
-	|| ( dev-ruby/net-http-persistent:4 dev-ruby/net-http-persistent:3 )
-	>=dev-ruby/nokogiri-1.11.2:0
-	>=dev-ruby/rubyntlm-0.6.3:0
-	>=dev-ruby/webrick-1.7:0
-	>=dev-ruby/webrobots-0.1.2 =dev-ruby/webrobots-0.1*
-"
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e '$VERBOSE=true; Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/mechanize/mechanize-2.9.1.ebuild b/dev-ruby/mechanize/mechanize-2.9.1.ebuild
new file mode 100644
index 000000000000..2c486d5111b9
--- /dev/null
+++ b/dev-ruby/mechanize/mechanize-2.9.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md EXAMPLES.rdoc GUIDE.rdoc README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby library used for automating interaction with websites"
+HOMEPAGE="https://github.com/sparklemotion/mechanize"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-libxml2-1.patch"
+	"${FILESDIR}/${P}-libxml2-2.patch"
+)
+
+ruby_add_bdepend ">=dev-ruby/hoe-3.7
+	test? ( dev-ruby/minitest:5 )"
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.8:0
+	>=dev-ruby/domain_name-0.5.20190701:0
+	>=dev-ruby/http-cookie-1.0.3:0
+	dev-ruby/mime-types:3
+	>=dev-ruby/net-http-digest_auth-1.4.1:0
+	dev-ruby/net-http-persistent:4
+	>=dev-ruby/nokogiri-1.11.2:0
+	>=dev-ruby/rubyntlm-0.6.3:0
+	>=dev-ruby/webrick-1.7:0
+	>=dev-ruby/webrobots-0.1.2 =dev-ruby/webrobots-0.1*
+"
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e '$VERBOSE=true; Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/mechanize/mechanize-2.9.2.ebuild b/dev-ruby/mechanize/mechanize-2.9.2.ebuild
new file mode 100644
index 000000000000..ae70fa37dc68
--- /dev/null
+++ b/dev-ruby/mechanize/mechanize-2.9.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md EXAMPLES.rdoc GUIDE.rdoc README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby library used for automating interaction with websites"
+HOMEPAGE="https://github.com/sparklemotion/mechanize"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+# PATCHES=(
+# 	"${FILESDIR}/${P}-libxml2-1.patch"
+# 	"${FILESDIR}/${P}-libxml2-2.patch"
+# )
+
+ruby_add_bdepend ">=dev-ruby/hoe-3.7
+	test? ( dev-ruby/minitest:5 )"
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.8:0
+	>=dev-ruby/domain_name-0.5.20190701:0
+	>=dev-ruby/http-cookie-1.0.3:0
+	dev-ruby/mime-types:3
+	>=dev-ruby/net-http-digest_auth-1.4.1:0
+	dev-ruby/net-http-persistent:4
+	>=dev-ruby/nokogiri-1.11.2:0
+	>=dev-ruby/rubyntlm-0.6.3:0
+	>=dev-ruby/webrick-1.7:0
+	>=dev-ruby/webrobots-0.1.2 =dev-ruby/webrobots-0.1*
+"
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e '$VERBOSE=true; Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/memo_wise/Manifest b/dev-ruby/memo_wise/Manifest
index c3b906da8bea..a9936cddafb7 100644
--- a/dev-ruby/memo_wise/Manifest
+++ b/dev-ruby/memo_wise/Manifest
@@ -1,2 +1,2 @@
-DIST memo_wise-1.6.0.tar.gz 184843 BLAKE2B 84b9cd5a2f757dc82cfb38359b39d26d60018fabc425c018b5537e61a5620dcdf0caf2863a8165fdf5f7ed5bc85400cae43b6ebbb3911ab7ce47160d7295240e SHA512 8a8a3a3a6c3a7dd9e518efed3b990917ad266e42266d30c80dbed90b279ad793ec795c080a1d080c7a23e2caec7e31e55388df802795ac1e5f7fb5e3ced93c03
 DIST memo_wise-1.7.0.tar.gz 185861 BLAKE2B 49ef04f4ef73ea24ac243c70d9545ed65c0fc8f4c6d9571d7f31c2728e82087cf1676aedd01aa1d0c1994a16ea7215b264a51fa2b8fe957cba3eb9088fd3a414 SHA512 3b87a1a81c060c34d4c91409ab6b2f8aa700e3313233e652e174f62c3dd826b675594d84d00ad21ae1f12dba4c6b0fe59431c54b4bbdf46430895635aa220b5f
+DIST memo_wise-1.8.0.tar.gz 186795 BLAKE2B afb1a027c6c981601d51262f13508fb8cd0074f6283bdb953537e300cc4970856765db60a92afa8331139ff98e50ba97529366f9adcd4d1ab93c93f52dcd2e48 SHA512 173dbab6fe93f21ad1ead34f4fbe8b0425747e1f2640472b9a1e4b79b935260cc0163d907d8ec423152d91165f32f2e8f1691dcdbd15830f375473415089ce6e
diff --git a/dev-ruby/memo_wise/memo_wise-1.6.0.ebuild b/dev-ruby/memo_wise/memo_wise-1.6.0.ebuild
deleted file mode 100644
index 90f908079563..000000000000
--- a/dev-ruby/memo_wise/memo_wise-1.6.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_GEMSPEC="memo_wise.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The wise choice for Ruby memoization"
-HOMEPAGE="https://github.com/panorama-ed/memo_wise"
-SRC_URI="https://github.com/panorama-ed/memo_wise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid specs for an unmaintained package with old dependencies that is optional.
-	sed -e '/require.*values/ s:^:#:' \
-		-e '/when the class is a Value class/,/^      end/ s:^:#:' \
-		-i spec/memo_wise_spec.rb || die
-
-	sed -e 's:_relative ": "./:' \
-		-e 's/__dir__/"."/' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/memo_wise/memo_wise-1.7.0.ebuild b/dev-ruby/memo_wise/memo_wise-1.7.0.ebuild
index 75eaf5252fb1..bfb5df0cd9f8 100644
--- a/dev-ruby/memo_wise/memo_wise-1.7.0.ebuild
+++ b/dev-ruby/memo_wise/memo_wise-1.7.0.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/memo_wise/memo_wise-1.8.0.ebuild b/dev-ruby/memo_wise/memo_wise-1.8.0.ebuild
new file mode 100644
index 000000000000..32095482d139
--- /dev/null
+++ b/dev-ruby/memo_wise/memo_wise-1.8.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="memo_wise.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The wise choice for Ruby memoization"
+HOMEPAGE="https://github.com/panorama-ed/memo_wise"
+SRC_URI="https://github.com/panorama-ed/memo_wise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~riscv"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid specs for an unmaintained package with old dependencies that is optional.
+	sed -e '/require.*values/ s:^:#:' \
+		-e '/when the class is a Value class/,/^      end/ s:^:#:' \
+		-i spec/memo_wise_spec.rb || die
+
+	sed -e 's:_relative ": "./:' \
+		-e 's/__dir__/"."/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/memoist/memoist-0.16.2-r1.ebuild b/dev-ruby/memoist/memoist-0.16.2-r1.ebuild
new file mode 100644
index 000000000000..9de2ccbd5d71
--- /dev/null
+++ b/dev-ruby/memoist/memoist-0.16.2-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+DESCRIPTION="ActiveSupport::Memoizable with a few enhancements"
+HOMEPAGE="https://github.com/matthewrudy/memoist"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/memoist/memoist-0.16.2.ebuild b/dev-ruby/memoist/memoist-0.16.2.ebuild
deleted file mode 100644
index bd0d05fb7fe8..000000000000
--- a/dev-ruby/memoist/memoist-0.16.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-DESCRIPTION="ActiveSupport::Memoizable with a few enhancements"
-HOMEPAGE="https://github.com/matthewrudy/memoist"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/memoizable/memoizable-0.4.2-r1.ebuild b/dev-ruby/memoizable/memoizable-0.4.2-r1.ebuild
index 98dd49f80c74..803484ba53bb 100644
--- a/dev-ruby/memoizable/memoizable-0.4.2-r1.ebuild
+++ b/dev-ruby/memoizable/memoizable-0.4.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/memoize/Manifest b/dev-ruby/memoize/Manifest
deleted file mode 100644
index 869ca7c0e6d3..000000000000
--- a/dev-ruby/memoize/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST memoize-1.3.1.gem 7680 BLAKE2B 3636f1911b6aac615a216edec8a154cf143174b63904f62120dd92123dd390193aea43967c60b3674f5ae2f81dcde9874e90c3222bb211e64db58a31eda174ab SHA512 048e1f6025519a32ca828cf1cf92c97ff94a0fb60ac64bf5b4d59ec715e610472307df8905f06f0be3d46529bf8eaaaf4d4874463b6e46934af0fea4766fd3ce
diff --git a/dev-ruby/memoize/memoize-1.3.1-r2.ebuild b/dev-ruby/memoize/memoize-1.3.1-r2.ebuild
deleted file mode 100644
index 8ff665ccf067..000000000000
--- a/dev-ruby/memoize/memoize-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README"
-
-inherit ruby-fakegem
-DESCRIPTION="A Ruby library that lets you memoize methods"
-HOMEPAGE="https://github.com/djberg96/memoize"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 ) "
-
-all_ruby_prepare() {
-	sed -i -e 's/Config/RbConfig/' Rakefile || die
-}
diff --git a/dev-ruby/memoize/metadata.xml b/dev-ruby/memoize/metadata.xml
deleted file mode 100644
index d1a60a231719..000000000000
--- a/dev-ruby/memoize/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>naota@gentoo.org</email>
-    <name>Naohiro Aota</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">djberg96/memoize</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/mercenary/mercenary-0.4.0-r1.ebuild b/dev-ruby/mercenary/mercenary-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..5109a31b4774
--- /dev/null
+++ b/dev-ruby/mercenary/mercenary-0.4.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="History.markdown README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Lightweight and flexible library for writing command-line apps"
+HOMEPAGE="https://github.com/jekyll/mercenary"
+
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
diff --git a/dev-ruby/mercenary/mercenary-0.4.0.ebuild b/dev-ruby/mercenary/mercenary-0.4.0.ebuild
deleted file mode 100644
index df32666d489a..000000000000
--- a/dev-ruby/mercenary/mercenary-0.4.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="History.markdown README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Lightweight and flexible library for writing command-line apps"
-HOMEPAGE="https://github.com/jekyll/mercenary"
-
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
diff --git a/dev-ruby/metaclass/metaclass-0.0.4-r1.ebuild b/dev-ruby/metaclass/metaclass-0.0.4-r1.ebuild
deleted file mode 100644
index 42ac6b126576..000000000000
--- a/dev-ruby/metaclass/metaclass-0.0.4-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="metaclass.gemspec"
-
-inherit ruby-fakegem
-SRC_URI="https://github.com/floehopper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-DESCRIPTION="Adds a __metaclass__ method to all Ruby objects"
-HOMEPAGE="https://github.com/floehopper/metaclass"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile test/test_helper.rb || die
-	sed -i -e 's/git ls-files/find/' -e '/\(test_files\|executables\)/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/metaclass/metaclass-0.0.4-r2.ebuild b/dev-ruby/metaclass/metaclass-0.0.4-r2.ebuild
index 8942bd6c6211..3173afd987be 100644
--- a/dev-ruby/metaclass/metaclass-0.0.4-r2.ebuild
+++ b/dev-ruby/metaclass/metaclass-0.0.4-r2.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/floehopper/metaclass"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/metasm/metadata.xml b/dev-ruby/metasm/metadata.xml
index ea19cfc370a2..7a38fd1850ff 100644
--- a/dev-ruby/metasm/metadata.xml
+++ b/dev-ruby/metasm/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
   </maintainer>
 </pkgmetadata>
diff --git a/dev-ruby/method_source/Manifest b/dev-ruby/method_source/Manifest
index ce1e94cbb8ca..00fae2ebd2db 100644
--- a/dev-ruby/method_source/Manifest
+++ b/dev-ruby/method_source/Manifest
@@ -1 +1,2 @@
 DIST method_source-1.0.0.gem 13824 BLAKE2B 1b6b4c23b2e73972acb69bf488f39d88fae3bffdc4e28559d880ce817199b9c1da8183f10cf8be5122535415b938c9f3964c9b4bade1dfba7fb4457c052185dd SHA512 d3a2dace01d987203d0520583120bfe08812237602421efc3ec7ff8054f2403b0aac13f15b8b91dfdb6e6679a519f707ede67ea6fed72cd8242edacc828a9caa
+DIST method_source-1.1.0.gem 13824 BLAKE2B 9b626e3db19a4093a61505afb04c65a2fc497146639656b9fd204f87d17d91473b11327ff086c8f3e2e1c0a462fa19e3e9c39f0b2817f26918c9a7c4b7cdaf54 SHA512 37cf2ff685adb68d1dd9c72922aa5ee1691a98c049ee402f5d630a783cacf9c971b0f25ac5e67b8d97211a6763e6f81825cf887fe9b4aef3359bad88335110d9
diff --git a/dev-ruby/method_source/method_source-1.0.0-r1.ebuild b/dev-ruby/method_source/method_source-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..1d2e9dad05b1
--- /dev/null
+++ b/dev-ruby/method_source/method_source-1.0.0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Retrieve the source code for a method"
+HOMEPAGE="https://github.com/banister/method_source"
+SLOT="0"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-ruby/method_source/method_source-1.0.0.ebuild b/dev-ruby/method_source/method_source-1.0.0.ebuild
index 2380cbb77230..a3930b32229b 100644
--- a/dev-ruby/method_source/method_source-1.0.0.ebuild
+++ b/dev-ruby/method_source/method_source-1.0.0.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_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
diff --git a/dev-ruby/method_source/method_source-1.1.0.ebuild b/dev-ruby/method_source/method_source-1.1.0.ebuild
new file mode 100644
index 000000000000..09638baf92d5
--- /dev/null
+++ b/dev-ruby/method_source/method_source-1.1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Retrieve the source code for a method"
+HOMEPAGE="https://github.com/banister/method_source"
+SLOT="0"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-ruby/middleware/metadata.xml b/dev-ruby/middleware/metadata.xml
index 7a38fd1850ff..4b8f1cb18d8a 100644
--- a/dev-ruby/middleware/metadata.xml
+++ b/dev-ruby/middleware/metadata.xml
@@ -5,4 +5,7 @@
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">mitchellh/middleware</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/middleware/middleware-0.1.0-r1.ebuild b/dev-ruby/middleware/middleware-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..7eb5a85ee0a6
--- /dev/null
+++ b/dev-ruby/middleware/middleware-0.1.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md user_guide.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Generalized implementation of the middleware abstraction for Ruby"
+HOMEPAGE="https://github.com/mitchellh/middleware"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid test failing with rspec 2.14+
+	sed -i -e '/should raise an error if an invalid middleware is given/,/^  end/ s:^:#:' spec/middleware/runner_spec.rb
+}
diff --git a/dev-ruby/middleware/middleware-0.1.0.ebuild b/dev-ruby/middleware/middleware-0.1.0.ebuild
deleted file mode 100644
index ef4b9e788df9..000000000000
--- a/dev-ruby/middleware/middleware-0.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md user_guide.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Generalized implementation of the middleware abstraction for Ruby"
-HOMEPAGE="https://github.com/mitchellh/middleware"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid test failing with rspec 2.14+
-	sed -i -e '/should raise an error if an invalid middleware is given/,/^  end/ s:^:#:' spec/middleware/runner_spec.rb
-}
diff --git a/dev-ruby/mime-types-data/Manifest b/dev-ruby/mime-types-data/Manifest
index aab107ad7fb6..ec2b333f3644 100644
--- a/dev-ruby/mime-types-data/Manifest
+++ b/dev-ruby/mime-types-data/Manifest
@@ -1,3 +1,4 @@
-DIST mime-types-data-3.2021.0901.gem 170496 BLAKE2B 549bddb921941f15599db71dd76ed1502341101386c10550372796d5de8591575f4525276e196bfafe246132ce6a67007cd8afb0634013e5690eef06439af84a SHA512 382cfe97d19e516925dfa04220516ea6f2c4002e92831d6bb112c11a5378bf8af5b373763841ed84e6fa1bca4d72d4fe9ccde94ad0a9f6f7ce9930270574d8db
-DIST mime-types-data-3.2021.1115.gem 195072 BLAKE2B 233d801305d48a6fc126b8439b2067e6c6eb9e27bd48391fe0a701ca01b12aa23cf807999f46ad945e766b26d8d25a16453a26148f7c91d9322ef8704590cb4b SHA512 995606efc98dcdb9c19cf94ea758a210fde3e56ed6cd853101c97964dff0fba0da07aff87c4e39bbe11887ce2e15b19d781fce4ce264671d004426dde2761c64
-DIST mime-types-data-3.2022.0105.gem 196096 BLAKE2B a36b9254e256c86adf7bff10a0c2e2d4d0bd25257ff7c8b5bc65e57012b2b70a5d1ce9a1ef88126a18cf00bf801eb068160dfbdea4119afe8ee99075c54eb0ee SHA512 4b5998fb5d39ba89d4ee4f2f1fe20ec93a6b7214b28b77421dd9f7647b14c88342ba17f709f34640f65ce4c1bda08bd2be4aa35c7f99ea1ba2f9e21458540a00
+DIST mime-types-data-3.2023.0218.1.gem 201216 BLAKE2B 3ccd9fcdc70fe9b09f0e9ca61356dd4c2563ac7fe32d75fdbdbaace9ba0757b274fec98c56cfdcae7f2f9f0840cc83a7ea9f3c9e420b3c8de076c87abb1621d9 SHA512 db0c4fddfcdd21ed1d8bd05039a14406600611be7fabd5d0021e8972d89e85ef2dd2d4e75bafb4e9ac7cf15606b4d4f67d6c6760fca6569fb2e2d6ba0d3f8145
+DIST mime-types-data-3.2023.1205.gem 205312 BLAKE2B a385ba1fdbb76621f7c10704629950f6a549befed6e930cdf73120d3834e87a0f722e0b1d407c85634f9786d15adc31f2d71cc0d77fb9a29bd629018df10670d SHA512 5e4fdf1dffa3a7bd1391215e72a10f53fd3570bf2665c82a059d595473a2ade7c1ec58abb4e6624ba67dba58b28b32c7db87f04a2b2a44e027d719a2ef22d246
+DIST mime-types-data-3.2024.0206.gem 205824 BLAKE2B 520922a60b386119e1e1229a11befcbfbf28ba5e179213a68d9bd4f344f2033c283799c1f39a43827d96fddd8a91856a938da09d95225a54aea5a46968c24264 SHA512 765c8671ec68b2c43f0f9a91da455e7d7533ec85a40f2b251861b0b0eab992dcdd3cbd2bc81631f447d683e1ca38b42e2724af40d437939736aa29170b395c13
+DIST mime-types-data-3.2024.0305.gem 205824 BLAKE2B 822f04fa9a06e4566d04b153a20d807b6e9c835c394c310e15f62f87098a3c1491e9fd0d9b08de5577e0eda106a484161744df89b686b8044c48b5a4146f81e4 SHA512 e6ba917fbf779c6b4b474c19372c06aa64b1eafc66e275278300b296ad796e051074369f7d593f82b49270631f631be7e2f37d1498f875d20ba23d0a68273754
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2021.0901.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2021.0901.ebuild
deleted file mode 100644
index 25773f3c2db9..000000000000
--- a/dev-ruby/mime-types-data/mime-types-data-3.2021.0901.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Registry for information about MIME media type definitions"
-HOMEPAGE="https://github.com/mime-types/mime-types-data"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2021.1115.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2021.1115.ebuild
deleted file mode 100644
index 177ccbaec43f..000000000000
--- a/dev-ruby/mime-types-data/mime-types-data-3.2021.1115.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Registry for information about MIME media type definitions"
-HOMEPAGE="https://github.com/mime-types/mime-types-data"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2022.0105.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2022.0105.ebuild
deleted file mode 100644
index a33f5907aae4..000000000000
--- a/dev-ruby/mime-types-data/mime-types-data-3.2022.0105.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Registry for information about MIME media type definitions"
-HOMEPAGE="https://github.com/mime-types/mime-types-data"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2023.0218.1.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2023.0218.1.ebuild
new file mode 100644
index 000000000000..b7863e0edc3a
--- /dev/null
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2023.0218.1.ebuild
@@ -0,0 +1,22 @@
+# 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"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Registry for information about MIME media type definitions"
+HOMEPAGE="https://github.com/mime-types/mime-types-data"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2023.1205.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2023.1205.ebuild
new file mode 100644
index 000000000000..8136a5a362cc
--- /dev/null
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2023.1205.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Registry for information about MIME media type definitions"
+HOMEPAGE="https://github.com/mime-types/mime-types-data"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2024.0206.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2024.0206.ebuild
new file mode 100644
index 000000000000..122dc1ac578e
--- /dev/null
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2024.0206.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Registry for information about MIME media type definitions"
+HOMEPAGE="https://github.com/mime-types/mime-types-data"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2024.0305.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2024.0305.ebuild
new file mode 100644
index 000000000000..122dc1ac578e
--- /dev/null
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2024.0305.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Registry for information about MIME media type definitions"
+HOMEPAGE="https://github.com/mime-types/mime-types-data"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
diff --git a/dev-ruby/mime-types/Manifest b/dev-ruby/mime-types/Manifest
index 828c6130b635..5746dec98b58 100644
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@@ -1,3 +1,4 @@
-DIST mime-types-2.99.3.gem 149504 BLAKE2B f0e34e5379948e5e742f3d9db0214bcf40bcdf425866509fe40e74188673b779da11980ab68d202c5129295ecda1a19f4b177f51f1add0b413f29669717060b7 SHA512 1a71cbe2baed27fa14a914e2ad112545c42c7560e93617a41fd3a5bf61e0ee1e5b5385e0cca7488302aecfc25eb6cd071a33d57291aa4c3280cb2621989daa48
-DIST mime-types-3.3.1.gem 36352 BLAKE2B 66b97cc51d157d445d05823a3059efb6684a59d6b976945df77beb6497979a83d3ada4832cc36a42b6fad2353d1b5f2d7d1271a7947a0264978f30b857c0c7c3 SHA512 48646c5d3cc1b65ad0418bd765c86102d5dd7d0196f1b2b4b92acd350d6927e0c0fec3d30d04bf8b073d342f56b38663dee791f2c87f82b5743c6508265692ec
 DIST mime-types-3.4.1.gem 36864 BLAKE2B 09c6c2fad3cad3535e5c357b49c84b2c1809903235f3bdbeeb766157c48bfc899f32fe95be535feab3c7835c4b535e25b49019c14f51dee1a812fdb735f0f7af SHA512 d0cec7afbe1685c008765997c3047f23bbb0bd10989cd82475805f932e61c400b3d2e60f5f95804c46919b57f0d3644c866be358b0c4c653ace43d62bbc98e4f
+DIST mime-types-3.5.0.gem 37888 BLAKE2B 1638dbe9dcb5cabf64a05d39d5069b10aad4c9749865a57e089e0e7a9ab6f4073833e6f86008506c634245755e2e66b44e204e68f0c4da4a0052d500e58bbf9e SHA512 c7177a2a54aaa8af88f14222c48011905379586ac160cab420dd7c49bfaa92159dd034398200908f5e18440ff69dbff767390948cbdb92fc325d552ca5087ea8
+DIST mime-types-3.5.1.gem 37888 BLAKE2B 51ae93cf8b3838c5b1353d7dc251ca34ff9519e4df36b4e05b34d9f981d441f7c8ad6952133d6706791a98946e3b3a67a083457fe7919c80ef6c64964ae92f3e SHA512 3bba16ed3ad8050fb4b62b65c3f087885178a2514c7375d949956df81a9ebdeaa7698dba9671ee8bfc958117b1d18dda9679ebf5253300a7ffafde53e8fdeeda
+DIST mime-types-3.5.2.gem 37888 BLAKE2B 1977922fe77029380a0adb3d3a12599e428cbf5abb8167595c3848c115f75046e69b1443e3644d506e0f434ff164ad75efcd3f7e663c9dbf89f81ec923735e05 SHA512 099e3b984d3637dfeaf00a76e56427c278ce3c48b77aaa45ed63521e73b1877d773d0ebe4fbe1ec21113987f7d39cda0deeefb7c9ded5f2a3024577e3e6ab6ff
diff --git a/dev-ruby/mime-types/mime-types-2.99.3.ebuild b/dev-ruby/mime-types/mime-types-2.99.3.ebuild
deleted file mode 100644
index 95fcf9162b30..000000000000
--- a/dev-ruby/mime-types/mime-types-2.99.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ruby30: not compatible
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc History-Types.rdoc README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a mailcap-like MIME Content-Type lookup for Ruby"
-HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
-
-LICENSE="MIT Artistic GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on minitest-focus.
-	sed -i -e '/focus/ s:^:#:' \
-		-e 's:fivemat/::' \
-		test/minitest_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/mime-types/mime-types-3.3.1.ebuild b/dev-ruby/mime-types/mime-types-3.3.1.ebuild
deleted file mode 100644
index 1667d3883c70..000000000000
--- a/dev-ruby/mime-types/mime-types-3.3.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a mailcap-like MIME Content-Type lookup for Ruby"
-HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/minitest-bonus-assertions:2 dev-ruby/minitest-hooks:1 )"
-
-ruby_add_rdepend ">=dev-ruby/mime-types-data-3.2015:3"
-
-all_ruby_prepare() {
-	# Avoid unneeded developer-only dependencies.
-	sed -i -e '/\(focus\|rg\)/ s:^:#:' \
-		-e 's:fivemat/::' test/minitest_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/mime-types/mime-types-3.4.1.ebuild b/dev-ruby/mime-types/mime-types-3.4.1.ebuild
index d07f3618ca0d..12c4a6d4803a 100644
--- a/dev-ruby/mime-types/mime-types-3.4.1.ebuild
+++ b/dev-ruby/mime-types/mime-types-3.4.1.ebuild
@@ -1,9 +1,9 @@
-# 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"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="History.md README.rdoc"
 
diff --git a/dev-ruby/mime-types/mime-types-3.5.0.ebuild b/dev-ruby/mime-types/mime-types-3.5.0.ebuild
new file mode 100644
index 000000000000..efb7bfe287e9
--- /dev/null
+++ b/dev-ruby/mime-types/mime-types-3.5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a mailcap-like MIME Content-Type lookup for Ruby"
+HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/minitest-bonus-assertions:2 dev-ruby/minitest-hooks:1 )"
+
+ruby_add_rdepend ">=dev-ruby/mime-types-data-3.2015:3"
+
+all_ruby_prepare() {
+	# Avoid unneeded developer-only dependencies.
+	sed -i -e '/\(focus\|rg\)/ s:^:#:' \
+		-e 's:fivemat/::' test/minitest_helper.rb || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=1 ${RUBY} -Ilib:test:. -e 'require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/mime-types/mime-types-3.5.1.ebuild b/dev-ruby/mime-types/mime-types-3.5.1.ebuild
new file mode 100644
index 000000000000..bcab1e489937
--- /dev/null
+++ b/dev-ruby/mime-types/mime-types-3.5.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a mailcap-like MIME Content-Type lookup for Ruby"
+HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/minitest-bonus-assertions:2 dev-ruby/minitest-hooks:1 )"
+
+ruby_add_rdepend ">=dev-ruby/mime-types-data-3.2015:3"
+
+all_ruby_prepare() {
+	# Avoid unneeded developer-only dependencies.
+	sed -i -e '/\(focus\|rg\)/ s:^:#:' \
+		-e 's:fivemat/::' test/minitest_helper.rb || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=1 ${RUBY} -Ilib:test:. -e 'require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/mime-types/mime-types-3.5.2.ebuild b/dev-ruby/mime-types/mime-types-3.5.2.ebuild
new file mode 100644
index 000000000000..820ebb8bda7d
--- /dev/null
+++ b/dev-ruby/mime-types/mime-types-3.5.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a mailcap-like MIME Content-Type lookup for Ruby"
+HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/minitest-hooks:1 )"
+
+ruby_add_rdepend ">=dev-ruby/mime-types-data-3.2015:3"
+
+all_ruby_prepare() {
+	# Avoid unneeded developer-only dependencies.
+	sed -i -e '/\(focus\|rg\)/ s:^:#:' \
+		-e 's:fivemat/::' test/minitest_helper.rb || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=1 ${RUBY} -Ilib:test:. -e 'require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/mimemagic/metadata.xml b/dev-ruby/mimemagic/metadata.xml
index 6761cf252f39..f0fc4a061131 100644
--- a/dev-ruby/mimemagic/metadata.xml
+++ b/dev-ruby/mimemagic/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">minad/mimemagic</remote-id>
+    <remote-id type="github">mimemagicrb/mimemagic</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/mimemagic/mimemagic-0.3.10-r1.ebuild b/dev-ruby/mimemagic/mimemagic-0.3.10-r1.ebuild
index 14cda3064dd1..33422b38290c 100644
--- a/dev-ruby/mimemagic/mimemagic-0.3.10-r1.ebuild
+++ b/dev-ruby/mimemagic/mimemagic-0.3.10-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/mimemagic/mimemagic-0.3.10.ebuild b/dev-ruby/mimemagic/mimemagic-0.3.10.ebuild
deleted file mode 100644
index 95b97506ad87..000000000000
--- a/dev-ruby/mimemagic/mimemagic-0.3.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC=mimemagic.gemspec
-
-inherit prefix ruby-fakegem
-
-DESCRIPTION="Fast mime detection by extension or content"
-HOMEPAGE="https://github.com/mimemagicrb/mimemagic"
-SRC_URI="https://github.com/mimemagicrb/mimemagic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND+=" x11-misc/shared-mime-info"
-
-ruby_add_rdepend "
-	dev-ruby/nokogiri
-	dev-ruby/rake
-"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	cp "${FILESDIR}/${PN}-0.3.9-path.rb" lib/mimemagic/path.rb || die
-	eprefixify lib/mimemagic/path.rb
-
-	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/mimemagic/mimemagic-0.4.3-r1.ebuild b/dev-ruby/mimemagic/mimemagic-0.4.3-r1.ebuild
index af2ea613b1de..303de304e2be 100644
--- a/dev-ruby/mimemagic/mimemagic-0.4.3-r1.ebuild
+++ b/dev-ruby/mimemagic/mimemagic-0.4.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/mimemagic/mimemagic-0.4.3-r2.ebuild b/dev-ruby/mimemagic/mimemagic-0.4.3-r2.ebuild
new file mode 100644
index 000000000000..e89f936c8497
--- /dev/null
+++ b/dev-ruby/mimemagic/mimemagic-0.4.3-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC=mimemagic.gemspec
+
+inherit prefix ruby-fakegem
+
+DESCRIPTION="Fast mime detection by extension or content"
+HOMEPAGE="https://github.com/mimemagicrb/mimemagic"
+SRC_URI="https://github.com/mimemagicrb/mimemagic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND+=" x11-misc/shared-mime-info"
+
+ruby_add_rdepend "
+	dev-ruby/nokogiri
+	dev-ruby/rake
+"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	cp "${FILESDIR}/${PN}-0.3.9-path.rb" lib/mimemagic/path.rb || die
+	eprefixify lib/mimemagic/path.rb
+
+	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each {|f| require f}' || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+	ruby_fakegem_extensions_installed
+}
diff --git a/dev-ruby/mimemagic/mimemagic-0.4.3.ebuild b/dev-ruby/mimemagic/mimemagic-0.4.3.ebuild
deleted file mode 100644
index d8b4ab4e72fa..000000000000
--- a/dev-ruby/mimemagic/mimemagic-0.4.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC=mimemagic.gemspec
-
-inherit prefix ruby-fakegem
-
-DESCRIPTION="Fast mime detection by extension or content"
-HOMEPAGE="https://github.com/mimemagicrb/mimemagic"
-SRC_URI="https://github.com/mimemagicrb/mimemagic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND+=" x11-misc/shared-mime-info"
-
-ruby_add_rdepend "
-	dev-ruby/nokogiri
-	dev-ruby/rake
-"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	cp "${FILESDIR}/${PN}-0.3.9-path.rb" lib/mimemagic/path.rb || die
-	eprefixify lib/mimemagic/path.rb
-
-	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index ce6185e1c125..68f8553bec04 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1 +1 @@
-DIST mini_magick-4.11.0.tar.gz 1193122 BLAKE2B b736bb1b147ec2b1f926ebf5a3b908e659d6dfcaca0e7199932086e09cfd6be21046dff3c4e0edb7877c40c5bbda73aa0f521b305c15abb6fab931242b4561c9 SHA512 7201a94345aa95bb9466369c78fbc48108b245df77435e839a3f0df7694f4da4eeff3a7b3da4aaabedefd93859abde1145baef6f0f01580f66255653be88f5d2
+DIST mini_magick-4.12.0.tar.gz 1331356 BLAKE2B 84d222424c354e83a041f2c6352f92d11889ed51126f90dd55ccbdbfa31974b79977bf3cf10d30c5f350d17a7dd2d20bf538c2eb78f65c58a29a81f71290acf8 SHA512 8801b4fe9cfed47eeae91cffd5364ca828f8b21d7040217d72d0f5ca9070e02f191b8f87b933c067c0d914332806f14e1b87621dbca06df047c43db8a72cd559
diff --git a/dev-ruby/mini_magick/mini_magick-4.11.0-r1.ebuild b/dev-ruby/mini_magick/mini_magick-4.11.0-r1.ebuild
deleted file mode 100644
index 9387743eba56..000000000000
--- a/dev-ruby/mini_magick/mini_magick-4.11.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Manipulate images with minimal use of memory"
-HOMEPAGE="https://github.com/minimagick/minimagick"
-SRC_URI="https://github.com/minimagick/minimagick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="minimagick-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-# It's only used at runtime in this case because this extension only
-# _calls_ the commands. But when we run tests we're going to need tiff
-# and jpeg support at a minimum.
-RDEPEND+=" media-gfx/imagemagick"
-DEPEND+=" test? ( virtual/imagemagick-tools[jpeg,png,tiff] )"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	# remove executable bit from all files
-	find "${S}" -type f -exec chmod -x {} +
-
-	sed -i -e '/\([Bb]undler\|pry\)/ s:^:#:' spec/spec_helper.rb || die
-
-	# Don't force a specific formatter but use overall Gentoo defaults.
-	sed -i -e '/config.formatter/d' spec/spec_helper.rb || die
-
-	# Avoid broken spec that does not assume . in path name
-	sed -i -e '/reformats a layer/,/end/ s:^:#:' spec/lib/mini_magick/image_spec.rb || die
-
-	# Avoid spec broken by recent imagemagick updates
-	sed -i -e '/cache files generated from .mpc/askip' spec/lib/mini_magick/image_spec.rb || die
-	sed -i -e '/does not hang when parsing verbose data/askip' spec/lib/mini_magick/image_spec.rb || die
-
-	# Avoid graphicsmagick tests because installing both in parallel for
-	# tests is hard.
-	sed -i -e 's/:graphicsmagick//' spec/spec_helper.rb || die
-	sed -i -e '/identifies when gm exists/,/^    end/ s:^:#:' spec/lib/mini_magick/utilities_spec.rb || die
-	sed -i -e '/returns GraphicsMagick/,/^    end/ s:^:#:' spec/lib/mini_magick_spec.rb || die
-	sed -i -e 's/"GraphicsMagick"//' spec/lib/mini_magick/image_spec.rb || die
-
-	# Avoid posix-spawn tests because is not the default, does not work with ruby30 and appears to be unmaintained.
-	sed	-e '/SHELL_APIS.*posix-spawn/ s:^:#:' \
-		-e 's/"posix-spawn"//' \
-		-i spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/mini_magick/mini_magick-4.11.0.ebuild b/dev-ruby/mini_magick/mini_magick-4.11.0.ebuild
deleted file mode 100644
index 4617f26bb68d..000000000000
--- a/dev-ruby/mini_magick/mini_magick-4.11.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Manipulate images with minimal use of memory"
-HOMEPAGE="https://github.com/minimagick/minimagick"
-SRC_URI="https://github.com/minimagick/minimagick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="minimagick-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-# It's only used at runtime in this case because this extension only
-# _calls_ the commands. But when we run tests we're going to need tiff
-# and jpeg support at a minimum.
-RDEPEND+=" media-gfx/imagemagick"
-DEPEND+=" test? ( virtual/imagemagick-tools[jpeg,png,tiff] )"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/posix-spawn dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	# remove executable bit from all files
-	find "${S}" -type f -exec chmod -x {} +
-
-	sed -i -e '/\([Bb]undler\|pry\)/ s:^:#:' spec/spec_helper.rb || die
-
-	# Don't force a specific formatter but use overall Gentoo defaults.
-	sed -i -e '/config.formatter/d' spec/spec_helper.rb || die
-
-	# Avoid broken spec that does not assume . in path name
-	sed -i -e '/reformats a layer/,/end/ s:^:#:' spec/lib/mini_magick/image_spec.rb || die
-
-	# Avoid spec broken by recent imagemagick updates
-	sed -i -e '/cache files generated from .mpc/askip' spec/lib/mini_magick/image_spec.rb || die
-	sed -i -e '/does not hang when parsing verbose data/askip' spec/lib/mini_magick/image_spec.rb || die
-
-	# Avoid graphicsmagick tests because installing both in parallel for
-	# tests is hard.
-	sed -i -e 's/:graphicsmagick//' spec/spec_helper.rb || die
-	sed -i -e '/identifies when gm exists/,/^    end/ s:^:#:' spec/lib/mini_magick/utilities_spec.rb || die
-	sed -i -e '/returns GraphicsMagick/,/^    end/ s:^:#:' spec/lib/mini_magick_spec.rb || die
-	sed -i -e 's/"GraphicsMagick"//' spec/lib/mini_magick/image_spec.rb || die
-}
diff --git a/dev-ruby/mini_magick/mini_magick-4.12.0.ebuild b/dev-ruby/mini_magick/mini_magick-4.12.0.ebuild
new file mode 100644
index 000000000000..47b68f055782
--- /dev/null
+++ b/dev-ruby/mini_magick/mini_magick-4.12.0.ebuild
@@ -0,0 +1,62 @@
+# 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_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Manipulate images with minimal use of memory"
+HOMEPAGE="https://github.com/minimagick/minimagick"
+SRC_URI="https://github.com/minimagick/minimagick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="minimagick-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+# It's only used at runtime in this case because this extension only
+# _calls_ the commands. But when we run tests we're going to need tiff
+# and jpeg support at a minimum.
+RDEPEND+=" media-gfx/imagemagick"
+DEPEND+=" test? ( virtual/imagemagick-tools[jpeg,png,tiff] )"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/webmock )"
+
+all_ruby_prepare() {
+	# remove executable bit from all files
+	find "${S}" -type f -exec chmod -x {} +
+
+	sed -i -e '/\([Bb]undler\|pry\)/ s:^:#:' spec/spec_helper.rb || die
+
+	# Don't force a specific formatter but use overall Gentoo defaults.
+	sed -i -e '/config.formatter/d' spec/spec_helper.rb || die
+
+	# Avoid broken spec that does not assume . in path name
+	sed -i -e '/reformats a layer/,/end/ s:^:#:' spec/lib/mini_magick/image_spec.rb || die
+
+	# Avoid spec broken by recent imagemagick updates
+	sed -i -e '/cache files generated from .mpc/askip' spec/lib/mini_magick/image_spec.rb || die
+	sed -i -e '/does not hang when parsing verbose data/askip' spec/lib/mini_magick/image_spec.rb || die
+
+	# Avoid graphicsmagick tests because installing both in parallel for
+	# tests is hard.
+	sed -i -e 's/:graphicsmagick//' spec/spec_helper.rb || die
+	sed -i -e '/identifies when gm exists/,/^    end/ s:^:#:' spec/lib/mini_magick/utilities_spec.rb || die
+	sed -i -e '/returns GraphicsMagick/,/^    end/ s:^:#:' spec/lib/mini_magick_spec.rb || die
+	sed -i -e 's/"GraphicsMagick"//' spec/lib/mini_magick/image_spec.rb || die
+
+	# Avoid posix-spawn tests because is not the default, does not work with ruby30 and appears to be unmaintained.
+	sed	-e '/SHELL_APIS.*posix-spawn/ s:^:#:' \
+		-e 's/"posix-spawn"//' \
+		-i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/mini_mime/Manifest b/dev-ruby/mini_mime/Manifest
index cc2ca084921c..0c6f38dbf8cd 100644
--- a/dev-ruby/mini_mime/Manifest
+++ b/dev-ruby/mini_mime/Manifest
@@ -1,3 +1 @@
-DIST mini_mime-1.0.3.tar.gz 33554 BLAKE2B 7be4a7b8ee066a1106a42ff28ab57684460d061dc9205a992af471f5e9024be080388451f6f0d171c09b96f53c4748c9490afcfa23a82f478c5e96b559c8c97d SHA512 d8259b81821d35ddb8f9038ad2f672816f20e098ff74d8245fdc2a8a6e4be6918b865a25372348ef8dd777483883238919293a683df064d15ac7045f9b40bb0e
-DIST mini_mime-1.1.1.tar.gz 33747 BLAKE2B 2b18012d611157c1ace9211e99f2c6b41931a932ed9161b24367def3bf70d5780287a0b855ac32aae202e32a1158d08c7004515841e3baa1a2789d296bdf928e SHA512 b59e5d5a94b80eae62c9be2722e2fa8306620e8b4f54e3c7d020961a89b3d796e26b18a92b6da29677c3822ab68783874486cd1080ca552c9c2fcd3acb13811f
-DIST mini_mime-1.1.2.tar.gz 33779 BLAKE2B acf4fc7bbaf4bb9df9a35aa8f093f3f607b0f57296f29511aa4d0cc8770af3c959f6c2b4e49d0e879dea6145e42a33f02d98a1f54af5f48cb248b95b3f6fa410 SHA512 696d0ddf69ba58671ff8a378e6d8bd302aa5b402f791f090b4d5413f48b90cf19de447d68942a4cdc329f4d42210bd62bf4757c1f226df5129cb269c0004a332
+DIST mini_mime-1.1.5.tar.gz 34890 BLAKE2B b5d5d35dec2dc4a5885443315fefedbce7bcd38a8193ebaba24ff0f6fd2173450eec0be669759f1831dbec646ac0a06e3b18d79704a901e602b7abe487fda189 SHA512 38da060c723ca21dfda783629ff065dfcc3634e7c0117f8f4af8e38abc1822656a5a62fabe154bed75cfc56637cfa65c596d354cfcdb673f98bce0653b47a816
diff --git a/dev-ruby/mini_mime/mini_mime-1.0.3.ebuild b/dev-ruby/mini_mime/mini_mime-1.0.3.ebuild
deleted file mode 100644
index 7580ae2fc414..000000000000
--- a/dev-ruby/mini_mime/mini_mime-1.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="mini_mime.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A lightweight mime type lookup toy"
-HOMEPAGE="https://github.com/discourse/mini_mime"
-SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid comparison with MIME::Types because types may vary over time
-	# as they get reclassified leading to random harmless failures.
-	sed -i -e '/test_full_parity_with_mime_types/askip "gentoo"' test/mini_mime_test.rb || die
-}
diff --git a/dev-ruby/mini_mime/mini_mime-1.1.1.ebuild b/dev-ruby/mini_mime/mini_mime-1.1.1.ebuild
deleted file mode 100644
index e63c0445e32c..000000000000
--- a/dev-ruby/mini_mime/mini_mime-1.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="mini_mime.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A lightweight mime type lookup toy"
-HOMEPAGE="https://github.com/discourse/mini_mime"
-SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid comparison with MIME::Types because types may vary over time
-	# as they get reclassified leading to random harmless failures.
-	sed -i -e '/test_full_parity_with_mime_types/askip "gentoo"' test/mini_mime_test.rb || die
-}
diff --git a/dev-ruby/mini_mime/mini_mime-1.1.2.ebuild b/dev-ruby/mini_mime/mini_mime-1.1.2.ebuild
deleted file mode 100644
index aa3313c65158..000000000000
--- a/dev-ruby/mini_mime/mini_mime-1.1.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="mini_mime.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A lightweight mime type lookup toy"
-HOMEPAGE="https://github.com/discourse/mini_mime"
-SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid comparison with MIME::Types because types may vary over time
-	# as they get reclassified leading to random harmless failures.
-	sed -i -e '/test_full_parity_with_mime_types/askip "gentoo"' test/mini_mime_test.rb || die
-}
diff --git a/dev-ruby/mini_mime/mini_mime-1.1.5.ebuild b/dev-ruby/mini_mime/mini_mime-1.1.5.ebuild
new file mode 100644
index 000000000000..008bc649708d
--- /dev/null
+++ b/dev-ruby/mini_mime/mini_mime-1.1.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="mini_mime.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A lightweight mime type lookup toy"
+HOMEPAGE="https://github.com/discourse/mini_mime"
+SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid comparison with MIME::Types because types may vary over time
+	# as they get reclassified leading to random harmless failures.
+	sed -i -e '/test_full_parity_with_mime_types/askip "gentoo"' test/mini_mime_test.rb || die
+}
diff --git a/dev-ruby/mini_portile2/Manifest b/dev-ruby/mini_portile2/Manifest
index fbfe0753f321..5580d6a4a0ba 100644
--- a/dev-ruby/mini_portile2/Manifest
+++ b/dev-ruby/mini_portile2/Manifest
@@ -1,3 +1,3 @@
-DIST mini_portile2-2.6.1.gem 27136 BLAKE2B 762b538c2d57cffe8a8ef570469b7796442f51a7a813a2e4f1dae5bd9a3ca62220c6dad1fc9d9157cbb8e93f940afce4b1e5b2b4d4f9edf01d54ce48d99dd6ca SHA512 d1cda6b7bb6b10187360717fc8ae6812d8f6625f6d302d4f76b7a829213f7938c7f0b68cdad7d7433186513542acfadd30100f4c641693e19ff82c5d6dc78859
-DIST mini_portile2-2.7.1.gem 28160 BLAKE2B f134704aa5fc72b01f3304f7b392b1cf665e0a6a52b70354409f9979d70dccbd58f5edb5cee3a54e97b3621eca7091a639bb1e317ad002fe8be855110562a305 SHA512 91cf285efb9f8e28d0781a80036c036ae6835a557a7aba535ca2c0bdaa113fc8e9509a37b1577443a4d763862dce3cc9babdcbe19efd88fe8195cebba4b07faf
-DIST mini_portile2-2.8.0.gem 28672 BLAKE2B 6bf6347193106aa06221659923d5761c5bb2a88b5f6ec9b67fad859b5804ee5792ed66313bd443e5df58b0399aa815added9c1a9b0852fc767fcb593aca0d30f SHA512 74eb55b15329d31b65d363ce2fda26b849d708bf77481acdf851bdf6c97a8c3f9676d5bebf46e9e3eeb55e0e243c8e995eda6952f51f54b846762ab0f65aa7df
+DIST mini_portile2-2.8.4.gem 30720 BLAKE2B 33f5e67e1ef647c781cf4f5a4b04a2164b27fb6846e0d76ad42f1cdbdd04cae69c4e14cde4ce5bc36c392de74d256770f693485e896b443aab8cceb0a6cc28e9 SHA512 19e3e4908e54fb73d695f0674a5c95d96bfa2cf6f87c0d59c32f8a68941b729adc065b3bea2d5eaada489340d8c76e098b9db839d075cac5d183f47d2cee7d9c
+DIST mini_portile2-2.8.5.gem 35840 BLAKE2B f14d071bebf5f1d7160b5196564279ea46ae4ec306587a6ec550c3dbc105db0790b55aae1d7595d2d11d5d21826a07ac382c62e4c22ba15aa22323520040789e SHA512 fa09bc2c4aefc341cb249dc33b5ad3182aa582ef150645793e323bdef4d19cbeeced0348c3c962a7225a9aa91b40824347fa1499955326525eddcf867f6ff798
+DIST mini_portile2-2.8.6.gem 35840 BLAKE2B 0173084a911ecc6400c1d7cff9645cb7cc99db6e8aac934c7ee723300b3016286dc21dbd2299c9b703a817527a63cd86c31334c880e57a879f78ab24a109e844 SHA512 7131806ef5af09082e08a05000256ad7ce9fcd170ef3485f42618c69e0bee6cdf8f2e14b67e61d36b9efed5c1df970045720a01d9e0b7ffac434da651a28f238
diff --git a/dev-ruby/mini_portile2/mini_portile2-2.6.1.ebuild b/dev-ruby/mini_portile2/mini_portile2-2.6.1.ebuild
deleted file mode 100644
index f21a927b8e84..000000000000
--- a/dev-ruby/mini_portile2/mini_portile2-2.6.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simplistic port-like solution for developers"
-HOMEPAGE="https://github.com/flavorjones/mini_portile"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitar
-	dev-ruby/minitest-hooks
-	dev-ruby/webrick
-)"
-
-each_ruby_test() {
-	${RUBY} -w -W2 -I. -Ilib -e 'Dir["test/test_*.rb"].map{|f| require f}' || die
-}
diff --git a/dev-ruby/mini_portile2/mini_portile2-2.7.1.ebuild b/dev-ruby/mini_portile2/mini_portile2-2.7.1.ebuild
deleted file mode 100644
index 5bcbb0b35482..000000000000
--- a/dev-ruby/mini_portile2/mini_portile2-2.7.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simplistic port-like solution for developers"
-HOMEPAGE="https://github.com/flavorjones/mini_portile"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitar
-	dev-ruby/minitest-hooks
-	dev-ruby/webrick
-)"
-
-each_ruby_test() {
-	${RUBY} -w -W2 -I. -Ilib -e 'Dir["test/test_*.rb"].map{|f| require f}' || die
-}
diff --git a/dev-ruby/mini_portile2/mini_portile2-2.8.0.ebuild b/dev-ruby/mini_portile2/mini_portile2-2.8.0.ebuild
deleted file mode 100644
index b2692b052f1c..000000000000
--- a/dev-ruby/mini_portile2/mini_portile2-2.8.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simplistic port-like solution for developers"
-HOMEPAGE="https://github.com/flavorjones/mini_portile"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitar
-	dev-ruby/minitest-hooks
-	dev-ruby/webrick
-)"
-
-each_ruby_test() {
-	${RUBY} -w -W2 -I. -Ilib -e 'Dir["test/test_*.rb"].map{|f| require f}' || die
-}
diff --git a/dev-ruby/mini_portile2/mini_portile2-2.8.4.ebuild b/dev-ruby/mini_portile2/mini_portile2-2.8.4.ebuild
new file mode 100644
index 000000000000..5b9425a057f2
--- /dev/null
+++ b/dev-ruby/mini_portile2/mini_portile2-2.8.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simplistic port-like solution for developers"
+HOMEPAGE="https://github.com/flavorjones/mini_portile"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos"
+IUSE=""
+
+BDEPEND="test? ( dev-build/cmake )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitar
+	dev-ruby/minitest-hooks
+	dev-ruby/net-ftp
+	dev-ruby/webrick
+)"
+
+each_ruby_test() {
+	${RUBY} -w -W2 -I. -Ilib -e 'Dir["test/test_*.rb"].map{|f| require f}' || die
+}
diff --git a/dev-ruby/mini_portile2/mini_portile2-2.8.5.ebuild b/dev-ruby/mini_portile2/mini_portile2-2.8.5.ebuild
new file mode 100644
index 000000000000..ec718bb6b313
--- /dev/null
+++ b/dev-ruby/mini_portile2/mini_portile2-2.8.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simplistic port-like solution for developers"
+HOMEPAGE="https://github.com/flavorjones/mini_portile"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+IUSE="test"
+
+BDEPEND="test? ( dev-build/cmake )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitar
+	dev-ruby/minitest-hooks
+	dev-ruby/net-ftp
+	dev-ruby/webrick
+)"
+
+all_ruby_prepare() {
+	# Avoid tests that expect gcc to be the main compiler, which we
+	# cannot guarantee.
+	sed -e '/test_configure_defaults_with/askip("Requires gcc to be the C/C++ compiler.")' \
+		-i test/test_cmake.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -w -W2 -I. -Ilib -e 'Dir["test/test_*.rb"].map{|f| require f}' || die
+}
diff --git a/dev-ruby/mini_portile2/mini_portile2-2.8.6.ebuild b/dev-ruby/mini_portile2/mini_portile2-2.8.6.ebuild
new file mode 100644
index 000000000000..ec718bb6b313
--- /dev/null
+++ b/dev-ruby/mini_portile2/mini_portile2-2.8.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simplistic port-like solution for developers"
+HOMEPAGE="https://github.com/flavorjones/mini_portile"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+IUSE="test"
+
+BDEPEND="test? ( dev-build/cmake )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitar
+	dev-ruby/minitest-hooks
+	dev-ruby/net-ftp
+	dev-ruby/webrick
+)"
+
+all_ruby_prepare() {
+	# Avoid tests that expect gcc to be the main compiler, which we
+	# cannot guarantee.
+	sed -e '/test_configure_defaults_with/askip("Requires gcc to be the C/C++ compiler.")' \
+		-i test/test_cmake.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -w -W2 -I. -Ilib -e 'Dir["test/test_*.rb"].map{|f| require f}' || die
+}
diff --git a/dev-ruby/minispec-metadata/Manifest b/dev-ruby/minispec-metadata/Manifest
index 9fa57a2190a7..c00d69942ef5 100644
--- a/dev-ruby/minispec-metadata/Manifest
+++ b/dev-ruby/minispec-metadata/Manifest
@@ -1 +1 @@
-DIST minispec-metadata-3.3.1.gem 12288 BLAKE2B fe8b921d7c2927cdd413da29b4953482b8b673c3ad0e997d2fb4f5b1f212e46c1597125378524213a4929fa3db5e6dc75a56a0e42f478cfa0000332b6e1b9073 SHA512 54d08b96f39e3fa7fbffcc4fdb5ef22725af1e3eada333d8a5963304d2d736cb2a6be7166a70a5ae893029fb920a0541d93f0bd7a2e3c51066536a3c02567b75
+DIST minispec-metadata-3.5.0.gem 11776 BLAKE2B b4ba302c647035f87f941e5e796f75093122d5a5f365d41d3a402a5155b69bbb70cb1ad2bd6bc6b69373b955dc936b22c7cfefbe8035cfb007b7c825b5ee9b44 SHA512 3fe99b843c8d1c2600270793d213df44bc505b0f364112bd98068db18fc5a5b35d2271b6e51fbd8ce9e2556cafc25a5bb8570914a141e5a6f2506801e92053e1
diff --git a/dev-ruby/minispec-metadata/minispec-metadata-3.3.1-r1.ebuild b/dev-ruby/minispec-metadata/minispec-metadata-3.3.1-r1.ebuild
deleted file mode 100644
index 856e71f71964..000000000000
--- a/dev-ruby/minispec-metadata/minispec-metadata-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Define and access metadata in MiniTest::Spec descriptions and specs"
-HOMEPAGE="https://github.com/ordinaryzelig/minispec-metadata"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/minitest"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|awesome_print\)/ s:^:#:' Rakefile spec/helper.rb || die
-}
diff --git a/dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild b/dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild
deleted file mode 100644
index 7e8bf819e44c..000000000000
--- a/dev-ruby/minispec-metadata/minispec-metadata-3.3.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Define and access metadata in MiniTest::Spec descriptions and specs"
-HOMEPAGE="https://github.com/ordinaryzelig/minispec-metadata"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/minitest"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|awesome_print\)/ s:^:#:' Rakefile spec/helper.rb || die
-}
diff --git a/dev-ruby/minispec-metadata/minispec-metadata-3.5.0.ebuild b/dev-ruby/minispec-metadata/minispec-metadata-3.5.0.ebuild
new file mode 100644
index 000000000000..5c1a82303c4a
--- /dev/null
+++ b/dev-ruby/minispec-metadata/minispec-metadata-3.5.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Define and access metadata in MiniTest::Spec descriptions and specs"
+HOMEPAGE="https://github.com/ordinaryzelig/minispec-metadata"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/minitest"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|awesome_print\)/ s:^:#:' Rakefile spec/helper.rb || die
+}
diff --git a/dev-ruby/minitar/minitar-0.9-r1.ebuild b/dev-ruby/minitar/minitar-0.9-r1.ebuild
index 002969caeb44..6cb57c047593 100644
--- a/dev-ruby/minitar/minitar-0.9-r1.ebuild
+++ b/dev-ruby/minitar/minitar-0.9-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="none"
@@ -18,9 +18,9 @@ HOMEPAGE="https://github.com/halostatue/minitar"
 SRC_URI="https://github.com/halostatue/minitar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 RUBY_S="minitar-${PV}"
 
-LICENSE="|| ( BSD-2 Ruby )"
+LICENSE="|| ( BSD-2 Ruby-BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
diff --git a/dev-ruby/minitar/minitar-0.9.ebuild b/dev-ruby/minitar/minitar-0.9.ebuild
deleted file mode 100644
index 4edb177addc5..000000000000
--- a/dev-ruby/minitar/minitar-0.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="minitar.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides POSIX tarchive management from Ruby programs"
-HOMEPAGE="https://github.com/halostatue/minitar"
-SRC_URI="https://github.com/halostatue/minitar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="minitar-${PV}"
-
-LICENSE="|| ( BSD-2 Ruby )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/minitest-around/minitest-around-0.5.0-r1.ebuild b/dev-ruby/minitest-around/minitest-around-0.5.0-r1.ebuild
index 7036fe227017..c1444d3859dc 100644
--- a/dev-ruby/minitest-around/minitest-around-0.5.0-r1.ebuild
+++ b/dev-ruby/minitest-around/minitest-around-0.5.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -14,8 +14,8 @@ HOMEPAGE="https://github.com/splattael/minitest-around"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+IUSE="test"
 
 ruby_add_rdepend "dev-ruby/minitest:5"
 
@@ -25,6 +25,8 @@ all_ruby_prepare() {
 	sed -i -e '/bump/ s:^:#:' \
 		-e '/ls-files/d' \
 		-e '/cucumber/ s/,.*$//' minitest-around.gemspec Rakefile || die
+	sed -e '/bundler/ s:^:#:' \
+		-i test/helper.rb Rakefile || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild
deleted file mode 100644
index 1cec455f175e..000000000000
--- a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Bonus assertions for minitest"
-HOMEPAGE="https://github.com/halostatue/minitest-bonus-assertions"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-pretty_diff )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bisect\|focus\|moar\)/ s:^:#:' test/minitest_config.rb || die
-
-	# assert the right value (as specified in the text of the test)
-	# this probably needs more investigation, but this package is only used
-	# by another package from the same author so we'll go with it
-	sed -i -e '140 s/true/false/' -e '216 s/false/true/' test/test_minitest-bonus-assertions.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r2.ebuild b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r2.ebuild
new file mode 100644
index 000000000000..3847c4ce3cfa
--- /dev/null
+++ b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Bonus assertions for minitest"
+HOMEPAGE="https://github.com/halostatue/minitest-bonus-assertions"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-pretty_diff )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bisect\|focus\|moar\)/ s:^:#:' test/minitest_config.rb || die
+
+	sed -e '/returns true if the \(keys are missing\|sets are not equal\)/askip "Flaky"' \
+		-i test/test_minitest-bonus-assertions.rb || die
+
+	# Avoid test that returns slightly different formatting on ruby31
+	sed -e '/is triggered with a different exception/askip "Fragile for output differences"' \
+		-i test/test_minitest-bonus-assertions.rb || die
+
+	# Avoid test that returns slightly different formatting with newer set versions.
+	sed -e '207iskip "Fragile for output differences"' \
+		-e '225iskip "Fragile for output differences"' \
+		-i test/test_minitest-bonus-assertions.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild
deleted file mode 100644
index 8542f91ae89e..000000000000
--- a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Bonus assertions for minitest"
-HOMEPAGE="https://github.com/halostatue/minitest-bonus-assertions"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-pretty_diff )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bisect\|focus\|moar\)/ s:^:#:' test/minitest_config.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1-r1.ebuild b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1-r1.ebuild
index e791117905eb..12e9ff508800 100644
--- a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1-r1.ebuild
+++ b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 inherit ruby-fakegem
 
@@ -11,5 +11,5 @@ HOMEPAGE="https://github.com/jeremyevans/minitest-global_expectations"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
diff --git a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild
deleted file mode 100644
index 042079cf04ae..000000000000
--- a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Support minitest expectation methods for all objects"
-HOMEPAGE="https://github.com/jeremyevans/minitest-global_expectations"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE=""
diff --git a/dev-ruby/minitest-hooks/Manifest b/dev-ruby/minitest-hooks/Manifest
index 0c9d9d2869a7..bafb507635e9 100644
--- a/dev-ruby/minitest-hooks/Manifest
+++ b/dev-ruby/minitest-hooks/Manifest
@@ -1 +1,2 @@
 DIST minitest-hooks-1.5.0.gem 11264 BLAKE2B 740df3b75ade3372fbf75ed7bd861c70af6f11d8cd1f37819272b98bc8cd1fad6ea09375856cd48a75499e0a692411c6da4f5aec212ebae91b47531c4bedda54 SHA512 4e7c969485c6e8d3414710b787c8880ad26b71de9f0b4a93ca1bf343deba426feee1cc06fcc51eee05c4880d851664fff045026d44728e217607e4cb32aa8f4b
+DIST minitest-hooks-1.5.1.gem 8704 BLAKE2B 8513e7694aae942da83323075d048c0aaf5bf2d89c3994c7a2f3c17478f14abc29bf5ee67690e5cd50c8de2d06d60cb2e0de27c69edbc3d6b85946d2ee6e6c3d SHA512 1129205f68688747aa1fbe161cf436e7d82802ec02fe008d564b4266069b1fad014f438d0c16c7c42a98af3f0a89fc4681deea0ae7f421d94653274ce103bd10
diff --git a/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild b/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
index b0b6614ee02b..62e45c33f352 100644
--- a/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
+++ b/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.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="ruby27 ruby30 ruby31 ruby32"
 
 # Skip tests since they require unpackaged sequel
 RUBY_FAKEGEM_RECIPE_TEST="none"
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/jeremyevans/minitest-hooks"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
diff --git a/dev-ruby/minitest-hooks/minitest-hooks-1.5.1.ebuild b/dev-ruby/minitest-hooks/minitest-hooks-1.5.1.ebuild
new file mode 100644
index 000000000000..ec292c0b4544
--- /dev/null
+++ b/dev-ruby/minitest-hooks/minitest-hooks-1.5.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# Skip tests since they require unpackaged sequel
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Adds around and before_all/after_all/around_all hooks for Minitest"
+HOMEPAGE="https://github.com/jeremyevans/minitest-hooks"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
diff --git a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1-r1.ebuild b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..80790609b2cf
--- /dev/null
+++ b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Power Assert for Minitest"
+HOMEPAGE="https://github.com/hsbt/minitest-power_assert"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/minitest:*
+	>=dev-ruby/power_assert-1.1
+"
+
+all_ruby_prepare() {
+	sed -i -e '/bundle/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
deleted file mode 100644
index a2422721a0a1..000000000000
--- a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Power Assert for Minitest"
-HOMEPAGE="https://github.com/hsbt/minitest-power_assert"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/minitest:*
-	>=dev-ruby/power_assert-1.1
-"
-
-all_ruby_prepare() {
-	sed -i -e '/bundle/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild
deleted file mode 100644
index 1d0b0d9b2e44..000000000000
--- a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pretty-print hashes and arrays before diffing them in MiniTest"
-HOMEPAGE="https://github.com/adammck/minitest-pretty_diff"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r2.ebuild b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r2.ebuild
new file mode 100644
index 000000000000..41ff835b3345
--- /dev/null
+++ b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pretty-print hashes and arrays before diffing them in MiniTest"
+HOMEPAGE="https://github.com/adammck/minitest-pretty_diff"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index 117da3fdc0f5..a1665637a75a 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -1,4 +1,7 @@
-DIST minitest-5.13.0.gem 83968 BLAKE2B 90f2bc20328a5522a51bcfee94d69e6fd03189190a04ee77499d574531e95b8f8b6652cc51a5917e51920f58c0f95465c27c5d69bab7aba01e02502ccf72ae38 SHA512 bdd0d665cfd6f6e36dcb1f2f069f5154a468f68eb4c41f5c39e3a3397644141d5e05024023b20fafbceb983b019b00a0ec6da98432f505cc8fd1cebc11cc1fca
-DIST minitest-5.14.3.gem 84992 BLAKE2B baad3e8198bcee1b2748f81a7ea822785423c2bfb07130397b2c21993c686aa6edf58811cd58c4c9685b63b8a7373948a0aa2eacb6b02383399847edbad5deaa SHA512 2aadb99c5eac8d29c78865f8ce3fae51f11c2e1dd17157b6d0c6684733a3b870146df16fd26626c6f9c56806422e1e2457208afa1c69238a2bdaa4a859c23645
-DIST minitest-5.14.4.gem 86016 BLAKE2B 1f7b8c72b41e1f4e47852021dd99df411a427ac8bbe564a2b86edbb727a4976030176331442a3a44f734347cc42f80444f8d3937e561f0063ec6bb3132d4c402 SHA512 f967a11cfce82e167879905082859273b270e8d8e663a0c1c553964a345fb8564547627b8cf97418ac5bda544bb76c1385438ad74ec8e846666dc2952d55c9e9
 DIST minitest-5.15.0.gem 87040 BLAKE2B 71e7a7952c25fd37067a449867d74a2f18a8a42d1fbd72f24d6db226c54a18e9a21958654d4176176804bedd09ef9d1d3be68f79e29312c3f85d0930d3d68d7b SHA512 5e97a7aa616966ffc60e10cdc0ba123a7e793f10283ec3b6bf36066177036788cb950ad566fbac49e613b93f08b9846534f463017cde966b4890c3a34a2286be
+DIST minitest-5.18.1.gem 95232 BLAKE2B 97743455cb893b8ccee7e5d40daa803500c243e59d78dcadde6e7af528f1f9b0a39db267b882f1b5467beb3dd5ecb5e0f5bc0d10ecf4901f10c368e5229b3fc2 SHA512 93095188dbde1020a8028e21023056ae9debe7bb868b26333d763958aa32f66910929a44c45c9656552c9efae2a9909cf8640f4c72b9cc53bd49fd5051c9b4a8
+DIST minitest-5.19.0.gem 95744 BLAKE2B b234f64e8957ca89c1cb76baea323874a74295c0fcb69b50efd1f720715d5d26e3d5ad5c0c1e350778f935d7d91f72d27f37e0c937172341b65c99843f983a26 SHA512 c9b5b234fe16127cb376c420a9e3ec111871d604bf7082d09b773637f5229c3b375eb224ae97a237cb3f436a24eb9f49d8d6dddf5d8e99a2806c83b543e10056
+DIST minitest-5.20.0.gem 95744 BLAKE2B b91a895b40a2703478300be236cff87888885099889c19358ccadc73c63d016a3e254c4dc52daa984204e801e3e6fffcb621e674d3e0e3c18b4b2b8fd9e4fece SHA512 906dba1226ed301ad0d7aae2fa138670101e87b11ced69e0c362e65d74fee58a5341756fed8be1f2900863e19c11adcae35ed6ebe7372bb93be0c131dae85a3c
+DIST minitest-5.21.2.gem 98304 BLAKE2B 09de6552a95a639b01a3935cf418301e453a9bb4a7edb85d4f2e27b5e8811db722adbc1ed37da1835c545065f8b4169e19e48c1b48a1778ec1c7bf2048628697 SHA512 4cf86dab870f1cb39ef8c9756fa843c6ddc03ff7738c404db37abc7bdb0ff0436e5a64ed15a733d72e7ae0b8412e4b44cbda0ef3d89ba487268f3550d9248e0c
+DIST minitest-5.22.2.gem 98816 BLAKE2B fcb519fbcf41f908a89608707ce7b2083ddecd3d5a1f8ec8d86e9d84df299997e5a424d201e3704234e695be6f969ab9182dcb0a2170c1277b3e8cd1b2c27b66 SHA512 aafeec582d60f580317f7d30319dd0c0fbb04269359e0aa4de62d0c598039d44dc9a28ce4f999550e7e3a2f48871e4cc563b45ebabf3f8ba7207b7e734b3b5d8
+DIST minitest-5.22.3.gem 99328 BLAKE2B c5d67807bd5e9fbe86be0f6f48886854dd7148ccc11062e511c8e354e2b789b3b7a6318cf5fcb06d1064d15378c2df1b2dca474b8eb2d37ba8e04d92a4f688b2 SHA512 11b5279cbedc1b4c6dc3997530f82a35b17a2fef258140332a21edcc0f880a4013514d811207dd8b79fe094e25fbfc5f8d2481b4313ec7dcdd5d8c70af9cf5bd
diff --git a/dev-ruby/minitest/metadata.xml b/dev-ruby/minitest/metadata.xml
index fa2983ac52a7..4116fc8fcb32 100644
--- a/dev-ruby/minitest/metadata.xml
+++ b/dev-ruby/minitest/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">seattlerb/minitest</remote-id>
+    <remote-id type="github">minitest/minitest</remote-id>
+    <remote-id type="rubygems">minitest</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/minitest/minitest-5.13.0.ebuild b/dev-ruby/minitest/minitest-5.13.0.ebuild
deleted file mode 100644
index 15aa1c9fe662..000000000000
--- a/dev-ruby/minitest/minitest-5.13.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
-HOMEPAGE="https://github.com/seattlerb/minitest"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
-}
diff --git a/dev-ruby/minitest/minitest-5.14.3.ebuild b/dev-ruby/minitest/minitest-5.14.3.ebuild
deleted file mode 100644
index 414bf91afda4..000000000000
--- a/dev-ruby/minitest/minitest-5.14.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
-HOMEPAGE="https://github.com/seattlerb/minitest"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
-}
diff --git a/dev-ruby/minitest/minitest-5.14.4.ebuild b/dev-ruby/minitest/minitest-5.14.4.ebuild
deleted file mode 100644
index e11aea35842d..000000000000
--- a/dev-ruby/minitest/minitest-5.14.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
-HOMEPAGE="https://github.com/seattlerb/minitest"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
-}
diff --git a/dev-ruby/minitest/minitest-5.15.0-r1.ebuild b/dev-ruby/minitest/minitest-5.15.0-r1.ebuild
new file mode 100644
index 000000000000..9c06ea51c931
--- /dev/null
+++ b/dev-ruby/minitest/minitest-5.15.0-r1.ebuild
@@ -0,0 +1,24 @@
+# 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_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
+HOMEPAGE="https://github.com/seattlerb/minitest"
+
+LICENSE="MIT"
+SLOT="5.15"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+RDEPEND="!~dev-ruby/minitest-5.15.0:5"
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
diff --git a/dev-ruby/minitest/minitest-5.15.0.ebuild b/dev-ruby/minitest/minitest-5.15.0.ebuild
deleted file mode 100644
index 046c3de94efa..000000000000
--- a/dev-ruby/minitest/minitest-5.15.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
-HOMEPAGE="https://github.com/seattlerb/minitest"
-
-LICENSE="MIT"
-SLOT="5"
-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"
-IUSE="doc test"
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
-}
diff --git a/dev-ruby/minitest/minitest-5.18.1.ebuild b/dev-ruby/minitest/minitest-5.18.1.ebuild
new file mode 100644
index 000000000000..a95082503039
--- /dev/null
+++ b/dev-ruby/minitest/minitest-5.18.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
+HOMEPAGE="https://github.com/minitest/minitest"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+all_ruby_prepare() {
+	# Avoid a test dependency on dev-ruby/hoe, leading to circular dependencies
+	rm -f test/minitest/test_minitest_test_task.rb || die
+}
+
+each_ruby_test() {
+	export -n A
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
diff --git a/dev-ruby/minitest/minitest-5.19.0.ebuild b/dev-ruby/minitest/minitest-5.19.0.ebuild
new file mode 100644
index 000000000000..5ce8b74cb5ec
--- /dev/null
+++ b/dev-ruby/minitest/minitest-5.19.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
+HOMEPAGE="https://github.com/minitest/minitest"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+all_ruby_prepare() {
+	# Avoid a test dependency on dev-ruby/hoe, leading to circular dependencies
+	rm -f test/minitest/test_minitest_test_task.rb || die
+}
+
+each_ruby_test() {
+	export -n A
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
diff --git a/dev-ruby/minitest/minitest-5.20.0.ebuild b/dev-ruby/minitest/minitest-5.20.0.ebuild
new file mode 100644
index 000000000000..77e5138f1324
--- /dev/null
+++ b/dev-ruby/minitest/minitest-5.20.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
+HOMEPAGE="https://github.com/minitest/minitest"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+all_ruby_prepare() {
+	# Avoid a test dependency on dev-ruby/hoe, leading to circular dependencies
+	rm -f test/minitest/test_minitest_test_task.rb || die
+}
+
+each_ruby_test() {
+	export -n A
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
diff --git a/dev-ruby/minitest/minitest-5.21.2.ebuild b/dev-ruby/minitest/minitest-5.21.2.ebuild
new file mode 100644
index 000000000000..c6f3489eae50
--- /dev/null
+++ b/dev-ruby/minitest/minitest-5.21.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
+HOMEPAGE="https://github.com/minitest/minitest"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+all_ruby_prepare() {
+	# Avoid a test dependency on dev-ruby/hoe, leading to circular dependencies
+	rm -f test/minitest/test_minitest_test_task.rb || die
+}
+
+each_ruby_test() {
+	export -n A
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
diff --git a/dev-ruby/minitest/minitest-5.22.2.ebuild b/dev-ruby/minitest/minitest-5.22.2.ebuild
new file mode 100644
index 000000000000..c6f3489eae50
--- /dev/null
+++ b/dev-ruby/minitest/minitest-5.22.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
+HOMEPAGE="https://github.com/minitest/minitest"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+all_ruby_prepare() {
+	# Avoid a test dependency on dev-ruby/hoe, leading to circular dependencies
+	rm -f test/minitest/test_minitest_test_task.rb || die
+}
+
+each_ruby_test() {
+	export -n A
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
diff --git a/dev-ruby/minitest/minitest-5.22.3.ebuild b/dev-ruby/minitest/minitest-5.22.3.ebuild
new file mode 100644
index 000000000000..c6f3489eae50
--- /dev/null
+++ b/dev-ruby/minitest/minitest-5.22.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
+HOMEPAGE="https://github.com/minitest/minitest"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+all_ruby_prepare() {
+	# Avoid a test dependency on dev-ruby/hoe, leading to circular dependencies
+	rm -f test/minitest/test_minitest_test_task.rb || die
+}
+
+each_ruby_test() {
+	export -n A
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
diff --git a/dev-ruby/mixlib-config/Manifest b/dev-ruby/mixlib-config/Manifest
new file mode 100644
index 000000000000..15e5172c6b73
--- /dev/null
+++ b/dev-ruby/mixlib-config/Manifest
@@ -0,0 +1 @@
+DIST mixlib-config-3.0.27.tar.gz 27147 BLAKE2B 867b736423b39c0c9960824936766a1b970eda30f2e69cb7031e1d63c28b05d387e0767f879f859e81d06cee1dbe426f23d4cfb71486f3235991520a532f72eb SHA512 7bf985f7ef15d3f96b148e3db591a0e4ba382f3c76103c7ef0f786cc6998bbea6a566e29cfedace2177e4e3444f69dac813bfbecddf932204dbe5a536c863037
diff --git a/dev-ruby/mixlib-config/metadata.xml b/dev-ruby/mixlib-config/metadata.xml
new file mode 100644
index 000000000000..901ce10b9cfe
--- /dev/null
+++ b/dev-ruby/mixlib-config/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version = '1.0' encoding = 'UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">chef/mixlib-config</remote-id>
+    <remote-id type="rubygems">mixlib-config</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/mixlib-config/mixlib-config-3.0.27.ebuild b/dev-ruby/mixlib-config/mixlib-config-3.0.27.ebuild
new file mode 100644
index 000000000000..c88f21a5d784
--- /dev/null
+++ b/dev-ruby/mixlib-config/mixlib-config-3.0.27.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRA_DOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="mixlib-config.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A class based configuration library"
+HOMEPAGE="https://github.com/chef/mixlib-config"
+SRC_URI="https://github.com/chef/mixlib-config/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/tomlrb"
diff --git a/dev-ruby/mixlib-shellout/Manifest b/dev-ruby/mixlib-shellout/Manifest
index 57b3d1755061..06e59fc3300e 100644
--- a/dev-ruby/mixlib-shellout/Manifest
+++ b/dev-ruby/mixlib-shellout/Manifest
@@ -1 +1,2 @@
 DIST mixlib-shellout-3.0.9.tar.gz 42476 BLAKE2B 4fab1d0f7d7ee5190f65d312304c7137d940b5cc19bb205d4de1d14eb5bc5829671560785b7f3179220246433b15b9022f8a1d16fb7491e180940c9dc6da5280 SHA512 7234c188e25cc6da3c4859eb12e4f86ce0d6538d17e4c90b1b5105fe677fcd13d884d7045be9767473c3ac63ffcfac7af25dc8efcec184928ba32852a5a760cc
+DIST mixlib-shellout-3.2.7.tar.gz 46666 BLAKE2B 0ee97eef27618d326487a3884115d0954147297a75001404c8df0717f71c6acde5ec9ebc9320d12493f1ce4e65b3d74ba1143ba7e4a631629de0d65e3b50bcb7 SHA512 de1d07e7a3f26ec934f57a37a82995b5522a5c196263b7ff1917c1a77cce3104d67a8dccab2aa907c3db854520ce6b5f78ef33fca8d4bffd0ba0cc659da1c16f
diff --git a/dev-ruby/mixlib-shellout/metadata.xml b/dev-ruby/mixlib-shellout/metadata.xml
index 0bb3a44f4fc3..7f479627fa46 100644
--- a/dev-ruby/mixlib-shellout/metadata.xml
+++ b/dev-ruby/mixlib-shellout/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">opscode/mixlib-shellout</remote-id>
+    <remote-id type="github">chef/mixlib-shellout</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/mixlib-shellout/mixlib-shellout-3.0.9-r1.ebuild b/dev-ruby/mixlib-shellout/mixlib-shellout-3.0.9-r1.ebuild
new file mode 100644
index 000000000000..d9f4e71b262f
--- /dev/null
+++ b/dev-ruby/mixlib-shellout/mixlib-shellout-3.0.9-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRA_DOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="mixlib-shellout.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Run external commands on Unix or Windows"
+HOMEPAGE="https://github.com/chef/mixlib-shellout"
+SRC_URI="https://github.com/chef/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+each_ruby_prepare() {
+	# Make sure we actually use the right interpreter for testing
+	sed -i -e "/ruby_eval/ s:ruby :${RUBY} :" spec/mixlib/shellout_spec.rb || die
+
+	# Avoid spec that requires an interactive terminal
+	sed -e '/with subprocess writing lots of data to both stdout and stderr/,/^      end/ s:^:#:' \
+		-i spec/mixlib/shellout_spec.rb || die
+}
diff --git a/dev-ruby/mixlib-shellout/mixlib-shellout-3.0.9.ebuild b/dev-ruby/mixlib-shellout/mixlib-shellout-3.0.9.ebuild
deleted file mode 100644
index 75136f68b715..000000000000
--- a/dev-ruby/mixlib-shellout/mixlib-shellout-3.0.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRA_DOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="mixlib-shellout.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Run external commands on Unix or Windows"
-HOMEPAGE="https://github.com/opscode/mixlib-shellout"
-SRC_URI="https://github.com/opscode/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-each_ruby_prepare() {
-	# Make sure we actually use the right interpreter for testing
-	sed -i -e "/ruby_eval/ s:ruby :${RUBY} :" spec/mixlib/shellout_spec.rb || die
-
-	# Avoid spec that requires an interactive terminal
-	sed -i -e '/with subprocess writing lots of data to both stdout and stderr/,/^      end/ s:^:#:' spec/mixlib/shellout_spec.rb || die
-}
diff --git a/dev-ruby/mixlib-shellout/mixlib-shellout-3.2.7.ebuild b/dev-ruby/mixlib-shellout/mixlib-shellout-3.2.7.ebuild
new file mode 100644
index 000000000000..dbfef33924a3
--- /dev/null
+++ b/dev-ruby/mixlib-shellout/mixlib-shellout-3.2.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRA_DOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="mixlib-shellout.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Run external commands on Unix or Windows"
+HOMEPAGE="https://github.com/chef/mixlib-shellout"
+SRC_URI="https://github.com/chef/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/chef-utils"
+
+each_ruby_prepare() {
+	# Make sure we actually use the right interpreter for testing
+	sed -i -e "/ruby_eval/ s:ruby :${RUBY} :" spec/mixlib/shellout_spec.rb || die
+
+	# Avoid spec that requires an interactive terminal
+	sed -e '/with subprocess writing lots of data to both stdout and stderr/,/^      end/ s:^:#:' \
+		-i spec/mixlib/shellout_spec.rb || die
+}
diff --git a/dev-ruby/mkmf-lite/Manifest b/dev-ruby/mkmf-lite/Manifest
new file mode 100644
index 000000000000..37d979ab70f9
--- /dev/null
+++ b/dev-ruby/mkmf-lite/Manifest
@@ -0,0 +1 @@
+DIST mkmf-lite-0.6.0.gem 20992 BLAKE2B fb52c99be00693409838a437a0715954551e9a9aecfad752d3e3f635d0b7992625d008a58da5b4b20bd03344d2cd861fc593d94bcb4a85012346eb534f5f851a SHA512 3baab933a75297dec89a254ffe33190bc991d7a6499b8cdf9abe612cb9837d2bcad8746aa008d394d910257518dc24cac6cd3c5adb6ed1f481088636e585d66f
diff --git a/dev-ruby/mkmf-lite/metadata.xml b/dev-ruby/mkmf-lite/metadata.xml
new file mode 100644
index 000000000000..21e14e5784be
--- /dev/null
+++ b/dev-ruby/mkmf-lite/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">djberg96/mkmf-lite</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/mkmf-lite/mkmf-lite-0.6.0.ebuild b/dev-ruby/mkmf-lite/mkmf-lite-0.6.0.ebuild
new file mode 100644
index 000000000000..94c3f14d02c9
--- /dev/null
+++ b/dev-ruby/mkmf-lite/mkmf-lite-0.6.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="light version of the the mkmf library designed for use as a library"
+HOMEPAGE="https://github.com/djberg96/mkmf-lite"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	=dev-ruby/memoist-0.16* >=dev-ruby/memoist-0.16.2
+	>=dev-ruby/ptools-1.4 <dev-ruby/ptools-2.0
+"
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index b750dbac6e6f..879248fbf7f0 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -1,3 +1,7 @@
 DIST mocha-0.14.0.gem 82944 BLAKE2B 50a066e2f5007df08a7f76785fd4c2b12327b4969c11324a0574c707bea3219d51edb9ab40635378c16b46ad826ec7eff42434a27cd61113a6f40251fa2e6930 SHA512 918e45f2ee761c7dc399c7958e4d406f9e186c90f479fd01a421aa542944b47e9b2c5e938f4fc5292a7da345726447b2d47dc5f417e114201f8a4d9893c4d461
-DIST mocha-1.13.0.tar.gz 246249 BLAKE2B 028b40646b96084f26df9813a8c8c4d5adc9f4649e11971069af086716d84f90f1acc6abc8fac8297c3a516afa51049c4bcd7ff0f6fd3917d0665fa6f9afe754 SHA512 84cbe344b0bae434e9931a83b587dcefc14e8699893022a56e30a59bff574b52e3879a123b8f2f70e77301701b167d5992489e2173191ffd3450f09db3e7383b
-DIST mocha-1.14.0.tar.gz 246015 BLAKE2B 836b678ca0bcbc1860cb185ee6cd5a71bbdeff4698780fdfcffe6fd38196b1291aa6c23a779e7e1e59bd8155d5ec48fbde426ace468f8186e18860f3d3764836 SHA512 41dfd1f9add0b62c8609ec4cdf07ae58580503c81eb40886cae6c97ee5a5109ae5aa6094756c9666985266c83fad38adef7c9c4a2add8ef2b7571c2c1753cfb0
+DIST mocha-1.16.0.tar.gz 246370 BLAKE2B c2891021c33e4038ff965a470eda3be7eac2765f7c038fef33f38cd07b8501fdb88a1dcd8d291eabb124fb0fff50c40651bf29ac4a28012b57c7a02d2ff46b63 SHA512 b7d8825771f84245e7383e4081dcb42734b9716e7bef3c1b5d49ac28850590b4beabf8d0370992e100b6340ff3cfb3113610e303de74bc33c059bd9b9910cb8e
+DIST mocha-1.16.1.tar.gz 247461 BLAKE2B d4bce5f945018e527f6b19c6328d3687912a3ac9638b6d7b7bd5cd5bf1cca20fd34ae8261a56525dc11610711e590f6ae915a0a5a0555ec47e30e8e3cbbda63f SHA512 b65cf98ab39334ad86a6f375b648fc906d083e803afa5bd2a62aaed87ac625fcf94ed9b16b21dc1563ff67675e00bf008d43234bde0343604f6fce2841d8b2bb
+DIST mocha-2.0.2.tar.gz 245650 BLAKE2B 3bf56cacc99b5eeb17977cd1052c635df74aec10f20a76d843d703e68520ef434bc9111b739591dfa15b21ecdbdfb5b55037e9509683624349be83613528787f SHA512 93579390f4feaf034cd6e8905654fe8cc5c8a1f28f3d27488deeb84250114a5e04c4e7aa544f18f33b2c3887668d5fddb3a3f9bda5548d577be1522da2e09760
+DIST mocha-2.0.4.tar.gz 243542 BLAKE2B 4a9bb3f1493225f7eed7080661a168a90c56e4f737a8bc15402bf0a08ae7cc14e8e5cff9a090b6413633c37169e7ff9f45aedc3c5fd929ab32d359ad58d404f7 SHA512 4a72cd18e70608265bc20761848657b900a6d60c888ec4027e3b9f1884efa41d0d0591c4f3e26edd96a806ecdfc3b921d5871465a799a5ea5905627b7093f5b1
+DIST mocha-2.1.0.tar.gz 243730 BLAKE2B a99cb5b6d968e0612cfc4f2d766029d2f700c92b3e1f16f33341b8c5652db823d52fc34070acd0711ea94077eeed32d13e605982b93baa56e7d11dae7fcfe55f SHA512 8044065ebb2225f7aab117353b0a49c854768fd55f7165ccb5916027f6f8fc843665572ed786e41d5ec6affedf397f4de20fa31a9f9c1582a17a67555662a65e
+DIST mocha-2.2.0.tar.gz 247014 BLAKE2B 7be3453e30be305a27a3a9c9cde8cfc196ebbf07329afe82fbbb79c320dfd08aaeca17242e1432d0e1b437f20260ee1557768851553d2a5d7f7697d07081468d SHA512 1e611c31c311f9ff5f341c46a374eea16835cffeb2ff454e09c656503f05c1a2b7d7ff6d1bf33f8ea33cd1e5e53aca108d1f73fc46ca79029d09f8bdeb9036c6
diff --git a/dev-ruby/mocha/files/mocha-1.16.0-ruby32.patch b/dev-ruby/mocha/files/mocha-1.16.0-ruby32.patch
new file mode 100644
index 000000000000..a4f6b8c2fd7a
--- /dev/null
+++ b/dev-ruby/mocha/files/mocha-1.16.0-ruby32.patch
@@ -0,0 +1,53 @@
+https://github.com/freerange/mocha/commit/ae9fed4a9f2ef6267302494ae0edf515d4a8a921
+https://github.com/freerange/mocha/commit/26b106a540ad57cd73401461451aa2711c541e9d
+
+From ae9fed4a9f2ef6267302494ae0edf515d4a8a921 Mon Sep 17 00:00:00 2001
+From: James Mead <james@floehopper.org>
+Date: Thu, 24 Nov 2022 13:26:15 +0000
+Subject: [PATCH] DRY up regexp_matches test
+
+--- a/test/unit/parameter_matchers/regexp_matches_test.rb
++++ b/test/unit/parameter_matchers/regexp_matches_test.rb
+@@ -32,14 +32,18 @@ def test_should_not_match_on_empty_arguments
+   end
+ 
+   def test_should_not_raise_error_on_argument_that_does_not_respond_to_equals_tilde
+-    object_not_responding_to_equals_tilde = Class.new { undef =~ }.new
+     matcher = regexp_matches(/oo/)
+     assert_nothing_raised { matcher.matches?([object_not_responding_to_equals_tilde]) }
+   end
+ 
+   def test_should_not_match_on_argument_that_does_not_respond_to_equals_tilde
+-    object_not_responding_to_equals_tilde = Class.new { undef =~ }.new
+     matcher = regexp_matches(/oo/)
+     assert !matcher.matches?([object_not_responding_to_equals_tilde])
+   end
++
++  private
++
++  def object_not_responding_to_equals_tilde
++    Class.new { undef =~ }.new
++  end
+ end
+
+From 26b106a540ad57cd73401461451aa2711c541e9d Mon Sep 17 00:00:00 2001
+From: James Mead <james@floehopper.org>
+Date: Fri, 25 Nov 2022 09:04:43 +0000
+Subject: [PATCH] Fix regexp_matches tests in Ruby v3.2
+
+Object#~= has been removed from Ruby v3.2 [1].
+
+Closes #590.
+
+[1]: https://bugs.ruby-lang.org/issues/15231
+--- a/test/unit/parameter_matchers/regexp_matches_test.rb
++++ b/test/unit/parameter_matchers/regexp_matches_test.rb
+@@ -44,6 +44,6 @@ def test_should_not_match_on_argument_that_does_not_respond_to_equals_tilde
+   private
+ 
+   def object_not_responding_to_equals_tilde
+-    Class.new { undef =~ }.new
++    Class.new { undef =~ if respond_to?(:=~) }.new
+   end
+ end
+
diff --git a/dev-ruby/mocha/metadata.xml b/dev-ruby/mocha/metadata.xml
index daac6fdb7252..73af35f9de54 100644
--- a/dev-ruby/mocha/metadata.xml
+++ b/dev-ruby/mocha/metadata.xml
@@ -5,4 +5,7 @@
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">freerange/mocha</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/mocha/mocha-0.14.0-r1.ebuild b/dev-ruby/mocha/mocha-0.14.0-r1.ebuild
index d4985c30a762..d46ab5b47e50 100644
--- a/dev-ruby/mocha/mocha-0.14.0-r1.ebuild
+++ b/dev-ruby/mocha/mocha-0.14.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=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_TEST="MOCHA_NO_DOCS=true test:units"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://gofreerange.com/mocha/docs/"
 
 LICENSE="MIT"
 SLOT="0.14"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 ruby_add_bdepend "
@@ -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/mocha/mocha-1.13.0.ebuild b/dev-ruby/mocha/mocha-1.13.0.ebuild
deleted file mode 100644
index eb549c40a41f..000000000000
--- a/dev-ruby/mocha/mocha-1.13.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_TEST="test:units test:acceptance"
-
-RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-RUBY_FAKEGEM_GEMSPEC="mocha.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
-HOMEPAGE="https://mocha.jamesmead.org/"
-SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-ruby_add_bdepend "
-	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
-
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	export MOCHA_NO_DOCS=true
-	each_fakegem_test
-}
diff --git a/dev-ruby/mocha/mocha-1.14.0.ebuild b/dev-ruby/mocha/mocha-1.14.0.ebuild
deleted file mode 100644
index 4e571cd1eff7..000000000000
--- a/dev-ruby/mocha/mocha-1.14.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_TEST="test:units test:acceptance"
-
-RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-RUBY_FAKEGEM_GEMSPEC="mocha.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
-HOMEPAGE="https://mocha.jamesmead.org/"
-SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "
-	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
-
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	export MOCHA_NO_DOCS=true
-	each_fakegem_test
-}
diff --git a/dev-ruby/mocha/mocha-1.16.0.ebuild b/dev-ruby/mocha/mocha-1.16.0.ebuild
new file mode 100644
index 000000000000..8c58c034b618
--- /dev/null
+++ b/dev-ruby/mocha/mocha-1.16.0.ebuild
@@ -0,0 +1,42 @@
+# 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:units test:acceptance"
+
+RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
+
+RUBY_FAKEGEM_GEMSPEC="mocha.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
+HOMEPAGE="https://mocha.jamesmead.org/"
+SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
+
+PATCHES=(
+	"${FILESDIR}"/mocha-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 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	export MOCHA_NO_DOCS=true
+	each_fakegem_test
+}
diff --git a/dev-ruby/mocha/mocha-1.16.1.ebuild b/dev-ruby/mocha/mocha-1.16.1.ebuild
new file mode 100644
index 000000000000..01b505b918e2
--- /dev/null
+++ b/dev-ruby/mocha/mocha-1.16.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_TEST="test:units test:acceptance"
+
+RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
+
+RUBY_FAKEGEM_GEMSPEC="mocha.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
+HOMEPAGE="https://mocha.jamesmead.org/"
+SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
+
+PATCHES=(
+	"${FILESDIR}"/mocha-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 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	export MOCHA_NO_DOCS=true
+	each_fakegem_test
+}
diff --git a/dev-ruby/mocha/mocha-2.0.2.ebuild b/dev-ruby/mocha/mocha-2.0.2.ebuild
new file mode 100644
index 000000000000..34b0910a8949
--- /dev/null
+++ b/dev-ruby/mocha/mocha-2.0.2.ebuild
@@ -0,0 +1,42 @@
+# 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:units test:acceptance"
+
+RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
+
+RUBY_FAKEGEM_GEMSPEC="mocha.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
+HOMEPAGE="https://mocha.jamesmead.org/"
+SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/ruby2_keywords-0.0.5"
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
+
+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 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	export MOCHA_NO_DOCS=true
+	each_fakegem_test
+}
diff --git a/dev-ruby/mocha/mocha-2.0.4.ebuild b/dev-ruby/mocha/mocha-2.0.4.ebuild
new file mode 100644
index 000000000000..3b885a18a67d
--- /dev/null
+++ b/dev-ruby/mocha/mocha-2.0.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+RUBY_FAKEGEM_TASK_TEST="test:units test:acceptance"
+RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
+RUBY_FAKEGEM_GEMSPEC="mocha.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
+HOMEPAGE="https://mocha.jamesmead.org/"
+SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+
+ruby_add_rdepend ">=dev-ruby/ruby2_keywords-0.0.5"
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
+
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	export MOCHA_NO_DOCS=true
+	each_fakegem_test
+}
diff --git a/dev-ruby/mocha/mocha-2.1.0.ebuild b/dev-ruby/mocha/mocha-2.1.0.ebuild
new file mode 100644
index 000000000000..06d86dc2ac9b
--- /dev/null
+++ b/dev-ruby/mocha/mocha-2.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_TASK_TEST="test:units test:acceptance"
+RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
+RUBY_FAKEGEM_GEMSPEC="mocha.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
+HOMEPAGE="https://mocha.jamesmead.org/"
+SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+ruby_add_rdepend ">=dev-ruby/ruby2_keywords-0.0.5"
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	export MOCHA_NO_DOCS=true
+	each_fakegem_test
+}
diff --git a/dev-ruby/mocha/mocha-2.2.0.ebuild b/dev-ruby/mocha/mocha-2.2.0.ebuild
new file mode 100644
index 000000000000..06d86dc2ac9b
--- /dev/null
+++ b/dev-ruby/mocha/mocha-2.2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_TASK_TEST="test:units test:acceptance"
+RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
+RUBY_FAKEGEM_GEMSPEC="mocha.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
+HOMEPAGE="https://mocha.jamesmead.org/"
+SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+ruby_add_rdepend ">=dev-ruby/ruby2_keywords-0.0.5"
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	export MOCHA_NO_DOCS=true
+	each_fakegem_test
+}
diff --git a/dev-ruby/moneta/Manifest b/dev-ruby/moneta/Manifest
index 7213d9a559d5..b28d4aef51ef 100644
--- a/dev-ruby/moneta/Manifest
+++ b/dev-ruby/moneta/Manifest
@@ -1,4 +1 @@
-DIST moneta-1.3.0.tar.gz 130195 BLAKE2B c6eabfe31ca39b4b0c91214eb37a6090d21b3ff62943cbbb5e1f1b2dc72e6c4087aed7227fd1ecd0678730ca0b86b82423b25e8dca3c56881f2c0a7a98fc95f3 SHA512 9ea725f095cc7e7faae9621c2f4bfa27c54c81200c16a680fce289e68f79f4a5f66d9bb55b1921578a65d303ff6dd2069f56fbba28cb9e758d898ae03bb1c3dd
-DIST moneta-1.4.0.tar.gz 129069 BLAKE2B 86b3eaa875483acb5931eb5583f56a0484851df57bc0186daf5fe1cca402c209a44226e5dca570b14026f8beb861650506ccbb386ad8d092fb7b5a9277c6f8b5 SHA512 ebcdafd4badaddccf833a43c3561421d82d0941c2340b9bed37b62a94d79e5098a36e7f04b93b1fe26c7dedfe455d6a751be3aa4606263fd2025b7a95fb5a68d
-DIST moneta-1.4.1.tar.gz 129056 BLAKE2B b5a7a9fdb1817c88c942ce8cc3353974d556f14e6362722ae4b44c40311241aa5dd7354054e4edaca84edcc3a76b3d43230dc0a376d48911409721137cbf8d01 SHA512 7ff8fec2047a7df7e110480ff87eadc8e33b776176350279dd933b456cc7def0e92b74eb5dfb7ac2b2233232959acd839ede80d491bba0f134c31414d3f7786b
-DIST moneta-1.5.1.tar.gz 133512 BLAKE2B 6027685e3e28e238b2d984b02fe2d5e7ccf1dba6646d71980932581e9b63cfa9082aa3c3a1509b679922f480e1601c71475113ad3eea5f8b7644f69998e3bbca SHA512 018b162d75eb7cb5f2d38e1e6a79e5a17abf8aefc381eb3eb4d9d4981ac88be5063ce95b786aa928de1618c6458b926a27bd26f41ad6515cf7ee3dfc1274c236
+DIST moneta-1.6.0.tar.gz 136501 BLAKE2B 5682cfc265ac1c132f53d91c0cb6c2a99a08130d144d2eb8fb544952c29a77556066b36e9ea727df941b1768dec28e99bb3e3f4017ddf5e3cb38e690bcadbe0a SHA512 8f372bfd769205b88cd6f497266074784588ff04b99e3383641b4171cf586210a6655f003bb9e11fe5a2e9dfe5ebbb5fe372b415e2927ab50ee9c8f28bed6b5d
diff --git a/dev-ruby/moneta/metadata.xml b/dev-ruby/moneta/metadata.xml
index 5c626eb13865..15d5e5d493bf 100644
--- a/dev-ruby/moneta/metadata.xml
+++ b/dev-ruby/moneta/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">minad/moneta</remote-id>
+    <remote-id type="github">moneta-rb/moneta</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/moneta/moneta-1.3.0.ebuild b/dev-ruby/moneta/moneta-1.3.0.ebuild
deleted file mode 100644
index 309488d1bccb..000000000000
--- a/dev-ruby/moneta/moneta-1.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="none"
-# test is disabled for now. It requires many packages.  Test suite also
-# takes very long run time and has high memory consumption.
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md SPEC.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-GITHUB_USER="minad"
-
-DESCRIPTION="A unified interface to key/value stores"
-HOMEPAGE="https://github.com/minad/moneta"
-SRC_URI="https://github.com/${GITHUB_USER}/moneta/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/moneta/moneta-1.4.0.ebuild b/dev-ruby/moneta/moneta-1.4.0.ebuild
deleted file mode 100644
index 309488d1bccb..000000000000
--- a/dev-ruby/moneta/moneta-1.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="none"
-# test is disabled for now. It requires many packages.  Test suite also
-# takes very long run time and has high memory consumption.
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md SPEC.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-GITHUB_USER="minad"
-
-DESCRIPTION="A unified interface to key/value stores"
-HOMEPAGE="https://github.com/minad/moneta"
-SRC_URI="https://github.com/${GITHUB_USER}/moneta/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/moneta/moneta-1.4.1.ebuild b/dev-ruby/moneta/moneta-1.4.1.ebuild
deleted file mode 100644
index d9be5d3e4a3b..000000000000
--- a/dev-ruby/moneta/moneta-1.4.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="none"
-# test is disabled for now. It requires many packages.  Test suite also
-# takes very long run time and has high memory consumption.
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md SPEC.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-GITHUB_USER="minad"
-
-DESCRIPTION="A unified interface to key/value stores"
-HOMEPAGE="https://github.com/minad/moneta"
-SRC_URI="https://github.com/${GITHUB_USER}/moneta/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/moneta/moneta-1.5.1.ebuild b/dev-ruby/moneta/moneta-1.5.1.ebuild
deleted file mode 100644
index d9be5d3e4a3b..000000000000
--- a/dev-ruby/moneta/moneta-1.5.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="none"
-# test is disabled for now. It requires many packages.  Test suite also
-# takes very long run time and has high memory consumption.
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md SPEC.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-GITHUB_USER="minad"
-
-DESCRIPTION="A unified interface to key/value stores"
-HOMEPAGE="https://github.com/minad/moneta"
-SRC_URI="https://github.com/${GITHUB_USER}/moneta/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/moneta/moneta-1.6.0.ebuild b/dev-ruby/moneta/moneta-1.6.0.ebuild
new file mode 100644
index 000000000000..7baef16d4107
--- /dev/null
+++ b/dev-ruby/moneta/moneta-1.6.0.ebuild
@@ -0,0 +1,31 @@
+# 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_RECIPE_TEST="none"
+# test is disabled for now. It requires many packages.  Test suite also
+# takes very long run time and has high memory consumption.
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md SPEC.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A unified interface to key/value stores"
+HOMEPAGE="https://github.com/moneta-rb/moneta"
+SRC_URI="https://github.com/moneta-rb/moneta/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e "s/__dir__/'.'/" \
+		-e "s/_relative//" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/mqtt/Manifest b/dev-ruby/mqtt/Manifest
index 46758110bb7a..da870b9da1e7 100644
--- a/dev-ruby/mqtt/Manifest
+++ b/dev-ruby/mqtt/Manifest
@@ -1 +1 @@
-DIST mqtt-0.5.0.tar.gz 43944 BLAKE2B 1bd1002a83af339627377ecd850980fc00788133da3393e999dd798ac7544d70a6fdd45129b03ae36402aac28a3212171b77df2223fdee45ea4778405e61543b SHA512 ad6e6cb4775e89725a9aa02f2a1d91871cd34f2e5bf35033456b93ec09ec90a6fdcf1cbaf8822e1f032f0a52cde23db55fbb1e4eff4540e331397c180e7c6ed0
+DIST mqtt-0.6.0.tar.gz 45975 BLAKE2B e3548db5a1d758168c86be8a1d313ccd0cc7ed7d5993f03688d6c68de7b28fc1c42f87de5d9cca459b0cb383d65640ba00c1015261fc777bb56811a51147924e SHA512 c9dbf86c583c9e57af97a1481b308a3d3fc796a6dd813dce83a8206d773a343242423fa116abc4b8ce34a1d6f0cb2026cc9189dd8b98af69c980c54501e130d8
diff --git a/dev-ruby/mqtt/metadata.xml b/dev-ruby/mqtt/metadata.xml
index 0167e7af13e3..1ee7124c3e4f 100644
--- a/dev-ruby/mqtt/metadata.xml
+++ b/dev-ruby/mqtt/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
   <maintainer type="project">
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
diff --git a/dev-ruby/mqtt/mqtt-0.5.0.ebuild b/dev-ruby/mqtt/mqtt-0.5.0.ebuild
deleted file mode 100644
index 704bbe520194..000000000000
--- a/dev-ruby/mqtt/mqtt-0.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure Ruby gem that implements the MQTT protocol"
-HOMEPAGE="https://github.com/njh/ruby-mqtt"
-SRC_URI="https://github.com/njh/ruby-mqtt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="ruby-${P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#: ; /SimpleCov/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/mqtt/mqtt-0.6.0.ebuild b/dev-ruby/mqtt/mqtt-0.6.0.ebuild
new file mode 100644
index 000000000000..2fb7e1aa98ab
--- /dev/null
+++ b/dev-ruby/mqtt/mqtt-0.6.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_GEMSPEC="mqtt.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_S="ruby-${P}"
+inherit ruby-fakegem
+
+DESCRIPTION="Pure Ruby gem that implements the MQTT protocol"
+HOMEPAGE="https://github.com/njh/ruby-mqtt"
+SRC_URI="https://github.com/njh/ruby-mqtt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#: ; /SimpleCov/,/^  end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/msgpack/Manifest b/dev-ruby/msgpack/Manifest
index 66e53815222e..1d48369ddda1 100644
--- a/dev-ruby/msgpack/Manifest
+++ b/dev-ruby/msgpack/Manifest
@@ -1,4 +1,3 @@
-DIST msgpack-1.4.3.gem 84992 BLAKE2B 70610107a956416dbc861141cad6f0552f1729d50085a23bb1b3dc8d79c7892488e1cc4e3f3029f770065714effa5c56909df922c96866b25299994f02377c8a SHA512 4ec79dbac8ba4a954757575279b2ea705c81771f65215103149722964ede661e9ceba23ec15b471214cca798861a39122d6bb766f89c2fb1bad3784e7052a37c
-DIST msgpack-1.4.4.gem 84992 BLAKE2B 41cdb4042bc3ca833d2e1f7c3682c06b2dbf6928a814a48d87e08b0f40e092ad295f268f9a0d473de141dcb63b699ea2b3a223c9437e2b3799d8ec056123ed6f SHA512 0ee58d5c334f7ee3e8b890d480b71141603bd5951b188ef162d2ca03f51ef40316ff386c505ccd9dc8a6e667359b9fd8934263b1200a4ee8a399c220e95156b0
-DIST msgpack-1.4.5.gem 86016 BLAKE2B 590226923fd0017a8916b78d87a0a87a006caf1758d563f338371493af2c11ba586a13c7fe1f920e4cfda4a2cf8caa43c679b2709c31cf023f472184234c26c4 SHA512 e750c49c481dbd6bc9c25242f81a86d6ed35895275062cf0928c2929e6c8c354917fa2fcd2a23969cebd650911cf2d244d5d0809ce8252b463c66317f930c64f
-DIST msgpack-1.5.1.gem 91136 BLAKE2B b5e75c9788cb02c6b96a8543c90d1e601a188943c971d8acc594031e76b4836d543960a5fb4377f609d0c9ec9411a80653eb4167f07df4cad8f695fb69cbf278 SHA512 8104eae39b3bae29849d05fa34574e0bbc2d29a99665a20f867d4c01b2ce1aa126486bcb7cd7e01733d3ca683f56b93e651e06cf71229f2bc6f6c8e3f4ff39b7
+DIST msgpack-1.6.1.tar.gz 88601 BLAKE2B 2ddb84afde00240cf446b06d8e7445cfd14fa3dabe67b96035ff09629884523df049d42c4e5250e275648d2bcad0fa56179994c9ea096a1ffc6c86b594968eba SHA512 b8a268a9c357ad5d2fec3fcee3d1a3e818708a51e5035105f245ee0d7cbafc145c6cac5e8bc3bfd12efa967f8ed275e2dfacedb5f3556166ba8e2354260f51ee
+DIST msgpack-1.7.1.tar.gz 89373 BLAKE2B c8f1a9312e8a3610ecb3d41aa5f375efb0f059af29419f8be8879865e5b67578c6ea5e684ea4828aac4c7f636e613b720cb79e5e092500f72210fb783c457cc5 SHA512 31d9262f4f9b2537e6982aa72b3d7c50d90a95422f8636425448eb160412eb39e34888d584eb5286cf3f69317c0c81c2a2360f6b633f771701603a6cec7849e4
+DIST msgpack-1.7.2.tar.gz 90108 BLAKE2B e5630ed36b9e6574bdd6c823afc15958d3b2a58e0e43738c84595d017274d7fc2761d0b4baac2fc8b5ba5ef0f6e1bf78e8c448ef81aa9841c8b3f875bb67c90e SHA512 c7ecf8031644c87debf6fab7d6b358a80cccefe4c0c795695056e5e82b1138641a5b94ea05b2b6edf20de2621ac59c059dce6a627a254742fbca8f73f0110c10
diff --git a/dev-ruby/msgpack/metadata.xml b/dev-ruby/msgpack/metadata.xml
index 4e421bc9d97b..f07561c32c76 100644
--- a/dev-ruby/msgpack/metadata.xml
+++ b/dev-ruby/msgpack/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge-jp">msgpack</remote-id>
+		<remote-id type="github">msgpack/msgpack-ruby</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/msgpack/msgpack-1.4.3.ebuild b/dev-ruby/msgpack/msgpack-1.4.3.ebuild
deleted file mode 100644
index 40f2113bb7ce..000000000000
--- a/dev-ruby/msgpack/msgpack-1.4.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/msgpack/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/msgpack"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
-HOMEPAGE="https://msgpack.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="doc"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Remove jruby-specific specs that are run also for other rubies.
-	rm -rf spec/jruby || die
-
-	sed -i -e '/git ls-files/d' msgpack.gemspec || die
-}
diff --git a/dev-ruby/msgpack/msgpack-1.4.4.ebuild b/dev-ruby/msgpack/msgpack-1.4.4.ebuild
deleted file mode 100644
index 40f2113bb7ce..000000000000
--- a/dev-ruby/msgpack/msgpack-1.4.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/msgpack/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/msgpack"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
-HOMEPAGE="https://msgpack.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="doc"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Remove jruby-specific specs that are run also for other rubies.
-	rm -rf spec/jruby || die
-
-	sed -i -e '/git ls-files/d' msgpack.gemspec || die
-}
diff --git a/dev-ruby/msgpack/msgpack-1.4.5.ebuild b/dev-ruby/msgpack/msgpack-1.4.5.ebuild
deleted file mode 100644
index 882ba697121d..000000000000
--- a/dev-ruby/msgpack/msgpack-1.4.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/msgpack/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/msgpack"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
-HOMEPAGE="https://msgpack.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="doc"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Remove jruby-specific specs that are run also for other rubies.
-	rm -rf spec/jruby || die
-
-	sed -i -e 's/git ls-files/find * -print/' msgpack.gemspec || die
-}
diff --git a/dev-ruby/msgpack/msgpack-1.5.1.ebuild b/dev-ruby/msgpack/msgpack-1.5.1.ebuild
deleted file mode 100644
index 7a785b90e317..000000000000
--- a/dev-ruby/msgpack/msgpack-1.5.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/msgpack/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/msgpack"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
-HOMEPAGE="https://msgpack.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="doc"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Remove jruby-specific specs that are run also for other rubies.
-	rm -rf spec/jruby || die
-
-	sed -i -e 's/git ls-files/find * -print/' msgpack.gemspec || die
-}
diff --git a/dev-ruby/msgpack/msgpack-1.6.1.ebuild b/dev-ruby/msgpack/msgpack-1.6.1.ebuild
new file mode 100644
index 000000000000..b7184188713e
--- /dev/null
+++ b/dev-ruby/msgpack/msgpack-1.6.1.ebuild
@@ -0,0 +1,35 @@
+# 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_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/msgpack/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/msgpack"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_S="${PN}-ruby-${PV}"
+inherit ruby-fakegem
+
+DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
+HOMEPAGE="https://msgpack.org/"
+# In 1.6.1, they stopped shipping the specs in the gem :(
+# https://github.com/msgpack/msgpack-ruby/commit/9cbcd0b28527af5ca755f34dfb370e3f4474d129 (https://github.com/msgpack/msgpack-ruby/pull/311)
+SRC_URI="https://github.com/msgpack/msgpack-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# Remove jruby-specific specs that are run also for other rubies.
+	rm -rf spec/jruby || die
+
+	sed -i -e 's/git ls-files/find * -print/' msgpack.gemspec || die
+}
diff --git a/dev-ruby/msgpack/msgpack-1.7.1.ebuild b/dev-ruby/msgpack/msgpack-1.7.1.ebuild
new file mode 100644
index 000000000000..58f5c86c409b
--- /dev/null
+++ b/dev-ruby/msgpack/msgpack-1.7.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/msgpack/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/msgpack"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_S="${PN}-ruby-${PV}"
+inherit ruby-fakegem
+
+DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
+HOMEPAGE="https://msgpack.org/"
+# In 1.6.1, they stopped shipping the specs in the gem :(
+# https://github.com/msgpack/msgpack-ruby/commit/9cbcd0b28527af5ca755f34dfb370e3f4474d129 
+# (https://github.com/msgpack/msgpack-ruby/pull/311)
+SRC_URI="https://github.com/msgpack/msgpack-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# Remove jruby-specific specs that are run also for other rubies.
+	rm -rf spec/jruby || die
+
+	sed -i -e 's/git ls-files/find * -print/' msgpack.gemspec || die
+}
diff --git a/dev-ruby/msgpack/msgpack-1.7.2.ebuild b/dev-ruby/msgpack/msgpack-1.7.2.ebuild
new file mode 100644
index 000000000000..ca768ea98361
--- /dev/null
+++ b/dev-ruby/msgpack/msgpack-1.7.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/msgpack/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/msgpack"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
+HOMEPAGE="https://msgpack.org/"
+SRC_URI="https://github.com/msgpack/msgpack-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-ruby-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# Remove jruby-specific specs that are run also for other rubies.
+	rm -rf spec/jruby || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' msgpack.gemspec || die
+}
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index a0eafaf3bc5e..40de1f29c265 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,2 +1 @@
-DIST multi_json-1.14.1.tar.gz 24713 BLAKE2B 188d0fa3bf7a46a6cf4a5aa1d613523b4da3dee5061a5288146d1a367835b255f103dec265da9a218dd6dd21ecb38a7ce35d16a758ac7754b440f52c25f0b703 SHA512 19e2b6704a8ed39b8714da449c8961e740198772718ddba3d3b651f71f2b7d8c2c198d9cc16fe290f1df7b1e54d029c01147fdc431a8d2763944a4de802b89d9
 DIST multi_json-1.15.0.tar.gz 24932 BLAKE2B c99c5c6b152c91dedc38fd24f8697f918064c603bfd72c55213f3ac8afd14d3c0ba31b7c3fb91c9998fcc8a5386f41a6983c53b40119558b99194ba58c06cc91 SHA512 55c873e45cdc59e75823aa031eb6d792cb9dc744b13a682fc279a8375b925db7a984256d61aa5454795a59722794a774a0ed5b6bf518db253152f4af67f46dea
diff --git a/dev-ruby/multi_json/multi_json-1.14.1.ebuild b/dev-ruby/multi_json/multi_json-1.14.1.ebuild
deleted file mode 100644
index 797521a074c1..000000000000
--- a/dev-ruby/multi_json/multi_json-1.14.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="multi_json.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/intridea/multi_json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A gem to provide swappable JSON backends"
-HOMEPAGE="https://github.com/intridea/multi_json"
-LICENSE="MIT"
-
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "|| ( >=dev-ruby/json-1.4:* >=dev-ruby/yajl-ruby-1.0 )"
-
-ruby_add_bdepend "doc? ( dev-ruby/rspec:3 dev-ruby/yard )"
-
-ruby_add_bdepend "test? ( dev-ruby/json
-	dev-ruby/yajl-ruby )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die "Unable to remove bundler."
-
-	# Remove unimportant rspec options not supported by rspec 2.6.
-	rm .rspec || die
-
-	# Remove specs specific to oj since we don't package oj yet.
-	sed -i -e '/defaults to the best available gem/,/^  end/ s:^:#:' \
-		-e '/Oj does not create symbols on parse/,/^    end/ s:^:#:' \
-		-e '/with Oj.default_settings/,/^    end/ s:^:#:' \
-		-e '/using one-shot parser/,/^  end/ s:^:#:' \
-		-e '/jrjackson/askip "unpackaged"' \
-		spec/multi_json_spec.rb
-
-	# Avoid simplecov which only works with ruby 1.9
-	sed -i -e '/simplecov/d' -e '/SimpleCov.formatter/,/SimpleCov.start/ d' spec/spec_helper.rb || die
-
-	# Remove unpackaged and for our purposes unneeded coveralls
-	sed -i -e '/coveralls/d' spec/spec_helper.rb || die
-
-	# Avoid testing unpackaged adapters
-	rm spec/{gson,nsjsonserialization,jr_jackson,oj}_adapter_spec.rb || die
-}
-
-each_ruby_test() {
-	for t in spec/*_spec.rb; do
-		${RUBY} -S rspec-3 ${t} || die
-	done
-}
diff --git a/dev-ruby/multi_json/multi_json-1.15.0.ebuild b/dev-ruby/multi_json/multi_json-1.15.0.ebuild
index 8c7cefde22b4..ac82e36bb3ef 100644
--- a/dev-ruby/multi_json/multi_json-1.15.0.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.15.0.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC="yard"
@@ -20,7 +20,7 @@ DESCRIPTION="A gem to provide swappable JSON backends"
 HOMEPAGE="https://github.com/intridea/multi_json"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 SLOT="0"
 IUSE=""
 
@@ -53,6 +53,15 @@ all_ruby_prepare() {
 
 	# Avoid testing unpackaged adapters
 	rm spec/{gson,nsjsonserialization,jr_jackson,oj}_adapter_spec.rb || die
+
+	# Fix expectations confused by ruby30 kwargs
+	sed -e "/expect/ s/:foo => 'bar', :fizz => 'buzz'/{:foo => 'bar', :fizz => 'buzz'}/" \
+		-e "/expect/ s/:bar => :baz/{:bar => :baz}/" \
+		-i spec/shared/adapter.rb || die
+	sed -e '/expect/ s/:indent => "\\t"/{:indent => "\t"}/' \
+		-e '/expect/ s/:quirks_mode => false, :create_additions => false/{:quirks_mode => false, :create_additions => false}/' \
+		-i spec/shared/json_common_adapter.rb || die
+	sed -e "/expect/ s/:foo => 'bar'/{:foo => 'bar'}/" -i spec/multi_json_spec.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/multi_test/Manifest b/dev-ruby/multi_test/Manifest
index 91e1502d8bbe..f5bb73e7ebe8 100644
--- a/dev-ruby/multi_test/Manifest
+++ b/dev-ruby/multi_test/Manifest
@@ -1 +1 @@
-DIST multi_test-0.1.2.gem 9216 BLAKE2B 9a5888937c82f87822445855eb15406b4250b3b42f00116a2c54360ab35b923d08c4015d90b14003679aac5d674baec8756b74aae4a5246beeefbae262edcc1f SHA512 a0d59f51dc959b7febe9c32853b5ac5cbbb3215e8810de5e46fe10fa42931c1ea89df477155cc8124264d608c5928e54fd4e1949e7d0940f927e1430bfd60a2b
+DIST multi_test-1.1.0.gem 9728 BLAKE2B 7fb610adfb24762d3a4e31d299bfcd387c7db3c7121b9f32c23f3f7cd8bed8dff1bd1e8fdb9a82411977581dac88a4513164d88dae83ce957747bcca507f6388 SHA512 593b7cec0c63b497df5d2f05da72a401656a71229070ee3bdfbc89fd95991a803915929df0c89781470a12c63ac621e7a5ee00b5e6f610c9279a6fe99668c959
diff --git a/dev-ruby/multi_test/metadata.xml b/dev-ruby/multi_test/metadata.xml
index 658c72b1920d..0ddfd887d369 100644
--- a/dev-ruby/multi_test/metadata.xml
+++ b/dev-ruby/multi_test/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">cucumber/multi_test</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild b/dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild
deleted file mode 100644
index da7b604275e5..000000000000
--- a/dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A uniform interface for Ruby testing libraries"
-HOMEPAGE="https://cucumber.io/"
-LICENSE="MIT"
-
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE=""
-
-# Tests depend on specific versions of testing frameworks where bundler
-# downloads dependencies.
-RESTRICT="test"
diff --git a/dev-ruby/multi_test/multi_test-1.1.0.ebuild b/dev-ruby/multi_test/multi_test-1.1.0.ebuild
new file mode 100644
index 000000000000..060d3954e0d3
--- /dev/null
+++ b/dev-ruby/multi_test/multi_test-1.1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A uniform interface for Ruby testing libraries"
+HOMEPAGE="https://cucumber.io/"
+LICENSE="MIT"
+
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+# Tests depend on specific versions of testing frameworks where bundler
+# downloads dependencies.
+RESTRICT="test"
diff --git a/dev-ruby/multi_xml/multi_xml-0.6.0-r1.ebuild b/dev-ruby/multi_xml/multi_xml-0.6.0-r1.ebuild
deleted file mode 100644
index d73279c77376..000000000000
--- a/dev-ruby/multi_xml/multi_xml-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A generic swappable back-end for XML parsing"
-HOMEPAGE="https://www.rubydoc.info/gems/multi_xml"
-SRC_URI="https://github.com/sferik/multi_xml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-ruby_add_bdepend "test? ( dev-ruby/ox )"
-
-all_ruby_prepare() {
-	eapply "${FILESDIR}/${P}-ox24.patch"
-
-	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/helper.rb || die
-	sed -e '/bundler/I s:^:#:' \
-		-e '/yardstick/,/end/ s:^:#:' \
-		-e '/rubocop/I s:^:#:' \
-		-i Rakefile || die
-}
-
-each_ruby_test() {
-	CI=true each_fakegem_test
-}
diff --git a/dev-ruby/multi_xml/multi_xml-0.6.0-r2.ebuild b/dev-ruby/multi_xml/multi_xml-0.6.0-r2.ebuild
index 4fe8cc4c3005..743db1e19e19 100644
--- a/dev-ruby/multi_xml/multi_xml-0.6.0-r2.ebuild
+++ b/dev-ruby/multi_xml/multi_xml-0.6.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC="yard"
@@ -18,10 +18,10 @@ inherit ruby-fakegem
 DESCRIPTION="A generic swappable back-end for XML parsing"
 HOMEPAGE="https://www.rubydoc.info/gems/multi_xml"
 SRC_URI="https://github.com/sferik/multi_xml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+LICENSE="MIT"
 SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/yard )"
diff --git a/dev-ruby/multipart-parser/Manifest b/dev-ruby/multipart-parser/Manifest
new file mode 100644
index 000000000000..19e97b137ddc
--- /dev/null
+++ b/dev-ruby/multipart-parser/Manifest
@@ -0,0 +1 @@
+DIST multipart-parser-0.1.1.gem 9728 BLAKE2B 2e3fff62f51ebba0fef3ad95d2098d0f3ef45f0fdc13acd9776f0cacbf308c13e5a95b634d6692c5a6b17c208aa05d90c8f0c8469292a8895c95598ac2839edf SHA512 06428785ade714cb5c78dacfb0054c0358a2ba96e3d27fd39c9395d76d32cb4dba92f58086571e0bb5f8f6cd877e61678ad9573be4035c854264418a0199ae69
diff --git a/dev-ruby/multipart-parser/files/multipart-parser-0.1.1-fix-tests.patch b/dev-ruby/multipart-parser/files/multipart-parser-0.1.1-fix-tests.patch
new file mode 100644
index 000000000000..16f614b62c36
--- /dev/null
+++ b/dev-ruby/multipart-parser/files/multipart-parser-0.1.1-fix-tests.patch
@@ -0,0 +1,45 @@
+From be3fda8863a84d6380ce08f8c17f9eae34260a1e Mon Sep 17 00:00:00 2001
+From: Akio Tajima <akio.tajima@robotfund.co.jp>
+Date: Wed, 17 Jan 2018 08:41:35 +0000
+Subject: [PATCH] test/fixtures/multipart: fix long boundary and
+ delimiter\ntest/multipart_parser/parser_test: fix require path as reader_test
+
+---
+ test/fixtures/multipart.rb           | 10 +++++-----
+ test/multipart_parser/parser_test.rb |  4 ++--
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/test/fixtures/multipart.rb b/test/fixtures/multipart.rb
+index 89b1bc6..acb737a 100644
+--- a/test/fixtures/multipart.rb
++++ b/test/fixtures/multipart.rb
+@@ -96,11 +96,11 @@ def parts
+     end
+ 
+     def raw
+-      ['----------------------------5c4dc587f69f',
+-        'content-disposition: form-data; name="field1"',
+-        '',
+-        "Joe Blow\r\nalmost tricked you!",
+-        '----------------------------5c4dc587f69f--'
++      ['------------------------------5c4dc587f69f',
++       'content-disposition: form-data; name="field1"',
++       '',
++       "Joe Blow\r\nalmost tricked you!",
++       '------------------------------5c4dc587f69f--'
+       ].join("\r\n")
+     end
+   end
+diff --git a/test/multipart_parser/parser_test.rb b/test/multipart_parser/parser_test.rb
+index f477031..27455ec 100644
+--- a/test/multipart_parser/parser_test.rb
++++ b/test/multipart_parser/parser_test.rb
+@@ -1,6 +1,6 @@
+ require 'test/unit'
+-require "multipart_parser/parser"
+-require "fixtures/multipart"
++require File.dirname(__FILE__) + "/../../lib/multipart_parser/parser"
++require File.dirname(__FILE__) + "/../fixtures/multipart"
+ 
+ module MultipartParser
+   class ParserTest < Test::Unit::TestCase
diff --git a/dev-ruby/multipart-parser/metadata.xml b/dev-ruby/multipart-parser/metadata.xml
new file mode 100644
index 000000000000..75116a032393
--- /dev/null
+++ b/dev-ruby/multipart-parser/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">danabr/multipart-parser</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/multipart-parser/multipart-parser-0.1.1.ebuild b/dev-ruby/multipart-parser/multipart-parser-0.1.1.ebuild
new file mode 100644
index 000000000000..9e9543d01da9
--- /dev/null
+++ b/dev-ruby/multipart-parser/multipart-parser-0.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README"
+
+#RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A multipart parser written in Ruby"
+HOMEPAGE="https://github.com/danabr/multipart-parser"
+#SRC_URI="https://github.com/lostisland/faraday-multipart/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-fix-tests.patch )
diff --git a/dev-ruby/multipart-post/Manifest b/dev-ruby/multipart-post/Manifest
index 3d5be3c65a64..a5203d6c07c4 100644
--- a/dev-ruby/multipart-post/Manifest
+++ b/dev-ruby/multipart-post/Manifest
@@ -1 +1,2 @@
-DIST multipart-post-2.1.1.gem 13824 BLAKE2B 70a706714d14d284e2fa69aa56a69682e16eece75eb1508c1707b0b7f03b0d1fb11d1a187c7b7681dc0654a280c59bc20a0754d30e80807a4dfe5e56976b4ccc SHA512 afa16717ee136f0bbbc20fe243252831604740bb61fa7288a2437a4a67638f660a4bd491b5326b034173e9e8352f2659f27dc8aaa761721f7111b7e9e704582f
+DIST multipart-post-2.3.0.tar.gz 13151 BLAKE2B 59ac6cfc743a6aaa285dd14a81fedfb123aa09720dc96a7243de94d45b3b23295d5a7de1cfb61c40c64881ad213fbf2debca49d3b1f6de7e1772c60b7d3c4d78 SHA512 ac15090cbf6dc629d57efe4810406571aec8782d021891f1f2764d4f00b735a2282162b06ee140c5b2ad21fd83f3d25028f386768166cef668bb508c235f04b2
+DIST multipart-post-2.4.0.tar.gz 13693 BLAKE2B 2340aed254d98dd6f2444eaa90009893fc6430aa8f9c1c000522afb7656de2545a734246316adf97d40b87078517005e9dd3f281532a1f966d371cff4875bc1d SHA512 9a96dc66424d8a0575f982c58bc016eda93c17195b968821b342873b4b6b02d8f53ae210fb9eea5adedfa0d9bdd70f78b37a0196782bddcd01bbbfd0e757ac38
diff --git a/dev-ruby/multipart-post/metadata.xml b/dev-ruby/multipart-post/metadata.xml
index 6805130490ea..7ec44ce8eeb0 100644
--- a/dev-ruby/multipart-post/metadata.xml
+++ b/dev-ruby/multipart-post/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">nicksieger/multipart-post</remote-id>
+    <remote-id type="github">socketry/multipart-post</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/multipart-post/multipart-post-2.1.1-r1.ebuild b/dev-ruby/multipart-post/multipart-post-2.1.1-r1.ebuild
deleted file mode 100644
index 4046299435f2..000000000000
--- a/dev-ruby/multipart-post/multipart-post-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Adds a streamy multipart form post capability to Net::HTTP"
-HOMEPAGE="https://github.com/nicksieger/multipart-post"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/multipart-post/multipart-post-2.1.1.ebuild b/dev-ruby/multipart-post/multipart-post-2.1.1.ebuild
deleted file mode 100644
index 898d950137c0..000000000000
--- a/dev-ruby/multipart-post/multipart-post-2.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Adds a streamy multipart form post capability to Net::HTTP"
-HOMEPAGE="https://github.com/nicksieger/multipart-post"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/multipart-post/multipart-post-2.3.0.ebuild b/dev-ruby/multipart-post/multipart-post-2.3.0.ebuild
new file mode 100644
index 000000000000..d31229650ea3
--- /dev/null
+++ b/dev-ruby/multipart-post/multipart-post-2.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="changelog.md readme.md"
+RUBY_FAKEGEM_GEMSPEC="multipart-post.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Adds a streamy multipart form post capability to Net::HTTP"
+HOMEPAGE="https://github.com/socketry/multipart-post"
+SRC_URI="https://github.com/socketry/multipart-post/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|covered\)/ s:^:#:' spec/spec_helper.rb || die
+
+	sed -i -e 's:_relative ":"./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Remove warnings since these are only actionable for developers,
+	# not for people consuming this package as part of other tools.
+	sed -i -e '/Top level/ s/warn/# warn/' lib/*.rb || die
+}
diff --git a/dev-ruby/multipart-post/multipart-post-2.4.0.ebuild b/dev-ruby/multipart-post/multipart-post-2.4.0.ebuild
new file mode 100644
index 000000000000..3c8e0f964d0f
--- /dev/null
+++ b/dev-ruby/multipart-post/multipart-post-2.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="changelog.md readme.md"
+RUBY_FAKEGEM_GEMSPEC="multipart-post.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Adds a streamy multipart form post capability to Net::HTTP"
+HOMEPAGE="https://github.com/socketry/multipart-post"
+SRC_URI="https://github.com/socketry/multipart-post/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|covered\)/ s:^:#:' spec/spec_helper.rb || die
+
+	sed -i -e 's:_relative ":"./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Remove warnings since these are only actionable for developers,
+	# not for people consuming this package as part of other tools.
+	sed -i -e '/Top level/ s/warn/# warn/' lib/*.rb || die
+}
diff --git a/dev-ruby/mustache/metadata.xml b/dev-ruby/mustache/metadata.xml
index 658c72b1920d..969ef434f599 100644
--- a/dev-ruby/mustache/metadata.xml
+++ b/dev-ruby/mustache/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">mustache/mustache</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/mustache/mustache-1.1.1-r1.ebuild b/dev-ruby/mustache/mustache-1.1.1-r1.ebuild
index af74c86d7e22..a8f4b32ff05e 100644
--- a/dev-ruby/mustache/mustache-1.1.1-r1.ebuild
+++ b/dev-ruby/mustache/mustache-1.1.1-r1.ebuild
@@ -1,9 +1,9 @@
-# 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"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
@@ -13,11 +13,11 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit multilib ruby-fakegem
 
 DESCRIPTION="Mustache is a framework-agnostic way to render logic-free views"
-HOMEPAGE="https://mustache.github.com/"
+HOMEPAGE="https://mustache.github.io/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-test-ordering.patch" )
@@ -32,7 +32,7 @@ all_ruby_prepare() {
 }
 
 each_ruby_test() {
-	${RUBY} -Ilib:. -e "Dir['test/*.rb'].each{|f| require f}" || die
+	MT_NO_PLUGINS=1 ${RUBY} -Ilib:. -e "Dir['test/*.rb'].each{|f| require f}" || die
 }
 
 all_ruby_install() {
diff --git a/dev-ruby/mustache/mustache-1.1.1.ebuild b/dev-ruby/mustache/mustache-1.1.1.ebuild
deleted file mode 100644
index 4d0fd65664ca..000000000000
--- a/dev-ruby/mustache/mustache-1.1.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC="man:build"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Mustache is a framework-agnostic way to render logic-free views"
-HOMEPAGE="https://mustache.github.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-test-ordering.patch" )
-
-ruby_add_bdepend "doc? ( app-text/ronn )"
-
-all_ruby_prepare() {
-	# Fix for renamed .ron files
-	sed -i -e 's:\.ronn:.ron:' Rakefile || die
-
-	sed -i -e '/simplecov/,/^end/ s:^:#:' test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e "Dir['test/*.rb'].each{|f| require f}" || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/mustache.1 man/mustache.5
-}
diff --git a/dev-ruby/mustermann/Manifest b/dev-ruby/mustermann/Manifest
index 6598deefc3e5..f80e0a7b3bed 100644
--- a/dev-ruby/mustermann/Manifest
+++ b/dev-ruby/mustermann/Manifest
@@ -1 +1 @@
-DIST mustermann-1.1.1.gem 51712 BLAKE2B cce8b5237b8dea0dae42822ec58c02a88b07b6d75a09bff6d8699c41fbc53c900dd3bc157ef66c863ad7d646bd5380cf935f5fa3cc1b322cef39b73d26682dac SHA512 55d5fd9b8309e0b806b2fb0af409fbc71b958b8f91116991439f2c66b1f71f17647a61020b0349a86132e7d3da383121719ea330538abb8f3c8bef5fbff0b747
+DIST mustermann-3.0.0.gem 50176 BLAKE2B fc77327de469f0886de782c577ac164b222bbe18074f1ec63c35a08344cfcdf9a2cb44b453c594e2b153db3055ff1e7bcf969240ade04e70be5cb85a73e486a3 SHA512 c33d41281fe2ac80c0af0c5c31dbab2068c73b9da19a4b82b387bbe551019fc115675634d932a8e56b070c3a06a85d830c982a103e6c5193aff8647f599be6e3
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-1.1.1.ebuild b/dev-ruby/mustermann/mustermann-1.1.1.ebuild
deleted file mode 100644
index b71baa060801..000000000000
--- a/dev-ruby/mustermann/mustermann-1.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-# There are specs but they depend heavily on unpackaged code.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library implementing patterns that behave like regular expressions"
-HOMEPAGE="https://github.com/sinatra/mustermann"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/ruby2_keywords-0.0*"
diff --git a/dev-ruby/mustermann/mustermann-3.0.0.ebuild b/dev-ruby/mustermann/mustermann-3.0.0.ebuild
new file mode 100644
index 000000000000..c7be5f34f92b
--- /dev/null
+++ b/dev-ruby/mustermann/mustermann-3.0.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# There are specs but they depend heavily on unpackaged code.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library implementing patterns that behave like regular expressions"
+HOMEPAGE="https://github.com/sinatra/mustermann"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "=dev-ruby/ruby2_keywords-0.0*"
diff --git a/dev-ruby/mutex_m/Manifest b/dev-ruby/mutex_m/Manifest
new file mode 100644
index 000000000000..7edcf85a3ab1
--- /dev/null
+++ b/dev-ruby/mutex_m/Manifest
@@ -0,0 +1 @@
+DIST mutex_m-0.2.0.tar.gz 4199 BLAKE2B 853b68f856d43ac7172e9c4fc8dd144282e6879b75bdcb223c40ca0433e22c21e2343cb949c19d6aaafb9208650001b011e12954321e1223f40a3bbb62a8fbde SHA512 aba0c77ac7663925a856621dad89ed6afd9a70697373bbffa0c335a9aef4774c4114b45e4addd747fe2b751af689c2710e549398aa80176970c612d570730ee7
diff --git a/dev-ruby/mutex_m/metadata.xml b/dev-ruby/mutex_m/metadata.xml
new file mode 100644
index 000000000000..420f235d2335
--- /dev/null
+++ b/dev-ruby/mutex_m/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/mutex_m</remote-id>
+    <remote-id type="rubygems">mutex_m</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/mutex_m/mutex_m-0.2.0.ebuild b/dev-ruby/mutex_m/mutex_m-0.2.0.ebuild
new file mode 100644
index 000000000000..d06d22d412e7
--- /dev/null
+++ b/dev-ruby/mutex_m/mutex_m-0.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="mutex_m.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mixin to extend objects to be handled like a Mutex"
+HOMEPAGE="https://github.com/ruby/mutex_m"
+SRC_URI="https://github.com/ruby/mutex_m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/mysql2/Manifest b/dev-ruby/mysql2/Manifest
index 916c65d17788..465817ce280c 100644
--- a/dev-ruby/mysql2/Manifest
+++ b/dev-ruby/mysql2/Manifest
@@ -1,3 +1,2 @@
-DIST mysql2-0.5.3.20210920.tar.gz 114492 BLAKE2B 589ee721838f956f90474e859d0dd2e8cf11c8622a8f89410929f9c52c82c240a5a7eea7e6b132e0212dd6e9cd13c5ca950e6cacac368d158aeca9feacc98a7c SHA512 3bec768b69ecc3b54db84048b633602e80f09c4b4631daf1fbd81810c33038410f6112b467ab7ac86051ba91e4660abb3546e55cb52d26b96531f3305b43871f
-DIST mysql2-0.5.3.gem 74240 BLAKE2B 9de25a34173ab952f6842f01d9207405c8bc6ed5937fdf66de4062129fc20f425635956f6d12f78466c8c341c49916f7d00df845f84a4101d34a98b1585b9919 SHA512 59a0ee00261b09e8bbfc586a6f75af840a465a94fd8c9463a3d7767e5ea6b7e64507c9571fb90c6d0cdde3cfff560c97fbf3f3c32b3916aca852ef5c41e1bce9
-DIST mysql2-0.5.4.tar.gz 116463 BLAKE2B 9c9ad00d813d69b6790d9a0c6c05979892d1b8bedb54e95326bf2250479a93958797fa845d60e29b5a8efcb416a80a94be66535e641d30c92b64d50c5f62c3b5 SHA512 89958220d2f5454351f4e4b93099e12355cb0a8c36824125650f2366b15cdb3e1aa208f60beb348834cd2ee6fa36aac4102581c16fe1b6bd4f2136cc1a8b5c99
+DIST mysql2-0.5.5.tar.gz 124769 BLAKE2B 698b18434691b2b7734c6fa314c931a38e973813a1912166838541f35c181813bff2db2c0967df72e8d9108b9ea71a030af09f39354a9c902674fab287b82331 SHA512 fa43e464bfd495d335c6f95b1897009813b7d6fbfeebe8d9c533c4f88c664a61a140227df73eb892c0314f76ebb5d0f2e06265284512dd35950bbab78d20e0fc
+DIST mysql2-0.5.6.tar.gz 125108 BLAKE2B cdecc8912a5cd1c1cb9ea1a428c930cf0acad8832db3c8fcee93c8a3ef898fff47f09735d7b646e782e4a908e555c704a11e68ffc10ef735705438d0090e2883 SHA512 44b6e0bfe819d9a9ce056d4cd99b547dbb2bebe512a00eadf030885a8b7b147bc08a334dc583585bddf36998d46242aa0aadc9dc159f2296d6f3640a74362de9
diff --git a/dev-ruby/mysql2/mysql2-0.5.3-r1.ebuild b/dev-ruby/mysql2/mysql2-0.5.3-r1.ebuild
deleted file mode 100644
index 600eafde560e..000000000000
--- a/dev-ruby/mysql2/mysql2-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-# Tests require a live MySQL database but should all pass.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/mysql2/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/mysql2
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
-HOMEPAGE="https://github.com/brianmario/mysql2"
-
-LICENSE="MIT"
-SLOT="0.5"
-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}"
-
-each_ruby_configure() {
-	local config
-	if use mysql ; then
-		config="${EPREFIX}/usr/bin/mysql_config"
-	fi
-	if use mariadb ; then
-		config="${EPREFIX}/usr/bin/mariadb_config"
-	fi
-
-	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config="${config}" || die
-}
diff --git a/dev-ruby/mysql2/mysql2-0.5.3.20210920.ebuild b/dev-ruby/mysql2/mysql2-0.5.3.20210920.ebuild
deleted file mode 100644
index 37d6e7fd7c44..000000000000
--- a/dev-ruby/mysql2/mysql2-0.5.3.20210920.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-# Tests require a live MySQL database but should all pass.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/mysql2/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/mysql2
-
-RUBY_FAKEGEM_GEMSPEC="mysql2.gemspec"
-
-COMMIT=6652da20010ddfbbe6bceb8e41666d05e512346c
-
-inherit ruby-fakegem
-
-DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
-HOMEPAGE="https://github.com/brianmario/mysql2"
-SRC_URI="https://github.com/brianmario/mysql2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-RUBY_S="mysql2-${COMMIT}"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-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}"
-
-all_ruby_prepare() {
-	sed -i -e '/s.version/ s/Mysql2::VERSION/"'${PV}'"/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	local config
-	if use mysql ; then
-		config="${EPREFIX}/usr/bin/mysql_config"
-	fi
-	if use mariadb ; then
-		config="${EPREFIX}/usr/bin/mariadb_config"
-	fi
-
-	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config="${config}" || die
-}
diff --git a/dev-ruby/mysql2/mysql2-0.5.4.ebuild b/dev-ruby/mysql2/mysql2-0.5.4.ebuild
deleted file mode 100644
index c37cd71d63a4..000000000000
--- a/dev-ruby/mysql2/mysql2-0.5.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-# Tests require a live MySQL database but should all pass.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/mysql2/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/mysql2
-
-RUBY_FAKEGEM_GEMSPEC="mysql2.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
-HOMEPAGE="https://github.com/brianmario/mysql2"
-SRC_URI="https://github.com/brianmario/mysql2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-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}"
-
-all_ruby_prepare() {
-	sed -i -e '/s.version/ s/Mysql2::VERSION/"'${PV}'"/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	local config
-	if use mysql ; then
-		config="${EPREFIX}/usr/bin/mysql_config"
-	fi
-	if use mariadb ; then
-		config="${EPREFIX}/usr/bin/mariadb_config"
-	fi
-
-	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config="${config}" || die
-}
diff --git a/dev-ruby/mysql2/mysql2-0.5.5.ebuild b/dev-ruby/mysql2/mysql2-0.5.5.ebuild
new file mode 100644
index 000000000000..baec9e3c8882
--- /dev/null
+++ b/dev-ruby/mysql2/mysql2-0.5.5.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/mysql2/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/mysql2
+
+RUBY_FAKEGEM_GEMSPEC="mysql2.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
+HOMEPAGE="https://github.com/brianmario/mysql2"
+SRC_URI="https://github.com/brianmario/mysql2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="mysql mariadb"
+REQUIRED_USE="^^ ( mariadb mysql )"
+
+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
+}
+
+each_ruby_configure() {
+	local config
+	if use mysql ; then
+		config="${EPREFIX}/usr/bin/mysql_config"
+	fi
+	if use mariadb ; then
+		config="${EPREFIX}/usr/bin/mariadb_config"
+	fi
+
+	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config="${config}" || die
+}
+
+each_ruby_test() {
+	local -x USER=$(whoami)
+
+	einfo "Creating mysql test instance ..."
+	mkdir -p "${T}"/mysql || die
+	if use mariadb ; then
+		local -x PATH="${BROOT}/usr/share/mariadb/scripts:${PATH}"
+
+		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 ..."
+	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/mysql2/mysql2-0.5.6.ebuild b/dev-ruby/mysql2/mysql2-0.5.6.ebuild
new file mode 100644
index 000000000000..380f6a06f03d
--- /dev/null
+++ b/dev-ruby/mysql2/mysql2-0.5.6.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/mysql2/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/mysql2
+
+RUBY_FAKEGEM_GEMSPEC="mysql2.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
+HOMEPAGE="https://github.com/brianmario/mysql2"
+SRC_URI="https://github.com/brianmario/mysql2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="mysql mariadb"
+REQUIRED_USE="^^ ( mariadb mysql )"
+
+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
+}
+
+each_ruby_configure() {
+	local config
+	if use mysql ; then
+		config="${EPREFIX}/usr/bin/mysql_config"
+	fi
+	if use mariadb ; then
+		config="${EPREFIX}/usr/bin/mariadb_config"
+	fi
+
+	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config="${config}" || die
+}
+
+each_ruby_test() {
+	local -x USER=$(whoami)
+
+	einfo "Creating mysql test instance ..."
+	mkdir -p "${T}"/mysql || die
+	if use mariadb ; then
+		local -x PATH="${BROOT}/usr/share/mariadb/scripts:${PATH}"
+
+		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 ..."
+	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/nagios_analyzer/Manifest b/dev-ruby/nagios_analyzer/Manifest
deleted file mode 100644
index a0c72b8c6bb4..000000000000
--- a/dev-ruby/nagios_analyzer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nagios_analyzer-0.0.5.gem 11264 BLAKE2B 16e90e269f73e7f717fcde574fd729efd0ab5a0c1892ffe1692e5bb0c87ed6e6909f45381d8021b24540ef3f99d80d9564c37476bbbba7ed11743616b065c6b0 SHA512 052ad107bf39d35b0c21392f4d5905ddcf009e3fa4b780706c23b9d6a45bf6a7b0a64dad596c8a32aedb332ee069f062c30b47479289569fb5f13b5705b03303
diff --git a/dev-ruby/nagios_analyzer/metadata.xml b/dev-ruby/nagios_analyzer/metadata.xml
deleted file mode 100644
index 9f6a9e2a4c52..000000000000
--- a/dev-ruby/nagios_analyzer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jbbarth/nagios_analyzer</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/nagios_analyzer/nagios_analyzer-0.0.5-r2.ebuild b/dev-ruby/nagios_analyzer/nagios_analyzer-0.0.5-r2.ebuild
deleted file mode 100644
index c0867a5217de..000000000000
--- a/dev-ruby/nagios_analyzer/nagios_analyzer-0.0.5-r2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRADOC="README.textile"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple parser for Nagios status files"
-HOMEPAGE="https://github.com/jbbarth/nagios_analyzer"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
diff --git a/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild b/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild
deleted file mode 100644
index aff63cb7ecd0..000000000000
--- a/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Extremely mynymal test framework"
-HOMEPAGE="https://github.com/mynyml/nanotest"
-LICENSE="MIT"
-
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE=""
-
-each_ruby_test() {
-	${RUBY} -I.:lib test/test_nanotest.rb || die
-}
diff --git a/dev-ruby/nanotest/nanotest-0.9.4.1-r2.ebuild b/dev-ruby/nanotest/nanotest-0.9.4.1-r2.ebuild
new file mode 100644
index 000000000000..463f215eb6d8
--- /dev/null
+++ b/dev-ruby/nanotest/nanotest-0.9.4.1-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Extremely mynymal test framework"
+HOMEPAGE="https://github.com/mynyml/nanotest"
+LICENSE="MIT"
+
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	sed -e 's/MiniTest::Unit::TestCase/Minitest::Test/' \
+		-i test/test_helper.rb test/test_nanotest.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -I.:lib test/test_nanotest.rb || die
+}
diff --git a/dev-ruby/narray/narray-0.6.1.2-r1.ebuild b/dev-ruby/narray/narray-0.6.1.2-r1.ebuild
deleted file mode 100644
index 6476e6194a42..000000000000
--- a/dev-ruby/narray/narray-0.6.1.2-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md README.ja.md SPEC.en.txt SPEC.ja.txt"
-
-RUBY_FAKEGEM_GEMSPEC="narray.gemspec"
-RUBY_FAKEGEM_VERSION="${PV/_p/.}"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Numerical N-dimensional Array class"
-HOMEPAGE="https://masa16.github.io/narray/"
-SRC_URI="https://github.com/masa16/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~mips ppc ~ppc64 x86"
-
-IUSE=""
-
-all_ruby_prepare() {
-	# the tests aren't really written to be a testsuite, so the
-	# failure cases will literally fail; ignore all of those and
-	# instead expect that the rest won't fail.
-	sed -i -e '/[fF]ollowing will fail/,$ s:^:#:' \
-		-e '/next will fail/,$ s:^:#:' \
-		test/*.rb || die "sed failed"
-
-	sed -i -e 's:src/narray.h:narray.h:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	${RUBY} extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-	cp -l ${PN}$(get_modname) ${PN}.h ${PN}_config.h lib/ || die "copy of ${PN}$(get_modname) failed"
-}
-
-each_ruby_test() {
-	for unit in test/*; do
-		${RUBY} -Ilib ${unit} || die "test ${unit} failed"
-	done
-}
diff --git a/dev-ruby/narray/narray-0.6.1.2-r2.ebuild b/dev-ruby/narray/narray-0.6.1.2-r2.ebuild
index 17c9c193b908..3def3445048e 100644
--- a/dev-ruby/narray/narray-0.6.1.2-r2.ebuild
+++ b/dev-ruby/narray/narray-0.6.1.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
@@ -21,9 +21,9 @@ DESCRIPTION="Numerical N-dimensional Array class"
 HOMEPAGE="https://masa16.github.io/narray/"
 SRC_URI="https://github.com/masa16/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Ruby"
+LICENSE="Ruby-BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~mips ppc ~ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-ruby/naught/naught-1.1.0-r1.ebuild b/dev-ruby/naught/naught-1.1.0-r1.ebuild
index 3d848dda9b1c..38c82ed74117 100644
--- a/dev-ruby/naught/naught-1.1.0-r1.ebuild
+++ b/dev-ruby/naught/naught-1.1.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="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/necromancer/Manifest b/dev-ruby/necromancer/Manifest
index 0e7eb24324b5..ee9c8917db5c 100644
--- a/dev-ruby/necromancer/Manifest
+++ b/dev-ruby/necromancer/Manifest
@@ -1,2 +1 @@
-DIST necromancer-0.5.1.gem 19968 BLAKE2B 32bf97caea056a1290ad574a32dbd8f9f258d0830694b28c3691d9d39039fcf6fb1d66c909f720350f455399fbbc9e416354de99bdad532d94843a8f8f1fdab5 SHA512 439358288bbdba674de9ebc4e43ddbba2fd8602c25114fff7a4c93fa11eb5d2a21aae7b6a95d82e78216fa19b5254270292e2e609fd08d6954f2b39afb9a3854
 DIST necromancer-0.7.0.tar.gz 22784 BLAKE2B b895677d0293adabd9c30d44c33131c69b9b30c24deca41d257c75d586cf44e34d68a090c8618a3040622be93fca3c4e637bb7510ff5db586c0392c47ee4e389 SHA512 873284964e55a0be0265675860b22345f7d46d8b49ccebb5cbe7a2103bfcb639443c3ad3af5d6d6f07d1bb2bc16dd945dc8c0a39b803640e866b82317d5f67b9
diff --git a/dev-ruby/necromancer/necromancer-0.5.1.ebuild b/dev-ruby/necromancer/necromancer-0.5.1.ebuild
deleted file mode 100644
index 39ac9d3e5b58..000000000000
--- a/dev-ruby/necromancer/necromancer-0.5.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Conversion from one object type to another with a bit of black magic"
-HOMEPAGE="https://github.com/piotrmurach/necromancer"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	echo '-rspec_helper' > .rspec || die
-}
diff --git a/dev-ruby/necromancer/necromancer-0.7.0-r1.ebuild b/dev-ruby/necromancer/necromancer-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..9705fe252424
--- /dev/null
+++ b/dev-ruby/necromancer/necromancer-0.7.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="necromancer.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Conversion from one object type to another with a bit of black magic"
+HOMEPAGE="https://github.com/piotrmurach/necromancer"
+SRC_URI="https://github.com/piotrmurach/necromancer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/necromancer/necromancer-0.7.0.ebuild b/dev-ruby/necromancer/necromancer-0.7.0.ebuild
deleted file mode 100644
index 73d45d482c7d..000000000000
--- a/dev-ruby/necromancer/necromancer-0.7.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_GEMSPEC="necromancer.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Conversion from one object type to another with a bit of black magic"
-HOMEPAGE="https://github.com/piotrmurach/necromancer"
-SRC_URI="https://github.com/piotrmurach/necromancer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/nenv/nenv-0.3.0-r1.ebuild b/dev-ruby/nenv/nenv-0.3.0-r1.ebuild
index 19fd0447c95d..9d193bedb683 100644
--- a/dev-ruby/nenv/nenv-0.3.0-r1.ebuild
+++ b/dev-ruby/nenv/nenv-0.3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/e2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/neovim-ruby-client/Manifest b/dev-ruby/neovim-ruby-client/Manifest
index 60f393e7a906..027ace499b09 100644
--- a/dev-ruby/neovim-ruby-client/Manifest
+++ b/dev-ruby/neovim-ruby-client/Manifest
@@ -1 +1 @@
-DIST neovim-0.8.1.gem 43520 BLAKE2B 0b7401c1dfb1675725dbf50c45626d88b1a5932ccd4836e8a33974b8e71e44bafa10bf1a43e51b7f42e2702facec776cbcef3093c5cf86e500a5e94be9486b08 SHA512 2d56cd56c0817491622f9a4beee4cdc9244e9fd6a4a6b78d69b51f160b1a24395730f153800279b7fdebc99d61c55e3b8944d4b16c1028cfbf5d8c95308d0f53
+DIST neovim-0.9.1.gem 45568 BLAKE2B 1d04ebae7ac708ed8d170ae0652e6b2d5e008efe82c4239479fefac10a23ce3f258d0b501ab72c529c158ad5129324259037804554dd7de26998c1dfbfe9d187 SHA512 93ad413b745ff337036cfe82581575f2f3392212b020323545c8bbd63ecf0d4bb119316a3adce036b4e7d1a5b563501c27934b9eb32b854088920a511115d66d
diff --git a/dev-ruby/neovim-ruby-client/metadata.xml b/dev-ruby/neovim-ruby-client/metadata.xml
index a759a4efccd5..e05710b6f148 100644
--- a/dev-ruby/neovim-ruby-client/metadata.xml
+++ b/dev-ruby/neovim-ruby-client/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">alexgenco/neovim-ruby</remote-id>
+    <remote-id type="github">neovim/neovim-ruby</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.8.1-r1.ebuild b/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.8.1-r1.ebuild
deleted file mode 100644
index b80f9588c1d3..000000000000
--- a/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_NAME="neovim"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby bindings for Neovim"
-HOMEPAGE="https://github.com/alexgenco/neovim-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND+=" app-editors/neovim"
-DEPEND+=" test? ( app-editors/neovim )"
-
-ruby_add_rdepend "
-	>=dev-ruby/msgpack-1.1:0
-	=dev-ruby/multi_json-1*
-"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|pry\)/ s:^:#:' spec/helper.rb || die
-
-	# Avoid tests that result in a unix socket path that is too long
-	sed -i -e '/\(establishes an RPC connection\|sets appropriate client info\)/askip "socket path length"' spec/neovim_spec.rb || die
-}
diff --git a/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.9.1.ebuild b/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.9.1.ebuild
new file mode 100644
index 000000000000..c2e80576a5c7
--- /dev/null
+++ b/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.9.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_NAME="neovim"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby bindings for Neovim"
+HOMEPAGE="https://github.com/neovim/neovim-ruby"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND+=" app-editors/neovim"
+DEPEND+=" test? ( app-editors/neovim )"
+
+ruby_add_rdepend "
+	>=dev-ruby/msgpack-1.1:0
+	=dev-ruby/multi_json-1*
+"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|pry\)/ s:^:#:' spec/helper.rb || die
+
+	# Avoid tests that result in a unix socket path that is too long
+	sed -e '/\(establishes an RPC connection\|sets appropriate client info\)/askip "socket path length"' \
+		-i spec/neovim_spec.rb || die
+}
diff --git a/dev-ruby/net-ftp/Manifest b/dev-ruby/net-ftp/Manifest
index f164c6fa904a..ca4d33dab28d 100644
--- a/dev-ruby/net-ftp/Manifest
+++ b/dev-ruby/net-ftp/Manifest
@@ -1 +1,4 @@
-DIST net-ftp-0.1.3.tar.gz 29719 BLAKE2B 27d6dbe8b75ceeba49ae9c1b041f1b3196c7e938a1a5cd10b68a8130cde09bb974a2900cff93d2d1aced6b69d1fa4749eec58650a2d4b1583fdc7fd86f001b03 SHA512 73159513947e1574d15b4d73c87c6b7506e1ee8defc01fd5dfbd4dc7e9f4aa9e8a2a62ae397b3471d0276707d806c6f3252540e60d9b224d30a8cc23fe60b4d3
+DIST net-ftp-0.2.0.tar.gz 29845 BLAKE2B 710ad47552242dfc30fd971cff683d67e0e1cda73086e3504b0e45ab650ad4666c19c46d221bb5b64fab2d507a9063c64fc8da17de9221de4fd487acb0cb3514 SHA512 a6b2f30bde4c39568690db7f57e917e0fab046d456acfe68eb22a0ee81ad71b4be4a6c7752dc556bb2481f3e0fe5fc81193e194e2b5056087abce633e0d2f7e9
+DIST net-ftp-0.3.0.tar.gz 29793 BLAKE2B 392182d7942b4c983816be1933a5b1ce0e35fb4d55adbd768e3b3306f680a20f0fcc43ef76cad6f0dcca49ac20d6539ce237cccedbe7290dee4b230c06042d10 SHA512 b6fcfd013e91c31752e44179a0cc2a115e261fcba12a0656654d52cdd216ec5d0b115108cba15b795c106d257bb34277c6dbed9153362a061510efddc7bc2494
+DIST net-ftp-0.3.3.tar.gz 29810 BLAKE2B 8677e55b4159ea072d90b1c12f992bbe66e8164bc866e80c0a216024c004a5a6971ae5a39c5eba5de35f9a85bab4b53da962ccb40e1049bf4df24377fb1ee874 SHA512 ace1a56de83f1369842e62a5164367281e7d10072a684ab0ad37591429623dd75de6ab672aa893651705ac62f74c12404b124a982b920142d3a5ff1296c24ec6
+DIST net-ftp-0.3.4.tar.gz 28020 BLAKE2B 2962f61c17b4314a044d3a80c62693948d1241f783b6f948a056ca34b8f076c8357dc150f04e09a245236b402c6e711e02f6a3717b60aa816a6ca419cfa1ed08 SHA512 1f289b8b0481abf66bbe000cfdc08d8f32559d02ccee186159696e1b563aecc1178d975946d969064bdb8abf8f76d50b5d5bde0423e12bf2ba0b757796c9b046
diff --git a/dev-ruby/net-ftp/net-ftp-0.1.3.ebuild b/dev-ruby/net-ftp/net-ftp-0.1.3.ebuild
deleted file mode 100644
index 73db2cdf3890..000000000000
--- a/dev-ruby/net-ftp/net-ftp-0.1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="net-ftp.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Support for the File Transfer Protocol"
-HOMEPAGE="https://github.com/ruby/net-ftp"
-SRC_URI="https://github.com/ruby/net-ftp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/net-protocol
-	dev-ruby/time
-"
-
-all_ruby_prepare() {
-	sed -e 's/__dir__/"."/' \
-		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/net-ftp/net-ftp-0.2.0.ebuild b/dev-ruby/net-ftp/net-ftp-0.2.0.ebuild
new file mode 100644
index 000000000000..87b1ff8c5865
--- /dev/null
+++ b/dev-ruby/net-ftp/net-ftp-0.2.0.ebuild
@@ -0,0 +1,32 @@
+# 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_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="net-ftp.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Support for the File Transfer Protocol"
+HOMEPAGE="https://github.com/ruby/net-ftp"
+SRC_URI="https://github.com/ruby/net-ftp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/net-protocol
+	dev-ruby/time
+"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/net-ftp/net-ftp-0.3.0.ebuild b/dev-ruby/net-ftp/net-ftp-0.3.0.ebuild
new file mode 100644
index 000000000000..74b0e783b4dc
--- /dev/null
+++ b/dev-ruby/net-ftp/net-ftp-0.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="net-ftp.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Support for the File Transfer Protocol"
+HOMEPAGE="https://github.com/ruby/net-ftp"
+SRC_URI="https://github.com/ruby/net-ftp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/net-protocol
+	dev-ruby/time
+"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/net-ftp/net-ftp-0.3.3.ebuild b/dev-ruby/net-ftp/net-ftp-0.3.3.ebuild
new file mode 100644
index 000000000000..cf7130d30ce1
--- /dev/null
+++ b/dev-ruby/net-ftp/net-ftp-0.3.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="net-ftp.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Support for the File Transfer Protocol"
+HOMEPAGE="https://github.com/ruby/net-ftp"
+SRC_URI="https://github.com/ruby/net-ftp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/net-protocol
+	dev-ruby/time
+"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/net-ftp/net-ftp-0.3.4.ebuild b/dev-ruby/net-ftp/net-ftp-0.3.4.ebuild
new file mode 100644
index 000000000000..506af331b8a7
--- /dev/null
+++ b/dev-ruby/net-ftp/net-ftp-0.3.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="net-ftp.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Support for the File Transfer Protocol"
+HOMEPAGE="https://github.com/ruby/net-ftp"
+SRC_URI="https://github.com/ruby/net-ftp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+ruby_add_rdepend "
+	dev-ruby/net-protocol
+	dev-ruby/time
+"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1-r1.ebuild b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1-r1.ebuild
deleted file mode 100644
index fb0a2242f257..000000000000
--- a/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An implementation of RFC 2617 - Digest Access Authentication"
-HOMEPAGE="https://github.com/drbrain/net-http-digest_auth"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1-r2.ebuild b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1-r2.ebuild
new file mode 100644
index 000000000000..5fa9bed2ea02
--- /dev/null
+++ b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An implementation of RFC 2617 - Digest Access Authentication"
+HOMEPAGE="https://github.com/drbrain/net-http-digest_auth"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/net-http-persistent/Manifest b/dev-ruby/net-http-persistent/Manifest
index 6cef2d4de01a..f4c1d3d39969 100644
--- a/dev-ruby/net-http-persistent/Manifest
+++ b/dev-ruby/net-http-persistent/Manifest
@@ -1,2 +1 @@
-DIST net-http-persistent-3.1.0.gem 31744 BLAKE2B fdd9c36ab5216c1cd1fe358207a689276e109845ac374ea16011469b6cb2b165115e78e701cce98c280e7f878c23d8016e75cac4508c7e579209012671b64101 SHA512 65b5afc4ad0729ec14b642e0e36363cecfff3dc25b26308d632866e93fed3eccfb83ce85da78f631553c6a1fe3ee834fcbc9d3681c85db6387463abbc30e60fa
-DIST net-http-persistent-4.0.1.gem 27136 BLAKE2B b88151498c401cc20983c86859d7ef7ae3688ee12a5fcc69544d9716c3aeed55f4339d35ec08e9c0a6a16b4b4ab807d7155425c3056b9634185c255472ad93c5 SHA512 d3c86c9c58affac8cde1513dd899527406c0baafd3a620b80011e3babf51a4bfd6fb2bd8998fd9c4696d49aad2d014bdf666b9626e06fe4413cb4010f94e5e91
+DIST net-http-persistent-4.0.2.tar.gz 23779 BLAKE2B 7ea0140ed9baf97f05f13816ddd836cc874a1861a0ca4d84d98fd8d5665163e96d74c6eef602088a12577addda8fad5c2194c7f679c59917255979c5618c1c8d SHA512 4ef028245092a15f5e017ed6f2723cb82a2ed1fdbcb55217e5807068a40601151c29f929c95ffb5bdaae12fe34dca6658e674e282be42e7b0909c0ff2ea984fd
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-3.1.0.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-3.1.0.ebuild
deleted file mode 100644
index 13fed6f70af6..000000000000
--- a/dev-ruby/net-http-persistent/net-http-persistent-3.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8"
-HOMEPAGE="https://github.com/drbrain/net-http-persistent"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend ">=dev-ruby/connection_pool-2.2:0"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/hoe dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# avoid test with implicit dependency on net-http-pipeline which
-	# fails and is not tested upstream
-	sed -i -e '/net-http-pipeline not installed/ s/unless.*$//' test/test_net_http_persistent.rb || die
-}
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-4.0.1.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-4.0.1.ebuild
deleted file mode 100644
index 1b3948b52c45..000000000000
--- a/dev-ruby/net-http-persistent/net-http-persistent-4.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8"
-HOMEPAGE="https://github.com/drbrain/net-http-persistent"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend ">=dev-ruby/connection_pool-2.2:0"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/hoe dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# avoid test with implicit dependency on net-http-pipeline which
-	# fails and is not tested upstream
-	sed -i -e '/net-http-pipeline not installed/ s/unless.*$//' test/test_net_http_persistent.rb || die
-}
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-4.0.2.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-4.0.2.ebuild
new file mode 100644
index 000000000000..a6a8499e31f1
--- /dev/null
+++ b/dev-ruby/net-http-persistent/net-http-persistent-4.0.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8"
+HOMEPAGE="https://github.com/drbrain/net-http-persistent"
+SRC_URI="https://github.com/drbrain/net-http-persistent/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc test"
+
+ruby_add_rdepend ">=dev-ruby/connection_pool-2.2:0"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	# Not relevant for us (we're just using rake for the tests)
+	sed -i -e '/require "rake\/manifest"/,/^end/ s:^:#:' Rakefile || die
+
+	# avoid test with implicit dependency on net-http-pipeline which
+	# fails and is not tested upstream
+	sed -i -e '/net-http-pipeline not installed/ s/unless.*$//' test/test_net_http_persistent.rb || die
+}
diff --git a/dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1-r1.ebuild b/dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1-r1.ebuild
index 40e1897cd99b..97042d4f6d06 100644
--- a/dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1-r1.ebuild
+++ b/dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1-r1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 inherit ruby-fakegem
 
 DESCRIPTION="An HTTP/1.1 pipelining implementation atop Net::HTTP"
-HOMEPAGE="http://docs.seattlerb.org/net-http-pipeline/"
+HOMEPAGE="https://docs.seattlerb.org/net-http-pipeline/"
 
 LICENSE="MIT"
 SLOT="1"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="test"
 
 ruby_add_bdepend "
 	test? ( dev-ruby/minitest )
@@ -20,6 +20,9 @@ ruby_add_bdepend "
 
 all_ruby_prepare() {
 	eapply -p0 "${FILESDIR}/${PN}-accept-encoding.patch"
+
+	sed -e 's/MiniTest::Unit::TestCase/Minitest::Test/' \
+		-i test/test_net_http_pipeline.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/net-imap/Manifest b/dev-ruby/net-imap/Manifest
index 344ab1a4f1fa..a6f87a9061e8 100644
--- a/dev-ruby/net-imap/Manifest
+++ b/dev-ruby/net-imap/Manifest
@@ -1 +1,2 @@
-DIST net-imap-0.2.3.tar.gz 61440 BLAKE2B f38bed72777ad93b5a94361ca134644ae218f4a0cb3f26330a99dd5633d30f0f846f3fc4eeb01bc94c13bd5e553cb29f1ad03264987badf83b8f5404755c73ac SHA512 69b6596a8ecc66788be10d11dad911351db6ff651f56e8dc5223f4c948efe0d2e53bd465ebf56edd96f1c414e3819413835c14b35a8e90b9f9ac59bfaa5611c6
+DIST net-imap-0.3.7.tar.gz 138906 BLAKE2B d6bc143d3947ec8a97cd7e0628e05447574f83296c78275dc7414d9cc744e820bcb6b8917de9215152be8b6141f69d4d6a1ea9e2265791eb4989dcdcce09b10c SHA512 6917d3bd980bbca86938232a59104dd924ffe7ec2f095e8c997165c726ada8020c821b26a0e8748433df49cf8802c4a434c805bd27f415d1f2644ddea1a94db8
+DIST net-imap-0.4.10.tar.gz 241688 BLAKE2B 459581055564669e99f40436b454a1a072de57fb64fc81ee55bee602ca6e3ed97c81cda1975d462b5d583264adad72803cfe801319ba8724fd8ae229cfb7ec68 SHA512 0f05588dc80cef7f121cbb40e2e9ddd6cd44e5ba96ca8451ea32339275d394f1233bc6a8bc30aa1de6852f49a469e0ee64a3821d08e12199e4af51fca4e79ccf
diff --git a/dev-ruby/net-imap/metadata.xml b/dev-ruby/net-imap/metadata.xml
index ae944adb3a9c..46975a288425 100644
--- a/dev-ruby/net-imap/metadata.xml
+++ b/dev-ruby/net-imap/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">ruby/net-pop</remote-id>
+    <remote-id type="github">ruby/net-imap</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/net-imap/net-imap-0.2.3.ebuild b/dev-ruby/net-imap/net-imap-0.2.3.ebuild
deleted file mode 100644
index d3e03b6e8231..000000000000
--- a/dev-ruby/net-imap/net-imap-0.2.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="net-imap.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby client api for Internet Message Access Protocol"
-HOMEPAGE="https://github.com/ruby/net-imap"
-SRC_URI="https://github.com/ruby/net-imap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/digest
-	dev-ruby/net-protocol
-	dev-ruby/strscan
-"
-
-all_ruby_prepare() {
-	sed -e 's/__dir__/"."/' \
-		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/net-imap/net-imap-0.3.7.ebuild b/dev-ruby/net-imap/net-imap-0.3.7.ebuild
new file mode 100644
index 000000000000..c4f12ebdde0c
--- /dev/null
+++ b/dev-ruby/net-imap/net-imap-0.3.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="net-imap.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby client api for Internet Message Access Protocol"
+HOMEPAGE="https://github.com/ruby/net-imap"
+SRC_URI="https://github.com/ruby/net-imap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/date
+	dev-ruby/net-protocol
+"
+
+ruby_add_bdepend "test? ( dev-ruby/digest dev-ruby/strscan )"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/net-imap/net-imap-0.4.10.ebuild b/dev-ruby/net-imap/net-imap-0.4.10.ebuild
new file mode 100644
index 000000000000..78de90b9b8ae
--- /dev/null
+++ b/dev-ruby/net-imap/net-imap-0.4.10.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="net-imap.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby client api for Internet Message Access Protocol"
+HOMEPAGE="https://github.com/ruby/net-imap"
+SRC_URI="https://github.com/ruby/net-imap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/date
+	dev-ruby/net-protocol
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/digest
+	dev-ruby/strscan
+	dev-ruby/test-unit
+	dev-ruby/test-unit-ruby-core
+)"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/net-pop/Manifest b/dev-ruby/net-pop/Manifest
index 5a8ef422b0f3..f9d3cc684256 100644
--- a/dev-ruby/net-pop/Manifest
+++ b/dev-ruby/net-pop/Manifest
@@ -1 +1 @@
-DIST net-pop-0.1.1.tar.gz 17292 BLAKE2B ccb653929b29572944b0edfd1d8123c64fd1e2baabf360ed9d04a173d348825d2a2c1e675669af96e11c84cd32a07ad37a395e9a5a78bd8a853c65e42d1dd205 SHA512 9a6a03cf8ce19711a1f9318910f0cb01ec5282695e986b68657fafc289ef32c084f2a9f5a038114f550ef1553bc99c8dda094191492b503c82a37a4a71124eb2
+DIST net-pop-0.1.2.tar.gz 21598 BLAKE2B 6d5082f135804a72f2b09f9107601f0dd6b42f33a9d46cd36eec1759b3376f82564e305596cfd519ae64a8c820fcbf57ab9ff29cc16ab9298b9ce069a1405b60 SHA512 5f7e78cb5499f1049c93732f88857d0b2bf9e864bcfc897beddd3fc86883204ff6c153ae9fc24715b1625fec5e2ec673e913a1495e43ec0e077e52d88aaf3448
diff --git a/dev-ruby/net-pop/net-pop-0.1.1.ebuild b/dev-ruby/net-pop/net-pop-0.1.1.ebuild
deleted file mode 100644
index 019ae6674791..000000000000
--- a/dev-ruby/net-pop/net-pop-0.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="net-pop.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby client library for POP3"
-HOMEPAGE="https://github.com/ruby/net-pop"
-SRC_URI="https://github.com/ruby/net-pop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/digest
-	dev-ruby/net-protocol
-	dev-ruby/timeout
-"
-
-all_ruby_prepare() {
-	sed -e 's/__dir__/"."/' \
-		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/net-pop/net-pop-0.1.2.ebuild b/dev-ruby/net-pop/net-pop-0.1.2.ebuild
new file mode 100644
index 000000000000..65f27a0463d9
--- /dev/null
+++ b/dev-ruby/net-pop/net-pop-0.1.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="net-pop.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby client library for POP3"
+HOMEPAGE="https://github.com/ruby/net-pop"
+SRC_URI="https://github.com/ruby/net-pop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/net-protocol
+"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/net-protocol/Manifest b/dev-ruby/net-protocol/Manifest
index 0eac72f9f05f..61cf20c2a202 100644
--- a/dev-ruby/net-protocol/Manifest
+++ b/dev-ruby/net-protocol/Manifest
@@ -1,2 +1,2 @@
-DIST net-protocol-0.1.2.tar.gz 17603 BLAKE2B 2d5dd2437d2d10e82c20e17884b80259b7cb5b5ef626f4dc054515adaff46143b46754fc375f66e5754aa81a72372784b389864bbed249c6df59d64331c47672 SHA512 959b426ab3fb388d42ccd5b21e60878b58e606ec21d651d232d706c40908c6b53c14ce16362ca3c32cb40da1238baf79127d870788adc8b23884204f4426f9d7
-DIST net-protocol-0.1.3.tar.gz 17522 BLAKE2B 6789bcf2f1908e91b6e01cdb225feb975457b9c274b6632d67e39c2fed1a6a0efe20c8f8f10d8f287618546c116fd0a5947b994c6d749d8312b243bdb7d624e1 SHA512 958f7a52fd7db661e60fa6f4f401ee0097de0782d984b4394dec5ced34b4935d6f30b65a198f5b9cc17247b6ff06ff266e2ca1f1081369cc18597bfd30285774
+DIST net-protocol-0.2.1.tar.gz 17713 BLAKE2B dc5abe229e6900a41af786f6e617c27a8fec2fc720afaf95ae72a1614017c43617eb207a57a6460dd6b589c392ec6cb65ff4a3b6e3f09e04f765295f5d41a3ff SHA512 e3990b64826c681efac2bcb5cbe4f120e730ddac8e1a62690e575de5037c7a9ddb80bf6cc051c98319c37013fef7f4f331adbcd51e96f32ecf4c3804fcd1f7c5
+DIST net-protocol-0.2.2.tar.gz 7863 BLAKE2B fe3fb6657d0efc9e9ca0d2bde4d32098d221c9a36c0d7f2160d39fe49d080ae4bb399c32709165684c8942bb1ea2fe60aa7144e161ad0a7962fd932dc5c20e32 SHA512 15698d9a88bca73edaa4d0db6ea9fabf2e09e7bfc6d08c2f03e3e1f0afe4f07c642af0d1272795c0907cacec0fc4b9a7844c5cb803f19082cdec420668a05aa8
diff --git a/dev-ruby/net-protocol/net-protocol-0.1.2.ebuild b/dev-ruby/net-protocol/net-protocol-0.1.2.ebuild
deleted file mode 100644
index a64dd392a5c1..000000000000
--- a/dev-ruby/net-protocol/net-protocol-0.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="net-protocol.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The abstruct interface for net-* client"
-HOMEPAGE="https://github.com/ruby/net-protocol"
-SRC_URI="https://github.com/ruby/net-protocol/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/io-wait
-	dev-ruby/timeout
-"
-
-all_ruby_prepare() {
-	sed -e 's/__dir__/"."/' \
-		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/net-protocol/net-protocol-0.1.3.ebuild b/dev-ruby/net-protocol/net-protocol-0.1.3.ebuild
deleted file mode 100644
index b048b906f840..000000000000
--- a/dev-ruby/net-protocol/net-protocol-0.1.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="net-protocol.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The abstruct interface for net-* client"
-HOMEPAGE="https://github.com/ruby/net-protocol"
-SRC_URI="https://github.com/ruby/net-protocol/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/timeout
-"
-
-all_ruby_prepare() {
-	sed -e 's/__dir__/"."/' \
-		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/net-protocol/net-protocol-0.2.1.ebuild b/dev-ruby/net-protocol/net-protocol-0.2.1.ebuild
new file mode 100644
index 000000000000..092435ee0737
--- /dev/null
+++ b/dev-ruby/net-protocol/net-protocol-0.2.1.ebuild
@@ -0,0 +1,31 @@
+# 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_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="net-protocol.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The abstruct interface for net-* client"
+HOMEPAGE="https://github.com/ruby/net-protocol"
+SRC_URI="https://github.com/ruby/net-protocol/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/timeout
+"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/net-protocol/net-protocol-0.2.2.ebuild b/dev-ruby/net-protocol/net-protocol-0.2.2.ebuild
new file mode 100644
index 000000000000..0bd59921fc38
--- /dev/null
+++ b/dev-ruby/net-protocol/net-protocol-0.2.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="net-protocol.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The abstruct interface for net-* client"
+HOMEPAGE="https://github.com/ruby/net-protocol"
+SRC_URI="https://github.com/ruby/net-protocol/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/timeout
+"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/net-scp/Manifest b/dev-ruby/net-scp/Manifest
index 1d9f8827588e..c612a8faf0de 100644
--- a/dev-ruby/net-scp/Manifest
+++ b/dev-ruby/net-scp/Manifest
@@ -1 +1 @@
-DIST net-scp-3.0.0.tar.gz 27947 BLAKE2B 78a1100b7602b9c09c8f06228b6e564fce15133c6cf8c9816613cb56b1d3805d9393700eb66c3710e482771e4116beae393c12ad12963b85428e21e7cf105218 SHA512 6d68b75124ccd2d387983f6d66a8b0e040132ba17d942631c806e899dff757ffae7a031a27ea0988166bf56e803c1a6175199845a848b92c7064388564e0ac79
+DIST net-scp-4.0.0.tar.gz 27962 BLAKE2B 0531fccad790e5466da9bf5c4cdcfa6416d84e759b096fcaabebc6403293be8ad8f15546126fb51bc76929d871b6ec067302dd88859c09e9c177bbbb4ecd6ae3 SHA512 9691f707c83d2b24954670e73b306f1262437d9c10561f4ceaa4979e3b06a237d97cba9f517f73931cd44a494fd04306ded077284927dcab313ce669037a1cdf
diff --git a/dev-ruby/net-scp/net-scp-3.0.0.ebuild b/dev-ruby/net-scp/net-scp-3.0.0.ebuild
deleted file mode 100644
index ba8bc03a74f2..000000000000
--- a/dev-ruby/net-scp/net-scp-3.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_GEMSPEC="net-scp.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby implementation of the SCP client protocol"
-HOMEPAGE="https://github.com/net-ssh/net-scp"
-SRC_URI="https://github.com/net-ssh/net-scp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-ruby_add_bdepend "
-	doc? ( || ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 ) )
-	test? (
-		|| ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 )
-		dev-ruby/mocha
-	)"
-
-ruby_add_rdepend "|| ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 )"
-
-all_ruby_prepare() {
-	sed -e "s:_relative ': './:" \
-		-e 's/git ls-files -z/find -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/test_all.rb || die
-}
diff --git a/dev-ruby/net-scp/net-scp-4.0.0.ebuild b/dev-ruby/net-scp/net-scp-4.0.0.ebuild
new file mode 100644
index 000000000000..4ab4f1e3f33c
--- /dev/null
+++ b/dev-ruby/net-scp/net-scp-4.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_GEMSPEC="net-scp.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby implementation of the SCP client protocol"
+HOMEPAGE="https://github.com/net-ssh/net-scp"
+SRC_URI="https://github.com/net-ssh/net-scp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/net-ssh:7 )
+	test? (
+		<dev-ruby/mocha-2.2.0:2
+		dev-ruby/test-unit
+	)"
+
+ruby_add_rdepend "dev-ruby/net-ssh:7"
+
+all_ruby_prepare() {
+	sed -e "s:_relative ': './:" \
+		-e 's/git ls-files -z/find -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -e '/mocha/ s/setup/test_unit/' \
+		-i test/common.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test test/test_all.rb || die
+}
diff --git a/dev-ruby/net-sftp/Manifest b/dev-ruby/net-sftp/Manifest
index 067884c48708..178923b318b0 100644
--- a/dev-ruby/net-sftp/Manifest
+++ b/dev-ruby/net-sftp/Manifest
@@ -1 +1 @@
-DIST net-sftp-3.0.0.tar.gz 63542 BLAKE2B e09e209aa0d102a6da7611cabf49970c9a4e572d51946d5dc0688879db97c92e8a39713dd0011a4234391ff0ab685a978c491917c041f7d10a8f092fde5c876a SHA512 c28411cfa8522dec893fe7a1588a16bb761a9d7692c81c453d9a9ad817988637614c6afd754db8547e845a16062882e2b7e95974b889631676f092d9e84b83e7
+DIST net-sftp-4.0.0.tar.gz 63896 BLAKE2B d63d32d3810c05c6ed19d156c87854d09a585a63e651be5984aed22b9a2b82c6c1464dd90fcc07d5586cd171d388dd6874ebe9e4e871012fee1620701f1d648e SHA512 8c4284da3b9143a02d597fc1c2824e5ab96abb38fef932682326443ea949733c4e7513184fb6b5c870d3ff802928e34580d423c98c594cb7a07ad17a50fb5c56
diff --git a/dev-ruby/net-sftp/net-sftp-3.0.0.ebuild b/dev-ruby/net-sftp/net-sftp-3.0.0.ebuild
deleted file mode 100644
index f5d048eeb007..000000000000
--- a/dev-ruby/net-sftp/net-sftp-3.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="net-sftp.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SFTP in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-sftp"
-SRC_URI="https://github.com/net-ssh/net-sftp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "|| ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		>=dev-ruby/mocha-0.13
-	)"
-
-all_ruby_prepare() {
-	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/net-sftp/net-sftp-4.0.0.ebuild b/dev-ruby/net-sftp/net-sftp-4.0.0.ebuild
new file mode 100644
index 000000000000..e1c163dd6524
--- /dev/null
+++ b/dev-ruby/net-sftp/net-sftp-4.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="net-sftp.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="SFTP in pure Ruby"
+HOMEPAGE="https://github.com/net-ssh/net-sftp"
+SRC_URI="https://github.com/net-ssh/net-sftp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/net-ssh:7"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		>=dev-ruby/mocha-0.13
+	)"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=1 ${RUBY} -Ilib:test:. -e 'Dir["test/**/test_*.rb"].each { require _1 }' || die
+}
diff --git a/dev-ruby/net-smtp/Manifest b/dev-ruby/net-smtp/Manifest
index 5f64d5deaddc..5aa2be16ab64 100644
--- a/dev-ruby/net-smtp/Manifest
+++ b/dev-ruby/net-smtp/Manifest
@@ -1 +1,3 @@
-DIST net-smtp-0.3.1.tar.gz 24465 BLAKE2B 200af603428dde4daf79aaac426525e1d7e2533995dcda4e2b96daaf64900558fd1717086215bf35cba9fd6db732d2d5a4b529531508a757197dc174a9f905b3 SHA512 68807d204f7768a3d890c0fd1076b2d7f77be3df662549ae9cfb56c8f84491cf4948addeb47399cdc9e7580e175e9d20ddeca25da8daafb3a90b880cc39a81ae
+DIST net-smtp-0.3.3.tar.gz 25297 BLAKE2B 29339faf7c7a3870b2eed7d2b9058ad7b3beaae9bddd3fe718cbcba0c65faa3e118916ac2e2a8cfc9e52c602bde301929c037856b68e42881bdab3ecbb90b01f SHA512 1936cede296d899f2cbcf5874b1472e808255cca21788037f6e8f38f8b1ef05779fec0c4f51a3970c09191078fee84c85e909eb9223034bdc293a1215b004ad1
+DIST net-smtp-0.4.0.tar.gz 26695 BLAKE2B 4ae79a5288ccb55b9a9bcd377ef3c85123a55b9269815730b2fb394ba98469ecaa7a5fc3230bc4a2e9117bff62453a69b627a397db1ca4f63f0cbd4856510d4e SHA512 3a130daac6392dd9328bdc644e1089eb34f290658b06f4aee48ab9f407086446af9fe674c5f417251ffb04478e5a6f14829f2b13b3e62fadb65ac09a2fa35bc1
+DIST net-smtp-0.5.0.tar.gz 26026 BLAKE2B 9969354a7f0fc4a32beac965bfc325aa54a1687d28ee7a4828005bbee1cabcaeefb4ffcdd019761c9162c7623efeccc8a4cb7222df004c75cbc1cced5242df3f SHA512 bf497150a4b7f59307ddedd02b1b210b971ba0de0d7459872d01a7db8175bb42c29598b5e9b6efdbdf90cc012696da2e000149246e1142a5695e7fe646aa6fa8
diff --git a/dev-ruby/net-smtp/net-smtp-0.3.1.ebuild b/dev-ruby/net-smtp/net-smtp-0.3.1.ebuild
deleted file mode 100644
index 6a5d70ff99e2..000000000000
--- a/dev-ruby/net-smtp/net-smtp-0.3.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-RUBY_FAKEGEM_GEMSPEC="net-smtp.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple Mail Transfer Protocol client library for Ruby"
-HOMEPAGE="https://github.com/ruby/net-smtp"
-SRC_URI="https://github.com/ruby/net-smtp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/digest
-	dev-ruby/net-protocol
-	dev-ruby/timeout
-"
-
-all_ruby_prepare() {
-	sed -e 's/__dir__/"."/' \
-		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/net-smtp/net-smtp-0.3.3.ebuild b/dev-ruby/net-smtp/net-smtp-0.3.3.ebuild
new file mode 100644
index 000000000000..fc25cb4c581a
--- /dev/null
+++ b/dev-ruby/net-smtp/net-smtp-0.3.3.ebuild
@@ -0,0 +1,31 @@
+# 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_EXTRADOC="NEWS.md README.md"
+RUBY_FAKEGEM_GEMSPEC="net-smtp.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple Mail Transfer Protocol client library for Ruby"
+HOMEPAGE="https://github.com/ruby/net-smtp"
+SRC_URI="https://github.com/ruby/net-smtp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/net-protocol
+"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/net-smtp/net-smtp-0.4.0.ebuild b/dev-ruby/net-smtp/net-smtp-0.4.0.ebuild
new file mode 100644
index 000000000000..ec05e4f513c7
--- /dev/null
+++ b/dev-ruby/net-smtp/net-smtp-0.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+RUBY_FAKEGEM_GEMSPEC="net-smtp.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple Mail Transfer Protocol client library for Ruby"
+HOMEPAGE="https://github.com/ruby/net-smtp"
+SRC_URI="https://github.com/ruby/net-smtp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/net-protocol
+"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/net-smtp/net-smtp-0.5.0.ebuild b/dev-ruby/net-smtp/net-smtp-0.5.0.ebuild
new file mode 100644
index 000000000000..8fe426c506ae
--- /dev/null
+++ b/dev-ruby/net-smtp/net-smtp-0.5.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+RUBY_FAKEGEM_GEMSPEC="net-smtp.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple Mail Transfer Protocol client library for Ruby"
+HOMEPAGE="https://github.com/ruby/net-smtp"
+SRC_URI="https://github.com/ruby/net-smtp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+ruby_add_rdepend "
+	dev-ruby/net-protocol
+"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0-r1.ebuild b/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0-r1.ebuild
deleted file mode 100644
index 5074ad99bf59..000000000000
--- a/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.md"
-RUBY_FAKEGEM_GEMSPEC="net-ssh-gateway.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple library to assist in enabling tunneled Net::SSH connections"
-HOMEPAGE="https://github.com/net-ssh/net-ssh-gateway"
-SRC_URI="https://github.com/net-ssh/net-ssh-gateway/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2.0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-ruby_add_bdepend "dev-ruby/minitest:5
-	dev-ruby/mocha:1.0"
-
-ruby_add_rdepend ">=dev-ruby/net-ssh-4.0.0:*"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/bundler/ s:^:#:' Rakefile test/net/ssh/gateway_test.rb || die
-	sed -i -e 's:mocha/mini_test:mocha/minitest:' test/net/ssh/gateway_test.rb || die
-}
diff --git a/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0-r2.ebuild b/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0-r2.ebuild
new file mode 100644
index 000000000000..6bfe49fb154c
--- /dev/null
+++ b/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.md"
+RUBY_FAKEGEM_GEMSPEC="net-ssh-gateway.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple library to assist in enabling tunneled Net::SSH connections"
+HOMEPAGE="https://github.com/net-ssh/net-ssh-gateway"
+SRC_URI="https://github.com/net-ssh/net-ssh-gateway/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2.0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+ruby_add_depend "dev-ruby/minitest:5
+	dev-ruby/mocha:2"
+
+ruby_add_rdepend ">=dev-ruby/net-ssh-4.0.0:*"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/bundler/ s:^:#:' Rakefile test/net/ssh/gateway_test.rb || die
+	sed -e 's:mocha/mini_test:mocha/minitest:' \
+		-e 's/MiniTest/Minitest/' \
+		-i test/net/ssh/gateway_test.rb || die
+}
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index 175a80bdfa36..8ae33fd07332 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -1,2 +1,3 @@
-DIST net-ssh-git-5.2.0.tgz 209986 BLAKE2B 6a1bc97da733420607c6ebe69a01f42d58998297a12394a29c9b4f5af425781d6b1b3535cecef21a0918eefc2e032f519fce9c5691c0a735c7810452f468d780 SHA512 cf2fa9817b124f0f35115abef51a4865073b3126b94d66cd307994bba06745513aaab1c1bcf64907a7b3bbce793b272b3f521cfa93f9339ca78ec8cef09cbeeb
-DIST net-ssh-git-6.1.0.tgz 220190 BLAKE2B a5ae0f15cf3dac8934de0b3216541415cc947214ea33d57770b5f2bf2594fa5b29b8dd9a417233de0ed243a12cdc547e5e87861767c5bbc65adb90cdbe58a484 SHA512 1d92ad19cb8bf80aec4ada23c49b91588c722551695cb0dd7b2954001fd71b4b4c030f8317b86766451847273c6116baa041c03e2415df2b0f81b20551dd8566
+DIST net-ssh-git-7.1.0.tgz 229217 BLAKE2B ab3c46d3d8831335495ae72dc60f2659109b66566f04117a16e4fd41085203b6a2d333e65ffcda4e390c96a2b808c68baeb168be1a2e23d4c797ad63b5af93f9 SHA512 723f487e77526a7acba8a9c8f09dd85c8c0bb21577d148f6c4280c79d603d3d364e29fb55b2b282064b5c108465efb2b1da061a2ba5872d575b0be264f493745
+DIST net-ssh-git-7.2.1.tgz 233338 BLAKE2B 14696b3c5de24219b0e5d5ad345aa46a1576183f4836ccdaf1d5feb78cb932232da1890c55d8c39dbf1d47b1fc0c19acf53eedd1f87bf8acb0d62ae10045e828 SHA512 9b13c33ed76a9ac346c610e8eb04fba5b327c9f79d2a28ca7d2c9b6fa94d3979f68b43f3fd2b83eb2ea0e3ada5e200373848b5f7abdee7922d77aa30d148b88b
+DIST net-ssh-git-7.2.3.tgz 233375 BLAKE2B d8eda3964b66e7a7c55f70a1ba763bacf192edcb6f32f679d36b4c589c6184af9911db6db4cb28e273a27ac4bd68afc4b0a0767d98955b2e37bcd65444c77d8a SHA512 621eb0c8080347614e924c236646cadaaceefb0894a818dc60cebc7c09c87d6ae6117f33628ed48fa8598fdb74146c9d2f114b178bd119908df8396103ceb4d9
diff --git a/dev-ruby/net-ssh/metadata.xml b/dev-ruby/net-ssh/metadata.xml
index 12d968ec6663..bc9c39fc40f7 100644
--- a/dev-ruby/net-ssh/metadata.xml
+++ b/dev-ruby/net-ssh/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">net-ssh/net-ssh</remote-id>
-	</upstream>
-	<use>
-		<flag name="ed25519">Use <pkg>dev-ruby/ed25519</pkg> for Ed25519 support</flag>
-	</use>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">net-ssh/net-ssh</remote-id>
+  </upstream>
+  <use>
+    <flag name="chacha20">Use <pkg>dev-ruby/rbnacl</pkg> for chacha20-poly1305@openssh.com support</flag>
+    <flag name="ed25519">Use <pkg>dev-ruby/ed25519</pkg> for Ed25519 support</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-ruby/net-ssh/net-ssh-5.2.0.ebuild b/dev-ruby/net-ssh/net-ssh-5.2.0.ebuild
deleted file mode 100644
index 09bc1c989cec..000000000000
--- a/dev-ruby/net-ssh/net-ssh-5.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc THANKS.txt"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-interactive SSH processing in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-ssh"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="ed25519 test"
-
-ruby_add_rdepend "virtual/ruby-ssl ed25519? ( dev-ruby/ed25519 dev-ruby/bcrypt_pbkdf )"
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
-
-all_ruby_prepare() {
-	# Avoid bundler dependency
-	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
-}
-
-src_test() {
-	# prevent tests from trying to connect to ssh-agent socket and failing
-	unset SSH_AUTH_SOCK
-	if ! use ed25519; then
-		export NET_SSH_NO_ED25519=true
-	fi
-	ruby-ng_src_test
-}
diff --git a/dev-ruby/net-ssh/net-ssh-6.1.0-r1.ebuild b/dev-ruby/net-ssh/net-ssh-6.1.0-r1.ebuild
deleted file mode 100644
index 0a8dc086232b..000000000000
--- a/dev-ruby/net-ssh/net-ssh-6.1.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.md THANKS.txt"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-RUBY_FAKEGEM_GEMSPEC="net-ssh.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-interactive SSH processing in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-ssh"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="ed25519 test"
-RESTRICT="!test? ( test )"
-
-ruby_add_rdepend "virtual/ruby-ssl ed25519? ( >=dev-ruby/ed25519-1.2:1 dev-ruby/x25519 dev-ruby/bcrypt_pbkdf:1 )"
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
-
-all_ruby_prepare() {
-	# Avoid bundler dependency
-	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
-
-	sed -e "s:require_relative ':require './:" \
-		-e 's/git ls-files -z/find -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-src_test() {
-	# prevent tests from trying to connect to ssh-agent socket and failing
-	unset SSH_AUTH_SOCK
-	if ! use ed25519; then
-		export NET_SSH_NO_ED25519=true
-	fi
-	ruby-ng_src_test
-}
diff --git a/dev-ruby/net-ssh/net-ssh-6.1.0-r2.ebuild b/dev-ruby/net-ssh/net-ssh-6.1.0-r2.ebuild
deleted file mode 100644
index db9f40f2bf0e..000000000000
--- a/dev-ruby/net-ssh/net-ssh-6.1.0-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.md THANKS.txt"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-RUBY_FAKEGEM_GEMSPEC="net-ssh.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-interactive SSH processing in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-ssh"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="ed25519 test"
-RESTRICT="!test? ( test )"
-
-ruby_add_rdepend "virtual/ruby-ssl ed25519? ( >=dev-ruby/ed25519-1.2:1 dev-ruby/x25519 dev-ruby/bcrypt_pbkdf:1 )"
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
-
-all_ruby_prepare() {
-	# Avoid bundler dependency
-	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
-
-	sed -e "s:require_relative ':require './:" \
-		-e 's/git ls-files -z/find -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-src_test() {
-	# prevent tests from trying to connect to ssh-agent socket and failing
-	unset SSH_AUTH_SOCK
-	if ! use ed25519; then
-		export NET_SSH_NO_ED25519=true
-	fi
-	ruby-ng_src_test
-}
diff --git a/dev-ruby/net-ssh/net-ssh-7.1.0.ebuild b/dev-ruby/net-ssh/net-ssh-7.1.0.ebuild
new file mode 100644
index 000000000000..d5c87deb7de9
--- /dev/null
+++ b/dev-ruby/net-ssh/net-ssh-7.1.0.ebuild
@@ -0,0 +1,45 @@
+# 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_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.md THANKS.txt"
+RUBY_FAKEGEM_EXTRAINSTALL="support"
+
+RUBY_FAKEGEM_GEMSPEC="net-ssh.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Non-interactive SSH processing in pure Ruby"
+HOMEPAGE="https://github.com/net-ssh/net-ssh"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+IUSE="ed25519 test"
+RESTRICT="!test? ( test )"
+
+ruby_add_rdepend "virtual/ruby-ssl ed25519? ( >=dev-ruby/ed25519-1.2:1 dev-ruby/x25519 dev-ruby/bcrypt_pbkdf:1 )"
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
+
+all_ruby_prepare() {
+	# Avoid bundler dependency
+	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
+
+	sed -e "s:require_relative ':require './:" \
+		-e 's/git ls-files -z/find -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+src_test() {
+	# prevent tests from trying to connect to ssh-agent socket and failing
+	unset SSH_AUTH_SOCK
+	if ! use ed25519; then
+		export NET_SSH_NO_ED25519=true
+	fi
+	ruby-ng_src_test
+}
diff --git a/dev-ruby/net-ssh/net-ssh-7.2.1.ebuild b/dev-ruby/net-ssh/net-ssh-7.2.1.ebuild
new file mode 100644
index 000000000000..dd43d42338d9
--- /dev/null
+++ b/dev-ruby/net-ssh/net-ssh-7.2.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.md THANKS.txt"
+RUBY_FAKEGEM_EXTRAINSTALL="support"
+
+RUBY_FAKEGEM_GEMSPEC="net-ssh.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Non-interactive SSH processing in pure Ruby"
+HOMEPAGE="https://github.com/net-ssh/net-ssh"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="chacha20 ed25519 test"
+RESTRICT="!test? ( test )"
+
+ruby_add_rdepend "
+	virtual/ruby-ssl
+	chacha20? ( dev-ruby/rbnacl )
+	ed25519? ( >=dev-ruby/ed25519-1.2:1 dev-ruby/x25519 dev-ruby/bcrypt_pbkdf:1 )
+"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
+
+all_ruby_prepare() {
+	# Avoid bundler dependency
+	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
+
+	sed -e "s:require_relative ':require './:" \
+		-e 's/git ls-files -z/find -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+src_test() {
+	# prevent tests from trying to connect to ssh-agent socket and failing
+	unset SSH_AUTH_SOCK
+	if ! use ed25519; then
+		export NET_SSH_NO_ED25519=true
+	fi
+	ruby-ng_src_test
+}
diff --git a/dev-ruby/net-ssh/net-ssh-7.2.3.ebuild b/dev-ruby/net-ssh/net-ssh-7.2.3.ebuild
new file mode 100644
index 000000000000..3d9b5e520a7c
--- /dev/null
+++ b/dev-ruby/net-ssh/net-ssh-7.2.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.md THANKS.txt"
+RUBY_FAKEGEM_EXTRAINSTALL="support"
+
+RUBY_FAKEGEM_GEMSPEC="net-ssh.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Non-interactive SSH processing in pure Ruby"
+HOMEPAGE="https://github.com/net-ssh/net-ssh"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="chacha20 ed25519 test"
+RESTRICT="!test? ( test )"
+
+ruby_add_rdepend "
+	virtual/ruby-ssl
+	chacha20? ( dev-ruby/rbnacl )
+	ed25519? ( >=dev-ruby/ed25519-1.2:1 dev-ruby/x25519 dev-ruby/bcrypt_pbkdf:1 )
+"
+
+ruby_add_bdepend "test? ( dev-ruby/base64 dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
+
+all_ruby_prepare() {
+	# Avoid bundler dependency
+	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
+
+	sed -e "s:require_relative ':require './:" \
+		-e 's/git ls-files -z/find -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+src_test() {
+	# prevent tests from trying to connect to ssh-agent socket and failing
+	unset SSH_AUTH_SOCK
+	if ! use ed25519; then
+		export NET_SSH_NO_ED25519=true
+	fi
+	ruby-ng_src_test
+}
diff --git a/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild b/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
index 4fa7921d96bd..065a731a8a02 100644
--- a/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
+++ b/dev-ruby/net-telnet/net-telnet-0.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="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_GEMSPEC="net-telnet.gemspec"
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/net-telnet/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="1"
-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 ~x64-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild b/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
deleted file mode 100644
index cabf9da5cc46..000000000000
--- a/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-# Don't install the binaries since they don't seem to be intended for
-# general use and they have very generic names leading to collisions,
-# e.g. bug 571186
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides telnet client functionality"
-HOMEPAGE="https://github.com/ruby/net-telnet"
-SRC_URI="https://github.com/ruby/net-telnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/netrc/metadata.xml b/dev-ruby/netrc/metadata.xml
index 8540b4da1f8c..a4e59258615f 100644
--- a/dev-ruby/netrc/metadata.xml
+++ b/dev-ruby/netrc/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">geemus/netrc</remote-id>
+    <remote-id type="github">heroku/netrc</remote-id>
+    <remote-id type="rubygems">netrc</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/netrc/netrc-0.11.0-r1.ebuild b/dev-ruby/netrc/netrc-0.11.0-r1.ebuild
deleted file mode 100644
index 814b9e13c084..000000000000
--- a/dev-ruby/netrc/netrc-0.11.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="changelog.txt Readme.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This library reads and writes .netrc files"
-HOMEPAGE="https://github.com/geemus/netrc"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~arm x86"
-SLOT="0"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid broken test that wrongly tests ruby internal code, bug 643922
-	sed -e '/test_encrypted_roundtrip/,/^  end/ s:^:#:' \
-		-e '/test_missing_environment/,/^  end/ s:^:#:' \
-		-e "s:/tmp/:${T}/:" \
-		-i test/test_netrc.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/netrc/netrc-0.11.0-r2.ebuild b/dev-ruby/netrc/netrc-0.11.0-r2.ebuild
new file mode 100644
index 000000000000..ace5e4bfd7cb
--- /dev/null
+++ b/dev-ruby/netrc/netrc-0.11.0-r2.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="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="changelog.txt Readme.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This library reads and writes .netrc files"
+HOMEPAGE="https://github.com/heroku/netrc"
+LICENSE="MIT"
+
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+SLOT="0"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid broken test that wrongly tests ruby internal code, bug 643922
+	sed -e '/test_encrypted_roundtrip/,/^  end/ s:^:#:' \
+		-e '/test_missing_environment/,/^  end/ s:^:#:' \
+		-e "s:/tmp/:${T}/:" \
+		-i test/test_netrc.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/network_interface/Manifest b/dev-ruby/network_interface/Manifest
index 821ffa0b5e11..61c848fe6c93 100644
--- a/dev-ruby/network_interface/Manifest
+++ b/dev-ruby/network_interface/Manifest
@@ -1 +1,3 @@
 DIST network_interface-0.0.2.gem 16896 BLAKE2B a0e7898aa5989ea38c8a9214f3aaf5f9d0dbdf39e86f7e9a4d62ec6c94f29f9612a08c1465513b62351a4c62ed776e427800eabe562062ce7c9b4b75ec757a3b SHA512 8850325e7e0c5ab51b060270220099c2c00cf7031083a511ae9f8dd6d1b9219b37169fa7620e9648eb071784a840e14ce965f8d1cf5d475ff82691bfba25a202
+DIST network_interface-0.0.3.tar.gz 13584 BLAKE2B 61cd72974e9ec1b72adb9c6a7f77e43ff3a025e4bfddb70b1e899ee34ca0fe42a56f81095ee0cff66e2da1712af7854ee811d26d7af316cb6c5fb905b3a8ad4b SHA512 9a2c9ae4a49666f27a1afdd188bd3be614f5aba7ec548f6b081627a9aaff5b5cdb2d7f5b98e8687eb78ea05ee3e90cf8f942403256076d80710945b5f2a429c2
+DIST network_interface-0.0.4.tar.gz 14231 BLAKE2B 140db70e0ed3091b0b76af046a46827d7cf660dd0823157d5c4e67be8e7d158a532392c499a4734b5f412b7ae58aca422428712e5cd5dc966429c7fc75108843 SHA512 68e19a657d95a49cd771447687d74991d7e1e58191c94c69ab594d11ee2491c89b8ddad7c2708021eedd093ec6a5bdd2434a5ecb9d695663d11aa5b9971c9584
diff --git a/dev-ruby/network_interface/metadata.xml b/dev-ruby/network_interface/metadata.xml
index 96d65a892ab9..e351964dbdb9 100644
--- a/dev-ruby/network_interface/metadata.xml
+++ b/dev-ruby/network_interface/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
     <remote-id type="github">rapid7/network_interface</remote-id>
diff --git a/dev-ruby/network_interface/network_interface-0.0.2-r1.ebuild b/dev-ruby/network_interface/network_interface-0.0.2-r1.ebuild
index 0d329543785f..31336f43d376 100644
--- a/dev-ruby/network_interface/network_interface-0.0.2-r1.ebuild
+++ b/dev-ruby/network_interface/network_interface-0.0.2-r1.ebuild
@@ -1,12 +1,10 @@
-# 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="ruby27 ruby30 ruby31 ruby32"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
 RUBY_FAKEGEM_EXTENSIONS=(ext/network_interface_ext/extconf.rb)
 
 inherit ruby-fakegem
@@ -17,7 +15,6 @@ HOMEPAGE="https://github.com/rapid7/network_interface"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
 
 # Tests are brittle as they cannot deal with all network interface configurations.
 RESTRICT="test"
diff --git a/dev-ruby/network_interface/network_interface-0.0.2.ebuild b/dev-ruby/network_interface/network_interface-0.0.2.ebuild
deleted file mode 100644
index 153cf1a9e375..000000000000
--- a/dev-ruby/network_interface/network_interface-0.0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="network_interface layer from metasploit pcaprub"
-HOMEPAGE="https://github.com/rapid7/network_interface"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-# Tests are brittle as they cannot deal with all network interface configurations.
-RESTRICT="test"
-
-all_ruby_prepare() {
-	sed -i -e 's:/sbin/ifconfig:/bin/ifconfig:' spec/spec_helper.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext/network_interface_ext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/network_interface_ext V=1
-	cp ext/network_interface_ext/network_interface_ext.so lib/ || die
-}
diff --git a/dev-ruby/network_interface/network_interface-0.0.3.ebuild b/dev-ruby/network_interface/network_interface-0.0.3.ebuild
new file mode 100644
index 000000000000..97db0fdc051c
--- /dev/null
+++ b/dev-ruby/network_interface/network_interface-0.0.3.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="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_GEMSPEC="network_interface.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTENSIONS=(ext/network_interface_ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="network_interface layer from metasploit pcaprub"
+HOMEPAGE="https://github.com/rapid7/network_interface"
+SRC_URI="https://github.com/rapid7/network_interface/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+# Tests are brittle as they cannot deal with all network interface configurations.
+RESTRICT="test"
+
+all_ruby_prepare() {
+	sed -i -e 's:/sbin/ifconfig:/bin/ifconfig:' spec/spec_helper.rb || die
+
+	sed --i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/network_interface/network_interface-0.0.4.ebuild b/dev-ruby/network_interface/network_interface-0.0.4.ebuild
new file mode 100644
index 000000000000..c7225e1e0d96
--- /dev/null
+++ b/dev-ruby/network_interface/network_interface-0.0.4.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="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_GEMSPEC="network_interface.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTENSIONS=(ext/network_interface_ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="network_interface layer from metasploit pcaprub"
+HOMEPAGE="https://github.com/rapid7/network_interface"
+SRC_URI="https://github.com/rapid7/network_interface/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+# Tests are brittle as they cannot deal with all network interface configurations.
+RESTRICT="test"
+
+all_ruby_prepare() {
+	sed -i -e 's:/sbin/ifconfig:/bin/ifconfig:' spec/spec_helper.rb || die
+
+	sed --i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/niceogiri/niceogiri-1.1.2-r1.ebuild b/dev-ruby/niceogiri/niceogiri-1.1.2-r1.ebuild
index b8daa104730c..a064e92f5569 100644
--- a/dev-ruby/niceogiri/niceogiri-1.1.2-r1.ebuild
+++ b/dev-ruby/niceogiri/niceogiri-1.1.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/nio4r/Manifest b/dev-ruby/nio4r/Manifest
index f034f94a4acf..64efc36e79ed 100644
--- a/dev-ruby/nio4r/Manifest
+++ b/dev-ruby/nio4r/Manifest
@@ -1,2 +1,4 @@
-DIST nio4r-2.5.4.gem 110080 BLAKE2B 9aaed6cd4d74cf6ff3fed114d7c0c9162afb646aa6eadf294e0a6710dfca1e6b4ccf1eb8850c8704f3792eb6695034612813db08fbf74814556455db6ab48b4a SHA512 f7e383516ac6b55fd49339280e624a4c35f9cd2d31915b3d117189506522d967fc53a43cde75e8601f3fe0530e1322aeaa8c94a09289ddbefb2afd8d067341ec
-DIST nio4r-2.5.8.gem 121856 BLAKE2B be79548761f52abab632b8e4660ab8557946079a51fe7f30c346f4f656ed2f8d0c8f2f463ed76a89bd4278bdfc0a0646ff2b8e0a815f97750836cb0bb250b9ef SHA512 3942403147882380b86f42c54a6d4e92c4e85dd3c0b5b9f473a05fcf98c041853e21d11d0481d1973342b5a4bfb59e02cfd523a44e9e45c3740627a45f7f99c7
+DIST nio4r-2.5.9.gem 122368 BLAKE2B 4238e2963604539207e1adc7ee78430e4f501ea8b71d807ee4f3c44322d16612779777f11b76313aaad6d252321435854f5b4905f83a2fe03c9d71be20b7a718 SHA512 d1c52896f186d19eb089a94d74ccadb427e64c204af149aa83a5a4dda3f0edd1bd2bae94afd21fcd58e3c2b9e2c17278a18717c0905de80e45540d13eeefd9e5
+DIST nio4r-2.6.1.gem 123904 BLAKE2B 5fbfe2a67fbd9fb6f49607358827391a56760c79435748f8fca0cbe6408f145cba224641b77afa8f6f49b1cd7e2fdd93e46e5aa3c75496f6539d66216ec3430b SHA512 bebf7f737f5e63107d77c4237a5750aa10f9bd1136deaa6bb1a8e5cab703d425a3a94a8f617df144e603f4f1f85ef62852740604a981e7dda41f0c43ae250406
+DIST nio4r-2.7.0.gem 124416 BLAKE2B f02a16cf45dc2ea547dd8e036ddff5c37c24e9188db9ab4f817a55243f87f78264ed11bcd8d055e244c655aea08fa4922cd53dcae39e090031c87d0d78909c7b SHA512 aeb0bd3e727fa6999a314cd2b15a35035694f41294f7e9c406a72fd50a7a7a02311efec8c5795a116fd3793bf6b81e17d884e156b844722933e45d056f0cbeb9
+DIST nio4r-2.7.1.gem 124416 BLAKE2B 4ae03731b0ae51bc51cfd12049e4d9beb9141feeb4196edafb26dd5ea4cc88e3cecaf0b121cd28c142cb509f991d22af5befe593443f7ecc420eb403fa83c0a1 SHA512 acade5696fe343b92f35f4bcfb7fbda48c8d9bbacff8e0571cffa193ade48d0c8f184db3480084bf3d796e5bd9176b285be4a52e4470c406bf867f538f1bfd4a
diff --git a/dev-ruby/nio4r/metadata.xml b/dev-ruby/nio4r/metadata.xml
index dfa0430bf323..4b9602e449cd 100644
--- a/dev-ruby/nio4r/metadata.xml
+++ b/dev-ruby/nio4r/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">celluloid/nio4r</remote-id>
+    <remote-id type="github">socketry/nio4r</remote-id>
+    <remote-id type="rubygems">nio4r</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/nio4r/nio4r-2.5.4.ebuild b/dev-ruby/nio4r/nio4r-2.5.4.ebuild
deleted file mode 100644
index ad118963436a..000000000000
--- a/dev-ruby/nio4r/nio4r-2.5.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A high performance selector API for monitoring IO objects"
-HOMEPAGE="https://github.com/socketry/nio4r"
-
-LICENSE="MIT || ( BSD GPL-2 )"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Note that nio4r bundles a patched copy of libev, and without these
-# patches the tests fail: https://github.com/celluloid/nio4r/issues/15
-
-ruby_add_bdepend "test? ( dev-ruby/rspec-retry )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Cc]overalls/d' -e '/[Bb]undler/d' -e '1irequire "openssl"' spec/spec_helper.rb || die
-	sed -e '/extension/ s:^:#:' -i Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/*$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/nio4r/nio4r-2.5.8.ebuild b/dev-ruby/nio4r/nio4r-2.5.8.ebuild
deleted file mode 100644
index aa6e308dfce1..000000000000
--- a/dev-ruby/nio4r/nio4r-2.5.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/nio4r/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="A high performance selector API for monitoring IO objects"
-HOMEPAGE="https://github.com/socketry/nio4r"
-
-LICENSE="MIT || ( BSD GPL-2 )"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Note that nio4r bundles a patched copy of libev, and without these
-# patches the tests fail: https://github.com/celluloid/nio4r/issues/15
-
-all_ruby_prepare() {
-	sed -i -e '/[Cc]overalls/d' -e '/[Bb]undler/d' -e '1irequire "openssl"' spec/spec_helper.rb || die
-	sed -e '/extension/ s:^:#:' -i Rakefile || die
-}
diff --git a/dev-ruby/nio4r/nio4r-2.5.9.ebuild b/dev-ruby/nio4r/nio4r-2.5.9.ebuild
new file mode 100644
index 000000000000..a6b35ed1088d
--- /dev/null
+++ b/dev-ruby/nio4r/nio4r-2.5.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nio4r/extconf.rb)
+
+inherit flag-o-matic ruby-fakegem
+
+DESCRIPTION="A high performance selector API for monitoring IO objects"
+HOMEPAGE="https://github.com/socketry/nio4r"
+
+LICENSE="MIT || ( BSD GPL-2 )"
+SLOT="2"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+# Note that nio4r bundles a patched copy of libev, and without these
+# patches the tests fail: https://github.com/celluloid/nio4r/issues/15
+
+all_ruby_prepare() {
+	# See bug #855869 and its large number of dupes in bundled libev copies.
+	filter-lto
+	append-flags -fno-strict-aliasing
+
+	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
+	sed -e '/extension/ s:^:#:' -i Rakefile || die
+}
diff --git a/dev-ruby/nio4r/nio4r-2.6.1.ebuild b/dev-ruby/nio4r/nio4r-2.6.1.ebuild
new file mode 100644
index 000000000000..6fe4a3605cb9
--- /dev/null
+++ b/dev-ruby/nio4r/nio4r-2.6.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="changes.md readme.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nio4r/extconf.rb)
+
+inherit flag-o-matic ruby-fakegem
+
+DESCRIPTION="A high performance selector API for monitoring IO objects"
+HOMEPAGE="https://github.com/socketry/nio4r"
+
+LICENSE="MIT || ( BSD GPL-2 )"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+# Note that nio4r bundles a patched copy of libev, and without these
+# patches the tests fail: https://github.com/celluloid/nio4r/issues/15
+
+all_ruby_prepare() {
+	# See bug #855869 and its large number of dupes in bundled libev copies.
+	filter-lto
+	append-flags -fno-strict-aliasing
+
+	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
+	sed -e '/extension/ s:^:#:' -i Rakefile || die
+}
diff --git a/dev-ruby/nio4r/nio4r-2.7.0.ebuild b/dev-ruby/nio4r/nio4r-2.7.0.ebuild
new file mode 100644
index 000000000000..8196c914fa21
--- /dev/null
+++ b/dev-ruby/nio4r/nio4r-2.7.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="changes.md readme.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nio4r/extconf.rb)
+
+inherit flag-o-matic ruby-fakegem
+
+DESCRIPTION="A high performance selector API for monitoring IO objects"
+HOMEPAGE="https://github.com/socketry/nio4r"
+
+LICENSE="MIT || ( BSD GPL-2 )"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+# Note that nio4r bundles a patched copy of libev, and without these
+# patches the tests fail: https://github.com/celluloid/nio4r/issues/15
+
+all_ruby_prepare() {
+	# See bug #855869 and its large number of dupes in bundled libev copies.
+	filter-lto
+	append-flags -fno-strict-aliasing
+
+	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
+	sed -e '/extension/ s:^:#:' -i Rakefile || die
+}
diff --git a/dev-ruby/nio4r/nio4r-2.7.1.ebuild b/dev-ruby/nio4r/nio4r-2.7.1.ebuild
new file mode 100644
index 000000000000..71be4cfe731f
--- /dev/null
+++ b/dev-ruby/nio4r/nio4r-2.7.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="changes.md readme.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nio4r/extconf.rb)
+
+inherit flag-o-matic ruby-fakegem
+
+DESCRIPTION="A high performance selector API for monitoring IO objects"
+HOMEPAGE="https://github.com/socketry/nio4r"
+
+LICENSE="MIT || ( BSD GPL-2 )"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+
+# Note that nio4r bundles a patched copy of libev, and without these
+# patches the tests fail: https://github.com/celluloid/nio4r/issues/15
+
+all_ruby_prepare() {
+	# See bug #855869 and its large number of dupes in bundled libev copies.
+	filter-lto
+	append-flags -fno-strict-aliasing
+
+	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
+	sed -e '/extension/ s:^:#:' -i Rakefile || die
+}
diff --git a/dev-ruby/nokogiri-diff/Manifest b/dev-ruby/nokogiri-diff/Manifest
index 6ca08c15b9c1..946c9622acd3 100644
--- a/dev-ruby/nokogiri-diff/Manifest
+++ b/dev-ruby/nokogiri-diff/Manifest
@@ -1 +1,2 @@
 DIST nokogiri-diff-0.2.0.gem 8704 BLAKE2B e1df47db2e6e7fcd29eb229245cb9a9a7b31fded319a6fe28d04722f457f0ea7bc19e13ee49b2233f3c072eedf3c83c7e38cd8b19d5ecbc4937f709a9f4cf3a7 SHA512 9b2b6f266c9c7d01153c345567086b4cd1092a5984e6867ea81d15e00467936f296fd5e2c3ab7dc18e44d1dd2af022d250234fb4311a9be80fd3ca32b3d201ca
+DIST nokogiri-diff-0.3.0.gem 10240 BLAKE2B 2e90a279926c6fc33089a679f4a25d40a7075fbee2481291bbec1f936bf436595bfa8a967050249df29c1b34211529bdff0c8f847c6f88964164a93c9864b216 SHA512 da28e7c2ae03fc66a5b4d9ce6b266ca20dc47a84445bb5a109d40d8153d41c98e7c6547efe35484fc7dbe0e30507e6588894dfc0c4b0fc297c3b24fc4ebbb41e
diff --git a/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r3.ebuild b/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r3.ebuild
index 7091a701d5b4..9352ba1e585a 100644
--- a/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r3.ebuild
+++ b/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
@@ -12,11 +12,10 @@ inherit ruby-fakegem
 
 DESCRIPTION="Calculate the differences between two XML/HTML documents"
 HOMEPAGE="https://github.com/postmodern/nokogiri-diff"
-LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+LICENSE="MIT"
 SLOT="0"
-IUSE=""
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 PATCHES=( "${FILESDIR}/${P}-rspec3.patch" )
 
diff --git a/dev-ruby/nokogiri-diff/nokogiri-diff-0.3.0.ebuild b/dev-ruby/nokogiri-diff/nokogiri-diff-0.3.0.ebuild
new file mode 100644
index 000000000000..9e76ad01ffb3
--- /dev/null
+++ b/dev-ruby/nokogiri-diff/nokogiri-diff-0.3.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Calculate the differences between two XML/HTML documents"
+HOMEPAGE="https://github.com/postmodern/nokogiri-diff"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.5 >=dev-ruby/tdiff-0.4.0:0"
+
+all_ruby_prepare() {
+	sed -e '/simplecov/I s:^:#:' -i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 3d02cf1af05d..07f5c6691d5f 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,3 +1,5 @@
-DIST nokogiri-1.13.4-git.tgz 6249271 BLAKE2B bc8569a0c80e4efcedd6c5bb8a46c8504cc33ec3d2acdcefe2718047ffabef9404c76003cd279ac55e5a5fb17243af12c335b7d9e300b90d8a97e84015cf92bc SHA512 cca3e8558f8739cca2424e461a5e048a3675a23bcb6549f1c71ecfea0729859cda84ef3bf09a81d2b419e1a7b8ff2616a8dd84ac12f6e1f32b9626a0bd3e1bc4
-DIST nokogiri-1.13.5-git.tgz 6249007 BLAKE2B 6fc7eed6c10f74105917a94e5e8acb0576fbe8e64fecad70e4256d352e1e4fc9cb101be2d518420c7351f72fd03ab385c3dccc3d6442638fe9e6ecfda581eb21 SHA512 a5608c137f60ec3302810154cbe8176bcf281ddae1ac075c08b71d23fd124ac6bc3ca349f326232090475e80524bd53927449cbcba0c6087917c270ddf9e6eb2
-DIST nokogiri-1.13.6-git.tgz 6249974 BLAKE2B db6a7fd70cd88fa784e70fd33102ad2a0d65a848a713bd93907d3c77b7ecc101a4f0a38febf3265b25967e045bf9091e46cf319702c08319e32f94d57a946985 SHA512 96f4e52332052bfae0d88d8c93cf334f8484b51290cafe8c1d43c820ba6ac5aa74b187c37e7177e62435d6101d859c16555b715fa88fcb06da742c84fd0e7486
+DIST nokogiri-1.15.3-git.tgz 10767496 BLAKE2B d9d2abd3f57fd3f9e3e49e38de7559d5d9bad278166b4108d2edf4f90884256c01bf574cec8a15b6f30420c9f4d501707b710e3af0f32dc5cbcc01b4433c6662 SHA512 9084e97c81bca52c19cf2cd47dcf0d3377705ceda559399aa1cbf1e112845b2a796e34576f08a073377fb523a7a298254bda91563929535734700c31c473cb49
+DIST nokogiri-1.15.5-git.tgz 10768080 BLAKE2B 25d24799c69a4271ea5283b264061c05f6907635ed55de196f76684d2db3c6c226e7f09f02f30de049b282c17cdea69154dec9a06813cb4f63adaac4876e160c SHA512 1df3f6bf4508a7c84fa22ce774cb878ca47154e69730f1cedb403fad270df42c580526ac03b47e73bf2267ad50d2999ed1341079b10043b450f51ea6b0565da7
+DIST nokogiri-1.16.2-git.tgz 11014186 BLAKE2B 8b34c586f3326278299786fec8b7513f61d7c147b453d984107d1d6896b42e8e59f078ac32577bebd71fc510e99087e80f8ea4eef822c73a41fc17c0ec079108 SHA512 844a47fcc9ad8677bed5486fd3437e9a685143afc8c8d71464301c14cc09e93827f3a91713df22f741434989adb24ed6d9144b3a4d0f3cb7f63fc83c2d3130a9
+DIST nokogiri-1.16.3-git.tgz 11014282 BLAKE2B fbda2a863374e25a9dae0e7ab145419b759e1ec615a8e87418825ed1d188801d535be87bb9e36bb717062080bb2a9f7cb179fdb311dd4dda61b019a41d4df6b8 SHA512 e86d5d2cb47720b9f2e72ced13e07e6d9a2bda808e05d9d151ffba92820e148bb6cd8cfe148d15247b13c23feb2abe64942f2665431e66dc821b9655425df8e3
+DIST nokogiri-1.16.4-git.tgz 11014494 BLAKE2B c07d75af189a8f897b885c111bb43258d039c31c8134df4dff65162fb5d3c24c48ec1194af24d816d8c5cc405b8384ae6430ffdce0a8687504f1de2b784b70dd SHA512 76a179fa7c907d5ffd548e472b9d03d02ba1afbd80c58f8c2760a0e342c2d3db75bd973e7a2f3751c671b68dd63ea3da95a6631f4963e18f85d5c5e7b9b877f4
diff --git a/dev-ruby/nokogiri/nokogiri-1.13.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.13.4.ebuild
deleted file mode 100644
index c125f5d9de48..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.13.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
-
-RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
-
-inherit ruby-fakegem multilib
-
-DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
-HOMEPAGE="https://www.nokogiri.org/"
-LICENSE="MIT"
-SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.13:=
-	>=dev-libs/libxslt-1.1.35
-	sys-libs/zlib
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.13
-	>=dev-libs/libxslt-1.1.35
-	sys-libs/zlib
-	virtual/libiconv"
-
-ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
-
-ruby_add_bdepend "
-	dev-ruby/mini_portile2:2.8
-	>=dev-ruby/rexical-1.0.7
-	dev-ruby/rdoc
-	test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/tasks\/cross_compile/s:^:#:' \
-		-e '/:test.*prerequisites/s:^:#:' \
-		-e '/license/ s:^:#:' \
-		Rakefile || die
-	# Remove the cross compilation options since they interfere with
-	# native building.
-	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
-	sed -i -e '/cross_config_options/d' Rakefile || die
-
-	sed -e '/simplecov/,/^end/ s:^:#:' \
-		-e '/reporters/I s:^:#:' \
-		-i test/helper.rb || die
-
-	# There is no need for mini_portile2 to be a runtime dependency on Gentoo
-	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
-		${RUBY} -Cext/${PN} extconf.rb \
-		--with-zlib-include="${EPREFIX}"/usr/include \
-		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
-		--with-iconv-include="${EPREFIX}"/usr/include \
-		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
-		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
-		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
-		--with-xslt-dir="${EPREFIX}"/usr \
-		--with-iconvlib=iconv \
-		|| die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
-	fi
-
-	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-	fi
-
-	emake -Cext/${PN} \
-		V=1 \
-		CFLAGS="${CFLAGS} -fPIC" \
-		archflag="${LDFLAGS}" || die "make extension failed"
-	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/nokogiri/nokogiri-1.13.5.ebuild b/dev-ruby/nokogiri/nokogiri-1.13.5.ebuild
deleted file mode 100644
index d3d2a1eac8bd..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.13.5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
-
-RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
-
-inherit ruby-fakegem multilib
-
-DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
-HOMEPAGE="https://www.nokogiri.org/"
-LICENSE="MIT"
-SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.14:=
-	>=dev-libs/libxslt-1.1.35
-	sys-libs/zlib
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.14
-	>=dev-libs/libxslt-1.1.35
-	sys-libs/zlib
-	virtual/libiconv"
-
-ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
-
-ruby_add_bdepend "
-	dev-ruby/mini_portile2:2.8
-	>=dev-ruby/rexical-1.0.7
-	dev-ruby/rdoc
-	test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/tasks\/cross_compile/s:^:#:' \
-		-e '/:test.*prerequisites/s:^:#:' \
-		-e '/license/ s:^:#:' \
-		Rakefile || die
-	# Remove the cross compilation options since they interfere with
-	# native building.
-	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
-	sed -i -e '/cross_config_options/d' Rakefile || die
-
-	sed -e '/simplecov/,/^end/ s:^:#:' \
-		-e '/reporters/I s:^:#:' \
-		-i test/helper.rb || die
-
-	# There is no need for mini_portile2 to be a runtime dependency on Gentoo
-	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
-		${RUBY} -Cext/${PN} extconf.rb \
-		--with-zlib-include="${EPREFIX}"/usr/include \
-		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
-		--with-iconv-include="${EPREFIX}"/usr/include \
-		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
-		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
-		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
-		--with-xslt-dir="${EPREFIX}"/usr \
-		--with-iconvlib=iconv \
-		|| die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
-	fi
-
-	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-	fi
-
-	emake -Cext/${PN} \
-		V=1 \
-		CFLAGS="${CFLAGS} -fPIC" \
-		archflag="${LDFLAGS}" || die "make extension failed"
-	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/nokogiri/nokogiri-1.13.6.ebuild b/dev-ruby/nokogiri/nokogiri-1.13.6.ebuild
deleted file mode 100644
index 82f99f83e8bc..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.13.6.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
-
-RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
-
-inherit ruby-fakegem multilib
-
-DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
-HOMEPAGE="https://www.nokogiri.org/"
-LICENSE="MIT"
-SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.14:=
-	>=dev-libs/libxslt-1.1.35
-	sys-libs/zlib
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.14
-	>=dev-libs/libxslt-1.1.35
-	sys-libs/zlib
-	virtual/libiconv"
-
-ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
-
-ruby_add_bdepend "
-	dev-ruby/mini_portile2:2.8
-	>=dev-ruby/rexical-1.0.7
-	dev-ruby/rdoc
-	test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/tasks\/cross_compile/s:^:#:' \
-		-e '/:test.*prerequisites/s:^:#:' \
-		-e '/license/ s:^:#:' \
-		Rakefile || die
-	# Remove the cross compilation options since they interfere with
-	# native building.
-	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
-	sed -i -e '/cross_config_options/d' Rakefile || die
-
-	sed -e '/simplecov/,/^end/ s:^:#:' \
-		-e '/reporters/I s:^:#:' \
-		-i test/helper.rb || die
-
-	# There is no need for mini_portile2 to be a runtime dependency on Gentoo
-	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
-		${RUBY} -Cext/${PN} extconf.rb \
-		--with-zlib-include="${EPREFIX}"/usr/include \
-		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
-		--with-iconv-include="${EPREFIX}"/usr/include \
-		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
-		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
-		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
-		--with-xslt-dir="${EPREFIX}"/usr \
-		--with-iconvlib=iconv \
-		|| die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
-	fi
-
-	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-	fi
-
-	emake -Cext/${PN} \
-		V=1 \
-		CFLAGS="${CFLAGS} -fPIC" \
-		archflag="${LDFLAGS}" || die "make extension failed"
-	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/nokogiri/nokogiri-1.15.3.ebuild b/dev-ruby/nokogiri/nokogiri-1.15.3.ebuild
new file mode 100644
index 000000000000..201ad4a00c77
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.15.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
+
+RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
+
+inherit ruby-fakegem multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+HOMEPAGE="https://nokogiri.org/"
+LICENSE="MIT"
+SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	>=dev-libs/libxml2-2.11.4
+	>=dev-libs/libxslt-1.1.37
+	sys-libs/zlib
+	virtual/libiconv"
+DEPEND="${DEPEND}
+	>=dev-libs/libxml2-2.11.4
+	>=dev-libs/libxslt-1.1.38
+	>=sys-libs/zlib-1.2.13
+	virtual/libiconv"
+
+ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
+
+ruby_add_bdepend "
+	dev-ruby/mini_portile2:2.8
+	>=dev-ruby/rexical-1.0.7
+	dev-ruby/rdoc
+	test? ( dev-ruby/minitest dev-ruby/rubyzip )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		-e '/license/ s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+
+	sed -e '/simplecov/,/^end/ s:^:#:' \
+		-e '/reporters/I s:^:#:' \
+		-i test/helper.rb || die
+
+	# There is no need for mini_portile2 to be a runtime dependency on Gentoo
+	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+		${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/nokogiri/nokogiri-1.15.5.ebuild b/dev-ruby/nokogiri/nokogiri-1.15.5.ebuild
new file mode 100644
index 000000000000..408df7c220cf
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.15.5.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
+
+RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
+
+inherit ruby-fakegem multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+HOMEPAGE="https://nokogiri.org/"
+LICENSE="MIT"
+SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	>=dev-libs/libxml2-2.11.6
+	>=dev-libs/libxslt-1.1.39
+	sys-libs/zlib
+	virtual/libiconv"
+DEPEND="${DEPEND}
+	>=dev-libs/libxml2-2.11.6
+	>=dev-libs/libxslt-1.1.39
+	>=sys-libs/zlib-1.2.13
+	virtual/libiconv"
+
+ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
+
+ruby_add_bdepend "
+	dev-ruby/mini_portile2:2.8
+	>=dev-ruby/rexical-1.0.7
+	dev-ruby/rdoc
+	test? ( dev-ruby/minitest dev-ruby/rubyzip )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		-e '/license/ s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+
+	sed -e '/simplecov/,/^end/ s:^:#:' \
+		-e '/reporters/I s:^:#:' \
+		-i test/helper.rb || die
+
+	# There is no need for mini_portile2 to be a runtime dependency on Gentoo
+	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+		${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=1 ${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/nokogiri/nokogiri-1.16.2.ebuild b/dev-ruby/nokogiri/nokogiri-1.16.2.ebuild
new file mode 100644
index 000000000000..6842350c158e
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.16.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
+
+RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
+
+inherit ruby-fakegem multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+HOMEPAGE="https://nokogiri.org/"
+LICENSE="MIT"
+SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="${RDEPEND}
+	>=dev-libs/libxml2-2.12.5
+	>=dev-libs/libxslt-1.1.39
+	sys-libs/zlib
+	virtual/libiconv"
+DEPEND="${DEPEND}
+	>=dev-libs/libxml2-2.12.5
+	>=dev-libs/libxslt-1.1.39
+	>=sys-libs/zlib-1.2.13
+	virtual/libiconv"
+
+ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
+
+ruby_add_bdepend "
+	dev-ruby/mini_portile2:2.8
+	>=dev-ruby/rexical-1.0.7
+	dev-ruby/rdoc
+	test? ( dev-ruby/minitest dev-ruby/rubyzip )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		-e '/license/ s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+
+	sed -e '/reporters/I s:^:#:' \
+		-i test/helper.rb || die
+
+	# There is no need for mini_portile2 to be a runtime dependency on Gentoo
+	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+		${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=1 \
+	RUBY_MEMCHECK_RUNNING=true \
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/nokogiri/nokogiri-1.16.3.ebuild b/dev-ruby/nokogiri/nokogiri-1.16.3.ebuild
new file mode 100644
index 000000000000..e3afcfa435ee
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.16.3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
+
+RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
+
+inherit ruby-fakegem multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+HOMEPAGE="https://nokogiri.org/"
+LICENSE="MIT"
+SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="${RDEPEND}
+	>=dev-libs/libxml2-2.12.6
+	>=dev-libs/libxslt-1.1.39
+	sys-libs/zlib
+	virtual/libiconv"
+DEPEND="${DEPEND}
+	>=dev-libs/libxml2-2.12.6
+	>=dev-libs/libxslt-1.1.39
+	>=sys-libs/zlib-1.2.13
+	virtual/libiconv"
+
+ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
+
+ruby_add_bdepend "
+	dev-ruby/mini_portile2:2.8
+	>=dev-ruby/rexical-1.0.7
+	dev-ruby/rdoc
+	test? ( dev-ruby/minitest dev-ruby/rubyzip )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		-e '/license/ s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+
+	sed -e '/reporters/I s:^:#:' \
+		-i test/helper.rb || die
+
+	# There is no need for mini_portile2 to be a runtime dependency on Gentoo
+	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+		${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=1 \
+	RUBY_MEMCHECK_RUNNING=true \
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/nokogiri/nokogiri-1.16.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.16.4.ebuild
new file mode 100644
index 000000000000..44e350cce0d1
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.16.4.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
+
+RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
+
+inherit ruby-fakegem multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+HOMEPAGE="https://nokogiri.org/"
+LICENSE="MIT"
+SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="${RDEPEND}
+	>=dev-libs/libxml2-2.12.6
+	>=dev-libs/libxslt-1.1.39
+	>=sys-libs/zlib-1.3.1
+	virtual/libiconv"
+DEPEND="${DEPEND}
+	>=dev-libs/libxml2-2.12.6
+	>=dev-libs/libxslt-1.1.39
+	>=sys-libs/zlib-1.3.1
+	virtual/libiconv"
+
+ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
+
+ruby_add_bdepend "
+	dev-ruby/mini_portile2:2.8
+	>=dev-ruby/rexical-1.0.7
+	dev-ruby/rdoc
+	test? ( dev-ruby/minitest dev-ruby/rubyzip )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		-e '/license/ s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+
+	sed -e '/reporters/I s:^:#:' \
+		-i test/helper.rb || die
+
+	# There is no need for mini_portile2 to be a runtime dependency on Gentoo
+	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+		${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=1 \
+	RUBY_MEMCHECK_RUNNING=true \
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/nokogumbo/Manifest b/dev-ruby/nokogumbo/Manifest
deleted file mode 100644
index f8df5d3b5814..000000000000
--- a/dev-ruby/nokogumbo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nokogumbo-2.0.5.tar.gz 298201 BLAKE2B ab342fa271983a13ccf7ca1fa6bbb2d250eb5027beb812c77d76bd03c971a95ff60440bc8c37ea5a482d21730cde5224c2419e89098824b1157b372974d09107 SHA512 3dd4dd83742b8c4b14e741b2b9195d227e5e3f14eb5b34992960cf021658476072a2c7f07fc21868d1347f4ba3c95e267e2cf7193b8d53c5451658e560128d16
diff --git a/dev-ruby/nokogumbo/metadata.xml b/dev-ruby/nokogumbo/metadata.xml
deleted file mode 100644
index f601ef420d89..000000000000
--- a/dev-ruby/nokogumbo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rubys/nokogumbo</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/nokogumbo/nokogumbo-2.0.5-r1.ebuild b/dev-ruby/nokogumbo/nokogumbo-2.0.5-r1.ebuild
deleted file mode 100644
index 975d0694bf54..000000000000
--- a/dev-ruby/nokogumbo/nokogumbo-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="nokogumbo.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/nokogumbo/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/nokogumbo
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Nokogiri interface to the Gumbo HTML5 parser"
-HOMEPAGE="https://github.com/rubys/nokogumbo"
-SRC_URI="https://github.com/rubys/nokogumbo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Contains a bundled and patched version of dev-libs/gumbo.
-
-ruby_add_rdepend "=dev-ruby/nokogiri-1.11*"
-
-all_ruby_prepare() {
-	# Define rakehome in scope
-	sed -i -e "1irakehome=File.expand_path('../../')" ext/nokogumbo/extconf.rb || die
-
-	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Modern nokogiri doesn't have any ldflags part, rather than an empty one.
-	sed -i -e '/have_libxml2/ s/empty/nil/' ext/nokogumbo/extconf.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/nokogumbo/nokogumbo-2.0.5-r2.ebuild b/dev-ruby/nokogumbo/nokogumbo-2.0.5-r2.ebuild
deleted file mode 100644
index e348dba98862..000000000000
--- a/dev-ruby/nokogumbo/nokogumbo-2.0.5-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="nokogumbo.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/nokogumbo/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/nokogumbo
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Nokogiri interface to the Gumbo HTML5 parser"
-HOMEPAGE="https://github.com/rubys/nokogumbo"
-SRC_URI="https://github.com/rubys/nokogumbo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Contains a bundled and patched version of dev-libs/gumbo.
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.11.0"
-
-ruby_add_bdepend "=dev-ruby/nokogiri-1.11*"
-
-all_ruby_prepare() {
-	# Define rakehome in scope
-	sed -i -e "1irakehome=File.expand_path('../../')" ext/nokogumbo/extconf.rb || die
-
-	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Modern nokogiri doesn't have any ldflags part, rather than an empty one.
-	sed -i -e '/have_libxml2/ s/empty/nil/' ext/nokogumbo/extconf.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/ntlm-http/Manifest b/dev-ruby/ntlm-http/Manifest
deleted file mode 100644
index d79a0fed0040..000000000000
--- a/dev-ruby/ntlm-http/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ntlm-http-0.1.1.gem 13824 BLAKE2B 179baff2b4b00306b15aa42bad3e91bb41bdc6070ad2eb4681075474839dafea06c54ef7b3fb9f997951ad7b4ddcfa78caf5345b35e5944366b60f27bea63530 SHA512 1d2868582a194fb3a3dcb48a7dfb031014e51a93d57afb83aaef98be8e57789506b71e6440770ca7bc48979d9dd730f398d01d554d6d0575ff01046a227c7669
diff --git a/dev-ruby/ntlm-http/files/ntlm-http-0.1.1+ruby-1.9.patch b/dev-ruby/ntlm-http/files/ntlm-http-0.1.1+ruby-1.9.patch
deleted file mode 100644
index b5e35a7210c5..000000000000
--- a/dev-ruby/ntlm-http/files/ntlm-http-0.1.1+ruby-1.9.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: ntlm-http-0.1.1/lib/net/ntlm_http.rb
-===================================================================
---- ntlm-http-0.1.1.orig/lib/net/ntlm_http.rb
-+++ ntlm-http-0.1.1/lib/net/ntlm_http.rb
-@@ -45,6 +45,7 @@
- require 'base64'
- require 'openssl'
- require 'openssl/digest'
-+require 'kconv'
- 
- module Net  #:nodoc:
-   module NTLM
-Index: ntlm-http-0.1.1/lib/net/ntlm.rb
-===================================================================
---- ntlm-http-0.1.1.orig/lib/net/ntlm.rb
-+++ ntlm-http-0.1.1/lib/net/ntlm.rb
-@@ -45,6 +45,7 @@
- require 'base64'
- require 'openssl'
- require 'openssl/digest'
-+require 'kconv'
- 
- module Net  #:nodoc:
-   module NTLM
diff --git a/dev-ruby/ntlm-http/metadata.xml b/dev-ruby/ntlm-http/metadata.xml
deleted file mode 100644
index 658c72b1920d..000000000000
--- a/dev-ruby/ntlm-http/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/ntlm-http/ntlm-http-0.1.1-r3.ebuild b/dev-ruby/ntlm-http/ntlm-http-0.1.1-r3.ebuild
deleted file mode 100644
index d05197d014ca..000000000000
--- a/dev-ruby/ntlm-http/ntlm-http-0.1.1-r3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_DOC_SOURCES="lib README"
-RUBY_FAKEGEM_EXTRADOC="README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby/NTLM HTTP provides NTLM authentication over http"
-HOMEPAGE="http://www.mindflowsolutions.net/"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-all_ruby_prepare() {
-	find . -name '*.rb' -exec sed -i -e 's:\r$::' {} +
-
-	# We can't use RUBY_PATCHES for this because we need first to convert the files
-	eapply "${FILESDIR}"/${P}+ruby-1.9.patch
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 test/*_test.rb
-}
diff --git a/dev-ruby/oauth/Manifest b/dev-ruby/oauth/Manifest
index 85f3d66865d4..a022ef58f36a 100644
--- a/dev-ruby/oauth/Manifest
+++ b/dev-ruby/oauth/Manifest
@@ -1,2 +1 @@
-DIST oauth-0.5.10.tar.gz 67073 BLAKE2B 30d5823151412f53af41f28f7d5831bcfa7e7cf0b86d3a122b825fd086c00dab7fca7a4838b7ed5ebb269725af7c2a64cf771fc598bd6a97b9968e480ce78b4c SHA512 0ff5cd07052e210b1948496844166e1095b09d9c39592b6b11fa3aa4909fd8debec55237493d292dc60f4fe513ddf1a8f58cdb0215949241cf753d4e53aa107e
-DIST oauth-0.5.8.tar.gz 67852 BLAKE2B 7dc19a2f84f585fd517d677bf441c5964b45566ffea3cbd7612061db115a5570cf8315b4cbdd8788f9b0ff336b6eea91922f17c0ce17a4c626731282bd8203ca SHA512 3bf8298ea5bcffe1fe61ba894a5cfcb04a5814348154749e056ea18d975b00b10db7ed226f2187ffb9f414b755022bf32ff4bb2c02f1f429f6a9a7062032d82e
+DIST oauth-0.6.2.tar.gz 81702 BLAKE2B 2775c0711beb9f3612844ae07ff59953d4db72c0f9a797c6eac49132a021a48481a13f4b1428b2037b0a04b83b5d79e621cccd4a794fe3a339a1ceb468f0b165 SHA512 22f4f734daa42339bbaed1d1d449a4591ef4404aaf8cf1753ba705735a176f6142853b2c4f5e8ff3afa3e9899163af1c5598685664326d58a5b529d94b65441f
diff --git a/dev-ruby/oauth/oauth-0.5.10.ebuild b/dev-ruby/oauth/oauth-0.5.10.ebuild
deleted file mode 100644
index 6aacd85e42e9..000000000000
--- a/dev-ruby/oauth/oauth-0.5.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md TODO"
-
-RUBY_FAKEGEM_GEMSPEC="oauth.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A RubyGem for implementing both OAuth clients and servers"
-HOMEPAGE="https://github.com/oauth-xx/oauth-ruby"
-SRC_URI="https://github.com/oauth-xx/oauth-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-ruby-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/test-unit:2
-	dev-ruby/mocha:1.0
-	dev-ruby/webmock
-	dev-ruby/rack
-	dev-ruby/actionpack:6.1
-	dev-ruby/railties:6.1
-)"
-
-all_ruby_prepare() {
-	# Require a compatible version of mocha
-	sed -i -e '1igem "mocha", "~> 1.0"; gem "railties", "~>6.1.0" ; gem "actionpack", "~>6.1.0"' \
-		-e '2i gem "test-unit"; require "test/unit"' \
-		-e '/mocha/ s/mini_test/minitest/' \
-		-e '/\(byebug\|minitest_helpers\|simplecov\)/I s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/oauth/oauth-0.5.8.ebuild b/dev-ruby/oauth/oauth-0.5.8.ebuild
deleted file mode 100644
index 6aacd85e42e9..000000000000
--- a/dev-ruby/oauth/oauth-0.5.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md TODO"
-
-RUBY_FAKEGEM_GEMSPEC="oauth.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A RubyGem for implementing both OAuth clients and servers"
-HOMEPAGE="https://github.com/oauth-xx/oauth-ruby"
-SRC_URI="https://github.com/oauth-xx/oauth-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-ruby-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/test-unit:2
-	dev-ruby/mocha:1.0
-	dev-ruby/webmock
-	dev-ruby/rack
-	dev-ruby/actionpack:6.1
-	dev-ruby/railties:6.1
-)"
-
-all_ruby_prepare() {
-	# Require a compatible version of mocha
-	sed -i -e '1igem "mocha", "~> 1.0"; gem "railties", "~>6.1.0" ; gem "actionpack", "~>6.1.0"' \
-		-e '2i gem "test-unit"; require "test/unit"' \
-		-e '/mocha/ s/mini_test/minitest/' \
-		-e '/\(byebug\|minitest_helpers\|simplecov\)/I s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/oauth/oauth-0.6.2-r1.ebuild b/dev-ruby/oauth/oauth-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..7b74b5dfd58c
--- /dev/null
+++ b/dev-ruby/oauth/oauth-0.6.2-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="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP="oauth"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md TODO"
+
+RUBY_FAKEGEM_GEMSPEC="oauth.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A RubyGem for implementing both OAuth clients and servers"
+HOMEPAGE="https://github.com/oauth-xx/oauth-ruby"
+SRC_URI="https://github.com/oauth-xx/oauth-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-ruby-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/snaky_hash:1
+	>=dev-ruby/version_gem-1.1:1
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/test-unit:2
+	dev-ruby/mocha:2
+	dev-ruby/webmock
+	dev-ruby/rack
+	dev-ruby/rest-client
+	dev-ruby/actionpack:6.1
+	dev-ruby/railties:6.1
+)"
+
+all_ruby_prepare() {
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Require compatible versions of dependencies
+	sed -i -e '1igem "railties", "~>6.1.0" ; gem "actionpack", "~>6.1.0"; require "action_dispatch"' \
+		-e '/mocha/ s/mini_test/minitest/' \
+		-e 's/if RUN_COVERAGE/if false/' test/test_helper.rb || die
+
+	# Avoid test tripped up by kwargs confusion
+	sed -e '/test_authorize/askip "kwargs confusion"' \
+		-e 's/MiniTest/Minitest/' \
+		-i test/units/cli_test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/**/*test*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/oauth2/Manifest b/dev-ruby/oauth2/Manifest
index 0d3fbb8efe1b..0226b5624afc 100644
--- a/dev-ruby/oauth2/Manifest
+++ b/dev-ruby/oauth2/Manifest
@@ -1,2 +1 @@
-DIST oauth2-1.4.4.tar.gz 28477 BLAKE2B 925008fcf4dd48da3b17c539713bf0f05f649d431ab1676293de625bef4165f31153271d48bbb0c6265c67d7bb6a3cbc7217ce155ba331b22a00d572a855a8ef SHA512 5398a25664e53d1942b0ecbe5d74ca9cc8f04a928c96073f40cfff207c4bf220634185320954a0d1f36944547fb48264855c9523318fbb79dd4a3779a7a46e79
-DIST oauth2-1.4.7.tar.gz 32341 BLAKE2B f3db3ff7ebcf7bc0958a564fdb0812c1bfb613148c5a16655f276fda4d6dac7769196305d854ee0fc3f8b4b53a93b4ae504b348029e1b363bcb704293887347a SHA512 4a43b3f75e827e9a12a74a6fe13a29b141c0d5bcb6a0d5c86dc8d8726f650a9fd5250ecc2c31cee5e985f0cb50e02f828d27fd07577bcac4dfc8ff4e009bd710
+DIST oauth2-1.4.11.tar.bz2 65622 BLAKE2B 9a09e69eb2389289d5b048388dd52dd6edcf289c4d7262ead05cca7dd27b261b6f432e023ac3c34aa77d6fa33bca5d870726b96cf5bf85eeec3561e9b53f9501 SHA512 12a9133cd5813eed00c2a22995630a7fdb611b0d76b06eeb8c938fd826831ea37556822246f21a739ba427c74135e6c2046edc1fb008725c55f3b1000ab5a945
diff --git a/dev-ruby/oauth2/metadata.xml b/dev-ruby/oauth2/metadata.xml
index 59f7d3b5910c..09a70a6befc5 100644
--- a/dev-ruby/oauth2/metadata.xml
+++ b/dev-ruby/oauth2/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">intridea/oauth2</remote-id>
+    <remote-id type="gitlab">oauth-xx/oauth2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/oauth2/oauth2-1.4.11.ebuild b/dev-ruby/oauth2/oauth2-1.4.11.ebuild
new file mode 100644
index 000000000000..286c19cd9e96
--- /dev/null
+++ b/dev-ruby/oauth2/oauth2-1.4.11.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="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
+HOMEPAGE="https://gitlab.com/oauth-xx/oauth2"
+SRC_URI="https://gitlab.com/oauth-xx/oauth2/-/archive/v${PV}/oauth2-${PV}.tar.bz2"
+RUBY_S="oauth2-v${PV}-d41fb6e8feef3b0b0382dedc0ede82f5ca7854cd"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 )
+	dev-ruby/jwt:2
+	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
+	>=dev-ruby/multi_xml-0.5:0
+	>=dev-ruby/rack-1.2:* <dev-ruby/rack-4:*"
+ruby_add_bdepend "test? (
+	>=dev-ruby/addressable-2.3
+	>=dev-ruby/rexml-3.2:3
+	dev-ruby/rspec:3
+	dev-ruby/rspec-pending_for
+	dev-ruby/rspec-stubbed_env
+)"
+
+all_ruby_prepare() {
+	sed \
+		-e '/silent/I s:^:#:' \
+		-e '/require.*oauth2/arequire "oauth2/version"' \
+		-i spec/helper.rb || die
+
+	sed -i -e '/yardstick/,/^end/ s:^:#:' \
+		-e '/bundler/I s:^:#:' Rakefile || die
+
+	# Avoid spec that is too fragile in relation to ENV
+	sed -i -e '/outputs to $stdout when OAUTH_DEBUG=true/a skip "fragile ENV stubbing"' spec/oauth2/client_spec.rb || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	CI=true ${RUBY} -S rspec-3 --format progress spec || die
+}
diff --git a/dev-ruby/oauth2/oauth2-1.4.4.ebuild b/dev-ruby/oauth2/oauth2-1.4.4.ebuild
deleted file mode 100644
index 0604c34eae04..000000000000
--- a/dev-ruby/oauth2/oauth2-1.4.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
-HOMEPAGE="https://github.com/intridea/oauth2"
-SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-2.0
-	dev-ruby/jwt:2
-	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
-	>=dev-ruby/multi_xml-0.5:0
-	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "test? (
-	>=dev-ruby/addressable-2.3
-	dev-ruby/rspec:3
-	dev-ruby/rspec-stubbed_env
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^  end/ s:^:#:' \
-		-e '/silent/I s:^:#:' \
-		-e '1irequire "uri"' spec/helper.rb || die
-
-	sed -i -e '/yardstick/,/^end/ s:^:#:' \
-		-e '/bundler/I s:^:#:' Rakefile || die
-
-	# Avoid spec that is too fragile in relation to ENV
-	sed -i -e '/outputs to $stdout when OAUTH_DEBUG=true/a skip "fragile ENV stubbing"' spec/oauth2/client_spec.rb || die
-
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	CI=true ${RUBY} -S rspec-3 spec || die
-}
diff --git a/dev-ruby/oauth2/oauth2-1.4.7.ebuild b/dev-ruby/oauth2/oauth2-1.4.7.ebuild
deleted file mode 100644
index 255cac1628cc..000000000000
--- a/dev-ruby/oauth2/oauth2-1.4.7.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
-HOMEPAGE="https://github.com/intridea/oauth2"
-SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-2.0
-	dev-ruby/jwt:2
-	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
-	>=dev-ruby/multi_xml-0.5:0
-	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "test? (
-	>=dev-ruby/addressable-2.3
-	dev-ruby/rspec:3
-	dev-ruby/rspec-stubbed_env
-)"
-
-all_ruby_prepare() {
-	sed -e '/simplecov/,/^  end/ s:^:#:' \
-		-e '/silent/I s:^:#:' \
-		-e '1irequire "uri"' \
-		-e '/require.*oauth2/arequire "oauth2/version"' \
-		-i spec/helper.rb || die
-
-	sed -i -e '/yardstick/,/^end/ s:^:#:' \
-		-e '/bundler/I s:^:#:' Rakefile || die
-
-	# Avoid spec that is too fragile in relation to ENV
-	sed -i -e '/outputs to $stdout when OAUTH_DEBUG=true/a skip "fragile ENV stubbing"' spec/oauth2/client_spec.rb || die
-
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	CI=true ${RUBY} -S rspec-3 spec || die
-}
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index 947a0a2b2d2f..087167e26c06 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1 +1,4 @@
-DIST octokit-4.22.0.tar.gz 3141531 BLAKE2B c852f34dc99b10fb06194bda9f15bffb4242a2b5ee7909e74defa2a7ca6b90962fd30232eb8850d97af872bfb036c87f7623acd9088efa3afd07f01cad525fe4 SHA512 e8696176227c81d5f80080fbb3c660b7b6e1b28b149b664b20d7e8cf333450988ac2fb9f5327c5e4e46528dbf7eea1246e82c94b265e6008f8fd7cd98f87423c
+DIST octokit-6.1.1.tar.gz 3193336 BLAKE2B 890afac205992c25dd8b48f63ea7a4cf250687318ecb9c0980fc50ff1583943074cea1d9260f139b1a5f86295483f44120421dba8294eba641104301f0188123 SHA512 d91b326d892f80f08598ebb0a03edfd1fb85d36e40dac49593291a6b2ff6a957f5cd2283655c20ff0299f40c75ad7472ff55a14b182bec5f92693b560c2d3c87
+DIST octokit-7.2.0.tar.gz 3293244 BLAKE2B 6c24add01107868d64b0409d7a4eaf5bc5b90a9932d10f46e091aa5f4a512dd64a70047e2615c4a064b33e66e48e724ca0c85a4dec523c8df6c4968ecae83b55 SHA512 91abe7e64a75da5ef4f93a891aedbd1a047f744fed695dfb843f5d6f7416d4e08c7cad192b60d3aead43e38095c0985239a364a70a51042dca1b74bbc3529e8a
+DIST octokit-8.0.0.tar.gz 3306271 BLAKE2B f2bdfebd6f6df3dc507f534947b9cac68ff970d333958a8c7624b01ca090a49294ea2f2fb7b2f0f595f2e4fa37b082d19a3cf346b3634856dfd6c79981c1dcc9 SHA512 7894d8fb3f318827bbac3d8fa4787510195e5c583e256c96b8dd98ccb9ed2126f66f00799547e7db8f565f6c72d7af346c2558a31b8ad5b711c9db240e138878
+DIST octokit-8.1.0.tar.gz 3324751 BLAKE2B 84cc09d122e7a7269272b453f1042158329804bc25bc918fafdc382264b4db7c0264f4d1978521fc5b438e50abc4b879cfe287032998d337ba05c0eae27f4229 SHA512 77552e71fcf149a7aafa94c93210dcf9462cf8269be89e16248c47cf3bf40ab4cc754a9d989599822fc06c29a7edc7e9a16ae3cba696155175710ae7cf845567
diff --git a/dev-ruby/octokit/octokit-4.22.0.ebuild b/dev-ruby/octokit/octokit-4.22.0.ebuild
deleted file mode 100644
index 9c6417cf16ec..000000000000
--- a/dev-ruby/octokit/octokit-4.22.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby toolkit for the Github API"
-HOMEPAGE="https://github.com/octokit/octokit.rb"
-SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RUBY_S=octokit.rb-${PV}
-
-ruby_add_rdepend "
-	>=dev-ruby/faraday-0.9:*
-	=dev-ruby/sawyer-0.8*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/jwt
-	dev-ruby/mime-types
-	>=dev-ruby/netrc-0.7.7
-	>=dev-ruby/rbnacl-7.1.1:6
-	dev-ruby/vcr[json]
-	dev-ruby/webmock:3 )"
-
-all_ruby_prepare() {
-	sed -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' \
-		-e '/pry/ s:^:#:' \
-		-i spec/helper.rb || die
-}
diff --git a/dev-ruby/octokit/octokit-6.1.1.ebuild b/dev-ruby/octokit/octokit-6.1.1.ebuild
new file mode 100644
index 000000000000..7d06ff6f153c
--- /dev/null
+++ b/dev-ruby/octokit/octokit-6.1.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby toolkit for the Github API"
+HOMEPAGE="https://github.com/octokit/octokit.rb"
+SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RUBY_S=octokit.rb-${PV}
+
+ruby_add_rdepend "
+	dev-ruby/faraday:1
+	>=dev-ruby/sawyer-0.9:0
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/jwt
+	dev-ruby/mime-types
+	>=dev-ruby/netrc-0.7.7
+	>=dev-ruby/rbnacl-7.1.1:6
+	dev-ruby/vcr[json]
+	dev-ruby/webmock:3 )"
+
+all_ruby_prepare() {
+	sed -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"; gem "faraday", "<2"' \
+		-e '/pry/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/octokit/octokit-7.2.0.ebuild b/dev-ruby/octokit/octokit-7.2.0.ebuild
new file mode 100644
index 000000000000..cc3f96e0c08e
--- /dev/null
+++ b/dev-ruby/octokit/octokit-7.2.0.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="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby toolkit for the Github API"
+HOMEPAGE="https://github.com/octokit/octokit.rb"
+SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RUBY_S=octokit.rb-${PV}
+
+ruby_add_rdepend "
+	|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 )
+	>=dev-ruby/sawyer-0.9:0
+"
+
+ruby_add_bdepend "test? (
+	|| ( ( dev-ruby/faraday:2 dev-ruby/faraday-multipart ) dev-ruby/faraday:1 )
+	dev-ruby/jwt
+	dev-ruby/mime-types
+	>=dev-ruby/netrc-0.7.7
+	>=dev-ruby/rbnacl-7.1.1:6
+	dev-ruby/vcr[json]
+	dev-ruby/webmock:3 )"
+
+all_ruby_prepare() {
+	sed -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' \
+		-e '/pry/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/octokit/octokit-8.0.0.ebuild b/dev-ruby/octokit/octokit-8.0.0.ebuild
new file mode 100644
index 000000000000..b153005e9e76
--- /dev/null
+++ b/dev-ruby/octokit/octokit-8.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby toolkit for the Github API"
+HOMEPAGE="https://github.com/octokit/octokit.rb"
+SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RUBY_S=octokit.rb-${PV}
+
+ruby_add_rdepend "
+	|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 )
+	>=dev-ruby/sawyer-0.9:0
+"
+
+ruby_add_bdepend "test? (
+	|| ( ( dev-ruby/faraday:2 dev-ruby/faraday-multipart ) dev-ruby/faraday:1 )
+	dev-ruby/jwt
+	dev-ruby/mime-types
+	>=dev-ruby/netrc-0.7.7
+	>=dev-ruby/rbnacl-7.1.1:6
+	dev-ruby/vcr[json]
+	dev-ruby/webmock:3 )"
+
+all_ruby_prepare() {
+	sed -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' \
+		-e '/pry/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/octokit/octokit-8.1.0.ebuild b/dev-ruby/octokit/octokit-8.1.0.ebuild
new file mode 100644
index 000000000000..c197bf7af4ed
--- /dev/null
+++ b/dev-ruby/octokit/octokit-8.1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby toolkit for the Github API"
+HOMEPAGE="https://github.com/octokit/octokit.rb"
+SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RUBY_S=octokit.rb-${PV}
+
+ruby_add_rdepend "
+	|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 )
+	>=dev-ruby/sawyer-0.9:0
+"
+
+ruby_add_bdepend "test? (
+	|| ( ( dev-ruby/faraday:2 dev-ruby/faraday-multipart ) dev-ruby/faraday:1 )
+	dev-ruby/jwt
+	dev-ruby/mime-types
+	>=dev-ruby/netrc-0.7.7
+	>=dev-ruby/rbnacl-7.1.1:6
+	dev-ruby/vcr[json]
+	dev-ruby/webmock:3 )"
+
+all_ruby_prepare() {
+	sed -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' \
+		-e '/pry/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/omniauth/Manifest b/dev-ruby/omniauth/Manifest
index a7597c449f36..a06ad6dd5df9 100644
--- a/dev-ruby/omniauth/Manifest
+++ b/dev-ruby/omniauth/Manifest
@@ -1,2 +1,2 @@
-DIST omniauth-2.0.4.tar.gz 30951 BLAKE2B 6086a737e043ae37e6c7c4b1e4d597a08e6dc490c5d71f7847e9c5a8880bbbd1117470efbbe12e150bf238bf6e5413493712f1c09ae5e37f5d7b7676b6da023e SHA512 c92ce881388c9793e96354caee764cbabb28c69ca63b32f304693c4859eb8bf994e86b2cc9dbeb57993347e6f2787c43eab967c36730d5c47a3c4767d16847eb
-DIST omniauth-2.1.0.tar.gz 31135 BLAKE2B b221c084b926e3ac9e31858268940d0bd8583c667c7bcb8ce14e7fbda91c06c286191ffeff36c17d1d668ee29ca850b377312f2f2a417c47cb1dd4e8a447a641 SHA512 f1dde6f527b6aafdbed83ce6e14dae39617b738c6e80e9ece3d768ef9f63a87924ef2ef92b99ecc52bd69c0103854f16ff9c80f3d2eeb7c134fc70ab0157df63
+DIST omniauth-2.1.1.tar.gz 31414 BLAKE2B 180ee40499a61e8b6360dc4c462ca10933dc7bac976f76dd8c9579e73da6618ffae71ed532fab024f0eb65c3830db1e52f866c40b6e160e65c8fa403c7c1ab37 SHA512 e86fbd3c1f239b4950f17fdfe4ebd97a9a135831b63892dd009bae97f4372b3a6fa2452233e414c6097c3b835ee4e75821e795599da9613affdaf163d31964a3
+DIST omniauth-2.1.2.tar.gz 31631 BLAKE2B 73faa82db781c3980eae55f3fa8a099d3ec0769326201f51f57840566a3b2da2331bdaaddd4ef17d957e389ea8863fc7bfdc11f0278753c27f3a7eabc01ec138 SHA512 bd0c65af815502f3df2dbb104ede35de093c6cc6f25285e9bbcdd58df3d31ac6c05d410888a40aca86a00b17a4851856d158593b06415e8b69ff426f171b9857
diff --git a/dev-ruby/omniauth/metadata.xml b/dev-ruby/omniauth/metadata.xml
index 404dc2f629d6..290d53d7f6af 100644
--- a/dev-ruby/omniauth/metadata.xml
+++ b/dev-ruby/omniauth/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">intridea/omniauth</remote-id>
+    <remote-id type="github">omniauth/omniauth</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/omniauth/omniauth-2.0.4.ebuild b/dev-ruby/omniauth/omniauth-2.0.4.ebuild
deleted file mode 100644
index 79e5a2b31ca8..000000000000
--- a/dev-ruby/omniauth/omniauth-2.0.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A generalized Rack framework for multiple-provider authentication"
-HOMEPAGE="https://github.com/intridea/omniauth"
-SRC_URI="https://github.com/intridea/omniauth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend "
-	=dev-ruby/rack-2*
-	dev-ruby/rack-protection
-	>=dev-ruby/hashie-3.4.6:*"
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/rack-test )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' \
-		Rakefile ${PN}.gemspec || die "sed failed"
-	sed -i -e '/RUBY_VERSION/,/^end/ s:^:#: ; /freeze/ s:^:#:' spec/helper.rb || die "sed failed"
-	# maruku fails, resorting to default markdown implementation
-	sed -i -e '/maruku/d' .yardopts || die "sed failed"
-
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		yard || die "yard failed"
-	fi
-}
diff --git a/dev-ruby/omniauth/omniauth-2.1.0.ebuild b/dev-ruby/omniauth/omniauth-2.1.0.ebuild
deleted file mode 100644
index 16d0da9a9ceb..000000000000
--- a/dev-ruby/omniauth/omniauth-2.1.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A generalized Rack framework for multiple-provider authentication"
-HOMEPAGE="https://github.com/intridea/omniauth"
-SRC_URI="https://github.com/intridea/omniauth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/rack-2.2.3
-	dev-ruby/rack-protection
-	>=dev-ruby/hashie-3.4.6:*"
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/rack-test )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' \
-		Rakefile ${PN}.gemspec || die "sed failed"
-	sed -i -e '/RUBY_VERSION/,/^end/ s:^:#: ; /freeze/ s:^:#:' spec/helper.rb || die "sed failed"
-	# maruku fails, resorting to default markdown implementation
-	sed -i -e '/maruku/d' .yardopts || die "sed failed"
-
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		yard || die "yard failed"
-	fi
-}
diff --git a/dev-ruby/omniauth/omniauth-2.1.1.ebuild b/dev-ruby/omniauth/omniauth-2.1.1.ebuild
new file mode 100644
index 000000000000..ece4591244e5
--- /dev/null
+++ b/dev-ruby/omniauth/omniauth-2.1.1.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="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A generalized Rack framework for multiple-provider authentication"
+HOMEPAGE="https://github.com/omniauth/omniauth"
+SRC_URI="https://github.com/omniauth/omniauth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/rack-2.2.3
+	dev-ruby/rack-protection
+	>=dev-ruby/hashie-3.4.6:*"
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	test? ( dev-ruby/rack-test dev-ruby/rack:2.2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' \
+		Rakefile ${PN}.gemspec || die "sed failed"
+	sed -e '/RUBY_VERSION/,/^end/ s:^:#: ; /freeze/ s:^:#:' \
+		-e '2igem "rack", "<3"' \
+		-i spec/helper.rb || die "sed failed"
+	# maruku fails, resorting to default markdown implementation
+	sed -i -e '/maruku/d' .yardopts || die "sed failed"
+
+	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		yard || die "yard failed"
+	fi
+}
diff --git a/dev-ruby/omniauth/omniauth-2.1.2.ebuild b/dev-ruby/omniauth/omniauth-2.1.2.ebuild
new file mode 100644
index 000000000000..0ff88ca09fd5
--- /dev/null
+++ b/dev-ruby/omniauth/omniauth-2.1.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A generalized Rack framework for multiple-provider authentication"
+HOMEPAGE="https://github.com/omniauth/omniauth"
+SRC_URI="https://github.com/omniauth/omniauth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/rack-2.2.3
+	dev-ruby/rack-protection
+	>=dev-ruby/hashie-3.4.6:*"
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	test? ( dev-ruby/rack-test dev-ruby/rack:2.2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' \
+		Rakefile ${PN}.gemspec || die "sed failed"
+	sed -e '/RUBY_VERSION/,/^end/ s:^:#: ; /freeze/ s:^:#:' \
+		-e '2igem "rack", "<3"' \
+		-e '/simplecov/,/^end/ s:^:#:' \
+		-i spec/helper.rb || die "sed failed"
+	# maruku fails, resorting to default markdown implementation
+	sed -i -e '/maruku/d' .yardopts || die "sed failed"
+
+	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		yard || die "yard failed"
+	fi
+}
diff --git a/dev-ruby/open4/open4-1.3.4-r1.ebuild b/dev-ruby/open4/open4-1.3.4-r1.ebuild
index 84e47efdaea9..be68fc392186 100644
--- a/dev-ruby/open4/open4-1.3.4-r1.ebuild
+++ b/dev-ruby/open4/open4-1.3.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README"
@@ -14,13 +14,17 @@ HOMEPAGE="https://github.com/ahoward/open4"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
 
 all_ruby_prepare() {
 	mv rakefile Rakefile || die
+
+	# Fix minitest deprecation
+	sed -e 's/MiniTest::Unit::TestCase/Minitest::Test/' \
+		-i test/lib/test_case.rb || die
 }
 
 all_ruby_install() {
diff --git a/dev-ruby/openssl-ccm/Manifest b/dev-ruby/openssl-ccm/Manifest
index c48350e379f1..d33cd8b90874 100644
--- a/dev-ruby/openssl-ccm/Manifest
+++ b/dev-ruby/openssl-ccm/Manifest
@@ -1 +1 @@
-DIST openssl-ccm-1.2.2.gem 24576 BLAKE2B b94a205ce3b9d557ad649c0391428526339b050dd7a85633ee955b3532a94637e7c40a7cbb9bd739ff50f2922c97721e4dadf7e392c2aaaa38f35123858c01f2 SHA512 5f04af1ac65608e519fcf68259b2690f12882781cdba411939f809e1a6cb602723bf23d9cb920949e8eb7c4bfddb3e65446ae16d0276af78992de21cbfcdfc49
+DIST openssl-ccm-1.2.3.gem 24576 BLAKE2B 7df1a1cbd0570eed4165931b6f236a96050bc0e27a9b12d68e42e2578bbb3fe319e28eae1752571275ff35ee25a77617d0d74a7dbff5c197c5ab11a0dac1d96b SHA512 4070a570da5864dce582d02916dffccea74db279dd8f4f419a29a4837e66bd6778ba742f6e06037ee5bc5542954e52b2271384b0a321ea282024bc60df3b81e1
diff --git a/dev-ruby/openssl-ccm/metadata.xml b/dev-ruby/openssl-ccm/metadata.xml
index a633d42a904b..d9e1718ffdfe 100644
--- a/dev-ruby/openssl-ccm/metadata.xml
+++ b/dev-ruby/openssl-ccm/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
     <remote-id type="github">SmallLars/openssl-ccm</remote-id>
diff --git a/dev-ruby/openssl-ccm/openssl-ccm-1.2.2-r1.ebuild b/dev-ruby/openssl-ccm/openssl-ccm-1.2.2-r1.ebuild
deleted file mode 100644
index e532af80584a..000000000000
--- a/dev-ruby/openssl-ccm/openssl-ccm-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-inherit ruby-fakegem
-
-DESCRIPTION="OpenSSL CBC-MAC (CCM) ruby gem"
-HOMEPAGE="https://github.com/SmallLars/openssl-ccm"
-
-LICENSE="BSD"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/coverall/I s:^:#:' test/test_ccm.rb || die
-}
diff --git a/dev-ruby/openssl-ccm/openssl-ccm-1.2.2.ebuild b/dev-ruby/openssl-ccm/openssl-ccm-1.2.2.ebuild
deleted file mode 100644
index fa9c498b8873..000000000000
--- a/dev-ruby/openssl-ccm/openssl-ccm-1.2.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="OpenSSL CBC-MAC (CCM) ruby gem"
-HOMEPAGE="https://github.com/SmallLars/openssl-ccm"
-
-LICENSE="BSD"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/coverall/I s:^:#:' test/test_ccm.rb || die
-}
diff --git a/dev-ruby/openssl-ccm/openssl-ccm-1.2.3.ebuild b/dev-ruby/openssl-ccm/openssl-ccm-1.2.3.ebuild
new file mode 100644
index 000000000000..4ffa7539b5c2
--- /dev/null
+++ b/dev-ruby/openssl-ccm/openssl-ccm-1.2.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-fakegem
+
+DESCRIPTION="OpenSSL CBC-MAC (CCM) ruby gem"
+HOMEPAGE="https://github.com/SmallLars/openssl-ccm"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/coverall/I s:^:#:' test/test_ccm.rb || die
+}
diff --git a/dev-ruby/openssl-cmac/Manifest b/dev-ruby/openssl-cmac/Manifest
new file mode 100644
index 000000000000..5cf7c654150c
--- /dev/null
+++ b/dev-ruby/openssl-cmac/Manifest
@@ -0,0 +1 @@
+DIST openssl-cmac-2.0.2.gem 9728 BLAKE2B 0113459326d6d42f256848cee682607a3d7a03778bd6963eaf86519d263c8295726acd462600bf047cca0c92704c8dfa6e0edd34b93dcb1673c232bb73c9331f SHA512 dbe4083ee3e1f2d1254a035d7d6c46a927e4dcde69d466ae9af5fa53ded89519f58c30095019fc5fa258f0c14493870e05c2b32cfba0921c451c6709710be3b4
diff --git a/dev-ruby/openssl-cmac/metadata.xml b/dev-ruby/openssl-cmac/metadata.xml
new file mode 100644
index 000000000000..ba63e44acdc2
--- /dev/null
+++ b/dev-ruby/openssl-cmac/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">SmallLars/openssl-cmac</remote-id>
+    <remote-id type="rubygems">openssl-cmac</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/openssl-cmac/openssl-cmac-2.0.2.ebuild b/dev-ruby/openssl-cmac/openssl-cmac-2.0.2.ebuild
new file mode 100644
index 000000000000..451946c94d04
--- /dev/null
+++ b/dev-ruby/openssl-cmac/openssl-cmac-2.0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Gem for RFC 4493, 4494, 4615 - The AES-CMAC Algorithm"
+HOMEPAGE="https://github.com/SmallLars/openssl-cmac"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/coverall/I s:^:#:' test/test_cmac.rb || die
+}
diff --git a/dev-ruby/optimist/Manifest b/dev-ruby/optimist/Manifest
index 78d2eb57965e..3ae11c590978 100644
--- a/dev-ruby/optimist/Manifest
+++ b/dev-ruby/optimist/Manifest
@@ -1 +1 @@
-DIST optimist-3.0.1.gem 30208 BLAKE2B 66778029b9e2ac2eb38beaab5cb73a4fe58b123c401fdfc00d924073a6dd97dca05bbf8ab3a88e47ca5f94ed920a583196d901c6a2a4962e93c8a2ef905173ba SHA512 209fbb355a7ba75208cef314ccaa188955463551d1c914f10409cac189375b5be40fbcdf0d88a5ce825c527bca7138528fafd6f37cf73f5e68f3b453f3ef8485
+DIST optimist-3.1.0.gem 31744 BLAKE2B 0fc27447a6263e2e7acde502f4b4a23d891f08f57c70655ac1057b0e2c3e33c54c215d6d27079d09305771028347473f39e4d0f547ad002237fa8808e0a8cf63 SHA512 adadc1722d970cc4c002a0983d0ab2dbb3683777310c7085950e07fa18c94e4ab788bd10bca9e1d076cf77637d09e2d6bb969f5d5b35f0b648881e744f42c785
diff --git a/dev-ruby/optimist/optimist-3.0.1.ebuild b/dev-ruby/optimist/optimist-3.0.1.ebuild
deleted file mode 100644
index f08a822bec74..000000000000
--- a/dev-ruby/optimist/optimist-3.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="FAQ.txt History.txt README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A commandline option parser for Ruby that just gets out of your way"
-HOMEPAGE="https://manageiq.github.io/optimist/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="3"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/chronic )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundle/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	MUTANT=true ${RUBY} -S rake test || die "Tests failed."
-}
diff --git a/dev-ruby/optimist/optimist-3.1.0.ebuild b/dev-ruby/optimist/optimist-3.1.0.ebuild
new file mode 100644
index 000000000000..60e85b618317
--- /dev/null
+++ b/dev-ruby/optimist/optimist-3.1.0.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="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="FAQ.txt History.txt README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A commandline option parser for Ruby that just gets out of your way"
+HOMEPAGE="https://www.manageiq.org/optimist/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="3"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/chronic )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundle/ s:^:#:' Rakefile || die
+	sed -i -e 's/MiniTest/Minitest/' test/*_test.rb test/optimist/*_test.rb || die
+}
+
+each_ruby_test() {
+	MUTANT=true ${RUBY} -S rake test || die "Tests failed."
+}
diff --git a/dev-ruby/optionable/optionable-0.2.0-r1.ebuild b/dev-ruby/optionable/optionable-0.2.0-r1.ebuild
index b1281a2fea0c..6a2b56311d9a 100644
--- a/dev-ruby/optionable/optionable-0.2.0-r1.ebuild
+++ b/dev-ruby/optionable/optionable-0.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="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/org-ruby/Manifest b/dev-ruby/org-ruby/Manifest
index 64b9d2e10763..bc589b0ee50e 100644
--- a/dev-ruby/org-ruby/Manifest
+++ b/dev-ruby/org-ruby/Manifest
@@ -1 +1 @@
-DIST org-ruby-0.9.12.tar.gz 143472 BLAKE2B c90e0f664f64be0449e63d717441f3c8aac9957c3b892392c8425847ea42dd23e3b7a598f57969432601ba9c6208633c7aa6e101a4684db2f68c07511bcb0458 SHA512 040c7bc9d9727fcec9bbd7ed4994ca489121c103d58242f98d340b4149f94cb97fc0bbc670bbd5dfba5a11de53930b579a33b6b1ffa343c7f2602674ec65aa07
+DIST org-ruby-0.9.12_p20200519.tar.gz 151533 BLAKE2B 8a4f11ffc6ddf8019a4df5924d64c31f2a50786d2b4871967f0b178095cbb3ca46084824293568b974e1d79aa6a4207558da0dcb08569de12a89d0b6aac3344e SHA512 ff55464fff4a0e20bf9aaa7fecb4622f1a322228add113e7b9e465009c6177b7c97332c6681c57d5d6e2967e7215a915e5eb99148eb311a0b890d8e48acf6e70
diff --git a/dev-ruby/org-ruby/files/org-ruby-0.9.12-file-exists.patch b/dev-ruby/org-ruby/files/org-ruby-0.9.12-file-exists.patch
new file mode 100644
index 000000000000..04d3c8ba9ad4
--- /dev/null
+++ b/dev-ruby/org-ruby/files/org-ruby-0.9.12-file-exists.patch
@@ -0,0 +1,36 @@
+commit c80af35e142d7705a367b5b39545fbba5b1f9bc2
+Author: Hans de Graaff <hans@degraaff.org>
+Date:   Sat Dec 9 09:23:29 2023 +0100
+
+    Use non-deprecated File.exist? method
+    
+    File.exists? has been deprecated for some time and is no longer
+    present in Ruby 3.2. With this change the specs pass again on Ruby
+    3.2.
+
+diff --git a/lib/org-ruby/output_buffer.rb b/lib/org-ruby/output_buffer.rb
+index 90a0aae..3179cd5 100644
+--- a/lib/org-ruby/output_buffer.rb
++++ b/lib/org-ruby/output_buffer.rb
+@@ -137,7 +137,7 @@ module Orgmode
+     end
+ 
+     def do_custom_markup
+-      if File.exists? @options[:markup_file]
++      if File.exist? @options[:markup_file]
+         load_custom_markup
+         if @custom_blocktags.empty?
+           no_valid_markup_found
+diff --git a/lib/org-ruby/parser.rb b/lib/org-ruby/parser.rb
+index a57fd9e..192b855 100644
+--- a/lib/org-ruby/parser.rb
++++ b/lib/org-ruby/parser.rb
+@@ -129,7 +129,7 @@ module Orgmode
+ 
+     # Check include file availability and permissions
+     def check_include_file(file_path)
+-      can_be_included = File.exists? file_path
++      can_be_included = File.exist? file_path
+ 
+       if not ENV['ORG_RUBY_INCLUDE_ROOT'].nil?
+         # Ensure we have full paths
diff --git a/dev-ruby/org-ruby/org-ruby-0.9.12-r1.ebuild b/dev-ruby/org-ruby/org-ruby-0.9.12-r1.ebuild
deleted file mode 100644
index d8552473aab2..000000000000
--- a/dev-ruby/org-ruby/org-ruby-0.9.12-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="README.org History.org"
-RUBY_FAKEGEM_GEMSPEC="org-ruby.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby routines for parsing org-mode files"
-HOMEPAGE="https://github.com/wallyqs/org-ruby"
-SRC_URI="https://github.com/wallyqs/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RUBY_S="${PN}-version-${PV}"
-
-ruby_add_rdepend ">=dev-ruby/rubypants-0.2:0"
-ruby_add_bdepend "test? ( dev-ruby/tilt )"
-
-all_ruby_prepare() {
-	#Fix tests until rspec:3 is available in the tree
-	sed -i -e "s/truthy/true/" -e "s/falsy/false/" spec/headline_spec.rb spec/parser_spec.rb spec/line_spec.rb || die
-}
diff --git a/dev-ruby/org-ruby/org-ruby-0.9.12_p20200519.ebuild b/dev-ruby/org-ruby/org-ruby-0.9.12_p20200519.ebuild
new file mode 100644
index 000000000000..9be117c667cd
--- /dev/null
+++ b/dev-ruby/org-ruby/org-ruby-0.9.12_p20200519.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+COMMIT=7a28c2e6e91cdaceb1fddc2d870f4458632816e8
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.org History.org"
+RUBY_FAKEGEM_GEMSPEC="org-ruby.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby routines for parsing org-mode files"
+HOMEPAGE="https://github.com/wallyqs/org-ruby"
+SRC_URI="https://github.com/wallyqs/org-ruby/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/org-ruby-0.9.12-file-exists.patch" )
+
+ruby_add_rdepend ">=dev-ruby/rubypants-0.2:0"
+ruby_add_bdepend "test? ( dev-ruby/tilt )"
+
+all_ruby_prepare() {
+	sed -i -e '1irequire "pathname"' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/origin/Manifest b/dev-ruby/origin/Manifest
deleted file mode 100644
index 54f738a065cc..000000000000
--- a/dev-ruby/origin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST origin-2.3.1.tar.gz 44392 BLAKE2B f58b5f977070a3e14a3b80c5ce7fb2860eda6ea41a0b403e67ff6159ccc86d078e3cc42f7269cc9640f2e3f71d66a4c0ea02935efa6d6096c6eccf622595589c SHA512 f74e3ed163b2c9a6184be624f85bc810fcb414290c5701beee291f1c227f889bc75d78ab3cc008f92780823217c7cefe916ebb3e902e807a40f4d901465343fd
diff --git a/dev-ruby/origin/metadata.xml b/dev-ruby/origin/metadata.xml
deleted file mode 100644
index 27bf5752cafb..000000000000
--- a/dev-ruby/origin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mongoid/origin</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/origin/origin-2.3.1.ebuild b/dev-ruby/origin/origin-2.3.1.ebuild
deleted file mode 100644
index ebe6cd4f4362..000000000000
--- a/dev-ruby/origin/origin-2.3.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="mongoid"
-GITHUB_PROJECT="${PN}"
-
-MY_PV="${PV/_rc/.rc}"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Origin is a simple DSL for generating MongoDB selectors and options"
-HOMEPAGE="http://mongoid.org/"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${MY_PV}.tar.gz -> ${GITHUB_PROJECT}-${MY_PV}.tar.gz"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/activesupport
-		dev-ruby/i18n:1
-		dev-ruby/tzinfo
-	)"
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index f1f84e6b9544..056dd3a57b51 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,4 +1,2 @@
-DIST ox-2.14.10.tar.gz 218705 BLAKE2B fc70af78d26655ec8dad64a180139446985590d57901f339b73de8c92142e0a695b23e09ac6eacb82f435b85b1a19bd700d7bdb4d2a3d220252233917a25ced9 SHA512 57a29c7dfc9990c91ce10a9f44afb2c1049b8d9a68e9c50b46cec4aa6dd7e20afc295853e55cb61eaf4054ed476350d43a8d9569a660663600e10adc819bbd51
-DIST ox-2.14.11.tar.gz 218731 BLAKE2B ca342a0cf87e9e80048511c82ade7d24fe8e59fc1efd96d24f50f5694a82527d3cbc37a762cd619ce5febd00323ccf566ffacd413a38e4516900c79e55a8cdd1 SHA512 9f34237fae1aa4c7c77e9dd01eda07fc5134e1fd5d0ca48c37bf2a52d4e257c049e71876c366bc63109727a0ee2fa37aec9fa8222f2902bdff57c3ecb87e8d84
-DIST ox-2.14.8.tar.gz 218502 BLAKE2B e3838c52096c959fcdf2eae2156a79f1562cd13c8463f0a3f0ff54f9468059547e9bfc79f2a7b750f614fd77d5ae56189679fb55f9771903697864cc80b0831b SHA512 a07e7d074c681325c84cf7f381be7d1912b9de53cb41d11762fca15a6899a66bbf0ad751119416ec4640cde8c11dae967514fcfb16acae6f5be76d03f2b46eac
-DIST ox-2.14.9.tar.gz 218618 BLAKE2B 57f5a43cf565079a07b678f45e14764ef859620d2f66c5348362d6f08e7f9d3a2b358ff81b2c2455bdb39dbf562df6aca45557895abc30d0cc16657c979b8806 SHA512 e2f178b30ad8e94873e0f8e0ed95800963655ffe31c0af9af3231df5a2d769487204507bca91573a381550ef80b08b15414e6607c5236f5bb8994a719a5ea5cb
+DIST ox-2.14.17.tar.gz 224636 BLAKE2B 9a8df3430a4eeeb74df1d930caba7ed84a6eacad28515e908781fbea9503f722cf9165e4498367f6838fad60bc976dd6621b69f7036a902a26c75cd6afa3a3bf SHA512 919da1884033af0e44c7dbef78a5d08dc473967bd23a9ab445b295ae57a6f1495cc95ed88794164d96d6f000b9262fa0abce9c8b4b93d27ee4c68997c820f0c1
+DIST ox-2.14.18.tar.gz 224697 BLAKE2B 2add505ebaefc8d8915d2c64f7717073df2c2792efffa75d7e4653c7ebda91390fbb1929099506119535b939a365cecf902e7405d2d84f9240e45ceadeeb38f3 SHA512 9be6c2c6a5e0bc02ec86b1495455112930737d74c1771098b68089e45c2acf897c94a8c8c0b9fdc70ccf584a692eb6aece440d4f7bece9d75bde1cea595853dc
diff --git a/dev-ruby/ox/ox-2.14.10.ebuild b/dev-ruby/ox/ox-2.14.10.ebuild
deleted file mode 100644
index 18c6fa807322..000000000000
--- a/dev-ruby/ox/ox-2.14.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="ox.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/ox/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/ox
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast XML parser and Object marshaller"
-HOMEPAGE="https://www.ohler.com/ox/ https://github.com/ohler55/ox"
-SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-each_ruby_test() {
-	${RUBY} test/tests.rb || die
-}
diff --git a/dev-ruby/ox/ox-2.14.11.ebuild b/dev-ruby/ox/ox-2.14.11.ebuild
deleted file mode 100644
index 9d396a28c0f1..000000000000
--- a/dev-ruby/ox/ox-2.14.11.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="ox.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/ox/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/ox
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast XML parser and Object marshaller"
-HOMEPAGE="https://www.ohler.com/ox/ https://github.com/ohler55/ox"
-SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-each_ruby_test() {
-	${RUBY} test/tests.rb || die
-}
diff --git a/dev-ruby/ox/ox-2.14.17.ebuild b/dev-ruby/ox/ox-2.14.17.ebuild
new file mode 100644
index 000000000000..29d90dc7c93d
--- /dev/null
+++ b/dev-ruby/ox/ox-2.14.17.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ox.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/ox/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/ox
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast XML parser and Object marshaller"
+HOMEPAGE="https://www.ohler.com/ox/ https://github.com/ohler55/ox"
+SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE=""
+
+each_ruby_test() {
+	${RUBY} test/tests.rb || die
+}
diff --git a/dev-ruby/ox/ox-2.14.18.ebuild b/dev-ruby/ox/ox-2.14.18.ebuild
new file mode 100644
index 000000000000..1dec90e7cf25
--- /dev/null
+++ b/dev-ruby/ox/ox-2.14.18.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ox.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/ox/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/ox
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast XML parser and Object marshaller"
+HOMEPAGE="https://www.ohler.com/ox/ https://github.com/ohler55/ox"
+SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+
+each_ruby_test() {
+	${RUBY} test/tests.rb || die
+}
diff --git a/dev-ruby/ox/ox-2.14.8.ebuild b/dev-ruby/ox/ox-2.14.8.ebuild
deleted file mode 100644
index 09abdbeca52b..000000000000
--- a/dev-ruby/ox/ox-2.14.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="ox.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/ox/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/ox
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast XML parser and Object marshaller"
-HOMEPAGE="https://www.ohler.com/ox/ https://github.com/ohler55/ox"
-SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-each_ruby_test() {
-	${RUBY} test/tests.rb || die
-}
diff --git a/dev-ruby/ox/ox-2.14.9.ebuild b/dev-ruby/ox/ox-2.14.9.ebuild
deleted file mode 100644
index 6f57f5023f6b..000000000000
--- a/dev-ruby/ox/ox-2.14.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="ox.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/ox/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/ox
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast XML parser and Object marshaller"
-HOMEPAGE="https://www.ohler.com/ox/ https://github.com/ohler55/ox"
-SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-each_ruby_test() {
-	${RUBY} test/tests.rb || die
-}
diff --git a/dev-ruby/packetfu/Manifest b/dev-ruby/packetfu/Manifest
deleted file mode 100644
index a9be91484249..000000000000
--- a/dev-ruby/packetfu/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST packetfu-1.1.13.gem 769024 BLAKE2B 6fa53680dec76c14c6cd73cac4e57acf2da5aaa2a9a6371d0b9fbea1e764d9e2eda09fcf0ad245eb62340fa0d3047e525ba290d4c45ff4739e28fd5782659cd6 SHA512 c3ee67bfd597dcd197f213361ab94c614136304d8746de45b99322c1b6878eaef7c4a2ebc19be658d891df3e7d261476def27ae14990157dc6cb466815bd6f15
diff --git a/dev-ruby/packetfu/metadata.xml b/dev-ruby/packetfu/metadata.xml
deleted file mode 100644
index 37f15a1d0b69..000000000000
--- a/dev-ruby/packetfu/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zerochaos@gentoo.org</email>
-		<name>Rick Farina</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="rubygems">packetfu</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/packetfu/packetfu-1.1.13.ebuild b/dev-ruby/packetfu/packetfu-1.1.13.ebuild
deleted file mode 100644
index 45c488ef112b..000000000000
--- a/dev-ruby/packetfu/packetfu-1.1.13.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRAINSTALL="examples"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A mid-level packet manipulation library"
-HOMEPAGE="https://rubygems.org/gems/packetfu"
-
-LICENSE="BSD"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-
-ruby_add_rdepend "
-	dev-ruby/network_interface:0
-	dev-ruby/pcaprub:*
-"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-its-1.2.0:1 )
-			dev-ruby/bundler"
-DEPEND="${DEPEND} !dev-ruby/packetfu:0"
-
-all_ruby_prepare() {
-	[ -f Gemfile.lock ] && rm Gemfile.lock
-	#For now, we don't support development or testing at all
-	#if ! use development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
-		sed -i -e "/spec.add_development_dependency/d" "${PN}".gemspec || die
-	#fi
-	#if ! use test; then
-		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
-	#fi
-	#if ! use test && ! use development; then
-		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
-	#fi
-	sed -i -e '/[Cc]overalls/d' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/paint/Manifest b/dev-ruby/paint/Manifest
index 6f3b04320103..209b8d7cb226 100644
--- a/dev-ruby/paint/Manifest
+++ b/dev-ruby/paint/Manifest
@@ -1 +1 @@
-DIST paint-2.2.1.tar.gz 22181 BLAKE2B f0d3e39244fd103e7f248161369189e2e5dafc7eb0f0813998e0da4a80714ab355ca1ebb9357695e97b57db49a90198a2efc0a4043a4e7bfd18fedf58515d113 SHA512 8190c220310b724defa0f482b264afe32bcfd00044380dbb3d8354050857f121c1e084bd737f7b9b89a6950ea4be2c87b7f7282854641df65918bfb6bead5450
+DIST paint-2.3.0.tar.gz 24208 BLAKE2B 6f9028c26966ba5c7e0b7de0e9957b2cd73585679347f281a07d2ac95ab5d12f043580cc5afba8f68fd416854c1824b18ed1f53e11f24277f1718786729e66b9 SHA512 296c73ae3066f2114fdadfbaab81bb0f4b4893c8ab5b41d5dc8ef511104541df2a1bfd9f35582742769cb32e11ad22527fef7938952147eec6d4d36526fb5f60
diff --git a/dev-ruby/paint/paint-2.2.1.ebuild b/dev-ruby/paint/paint-2.2.1.ebuild
deleted file mode 100644
index a7b57a3529d0..000000000000
--- a/dev-ruby/paint/paint-2.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md SHORTCUTS.md"
-
-RUBY_FAKEGEM_GEMSPEC=paint.gemspec
-
-inherit ruby-fakegem
-
-DESCRIPTION="Terminal painter"
-HOMEPAGE="https://github.com/janlelis/paint"
-SRC_URI="https://github.com/janlelis/paint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test doc"
diff --git a/dev-ruby/paint/paint-2.3.0-r1.ebuild b/dev-ruby/paint/paint-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..a4b747c6e88d
--- /dev/null
+++ b/dev-ruby/paint/paint-2.3.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md SHORTCUTS.md"
+
+RUBY_FAKEGEM_GEMSPEC=paint.gemspec
+
+inherit ruby-fakegem
+
+DESCRIPTION="Terminal painter"
+HOMEPAGE="https://github.com/janlelis/paint"
+SRC_URI="https://github.com/janlelis/paint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test doc"
diff --git a/dev-ruby/pairing_heap/Manifest b/dev-ruby/pairing_heap/Manifest
new file mode 100644
index 000000000000..21e6162b7005
--- /dev/null
+++ b/dev-ruby/pairing_heap/Manifest
@@ -0,0 +1,2 @@
+DIST pairing_heap-3.0.1.tar.gz 16965 BLAKE2B 80200dd98676c8ee9258ef96d296a4169b56d104875368bb8401b0f7d53494e3bbff8cfc5a536bdb24d844893ebe6962af709614b399c8c56980ee578ec2740b SHA512 0d22ccd42275aec54ff6960094c7ef14ad487835ba23217882a649c66585fc6c21af8a2f27f7a0a410fba6daf157ffdae6b74f1fdd798903ac597851945dee41
+DIST pairing_heap-3.1.0.tar.gz 17034 BLAKE2B 45d093df803b02109b2f8c339ac2f138606c3f2edf6c0430acedec0691c938d9bc38ff6c822267c7bceaa0ff9537070411db1ffba2c9565aaa7427a39d9b242e SHA512 b41f11d31c92bc9946bafe9d2be9d13df2cc3b67d7266e6bc7efa1c28c4a7a1ad6f4809070ba874594beb3146cc07a928034d29fd4247f139039bf03cf0c4809
diff --git a/dev-ruby/pairing_heap/metadata.xml b/dev-ruby/pairing_heap/metadata.xml
new file mode 100644
index 000000000000..dfe26ba04abc
--- /dev/null
+++ b/dev-ruby/pairing_heap/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <longdescription>
+    Performant priority queue in pure ruby with support for changing priority using pairing heap data structure
+  </longdescription>
+  <upstream>
+    <remote-id type="github">mhib/pairing_heap</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/pairing_heap/pairing_heap-3.0.1-r1.ebuild b/dev-ruby/pairing_heap/pairing_heap-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..9e71f07dc62b
--- /dev/null
+++ b/dev-ruby/pairing_heap/pairing_heap-3.0.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="pairing_heap.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Performant priority queue with support for changing priority"
+HOMEPAGE="https://github.com/mhib/pairing_heap"
+SRC_URI="https://github.com/mhib/pairing_heap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+# We normally patch out simplecov but the test suite does not work
+# correctly without it.
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/simplecov )"
+
+all_ruby_prepare() {
+	sed -i -e '/require.*\(bundler\|standard\)/ s:^:#:' Rakefile || die
+
+	sed -e 's:_relative ": "./:' \
+		-e 's/__dir__/"."/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/pairing_heap/pairing_heap-3.1.0.ebuild b/dev-ruby/pairing_heap/pairing_heap-3.1.0.ebuild
new file mode 100644
index 000000000000..fc19294ce516
--- /dev/null
+++ b/dev-ruby/pairing_heap/pairing_heap-3.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="pairing_heap.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Performant priority queue with support for changing priority"
+HOMEPAGE="https://github.com/mhib/pairing_heap"
+SRC_URI="https://github.com/mhib/pairing_heap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+# We normally patch out simplecov but the test suite does not work
+# correctly without it.
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/simplecov )"
+
+all_ruby_prepare() {
+	sed -i -e '/require.*\(bundler\|standard\)/ s:^:#:' Rakefile || die
+
+	sed -e 's:_relative ": "./:' \
+		-e 's/__dir__/"."/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/parallel/Manifest b/dev-ruby/parallel/Manifest
index 746d76f3790a..adc556b648f1 100644
--- a/dev-ruby/parallel/Manifest
+++ b/dev-ruby/parallel/Manifest
@@ -1,3 +1,2 @@
-DIST parallel-1.21.0.tar.gz 21772 BLAKE2B 307d097629faf5c1967c0f189dc9703df481c763736242856c594dd99975193d81331654580ecce97b675591f8d9c543a2ccc769966d91ceb1ded7c3ec949ac9 SHA512 cd0bce1abe2cd53015fee7f8080e05bbcd80798fe0a6fa0e120776018a382260bd070d1a14085ef3e6d7fb16a79c6a05f438d4f8b228cce7461efe5a1395b530
-DIST parallel-1.22.0.tar.gz 23294 BLAKE2B 99bc41f132083402fe6ba9666d89941ce7672463c80676b8b558ce8a6915e996a1ec1d86476ab645796db79a63160677405c525c0696306dda270a54db1c8010 SHA512 2b993890234337e8eb1b22882423c8b2d73bfe7be386a7d2c9cf4f45620f3295f7c70b630b1607995e913d2307c043db658edb41b5c95f334f64bbd178cccf20
-DIST parallel-1.22.1.tar.gz 23294 BLAKE2B 11a3f902f8a6813b407035088adaf76fda5f27e0e33e7f210ce28fc66f4edf4f8d92a8b0f9501d24013a527f4205b79c6eda2c31f6fa4a646a18e6da5b20e702 SHA512 f106ac605a5998d0e5a43b7863f8400e49270c06e55b6342a84fed788e1e854a26a5e29ec31da9d96a4d403227d002691e27786c25e8d7542f3877bf097e55ad
+DIST parallel-1.23.0.tar.gz 23359 BLAKE2B f7c505484a8ebade97efb61eb18474625ee994e3a4a16e85b264988212e3de093ae7b8cb03de2a6f97f8205b41264b72c13f32d81ed9ddcd2241d3aab15c7564 SHA512 fd80b928ad4c34c71abb62a2e27da6bdcabb425ed68cfef190c0e9f56c853147b1c96d7e9b5ec0ef2e7909dd2303892cb293c40a170241158286f9422b6bc780
+DIST parallel-1.24.0.tar.gz 23944 BLAKE2B 9e14b8551416c74a16f34db0616c487841368b6834c6848c929e480b3bbeaa3d378c96ccb26496bdef35448e583ab8d029d84f54408a29385e6809d0f013cf71 SHA512 9b1bd00fa16cae4938642e2834c57ce71c5f51bbbec695c40107a02f1af4a1528ef27ce002f3a3290e21a6c045c739ac3844c586e4f1976ac5616d8fae03a5af
diff --git a/dev-ruby/parallel/parallel-1.21.0.ebuild b/dev-ruby/parallel/parallel-1.21.0.ebuild
deleted file mode 100644
index 7a798626bec6..000000000000
--- a/dev-ruby/parallel/parallel-1.21.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="Readme.md"
-
-RUBY_FAKEGEM_GEMSPEC="parallel.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Run any code in parallel Processes or Threads"
-HOMEPAGE="https://github.com/grosser/parallel"
-LICENSE="MIT"
-SRC_URI="https://github.com/grosser/parallel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~riscv"
-SLOT="1"
-IUSE="test"
-
-DEPEND+="test? ( sys-process/lsof sys-process/procps )"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/ruby-progressbar dev-ruby/activerecord:6.0 dev-ruby/sqlite3 )"
-
-each_ruby_prepare() {
-	# Make sure the correct ruby is used for testing
-	sed -e 's:ruby :'${RUBY}' :' -i spec/parallel_spec.rb || die
-}
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/ s:^:#:' \
-		-e '1i require "tempfile"; gem "activerecord", "~>6.0.0"' spec/cases/helper.rb || die
-	sed -i -e '3irequire "timeout"' spec/spec_helper.rb || die
-
-	# Avoid fragile ar sqlite tests. They throw ReadOnly errors every now and then.
-	sed -i -e '/works with SQLite in/,/end/ s:^:#:' spec/parallel_spec.rb || die
-}
-
-each_ruby_test() {
-	# Set RUBYLIB explicitly for the ruby's that get started from the specs.
-	TRAVIS=true RUBYLIB="lib" ${RUBY} -S rspec-3 spec || die
-}
diff --git a/dev-ruby/parallel/parallel-1.22.0.ebuild b/dev-ruby/parallel/parallel-1.22.0.ebuild
deleted file mode 100644
index 7a798626bec6..000000000000
--- a/dev-ruby/parallel/parallel-1.22.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="Readme.md"
-
-RUBY_FAKEGEM_GEMSPEC="parallel.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Run any code in parallel Processes or Threads"
-HOMEPAGE="https://github.com/grosser/parallel"
-LICENSE="MIT"
-SRC_URI="https://github.com/grosser/parallel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~riscv"
-SLOT="1"
-IUSE="test"
-
-DEPEND+="test? ( sys-process/lsof sys-process/procps )"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/ruby-progressbar dev-ruby/activerecord:6.0 dev-ruby/sqlite3 )"
-
-each_ruby_prepare() {
-	# Make sure the correct ruby is used for testing
-	sed -e 's:ruby :'${RUBY}' :' -i spec/parallel_spec.rb || die
-}
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/ s:^:#:' \
-		-e '1i require "tempfile"; gem "activerecord", "~>6.0.0"' spec/cases/helper.rb || die
-	sed -i -e '3irequire "timeout"' spec/spec_helper.rb || die
-
-	# Avoid fragile ar sqlite tests. They throw ReadOnly errors every now and then.
-	sed -i -e '/works with SQLite in/,/end/ s:^:#:' spec/parallel_spec.rb || die
-}
-
-each_ruby_test() {
-	# Set RUBYLIB explicitly for the ruby's that get started from the specs.
-	TRAVIS=true RUBYLIB="lib" ${RUBY} -S rspec-3 spec || die
-}
diff --git a/dev-ruby/parallel/parallel-1.22.1.ebuild b/dev-ruby/parallel/parallel-1.22.1.ebuild
deleted file mode 100644
index 74f033fe71cd..000000000000
--- a/dev-ruby/parallel/parallel-1.22.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="Readme.md"
-
-RUBY_FAKEGEM_GEMSPEC="parallel.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Run any code in parallel Processes or Threads"
-HOMEPAGE="https://github.com/grosser/parallel"
-LICENSE="MIT"
-SRC_URI="https://github.com/grosser/parallel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~riscv"
-SLOT="1"
-IUSE="test"
-
-DEPEND+="test? ( sys-process/lsof sys-process/procps )"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/ruby-progressbar dev-ruby/activerecord[sqlite] )"
-
-each_ruby_prepare() {
-	# Make sure the correct ruby is used for testing
-	sed -e 's:ruby :'${RUBY}' :' -i spec/parallel_spec.rb || die
-}
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/ s:^:#:' \
-		-e '1i require "tempfile"' spec/cases/helper.rb || die
-	sed -i -e '3irequire "timeout"' spec/spec_helper.rb || die
-
-	# Avoid fragile ar sqlite tests. They throw ReadOnly errors every now and then.
-	sed -i -e '/works with SQLite in/,/end/ s:^:#:' spec/parallel_spec.rb || die
-}
-
-each_ruby_test() {
-	# Set RUBYLIB explicitly for the ruby's that get started from the specs.
-	TRAVIS=true RUBYLIB="lib" ${RUBY} -S rspec-3 spec || die
-}
diff --git a/dev-ruby/parallel/parallel-1.23.0.ebuild b/dev-ruby/parallel/parallel-1.23.0.ebuild
new file mode 100644
index 000000000000..99e9eac66f1e
--- /dev/null
+++ b/dev-ruby/parallel/parallel-1.23.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="Readme.md"
+
+RUBY_FAKEGEM_GEMSPEC="parallel.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Run any code in parallel Processes or Threads"
+HOMEPAGE="https://github.com/grosser/parallel"
+SRC_URI="https://github.com/grosser/parallel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="amd64 ~riscv"
+
+DEPEND+="test? ( sys-process/lsof sys-process/procps )"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/ruby-progressbar )
+"
+
+# Rails isn't yet ruby32-ready in Gentoo
+USE_RUBY="ruby30 ruby31" ruby_add_bdepend "
+	test? ( dev-ruby/activerecord[sqlite] )
+"
+
+each_ruby_prepare() {
+	# Make sure the correct ruby is used for testing
+	sed -e 's:ruby :'${RUBY}' :' -i spec/parallel_spec.rb || die
+}
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' \
+		-e '1i require "tempfile"' spec/cases/helper.rb || die
+	sed -i -e '3irequire "timeout"' spec/spec_helper.rb || die
+
+	# Avoid fragile ar sqlite tests. They throw ReadOnly errors every now and then.
+	sed -i -e '/works with SQLite in/,/end/ s:^:#:' spec/parallel_spec.rb || die
+}
+
+each_ruby_test() {
+	if ! has_version -b "dev-ruby/activerecord[sqlite]" ; then
+		rm spec/cases/map_with_ar.rb spec/cases/each_with_ar_sqlite.rb || die
+	fi
+
+	# Set RUBYLIB explicitly for the ruby's that get started from the specs.
+	TRAVIS=true RUBYLIB="lib" ${RUBY} -S rspec-3 spec || die
+}
diff --git a/dev-ruby/parallel/parallel-1.24.0.ebuild b/dev-ruby/parallel/parallel-1.24.0.ebuild
new file mode 100644
index 000000000000..28bfb2ad8c7d
--- /dev/null
+++ b/dev-ruby/parallel/parallel-1.24.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="Readme.md"
+
+RUBY_FAKEGEM_GEMSPEC="parallel.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Run any code in parallel Processes or Threads"
+HOMEPAGE="https://github.com/grosser/parallel"
+SRC_URI="https://github.com/grosser/parallel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~riscv"
+
+DEPEND+="test? ( sys-process/lsof sys-process/procps )"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/ruby-progressbar )
+"
+
+# Rails isn't yet ruby32-ready in Gentoo
+USE_RUBY="ruby30 ruby31" ruby_add_bdepend "
+	test? ( dev-ruby/activerecord[sqlite] )
+"
+
+each_ruby_prepare() {
+	# Make sure the correct ruby is used for testing
+	sed -e 's:ruby :'${RUBY}' :' -i spec/parallel_spec.rb || die
+}
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' \
+		-e '1i require "tempfile"' spec/cases/helper.rb || die
+	sed -i -e '3irequire "timeout"' spec/spec_helper.rb || die
+
+	# Avoid fragile ar sqlite tests. They throw ReadOnly errors every now and then.
+	sed -i -e '/works with SQLite in/,/end/ s:^:#:' spec/parallel_spec.rb || die
+}
+
+each_ruby_test() {
+	if ! has_version -b "dev-ruby/activerecord[sqlite]" ; then
+		rm spec/cases/map_with_ar.rb spec/cases/each_with_ar_sqlite.rb || die
+	fi
+
+	# Set RUBYLIB explicitly for the ruby's that get started from the specs.
+	TRAVIS=true RUBYLIB="lib" ${RUBY} -S rspec-3 spec || die
+}
diff --git a/dev-ruby/paramesan/Manifest b/dev-ruby/paramesan/Manifest
index f8cf0d87bf5d..c629fdfe873d 100644
--- a/dev-ruby/paramesan/Manifest
+++ b/dev-ruby/paramesan/Manifest
@@ -1,2 +1 @@
-DIST paramesan-0.1.1.tgz 4064 BLAKE2B f6c0e8b0df885e9dda4d5c2a3f0226703a94237707b877a7b82d5b8b0fdc812fcf289019a1ed550640a7f99a59a0b0389407857bc0e21987c7dd734734d32c0d SHA512 927595ed9686fb8833beaabf4421cb2c4908bf6e2e1c656034a79c839c292b503ca0ae211f8bdd3916501a281eb2f0b374fc5f4c90615629170e1ba767f0e7fc
 DIST paramesan-1.0.1.tgz 4981 BLAKE2B 3447281084a1d79d46f2a8b80c9b6d2ee63d9ef245e07ef07799a2ab2c730a1f99075bfb5c632c409fe412e277cfe354c8e59e99ffd38c2f1d671b7db3ace34a SHA512 6353006a26e8a7d4790d8bee88e4968df6d79ebca1f0855262eee1679789dfe1404fc345f6965377d5eadf03b88b9b8e1764a84065dde312d29fc0bae323b8a0
diff --git a/dev-ruby/paramesan/paramesan-0.1.1.ebuild b/dev-ruby/paramesan/paramesan-0.1.1.ebuild
deleted file mode 100644
index 2339e07e4fdc..000000000000
--- a/dev-ruby/paramesan/paramesan-0.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="paramesan.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parameterized tests in Ruby"
-HOMEPAGE="https://github.com/jpace/paramesan"
-
-SRC_URI="https://github.com/jpace/paramesan/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/paramesan/paramesan-1.0.1-r1.ebuild b/dev-ruby/paramesan/paramesan-1.0.1-r1.ebuild
index 66f65e8f38cf..be3439c7fccd 100644
--- a/dev-ruby/paramesan/paramesan-1.0.1-r1.ebuild
+++ b/dev-ruby/paramesan/paramesan-1.0.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jpace/paramesan/archive/v${PV}.tar.gz -> ${P}.tgz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/paramesan/paramesan-1.0.1.ebuild b/dev-ruby/paramesan/paramesan-1.0.1.ebuild
deleted file mode 100644
index f0490b557b7e..000000000000
--- a/dev-ruby/paramesan/paramesan-1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="paramesan.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parameterized tests in Ruby"
-HOMEPAGE="https://github.com/jpace/paramesan"
-
-SRC_URI="https://github.com/jpace/paramesan/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index c40362968e76..265f2c86f132 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -1,5 +1,4 @@
-DIST parser-2.7.2.0.tar.gz 266318 BLAKE2B 5bb3e4649eeccaa4a72fb2478755185a749b28f53898b361d5a6f35a57eb9cfbddeb149cd4a793243e60b7421966662992c2ebd6e42298e0f5828a1a7fb43e47 SHA512 e9754d6d334115fb272c3df0a6620da0b0a014aa7c49914556d72259a11229a6c71f797cfa814c87eec052097c2f6e3cc18adf50cc30690549c74b57733f0c72
-DIST parser-3.0.3.2.tar.gz 285975 BLAKE2B 3772e78d3e92469940c21b9167d9bc5bb7a31d4ddd74c3872d99c5de7fc12b59cda72209f0983758e81259f2effdd6f5221a71dd24f0e19351485bf41c2bcb7e SHA512 c2f6f822d9a60fb038b66fb44e8bc6339ca9329865e3a2c4bb05ee8db80826df7f96766b661d94156c6e4bcc3d5d4fc3624a4e1373a8919ad19ef1a1acd41797
-DIST parser-3.1.0.0.tar.gz 287924 BLAKE2B 042f325c12718a8d05dbbe1052cf3792bfab5421a0eb279b81b7c4e3ab9584e4f806de6823f9a74c47e81a949d676d2f903b77ceb5369a656b6047dd9856333d SHA512 68191906b6fd7183233875da3ba4937d3e90c491ffeec451048d3dbee6c0c979eb50b474135f57cd6fd9a42abb6629668b97eec00a4879760a362d1cc5bb38a3
-DIST parser-3.1.1.0.tar.gz 299759 BLAKE2B c4fdf278c1ae90529de414d9cda2770524f051f05d457ebe3224c49a84c55abfe8ac11799b0caf4d74200c4be494c3f655ed7f9c03e11d198436a7f54bec77ce SHA512 9c51aaa7d19e4a679d9d4c40716a90ef4c15d22728a21a8a4c278245114cd8cdeace19018d54dbb73b77897d531f3eb446b99c6dfaf9e205aa54346933ada215
-DIST parser-3.1.2.0.tar.gz 299753 BLAKE2B b5c991ab0834ed5e5b7107935500659828a6f804d9231462dc8a658346bab3959ac56b514045c25af4adb84af3f0cdd9615c9aafb2325ab24a04c0c5617ca732 SHA512 d8becf7e5b633c0a1ddfe8aac98c2f89d6b713cbabd2877a4eac36b0fd4935bd1a05990c100bcf58f04ad78218af0a5f79dbb83bf369708750c8834598286cfa
+DIST parser-3.2.2.4.tar.gz 315784 BLAKE2B 4dadbc75ef6f3b7598d7e51222bac37cdbcb0ef2c9d156f910080d2f1a77ec568d34f57198f54e261ffc97faf0fffcd0d9f84f0710e1fbb31ac680cf08764608 SHA512 dc755f4acf9bdbe9312e622eaae96e44efd5a4db5e9cb31cc93ca225b5e8f8cb7f9bb408225ceeaa63d543a9f47e89aba00d1b1353a558ab53219f4611d19955
+DIST parser-3.3.0.3.tar.gz 318017 BLAKE2B 3322de46055839d6be751914c4d1cf020ed6a62795432427aac2c267df2a46af5e970e757ee4d7d357660d65fc14fbc143239f33a6f83905f9457c5eda523e13 SHA512 8248009f285b727b029596c931f067b14e5e5811c940dbdce41155ea2489c0a348a4f4a425cc0af7c1bcea5fafbdfa48fd97ef448be3092a879abfcfd2c2438c
+DIST parser-3.3.0.4.tar.gz 329872 BLAKE2B 966c5fc12b2b4ba9fa94b93d2f9b0fd1f18d1f1f5d2fe80299099f04dc28874e0b9a1235bdd2ccc5e2bbb5b4033529a24721337cba9bedf23843109adf19f928 SHA512 c3ffca4978b3f156663a3cac72c9629107a92e2a40dd2dbdea4d14a72d9b48af832b33fad0bc81707f0c8e49e14ac9e3f832c02d94c424db17aee9009fb79386
+DIST parser-3.3.0.5.tar.gz 329827 BLAKE2B 6e7872134d6591a378192d12424a9314a3fe580c187db8e1adcf75a377acd4dd12389222d25a044b8fc22df4c3a251796bb8bf073a1ac6f6130f5709c25ef9f4 SHA512 ef6c9eed9ffc42e1cbee662bc1305bd2ce28ba8e7a06d3c77ecdb07fb6244ea65d2b402bd2cd7cf49af3336976e81d288caf0e1da144d837e36b25dc406ee81d
diff --git a/dev-ruby/parser/parser-2.7.2.0-r1.ebuild b/dev-ruby/parser/parser-2.7.2.0-r1.ebuild
deleted file mode 100644
index 9572def45868..000000000000
--- a/dev-ruby/parser/parser-2.7.2.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
-
-RUBY_FAKEGEM_GEMSPEC="parser.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
-HOMEPAGE="https://github.com/whitequark/parser"
-SRC_URI="https://github.com/whitequark/parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5
-		dev-ruby/racc )
-	dev-ruby/cliver
-"
-ruby_add_rdepend "=dev-ruby/ast-2.4* >=dev-ruby/ast-2.4.1"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake generate || die
-}
diff --git a/dev-ruby/parser/parser-3.0.3.2.ebuild b/dev-ruby/parser/parser-3.0.3.2.ebuild
deleted file mode 100644
index 70d2b1439d34..000000000000
--- a/dev-ruby/parser/parser-3.0.3.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
-
-RUBY_FAKEGEM_GEMSPEC="parser.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
-HOMEPAGE="https://github.com/whitequark/parser"
-SRC_URI="https://github.com/whitequark/parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5
-		dev-ruby/racc )
-	dev-ruby/cliver
-"
-ruby_add_rdepend "=dev-ruby/ast-2.4* >=dev-ruby/ast-2.4.1"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake generate || die
-}
diff --git a/dev-ruby/parser/parser-3.1.0.0.ebuild b/dev-ruby/parser/parser-3.1.0.0.ebuild
deleted file mode 100644
index 0bc9672c1a19..000000000000
--- a/dev-ruby/parser/parser-3.1.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
-
-RUBY_FAKEGEM_GEMSPEC="parser.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
-HOMEPAGE="https://github.com/whitequark/parser"
-SRC_URI="https://github.com/whitequark/parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5
-		dev-ruby/racc )
-	dev-ruby/cliver
-"
-ruby_add_rdepend "=dev-ruby/ast-2.4* >=dev-ruby/ast-2.4.1"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake generate || die
-}
diff --git a/dev-ruby/parser/parser-3.1.1.0.ebuild b/dev-ruby/parser/parser-3.1.1.0.ebuild
deleted file mode 100644
index 0bc9672c1a19..000000000000
--- a/dev-ruby/parser/parser-3.1.1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
-
-RUBY_FAKEGEM_GEMSPEC="parser.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
-HOMEPAGE="https://github.com/whitequark/parser"
-SRC_URI="https://github.com/whitequark/parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5
-		dev-ruby/racc )
-	dev-ruby/cliver
-"
-ruby_add_rdepend "=dev-ruby/ast-2.4* >=dev-ruby/ast-2.4.1"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake generate || die
-}
diff --git a/dev-ruby/parser/parser-3.1.2.0.ebuild b/dev-ruby/parser/parser-3.1.2.0.ebuild
deleted file mode 100644
index 0bc9672c1a19..000000000000
--- a/dev-ruby/parser/parser-3.1.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
-
-RUBY_FAKEGEM_GEMSPEC="parser.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
-HOMEPAGE="https://github.com/whitequark/parser"
-SRC_URI="https://github.com/whitequark/parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5
-		dev-ruby/racc )
-	dev-ruby/cliver
-"
-ruby_add_rdepend "=dev-ruby/ast-2.4* >=dev-ruby/ast-2.4.1"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake generate || die
-}
diff --git a/dev-ruby/parser/parser-3.2.2.4.ebuild b/dev-ruby/parser/parser-3.2.2.4.ebuild
new file mode 100644
index 000000000000..ae52a5886cef
--- /dev/null
+++ b/dev-ruby/parser/parser-3.2.2.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
+
+RUBY_FAKEGEM_GEMSPEC="parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
+HOMEPAGE="https://github.com/whitequark/parser"
+SRC_URI="https://github.com/whitequark/parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/minitest:5 )
+	dev-ruby/cliver
+"
+ruby_add_rdepend "=dev-ruby/ast-2.4* >=dev-ruby/ast-2.4.1 dev-ruby/racc"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake generate || die
+}
diff --git a/dev-ruby/parser/parser-3.3.0.3.ebuild b/dev-ruby/parser/parser-3.3.0.3.ebuild
new file mode 100644
index 000000000000..48b258f91620
--- /dev/null
+++ b/dev-ruby/parser/parser-3.3.0.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
+
+RUBY_FAKEGEM_GEMSPEC="parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
+HOMEPAGE="https://github.com/whitequark/parser"
+SRC_URI="https://github.com/whitequark/parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc"
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/minitest:5 )
+	dev-ruby/cliver
+"
+ruby_add_rdepend "=dev-ruby/ast-2.4* >=dev-ruby/ast-2.4.1 dev-ruby/racc"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake generate || die
+}
diff --git a/dev-ruby/parser/parser-3.3.0.4.ebuild b/dev-ruby/parser/parser-3.3.0.4.ebuild
new file mode 100644
index 000000000000..48b258f91620
--- /dev/null
+++ b/dev-ruby/parser/parser-3.3.0.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
+
+RUBY_FAKEGEM_GEMSPEC="parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
+HOMEPAGE="https://github.com/whitequark/parser"
+SRC_URI="https://github.com/whitequark/parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc"
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/minitest:5 )
+	dev-ruby/cliver
+"
+ruby_add_rdepend "=dev-ruby/ast-2.4* >=dev-ruby/ast-2.4.1 dev-ruby/racc"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake generate || die
+}
diff --git a/dev-ruby/parser/parser-3.3.0.5.ebuild b/dev-ruby/parser/parser-3.3.0.5.ebuild
new file mode 100644
index 000000000000..0d50425d80a7
--- /dev/null
+++ b/dev-ruby/parser/parser-3.3.0.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
+
+RUBY_FAKEGEM_GEMSPEC="parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
+HOMEPAGE="https://github.com/whitequark/parser"
+SRC_URI="https://github.com/whitequark/parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc"
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/minitest:5 )
+	dev-ruby/cliver
+"
+ruby_add_rdepend "=dev-ruby/ast-2.4* >=dev-ruby/ast-2.4.1 dev-ruby/racc"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake generate || die
+}
diff --git a/dev-ruby/pastel/pastel-0.8.0-r1.ebuild b/dev-ruby/pastel/pastel-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..372c20ae05ff
--- /dev/null
+++ b/dev-ruby/pastel/pastel-0.8.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="pastel.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Terminal strings styling with intuitive and clean API"
+HOMEPAGE="https://github.com/piotrmurach/pastel"
+SRC_URI="https://github.com/piotrmurach/pastel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/tty-color-0.5:0
+"
+
+all_ruby_prepare() {
+	echo '-rspec_helper' > .rspec || die
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/pastel/pastel-0.8.0.ebuild b/dev-ruby/pastel/pastel-0.8.0.ebuild
index cb69ad547087..1729283a9c9f 100644
--- a/dev-ruby/pastel/pastel-0.8.0.ebuild
+++ b/dev-ruby/pastel/pastel-0.8.0.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_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/path_expander/Manifest b/dev-ruby/path_expander/Manifest
index 13653294f35d..ae36185b00fc 100644
--- a/dev-ruby/path_expander/Manifest
+++ b/dev-ruby/path_expander/Manifest
@@ -1 +1 @@
-DIST path_expander-1.1.0.gem 13312 BLAKE2B dca42a0e995d7ef87cef3dd26251ce378df33db557c5089b58f1130ed4c61b5521012198e381853c3583601d990aeff3a8463393e89e891b2ca9c923831ba31d SHA512 eebcd1caafba5c40512cc0c6e3419137fc169215d2eac77914419d9f3a6e200350d742b13953b2dbbdd532c9ef73e950c920017a4f178941c1e04ee832e038f7
+DIST path_expander-1.1.1.gem 13312 BLAKE2B d22b7253be821f7bf73bef48843b64356e5a4c66fb532844e4de25e9f4e01486560defda00d8cbc698a3d3b936cff742bdd3005afb32f9a41318d380d2f575cc SHA512 bd670b45bf8a265faf0ab9e845782e7bb6fa62e4360d3b5109b83b27afc54d3d372db1d0df9a098eb6935d24d29a973848c7b914b5ee0d67069ddc88c0aa79b7
diff --git a/dev-ruby/path_expander/path_expander-1.1.0.ebuild b/dev-ruby/path_expander/path_expander-1.1.0.ebuild
deleted file mode 100644
index 0d35b7ab7044..000000000000
--- a/dev-ruby/path_expander/path_expander-1.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pre-process CLI arguments expanding directories into their constituent files"
-HOMEPAGE="https://github.com/seattlerb/path_expander"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-IUSE=""
-
-all_ruby_prepare() {
-	# Fix tests depending on sort order
-	sed -i -e '/test_process_args_dir/,/^  end/ s:^:#:' \
-		-e '33 s/$/.sort/' \
-		-e '83 s/act/act.sort/' \
-		test/test_path_expander.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/path_expander/path_expander-1.1.1.ebuild b/dev-ruby/path_expander/path_expander-1.1.1.ebuild
new file mode 100644
index 000000000000..a7ddd0c6c45e
--- /dev/null
+++ b/dev-ruby/path_expander/path_expander-1.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pre-process CLI arguments expanding directories into their constituent files"
+HOMEPAGE="https://github.com/seattlerb/path_expander"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+
+all_ruby_prepare() {
+	# Fix tests depending on sort order
+	sed -i -e '/test_process_args_dir/,/^  end/ s:^:#:' \
+		-e '33 s/$/.sort/' \
+		-e '83 s/act/act.sort/' \
+		test/test_path_expander.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/pathutil/files/pathutil-0.16.2-ruby30.patch b/dev-ruby/pathutil/files/pathutil-0.16.2-ruby30.patch
new file mode 100644
index 000000000000..9bb290d4bf24
--- /dev/null
+++ b/dev-ruby/pathutil/files/pathutil-0.16.2-ruby30.patch
@@ -0,0 +1,197 @@
+https://github.com/envygeeks/pathutil/pull/5
+
+From 3451a10c362fc867b20c7e471a551b31c40a0246 Mon Sep 17 00:00:00 2001
+From: Tom Dunlap <tom@motevets.com>
+Date: Tue, 9 Jun 2020 12:59:32 -0400
+Subject: [PATCH] Fix ruby keyword parameter deprecation warnings
+
+In ruby 2.7, using the last argument as keyword parameters became
+deprecated in preparation for ruby 3.0. When running the tests, we saw
+numerous deprecation warnings. This commit fixes up those deprecation
+warnings by explicitly passing the last argument(s) as keyword
+argument(s).
+
+See: https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/
+
+Fixes #4
+
+Side note: this commit did not fix the `#binread` method because it was
+untested, and when attempting to add tests, we got the following failing
+test:
+
+```
+1) Pathutil#binread when set to normalize should use encode to convert CRLF to LF
+   Failure/Error:
+     File.binread(self, *args, kwd).encode({
+       :universal_newline => true
+     })
+
+   TypeError:
+     no implicit conversion of Hash into Integer
+   # ./lib/pathutil.rb:509:in `binread'
+   # ./lib/pathutil.rb:509:in `binread'
+   # ./spec/tests/lib/pathutil_spec.rb:943:in `block (4 levels) in <top (required)>'
+```
+
+...which appears to be occuring because of an interface mismatch as
+`IO#binread` does not take keyword arguments.
+
+https://ruby-doc.org/core-2.7.1/IO.html#method-c-binread
+---
+ lib/pathutil.rb                         | 36 ++++++++-----------------
+ spec/tests/lib/pathutil/helpers_spec.rb |  4 +--
+ spec/tests/lib/pathutil_spec.rb         | 13 +++------
+ 3 files changed, 16 insertions(+), 37 deletions(-)
+
+diff --git a/lib/pathutil.rb b/lib/pathutil.rb
+index 1a15873..80913f2 100644
+--- a/lib/pathutil.rb
++++ b/lib/pathutil.rb
+@@ -456,14 +456,10 @@ def safe_copy(to, root: nil, ignore: [])
+     to   = self.class.new(to)
+ 
+     if directory?
+-      safe_copy_directory(to, {
+-        :root => root, :ignore => ignore
+-      })
++      safe_copy_directory(to, root: root, ignore: ignore)
+ 
+     else
+-      safe_copy_file(to, {
+-        :root => root
+-      })
++      safe_copy_file(to, root: root)
+     end
+   end
+ 
+@@ -494,14 +490,10 @@ def read(*args, **kwd)
+     kwd[:encoding] ||= encoding
+ 
+     if normalize[:read]
+-      File.read(self, *args, kwd).encode({
+-        :universal_newline => true
+-      })
++      File.read(self, *args, **kwd).encode(universal_newline: true)
+ 
+     else
+-      File.read(
+-        self, *args, kwd
+-      )
++      File.read(self, *args, **kwd)
+     end
+   end
+ 
+@@ -534,13 +526,13 @@ def readlines(*args, **kwd)
+     kwd[:encoding] ||= encoding
+ 
+     if normalize[:read]
+-      File.readlines(self, *args, kwd).encode({
++      File.readlines(self, *args, **kwd).encode({
+         :universal_newline => true
+       })
+ 
+     else
+       File.readlines(
+-        self, *args, kwd
++        self, *args, **kwd
+       )
+     end
+   end
+@@ -556,11 +548,11 @@ def write(data, *args, **kwd)
+     if normalize[:write]
+       File.write(self, data.encode(
+         :crlf_newline => true
+-      ), *args, kwd)
++      ), *args, **kwd)
+ 
+     else
+       File.write(
+-        self, data, *args, kwd
++        self, data, *args, **kwd
+       )
+     end
+   end
+@@ -670,9 +662,7 @@ def expanded_paths(path)
+   private
+   def safe_copy_file(to, root: nil)
+     raise Errno::EPERM, "#{self} not in #{root}" unless in_path?(root)
+-    FileUtils.cp(self, to, {
+-      :preserve => true
+-    })
++    FileUtils.cp(self, to, preserve: true)
+   end
+ 
+   # --
+@@ -697,15 +687,11 @@ def safe_copy_directory(to, root: nil, ignore: [])
+             }"
+ 
+           elsif file.file?
+-            FileUtils.cp(file, to, {
+-              :preserve => true
+-            })
++            FileUtils.cp(file, to, preserve: true)
+ 
+           else
+             path = file.realpath
+-            path.safe_copy(to.join(file.basename), {
+-              :root => root, :ignore => ignore
+-            })
++            path.safe_copy(to.join(file.basename), root: root, ignore: ignore)
+           end
+         end
+       end
+diff --git a/spec/tests/lib/pathutil/helpers_spec.rb b/spec/tests/lib/pathutil/helpers_spec.rb
+index 4d64d0a..0dfbc00 100644
+--- a/spec/tests/lib/pathutil/helpers_spec.rb
++++ b/spec/tests/lib/pathutil/helpers_spec.rb
+@@ -76,9 +76,7 @@
+           #
+ 
+           after do
+-            described_class.load_yaml("hello: world", {
+-              :aliases => true
+-            })
++            described_class.load_yaml("hello: world", aliases: true)
+           end
+         end
+ 
+diff --git a/spec/tests/lib/pathutil_spec.rb b/spec/tests/lib/pathutil_spec.rb
+index 784a16b..0ee7a12 100644
+--- a/spec/tests/lib/pathutil_spec.rb
++++ b/spec/tests/lib/pathutil_spec.rb
+@@ -944,9 +944,7 @@
+ 
+     context "with an encoding argument" do
+       before do
+-        file.write("hello", {
+-          :encoding => "ASCII"
+-        })
++        file.write("hello", encoding: "ASCII")
+       end
+ 
+       #
+@@ -1050,11 +1048,10 @@
+           name1.join(name2.basename, name1.basename).touch
+           name1.join(name1.basename).touch
+ 
+-          name1.safe_copy(name2, {
+-            :root => tmpdir1, :ignore => [
++          name1.safe_copy(name2, root: tmpdir1, ignore: [
+               name1.join(name2.basename, name1.basename)
+             ]
+-          })
++          )
+         end
+ 
+         #
+@@ -1077,9 +1074,7 @@
+           name1.join(name2.basename, name1.basename).touch
+           name1.join(name1.basename).touch
+ 
+-          name1.safe_copy(name2, {
+-            :root => tmpdir1
+-          })
++          name1.safe_copy(name2, root: tmpdir1)
+         end
+ 
+         #
diff --git a/dev-ruby/pathutil/files/pathutil-0.16.2-ruby31.patch b/dev-ruby/pathutil/files/pathutil-0.16.2-ruby31.patch
new file mode 100644
index 000000000000..0bfc4c5919b5
--- /dev/null
+++ b/dev-ruby/pathutil/files/pathutil-0.16.2-ruby31.patch
@@ -0,0 +1,247 @@
+https://github.com/envygeeks/pathutil/pull/7
+
+From c0ecc9a516ed43facfb3a80735034c892d517d1a Mon Sep 17 00:00:00 2001
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sun, 3 Apr 2022 20:20:44 +0200
+Subject: [PATCH 1/2] Fix usage of YAML.safe_load for compatibility with Ruby
+ >=2.4
+
+YAML.safe_load in Ruby 3.1.1 doesn't accept deprecated positional parameters anymore:
+
+  1) Pathutil::Helpers#load_yaml should be able to parse YAML
+     Failure/Error:
+       YAML.safe_load(
+         data,
+         whitelist_classes,
+         whitelist_symbols,
+         aliases
+       )
+
+     ArgumentError:
+       wrong number of arguments (given 4, expected 1)
+     # ./lib/pathutil/helpers.rb:44:in `load_yaml'
+     # ./spec/tests/lib/pathutil/helpers_spec.rb:25:in `block (3 levels) in <top (required)>'
+
+From 868efe4022f944cef81b05ae01e00fab2d51ee5c Mon Sep 17 00:00:00 2001
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sun, 3 Apr 2022 20:35:50 +0200
+Subject: [PATCH 2/2] Remove deprecated SafeYAML support
+
+SafeYAML has been deprecated a very long time ago.
+--- a/Gemfile
++++ b/Gemfile
+@@ -7,7 +7,6 @@ gem "rake", :require => false
+ gemspec
+ 
+ group :test do
+-  gem "safe_yaml", :require => false
+   gem "luna-rspec-formatters", :require => false
+   gem "simplecov", :require => false
+ end
+--- a/README.md
++++ b/README.md
+@@ -26,7 +26,7 @@ but only if they originate from the given root.
+ - `>=`, `>` - Check if a file is in but ahead of a path: `Pathutil.new("/tmp/hello") > "/tmp" # => true`
+ - `in_path?` - Check if a file is within a given path: `Pathutil.new("/tmp/hello").in_path?("/tmp") # => true`
+ - `<=`, `<` - Check if a file is in but below a path: `Pathutil.new("/tmp") < "/tmp/hello" # => true`
+-- `read_yaml` - a wrapper around `Yaml.safe_load` and `SafeYAML` to make reading `YAML` easy.
++- `read_yaml` - a wrapper around `Yaml.safe_load` to make reading `YAML` easy.
+ - `children` - behaves like Pathname, except it accepts a block to work on the path.
+ - `safe_copy` - Copy files, disallowing symlinks unless `in_path?`
+ - `enforce_root` - Force a root if not already in that root.
+--- a/benchmark/yaml.rb
++++ /dev/null
+@@ -1,16 +0,0 @@
+-# Frozen-string-literal: true
+-# Copyright: 2015 - 2017 Jordon Bedwell - MIT License
+-# Encoding: utf-8
+-
+-require "bundler/setup"
+-require "safe_yaml/load"
+-require "benchmark/ips"
+-require "pathutil"
+-
+-data = "hello: world\nworld: hello"
+-Benchmark.ips :quiet => true do |x|
+-  x.json! "benchmark.json"
+-  x.report("A:SafeYAML.load") { SafeYAML.load(data) }
+-  x.report("B:Pathutil::Helpers.load_yaml") { Pathutil::Helpers.load_yaml(data) }
+-  x.compare!
+-end
+--- a/lib/pathutil/helpers.rb
++++ b/lib/pathutil/helpers.rb
+@@ -20,7 +20,7 @@ class Pathutil
+     end
+ 
+     # --
+-    # Wraps around YAML and SafeYAML to provide alternatives to Rubies.
++    # Wraps around YAMLto provide alternatives to Rubies.
+     # @note We default aliases to yes so we can detect if you explicit true.
+     # @return Hash
+     # --
+@@ -34,20 +34,12 @@ class Pathutil
+         )
+       end
+ 
+-      if !YAML.respond_to?(:safe_load)
+-        setup_safe_yaml whitelist_classes, aliases
+-        SafeYAML.load(
+-          data
+-        )
+-
+-      else
+-        YAML.safe_load(
+-          data,
+-          whitelist_classes,
+-          whitelist_symbols,
+-          aliases
+-        )
+-      end
++      YAML.safe_load(
++        data,
++        permitted_classes: whitelist_classes,
++        permitted_symbols: whitelist_symbols,
++        aliases: aliases
++      )
+     end
+ 
+     # --
+@@ -109,21 +101,5 @@ class Pathutil
+         prefix, ext || ""
+       ]
+     end
+-
+-    # --
+-    # Wrap around, cleanup, deprecate and use SafeYAML.
+-    # rubocop:enable Style/ParallelAssignment
+-    # --
+-    private
+-    def setup_safe_yaml(whitelist_classes, aliases)
+-      warn "WARN: SafeYAML does not support disabling  of aliases." if aliases && aliases != :yes
+-      warn "WARN: SafeYAML will be removed when Ruby 2.0 goes EOL."
+-      require "safe_yaml/load"
+-
+-      SafeYAML.restore_defaults!
+-      whitelist_classes.map(&SafeYAML.method(
+-        :whitelist_class!
+-      ))
+-    end
+   end
+ end
+--- a/spec/tests/lib/pathutil/helpers_spec.rb
++++ b/spec/tests/lib/pathutil/helpers_spec.rb
+@@ -26,113 +26,10 @@ describe Pathutil::Helpers do
+         "hello" => "world"
+       })
+     end
++  end
+ 
+     #
+ 
+-    context "when safe" do
+-      it "should reject any special classes", :disable => :oldest_ruby do
+-        expect { described_class.load_yaml(":hello: :world") }.to raise_error(
+-          Psych::DisallowedClass
+-        )
+-      end
+-
+-      #
+-
+-      context "when using SafeYAML" do
+-        before do
+-          allow(YAML).to receive(:respond_to?).with(:safe_load).and_return(false)
+-          expect_any_instance_of(described_class).to receive(:warn).and_return(
+-            nil
+-          )
+-        end
+-
+-        #
+-
+-        context do
+-          it "should warn it's deprecated" do
+-            expect(described_class).to receive(:warn).and_return(
+-              nil
+-            )
+-          end
+-
+-          #
+-
+-          after do
+-            described_class.load_yaml(
+-              ":hello: :world"
+-            )
+-          end
+-        end
+-
+-        #
+-
+-        context "when trying to disable aliases" do
+-          it "should warn that you cannot disable them in SafeYAML" do
+-            expect(described_class).to receive(:warn).exactly(2).times.and_return(
+-              nil
+-            )
+-          end
+-
+-          #
+-
+-          after do
+-            described_class.load_yaml("hello: world", aliases: true)
+-          end
+-        end
+-
+-        #
+-
+-        it "should parse with SafeYAML" do
+-          expect(described_class.load_yaml(":hello: :world")).to eq({
+-            ":hello" => ":world"
+-          })
+-        end
+-      end
+-    end
+-
+-    #
+-
+-    context "when whitelisting classes" do
+-      it "should allow that class to be loaded" do
+-        expect(described_class.load_yaml(":hello: :world", :whitelist_classes => [Symbol])).to eq({
+-          :hello => :world
+-        })
+-      end
+-    end
+-
+-    #
+-
+-    context "when diallowing aliases" do
+-      it "should throw the parse" do
+-        yaml = "version: &version 1\nother_version: *version"
+-        expect { described_class.load_yaml(yaml, :aliases => false) }.to raise_error(
+-          Psych::BadAlias
+-        )
+-      end
+-    end
+-
+-    #
+-
+-    context do
+-      it "should allow aliases by default" do
+-        expect(described_class.load_yaml("version: &version 1\nother_version: *version")).to eq({
+-          "version" => 1, "other_version" => 1
+-        })
+-      end
+-    end
+-
+-    #
+-
+-    context do
+-      it "should parse YAML" do
+-        expect(described_class.load_yaml("hello: world\nworld: hello")).to eq({
+-          "hello" => "world",
+-          "world" => "hello"
+-        })
+-      end
+-    end
+-  end
+-
+   #
+ 
+   describe ".make_tmpname" do
diff --git a/dev-ruby/pathutil/metadata.xml b/dev-ruby/pathutil/metadata.xml
index 1e3d4cbb1b4c..e32ad2383b1f 100644
--- a/dev-ruby/pathutil/metadata.xml
+++ b/dev-ruby/pathutil/metadata.xml
@@ -6,7 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">envygeeks/pathutils</remote-id>
+    <remote-id type="github">envygeeks/pathutil</remote-id>
     <remote-id type="rubygems">pathutil</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/pathutil/pathutil-0.16.2-r2.ebuild b/dev-ruby/pathutil/pathutil-0.16.2-r2.ebuild
new file mode 100644
index 000000000000..296caa499f17
--- /dev/null
+++ b/dev-ruby/pathutil/pathutil-0.16.2-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_GEMSPEC="Gem.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Like Pathname but a little less insane"
+HOMEPAGE="https://rubygems.org/gems/pathutil https://github.com/envygeeks/pathutil"
+SRC_URI="https://github.com/envygeeks/pathutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+ruby_add_rdepend "
+	>=dev-ruby/forwardable-extended-2.6
+	<dev-ruby/forwardable-extended-3
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ruby30.patch"
+	"${FILESDIR}/${P}-ruby31.patch"
+)
+
+all_ruby_prepare() {
+	sed -i -e '/\(coverage\|luna\|rspec\/helpers\)/ s:^:#:' \
+		-e '1irequire "pathname"; require "tempfile"; require "tmpdir"; require "json" ; gem "psych", "~> 5.0"' \
+		spec/rspec/helper.rb || die
+	rm -f spec/support/coverage.rb || die
+}
diff --git a/dev-ruby/pathutil/pathutil-0.16.2.ebuild b/dev-ruby/pathutil/pathutil-0.16.2.ebuild
deleted file mode 100644
index c12850513c72..000000000000
--- a/dev-ruby/pathutil/pathutil-0.16.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="Gem.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Like Pathname but a little less insane"
-HOMEPAGE="https://rubygems.org/gems/pathutil https://github.com/envygeeks/pathutil"
-SRC_URI="https://github.com/envygeeks/pathutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/forwardable-extended-2.6
-	<dev-ruby/forwardable-extended-3"
-
-ruby_add_bdepend "test? ( dev-ruby/safe_yaml )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(coverage\|luna\|rspec\/helpers\)/ s:^:#:' \
-		-e '1irequire "pathname"; require "tempfile"; require "tmpdir"; require "json"' \
-		spec/rspec/helper.rb || die
-	rm -f spec/support/coverage.rb || die
-
-	# Avoid spec failing with newer rspec versions, bug 775383
-	sed -i -e '/should chdir before running the glob/apending' spec/tests/lib/pathutil_spec.rb || die
-}
diff --git a/dev-ruby/patron/metadata.xml b/dev-ruby/patron/metadata.xml
index 658c72b1920d..3381fedd792f 100644
--- a/dev-ruby/patron/metadata.xml
+++ b/dev-ruby/patron/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">toland/patron</remote-id> 
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/patron/patron-0.13.3-r1.ebuild b/dev-ruby/patron/patron-0.13.3-r1.ebuild
deleted file mode 100644
index c9c2afa0dd53..000000000000
--- a/dev-ruby/patron/patron-0.13.3-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/patron/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_DIR="lib/patron"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Patron is a Ruby HTTP client library based on libcurl"
-HOMEPAGE="https://toland.github.com/patron/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND+=" net-misc/curl"
-RDEPEND+=" net-misc/curl"
-
-ruby_add_bdepend "test? ( dev-ruby/rack www-servers/puma )"
-
-all_ruby_prepare() {
-	# Fix Rakefile
-	sed -i -e 's:rake/rdoctask:rdoc/task:' \
-		-e 's/README.txt/README.md/' \
-		-e '/bundler/I s:^:#:' \
-		-e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/^end/ s:^:#:' \
-		Rakefile || die
-
-	# Avoid specs with failures. We were not running any specs before.
-	rm spec/session_ssl_spec.rb spec/session_spec.rb spec/response_spec.rb || die
-}
diff --git a/dev-ruby/patron/patron-0.13.3-r2.ebuild b/dev-ruby/patron/patron-0.13.3-r2.ebuild
new file mode 100644
index 000000000000..2293e2a96eb0
--- /dev/null
+++ b/dev-ruby/patron/patron-0.13.3-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/patron/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_DIR="lib/patron"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Patron is a Ruby HTTP client library based on libcurl"
+HOMEPAGE="https://github.com/toland/patron"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND+=" net-misc/curl"
+RDEPEND+=" net-misc/curl"
+
+ruby_add_bdepend "test? ( dev-ruby/rack:2.2 www-servers/puma )"
+
+all_ruby_prepare() {
+	# Fix Rakefile
+	sed -i -e 's:rake/rdoctask:rdoc/task:' \
+		-e 's/README.txt/README.md/' \
+		-e '/bundler/I s:^:#:' \
+		-e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^end/ s:^:#:' \
+		Rakefile || die
+
+	# Avoid specs with failures. We were not running any specs before.
+	rm spec/session_ssl_spec.rb spec/session_spec.rb spec/response_spec.rb || die
+
+	# Ensure a compatible rack version
+	sed -i -e '1igem "rack", "~> 2.2.0"' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/pcaprub/Manifest b/dev-ruby/pcaprub/Manifest
index ca57801dd0ad..fc224458750d 100644
--- a/dev-ruby/pcaprub/Manifest
+++ b/dev-ruby/pcaprub/Manifest
@@ -1 +1,2 @@
 DIST pcaprub-0.13.1.gem 36864 BLAKE2B 8a0f035d2d66cb21b8314e1f855f18fa71824ffaaa3260faa90f71dbd55172701cf0105f8dce91f3107dd455b5480170a2490a2b5a13f25b46a390401fc8b8e0 SHA512 3079a5f7b29df502b5bbf0afdb7c670c9a43fbb4024163001018ebffd660597197cb0c146005f1ce027f00f2ba4c2e0430a8574cb10c4fac310a8b04411c53dd
+DIST pcaprub-0.13.2.gem 36864 BLAKE2B 1bb0f37faa0752a7cb9b5c76f071596cf11b2c52dc3d16cd1fb577d7467afff3b46a7e4bb53436677231418ed8c0f91c91970366d4040f9ddf0491e50c52dfe5 SHA512 1be60a684ead0a91bd113150ac426f86f30b906bc2a300ac334ac9cc323406e4680d9578070d9f39cb479d9a45c2e4f42c11db9ca5531f8d5dee8d1dfc01425f
diff --git a/dev-ruby/pcaprub/metadata.xml b/dev-ruby/pcaprub/metadata.xml
index 868545d71304..99d63f2af350 100644
--- a/dev-ruby/pcaprub/metadata.xml
+++ b/dev-ruby/pcaprub/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="rubygems">pcaprub</remote-id>
+		<remote-id type="github">pcaprub/pcaprub</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/pcaprub/pcaprub-0.13.1.ebuild b/dev-ruby/pcaprub/pcaprub-0.13.1.ebuild
index a2557b0dd274..db30184a51d2 100644
--- a/dev-ruby/pcaprub/pcaprub-0.13.1.ebuild
+++ b/dev-ruby/pcaprub/pcaprub-0.13.1.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="FAQ.rdoc README.rdoc USAGE.rdoc"
-
 RUBY_FAKEGEM_EXTENSIONS=(ext/pcaprub_c/extconf.rb)
-
+RUBY_FAKEGEM_TASK_TEST="test"
 inherit ruby-fakegem
 
 DESCRIPTION="Libpcap bindings for ruby compat"
@@ -21,5 +20,46 @@ KEYWORDS="~amd64 ~arm ~x86"
 DEPEND+="net-libs/libpcap"
 RDEPEND+="net-libs/libpcap"
 
-# Tests require live access to a network device as root.
-RESTRICT="test"
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rake-compiler-0.6.0
+		dev-ruby/shoulda-context
+	)
+"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/\(minitest\|shoulda-context\)/s:~>:>=:' \
+		-e '/coveralls/d' \
+		-e '/rubygems-tasks/d' \
+		-e '/gem.*git/d' \
+		Gemfile || die
+
+	sed -i \
+		-e '/rubygems\/tasks/d' \
+		-e '/Gem::Tasks/d' \
+		-e "/^require 'git'/,/end/ s/^/#/" \
+		Rakefile || die
+
+	sed -i -e '/coveralls/Id' test/test_helper.rb || die
+
+	# Tests which need escalated privileges
+	local privileged_tests=(
+		test_set_datalink
+		test_create_from_primitives
+		test_filter
+		test_pcap_stats
+		test_pcap_datalink
+		test_pcap_inject
+		test_pcap_next
+		test_pcap_setfilter
+		test_pcap_snapshot
+	)
+
+	local privileged_tests_expr=$(printf "%s\|" "${privileged_tests[@]}")
+	privileged_tests_expr="${privileged_tests_expr::-2}"
+
+	sed -i \
+		-e "/def \(${privileged_tests_expr}\)/,/^  end/s/^/#/" \
+		test/test_pcaprub_unit.rb || die
+}
diff --git a/dev-ruby/pcaprub/pcaprub-0.13.2.ebuild b/dev-ruby/pcaprub/pcaprub-0.13.2.ebuild
new file mode 100644
index 000000000000..f06aad2bf9b2
--- /dev/null
+++ b/dev-ruby/pcaprub/pcaprub-0.13.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="FAQ.rdoc README.rdoc USAGE.rdoc"
+RUBY_FAKEGEM_EXTENSIONS=(ext/pcaprub_c/extconf.rb)
+RUBY_FAKEGEM_TASK_TEST="test"
+inherit ruby-fakegem
+
+DESCRIPTION="Libpcap bindings for ruby compat"
+HOMEPAGE="https://rubygems.org/gems/pcaprub"
+
+LICENSE="LGPL-2.1"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND+="net-libs/libpcap"
+RDEPEND+="net-libs/libpcap"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rake-compiler-0.6.0
+		dev-ruby/shoulda-context
+	)
+"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/\(minitest\|shoulda-context\)/s:~>:>=:' \
+		-e '/coveralls/d' \
+		-e '/rubygems-tasks/d' \
+		-e '/gem.*git/d' \
+		Gemfile || die
+
+	sed -i \
+		-e '/rubygems\/tasks/d' \
+		-e '/Gem::Tasks/d' \
+		-e "/^require 'git'/,/end/ s/^/#/" \
+		Rakefile || die
+
+	sed -i -e '/coveralls/Id' test/test_helper.rb || die
+
+	# Tests which need escalated privileges, network interfaces or other devices
+	local privileged_tests=(
+		test_set_datalink
+		test_create_from_primitives
+		test_filter
+		test_lookupdev
+		test_lookupnet
+		test_monitor
+		test_pcap_stats
+		test_pcap_datalink
+		test_pcap_inject
+		test_pcap_next
+		test_pcap_setfilter
+		test_pcap_snapshot
+	)
+
+	local privileged_tests_expr=$(printf "%s\|" "${privileged_tests[@]}")
+	privileged_tests_expr="${privileged_tests_expr::-2}"
+
+	sed -i \
+		-e "/def \(${privileged_tests_expr}\)/,/^  end/s/^/#/" \
+		test/test_pcaprub_unit.rb || die
+}
diff --git a/dev-ruby/pdf-core/Manifest b/dev-ruby/pdf-core/Manifest
index fe4a9126cb7e..0f644c5c0ee2 100644
--- a/dev-ruby/pdf-core/Manifest
+++ b/dev-ruby/pdf-core/Manifest
@@ -1 +1,2 @@
+DIST pdf-core-0.10.0.tar.gz 51497 BLAKE2B 014c753e7adda2762862b721322679ab415b56fbadc1a82b02cf55e40eec4d1f88d3b622a2e312236187c5ec8b7d227fa4b8c73cf9fe7fb5527e8bb973b5e288 SHA512 07dbd2ea685a28933a4498e3d1e3a0d98691372d5fdd15238c74c68f49ce781535a77c055ae703ac32160e9ca35d115690cb40d26a56147a086181c0163d2e84
 DIST pdf-core-0.9.0.tar.gz 45772 BLAKE2B 860d0995af759315564b91264f5d6072b8a1530f4c994700e5d2632e0d8c09fd48c9b0991ff8026f68db07c43c412bf13ad73913a82977dad0bf6477fff81dfe SHA512 668b19cd722c56c00330ed81ad4fb8fb8bfa7290c2a8a3d23ab4ca92e7f9ea44729314aaaf68da9cb02dd73643b650ea87437d8d8aba5075342917ebd7ffa2be
diff --git a/dev-ruby/pdf-core/pdf-core-0.10.0.ebuild b/dev-ruby/pdf-core/pdf-core-0.10.0.ebuild
new file mode 100644
index 000000000000..0e04f853bc04
--- /dev/null
+++ b/dev-ruby/pdf-core/pdf-core-0.10.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements low level PDF features for Prawn"
+HOMEPAGE="https://github.com/prawnpdf/pdf-core/"
+SRC_URI="https://github.com/prawnpdf/pdf-core/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( =dev-ruby/pdf-inspector-1*
+	|| ( dev-ruby/pdf-reader:2 >=dev-ruby/pdf-reader-1.2:0 )
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/pdf-core/pdf-core-0.9.0-r1.ebuild b/dev-ruby/pdf-core/pdf-core-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..c89ee63c7c2b
--- /dev/null
+++ b/dev-ruby/pdf-core/pdf-core-0.9.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="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements low level PDF features for Prawn"
+HOMEPAGE="https://github.com/prawnpdf/pdf-core/"
+SRC_URI="https://github.com/prawnpdf/pdf-core/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( =dev-ruby/pdf-inspector-1*
+	|| ( dev-ruby/pdf-reader:2 >=dev-ruby/pdf-reader-1.2:0 )
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/pdf-core/pdf-core-0.9.0.ebuild b/dev-ruby/pdf-core/pdf-core-0.9.0.ebuild
deleted file mode 100644
index c3afffa2aede..000000000000
--- a/dev-ruby/pdf-core/pdf-core-0.9.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements low level PDF features for Prawn"
-HOMEPAGE="https://github.com/prawnpdf/pdf-core/"
-SRC_URI="https://github.com/prawnpdf/pdf-core/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Ruby GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( =dev-ruby/pdf-inspector-1*
-	>=dev-ruby/pdf-reader-1.2 =dev-ruby/pdf-reader-1* )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/pdf-inspector/pdf-inspector-1.3.0-r1.ebuild b/dev-ruby/pdf-inspector/pdf-inspector-1.3.0-r1.ebuild
index 400788a26f40..0b7ca848aa7e 100644
--- a/dev-ruby/pdf-inspector/pdf-inspector-1.3.0-r1.ebuild
+++ b/dev-ruby/pdf-inspector/pdf-inspector-1.3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/pdf-reader/Manifest b/dev-ruby/pdf-reader/Manifest
index 8661b1964333..e706c929686a 100644
--- a/dev-ruby/pdf-reader/Manifest
+++ b/dev-ruby/pdf-reader/Manifest
@@ -1,4 +1,3 @@
 DIST pdf-reader-1.4.1.tar.gz 10236680 BLAKE2B 86fb137c65b47717e758473b94ddbbf52def3ae0edaecd7b5eb3f0d880f664c9ff6097221f43d64247b006ed18220f4f9a469d6b8574592750a1d8a468ce7ddb SHA512 aaa53dafc2d58dc591f708941907ecf14b1ee73362a7bd6d34659103d51effa90888560733747ca1bfe3d217cb6834109e06b024f40a95214880ca42f54054e5
-DIST pdf-reader-2.8.0.tar.gz 12598389 BLAKE2B 8572c4c869d09bd7ecc9967d46b44236002fadb863695675b3d7bf2f7d63560c72240f9f0544f844d63f33f65f6097d28eb315f332eeca58294a5956cf24c09b SHA512 8f1a7990d982141e6dae682ad5dd6f415a363a598f76523ac9be2fda9c460479e571140c0f407f01f950dd94d73bc006a32a827fbab08a42d1c6656024d241c9
-DIST pdf-reader-2.9.0.tar.gz 26133329 BLAKE2B b9c798e98198c2233d0b87a56213dec54fcbef2d566cdde29d38f10c0b577a8bce3066a008de8eaa11169851eb285cf2818a56ef35ba44abb3702e25723707ba SHA512 cb4f08ec0b706a553c2fb20abab4e3486e3b7de1887366b10454a67b405bdd675c437edbd5928f11dfe4f7cf0d6af64a877db3f1002e38c27e0177e0ef5a487d
-DIST pdf-reader-2.9.1.tar.gz 26134579 BLAKE2B 7900530afe2818adb621d57d67d1c16c7fb3d6d9ed64648ee3241e903cfc8ea4264f773af4302f17eeef7b945b10df5bbb9c734c4f0710e831657f9fa0b49a55 SHA512 63e95f015308c6cac2f59965c753c3d51d3b24c28ab72d6c8672c026ec5dd796033d559a4956a09855423613668a572f9c935aaa5cca3be3529b3f33ee353974
+DIST pdf-reader-2.11.0.tar.gz 26136409 BLAKE2B 4ecd75046483c194c4af643e06da23f5efabe5b7e7a81a8c66479eab4f7c231474280ac253f54ca5a4932649c495f146cdb373b8233f43735f7b4219672b0f59 SHA512 a6e7c915170ba31f4889b854cbdcf02e3733b8ba9f0673e057f6b27021c1385c2099e073c82563f2c411174efe646c3f1c656ba7f56ab3fe30f9615acdd597fa
+DIST pdf-reader-2.12.0.tar.gz 26530597 BLAKE2B 77cdac5f998b0e3f2a61406937483f1dc81dc982af47ad4b7fc59cb0e3e776fc082d54adc9f241c31aede3533e1efadffb43144f949927f2f5af7dd5e62a0558 SHA512 47ea75b2e773cee27fa2e395c29346b2ba9b0d542c46bf953fe875548f0788f945ef1dd466d7c519130a05e01e52e6aa0c905cfd2c406041ffa8f92c6e15b407
diff --git a/dev-ruby/pdf-reader/pdf-reader-1.4.1-r4.ebuild b/dev-ruby/pdf-reader/pdf-reader-1.4.1-r4.ebuild
index 4b5c18e871f5..26fa61c5e1c6 100644
--- a/dev-ruby/pdf-reader/pdf-reader-1.4.1-r4.ebuild
+++ b/dev-ruby/pdf-reader/pdf-reader-1.4.1-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 GITHUB_USER=yob
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/pdf-reader/pdf-reader-2.11.0.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.11.0.ebuild
new file mode 100644
index 000000000000..259f7a087e5a
--- /dev/null
+++ b/dev-ruby/pdf-reader/pdf-reader-2.11.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GITHUB_USER=yob
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO"
+
+RUBY_FAKEGEM_GEMSPEC="pdf-reader.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
+HOMEPAGE="https://github.com/yob/pdf-reader/"
+
+# We cannot use the gem distributions because they don't contain the
+# tests' data, we have to rely on the git tags.
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/afm-0.2.1 =dev-ruby/afm-0.2*
+	=dev-ruby/ascii85-1*
+	=dev-ruby/hashery-2*
+	dev-ruby/ttfunk:*
+	dev-ruby/ruby-rc4"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/pdf-reader/pdf-reader-2.12.0.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.12.0.ebuild
new file mode 100644
index 000000000000..3136b0ae3d6d
--- /dev/null
+++ b/dev-ruby/pdf-reader/pdf-reader-2.12.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GITHUB_USER=yob
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO"
+
+RUBY_FAKEGEM_GEMSPEC="pdf-reader.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
+HOMEPAGE="https://github.com/yob/pdf-reader/"
+
+# We cannot use the gem distributions because they don't contain the
+# tests' data, we have to rely on the git tags.
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/afm-0.2.1 =dev-ruby/afm-0.2*
+	=dev-ruby/ascii85-1*
+	=dev-ruby/hashery-2*
+	dev-ruby/ttfunk:*
+	dev-ruby/ruby-rc4"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/pdf-reader/pdf-reader-2.8.0.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.8.0.ebuild
deleted file mode 100644
index 06b2336fdc14..000000000000
--- a/dev-ruby/pdf-reader/pdf-reader-2.8.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GITHUB_USER=yob
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO"
-
-RUBY_FAKEGEM_GEMSPEC="pdf-reader.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
-HOMEPAGE="https://github.com/yob/pdf-reader/"
-
-# We cannot use the gem distributions because they don't contain the
-# tests' data, we have to rely on the git tags.
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND+=" !!<dev-ruby/pdf-reader-1.4.1-r2"
-
-ruby_add_rdepend ">=dev-ruby/afm-0.2.1 =dev-ruby/afm-0.2*
-	=dev-ruby/ascii85-1*
-	=dev-ruby/hashery-2*
-	dev-ruby/ttfunk:*
-	dev-ruby/ruby-rc4"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/pdf-reader/pdf-reader-2.9.0.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.9.0.ebuild
deleted file mode 100644
index 06b2336fdc14..000000000000
--- a/dev-ruby/pdf-reader/pdf-reader-2.9.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GITHUB_USER=yob
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO"
-
-RUBY_FAKEGEM_GEMSPEC="pdf-reader.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
-HOMEPAGE="https://github.com/yob/pdf-reader/"
-
-# We cannot use the gem distributions because they don't contain the
-# tests' data, we have to rely on the git tags.
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND+=" !!<dev-ruby/pdf-reader-1.4.1-r2"
-
-ruby_add_rdepend ">=dev-ruby/afm-0.2.1 =dev-ruby/afm-0.2*
-	=dev-ruby/ascii85-1*
-	=dev-ruby/hashery-2*
-	dev-ruby/ttfunk:*
-	dev-ruby/ruby-rc4"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/pdf-reader/pdf-reader-2.9.1.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.9.1.ebuild
deleted file mode 100644
index 06b2336fdc14..000000000000
--- a/dev-ruby/pdf-reader/pdf-reader-2.9.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GITHUB_USER=yob
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO"
-
-RUBY_FAKEGEM_GEMSPEC="pdf-reader.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
-HOMEPAGE="https://github.com/yob/pdf-reader/"
-
-# We cannot use the gem distributions because they don't contain the
-# tests' data, we have to rely on the git tags.
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND+=" !!<dev-ruby/pdf-reader-1.4.1-r2"
-
-ruby_add_rdepend ">=dev-ruby/afm-0.2.1 =dev-ruby/afm-0.2*
-	=dev-ruby/ascii85-1*
-	=dev-ruby/hashery-2*
-	dev-ruby/ttfunk:*
-	dev-ruby/ruby-rc4"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/permutation/permutation-0.1.8-r2.ebuild b/dev-ruby/permutation/permutation-0.1.8-r2.ebuild
deleted file mode 100644
index 5a634f425a7f..000000000000
--- a/dev-ruby/permutation/permutation-0.1.8-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Library performing operations with permutations of sequences (strings, arrays)"
-HOMEPAGE="https://flori.github.com/permutation"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-each_ruby_test() {
-	${RUBY} -Ilib test/test.rb || die
-}
diff --git a/dev-ruby/permutation/permutation-0.1.8-r3.ebuild b/dev-ruby/permutation/permutation-0.1.8-r3.ebuild
new file mode 100644
index 000000000000..466b0063ab7a
--- /dev/null
+++ b/dev-ruby/permutation/permutation-0.1.8-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library performing operations with permutations of sequences (strings, arrays)"
+HOMEPAGE="https://flori.github.io/permutation/"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test.rb || die
+}
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index 4961707bf6bd..9af8e3ee4321 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -1,3 +1,4 @@
-DIST pg-1.2.2.gem 196608 BLAKE2B 068be98d190cb4074cc89bdb5b376322f323950909f7a6fddc8669a3ff0f85eef9f512bd2ec7121707e9ea077b2b428f698e84f2118c76e34f5def75ca303fca SHA512 5c7cc90afb75a66e80cfc34c4875cf22b005aa0a27e78db6f71d1829f870c6409b73326a9925f79c0d642e93ea51d1f84c7383323fea44b7488e83deb7754951
-DIST pg-1.2.3.gem 196608 BLAKE2B b3e9119d068c833f7352b61802d5fb03616ed2d13f957c8d4b51966444523ef9d884a860309209dfbda5931aa1f8199b7a63a51a89c194758de309f00bdbfbd6 SHA512 dd8fa7b256102aea7588fd7e1d4e28199be2bf9910149d266b5379e78a7a57aa2a22763d04a559f4763842cad4ba8d0fbc33e8b43b7497dc77039edfd1029585
-DIST pg-1.3.5.tar.gz 256197 BLAKE2B 8a8cd0135eb7dcf8389d2b0afa174059d12f542b1e2897fba0e292fd16f31508293ca90f64f731db9bc14e55e9ba2c740ccf744a5fe30c449d64344264e409e1 SHA512 44e8ad97a6f4136d49641c5a59a70a489d766d1c1e511f5a6f003c2ae2900466b02a2504dc0fb26c872ce3fcb56ac83ac5299a829cca99d9c02c4b7ce0f0ac75
+DIST pg-1.4.6.tar.gz 282608 BLAKE2B 73616b6ba0373ae81394188fd96d7ca37144b76e5e89d0267e076ea39b9e33d19851d3881e70d9d5934ea26671c07635a22e7e530dd0094a243de8e9d9793fb5 SHA512 5cde5441f9864f89e7f44fd72d8becc60c223ba90793812c4756764f9807610d393ecca5ba05187e8aefb0d3530d67a7525b4e2c638160161410b369937e912a
+DIST pg-1.5.4.tar.gz 298368 BLAKE2B 1028fac00371f9f769ee6c484a518149dc7c89e78ee8c05754a4412c4fec062f958de75bfbfb3f8c570e9598e439156e1d53ba00a8bc6e1be93d00412d153281 SHA512 87d950d2240e4d9d540f19ce89b945cb2b4a6d96e79dc7aa67a2dae014f1b20b307d2c195bfe3afe5c86894b94d379980fa2b7c4cf0e6a68a15c58b8d6d469f8
+DIST pg-1.5.5.tar.gz 299336 BLAKE2B 40410091a24929ee79c14cae8ec6e526a8db569f3f0d5c0637389a099caf8085189bec3fee69c52a07097e1aec62d8da0ee87cdc11118be5c7daefebd9e0019e SHA512 4cd12f2b30d9f853f9707d3329eda0999a7ed0f5ebdbbcb3110996db6d80ef6bb4331b3f6648b19f6fd3f63d928552b58190b34808ca714cbd72c54aeed43478
+DIST pg-1.5.6.tar.gz 300559 BLAKE2B 5430789943f107e18f9b509ab7963d6a5dc702782c30a218f5e648397ccc9f07128bae1beccf47172860fe97ae935308841876f26dad0d9ac223adb96722a302 SHA512 5c4cda39699f17864b3dc4daed4ab2096d64245fc2262b948a94c3269b0572a9fab2a42dcba692daf6eeba3354d6a0b05eb5db0f0ca5382b0f8315c1837a0206
diff --git a/dev-ruby/pg/pg-1.2.2.ebuild b/dev-ruby/pg/pg-1.2.2.ebuild
deleted file mode 100644
index accf547a30ff..000000000000
--- a/dev-ruby/pg/pg-1.2.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog Contributors.rdoc README.rdoc History.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
-HOMEPAGE="https://github.com/ged/ruby-pg"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND+=" dev-db/postgresql:*"
-DEPEND+=" dev-db/postgresql
-	test? ( >=dev-db/postgresql-9.4[server(+),threads] )"
-
-all_ruby_prepare() {
-	# hack the Rakefile to make it sure that it doesn't load
-	# rake-compiler (so that we don't have to depend on it and it
-	# actually works when building with USE=doc).
-	sed -i \
-		-e '/Rakefile.cross/s:^:#:' \
-		-e '/ExtensionTask/,/^end$/ s:^:#:' \
-		Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -C ext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-	cp ext/*$(get_libname) lib || die
-}
-
-each_ruby_test() {
-	if [[ "${EUID}" -ne "0" ]]; then
-		# Make the rspec call explicit, this way we don't have to depend
-		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
-		# the whole extension from scratch.
-		RSPEC_VERSION=3 ruby-ng_rspec
-	else
-		ewarn "The userpriv feature must be enabled to run tests."
-		eerror "Testsuite will not be run."
-	fi
-}
diff --git a/dev-ruby/pg/pg-1.2.3.ebuild b/dev-ruby/pg/pg-1.2.3.ebuild
deleted file mode 100644
index b4fc9bbcf700..000000000000
--- a/dev-ruby/pg/pg-1.2.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog Contributors.rdoc README.rdoc History.rdoc"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
-HOMEPAGE="https://github.com/ged/ruby-pg"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND+=" dev-db/postgresql:*"
-DEPEND+=" dev-db/postgresql
-	test? ( >=dev-db/postgresql-9.4[server(+),threads] )"
-
-all_ruby_prepare() {
-	# hack the Rakefile to make it sure that it doesn't load
-	# rake-compiler (so that we don't have to depend on it and it
-	# actually works when building with USE=doc).
-	sed -i \
-		-e '/Rakefile.cross/s:^:#:' \
-		-e '/ExtensionTask/,/^end$/ s:^:#:' \
-		Rakefile || die
-}
-
-each_ruby_test() {
-	if [[ "${EUID}" -ne "0" ]]; then
-		# Make the rspec call explicit, this way we don't have to depend
-		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
-		# the whole extension from scratch.
-		RSPEC_VERSION=3 ruby-ng_rspec
-	else
-		ewarn "The userpriv feature must be enabled to run tests."
-		eerror "Testsuite will not be run."
-	fi
-}
diff --git a/dev-ruby/pg/pg-1.3.5.ebuild b/dev-ruby/pg/pg-1.3.5.ebuild
deleted file mode 100644
index a041e4e6ee51..000000000000
--- a/dev-ruby/pg/pg-1.3.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_GEMSPEC="pg.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc README.rdoc History.rdoc"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
-HOMEPAGE="https://github.com/ged/ruby-pg"
-SRC_URI="https://github.com/ged/ruby-pg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="ruby-${P}"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND+=" dev-db/postgresql:*"
-DEPEND+=" dev-db/postgresql
-	test? ( >=dev-db/postgresql-9.4[server(+),threads] )"
-
-all_ruby_prepare() {
-	# hack the Rakefile to make it sure that it doesn't load
-	# rake-compiler (so that we don't have to depend on it and it
-	# actually works when building with USE=doc).
-	sed -i \
-		-e '/Rakefile.cross/s:^:#:' \
-		-e '/ExtensionTask/,/^end$/ s:^:#:' \
-		Rakefile || die
-
-	sed -e 's/git ls-files -z/find * -print0/' \
-		-e "s:_relative ': './:" \
-		-e 's/__dir__/"."/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid tests that assume IPv4
-	sed -i -e '/expect.*hostaddr/ s:^:#:' spec/pg/connection_spec.rb || die
-
-	# Avoid test that only works with bundled pg
-	sed -i -e '/tells about the libpq library path/askip "gentoo"' spec/pg_spec.rb || die
-}
-
-each_ruby_test() {
-	if [[ "${EUID}" -ne "0" ]]; then
-		# Make the rspec call explicit, this way we don't have to depend
-		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
-		# the whole extension from scratch.
-		RSPEC_VERSION=3 ruby-ng_rspec
-	else
-		ewarn "The userpriv feature must be enabled to run tests."
-		eerror "Testsuite will not be run."
-	fi
-}
diff --git a/dev-ruby/pg/pg-1.4.6-r1.ebuild b/dev-ruby/pg/pg-1.4.6-r1.ebuild
new file mode 100644
index 000000000000..5bddbc743385
--- /dev/null
+++ b/dev-ruby/pg/pg-1.4.6-r1.ebuild
@@ -0,0 +1,64 @@
+# 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_GEMSPEC="pg.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc README.md History.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
+HOMEPAGE="https://github.com/ged/ruby-pg"
+SRC_URI="https://github.com/ged/ruby-pg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-${P}"
+
+LICENSE="|| ( BSD-2 Ruby-BSD )"
+SLOT="1"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND+=" dev-db/postgresql:*"
+DEPEND+=" dev-db/postgresql
+	test? ( >=dev-db/postgresql-9.4[server(+),threads(+)] )"
+
+all_ruby_prepare() {
+	# hack the Rakefile to make it sure that it doesn't load
+	# rake-compiler (so that we don't have to depend on it and it
+	# actually works when building with USE=doc).
+	sed -i \
+		-e '/Rakefile.cross/s:^:#:' \
+		-e '/ExtensionTask/,/^end$/ s:^:#:' \
+		Rakefile || die
+
+	sed -e 's/git ls-files -z/find * -print0/' \
+		-e "s:_relative ': './:" \
+		-e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid tests that assume IPv4
+	sed -i -e '/expect.*hostaddr/ s:^:#:' spec/pg/connection_spec.rb || die
+
+	# Fails with network-sandbox
+	sed -i -e '/connects using without host but envirinment variables/askip "gentoo"' spec/pg/scheduler_spec.rb || die
+
+	# Avoid test that only works with bundled pg
+	sed -i -e '/tells about the libpq library path/askip "gentoo"' spec/pg_spec.rb || die
+}
+
+each_ruby_test() {
+	if [[ "${EUID}" -ne "0" ]]; then
+		# Make the rspec call explicit, this way we don't have to depend
+		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
+		# the whole extension from scratch.
+		RSPEC_VERSION=3 ruby-ng_rspec
+	else
+		ewarn "The userpriv feature must be enabled to run tests."
+		eerror "Testsuite will not be run."
+	fi
+}
diff --git a/dev-ruby/pg/pg-1.5.4-r1.ebuild b/dev-ruby/pg/pg-1.5.4-r1.ebuild
new file mode 100644
index 000000000000..26fac2d5da84
--- /dev/null
+++ b/dev-ruby/pg/pg-1.5.4-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_GEMSPEC="pg.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc README.md History.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
+HOMEPAGE="https://github.com/ged/ruby-pg"
+SRC_URI="https://github.com/ged/ruby-pg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-${P}"
+
+LICENSE="|| ( BSD-2 Ruby-BSD )"
+SLOT="1"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND+=" dev-db/postgresql:*"
+DEPEND+=" dev-db/postgresql
+	test? ( >=dev-db/postgresql-9.4[server(+),threads(+)] )"
+
+all_ruby_prepare() {
+	# hack the Rakefile to make it sure that it doesn't load
+	# rake-compiler (so that we don't have to depend on it and it
+	# actually works when building with USE=doc).
+	sed -i \
+		-e '/Rakefile.cross/s:^:#:' \
+		-e '/ExtensionTask/,/^end$/ s:^:#:' \
+		Rakefile || die
+
+	sed -e 's/git ls-files -z/find * -print0/' \
+		-e "s:_relative ': './:" \
+		-e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid tests that assume IPv4
+	sed -i -e '/expect.*hostaddr/ s:^:#:' spec/pg/connection_spec.rb || die
+
+	# Fails with network-sandbox
+	sed -i -e '/connects using without host but envirinment variables/askip "gentoo"' spec/pg/scheduler_spec.rb || die
+
+	# Avoid test that only works with bundled pg
+	sed -i -e '/tells about the libpq library path/askip "gentoo"' spec/pg_spec.rb || die
+}
+
+each_ruby_test() {
+	if [[ "${EUID}" -ne "0" ]]; then
+		# Make the rspec call explicit, this way we don't have to depend
+		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
+		# the whole extension from scratch.
+		RSPEC_VERSION=3 ruby-ng_rspec
+	else
+		ewarn "The userpriv feature must be enabled to run tests."
+		eerror "Testsuite will not be run."
+	fi
+}
diff --git a/dev-ruby/pg/pg-1.5.5.ebuild b/dev-ruby/pg/pg-1.5.5.ebuild
new file mode 100644
index 000000000000..2f148b514659
--- /dev/null
+++ b/dev-ruby/pg/pg-1.5.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_GEMSPEC="pg.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc README.md History.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
+HOMEPAGE="https://github.com/ged/ruby-pg"
+SRC_URI="https://github.com/ged/ruby-pg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-${P}"
+
+LICENSE="|| ( BSD-2 Ruby-BSD )"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+RDEPEND+=" dev-db/postgresql:*"
+DEPEND+=" dev-db/postgresql
+	test? ( >=dev-db/postgresql-9.4[server(+),threads(+)] )"
+
+all_ruby_prepare() {
+	# hack the Rakefile to make it sure that it doesn't load
+	# rake-compiler (so that we don't have to depend on it and it
+	# actually works when building with USE=doc).
+	sed -i \
+		-e '/Rakefile.cross/s:^:#:' \
+		-e '/ExtensionTask/,/^end$/ s:^:#:' \
+		Rakefile || die
+
+	sed -e 's/git ls-files -z/find * -print0/' \
+		-e "s:_relative ': './:" \
+		-e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid tests that assume IPv4
+	sed -i -e '/expect.*hostaddr/ s:^:#:' spec/pg/connection_spec.rb || die
+
+	# Fails with network-sandbox
+	sed -i -e '/connects using without host but envirinment variables/askip "gentoo"' spec/pg/scheduler_spec.rb || die
+
+	# Avoid test that only works with bundled pg
+	sed -i -e '/tells about the libpq library path/askip "gentoo"' spec/pg_spec.rb || die
+}
+
+each_ruby_test() {
+	if [[ "${EUID}" -ne "0" ]]; then
+		# Make the rspec call explicit, this way we don't have to depend
+		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
+		# the whole extension from scratch.
+		RSPEC_VERSION=3 ruby-ng_rspec
+	else
+		ewarn "The userpriv feature must be enabled to run tests."
+		eerror "Testsuite will not be run."
+	fi
+}
diff --git a/dev-ruby/pg/pg-1.5.6.ebuild b/dev-ruby/pg/pg-1.5.6.ebuild
new file mode 100644
index 000000000000..2f148b514659
--- /dev/null
+++ b/dev-ruby/pg/pg-1.5.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_GEMSPEC="pg.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc README.md History.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
+HOMEPAGE="https://github.com/ged/ruby-pg"
+SRC_URI="https://github.com/ged/ruby-pg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-${P}"
+
+LICENSE="|| ( BSD-2 Ruby-BSD )"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+RDEPEND+=" dev-db/postgresql:*"
+DEPEND+=" dev-db/postgresql
+	test? ( >=dev-db/postgresql-9.4[server(+),threads(+)] )"
+
+all_ruby_prepare() {
+	# hack the Rakefile to make it sure that it doesn't load
+	# rake-compiler (so that we don't have to depend on it and it
+	# actually works when building with USE=doc).
+	sed -i \
+		-e '/Rakefile.cross/s:^:#:' \
+		-e '/ExtensionTask/,/^end$/ s:^:#:' \
+		Rakefile || die
+
+	sed -e 's/git ls-files -z/find * -print0/' \
+		-e "s:_relative ': './:" \
+		-e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid tests that assume IPv4
+	sed -i -e '/expect.*hostaddr/ s:^:#:' spec/pg/connection_spec.rb || die
+
+	# Fails with network-sandbox
+	sed -i -e '/connects using without host but envirinment variables/askip "gentoo"' spec/pg/scheduler_spec.rb || die
+
+	# Avoid test that only works with bundled pg
+	sed -i -e '/tells about the libpq library path/askip "gentoo"' spec/pg_spec.rb || die
+}
+
+each_ruby_test() {
+	if [[ "${EUID}" -ne "0" ]]; then
+		# Make the rspec call explicit, this way we don't have to depend
+		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
+		# the whole extension from scratch.
+		RSPEC_VERSION=3 ruby-ng_rspec
+	else
+		ewarn "The userpriv feature must be enabled to run tests."
+		eerror "Testsuite will not be run."
+	fi
+}
diff --git a/dev-ruby/pg_array_parser/metadata.xml b/dev-ruby/pg_array_parser/metadata.xml
index 397a134b5c30..40bbe04f73e3 100644
--- a/dev-ruby/pg_array_parser/metadata.xml
+++ b/dev-ruby/pg_array_parser/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">dockyard/pg_array_parser</remote-id>
+    <remote-id type="github">DavyJonesLocker/pg_array_parser</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r3.ebuild b/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r3.ebuild
index b5d931496a25..85358ae218a7 100644
--- a/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r3.ebuild
+++ b/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -13,12 +13,11 @@ RUBY_FAKEGEM_EXTENSIONS=(ext/pg_array_parser/extconf.rb)
 inherit ruby-fakegem
 
 DESCRIPTION="Simple library to parse PostgreSQL arrays into a array of strings"
-HOMEPAGE="https://github.com/dockyard/pg_array_parser"
+HOMEPAGE="https://github.com/DavyJonesLocker/pg_array_parser"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-3)"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
 
 ruby_add_bdepend "dev-ruby/bundler"
 
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index ae5ad08ef980..d1098afbe733 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -1,3 +1,3 @@
-DIST pkg-config-1.4.1.gem 22016 BLAKE2B efac610221b288bb669a3783c0e70af3951478147896315c53af2186912b60045096c0ba01a0a59ce09897a2e4e747d28a091b947281fe7f6dd6f85cea31aae7 SHA512 72d61466c1ea53a5eda66a8e8f8106fef0269fefdd349ac83959a34bb8f36796bd3e9c7fbcbad5763d2fca015c65436f9d410724e27b6d1c495e3957d26757a6
-DIST pkg-config-1.4.6.gem 22528 BLAKE2B 7d040576e0d035af75218e7efee6d3a8ee27206de8e12ef112c6fa7c5917f300c07149c08d510f26f89299cb73c384775403ff7f863379c195fb524c8127c59a SHA512 328fbc46bb549d4cbcd4995cb91545bd13f00f3d24610f9a70b39ea3b58c595d96801fcfe9ca9848d6664d7c9dfce44ce2702a58b894b80744619678e10b0e50
-DIST pkg-config-1.4.7.gem 22528 BLAKE2B 450dffb0c9680f92c8841bcc8c7aa2e187f73e8db1d1325ece7dd024ae0f430b8365d185742d349775bf821210ecd13dddf5b9e40bc85ede07cdaef3199b23b3 SHA512 ca93bcee16b75690af630236e6ab01c13de220f1ea128475ded5fac155f12a967ceebe9b5ab3e7e6f43d5dbf81ccb1bd79f6f25c92eabd3318019b0e50696623
+DIST pkg-config-1.5.2.gem 23040 BLAKE2B 32670e823980888b3cc679afa61cb71092b559ad12ab0cd4485ccc191353426af23f0007fd844cc8a71ad7c4c1c190587eb7643f19f68623ecad182270606141 SHA512 f4aa101ff6bbfce5bf23b6c83f61e186424c097f889e51fe337d158753fc8af26ee918bb509653ea70487a7d92a24b66cc96c1c0ea4bed2cfab5cd9380317679
+DIST pkg-config-1.5.5.gem 23040 BLAKE2B c23e7904d9a9630d684bbfb0ac85893d5539c3eff7f5a12ca8703095ec076415ff938c9e0d74e873a5a31581c3f28a60bfd65df1466bae2a109259748a921b69 SHA512 d796999a6a1745ddbd9b816d8d7ba714097538803f85864b41745c48730a6fa27ced405837500e6d35edc9dad432e86da0d8e788fd18e8b9d507fa0ac0fb7b81
+DIST pkg-config-1.5.6.gem 23040 BLAKE2B dad69e21b43fd8b97ea0f01973b89bf5182664b4170fcff7aacb40db045da313579920750450e1b2fa90a955d4c9a64b8eb9bb5618d2728db1114f4e9e173354 SHA512 cff5b2e3ed19ea6f8ea554990ba51a6313a663a258d9962c951ae75016fd181bc35593a871086c7f1fa4347e3f15949ad1621ea8fa86ca0d330db19c84a80ee4
diff --git a/dev-ruby/pkg-config/metadata.xml b/dev-ruby/pkg-config/metadata.xml
index 3d83cf882827..91e59e9e6f53 100644
--- a/dev-ruby/pkg-config/metadata.xml
+++ b/dev-ruby/pkg-config/metadata.xml
@@ -10,6 +10,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">rcairo/pkg-config</remote-id>
+    <remote-id type="github">ruby-gnome/pkg-config</remote-id>
+    <remote-id type="rubygems">pkg-config</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild
deleted file mode 100644
index 339f7b793489..000000000000
--- a/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pkg-config implementation by Ruby"
-HOMEPAGE="https://github.com/rcairo/pkg-config"
-LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-# this is used for testing
-DEPEND+=" test? ( x11-libs/cairo )"
-
-all_ruby_prepare() {
-	# drop failing tests
-	sed -i -e "/test_cflags/,/end/d"\
-		-e "/test_cflags_only_I/,/end/d" test/test_pkg_config.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test_${PN/-/_}.rb || die
-}
diff --git a/dev-ruby/pkg-config/pkg-config-1.4.6.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.6.ebuild
deleted file mode 100644
index d93955918c5a..000000000000
--- a/dev-ruby/pkg-config/pkg-config-1.4.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pkg-config implementation by Ruby"
-HOMEPAGE="https://github.com/rcairo/pkg-config"
-LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-# this is used for testing
-DEPEND+=" test? ( x11-libs/cairo )"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test-pkg-config.rb || die
-}
diff --git a/dev-ruby/pkg-config/pkg-config-1.4.7.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.7.ebuild
deleted file mode 100644
index 6fc6d370faeb..000000000000
--- a/dev-ruby/pkg-config/pkg-config-1.4.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pkg-config implementation by Ruby"
-HOMEPAGE="https://github.com/rcairo/pkg-config"
-LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-# this is used for testing
-DEPEND+=" test? ( x11-libs/cairo )"
-
-all_ruby_prepare() {
-	sed -e '/test_cflags/aomit "Fragile on Gentoo"' -i test/test-pkg-config.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test-pkg-config.rb || die
-}
diff --git a/dev-ruby/pkg-config/pkg-config-1.5.2.ebuild b/dev-ruby/pkg-config/pkg-config-1.5.2.ebuild
new file mode 100644
index 000000000000..f0907abf5103
--- /dev/null
+++ b/dev-ruby/pkg-config/pkg-config-1.5.2.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="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pkg-config implementation by Ruby"
+HOMEPAGE="https://github.com/ruby-gnome/pkg-config"
+LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
+
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+# this is used for testing
+DEPEND+=" test? ( x11-libs/cairo )"
+
+all_ruby_prepare() {
+	sed -e '/test_cflags/aomit "Fragile on Gentoo"' -i test/test-pkg-config.rb || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib test/test-pkg-config.rb || die
+}
diff --git a/dev-ruby/pkg-config/pkg-config-1.5.5.ebuild b/dev-ruby/pkg-config/pkg-config-1.5.5.ebuild
new file mode 100644
index 000000000000..846afc769643
--- /dev/null
+++ b/dev-ruby/pkg-config/pkg-config-1.5.5.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="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pkg-config implementation by Ruby"
+HOMEPAGE="https://github.com/ruby-gnome/pkg-config"
+LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+# this is used for testing
+DEPEND+=" test? ( x11-libs/cairo )"
+
+all_ruby_prepare() {
+	sed -e '/test_cflags/aomit "Fragile on Gentoo"' -i test/test-pkg-config.rb || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib test/test-pkg-config.rb || die
+}
diff --git a/dev-ruby/pkg-config/pkg-config-1.5.6.ebuild b/dev-ruby/pkg-config/pkg-config-1.5.6.ebuild
new file mode 100644
index 000000000000..89913d40ba0c
--- /dev/null
+++ b/dev-ruby/pkg-config/pkg-config-1.5.6.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="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pkg-config implementation by Ruby"
+HOMEPAGE="https://github.com/ruby-gnome/pkg-config"
+LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+# this is used for testing
+DEPEND+=" test? ( x11-libs/cairo )"
+
+all_ruby_prepare() {
+	sed -e '/test_cflags/aomit "Fragile on Gentoo"' -i test/test-pkg-config.rb || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib test/test-pkg-config.rb || die
+}
diff --git a/dev-ruby/plist/Manifest b/dev-ruby/plist/Manifest
index 26f4a805b58e..5781efaa89bb 100644
--- a/dev-ruby/plist/Manifest
+++ b/dev-ruby/plist/Manifest
@@ -1 +1,2 @@
-DIST plist-3.6.0.tar.gz 37311 BLAKE2B dd9bd1a7cf62974fb4b51744ab826ab65e6e02030073ec3b60b3d420982b65ceb3b1c1bb50e0f38fb68e25c366b17e7885cf5053418338ea05c324afad2df5b7 SHA512 d5991d944d8f02cacecdbdf9834379f34fd915eb3cf252aa1923e8d49a3b17c72ae07fbd53f1cfe9d0c14147729f4736838e4cea3fc286a90280bcc3de4b7fd1
+DIST plist-3.7.0.tar.gz 38215 BLAKE2B a92cb0e4902c4e7a76ab9aca32a340c69f196bfb2c8836deab897e7cf9b653e74bae1aa0ad4de0eee71876bcc787bbc7caaa0ba61d4a716bff3cf202d14a6a12 SHA512 138ff5d9890f3da2add2f2d7935d7cacfcd57314ae92bf04b1ca4d37fe00d586a40629e84c8b9ef871db277587efe2375d934ca5a7e7b92eaffb441ee361e533
+DIST plist-3.7.1.tar.gz 38307 BLAKE2B 7c03af0a1567f6f8f0543626e1993d8a921f7330b560d618754d396fb282298ccdee35e9992b8a6e1131479ce09a9fa0c37b906547ff636109d0e38035abc53f SHA512 cd1c88027bccaa3005837e06df4f300005691fdda97d0e8d62cc7babacb6d1f3f80d7a446978f234b2f883246de34f29265578aba10a1d2995f65918bf1f7c9e
diff --git a/dev-ruby/plist/plist-3.6.0.ebuild b/dev-ruby/plist/plist-3.6.0.ebuild
deleted file mode 100644
index ead510f58365..000000000000
--- a/dev-ruby/plist/plist-3.6.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library to manipulate Property List files, also known as plists"
-HOMEPAGE="https://github.com/patsplat/plist"
-SRC_URI="https://github.com/patsplat/plist/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/plist/plist-3.7.0.ebuild b/dev-ruby/plist/plist-3.7.0.ebuild
new file mode 100644
index 000000000000..276d44a0fb73
--- /dev/null
+++ b/dev-ruby/plist/plist-3.7.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library to manipulate Property List files, also known as plists"
+HOMEPAGE="https://github.com/patsplat/plist"
+SRC_URI="https://github.com/patsplat/plist/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/plist/plist-3.7.1.ebuild b/dev-ruby/plist/plist-3.7.1.ebuild
new file mode 100644
index 000000000000..c0b029420060
--- /dev/null
+++ b/dev-ruby/plist/plist-3.7.1.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="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library to manipulate Property List files, also known as plists"
+HOMEPAGE="https://github.com/patsplat/plist"
+SRC_URI="https://github.com/patsplat/plist/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+ruby_add_rdepend "test? ( dev-ruby/base64 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/pluggaloid/pluggaloid-1.7.0-r1.ebuild b/dev-ruby/pluggaloid/pluggaloid-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..6195f7a62c4a
--- /dev/null
+++ b/dev-ruby/pluggaloid/pluggaloid-1.7.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+DESCRIPTION="Pluggaloid is extensible plugin system for mikutter"
+HOMEPAGE="https://rubygems.org/gems/pluggaloid/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/delayer-1.1.0:1
+	dev-ruby/instance_storage:0
+"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile test/*_test.rb || die
+}
diff --git a/dev-ruby/pluggaloid/pluggaloid-1.7.0.ebuild b/dev-ruby/pluggaloid/pluggaloid-1.7.0.ebuild
deleted file mode 100644
index 60995193e2f9..000000000000
--- a/dev-ruby/pluggaloid/pluggaloid-1.7.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-DESCRIPTION="Pluggaloid is extensible plugin system for mikutter"
-HOMEPAGE="https://rubygems.org/gems/pluggaloid/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/delayer-1.1.0:1
-	dev-ruby/instance_storage:0
-"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile test/*_test.rb || die
-}
diff --git a/dev-ruby/podcast/metadata.xml b/dev-ruby/podcast/metadata.xml
index daac6fdb7252..266783412a06 100644
--- a/dev-ruby/podcast/metadata.xml
+++ b/dev-ruby/podcast/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">boncey/ruby-podcast</remote-id>
+    <remote-id type="rubygems">podcast</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/podcast/podcast-0.0.4-r3.ebuild b/dev-ruby/podcast/podcast-0.0.4-r3.ebuild
index 0da4506b3d80..4aa3435ce502 100644
--- a/dev-ruby/podcast/podcast-0.0.4-r3.ebuild
+++ b/dev-ruby/podcast/podcast-0.0.4-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_EXTRADOC="README"
@@ -10,7 +10,7 @@ RUBY_FAKEGEM_EXTRADOC="README"
 inherit ruby-fakegem
 
 DESCRIPTION="A pure Ruby library for generating podcasts from mp3 files"
-HOMEPAGE="http://podcast.rubyforge.org/"
+HOMEPAGE="https://github.com/boncey/ruby-podcast"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-ruby/polyglot/metadata.xml b/dev-ruby/polyglot/metadata.xml
index f2941078f009..92cdcad5348c 100644
--- a/dev-ruby/polyglot/metadata.xml
+++ b/dev-ruby/polyglot/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<longdescription>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <longdescription>
 Polyglot provides support for fully-custom DSLs by providing a
 registry of file types that can be loaded by its improved version of
 'require', using a custom loader for each file type.
-	</longdescription>
+  </longdescription>
+  <upstream>
+    <remote-id type="github">cjheath/polyglot</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/polyglot/polyglot-0.3.5-r1.ebuild b/dev-ruby/polyglot/polyglot-0.3.5-r1.ebuild
index ed4b4808252c..d280bbd80eec 100644
--- a/dev-ruby/polyglot/polyglot-0.3.5-r1.ebuild
+++ b/dev-ruby/polyglot/polyglot-0.3.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
@@ -11,9 +11,9 @@ RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
 inherit ruby-fakegem
 
 DESCRIPTION="Polyglot provides support for fully-custom DSLs"
-HOMEPAGE="http://polyglot.rubyforge.org/"
+HOMEPAGE="https://github.com/cjheath/polyglot"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/posix-spawn/Manifest b/dev-ruby/posix-spawn/Manifest
deleted file mode 100644
index ff646c271c68..000000000000
--- a/dev-ruby/posix-spawn/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST posix-spawn-0.3.15.gem 29696 BLAKE2B 224cca09cbac983cb35dd2c25fe4ea485f6c5ec20fe46dfafcfb4f3586da9eb77ba8328dcdc3fde6f389dc0953ae4b7e5a600af67db421837a6610b0770c8146 SHA512 bdfecdbb0d470d23643de1c5b40c4f4b8b7f8970c14a2d3bd7c15e59d388b24857fb740c5c87573cbb6ac83483a29bf87f856a949a1fc014be8ad09e5cb2a9e7
diff --git a/dev-ruby/posix-spawn/metadata.xml b/dev-ruby/posix-spawn/metadata.xml
deleted file mode 100644
index 442c14db4018..000000000000
--- a/dev-ruby/posix-spawn/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rtomayko/posix-spawn</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/posix-spawn/posix-spawn-0.3.15-r1.ebuild b/dev-ruby/posix-spawn/posix-spawn-0.3.15-r1.ebuild
deleted file mode 100644
index 61f75a2bf234..000000000000
--- a/dev-ruby/posix-spawn/posix-spawn-0.3.15-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md TODO HACKING"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library that implements a subset of the Ruby 1.9 Process::spawn"
-HOMEPAGE="https://github.com/rtomayko/posix-spawn/"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-all_ruby_prepare() {
-	sed -i -e '/test_backtick_redirect/askip "Output depends on bash version"' test/test_backtick.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/test_*.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index 8f21766f863d..7fe6fbe42b95 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -1,4 +1 @@
-DIST power_assert-1.1.7.tar.gz 17361 BLAKE2B 54fe379af9231a1794534f0199bb587418ea6d0960f7ae5cfc3a9c484c692e08254b5bd7220120559cc1b9e6f1b85c73d0e8e58c115731faea72d70180a94336 SHA512 bc6649bf17f41f7c84611eb334b73b43a0b7c3892a46acb82ae7b43dcf43b7a556ad617a6806ce1d354796bc694cea9eef7cc47b1928102f1822a03e01160a35
-DIST power_assert-1.2.0.tar.gz 17358 BLAKE2B 8b75b34f5d80f8f52370816b916e3bc3a60493b8f52a910346c51c70770e0645566b8b7c3dd551d8bb1f1cbdac5dfcebe043457bd025d819e3782e75e41e0f16 SHA512 2f001f6223fc3fb586c7b0457f775379040e11eb83b5bdda51c02b2b24e531aecd6e12e6ec80bf9407a768ab1a10b0a6b4c8f1a92ca69ea702faf56202bb635c
-DIST power_assert-2.0.0.tar.gz 16994 BLAKE2B 5106e77566100274000c55af1bd2ff9aaf00185ed1821ac966587461919210d7460e30aefdb5a880e7ef59e4f536121371d0862df2af91cb274ed79ded8c9771 SHA512 e6faf3cf50d2c70ae421bae20b885ac858fe11b10b1a8562d9ca88afbd397fa4812631f2aa02638c273eed518091dfaa020b6c002c0559383ddca625404bcc1c
-DIST power_assert-2.0.1.tar.gz 17062 BLAKE2B 9c592c12e0722a3376fede86b1a609c4c5feec49dacdb74f5af96d7ee3024112525bdd57fd5d1763b3a599386ce6548d694f5a4b1207c356701c79046166ee42 SHA512 717d163050e45d889bbf50ee5caf4d91b143a0df45d8ed1be9588595fd485f05662d59ae6166d44b5cf987d6b2a1e77f40441f2aefd1051ff9cf679d3bcdddc6
+DIST power_assert-2.0.3.tar.gz 17228 BLAKE2B 6a7927102deaf6daf0e4f17e7183ec4a862a57607b965c0051b1ecd22a4bf555c6f6195911405d2839a725f38e1e1b49ef6ca3a4209452ca149996071d28e47b SHA512 f5658d18b3b78e7757ddfc1ccdabc011076c009a7343eaad2748ca7aeb4d112bf19c70621cb938e7dcf1582c8bb7c5512017885ea51503b3ed274980b7d7c0b1
diff --git a/dev-ruby/power_assert/power_assert-1.1.7.ebuild b/dev-ruby/power_assert/power_assert-1.1.7.ebuild
deleted file mode 100644
index 1056c61f570d..000000000000
--- a/dev-ruby/power_assert/power_assert-1.1.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="power_assert.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shows each value of variables and method calls in the expression"
-HOMEPAGE="https://github.com/k-tsj/power_assert"
-SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
-	sed -i -e '1igem "test-unit"' \
-		-e '/byebug/ s:^:#:' test/test_helper.rb || die
-
-	# Avoid git dependency
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid circular dependency on byebug when bootstrapping ruby
-	sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' test/test_helper.rb || die
-	rm test/test_core_ext_helper.rb test/trace_test.rb || die
-
-	# Avoid circular dependency on pry when bootstrapping ruby
-	sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^    end/ s:^:#:' test/block_test.rb || die
-}
diff --git a/dev-ruby/power_assert/power_assert-1.2.0.ebuild b/dev-ruby/power_assert/power_assert-1.2.0.ebuild
deleted file mode 100644
index 18a85b535c72..000000000000
--- a/dev-ruby/power_assert/power_assert-1.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="power_assert.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shows each value of variables and method calls in the expression"
-HOMEPAGE="https://github.com/ruby/power_assert"
-SRC_URI="https://github.com/ruby/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
-	sed -i -e '1igem "test-unit"' \
-		-e '/byebug/ s:^:#:' test/test_helper.rb || die
-
-	# Avoid git dependency
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid circular dependency on byebug when bootstrapping ruby
-	sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' test/test_helper.rb || die
-	rm test/test_core_ext_helper.rb test/trace_test.rb || die
-
-	# Avoid circular dependency on pry when bootstrapping ruby
-	sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^    end/ s:^:#:' test/block_test.rb || die
-}
diff --git a/dev-ruby/power_assert/power_assert-2.0.0.ebuild b/dev-ruby/power_assert/power_assert-2.0.0.ebuild
deleted file mode 100644
index cdd3a84795ff..000000000000
--- a/dev-ruby/power_assert/power_assert-2.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="power_assert.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shows each value of variables and method calls in the expression"
-HOMEPAGE="https://github.com/ruby/power_assert"
-SRC_URI="https://github.com/ruby/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
-	sed -i -e '1igem "test-unit"' \
-		-e '/byebug/ s:^:#:' test/test_helper.rb || die
-
-	# Avoid git dependency
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid circular dependency on byebug when bootstrapping ruby
-	sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' test/test_helper.rb || die
-	rm test/test_core_ext_helper.rb test/trace_test.rb || die
-
-	# Avoid circular dependency on pry when bootstrapping ruby
-	sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^    end/ s:^:#:' test/block_test.rb || die
-}
diff --git a/dev-ruby/power_assert/power_assert-2.0.1.ebuild b/dev-ruby/power_assert/power_assert-2.0.1.ebuild
deleted file mode 100644
index 12835b10bbca..000000000000
--- a/dev-ruby/power_assert/power_assert-2.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="power_assert.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shows each value of variables and method calls in the expression"
-HOMEPAGE="https://github.com/ruby/power_assert"
-SRC_URI="https://github.com/ruby/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( Ruby 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"
-
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
-	sed -i -e '1igem "test-unit"' \
-		-e '/byebug/ s:^:#:' test/test_helper.rb || die
-
-	# Avoid git dependency
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid circular dependency on byebug when bootstrapping ruby
-	sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' test/test_helper.rb || die
-	rm test/test_core_ext_helper.rb test/trace_test.rb || die
-
-	# Avoid circular dependency on pry when bootstrapping ruby
-	sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^    end/ s:^:#:' test/block_test.rb || die
-}
diff --git a/dev-ruby/power_assert/power_assert-2.0.3.ebuild b/dev-ruby/power_assert/power_assert-2.0.3.ebuild
new file mode 100644
index 000000000000..938100be1fb0
--- /dev/null
+++ b/dev-ruby/power_assert/power_assert-2.0.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="power_assert.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Shows each value of variables and method calls in the expression"
+HOMEPAGE="https://github.com/ruby/power_assert"
+SRC_URI="https://github.com/ruby/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="|| ( Ruby BSD-2 )"
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
+	sed -i -e '1igem "test-unit"' \
+		-e '/byebug/ s:^:#:' test/test_helper.rb || die
+
+	# Avoid git dependency
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid circular dependency on byebug when bootstrapping ruby
+	sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' test/test_helper.rb || die
+	rm test/test_core_ext_helper.rb test/trace_test.rb || die
+
+	# Avoid circular dependency on pry when bootstrapping ruby
+	sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^    end/ s:^:#:' test/block_test.rb || die
+}
diff --git a/dev-ruby/prawn-table/prawn-table-0.2.2-r2.ebuild b/dev-ruby/prawn-table/prawn-table-0.2.2-r2.ebuild
index 514a0845f681..a73d4daa132d 100644
--- a/dev-ruby/prawn-table/prawn-table-0.2.2-r2.ebuild
+++ b/dev-ruby/prawn-table/prawn-table-0.2.2-r2.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"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/prawn/Manifest b/dev-ruby/prawn/Manifest
index d3e45e2289af..89379d489135 100644
--- a/dev-ruby/prawn/Manifest
+++ b/dev-ruby/prawn/Manifest
@@ -1 +1,2 @@
 DIST prawn-2.4.0.tar.gz 5239492 BLAKE2B 5435d7715d2b3020316a04cbf2db1b7793435f2d05d34aae4832e12908a928f689c86d358562e7cd1c2675171a1743757097f0af3357eb667e4e2b9462890590 SHA512 e9fcc31ad2b5aa23592a8bf9419153fcb3080e00e53c9a91b50edc526631227fe86769eeb09336d267ea8f0a94f12336f71b24adc4d5cd9e750367d51f07c867
+DIST prawn-2.5.0.tar.gz 5254375 BLAKE2B e523522868716a3d4926cbbeb33b6d71ce8211065b66a1633e351465e9a9e5c6b62e2de066302c366964df468d6c494393c3afb011f7b91392bc6d0940e55ec9 SHA512 1feb425867c276dd4dcf27f5086c75700ef191e68a1a91756cfd4058540b268dfc29b0d249d281e7ded6e2d2bf7aa56065e6173c4c9caf4d568dc8e4ad66e08d
diff --git a/dev-ruby/prawn/prawn-2.4.0-r3.ebuild b/dev-ruby/prawn/prawn-2.4.0-r3.ebuild
new file mode 100644
index 000000000000..4c63deb9ceee
--- /dev/null
+++ b/dev-ruby/prawn/prawn-2.4.0-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_GEMSPEC="prawn.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Fast, Nimble PDF Generation For Ruby"
+HOMEPAGE="https://prawnpdf.org/"
+SRC_URI="https://github.com/prawnpdf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="|| ( GPL-2 GPL-3 Ruby )"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	=dev-ruby/matrix-0.4*
+	=dev-ruby/pdf-core-0.9*
+	>=dev-ruby/ttfunk-1.7:*
+"
+ruby_add_bdepend "test? ( dev-ruby/coderay
+	>=dev-ruby/pdf-inspector-1.2.1
+	>=dev-ruby/pdf-reader-1.4
+	)"
+
+all_ruby_prepare() {
+	sed -i -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e "/[Bb]undler/d" Rakefile spec/spec_helper.rb || die
+
+	# Remove test that needs unpackaged dependency
+	rm -f spec/prawn_manual_spec.rb || die
+}
diff --git a/dev-ruby/prawn/prawn-2.4.0.ebuild b/dev-ruby/prawn/prawn-2.4.0.ebuild
deleted file mode 100644
index e22a8357294a..000000000000
--- a/dev-ruby/prawn/prawn-2.4.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-RUBY_FAKEGEM_GEMSPEC="prawn.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Fast, Nimble PDF Generation For Ruby"
-HOMEPAGE="https://prawnpdf.org/"
-SRC_URI="https://github.com/prawnpdf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/pdf-core-0.9*
-	>=dev-ruby/ttfunk-1.7:*"
-ruby_add_bdepend "test? ( dev-ruby/coderay
-	>=dev-ruby/pdf-inspector-1.2.1
-	>=dev-ruby/pdf-reader-1.4
-	)"
-
-all_ruby_prepare() {
-	sed -i -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e "/[Bb]undler/d" Rakefile spec/spec_helper.rb || die
-
-	# Remove test that needs unpackaged dependency
-	rm -f spec/prawn_manual_spec.rb || die
-}
diff --git a/dev-ruby/prawn/prawn-2.5.0.ebuild b/dev-ruby/prawn/prawn-2.5.0.ebuild
new file mode 100644
index 000000000000..f0f67e5ce12b
--- /dev/null
+++ b/dev-ruby/prawn/prawn-2.5.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_GEMSPEC="prawn.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Fast, Nimble PDF Generation For Ruby"
+HOMEPAGE="https://prawnpdf.org/"
+SRC_URI="https://github.com/prawnpdf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="|| ( GPL-2 GPL-3 Ruby )"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	=dev-ruby/matrix-0.4*
+	=dev-ruby/pdf-core-0.10*
+	>=dev-ruby/ttfunk-1.8:*
+"
+ruby_add_bdepend "test? ( dev-ruby/coderay
+	>=dev-ruby/pdf-inspector-1.2.1
+	>=dev-ruby/pdf-reader-1.4
+	)"
+
+all_ruby_prepare() {
+	sed -i -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e "/[Bb]undler/d" Rakefile spec/spec_helper.rb || die
+
+	# Remove test that needs unpackaged dependency
+	rm -f spec/prawn_manual_spec.rb || die
+}
diff --git a/dev-ruby/prime/Manifest b/dev-ruby/prime/Manifest
new file mode 100644
index 000000000000..6c571fc28d5f
--- /dev/null
+++ b/dev-ruby/prime/Manifest
@@ -0,0 +1 @@
+DIST prime-0.1.2.tar.gz 9485 BLAKE2B 88db1d22a33405de0bd216baa0a8fa28abc61fe031ae6042a19f0a5c66cf7733b946a52f94165112b45b23331dc68e3168541ec89329ad8d2c016bbf1e33f425 SHA512 a766426884d6b3cd7a586676799db146974ec9a4a7c30ca53b5f279ad55ee9960c9b5bb26988cb66253b4fe974f9b5087f48ef5b216772464d03b8ed78a817d6
diff --git a/dev-ruby/prime/metadata.xml b/dev-ruby/prime/metadata.xml
new file mode 100644
index 000000000000..82f9f0cd0cba
--- /dev/null
+++ b/dev-ruby/prime/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/prime</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/prime/prime-0.1.2-r1.ebuild b/dev-ruby/prime/prime-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..32120ce607cb
--- /dev/null
+++ b/dev-ruby/prime/prime-0.1.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="prime.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Prime numbers and factorization library"
+HOMEPAGE="https://github.com/ruby/prime"
+SRC_URI="https://github.com/ruby/prime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/forwardable
+	dev-ruby/singleton
+"
+
+all_ruby_prepare() {
+	sed -e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/propshaft/Manifest b/dev-ruby/propshaft/Manifest
index a8b03693e954..98444331380f 100644
--- a/dev-ruby/propshaft/Manifest
+++ b/dev-ruby/propshaft/Manifest
@@ -1,2 +1,2 @@
-DIST propshaft-0.6.1-git.tgz 245087 BLAKE2B 6e04ebc0315c263f79dbfc9f836b270b8b693e1a7e332a97d8abe5cc6555d0acc9efe3ae7979c901ca2c502460e8ee67b83420863d5dabdf50fbc2028aacd5b9 SHA512 35600b7e051810c7f0798f29faab7c7bcabf04198fc56ee9a4492d18ddfabf543cfbf11c28f35eb5e2a64eb57c65b95567e00441852ac0f29d8538ad8d5cb1b4
-DIST propshaft-0.6.4-git.tgz 245384 BLAKE2B 8089c7ee8f8d41f761a31bcd4751899da86302cdf7e1d5a9ba673e8a64431b0e35bbfa7d09fb0caa5ca06457b7134f27c3f37ade213922d616b374adac9824c5 SHA512 3302e1a0ef4bd47094566b393db77f1181e3e3b67c08b18694cea48b4518a45893dc16238ce1d86965d0b37894069ddbe7040392e7cdcad5caa80d7ff86bf2eb
+DIST propshaft-0.7.0-git.tgz 247111 BLAKE2B aecf4dcab9b57f1933e8f7066f4b229348cf60e4104cc82e14edb945e797a263012fe5b7b65de8ff0165e652256a0bd8fba24af8f08d8e9391050e36e56d5f31 SHA512 3d6dba7a3b5b522f3e4a9f43dc6b9981fbb475374be0b90c8abb2f19c587d025b58876ddb6a9e1b9992e3f357a96b50b6138173d10b8ae131e9457309b8cc0c9
+DIST propshaft-0.8.0-git.tgz 247518 BLAKE2B fe57104a1abd683d74a3166931256f2cdc8e942fffe80c286acfc6db6fa105810bc929f03dd959a660835f030acb580dbd18e7b20f16cfb168b0953731bb2f90 SHA512 3a40355063edb912107ec27ac43ba76746bbd04da04096a4480b43f6fd103bfaec53957d1bbc2bf3d0e08237d965af4d3bf8067b558c4e417ffb506a84f1abff
diff --git a/dev-ruby/propshaft/propshaft-0.6.1.ebuild b/dev-ruby/propshaft/propshaft-0.6.1.ebuild
deleted file mode 100644
index 7bfc73881f6a..000000000000
--- a/dev-ruby/propshaft/propshaft-0.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="propshaft.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Deliver assets for Rails"
-HOMEPAGE="https://github.com/rails/propshaft"
-SRC_URI="https://github.com/rails/propshaft/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/actionpack-7.0.0:*
-	>=dev-ruby/activesupport-7.0.0:*
-	dev-ruby/rack:*
-	>=dev-ruby/railties-7.0.0:*
-"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-	sed -i -e '/debug/ s:^:#:' Gemfile || die
-
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/propshaft/propshaft-0.6.4.ebuild b/dev-ruby/propshaft/propshaft-0.6.4.ebuild
deleted file mode 100644
index 2a302f0f80fa..000000000000
--- a/dev-ruby/propshaft/propshaft-0.6.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="propshaft.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Deliver assets for Rails"
-HOMEPAGE="https://github.com/rails/propshaft"
-SRC_URI="https://github.com/rails/propshaft/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/actionpack-7.0.0:*
-	>=dev-ruby/activesupport-7.0.0:*
-	dev-ruby/rack:*
-	>=dev-ruby/railties-7.0.0:*
-"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rails-7.0.0 )"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-	sed -i -e '/debug/ s:^:#:' Gemfile || die
-
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/propshaft/propshaft-0.7.0-r1.ebuild b/dev-ruby/propshaft/propshaft-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..fec829a55e50
--- /dev/null
+++ b/dev-ruby/propshaft/propshaft-0.7.0-r1.ebuild
@@ -0,0 +1,38 @@
+# 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_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="propshaft.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Deliver assets for Rails"
+HOMEPAGE="https://github.com/rails/propshaft"
+SRC_URI="https://github.com/rails/propshaft/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/actionpack-7.0.0:*
+	>=dev-ruby/activesupport-7.0.0:*
+	dev-ruby/rack:*
+	>=dev-ruby/railties-7.0.0:*
+"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rails-7.0.0 )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	sed -i -e '/debug/ s:^:#:' Gemfile || die
+
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/propshaft/propshaft-0.8.0.ebuild b/dev-ruby/propshaft/propshaft-0.8.0.ebuild
new file mode 100644
index 000000000000..9f12429acd24
--- /dev/null
+++ b/dev-ruby/propshaft/propshaft-0.8.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="propshaft.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Deliver assets for Rails"
+HOMEPAGE="https://github.com/rails/propshaft"
+SRC_URI="https://github.com/rails/propshaft/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/actionpack-7.0.0:*
+	>=dev-ruby/activesupport-7.0.0:*
+	dev-ruby/rack:*
+	>=dev-ruby/railties-7.0.0:*
+"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rails-7.0.0 )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	sed -i -e '/debug/ s:^:#:' Gemfile || die
+
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/pry/Manifest b/dev-ruby/pry/Manifest
index 0eaac44be6b0..6684ca7b9907 100644
--- a/dev-ruby/pry/Manifest
+++ b/dev-ruby/pry/Manifest
@@ -1 +1 @@
-DIST pry-0.14.1.tar.gz 239261 BLAKE2B 46bba71668cbfcb710ebf4f8921d1b4cbaad887b1546b4566a90f9f246f1ff41451ccabb4a8692bb8a404532227aaa72b2d530fa4451bf1b7141cb6f57dfea1a SHA512 b258d1ae7ffd82c6fbed7edbd6e9bc64006eb54e3376a2f85b7482e0517be34efb46a2264975820cac3b7c0bea89b855b4d2a6fb104ff760f25667e1afb3ba44
+DIST pry-0.14.2.tar.gz 239170 BLAKE2B a6370affcee671b293f33f65613607009d46b361fa241e47a1828c85e484dc82909ab8d307c2d20545253dd19115875788d1ab151b793e90246df4a7fec28cff SHA512 890ab8399899864c109919637e2641cafaf2d895db6ab4912bf856799708e08a68f4c9fbb5c505a75c160af30c4eabccfd52fa92cfa1dd3be7ae776ba0476660
diff --git a/dev-ruby/pry/pry-0.14.1.ebuild b/dev-ruby/pry/pry-0.14.1.ebuild
deleted file mode 100644
index 50feef9b7db5..000000000000
--- a/dev-ruby/pry/pry-0.14.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-RUBY_FAKEGEM_GEMSPEC=${PN}.gemspec
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pry is a powerful alternative to the standard IRB shell for Ruby"
-HOMEPAGE="https://github.com/pry/pry/wiki"
-SRC_URI="https://github.com/pry/pry/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE=""
-SLOT="ruby19"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-ruby_add_rdepend "
-	>=dev-ruby/coderay-1.1:0
-	=dev-ruby/method_source-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/open4-1.3
-		>=dev-ruby/rake-0.9
-		>=dev-ruby/mocha-1.0
-	)"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on git.
-	# Loosen coderay dependency.
-	sed -e '/git ls-files/d' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -e '/[Bb]undler/d' -i spec/spec_helper.rb || die
-
-	# Skip integration tests because they depend to much on specifics of the environment.
-	rm -f spec/integration/* || die
-	sed -i -e '/loads files through repl and exits/askip "depends on parent directory"' spec/cli_spec.rb || die
-}
diff --git a/dev-ruby/pry/pry-0.14.2.ebuild b/dev-ruby/pry/pry-0.14.2.ebuild
new file mode 100644
index 000000000000..a0d156fd38c1
--- /dev/null
+++ b/dev-ruby/pry/pry-0.14.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+RUBY_FAKEGEM_GEMSPEC=${PN}.gemspec
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pry is a powerful alternative to the standard IRB shell for Ruby"
+HOMEPAGE="https://github.com/pry/pry/wiki"
+SRC_URI="https://github.com/pry/pry/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE=""
+SLOT="ruby19"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/coderay-1.1:0
+	=dev-ruby/method_source-1*"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/open4-1.3
+		>=dev-ruby/rake-0.9
+		>=dev-ruby/mocha-1.0
+	)"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on git.
+	# Loosen coderay dependency.
+	sed -e '/git ls-files/d' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -e '/[Bb]undler/d' -i spec/spec_helper.rb || die
+
+	# Skip integration tests because they depend to much on specifics of the environment.
+	rm -f spec/integration/* || die
+	sed -i -e '/loads files through repl and exits/askip "depends on parent directory"' spec/cli_spec.rb || die
+}
diff --git a/dev-ruby/psych/Manifest b/dev-ruby/psych/Manifest
index cbdc73f0a669..c9090fc54232 100644
--- a/dev-ruby/psych/Manifest
+++ b/dev-ruby/psych/Manifest
@@ -1,2 +1,4 @@
-DIST psych-4.0.3.gem 93184 BLAKE2B dd3dbd561a4abd97dfc5396d17966dca20205b8f5e7a13f858398ac7160610fb623a63b4e70cd91516c7e6e64fa5cb9986b9e3fa3c74dbb7b0752cb37f0467b9 SHA512 d28d3d4e5f9e00949f8ead2ef2224ac494c5d1b6d8c45f176e0563500829dab85b2366f10cd7b01339b4a4b6bf8f57c4616b84e3d3e245e551e382ebb3b6d0ad
-DIST psych-4.0.4.gem 93696 BLAKE2B a70998ff33cf6590d6f9743b1b0b60907ce104f349aa8bdc011560d9d131c6e0563fc204128a39ebeb63c7d3e6336dc024ef2613c274453dfeb3b37960a2782b SHA512 976f2686b00339c98da125a19ca4128a3c3098a1ae5980a3a8b0adf521c8bda4610dd0df0180f9ca0b902b98f0dac93e081d8270ea2f0799e20addb0bf8275a2
+DIST psych-4.0.6.gem 93696 BLAKE2B f5bea8262b401c0c291514dbd5ddc4aff389aeadb0b6483901b70a9562d267460260ddc5991e1540e51fb371a79d3a4a831bfdb8cb0b5dd9bd53cac939287545 SHA512 31f0ff5cd48e80ae81977f9519aa7952685b2da4a88b202aeb7214a364932cb1ca256f0934bed158d44a7d4d6e8cbb34928d33e731d0a8ba1a9885733ed32cd1
+DIST psych-5.1.0.gem 39936 BLAKE2B f4d1b2b3699e36cf5f5101ad038ac3fd2e44b434df3e91516b850511684daeeb1eda32901ffbff870f533b8bda859b09bbd63e5ebe8a5ca3ce271ce869ef3a16 SHA512 94dd2a7b98d9d452fb24ba14d42d91969aa0d93f5737728e41a5032d76bad45d0e0b365f53447664cece448559d2e47ab35d95b4989016d9f0daf03b76d8a5cc
+DIST psych-5.1.1.tar.gz 84699 BLAKE2B 5b45ddf8964c6bbbc7cac641d80c2967805125dfe338a2383a4f2c413b75b74d6ff5f2c0885ec1ad75c8f406afeaa5ba4fbf12e2bbc6abffb0d41cd88cc570a3 SHA512 a417459b038c1b9c66a93e7666c62c556ea0d2728405fb3ddde309ccd87a92992b82cca1f6be592395cfac75f6ac24e8ee52b8aa0c0cf28233e1cab0bf8a3a2f
+DIST psych-5.1.2.tar.gz 84689 BLAKE2B 868b653f28aa158777db34f33a76059e3f9565293328874af72ead5c2495fcdfabc145acfa5da8aecb0f4549f1012ad54e126274a7b8623188542363616099f7 SHA512 ed5440088c50bab86757b642f444903c804628ec361d138f54d2416def9c9fdd9728ece61fd6b4b56f47b13ab604aa99afb5710f49fcee0cf4ca3492f8cd7013
diff --git a/dev-ruby/psych/psych-4.0.3.ebuild b/dev-ruby/psych/psych-4.0.3.ebuild
deleted file mode 100644
index db09181668bb..000000000000
--- a/dev-ruby/psych/psych-4.0.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTENSIONS=(ext/psych/extconf.rb)
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A YAML parser and emitter"
-HOMEPAGE="https://github.com/ruby/psych"
-
-LICENSE="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"
-SLOT="0"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/stringio"
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/psych/psych-4.0.4.ebuild b/dev-ruby/psych/psych-4.0.4.ebuild
deleted file mode 100644
index d3011b57e062..000000000000
--- a/dev-ruby/psych/psych-4.0.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTENSIONS=(ext/psych/extconf.rb)
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A YAML parser and emitter"
-HOMEPAGE="https://github.com/ruby/psych"
-
-LICENSE="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"
-SLOT="0"
-IUSE="test"
-
-RDEPEND+=" >=dev-libs/libyaml-0.2.5"
-BDEPEND+=" >=dev-libs/libyaml-0.2.5"
-
-ruby_add_rdepend "dev-ruby/stringio"
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/psych/psych-4.0.6.ebuild b/dev-ruby/psych/psych-4.0.6.ebuild
new file mode 100644
index 000000000000..9650d7d5a646
--- /dev/null
+++ b/dev-ruby/psych/psych-4.0.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/psych/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A YAML parser and emitter"
+HOMEPAGE="https://github.com/ruby/psych"
+
+LICENSE="BSD-2"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+RDEPEND+=" >=dev-libs/libyaml-0.2.5"
+BDEPEND+=" >=dev-libs/libyaml-0.2.5"
+
+ruby_add_rdepend "dev-ruby/stringio"
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/psych/psych-5.1.0.ebuild b/dev-ruby/psych/psych-5.1.0.ebuild
new file mode 100644
index 000000000000..bb50d15c44e8
--- /dev/null
+++ b/dev-ruby/psych/psych-5.1.0.ebuild
@@ -0,0 +1,28 @@
+# 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/psych/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A YAML parser and emitter"
+HOMEPAGE="https://github.com/ruby/psych"
+
+LICENSE="BSD-2"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+RDEPEND+=" >=dev-libs/libyaml-0.2.5"
+BDEPEND+=" >=dev-libs/libyaml-0.2.5"
+
+ruby_add_rdepend "dev-ruby/stringio"
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/psych/psych-5.1.1.ebuild b/dev-ruby/psych/psych-5.1.1.ebuild
new file mode 100644
index 000000000000..43ecf2660829
--- /dev/null
+++ b/dev-ruby/psych/psych-5.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/psych/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="psych.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A YAML parser and emitter"
+HOMEPAGE="https://github.com/ruby/psych"
+SRC_URI="https://github.com/ruby/psych/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+RDEPEND+=" >=dev-libs/libyaml-0.2.5"
+BDEPEND+=" >=dev-libs/libyaml-0.2.5"
+
+ruby_add_rdepend "dev-ruby/stringio"
+
+ruby_add_bdepend "test? (
+	dev-ruby/test-unit
+	dev-ruby/test-unit-ruby-core
+)"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC}
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'require "lib/helper"; Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/psych/psych-5.1.2.ebuild b/dev-ruby/psych/psych-5.1.2.ebuild
new file mode 100644
index 000000000000..554a73d1edcc
--- /dev/null
+++ b/dev-ruby/psych/psych-5.1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/psych/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="psych.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A YAML parser and emitter"
+HOMEPAGE="https://github.com/ruby/psych"
+SRC_URI="https://github.com/ruby/psych/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+RDEPEND+=" >=dev-libs/libyaml-0.2.5"
+BDEPEND+=" >=dev-libs/libyaml-0.2.5"
+
+ruby_add_rdepend "dev-ruby/stringio"
+
+ruby_add_bdepend "test? (
+	dev-ruby/test-unit
+	dev-ruby/test-unit-ruby-core
+)"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC}
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'require "lib/helper"; Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/ptools/Manifest b/dev-ruby/ptools/Manifest
new file mode 100644
index 000000000000..37a92028caee
--- /dev/null
+++ b/dev-ruby/ptools/Manifest
@@ -0,0 +1 @@
+DIST ptools-1.5.0.gem 53760 BLAKE2B 49de9513c33dc2840138a88cfc3ab85639426f731138a62c746612715509b6426032e72d59f7789deb3a932de88e81fd0762f744a7abc5be09e782b68eb22647 SHA512 e79b069dc50796ba979c34028d11e65804b398c60328edb349ef6dec6c133166aecc1255fe583bdb06f7b2a7d835de77dd7ec38180d3b23e3f7d321d7e0724e9
diff --git a/dev-ruby/ptools/metadata.xml b/dev-ruby/ptools/metadata.xml
new file mode 100644
index 000000000000..d79192dd637e
--- /dev/null
+++ b/dev-ruby/ptools/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">djberg96/ptools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/ptools/ptools-1.5.0.ebuild b/dev-ruby/ptools/ptools-1.5.0.ebuild
new file mode 100644
index 000000000000..15540d481f24
--- /dev/null
+++ b/dev-ruby/ptools/ptools-1.5.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Several handy methods to Ruby's core File class"
+HOMEPAGE="https://github.com/djberg96/ptools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+#ruby_add_bdepend "test? ( dev-ruby/mkmf-lite )"
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index f40da1499314..e9633b432ebd 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -1,3 +1,4 @@
-DIST public_suffix-3.1.1.gem 99840 BLAKE2B ef86b7ecb834a855dbb44b8a0f934de3715edb6d67faefd20f99054898b35bfedffd490b60fbe80236905826868611aa96e13766577bb98ab997321cf9c49b39 SHA512 1e266ed7fa224fa94a49a51dae2868bdadb80ca2de660d2cda9a1e146ccad5aaba2cf68d75272e333a4b1a80e47863d388d85d3a86bddf8f649a320e5e700078
-DIST public_suffix-4.0.6.gem 108032 BLAKE2B 4cbb10ddd924daf11d97a54d18550961f46c0951dd3dc1f23740ee7500fd8e796e78fd6421a7418a49350a69eca7d6456a09810be317ad4619ef3d3e7f71ff69 SHA512 a756c0f8f9cee2d12bd1730280108b72befa362defda12e5f6d7af6d68c40e31478c337b3eb7e7407feff9531082051d18928861003c7ba29679b4048da3b4b1
 DIST public_suffix-4.0.7.gem 113664 BLAKE2B 5da86713da01f59e7f311985a36b835e02807ca5f186ffc5e41e42cae7781cc10d96a4aca77dafb77050c78e6fb03e10f7ac55dace776c5cca68bca9f4bd7d75 SHA512 acdfe135684277a669ceaa61ea78fc70b979614f63daf27d145e78e4013221eac106651838a27b6694844f4fc33521ecc9f81102582ca1f1232fa80ce8191207
+DIST public_suffix-5.0.3.gem 113152 BLAKE2B e14a5c343f4db466a31c3a84c95f810d82b5bf64d6be9e0690d9639aaae8feec91ffb1e867dcb3664027426c436396a090a7051189308414b76c4f962c899930 SHA512 7d8c1c0ff951458060dfee4247cfdb04a3f875f97e8451e2955b05335c9ea8480612be1455280ee86c9b2a1c62d0dac663d67b68825d8ce3a99ef63c5841017d
+DIST public_suffix-5.0.4.tar.gz 111469 BLAKE2B 6719dc40206f5dc2bb8152576ca82d1321b1789fd8b085d20d1246d4f5f44f64116f9a62cbd55053a066c6b99fbe200951f13862d0a4136a62c235147f65fd4a SHA512 d42bd895387739d87579249ff4799fb5a49c49a2e4cbf4f22dd0b42a252b264d813549bf86d6c327d85e7d38fbdd97681d777adf2ff8398025dafd9eac655654
+DIST public_suffix-5.0.5.tar.gz 112703 BLAKE2B aa23f94cbccb380e38fd63521516038f180f32a2e5c1c4fd800063f9cd1859c388cdd2e0bca13f76c9cf1ff16f03a34eb5ea1a6ac75e4eb98970d516e01df6a5 SHA512 4b785474b7fb726dbfe66b6c1c801eb9a75d5e555c69e678cf8253112facd9dc98fd76c07f43ff74eb310beaf7e063344e8a6484dfe4b8cfea2557510f22ae9f
diff --git a/dev-ruby/public_suffix/public_suffix-3.1.1.ebuild b/dev-ruby/public_suffix/public_suffix-3.1.1.ebuild
deleted file mode 100644
index 954658807691..000000000000
--- a/dev-ruby/public_suffix/public_suffix-3.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
-HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
-
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-LICENSE="MIT"
-SLOT="3"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/rubocop/I s:^:#:' \
-		-e '/yardoc/,/CLOBBER.include/ s:^:#:' \
-		-e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/reporters/I s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild b/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild
deleted file mode 100644
index 8e9fe4219951..000000000000
--- a/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
-HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
-
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/mocha:1.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/rubocop/I s:^:#:' \
-		-e '/yardoc/,/CLOBBER.include/ s:^:#:' \
-		-e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/reporters/I s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/public_suffix/public_suffix-4.0.7.ebuild b/dev-ruby/public_suffix/public_suffix-4.0.7.ebuild
index 6b42d2313e8a..30c96ea38f8b 100644
--- a/dev-ruby/public_suffix/public_suffix-4.0.7.ebuild
+++ b/dev-ruby/public_suffix/public_suffix-4.0.7.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRAINSTALL="data"
 
@@ -14,12 +14,12 @@ inherit ruby-fakegem
 DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
 HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
-ruby_add_bdepend "test? ( dev-ruby/mocha:1.0 )"
+ruby_add_bdepend "test? ( dev-ruby/mocha:2 )"
 
 all_ruby_prepare() {
 	sed -i -e '/rubocop/I s:^:#:' \
diff --git a/dev-ruby/public_suffix/public_suffix-5.0.3.ebuild b/dev-ruby/public_suffix/public_suffix-5.0.3.ebuild
new file mode 100644
index 000000000000..30c96ea38f8b
--- /dev/null
+++ b/dev-ruby/public_suffix/public_suffix-5.0.3.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="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
+HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
+
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/mocha:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/rubocop/I s:^:#:' \
+		-e '/yard/,/CLOBBER.include/ s:^:#:' \
+		-e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/reporters/I s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/public_suffix/public_suffix-5.0.4.ebuild b/dev-ruby/public_suffix/public_suffix-5.0.4.ebuild
new file mode 100644
index 000000000000..6492c9b38017
--- /dev/null
+++ b/dev-ruby/public_suffix/public_suffix-5.0.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+RUBY_FAKEGEM_GEMSPEC="public_suffix.gemspec"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
+HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
+SRC_URI="https://github.com/weppos/publicsuffix-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="publicsuffix-ruby-${PV}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/mocha:2 )"
+
+all_ruby_prepare() {
+	sed -e 's:_relative ": "./:' \
+		-e 's/__dir__/"."/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/rubocop/I s:^:#:' \
+		-e '/yard/,/CLOBBER.include/ s:^:#:' \
+		-e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/reporters/I s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/public_suffix/public_suffix-5.0.5.ebuild b/dev-ruby/public_suffix/public_suffix-5.0.5.ebuild
new file mode 100644
index 000000000000..005e30ea60ff
--- /dev/null
+++ b/dev-ruby/public_suffix/public_suffix-5.0.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+RUBY_FAKEGEM_GEMSPEC="public_suffix.gemspec"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
+HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
+SRC_URI="https://github.com/weppos/publicsuffix-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="publicsuffix-ruby-${PV}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha:2 )"
+
+all_ruby_prepare() {
+	sed -e 's:_relative ": "./:' \
+		-e 's/__dir__/"."/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/rubocop/I s:^:#:' \
+		-e '/yard/,/CLOBBER.include/ s:^:#:' \
+		-e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/reporters/I s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/pundit/Manifest b/dev-ruby/pundit/Manifest
index 986d61a757e3..313c1c6b5db3 100644
--- a/dev-ruby/pundit/Manifest
+++ b/dev-ruby/pundit/Manifest
@@ -1,2 +1,2 @@
-DIST pundit-2.1.1.gem 26112 BLAKE2B de517b25d0d062c2a85b6ca28b6dc8ebcea25f4786435788e90394ad29338462073c946d7127172766baeced6dc98d0e21923220b1371861f200b73fe09039e9 SHA512 d5463e21801ef04e82500c671ccbee0e8fb1576a8b7b86283ecc80d1c6e81cd375abf3c81ee5fad8323eb3ba0c296df43c9a78fafc2cd6e7797f1447d02ede0d
-DIST pundit-2.2.0.gem 27136 BLAKE2B 560843f9e1d19c551ee9bdeb3ead856a483dff68187da20c463fd01cbf1ca68f48adf6d4b9589b2c755cf6c860fba98b3719af8732e9f4c284c7dc4b2a1b2f5b SHA512 fcb8c9305e7ce9301142bd62c08856ee29cf5227d63ae36ccc894c4a3b19ec9c03625c3742890e9aeabc2fc8877a5d9527d28ecc8084103bcfa8321d87458a44
+DIST pundit-2.3.0.gem 27136 BLAKE2B 651f008426ce010c8a5be8543cde5c91f1bb8c6513e08cde4c4fda965fa95647f130d0a68094107be0b0c639ab520a74da0c2a50715ec5bd86a7a9243cf53686 SHA512 5a2c8563ab8402d3454afae499368b06d0a7ce23b59fdade3034da06604b025a567c4f9bc745bbc8a51226d768fad99b9057ff38c2930258d943265053a09636
+DIST pundit-2.3.1.gem 27648 BLAKE2B f81bececa11fb4df90779e7a92abb3854f77e47207afb162fdbaac1b23448018b04a35808bac7857e4f766eab949802a58b16ba8ed2331ccd3457a88826fda0d SHA512 dc919a8879aa613efa1b3ebf0c9a3673a060d50814a5ec6b3cc4120dceda407e483d9c265d08d5bf4a1cbe56a0ea698ecbc485f24fe0325a9b90635bc1cc125a
diff --git a/dev-ruby/pundit/metadata.xml b/dev-ruby/pundit/metadata.xml
index ffce597f4798..a4b9e2f5d6cf 100644
--- a/dev-ruby/pundit/metadata.xml
+++ b/dev-ruby/pundit/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">elabs/pundit</remote-id>
+		<remote-id type="github">varvet/pundit</remote-id>
 		<remote-id type="rubygems">pundit</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/pundit/pundit-2.1.1.ebuild b/dev-ruby/pundit/pundit-2.1.1.ebuild
deleted file mode 100644
index aa5c64669fdb..000000000000
--- a/dev-ruby/pundit/pundit-2.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Object oriented authorization for Rails applications"
-HOMEPAGE="https://github.com/elabs/pundit https://rubygems.org/gems/pundit"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0:*"
-
-ruby_add_bdepend "test? ( >=dev-ruby/actionpack-3.0.0
-	>=dev-ruby/activemodel-3.0.0 )"
-
-all_ruby_prepare() {
-	sed -i -e "/pry/d" -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/pundit/pundit-2.2.0.ebuild b/dev-ruby/pundit/pundit-2.2.0.ebuild
deleted file mode 100644
index db4c1e55370c..000000000000
--- a/dev-ruby/pundit/pundit-2.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Object oriented authorization for Rails applications"
-HOMEPAGE="https://github.com/elabs/pundit https://rubygems.org/gems/pundit"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0:*"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/actionpack-3.0.0
-	>=dev-ruby/activemodel-3.0.0
-	>=dev-ruby/railties-3.0.0
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/pry/d" -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/pundit/pundit-2.3.0.ebuild b/dev-ruby/pundit/pundit-2.3.0.ebuild
new file mode 100644
index 000000000000..4c7a17a0feb1
--- /dev/null
+++ b/dev-ruby/pundit/pundit-2.3.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Object oriented authorization for Rails applications"
+HOMEPAGE="https://github.com/varvet/pundit https://rubygems.org/gems/pundit"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0:*"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/actionpack-3.0.0
+	>=dev-ruby/activemodel-3.0.0
+	>=dev-ruby/railties-3.0.0
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/pry/d" -e '/simplecov/,/^end/ s:^:#:' -e '2igem "rack", "~> 2.0"' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/pundit/pundit-2.3.1.ebuild b/dev-ruby/pundit/pundit-2.3.1.ebuild
new file mode 100644
index 000000000000..4c7a17a0feb1
--- /dev/null
+++ b/dev-ruby/pundit/pundit-2.3.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Object oriented authorization for Rails applications"
+HOMEPAGE="https://github.com/varvet/pundit https://rubygems.org/gems/pundit"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0:*"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/actionpack-3.0.0
+	>=dev-ruby/activemodel-3.0.0
+	>=dev-ruby/railties-3.0.0
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/pry/d" -e '/simplecov/,/^end/ s:^:#:' -e '2igem "rack", "~> 2.0"' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/puppet-resource_api/Manifest b/dev-ruby/puppet-resource_api/Manifest
new file mode 100644
index 000000000000..264c8fd200e7
--- /dev/null
+++ b/dev-ruby/puppet-resource_api/Manifest
@@ -0,0 +1,2 @@
+DIST puppet-resource_api-1.8.16.tar.gz 167691 BLAKE2B 58aad4a73ef76fbccab580c1500b4af6a472f9bc9b7b0b1c592626abb837af6b34697194b5da884f87ce306f00f23d6f17ff7926e88ca2df3b0cd5770c819e9c SHA512 b60575d0e4f87425d028429403dd5524e39cb5ffea338871f7c5296d7e632d4eebc6786bdb7005e5c1be5e962115903b11dc9645dacd4d040d3afa43606a3ea2
+DIST puppet-resource_api-1.9.0.tar.gz 168292 BLAKE2B 469c59c07e22d7bb9cd9c00bb95b3efe5af8a1a985155ec5a0286f912a5afa95504d7fa9f24c6b00307d88e06dce035021f4c8570c9a7a81de7f5e195d1a4719 SHA512 009900910fc83bbc5d96d51d5d069a527c271786143c080774d90d6ba89f5451a2a949965f852a83a7d4ac964a9db0756c7f698d4f3f6c7631e4164ff545f9c6
diff --git a/dev-ruby/puppet-resource_api/metadata.xml b/dev-ruby/puppet-resource_api/metadata.xml
new file mode 100644
index 000000000000..706558282ad9
--- /dev/null
+++ b/dev-ruby/puppet-resource_api/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">puppetlabs/puppet-resource_api</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/puppet-resource_api/puppet-resource_api-1.8.16-r1.ebuild b/dev-ruby/puppet-resource_api/puppet-resource_api-1.8.16-r1.ebuild
new file mode 100644
index 000000000000..9c04a8628ae6
--- /dev/null
+++ b/dev-ruby/puppet-resource_api/puppet-resource_api-1.8.16-r1.ebuild
@@ -0,0 +1,40 @@
+# 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_EXTRADOC="CHANGELOG.md CONTRIBUTING.md HISTORY.md README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+# rspec tests have dependencies not packaged in Gentoo at this time:
+# puppetlabs_spec_helper
+# CFPropertyList
+# simplecov-console
+# spec-puppet
+# rubocop
+# rubocop-rspec
+# license_finder
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This library provides a simple way to write new native resources for puppet."
+HOMEPAGE="https://rubygems.org/gems/puppet-resource_api https://github.com/puppetlabs/puppet-resource_api"
+LICENSE="MIT"
+# 2023/03/19: .gem does not contain specfiles, and lags behind GitHub releases.
+SRC_URI="https://github.com/puppetlabs/puppet-resource_api/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	# the gemspec tries to system(git ls-files) but has a meaningful fallback, so just make it not run git.
+	sed -i -e '/git --help/s,git,false git,g' \
+		"${RUBY_FAKEGEM_GEMSPEC}" \
+		|| die
+}
+
+ruby_add_rdepend ">=dev-ruby/hocon-1.0"
diff --git a/dev-ruby/puppet-resource_api/puppet-resource_api-1.9.0.ebuild b/dev-ruby/puppet-resource_api/puppet-resource_api-1.9.0.ebuild
new file mode 100644
index 000000000000..194148a7cf54
--- /dev/null
+++ b/dev-ruby/puppet-resource_api/puppet-resource_api-1.9.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md HISTORY.md README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+# rspec tests have dependencies not packaged in Gentoo at this time:
+# puppetlabs_spec_helper
+# CFPropertyList
+# simplecov-console
+# spec-puppet
+# rubocop
+# rubocop-rspec
+# license_finder
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This library provides a simple way to write new native resources for puppet."
+HOMEPAGE="https://rubygems.org/gems/puppet-resource_api https://github.com/puppetlabs/puppet-resource_api"
+LICENSE="MIT"
+# 2023/03/19: .gem does not contain specfiles, and lags behind GitHub releases.
+SRC_URI="https://github.com/puppetlabs/puppet-resource_api/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	# the gemspec tries to system(git ls-files) but has a meaningful fallback, so just make it not run git.
+	sed -e 's:__FILE__:"puppet-resource_api.gemspec":' \
+		-e 's/__dir__/"."/' \
+		-i "${RUBY_FAKEGEM_GEMSPEC}" \
+		|| die
+}
+
+ruby_add_rdepend ">=dev-ruby/hocon-1.0"
diff --git a/dev-ruby/puppet_forge/Manifest b/dev-ruby/puppet_forge/Manifest
index 82af1fc11ec8..d4bcf25582ce 100644
--- a/dev-ruby/puppet_forge/Manifest
+++ b/dev-ruby/puppet_forge/Manifest
@@ -1 +1,5 @@
-DIST puppet_forge-2.3.4.gem 772608 BLAKE2B abb730eaf55a3c87a6f31b192e1efe6783895fad468c850f1e4e87d15dc8887b72571c425e81272c308e3ba9e94936f20b3ccbd22e670d7c111c88ce1acc1974 SHA512 f903f3ecbfdfe80b4c9d769ba1f622bf64cd723fd9165d1e3ed27296eb0e2e67f827fbc5faf460391e462cfd1cc652e573093dae29622726b3e5a37e01cf61ec
+DIST puppet_forge-3.2.0.gem 771072 BLAKE2B dd304297aa65dc0f36f837e27abf255a0474fc2216fa72ac3203febeb4085024f4d155e93a91646d1e7828fe67a5a421b2c75bb638deb846c5d337dfe11eafc9 SHA512 dfa82d96f44fb8247f39155c942bf20aec6a4a2833959c877ec98b150553076dd72112b6d1230fa7ae1acef7f648017a8446c3e952680f8d4a6411d2fc8055dc
+DIST puppet_forge-4.1.0.gem 772096 BLAKE2B 2d6f0af8baa067f79eb113f0de9596c562cdda678587fdd1cb14960535ded5fdbafb2b5ff0ebbd6ae676fb10d766f949b599b43c9b04dac55fc28b8163ef1383 SHA512 f752069d8b1998b3d27745abe3e6ad87a24ef614a68b52af2235a0587f98c69d8e39d2637640431f64d5c91ce468e3a2e2452b6ce8fa91d83b00c20ad047ae33
+DIST puppet_forge-5.0.1.gem 774144 BLAKE2B 2770c0609d93b3518017b36344025dbd7ab51360fea4af8f7ee610f4117f31de25698ad192ab00755564f0a57d9e6b041a7568440dbc5b47e2830a8cb00cd8f8 SHA512 3d29c166e1c22d7b4d45251866fbd8e6756a3026be5e17b1abe8cd6baaa7af4ddde7f2d07b75c21c5716c545cc6df82e36b1070a43a3d3c363214d3a5102843b
+DIST puppet_forge-5.0.2.gem 774144 BLAKE2B 6b01872246dc4791f78cefcb9df213df5768df483c8fac4bad12ddf358210ecb2b827ad129790e37d636ce4d7d0abb381097ffd2ee518a8472b067f5ba6de0a5 SHA512 861ac99a3e5234a8555fe37329b621135140d41c0fbad69648f56b901b10254d0474494c64525ebc4a0b730dfa91e9889ea4cf6ca7e2d5e40453221dd2e7370d
+DIST puppet_forge-5.0.3.gem 776704 BLAKE2B 2ea9e6a17fb5231629551b4dc2ca02f4843d67ded114f43a9891dba6a7ce03ab0b1b8ed38b434e8bcdfc73e940a263964a8254ba18493a137bd14600c3251a18 SHA512 17cb9aaf9c911608b90f2eb3e2561d94bffdfec559cb22bb0fa53d799f4a53f77c332ec261270135a924a4996d35b39945a4a94f7163b44dd9bb10f6ea72366f
diff --git a/dev-ruby/puppet_forge/files/puppet_forge-5.0.1-typhoeus.patch b/dev-ruby/puppet_forge/files/puppet_forge-5.0.1-typhoeus.patch
new file mode 100644
index 000000000000..3f39e97afe8c
--- /dev/null
+++ b/dev-ruby/puppet_forge/files/puppet_forge-5.0.1-typhoeus.patch
@@ -0,0 +1,14 @@
+Typhoeus support only works then the faraday-typhoeus package is installed.
+https://github.com/typhoeus/typhoeus/issues/709
+
+--- a/lib/puppet_forge/connection.rb	2023-09-09 09:02:03.981164238 +0200
++++ b/lib/puppet_forge/connection.rb	2023-09-09 09:03:56.506144279 +0200
+@@ -82,7 +82,7 @@
+ 
+       begin
+         # Use Typhoeus if available.
+-        Gem::Specification.find_by_name('typhoeus', '~> 1.4')
++        Gem::Specification.find_by_name('typhoeus', '~> 1.4') && Gem::Specification.find_by_name('faraday-typhoeus')
+         require 'typhoeus/adapters/faraday'
+         adapter = :typhoeus
+       rescue Gem::LoadError
diff --git a/dev-ruby/puppet_forge/puppet_forge-2.3.4.ebuild b/dev-ruby/puppet_forge/puppet_forge-2.3.4.ebuild
deleted file mode 100644
index 511ebd604359..000000000000
--- a/dev-ruby/puppet_forge/puppet_forge-2.3.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL=locales
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools to access Forge API information on Modules, Users, and Releases"
-HOMEPAGE="https://github.com/puppetlabs/forge-ruby"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/faraday-0.9.0:0
-	>=dev-ruby/faraday_middleware-0.9.0:0
-	>=dev-ruby/gettext-setup-0.11:0
-	dev-ruby/minitar
-	=dev-ruby/semantic_puppet-1*
-"
-
-all_ruby_prepare() {
-	# Avoid integration and user specs since they all require network access
-	rm -rf spec/integration spec/unit/forge/v3/user_spec.rb || die
-
-	# Load correct faraday versions
-	sed -i -e '1igem "faraday_middleware", "~> 0.0"' spec/spec_helper.rb || die
-
-	# Fix overly restrictive dependencies
-	sed -i \
-		-e '/faraday/ s/0.18.0/0.99.0/' \
-		-e '/faraday_middleware/ s/0.14.0/0.99.0/' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/puppet_forge/puppet_forge-3.2.0.ebuild b/dev-ruby/puppet_forge/puppet_forge-3.2.0.ebuild
new file mode 100644
index 000000000000..bb3d5751ca63
--- /dev/null
+++ b/dev-ruby/puppet_forge/puppet_forge-3.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools to access Forge API information on Modules, Users, and Releases"
+HOMEPAGE="https://github.com/puppetlabs/forge-ruby"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/faraday-1.3:1
+	dev-ruby/faraday_middleware:1
+	dev-ruby/minitar
+	=dev-ruby/semantic_puppet-1*
+"
+
+all_ruby_prepare() {
+	# Avoid integration and user specs since they all require network access
+	rm -rf spec/integration spec/unit/forge/v3/user_spec.rb || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '1igem "faraday", "<2"' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/puppet_forge/puppet_forge-4.1.0.ebuild b/dev-ruby/puppet_forge/puppet_forge-4.1.0.ebuild
new file mode 100644
index 000000000000..ff6f1063b086
--- /dev/null
+++ b/dev-ruby/puppet_forge/puppet_forge-4.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools to access Forge API information on Modules, Users, and Releases"
+HOMEPAGE="https://github.com/puppetlabs/forge-ruby"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/faraday:2
+	>=dev-ruby/faraday-follow_redirects-0.3.0:0.3
+	dev-ruby/minitar
+	=dev-ruby/semantic_puppet-1*
+"
+
+all_ruby_prepare() {
+	# Avoid integration and user specs since they all require network access
+	rm -rf spec/integration spec/unit/forge/v3/user_spec.rb || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs that are broken when typhoeus is installed
+	rm -f spec/unit/forge/connection_spec.rb spec/unit/forge/v3/{base,release}_spec.rb || die
+}
diff --git a/dev-ruby/puppet_forge/puppet_forge-5.0.1-r1.ebuild b/dev-ruby/puppet_forge/puppet_forge-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..dc80c18aca40
--- /dev/null
+++ b/dev-ruby/puppet_forge/puppet_forge-5.0.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools to access Forge API information on Modules, Users, and Releases"
+HOMEPAGE="https://github.com/puppetlabs/forge-ruby"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-typhoeus.patch" )
+
+ruby_add_rdepend "
+	dev-ruby/faraday:2
+	>=dev-ruby/faraday-follow_redirects-0.3.0:0.3
+	dev-ruby/minitar
+	=dev-ruby/semantic_puppet-1*
+"
+
+all_ruby_prepare() {
+	# Avoid integration and user specs since they all require network access
+	rm -rf spec/integration spec/unit/forge/v3/user_spec.rb || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/puppet_forge/puppet_forge-5.0.2.ebuild b/dev-ruby/puppet_forge/puppet_forge-5.0.2.ebuild
new file mode 100644
index 000000000000..642b012de688
--- /dev/null
+++ b/dev-ruby/puppet_forge/puppet_forge-5.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools to access Forge API information on Modules, Users, and Releases"
+HOMEPAGE="https://github.com/puppetlabs/forge-ruby"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${PN}-5.0.1-typhoeus.patch" )
+
+ruby_add_rdepend "
+	dev-ruby/faraday:2
+	>=dev-ruby/faraday-follow_redirects-0.3.0:0.3
+	dev-ruby/minitar
+	=dev-ruby/semantic_puppet-1*
+"
+
+all_ruby_prepare() {
+	# Avoid integration and user specs since they all require network access
+	rm -rf spec/integration spec/unit/forge/v3/user_spec.rb || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/puppet_forge/puppet_forge-5.0.3.ebuild b/dev-ruby/puppet_forge/puppet_forge-5.0.3.ebuild
new file mode 100644
index 000000000000..ece4d8e764fe
--- /dev/null
+++ b/dev-ruby/puppet_forge/puppet_forge-5.0.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools to access Forge API information on Modules, Users, and Releases"
+HOMEPAGE="https://github.com/puppetlabs/forge-ruby"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+
+PATCHES=( "${FILESDIR}/${PN}-5.0.1-typhoeus.patch" )
+
+ruby_add_rdepend "
+	dev-ruby/faraday:2
+	>=dev-ruby/faraday-follow_redirects-0.3.0:0.3
+	dev-ruby/minitar
+	=dev-ruby/semantic_puppet-1*
+"
+
+all_ruby_prepare() {
+	# Avoid integration and user specs since they all require network access
+	rm -rf spec/integration spec/unit/forge/v3/user_spec.rb || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 95a5e66ae1ea..499d174ef44d 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,2 +1,4 @@
-DIST puppetdb-termini_7.10.1-1stretch_all.deb 22156 BLAKE2B 52b1060fcf177b37229303ef93f90424f2b6b29eadf8041aa733d20f6b417c16e163891c44bc6f7845957ced10db132c705d6d6031041abace2f8f66f3d64964 SHA512 b273ac57558c9255d342010d9f3ada729596582311b3bbe658bf1505bd457041d0f5948c35c37bad585c931a66a66dcadcc71960de695c126715ef53d08295c5
-DIST puppetdb-termini_7.9.2-1stretch_all.deb 22164 BLAKE2B fbdeb196815a09fc3b5658cf193d723bc0038ce0463cab3fa218bdc970d03828eeffa5a4756c4716afe6346a6aca2ea4ceb8c57ae4174cbae72773fffee634ce SHA512 5c399983118583d856c8160f8e21b646dbdaf56ba9044f7d5ac7a00cac14038b476b80074ea7bb696c0d9548cb50e03efc1119a32bade81532b6f10540a54d3d
+DIST puppetdb-termini_7.13.0-1bullseye_all.deb 22548 BLAKE2B 535a3f846a7a10dcfaec4447ae852c6c4d870a573169f84e31f61c361164caea989f911df2d18e183c391dd0130a10b9422057eecaab304bebbb022f78e22a21 SHA512 3c8e440bfc55579d0c9a03ecae516d4cef49512ad9fdd6fceef37618c163ecac6d77a2b17b6cbb7131ceb3787904486bb78eef84a36a5f76672918db6d30db86
+DIST puppetdb-termini_8.2.0-1focal_all.deb 21850 BLAKE2B 3f2d35a24c3884fdc985cd22e2c27d159dbea80272f5d1510634fc3b93079fd33e2b4f19963e2e122eb25829aa118ac13a84d6838c73ccb54305afc7876f8fc6 SHA512 ebf05f85d4bd455498a40b0210a6fc0cbfed4d0991d5a3d5780eb1b99a2f93f64407d6465d010c53ff55a0a3fcfab6f411c851d95a9e028945634644baef5163
+DIST puppetdb-termini_8.4.1-1focal_all.deb 21900 BLAKE2B 9d17deaaa0bc27aafdd20cc91aff9d7b9fac92fe6c7c536d6f606eedee5e30870325cd50e3f26e29c70865d7d0c9e5f6774179d6a9c10e84c7f08886837a5f91 SHA512 9f261efc3f6140cc8fc637fd7c9ee69c64bf06591581dada8b2aa95d25621b1165673786f8ee55d669e134fcf3676557adf5cbcad30c4e8a1447dd111dc486e4
+DIST puppetdb-termini_8.5.0-1focal_all.deb 22142 BLAKE2B e32985eee15ffc44dee5626c51edd09de2a6b2b936c8fb9308d34884871d693b246983056d2791a29341e450ba525a419c818b22390aa22cc9efd85696a1e007 SHA512 c4afc5618f83db64b083953a38070660ff4087141e09ff02ce218416eda53e6c16bf6c9f5eab2ebd2721f086c477902ebb1b34b2556eafdeb8f4d4260d9e9f00
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.10.1.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.10.1.ebuild
deleted file mode 100644
index 68f1eaa1a4b6..000000000000
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.10.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 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/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch_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/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..a2b827c8e1b2
--- /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/puppetdb-termini/puppetdb-termini-7.9.2.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.9.2.ebuild
deleted file mode 100644
index 83bb38516615..000000000000
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.9.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-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/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch_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/puppetdb-termini/puppetdb-termini-8.2.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-8.2.0.ebuild
new file mode 100644
index 000000000000..c55da78154ac
--- /dev/null
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-8.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby31 ruby32"
+
+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/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_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/puppetdb-termini/puppetdb-termini-8.4.1.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-8.4.1.ebuild
new file mode 100644
index 000000000000..c55da78154ac
--- /dev/null
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-8.4.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby31 ruby32"
+
+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/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_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/puppetdb-termini/puppetdb-termini-8.5.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-8.5.0.ebuild
new file mode 100644
index 000000000000..c55da78154ac
--- /dev/null
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-8.5.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby31 ruby32"
+
+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/focal/puppet8/${PN:0:1}/${PN}/${PN}_${PV}-1focal_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/pusher-client/pusher-client-0.6.2-r1.ebuild b/dev-ruby/pusher-client/pusher-client-0.6.2-r1.ebuild
index 622335344978..5e0cbfcbbf0a 100644
--- a/dev-ruby/pusher-client/pusher-client-0.6.2-r1.ebuild
+++ b/dev-ruby/pusher-client/pusher-client-0.6.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+
+USE_RUBY="ruby31 ruby32 ruby33"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 inherit ruby-fakegem
diff --git a/dev-ruby/qed/metadata.xml b/dev-ruby/qed/metadata.xml
index 658c72b1920d..fa82c8089219 100644
--- a/dev-ruby/qed/metadata.xml
+++ b/dev-ruby/qed/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">rubyworks/qed</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/qed/qed-2.9.2-r1.ebuild b/dev-ruby/qed/qed-2.9.2-r1.ebuild
index 07588125b11d..623d32188c97 100644
--- a/dev-ruby/qed/qed-2.9.2-r1.ebuild
+++ b/dev-ruby/qed/qed-2.9.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="yard"
@@ -21,7 +22,8 @@ IUSE=""
 ruby_add_bdepend "test? ( dev-ruby/ae )"
 ruby_add_rdepend "
 	dev-ruby/ansi
-	dev-ruby/brass"
+	dev-ruby/brass
+"
 
 each_ruby_test() {
 	${RUBY} -Ilib bin/qed || die 'tests failed'
diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index bf1585b37277..bf9733c9080c 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -1,3 +1,4 @@
-DIST racc-1.4.16.tar.gz 451711 BLAKE2B d3bcb72a69df255d5468054541c281bf7bd3225eb3ba1997fccd6dcd219d3a8890e3df7b43fe106ffa3fc63a8d8079cab83e7096b0737f5bbacf816b7c3bbfb2 SHA512 7cdf6a62449e8f39984a8b27706045e509828a93a72d112b22a4c467184a63ee23b4b2048ef7017846053fb2ff4021aa43d96a6147fa271257df584ab3d66f38
-DIST racc-1.5.2.tar.gz 434903 BLAKE2B cfbaa09c1b2e233e82228075cf979c54688e51e702cade072d42b2952100b74a53e536d904cbbf15cb04ffc74018b48e5b27a5773adf6240614c815250d47119 SHA512 73c68dd75fa35727fd93a76886dd77afbb7032271e535c6e885a4ede6822052a93a610dec8a1f84daf24903c749b30a185831ec96d651588db2a2524f3dcd477
-DIST racc-1.6.0.tar.gz 470565 BLAKE2B 482b17723630dfb1d6e010c3eeb7da5a9f7b97f544d1a5020195134cd5446d28eff9a75b6c392a75970ddf024f560d2c7135abc4a2de76b581aa835c0901b524 SHA512 c19b7444bfafa0dfe3448600d10a1a09319702c37632e19569aeb947e7c035cc4067da040d45ede0dab35eaa197a55eac394715aae520fba41ed6e0c01c95e3d
+DIST racc-1.6.2.tar.gz 470740 BLAKE2B c21e01cd7a11573774218ba97de3f58ebdbc4b138def4dfb2620b626d68e71a72f66a7e7f7644707942d4ec5f387b848aa00aa1d7dd81fc98f50b1c23ce118cb SHA512 ef577d0da440361702d15cf2127142e57d5af4146f120cd9d94ee8c8b4380810c8913c373a9969f09b50e0850a8ac04ffd22729c4abdab0670765c7379b549f6
+DIST racc-1.7.0.tar.gz 472347 BLAKE2B 329761dcdde47180e15f0ceea09b071c2387569364690ff4dc76631c4f3a5c8d8e5482fdc9a451c9c521fb902007c0974d6596287e73f5e9bf8b51f59a31e09d SHA512 8a198a73132f8a97468aaf2078d493899473cefd67cb8065e2d3f35730577e98cd19682e6d4b0f8a2347c77edfb9acfc5649a527c6361a47ae836c3ec2d01085
+DIST racc-1.7.1.tar.gz 460849 BLAKE2B 88caea7f176111678ee7245af72c8689912d413b400c0299da9239d245d0e4d06511e554cbf00f0b9b248baff240d359492fa9c7bbc623d693ef54d135d6ed35 SHA512 266e4cc81bebe5d7331d42f9e2becc3c02c8fd15b5d70d424d04d37ffea35c802c382e88933cfb0f80331c3504b39ab4c59308c9a86de57a8fc7a8bae9d20882
+DIST racc-1.7.3.tar.gz 455515 BLAKE2B c2eea87b804ae8675ff253682c1720b006d1edd7c08b2f34dfb731f787aede88175f478c8afdd7d6c28fb1f59d6ec460a1d365e5c282d10c370b78f45c76f7a0 SHA512 8412c021d3fc7f25ccf3a61d56c11df0d8c0b09852d99cc314c8b4931f9c22939dc43ef599801de9a64a69acbd897fb6f215f56702634f2c8b6d69ae3bdfa2b3
diff --git a/dev-ruby/racc/metadata.xml b/dev-ruby/racc/metadata.xml
index 3f279ae8b792..cbe1b685cb46 100644
--- a/dev-ruby/racc/metadata.xml
+++ b/dev-ruby/racc/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">tenderlove/racc</remote-id>
+		<remote-id type="github">ruby/racc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/racc/racc-1.4.16-r1.ebuild b/dev-ruby/racc/racc-1.4.16-r1.ebuild
deleted file mode 100644
index 991d3f4dd44f..000000000000
--- a/dev-ruby/racc/racc-1.4.16-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc README.ja.rdoc TODO ChangeLog"
-
-RUBY_FAKEGEM_GEMSPEC="racc.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A LALR(1) parser generator for Ruby"
-HOMEPAGE="https://github.com/tenderlove/racc"
-SRC_URI="https://github.com/tenderlove/racc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "dev-ruby/rake
-	test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e 's|/tmp/out|${TMPDIR:-/tmp}/out|' test/helper.rb || die "tests fix failed"
-
-	# Avoid depending on rake-compiler since we don't use it to compile
-	# the extension.
-	sed -i -e '/rake-compiler/ s:^:#:' -e '/extensiontask/ s:^:#:' Rakefile
-	sed -i -e '/ExtensionTask/,/^  end/ s:^:#:' Rakefile
-	# Which means we need to generate the parser file here
-	rake lib/racc/parser-text.rb || die
-
-	# Avoid isolation since dependencies are not properly declared.
-	sed -i -e 's/, :isolate//' Rakefile || die
-}
-
-each_ruby_prepare() {
-	${RUBY} -Cext/racc/cparse extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/racc/cparse
-	# Copy over the file here so that we don't have to do
-	# special ruby install for JRuby and the other
-	# implementations.
-	mkdir -p lib/racc/cparse || die
-	cp -l ext/racc/cparse/cparse$(get_modname) lib/racc/cparse/cparse$(get_modname) || die
-}
-
-each_ruby_test() {
-	PATH="bin:${PATH}" ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r rdoc
-
-	docinto examples
-	dodoc -r sample
-}
diff --git a/dev-ruby/racc/racc-1.5.2-r1.ebuild b/dev-ruby/racc/racc-1.5.2-r1.ebuild
deleted file mode 100644
index 08e9adde6cb4..000000000000
--- a/dev-ruby/racc/racc-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc README.ja.rdoc TODO ChangeLog"
-
-RUBY_FAKEGEM_GEMSPEC="racc.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/racc/cparse/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/racc/cparse"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A LALR(1) parser generator for Ruby"
-HOMEPAGE="https://github.com/tenderlove/racc"
-SRC_URI="https://github.com/tenderlove/racc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "dev-ruby/rake
-	test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e 's|/tmp/out|${TMPDIR:-/tmp}/out|' test/helper.rb || die "tests fix failed"
-
-	sed -i -e 's/, :isolate//' Rakefile || die
-	sed -i -e '/bundler/ s:^:#:' -e '/rdoc/,/^end/ s:^:#:' Rakefile || die
-
-	# Avoid depending on rake-compiler since we don't use it to compile
-	# the extension.
-	sed -i -e '/rake-compiler/ s:^:#:' -e '/extensiontask/ s:^:#:' Rakefile
-	sed -i -e '/ExtensionTask/,/^  end/ s:^:#:' Rakefile
-	# Which means we need to generate the parser file here
-	rake lib/racc/parser-text.rb || die
-
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	PATH="bin:${PATH}" ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r rdoc
-
-	docinto examples
-	dodoc -r sample
-}
diff --git a/dev-ruby/racc/racc-1.5.2-r2.ebuild b/dev-ruby/racc/racc-1.5.2-r2.ebuild
deleted file mode 100644
index 223c5c03648e..000000000000
--- a/dev-ruby/racc/racc-1.5.2-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc README.ja.rdoc TODO ChangeLog"
-
-RUBY_FAKEGEM_GEMSPEC="racc.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/racc/cparse/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/racc/cparse"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A LALR(1) parser generator for Ruby"
-HOMEPAGE="https://github.com/tenderlove/racc"
-SRC_URI="https://github.com/tenderlove/racc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "dev-ruby/rake
-	test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e 's|/tmp/out|${TMPDIR:-/tmp}/out|' test/helper.rb || die "tests fix failed"
-
-	sed -i -e 's/, :isolate//' Rakefile || die
-	sed -i -e '/bundler/ s:^:#:' -e '/rdoc/,/^end/ s:^:#:' Rakefile || die
-
-	# Avoid depending on rake-compiler since we don't use it to compile
-	# the extension.
-	sed -i -e '/rake-compiler/ s:^:#:' -e '/extensiontask/ s:^:#:' Rakefile
-	sed -i -e '/ExtensionTask/,/^  end/ s:^:#:' Rakefile
-	# Which means we need to generate the parser file here
-	rake lib/racc/parser-text.rb || die
-
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	PATH="bin:${PATH}" ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r rdoc
-
-	docinto examples
-	dodoc -r sample
-}
diff --git a/dev-ruby/racc/racc-1.5.2.ebuild b/dev-ruby/racc/racc-1.5.2.ebuild
deleted file mode 100644
index 1d3aadcec5a1..000000000000
--- a/dev-ruby/racc/racc-1.5.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc README.ja.rdoc TODO ChangeLog"
-
-RUBY_FAKEGEM_GEMSPEC="racc.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A LALR(1) parser generator for Ruby"
-HOMEPAGE="https://github.com/tenderlove/racc"
-SRC_URI="https://github.com/tenderlove/racc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "dev-ruby/rake
-	test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e 's|/tmp/out|${TMPDIR:-/tmp}/out|' test/helper.rb || die "tests fix failed"
-
-	sed -i -e 's/, :isolate//' Rakefile || die
-	sed -i -e '/bundler/ s:^:#:' -e '/rdoc/,/^end/ s:^:#:' Rakefile || die
-
-	# Avoid depending on rake-compiler since we don't use it to compile
-	# the extension.
-	sed -i -e '/rake-compiler/ s:^:#:' -e '/extensiontask/ s:^:#:' Rakefile
-	sed -i -e '/ExtensionTask/,/^  end/ s:^:#:' Rakefile
-	# Which means we need to generate the parser file here
-	rake lib/racc/parser-text.rb || die
-
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	${RUBY} -Cext/racc/cparse extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/racc/cparse
-	# Copy over the file here so that we don't have to do
-	# special ruby install for JRuby and the other
-	# implementations.
-	mkdir -p lib/racc/cparse || die
-	cp -l ext/racc/cparse/cparse$(get_modname) lib/racc/cparse/cparse$(get_modname) || die
-}
-
-each_ruby_test() {
-	PATH="bin:${PATH}" ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r rdoc
-
-	docinto examples
-	dodoc -r sample
-}
diff --git a/dev-ruby/racc/racc-1.6.0.ebuild b/dev-ruby/racc/racc-1.6.0.ebuild
deleted file mode 100644
index e305e9aa95a8..000000000000
--- a/dev-ruby/racc/racc-1.6.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc README.ja.rdoc TODO ChangeLog"
-
-RUBY_FAKEGEM_GEMSPEC="racc.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/racc/cparse/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/racc/cparse"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A LALR(1) parser generator for Ruby"
-HOMEPAGE="https://github.com/tenderlove/racc"
-SRC_URI="https://github.com/tenderlove/racc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-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"
-IUSE="doc test"
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "dev-ruby/rake
-	test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e 's/, :isolate//' Rakefile || die
-	sed -i -e '/bundler/ s:^:#:' -e '/rdoc/,/^end/ s:^:#:' Rakefile || die
-
-	# Avoid depending on rake-compiler since we don't use it to compile
-	# the extension.
-	sed -i -e '/rake-compiler/ s:^:#:' -e '/extensiontask/ s:^:#:' Rakefile
-	sed -i -e '/ExtensionTask/,/^  end/ s:^:#:' Rakefile
-	# Which means we need to generate the parser file here
-	rake lib/racc/parser-text.rb || die
-
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r doc
-
-	docinto examples
-	dodoc -r sample
-}
diff --git a/dev-ruby/racc/racc-1.6.2.ebuild b/dev-ruby/racc/racc-1.6.2.ebuild
new file mode 100644
index 000000000000..897d31aae5a1
--- /dev/null
+++ b/dev-ruby/racc/racc-1.6.2.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_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc README.ja.rdoc TODO ChangeLog"
+
+RUBY_FAKEGEM_GEMSPEC="racc.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/racc/cparse/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/racc/cparse"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A LALR(1) parser generator for Ruby"
+HOMEPAGE="https://github.com/tenderlove/racc"
+SRC_URI="https://github.com/tenderlove/racc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "dev-ruby/rake
+	test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e 's/, :isolate//' Rakefile || die
+	sed -i -e '/bundler/ s:^:#:' -e '/rdoc/,/^end/ s:^:#:' Rakefile || die
+
+	# Avoid depending on rake-compiler since we don't use it to compile
+	# the extension.
+	sed -i -e '/rake-compiler/ s:^:#:' -e '/extensiontask/ s:^:#:' Rakefile || die
+	sed -i -e '/ExtensionTask/,/^  end/ s:^:#:' Rakefile || die
+
+	# ...which means we need to generate the parser file here
+	for ruby in $(ruby_get_use_implementations) ; do
+		if has_version -b "virtual/rubygems[ruby_targets_${ruby}(-)]" && has_version -b "dev-ruby/rake[ruby_targets_${ruby}(-)]" ; then
+			${ruby} -S rake lib/racc/parser-text.rb || die
+			break
+		fi
+	done
+
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r doc
+
+	docinto examples
+	dodoc -r sample
+}
diff --git a/dev-ruby/racc/racc-1.7.0.ebuild b/dev-ruby/racc/racc-1.7.0.ebuild
new file mode 100644
index 000000000000..c8e2fec31475
--- /dev/null
+++ b/dev-ruby/racc/racc-1.7.0.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_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc README.ja.rdoc TODO ChangeLog"
+
+RUBY_FAKEGEM_GEMSPEC="racc.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/racc/cparse/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/racc/cparse"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A LALR(1) parser generator for Ruby"
+HOMEPAGE="https://github.com/tenderlove/racc"
+SRC_URI="https://github.com/tenderlove/racc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "dev-ruby/rake
+	test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e 's/, :isolate//' Rakefile || die
+	sed -i -e '/bundler/ s:^:#:' -e '/rdoc/,/^end/ s:^:#:' Rakefile || die
+
+	# Avoid depending on rake-compiler since we don't use it to compile
+	# the extension.
+	sed -i -e '/rake-compiler/ s:^:#:' -e '/extensiontask/ s:^:#:' Rakefile || die
+	sed -i -e '/ExtensionTask/,/^  end/ s:^:#:' Rakefile || die
+
+	# ...which means we need to generate the parser file here
+	for ruby in $(ruby_get_use_implementations) ; do
+		if has_version -b "virtual/rubygems[ruby_targets_${ruby}(-)]" &&
+		   has_version -b "dev-ruby/rake[ruby_targets_${ruby}(-)]" ; then
+			${ruby} -S rake lib/racc/parser-text.rb || die
+			break
+		fi
+	done
+
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r doc
+
+	docinto examples
+	dodoc -r sample
+}
diff --git a/dev-ruby/racc/racc-1.7.1.ebuild b/dev-ruby/racc/racc-1.7.1.ebuild
new file mode 100644
index 000000000000..bc1bfd4f7a78
--- /dev/null
+++ b/dev-ruby/racc/racc-1.7.1.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="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc README.ja.rdoc TODO ChangeLog"
+
+RUBY_FAKEGEM_GEMSPEC="racc.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/racc/cparse/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/racc/cparse"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A LALR(1) parser generator for Ruby"
+HOMEPAGE="https://github.com/ruby/racc"
+SRC_URI="https://github.com/ruby/racc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "dev-ruby/rake
+	test? ( dev-ruby/minitest dev-ruby/test-unit-ruby-core )"
+
+all_ruby_prepare() {
+	sed -i -e 's/, :isolate//' Rakefile || die
+	sed -i -e '/bundler/ s:^:#:' -e '/rdoc/,/^end/ s:^:#:' Rakefile || die
+
+	# Avoid depending on rake-compiler since we don't use it to compile
+	# the extension.
+	sed -i -e '/rake-compiler/ s:^:#:' -e '/extensiontask/ s:^:#:' Rakefile || die
+	sed -i -e '/ExtensionTask/,/^  end/ s:^:#:' Rakefile || die
+
+	# ...which means we need to generate the parser file here
+	for ruby in $(ruby_get_use_implementations) ; do
+		if has_version -b "virtual/rubygems[ruby_targets_${ruby}(-)]" &&
+		   has_version -b "dev-ruby/rake[ruby_targets_${ruby}(-)]" ; then
+			${ruby} -S rake lib/racc/parser-text.rb || die
+			break
+		fi
+	done
+
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r doc
+
+	docinto examples
+	dodoc -r sample
+}
diff --git a/dev-ruby/racc/racc-1.7.3.ebuild b/dev-ruby/racc/racc-1.7.3.ebuild
new file mode 100644
index 000000000000..771e3b3bd591
--- /dev/null
+++ b/dev-ruby/racc/racc-1.7.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc README.ja.rdoc TODO ChangeLog"
+
+RUBY_FAKEGEM_GEMSPEC="racc.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/racc/cparse/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/racc/cparse"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A LALR(1) parser generator for Ruby"
+HOMEPAGE="https://github.com/ruby/racc"
+SRC_URI="https://github.com/ruby/racc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "dev-ruby/rake
+	test? ( dev-ruby/minitest dev-ruby/test-unit-ruby-core )"
+
+all_ruby_prepare() {
+	sed -i -e 's/, :isolate//' Rakefile || die
+	sed -e '/bundler/ s:^:#:' \
+		-e '/require.*rdoc/ s:^:#:' \
+		-e '/RDoc/,/^end/ s:^:#:' \
+		-i Rakefile || die
+
+	# Avoid depending on rake-compiler since we don't use it to compile
+	# the extension.
+	sed -i -e '/rake-compiler/ s:^:#:' -e '/require.*extensiontask/ s:^:#:' Rakefile || die
+	sed -i -e '/ExtensionTask/,/^  end/ s:^:#:' Rakefile || die
+
+	# ...which means we need to generate the parser file here
+	for ruby in $(ruby_get_use_implementations) ; do
+		if has_version -b "virtual/rubygems[ruby_targets_${ruby}(-)]" &&
+		   has_version -b "dev-ruby/rake[ruby_targets_${ruby}(-)]" ; then
+			${ruby} -S rake lib/racc/parser-text.rb || die
+			break
+		fi
+	done
+
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r doc
+
+	docinto examples
+	dodoc -r sample
+}
diff --git a/dev-ruby/rack-attack/Manifest b/dev-ruby/rack-attack/Manifest
index 7869e9c43216..0dbfa8ddf524 100644
--- a/dev-ruby/rack-attack/Manifest
+++ b/dev-ruby/rack-attack/Manifest
@@ -1,3 +1,2 @@
-DIST rack-attack-6.5.0.gem 25600 BLAKE2B a2b40e3779b51f10d43da7381cf3aa6b83bf3ffcff26cde0cad47838bb7d4f3a255d2e182f3f56118afc29d8a487c574a79f2ec1d331ff51a746c5730888465a SHA512 3a50518972bbd4f9f5a2f4f5cc48958bae1d0636923e0124b34792d6f8ed10d435c9bdff64a31c79639667a996386f573c45214b931a3310d6749316db7ca37e
-DIST rack-attack-6.6.0.gem 26624 BLAKE2B 0e24985666d5af4dc693137e41b6eb6b7f97d7e85eadfdf5ccf814007315567f52a9047795a419c8f717f77cd720e3bb2161152f019f5af1aaa318ebb64b8752 SHA512 286034be8770654c7ef9f1c632932968749b406e01ce4d93ff72d28359cafe7ec22906ed973409507bcf06b42ebe685437fee84be1f6e63212dbb706835bc860
 DIST rack-attack-6.6.1.gem 26624 BLAKE2B 3182da7b9fef4506fbbcf6fe8bcf175701b6999728c3b0ef2491cad426047540bc0e9a992db6f18f4f3947d2659e6db2e692a2a015e107c44106696086ffbb2d SHA512 65973550e1639527c4b00fb2743008b7ad9438faf5b70b490585966cf02f9733b215cff1826663ad6d770bac35dbe665cf901a5c4778de8e7f02e29ae1fb2772
+DIST rack-attack-6.7.0.gem 27136 BLAKE2B 9321bf2512655267887d1a216d59bef1f1f4d556ebc8141e079e5bc77168eb2021a03f5212f0feb04f0da04ca7486f170ce3bdd3c493f5da9c6125d6a5699560 SHA512 2620cec8d3d81c413db6eb6b62bbcf70c5815d2a8d05d7bdf9d100b5dcd9a0b832e382c2de2b13266966800d9cd6060d7a6cb087a438131dd50c96ffd4fc043b
diff --git a/dev-ruby/rack-attack/metadata.xml b/dev-ruby/rack-attack/metadata.xml
index 4cccaf157b14..32bd9929c454 100644
--- a/dev-ruby/rack-attack/metadata.xml
+++ b/dev-ruby/rack-attack/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">kickstarter/rack-attack</remote-id>
+    <remote-id type="github">rack/rack-attack</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rack-attack/rack-attack-6.5.0.ebuild b/dev-ruby/rack-attack/rack-attack-6.5.0.ebuild
deleted file mode 100644
index e716cede7381..000000000000
--- a/dev-ruby/rack-attack/rack-attack-6.5.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# Skip integration tests since they require additional unpackaged
-# dependencies and running daemons.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for blocking & throttling abusive clients"
-HOMEPAGE="https://github.com/kickstarter/rack-attack"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/rack:*"
-ruby_add_bdepend "test? (
-	dev-ruby/actionpack
-	dev-ruby/activesupport
-	dev-ruby/railties
-	dev-ruby/rack-test
-	dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|byebug\)/ s:^:#:' Rakefile spec/spec_helper.rb || die
-	sed -i -e '3igem "actionpack"' spec/spec_helper.rb || die
-	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
-
-	# Avoid specs requiring a live redis service
-	sed -i -e '/should delete rack attack key/askip "requires redis service"' spec/rack_attack_spec.rb || die
-}
diff --git a/dev-ruby/rack-attack/rack-attack-6.6.0.ebuild b/dev-ruby/rack-attack/rack-attack-6.6.0.ebuild
deleted file mode 100644
index 795479b2f348..000000000000
--- a/dev-ruby/rack-attack/rack-attack-6.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-# Skip integration tests since they require additional unpackaged
-# dependencies and running daemons.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for blocking & throttling abusive clients"
-HOMEPAGE="https://github.com/kickstarter/rack-attack"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/rack:*"
-ruby_add_bdepend "test? (
-	dev-ruby/actionpack
-	dev-ruby/activesupport
-	dev-ruby/railties
-	dev-ruby/rack-test
-	dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|byebug\)/ s:^:#:' Rakefile spec/spec_helper.rb || die
-	sed -i -e '3igem "actionpack"' spec/spec_helper.rb || die
-	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
-
-	# Avoid specs requiring a live redis service
-	sed -i -e '/should delete rack attack key/askip "requires redis service"' spec/rack_attack_spec.rb || die
-}
diff --git a/dev-ruby/rack-attack/rack-attack-6.6.1.ebuild b/dev-ruby/rack-attack/rack-attack-6.6.1.ebuild
index 0c3241cf6d1a..7e04839295dc 100644
--- a/dev-ruby/rack-attack/rack-attack-6.6.1.ebuild
+++ b/dev-ruby/rack-attack/rack-attack-6.6.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"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 # Skip integration tests since they require additional unpackaged
 # dependencies and running daemons.
@@ -15,7 +15,7 @@ RUBY_FAKEGEM_BINWRAP=""
 inherit ruby-fakegem
 
 DESCRIPTION="A DSL for blocking & throttling abusive clients"
-HOMEPAGE="https://github.com/kickstarter/rack-attack"
+HOMEPAGE="https://github.com/rack/rack-attack"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
diff --git a/dev-ruby/rack-attack/rack-attack-6.7.0.ebuild b/dev-ruby/rack-attack/rack-attack-6.7.0.ebuild
new file mode 100644
index 000000000000..9992f6f3d30a
--- /dev/null
+++ b/dev-ruby/rack-attack/rack-attack-6.7.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# Skip integration tests since they require additional unpackaged
+# dependencies and running daemons.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A DSL for blocking & throttling abusive clients"
+HOMEPAGE="https://github.com/rack/rack-attack"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/rack:*"
+ruby_add_bdepend "test? (
+	dev-ruby/actionpack
+	dev-ruby/activesupport
+	dev-ruby/railties
+	dev-ruby/rack-test
+	dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|byebug\)/ s:^:#:' Rakefile spec/spec_helper.rb || die
+	sed -i -e '3igem "actionpack"' spec/spec_helper.rb || die
+	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
+
+	# Fix minitest deprecation
+	sed -i -e 's/MiniTest/Minitest/' spec/spec_helper.rb || die
+
+	# Avoid specs requiring a live redis service
+	sed -i -e '/should delete rack attack key/askip "requires redis service"' spec/rack_attack_spec.rb || die
+}
diff --git a/dev-ruby/rack-cache/Manifest b/dev-ruby/rack-cache/Manifest
index 4218b279ef62..dd3c598e5bf1 100644
--- a/dev-ruby/rack-cache/Manifest
+++ b/dev-ruby/rack-cache/Manifest
@@ -1 +1,3 @@
-DIST rack-cache-1.13.0.tar.gz 262945 BLAKE2B ea0dafe105c8c1e10815c39b928c5a86bf77a0cf3a31f085169028cb633dddd3db761138fb85b7f5da6c3374e749e898d97622994ad3a7b4972befbd46d31e3b SHA512 049302994663703ea593e01194e1c5c3b95afc889e628906e65302dd1fe64fc280bac9d26855db2fc7af1e287201a47c7f6a52329a3151b3efc775c0585d837c
+DIST rack-cache-1.15.0.tar.gz 264051 BLAKE2B 0e9de0d7bd82c553f448f6fe9273465f9b7ac68aab814543ccb13644137f9f6ad9a279a0d71fa61ce8198e1f579f2b1f9118e4b0e017b8c75d8e385d32c1826f SHA512 eaeb2e52e5bedce3f5ddeab9e32ec73ac67786a12d3abbd5469b1072c50ac54b236dfd03420152f1e86fd55950bb9f4e243bec3541309bf7e8dbd410fd777967
+DIST rack-cache-1.16.0.tar.gz 264119 BLAKE2B 7affde4d1e72cd4f7cecec36aea753f7e8aeb42ac2e41bf8a3a2132b6736b137ed9f1969f630b12fca60d34e8390f97c8cdfe0e33cc847589f03d6aede48b8e3 SHA512 c2e41b8382f060d85d67ddcc5a4edd899e58a0438c94cccf2b6e00013442d1b2914744916880ea9740cd4f5c80045b873f17e00222b3f03d18719e78656ec7c5
+DIST rack-cache-1.17.0.tar.gz 264229 BLAKE2B 935e9d539dd130d62486326ef4f6b4ed2576a13262af40914a4de5251601872e29fc68134fe04f8f5eed656d17957257d8a502e02853838a30772a354ff8f921 SHA512 41b3d28c577f241c57c74623f37ef36efcc059f9b8499cdc2c08d15ab68fbd06b736140594c6860708e0fa6590027b0e64ab539d2d2ae243d1a1150e7e64959f
diff --git a/dev-ruby/rack-cache/metadata.xml b/dev-ruby/rack-cache/metadata.xml
index f688e36a67b9..99bf54904f42 100644
--- a/dev-ruby/rack-cache/metadata.xml
+++ b/dev-ruby/rack-cache/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">rtomayko/rack-cache</remote-id>
+		<remote-id type="github">rack/rack-cache</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rack-cache/rack-cache-1.13.0.ebuild b/dev-ruby/rack-cache/rack-cache-1.13.0.ebuild
deleted file mode 100644
index 633c2e34dc85..000000000000
--- a/dev-ruby/rack-cache/rack-cache-1.13.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-# no documentation is generable, it needs hanna, which is broken
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*"
-
-RUBY_FAKEGEM_GEMSPEC="rack-cache.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Enable HTTP caching for Rack-based applications that produce freshness info"
-HOMEPAGE="https://github.com/rtomayko/rack-cache"
-SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rack:*"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/maxitest-3.4.0
-	>=dev-ruby/minitest-5.7.0:5
-	>=dev-ruby/mocha-0.13.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' \
-		test/test_helper.rb || die
-}
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -I.:lib:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rack-cache/rack-cache-1.15.0.ebuild b/dev-ruby/rack-cache/rack-cache-1.15.0.ebuild
new file mode 100644
index 000000000000..dcf4c92952ac
--- /dev/null
+++ b/dev-ruby/rack-cache/rack-cache-1.15.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+# no documentation is generable, it needs hanna, which is broken
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*"
+
+RUBY_FAKEGEM_GEMSPEC="rack-cache.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Enable HTTP caching for Rack-based applications that produce freshness info"
+HOMEPAGE="https://github.com/rack/rack-cache"
+SRC_URI="https://github.com/rack/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.2"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/maxitest-3.4.0
+	>=dev-ruby/minitest-5.7.0:5
+	>=dev-ruby/mocha-2 )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files/find */' -e "s:_relative ': './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true ${RUBY} -I.:lib:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rack-cache/rack-cache-1.16.0.ebuild b/dev-ruby/rack-cache/rack-cache-1.16.0.ebuild
new file mode 100644
index 000000000000..81b6b20841c5
--- /dev/null
+++ b/dev-ruby/rack-cache/rack-cache-1.16.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# no documentation can be generated. It needs hanna, which is broken.
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*"
+
+RUBY_FAKEGEM_GEMSPEC="rack-cache.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Enable HTTP caching for Rack-based applications that produce freshness info"
+HOMEPAGE="https://github.com/rack/rack-cache"
+SRC_URI="https://github.com/rack/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/maxitest-3.4.0
+	>=dev-ruby/minitest-5.7.0:5
+	>=dev-ruby/mocha-2 )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files/find */' -e "s:_relative ': './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true ${RUBY} -I.:lib:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rack-cache/rack-cache-1.17.0.ebuild b/dev-ruby/rack-cache/rack-cache-1.17.0.ebuild
new file mode 100644
index 000000000000..81b6b20841c5
--- /dev/null
+++ b/dev-ruby/rack-cache/rack-cache-1.17.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# no documentation can be generated. It needs hanna, which is broken.
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*"
+
+RUBY_FAKEGEM_GEMSPEC="rack-cache.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Enable HTTP caching for Rack-based applications that produce freshness info"
+HOMEPAGE="https://github.com/rack/rack-cache"
+SRC_URI="https://github.com/rack/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/maxitest-3.4.0
+	>=dev-ruby/minitest-5.7.0:5
+	>=dev-ruby/mocha-2 )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files/find */' -e "s:_relative ': './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true ${RUBY} -I.:lib:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rack-openid/rack-openid-1.4.2-r1.ebuild b/dev-ruby/rack-openid/rack-openid-1.4.2-r1.ebuild
index 3903b0a78330..cbe158d0c8a0 100644
--- a/dev-ruby/rack-openid/rack-openid-1.4.2-r1.ebuild
+++ b/dev-ruby/rack-openid/rack-openid-1.4.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="Readme.md"
@@ -14,11 +14,10 @@ inherit ruby-fakegem
 DESCRIPTION="Provides a more HTTPish API around the ruby-openid library"
 SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 HOMEPAGE="https://github.com/grosser/rack-openid"
-LICENSE="MIT"
 
-KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
 SLOT="0"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
 
 ruby_add_rdepend ">=dev-ruby/ruby-openid-2.1.8 >=dev-ruby/rack-1.1.0:*"
 
diff --git a/dev-ruby/rack-protection/Manifest b/dev-ruby/rack-protection/Manifest
index 258781ff427b..bb5be98d1139 100644
--- a/dev-ruby/rack-protection/Manifest
+++ b/dev-ruby/rack-protection/Manifest
@@ -1 +1,4 @@
-DIST rack-protection-2.2.0.gem 17408 BLAKE2B d9d5d8e2473b6354dd61cfc338a05932a2c60aa12544399cb0b9b74c717d6fa48bdec638381582be0a13f845f0c69583275f412458a20198894b5eddc7b53358 SHA512 06d6c2026e3e93131a2405bbaa8a514ddde48607979828b9fc41309dbdfff2b7c8cac48a6981e76b5dda554f0cbdc7c6ff5f44b8925fce1cb9b7de0a16380ca4
+DIST rack-protection-3.0.5.gem 20480 BLAKE2B 1fa11760c6ddac58234ffe2e6d783c985e29b5e2bd10ea21b0782f7824b5930351c8e32c9401b6276ef028adcd8b25ca4458333d8008a554c413f54315ff8809 SHA512 4ed0ee9e8fe08532ff7f2905251af110f3fff0e419da5be50ae3e5a90906e43c39cf8edc219fcfe3e27a72591500c040afcc9552da875773375b170fb91aa9ff
+DIST rack-protection-3.0.6.gem 20480 BLAKE2B b29d8b87dd7bc4629d97923a448feacb53ae62f8d3753b44a627db742e3065eb1d09846e0be9131b02c83a32e1241154a844fcd5a5a7e708039cae7f6938fbb8 SHA512 4763a0439a3d99cfd799325004c7e6cb46783b3fcd77ea0df08caa6b5cdfc95c6ec96791d79261a0d7df26eb0b084e7ead2cceb05b589617159e948b3172e564
+DIST rack-protection-3.1.0.gem 20480 BLAKE2B ae5a784eb7420b756d15b251ebc981197f11979e76fed2ad42eb0bcf84719f4b9ab9d68a40ac9ee8db392ad7a8c45c8d4f03de2efb0375dbaa131ec5ff2022e2 SHA512 18a5ffe614a906ca876926bff3e4d1657f0b6963005ee32de80d0ab987b9465f603b30d69f07fd8d8a1ebf4fa85eb89bfd0b607d72387b360d13bea113a63ef7
+DIST rack-protection-3.2.0.gem 20480 BLAKE2B ac471dd39e8aad633bf20835f8dbeb9ca53b314b038391a8b334b1e5f2dd2c88983b1988655b5c946211883956318e50a7c2990386a0a43881f29bca474c8789 SHA512 8c8a715e031bbba3a572dc70e3ebc75357e43860fb8c3c88d15c9f07c07b3d6d27b335abc2eebb29c12a78871ef7be9788231f7ccfafca692afea49397310fee
diff --git a/dev-ruby/rack-protection/metadata.xml b/dev-ruby/rack-protection/metadata.xml
index 517e7b4cdcc6..f2a92a716a0a 100644
--- a/dev-ruby/rack-protection/metadata.xml
+++ b/dev-ruby/rack-protection/metadata.xml
@@ -6,10 +6,10 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <longdescription>
-Rack provides a common API for connecting web frameworks, web servers and layers
-of software inbetween.
-</longdescription>
+  Rack provides a common API for connecting web frameworks, web servers and layers
+  of software inbetween.
+  </longdescription>
   <upstream>
-    <remote-id type="github">rkh/rack-protection</remote-id>
+    <remote-id type="github">sinatra/rack-protection</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rack-protection/rack-protection-2.2.0.ebuild b/dev-ruby/rack-protection/rack-protection-2.2.0.ebuild
deleted file mode 100644
index 263f114e79f3..000000000000
--- a/dev-ruby/rack-protection/rack-protection-2.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-# There are no specs in the gem and the source cannot be downloaded separately.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem protects against typical web attacks"
-HOMEPAGE="https://github.com/rkh/rack-protection"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rack:*"
-
-# ruby_add_bdepend "test? ( dev-ruby/rack-test )"
diff --git a/dev-ruby/rack-protection/rack-protection-3.0.5.ebuild b/dev-ruby/rack-protection/rack-protection-3.0.5.ebuild
new file mode 100644
index 000000000000..41a0cc7dac0f
--- /dev/null
+++ b/dev-ruby/rack-protection/rack-protection-3.0.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem protects against typical web attacks"
+HOMEPAGE="https://github.com/rkh/rack-protection"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+# ruby_add_bdepend "test? ( dev-ruby/rack-test )"
diff --git a/dev-ruby/rack-protection/rack-protection-3.0.6.ebuild b/dev-ruby/rack-protection/rack-protection-3.0.6.ebuild
new file mode 100644
index 000000000000..fe0df221df36
--- /dev/null
+++ b/dev-ruby/rack-protection/rack-protection-3.0.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+# There are no specs in the gem and the source cannot be downloaded separately.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem protects against typical web attacks"
+HOMEPAGE="https://sinatrarb.com/protection/"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+# ruby_add_bdepend "test? ( dev-ruby/rack-test )"
diff --git a/dev-ruby/rack-protection/rack-protection-3.1.0.ebuild b/dev-ruby/rack-protection/rack-protection-3.1.0.ebuild
new file mode 100644
index 000000000000..084831e63ebe
--- /dev/null
+++ b/dev-ruby/rack-protection/rack-protection-3.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# There are no specs in the gem and the source cannot be downloaded separately.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem protects against typical web attacks"
+HOMEPAGE="https://sinatrarb.com/protection/"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+# ruby_add_bdepend "test? ( dev-ruby/rack-test )"
diff --git a/dev-ruby/rack-protection/rack-protection-3.2.0.ebuild b/dev-ruby/rack-protection/rack-protection-3.2.0.ebuild
new file mode 100644
index 000000000000..b79877ef8fa3
--- /dev/null
+++ b/dev-ruby/rack-protection/rack-protection-3.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# There are no specs in the gem and the source cannot be downloaded separately.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem protects against typical web attacks"
+HOMEPAGE="https://sinatrarb.com/protection/"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+# ruby_add_bdepend "test? ( dev-ruby/rack-test )"
diff --git a/dev-ruby/rack-session/Manifest b/dev-ruby/rack-session/Manifest
new file mode 100644
index 000000000000..0b6be764241e
--- /dev/null
+++ b/dev-ruby/rack-session/Manifest
@@ -0,0 +1,2 @@
+DIST rack-session-1.0.1.tar.gz 3120 BLAKE2B a36fefd25da9bbab26a58419782baf7606171fcdf9d033b3abb52ee225f5bd3f8b52d18c11947cceae8f00f278c832412b3babb8c2d7088f2a6554dcb0293689 SHA512 fa8362689cd49d55e24c82699eca9a45dd408b5e8978f6aee11f3f107e8d0a1f36ad319f4dd92e4fe5fd83e985382a43c41a353e9366d03b41f28e826d65483f
+DIST rack-session-2.0.0.tar.gz 23964 BLAKE2B 457210c3588c31d2d0d9251e6b12fe1f606545c4593c9be50a42110f99f7d15840553cac7e35653f2ef86d88f881a0a91537948bfca5b34e3d507cef8134c52b SHA512 8975a85845fa4dbdf22c10793fb2bb1a69aed3242c70c45b1d436448243e65ad77ecbfb17c8f2ef6f780b81ef480f8a46c5623e36dacc95401cd59a1510748f8
diff --git a/dev-ruby/rack-session/metadata.xml b/dev-ruby/rack-session/metadata.xml
new file mode 100644
index 000000000000..f90b9e380825
--- /dev/null
+++ b/dev-ruby/rack-session/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">rack/rack-session</remote-id>
+    <remote-id type="rubygems">rack-session</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/rack-session/rack-session-1.0.1.ebuild b/dev-ruby/rack-session/rack-session-1.0.1.ebuild
new file mode 100644
index 000000000000..ecc25cc0d96a
--- /dev/null
+++ b/dev-ruby/rack-session/rack-session-1.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="rack-session.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A session implementation for Rack"
+HOMEPAGE="https://github.com/rack/rack-session"
+SRC_URI="https://github.com/rack/rack-session/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "<dev-ruby/rack-3"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/minitest-global_expectations
+)"
+
+all_ruby_prepare() {
+	sed -e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rack-session/rack-session-2.0.0.ebuild b/dev-ruby/rack-session/rack-session-2.0.0.ebuild
new file mode 100644
index 000000000000..b9c1619948b2
--- /dev/null
+++ b/dev-ruby/rack-session/rack-session-2.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="rack-session.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A session implementation for Rack"
+HOMEPAGE="https://github.com/rack/rack-session"
+SRC_URI="https://github.com/rack/rack-session/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rack-3.0.0"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/minitest-global_expectations
+)"
+
+all_ruby_prepare() {
+	sed -e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rack-test/Manifest b/dev-ruby/rack-test/Manifest
index b851dbab092d..9b4545c8800a 100644
--- a/dev-ruby/rack-test/Manifest
+++ b/dev-ruby/rack-test/Manifest
@@ -1 +1 @@
-DIST rack-test-1.1.0.tar.gz 27035 BLAKE2B 640de2303850662c3b6a8fc17f2344223c9928b48abde6d1b251a634689793158f35498c4736e4e2d069efa921d37bc32da92a7e17c0761a6f6111b345b54c1a SHA512 36d947d9b13d33ee8322e5b9d18fe8266787ccb7703f1fafadc040123e34dd44e98e7faf8b6dd816e51ed167065b2ffe79e9bcee74564dc324ba2b7dba76f82a
+DIST rack-test-2.1.0.tar.gz 30099 BLAKE2B 212f23cf1d65f8840e04bc895d511b1b35e0344e5074e7ef3a15c5184a55285cb495b54489512ba7757cfbbe4ce9886db9f6dd36e092f5653c3c5bc8fb84ea7a SHA512 0d9d1e2b74ff8acca1c97d08c068022345556758c3c0dcf81b87c2f7caa8ca5730af2adc89e5c2bcf8f598f08df056c39f7c348f13a1ce44c4bcf0f84fe2bc11
diff --git a/dev-ruby/rack-test/metadata.xml b/dev-ruby/rack-test/metadata.xml
index 3603a4c3ff23..0bc53df14b4f 100644
--- a/dev-ruby/rack-test/metadata.xml
+++ b/dev-ruby/rack-test/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">brynary/rack-test</remote-id>
+    <remote-id type="github">rack/rack-test</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rack-test/rack-test-1.1.0-r1.ebuild b/dev-ruby/rack-test/rack-test-1.1.0-r1.ebuild
deleted file mode 100644
index fff17aea6b0d..000000000000
--- a/dev-ruby/rack-test/rack-test-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rack::Test is a small, simple testing API for Rack apps"
-HOMEPAGE="https://github.com/rack-test/rack-test"
-SRC_URI="https://github.com/rack-test/rack-test/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rack-1.0:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "
-	test? ( dev-ruby/sinatra:2 )"
-
-all_ruby_prepare() {
-	rm Gemfile* || die
-	sed -e '/bundler/d' \
-		-e '/[Cc]ode[Cc]limate/d' \
-		-e '/simplecov/,/^end/ s:^:#:' \
-		-i spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid test broken with rack 2.2
-	sed -i -e '/closes response.s body/askip "rack 2.2 compatibility"' spec/rack/test_spec.rb || die
-}
diff --git a/dev-ruby/rack-test/rack-test-1.1.0.ebuild b/dev-ruby/rack-test/rack-test-1.1.0.ebuild
deleted file mode 100644
index 0f5bff84d58f..000000000000
--- a/dev-ruby/rack-test/rack-test-1.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rack::Test is a small, simple testing API for Rack apps"
-HOMEPAGE="https://github.com/rack-test/rack-test"
-SRC_URI="https://github.com/rack-test/rack-test/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rack-1.0:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "
-	test? ( dev-ruby/sinatra:2 )"
-
-all_ruby_prepare() {
-	rm Gemfile* || die
-	sed -e '/bundler/d' \
-		-e '/[Cc]ode[Cc]limate/d' \
-		-e '/simplecov/,/^end/ s:^:#:' \
-		-i spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid test broken with rack 2.2
-	sed -i -e '/closes response.s body/askip "rack 2.2 compatibility"' spec/rack/test_spec.rb || die
-}
diff --git a/dev-ruby/rack-test/rack-test-2.1.0.ebuild b/dev-ruby/rack-test/rack-test-2.1.0.ebuild
new file mode 100644
index 000000000000..d5b45167ab51
--- /dev/null
+++ b/dev-ruby/rack-test/rack-test-2.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rack::Test is a small, simple testing API for Rack apps"
+HOMEPAGE="https://github.com/rack/rack-test"
+SRC_URI="https://github.com/rack/rack-test/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rack-1.3:*"
+ruby_add_bdepend "
+	test? ( dev-ruby/minitest:5 dev-ruby/minitest-global_expectations )"
+
+all_ruby_prepare() {
+	sed -e 's/git ls-files --/find/' \
+		-e "s:_relative ': './:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -w spec/all.rb || die
+}
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index f85711c3d4ea..cfbd893f1d2c 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1 +1,7 @@
-DIST rack-2.2.3.tar.gz 278045 BLAKE2B 2182ab6ee2ca0e40bd131dc96cf15d7e1015570a0702c2419e50da9eae6afedc0f1543a2fdc1fb32022a65788ab486b7add688c8bf201ad46a3d101b6e625a8b SHA512 0daefd1fd7d1c83a5aaf0e8a3c0d734f805f6718c3f2d20673e78242f10fa99c24f8e8d480cb7f0ee299d96a4b691e4a19c967785de946dc863e9b78e0c3ac53
+DIST rack-2.2.8.1.tar.gz 279646 BLAKE2B 2e466bb3052266fa3cba5551af128d6723d9acd281962bbc84cb6c4c9a0aaaf018417c5549ae9cd8ae74df12726e1d62346b22cc1217248be488a63449cf870d SHA512 3dc99071ff5e68954824e6af57524222d4f0014e1cdf04dafc2131e5a2c208c6aa925a2ad053e2d26204383b20395ab499e8236a1d92c8c4e7d7959225bd5dc6
+DIST rack-2.2.8.tar.gz 279555 BLAKE2B 798d6d1e0877a895c0b4d33c5dc20e6cfab88745abd4cb76166484df355b283a9e842791b0d874c53ffb8600258d169e24a4570850f4f0994b596c6ebf76937e SHA512 e3055483c8f6f7a9a6aeb5654865a004b02bef781dd95072b84402a98549c13c66b5591b25b1a35fb6915af4b39adf88aa716e3edef7d0e41dbebf2a2a79ffcb
+DIST rack-2.2.9.tar.gz 280594 BLAKE2B 669eb4b979183a23474600003f18580e8f3ccfe9677db0c5e93a86f1f6c00cfdecf1e0481249199470dbb1ae3423c2e883cd8149d7fc65c5e8be88a83473aa32 SHA512 a9d6fdeb5603217a0208d383875613b86072da44e14b0e6ce0811ec55b80a0abd7448bd8f0c94bfef900fcd632e85228d74094efd88c829ebd6c565076ff47f8
+DIST rack-3.0.10.tar.gz 789469 BLAKE2B 2c9781301034f30524243727ada5450f613d474210f4f0edbafec994fd6705b8e777295e3066b4a5f698065ffa57c0d0a2bd75450c07047fd6313b5df70e4fad SHA512 9f165fb81c648cdcf973ad0e03a8ffcf0785dbdaf063f11b0b8c3a124af5765b9dfde57f728d1e13b50c3f9efa375fe7e0b7b0f2c044e7a074ab96d577021c98
+DIST rack-3.0.8.tar.gz 788610 BLAKE2B 9a591242e37f10021a2779bc495ab0ef954eb6474efe279f2bc6417e4255d83a92f156a9bc52fe90c098dc23c26eddf802119fdcd739a05332bc398db1c12456 SHA512 045a1de846e984d2067ce647d0b3652c810a264fa4f84e9791a623ac5c5cfa5ab4b961c4cb0328b51a71f66082190741dbaac3f4dbafad7c5a8e97a71b169448
+DIST rack-3.0.9.1.tar.gz 789318 BLAKE2B 300be59512a1497b832fe553ae9d957e380c5399707c891b67a950db32682ee8e2539dab02e656fdc855a8c821d7a5d8674b9208d4cc701f534eb8f1a8767fcf SHA512 0aacf814463dc03a95aaa7ec979caf3464d9e19d5ab9c3842978c2c94b81e8b2ed040f3f4028fd046c73e0632ee7754755cd35afc81ca47e22d43d4882086dc0
+DIST rack-3.0.9.tar.gz 789232 BLAKE2B b71eb67ff796a1389bba79c3132608bec30a65d44fa8dd302a5c4e40a42b30b0284aeea6b0b5a1c73ec823e134c25ce426375bfa8772242a8f6b05a4187ee36b SHA512 0a69f4755119aae5c6e0ab8b1541eade221a701a9cdba3b10afd2bbd2a37e8b0faa80aad92304cf29793b2536b05e8a5ae3c0e0e986b021af1566bda8d387353
diff --git a/dev-ruby/rack/metadata.xml b/dev-ruby/rack/metadata.xml
index 1adcc43a6508..416ec8c431ca 100644
--- a/dev-ruby/rack/metadata.xml
+++ b/dev-ruby/rack/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<longdescription>Rack provides a common API for connecting web frameworks, web servers and layers
-of software inbetween.</longdescription>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <longdescription>
+    Rack provides a common API for connecting web frameworks, web servers and layers
+    of software inbetween.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">rack/rack</remote-id>
+    <remote-id type="rubygems">rack</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rack/rack-2.2.3.ebuild b/dev-ruby/rack/rack-2.2.3.ebuild
deleted file mode 100644
index 6b2817efd18b..000000000000
--- a/dev-ruby/rack/rack-2.2.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://github.com/rack/rack"
-SRC_URI="https://github.com/rack/rack/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/minitest-global_expectations
-	dev-ruby/concurrent-ruby
-)"
-
-# The gem has automagic dependencies over mongrel, ruby-openid,
-# memcache-client, thin, mongrel and camping; not sure if we should
-# make them dependencies at all.
-
-# Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} !<dev-ruby/rack-1.6.4-r2:1.6 !!<dev-ruby/rack-2.0.8-r1:2.0 !!<dev-ruby/rack-2.1.1-r1:2.1"
-
-all_ruby_prepare() {
-	# The build system tries to generate the ChangeLog from git. Create
-	# an empty file to avoid a needless dependency on git.
-	touch ChangeLog || die
-
-	# Avoid development dependency
-	sed -i -e '/minitest-sprint/ s:^:#:' -e "s:require_relative ':require './:" rack.gemspec || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/rack/rack-2.2.8.1.ebuild b/dev-ruby/rack/rack-2.2.8.1.ebuild
new file mode 100644
index 000000000000..6877ce8eef40
--- /dev/null
+++ b/dev-ruby/rack/rack-2.2.8.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="https://github.com/rack/rack"
+SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/minitest-global_expectations
+	|| ( dev-ruby/psych:5 dev-ruby/psych:0 )
+	dev-ruby/webrick
+)"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all.
+
+all_ruby_prepare() {
+	# The build system tries to generate the ChangeLog from git. Create
+	# an empty file to avoid a needless dependency on git.
+	touch ChangeLog || die
+
+	# Avoid development dependency
+	sed -i -e '/minitest-sprint/ s:^:#:' -e "s:require_relative ':require './:" rack.gemspec || die
+
+	# Rename rackup command and force gem version to allow rack 2.x applications to work
+	mv bin/rackup bin/rackup-2 || die
+	sed -i -e '4igem "rack", "~> 2.2.0"' bin/rackup-2
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	einfo "The rackup command is installed as 'rackup-2' to allow parallel installation with rack 3"
+}
diff --git a/dev-ruby/rack/rack-2.2.8.ebuild b/dev-ruby/rack/rack-2.2.8.ebuild
new file mode 100644
index 000000000000..f39f092872f5
--- /dev/null
+++ b/dev-ruby/rack/rack-2.2.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="https://github.com/rack/rack"
+SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/minitest-global_expectations
+	|| ( dev-ruby/psych:5 dev-ruby/psych:0 )
+	dev-ruby/webrick
+)"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all.
+
+all_ruby_prepare() {
+	# The build system tries to generate the ChangeLog from git. Create
+	# an empty file to avoid a needless dependency on git.
+	touch ChangeLog || die
+
+	# Avoid development dependency
+	sed -i -e '/minitest-sprint/ s:^:#:' -e "s:require_relative ':require './:" rack.gemspec || die
+
+	# Rename rackup command and force gem version to allow rack 2.x applications to work
+	mv bin/rackup bin/rackup-2 || die
+	sed -i -e '4igem "rack", "~> 2.2.0"' bin/rackup-2
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	einfo "The rackup command is installed as 'rackup-2' to allow parallel installation with rack 3"
+}
diff --git a/dev-ruby/rack/rack-2.2.9.ebuild b/dev-ruby/rack/rack-2.2.9.ebuild
new file mode 100644
index 000000000000..6877ce8eef40
--- /dev/null
+++ b/dev-ruby/rack/rack-2.2.9.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="https://github.com/rack/rack"
+SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/minitest-global_expectations
+	|| ( dev-ruby/psych:5 dev-ruby/psych:0 )
+	dev-ruby/webrick
+)"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all.
+
+all_ruby_prepare() {
+	# The build system tries to generate the ChangeLog from git. Create
+	# an empty file to avoid a needless dependency on git.
+	touch ChangeLog || die
+
+	# Avoid development dependency
+	sed -i -e '/minitest-sprint/ s:^:#:' -e "s:require_relative ':require './:" rack.gemspec || die
+
+	# Rename rackup command and force gem version to allow rack 2.x applications to work
+	mv bin/rackup bin/rackup-2 || die
+	sed -i -e '4igem "rack", "~> 2.2.0"' bin/rackup-2
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	einfo "The rackup command is installed as 'rackup-2' to allow parallel installation with rack 3"
+}
diff --git a/dev-ruby/rack/rack-3.0.10.ebuild b/dev-ruby/rack/rack-3.0.10.ebuild
new file mode 100644
index 000000000000..34788801390b
--- /dev/null
+++ b/dev-ruby/rack/rack-3.0.10.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md SECURITY.md SPEC.rdoc UPGRADE-GUIDE.md"
+
+RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="https://github.com/rack/rack"
+SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/minitest-global_expectations
+	dev-ruby/webrick
+)"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all.
+
+all_ruby_prepare() {
+	# The build system tries to generate the ChangeLog from git. Create
+	# an empty file to avoid a needless dependency on git.
+	touch ChangeLog || die
+
+	sed -i -e "s:require_relative ':require './:" rack.gemspec || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/rack/rack-3.0.8.ebuild b/dev-ruby/rack/rack-3.0.8.ebuild
new file mode 100644
index 000000000000..baa821ead480
--- /dev/null
+++ b/dev-ruby/rack/rack-3.0.8.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md SECURITY.md SPEC.rdoc UPGRADE-GUIDE.md"
+
+RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="https://github.com/rack/rack"
+SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/minitest-global_expectations
+	dev-ruby/webrick
+)"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all.
+
+all_ruby_prepare() {
+	# The build system tries to generate the ChangeLog from git. Create
+	# an empty file to avoid a needless dependency on git.
+	touch ChangeLog || die
+
+	sed -i -e "s:require_relative ':require './:" rack.gemspec || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/rack/rack-3.0.9.1.ebuild b/dev-ruby/rack/rack-3.0.9.1.ebuild
new file mode 100644
index 000000000000..34788801390b
--- /dev/null
+++ b/dev-ruby/rack/rack-3.0.9.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md SECURITY.md SPEC.rdoc UPGRADE-GUIDE.md"
+
+RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="https://github.com/rack/rack"
+SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/minitest-global_expectations
+	dev-ruby/webrick
+)"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all.
+
+all_ruby_prepare() {
+	# The build system tries to generate the ChangeLog from git. Create
+	# an empty file to avoid a needless dependency on git.
+	touch ChangeLog || die
+
+	sed -i -e "s:require_relative ':require './:" rack.gemspec || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/rack/rack-3.0.9.ebuild b/dev-ruby/rack/rack-3.0.9.ebuild
new file mode 100644
index 000000000000..34788801390b
--- /dev/null
+++ b/dev-ruby/rack/rack-3.0.9.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md SECURITY.md SPEC.rdoc UPGRADE-GUIDE.md"
+
+RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="https://github.com/rack/rack"
+SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/minitest-global_expectations
+	dev-ruby/webrick
+)"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all.
+
+all_ruby_prepare() {
+	# The build system tries to generate the ChangeLog from git. Create
+	# an empty file to avoid a needless dependency on git.
+	touch ChangeLog || die
+
+	sed -i -e "s:require_relative ':require './:" rack.gemspec || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/rackup/Manifest b/dev-ruby/rackup/Manifest
new file mode 100644
index 000000000000..912a9a7fbbc1
--- /dev/null
+++ b/dev-ruby/rackup/Manifest
@@ -0,0 +1 @@
+DIST rackup-2.1.0.tar.gz 25009 BLAKE2B 56de2ad40a1e4dbd0d7efb6583ceea6836eea4fa37b81c0f670dfe91b1c18e9cc4eed21c9057e027d8eb5b04a0cb148b6f5bd540ec3491e2381976902178aa24 SHA512 c470af246388243d2c48f244ccdc72aa8888539f5561fb1352c68ae3946713f14853820348b9a96f9507c316e0f619f111cd3cde077f6ee7f9dadc4bb2f2396d
diff --git a/dev-ruby/rackup/metadata.xml b/dev-ruby/rackup/metadata.xml
new file mode 100644
index 000000000000..2b0a4ab4ca80
--- /dev/null
+++ b/dev-ruby/rackup/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">rack/rackup</remote-id>
+    <remote-id type="rubygems">rackup</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/rackup/rackup-2.1.0-r1.ebuild b/dev-ruby/rackup/rackup-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..0946a2ddc09d
--- /dev/null
+++ b/dev-ruby/rackup/rackup-2.1.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md security.md"
+
+RUBY_FAKEGEM_GEMSPEC="rackup.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A general server command for Rack applications"
+HOMEPAGE="https://github.com/rack/rackup"
+SRC_URI="https://github.com/rack/rackup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/rack:3.0
+	>=dev-ruby/webrick-1.8:0
+	virtual/ruby-ssl
+	!<dev-ruby/rack-2.2.7-r1
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/minitest-global_expectations
+)"
+
+all_ruby_prepare() {
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e "Dir['test/spec_*.rb'].each{ require _1 }" || die
+}
diff --git a/dev-ruby/radius/radius-0.7.5-r1.ebuild b/dev-ruby/radius/radius-0.7.5-r1.ebuild
index 8fd66a96aa1d..6dea83697e4f 100644
--- a/dev-ruby/radius/radius-0.7.5-r1.ebuild
+++ b/dev-ruby/radius/radius-0.7.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG QUICKSTART.rdoc README.rdoc"
 
diff --git a/dev-ruby/rails-dom-testing/Manifest b/dev-ruby/rails-dom-testing/Manifest
index 6c38c5c58c07..8c37a71cbc7f 100644
--- a/dev-ruby/rails-dom-testing/Manifest
+++ b/dev-ruby/rails-dom-testing/Manifest
@@ -1 +1,2 @@
-DIST rails-dom-testing-2.0.3.gem 14336 BLAKE2B 8740433474e88a7cb5be14b4357dd0b69d45a39972136cfe9a4d695d2478b5b535e2b407eb0acc9ec3abd633cb1f8591a634abe6eacd8ec38bba865ad32ed92e SHA512 910549bd42e6651b7160af0a4aaffbbdeaee829aa7c3f3552a73ba985ef1230d5586f5bf723018f2cd8c6d5c6238d045a8f3e686704b6989e5a56664061f6c72
+DIST rails-dom-testing-2.1.1.gem 14848 BLAKE2B 6923e861ed19bb920fc8e356a9f568f6c9048e87e9bc7adbc804f7fcba92bb8e636b71e4a4594b845e220f19614169d4466a4151df27a45025eb839fea539364 SHA512 c820925858b0ea1c4f978743f0f1c2cb9104f66f82fb2b75ec1219d8d68d5766a3e3e571950e2a436d951d183877f5eed4c6d4d9039cee298ee15e568bea43fc
+DIST rails-dom-testing-2.2.0.gem 16896 BLAKE2B 7d2c17970b69a21d971a93d7a93f7ccdb269c609f53fcb573406f7670d17bc49e6313e723288a9e389c582c2331fa1088f1a4e8c10daf2d48cfdaec2b6e00e04 SHA512 90607b42d0239933f34aac803e090802ea823fd6c980149395860d50e8361428d6c5a4a3e9fedd5c7870c896864d3e797d5180b9796c9132ed2755d21e55de98
diff --git a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild b/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild
deleted file mode 100644
index 50bbca2323b5..000000000000
--- a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compare doms and assert certain elements exists in doms using Nokogiri"
-HOMEPAGE="https://github.com/kaspth/rails-dom-testing"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/activesupport-4.2.0:*
-	>=dev-ruby/nokogiri-1.6"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r2.ebuild b/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r2.ebuild
deleted file mode 100644
index e9ad3e08cfa4..000000000000
--- a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compare doms and assert certain elements exists in doms using Nokogiri"
-HOMEPAGE="https://github.com/kaspth/rails-dom-testing"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/activesupport-4.2.0:*
-	>=dev-ruby/nokogiri-1.6"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rails-dom-testing/rails-dom-testing-2.1.1.ebuild b/dev-ruby/rails-dom-testing/rails-dom-testing-2.1.1.ebuild
new file mode 100644
index 000000000000..ea3ed52cd8ee
--- /dev/null
+++ b/dev-ruby/rails-dom-testing/rails-dom-testing-2.1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Compare doms and assert certain elements exists in doms using Nokogiri"
+HOMEPAGE="https://github.com/kaspth/rails-dom-testing"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/activesupport-5.0.0:*
+	>=dev-ruby/nokogiri-1.6
+	dev-ruby/minitest
+"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rails-dom-testing/rails-dom-testing-2.2.0.ebuild b/dev-ruby/rails-dom-testing/rails-dom-testing-2.2.0.ebuild
new file mode 100644
index 000000000000..272b5586675b
--- /dev/null
+++ b/dev-ruby/rails-dom-testing/rails-dom-testing-2.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Compare doms and assert certain elements exists in doms using Nokogiri"
+HOMEPAGE="https://github.com/kaspth/rails-dom-testing"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/activesupport-5.0.0:*
+	>=dev-ruby/nokogiri-1.6
+	dev-ruby/minitest
+"
+
+each_ruby_test() {
+	MT_NO_PLUGINS=1 ${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rails-html-sanitizer/Manifest b/dev-ruby/rails-html-sanitizer/Manifest
index 6bf168403213..002418af9a5f 100644
--- a/dev-ruby/rails-html-sanitizer/Manifest
+++ b/dev-ruby/rails-html-sanitizer/Manifest
@@ -1,3 +1,2 @@
-DIST rails-html-sanitizer-1.3.0.gem 16384 BLAKE2B ae0b9acfd4ffc53b84b92cb42c149022312112f90d64866de916be2b91b680ecfbbdc94d278626c992cc90b0061705c11c9a604f6d9e91092e1117e40e003e6d SHA512 01d67f750ffc6ac857e4dc47b77d66e02acc4488f353af97e2fc367590fe85107b631aaf8b32f61f9e1f375c93e1b24fbf966f738e35483f5174880a0ffe5ddb
-DIST rails-html-sanitizer-1.4.1.gem 17408 BLAKE2B 4d503bad7a84aefe3bfbb1121eebe768ecf388f502e9ee58f2daf9d1a497ecfea2ad29e7bdd7c2b06e6914355b8eeaf2eeb730aadbceadebdd5a342b9fdc0969 SHA512 c778189fd3fdbdca4a586938d0f22b600f499a174d4d0e34567f0a2a92b8095a2c6c544e47cca3bd7d1f8ae09916898c200d4462de2d31f6bb8eb2c920ab69b4
-DIST rails-html-sanitizer-1.4.2.gem 16896 BLAKE2B 97f09d43ad99c13c07c34c0f5c47e3b34983b94773923cf7d131d1115d818ede619fc0ef268c5523524c53178afde2c9ee2652617add6b4efc282d190591be80 SHA512 9f0872f1000c758918f66a889322d3393ec678604eb3b01fc21bbb861189ec04fcf05f5c9487bd5eeb63ce6d99a80064718c82bfce2daf25c07754979a2ed747
+DIST rails-html-sanitizer-1.5.0.gem 19456 BLAKE2B 7f8b0270d9006b975fed28941139e176af4738954bd56e7b34dbc4f778521d770ff0c2c92cb365d1a671fc69d1da79f4d3bd4d90e37913c61084139ba7ff9893 SHA512 533a203d34b0f77b70258fc1b610caf1d4910da48224b136774d094ee8fa74b5cd9f3b1719118334489a41d743b97592539935b05b07770cd745e03634422214
+DIST rails-html-sanitizer-1.6.0.gem 23552 BLAKE2B 7bc00cada4bb10a6f3b264a20f555b1e3e81a09d528339f20961ebbd5c958c23a7b14febf8a2e1c07d36e8d67aff30317d2ebc0f9cd009a1b519d24b18a0171b SHA512 265c093872b43794be02a8b1d2574be8270762b46c2b0d930159d3b41e06b897ed8b6edf3b219e0e71591fa5f7d38107ed8d332cebd3dfe4c37c6d06b7b5fa12
diff --git a/dev-ruby/rails-html-sanitizer/metadata.xml b/dev-ruby/rails-html-sanitizer/metadata.xml
index 57108ad3af2e..62317cbe4271 100644
--- a/dev-ruby/rails-html-sanitizer/metadata.xml
+++ b/dev-ruby/rails-html-sanitizer/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">rafaelfranca/rails-html-sanitizer</remote-id>
+    <remote-id type="github">rails/rails-html-sanitizer</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0-r1.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0-r1.ebuild
deleted file mode 100644
index b96d893f1ddf..000000000000
--- a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Sanitize HTML fragments in Rails applications"
-HOMEPAGE="https://github.com/rafaelfranca/rails-html-sanitizer"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/loofah-2.3:0"
-
-ruby_add_bdepend "test? ( dev-ruby/rails-dom-testing )"
-
-all_ruby_prepare() {
-	# Avoid tests that depend on nokogiri patches to libxml2.
-	sed -i -e '/\(name_action\|attr\)_in_a_tag_in_safe_list_sanitizer/askip "libxml2"' test/sanitizer_test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.1.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.1.ebuild
deleted file mode 100644
index 144833b644b3..000000000000
--- a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Sanitize HTML fragments in Rails applications"
-HOMEPAGE="https://github.com/rafaelfranca/rails-html-sanitizer"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/loofah-2.3:0"
-
-ruby_add_bdepend "test? ( dev-ruby/rails-dom-testing )"
-
-all_ruby_prepare() {
-	# Avoid tests that depend on nokogiri patches to libxml2.
-	sed -i -e '/\(name_action\|attr\)_in_a_tag_in_safe_list_sanitizer/askip "libxml2"' test/sanitizer_test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.2.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.2.ebuild
deleted file mode 100644
index e734cd19c106..000000000000
--- a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Sanitize HTML fragments in Rails applications"
-HOMEPAGE="https://github.com/rafaelfranca/rails-html-sanitizer"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/loofah-2.3:0"
-
-ruby_add_bdepend "test? ( dev-ruby/rails-dom-testing )"
-
-all_ruby_prepare() {
-	# Avoid tests that depend on nokogiri patches to libxml2.
-	sed -i -e '/\(name_action\|attr\)_in_a_tag_in_safe_list_sanitizer/askip "libxml2"' test/sanitizer_test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.5.0.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.5.0.ebuild
new file mode 100644
index 000000000000..1b3a9b71d304
--- /dev/null
+++ b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.5.0.ebuild
@@ -0,0 +1,32 @@
+# 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.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Sanitize HTML fragments in Rails applications"
+HOMEPAGE="https://github.com/rafaelfranca/rails-html-sanitizer"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/loofah-2.19.1:0"
+
+ruby_add_bdepend "test? ( dev-ruby/rails-dom-testing )"
+
+all_ruby_prepare() {
+	# Avoid tests that depend on nokogiri patches to libxml2.
+#	sed -i -e '/\(name_action\|attr\)_in_a_tag_in_safe_list_sanitizer/askip "libxml2"' test/sanitizer_test.rb || die
+:
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.6.0.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.6.0.ebuild
new file mode 100644
index 000000000000..0daf562b836c
--- /dev/null
+++ b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.6.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Sanitize HTML fragments in Rails applications"
+HOMEPAGE="https://github.com/rails/rails-html-sanitizer"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/loofah-2.21:0 >=dev-ruby/nokogiri-1.14:0"
+
+ruby_add_bdepend "test? ( dev-ruby/rails-dom-testing )"
+
+all_ruby_prepare() {
+	# Avoid tests that depend on nokogiri patches to libxml2.
+#	sed -i -e '/\(name_action\|attr\)_in_a_tag_in_safe_list_sanitizer/askip "libxml2"' test/sanitizer_test.rb || die
+:
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 0f96da59e5af..a595834c296c 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,15 +1,6 @@
-DIST rails-5.2.6.gem 6656 BLAKE2B 95052fd231c0e390b5194af01f7e80d7e8dd34b155b40b95046625f060f89d799a641e5a79fd06efb606a4f5527d556c10a86da9d972ce36c526dcdc639623b6 SHA512 9c6965dd1ad4d5a12f7116e372f7b38bd95a93d24d93b66860086922aedf30aa1ad5cc27578f87d72228d893c1d73b431c195b0d1f8b1bc5a645b00fead05f9d
-DIST rails-5.2.7.1.gem 6656 BLAKE2B 0c7da4951ac22518ede6f502bef9c7a13925c27792a97d00e9fecbb1186732e7fc728db6f8c4155a4842c32ece7a9927540e047c3f009828eb8ca3107b29dc3c SHA512 a251d8086c850e04b9e686cc9a7532872c3d81d28ed675c163c9a6bd1a8deae9474512b53216415937b2422d5461cd66220edf8225860a49bc6546923fb0da38
-DIST rails-5.2.8.gem 6656 BLAKE2B dc30dc10e9a2d9f72a9827931ebb1cc34eea3495fbbf0ffdc4feb46ede25ada6f26e8e3ada1180f639eaf066fac0b80cccf5e601c9f73ec507211e9b73ece58d SHA512 b8ac1afc31a13ec9736ef81dbdd3ad89c4c7337e766e3598ea0c467fb06b925dd29372bef7b6b8f7b26ca9a51c1e831621338753519075b3d03f4bf7c237fe82
-DIST rails-6.0.4.1.gem 6656 BLAKE2B f3ab76fa7ce5e3a668a98b7d1292516f34d36c466b8eea45de136791375d480ae016bfd824d6397af4e44280ff5567ce215e5df3d90867adeb0bc02bdedb1a66 SHA512 ae71bf509339b5c802dd9586caa10a3639fe73225ee4afe59a2bce2de9c58fe0f3e6faf6ed8b0e364ca579a9ec78d012c2f7a842745c6c81c5a4e9d0fa66efd1
-DIST rails-6.0.4.4.gem 6656 BLAKE2B 5a86f542a1030653fdb8d9ac994199b32ce4ab19e62c04e6c11bf66ecdf870654a31b312a3b75b8ac1df7b5f6dea7e423873f8f79030dbc7777d369c3c88eb86 SHA512 369a49d6c8371f7216f030ef9a69679bb3676267b4ecb524f8bf06e89f03a28dd0ab981c4cc9498f002bb95874b3661aa3ec923c64c30cc521a77d33352b57a9
-DIST rails-6.0.4.7.gem 6656 BLAKE2B 69c921093a9b0fdd13fa50afacf36bd6ac9230c5aee83b30864b1a9d3754699f6cbb7c89c6d38de475371c1608e398f12144b9649b3eae2ef3cfecdbf3c21cf0 SHA512 6b88dc394ec180053feddd4e8b3eb83152ae2af5418c8a9ba5cc53739320689157dcd2f63333ab44206c035a1fa249cd008f9545d579e73d18423653501af7d0
-DIST rails-6.0.4.8.gem 6656 BLAKE2B b4a755b32538a52d00a5e51729382c32c553eb5104c842b359c9ea069f630b1f6656375c32348c893696e63317f42db2c8efdf28ed20e7d33b3f7dacd63b3d2f SHA512 46cc2868a11f8407a63bdbeafdc4fb550b7d447d9c529dea8cca8da0b4f9848c1b4bcd8dd80999be22d86e05da8cadb6d5e7bdc4351f0f7458b3f6014d9f7689
-DIST rails-6.0.5.gem 6656 BLAKE2B 3cb1a7c175ddd0e69335df2ec4abd9e4edea89e6c69627245b27f676a152e712eb475b6479477cc1cb31f0be7eba1ae11529d3820b9c183139f10064daab38aa SHA512 7ab1e1ae524b9e68f95f833f47908888a1699f5af6494102e66e7c7476924d4dc793228eaef78dda9a497e1988f8367c357a25e7df587b4c9fc9ddcdfa0eb7ce
-DIST rails-6.1.5.1.gem 6656 BLAKE2B 1f050c2c98bafdfe4c70c8581488336efb81e7a93bd86a2a996a6342aa6643e7360eb00d6455939d9412dd5bda3b3cd6770d14b66cb2f00812be4eb950a968aa SHA512 852ff9009d6820161458db0df255db96d85584453716f2b67d273558fcdb4ce9ea5c09f46dbb54a10015c327cf660ab04d5c613608beb7fd9e8a61824fc8c6f4
-DIST rails-6.1.5.gem 6656 BLAKE2B 23cf302daac889afc51fd9a3619cb229843adc91e8b1ff79531758e1d58ed009baa6fb86f04b124146475c7030754365d88b37aea1333cc002a8162182f4c3dc SHA512 f7cf72733a8662a750f3fa3d5fe00209db24109d029b7743e8f73833db5c63cb5a59a99c5711997e543f79c0ffb802f7a84a165d7ab7ea93afff9a564eecaa48
-DIST rails-6.1.6.gem 6656 BLAKE2B 94cbed0213ed04cd0e94d1d9b0af0204ab50c5120efafa950eec899cef814942772ec6f98e4ebcc51657a104d9fe29b060e55f6d1a2dc9a9c7701d3b171ac638 SHA512 60639b4247029d90ef12dffad37a007672d0cc3672316da540ed38e7d6c8a2702ed51e5a48797e1db5beffa042007cc9a134924d8f1f242f49f0c470c80f750f
-DIST rails-7.0.2.2.gem 6656 BLAKE2B 03d726703ed8c9403326b779a84ff8af171636e686a81a92c064156fd014f00f681cca844b5eeb696c6343bf83e72b9d7e2c43237c3d7639e4dd960140b3337f SHA512 475562e77a702eef88b9300a682db04be6f2a6c6beeaab737d41cdc326f80276efc0283e8ef7c2edaedad1d21ea38098af2c5b1f944bfa6be934edb00fc56df5
-DIST rails-7.0.2.3.gem 6656 BLAKE2B 84e016d03df001149f16524dcb5e8372a7e7548eb4b8fd1419d3ec44b39809fcbc26d704c95e5934bcc6c49d57c37114d5a1f16fd93fa929956685ce5caa8dd2 SHA512 8a9cd26ad1ac42928ac9ae9d00579e29f9559aff6dd44f57eb7fbefc06ad4aed320b946aa448c0cdfacd6afc8fbc78cacef031c8d0ca6b657c9a07af359943df
-DIST rails-7.0.2.4.gem 6656 BLAKE2B fb38071f7968361cf08e3332b536e3abdd0ad9730374c19b8322d3c9d688b777c5ccf92d1312336f9cfdcf7765894c44247b5073466dfd073319aef951162ae6 SHA512 18c77aa5ee62b31b0e44a65cbdf99b64b40634ecde72b22601912ce24d7ad0bcf364ef5f8e69fb974802b4e5c1027dfd61664ba5eb8e196f53d4b244eaba5210
-DIST rails-7.0.3.gem 6656 BLAKE2B 4f67a44190a44a6ba22447f7ef900b067332024a74bab2dd1bf52392fdcf28183ee883448c25eca18a3b2435b7f33f0591cbd62e63cbf918da8a9bd7668f287c SHA512 f62ae8430b3a81da3a295aee32bf8176e8becad9f4807c02a7aa582acd8bf3d140ae73169757d49ed6fd5d32fc37ab7c44c1961bddff902283e787a56d86f71f
+DIST rails-6.1.7.6.gem 6656 BLAKE2B 2ff137655bcf6e504a217bc5f796f5dbf935b8c7fd57ace8abb79f3e0473ef52e1cbcef969423d9bf00bf5606d0260049bfbfc389beae0b5b9d4127093420fcf SHA512 c2233f8e92d2d4ad02f03c189a5a94cc97c40e35ca1423cfcdbea92f46f7cb73be595ef979c8a7f734c92bb76dbb85b4653d92a7d91f51361693b2369a184a22
+DIST rails-6.1.7.7.gem 6656 BLAKE2B bf183f9c7749ec4c3938db63b262a220991a0aeea4da9e3500e9ccca1e5c712585ccc31447aba6da8aa0f91e2696a5fc45e6a6bd73e2eb3bddb3767452213be5 SHA512 3566fe89b223227e337d23e8a863a12d7b9557bc80e90aef8ae44c30c270348569b78d83c5f9667a81656440f41161aa0e982f0840f4d3846b787a436bdc3e89
+DIST rails-7.0.8.1.gem 7168 BLAKE2B 71f0837f3190aa5d781ed3ea98ee1f5c9c87e09719f0954e948e3ab763a035479e9f9a25c4f727d948b83023200c4f0ef6bf2964be336f5361d4a16fbdf012f3 SHA512 bec52a2d8b086d9b6ec0a7351286b4d8a6cdbf60f332db5be738fd30bd0cf3bedca582803c951dee6501c327ae9f45b51dfeaa3d5c5665195fa66ce41bcc10d0
+DIST rails-7.0.8.gem 7168 BLAKE2B 247aa3e46d5c1037982d65ad720a3c7aedba682b8773acda7f6fd724e6c5b009b45854b6509a062c95c577eeca92f485eed2bc94f3cb5d0b8b275be61d39b152 SHA512 511cc43c1dbb992fed684ade1505d9a9d1aca4ad48de5134d3b9f7e825ec60425b6418d0b6382741bcfd5d43fd4ad6d5035f7ff01f170b457f9822e2cc78eeeb
+DIST rails-7.1.3.2.gem 7168 BLAKE2B 6b67a2eb87d1a51e17b7fb015de73a438656fda729dd091413176ce0c53e08a3bc1de77cbd92810478de69aab31f380193bf906f4aecc0b9cb77a7c8ad2677ec SHA512 b3c87c79f585680a3f55dc583a914863a8ad7ee60271560efa86a2ff8dd88b0d48c09242aa705a2f62867c75030dd312201c3f8897e2406dda03f36ea1d13ca3
+DIST rails-7.1.3.gem 7168 BLAKE2B a14f2ee96ef793fb8eb6eebf6afc4113492796a1f580deb7b8ee54075293bddb0903cc59875bdd1863ee210869bd22704952641535349beddd226f728ffe0c5d SHA512 e832193b30b9abba746f71604d0821d374d7457c53c78bf97c68415721f852d70ceeb79c1c77e31c0dc7f6df6769c5a00838ab55a7dfbbbe0a80e51ee93e33cc
diff --git a/dev-ruby/rails/metadata.xml b/dev-ruby/rails/metadata.xml
index c10c88e1670c..7a38fd1850ff 100644
--- a/dev-ruby/rails/metadata.xml
+++ b/dev-ruby/rails/metadata.xml
@@ -5,11 +5,4 @@
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
-  <use>
-    <flag name="asset-pipeline">
-      Also install the default components for the asset pipeline.
-      These are not required but they are activated automatically
-      in new Rails projects by default.
-    </flag>
-  </use>
 </pkgmetadata>
diff --git a/dev-ruby/rails/rails-5.2.6.ebuild b/dev-ruby/rails/rails-5.2.6.ebuild
deleted file mode 100644
index 36edfe1bde23..000000000000
--- a/dev-ruby/rails/rails-5.2.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="+asset-pipeline"
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-	asset-pipeline? (
-		dev-ruby/jquery-rails:*
-		>=dev-ruby/sass-rails-5.0:5.0
-		>=dev-ruby/uglifier-1.3.0:*
-		>=dev-ruby/coffee-rails-4.1.0:*
-	)"
-
-# also: turbolinks, >=jbuilder-1.2:1
diff --git a/dev-ruby/rails/rails-5.2.7.1.ebuild b/dev-ruby/rails/rails-5.2.7.1.ebuild
deleted file mode 100644
index 56c5302b9cad..000000000000
--- a/dev-ruby/rails/rails-5.2.7.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="+asset-pipeline"
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-	asset-pipeline? (
-		dev-ruby/jquery-rails:*
-		>=dev-ruby/sass-rails-5.0:5.0
-		>=dev-ruby/uglifier-1.3.0:*
-		>=dev-ruby/coffee-rails-4.1.0:*
-	)"
-
-# also: turbolinks, >=jbuilder-1.2:1
diff --git a/dev-ruby/rails/rails-5.2.8.ebuild b/dev-ruby/rails/rails-5.2.8.ebuild
deleted file mode 100644
index 56c5302b9cad..000000000000
--- a/dev-ruby/rails/rails-5.2.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="+asset-pipeline"
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-	asset-pipeline? (
-		dev-ruby/jquery-rails:*
-		>=dev-ruby/sass-rails-5.0:5.0
-		>=dev-ruby/uglifier-1.3.0:*
-		>=dev-ruby/coffee-rails-4.1.0:*
-	)"
-
-# also: turbolinks, >=jbuilder-1.2:1
diff --git a/dev-ruby/rails/rails-6.0.4.1.ebuild b/dev-ruby/rails/rails-6.0.4.1.ebuild
deleted file mode 100644
index 8e4850d7e743..000000000000
--- a/dev-ruby/rails/rails-6.0.4.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.0.4.4.ebuild b/dev-ruby/rails/rails-6.0.4.4.ebuild
deleted file mode 100644
index 045971c6e442..000000000000
--- a/dev-ruby/rails/rails-6.0.4.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.0.4.7.ebuild b/dev-ruby/rails/rails-6.0.4.7.ebuild
deleted file mode 100644
index 94bcf8ba4dd3..000000000000
--- a/dev-ruby/rails/rails-6.0.4.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.0.4.8.ebuild b/dev-ruby/rails/rails-6.0.4.8.ebuild
deleted file mode 100644
index 94bcf8ba4dd3..000000000000
--- a/dev-ruby/rails/rails-6.0.4.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.0.5.ebuild b/dev-ruby/rails/rails-6.0.5.ebuild
deleted file mode 100644
index 94bcf8ba4dd3..000000000000
--- a/dev-ruby/rails/rails-6.0.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.1.5.1.ebuild b/dev-ruby/rails/rails-6.1.5.1.ebuild
deleted file mode 100644
index 5330bc6f88eb..000000000000
--- a/dev-ruby/rails/rails-6.1.5.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.15.0:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.1.5.ebuild b/dev-ruby/rails/rails-6.1.5.ebuild
deleted file mode 100644
index 27b1d5ff015a..000000000000
--- a/dev-ruby/rails/rails-6.1.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.15.0:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.1.6.ebuild b/dev-ruby/rails/rails-6.1.6.ebuild
deleted file mode 100644
index 5330bc6f88eb..000000000000
--- a/dev-ruby/rails/rails-6.1.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.15.0:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.1.7.6.ebuild b/dev-ruby/rails/rails-6.1.7.6.ebuild
new file mode 100644
index 000000000000..9fce0d61a8cc
--- /dev/null
+++ b/dev-ruby/rails/rails-6.1.7.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby on rails is a web-application and persistence framework"
+HOMEPAGE="https://rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~riscv"
+
+IUSE=""
+
+ruby_add_rdepend "
+	~dev-ruby/actioncable-${PV}
+	~dev-ruby/actionmailbox-${PV}
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actiontext-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/railties-${PV}
+	>=dev-ruby/bundler-1.15.0:*
+	>=dev-ruby/sprockets-rails-2.0.0:*
+"
diff --git a/dev-ruby/rails/rails-6.1.7.7.ebuild b/dev-ruby/rails/rails-6.1.7.7.ebuild
new file mode 100644
index 000000000000..962a25c5c669
--- /dev/null
+++ b/dev-ruby/rails/rails-6.1.7.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby on rails is a web-application and persistence framework"
+HOMEPAGE="https://rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~riscv"
+
+ruby_add_rdepend "
+	~dev-ruby/actioncable-${PV}
+	~dev-ruby/actionmailbox-${PV}
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actiontext-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/railties-${PV}
+	>=dev-ruby/bundler-1.15.0:*
+	>=dev-ruby/sprockets-rails-2.0.0:*
+"
diff --git a/dev-ruby/rails/rails-7.0.2.2.ebuild b/dev-ruby/rails/rails-7.0.2.2.ebuild
deleted file mode 100644
index 10891fb0b0f9..000000000000
--- a/dev-ruby/rails/rails-7.0.2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.15.0:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-7.0.2.3.ebuild b/dev-ruby/rails/rails-7.0.2.3.ebuild
deleted file mode 100644
index b9ff7fecd2b5..000000000000
--- a/dev-ruby/rails/rails-7.0.2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.15.0:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-7.0.2.4.ebuild b/dev-ruby/rails/rails-7.0.2.4.ebuild
deleted file mode 100644
index b9ff7fecd2b5..000000000000
--- a/dev-ruby/rails/rails-7.0.2.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.15.0:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-7.0.3.ebuild b/dev-ruby/rails/rails-7.0.3.ebuild
deleted file mode 100644
index b9ff7fecd2b5..000000000000
--- a/dev-ruby/rails/rails-7.0.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.15.0:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-7.0.8.1.ebuild b/dev-ruby/rails/rails-7.0.8.1.ebuild
new file mode 100644
index 000000000000..72d44b0d9e7c
--- /dev/null
+++ b/dev-ruby/rails/rails-7.0.8.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby on rails is a web-application and persistence framework"
+HOMEPAGE="https://rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+ruby_add_rdepend "
+	~dev-ruby/actioncable-${PV}
+	~dev-ruby/actionmailbox-${PV}
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actiontext-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/railties-${PV}
+	>=dev-ruby/bundler-1.15.0:*
+"
diff --git a/dev-ruby/rails/rails-7.0.8.ebuild b/dev-ruby/rails/rails-7.0.8.ebuild
new file mode 100644
index 000000000000..e329129af729
--- /dev/null
+++ b/dev-ruby/rails/rails-7.0.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby on rails is a web-application and persistence framework"
+HOMEPAGE="https://rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE=""
+
+ruby_add_rdepend "
+	~dev-ruby/actioncable-${PV}
+	~dev-ruby/actionmailbox-${PV}
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actiontext-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/railties-${PV}
+	>=dev-ruby/bundler-1.15.0:*
+"
diff --git a/dev-ruby/rails/rails-7.1.3.2.ebuild b/dev-ruby/rails/rails-7.1.3.2.ebuild
new file mode 100644
index 000000000000..fe1a57d76293
--- /dev/null
+++ b/dev-ruby/rails/rails-7.1.3.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby on rails is a web-application and persistence framework"
+HOMEPAGE="https://rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+ruby_add_rdepend "
+	~dev-ruby/actioncable-${PV}
+	~dev-ruby/actionmailbox-${PV}
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actiontext-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/bundler-1.15.0:*
+	~dev-ruby/railties-${PV}
+"
diff --git a/dev-ruby/rails/rails-7.1.3.ebuild b/dev-ruby/rails/rails-7.1.3.ebuild
new file mode 100644
index 000000000000..fe1a57d76293
--- /dev/null
+++ b/dev-ruby/rails/rails-7.1.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby on rails is a web-application and persistence framework"
+HOMEPAGE="https://rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+ruby_add_rdepend "
+	~dev-ruby/actioncable-${PV}
+	~dev-ruby/actionmailbox-${PV}
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actiontext-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/bundler-1.15.0:*
+	~dev-ruby/railties-${PV}
+"
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 2ca4cdbed1ae..5a38fea999e2 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,15 +1,6 @@
-DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
-DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
-DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
-DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
-DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
-DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
-DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
-DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
+DIST rails-6.1.7.6.tgz 11040086 BLAKE2B 8b5311752952403cf8eae31b5d8e8d376c4b449f512e86df66b3e921375ffa3ea11e15f1d74a7f8ec9179ff70c32a6d4f8de75be5f92fe6315ee97164e22d2d0 SHA512 c4163565b2324ce97317d252f3d9e2e673a12b6ae7f54571645c958ce30221f1b357887ade80e46abdd47a422736b9946e49850d52ffd72d8acc87f35224e69f
+DIST rails-6.1.7.7.tgz 11041447 BLAKE2B 3f59325aa86d3b7d6e0773b9eb2b895a26b644109be8df0b0d9abbab8e6c77f76d316c717ecce4e2d79d3247559504a7452a8037d2d52a6cf95fbacd7f8b8612 SHA512 f9af4eebb3bffec78832f92be6158c71c147e265b54e8e368a06c762bfd1a7992256b3e9286aeb59eee69ba56be28d381a715eb13f99b9babfd9b7ce8051e210
+DIST rails-7.0.8.1.tgz 11089378 BLAKE2B 5d92087402d8aa2b86759ec92c44091a7a0f8a22959e0510f10417f88e54f9e1e6a14c4e9519033cd63bdd1f54f72b91bff8a3318a3264c39311317fb67e8b63 SHA512 74f467f7d3e5ec88560448e206a8f0cdf55bad60dd9eac019224fce86a766ee9d0c4afbd4eaae30dacfe34beebcff6aa9d3c5c99be9c8ad5c385817fe409afc8
+DIST rails-7.0.8.tgz 11073254 BLAKE2B 2aee047a365acb0890ef3afbccfe323fedccf7b54214aa1c2f92b7a7aaa64c275c1e03f8f97e6a2e30281224ba30703d18b40aeee9b4e7fb6f035a4a7716a054 SHA512 0e9feb5bd0360868c3109152d8ea414b65d36d33a5dbb96b199cfa6c4335800d6c392e0fbcbfa453a02fd75924a297a65caf04948895de53db43700478dbeb11
+DIST rails-7.1.3.2.tgz 10914950 BLAKE2B 419e6817958efcc5dbbb47d24498decff48fca9748c9f4069bcd353a4644fa623caf79c4072db0944139ac991d14623013683f69cef3126fa63348cc0612655b SHA512 0a58e7b125eb97f94a8a75bacd421d7197e6ad78d24651aecfe82e41c024ccfa42a9de0664099f55cd6ac6a41fd7f09cdc3177ed2b809b0be7d7df1639424f9d
+DIST rails-7.1.3.tgz 10900323 BLAKE2B a83ca4ee656e93241fa0460d8df197904a4eef310cf25bce6db6167bad87c8d0644533fa6e224ec959a4e10005164e0f981e14e8b23cee14e2747117be9da712 SHA512 df1128d1403ab82d218d2057c7c86e646594f97a8c6fcf5648a66440d52e5c20a4ceb0c13e70b6153152b44f62d8a1e20f3776acff5c55bc54d006cb7da32d12
diff --git a/dev-ruby/railties/railties-5.2.6.ebuild b/dev-ruby/railties/railties-5.2.6.ebuild
deleted file mode 100644
index 991d7a022706..000000000000
--- a/dev-ruby/railties/railties-5.2.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-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.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-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/railties/railties-5.2.7.1.ebuild b/dev-ruby/railties/railties-5.2.7.1.ebuild
deleted file mode 100644
index 7bd73f7bc8ef..000000000000
--- a/dev-ruby/railties/railties-5.2.7.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-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.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-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/railties/railties-5.2.8.ebuild b/dev-ruby/railties/railties-5.2.8.ebuild
deleted file mode 100644
index 656474a80bf1..000000000000
--- a/dev-ruby/railties/railties-5.2.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-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.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-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/railties/railties-6.0.4.1.ebuild b/dev-ruby/railties/railties-6.0.4.1.ebuild
deleted file mode 100644
index 7c2254ad723c..000000000000
--- a/dev-ruby/railties/railties-6.0.4.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-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 ~riscv ~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.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-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/railties/railties-6.0.4.4.ebuild b/dev-ruby/railties/railties-6.0.4.4.ebuild
deleted file mode 100644
index af4fef171d17..000000000000
--- a/dev-ruby/railties/railties-6.0.4.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-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 ~riscv ~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.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-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/railties/railties-6.0.4.7.ebuild b/dev-ruby/railties/railties-6.0.4.7.ebuild
deleted file mode 100644
index 201e99487a96..000000000000
--- a/dev-ruby/railties/railties-6.0.4.7.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-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 ~riscv ~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.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-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/railties/railties-6.0.4.8.ebuild b/dev-ruby/railties/railties-6.0.4.8.ebuild
deleted file mode 100644
index 201e99487a96..000000000000
--- a/dev-ruby/railties/railties-6.0.4.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-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 ~riscv ~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.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-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/railties/railties-6.0.5.ebuild b/dev-ruby/railties/railties-6.0.5.ebuild
deleted file mode 100644
index 201e99487a96..000000000000
--- a/dev-ruby/railties/railties-6.0.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-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 ~riscv ~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.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-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/railties/railties-6.1.5.1.ebuild b/dev-ruby/railties/railties-6.1.5.1.ebuild
deleted file mode 100644
index cae1535049d0..000000000000
--- a/dev-ruby/railties/railties-6.1.5.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-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 ~riscv ~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-0.8.7
-	dev-ruby/method_source
-"
-
-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/railties/railties-6.1.5.ebuild b/dev-ruby/railties/railties-6.1.5.ebuild
deleted file mode 100644
index a36038e9bbe8..000000000000
--- a/dev-ruby/railties/railties-6.1.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-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 ~riscv ~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-0.8.7
-	dev-ruby/method_source
-"
-
-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/railties/railties-6.1.6.ebuild b/dev-ruby/railties/railties-6.1.6.ebuild
deleted file mode 100644
index cae1535049d0..000000000000
--- a/dev-ruby/railties/railties-6.1.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-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 ~riscv ~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-0.8.7
-	dev-ruby/method_source
-"
-
-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/railties/railties-6.1.7.6.ebuild b/dev-ruby/railties/railties-6.1.7.6.ebuild
new file mode 100644
index 000000000000..e8dc95135054
--- /dev/null
+++ b/dev-ruby/railties/railties-6.1.7.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~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-0.8.7
+	dev-ruby/method_source
+"
+
+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/railties/railties-6.1.7.7.ebuild b/dev-ruby/railties/railties-6.1.7.7.ebuild
new file mode 100644
index 000000000000..991a334c4c47
--- /dev/null
+++ b/dev-ruby/railties/railties-6.1.7.7.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+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-0.8.7
+	dev-ruby/method_source
+"
+
+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/railties/railties-7.0.2.2.ebuild b/dev-ruby/railties/railties-7.0.2.2.ebuild
deleted file mode 100644
index 6d69dd1b2820..000000000000
--- a/dev-ruby/railties/railties-7.0.2.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_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 ~riscv ~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/railties/railties-7.0.2.3.ebuild b/dev-ruby/railties/railties-7.0.2.3.ebuild
deleted file mode 100644
index d49f8cb3826e..000000000000
--- a/dev-ruby/railties/railties-7.0.2.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-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 ~riscv ~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/railties/railties-7.0.2.4.ebuild b/dev-ruby/railties/railties-7.0.2.4.ebuild
deleted file mode 100644
index d49f8cb3826e..000000000000
--- a/dev-ruby/railties/railties-7.0.2.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-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 ~riscv ~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/railties/railties-7.0.3.ebuild b/dev-ruby/railties/railties-7.0.3.ebuild
deleted file mode 100644
index d49f8cb3826e..000000000000
--- a/dev-ruby/railties/railties-7.0.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-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 ~riscv ~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/railties/railties-7.0.8.1.ebuild b/dev-ruby/railties/railties-7.0.8.1.ebuild
new file mode 100644
index 000000000000..e1fb14649e81
--- /dev/null
+++ b/dev-ruby/railties/railties-7.0.8.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+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/railties/railties-7.0.8.ebuild b/dev-ruby/railties/railties-7.0.8.ebuild
new file mode 100644
index 000000000000..e848f0b517aa
--- /dev/null
+++ b/dev-ruby/railties/railties-7.0.8.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="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~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/railties/railties-7.1.3.2.ebuild b/dev-ruby/railties/railties-7.1.3.2.ebuild
new file mode 100644
index 000000000000..5934d5cc6827
--- /dev/null
+++ b/dev-ruby/railties/railties-7.1.3.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+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/actionpack-${PV}
+	~dev-ruby/activesupport-${PV}
+	dev-ruby/irb
+	>=dev-ruby/rackup-1.0.0
+	>=dev-ruby/rake-12.2
+	>=dev-ruby/thor-1.2.2:1
+	>=dev-ruby/zeitwerk-2.6:2
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/actionview-${PV}
+		dev-ruby/mocha
+	)"
+
+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/railties/railties-7.1.3.ebuild b/dev-ruby/railties/railties-7.1.3.ebuild
new file mode 100644
index 000000000000..38757014ee94
--- /dev/null
+++ b/dev-ruby/railties/railties-7.1.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+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/actionpack-${PV}
+	~dev-ruby/activesupport-${PV}
+	dev-ruby/irb
+	>=dev-ruby/rackup-1.0.0
+	>=dev-ruby/rake-12.2
+	>=dev-ruby/thor-1.2.2:1
+	>=dev-ruby/zeitwerk-2.6: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/rainbow/Manifest b/dev-ruby/rainbow/Manifest
index 0eba94701f6c..d3225cecb213 100644
--- a/dev-ruby/rainbow/Manifest
+++ b/dev-ruby/rainbow/Manifest
@@ -1,2 +1 @@
-DIST rainbow-git-3.0.0.tgz 15105 BLAKE2B bc2c91b8ac726c080dbed45584adcdf4a4a496de070a92291042490009ae490efc4ab91cdd12d338f0cda156811358550507ad629e27dd54445a68427f8d4d2d SHA512 863b89152696b6a13606a1e92b68a788b9b5bcd6f521f02f26fb189fc6c9613e5db032dd5deed1aa95247ab0aa08a44981756f941af6eb786076c271881a38c1
 DIST rainbow-git-3.1.1.tgz 15785 BLAKE2B 9c5dffab817fa2b2b5f70acbe642990c6417de7a5b4347f7921ea57ea5c1017fea63656696544d870a3589f9ac8049e56baa6f4e70b8af902883d62046480d11 SHA512 5aff955e8baf78d99960ec9caa11626f07460085f35966c410bb867dd6454a932d2ee8742729a32eeca186fa338bbb02bce3ee8a452a8b4fb0044bb6ec751bc3
diff --git a/dev-ruby/rainbow/rainbow-3.0.0.ebuild b/dev-ruby/rainbow/rainbow-3.0.0.ebuild
deleted file mode 100644
index afd560cfb8cf..000000000000
--- a/dev-ruby/rainbow/rainbow-3.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Colorize printed text on ANSI terminals"
-HOMEPAGE="https://github.com/sickill/rainbow"
-
-SRC_URI="https://github.com/sickill/rainbow/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
-IUSE=""
diff --git a/dev-ruby/rainbow/rainbow-3.1.1.ebuild b/dev-ruby/rainbow/rainbow-3.1.1.ebuild
index 7e35d576091b..f90ccf16ba5e 100644
--- a/dev-ruby/rainbow/rainbow-3.1.1.ebuild
+++ b/dev-ruby/rainbow/rainbow-3.1.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -18,5 +18,5 @@ SRC_URI="https://github.com/sickill/rainbow/archive/v${PV}.tar.gz -> ${PN}-git-$
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
 IUSE=""
diff --git a/dev-ruby/rake-compiler/Manifest b/dev-ruby/rake-compiler/Manifest
index 1f1fbee6876d..cf6abdcb8b00 100644
--- a/dev-ruby/rake-compiler/Manifest
+++ b/dev-ruby/rake-compiler/Manifest
@@ -1,4 +1,4 @@
-DIST rake-compiler-1.1.1.tar.gz 34692 BLAKE2B c6862f24ec57c25fdeb7faeeda9eb96cb64ac972c852a81b77ec9b35d21018a5647089cd38d80b03a79e2c07d3f9af42bbaf9998457ad3beed27c8285c23689f SHA512 e9cf9752e48eae912657a34d2f86a2b41f7d57620c6e43b1fa6fb8e5715336b2fdf99bf20a4851889e8b9b7b2e834421c13e108c538abdc3cec968952345361d
-DIST rake-compiler-1.1.3.tar.gz 35894 BLAKE2B cf395392ed4940a9cae1a0c3eed530de0b2ab4af32b0662f8e316f17f1f351170b876afb18cfc74208863fc124db6031f485c37b0ead73b235029d9b0bf01f11 SHA512 542a3579baf9bbb046bb99d72799d50e2f0efe71bb18a8c8aa7a9f740d8dc5706cec1c9619a977ba50eef615f66cbf415b5f8a351843d03ea2d72ed1203ac72d
-DIST rake-compiler-1.1.9.tar.gz 36565 BLAKE2B 6c41d2e3e63cdea0d21d7b8bde6739dc719f87535e50fa1e09dab28e2aa9d88cbc71e826b813426eed7ea75f213f7d84337a01b1949ff006699c5239474d5778 SHA512 d6acc9a36c8c2778d3c958d34ca9d6cba8cdf82365849a818eefb024cc80558512652c20b84a0c756007f7349e2c0380a3818ac1e246eeb8dbfff13283405a21
-DIST rake-compiler-1.2.0.tar.gz 36596 BLAKE2B 56394a2a8d6761f0f36bbc9fa63b2c36e57a33ba6c0bc660f31ef671e9fa90c581d65acb218ba8699dda7793fe6b8eac03e988c9a6dd486df422fd1228bc8b72 SHA512 77b6dd8b976039484ec7d6bb9e0b2432d40153f218ce2e1d242246711d40dc3ed9be7ba6ec99ee8fd89192ab04d5d1a97b4d1c089c86c7d20b163eb8d4ae68d5
+DIST rake-compiler-1.2.3.tar.gz 38603 BLAKE2B d6cb1714ec3983051d794307e0516c01379a1d2a59430fad9780cc4b037a159c924a4edc1abf6cfbfa1b245203e4cfd4ea7bf887dbf2ea02ca93138629012062 SHA512 3dd3374630dbf0ce9d31caf62d399481622ed55aa15184073836043b907d40994b3284c40945f89c604296cc0cd2b588245e2310cef80846da48883c0e6a2f34
+DIST rake-compiler-1.2.5.tar.gz 38723 BLAKE2B 9f619026574467e6abd31a449f1825c49e0df691b1f139c7a8829a9361df3401bab65312303ab7a566eaf73f4a3a6b78674c73abe6f1cc72d1f1bbb6f619e51a SHA512 843b9286f874b487f23a3558b0a7565eea5e2a22144a8ece944b4b69d40945eee16cca8341e2ea3678418df7f36637574c6832899215676ca3294ae61b24ff5a
+DIST rake-compiler-1.2.6.tar.gz 38890 BLAKE2B 0d0e854b86fda590ea80cdff548195fda09f8851aad444546f88b8bd3594766b459e94185398d99c0322ca4314bee5b8ae9ebdc573ff1df1e3b78c3af651498b SHA512 29ad4a756149788676cf8f33dd419f0c306390d098f22b88aee211e61593b69f53e7f2b566d28c32cf3676478c0c2dba73a360715db1a9d6d50dedbbddb97379
+DIST rake-compiler-1.2.7.tar.gz 39664 BLAKE2B 457359489e5c3c2155d0b2118b146bdf0ed0249b642859d34950640f472e4ed1d166ff3491ba5f739612f4a32e537b8319ee0eca2cd85cd5bfb61aec7a7daecc SHA512 7405037092446e245028f73494acbeeb9b67cdcbc4e90832180d3c53d36df008b05a83e88e1919b884754e39365ca5685aa22cf8caf9e7f96786c11ac7208ead
diff --git a/dev-ruby/rake-compiler/metadata.xml b/dev-ruby/rake-compiler/metadata.xml
index 1f0fcedcc36e..499364daa9ff 100644
--- a/dev-ruby/rake-compiler/metadata.xml
+++ b/dev-ruby/rake-compiler/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">luislavena/rake-compiler</remote-id>
+    <remote-id type="github">rake-compiler/rake-compiler</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild
deleted file mode 100644
index c0171b026f01..000000000000
--- a/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rake-compiler.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
-HOMEPAGE="https://github.com/luislavena/rake-compiler"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rake"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-USE_RUBY="ruby25 ruby26 ruby27" ruby_add_bdepend "test? ( dev-util/cucumber dev-ruby/rspec:2 )"
-
-all_ruby_prepare() {
-	# Make sure the right rspec version is used in cucumber.
-	sed -i -e "1igem 'rspec', '~>2.0'" features/support/env.rb || die
-
-	# Avoid failing features for native gems, this also fails with rubygems
-	sed -i -e '/generate native gem/,$ s:^:#:' features/package.feature || die
-
-	# Fix compatibility with newer cucumber versions. The not syntax has
-	# been supported since cucumber 3.x.
-	sed -i -e "s/~@java/'not @java'/" cucumber.yml || die
-}
-
-each_ruby_test() {
-	# Skip cucumber for new ruby versions (not ready yet)
-	case ${RUBY} in
-		*ruby25|*ruby26|*ruby27)
-			RSPEC_VERSION=3 ruby-ng_rspec
-			ruby-ng_cucumber
-			;;
-		*)
-			RSPEC_VERSION=3 ruby-ng_rspec
-			;;
-	esac
-}
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.1.3.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.1.3.ebuild
deleted file mode 100644
index 8003fcf53fda..000000000000
--- a/dev-ruby/rake-compiler/rake-compiler-1.1.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rake-compiler.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
-HOMEPAGE="https://github.com/luislavena/rake-compiler"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rake"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-USE_RUBY="ruby26 ruby27" ruby_add_bdepend "test? ( dev-util/cucumber dev-ruby/rspec:2 )"
-
-all_ruby_prepare() {
-	# Make sure the right rspec version is used in cucumber.
-	sed -i -e "1igem 'rspec', '~>2.0'" features/support/env.rb || die
-
-	# Avoid failing features for native gems, this also fails with rubygems
-	sed -i -e '/generate native gem/,$ s:^:#:' features/package.feature || die
-
-	# Fix compatibility with newer cucumber versions. The not syntax has
-	# been supported since cucumber 3.x.
-	sed -i -e "s/~@java/'not @java'/" cucumber.yml || die
-}
-
-each_ruby_test() {
-	# Skip cucumber for new ruby versions (not ready yet)
-	case ${RUBY} in
-		*ruby25|*ruby26|*ruby27)
-			RSPEC_VERSION=3 ruby-ng_rspec
-			ruby-ng_cucumber
-			;;
-		*)
-			RSPEC_VERSION=3 ruby-ng_rspec
-			;;
-	esac
-}
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.1.9.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.1.9.ebuild
deleted file mode 100644
index 8cf7bf67922d..000000000000
--- a/dev-ruby/rake-compiler/rake-compiler-1.1.9.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rake-compiler.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
-HOMEPAGE="https://github.com/luislavena/rake-compiler"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rake"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-USE_RUBY="ruby26 ruby27" ruby_add_bdepend "test? ( dev-util/cucumber dev-ruby/rspec:2 )"
-
-all_ruby_prepare() {
-	# Make sure the right rspec version is used in cucumber.
-	sed -i -e "1igem 'rspec', '~>2.0'" features/support/env.rb || die
-
-	# Avoid failing features for native gems, this also fails with rubygems
-	sed -i -e '/generate native gem/,$ s:^:#:' features/package.feature || die
-
-	# Fix compatibility with newer cucumber versions. The not syntax has
-	# been supported since cucumber 3.x.
-	sed -i -e "s/~@java/'not @java'/" cucumber.yml || die
-}
-
-each_ruby_test() {
-	# Skip cucumber for new ruby versions (not ready yet due to rspec 2 usage)
-	case ${RUBY} in
-		*ruby26|*ruby27)
-			RSPEC_VERSION=3 ruby-ng_rspec
-			ruby-ng_cucumber
-			;;
-		*)
-			RSPEC_VERSION=3 ruby-ng_rspec
-			;;
-	esac
-}
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.2.0.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.2.0.ebuild
deleted file mode 100644
index 8cf7bf67922d..000000000000
--- a/dev-ruby/rake-compiler/rake-compiler-1.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rake-compiler.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
-HOMEPAGE="https://github.com/luislavena/rake-compiler"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rake"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-USE_RUBY="ruby26 ruby27" ruby_add_bdepend "test? ( dev-util/cucumber dev-ruby/rspec:2 )"
-
-all_ruby_prepare() {
-	# Make sure the right rspec version is used in cucumber.
-	sed -i -e "1igem 'rspec', '~>2.0'" features/support/env.rb || die
-
-	# Avoid failing features for native gems, this also fails with rubygems
-	sed -i -e '/generate native gem/,$ s:^:#:' features/package.feature || die
-
-	# Fix compatibility with newer cucumber versions. The not syntax has
-	# been supported since cucumber 3.x.
-	sed -i -e "s/~@java/'not @java'/" cucumber.yml || die
-}
-
-each_ruby_test() {
-	# Skip cucumber for new ruby versions (not ready yet due to rspec 2 usage)
-	case ${RUBY} in
-		*ruby26|*ruby27)
-			RSPEC_VERSION=3 ruby-ng_rspec
-			ruby-ng_cucumber
-			;;
-		*)
-			RSPEC_VERSION=3 ruby-ng_rspec
-			;;
-	esac
-}
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.2.3.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.2.3.ebuild
new file mode 100644
index 000000000000..b31740aa8098
--- /dev/null
+++ b/dev-ruby/rake-compiler/rake-compiler-1.2.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rake-compiler.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
+HOMEPAGE="https://github.com/luislavena/rake-compiler"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rake"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
+
+USE_RUBY="ruby27 ruby30 ruby31" ruby_add_bdepend "test? ( dev-util/cucumber )"
+
+all_ruby_prepare() {
+	# Avoid failing features for native gems, this also fails with rubygems
+	sed -i -e '/generate native gem/,$ s:^:#:' features/package.feature || die
+
+	# Fix compatibility with newer cucumber versions. The not syntax has
+	# been supported since cucumber 3.x.
+	sed -i -e "s/~@java/'not @java'/" cucumber.yml || die
+
+	# Fix compatibility with newer rspec versions.
+	sed -i -e 's/be_true/be true/ ; s/be_false/be false/' features/step_definitions/*.rb || die
+}
+
+each_ruby_test() {
+	# Skip cucumber for new ruby versions (not ready yet due to rspec 2 usage)
+	case ${RUBY} in
+		*ruby27|*ruby30|*ruby31)
+			RSPEC_VERSION=3 ruby-ng_rspec
+			ruby-ng_cucumber
+			;;
+		*)
+			RSPEC_VERSION=3 ruby-ng_rspec
+			;;
+	esac
+}
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.2.5.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.2.5.ebuild
new file mode 100644
index 000000000000..ef97f6e94f3e
--- /dev/null
+++ b/dev-ruby/rake-compiler/rake-compiler-1.2.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rake-compiler.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
+HOMEPAGE="https://github.com/rake-compiler/rake-compiler"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/rake-compiler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rake"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
+
+USE_RUBY="ruby30 ruby31 ruby32" ruby_add_bdepend "test? ( dev-util/cucumber )"
+
+all_ruby_prepare() {
+	# Avoid failing features for native gems, this also fails with rubygems
+	sed -i -e '/generate native gem/,$ s:^:#:' features/package.feature || die
+
+	# Fix compatibility with newer cucumber versions. The not syntax has
+	# been supported since cucumber 3.x.
+	sed -i -e "s/~@java/'not @java'/" cucumber.yml || die
+
+	# Fix compatibility with newer rspec versions.
+	sed -i -e 's/be_true/be true/ ; s/be_false/be false/' features/step_definitions/*.rb || die
+}
+
+each_ruby_test() {
+	# Skip cucumber for new ruby versions (not ready yet due to rspec 2 usage)
+	case ${RUBY} in
+		*ruby30|*ruby31|*ruby32)
+			RSPEC_VERSION=3 ruby-ng_rspec
+			ruby-ng_cucumber
+			;;
+		*)
+			RSPEC_VERSION=3 ruby-ng_rspec
+			;;
+	esac
+}
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.2.6.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.2.6.ebuild
new file mode 100644
index 000000000000..810b46de41d0
--- /dev/null
+++ b/dev-ruby/rake-compiler/rake-compiler-1.2.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rake-compiler.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
+HOMEPAGE="https://github.com/rake-compiler/rake-compiler"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/rake-compiler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/rake"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
+
+USE_RUBY="ruby30 ruby31 ruby32" ruby_add_bdepend "test? ( dev-util/cucumber )"
+
+all_ruby_prepare() {
+	# Avoid failing features for native gems, this also fails with rubygems
+	sed -i -e '/generate native gem/,$ s:^:#:' features/package.feature || die
+
+	# Fix compatibility with newer cucumber versions. The not syntax has
+	# been supported since cucumber 3.x.
+	sed -i -e "s/~@java/'not @java'/" cucumber.yml || die
+
+	# Fix compatibility with newer rspec versions.
+	sed -i -e 's/be_true/be true/ ; s/be_false/be false/' features/step_definitions/*.rb || die
+}
+
+each_ruby_test() {
+	# Skip cucumber for new ruby versions (not ready yet due to rspec 2 usage)
+	case ${RUBY} in
+		*ruby30|*ruby31|*ruby32)
+			RSPEC_VERSION=3 ruby-ng_rspec
+			ruby-ng_cucumber
+			;;
+		*)
+			RSPEC_VERSION=3 ruby-ng_rspec
+			;;
+	esac
+}
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.2.7.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.2.7.ebuild
new file mode 100644
index 000000000000..810b46de41d0
--- /dev/null
+++ b/dev-ruby/rake-compiler/rake-compiler-1.2.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rake-compiler.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
+HOMEPAGE="https://github.com/rake-compiler/rake-compiler"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/rake-compiler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/rake"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
+
+USE_RUBY="ruby30 ruby31 ruby32" ruby_add_bdepend "test? ( dev-util/cucumber )"
+
+all_ruby_prepare() {
+	# Avoid failing features for native gems, this also fails with rubygems
+	sed -i -e '/generate native gem/,$ s:^:#:' features/package.feature || die
+
+	# Fix compatibility with newer cucumber versions. The not syntax has
+	# been supported since cucumber 3.x.
+	sed -i -e "s/~@java/'not @java'/" cucumber.yml || die
+
+	# Fix compatibility with newer rspec versions.
+	sed -i -e 's/be_true/be true/ ; s/be_false/be false/' features/step_definitions/*.rb || die
+}
+
+each_ruby_test() {
+	# Skip cucumber for new ruby versions (not ready yet due to rspec 2 usage)
+	case ${RUBY} in
+		*ruby30|*ruby31|*ruby32)
+			RSPEC_VERSION=3 ruby-ng_rspec
+			ruby-ng_cucumber
+			;;
+		*)
+			RSPEC_VERSION=3 ruby-ng_rspec
+			;;
+	esac
+}
diff --git a/dev-ruby/rake-remote_task/rake-remote_task-2.4.4-r1.ebuild b/dev-ruby/rake-remote_task/rake-remote_task-2.4.4-r1.ebuild
new file mode 100644
index 000000000000..dd093c41c7a5
--- /dev/null
+++ b/dev-ruby/rake-remote_task/rake-remote_task-2.4.4-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Extends Rake with remote task goodness"
+HOMEPAGE="https://github.com/seattlerb/rake-remote_task"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "
+	test? ( dev-ruby/minitest )"
+ruby_add_rdepend ">=dev-ruby/open4-1.0 >=dev-ruby/rake-0.8 <dev-ruby/rake-15"
+
+RDEPEND+=" net-misc/rsync"
+DEPEND+=" test? ( net-misc/rsync )"
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rake-remote_task/rake-remote_task-2.4.4.ebuild b/dev-ruby/rake-remote_task/rake-remote_task-2.4.4.ebuild
deleted file mode 100644
index 4f6ac2c2a0e6..000000000000
--- a/dev-ruby/rake-remote_task/rake-remote_task-2.4.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Extends Rake with remote task goodness"
-HOMEPAGE="https://github.com/seattlerb/rake-remote_task"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "
-	test? ( dev-ruby/minitest )"
-ruby_add_rdepend ">=dev-ruby/open4-1.0 >=dev-ruby/rake-0.8 <dev-ruby/rake-15"
-
-RDEPEND+=" net-misc/rsync"
-DEPEND+=" test? ( net-misc/rsync )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest
index 6ffdee07f353..3d3b4acd4012 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -1,3 +1,4 @@
-DIST rake-13.0.3.tar.gz 122825 BLAKE2B a36cc6d8e5f560bc502455a756b89d763899e71b711ba6b11d17fd86a460b4cb3ac47705645d4ccbaef9b6d8964cdc5d4d535b4470582cb3658016a399f78d58 SHA512 aff09bbfa58620cd6902e6679ae3f54d90424bfac40c7ad6efcc590a1c9624ae7a0c5597b8b05b378d90e422285c41d781485b9aebe1819c0c2eaf5f2624afa2
-DIST rake-13.0.4.tar.gz 123399 BLAKE2B f91079b3e22f0b1e09857ac5f549ad1cd4372ccbd2bc152e1ed57241ebf05e8605992008a6f7e4f172f7a0fd77450092b9d03e7026e3cbba25c52731d4aaeb57 SHA512 78533cc966cf285ba5556645cc674affb41baa3076e873055491c5700c6b2301b2da8ec212f260a44d2fe83003bf84b12cd2b81775fc354c89e3fcd346030bb9
 DIST rake-13.0.6.tar.gz 123485 BLAKE2B 39c99b9d125ba7519bd8eaadac85646e785cc01fafad549becea5b2801f14d74085365743f1c5eb1126d0ae32b19ebcde636badc06670a0ad0dba419082e691f SHA512 1b438be96d8cedaf70e961b0bbd2217692b0b5537b2e1d5f599158e7da3e300cf6ab0c5f0c52fea89be0beb675effbbf563d24e55c84fb673b4982013355e03c
+DIST rake-13.1.0.tar.gz 124144 BLAKE2B 753995c99c165c2f7fb58da698c8599bed700503fe887062c984f20f0792c8d27aa9e7bb00b4c234aa493437f569d389068c6ace1cd72be9c21f7a4b515df584 SHA512 aaea4566834e588ff5cf9f48892cb7aea40f0057db949eb0053755b2f601d5c19073128aedb1f3c98cace441518bbf9bc215ba45d9135123d5b3a48a1625a995
+DIST rake-13.2.0.tar.gz 124514 BLAKE2B 07765d63d46e2044bf571491aea70a9a74156c8a68d524339c443e38ad298efc53bc9cbba288039ec7ad02cf6984ca3a1008c22478188bab0e2a7c4bda82ccb4 SHA512 c1c36de667c92a5e627b29d6d504aa22bf845f27d04eace5fbc13b10845932fe6ba58b4d64d6aca45436f6db6f2b4fbab4c155120d4818db0870c8d58e957d9c
+DIST rake-13.2.1.tar.gz 124565 BLAKE2B c9ec38d3808705aa583d815966c026ee891f4af8860267515b92e14e4a9c2f85f6d08c338546837cd01cda6f4398bf5001017838561b4b8abeba5aa54ce6f19b SHA512 23948361713d751c6ed83fa84ce2c02031604d2c6f2f8d4db92a50ba2b614214f58b3c156066bb2653dd9728243493100cefbc76ee95ba377ccb90f696974952
diff --git a/dev-ruby/rake/rake-13.0.3-r1.ebuild b/dev-ruby/rake/rake-13.0.3-r1.ebuild
deleted file mode 100644
index 6e0f403d99e2..000000000000
--- a/dev-ruby/rake/rake-13.0.3-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rake.gemspec"
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Make-like scripting in Ruby"
-HOMEPAGE="https://github.com/ruby/rake"
-SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND+=" app-arch/gzip"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.8 )
-	doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -type f -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_compile() {
-	if use doc; then
-		rdoc --title "Rake - Ruby Make" --main README.rdoc --out html lib *.rdoc doc/*/*.rdoc || die
-		rm -f html/js/*.js.gz
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.8"; require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	ruby_fakegem_binwrapper rake
-
-	if use doc; then
-		pushd html
-		dodoc -r *
-		popd
-	fi
-
-	doman doc/rake.1
-
-	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
-}
diff --git a/dev-ruby/rake/rake-13.0.4.ebuild b/dev-ruby/rake/rake-13.0.4.ebuild
deleted file mode 100644
index 0ac434efec60..000000000000
--- a/dev-ruby/rake/rake-13.0.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rake.gemspec"
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Make-like scripting in Ruby"
-HOMEPAGE="https://github.com/ruby/rake"
-SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND+=" app-arch/gzip"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.8 )
-	doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	sed -e 's/git ls-files -z/find * -type f -print0/' \
-		-e "s:_relative ': './:" \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_compile() {
-	if use doc; then
-		rdoc --title "Rake - Ruby Make" --main README.rdoc --out html lib *.rdoc doc/*/*.rdoc || die
-		rm -f html/js/*.js.gz
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.8"; require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	ruby_fakegem_binwrapper rake
-
-	if use doc; then
-		pushd html
-		dodoc -r *
-		popd
-	fi
-
-	doman doc/rake.1
-
-	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
-}
diff --git a/dev-ruby/rake/rake-13.0.6-r1.ebuild b/dev-ruby/rake/rake-13.0.6-r1.ebuild
deleted file mode 100644
index c1be6eaba717..000000000000
--- a/dev-ruby/rake/rake-13.0.6-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rake.gemspec"
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Make-like scripting in Ruby"
-HOMEPAGE="https://github.com/ruby/rake"
-SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-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"
-IUSE="doc"
-
-DEPEND+=" app-arch/gzip"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.8 )
-	doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	sed -e 's/git ls-files -z/find * -type f -print0/' \
-		-e "s:_relative ': './:" \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_compile() {
-	if use doc; then
-		rdoc --title "Rake - Ruby Make" --main README.rdoc --out html lib *.rdoc doc/*/*.rdoc || die
-		rm -f html/js/*.js.gz
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.8"; require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	ruby_fakegem_binwrapper rake
-
-	if use doc; then
-		pushd html
-		dodoc -r *
-		popd
-	fi
-
-	doman doc/rake.1
-
-	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
-}
diff --git a/dev-ruby/rake/rake-13.0.6-r2.ebuild b/dev-ruby/rake/rake-13.0.6-r2.ebuild
new file mode 100644
index 000000000000..dccfcd88769a
--- /dev/null
+++ b/dev-ruby/rake/rake-13.0.6-r2.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_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rake.gemspec"
+
+inherit bash-completion-r1 ruby-fakegem
+
+DESCRIPTION="Make-like scripting in Ruby"
+HOMEPAGE="https://github.com/ruby/rake"
+SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc"
+
+BDEPEND+=" app-alternatives/gzip"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.8 )
+	doc? ( dev-ruby/rdoc )"
+
+all_ruby_prepare() {
+	sed -e 's/git ls-files -z/find * -type f -print0/' \
+		-e "s:_relative ': './:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_compile() {
+	if use doc; then
+		rdoc --title "Rake - Ruby Make" --main README.rdoc --out html lib *.rdoc doc/*/*.rdoc || die
+		rm -f html/js/*.js.gz
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.8"; require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	ruby_fakegem_binwrapper rake
+
+	if use doc; then
+		pushd html
+		dodoc -r *
+		popd
+	fi
+
+	doman doc/rake.1
+
+	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
+}
diff --git a/dev-ruby/rake/rake-13.0.6.ebuild b/dev-ruby/rake/rake-13.0.6.ebuild
deleted file mode 100644
index c238697d984c..000000000000
--- a/dev-ruby/rake/rake-13.0.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rake.gemspec"
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Make-like scripting in Ruby"
-HOMEPAGE="https://github.com/ruby/rake"
-SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND+=" app-arch/gzip"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.8 )
-	doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	sed -e 's/git ls-files -z/find * -type f -print0/' \
-		-e "s:_relative ': './:" \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_compile() {
-	if use doc; then
-		rdoc --title "Rake - Ruby Make" --main README.rdoc --out html lib *.rdoc doc/*/*.rdoc || die
-		rm -f html/js/*.js.gz
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.8"; require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	ruby_fakegem_binwrapper rake
-
-	if use doc; then
-		pushd html
-		dodoc -r *
-		popd
-	fi
-
-	doman doc/rake.1
-
-	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
-}
diff --git a/dev-ruby/rake/rake-13.1.0.ebuild b/dev-ruby/rake/rake-13.1.0.ebuild
new file mode 100644
index 000000000000..2b254de6cfb7
--- /dev/null
+++ b/dev-ruby/rake/rake-13.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rake.gemspec"
+
+inherit bash-completion-r1 ruby-fakegem
+
+DESCRIPTION="Make-like scripting in Ruby"
+HOMEPAGE="https://github.com/ruby/rake"
+SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc"
+
+BDEPEND+=" app-alternatives/gzip"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.8 )
+	doc? ( dev-ruby/rdoc )"
+
+all_ruby_prepare() {
+	sed -e 's/git ls-files -z/find * -type f -print0/' \
+		-e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_compile() {
+	if use doc; then
+		rdoc --title "Rake - Ruby Make" --main README.rdoc --out html lib *.rdoc doc/*/*.rdoc || die
+		rm -f html/js/*.js.gz
+	fi
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true RUBYLIB="$(pwd)/lib" ${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	ruby_fakegem_binwrapper rake
+
+	if use doc; then
+		pushd html
+		dodoc -r *
+		popd
+	fi
+
+	doman doc/rake.1
+
+	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
+}
diff --git a/dev-ruby/rake/rake-13.2.0.ebuild b/dev-ruby/rake/rake-13.2.0.ebuild
new file mode 100644
index 000000000000..9f9e0a5bc533
--- /dev/null
+++ b/dev-ruby/rake/rake-13.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rake.gemspec"
+
+inherit bash-completion-r1 ruby-fakegem
+
+DESCRIPTION="Make-like scripting in Ruby"
+HOMEPAGE="https://github.com/ruby/rake"
+SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc"
+
+BDEPEND+=" app-alternatives/gzip"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit )
+	doc? ( dev-ruby/rdoc )"
+
+all_ruby_prepare() {
+	sed -e 's/git ls-files -z/find * -type f -print0/' \
+		-e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_compile() {
+	if use doc; then
+		rdoc --title "Rake - Ruby Make" --main README.rdoc --out html lib *.rdoc doc/*/*.rdoc || die
+		rm -f html/js/*.js.gz
+	fi
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true RUBYLIB="$(pwd)/lib" ${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	ruby_fakegem_binwrapper rake
+
+	if use doc; then
+		pushd html
+		dodoc -r *
+		popd
+	fi
+
+	doman doc/rake.1
+
+	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
+}
diff --git a/dev-ruby/rake/rake-13.2.1.ebuild b/dev-ruby/rake/rake-13.2.1.ebuild
new file mode 100644
index 000000000000..9f9e0a5bc533
--- /dev/null
+++ b/dev-ruby/rake/rake-13.2.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rake.gemspec"
+
+inherit bash-completion-r1 ruby-fakegem
+
+DESCRIPTION="Make-like scripting in Ruby"
+HOMEPAGE="https://github.com/ruby/rake"
+SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc"
+
+BDEPEND+=" app-alternatives/gzip"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit )
+	doc? ( dev-ruby/rdoc )"
+
+all_ruby_prepare() {
+	sed -e 's/git ls-files -z/find * -type f -print0/' \
+		-e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_compile() {
+	if use doc; then
+		rdoc --title "Rake - Ruby Make" --main README.rdoc --out html lib *.rdoc doc/*/*.rdoc || die
+		rm -f html/js/*.js.gz
+	fi
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true RUBYLIB="$(pwd)/lib" ${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	ruby_fakegem_binwrapper rake
+
+	if use doc; then
+		pushd html
+		dodoc -r *
+		popd
+	fi
+
+	doman doc/rake.1
+
+	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
+}
diff --git a/dev-ruby/rantly/rantly-2.0.0-r1.ebuild b/dev-ruby/rantly/rantly-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..2e5c1c5be21a
--- /dev/null
+++ b/dev-ruby/rantly/rantly-2.0.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby Imperative Random Data Generator and Quickcheck"
+HOMEPAGE="https://github.com/rantly-rb/rantly"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rantly/rantly-2.0.0.ebuild b/dev-ruby/rantly/rantly-2.0.0.ebuild
deleted file mode 100644
index caa2188e68ac..000000000000
--- a/dev-ruby/rantly/rantly-2.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Imperative Random Data Generator and Quickcheck"
-HOMEPAGE="https://github.com/rantly-rb/rantly"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rash_alt/Manifest b/dev-ruby/rash_alt/Manifest
index f0ba357170b2..89e0bd54daba 100644
--- a/dev-ruby/rash_alt/Manifest
+++ b/dev-ruby/rash_alt/Manifest
@@ -1,2 +1 @@
 DIST rash_alt-0.4.12.gem 9216 BLAKE2B 2785eee275672beeb04bdf42126c889185a0400e2d2838a2bc7d2212c617fac97b6d11319b4f45022bf87119cb55dd9ad9579731541c650bd26114cb3bfd68c9 SHA512 a337521ef6522f2a2bcb30bbeecd9c3a45f8f2915299080ad13f3f544950ab482980e106b217f146034a15af93fc4efc013edb5a73f831ac053d09f536df337d
-DIST rash_alt-0.4.9.gem 8704 BLAKE2B 8b0fdbc5934a50e161ae1732b915dff6c8264ec6e3b2e2905ab3c5bb23174681bb12a738a8b43f1fffee9c1b39ca0dd0102b1a703ee769a8bfa1e4ed469d291f SHA512 a00cd979386b98e520bb09e9f866f0865b0213d67647c52acf0eb007aad0607d47fd8017c809d1613b6c9e94317dfafee0da7892301212209b27245de472116e
diff --git a/dev-ruby/rash_alt/rash_alt-0.4.12.ebuild b/dev-ruby/rash_alt/rash_alt-0.4.12.ebuild
index a1598d3aa00c..58428c73e398 100644
--- a/dev-ruby/rash_alt/rash_alt-0.4.12.ebuild
+++ b/dev-ruby/rash_alt/rash_alt-0.4.12.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/shishi/rash_alt"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/hashie-3.4:*"
diff --git a/dev-ruby/rash_alt/rash_alt-0.4.9.ebuild b/dev-ruby/rash_alt/rash_alt-0.4.9.ebuild
deleted file mode 100644
index 8cf80b0f35c4..000000000000
--- a/dev-ruby/rash_alt/rash_alt-0.4.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="rash.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rash alt version for Hashie's own Rash"
-HOMEPAGE="https://github.com/shishi/rash_alt"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/hashie-4.1:4"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rb-gsl/Manifest b/dev-ruby/rb-gsl/Manifest
deleted file mode 100644
index cdf1eadc348b..000000000000
--- a/dev-ruby/rb-gsl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gsl-2.1.0.2.gem 735232 BLAKE2B bb8aa488b5d3bf7c2f3facf34093c985c63bfe692933b21eb8273af38e6788691593bdcc6fd52b9e22635d1b8195f81d1302edab7c2915a19ce9574cab184d84 SHA512 c07adfb44980ca813e114db2b0917f6b2dcb7d3bbe0ccfd9561519b4e574991f3c72f3e7115218f473154690f9284bf89c968d3c6d52d29fa0a232a1160d2704
diff --git a/dev-ruby/rb-gsl/metadata.xml b/dev-ruby/rb-gsl/metadata.xml
deleted file mode 100644
index 5a476dce6701..000000000000
--- a/dev-ruby/rb-gsl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">SciRuby/rb-gsl</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rb-gsl/rb-gsl-2.1.0.2-r1.ebuild b/dev-ruby/rb-gsl/rb-gsl-2.1.0.2-r1.ebuild
deleted file mode 100644
index 5fc4e9e1c9d9..000000000000
--- a/dev-ruby/rb-gsl/rb-gsl-2.1.0.2-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_NAME="gsl"
-inherit ruby-fakegem multilib
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/gsl_native/extconf.rb)
-
-DESCRIPTION="Ruby interface to GNU Scientific Library"
-HOMEPAGE="https://github.com/SciRuby/rb-gsl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="doc"
-
-DEPEND+=" >=sci-libs/gsl-2.3[deprecated]"
-RDEPEND+=" >=sci-libs/gsl-2.3[deprecated]"
-
-RUBY_S="${PN}-${P}"
-
-ruby_add_bdepend "dev-ruby/narray"
-ruby_add_rdepend "dev-ruby/narray"
-
-all_ruby_prepare() {
-	sed -i -e '/LOCAL_LIBS/ s: -l: -L#{path.gsub("ext", "lib")} -l:' ext/gsl_native/extconf.rb || die
-	# nmatrix only tests
-	rm -r test/gsl/nmatrix_tests || die
-}
-
-each_ruby_configure() {
-	NARRAY=1 each_fakegem_configure
-}
-
-each_ruby_compile() {
-	NARRAY=1 each_fakegem_compile
-}
-
-each_ruby_test() {
-	NARRAY=1 ${RUBY} -Ilib:test:. -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.10.1-r1.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.10.1-r1.ebuild
new file mode 100644
index 000000000000..823ea839dedd
--- /dev/null
+++ b/dev-ruby/rb-inotify/rb-inotify-0.10.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A thorough inotify wrapper for Ruby using FFI"
+HOMEPAGE="https://github.com/nex3/rb-inotify"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/ffi"
+
+ruby_add_bdepend "test? ( dev-ruby/concurrent-ruby )"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on jeweler.
+	sed -i -e '/:build/ s:^:#:' -e '/module Jeweler/,/^end/ s:^:#:' -e '/class Jeweler/,/^end/ s:^:#:' Rakefile || die
+
+	# Remove mandatory markup processor from yard options, bug 436112.
+	sed -i -e '/maruku/d' .yardopts || die
+
+	sed -i -e '/bundler/ s:^:#:' -e '1irequire "pathname"' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
index 19ff54bc422b..0b4e3bf2558c 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
@@ -1,9 +1,9 @@
-# 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_RECIPE_TEST="rspec3"
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/nex3/rb-inotify"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/ffi"
diff --git a/dev-ruby/rb-readline/metadata.xml b/dev-ruby/rb-readline/metadata.xml
index d97c3d2849cf..9358dcfd75a1 100644
--- a/dev-ruby/rb-readline/metadata.xml
+++ b/dev-ruby/rb-readline/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zerochaos@gentoo.org</email>
-		<name>Rick Farina</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>
diff --git a/dev-ruby/rb-readline/rb-readline-0.5.5-r1.ebuild b/dev-ruby/rb-readline/rb-readline-0.5.5-r1.ebuild
index 96b7e3a4e22b..3935d8f0f76c 100644
--- a/dev-ruby/rb-readline/rb-readline-0.5.5-r1.ebuild
+++ b/dev-ruby/rb-readline/rb-readline-0.5.5-r1.ebuild
@@ -1,8 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 inherit ruby-fakegem
 
@@ -12,7 +13,6 @@ HOMEPAGE="https://rubygems.org/gems/rb-readline"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
 
 ruby_add_bdepend "dev-ruby/rake
 		>=dev-ruby/minitest-5.2"
diff --git a/dev-ruby/rb-readline/rb-readline-0.5.5.ebuild b/dev-ruby/rb-readline/rb-readline-0.5.5.ebuild
deleted file mode 100644
index 92b86661dc6c..000000000000
--- a/dev-ruby/rb-readline/rb-readline-0.5.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby implementation of the GNU readline C library"
-HOMEPAGE="https://rubygems.org/gems/rb-readline"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "dev-ruby/rake
-		>=dev-ruby/minitest-5.2"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-
-	# Skip a test that fails when run in the ebuild environment.
-	sed -i -e '/test_readline_with_default_parameters_does_not_error/,/end/ s:^:#:' test/test_readline.rb || die
-}
diff --git a/dev-ruby/rbnacl/metadata.xml b/dev-ruby/rbnacl/metadata.xml
index ff5205606ab3..7901e664f629 100644
--- a/dev-ruby/rbnacl/metadata.xml
+++ b/dev-ruby/rbnacl/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">cryptosphere/rbnacl</remote-id>
+    <remote-id type="github">RubyCrypto/rbnacl</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rbnacl/rbnacl-7.1.1-r1.ebuild b/dev-ruby/rbnacl/rbnacl-7.1.1-r1.ebuild
new file mode 100644
index 000000000000..fe46f32b4f0b
--- /dev/null
+++ b/dev-ruby/rbnacl/rbnacl-7.1.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a high-level toolkit for building cryptographic systems and protocols"
+HOMEPAGE="https://github.com/RubyCrypto/rbnacl"
+
+LICENSE="MIT"
+SLOT="6"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND+=" dev-libs/libsodium"
+DEPEND+=" test? ( dev-libs/libsodium )"
+
+ruby_add_rdepend "dev-ruby/ffi"
+
+all_ruby_prepare() {
+	sed -i -e '/coveralls/I s:^:#:' \
+		-e '/bundler/ s:^:#:' \
+		-e 's:rbnacl/libsodium:rbnacl:' spec/spec_helper.rb
+}
diff --git a/dev-ruby/rbnacl/rbnacl-7.1.1.ebuild b/dev-ruby/rbnacl/rbnacl-7.1.1.ebuild
deleted file mode 100644
index 4296272cd694..000000000000
--- a/dev-ruby/rbnacl/rbnacl-7.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a high-level toolkit for building cryptographic systems and protocols"
-HOMEPAGE="https://github.com/cryptosphere/rbnacl"
-
-LICENSE="MIT"
-SLOT="6"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE=""
-
-RDEPEND+=" dev-libs/libsodium"
-DEPEND+=" test? ( dev-libs/libsodium )"
-
-ruby_add_rdepend "dev-ruby/ffi"
-
-all_ruby_prepare() {
-	sed -i -e '/coveralls/I s:^:#:' \
-		-e '/bundler/ s:^:#:' \
-		-e 's:rbnacl/libsodium:rbnacl:' spec/spec_helper.rb
-}
diff --git a/dev-ruby/rbpdf-font/Manifest b/dev-ruby/rbpdf-font/Manifest
index 7cc2dbe5d1a0..37d3f2d5b2cc 100644
--- a/dev-ruby/rbpdf-font/Manifest
+++ b/dev-ruby/rbpdf-font/Manifest
@@ -1 +1 @@
-DIST rbpdf-font-1.19.1.gem 9571840 BLAKE2B 6e362148514e2c4f5794e81b01bd725ffc5c89dbaec30b053979e87206a137151aabfb7a577344144cbd225ece695e49e8b43595b6e5a89eaca300d468ae96bc SHA512 e678df3b58f32f6670bd79e8ebed0856a5fdbab766c32c8667c80358f899625445e9f6829652f13b64d4c79c5af15dd3dde9849dfe86c4f14e45b8750e71e3b7
+DIST rbpdf-font-1.19.1.tar.gz 12021768 BLAKE2B edc3a9a88300bcd89c7fe30f19081cfe478897aa6aced2b94dcd55cfd4fa29ba72ce8c582579f90cc8e1d66017ea2f163a6aa9e06d50476be77b09a686900683 SHA512 a3f137f937c2a33c68c7dd9990215a64762b5bdd736dec8c3208c285719aa5bc79d2ea5687c5b224e950b95ed4772ce0ebde0d883fb3c911ad7fa442c4f18e7b
diff --git a/dev-ruby/rbpdf-font/rbpdf-font-1.19.1-r1.ebuild b/dev-ruby/rbpdf-font/rbpdf-font-1.19.1-r1.ebuild
deleted file mode 100644
index c2a9a9e23ddd..000000000000
--- a/dev-ruby/rbpdf-font/rbpdf-font-1.19.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# This gem bundles dejavu fonts, freefonts, and ttf2ufm
-# ttf2ufm is a precompiled 32-bit binary
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Font files for the Ruby on Rails RBPDF plugin"
-HOMEPAGE="https://github.com/naitoh/rbpdf"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend ">=dev-ruby/test-unit-3:2"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" Rakefile || die
-	sed -i -e '2igem "test-unit", "~>3.0"' test/test_helper.rb || die
-}
diff --git a/dev-ruby/rbpdf-font/rbpdf-font-1.19.1-r2.ebuild b/dev-ruby/rbpdf-font/rbpdf-font-1.19.1-r2.ebuild
new file mode 100644
index 000000000000..1d97bbe90fdf
--- /dev/null
+++ b/dev-ruby/rbpdf-font/rbpdf-font-1.19.1-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# This gem bundles dejavu fonts, freefonts
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG"
+RUBY_FAKEGEM_GEMSPEC="rbpdf-font.gemspec"
+
+inherit ruby-fakegem toolchain-funcs
+
+DESCRIPTION="Font files for the Ruby on Rails RBPDF plugin"
+HOMEPAGE="https://github.com/naitoh/rbpdf"
+SRC_URI="https://github.com/naitoh/rbpdf/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="rbpdf-${PV}/rbpdf-font"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+ruby_add_bdepend ">=dev-ruby/test-unit-3:2"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" Rakefile || die
+	sed -i -e '2igem "test-unit", "~>3.0"' test/test_helper.rb || die
+
+	pushd lib/fonts/src || die
+	tar xf ttf2ufm-src.tar.gz || die
+	emake -C ttf2ufm-src clean
+	sed -e '/^CFLAGS_SYS=/ s/-O/$(CFLAGS)/' \
+		-e '/CFLAGS.*LIBS/ s/CFLAGS/LDFLAGS/' \
+		-i ttf2ufm-src/Makefile || die
+	sed -e '/limits.h/a#include <getopt.h>' -i ttf2ufm-src/t1asm.c || die
+	popd || die
+}
+
+each_ruby_prepare() {
+	rm -rf lib/fonts/src || die
+}
+
+all_ruby_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -C lib/fonts/src/ttf2ufm-src
+}
+
+each_ruby_install() {
+	cp "${WORKDIR}/all/${RUBY_S}/lib/fonts/src/ttf2ufm-src/ttf2pt1" lib/fonts/ttf2ufm/ttf2ufm || die
+
+	each_fakegem_install
+}
diff --git a/dev-ruby/rbpdf/Manifest b/dev-ruby/rbpdf/Manifest
index 84e213cdd22a..e06708a453f1 100644
--- a/dev-ruby/rbpdf/Manifest
+++ b/dev-ruby/rbpdf/Manifest
@@ -1 +1,2 @@
-DIST rbpdf-1.20.1.tar.gz 12026190 BLAKE2B 5a468e974bc0a15a9a8f621a6ee635a8cf4f81cc94b88a6bf8afd90c4a665c0892381e903158e66ec4a68676491faa80fd99b7d4ffcf0c86defc4a4114603b08 SHA512 19b4fbd8a0c4650c73ba299721a0fe03a10f223da5e0dd2b97549972ea8f381b2d5b4837369d0667cd325392edae1ec795ec67bc852c9b3588ec0c5e686844d7
+DIST rbpdf-1.21.2.tar.gz 12055483 BLAKE2B 24aa5acff343c70769a6644abd68967333bf1d121a6ac85ece8d040439bf096983806613529a84d42b295e729134181a1ac2d0828b1ed337e91c8732a67ef30a SHA512 0da1f5bdc538cbb8e8f27373debb81634cfc407b4bd6c84301719f2faec196df7dc40a18e01a56fc9d373b0bb00523f574be1b0cb98f713c76e7987a8f5d0a98
+DIST rbpdf-1.21.3.tar.gz 12071239 BLAKE2B bcfc19ab707b2e2b03752f723bb8c971b131bde2e6841832c958ea329681aaa36edb13c453173db05c2748de33962f756fc0bcf4959dda385eb4f6f081290fd9 SHA512 f169c3694df9af7fea76ed8415c79658ed12bacad4b2f3fda0ce632ced98fcf9bc256278dea52283907d33aed1632a453e4dadc43522003ab2f1a471d9818041
diff --git a/dev-ruby/rbpdf/rbpdf-1.20.1-r2.ebuild b/dev-ruby/rbpdf/rbpdf-1.20.1-r2.ebuild
deleted file mode 100644
index 155f953d2af4..000000000000
--- a/dev-ruby/rbpdf/rbpdf-1.20.1-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-# Avoid the complexity of the "rake" recipe and run the tests manually.
-RUBY_FAKEGEM_RECIPE_TEST=none
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby on Rails RBPDF plugin"
-HOMEPAGE="https://github.com/naitoh/rbpdf"
-SRC_URI="https://github.com/naitoh/rbpdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 )"
-ruby_add_rdepend "
-	dev-ruby/actionview
-	dev-ruby/htmlentities
-	=dev-ruby/rbpdf-font-1.19*
-	|| ( dev-ruby/mini_magick dev-ruby/rmagick )
-"
-
-# Two of the tests require png/jpeg support in "magick identify",
-# see bug 738784.
-BDEPEND+=" test? ( virtual/imagemagick-tools[jpeg,png] )"
-
-all_ruby_prepare() {
-	default
-
-	# This test is enabled automagically in the presence of rmagick, and
-	# then fails.
-	rm -f test/rbpdf_image_rmagick_test.rb \
-		|| die "failed to remove rmagick tests"
-}
-
-each_ruby_test() {
-	local cmd='gem "test-unit", ">= 3.0"'
-	cmd+=' and '
-	cmd+='require "test/unit"'
-	cmd+=' and '
-	cmd+='Dir["test/rbpdf_*.rb"].each{|f| require("./" +  f)}'
-	${RUBY} -Ilib:.:test -e "${cmd}" || die "test suite failed"
-}
diff --git a/dev-ruby/rbpdf/rbpdf-1.21.2.ebuild b/dev-ruby/rbpdf/rbpdf-1.21.2.ebuild
new file mode 100644
index 000000000000..62ceeefdb1f1
--- /dev/null
+++ b/dev-ruby/rbpdf/rbpdf-1.21.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+# Avoid the complexity of the "rake" recipe and run the tests manually.
+RUBY_FAKEGEM_RECIPE_TEST=none
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby on Rails RBPDF plugin"
+HOMEPAGE="https://github.com/naitoh/rbpdf"
+SRC_URI="https://github.com/naitoh/rbpdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 dev-ruby/webrick )"
+ruby_add_rdepend "
+	dev-ruby/actionview
+	dev-ruby/htmlentities
+	=dev-ruby/rbpdf-font-1.19*
+	|| ( dev-ruby/mini_magick dev-ruby/rmagick )
+"
+
+# Two of the tests require png/jpeg support in "magick identify",
+# see bug 738784.
+BDEPEND+=" test? ( virtual/imagemagick-tools[jpeg,png] )"
+
+all_ruby_prepare() {
+	default
+
+	# This test is enabled automagically in the presence of rmagick, and
+	# then fails.
+	rm -f test/rbpdf_image_rmagick_test.rb \
+		|| die "failed to remove rmagick tests"
+}
+
+each_ruby_test() {
+	local cmd='gem "test-unit", ">= 3.0"'
+	cmd+=' and '
+	cmd+='require "test/unit"'
+	cmd+=' and '
+	cmd+='Dir["test/rbpdf_*.rb"].each{|f| require("./" +  f)}'
+	${RUBY} -Ilib:.:test -e "${cmd}" || die "test suite failed"
+}
diff --git a/dev-ruby/rbpdf/rbpdf-1.21.3.ebuild b/dev-ruby/rbpdf/rbpdf-1.21.3.ebuild
new file mode 100644
index 000000000000..62ceeefdb1f1
--- /dev/null
+++ b/dev-ruby/rbpdf/rbpdf-1.21.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+# Avoid the complexity of the "rake" recipe and run the tests manually.
+RUBY_FAKEGEM_RECIPE_TEST=none
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby on Rails RBPDF plugin"
+HOMEPAGE="https://github.com/naitoh/rbpdf"
+SRC_URI="https://github.com/naitoh/rbpdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 dev-ruby/webrick )"
+ruby_add_rdepend "
+	dev-ruby/actionview
+	dev-ruby/htmlentities
+	=dev-ruby/rbpdf-font-1.19*
+	|| ( dev-ruby/mini_magick dev-ruby/rmagick )
+"
+
+# Two of the tests require png/jpeg support in "magick identify",
+# see bug 738784.
+BDEPEND+=" test? ( virtual/imagemagick-tools[jpeg,png] )"
+
+all_ruby_prepare() {
+	default
+
+	# This test is enabled automagically in the presence of rmagick, and
+	# then fails.
+	rm -f test/rbpdf_image_rmagick_test.rb \
+		|| die "failed to remove rmagick tests"
+}
+
+each_ruby_test() {
+	local cmd='gem "test-unit", ">= 3.0"'
+	cmd+=' and '
+	cmd+='require "test/unit"'
+	cmd+=' and '
+	cmd+='Dir["test/rbpdf_*.rb"].each{|f| require("./" +  f)}'
+	${RUBY} -Ilib:.:test -e "${cmd}" || die "test suite failed"
+}
diff --git a/dev-ruby/rbs/Manifest b/dev-ruby/rbs/Manifest
index b60a182ca047..60e0564225b3 100644
--- a/dev-ruby/rbs/Manifest
+++ b/dev-ruby/rbs/Manifest
@@ -1,6 +1,8 @@
-DIST rbs-1.2.1.tar.gz 560668 BLAKE2B 25cd2c232a26527e7693d8fe80f0aea08c1d261bbff0d1cd9d20d5d6e06423d3b06e86bdd0ebfdfaf3224307dab683588959f23306fc48953ea2a96fd93b0176 SHA512 8c2e791cf751581720238a6fce347dd03378c42e5d7eb1495c191677bd443ec6294d082e22f589d28ad63ab2f4c98575f1619bad7e31e72af98914695eab2d86
-DIST rbs-1.3.3.tar.gz 632597 BLAKE2B 810f090800ecb9507c07de6991e45a089fbaaa677337e924234ce7487a38a51ec5a3966c670c9d828ad351ea921c0d245c66cf0c497b672b3c2fdb04ac99578a SHA512 084b6e84858b2a947181602cdd707b1812486be86787afaaa18894b5ea71ad3b1438e1addb995a0dc24b65cd81f4f844b77f7a6fcaf42a653f718b39ff7c371b
-DIST rbs-1.5.1.tar.gz 672987 BLAKE2B acdaa88627ab79626cb391f5c7dd040da648c9c0cd2e7a7ed697075436d6215edd444dea6079c0319051b326e8823d8151376193f7aa34ab10b533560ecd5987 SHA512 2104eb5ae023fec317ed5cb498a283ac8d3831360822f8917d89ea522a3e5f3479da7d4c57e878a6be6064debd7f3818e1367d4b12f0cd487d7b019f80096d9e
-DIST rbs-2.2.2.tar.gz 963888 BLAKE2B ae6e66b496501b6eb2db7b8e6d265691ab8e95193b434b1ecdc8802de6a7e1f505f4d944cf67d1ec00bc9fbb5da436e74813e7dfea07d774ded609ae2b246bc1 SHA512 3eb2ae59641b66dc6d7757074ea8a77e7621941fc0553f1b83852d507ec058c0738992931df587c38de11ecae35d994149cbfe5e5d268449f2f017f22c9955a5
-DIST rbs-2.3.1.tar.gz 977367 BLAKE2B da15dc2bbf2a10f05c3a4a86db774f9a30b8d9df28137bba363dc2e57c800fe19848cec481df7fd0df4070e5f94ac6c2aa7e5c8e978197dfac1a265790e924bc SHA512 69a052225b055c24c7bc2ce6a44f8541c099ab5bf3ee5eee1958b83a9a666328fc24e39bfa79e3eb76cfcf360eeada3fc5cf1fd333e34290164fff3abb04ffcd
-DIST rbs-2.3.2.tar.gz 977459 BLAKE2B d33984c03a962f4d72989b5b665e7e256f8928e86fa15162a8df549259a832b7898da62c949ae5bb06ed3da82d3179c3e350a392e6177d15a26600debea82539 SHA512 1ae9318265f47232bac77ca966fbf7c2b1b7a1eb3c1070258812f697c633026527c411d2e2319f3c16a3318307cf1cd0983967ba0cf2cae1f9f37a607b6aa92e
+DIST rbs-2.8.4.tar.gz 1069703 BLAKE2B a7b97e2ba7b8bd5afca303d69262cd54169bfad8e716cb5c452a1f20c36708f62c36382d5d3111856aa130e5d198960117ad47ca444ac3e042e99e534b3c2204 SHA512 e698b64ffc5c5e53ed84ab9fb6a5d83cc17738ec2114f72cadd0d9e062d8017ee91dc4d1afe254646c30659f3af57d6606f555881951fae7cc399b1bbd428824
+DIST rbs-3.0.4.tar.gz 1123563 BLAKE2B 335ba5d438b74ef36a65c1bd5d41508bb4d89a5273d413899f96684e6d97a6911ab157ad5b8acde97e23b832ebd2bd04517c37a3edc2fd66703442333d3fa5b1 SHA512 17dff709693c2b554178a31580ed48e863490fc527c86a8d823928379483665076c498e402c1dcb85c0ba401e6754e9c2d8cb9a48655952136521e6e7b47025f
+DIST rbs-3.1.3.tar.gz 1133033 BLAKE2B d9727a757bab41dc2deb4570b6fe325ec9dd6b50190fff9995d2054125ba5e05536a31b7961c068c78071c9039858b64bc73195bb40a26d12f6d7f9031e40e53 SHA512 76bce2c0a2377e2eca16877de7082c90b8df4fd7d9f89d74751e62d25f94a3418a71bcc7ea30e646ce548f675002358dc700c5d598379d8c744fa4fb0454f40c
+DIST rbs-3.2.2.tar.gz 1148293 BLAKE2B a585a942d48217aa574629ace472dc57a6c876a67e8e521f3eaa00996c65f45836140b3c888e2a0e4e6d7ab9abf48337565978ec9b3950f9bbcce9f885fbb459 SHA512 758787ef7decd889ed3abcf9f06cd612299823e16b446568e729d76ba41cd66c36d626d7618ed360ff4b15b16c9d6f172fe55d9053810106f731c74f4cca3fe4
+DIST rbs-3.4.0.tar.gz 1233005 BLAKE2B 66486849627ae75842b58abb24b4148146384f0a3e69ecb968eaf6c67afe0a5a6769d6263cb8f2499c899831280f4030f8fe545e3ed39a79129ff5651e9abdc4 SHA512 fde44bec1eba699323c3173508e2c026d9a61bccf4a4c55d0ed74dbf7306d8e1416fe9e115e3bb70d1027262ee26fb47b644571efbc9aed0b67ccb9d9ee59152
+DIST rbs-3.4.1.tar.gz 1236509 BLAKE2B da51d9c8eed72fb5f4b4b31950db5d39b0fc18a55a3d7999f92d3c5d23ed3d0b0572e65d212483442796093a3941a404e2babd0b55581135d1c77c3521ddc00e SHA512 d98217535091f6af5ff102d8b7126bcd881e22b64c240b5e443a965ccdb0f812a755d3da5db6b65964f6e0e798491bd17ba76d4221e46fbbb26ad0674cd1dca0
+DIST rbs-3.4.2.tar.gz 1236528 BLAKE2B 65c6c218d65db323171af85bbce2f18bbc502c5e0611739ce96d7490afa91090d3fe308fdec253bdb61f41877b4691686fd8a9c8f4be4ec270713f47d5b18a79 SHA512 ec22ef5c27750d2762b0e50bc6623d9dabd7afb11dcae641e76776ca9a12cda9c73657e5be84fadd05998e065174f785df238415c7f4a3bb3e71aff89dffc620
+DIST rbs-3.4.4.tar.gz 1236977 BLAKE2B 19b95e7b162714738c37d9d8f740d11e5e4694f6e2c7e9ba9f01c74d8d318d0b848251276e421a80d8a5680ed60fa510d04d4a57ac72d0c376f1e9cfef2fe773 SHA512 c6be887af1c89e7b9d8f01e248a24f571c189fc81f55d1625957434a3d1e74c5d23f9ba2089750cb742a82560165d9bab309cff8cdb6c9e455076051301c7dd4
diff --git a/dev-ruby/rbs/rbs-1.2.1.ebuild b/dev-ruby/rbs/rbs-1.2.1.ebuild
deleted file mode 100644
index 6602e2b93a34..000000000000
--- a/dev-ruby/rbs/rbs-1.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
-
-RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
-HOMEPAGE="https://github.com/ruby/rbs"
-SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid JSON schema validation tests due to a large dependency stack
-	# that would be needed.
-	rm -f test/rbs/schema_test.rb || die
-
-	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
-}
diff --git a/dev-ruby/rbs/rbs-1.3.3.ebuild b/dev-ruby/rbs/rbs-1.3.3.ebuild
deleted file mode 100644
index 6b1c5644770c..000000000000
--- a/dev-ruby/rbs/rbs-1.3.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
-
-RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
-HOMEPAGE="https://github.com/ruby/rbs"
-SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid JSON schema validation tests due to a large dependency stack
-	# that would be needed.
-	rm -f test/rbs/schema_test.rb || die
-
-	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
-}
diff --git a/dev-ruby/rbs/rbs-1.5.1.ebuild b/dev-ruby/rbs/rbs-1.5.1.ebuild
deleted file mode 100644
index 6b1c5644770c..000000000000
--- a/dev-ruby/rbs/rbs-1.5.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
-
-RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
-HOMEPAGE="https://github.com/ruby/rbs"
-SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid JSON schema validation tests due to a large dependency stack
-	# that would be needed.
-	rm -f test/rbs/schema_test.rb || die
-
-	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
-}
diff --git a/dev-ruby/rbs/rbs-2.2.2.ebuild b/dev-ruby/rbs/rbs-2.2.2.ebuild
deleted file mode 100644
index 0380669086c4..000000000000
--- a/dev-ruby/rbs/rbs-2.2.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
-RUBY_FAKEGEM_EXTENSIONS=(ext/rbs_extension/extconf.rb)
-
-RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
-HOMEPAGE="https://github.com/ruby/rbs"
-SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/rdoc dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# We compile the extension directly
-	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
-
-	# Avoid JSON schema validation tests due to a large dependency stack
-	# that would be needed.
-	rm -f test/rbs/schema_test.rb || die
-
-	# Avoid setup tests since they require a lot of development dependencies.
-	rm -f test/rbs/test/runtime_test_test.rb || die
-
-	# Avoid tests requiring a network connection
-	rm -f test/rbs/collection/installer_test.rb test/rbs/collection/collections_test.rb test/rbs/collection/config_test.rb || die
-	sed -i -e '/def test_collection_/aomit "Requires network"' test/rbs/cli_test.rb || die
-	sed -i -e '/def test_loading_from_rbs_collection/aomit "Requires network"' test/rbs/environment_loader_test.rb || die
-
-	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
-}
diff --git a/dev-ruby/rbs/rbs-2.3.1.ebuild b/dev-ruby/rbs/rbs-2.3.1.ebuild
deleted file mode 100644
index 0380669086c4..000000000000
--- a/dev-ruby/rbs/rbs-2.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
-RUBY_FAKEGEM_EXTENSIONS=(ext/rbs_extension/extconf.rb)
-
-RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
-HOMEPAGE="https://github.com/ruby/rbs"
-SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/rdoc dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# We compile the extension directly
-	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
-
-	# Avoid JSON schema validation tests due to a large dependency stack
-	# that would be needed.
-	rm -f test/rbs/schema_test.rb || die
-
-	# Avoid setup tests since they require a lot of development dependencies.
-	rm -f test/rbs/test/runtime_test_test.rb || die
-
-	# Avoid tests requiring a network connection
-	rm -f test/rbs/collection/installer_test.rb test/rbs/collection/collections_test.rb test/rbs/collection/config_test.rb || die
-	sed -i -e '/def test_collection_/aomit "Requires network"' test/rbs/cli_test.rb || die
-	sed -i -e '/def test_loading_from_rbs_collection/aomit "Requires network"' test/rbs/environment_loader_test.rb || die
-
-	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
-}
diff --git a/dev-ruby/rbs/rbs-2.3.2.ebuild b/dev-ruby/rbs/rbs-2.3.2.ebuild
deleted file mode 100644
index 038f8bc8983e..000000000000
--- a/dev-ruby/rbs/rbs-2.3.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
-RUBY_FAKEGEM_EXTENSIONS=(ext/rbs_extension/extconf.rb)
-
-RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
-HOMEPAGE="https://github.com/ruby/rbs"
-SRC_URI="https://github.com/ruby/rbs/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"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/rdoc dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# We compile the extension directly
-	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
-
-	# Avoid JSON schema validation tests due to a large dependency stack
-	# that would be needed.
-	rm -f test/rbs/schema_test.rb || die
-
-	# Avoid setup tests since they require a lot of development dependencies.
-	rm -f test/rbs/test/runtime_test_test.rb || die
-
-	# Avoid tests requiring a network connection
-	rm -f test/rbs/collection/installer_test.rb test/rbs/collection/collections_test.rb test/rbs/collection/config_test.rb || die
-	sed -i -e '/def test_collection_/aomit "Requires network"' test/rbs/cli_test.rb || die
-	sed -i -e '/def test_loading_from_rbs_collection/aomit "Requires network"' test/rbs/environment_loader_test.rb || die
-
-	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
-}
diff --git a/dev-ruby/rbs/rbs-2.8.4.ebuild b/dev-ruby/rbs/rbs-2.8.4.ebuild
new file mode 100644
index 000000000000..6071d0555ffc
--- /dev/null
+++ b/dev-ruby/rbs/rbs-2.8.4.ebuild
@@ -0,0 +1,49 @@
+# 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.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
+RUBY_FAKEGEM_EXTENSIONS=(ext/rbs_extension/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
+HOMEPAGE="https://github.com/ruby/rbs"
+SRC_URI="https://github.com/ruby/rbs/archive/refs/tags/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 ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/rdoc dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# We compile the extension directly
+	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
+
+	# Avoid JSON schema validation tests due to a large dependency stack
+	# that would be needed.
+	rm -f test/rbs/schema_test.rb || die
+
+	# Avoid setup tests since they require a lot of development dependencies.
+	rm -f test/rbs/test/runtime_test_test.rb || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/rbs/collection/installer_test.rb test/rbs/collection/collections_test.rb \
+		test/rbs/collection/config_test.rb test/rbs/collection/sources/git_test.rb || die
+	sed -i -e '/def test_collection_/aomit "Requires network"' test/rbs/cli_test.rb || die
+	sed -i -e '/def test_loading_from_rbs_collection/aomit "Requires network"' test/rbs/environment_loader_test.rb || die
+
+	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
+}
diff --git a/dev-ruby/rbs/rbs-3.0.4.ebuild b/dev-ruby/rbs/rbs-3.0.4.ebuild
new file mode 100644
index 000000000000..be6531da78bd
--- /dev/null
+++ b/dev-ruby/rbs/rbs-3.0.4.ebuild
@@ -0,0 +1,49 @@
+# 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.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
+RUBY_FAKEGEM_EXTENSIONS=(ext/rbs_extension/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
+HOMEPAGE="https://github.com/ruby/rbs"
+SRC_URI="https://github.com/ruby/rbs/archive/refs/tags/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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/rdoc dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# We compile the extension directly
+	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
+
+	# Avoid JSON schema validation tests due to a large dependency stack
+	# that would be needed.
+	rm -f test/rbs/schema_test.rb || die
+
+	# Avoid setup tests since they require a lot of development dependencies.
+	rm -f test/rbs/test/runtime_test_test.rb || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/rbs/collection/installer_test.rb test/rbs/collection/collections_test.rb \
+		test/rbs/collection/config_test.rb test/rbs/collection/sources/git_test.rb || die
+	sed -i -e '/def test_collection_/aomit "Requires network"' test/rbs/cli_test.rb || die
+	sed -i -e '/def test_loading_from_rbs_collection/aomit "Requires network"' test/rbs/environment_loader_test.rb || die
+
+	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
+}
diff --git a/dev-ruby/rbs/rbs-3.1.3.ebuild b/dev-ruby/rbs/rbs-3.1.3.ebuild
new file mode 100644
index 000000000000..0e69e175d355
--- /dev/null
+++ b/dev-ruby/rbs/rbs-3.1.3.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="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
+RUBY_FAKEGEM_EXTENSIONS=(ext/rbs_extension/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
+HOMEPAGE="https://github.com/ruby/rbs"
+SRC_URI="https://github.com/ruby/rbs/archive/refs/tags/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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/rdoc dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# We compile the extension directly
+	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
+
+	# Avoid JSON schema validation tests due to a large dependency stack
+	# that would be needed.
+	rm -f test/rbs/schema_test.rb || die
+
+	# Avoid setup tests since they require a lot of development dependencies.
+	rm -f test/rbs/test/runtime_test_test.rb || die
+
+	# Avoid subtract tests with additonal unpackaged dependencies
+	sed -i -e '/def test_subtract/aomit "Skipped due to additional dependencies"' test/rbs/cli_test.rb || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/rbs/collection/installer_test.rb test/rbs/collection/collections_test.rb \
+		test/rbs/collection/config_test.rb test/rbs/collection/sources/git_test.rb || die
+	sed -i -e '/def test_collection_/aomit "Requires network"' test/rbs/cli_test.rb || die
+	sed -i -e '/def test_loading_from_rbs_collection/aomit "Requires network"' test/rbs/environment_loader_test.rb || die
+
+	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
+}
diff --git a/dev-ruby/rbs/rbs-3.2.2.ebuild b/dev-ruby/rbs/rbs-3.2.2.ebuild
new file mode 100644
index 000000000000..c66d09f9c28c
--- /dev/null
+++ b/dev-ruby/rbs/rbs-3.2.2.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="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
+RUBY_FAKEGEM_EXTENSIONS=(ext/rbs_extension/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
+HOMEPAGE="https://github.com/ruby/rbs"
+SRC_URI="https://github.com/ruby/rbs/archive/refs/tags/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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/rdoc dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# We compile the extension directly
+	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
+
+	# Avoid JSON schema validation tests due to a large dependency stack
+	# that would be needed.
+	rm -f test/rbs/schema_test.rb || die
+
+	# Avoid setup tests since they require a lot of development dependencies.
+	rm -f test/rbs/test/runtime_test_test.rb || die
+
+	# Avoid subtract tests with additonal unpackaged dependencies
+	sed -i -e '/def test_subtract/aomit "Skipped due to additional dependencies"' test/rbs/cli_test.rb || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/rbs/collection/installer_test.rb test/rbs/collection/collections_test.rb \
+		test/rbs/collection/config_test.rb test/rbs/collection/sources/git_test.rb || die
+	sed -i -e '/def test_collection_/aomit "Requires network"' test/rbs/cli_test.rb || die
+	sed -i -e '/def test_loading_from_rbs_collection/aomit "Requires network"' test/rbs/environment_loader_test.rb || die
+
+	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
+}
diff --git a/dev-ruby/rbs/rbs-3.4.0.ebuild b/dev-ruby/rbs/rbs-3.4.0.ebuild
new file mode 100644
index 000000000000..5302c97c811c
--- /dev/null
+++ b/dev-ruby/rbs/rbs-3.4.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
+RUBY_FAKEGEM_EXTENSIONS=(ext/rbs_extension/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
+HOMEPAGE="https://github.com/ruby/rbs"
+SRC_URI="https://github.com/ruby/rbs/archive/refs/tags/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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/abbrev"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/rdoc dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# We compile the extension directly
+	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
+
+	# Avoid JSON schema validation tests due to a large dependency stack
+	# that would be needed.
+	rm -f test/rbs/schema_test.rb || die
+
+	# Avoid setup tests since they require a lot of development dependencies.
+	rm -f test/rbs/test/runtime_test_test.rb || die
+
+	# Avoid subtract tests with additonal unpackaged dependencies
+	sed -i -e '/def test_subtract/aomit "Skipped due to additional dependencies"' test/rbs/cli_test.rb || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/rbs/collection/installer_test.rb test/rbs/collection/collections_test.rb \
+		test/rbs/collection/config_test.rb test/rbs/collection/sources/git_test.rb || die
+	sed -i -e '/def test_collection_/aomit "Requires network"' test/rbs/cli_test.rb || die
+	sed -i -e '/def test_loading_from_rbs_collection/aomit "Requires network"' test/rbs/environment_loader_test.rb || die
+
+	sed -i -e '/def test_\(method\|paths\)/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
+}
diff --git a/dev-ruby/rbs/rbs-3.4.1.ebuild b/dev-ruby/rbs/rbs-3.4.1.ebuild
new file mode 100644
index 000000000000..5302c97c811c
--- /dev/null
+++ b/dev-ruby/rbs/rbs-3.4.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
+RUBY_FAKEGEM_EXTENSIONS=(ext/rbs_extension/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
+HOMEPAGE="https://github.com/ruby/rbs"
+SRC_URI="https://github.com/ruby/rbs/archive/refs/tags/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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/abbrev"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/rdoc dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# We compile the extension directly
+	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
+
+	# Avoid JSON schema validation tests due to a large dependency stack
+	# that would be needed.
+	rm -f test/rbs/schema_test.rb || die
+
+	# Avoid setup tests since they require a lot of development dependencies.
+	rm -f test/rbs/test/runtime_test_test.rb || die
+
+	# Avoid subtract tests with additonal unpackaged dependencies
+	sed -i -e '/def test_subtract/aomit "Skipped due to additional dependencies"' test/rbs/cli_test.rb || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/rbs/collection/installer_test.rb test/rbs/collection/collections_test.rb \
+		test/rbs/collection/config_test.rb test/rbs/collection/sources/git_test.rb || die
+	sed -i -e '/def test_collection_/aomit "Requires network"' test/rbs/cli_test.rb || die
+	sed -i -e '/def test_loading_from_rbs_collection/aomit "Requires network"' test/rbs/environment_loader_test.rb || die
+
+	sed -i -e '/def test_\(method\|paths\)/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
+}
diff --git a/dev-ruby/rbs/rbs-3.4.2.ebuild b/dev-ruby/rbs/rbs-3.4.2.ebuild
new file mode 100644
index 000000000000..46da666c978d
--- /dev/null
+++ b/dev-ruby/rbs/rbs-3.4.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
+RUBY_FAKEGEM_EXTENSIONS=(ext/rbs_extension/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
+HOMEPAGE="https://github.com/ruby/rbs"
+SRC_URI="https://github.com/ruby/rbs/archive/refs/tags/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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/abbrev"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/rdoc dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# We compile the extension directly
+	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
+
+	# Avoid JSON schema validation tests due to a large dependency stack
+	# that would be needed.
+	rm -f test/rbs/schema_test.rb || die
+
+	# Avoid setup tests since they require a lot of development dependencies.
+	rm -f test/rbs/test/runtime_test_test.rb || die
+
+	# Avoid subtract tests with additonal unpackaged dependencies
+	sed -i -e '/def test_subtract/aomit "Skipped due to additional dependencies"' test/rbs/cli_test.rb || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/rbs/collection/installer_test.rb test/rbs/collection/collections_test.rb \
+		test/rbs/collection/config_test.rb test/rbs/collection/sources/git_test.rb || die
+	sed -i -e '/def test_collection_/aomit "Requires network"' test/rbs/cli_test.rb || die
+	sed -i -e '/def test_loading_from_rbs_collection/aomit "Requires network"' test/rbs/environment_loader_test.rb || die
+
+	sed -i -e '/def test_\(method\|paths\)/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
+}
diff --git a/dev-ruby/rbs/rbs-3.4.4.ebuild b/dev-ruby/rbs/rbs-3.4.4.ebuild
new file mode 100644
index 000000000000..46da666c978d
--- /dev/null
+++ b/dev-ruby/rbs/rbs-3.4.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
+RUBY_FAKEGEM_EXTENSIONS=(ext/rbs_extension/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
+HOMEPAGE="https://github.com/ruby/rbs"
+SRC_URI="https://github.com/ruby/rbs/archive/refs/tags/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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/abbrev"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/rdoc dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# We compile the extension directly
+	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
+
+	# Avoid JSON schema validation tests due to a large dependency stack
+	# that would be needed.
+	rm -f test/rbs/schema_test.rb || die
+
+	# Avoid setup tests since they require a lot of development dependencies.
+	rm -f test/rbs/test/runtime_test_test.rb || die
+
+	# Avoid subtract tests with additonal unpackaged dependencies
+	sed -i -e '/def test_subtract/aomit "Skipped due to additional dependencies"' test/rbs/cli_test.rb || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/rbs/collection/installer_test.rb test/rbs/collection/collections_test.rb \
+		test/rbs/collection/config_test.rb test/rbs/collection/sources/git_test.rb || die
+	sed -i -e '/def test_collection_/aomit "Requires network"' test/rbs/cli_test.rb || die
+	sed -i -e '/def test_loading_from_rbs_collection/aomit "Requires network"' test/rbs/environment_loader_test.rb || die
+
+	sed -i -e '/def test_\(method\|paths\)/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
+}
diff --git a/dev-ruby/rbst/metadata.xml b/dev-ruby/rbst/metadata.xml
index 076793e3f54b..afeb8ebab6c7 100644
--- a/dev-ruby/rbst/metadata.xml
+++ b/dev-ruby/rbst/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
+  <maintainer type="person">
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">xwmx/rbst</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rbst/rbst-0.6.5-r1.ebuild b/dev-ruby/rbst/rbst-0.6.5-r1.ebuild
index 580e897b1276..8b44aba69e0c 100644
--- a/dev-ruby/rbst/rbst-0.6.5-r1.ebuild
+++ b/dev-ruby/rbst/rbst-0.6.5-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..11} )
-USE_RUBY="ruby25 ruby26 ruby27"
+PYTHON_COMPAT=( python3_{9..11} )
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_NAME="RbST"
 RUBY_FAKEGEM_GEMSPEC="RbST.gemspec"
diff --git a/dev-ruby/rbst/rbst-0.6.5.ebuild b/dev-ruby/rbst/rbst-0.6.5.ebuild
deleted file mode 100644
index 7390ccd1e168..000000000000
--- a/dev-ruby/rbst/rbst-0.6.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_NAME="RbST"
-RUBY_FAKEGEM_GEMSPEC="RbST.gemspec"
-
-inherit python-single-r1 ruby-fakegem
-
-DESCRIPTION="A simple Ruby wrapper for processing rST via docutils"
-HOMEPAGE="https://github.com/alphabetum/rbst"
-SRC_URI="https://github.com/alphabetum/rbst/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-python/docutils
-	${PYTHON_DEPS}"
-DEPEND="
-	test? ( ${RDEPEND} )"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/minitest-5.14.0:5
-		>=dev-ruby/mocha-1.1.0:1.0
-	)"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ruby-ng_pkg_setup
-}
-
-all_ruby_prepare() {
-	# do not use bundler
-	sed -i -e '/bundler/,/end/d' \
-		Rakefile test/helper.rb || die
-	# do not use python2
-	sed -i -e '/python2/,/end/d' \
-		test/test_rbst.rb || die
-
-	# force our python version
-	sed -i -e "s:\(python_path=\"\)python:\1${EPYTHON}:" lib/rbst.rb || die
-	python_fix_shebang lib/rst2parts
-}
diff --git a/dev-ruby/rbtree/Manifest b/dev-ruby/rbtree/Manifest
index 1ff4ea7ecd64..b5133d6bcc4e 100644
--- a/dev-ruby/rbtree/Manifest
+++ b/dev-ruby/rbtree/Manifest
@@ -1 +1 @@
-DIST rbtree-0.4.5.gem 30208 BLAKE2B a2e4763f99a3cecb4b7525ed7637fcb5fe9efd45f61125164804fd6a883fad2ed688357af9264317898500bf8f9d31b5797cb93d88982c06b356a9de0b5b74e1 SHA512 e1a1692fb91e85299d86083b02d71aa6ecb293ada2e3f17d2000344d064575148d3ab68b3f5bc4da420b8bf79bcfe353afeb52cc3b450eea662bb69d9ebeaf2d
+DIST rbtree-0.4.6.gem 30720 BLAKE2B cd44852f8de9138d9f590825c62b1863e8a4fc51a3f150317f929e200430b9a4fcc7f7b83deb0904def84cfe3debf102e7b200fe1e894422b0515297ed44baff SHA512 7c9f5ac83ee78191efe3fb7fd6ef0afaa7506245191dbe92f3eb9e5f19b9fcd8157f19901d49d5ff9b4661a498a67d79e39ca86c79d8df99fcf11603b54a0158
diff --git a/dev-ruby/rbtree/rbtree-0.4.5.ebuild b/dev-ruby/rbtree/rbtree-0.4.5.ebuild
deleted file mode 100644
index 8391fa518d0c..000000000000
--- a/dev-ruby/rbtree/rbtree-0.4.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTENSIONS=(./extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="A sorted associative collection that is implemented with a Red-Black Tree"
-HOMEPAGE="https://rubygems.org/gems/rbtree"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-each_ruby_test() {
-	${RUBY} test.rb || die
-}
diff --git a/dev-ruby/rbtree/rbtree-0.4.6.ebuild b/dev-ruby/rbtree/rbtree-0.4.6.ebuild
new file mode 100644
index 000000000000..194148a21e7f
--- /dev/null
+++ b/dev-ruby/rbtree/rbtree-0.4.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTENSIONS=(./extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="A sorted associative collection that is implemented with a Red-Black Tree"
+HOMEPAGE="https://rubygems.org/gems/rbtree"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/test_pp/aomit "Fragile for whitespace"' test.rb || die
+}
+
+each_ruby_test() {
+	RUBY_LIB=lib ${RUBY} test.rb || die
+}
diff --git a/dev-ruby/rcairo/Manifest b/dev-ruby/rcairo/Manifest
index a7543581a0b5..b60a56ba94ba 100644
--- a/dev-ruby/rcairo/Manifest
+++ b/dev-ruby/rcairo/Manifest
@@ -1,2 +1,3 @@
-DIST cairo-1.16.6.gem 197120 BLAKE2B d5c1f1704592afb096d30504f2d74d27e29e6222fd1648895beab786efae071de70f942b31e2f49960ec91bd87f0297a2d3b07013e894951d4ec1e8d376e73dc SHA512 f499daa83e865d58cc29d158ce649cab9f939464a08e5d7711f6cf255fb8dcfbf52457e3d2b81aef2018ad8d0762117776049b3681c9be6abdf4f0b12e43404c
-DIST cairo-1.17.5.gem 197120 BLAKE2B 6788c4832331407802d56dc429d665d8a82d9e69a7bf9958391b02003e71d7449cabd65fb97916e8e06a16fa599bae1c514e8ace75304f746db3051bb6bc21ee SHA512 f2ade6fb6b9fccd81a11061b277d4a9077936e0beef42c61225bd4d5630586a57a3fa192a20a0f7e4922313e2a8215268bc9a5d007d2805cf1f80714fd9ad1ba
+DIST cairo-1.17.12.gem 199168 BLAKE2B 3183fc448cf15d0437f1b846670dc7494479bf81ba84a2ae475bb5a0683f1012d0e44c95b3311cea5d0ec9cdd75faa7159d7d0649dbe0813166a8d6a16ddda74 SHA512 6bad8c0f15e8617266a85f0ba0bf41db1b508bdb174aa8dbfad8a560a1510cec852502cf39e93b0317c046035bfd97552b92167debb7de4d887c319648b10b56
+DIST cairo-1.17.13.gem 199168 BLAKE2B 07472d8c3cb71ee6351b0d3fc3a8b22eef586f44677d38dcd2fa848afecca20a1d8c66397eac70ced9c24ccee60a83721fc7cc3a6cf7c1c1beae69935fde5a9b SHA512 82fb621f97b6eb292565fd0f90f5e686c2cd4cd8aa61fa0ab6e25aac665aa9f7e780481a6571fd443be8c53070f29a2dfea5a54949350fe783b12aeb6aba3769
+DIST cairo-1.17.8.gem 198656 BLAKE2B c999f862753d17c186f766f82ede6c7fb3c773018c314825762b68025bf806e6a466b8895ddfa3046f7ac3f3af501d6feaebcb8241779de9c3a0d153589d0993 SHA512 a2b756dc1cf1abb98e4b60b9b56f5f610058bd840b67c991d6bfb3da2523b0f77a5854147f9d14ca461d573e51fbe3ba35c83659af5c031086710970fac6665a
diff --git a/dev-ruby/rcairo/metadata.xml b/dev-ruby/rcairo/metadata.xml
index 658c72b1920d..58fa413cca59 100644
--- a/dev-ruby/rcairo/metadata.xml
+++ b/dev-ruby/rcairo/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">rcairo/rcairo</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rcairo/rcairo-1.16.6.ebuild b/dev-ruby/rcairo/rcairo-1.16.6.ebuild
deleted file mode 100644
index 7b11ca38811a..000000000000
--- a/dev-ruby/rcairo/rcairo-1.16.6.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_NAME="cairo"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="AUTHORS NEWS"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby bindings for cairo"
-HOMEPAGE="https://cairographics.org/rcairo/"
-
-IUSE=""
-
-SLOT="0"
-LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="amd64 ~ppc ~x86"
-
-RDEPEND="${RDEPEND}
-	>=x11-libs/cairo-1.2.0[svg]"
-DEPEND="${DEPEND}
-	>=x11-libs/cairo-1.2.0[svg]"
-
-ruby_add_bdepend "
-	>=dev-ruby/pkg-config-1.2.2
-	dev-ruby/ruby-glib2
-	test? ( >=dev-ruby/test-unit-2.1.0-r1:2 dev-ruby/ruby-poppler )"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency
-	sed -e '/native-package-installer/ s:^:#:' \
-		-e '/def required_pkg_config_package/areturn true' \
-		-e '/checking_for/,/^end/ s:^:#:' \
-		-i ext/cairo/extconf.rb || die
-	sed -i -e '/native-package-installer/,/Gem::Dependency/ d' ../metadata || die
-
-	# Avoid test that requires unpackaged fixture
-	sed -i -e '/sub_test_case..FreeTypeFontFace/,/^  end/ s:^:#:' test/test_font_face.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/cairo extconf.rb || die "extconf failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/cairo
-
-	# again, try to make it more standard, to install it more easily.
-	cp ext/cairo/cairo$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	# don't rely on the Rakefile because it's a mess to load with
-	# their hierarchy, do it manually.
-	${RUBY} -Ilib -r ./test/helper \
-		-e 'gem "test-unit"; require "test/unit"; Dir.glob("test/**/test_*.rb") {|f| load f}' || die "tests failed"
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	insinto $(ruby_get_hdrdir)
-	doins ext/cairo/rb_cairo.h
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r samples
-}
diff --git a/dev-ruby/rcairo/rcairo-1.17.12.ebuild b/dev-ruby/rcairo/rcairo-1.17.12.ebuild
new file mode 100644
index 000000000000..1d22ef0b81d7
--- /dev/null
+++ b/dev-ruby/rcairo/rcairo-1.17.12.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_NAME="cairo"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="AUTHORS NEWS"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/cairo/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby bindings for cairo"
+HOMEPAGE="https://cairographics.org/rcairo/"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Ruby-BSD GPL-2 )"
+KEYWORDS="amd64 ~ppc ~riscv ~x86"
+
+RDEPEND="${RDEPEND}
+	>=x11-libs/cairo-1.2.0[svg(+)]"
+DEPEND="${DEPEND}
+	>=x11-libs/cairo-1.2.0[svg(+)]"
+
+ruby_add_rdepend "dev-ruby/red-colors"
+
+ruby_add_bdepend "
+	>=dev-ruby/pkg-config-1.2.2
+	dev-ruby/ruby-glib2
+	test? ( >=dev-ruby/test-unit-2.1.0-r1:2 dev-ruby/ruby-poppler )"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency
+	sed -e '/native-package-installer/ s:^:#:' \
+		-e '/def required_pkg_config_package/areturn true' \
+		-e '/checking_for/,/^end/ s:^:#:' \
+		-i ext/cairo/extconf.rb || die
+	sed -i -e '/native-package-installer/,/Gem::Dependency/ d' ../metadata || die
+
+	# Avoid test that requires unpackaged fixture
+	sed -i -e '/sub_test_case..FreeTypeFontFace/,/^  end/ s:^:#:' test/test_font_face.rb || die
+
+	# Bug 790131
+	sed -i -e '/^install-headers:/s!$! $(TIMESTAMP_DIR)/.sitearchdir.time!' \
+		ext/cairo/depend || die
+}
+
+each_ruby_test() {
+	# don't rely on the Rakefile because it's a mess to load with
+	# their hierarchy, do it manually.
+	${RUBY} -Ilib -r ./test/helper \
+		-e 'gem "test-unit"; require "test/unit"; Dir.glob("test/**/test_*.rb") {|f| load f}' || die "tests failed"
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	insinto $(ruby_get_hdrdir)
+	doins ext/cairo/rb_cairo.h
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r samples
+}
diff --git a/dev-ruby/rcairo/rcairo-1.17.13.ebuild b/dev-ruby/rcairo/rcairo-1.17.13.ebuild
new file mode 100644
index 000000000000..ff39b20efaa2
--- /dev/null
+++ b/dev-ruby/rcairo/rcairo-1.17.13.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_NAME="cairo"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="AUTHORS NEWS"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/cairo/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby bindings for cairo"
+HOMEPAGE="https://cairographics.org/rcairo/"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Ruby-BSD GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+
+RDEPEND="${RDEPEND}
+	>=x11-libs/cairo-1.2.0[svg(+)]"
+DEPEND="${DEPEND}
+	>=x11-libs/cairo-1.2.0[svg(+)]"
+
+ruby_add_rdepend "dev-ruby/red-colors"
+
+ruby_add_bdepend "
+	>=dev-ruby/pkg-config-1.2.2
+	dev-ruby/ruby-glib2
+	test? ( >=dev-ruby/test-unit-2.1.0-r1:2 dev-ruby/ruby-poppler )"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency
+	sed -e '/native-package-installer/ s:^:#:' \
+		-e '/def required_pkg_config_package/areturn true' \
+		-e '/checking_for/,/^end/ s:^:#:' \
+		-i ext/cairo/extconf.rb || die
+	sed -i -e '/native-package-installer/,/Gem::Dependency/ d' ../metadata || die
+
+	# Avoid test that requires unpackaged fixture
+	sed -i -e '/sub_test_case..FreeTypeFontFace/,/^  end/ s:^:#:' test/test_font_face.rb || die
+
+	# Bug 790131
+	sed -i -e '/^install-headers:/s!$! $(TIMESTAMP_DIR)/.sitearchdir.time!' \
+		ext/cairo/depend || die
+}
+
+each_ruby_test() {
+	# don't rely on the Rakefile because it's a mess to load with
+	# their hierarchy, do it manually.
+	${RUBY} -Ilib -r ./test/helper \
+		-e 'gem "test-unit"; require "test/unit"; Dir.glob("test/**/test_*.rb") {|f| load f}' || die "tests failed"
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	insinto $(ruby_get_hdrdir)
+	doins ext/cairo/rb_cairo.h
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r samples
+}
diff --git a/dev-ruby/rcairo/rcairo-1.17.5.ebuild b/dev-ruby/rcairo/rcairo-1.17.5.ebuild
deleted file mode 100644
index 98fa741d41d3..000000000000
--- a/dev-ruby/rcairo/rcairo-1.17.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_NAME="cairo"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="AUTHORS NEWS"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/cairo/extconf.rb)
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby bindings for cairo"
-HOMEPAGE="https://cairographics.org/rcairo/"
-
-IUSE=""
-
-SLOT="0"
-LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
-
-RDEPEND="${RDEPEND}
-	>=x11-libs/cairo-1.2.0[svg]"
-DEPEND="${DEPEND}
-	>=x11-libs/cairo-1.2.0[svg]"
-
-ruby_add_rdepend "dev-ruby/red-colors"
-
-ruby_add_bdepend "
-	>=dev-ruby/pkg-config-1.2.2
-	dev-ruby/ruby-glib2
-	test? ( >=dev-ruby/test-unit-2.1.0-r1:2 dev-ruby/ruby-poppler )"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency
-	sed -e '/native-package-installer/ s:^:#:' \
-		-e '/def required_pkg_config_package/areturn true' \
-		-e '/checking_for/,/^end/ s:^:#:' \
-		-i ext/cairo/extconf.rb || die
-	sed -i -e '/native-package-installer/,/Gem::Dependency/ d' ../metadata || die
-
-	# Avoid test that requires unpackaged fixture
-	sed -i -e '/sub_test_case..FreeTypeFontFace/,/^  end/ s:^:#:' test/test_font_face.rb || die
-
-	# Bug 790131
-	sed -i -e '/^install-headers:/s!$! $(TIMESTAMP_DIR)/.sitearchdir.time!' \
-		ext/cairo/depend || die
-}
-
-each_ruby_test() {
-	# don't rely on the Rakefile because it's a mess to load with
-	# their hierarchy, do it manually.
-	${RUBY} -Ilib -r ./test/helper \
-		-e 'gem "test-unit"; require "test/unit"; Dir.glob("test/**/test_*.rb") {|f| load f}' || die "tests failed"
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	insinto $(ruby_get_hdrdir)
-	doins ext/cairo/rb_cairo.h
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r samples
-}
diff --git a/dev-ruby/rcairo/rcairo-1.17.8.ebuild b/dev-ruby/rcairo/rcairo-1.17.8.ebuild
new file mode 100644
index 000000000000..8b30f8949ac7
--- /dev/null
+++ b/dev-ruby/rcairo/rcairo-1.17.8.ebuild
@@ -0,0 +1,75 @@
+# 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_NAME="cairo"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="AUTHORS NEWS"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/cairo/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby bindings for cairo"
+HOMEPAGE="https://cairographics.org/rcairo/"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Ruby-BSD GPL-2 )"
+KEYWORDS="amd64 ~ppc ~riscv ~x86"
+
+RDEPEND="${RDEPEND}
+	>=x11-libs/cairo-1.2.0[svg(+)]"
+DEPEND="${DEPEND}
+	>=x11-libs/cairo-1.2.0[svg(+)]"
+
+ruby_add_rdepend "dev-ruby/red-colors"
+
+ruby_add_bdepend "
+	>=dev-ruby/pkg-config-1.2.2
+	dev-ruby/ruby-glib2
+	test? ( >=dev-ruby/test-unit-2.1.0-r1:2 dev-ruby/ruby-poppler )"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency
+	sed -e '/native-package-installer/ s:^:#:' \
+		-e '/def required_pkg_config_package/areturn true' \
+		-e '/checking_for/,/^end/ s:^:#:' \
+		-i ext/cairo/extconf.rb || die
+	sed -i -e '/native-package-installer/,/Gem::Dependency/ d' ../metadata || die
+
+	# Avoid test that requires unpackaged fixture
+	sed -i -e '/sub_test_case..FreeTypeFontFace/,/^  end/ s:^:#:' test/test_font_face.rb || die
+
+	# Bug 790131
+	sed -i -e '/^install-headers:/s!$! $(TIMESTAMP_DIR)/.sitearchdir.time!' \
+		ext/cairo/depend || die
+}
+
+each_ruby_test() {
+	# don't rely on the Rakefile because it's a mess to load with
+	# their hierarchy, do it manually.
+	${RUBY} -Ilib -r ./test/helper \
+		-e 'gem "test-unit"; require "test/unit"; Dir.glob("test/**/test_*.rb") {|f| load f}' || die "tests failed"
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	insinto $(ruby_get_hdrdir)
+	doins ext/cairo/rb_cairo.h
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r samples
+}
diff --git a/dev-ruby/rchardet/rchardet-1.8.0-r1.ebuild b/dev-ruby/rchardet/rchardet-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..b4da2af9c347
--- /dev/null
+++ b/dev-ruby/rchardet/rchardet-1.8.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+
+RUBY_FAKEGEM_GEMSPEC="rchardet.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Character encoding auto-detection in Ruby"
+HOMEPAGE="https://github.com/jmhodges/rchardet"
+SRC_URI="https://github.com/jmhodges/rchardet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' -e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rchardet/rchardet-1.8.0.ebuild b/dev-ruby/rchardet/rchardet-1.8.0.ebuild
deleted file mode 100644
index f7406102881c..000000000000
--- a/dev-ruby/rchardet/rchardet-1.8.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="Readme.md"
-
-RUBY_FAKEGEM_GEMSPEC="rchardet.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Character encoding auto-detection in Ruby"
-HOMEPAGE="https://github.com/jmhodges/rchardet"
-SRC_URI="https://github.com/jmhodges/rchardet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' -e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rdiscount/Manifest b/dev-ruby/rdiscount/Manifest
index 3a292f56931a..5db221ea2c40 100644
--- a/dev-ruby/rdiscount/Manifest
+++ b/dev-ruby/rdiscount/Manifest
@@ -1 +1,2 @@
-DIST rdiscount-2.2.0.2.gem 68096 BLAKE2B 91f67643103a46f3fc95f80191a85ce4c89bba6a83f7ed5542cc9ec1671628c6ac0543b206d87e2ffc469dc83139e5669ee7eb6713eba4116db19c071a15f402 SHA512 97a0fabb77238173f101298e4b4b6d4728b9e15cb7d3f14e7d1d978c44ab92dd89c2e02d0c15c0fa70a836eb54abca06b0027e26e5d87540bfe145c8527be3f7
+DIST rdiscount-2.2.7.1.gem 74240 BLAKE2B 06779a601c8d13b90f5d9fb1c38712431671eab1cb2ef012dee284ddb6da254a0c788f16295438913d68f3641db2ec48c7cea3bade4f36fdc55b7a6049119fd4 SHA512 e67bbbb7f19ef14a729642e2059f0920b65a3f254507204955ab6d34529ade643ee7adecc3db2c61ca5462d266f88ea336bd228401e3cd0fad98e2e7763dd8d3
+DIST rdiscount-2.2.7.3.gem 75776 BLAKE2B 6dc3110d0acf1adf86450e520e43e9d6602ca8980e85d5d0122f2e49026e6b6a32eca72a44631fa1fa03e6c649b21941a820cb07a1d8cc30d3bde3d3fdc74c5e SHA512 525791f2be10e118f556676a1645d2805ba6ad920e4f4c8761362c5aa09cf1f773f0216f7b6c2e1f78acbc1de1ac85c6088cc85729af70a28f537fdff3434786
diff --git a/dev-ruby/rdiscount/metadata.xml b/dev-ruby/rdiscount/metadata.xml
index 7d5116aa1506..b0f9999b842e 100644
--- a/dev-ruby/rdiscount/metadata.xml
+++ b/dev-ruby/rdiscount/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">rtomayko/rdiscount</remote-id>
+    <remote-id type="github">davidfstr/rdiscount</remote-id>
+    <remote-id type="rubygems">rdiscount</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rdiscount/rdiscount-2.2.0.2-r1.ebuild b/dev-ruby/rdiscount/rdiscount-2.2.0.2-r1.ebuild
deleted file mode 100644
index 2627a3aae791..000000000000
--- a/dev-ruby/rdiscount/rdiscount-2.2.0.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-
-RUBY_FAKEGEM_TASK_DOC="doc man"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Implementation of John Gruber's Markdown"
-HOMEPAGE="https://github.com/rtomayko/rdiscount"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	# Hanna is broken for us and therefore we don't have it in portage.
-	sed -i -e 's/hanna/rdoc/' Rakefile || die
-
-	# Remove rule that will force a rebuild when running tests.
-	sed -i -e "/task 'test:unit' => \[:build\]/d" Rakefile || die
-
-	# Provide RUBY variable no longer provided by rake.
-	sed -i -e "1 iRUBY=${RUBY}" Rakefile || die
-
-	# Remove obsolete -rubygems argument, bug 775377
-	sed -i -e '/-rubygems/ s:^:#:' Rakefile || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/rdiscount.1
-}
diff --git a/dev-ruby/rdiscount/rdiscount-2.2.0.2-r2.ebuild b/dev-ruby/rdiscount/rdiscount-2.2.0.2-r2.ebuild
deleted file mode 100644
index df2316ab35f4..000000000000
--- a/dev-ruby/rdiscount/rdiscount-2.2.0.2-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-
-RUBY_FAKEGEM_TASK_DOC="doc man"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implementation of John Gruber's Markdown"
-HOMEPAGE="https://github.com/rtomayko/rdiscount"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	# Hanna is broken for us and therefore we don't have it in portage.
-	sed -i -e 's/hanna/rdoc/' Rakefile || die
-
-	# Remove rule that will force a rebuild when running tests.
-	sed -i -e "/task 'test:unit' => \[:build\]/d" Rakefile || die
-
-	# Provide RUBY variable no longer provided by rake.
-	sed -i -e "1 iRUBY=${RUBY}" Rakefile || die
-
-	# Remove obsolete -rubygems argument, bug 775377
-	sed -i -e '/-rubygems/ s:^:#:' Rakefile || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/rdiscount.1
-}
diff --git a/dev-ruby/rdiscount/rdiscount-2.2.7.1.ebuild b/dev-ruby/rdiscount/rdiscount-2.2.7.1.ebuild
new file mode 100644
index 000000000000..e115ba7a39f3
--- /dev/null
+++ b/dev-ruby/rdiscount/rdiscount-2.2.7.1.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="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST="test:unit"
+
+RUBY_FAKEGEM_TASK_DOC="doc man"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implementation of John Gruber's Markdown"
+HOMEPAGE="https://github.com/davidfstr/rdiscount"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	# Hanna is broken for us and therefore we don't have it in portage.
+	sed -i -e 's/hanna/rdoc/' Rakefile || die
+
+	# Remove rule that will force a rebuild when running tests.
+	sed -i -e "/task 'test:unit' => \[:build\]/d" Rakefile || die
+
+	# Provide RUBY variable no longer provided by rake.
+	sed -i -e "1 iRUBY=${RUBY}" Rakefile || die
+
+	# Remove obsolete -rubygems argument, bug 775377
+	sed -i -e '/-rubygems/ s:^:#:' Rakefile || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/rdiscount.1
+}
diff --git a/dev-ruby/rdiscount/rdiscount-2.2.7.3.ebuild b/dev-ruby/rdiscount/rdiscount-2.2.7.3.ebuild
new file mode 100644
index 000000000000..1e2af68e91bb
--- /dev/null
+++ b/dev-ruby/rdiscount/rdiscount-2.2.7.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST="test:unit"
+
+RUBY_FAKEGEM_TASK_DOC="doc man"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implementation of John Gruber's Markdown"
+HOMEPAGE="https://github.com/davidfstr/rdiscount"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	# Hanna is broken for us and therefore we don't have it in portage.
+	sed -i -e 's/hanna/rdoc/' Rakefile || die
+
+	# Remove rule that will force a rebuild when running tests.
+	sed -i -e "/task 'test:unit' => \[:build\]/d" Rakefile || die
+
+	# Provide RUBY variable no longer provided by rake.
+	sed -i -e "1 iRUBY=${RUBY}" Rakefile || die
+
+	# Remove obsolete -rubygems argument, bug 775377
+	sed -i -e '/-rubygems/ s:^:#:' Rakefile || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/rdiscount.1
+}
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 03b5ca48f03d..24c0d3edac48 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,3 +1,3 @@
-DIST rdoc-6.3.2.tar.gz 675963 BLAKE2B 1ac931ddf0af700f2460e415a6e8c505c9a3c0f2d65b5c25928285144181d925747dad0224f014abdc1680df9130df74ba82750a2cb1d02b042c0bcd63d22e6a SHA512 1bd8eaa6c1e5cc40492b1d6e461d831cfc05bf368c982f3266b63ea4984c10de40523f9e2106b1beebd96933a2006cb81c3daa26ee0196d99d1ed6da5b72a78f
-DIST rdoc-6.3.3.tar.gz 675961 BLAKE2B 200d57c4b104cb3ba894ef56fd72b4f6b2228dc2c5fd7a53035a7e03834e0e9aa283ee2b07dc7dbbfaf123bc9d96ef302f47a24b71a6d735872960ecd65d9cb3 SHA512 e4e4083fea67184c435b59866fc8e8c29c740d716f8be279d18a625c1eadddd41d449de30ddcc3af1aa0507320c0910800d5a0032540b626c5b2ea83d3b123f2
-DIST rdoc-6.4.0.tar.gz 755741 BLAKE2B d2519dc0dac3fac32ef7cac8c87dba1a679f0b09dc5858e91899d6d28195cf584fe3eba802bafad400ae26c5ddcb65eaec32e101f9e047f80cecd1616a386ed3 SHA512 6c6a89245ac77abdeedee70327f97f8a9b8bb596c14848a95487ff19039864dd7a5c0f5b501fe2e7b187c671cfb205c1500359c7c203beb89211addaf3ac34f7
+DIST rdoc-6.5.0.tar.gz 762645 BLAKE2B cecade491f0d18b2c50ec710cb27a28b6cb946f321503e0508e8d4802e93033a78867346eb1d68ca56884ea0d68d51d6fdb92eb61fa63034a01332e8b572dbcf SHA512 10382e66ca778f85f236614fe071b2b0d598065d3aab8f5a89cb0839da7713b5e16a66e3f7a2bff2e2125d26a42f088a86c6d339dc36479a943bb7023c1cad0c
+DIST rdoc-6.6.2.tar.gz 765932 BLAKE2B 39bcb0f1af6ee4d53b9011179556d8f1a6b09e20716e60a5d57ca7dcede54797946517e7321004e41d440f26d39e9f3c7c80aaf3b24212ce6a650cddc23d69f3 SHA512 326ead5d4ec5b9328f9feaf3434351911a3dda18d739c8657d9025f7b3387139e1b63ea8fc649870ca474e4a0560ad87cb9e2a13fbbecd240a8aad652d061d42
+DIST rdoc-6.6.3.1.tar.gz 766103 BLAKE2B 15cef9df763e40e105155d49c6c0c1a449c366ac35ab6036c43773c52114f00b19109b056033366b873b5b3317a3bf11c574dd76094d8f606fa0916a84257d0a SHA512 c6f3aae83e895e2de28e5a7c27456160dd53007ceb4464a045e0211473eb3d51f49a7c2ac28f2e44e807c5b36447140d15eadff65bfa52335e94adc9c8b56d2e
diff --git a/dev-ruby/rdoc/metadata.xml b/dev-ruby/rdoc/metadata.xml
index 9077f28f103e..ed72bc33b342 100644
--- a/dev-ruby/rdoc/metadata.xml
+++ b/dev-ruby/rdoc/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">rdoc/rdoc</remote-id>
+    <remote-id type="github">ruby/rdoc</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rdoc/rdoc-6.3.2.ebuild b/dev-ruby/rdoc/rdoc-6.3.2.ebuild
deleted file mode 100644
index be4d9995ff2f..000000000000
--- a/dev-ruby/rdoc/rdoc-6.3.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
-HOMEPAGE="https://github.com/ruby/rdoc/"
-SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~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="doc"
-
-RDEPEND+=">=app-eselect/eselect-ruby-20181225"
-
-ruby_add_bdepend "
-	>=dev-ruby/kpeg-1.1.0-r1
-	>dev-ruby/racc-1.4.10
-	dev-ruby/rake
-	test? (
-		dev-ruby/bundler
-		>=dev-ruby/minitest-5.8:5
-	)"
-
-all_ruby_prepare() {
-	# Other packages also have use for a nonexistent directory, bug 321059
-	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/rdoc/test_rdoc*.rb || die
-
-	# Avoid unneeded dependency on bundler, bug 603696
-	sed -i -e '/bundler/ s:^:#:' \
-		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' \
-		-e '/rubocop\/rake/ s:^:#:' \
-		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
-
-	# Remove test that is depending on the locale, which we can't garantuee.
-	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
-
-	# Remove test depending on FEATURES=userpriv, bug 361959
-	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
-
-	# Remove tests for code that is not included and not listed in Manifest.txt
-	rm -f test/test_rdoc_i18n_{locale,text}.rb \
-		test/rdoc/test_rdoc_generator_pot* || die
-
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		ruby -Ilib -S exe/rdoc || die
-	fi
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake generate || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for bin in rdoc ri; do
-		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
-
-		for version in $(ruby_get_use_implementations); do
-			version=`echo ${version} | cut -c 5-`
-			if use ruby_targets_ruby${version}; then
-				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
-				sed -i -e "1s/env ruby/ruby${version}/" \
-					"${ED}/usr/bin/${bin}${version}" || die
-			fi
-		done
-	done
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"/usr/bin/rdoc) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-}
diff --git a/dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild b/dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild
deleted file mode 100644
index feff109f3ce8..000000000000
--- a/dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
-HOMEPAGE="https://github.com/ruby/rdoc/"
-SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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="doc"
-
-RDEPEND+=">=app-eselect/eselect-ruby-20181225"
-
-ruby_add_bdepend "
-	>=dev-ruby/kpeg-1.1.0-r1
-	>dev-ruby/racc-1.4.10
-	dev-ruby/rake
-	test? (
-		dev-ruby/bundler
-		>=dev-ruby/minitest-5.8:5
-	)"
-
-all_ruby_prepare() {
-	# Other packages also have use for a nonexistent directory, bug 321059
-	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/rdoc/test_rdoc*.rb || die
-
-	# Avoid unneeded dependency on bundler, bug 603696
-	sed -i -e '/bundler/ s:^:#:' \
-		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' \
-		-e '/rubocop\/rake/ s:^:#:' \
-		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
-
-	# Skip rubygems tests since the rubygems test case code is no longer installed by rubygems.
-	sed -i -e '/^task/ s/, :rubygems_test//' Rakefile || die
-
-	# Remove test that is depending on the locale, which we can't garantuee.
-	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
-
-	# Remove test depending on FEATURES=userpriv, bug 361959
-	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
-
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		ruby -Ilib -S exe/rdoc || die
-		rm -f doc/js/*.gz || die
-	fi
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake generate || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for bin in rdoc ri; do
-		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
-
-		for version in $(ruby_get_use_implementations); do
-			version=`echo ${version} | cut -c 5-`
-			if use ruby_targets_ruby${version}; then
-				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
-				sed -i -e "1s/env ruby/ruby${version}/" \
-					"${ED}/usr/bin/${bin}${version}" || die
-			fi
-		done
-	done
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"/usr/bin/rdoc) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-}
diff --git a/dev-ruby/rdoc/rdoc-6.3.3.ebuild b/dev-ruby/rdoc/rdoc-6.3.3.ebuild
deleted file mode 100644
index 507317f9b0a0..000000000000
--- a/dev-ruby/rdoc/rdoc-6.3.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
-HOMEPAGE="https://github.com/ruby/rdoc/"
-SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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="doc"
-
-RDEPEND+=">=app-eselect/eselect-ruby-20181225"
-
-ruby_add_bdepend "
-	>=dev-ruby/kpeg-1.1.0-r1
-	>dev-ruby/racc-1.4.10
-	dev-ruby/rake
-	test? (
-		dev-ruby/bundler
-		>=dev-ruby/minitest-5.8:5
-	)"
-
-all_ruby_prepare() {
-	# Other packages also have use for a nonexistent directory, bug 321059
-	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/rdoc/test_rdoc*.rb || die
-
-	# Avoid unneeded dependency on bundler, bug 603696
-	sed -i -e '/bundler/ s:^:#:' \
-		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' \
-		-e '/rubocop\/rake/ s:^:#:' \
-		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
-
-	# Remove test that is depending on the locale, which we can't garantuee.
-	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
-
-	# Remove test depending on FEATURES=userpriv, bug 361959
-	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
-
-	# Remove tests for code that is not included and not listed in Manifest.txt
-	rm -f test/test_rdoc_i18n_{locale,text}.rb \
-		test/rdoc/test_rdoc_generator_pot* || die
-
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		ruby -Ilib -S exe/rdoc || die
-	fi
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake generate || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for bin in rdoc ri; do
-		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
-
-		for version in $(ruby_get_use_implementations); do
-			version=`echo ${version} | cut -c 5-`
-			if use ruby_targets_ruby${version}; then
-				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
-				sed -i -e "1s/env ruby/ruby${version}/" \
-					"${ED}/usr/bin/${bin}${version}" || die
-			fi
-		done
-	done
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"/usr/bin/rdoc) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-}
diff --git a/dev-ruby/rdoc/rdoc-6.4.0.ebuild b/dev-ruby/rdoc/rdoc-6.4.0.ebuild
deleted file mode 100644
index 03aaa77dbfa2..000000000000
--- a/dev-ruby/rdoc/rdoc-6.4.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
-HOMEPAGE="https://github.com/ruby/rdoc/"
-SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby MIT"
-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="doc"
-
-RDEPEND+=">=app-eselect/eselect-ruby-20181225"
-
-ruby_add_rdepend "
-	>=dev-ruby/psych-4.0.0
-"
-
-ruby_add_bdepend "
-	>=dev-ruby/kpeg-1.1.0-r1
-	>dev-ruby/racc-1.4.10
-	dev-ruby/rake
-	test? (
-		dev-ruby/bundler
-		>=dev-ruby/minitest-5.8:5
-	)"
-
-all_ruby_prepare() {
-	# Other packages also have use for a nonexistent directory, bug 321059
-	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/rdoc/test_rdoc*.rb || die
-
-	# Avoid unneeded dependency on bundler, bug 603696
-	sed -i -e '/bundler/ s:^:#:' \
-		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' \
-		-e '/rubocop\/rake/ s:^:#:' \
-		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
-
-	# Skip rubygems tests since the rubygems test case code is no longer installed by rubygems.
-	sed -i -e '/^task/ s/, :rubygems_test//' Rakefile || die
-
-	# Remove test that is depending on the locale, which we can't garantuee.
-	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
-
-	# Remove test depending on FEATURES=userpriv, bug 361959
-	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
-
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		ruby -Ilib -S exe/rdoc || die
-		rm -f doc/js/*.gz || die
-	fi
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake generate || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for bin in rdoc ri; do
-		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
-
-		for version in $(ruby_get_use_implementations); do
-			version=`echo ${version} | cut -c 5-`
-			if use ruby_targets_ruby${version}; then
-				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
-				sed -i -e "1s/env ruby/ruby${version}/" \
-					"${ED}/usr/bin/${bin}${version}" || die
-			fi
-		done
-	done
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"/usr/bin/rdoc) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-}
diff --git a/dev-ruby/rdoc/rdoc-6.5.0.ebuild b/dev-ruby/rdoc/rdoc-6.5.0.ebuild
new file mode 100644
index 000000000000..a49d07120345
--- /dev/null
+++ b/dev-ruby/rdoc/rdoc-6.5.0.ebuild
@@ -0,0 +1,98 @@
+# 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="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
+HOMEPAGE="https://github.com/ruby/rdoc/"
+SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 Ruby-BSD )"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND+=">=app-eselect/eselect-ruby-20181225"
+
+ruby_add_rdepend "
+	>=dev-ruby/psych-4.0.0
+"
+
+ruby_add_bdepend "
+	>=dev-ruby/kpeg-1.1.0-r1
+	>dev-ruby/racc-1.4.10
+	dev-ruby/rake
+	test? (
+		dev-ruby/bundler
+		>=dev-ruby/minitest-5.8:5
+	)"
+
+all_ruby_prepare() {
+	# Other packages also have use for a nonexistent directory, bug 321059
+	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/rdoc/test_rdoc*.rb || die
+
+	# Avoid unneeded dependency on bundler, bug 603696
+	sed -i -e '/bundler/ s:^:#:' \
+		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' \
+		-e '/rubocop\/rake/ s:^:#:' \
+		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
+
+	# Skip rubygems tests since the rubygems test case code is no longer installed by rubygems.
+	sed -i -e '/^task/ s/, :rubygems_test//' Rakefile || die
+
+	# Remove test that is depending on the locale, which we can't garantuee.
+	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
+
+	# Remove test depending on FEATURES=userpriv, bug 361959
+	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
+
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		ruby -S exe/rdoc --force-output || die
+		rm -f doc/js/*.gz || die
+	fi
+}
+
+each_ruby_compile() {
+	LANG=C.UTF-8 ${RUBY} -S rake generate || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for bin in rdoc ri; do
+		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
+
+		for version in $(ruby_get_use_implementations); do
+			version=`echo ${version} | cut -c 5-`
+			if use ruby_targets_ruby${version}; then
+				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
+				sed -i -e "1s/env ruby/ruby${version}/" \
+					"${ED}/usr/bin/${bin}${version}" || die
+			fi
+		done
+	done
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/rdoc) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+}
diff --git a/dev-ruby/rdoc/rdoc-6.6.2.ebuild b/dev-ruby/rdoc/rdoc-6.6.2.ebuild
new file mode 100644
index 000000000000..aad01097472a
--- /dev/null
+++ b/dev-ruby/rdoc/rdoc-6.6.2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
+HOMEPAGE="https://github.com/ruby/rdoc/"
+SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 Ruby-BSD )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND+=">=app-eselect/eselect-ruby-20181225"
+
+ruby_add_rdepend "
+	>=dev-ruby/psych-4.0.0
+"
+
+ruby_add_bdepend "
+	>=dev-ruby/kpeg-1.1.0-r1
+	>dev-ruby/racc-1.4.10
+	dev-ruby/rake
+	test? (
+		dev-ruby/bundler
+		>=dev-ruby/minitest-5.8:5
+	)"
+
+all_ruby_prepare() {
+	# Other packages also have use for a nonexistent directory, bug 321059
+	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/rdoc/test_rdoc*.rb || die
+
+	# Avoid unneeded dependency on bundler, bug 603696
+	sed -i -e '/bundler/ s:^:#:' \
+		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' \
+		-e '/rubocop\/rake/ s:^:#:' \
+		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
+
+	# Skip rubygems tests since the rubygems test case code is no longer installed by rubygems.
+	sed -i -e '/^task/ s/, :rubygems_test//' Rakefile || die
+
+	# Remove test that is depending on the locale, which we can't garantuee.
+	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
+
+	# Remove test depending on FEATURES=userpriv, bug 361959
+	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
+
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		ruby -S exe/rdoc --force-output || die
+		rm -f doc/js/*.gz || die
+	fi
+}
+
+each_ruby_compile() {
+	LANG=C.UTF-8 ${RUBY} -S rake generate || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for bin in rdoc ri; do
+		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
+
+		for version in $(ruby_get_use_implementations); do
+			version=`echo ${version} | cut -c 5-`
+			if use ruby_targets_ruby${version}; then
+				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
+				sed -i -e "1s/env ruby/ruby${version}/" \
+					"${ED}/usr/bin/${bin}${version}" || die
+			fi
+		done
+	done
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/rdoc) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+}
diff --git a/dev-ruby/rdoc/rdoc-6.6.3.1-r1.ebuild b/dev-ruby/rdoc/rdoc-6.6.3.1-r1.ebuild
new file mode 100644
index 000000000000..e282ebb89a7e
--- /dev/null
+++ b/dev-ruby/rdoc/rdoc-6.6.3.1-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
+HOMEPAGE="https://github.com/ruby/rdoc/"
+SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 Ruby-BSD )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND+=">=app-eselect/eselect-ruby-20181225"
+
+ruby_add_rdepend "
+	>=dev-ruby/psych-4.0.0
+"
+
+ruby_add_bdepend "
+	>=dev-ruby/kpeg-1.1.0-r1
+	>dev-ruby/racc-1.4.10
+	dev-ruby/rake
+	test? (
+		dev-ruby/bundler
+		>=dev-ruby/minitest-5.8:5
+		dev-ruby/test-unit-ruby-core
+	)"
+
+all_ruby_prepare() {
+	# Other packages also have use for a nonexistent directory, bug 321059
+	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/rdoc/test_rdoc*.rb || die
+
+	# Avoid unneeded dependency on bundler, bug 603696
+	sed -i -e '/bundler/ s:^:#:' \
+		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' \
+		-e '/rubocop\/rake/ s:^:#:' \
+		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
+
+	# Skip rubygems tests since the rubygems test case code is no longer installed by rubygems.
+	sed -i -e '/^task/ s/, :rubygems_test//' Rakefile || die
+
+	# Remove test that is depending on the locale, which we can't garantuee.
+	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
+
+	# Remove test depending on FEATURES=userpriv, bug 361959
+	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
+
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		ruby -S exe/rdoc --force-output || die
+		rm -f doc/js/*.gz || die
+	fi
+}
+
+each_ruby_compile() {
+	LANG=C.UTF-8 ${RUBY} -S rake generate || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for bin in rdoc ri; do
+		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
+
+		for version in $(ruby_get_use_implementations); do
+			version=`echo ${version} | cut -c 5-`
+			if use ruby_targets_ruby${version}; then
+				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
+				sed -i -e "1s/env ruby/ruby${version}/" \
+					"${ED}/usr/bin/${bin}${version}" || die
+			fi
+		done
+	done
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/rdoc) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+}
diff --git a/dev-ruby/rdoc/rdoc-6.6.3.1.ebuild b/dev-ruby/rdoc/rdoc-6.6.3.1.ebuild
new file mode 100644
index 000000000000..7a774a7cbd0e
--- /dev/null
+++ b/dev-ruby/rdoc/rdoc-6.6.3.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
+HOMEPAGE="https://github.com/ruby/rdoc/"
+SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 Ruby-BSD )"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND+=">=app-eselect/eselect-ruby-20181225"
+
+ruby_add_rdepend "
+	>=dev-ruby/psych-4.0.0
+"
+
+ruby_add_bdepend "
+	>=dev-ruby/kpeg-1.1.0-r1
+	>dev-ruby/racc-1.4.10
+	dev-ruby/rake
+	test? (
+		dev-ruby/bundler
+		>=dev-ruby/minitest-5.8:5
+	)"
+
+all_ruby_prepare() {
+	# Other packages also have use for a nonexistent directory, bug 321059
+	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/rdoc/test_rdoc*.rb || die
+
+	# Avoid unneeded dependency on bundler, bug 603696
+	sed -i -e '/bundler/ s:^:#:' \
+		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' \
+		-e '/rubocop\/rake/ s:^:#:' \
+		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
+
+	# Skip rubygems tests since the rubygems test case code is no longer installed by rubygems.
+	sed -i -e '/^task/ s/, :rubygems_test//' Rakefile || die
+
+	# Remove test that is depending on the locale, which we can't garantuee.
+	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
+
+	# Remove test depending on FEATURES=userpriv, bug 361959
+	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
+
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		ruby -S exe/rdoc --force-output || die
+		rm -f doc/js/*.gz || die
+	fi
+}
+
+each_ruby_compile() {
+	LANG=C.UTF-8 ${RUBY} -S rake generate || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for bin in rdoc ri; do
+		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
+
+		for version in $(ruby_get_use_implementations); do
+			version=`echo ${version} | cut -c 5-`
+			if use ruby_targets_ruby${version}; then
+				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
+				sed -i -e "1s/env ruby/ruby${version}/" \
+					"${ED}/usr/bin/${bin}${version}" || die
+			fi
+		done
+	done
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/rdoc) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+}
diff --git a/dev-ruby/rdtool/rdtool-0.6.38-r3.ebuild b/dev-ruby/rdtool/rdtool-0.6.38-r3.ebuild
index 9bf91b04f87d..39489b7cfc39 100644
--- a/dev-ruby/rdtool/rdtool-0.6.38-r3.ebuild
+++ b/dev-ruby/rdtool/rdtool-0.6.38-r3.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="HISTORY README.*"
diff --git a/dev-ruby/recog/Manifest b/dev-ruby/recog/Manifest
index 9b847462ca1d..b70cdfbbad3f 100644
--- a/dev-ruby/recog/Manifest
+++ b/dev-ruby/recog/Manifest
@@ -1,3 +1,3 @@
-DIST recog-2.3.19.gem 343552 BLAKE2B bf5aa0e2c5e8d7a27b23f03250a3fa952dfa0ed5a2844596b00940fce2e1080ada009a46b5eeb2418845ea12f803580040fc3a3aa6871675efff1a8f4d5a4ade SHA512 f09a0ee2b4a7ecb7ca6b587a70e115e162fbca8a7a1736017305346ed03207de66f71711e78593ed242c63c3c8be9af2b341c2d06c08a6592fd3d8ecbdc60147
-DIST recog-2.3.20.gem 355328 BLAKE2B 0da5bc28ef7afa9f6e6e64911c6cc423b1667a06b9ce1cb234a89d05e3680c562796ed4701015b5621f6319c1516d5ff7c0e67bd1343bbe6464ce5982ebfdeb7 SHA512 ae247adc9dc342fb3277f4f231f5f827e470a74fea5e609ca53cd1dc9b48c5742a16433536271f4e686c1af31619cc1afd4255a41285ff18518f81f21433cef1
 DIST recog-2.3.23.gem 392704 BLAKE2B 6b7ccfa2921fb7d643531c66970e757a01478b3990bbb2d05687a5364ed8b57317d16d0b116c2175cf0e667b12ea7a978c947b73d04db16fbd1a9db651ba4abf SHA512 34cb222dbc25f5da0581cb85aa92a3e6fa67b9af9d0b7b99cb3e358b1be5d71a25f582a669a06f4cadd4b6ac464c7f3d2b3856c24d5ecea0d1d6027758905774
+DIST recog-3.1.4.gem 375808 BLAKE2B 59bfe273242ecad54ac1de6d3aaade86310dabfc252ac087734e867a762b287d31b9dd1669536ab3e59d18d2342b3ab070e2406b41ca9281cbb6e5b2a9270330 SHA512 6fe086b16f9b9ee3579bade83da815973f4043b49b9869db18677b6d8378efa1024b2ecf414172ea62f35160da2d080406fb0f9c2ae001a6748c29f33f505d83
+DIST recog-3.1.5.gem 376832 BLAKE2B 99bb76f301eb7216bc586f4bea59d729dca68ccccb58053ae2757277db4ac96aa80ad490915fd31f30acd46f2f2642bb078b1174d716adba76ca1d6b16a0ef43 SHA512 e02904c42ebf1b671df65fcfc38527ab2b09c3e7bfeb1d2c2a29b45715eab1f0475c83ac66667fb38737e79a6158f456fe45ac3a6b881eaa4a5b52efd37b47ab
diff --git a/dev-ruby/recog/metadata.xml b/dev-ruby/recog/metadata.xml
index f7b0241b3812..9c8ce608b3bc 100644
--- a/dev-ruby/recog/metadata.xml
+++ b/dev-ruby/recog/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/recog</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rapid7/recog</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/recog/recog-2.3.19.ebuild b/dev-ruby/recog/recog-2.3.19.ebuild
deleted file mode 100644
index 18077246bb19..000000000000
--- a/dev-ruby/recog/recog-2.3.19.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="xml"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pattern recognition for hosts, services, and content"
-HOMEPAGE="https://github.com/rapid7/recog"
-
-LICENSE="BSD-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/nokogiri"
-
-ruby_add_bdepend "test? (
-	dev-ruby/regexp_parser
-	dev-ruby/rspec:3
-	dev-util/aruba:1
-	dev-util/cucumber
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	ruby-ng_cucumber
-}
diff --git a/dev-ruby/recog/recog-2.3.20.ebuild b/dev-ruby/recog/recog-2.3.20.ebuild
deleted file mode 100644
index 18077246bb19..000000000000
--- a/dev-ruby/recog/recog-2.3.20.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="xml"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pattern recognition for hosts, services, and content"
-HOMEPAGE="https://github.com/rapid7/recog"
-
-LICENSE="BSD-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/nokogiri"
-
-ruby_add_bdepend "test? (
-	dev-ruby/regexp_parser
-	dev-ruby/rspec:3
-	dev-util/aruba:1
-	dev-util/cucumber
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	ruby-ng_cucumber
-}
diff --git a/dev-ruby/recog/recog-2.3.23.ebuild b/dev-ruby/recog/recog-2.3.23.ebuild
index 5e29a01e4058..a7e9828eece6 100644
--- a/dev-ruby/recog/recog-2.3.23.ebuild
+++ b/dev-ruby/recog/recog-2.3.23.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"
+USE_RUBY="ruby30 ruby31 ruby32"
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -23,7 +23,7 @@ ruby_add_rdepend "dev-ruby/nokogiri"
 ruby_add_bdepend "test? (
 	dev-ruby/regexp_parser
 	dev-ruby/rspec:3
-	|| ( dev-util/aruba:2 dev-util/aruba:1 )
+	dev-util/aruba:2
 	dev-util/cucumber
 )"
 
diff --git a/dev-ruby/recog/recog-3.1.4.ebuild b/dev-ruby/recog/recog-3.1.4.ebuild
new file mode 100644
index 000000000000..5c67d5b524f1
--- /dev/null
+++ b/dev-ruby/recog/recog-3.1.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="recog"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pattern recognition for hosts, services, and content"
+HOMEPAGE="https://github.com/rapid7/recog"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/nokogiri"
+
+ruby_add_bdepend "test? (
+	dev-ruby/regexp_parser
+)"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/recog/recog-3.1.5.ebuild b/dev-ruby/recog/recog-3.1.5.ebuild
new file mode 100644
index 000000000000..35ef2a4232d6
--- /dev/null
+++ b/dev-ruby/recog/recog-3.1.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="recog"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pattern recognition for hosts, services, and content"
+HOMEPAGE="https://github.com/rapid7/recog"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/nokogiri"
+
+ruby_add_bdepend "test? (
+	dev-ruby/regexp_parser
+)"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/red-colors/Manifest b/dev-ruby/red-colors/Manifest
index 3e6df5059366..519ce080e51c 100644
--- a/dev-ruby/red-colors/Manifest
+++ b/dev-ruby/red-colors/Manifest
@@ -1 +1,2 @@
 DIST red-colors-0.3.0.gem 104448 BLAKE2B 46b99c755e745eadfc1af61c024df66d54b583c9fbad37522971d44ee42b1db9a5148529a37252ad50cdb276fee8e58aca2afdc190bac3098baa67857eac0d6a SHA512 baa05634213a46da968a42e478db097c5bc47187e61807a3b3c30b8109a0fae63d587e5a3227b5bca75b921304b9d5e24a5ba945361dd5eba1c25235889c2cf1
+DIST red-colors-0.4.0.gem 107008 BLAKE2B e9396e16719514fa6ffee2de5f24f5668c6df10122264b967133f29a0c6b3fb949babb4d343948afba74a8226979677061ef1b28f1fef3e1e002d6d3b643ab78 SHA512 ce142c8f0b0e0a3d676b8460938c788595d15a84f268ac80a70543f81d4042d60f6f5703c91a496be8d27eed504207525bd3c4b72909b3dfc1ea2599515aafe8
diff --git a/dev-ruby/red-colors/metadata.xml b/dev-ruby/red-colors/metadata.xml
index 658c72b1920d..721a3d872641 100644
--- a/dev-ruby/red-colors/metadata.xml
+++ b/dev-ruby/red-colors/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">red-data-tools/red-colors</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/red-colors/red-colors-0.3.0-r1.ebuild b/dev-ruby/red-colors/red-colors-0.3.0-r1.ebuild
deleted file mode 100644
index 09c203b5d5e0..000000000000
--- a/dev-ruby/red-colors/red-colors-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Color features for Ruby"
-HOMEPAGE="https://github.com/red-data-tools/red-colors"
-
-IUSE=""
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
diff --git a/dev-ruby/red-colors/red-colors-0.3.0-r2.ebuild b/dev-ruby/red-colors/red-colors-0.3.0-r2.ebuild
new file mode 100644
index 000000000000..9f4866b65574
--- /dev/null
+++ b/dev-ruby/red-colors/red-colors-0.3.0-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Color features for Ruby"
+HOMEPAGE="https://github.com/red-data-tools/red-colors"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 ~ppc ~riscv ~x86"
+
+ruby_add_rdepend "dev-ruby/matrix"
diff --git a/dev-ruby/red-colors/red-colors-0.4.0.ebuild b/dev-ruby/red-colors/red-colors-0.4.0.ebuild
new file mode 100644
index 000000000000..9ff66585041a
--- /dev/null
+++ b/dev-ruby/red-colors/red-colors-0.4.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Color features for Ruby"
+HOMEPAGE="https://github.com/red-data-tools/red-colors"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+
+ruby_add_rdepend "
+	dev-ruby/json
+	dev-ruby/matrix
+"
diff --git a/dev-ruby/redcarpet/Manifest b/dev-ruby/redcarpet/Manifest
index a0a34baf2c31..f6a55632b78b 100644
--- a/dev-ruby/redcarpet/Manifest
+++ b/dev-ruby/redcarpet/Manifest
@@ -1 +1 @@
-DIST redcarpet-3.5.1.tar.gz 106950 BLAKE2B 2f84e0dbadaa79827d9d244988b19161996e249e493208b20b6339f0eccf73160fe84d79f11a23419573693bbc9c1faae61e690ffe5ec133f8a0baddb69d92b5 SHA512 348ee8fc56b89bb1b9fe0b004cab08e9542f3806a885fb5fb0ff58c9a0fa704ad37611484e071951ad00d1d337988d5dae6d240cd65df890f8fe0865e242608d
+DIST redcarpet-3.6.0.tar.gz 108308 BLAKE2B 0dc15dc6ee17fdc8a0a171eb268315c4682b95145c5e79168e004c38cd856bd68f78e48b1b0c14a1d20676630d197fce86905cf15be5a1af0a83103855a63e6b SHA512 6d20340b10ee495319c6d3d24a42daf6ce78d5daafd1a650793f6743cc06b0523a560f2dd3d13030025e3592bbf05663e4b9393607b81b1d76b8a0da5be2dbce
diff --git a/dev-ruby/redcarpet/redcarpet-3.5.1-r1.ebuild b/dev-ruby/redcarpet/redcarpet-3.5.1-r1.ebuild
deleted file mode 100644
index 56f0828759b1..000000000000
--- a/dev-ruby/redcarpet/redcarpet-3.5.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOCS="README.markdown CONTRIBUTING.md CHANGELOG.md doc"
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-
-RUBY_FAKEGEM_GEMSPEC="redcarpet.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/redcarpet/extconf.rb)
-
-inherit multilib ruby-fakegem
-
-SRC_URI="https://github.com/vmg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A Ruby wrapper for Upskirt"
-HOMEPAGE="https://github.com/vmg/redcarpet"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e 's/=> :compile//'  Rakefile || die
-
-	# Avoid unneeded dependency on rake-compiler
-	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s#ruby#${RUBY}#" bin/redcarpet || die
-}
diff --git a/dev-ruby/redcarpet/redcarpet-3.5.1.ebuild b/dev-ruby/redcarpet/redcarpet-3.5.1.ebuild
deleted file mode 100644
index 860692c43e4b..000000000000
--- a/dev-ruby/redcarpet/redcarpet-3.5.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOCS="README.markdown CONTRIBUTING.md CHANGELOG.md doc"
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-
-RUBY_FAKEGEM_GEMSPEC="redcarpet.gemspec"
-
-inherit multilib ruby-fakegem
-
-SRC_URI="https://github.com/vmg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A Ruby wrapper for Upskirt"
-HOMEPAGE="https://github.com/vmg/redcarpet"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e 's/=> :compile//'  Rakefile || die
-
-	# Avoid unneeded dependency on rake-compiler
-	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s#ruby#${RUBY}#" bin/redcarpet || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/redcarpet extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/*$(get_modname) lib || die
-}
diff --git a/dev-ruby/redcarpet/redcarpet-3.6.0.ebuild b/dev-ruby/redcarpet/redcarpet-3.6.0.ebuild
new file mode 100644
index 000000000000..5f491f7c2a44
--- /dev/null
+++ b/dev-ruby/redcarpet/redcarpet-3.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOCS="README.markdown CONTRIBUTING.md CHANGELOG.md doc"
+RUBY_FAKEGEM_TASK_TEST="test:unit"
+
+RUBY_FAKEGEM_GEMSPEC="redcarpet.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/redcarpet/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby wrapper for Upskirt"
+HOMEPAGE="https://github.com/vmg/redcarpet"
+SRC_URI="https://github.com/vmg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e 's/=> :compile//'  Rakefile || die
+
+	# Avoid unneeded dependency on rake-compiler
+	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
+}
+
+each_ruby_prepare() {
+	sed -i -e "s#ruby#${RUBY}#" bin/redcarpet || die
+}
diff --git a/dev-ruby/redcloth/Manifest b/dev-ruby/redcloth/Manifest
index ef9bc8995d3e..a4f4e1c41299 100644
--- a/dev-ruby/redcloth/Manifest
+++ b/dev-ruby/redcloth/Manifest
@@ -1 +1,3 @@
 DIST RedCloth-4.3.2.tar.gz 91880 BLAKE2B 0feac1ec59e23fcff39e2fdf9beff896be7949764e53a5a834c5f4e7d18813dc59bf354103d4fab82a709341a0f1b6919bbd3a463fd601564888672dbe73d343 SHA512 377fef21e646beb1658a4b8b8d0228e9730c6c8f33075a14137afcf80e8d37501ede8c05b720d0dfb36a680017f4dedd01565fe9b326ae06ead77afee6f122ca
+DIST RedCloth-4.3.3.tar.gz 92704 BLAKE2B 8de97317fa8ed3644a858376cbc73b4dfa91db565ef0a8a9dbbc2002da563eafd0ac975fe2c466519c38df7bb7be40f1f99ac4a7f2217c4a639760a95a32c79e SHA512 d45bad056e7d3d18bc123cc932ee35a808ab19dcee436a715dcccdd081dc6fbc06bbb56f792037fae031951c5b69f864c2fa0e80bf9ccece79789260bf69ca8b
+DIST RedCloth-4.3.4.tar.gz 93256 BLAKE2B d18146010b506ad6bbe78d28578bd7543c67c3c4ad001f0ccc4aa2bf791957283602282a0cc651d0454d02e84594b8df6e82cfbddd525805d5fb7636732108b0 SHA512 f6ec16056b60c3469e628558dbe4a9412f7338c57fc9bf70064946d532def1e3220686e5f726ed9d7e44c9ee902623a3e2ed625d483ff0e9b40ab0624c977cea
diff --git a/dev-ruby/redcloth/files/redcloth-4.3.2-cve-2023-31606-1.patch b/dev-ruby/redcloth/files/redcloth-4.3.2-cve-2023-31606-1.patch
new file mode 100644
index 000000000000..f5de833dafb3
--- /dev/null
+++ b/dev-ruby/redcloth/files/redcloth-4.3.2-cve-2023-31606-1.patch
@@ -0,0 +1,22 @@
+From 8d3b5c730596d254d0bbcfbab52f4158f03397b3 Mon Sep 17 00:00:00 2001
+From: Kornelius Kalnbach <murphy@rubychan.de>
+Date: Wed, 28 Jun 2023 17:24:55 +0200
+Subject: [PATCH] make regex faster with Atomic Grouping
+
+---
+ lib/redcloth/formatters/html.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/redcloth/formatters/html.rb b/lib/redcloth/formatters/html.rb
+index b241c99..aaeae34 100644
+--- a/lib/redcloth/formatters/html.rb
++++ b/lib/redcloth/formatters/html.rb
+@@ -324,7 +324,7 @@ def before_transform(text)
+   # Clean unauthorized tags.
+   def clean_html( text, allowed_tags = BASIC_TAGS )
+     text.gsub!( /<!\[CDATA\[/, '' )
+-    text.gsub!( /<(\/*)([A-Za-z]\w*)([^>]*?)(\s?\/?)>/ ) do |m|
++    text.gsub!( /<(\/*)(?>[A-Za-z]\w*)([^>]*?)(\s?\/?)>/ ) do |m|
+       raw = $~
+       tag = raw[2].downcase
+       if allowed_tags.has_key? tag
diff --git a/dev-ruby/redcloth/files/redcloth-4.3.2-cve-2023-31606-2.patch b/dev-ruby/redcloth/files/redcloth-4.3.2-cve-2023-31606-2.patch
new file mode 100644
index 000000000000..fd8de28f0e71
--- /dev/null
+++ b/dev-ruby/redcloth/files/redcloth-4.3.2-cve-2023-31606-2.patch
@@ -0,0 +1,22 @@
+From 7429f32bdac4fccf9f5ab702afc9c47092a7b3df Mon Sep 17 00:00:00 2001
+From: Kornelius Kalnbach <murphy@rubychan.de>
+Date: Thu, 29 Jun 2023 00:31:50 +0200
+Subject: [PATCH] simplify fix
+
+---
+ lib/redcloth/formatters/html.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/redcloth/formatters/html.rb b/lib/redcloth/formatters/html.rb
+index aaeae34..396c2d0 100644
+--- a/lib/redcloth/formatters/html.rb
++++ b/lib/redcloth/formatters/html.rb
+@@ -324,7 +324,7 @@ def before_transform(text)
+   # Clean unauthorized tags.
+   def clean_html( text, allowed_tags = BASIC_TAGS )
+     text.gsub!( /<!\[CDATA\[/, '' )
+-    text.gsub!( /<(\/*)(?>[A-Za-z]\w*)([^>]*?)(\s?\/?)>/ ) do |m|
++    text.gsub!( /<(\/*)([A-Za-z]\w*+)([^>]*?)(\s?\/?)>/ ) do |m|
+       raw = $~
+       tag = raw[2].downcase
+       if allowed_tags.has_key? tag
diff --git a/dev-ruby/redcloth/redcloth-4.3.2-r1.ebuild b/dev-ruby/redcloth/redcloth-4.3.2-r1.ebuild
deleted file mode 100644
index bea03847125b..000000000000
--- a/dev-ruby/redcloth/redcloth-4.3.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_NAME="RedCloth"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGELOG"
-
-RUBY_FAKEGEM_REQUIRE_PATHS="lib/case_sensitive_require"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="A module for using Textile in Ruby"
-HOMEPAGE="http://redcloth.org/"
-
-GITHUB_USER=jgarber
-SRC_URI="https://github.com/${GITHUB_USER}/redcloth/archive/v${PV}.tar.gz -> ${RUBY_FAKEGEM_NAME}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-PATCHES=( "${FILESDIR}/${P}-load-documents.patch" )
-
-ruby_add_bdepend "
-	>=dev-ruby/rake-0.8.7
-	>=dev-ruby/rake-compiler-0.7.1
-	test? ( >=dev-ruby/diff-lcs-1.1.2 )"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-
-	# Export the VERBOSE variable to avoid remapping of stdout and
-	# stderr, and that breaks because of bad interactions between
-	# echoe, Ruby and Gentoo.
-	export VERBOSE=1
-}
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile ${PN}.gemspec || die
-	rm -f tasks/{release,rspec,rvm}.rake || die
-}
-
-each_ruby_compile() {
-	# We cannot run this manually easily, because Ragel re-generation
-	# is a mess
-	${RUBY} -S rake compile || die "rake compile failed"
-}
diff --git a/dev-ruby/redcloth/redcloth-4.3.2-r4.ebuild b/dev-ruby/redcloth/redcloth-4.3.2-r4.ebuild
deleted file mode 100644
index e0439e6d1669..000000000000
--- a/dev-ruby/redcloth/redcloth-4.3.2-r4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_NAME="RedCloth"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGELOG"
-
-RUBY_FAKEGEM_REQUIRE_PATHS="lib/case_sensitive_require"
-
-RUBY_FAKEGEM_GEMSPEC=redcloth.gemspec
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/redcloth_scan/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="A module for using Textile in Ruby"
-HOMEPAGE="http://redcloth.org/"
-
-GITHUB_USER=jgarber
-SRC_URI="https://github.com/${GITHUB_USER}/redcloth/archive/v${PV}.tar.gz -> ${RUBY_FAKEGEM_NAME}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-PATCHES=( "${FILESDIR}/${P}-load-documents.patch" )
-
-ruby_add_bdepend "
-	>=dev-ruby/rake-0.8.7
-	>=dev-ruby/rake-compiler-0.7.1
-	test? ( >=dev-ruby/diff-lcs-1.1.2 )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile ${PN}.gemspec || die
-	rm -f tasks/{release,rspec,rvm}.rake || die
-
-	# Fix version
-	sed -i -e '/TINY/ s/1/2/' lib/redcloth/version.rb || die
-}
-
-each_ruby_prepare() {
-	${RUBY} -S rake ext/redcloth_scan/extconf.rb || die
-}
diff --git a/dev-ruby/redcloth/redcloth-4.3.2-r5.ebuild b/dev-ruby/redcloth/redcloth-4.3.2-r5.ebuild
new file mode 100644
index 000000000000..ffd15f954018
--- /dev/null
+++ b/dev-ruby/redcloth/redcloth-4.3.2-r5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_NAME="RedCloth"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGELOG"
+
+RUBY_FAKEGEM_REQUIRE_PATHS="lib/case_sensitive_require"
+
+RUBY_FAKEGEM_GEMSPEC=redcloth.gemspec
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/redcloth_scan/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="A module for using Textile in Ruby"
+HOMEPAGE="https://github.com/jgarber/redcloth"
+SRC_URI="https://github.com/jgarber/redcloth/archive/v${PV}.tar.gz -> ${RUBY_FAKEGEM_NAME}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+PATCHES=(
+	"${FILESDIR}/${P}-load-documents.patch"
+	"${FILESDIR}/${P}-cve-2023-31606-1.patch"
+	"${FILESDIR}/${P}-cve-2023-31606-2.patch"
+)
+
+ruby_add_bdepend "
+	>=dev-ruby/rake-0.8.7
+	>=dev-ruby/rake-compiler-0.7.1
+	test? ( >=dev-ruby/diff-lcs-1.1.2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile ${PN}.gemspec || die
+	rm -f tasks/{release,rspec,rvm}.rake || die
+
+	# Fix version
+	sed -i -e '/TINY/ s/1/2/' lib/redcloth/version.rb || die
+}
+
+each_ruby_prepare() {
+	${RUBY} -S rake ext/redcloth_scan/extconf.rb || die
+}
diff --git a/dev-ruby/redcloth/redcloth-4.3.3.ebuild b/dev-ruby/redcloth/redcloth-4.3.3.ebuild
new file mode 100644
index 000000000000..719391936535
--- /dev/null
+++ b/dev-ruby/redcloth/redcloth-4.3.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_NAME="RedCloth"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGELOG"
+
+RUBY_FAKEGEM_REQUIRE_PATHS="lib/case_sensitive_require"
+
+RUBY_FAKEGEM_GEMSPEC=redcloth.gemspec
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/redcloth_scan/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="A module for using Textile in Ruby"
+HOMEPAGE="https://github.com/jgarber/redcloth"
+SRC_URI="https://github.com/jgarber/redcloth/archive/v${PV}.tar.gz -> ${RUBY_FAKEGEM_NAME}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "
+	>=dev-ruby/rake-0.8.7
+	>=dev-ruby/rake-compiler-0.7.1
+	test? ( >=dev-ruby/diff-lcs-1.1.2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile ${PN}.gemspec || die
+	rm -f tasks/{release,rspec,rvm}.rake || die
+
+	# Fix version
+	sed -i -e '/TINY/ s/1/2/' lib/redcloth/version.rb || die
+}
+
+each_ruby_prepare() {
+	${RUBY} -S rake ext/redcloth_scan/extconf.rb || die
+}
diff --git a/dev-ruby/redcloth/redcloth-4.3.4.ebuild b/dev-ruby/redcloth/redcloth-4.3.4.ebuild
new file mode 100644
index 000000000000..719391936535
--- /dev/null
+++ b/dev-ruby/redcloth/redcloth-4.3.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_NAME="RedCloth"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGELOG"
+
+RUBY_FAKEGEM_REQUIRE_PATHS="lib/case_sensitive_require"
+
+RUBY_FAKEGEM_GEMSPEC=redcloth.gemspec
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/redcloth_scan/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="A module for using Textile in Ruby"
+HOMEPAGE="https://github.com/jgarber/redcloth"
+SRC_URI="https://github.com/jgarber/redcloth/archive/v${PV}.tar.gz -> ${RUBY_FAKEGEM_NAME}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "
+	>=dev-ruby/rake-0.8.7
+	>=dev-ruby/rake-compiler-0.7.1
+	test? ( >=dev-ruby/diff-lcs-1.1.2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile ${PN}.gemspec || die
+	rm -f tasks/{release,rspec,rvm}.rake || die
+
+	# Fix version
+	sed -i -e '/TINY/ s/1/2/' lib/redcloth/version.rb || die
+}
+
+each_ruby_prepare() {
+	${RUBY} -S rake ext/redcloth_scan/extconf.rb || die
+}
diff --git a/dev-ruby/redis/Manifest b/dev-ruby/redis/Manifest
index a2b3ac6d0de1..8ab85f36947a 100644
--- a/dev-ruby/redis/Manifest
+++ b/dev-ruby/redis/Manifest
@@ -1 +1 @@
-DIST redis-rb-4.1.4.tar.gz 125556 BLAKE2B c1a9e7a365bb12c4aaacfdaff776e370c715a594a05c4270c2dfe85bdc540e915f797fbfa1dc87e10fb03faa56ff572b7e24f7a1244166ea1e1b611900bf22bb SHA512 6c12a75832e8493891ba50ca452960b5748593334287a93c40f117b0e522d483ca0af9a6510271c19f306dfb89a71dd9a7d02c1c8ad3ad82e1d4b31f0b51adad
+DIST redis-rb-4.8.0.tar.gz 143136 BLAKE2B 6d70985d5e2a749b931e5bf1f74f04d1e748a9b65cc1b1e644d9ecfa633978bef9c6418308425b6996779ff65fbbb66cacbf464cdf6d00e2736b20089aa0889c SHA512 e9d454d0416091d0c5629b6ed826e70879ea2f93501bae7db19570bfbf4bdae2ed36b357390afcfca427531d997acc7f5ae004d55d0e87ddb67c909db2b181d5
diff --git a/dev-ruby/redis/files/redis-4.1.4-local-redis-server.patch b/dev-ruby/redis/files/redis-4.1.4-local-redis-server.patch
deleted file mode 100644
index b9db61a0a6a7..000000000000
--- a/dev-ruby/redis/files/redis-4.1.4-local-redis-server.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/makefile	2019-06-29 08:02:02.519804948 +0200
-+++ b/makefile	2019-06-29 08:03:43.125559643 +0200
-@@ -1,16 +1,15 @@
- REDIS_BRANCH       ?= 5.0
--TMP                := tmp
- BUILD_DIR          := ${TMP}/cache/redis-${REDIS_BRANCH}
- TARBALL            := ${TMP}/redis-${REDIS_BRANCH}.tar.gz
--BINARY             := ${BUILD_DIR}/src/redis-server
--REDIS_CLIENT       := ${BUILD_DIR}/src/redis-cli
-+BINARY             := /usr/sbin/redis-server
-+REDIS_CLIENT       := /usr/bin/redis-cli
- REDIS_TRIB         := ${BUILD_DIR}/src/redis-trib.rb
--PID_PATH           := ${BUILD_DIR}/redis.pid
--SOCKET_PATH        := ${BUILD_DIR}/redis.sock
-+PID_PATH           := ${TMP}/redis.pid
-+SOCKET_PATH        := ${TMP}/redis.sock
- PORT               := 6381
- SLAVE_PORT         := 6382
--SLAVE_PID_PATH     := ${BUILD_DIR}/redis_slave.pid
--SLAVE_SOCKET_PATH  := ${BUILD_DIR}/redis_slave.sock
-+SLAVE_PID_PATH     := ${TMP}/redis_slave.pid
-+SLAVE_SOCKET_PATH  := ${TMP}/redis_slave.sock
- SENTINEL_PORTS     := 6400 6401 6402
- SENTINEL_PID_PATHS := $(addprefix ${TMP}/redis,$(addsuffix .pid,${SENTINEL_PORTS}))
- CLUSTER_PORTS      := 7000 7001 7002 7003 7004 7005
-@@ -43,11 +43,11 @@
- ${TMP}:
- 	@mkdir -p $@
- 
--${BINARY}: ${TMP}
--	@bin/build ${REDIS_BRANCH} $<
-+#${BINARY}: ${TMP}
-+#	@bin/build ${REDIS_BRANCH} $<
- 
- test: 
--	@env SOCKET_PATH=${SOCKET_PATH} bundle exec rake test
-+	@env SOCKET_PATH=${SOCKET_PATH} ${RUBY} -S rake test
- 
- stop:
- 	@$(call kill-redis,${PID_PATH})
diff --git a/dev-ruby/redis/files/redis-4.8.0-local-redis-server.patch b/dev-ruby/redis/files/redis-4.8.0-local-redis-server.patch
new file mode 100644
index 000000000000..faf382ac5aee
--- /dev/null
+++ b/dev-ruby/redis/files/redis-4.8.0-local-redis-server.patch
@@ -0,0 +1,49 @@
+Gentoo specific patch adapted from redis-4.7.1-local-redis-server.patch
+
+diff --git a/makefile b/makefile
+index df25e4b..57bc941 100644
+--- a/makefile
++++ b/makefile
+@@ -1,18 +1,17 @@
+ REDIS_BRANCH       ?= 7.0
+ ROOT_DIR           :=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+-TMP                := tmp
+ CONF               := ${ROOT_DIR}/test/support/conf/redis-${REDIS_BRANCH}.conf
+ BUILD_DIR          := ${TMP}/cache/redis-${REDIS_BRANCH}
+ TARBALL            := ${TMP}/redis-${REDIS_BRANCH}.tar.gz
+-BINARY             := ${BUILD_DIR}/src/redis-server
+-REDIS_CLIENT       := ${BUILD_DIR}/src/redis-cli
++BINARY             := /usr/sbin/redis-server
++REDIS_CLIENT       := /usr/bin/redis-cli
+ REDIS_TRIB         := ${BUILD_DIR}/src/redis-trib.rb
+-PID_PATH           := ${BUILD_DIR}/redis.pid
++PID_PATH           := ${TMP}/redis.pid
+ SOCKET_PATH        := ${TMP}/redis.sock
+ PORT               := 6381
+ SLAVE_PORT         := 6382
+-SLAVE_PID_PATH     := ${BUILD_DIR}/redis_slave.pid
+-SLAVE_SOCKET_PATH  := ${BUILD_DIR}/redis_slave.sock
++SLAVE_PID_PATH     := ${TMP}/redis_slave.pid
++SLAVE_SOCKET_PATH  := ${TMP}/redis_slave.sock
+ HA_GROUP_NAME      := master1
+ SENTINEL_PORTS     := 6400 6401 6402
+ SENTINEL_PID_PATHS := $(addprefix ${TMP}/redis,$(addsuffix .pid,${SENTINEL_PORTS}))
+@@ -31,14 +30,8 @@ start_all: start start_slave start_sentinel wait_for_sentinel start_cluster crea
+ 
+ stop_all: stop_sentinel stop_slave stop stop_cluster
+ 
+-${TMP}:
+-	@mkdir -p $@
+-
+-${BINARY}: ${TMP}
+-	@bin/build ${REDIS_BRANCH} $<
+-
+ test:
+-	@env REDIS_SOCKET_PATH=${SOCKET_PATH} bundle exec rake test
++	@env REDIS_SOCKET_PATH=${SOCKET_PATH} ${RUBY} -S rake test
+ 
+ stop:
+ 	@$(call kill-redis,${PID_PATH});\
+-- 
+2.35.1
+
diff --git a/dev-ruby/redis/redis-4.1.4.ebuild b/dev-ruby/redis/redis-4.1.4.ebuild
deleted file mode 100644
index 18843a889001..000000000000
--- a/dev-ruby/redis/redis-4.1.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-MY_P="redis-rb-${PV}"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="redis.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby client library for Redis"
-HOMEPAGE="https://github.com/redis/redis-rb"
-SRC_URI="https://github.com/redis/redis-rb/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm64"
-IUSE="doc test"
-
-DEPEND="test? ( =dev-db/redis-5* )"
-
-RUBY_S="${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-4.1.4-local-redis-server.patch" )
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	# call me impatient, but this way we don't need netcat
-	sed -i \
-		-e '/test_subscribe_past_a_timeout/,+18d' \
-		test/publish_subscribe_test.rb || die "sed failed"
-
-	sed -i -e 's/git ls-files --/echo/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/test_connection_timeout/askip "requires network"' test/internals_test.rb || die
-
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	RUBY=${RUBY} TMP=${T} MT_NO_PLUGINS=true emake -j1 all
-	einfo "Wait 5 seconds for servers to stop"
-	sleep 5
-}
diff --git a/dev-ruby/redis/redis-4.8.0.ebuild b/dev-ruby/redis/redis-4.8.0.ebuild
new file mode 100644
index 000000000000..7a131619ca89
--- /dev/null
+++ b/dev-ruby/redis/redis-4.8.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+MY_P="redis-rb-${PV}"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="redis.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby client library for Redis"
+HOMEPAGE="https://github.com/redis/redis-rb"
+SRC_URI="https://github.com/redis/redis-rb/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm64"
+IUSE="doc test"
+
+DEPEND="test? ( >=dev-db/redis-7 )"
+
+RUBY_S="${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.8.0-local-redis-server.patch" )
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files --/echo/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/test_connection_timeout/askip "requires network"' test/redis/internals_test.rb || die
+
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	RUBY=${RUBY} TMP=${T} MT_NO_PLUGINS=true VERBOSE=true emake -j1 all
+	einfo "Wait 5 seconds for servers to stop"
+	sleep 5
+}
diff --git a/dev-ruby/ref/ref-2.0.0-r1.ebuild b/dev-ruby/ref/ref-2.0.0-r1.ebuild
index 14a1786924b8..d728b0a9e178 100644
--- a/dev-ruby/ref/ref-2.0.0-r1.ebuild
+++ b/dev-ruby/ref/ref-2.0.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="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index 7a34d1cefca1..633178f00ce0 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -1,5 +1,3 @@
-DIST regexp_parser-0.5.0.tar.gz 80554 BLAKE2B 7890e6850e3ffbb927c5e72430ab29e6aeec4f8684eb56f4153414aca62702faa57f48887618e84b1d087e2ba366ec9d6b2e92200cc34472b7bbb5a8b0043415 SHA512 0d1c43fda01077b9b3d9c28ce9cb01772f10817e42d9c0ff28e6ea5cd059ad4869b940498c6a4e77d4fc6acb6ac0aba293ae67dd012650cdb58989b90868be16
-DIST regexp_parser-1.8.2.tar.gz 85592 BLAKE2B 55333dbf59606d1f203c84cc3e712ddba9551be492745f2a0ce9ca8ba56e9a6eb1aee0c9d3d5079114c65747746f6ef4df3cbbf5a917562f413ca3426fd16efc SHA512 8192ee4334d2da13af5552eccd4fed82b24ed57489e3e0d8d083e8cf72e52fa185c2e007e9adf1ec6e59b0cf4e4055eb8def28d5cc94cc7a9ab7981d14f8e727
-DIST regexp_parser-2.2.1.tar.gz 90169 BLAKE2B dcfa392bc5dc9e08816b3a2e401744c775a8a5c60067c410d195d60ef155eba287b31243e70677f018e3d751b371a8878933a5e34c4bd5b00cef3bf1b266c00a SHA512 a3a6fbd36e980eaf5f14d0c98c2680aed700b01c7941fbc4e406e14992e432b3ce1510a8be9ef7964ddf0ab85c55b556206cdea36a336de98e6956942b4ff726
-DIST regexp_parser-2.3.1.tar.gz 92120 BLAKE2B e4dc8d3d38a260be0d21812703380af418ea6b87c1fff66048111e2d5295b04589cf3d838f3e9eb330f300c7b49c8ccb18867c6fac41e55c0c623cc0206d2c85 SHA512 3f2502afaaeeffe6738c0fa83717f93af22de8704a1ce3cfdae910be287a6bbbab5dcd80d9ce7fb840acabea8d55a0cb06bca1696820f5e568b75c96360c3895
-DIST regexp_parser-2.4.0.tar.gz 93162 BLAKE2B cab80ca22b1f34d60a47f7bb3f671e2a7af46b598250a0d1f85049b5b682800badf82c7f0cfc676808999d4128bd8b8a6d2bd073d8a771ee7c07253f1e24e5ce SHA512 cd7a9d5d3d4882753b47a8369a807b3c6d943e36a66d0001d51d5d37d19a46c2ba078217d95952f1dc7c7434699a35bbd6414cd45264db08a0173f887a8d4826
+DIST regexp_parser-2.8.2.tar.gz 102450 BLAKE2B ff932e91dfa01226e4b528f5d4bd9aeb42a04f52fe067879d54c05bbdad8dd26ab442e64e9f439d0466a4654057805f0073463f7498929205030eed940bf9afd SHA512 78a76fe3d049e840f8539ad013c682c58f6cac11305579a8e11601f20d4cd7f6a4de86e4da16109b6f95fd86c084ddf02ed67e6fe706fb8f023ec535c0944e30
+DIST regexp_parser-2.8.3.tar.gz 102631 BLAKE2B 667a1bfb5cb71d84868d851686cda5601cebaceeea57e53cdd00cef59b7f78cf7c4051019e48367c9f053fb175079802c05ac0ac76e0fcc0273c811ccfadb107 SHA512 cb818d30387acf4604370ed7ada928e59bf2714905b1252e7a29a3b3cf3b53ef1c0fec53b9ec262716c872ca330f556f7beb28d75a043fc9b2343e76b80e5a38
+DIST regexp_parser-2.9.0.tar.gz 103509 BLAKE2B 722dec7d2d98ee2773b0c109195e20e154fbbd7c2b8fb737a35e85c138e3372407c36c9e488f199345acb84d20768a71ced7334aa76fb09ee329f83e088a301b SHA512 e6c1cb75f90e23e8c43d0c53a4aa185b0f4dcc2e02d6c4e334fd9e5aadb875cf79966934b4c7e3a13fe16f9b1fa069d39ef90b307da731eb634bed27d0a1ba4d
diff --git a/dev-ruby/regexp_parser/regexp_parser-0.5.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-0.5.0.ebuild
deleted file mode 100644
index b111089f9cf3..000000000000
--- a/dev-ruby/regexp_parser/regexp_parser-0.5.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
-HOMEPAGE="https://github.com/ammar/regexp_parser"
-SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-	sed -i -e '1irequire "delegate"' test/support/warning_extractor.rb || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake ragel:rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib bin/test || die
-}
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild b/dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
deleted file mode 100644
index 58632b95a870..000000000000
--- a/dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:full"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
-HOMEPAGE="https://github.com/ammar/regexp_parser"
-SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "dev-ruby/rake
-	test? ( dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake ragel:rb || die
-}
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.2.1.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.2.1.ebuild
deleted file mode 100644
index 44e9c4376318..000000000000
--- a/dev-ruby/regexp_parser/regexp_parser-2.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
-HOMEPAGE="https://github.com/ammar/regexp_parser"
-SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "dev-ruby/rake
-	test? ( dev-ruby/ice_nine dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake ragel:rb || die
-}
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.3.1.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.3.1.ebuild
deleted file mode 100644
index 6f59b303702a..000000000000
--- a/dev-ruby/regexp_parser/regexp_parser-2.3.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
-HOMEPAGE="https://github.com/ammar/regexp_parser"
-SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "dev-ruby/rake dev-ruby/rspec:3
-	test? ( dev-ruby/ice_nine dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake ragel:rb || die
-}
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.4.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.4.0.ebuild
deleted file mode 100644
index 6f59b303702a..000000000000
--- a/dev-ruby/regexp_parser/regexp_parser-2.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
-HOMEPAGE="https://github.com/ammar/regexp_parser"
-SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "dev-ruby/rake dev-ruby/rspec:3
-	test? ( dev-ruby/ice_nine dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake ragel:rb || die
-}
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.8.2.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.8.2.ebuild
new file mode 100644
index 000000000000..6a1a5443fa90
--- /dev/null
+++ b/dev-ruby/regexp_parser/regexp_parser-2.8.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
+HOMEPAGE="https://github.com/ammar/regexp_parser"
+SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "dev-ruby/rake dev-ruby/rspec:3
+	test? ( dev-ruby/leto:2 dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_compile() {
+	CI=true ${RUBY} -S rake ragel:rb || die
+}
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.8.3.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.8.3.ebuild
new file mode 100644
index 000000000000..e3cde62471a5
--- /dev/null
+++ b/dev-ruby/regexp_parser/regexp_parser-2.8.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
+HOMEPAGE="https://github.com/ammar/regexp_parser"
+SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "dev-ruby/rake dev-ruby/rspec:3
+	test? ( dev-ruby/leto:2 dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_compile() {
+	CI=true ${RUBY} -S rake ragel:rb || die
+}
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.9.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.9.0.ebuild
new file mode 100644
index 000000000000..24715aaf7a43
--- /dev/null
+++ b/dev-ruby/regexp_parser/regexp_parser-2.9.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
+HOMEPAGE="https://github.com/ammar/regexp_parser"
+SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "dev-ruby/rake dev-ruby/rspec:3
+	test? ( dev-ruby/leto:2 dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_compile() {
+	CI=true ${RUBY} -S rake ragel:rb || die
+}
diff --git a/dev-ruby/regexp_property_values/Manifest b/dev-ruby/regexp_property_values/Manifest
index 4b58dfc09204..f4fb3307ca6c 100644
--- a/dev-ruby/regexp_property_values/Manifest
+++ b/dev-ruby/regexp_property_values/Manifest
@@ -1,2 +1,2 @@
-DIST regexp_property_values-1.2.0.tar.gz 13713 BLAKE2B eaf96fea2fcaca3156f87271f772e03c07c447e7876333b7fa3f11f9bbf267d3e93d69c17601e8fa35004aa8fdb35b05829490ba86906fc4b460281ed29da561 SHA512 01add1c7ededb8a48b42d3c24b5de6d539774656bd59b666e6088b20a495e1936b547ec903678bbb8e49af35f7c72e3dbd35a7750ecba91a04c751d5900bed8a
-DIST regexp_property_values-1.3.0.tar.gz 13626 BLAKE2B 795446b5a51ef59085b73b38211b67b8eadcc51d3707fc69a78e7540fabab0cf1bcf49ce2358c5273006939fe722538f7e4eb02f3f47b1b8de49d232496a1ec1 SHA512 d5195e2e898478696527e266b05b39704aa55cf8d46d6dfe76985064484e5bdbb5c362552a960f6347a00efaed46eaaa0bcef9daf869fd476aea959a035dd98f
+DIST regexp_property_values-1.4.0.tar.gz 13719 BLAKE2B e0569e5387d5186829e40a8fdeec1fbd8534356ec73cce5525b6259938534fe8d1e3a15664faa7903a93e5a7330e6cbc6281b79be74cd4d1b13865084e1f42a4 SHA512 f8b425f001f4b9f6b373d9b47d7b87baf369719c2ae1385d68932f31d0a392086d3ed8b48461cbf59568668722975a98935c56fa470ce7ba466c29a30442bf6e
+DIST regexp_property_values-1.5.1.tar.gz 13901 BLAKE2B 32236b67ff4fc932fc30638a8fc85745d2c74445d4009c06de94652b82238599dd90e73d9ebd63690604fd1c3d413cddba3290a732150726126dcd3361f5eb47 SHA512 0787105195c22cfb499d37e5a2adb7ca52d23d291280ed9b5dcc38e6b03d260e341bdf56ba1bf643cc6cdf9436fe2287e5f139cdbd11cf4c71da256767f75754
diff --git a/dev-ruby/regexp_property_values/metadata.xml b/dev-ruby/regexp_property_values/metadata.xml
index 658c72b1920d..aa236c49ae4b 100644
--- a/dev-ruby/regexp_property_values/metadata.xml
+++ b/dev-ruby/regexp_property_values/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">jaynetics/regexp_property_values</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/regexp_property_values/regexp_property_values-1.2.0.ebuild b/dev-ruby/regexp_property_values/regexp_property_values-1.2.0.ebuild
deleted file mode 100644
index a001af267c87..000000000000
--- a/dev-ruby/regexp_property_values/regexp_property_values-1.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/regexp_property_values/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/regexp_property_values"
-
-inherit ruby-fakegem
-
-DESCRIPTION="See which property values are supported by the regular expression engine"
-HOMEPAGE="https://github.com/janosch-x/regexp_property_values"
-SRC_URI="https://github.com/janosch-x/regexp_property_values/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid dependency on character_set which would lead to circular
-	# dependencies.
-	sed -i -e '/returns a CharacterSet/askip "gentoo circular dependencies"' spec/regexp_property_values/value_spec.rb || die
-}
diff --git a/dev-ruby/regexp_property_values/regexp_property_values-1.3.0.ebuild b/dev-ruby/regexp_property_values/regexp_property_values-1.3.0.ebuild
deleted file mode 100644
index 0f060d480bce..000000000000
--- a/dev-ruby/regexp_property_values/regexp_property_values-1.3.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/regexp_property_values/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/regexp_property_values"
-
-inherit ruby-fakegem
-
-DESCRIPTION="See which property values are supported by the regular expression engine"
-HOMEPAGE="https://github.com/janosch-x/regexp_property_values"
-SRC_URI="https://github.com/janosch-x/regexp_property_values/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid dependency on character_set which would lead to circular
-	# dependencies.
-	sed -i -e '/returns a CharacterSet/askip "gentoo circular dependencies"' spec/regexp_property_values/value_spec.rb || die
-}
diff --git a/dev-ruby/regexp_property_values/regexp_property_values-1.4.0.ebuild b/dev-ruby/regexp_property_values/regexp_property_values-1.4.0.ebuild
new file mode 100644
index 000000000000..0de77ef85071
--- /dev/null
+++ b/dev-ruby/regexp_property_values/regexp_property_values-1.4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/regexp_property_values/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/regexp_property_values"
+
+inherit ruby-fakegem
+
+DESCRIPTION="See which property values are supported by the regular expression engine"
+HOMEPAGE="https://github.com/jaynetics/regexp_property_values"
+SRC_URI="https://github.com/jaynetics/regexp_property_values/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid dependency on character_set which would lead to circular
+	# dependencies.
+	sed -e '/returns a CharacterSet/askip "gentoo circular dependencies"' \
+		-i spec/regexp_property_values/value_spec.rb || die
+}
diff --git a/dev-ruby/regexp_property_values/regexp_property_values-1.5.1.ebuild b/dev-ruby/regexp_property_values/regexp_property_values-1.5.1.ebuild
new file mode 100644
index 000000000000..dd0be2885d42
--- /dev/null
+++ b/dev-ruby/regexp_property_values/regexp_property_values-1.5.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/regexp_property_values/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/regexp_property_values"
+
+inherit ruby-fakegem
+
+DESCRIPTION="See which property values are supported by the regular expression engine"
+HOMEPAGE="https://github.com/jaynetics/regexp_property_values"
+SRC_URI="https://github.com/jaynetics/regexp_property_values/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid dependency on character_set which would lead to circular
+	# dependencies.
+	sed -e '/returns a CharacterSet/askip "gentoo circular dependencies"' \
+		-i spec/regexp_property_values/value_spec.rb || die
+}
diff --git a/dev-ruby/reline/Manifest b/dev-ruby/reline/Manifest
new file mode 100644
index 000000000000..37ffa1b48216
--- /dev/null
+++ b/dev-ruby/reline/Manifest
@@ -0,0 +1,4 @@
+DIST reline-0.4.3.tar.gz 93606 BLAKE2B 9faf8e2db40e75285163a6b8d587198b96faa67284b276e2a96d03b074d2f1abed01aa49a770bad96e066d0d6214319fb84b09a07754b93e2298896641babd73 SHA512 7a6c054dd187ed804ea730845af1eaace094d25e5fc5a9c02395e3886f493a79922cb624dd16d9000f193baf2d3cb147a57737235b289e1382a92e34c59d7dfe
+DIST reline-0.5.0.tar.gz 88882 BLAKE2B 822c8b4d73fee5545c8b6e6ad0a7f4e3ecf0c67f6493835f47b7cf2c3d653296463cd3cd0f085d182cd5c2ab33551a125bcfc048bb288e602b812ec921de2e9a SHA512 ff988a5007385d50c4f29403be2f85d3a3d559121b4ffc0bffd697b061efcaaa49e1bdaa36bd3b505a8f3cdfacd4b4198f3dd84e0d91014b56deec34a66bd153
+DIST reline-0.5.1.tar.gz 89528 BLAKE2B 24a7747abacdc1c9fbf95b31b1981c63f9eed1b3c701d938127d0b3a09212f05e6849722f77efb95a70ad1ebf442d4e0bacb18a01d42a2887f1c70a8a10f96d1 SHA512 0248ab4fac21ac8009c053ed982c943430d4aa899a0b76ccd02fa4f2d1e4174c29dd1d6176a002bf12d838399e30db681b205ae74c74e8a5139ce098641a9c69
+DIST reline-0.5.2.tar.gz 90163 BLAKE2B 12ff435da396a19e62b8ba972568c39697ff7024fe5deeb209958cf85b5a7a8fd3986eff2f6f66282af23997566955b195a354a875efe6a77350f8b103dd9aef SHA512 bd8722e524333ab84c12c97c3e335a075f36379301b9c35a52f459ff55a853f779218ec24d691dc0a1eea1525693b18c49053b13eb79a8db903905659735bb74
diff --git a/dev-ruby/reline/metadata.xml b/dev-ruby/reline/metadata.xml
new file mode 100644
index 000000000000..1ca926c896fd
--- /dev/null
+++ b/dev-ruby/reline/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/reline</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/reline/reline-0.4.3.ebuild b/dev-ruby/reline/reline-0.4.3.ebuild
new file mode 100644
index 000000000000..a779c43093ce
--- /dev/null
+++ b/dev-ruby/reline/reline-0.4.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md doc/reline/face.md"
+RUBY_FAKEGEM_GEMSPEC="reline.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Alternative readline implementation in pure Ruby"
+HOMEPAGE="https://github.com/ruby/reline"
+SRC_URI="https://github.com/ruby/reline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+ruby_add_rdepend ">=dev-ruby/io-console-0.5.0:0"
+
+all_ruby_prepare() {
+	sed -e "s:_relative ':'./:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test/reline -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/reline/reline-0.5.0.ebuild b/dev-ruby/reline/reline-0.5.0.ebuild
new file mode 100644
index 000000000000..a779c43093ce
--- /dev/null
+++ b/dev-ruby/reline/reline-0.5.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md doc/reline/face.md"
+RUBY_FAKEGEM_GEMSPEC="reline.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Alternative readline implementation in pure Ruby"
+HOMEPAGE="https://github.com/ruby/reline"
+SRC_URI="https://github.com/ruby/reline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+ruby_add_rdepend ">=dev-ruby/io-console-0.5.0:0"
+
+all_ruby_prepare() {
+	sed -e "s:_relative ':'./:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test/reline -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/reline/reline-0.5.1.ebuild b/dev-ruby/reline/reline-0.5.1.ebuild
new file mode 100644
index 000000000000..a779c43093ce
--- /dev/null
+++ b/dev-ruby/reline/reline-0.5.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md doc/reline/face.md"
+RUBY_FAKEGEM_GEMSPEC="reline.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Alternative readline implementation in pure Ruby"
+HOMEPAGE="https://github.com/ruby/reline"
+SRC_URI="https://github.com/ruby/reline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+ruby_add_rdepend ">=dev-ruby/io-console-0.5.0:0"
+
+all_ruby_prepare() {
+	sed -e "s:_relative ':'./:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test/reline -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/reline/reline-0.5.2.ebuild b/dev-ruby/reline/reline-0.5.2.ebuild
new file mode 100644
index 000000000000..a779c43093ce
--- /dev/null
+++ b/dev-ruby/reline/reline-0.5.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md doc/reline/face.md"
+RUBY_FAKEGEM_GEMSPEC="reline.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Alternative readline implementation in pure Ruby"
+HOMEPAGE="https://github.com/ruby/reline"
+SRC_URI="https://github.com/ruby/reline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+ruby_add_rdepend ">=dev-ruby/io-console-0.5.0:0"
+
+all_ruby_prepare() {
+	sed -e "s:_relative ':'./:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test/reline -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/request_store/Manifest b/dev-ruby/request_store/Manifest
index e957a1218555..a266786179f9 100644
--- a/dev-ruby/request_store/Manifest
+++ b/dev-ruby/request_store/Manifest
@@ -1,2 +1,2 @@
-DIST request_store-1.5.0.gem 9216 BLAKE2B 75dd49c33cfebcf0deef78be1fe054feb7198b42409ec4b339cefdbdd4fc066159bd18ae6db8001edd0fe20e1e8be1021812e6ffd033eed0bd9730603aaa2daf SHA512 c01d4505d2bc0b88456d0bc49416fcbea67da1e2ab6ef0c7fc900fae8856d82157dc39d2e1d2f299000f74b140f6f13d7352f4684e247d103bbaab7b1705910f
 DIST request_store-1.5.1.gem 9728 BLAKE2B df83be1ecdb8b6158133925167df19cff59eab3cdb2ea1b5f970359a19a79dcd114f9c8d42856a1bf0173bb69df8f89efe54c29f5c6a9dd58d4b8bb7ccfa76d2 SHA512 89ba2df4169a23c60546081c5d872c26f09ce6edbb6bfdb9bb03ba3e194ca36b7f588e3f77deaa82ae6465e2ab8c372c9199fd49232ba37bd8e5d0cdcac785f1
+DIST request_store-1.6.0.gem 9728 BLAKE2B a7b4beae76bb7704bd02cd1a64d4e53579b8fab23e70a59dc7f241ca80b86f43c0bc0827ead56320a40a6041ccc61144e15ece26f4897e523eb902f845e2b072 SHA512 7c18d3e7164837ab7e538f5a5e243f24650f70cb801e108381b46da5122217d959371a439b8359dfc39950efcd1941c5d9cde9121fdb3350b16a36e59101338c
diff --git a/dev-ruby/request_store/request_store-1.5.0.ebuild b/dev-ruby/request_store/request_store-1.5.0.ebuild
deleted file mode 100644
index 3a5247cc5319..000000000000
--- a/dev-ruby/request_store/request_store-1.5.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Per-request global storage for Rack"
-HOMEPAGE="https://github.com/steveklabnik/request_store"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rack-1.4:*"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/ s:^:#:" Rakefile || die
-}
diff --git a/dev-ruby/request_store/request_store-1.5.1.ebuild b/dev-ruby/request_store/request_store-1.5.1.ebuild
index 6c6465d9f86e..248253f10206 100644
--- a/dev-ruby/request_store/request_store-1.5.1.ebuild
+++ b/dev-ruby/request_store/request_store-1.5.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"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/request_store/request_store-1.6.0.ebuild b/dev-ruby/request_store/request_store-1.6.0.ebuild
new file mode 100644
index 000000000000..405c3fc00680
--- /dev/null
+++ b/dev-ruby/request_store/request_store-1.6.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Per-request global storage for Rack"
+HOMEPAGE="https://github.com/steveklabnik/request_store"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+ruby_add_rdepend ">=dev-ruby/rack-1.4:*"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/ s:^:#:" Rakefile || die
+}
diff --git a/dev-ruby/rest-client/rest-client-2.1.0-r1.ebuild b/dev-ruby/rest-client/rest-client-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..8ad89ea60d3d
--- /dev/null
+++ b/dev-ruby/rest-client/rest-client-2.1.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="history.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple Simple HTTP and REST client for Ruby"
+HOMEPAGE="https://github.com/rest-client/rest-client"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="amd64 ~arm64 ~ppc ~riscv ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/webmock:3 )"
+
+ruby_add_rdepend "
+	>=dev-ruby/http-accept-1.7.0:1
+	>=dev-ruby/http-cookie-1.0.2:0
+	>=dev-ruby/mime-types-1.16:* <dev-ruby/mime-types-4:*
+	>=dev-ruby/netrc-0.8:0
+"
+
+all_ruby_prepare() {
+	sed -e '/bundler/I s:^:#:' \
+		-e '/namespace :windows/,/^end/ s:^:#:' -i Rakefile || die
+
+	# Remove specs that requires network access.
+	rm spec/integration/{httpbin,request}_spec.rb || die
+
+	# Fix specs confused by ruby30 keyword arguments
+	sed -i -e 's/with(/with({/' -e '/with/ s/)$/})/' spec/unit/resource_spec.rb || die
+	sed -i -e '508 s/1 => 2/{1 => 2}/' spec/unit/request_spec.rb || die
+
+	# Avoid spec where ruby semantics changed with ruby31
+	sed -e '/should reject valid URIs with no hostname/askip "different in ruby30 and ruby31"' \
+		-i spec/unit/request_spec.rb || die
+}
diff --git a/dev-ruby/rest-client/rest-client-2.1.0.ebuild b/dev-ruby/rest-client/rest-client-2.1.0.ebuild
deleted file mode 100644
index 165d50bc2b26..000000000000
--- a/dev-ruby/rest-client/rest-client-2.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="history.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple Simple HTTP and REST client for Ruby"
-HOMEPAGE="https://github.com/rest-client/rest-client"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/webmock:3 )"
-
-ruby_add_rdepend "
-	>=dev-ruby/http-accept-1.7.0:1
-	>=dev-ruby/http-cookie-1.0.2:0
-	>=dev-ruby/mime-types-1.16:* <dev-ruby/mime-types-4:*
-	>=dev-ruby/netrc-0.8:0
-"
-
-all_ruby_prepare() {
-	sed -e '/bundler/I s:^:#:' \
-		-e '/namespace :windows/,/^end/ s:^:#:' -i Rakefile || die
-
-	# Remove specs that requires network access.
-	rm spec/integration/{httpbin,request}_spec.rb || die
-}
diff --git a/dev-ruby/rexical/rexical-1.0.7-r1.ebuild b/dev-ruby/rexical/rexical-1.0.7-r1.ebuild
index b8600afdc55d..a0faf8b5c956 100644
--- a/dev-ruby/rexical/rexical-1.0.7-r1.ebuild
+++ b/dev-ruby/rexical/rexical-1.0.7-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc	DOCUMENTATION.en.rdoc  DOCUMENTATION.ja.rdoc  README.ja  README.rdoc"
 
@@ -13,7 +13,7 @@ DESCRIPTION="Rexical is a lexical scanner generator"
 HOMEPAGE="https://github.com/tenderlove/rexical/tree/master"
 LICENSE="LGPL-2" # plus exception
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rexical/rexical-1.0.7.ebuild b/dev-ruby/rexical/rexical-1.0.7.ebuild
deleted file mode 100644
index e77b7ec191ba..000000000000
--- a/dev-ruby/rexical/rexical-1.0.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc	DOCUMENTATION.en.rdoc  DOCUMENTATION.ja.rdoc  README.ja  README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rexical is a lexical scanner generator"
-HOMEPAGE="https://github.com/tenderlove/rexical/tree/master"
-LICENSE="LGPL-2" # plus exception
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa 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=""
-
-# File collision, bug 459116
-RDEPEND+=" !!app-admin/rex"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/hoe
-		dev-ruby/minitest
-	)"
-
-all_ruby_prepare() {
-	# Avoid dependency on unpackaged rubocop
-	sed -i -e '/test_rubocop_security/askip "not packaged"' test/test_generator.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc sample/*
-}
diff --git a/dev-ruby/rexml/Manifest b/dev-ruby/rexml/Manifest
index 0c14806a161e..f3b992c26447 100644
--- a/dev-ruby/rexml/Manifest
+++ b/dev-ruby/rexml/Manifest
@@ -1 +1 @@
-DIST rexml-3.2.5.tar.gz 447881 BLAKE2B 4b922d51f9331ae17c2deaf3c617fbb6130b111ec0fe27892e524b89f298c3b962e64ab276b71213f3482c0a480b52cf71b3866aacc45fd6de82589baff81354 SHA512 9c62b789988b407bf4b02906768300b256734bfa342ef6b3551428ba2c1792b7e7e5a5480251d7df52318a5e5155757ab1377c0cc8d1d7c33278f33e367a5ca5
+DIST rexml-3.2.6.tar.gz 459069 BLAKE2B 737b4a8836cae8614bc7a8e579f5c141e3d0e2114a6f6084a186795fa2d0a0008a7cb5d5a8c493b3a4204a901a26c617054ef3b93a7ed845b2f3398f5e25f5ca SHA512 bbf278ed25fbf4d814de9df3cbca691ab43d4e502a02b081e894ce82c161b1931d850df54074ef81c9cb470dca10a81c631da7ccbf908401818fca4c9a4aa5c4
diff --git a/dev-ruby/rexml/metadata.xml b/dev-ruby/rexml/metadata.xml
index 7a38fd1850ff..db83ebe51721 100644
--- a/dev-ruby/rexml/metadata.xml
+++ b/dev-ruby/rexml/metadata.xml
@@ -5,4 +5,7 @@
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/rexml</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rexml/rexml-3.2.5-r1.ebuild b/dev-ruby/rexml/rexml-3.2.5-r1.ebuild
deleted file mode 100644
index 7fbbb382746d..000000000000
--- a/dev-ruby/rexml/rexml-3.2.5-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An XML toolkit for Ruby"
-HOMEPAGE="https://github.com/ruby/rexml"
-SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="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"
-SLOT="3"
-
-all_ruby_prepare() {
-	sed -i -e 's:require_relative ":require "./:' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} test/run.rb || die
-}
diff --git a/dev-ruby/rexml/rexml-3.2.5.ebuild b/dev-ruby/rexml/rexml-3.2.5.ebuild
deleted file mode 100644
index c0aaebeb5c0e..000000000000
--- a/dev-ruby/rexml/rexml-3.2.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An XML toolkit for Ruby"
-HOMEPAGE="https://github.com/ruby/rexml"
-SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="3"
-
-all_ruby_prepare() {
-	sed -i -e 's:require_relative ":require "./:' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} test/run.rb || die
-}
diff --git a/dev-ruby/rexml/rexml-3.2.6.ebuild b/dev-ruby/rexml/rexml-3.2.6.ebuild
new file mode 100644
index 000000000000..93593f0bec77
--- /dev/null
+++ b/dev-ruby/rexml/rexml-3.2.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An XML toolkit for Ruby"
+HOMEPAGE="https://github.com/ruby/rexml"
+SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="3"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's:require_relative ":require "./:' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} test/run.rb || die
+}
diff --git a/dev-ruby/rgl/Manifest b/dev-ruby/rgl/Manifest
new file mode 100644
index 000000000000..0c5fad92c402
--- /dev/null
+++ b/dev-ruby/rgl/Manifest
@@ -0,0 +1 @@
+DIST rgl-0.6.6.tar.gz 256889 BLAKE2B 9859541abb49f241d5aa9ed5b16c200abda810b3ac93fb610f000bf023c35a3bbe15dc3e42dc3d070a041ca6f5fbd0c36ef180031667d3bae2c5cb770a9072fc SHA512 71f058b05856e49ea4e13f6cffc356ca730a6a9d3ecb551dba4afa5420491d91770b87a7e37847a4bf2335c6f33fdc38c623c9de5480a51753abf162c741544c
diff --git a/dev-ruby/rgl/metadata.xml b/dev-ruby/rgl/metadata.xml
new file mode 100644
index 000000000000..4f9fdab3efd2
--- /dev/null
+++ b/dev-ruby/rgl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">monora/rgl</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/rgl/rgl-0.6.6.ebuild b/dev-ruby/rgl/rgl-0.6.6.ebuild
new file mode 100644
index 000000000000..3beff03442d9
--- /dev/null
+++ b/dev-ruby/rgl/rgl-0.6.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="rgl.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="RGL is a framework for graph data structures and algorithms"
+HOMEPAGE="https://github.com/monora/rgl"
+SRC_URI="https://github.com/monora/rgl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND+=" test? ( media-gfx/graphviz )"
+
+ruby_add_rdepend "
+	dev-ruby/pairing_heap:0
+	>=dev-ruby/rexml-3.2.4:3
+	>=dev-ruby/stream-0.5.3 =dev-ruby/stream-0.5*
+"
+
+ruby_add_bdepend "dev-ruby/yard test? ( dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/rinku/rinku-2.0.6-r1.ebuild b/dev-ruby/rinku/rinku-2.0.6-r1.ebuild
index 65624155dc1c..e384373cd017 100644
--- a/dev-ruby/rinku/rinku-2.0.6-r1.ebuild
+++ b/dev-ruby/rinku/rinku-2.0.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
 
diff --git a/dev-ruby/ritex/ritex-1.0.1-r1.ebuild b/dev-ruby/ritex/ritex-1.0.1-r1.ebuild
index b7ddb95e158f..0b35e5334ac0 100644
--- a/dev-ruby/ritex/ritex-1.0.1-r1.ebuild
+++ b/dev-ruby/ritex/ritex-1.0.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README ReleaseNotes"
@@ -22,7 +22,9 @@ DEPEND+=" test? ( app-text/itex2mml )"
 
 all_ruby_prepare() {
 	# Fix tests
-	sed -i -e "s#\./itex2MML#/usr/bin/itex2MML#;142d" test/mathml.rb || die
+	sed -e "s#\./itex2MML#/usr/bin/itex2MML#;142d" \
+		-e 's/File.exists/File.exist/' \
+		-i test/mathml.rb || die
 	sed -i -e "12d" test/answer-key.yaml || die
 }
 
diff --git a/dev-ruby/rjb/Manifest b/dev-ruby/rjb/Manifest
index 72aaaa7afa0c..63df550819d0 100644
--- a/dev-ruby/rjb/Manifest
+++ b/dev-ruby/rjb/Manifest
@@ -1,2 +1 @@
-DIST rjb-1.6.4.gem 75264 BLAKE2B a678eb0b57e930bfcc7ea059da8ee6a9319b7e0e5bc632a5b97ec617e77d844491469ebc2366ba4290ee7648b4201f1d34be560e325c6099237d413c9ed8aa46 SHA512 49a0aaeb1a0e945ce373af74e01f33f531e27b205c33a382975125357ee1ceae0bea12d6fc32acb2dd66ce56c6034691520f355688cdaca5d01abff295d1a6c8
-DIST rjb-1.6.5.gem 75264 BLAKE2B 0608e3d2a70fbf909c2be454e71960ae900fadeda936677c290de1b1bfebacd43e9582dea847b3b6ca6c7294c11ff6fce409c1f59c72aea22c3fbc337ca0c590 SHA512 328a2b58eaf4673d5218ae7c87708c115b817f082844893c548a1fab5b544f729d6874cdba4f4fff6443e2fde2370daa8937f729b949c842461a4988033685ac
+DIST rjb-1.6.9.gem 74752 BLAKE2B c8264fd0401044d9099717ae8770a30ce6bdfd12c3acfc2024b21330e3fdb07604bba69600a8808aa179c6459eb2d140e7b5822cbf58c3ea8ce47569bc92463b SHA512 c1ccae10361be881af4a129c0640ced00d00e909442b517150036cd44d5927cf24dc87bc0c30f3703f96955f114e0c0a5ff2d0f5fc555b71ade0f98e6b388426
diff --git a/dev-ruby/rjb/metadata.xml b/dev-ruby/rjb/metadata.xml
index 22048931ef3e..455dc39531ce 100644
--- a/dev-ruby/rjb/metadata.xml
+++ b/dev-ruby/rjb/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zerochaos@gentoo.org</email>
-		<name>Rick Farina</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>
diff --git a/dev-ruby/rjb/rjb-1.6.4-r1.ebuild b/dev-ruby/rjb/rjb-1.6.4-r1.ebuild
deleted file mode 100644
index 3f2663da48e6..000000000000
--- a/dev-ruby/rjb/rjb-1.6.4-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="readme.txt ChangeLog"
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit java-pkg-2 ruby-fakegem
-
-DESCRIPTION="Rjb is a Ruby-Java software bridge"
-HOMEPAGE="https://github.com/arton/rjb"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples hardened"
-
-DEPEND=">=virtual/jdk-1.8
-	hardened? ( sys-apps/paxctl )"
-RDEPEND=">=virtual/jre-1.8:*"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-all_ruby_prepare() {
-	# The console is not available for testing.
-	sed -i -e '/test_noarg_sinvoke/,/end/ s:^:#:' test/test.rb || die
-
-	# Avoid encoding tests since not all locales may be available.
-	sed -i -e '/test_kjconv/,/^  end/ s:^:#:' test/test.rb || die
-
-	# Fix build on openjdk-11
-	sed -i -e 's#javah -classpath ../data/rjb jp.co.infoseek.hp.arton.rjb.RBridge#javac -h . -classpath ../data/rjb RBridge.java#g' ext/extconf.rb || die
-}
-
-each_ruby_prepare() {
-	#dev-lang/ruby might need the "hardened" flag to enforce the following:
-	if use hardened; then
-		paxctl -v /usr/bin/ruby 2>/dev/null | grep MPROTECT | grep disabled || ewarn '!!! rjb will only work if ruby is MPROTECT disabled\n  please disable it if required using paxctl -m /usr/bin/ruby'
-	fi
-	# force compilation of class file for our JVM
-	rm -rf data
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	if use examples; then
-		dodoc -r samples
-	fi
-}
-
-each_ruby_test() {
-	if use hardened; then
-		paxctl -v ${RUBY} 2>/dev/null | grep MPROTECT | grep -q disabled
-		if [ $? = 0 ]; then
-			${RUBY} -C test -I../lib:.:../ext test.rb || die
-		else
-			ewarn "${RUBY} has MPROTECT enabled, rjb will not work until it is disabled, skipping tests."
-		fi
-	else
-		${RUBY} -C test -I../lib:.:../ext test.rb || die
-	fi
-}
diff --git a/dev-ruby/rjb/rjb-1.6.5.ebuild b/dev-ruby/rjb/rjb-1.6.5.ebuild
deleted file mode 100644
index a4c722657a3e..000000000000
--- a/dev-ruby/rjb/rjb-1.6.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="readme.txt ChangeLog"
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit java-pkg-2 ruby-fakegem
-
-DESCRIPTION="Rjb is a Ruby-Java software bridge"
-HOMEPAGE="https://github.com/arton/rjb"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples hardened"
-
-DEPEND=">=virtual/jdk-1.8
-	hardened? ( sys-apps/paxctl )"
-RDEPEND=">=virtual/jre-1.8:*"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-all_ruby_prepare() {
-	# The console is not available for testing.
-	sed -i -e '/test_noarg_sinvoke/,/end/ s:^:#:' test/test.rb || die
-
-	# Avoid encoding tests since not all locales may be available.
-	sed -i -e '/test_kjconv/,/^  end/ s:^:#:' test/test.rb || die
-
-	# Fix build on openjdk-11
-	sed -i -e 's#javah -classpath ../data/rjb jp.co.infoseek.hp.arton.rjb.RBridge#javac -h . -classpath ../data/rjb RBridge.java#g' ext/extconf.rb || die
-}
-
-each_ruby_prepare() {
-	#dev-lang/ruby might need the "hardened" flag to enforce the following:
-	if use hardened; then
-		paxctl -v /usr/bin/ruby 2>/dev/null | grep MPROTECT | grep disabled || ewarn '!!! rjb will only work if ruby is MPROTECT disabled\n  please disable it if required using paxctl -m /usr/bin/ruby'
-	fi
-	# force compilation of class file for our JVM
-	rm -rf data
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	if use examples; then
-		dodoc -r samples
-	fi
-}
-
-each_ruby_test() {
-	if use hardened; then
-		paxctl -v ${RUBY} 2>/dev/null | grep MPROTECT | grep -q disabled
-		if [ $? = 0 ]; then
-			${RUBY} -C test -I../lib:.:../ext test.rb || die
-		else
-			ewarn "${RUBY} has MPROTECT enabled, rjb will not work until it is disabled, skipping tests."
-		fi
-	else
-		${RUBY} -C test -I../lib:.:../ext test.rb || die
-	fi
-}
diff --git a/dev-ruby/rjb/rjb-1.6.9.ebuild b/dev-ruby/rjb/rjb-1.6.9.ebuild
new file mode 100644
index 000000000000..ef80fb653497
--- /dev/null
+++ b/dev-ruby/rjb/rjb-1.6.9.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="readme.txt ChangeLog"
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit java-pkg-2 ruby-fakegem
+
+DESCRIPTION="Rjb is a Ruby-Java software bridge"
+HOMEPAGE="https://github.com/arton/rjb"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples hardened"
+
+DEPEND="|| ( virtual/jdk:17 virtual/jdk:11 virtual/jdk:1.8 )
+	hardened? ( sys-apps/paxctl )"
+RDEPEND="|| ( virtual/jre:17 virtual/jre:11 virtual/jre:1.8 )"
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+all_ruby_prepare() {
+	# The console is not available for testing.
+	sed -i -e '/test_noarg_sinvoke/,/end/ s:^:#:' test/test.rb || die
+
+	# Avoid encoding tests since not all locales may be available.
+	sed -i -e '/test_kjconv/,/^  end/ s:^:#:' test/test.rb || die
+
+	# Fix build on openjdk-11
+	sed -i -e 's#javah -classpath ../data/rjb jp.co.infoseek.hp.arton.rjb.RBridge#javac -h . -classpath ../data/rjb RBridge.java#g' ext/extconf.rb || die
+}
+
+each_ruby_prepare() {
+	#dev-lang/ruby might need the "hardened" flag to enforce the following:
+	if use hardened; then
+		paxctl -v /usr/bin/ruby 2>/dev/null | grep MPROTECT | grep disabled || ewarn '!!! rjb will only work if ruby is MPROTECT disabled\n  please disable it if required using paxctl -m /usr/bin/ruby'
+	fi
+	# force compilation of class file for our JVM
+	rm -rf data
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	if use examples; then
+		dodoc -r samples
+	fi
+}
+
+each_ruby_test() {
+	if use hardened; then
+		paxctl -v ${RUBY} 2>/dev/null | grep MPROTECT | grep -q disabled
+		if [ $? = 0 ]; then
+			${RUBY} -C test -I../lib:.:../ext test.rb || die
+		else
+			ewarn "${RUBY} has MPROTECT enabled, rjb will not work until it is disabled, skipping tests."
+		fi
+	else
+		${RUBY} -C test -I../lib:.:../ext test.rb || die
+	fi
+}
diff --git a/dev-ruby/rkelly-remix/metadata.xml b/dev-ruby/rkelly-remix/metadata.xml
index df039c95a17c..82044ed2c0aa 100644
--- a/dev-ruby/rkelly-remix/metadata.xml
+++ b/dev-ruby/rkelly-remix/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
   <maintainer type="project">
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
diff --git a/dev-ruby/rkelly-remix/rkelly-remix-0.0.7-r1.ebuild b/dev-ruby/rkelly-remix/rkelly-remix-0.0.7-r1.ebuild
index a40f6b8941f1..223af8009310 100644
--- a/dev-ruby/rkelly-remix/rkelly-remix-0.0.7-r1.ebuild
+++ b/dev-ruby/rkelly-remix/rkelly-remix-0.0.7-r1.ebuild
@@ -1,16 +1,16 @@
-# 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="ruby31 ruby32 ruby33"
 
 inherit ruby-fakegem
 
 DESCRIPTION="RKelly Remix is a fork of the RKelly JavaScript parser"
 HOMEPAGE="https://github.com/nene/rkelly-remix"
-LICENSE="MIT"
 
+LICENSE="MIT"
 KEYWORDS="~amd64 ~arm ~x86"
 SLOT="0"
 IUSE="doc"
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 1ec823e0c499..fc7deac332a0 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,4 +1,4 @@
-DIST rmagick-4.2.2.tar.gz 1984143 BLAKE2B 8b8119a0002c48f3a289f72d4bbea6ac86cbecb287b34ddc14ca126fd2d951a34aefa39d68603dc4c9de674d346e47ef9e3b2c8ed96a5bc081373a4184a3ec40 SHA512 0a6a30a631786ea310d2c8add297abd527588be755d021143d6c64fbb597006aefef859c374604f8d26b0f8b1f6cd8a5f1cdd6489772ee713c71681f3980c7fd
-DIST rmagick-4.2.3.tar.gz 1984440 BLAKE2B 32dea4b8ed7d2385537ac5d67d48e3431e3f398c146b01308cc44ab6b4ad5e851292c22e373307bd2193a299f94a2a2f91b0a7d534825990cc5e1458a9efff7d SHA512 3465afc5c9a93e45511463b1f7eda00fd243f17041cf52b5cb54ceb05ff22cb6e23ea2b15d080ae31bca5daebdd92c28364ada73ea0cf6ea56cb1ec5fe1aa184
-DIST rmagick-4.2.4.tar.gz 1984584 BLAKE2B 8f3a737b851e16e16b6b010ea9f76ae14715661630eb877ca4204a71d67603967e5ca4eebdb9d8dea4caa880d049b78f525b6596feea9f866d7396fc550fb410 SHA512 89d5b616b6ce5187ac31356c44abea23aab0054e08ed00d390e3c74d1cdca421bc1ceb6708e5434858f3194756bf14b445d1331216480be5f8c072f65a889198
-DIST rmagick-4.2.5.tar.gz 1984865 BLAKE2B 5a96967da0583ca6d16252fd3e93162cc31b4b125875e16334436c2ec54cb9b739d4a0e0e08547a6218312ce844b3b78cca5f63cf4b81ae3f15abbf9816ceac8 SHA512 55835e43bf583c6c53431849caa54900902d0d63f21c7f70b0bdbcfbe69d16a71d433d1d9b949bf68ed36f6fc7f18ae512f0e96c26ff1c63a68bbc83446b52d8
+DIST rmagick-4.3.0.tar.gz 1986554 BLAKE2B bf6afb0b19a98f45dd9f3a8261b67ad05ed774784e9fb19009a83c266c16362b4938acd8b0af6a07d3a37fb255fb5bee7a33b7f26c2c49460d546665a98a7871 SHA512 1b108d61b836bf382c9776badc45614ff88ca74176595765c3caba00cc6af0f955dd6f7649a9f97698832193d85292bc22ff0bf290d0bfbf9e8faa58b99b0b1c
+DIST rmagick-5.3.0.tar.gz 2018036 BLAKE2B 204ece4d3794ef43b02855cce2f11e0194d2a81e400c1c2ef2af824359b8b4566eda93caba6269ad6b283af60d99ad403ab6ba8e972153e8f20d208ce0c48ad6 SHA512 dcc9e0d7cd77ebd3859871f26449c37839f9102e7aa4f0746698cbd6fe93579c3adbe6cfefeba6cdcb53e573f5113b872d03fcd568bb80edda5c8ca9c1ab1665
+DIST rmagick-5.4.4.tar.gz 2019830 BLAKE2B 0eb8d8c7edb885f5cddab586532eb95dadaaa20bab78707ffe80ce486c073d8d552e610c4e0cc5671d4832768614891e4fe73426c62689ef281586bce49643c9 SHA512 95559d1138b46ecbe2adea5cdbb18ed1cb5076f879de560af8a35b567d82c81fc78258e57bf58f8d3657bd9a2333b813471d85b37a459056bfb00a76428b7536
+DIST rmagick-5.5.0.tar.gz 2045116 BLAKE2B 018d4e940043210238b6026a8bc0b65656633aaaf559954b666c75dda74c0f0fd33319a13fd6c494a6a51a3cfac67aac283e3e79d06dc90b6d4581464805e476 SHA512 f813104c347867b14281b044135fd626805d35d2afa3167c25d5e31179b31e985c5cc75deb630f8a64d20b877d8c42ce13e31e137f573467d3c5f3f2453d514f
diff --git a/dev-ruby/rmagick/files/rmagick-4.2.5-empty-rpath.patch b/dev-ruby/rmagick/files/rmagick-4.2.5-empty-rpath.patch
deleted file mode 100644
index 13defdd24099..000000000000
--- a/dev-ruby/rmagick/files/rmagick-4.2.5-empty-rpath.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit fef59858eaba843b876c5b5f253f623ddb4d0f1c
-Author: Hans de Graaff <hans@degraaff.org>
-Date:   Sat Apr 23 08:54:42 2022 +0200
-
-    Guard against an empty rpath
-    
-    Some ImageMagick installations (e.g. on Gentoo Linux when installed
-    with the package manager) don't return any -L options in pkg-config.
-    Including an empty rpath is a security risk and should be avoided.
-    
-    Fixes #1332
-
-diff --git a/ext/RMagick/extconf.rb b/ext/RMagick/extconf.rb
-index 7b4ce1ad..3eef6cbd 100644
---- a/ext/RMagick/extconf.rb
-+++ b/ext/RMagick/extconf.rb
-@@ -69,11 +69,12 @@ module RMagick
- 
-         libdir  = `pkg-config --libs-only-L #{$magick_package}`.chomp.sub('-L', '')
-         ldflags = "#{ENV['LDFLAGS']} " + `pkg-config --libs #{$magick_package}`.chomp
-+        rpath   = libdir.empty? ? '' : "-Wl,-rpath,#{libdir}"
- 
-         # Save flags
-         $CPPFLAGS   = "#{ENV['CPPFLAGS']} " + `pkg-config --cflags #{$magick_package}`.chomp
-         $LOCAL_LIBS = "#{ENV['LIBS']} "     + `pkg-config --libs #{$magick_package}`.chomp
--        $LDFLAGS    = "#{ldflags} -Wl,-rpath,#{libdir}"
-+        $LDFLAGS    = "#{ldflags} #{rpath}"
- 
-         unless try_link("int main() { }")
-           # if linker does not recognizes '-Wl,-rpath,somewhere' option, it revert to original option
diff --git a/dev-ruby/rmagick/metadata.xml b/dev-ruby/rmagick/metadata.xml
index 78edce773db7..fac7a178d4d8 100644
--- a/dev-ruby/rmagick/metadata.xml
+++ b/dev-ruby/rmagick/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">gemhome/rmagick</remote-id>
+    <remote-id type="github">rmagick/rmagick</remote-id>
+    <remote-id type="rubygems">rmagick</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rmagick/rmagick-4.2.2.ebuild b/dev-ruby/rmagick/rmagick-4.2.2.ebuild
deleted file mode 100644
index 5b061481d8a1..000000000000
--- a/dev-ruby/rmagick/rmagick-4.2.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rmagick.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/RMagick/extconf.rb)
-
-MY_PV=RMagick_${PV//\./-}
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
-HOMEPAGE="https://github.com/rmagick/rmagick"
-SRC_URI="https://github.com/rmagick/rmagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="rmagick-${MY_PV}"
-
-LICENSE="Artistic"
-SLOT="4"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="doc"
-
-RDEPEND+=" >=media-gfx/imagemagick-6.9.0:="
-DEPEND+=" test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,lcms,postscript,tiff,webp] )"
-
-all_ruby_prepare() {
-	# Avoid unused dependency on rake-compiler. This also avoids an
-	# extra compile during tests.
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/end/ s:^:#:' \
-		-e '/compile/ s:^:#:' Rakefile || die
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Squelch harmless warning about imagemagick installation.
-	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
-
-	# Reading PDFs is not allowed by the default Gentoo security policy for imagemagick
-	#sed -i -e '/can read PDF file/askip "Not allowed by Gentoo security policy"' spec/rmagick/image/read_spec.rb || die
-
-	# Update version number hardcoded in tests
-	sed -i -e 's/"7.0"/"7.1"/' spec/rmagick/image/channel_mean_spec.rb || die
-
-	# Create directory used for a test
-	mkdir tmp
-}
-
-each_ruby_test() {
-	# Borrowed from media-gfx/gscan2pdf
-	# Needed to avoid test failures on e.g. ppc, bug #815856
-	# (Unclear why it doesn't manifest on amd64 here at least)
-	local confdir="${HOME}/.config/ImageMagick"
-	mkdir -p "${confdir}" || die
-	cat > "${confdir}/policy.xml" <<-EOT || die
-		<policymap>
-			<policy domain="coder" rights="read|write" pattern="PDF" />
-			<policy domain="coder" rights="read" pattern="PS" />
-		</policymap>
-	EOT
-
-	RSPEC_VERSION="3" ruby-ng_rspec
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-
-	if use doc ; then
-		docinto .
-		dodoc -r doc
-	fi
-}
diff --git a/dev-ruby/rmagick/rmagick-4.2.3.ebuild b/dev-ruby/rmagick/rmagick-4.2.3.ebuild
deleted file mode 100644
index 77076de599c9..000000000000
--- a/dev-ruby/rmagick/rmagick-4.2.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rmagick.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/RMagick/extconf.rb)
-
-MY_PV=RMagick_${PV//\./-}
-
-inherit ruby-fakegem
-
-DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
-HOMEPAGE="https://github.com/rmagick/rmagick"
-SRC_URI="https://github.com/rmagick/rmagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="rmagick-${MY_PV}"
-
-LICENSE="Artistic"
-SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND+=" >=media-gfx/imagemagick-6.9.0:="
-DEPEND+=" test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,lcms,postscript,tiff,webp] )"
-
-all_ruby_prepare() {
-	# Avoid unused dependency on rake-compiler. This also avoids an
-	# extra compile during tests.
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/end/ s:^:#:' \
-		-e '/compile/ s:^:#:' Rakefile || die
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Squelch harmless warning about imagemagick installation.
-	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
-
-	# Reading PDFs is not allowed by the default Gentoo security policy for imagemagick
-	#sed -i -e '/can read PDF file/askip "Not allowed by Gentoo security policy"' spec/rmagick/image/read_spec.rb || die
-
-	# Update version number hardcoded in tests
-	sed -i -e 's/"7.0"/"7.1"/' spec/rmagick/image/channel_mean_spec.rb || die
-
-	# Create directory used for a test
-	mkdir tmp
-}
-
-each_ruby_test() {
-	# Borrowed from media-gfx/gscan2pdf
-	# Needed to avoid test failures on e.g. ppc, bug #815856
-	# (Unclear why it doesn't manifest on amd64 here at least)
-	local confdir="${HOME}/.config/ImageMagick"
-	mkdir -p "${confdir}" || die
-	cat > "${confdir}/policy.xml" <<-EOT || die
-		<policymap>
-			<policy domain="coder" rights="read|write" pattern="PDF" />
-			<policy domain="coder" rights="read" pattern="PS" />
-		</policymap>
-	EOT
-
-	RSPEC_VERSION="3" ruby-ng_rspec
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-
-	if use doc ; then
-		docinto .
-		dodoc -r doc
-	fi
-}
diff --git a/dev-ruby/rmagick/rmagick-4.2.4.ebuild b/dev-ruby/rmagick/rmagick-4.2.4.ebuild
deleted file mode 100644
index 77076de599c9..000000000000
--- a/dev-ruby/rmagick/rmagick-4.2.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rmagick.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/RMagick/extconf.rb)
-
-MY_PV=RMagick_${PV//\./-}
-
-inherit ruby-fakegem
-
-DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
-HOMEPAGE="https://github.com/rmagick/rmagick"
-SRC_URI="https://github.com/rmagick/rmagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="rmagick-${MY_PV}"
-
-LICENSE="Artistic"
-SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND+=" >=media-gfx/imagemagick-6.9.0:="
-DEPEND+=" test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,lcms,postscript,tiff,webp] )"
-
-all_ruby_prepare() {
-	# Avoid unused dependency on rake-compiler. This also avoids an
-	# extra compile during tests.
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/end/ s:^:#:' \
-		-e '/compile/ s:^:#:' Rakefile || die
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Squelch harmless warning about imagemagick installation.
-	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
-
-	# Reading PDFs is not allowed by the default Gentoo security policy for imagemagick
-	#sed -i -e '/can read PDF file/askip "Not allowed by Gentoo security policy"' spec/rmagick/image/read_spec.rb || die
-
-	# Update version number hardcoded in tests
-	sed -i -e 's/"7.0"/"7.1"/' spec/rmagick/image/channel_mean_spec.rb || die
-
-	# Create directory used for a test
-	mkdir tmp
-}
-
-each_ruby_test() {
-	# Borrowed from media-gfx/gscan2pdf
-	# Needed to avoid test failures on e.g. ppc, bug #815856
-	# (Unclear why it doesn't manifest on amd64 here at least)
-	local confdir="${HOME}/.config/ImageMagick"
-	mkdir -p "${confdir}" || die
-	cat > "${confdir}/policy.xml" <<-EOT || die
-		<policymap>
-			<policy domain="coder" rights="read|write" pattern="PDF" />
-			<policy domain="coder" rights="read" pattern="PS" />
-		</policymap>
-	EOT
-
-	RSPEC_VERSION="3" ruby-ng_rspec
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-
-	if use doc ; then
-		docinto .
-		dodoc -r doc
-	fi
-}
diff --git a/dev-ruby/rmagick/rmagick-4.2.5.ebuild b/dev-ruby/rmagick/rmagick-4.2.5.ebuild
deleted file mode 100644
index 9bb20e982c14..000000000000
--- a/dev-ruby/rmagick/rmagick-4.2.5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rmagick.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/RMagick/extconf.rb)
-
-MY_PV=RMagick_${PV//\./-}
-
-inherit ruby-fakegem
-
-DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
-HOMEPAGE="https://github.com/rmagick/rmagick"
-SRC_URI="https://github.com/rmagick/rmagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="rmagick-${MY_PV}"
-
-LICENSE="Artistic"
-SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND+=" >=media-gfx/imagemagick-6.9.0:="
-DEPEND+=" test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,lcms,postscript,tiff,webp] )"
-
-PATCHES=( "${FILESDIR}/${P}-empty-rpath.patch" )
-
-all_ruby_prepare() {
-	# Avoid unused dependency on rake-compiler. This also avoids an
-	# extra compile during tests.
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/end/ s:^:#:' \
-		-e '/compile/ s:^:#:' Rakefile || die
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Squelch harmless warning about imagemagick installation.
-	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
-
-	# Reading PDFs is not allowed by the default Gentoo security policy for imagemagick
-	#sed -i -e '/can read PDF file/askip "Not allowed by Gentoo security policy"' spec/rmagick/image/read_spec.rb || die
-
-	# Update version number hardcoded in tests
-	sed -i -e 's/"7.0"/"7.1"/' spec/rmagick/image/channel_mean_spec.rb || die
-
-	# Create directory used for a test
-	mkdir tmp
-}
-
-each_ruby_test() {
-	# Borrowed from media-gfx/gscan2pdf
-	# Needed to avoid test failures on e.g. ppc, bug #815856
-	# (Unclear why it doesn't manifest on amd64 here at least)
-	local confdir="${HOME}/.config/ImageMagick"
-	mkdir -p "${confdir}" || die
-	cat > "${confdir}/policy.xml" <<-EOT || die
-		<policymap>
-			<policy domain="coder" rights="read|write" pattern="PDF" />
-			<policy domain="coder" rights="read" pattern="PS" />
-		</policymap>
-	EOT
-
-	RSPEC_VERSION="3" ruby-ng_rspec
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-
-	if use doc ; then
-		docinto .
-		dodoc -r doc
-	fi
-}
diff --git a/dev-ruby/rmagick/rmagick-4.3.0.ebuild b/dev-ruby/rmagick/rmagick-4.3.0.ebuild
new file mode 100644
index 000000000000..d49338658934
--- /dev/null
+++ b/dev-ruby/rmagick/rmagick-4.3.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rmagick.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/RMagick/extconf.rb)
+
+MY_PV=RMagick_${PV//\./-}
+
+inherit ruby-fakegem
+
+DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
+HOMEPAGE="https://github.com/rmagick/rmagick"
+SRC_URI="https://github.com/rmagick/rmagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="rmagick-${MY_PV}"
+
+LICENSE="Artistic"
+SLOT="4"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+IUSE="doc"
+
+RDEPEND+=" >=media-gfx/imagemagick-6.9.0:="
+DEPEND+=" >=media-gfx/imagemagick-6.9.0 test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,lcms,postscript,tiff,webp] media-fonts/dejavu )"
+
+all_ruby_prepare() {
+	# Avoid unused dependency on rake-compiler. This also avoids an
+	# extra compile during tests.
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/end/ s:^:#:' \
+		-e '/compile/ s:^:#:' Rakefile || die
+	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Squelch harmless warning about imagemagick installation.
+	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
+
+	# Reading PDFs is not allowed by the default Gentoo security policy for imagemagick
+	#sed -i -e '/can read PDF file/askip "Not allowed by Gentoo security policy"' spec/rmagick/image/read_spec.rb || die
+
+	# Update version number hardcoded in tests
+	sed -i -e 's/"7.0"/"7.1"/' spec/rmagick/image/channel_mean_spec.rb || die
+
+	# Create directory used for a test
+	mkdir tmp
+}
+
+each_ruby_test() {
+	# Borrowed from media-gfx/gscan2pdf
+	# Needed to avoid test failures on e.g. ppc, bug #815856
+	# (Unclear why it doesn't manifest on amd64 here at least)
+	local confdir="${HOME}/.config/ImageMagick"
+	mkdir -p "${confdir}" || die
+	cat > "${confdir}/policy.xml" <<-EOT || die
+		<policymap>
+			<policy domain="coder" rights="read|write" pattern="PDF" />
+			<policy domain="coder" rights="read" pattern="PS" />
+		</policymap>
+	EOT
+
+	RSPEC_VERSION="3" ruby-ng_rspec
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+
+	if use doc ; then
+		docinto .
+		dodoc -r doc
+	fi
+}
diff --git a/dev-ruby/rmagick/rmagick-5.3.0.ebuild b/dev-ruby/rmagick/rmagick-5.3.0.ebuild
new file mode 100644
index 000000000000..d0e9cf4710ab
--- /dev/null
+++ b/dev-ruby/rmagick/rmagick-5.3.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rmagick.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/RMagick/extconf.rb)
+
+MY_PV=RMagick_${PV//\./-}
+
+inherit ruby-fakegem
+
+DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
+HOMEPAGE="https://github.com/rmagick/rmagick"
+SRC_URI="https://github.com/rmagick/rmagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="rmagick-${MY_PV}"
+
+LICENSE="Artistic"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
+IUSE="doc"
+
+RDEPEND+=" >=media-gfx/imagemagick-6.9.0:="
+DEPEND+=" >=media-gfx/imagemagick-6.9.0 test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,lcms,postscript,tiff,webp] media-fonts/dejavu )"
+
+ruby_add_bdepend "dev-ruby/pkg-config"
+
+all_ruby_prepare() {
+	# Avoid unused dependency on rake-compiler. This also avoids an
+	# extra compile during tests.
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/end/ s:^:#:' \
+		-e '/compile/ s:^:#:' Rakefile || die
+	sed -i -e '/pry/ s:^:#:' -e '5irequire "tempfile"' spec/spec_helper.rb || die
+	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Squelch harmless warning about imagemagick installation.
+	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
+
+	# Avoid some tests that fails due to minor implementation changes in
+	# imagemagick.
+	rm -f spec/rmagick/class_methods/limit_resources_spec.rb spec/rmagick/image/gamma_spec.rb || die
+
+	# Create directory used for a test
+	mkdir tmp
+}
+
+each_ruby_test() {
+	# Borrowed from media-gfx/gscan2pdf
+	# Needed to avoid test failures on e.g. ppc, bug #815856
+	# (Unclear why it doesn't manifest on amd64 here at least)
+	local confdir="${HOME}/.config/ImageMagick"
+	mkdir -p "${confdir}" || die
+	cat > "${confdir}/policy.xml" <<-EOT || die
+		<policymap>
+			<policy domain="coder" rights="read|write" pattern="PDF" />
+			<policy domain="coder" rights="read" pattern="PS" />
+		</policymap>
+	EOT
+
+	RSPEC_VERSION="3" ruby-ng_rspec
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+
+	if use doc ; then
+		docinto .
+		dodoc -r doc
+	fi
+}
diff --git a/dev-ruby/rmagick/rmagick-5.4.4.ebuild b/dev-ruby/rmagick/rmagick-5.4.4.ebuild
new file mode 100644
index 000000000000..b649ed32d45b
--- /dev/null
+++ b/dev-ruby/rmagick/rmagick-5.4.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rmagick.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/RMagick/extconf.rb)
+
+MY_PV=RMagick_${PV//\./-}
+
+inherit ruby-fakegem
+
+DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
+HOMEPAGE="https://github.com/rmagick/rmagick"
+SRC_URI="https://github.com/rmagick/rmagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="rmagick-${MY_PV}"
+
+LICENSE="Artistic"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND+=" >=media-gfx/imagemagick-6.9.0:="
+DEPEND+=" >=media-gfx/imagemagick-6.9.0 test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,lcms,postscript,tiff,webp] media-fonts/dejavu )"
+
+# observer is a default gem packaged with ruby
+
+ruby_add_bdepend "dev-ruby/pkg-config"
+
+all_ruby_prepare() {
+	# Avoid unused dependency on rake-compiler. This also avoids an
+	# extra compile during tests.
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/end/ s:^:#:' \
+		-e '/compile/ s:^:#:' Rakefile || die
+	sed -i -e '/pry/ s:^:#:' -e '5irequire "tempfile"' spec/spec_helper.rb || die
+	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Squelch harmless warning about imagemagick installation.
+	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
+
+	# Create directory used for a test
+	mkdir tmp
+}
+
+each_ruby_test() {
+	# Borrowed from media-gfx/gscan2pdf
+	# Needed to avoid test failures on e.g. ppc, bug #815856
+	# (Unclear why it doesn't manifest on amd64 here at least)
+	local confdir="${HOME}/.config/ImageMagick"
+	mkdir -p "${confdir}" || die
+	cat > "${confdir}/policy.xml" <<-EOT || die
+		<policymap>
+			<policy domain="coder" rights="read|write" pattern="PDF" />
+			<policy domain="coder" rights="read" pattern="PS" />
+		</policymap>
+	EOT
+
+	RSPEC_VERSION="3" ruby-ng_rspec
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+
+	if use doc ; then
+		docinto .
+		dodoc -r doc
+	fi
+}
diff --git a/dev-ruby/rmagick/rmagick-5.5.0.ebuild b/dev-ruby/rmagick/rmagick-5.5.0.ebuild
new file mode 100644
index 000000000000..b649ed32d45b
--- /dev/null
+++ b/dev-ruby/rmagick/rmagick-5.5.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rmagick.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/RMagick/extconf.rb)
+
+MY_PV=RMagick_${PV//\./-}
+
+inherit ruby-fakegem
+
+DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
+HOMEPAGE="https://github.com/rmagick/rmagick"
+SRC_URI="https://github.com/rmagick/rmagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="rmagick-${MY_PV}"
+
+LICENSE="Artistic"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND+=" >=media-gfx/imagemagick-6.9.0:="
+DEPEND+=" >=media-gfx/imagemagick-6.9.0 test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,lcms,postscript,tiff,webp] media-fonts/dejavu )"
+
+# observer is a default gem packaged with ruby
+
+ruby_add_bdepend "dev-ruby/pkg-config"
+
+all_ruby_prepare() {
+	# Avoid unused dependency on rake-compiler. This also avoids an
+	# extra compile during tests.
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/end/ s:^:#:' \
+		-e '/compile/ s:^:#:' Rakefile || die
+	sed -i -e '/pry/ s:^:#:' -e '5irequire "tempfile"' spec/spec_helper.rb || die
+	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Squelch harmless warning about imagemagick installation.
+	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
+
+	# Create directory used for a test
+	mkdir tmp
+}
+
+each_ruby_test() {
+	# Borrowed from media-gfx/gscan2pdf
+	# Needed to avoid test failures on e.g. ppc, bug #815856
+	# (Unclear why it doesn't manifest on amd64 here at least)
+	local confdir="${HOME}/.config/ImageMagick"
+	mkdir -p "${confdir}" || die
+	cat > "${confdir}/policy.xml" <<-EOT || die
+		<policymap>
+			<policy domain="coder" rights="read|write" pattern="PDF" />
+			<policy domain="coder" rights="read" pattern="PS" />
+		</policymap>
+	EOT
+
+	RSPEC_VERSION="3" ruby-ng_rspec
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+
+	if use doc ; then
+		docinto .
+		dodoc -r doc
+	fi
+}
diff --git a/dev-ruby/roadie-rails/Manifest b/dev-ruby/roadie-rails/Manifest
index 58f9c0f3c006..d08879a8828e 100644
--- a/dev-ruby/roadie-rails/Manifest
+++ b/dev-ruby/roadie-rails/Manifest
@@ -1,4 +1,2 @@
-DIST roadie-rails-2.1.1.tar.gz 56419 BLAKE2B 6a54797c77267a61ab63d72743fbd3f98d4137d917ddebf0335c30d03e5efb9e2907679237eea168384b54ea93bbe9be3aad4dcbf6364d411ebaa6e2ba7638fb SHA512 ceffe9746cded4f5dca83c614dc6ffb65203455775df9f56a402837018c0a322c7edad37ca05c72bc70fa8d19cfb4f9eba5b2fde1cbff7f8b28312e95140f353
-DIST roadie-rails-2.2.0.tar.gz 56005 BLAKE2B b3251d095074dcbaf6879f8344a9f6d1426abd2824a667f8ddb1d6be186c1c89bc3425972abc62495038b263780339840b792a961809e80d181c043e8f558012 SHA512 4042d549f19adb48144306d7f646d7462b72c3775b41e6ad68ffc75aad8704c28f828bd2928fc9cb3a97d0a2ebee86446b17d2ba31d3b1b163e668cb4d85bb0f
-DIST roadie-rails-2.3.0.tar.gz 61709 BLAKE2B 7616f27199f3ad6733becc62e0cb4946ad2d01ff78ed5ecb79f49b2ab91ff29f173450c90364ab62af68b62a1e2e64060f32e41032f8d0b7596934be9f34733b SHA512 454d1eda70cf055c7343d5ba80124e9663084464cbbe0811f770bf6ae4a39c0ac40332983cd86b6b92e3bf50bf1da722f5ba5e631f69a355f5b5be73d9502458
 DIST roadie-rails-3.0.0.tar.gz 62724 BLAKE2B d9e960f97a491724b80d3064304e4875b1a12e7570e6c6ed8c373bf0dc73cf0828d1c5f3cb2ea57c485bbca832ce9cd9ba5c7ca798c4695a36b0c7925826eb91 SHA512 061635e9d5d6c4f752f8f105c0fef0b0ac9cd46cec7669b43295fecb80fd2232e211f033af9f9fe457a3c2c6ea04921ffcc9abe6f8b375f2df8b8bc8bfa64512
+DIST roadie-rails-3.1.0.tar.gz 76608 BLAKE2B b0adffa2ca6e5416a9f9e77cb86e3ba8766f1cc18a68edbf9f7c0dd5197e2d888c98ad6a46b6cb8b2dd75e0cf1abe59c528b49571144c895f357bbe07c3348d7 SHA512 d12a024eccce273558aaedc6100050c424fd564b5f2b88b27e14cc2d7817e79e5f36d8a4f8dae78104d6d57f0ce11dfe926d08109573d9c0f4e77bfd866683b3
diff --git a/dev-ruby/roadie-rails/roadie-rails-2.1.1.ebuild b/dev-ruby/roadie-rails/roadie-rails-2.1.1.ebuild
deleted file mode 100644
index 8c1ce8a56fcc..000000000000
--- a/dev-ruby/roadie-rails/roadie-rails-2.1.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hooks Roadie into your Rails application to help with email generation"
-HOMEPAGE="https://github.com/Mange/roadie-rails"
-SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-#RESTRICT="test"
-
-ruby_add_rdepend ">=dev-ruby/roadie-3.1
-	|| ( dev-ruby/railties:6.0 dev-ruby/railties:5.2 )"
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		|| ( dev-ruby/rails:6.0 dev-ruby/rails:5.2 )
-		dev-ruby/rspec-rails
-		dev-ruby/rspec-collection_matchers )"
-
-all_ruby_prepare() {
-	sed -i -e '/codecov/ s:^:#:' Gemfile || die
-	sed -i -e 's/git ls-files/find . -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid already removed rails version
-	sed -i -e '/rails_51/ s:^:#:' spec/integration_spec.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rspec-3 spec || die
-}
diff --git a/dev-ruby/roadie-rails/roadie-rails-2.2.0.ebuild b/dev-ruby/roadie-rails/roadie-rails-2.2.0.ebuild
deleted file mode 100644
index fe6ad76611c9..000000000000
--- a/dev-ruby/roadie-rails/roadie-rails-2.2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hooks Roadie into your Rails application to help with email generation"
-HOMEPAGE="https://github.com/Mange/roadie-rails"
-SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-
-ruby_add_rdepend ">=dev-ruby/roadie-3.1
-	|| ( dev-ruby/railties:6.1 dev-ruby/railties:6.0 dev-ruby/railties:5.2 )"
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		|| ( dev-ruby/rails:6.1 dev-ruby/rails:6.0 dev-ruby/rails:5.2 )
-		dev-ruby/rspec-rails
-		dev-ruby/rspec-collection_matchers )"
-
-all_ruby_prepare() {
-	sed -i -e '/codecov/ s:^:#:' Gemfile || die
-	sed -i -e 's/git ls-files/find . -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid already removed rails version
-	sed -i -e '/rails_51/ s:^:#:' spec/integration_spec.rb || die
-
-	# Revert https://github.com/Mange/roadie-rails/commit/03acd8fddf651d43919e92db35d541ec4281c5fc for now
-	# Fragile test which is affected by dependency versions (unclear which)
-	sed -e 's/cd95a25e70dfe61add5a96e11d3fee0f29e9ba2b05099723d57bba7dfa725c8a/322506f9917889126e81df2833a6eecdf2e394658d53dad347e9882dd4dbf28e/' \
-		-i spec/integration_spec.rb || die
-
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rspec-3 spec || die
-}
diff --git a/dev-ruby/roadie-rails/roadie-rails-2.3.0.ebuild b/dev-ruby/roadie-rails/roadie-rails-2.3.0.ebuild
deleted file mode 100644
index 91f4b1b6d504..000000000000
--- a/dev-ruby/roadie-rails/roadie-rails-2.3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hooks Roadie into your Rails application to help with email generation"
-HOMEPAGE="https://github.com/Mange/roadie-rails"
-SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-
-ruby_add_rdepend ">=dev-ruby/roadie-3.1:4
-	|| ( dev-ruby/railties:7.0 dev-ruby/railties:6.1 dev-ruby/railties:6.0 dev-ruby/railties:5.2 )"
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		|| ( dev-ruby/rails:7.0 dev-ruby/rails:6.1 dev-ruby/rails:6.0 dev-ruby/rails:5.2 )
-		dev-ruby/rspec-rails
-		dev-ruby/rspec-collection_matchers )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/ s:^:#:' Gemfile || die
-	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid already removed rails version
-	sed -i -e '/rails_51/ s:^:#:' spec/integration_spec.rb || die
-
-	# Avoid dependency on optional bootsnap
-	sed -i -e '/bootsnap/ s:^:#:' spec/railsapps/rails_70/Gemfile spec/railsapps/rails_70/config/boot.rb || die
-
-	# Revert https://github.com/Mange/roadie-rails/commit/03acd8fddf651d43919e92db35d541ec4281c5fc for now
-	# Fragile test which is affected by dependency versions (unclear which)
-	sed -e 's/cd95a25e70dfe61add5a96e11d3fee0f29e9ba2b05099723d57bba7dfa725c8a/322506f9917889126e81df2833a6eecdf2e394658d53dad347e9882dd4dbf28e/' \
-		-i spec/integration_spec.rb || die
-
-}
-
-each_ruby_prepare() {
-	sed -i -e '/run_in_app_context/ s:bin/rails:'${RUBY}' -S bin/rails:' spec/support/rails_app.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rspec-3 spec || die
-}
diff --git a/dev-ruby/roadie-rails/roadie-rails-3.0.0-r1.ebuild b/dev-ruby/roadie-rails/roadie-rails-3.0.0-r1.ebuild
index b17f0eb672fe..63a9f9b64558 100644
--- a/dev-ruby/roadie-rails/roadie-rails-3.0.0-r1.ebuild
+++ b/dev-ruby/roadie-rails/roadie-rails-3.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# 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"
+USE_RUBY="ruby30 ruby31 ruby32"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
@@ -21,11 +21,11 @@ SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64"
 
 ruby_add_rdepend "dev-ruby/roadie:5
-	|| ( dev-ruby/railties:7.0 dev-ruby/railties:6.1 dev-ruby/railties:6.0 dev-ruby/railties:5.2 )"
+	|| ( dev-ruby/railties:7.0 dev-ruby/railties:6.1 )"
 ruby_add_bdepend "
 	test? (
 		dev-ruby/bundler
-		|| ( dev-ruby/rails:7.0 dev-ruby/rails:6.1 dev-ruby/rails:6.0 dev-ruby/rails:5.2 )
+		|| ( dev-ruby/rails:7.0 dev-ruby/rails:6.1 )
 		dev-ruby/rspec-rails
 		dev-ruby/rspec-collection_matchers
 		dev-ruby/sass-rails )"
diff --git a/dev-ruby/roadie-rails/roadie-rails-3.0.0.ebuild b/dev-ruby/roadie-rails/roadie-rails-3.0.0.ebuild
deleted file mode 100644
index d9ea47486a58..000000000000
--- a/dev-ruby/roadie-rails/roadie-rails-3.0.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hooks Roadie into your Rails application to help with email generation"
-HOMEPAGE="https://github.com/Mange/roadie-rails"
-SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-
-ruby_add_rdepend ">=dev-ruby/roadie-3.1:4
-	|| ( dev-ruby/railties:7.0 dev-ruby/railties:6.1 dev-ruby/railties:6.0 dev-ruby/railties:5.2 )"
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		|| ( dev-ruby/rails:7.0 dev-ruby/rails:6.1 dev-ruby/rails:6.0 dev-ruby/rails:5.2 )
-		dev-ruby/rspec-rails
-		dev-ruby/rspec-collection_matchers
-		dev-ruby/sass-rails )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(simplecov\|standard\)/ s:^:#:' Gemfile || die
-	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid already removed rails version
-	sed -i -e '/rails_51/ s:^:#:' spec/integration_spec.rb || die
-
-	# Avoid dependency on optional bootsnap
-	sed -i -e '/bootsnap/ s:^:#:' spec/railsapps/rails_*/Gemfile spec/railsapps/rails_*/config/boot.rb || die
-
-	# Fix versioned sass-rails dependency
-	sed -i -e '/sass-rails/ s/>= 6/>=5/' spec/railsapps/*/Gemfile || die
-
-	# Revert https://github.com/Mange/roadie-rails/commit/03acd8fddf651d43919e92db35d541ec4281c5fc for now
-	# Fragile test which is affected by dependency versions (unclear which)
-	sed -e 's/cd95a25e70dfe61add5a96e11d3fee0f29e9ba2b05099723d57bba7dfa725c8a/322506f9917889126e81df2833a6eecdf2e394658d53dad347e9882dd4dbf28e/' \
-		-i spec/integration_spec.rb || die
-
-}
-
-each_ruby_prepare() {
-	sed -i -e '/run_in_app_context/ s:bin/rails:'${RUBY}' -S bin/rails:' spec/support/rails_app.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rspec-3 spec || die
-}
diff --git a/dev-ruby/roadie-rails/roadie-rails-3.1.0.ebuild b/dev-ruby/roadie-rails/roadie-rails-3.1.0.ebuild
new file mode 100644
index 000000000000..9c5504299029
--- /dev/null
+++ b/dev-ruby/roadie-rails/roadie-rails-3.1.0.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="ruby31 ruby32"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Hooks Roadie into your Rails application to help with email generation"
+HOMEPAGE="https://github.com/Mange/roadie-rails"
+SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend "dev-ruby/roadie:5
+	|| ( dev-ruby/railties:7.0 dev-ruby/railties:6.1 )"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		|| ( dev-ruby/rails:7.0 dev-ruby/rails:6.1 )
+		dev-ruby/rspec-rails
+		dev-ruby/rspec-collection_matchers
+		dev-ruby/sass-rails )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(simplecov\|standard\)/ s:^:#:' Gemfile || die
+	sed -i -e 's/git ls-files/find * -print/' -e '/standard/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid already removed rails or versions incompatible with sass-rails
+	sed -i -e '/rails_\(51\|52\|60\|71\)/ s:^:#:' spec/integration_spec.rb || die
+
+	# Avoid dependency on optional bootsnap
+	sed -i -e '/bootsnap/ s:^:#:' spec/railsapps/rails_*/Gemfile spec/railsapps/rails_*/config/boot.rb || die
+
+	# Fix versioned sass-rails dependency
+	sed -i -e '/sass-rails/ s/>= 6/>=5/' spec/railsapps/*/Gemfile || die
+
+	# Revert https://github.com/Mange/roadie-rails/commit/03acd8fddf651d43919e92db35d541ec4281c5fc for now
+	# Fragile test which is affected by dependency versions (unclear which)
+	sed -e 's/cd95a25e70dfe61add5a96e11d3fee0f29e9ba2b05099723d57bba7dfa725c8a/322506f9917889126e81df2833a6eecdf2e394658d53dad347e9882dd4dbf28e/' \
+		-i spec/integration_spec.rb || die
+
+}
+
+each_ruby_prepare() {
+	sed -i -e '/run_in_app_context/ s:bin/rails:'${RUBY}' -S bin/rails:' spec/support/rails_app.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rspec-3 spec || die
+}
diff --git a/dev-ruby/roadie/Manifest b/dev-ruby/roadie/Manifest
index f7f2ac0a8f54..b7cf0b01988e 100644
--- a/dev-ruby/roadie/Manifest
+++ b/dev-ruby/roadie/Manifest
@@ -1,3 +1,3 @@
-DIST roadie-4.0.0.tar.gz 50727 BLAKE2B 671c5260f4a181e4a50d136e4c6e96e96a3bb51adc7cd88d070b558af0d1d858e712a8f6d586aaea5c72b735db41a54ecb1833b74b3e76f7838a3323a69fb5f3 SHA512 ad42ff83c7983e8cce1506f6b72d66e47a860251749eebd3cd65c2114859d3d8a8103d309964aa53875cb07a83393b086fb6c58db88d95a84059abb514d12665
-DIST roadie-5.0.0.tar.gz 50262 BLAKE2B 94e2ecb83252ff1e3d20dd383cef5f65922dacf0febaaad8d5943890640f0bd7cc2774cb9f0bd87faff60dee9ea1ec27c562368f451ce8811faf968c172f661e SHA512 531de622ff3c96ec702e04238c512b3b64dd352a55151db2becac0d8dc1ca933b76914058130ff468030199b7dfe80e1bb89366db2bb3b86519f74911cd4ee29
-DIST roadie-5.0.1.tar.gz 50380 BLAKE2B 38cbc3697aacc4932ec817be2face87e0eeb89b9de6053b753b4db1aadf7ef4d3205148a43a722f9d0691c3200e23d1d4cb345adb8deaebfdfa13c63238a4361 SHA512 a23aafd9cf6b21ac3ca00a29bcbf40b7c11366c09f013a31d0bc92194729735dda3370e43700fce88a3cd1e1fccfc7089b3fe126a4f95ab71f3b93a85670d623
+DIST roadie-5.1.0.tar.gz 50866 BLAKE2B efab67901951f36877cf5f4a41e604e69f672f4ba3b774a26992de947d52b8e1f1c1bf10b4d36212b80542942d29be066184fe4237ac31895ac5bbb2ca27ae80 SHA512 490a5def87bd2a33eff732fc144881fc23e8838ccbd7392a0ecabcde2eb7736445a94eb0580080d616f7c6594c63da6455f1b55636dd542372569bee4a70de78
+DIST roadie-5.2.0.tar.gz 50870 BLAKE2B ba78087e07d9135341dbe6cee3b4ff2c9a54ae8a98315447ac38b4af1f0a19b61151c209f28e5c279d87d0de97de8da517aa8313fb867babfa400e6c8f3f07cd SHA512 76123aa4d01fe847693358ceae26048510fa5c18a1489a09f09ffeffcc021baf156330a5d75fc1326936b9605a034dfa8987bb29deaa11c1e8b7bd0493054e5e
+DIST roadie-5.2.1.tar.gz 50799 BLAKE2B 9a3a228a5242d6260604ddf44fb3d804c65bf391091b3b54ff63f19b794a46cce6a963490afe497b0bb0c763204d47f33e30d0e86954d1ef50c09bc28773b764 SHA512 3cbd7026f2a4712ff1541c9584590d5bd9f1a45f18d5275ecd16b8300ae87acab47756626f9eb4b6dba200d57e040f38e0ae9e6a3bac6a0fdf3815605d2ded80
diff --git a/dev-ruby/roadie/roadie-4.0.0.ebuild b/dev-ruby/roadie/roadie-4.0.0.ebuild
deleted file mode 100644
index 019990e2ae00..000000000000
--- a/dev-ruby/roadie/roadie-4.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making HTML emails comfortable for the Rails rockstars"
-HOMEPAGE="https://github.com/Mange/roadie"
-SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.8:0
-	>=dev-ruby/css_parser-1.4.5 =dev-ruby/css_parser-1*"
-ruby_add_bdepend "test? ( dev-ruby/rspec-collection_matchers dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e 's/git ls-files/find . -type f -print/' \
-		-e '/test_files/d' \
-		-e '/css_parser/ s/~>/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/roadie/roadie-5.0.0.ebuild b/dev-ruby/roadie/roadie-5.0.0.ebuild
deleted file mode 100644
index 761869585c3e..000000000000
--- a/dev-ruby/roadie/roadie-5.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making HTML emails comfortable for the Rails rockstars"
-HOMEPAGE="https://github.com/Mange/roadie"
-SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.8:0
-	>=dev-ruby/css_parser-1.4.5 =dev-ruby/css_parser-1*"
-ruby_add_bdepend "test? ( dev-ruby/rspec-collection_matchers dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e 's/git ls-files/find * -type f -print/' \
-		-e '/test_files/d' \
-		-e '/css_parser/ s/~>/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/roadie/roadie-5.0.1.ebuild b/dev-ruby/roadie/roadie-5.0.1.ebuild
deleted file mode 100644
index 761869585c3e..000000000000
--- a/dev-ruby/roadie/roadie-5.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making HTML emails comfortable for the Rails rockstars"
-HOMEPAGE="https://github.com/Mange/roadie"
-SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.8:0
-	>=dev-ruby/css_parser-1.4.5 =dev-ruby/css_parser-1*"
-ruby_add_bdepend "test? ( dev-ruby/rspec-collection_matchers dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e 's/git ls-files/find * -type f -print/' \
-		-e '/test_files/d' \
-		-e '/css_parser/ s/~>/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/roadie/roadie-5.1.0.ebuild b/dev-ruby/roadie/roadie-5.1.0.ebuild
new file mode 100644
index 000000000000..e88322619eae
--- /dev/null
+++ b/dev-ruby/roadie/roadie-5.1.0.ebuild
@@ -0,0 +1,34 @@
+# 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_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Making HTML emails comfortable for the Rails rockstars"
+HOMEPAGE="https://github.com/Mange/roadie"
+SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.8:0
+	>=dev-ruby/css_parser-1.4.5 =dev-ruby/css_parser-1*"
+ruby_add_bdepend "test? ( dev-ruby/rspec-collection_matchers dev-ruby/webmock )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e 's/git ls-files/find * -type f -print/' \
+		-e '/test_files/d' \
+		-e '/css_parser/ s/~>/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/roadie/roadie-5.2.0.ebuild b/dev-ruby/roadie/roadie-5.2.0.ebuild
new file mode 100644
index 000000000000..756b73a5b1fe
--- /dev/null
+++ b/dev-ruby/roadie/roadie-5.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Making HTML emails comfortable for the Rails rockstars"
+HOMEPAGE="https://github.com/Mange/roadie"
+SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.15:0
+	>=dev-ruby/css_parser-1.4.5 =dev-ruby/css_parser-1*"
+ruby_add_bdepend "test? ( dev-ruby/rspec-collection_matchers dev-ruby/webmock )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e 's/git ls-files/find * -type f -print/' \
+		-e '/test_files/d' \
+		-e '/css_parser/ s/~>/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/roadie/roadie-5.2.1.ebuild b/dev-ruby/roadie/roadie-5.2.1.ebuild
new file mode 100644
index 000000000000..a2ca9a82584f
--- /dev/null
+++ b/dev-ruby/roadie/roadie-5.2.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Making HTML emails comfortable for the Rails rockstars"
+HOMEPAGE="https://github.com/Mange/roadie"
+SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.15:0
+	>=dev-ruby/css_parser-1.4.5 =dev-ruby/css_parser-1*"
+ruby_add_bdepend "test? ( dev-ruby/rspec-collection_matchers dev-ruby/webmock )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e 's/git ls-files/find * -type f -print/' \
+		-e '/test_files/d' \
+		-e '/css_parser/ s/~>/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/robots/metadata.xml b/dev-ruby/robots/metadata.xml
index 95ee895d95f5..58ae4abf30f4 100644
--- a/dev-ruby/robots/metadata.xml
+++ b/dev-ruby/robots/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zerochaos@gentoo.org</email>
-		<name>Rick Farina</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>
diff --git a/dev-ruby/robots/robots-0.10.1-r2.ebuild b/dev-ruby/robots/robots-0.10.1-r2.ebuild
deleted file mode 100644
index 93a59b26eccf..000000000000
--- a/dev-ruby/robots/robots-0.10.1-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple Ruby library to parse robots.txt"
-HOMEPAGE="https://rubygems.org/gems/robots"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e 's:rake/rdoctask:rdoc/task:' Rakefile || die
-}
diff --git a/dev-ruby/robots/robots-0.10.1-r3.ebuild b/dev-ruby/robots/robots-0.10.1-r3.ebuild
index d6175ebefe8b..71e73cbf203e 100644
--- a/dev-ruby/robots/robots-0.10.1-r3.ebuild
+++ b/dev-ruby/robots/robots-0.10.1-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
 
@@ -15,7 +15,6 @@ HOMEPAGE="https://rubygems.org/gems/robots"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
 
 all_ruby_prepare() {
 	sed -i -e 's:rake/rdoctask:rdoc/task:' Rakefile || die
diff --git a/dev-ruby/rotp/Manifest b/dev-ruby/rotp/Manifest
index 69bab31e7f7f..5d8388b777d2 100644
--- a/dev-ruby/rotp/Manifest
+++ b/dev-ruby/rotp/Manifest
@@ -1 +1,2 @@
-DIST rotp-6.2.0.tar.gz 60000 BLAKE2B dba270201593425c9282aca71efb33ecacda916996ebfffc703dd865a6c6ee3b3da4098497ce036a95157089d8d736e9413d0aa9fd0dc582d4b278ce811e05d0 SHA512 938cf9feffbe7e86f542c6dde4cd87b57e2ddd2696303e69cb76bc9fb04ffb40c9a5ef45288f23cb096d9f6706e0b48ad89907dc9322594df10c8c0521feffa1
+DIST rotp-6.2.2.tar.gz 16554 BLAKE2B ba6688238c1e0f0674cc38f8ee0a9f4db2396afbe8a66c47f309ab5b14ef80be039e76d610cd29cad7ce15f6ce2de5be4edc40f2a27841227910a71ec9c56bfc SHA512 88292c80122eec53ed9a45682263b66f1ff6aaad04e0247e235a94faa5d27c1f12398445d81152b6da5565039810f7d5a6974af4bb179a6b8e0a3282fbd6437e
+DIST rotp-6.3.0.tar.gz 17931 BLAKE2B 123ea8b4e855f4fca5edb4f752446c09e65c8a030ee684c32d34aa76db014c54e9d159ced47a2b7f39b92d97453c4ebe728ca65f70ccda0b7ebbf3c966eb4941 SHA512 99f41db28e87541a8318285efc1b57357bfeec72c62e3e8386bb4c75eda6273a992764cebf04b8548aa617fdeec6555cdd29cebe6c5fd8860cb93af62275e30f
diff --git a/dev-ruby/rotp/rotp-6.2.0.ebuild b/dev-ruby/rotp/rotp-6.2.0.ebuild
deleted file mode 100644
index cf584132bc38..000000000000
--- a/dev-ruby/rotp/rotp-6.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The Ruby One Time Password Library"
-HOMEPAGE="https://github.com/mdp/rotp"
-SRC_URI="https://github.com/mdp/rotp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-libs/openssl"
-
-ruby_add_bdepend "
-	test? (	>=dev-ruby/timecop-0.8 )
-"
-
-all_ruby_prepare() {
-	# Remove simplecov
-	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
-	# Don't require git
-	sed -i \
-		-e 's/git ls-files/find/' \
-		-e 's/{test,spec,features}/spec/' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rotp/rotp-6.2.2.ebuild b/dev-ruby/rotp/rotp-6.2.2.ebuild
new file mode 100644
index 000000000000..989365b43b73
--- /dev/null
+++ b/dev-ruby/rotp/rotp-6.2.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2021-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.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The Ruby One Time Password Library"
+HOMEPAGE="https://github.com/mdp/rotp"
+SRC_URI="https://github.com/mdp/rotp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/openssl"
+
+ruby_add_bdepend "
+	test? (	>=dev-ruby/timecop-0.8 )
+"
+
+all_ruby_prepare() {
+	# Remove simplecov
+	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+	# Don't require git
+	sed -i \
+		-e 's/git ls-files/find/' \
+		-e 's/{test,spec,features}/spec/' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rotp/rotp-6.3.0.ebuild b/dev-ruby/rotp/rotp-6.3.0.ebuild
new file mode 100644
index 000000000000..4f99b2736ab5
--- /dev/null
+++ b/dev-ruby/rotp/rotp-6.3.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The Ruby One Time Password Library"
+HOMEPAGE="https://github.com/mdp/rotp"
+SRC_URI="https://github.com/mdp/rotp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/openssl"
+
+ruby_add_bdepend "
+	test? (	>=dev-ruby/timecop-0.8 )
+"
+
+all_ruby_prepare() {
+	# Remove simplecov
+	sed -i -e '/simplecov/,/^end/ s:^:#:' -e '2irequire "uri"; require "cgi"' spec/spec_helper.rb || die
+	# Don't require git
+	sed -i \
+		-e 's/git ls-files/find/' \
+		-e 's/{test,spec,features}/spec/' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index 9b8f87f34f38..87ed71c0d291 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -1,4 +1,5 @@
-DIST rouge-3.26.0.tar.gz 971871 BLAKE2B 9739c229788d615f4875caf5d38c91ca30b4fe5703c577b2e7aa5d54bd625f33e998ee887d375d357e72c9f05ac9a284b88ce7902c6fae422e8196098a993259 SHA512 bd6006b11924b3705dc142922878dc87af25ceed8a153ad9691ad2595144ae1f3f909574799002601928e985a6650fe4c8d93e05a1e8e26bdb10e9b2f9a28765
-DIST rouge-3.26.1.tar.gz 972469 BLAKE2B 48f7741d69ce6470235ba4f469b8a37b6bac409a68ba44bce3d60f3ffc4d3cd7a1e3fc4358e4f7a4f27b27653e4525767749da5d7949a1208810f2634be2f331 SHA512 4b5d5a840dab75579e2fb10b4d86fde647ccf183b2fe496463a6ab14dfc9022fa44be9ac75e5f792bf3f2102477a40aafb5fe4694e59bfe9786d3a2d70ddb9f6
-DIST rouge-3.27.0.tar.gz 981023 BLAKE2B f0e22bf37563fc12d5308dc13c8de8230dd366eaafa12a7e3a387d4bea108fb14001b0b570e9cf8e2ffba317c7821c3b5f3f1cc0505e39e8057af5b438207235 SHA512 6f35c7bafa18c77a11131700fb8baac1f646be467224b9b863cafcf2445c54605c031009b14b57d95ad72b9311160e9d02e6b4a2bb2682ac4f5e88772a7cc695
-DIST rouge-3.28.0.tar.gz 993680 BLAKE2B 38b360bc282887913e24e8ebd5463d792d03f55e70553f93b12ee94c7e1ed9d6d2ac3d084c21d21a59480a1669b552bc10b42ec2d0e63b167f142b241ce884db SHA512 a6cb87ef7ec1eae94f127ef615b77830581d1e3a2f690e852effafd146e4456e6c931f843e9df068a750b69af8a6d8d958277d94e16550e016a58412caeba7d7
+DIST rouge-3.30.0.tar.gz 1036048 BLAKE2B 79dde9ed8a282b22aa044bef1a17cdde705e5361aa9298789d1de155260a69a200d8039c400d22db5719039d67f0d9179c31574190684da50ea64fba92c63ec8 SHA512 f21ff96d2d1f248dfffb02ea2312b4c01090b2b5664588e00763d0ede0d8af701efe0cdabb551a2debff26a301dfaffa7a07aa579d73806c6635f03dd15dcfe1
+DIST rouge-4.1.2.tar.gz 1054462 BLAKE2B 8f0aff31c6c184a9f264e27d95804c88f8a1ab43ae25237c8e24c646d46aa5e59ca1c32efb7c6c6e59b0a6edd531ae67edd7fa87906ec2f244e0086590c255a1 SHA512 835ac4b75c4c8be9d11486e2a6f5a9ecff03180bf6657d2486638f562a99420d97dd518a65fd6ffe20e7994386174887575e02f77d9c3af3aa895ff4d3a4b7f3
+DIST rouge-4.1.3.tar.gz 1056133 BLAKE2B 4c5134caf28c5bc5f8edc5aef903139f86bc6dedd268970a8a368afa6be6df2b176ab4ddd5c287482333a4863e16ccdc50de7f3830ebb57c6db3285f544f9b6c SHA512 4fa62b46477055e19070c86a5ca0164f84ec8d2d4a3a5bc5b3c84fd514353153d4caf3b3968da6dc357475f3048c684059b9ce419aa3f9986e1c9838a00d8564
+DIST rouge-4.2.0.tar.gz 1059813 BLAKE2B b6add86c73729ed3df8f24ff2b454c520416f0640e090ca04372f8f00184bbf432119993ea6b809e1aec50899bd05bccebde0ca6d35f420c8d2a1e57c61a84d2 SHA512 b0dd5fb3ec2ebb1e7cd50460ea589026e70e5ee8b7b55a9a9c48990f22d3845a5a1bb7ce83001f5316852568c8bc7bca3ee2db9deacd60cde2b42ea9ba391d18
+DIST rouge-4.2.1.tar.gz 1061430 BLAKE2B 8dcaf5f4ef17e5e44eaa3251877ddd44d8a99a36e2b7e0624910de2c21e0272b7f1f022257136be5090eebe3cab826eed7a740e5cbe50bbdd72dcd0aad9eb955 SHA512 3545e41e5815acf96fc2e48531bebf50424425bbc13816daf03376882f41319905db6fee609b2bea5c629c6056cb50ae40dd7e3dcd088cc7403506cbde5351f7
diff --git a/dev-ruby/rouge/metadata.xml b/dev-ruby/rouge/metadata.xml
index 7aa361717101..98198ea0fe7c 100644
--- a/dev-ruby/rouge/metadata.xml
+++ b/dev-ruby/rouge/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">jneen/rouge</remote-id>
+    <remote-id type="github">rouge-ruby/rouge</remote-id>
+    <remote-id type="rubygems">rouge</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rouge/rouge-3.26.0.ebuild b/dev-ruby/rouge/rouge-3.26.0.ebuild
deleted file mode 100644
index 1eac0b015dd2..000000000000
--- a/dev-ruby/rouge/rouge-3.26.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
-HOMEPAGE="https://github.com/jneen/rouge"
-SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="2"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~x86"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
-	test? ( dev-ruby/minitest-power_assert )
-	dev-ruby/yard
-"
-
-ruby_add_rdepend "dev-ruby/redcarpet"
-
-all_ruby_prepare() {
-	rm -f tasks/{check/style,update/changelog}.rake || die
-
-	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
-	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
-}
diff --git a/dev-ruby/rouge/rouge-3.26.1.ebuild b/dev-ruby/rouge/rouge-3.26.1.ebuild
deleted file mode 100644
index ed8b79f76129..000000000000
--- a/dev-ruby/rouge/rouge-3.26.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
-HOMEPAGE="https://github.com/jneen/rouge"
-SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
-	test? ( dev-ruby/minitest-power_assert )
-	dev-ruby/yard
-"
-
-ruby_add_rdepend "dev-ruby/redcarpet"
-
-all_ruby_prepare() {
-	rm -f tasks/{check/style,update/changelog}.rake || die
-
-	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
-	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
-}
diff --git a/dev-ruby/rouge/rouge-3.27.0.ebuild b/dev-ruby/rouge/rouge-3.27.0.ebuild
deleted file mode 100644
index 6b510c11b4fc..000000000000
--- a/dev-ruby/rouge/rouge-3.27.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
-HOMEPAGE="https://github.com/jneen/rouge"
-SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
-	test? ( dev-ruby/minitest-power_assert )
-	dev-ruby/yard
-"
-
-ruby_add_rdepend "dev-ruby/redcarpet"
-
-all_ruby_prepare() {
-	rm -f tasks/{check/style,update/changelog}.rake || die
-
-	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
-	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
-}
diff --git a/dev-ruby/rouge/rouge-3.28.0.ebuild b/dev-ruby/rouge/rouge-3.28.0.ebuild
deleted file mode 100644
index f5df182ee440..000000000000
--- a/dev-ruby/rouge/rouge-3.28.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
-HOMEPAGE="https://github.com/jneen/rouge"
-SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
-	test? ( dev-ruby/minitest-power_assert )
-	dev-ruby/yard
-"
-
-ruby_add_rdepend "dev-ruby/redcarpet"
-
-all_ruby_prepare() {
-	rm -f tasks/{check/style,update/changelog}.rake || die
-
-	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
-	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
-}
diff --git a/dev-ruby/rouge/rouge-3.30.0-r1.ebuild b/dev-ruby/rouge/rouge-3.30.0-r1.ebuild
new file mode 100644
index 000000000000..09285206f50f
--- /dev/null
+++ b/dev-ruby/rouge/rouge-3.30.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
+HOMEPAGE="https://github.com/jneen/rouge"
+SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="2"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
+	test? ( dev-ruby/minitest-power_assert )
+	dev-ruby/yard
+"
+
+ruby_add_rdepend "dev-ruby/redcarpet"
+
+all_ruby_prepare() {
+	rm -f tasks/{check/style,update/changelog}.rake || die
+
+	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
+	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
+}
diff --git a/dev-ruby/rouge/rouge-4.1.2.ebuild b/dev-ruby/rouge/rouge-4.1.2.ebuild
new file mode 100644
index 000000000000..746231b87f4a
--- /dev/null
+++ b/dev-ruby/rouge/rouge-4.1.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
+HOMEPAGE="https://github.com/rouge-ruby/rouge"
+SRC_URI="https://github.com/rouge-ruby/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
+	test? ( dev-ruby/minitest-power_assert )
+	dev-ruby/yard
+"
+
+ruby_add_rdepend "dev-ruby/redcarpet !<dev-ruby/rouge-3.30.0-r1"
+
+all_ruby_prepare() {
+	rm -f tasks/{check/style,update/changelog}.rake || die
+
+	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
+	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
+}
diff --git a/dev-ruby/rouge/rouge-4.1.3.ebuild b/dev-ruby/rouge/rouge-4.1.3.ebuild
new file mode 100644
index 000000000000..bbe0e3381dad
--- /dev/null
+++ b/dev-ruby/rouge/rouge-4.1.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
+HOMEPAGE="https://github.com/rouge-ruby/rouge"
+SRC_URI="https://github.com/rouge-ruby/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
+	test? ( dev-ruby/minitest-power_assert )
+	dev-ruby/yard
+"
+
+ruby_add_rdepend "dev-ruby/redcarpet !<dev-ruby/rouge-3.30.0-r1"
+
+all_ruby_prepare() {
+	rm -f tasks/{check/style,update/changelog}.rake || die
+
+	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
+	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
+}
diff --git a/dev-ruby/rouge/rouge-4.2.0.ebuild b/dev-ruby/rouge/rouge-4.2.0.ebuild
new file mode 100644
index 000000000000..da8fd295fe7b
--- /dev/null
+++ b/dev-ruby/rouge/rouge-4.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
+HOMEPAGE="https://github.com/rouge-ruby/rouge"
+SRC_URI="https://github.com/rouge-ruby/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2 MIT"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
+	test? ( dev-ruby/minitest-power_assert )
+	dev-ruby/yard
+"
+
+ruby_add_rdepend "dev-ruby/redcarpet !<dev-ruby/rouge-3.30.0-r1"
+
+all_ruby_prepare() {
+	rm -f tasks/{check/style,update/changelog}.rake || die
+
+	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
+	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
+}
diff --git a/dev-ruby/rouge/rouge-4.2.1.ebuild b/dev-ruby/rouge/rouge-4.2.1.ebuild
new file mode 100644
index 000000000000..dd5ef6a25191
--- /dev/null
+++ b/dev-ruby/rouge/rouge-4.2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
+HOMEPAGE="https://github.com/rouge-ruby/rouge"
+SRC_URI="https://github.com/rouge-ruby/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2 MIT"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc test"
+
+ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
+	test? ( dev-ruby/minitest-power_assert )
+	dev-ruby/yard
+"
+
+ruby_add_rdepend "dev-ruby/redcarpet !<dev-ruby/rouge-3.30.0-r1"
+
+all_ruby_prepare() {
+	rm -f tasks/{check/style,update/changelog}.rake || die
+
+	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
+	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
+}
diff --git a/dev-ruby/rqrcode/Manifest b/dev-ruby/rqrcode/Manifest
index 135dd45c4f95..ef4a661473c6 100644
--- a/dev-ruby/rqrcode/Manifest
+++ b/dev-ruby/rqrcode/Manifest
@@ -1,2 +1 @@
-DIST rqrcode-2.1.0.tar.gz 108317 BLAKE2B 4105929b5f63461ff7043b8a8ec0635f2c11b301f32de0fc25f1800449b105be707b82c4d5b21d5fb6a1b51bc015958ea9060af93a23adf3913994159d4ac918 SHA512 682999cab8a5eaa006992ea6b46d1fb52d5647c5c9faf8c9df9eb21d0985c8cb3f23c2692505293cdaacb63ce2bd042eeead7d779c598f708d10614934310da8
-DIST rqrcode-2.1.1.tar.gz 108586 BLAKE2B 69321f43473a831b97bcb54f4fe34318a42105fd78e34e8e8e9b3902d17480a493cbe98a9fc7a352eed5dd360fb83a916f5633c03d0e7e228542f0216266cd26 SHA512 8abc1c71c2c4f48f0c133bd7634b5a2220edfbe9eeb1cf4eb155dd3cf3450ecd57db30e23327cd279b927f5f836543364167b7d1ceb76148bea5db6dbffc4a68
+DIST rqrcode-2.2.0.tar.gz 109070 BLAKE2B 91a74a9c547f62f0cd83dd60d00b7af2c9363bd34f3987e43b637f906975f3e2b1f95ac67df80a0065fdd9fa3a7801e639fff1d2b36bcc4dc4abbc996fb6c919 SHA512 41d6882b28d15154b9cc5dc6aba30cad404aabad2b9101309bea0812b776cdb540fec3152ec5bb075f19c77a1aa67bc44d9b35e2161d189bd64a7d2517cafa63
diff --git a/dev-ruby/rqrcode/metadata.xml b/dev-ruby/rqrcode/metadata.xml
index 658c72b1920d..12fa9670bac5 100644
--- a/dev-ruby/rqrcode/metadata.xml
+++ b/dev-ruby/rqrcode/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">whomwah/rqrcode</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rqrcode/rqrcode-2.1.0.ebuild b/dev-ruby/rqrcode/rqrcode-2.1.0.ebuild
deleted file mode 100644
index e21c22e869e8..000000000000
--- a/dev-ruby/rqrcode/rqrcode-2.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="rqrcode.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for encoding QR Codes"
-HOMEPAGE="https://whomwah.github.io/rqrcode/"
-SRC_URI="https://github.com/whomwah/rqrcode/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/chunky_png:0
-	dev-ruby/rqrcode_core:1
-"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rqrcode/rqrcode-2.1.1.ebuild b/dev-ruby/rqrcode/rqrcode-2.1.1.ebuild
deleted file mode 100644
index 1697439bcf43..000000000000
--- a/dev-ruby/rqrcode/rqrcode-2.1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="rqrcode.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for encoding QR Codes"
-HOMEPAGE="https://whomwah.github.io/rqrcode/"
-SRC_URI="https://github.com/whomwah/rqrcode/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/chunky_png:0
-	dev-ruby/rqrcode_core:1
-"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rqrcode/rqrcode-2.2.0.ebuild b/dev-ruby/rqrcode/rqrcode-2.2.0.ebuild
new file mode 100644
index 000000000000..5d2f0af80d0f
--- /dev/null
+++ b/dev-ruby/rqrcode/rqrcode-2.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="rqrcode.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for encoding QR Codes"
+HOMEPAGE="https://whomwah.com/rqrcode/"
+SRC_URI="https://github.com/whomwah/rqrcode/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/chunky_png:0
+	dev-ruby/rqrcode_core:1
+"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+
+	sed -i -e "s:/tmp:${TMPDIR}:" spec/rqrcode/export_png_spec.rb || die
+}
diff --git a/dev-ruby/rqrcode_core/Manifest b/dev-ruby/rqrcode_core/Manifest
index 7ee328bb359f..c0ee56f98eba 100644
--- a/dev-ruby/rqrcode_core/Manifest
+++ b/dev-ruby/rqrcode_core/Manifest
@@ -1,3 +1 @@
-DIST rqrcode_core-0.2.0.tar.gz 20167 BLAKE2B 68ddad8e908404a9e156cffd0d1f2704671ffeaca0ce48a2a74b3512076d89812f19b537cbef98f3b0ae046486ab11f7681b187a07fb53539afb188bdcc87c21 SHA512 96a1fc3484aabfc30b9a26da705405e56cb82168d34ce252f35481b03142ddab359dfbfc4601d12f67f5a65d466120fc0a295c66c0a7ae07401b58cbd8d5c47a
-DIST rqrcode_core-1.1.0.tar.gz 20891 BLAKE2B 1900cff03c5533453147c736e254709766e8fd2c8be7ed84695682974611a573d1e4eeb34991707eae5e5b7dad31f4d2e74ac0c412f01dce67e558259608d68b SHA512 c9b571f43eb3bb50843eee480add8b5d6bbec171b7bd4f70e746aca0b0dccc321ea190a234151beb1c6d30bb56c3aa7d8d6522dfc346a46165bd90e9be9c20fd
 DIST rqrcode_core-1.2.0.tar.gz 21103 BLAKE2B 9988dc999b2853888e91b6346af074defe59dbd1be097e6c058fb7e8e68a779aedef14458ac14aa06e57e8cccdd1240e5eb003944951b47c174a1239cc35d77f SHA512 423a492b29ed8cb4e2f037305121a77f22e76dafc93675d0a24e2c6ad1918522003a8d404d55fa28e007bbb9be6d2038eafab76b2dd5e5e59c0d9adb7ab4626c
diff --git a/dev-ruby/rqrcode_core/rqrcode_core-0.2.0.ebuild b/dev-ruby/rqrcode_core/rqrcode_core-0.2.0.ebuild
deleted file mode 100644
index 71e3c38c4188..000000000000
--- a/dev-ruby/rqrcode_core/rqrcode_core-0.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="rqrcode_core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for encoding QR Codes"
-HOMEPAGE="https://github.com/whomwah/rqrcode_core/"
-SRC_URI="https://github.com/whomwah/rqrcode_core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rqrcode_core/rqrcode_core-1.1.0.ebuild b/dev-ruby/rqrcode_core/rqrcode_core-1.1.0.ebuild
deleted file mode 100644
index 243d00d0334a..000000000000
--- a/dev-ruby/rqrcode_core/rqrcode_core-1.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="rqrcode_core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for encoding QR Codes"
-HOMEPAGE="https://github.com/whomwah/rqrcode_core/"
-SRC_URI="https://github.com/whomwah/rqrcode_core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/rqrcode_core/rqrcode_core-1.2.0.ebuild b/dev-ruby/rqrcode_core/rqrcode_core-1.2.0.ebuild
index cc546529ceb1..5dd454a709bc 100644
--- a/dev-ruby/rqrcode_core/rqrcode_core-1.2.0.ebuild
+++ b/dev-ruby/rqrcode_core/rqrcode_core-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/rr/Manifest b/dev-ruby/rr/Manifest
index b3adc04c7a67..2c6f1034cecc 100644
--- a/dev-ruby/rr/Manifest
+++ b/dev-ruby/rr/Manifest
@@ -1,2 +1 @@
-DIST rr-1.2.1.tar.gz 137497 BLAKE2B 3db6751d15e54da6ee6777fb7d383c1bfea2e68482dda03ceda9a70f66382cf9aa7c39f27fca9f0ce92b19858b5324bdbb5811809b3ae146e213bb03ddca0772 SHA512 df2d05ff732908da55878cb89cb7d1c4442a18c19f71940244f5bd7dc55632467a1824f55d7fade4b5122486a61277090d7ad05df9f99098030c21aa45b36dd2
-DIST rr-3.0.9.tar.gz 140053 BLAKE2B 598a8981d9d5cc84a4a93e401a39596be3d0b81c28677ccc69dc9bffda618cc68b1fa3f723d725812305de8d58f73540fb1b12a388f2cf452f8e9ccd6649de1b SHA512 df285aa1c9c226765f33338ad267abfded568bfc2b76d7d966e20b68d849f071c2a3e3a6a666c70584993d26956a7ae0ccca8be68a66a862826c9203b0e04ee9
+DIST rr-3.1.0.tar.gz 140388 BLAKE2B 0994ae589d1d9ebe6b4a334c1e93f959b63280beff8f2a6b1696722ac908ac5a21954e65d20216c239587abdbff3a1b3110f6f1eb3f17bd5e0f169a4892e750c SHA512 d05d8421d5cd6e9225cbf5ca183c54cc510a3212f0629f7cee60887b18c874618cb67836503aed7665cef8443cc579306b84e030ae1ec0834f56298f5044a2fa
diff --git a/dev-ruby/rr/rr-1.2.1.ebuild b/dev-ruby/rr/rr-1.2.1.ebuild
deleted file mode 100644
index 0b07ec53e58d..000000000000
--- a/dev-ruby/rr/rr-1.2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A double framework featuring a selection of double techniques and a terse syntax"
-HOMEPAGE="https://rr.github.io/rr"
-SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? (
-		dev-ruby/rspec:2
-		dev-ruby/minitest
-		dev-ruby/diff-lcs )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '1,2 s:^:#:' spec/suites/rspec_2/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	# Only run the rspec 2 case since we don't have appraisals. Setting
-	# up everything correctly without it seems very complicated.
-	ruby-ng_rspec --format progress spec/suites/rspec_2/unit || die
-}
diff --git a/dev-ruby/rr/rr-3.0.9.ebuild b/dev-ruby/rr/rr-3.0.9.ebuild
deleted file mode 100644
index 3c2796a72e4e..000000000000
--- a/dev-ruby/rr/rr-3.0.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC=rr.gemspec
-
-inherit ruby-fakegem
-
-DESCRIPTION="A double framework featuring a selection of double techniques and a terse syntax"
-HOMEPAGE="https://rr.github.io/rr"
-SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? (
-		dev-ruby/minitest
-		dev-ruby/diff-lcs
-		dev-ruby/test-unit-rr )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-}
diff --git a/dev-ruby/rr/rr-3.1.0.ebuild b/dev-ruby/rr/rr-3.1.0.ebuild
new file mode 100644
index 000000000000..3b3e44be3275
--- /dev/null
+++ b/dev-ruby/rr/rr-3.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC=rr.gemspec
+
+inherit ruby-fakegem
+
+DESCRIPTION="A double framework featuring a selection of double techniques and a terse syntax"
+HOMEPAGE="https://rr.github.io/rr/"
+SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_bdepend "test? (
+		dev-ruby/minitest
+		dev-ruby/diff-lcs
+		dev-ruby/test-unit-rr )"
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/rrdtool-bindings/Manifest b/dev-ruby/rrdtool-bindings/Manifest
index 2fce6e694e1d..e3ece643a7cd 100644
--- a/dev-ruby/rrdtool-bindings/Manifest
+++ b/dev-ruby/rrdtool-bindings/Manifest
@@ -1,2 +1 @@
-DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
 DIST rrdtool-1.8.0.tar.gz 2955398 BLAKE2B d821d662af432c53760bc0e9636b84d9209933a810fa71091fc4c2b44518c89c7ad509bde7955d952279ee41464c3bfa4f631662dde61b6fff46699bb382653f SHA512 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1
diff --git a/dev-ruby/rrdtool-bindings/metadata.xml b/dev-ruby/rrdtool-bindings/metadata.xml
index 1181ab844295..4f711c39bd4e 100644
--- a/dev-ruby/rrdtool-bindings/metadata.xml
+++ b/dev-ruby/rrdtool-bindings/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="project">
-<email>ruby@gentoo.org</email>
-<name>Gentoo Ruby Project</name>
-  </maintainer>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
-  </maintainer>
-<use>
-<flag name="graph">Enable support for graphing functions</flag>
-</use>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="graph">Enable support for graphing functions</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">oetiker/rrdtool-1.x</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
deleted file mode 100644
index d52b6b98cdec..000000000000
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-RUBY_FAKEGEM_TASK_DOC=""
-inherit ruby-ng
-
-MY_P=${P/-bindings}
-MY_P=${MY_P/_/-}
-
-DESCRIPTION="Ruby bindings for rrdtool"
-HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
-SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
-RUBY_S="$MY_P"/bindings/ruby
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="graph test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( graph )"
-
-# Block on older versions of rrdtool that install the bindings themselves.
-# requires rrd_xport which requires rrd_graph
-RDEPEND="
-	~net-analyzer/rrdtool-${PV}[graph=]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( ~net-analyzer/rrdtool-${PV}[graph] )
-"
-
-all_ruby_prepare() {
-	eapply -p3 "${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch
-}
-
-each_ruby_configure() {
-	rm ../../src/rrd_config.h || die
-	touch ../../src/rrd_config.h || die
-
-	${RUBY} extconf.rb \
-		--with-cflags="${CFLAGS} $(usex graph -DHAVE_RRD_GRAPH -UHAVE_RRD_GRAPH)" || die
-}
-
-each_ruby_compile() {
-	emake V=1 ABS_TOP_SRCDIR="${PWD}/../.."
-}
-
-each_ruby_test() {
-	if use graph; then
-		${RUBY} -I. test.rb || die
-	fi
-}
-
-all_ruby_install() {
-	dodoc CHANGES README
-}
-
-each_ruby_install() {
-	DESTDIR=${D} emake install
-}
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.8.0.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.8.0.ebuild
index a30192a903de..e28cb8409d5d 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.8.0.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,19 +6,19 @@ EAPI=8
 MY_P="${P/-bindings}"
 MY_P="${MY_P/_/-}"
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby30 ruby31 ruby32"
 RUBY_FAKEGEM_TASK_DOC=""
 
 inherit ruby-ng
 
 DESCRIPTION="Ruby bindings for rrdtool"
 HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
-SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
-RUBY_S="$MY_P"/bindings/ruby
+SRC_URI="https://github.com/oetiker/${PN/-bindings}-1.x/releases/download/v${PV}/${MY_P}.tar.gz"
+RUBY_S="${MY_P}/bindings/ruby"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="graph test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( graph )"
diff --git a/dev-ruby/rspec-block_is_expected/Manifest b/dev-ruby/rspec-block_is_expected/Manifest
new file mode 100644
index 000000000000..b3989f62ba64
--- /dev/null
+++ b/dev-ruby/rspec-block_is_expected/Manifest
@@ -0,0 +1 @@
+DIST rspec-block_is_expected-1.0.5.tar.gz 20486 BLAKE2B 6ec1ffb606c646aae6f63845697d461946a7a3574b82506207f81f49c6d50282370b716f1d124b98cb19b79591522caf408fa978b2c0b423a3d6c9b986b32272 SHA512 4423948605ca58e15d4b6994cce6850487e72c265feda6461e6614374af4a6fef22329e1d62668b4930273c3f0f68348fdacaf67acbd4eeff771c8779d007194
diff --git a/dev-ruby/rspec-block_is_expected/metadata.xml b/dev-ruby/rspec-block_is_expected/metadata.xml
new file mode 100644
index 000000000000..c672ba5197f4
--- /dev/null
+++ b/dev-ruby/rspec-block_is_expected/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">pboling/rspec-block_is_expected</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/rspec-block_is_expected/rspec-block_is_expected-1.0.5.ebuild b/dev-ruby/rspec-block_is_expected/rspec-block_is_expected-1.0.5.ebuild
new file mode 100644
index 000000000000..5958292deed3
--- /dev/null
+++ b/dev-ruby/rspec-block_is_expected/rspec-block_is_expected-1.0.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="rspec-block_is_expected.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simplify testing of blocks in RSpec"
+HOMEPAGE="https://github.com/pboling/rspec-block_is_expected"
+SRC_URI="https://github.com/pboling/rspec-block_is_expected/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE=""
+SLOT="1"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+
+ruby_add_depend "test? ( >=dev-ruby/rspec-pending_for-0.1:0 )"
diff --git a/dev-ruby/rspec-collection_matchers/Manifest b/dev-ruby/rspec-collection_matchers/Manifest
index 5649a1ee0db4..bde768f97edf 100644
--- a/dev-ruby/rspec-collection_matchers/Manifest
+++ b/dev-ruby/rspec-collection_matchers/Manifest
@@ -1 +1,2 @@
 DIST rspec-collection_matchers-1.2.0.gem 17408 BLAKE2B 9ad83ec161d5cee74e6017a137c955a55262e05e4a82b14270887e0433b88ff3aec7245ea1a1707035dc6d2de19b2d6c27b952ad43882cc516a770bafd0b5a0d SHA512 0988cabcd8873cbb7161fda3500ae77ae299024a25a1f3faa71cad673777097518db5fddc9ff0ca8e25653c4e790b7ba76fe234596848816276defddef2e308c
+DIST rspec-collection_matchers-1.2.1.gem 17920 BLAKE2B 51920d0bc10503c64d4033e098b8c58ddac91cd3c89124aba712c965fe65f979ebc5de67527d4ec80867ce5045833f0169bf95ed61370d836a4f3d0493d80efc SHA512 7b514f4935e2e1f4612cb3e0138f8735e856f23bd6acdf99c452671441529ec70d5caedaf42fa48b3f64bbeb9addf7d87f5955d9ca460cf074a6218db0e36c4f
diff --git a/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.2.0.ebuild b/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.2.0.ebuild
index 4cf2a374f467..c06fd5801fd6 100644
--- a/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.2.0.ebuild
+++ b/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.2.0.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"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.2.1.ebuild b/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.2.1.ebuild
new file mode 100644
index 000000000000..bbf149011430
--- /dev/null
+++ b/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.2.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-collection_matchers"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rspec-expectations-3.0.0"
+
+ruby_add_bdepend "test? ( >=dev-ruby/activemodel-3.0 )"
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index d0677c9d5386..4f88efb198e9 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,5 +1,3 @@
-DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab63230ab07ea97928d6f66face8d07ab54d87f19535f5f235c441b2da6dec17ef2a889e9ccd7e83d987086e24afd1b82 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44
-DIST rspec-core-3.10.1-git.tgz 398302 BLAKE2B 3ecd2a93b77435ef44dd7e52e2987155f71de3b04376dfbfc9c831ce075b4105f6a23a210f8508784b66c46f1126c188a3bd0548cc4f24060373b9c7e0b79101 SHA512 2d134e742e36cfaac0a52fa7ebd949391cfe58419956536a65fa3aefa2c7f3638fe19f7324ca3e0d2642cc5a9d33de11b09bd571844f1cfae9c077e5f27563d5
-DIST rspec-core-3.10.2-git.tgz 400299 BLAKE2B 82fe8689022f69f444549d654cd4799f8f1dff7c984016eba0835cffb518dce892a0af61a3ef6b251c598aa3caac66b0498620dc8d2b06a02795fc6ff3f46c41 SHA512 0ebeea8aed275f08bcac4846977b0718f85d95dedaed82b99280e5b52519713be6234d97b34b61a56e3276e767f47a13e6888401bd5a4b8a0003c9bbb518364d
-DIST rspec-core-3.11.0-git.tgz 403154 BLAKE2B 1a5043bd2120236e8e3ca931c1fd9562bc78d692674d3133ac3742ef7b7f81161a7fc550f4d11bf34575a85a8657aeb39fcc0fdccaab67cc189cc1d39a303ade SHA512 6121b805f6feade244fe13e273526e64c5a3c74a1f9d4316c895279f4ed8576dbe3189b06040f3f29fe7d3e90f862f2c78aacb0b4bef989660eae30d046ed69c
-DIST rspec-core-3.9.3-git.tgz 396080 BLAKE2B ea52a33586dc32af49a72950c7dbf24eef52a74891b2d7004ec4c5083e2e6d63c602f5033fba3a8ec1dfe6e8da349208b468a79b4e16aa5150d2fc8e93055c0e SHA512 f821ae3017c0fd9ac7f3ced0e81d0ebc54f2c17261f426c58a46c0bf1debb20efca7acc4b751b671e160de72ce5790f897bcb55d5d276fab228a4ea8d388a046
+DIST rspec-core-3.12.2-git.tgz 409039 BLAKE2B 087b08b6a5231a050d89dc8ec1648509b47078b54c05e5effc02cfcdd0f4cae9fa85f7dc02d643a6e81eb9e4c1dca54d6f4e0b0f79a5d91072c1934fddac9169 SHA512 6ecd39355a5060dbf820b89f2f5958b7e75a185e003036cb0ceb8dd6021d79fa14495a300acdc019b55e174bf8a6be42022bfeb0f22a35c461c0f81cd1a742fd
+DIST rspec-core-3.12.3-git.tgz 409316 BLAKE2B 7d7ab38346895499403ff5ce7770f7605ebefa9ffcdb3feee4a01df27731fea3d98f22481a242f3799ff104c040312cbb7794b947b6f95ba69e8b571971e056b SHA512 d2e6ee6638dacc629e6f772840e2d384e07408e2d459dbd8c68404398df466afad9df1929b6a4e23ca10beab22b7f24efa725806bb9a6dd855adc5ad3eb17c4e
+DIST rspec-core-3.13.0-git.tgz 412734 BLAKE2B a3808e96fa58250f606aab757d0b09dc8bd06c9cc7ce375b5ffb97f4a0fbde456f4d3b3f190b1f70393ae6765c2f29dbd7876c92d9e19318460b8956772f04bd SHA512 4d84384c8a8d22b72d1cdab40f1fe43dec7a5c0dd1ab2ce11739e1a52510c6deea6417130bf100d582cae7293aabee6217f21cd80d4b92f976119bba465650bb
diff --git a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
deleted file mode 100644
index e8fda14e45c7..000000000000
--- a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		dev-ruby/syntax
-		>=dev-ruby/rspec-expectations-2.14.0:2
-		>=dev-ruby/rspec-mocks-2.99.0:2
-		dev-ruby/rspec:2
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e '/git ls-files/ s:^:#:' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/aruba/ s:^:#:' -e '/Aruba/,/}/ s:^:#:' spec/spec_helper.rb || die
-	rm spec/command_line/order_spec.rb || die
-
-	# Avoid testing issues with rspec 3 installed
-	sed -i -e '2igem "rspec", "~> 2.0"' bin/rspec || die
-
-	# Remove minor functionality to remain compatible with rake 12
-	sed -i -e '/last_comment/ s:^:#:' lib/rspec/core/rake_task.rb || die
-
-	# Avoid autotest specs since this is no longer part of zentest
-	sed -i -e '/autotest/ s:^:#:' spec/spec_helper.rb || die
-	rm -rf spec/autotest || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-
-	case ${RUBY} in
-		*ruby24)
-			sed -i -e 's/SAFE = 3/SAFE = 1/' spec/support/helper_methods.rb || die
-			sed -i -e 's/Fixnum: 4/Integer: 4/' spec/rspec/core/memoized_helpers_spec.rb || die
-			sed -i -e '/warns when HOME env var is not set/,/^  end/ s:^:#:' spec/rspec/core/configuration_options_spec.rb || die
-			;;
-		*ruby25)
-			sed -i -e 's/SAFE = 3/SAFE = 1/' spec/support/helper_methods.rb || die
-			sed -i -e 's/Fixnum: 4/Integer: 4/' spec/rspec/core/memoized_helpers_spec.rb || die
-			sed -i -e '/warns when HOME env var is not set/,/^  end/ s:^:#:' spec/rspec/core/configuration_options_spec.rb || die
-			sed -i -e '/with mathn loaded/,/^          end/ s:^:#:' spec/rspec/core/formatters/html_formatter_spec.rb || die
-			sed -i -e '/with mathn loaded/,/^    end/ s:^:#:' spec/rspec/core/formatters/helpers_spec.rb || die
-			sed -i -e '/is still a private method/,/end/ s:^:#:' spec/rspec/core/memoized_helpers_spec.rb || die
-			sed -i -e '/leaves a raised exception unmodified/,/^      end/ s:^:#:' spec/rspec/core/example_spec.rb || die
-			;;
-		*ruby26)
-			sed -i -e 's/SAFE = 3/SAFE = 0/' spec/support/helper_methods.rb || die
-			sed -i -e 's/Fixnum: 4/Integer: 4/' spec/rspec/core/memoized_helpers_spec.rb || die
-			sed -i -e '/warns when HOME env var is not set/,/^  end/ s:^:#:' spec/rspec/core/configuration_options_spec.rb || die
-			sed -i -e '/with mathn loaded/,/^          end/ s:^:#:' spec/rspec/core/formatters/html_formatter_spec.rb || die
-			sed -i -e '/with mathn loaded/,/^    end/ s:^:#:' spec/rspec/core/formatters/helpers_spec.rb || die
-			sed -i -e '/is still a private method/,/end/ s:^:#:' spec/rspec/core/memoized_helpers_spec.rb || die
-			sed -i -e '/leaves a raised exception unmodified/,/^      end/ s:^:#:' spec/rspec/core/example_spec.rb || die
-			;;
-		*ruby27)
-			sed -i -e 's/SAFE = 3/SAFE = 0/' spec/support/helper_methods.rb || die
-			sed -i -e 's/Fixnum: 4/Integer: 4/' spec/rspec/core/memoized_helpers_spec.rb || die
-			sed -i -e '/warns when HOME env var is not set/,/^  end/ s:^:#:' spec/rspec/core/configuration_options_spec.rb || die
-			sed -i -e '/with mathn loaded/,/^          end/ s:^:#:' spec/rspec/core/formatters/html_formatter_spec.rb || die
-			sed -i -e '/with mathn loaded/,/^    end/ s:^:#:' spec/rspec/core/formatters/helpers_spec.rb || die
-			sed -i -e '/is still a private method/,/end/ s:^:#:' spec/rspec/core/memoized_helpers_spec.rb || die
-			sed -i -e '/leaves a raised exception unmodified/,/^      end/ s:^:#:' spec/rspec/core/example_spec.rb || die
-			sed -i -e '/PROC_HEX_NUMBER =/ s/@//' lib/rspec/core/filter_manager.rb || die
-			;;
-	esac
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-2 'gem "rspec", "~>2.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
deleted file mode 100644
index 3c5e9c4f2ca8..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="highlight"
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	highlight? ( >=dev-ruby/coderay-1.1.1 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.1.1
-		dev-ruby/syntax
-		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/rspec-expectations-3.8.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-		>=dev-ruby/rspec-support-3.9.1:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/support/aruba_support.rb || die
-	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
-	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
-
-	# Avoid a spec failing due to path issues
-	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
-		spec/rspec/core/configuration_spec.rb || die
-
-	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
-	# dependencies, bug 662328
-	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
-
-	# Avoid a spec depending on specifics on local networks
-	# This fails when localhost resolves to ::1 which may be a
-	# ruby regression in the drb/acl code.
-	rm -f spec/rspec/core/bisect/server_spec.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.10.2.ebuild b/dev-ruby/rspec-core/rspec-core-3.10.2.ebuild
deleted file mode 100644
index 4fcf7ab73a72..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.10.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="highlight"
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	highlight? ( >=dev-ruby/coderay-1.1.1 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.1.1
-		dev-ruby/syntax
-		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/rspec-expectations-3.8.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-		>=dev-ruby/rspec-support-3.9.1:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/support/aruba_support.rb || die
-	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
-	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
-
-	# Avoid a spec failing due to path issues
-	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
-		spec/rspec/core/configuration_spec.rb || die
-
-	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
-	# dependencies, bug 662328
-	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
-
-	# Avoid a spec depending on specifics on local networks
-	# This fails when localhost resolves to ::1 which may be a
-	# ruby regression in the drb/acl code.
-	rm -f spec/rspec/core/bisect/server_spec.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.11.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.11.0.ebuild
deleted file mode 100644
index 0b23febeb669..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.11.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="highlight"
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	highlight? ( >=dev-ruby/coderay-1.1.1 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.1.1
-		dev-ruby/syntax
-		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/rspec-expectations-3.8.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-		>=dev-ruby/rspec-support-3.9.1:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/support/aruba_support.rb || die
-	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
-	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
-
-	# Avoid a spec failing due to path issues
-	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
-		spec/rspec/core/configuration_spec.rb || die
-
-	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
-	# dependencies, bug 662328
-	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
-
-	# Avoid a spec depending on specifics on local networks
-	# This fails when localhost resolves to ::1 which may be a
-	# ruby regression in the drb/acl code.
-	rm -f spec/rspec/core/bisect/server_spec.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.12.2.ebuild b/dev-ruby/rspec-core/rspec-core-3.12.2.ebuild
new file mode 100644
index 000000000000..2f60929f76dc
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.12.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="highlight"
+
+SUBVERSION="$(ver_cut 1-2)"
+
+DEPEND+="test? ( dev-vcs/git )"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-support-${SUBVERSION}*
+	highlight? ( >=dev-ruby/coderay-1.1.1 )
+"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/coderay-1.1.1
+		dev-ruby/syntax
+		>=dev-ruby/thread_order-1.1.0
+		>=dev-ruby/rspec-expectations-3.8.0:3
+		>=dev-ruby/rspec-mocks-2.99.0:3
+		>=dev-ruby/rspec-support-3.9.1:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Avoid dependency on cucumber since we can't run the features anyway.
+	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+	# Duplicate exe also in bin. We can't change it since internal stuff
+	# also depends on this and fixing that is going to be fragile. This
+	# way we can at least install proper bin scripts.
+	cp -R exe bin || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
+
+	# Avoid aruba dependency so that we don't end up in dependency hell.
+	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/support/aruba_support.rb || die
+	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
+	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
+
+	# Avoid a spec failing due to path issues
+	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
+		spec/rspec/core/configuration_spec.rb || die
+
+	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
+	# dependencies, bug 662328
+	sed -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' \
+		-i spec/rspec/core_spec.rb || die
+
+	# Avoid a spec depending on specifics on local networks
+	# This fails when localhost resolves to ::1 which may be a
+	# ruby regression in the drb/acl code.
+	rm -f spec/rspec/core/bisect/server_spec.rb || die
+
+	# Avoid old regression check (already fixed upstream)
+	sed -i -e '/uses only one thread local variable/askip "old safety check"' spec/rspec/core_spec.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}
diff --git a/dev-ruby/rspec-core/rspec-core-3.12.3.ebuild b/dev-ruby/rspec-core/rspec-core-3.12.3.ebuild
new file mode 100644
index 000000000000..13e66548c64d
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.12.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="highlight test"
+
+SUBVERSION="$(ver_cut 1-2)"
+
+DEPEND+="test? ( dev-vcs/git )"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-support-${SUBVERSION}*
+	highlight? ( >=dev-ruby/coderay-1.1.1 )
+"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/coderay-1.1.1
+		dev-ruby/syntax
+		>=dev-ruby/thread_order-1.1.0
+		>=dev-ruby/rspec-expectations-3.8.0:3
+		>=dev-ruby/rspec-mocks-2.99.0:3
+		>=dev-ruby/rspec-support-3.9.1:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Avoid dependency on cucumber since we can't run the features anyway.
+	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+	# Duplicate exe also in bin. We can't change it since internal stuff
+	# also depends on this and fixing that is going to be fragile. This
+	# way we can at least install proper bin scripts.
+	cp -R exe bin || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
+
+	# Avoid aruba dependency so that we don't end up in dependency hell.
+	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/support/aruba_support.rb || die
+	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
+	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
+
+	# Avoid a spec failing due to path issues
+	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
+		spec/rspec/core/configuration_spec.rb || die
+
+	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
+	# dependencies, bug 662328
+	sed -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' \
+		-i spec/rspec/core_spec.rb || die
+
+	# Avoid a spec depending on specifics on local networks
+	# This fails when localhost resolves to ::1 which may be a
+	# ruby regression in the drb/acl code.
+	rm -f spec/rspec/core/bisect/server_spec.rb || die
+
+	# Avoid old regression check (already fixed upstream)
+	sed -i -e '/uses only one thread local variable/askip "old safety check"' spec/rspec/core_spec.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}
diff --git a/dev-ruby/rspec-core/rspec-core-3.13.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.13.0.ebuild
new file mode 100644
index 000000000000..13e66548c64d
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.13.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="highlight test"
+
+SUBVERSION="$(ver_cut 1-2)"
+
+DEPEND+="test? ( dev-vcs/git )"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-support-${SUBVERSION}*
+	highlight? ( >=dev-ruby/coderay-1.1.1 )
+"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/coderay-1.1.1
+		dev-ruby/syntax
+		>=dev-ruby/thread_order-1.1.0
+		>=dev-ruby/rspec-expectations-3.8.0:3
+		>=dev-ruby/rspec-mocks-2.99.0:3
+		>=dev-ruby/rspec-support-3.9.1:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Avoid dependency on cucumber since we can't run the features anyway.
+	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+	# Duplicate exe also in bin. We can't change it since internal stuff
+	# also depends on this and fixing that is going to be fragile. This
+	# way we can at least install proper bin scripts.
+	cp -R exe bin || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
+
+	# Avoid aruba dependency so that we don't end up in dependency hell.
+	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/support/aruba_support.rb || die
+	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
+	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
+
+	# Avoid a spec failing due to path issues
+	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
+		spec/rspec/core/configuration_spec.rb || die
+
+	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
+	# dependencies, bug 662328
+	sed -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' \
+		-i spec/rspec/core_spec.rb || die
+
+	# Avoid a spec depending on specifics on local networks
+	# This fails when localhost resolves to ::1 which may be a
+	# ruby regression in the drb/acl code.
+	rm -f spec/rspec/core/bisect/server_spec.rb || die
+
+	# Avoid old regression check (already fixed upstream)
+	sed -i -e '/uses only one thread local variable/askip "old safety check"' spec/rspec/core_spec.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}
diff --git a/dev-ruby/rspec-core/rspec-core-3.9.3.ebuild b/dev-ruby/rspec-core/rspec-core-3.9.3.ebuild
deleted file mode 100644
index 08da7b72ca8b..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.9.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="highlight"
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	highlight? ( >=dev-ruby/coderay-1.1.1 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.1.1
-		dev-ruby/syntax
-		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/rspec-expectations-3.8.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-		>=dev-ruby/rspec-support-3.9.1:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/support/aruba_support.rb || die
-	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
-	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
-
-	# Avoid a spec failing due to path issues
-	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
-		spec/rspec/core/configuration_spec.rb || die
-
-	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
-	# dependencies, bug 662328
-	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
-
-	# Avoid a spec depending on specifics on local networks
-	# This fails when localhost resolves to ::1 which may be a
-	# ruby regression in the drb/acl code.
-	rm -f spec/rspec/core/bisect/server_spec.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 59cd523675a7..8b3f0c3b82f1 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -1,5 +1,3 @@
-DIST rspec-expectations-2.99.2-git.tgz 106884 BLAKE2B 5b31c8681306d5c688f62fc3fc6adf7be6cabad6df6fd16195c71787d73495924233d793633fa041a94d796f63c9ff97c58e6f4a75bdc09dfbe56e770bb6a5c9 SHA512 6042cafe225b2b16df458c7bf69e1694b637afcac6f6195e35a0be199432610457ccaa3e7e4bd114b27a7a6c3d530d94f4c0603c65f469cbadc55bd3f75b6f3a
-DIST rspec-expectations-3.10.1-git.tgz 212281 BLAKE2B a1872a7f71c198db1662eca48bcb34c054f05c16193395962cb47a7fa230c2f0f83bedee302a0ab6a81380a361640177ac3370d8829faa6bd362c07e3a551e5e SHA512 35999542bf70ff04a472e50434abb8815cac8bf10b680da458f5e0e6ee290a1a6356a22cc12f0a8a6310cf282bb6cd99f922fcc63a0cf1e252b167e451bcf7d4
-DIST rspec-expectations-3.10.2-git.tgz 213253 BLAKE2B 51c306d34dfd82d551b8390bed9790748f8f62b9f4b5243399486640d04465dc0c33756f7a575e98c8e61310cf6c25b93b4c1102fc1798814d916defb0ad310e SHA512 819f1b9e881a56d5563c9421e3e897726931c3cb27be5554e35f41077656e426cbac1ddced6a6e61ba21faa7c147c239433ddb9d21ae2e88592d91b286c170a7
-DIST rspec-expectations-3.11.0-git.tgz 214878 BLAKE2B f830a0a31fb0e7cd6639e711e4daa9faa98e514b6a1dd864c383259d199dc617c6c7ff45dc65f37cf53d3c4581c6ecb9148e42b77f3c37541d8985714d62af23 SHA512 209eabafe92db3de1a78524d98facda16b3f5fef11f8f0c8c74bc6fc68529c8d9a835a8196e84b8b8bdf828d548d4b00bb1acdd607cab14dad7874f55a42b0c6
-DIST rspec-expectations-3.9.4-git.tgz 206297 BLAKE2B c5dbebcf7b411c9cb5cd815dc06fb6f455e82181856661110f803b25f3910975f0676f3cf154e93fe771849363593e104e0f2dd298dfd3d8b1dd96a6ff991547 SHA512 bd025b89751b5b8d3c6bd61a90386fc05ca371e04247d93b29334bbb3eceb84bacea3f3846c20f08dbf53f174992b2dc0fe9f2bc449c4591188b5e428b1d8003
+DIST rspec-expectations-3.12.3-git.tgz 218754 BLAKE2B be6c6c50115bec39758f792030363de88abf5affa8a4df1161a386fee3dfb620542fca6225779e76aa2e72d1f782b65ef9db393be061e9ed47c72d96f47cf981 SHA512 37f85555e0ba16b1a76f8d59571312febfc802eab1a27ff788d57bb34f410867e753dcfee83ca3d70367b77ad9f823341c653901c8ff02c75df6863937c71315
+DIST rspec-expectations-3.12.4-git.tgz 219529 BLAKE2B 8858b586cb2b50f06c93530304ca554ddff9f3fe7078e1e2f263ab352e8315d3529bd8028b835d8b83d49bc06345a0723d2fbf31849552ef53567f2162eb503c SHA512 9317d91fb5fb02c1319010517df6f28bc117cccb3b8fd4226bd1adde00fbf13d1505be89cd036bd1849b9a142e24ec966afa536144e384700f8d11e640e2eaf9
+DIST rspec-expectations-3.13.0-git.tgz 220792 BLAKE2B 526282d357f47d82163b8a44f5fffc0ce24f0fef0d0f5c5f33da93c91680ae704a065c4903a8b7eb3b619d3910314ff137d1c7b636207c0a3383ed0520e2ffaa SHA512 9e1e502d12704fd7573a57b7f01cf4ffe97e2eefe83dc3144842f460165304dc234a1b1946147f2cbcae105d755c8b42b25aec815f9af0c67844baf858c0a6c7
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
deleted file mode 100644
index 006ae650cb53..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="http://rspec.rubyforge.org/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/diff-lcs-1.1.3"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/rspec-core-2.99.0:2
-		>=dev-ruby/rspec-mocks-2.14.0:2
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	# fix up the gemspecs
-	sed -i \
-		-e '/git ls/d' \
-		-e '/add_development_dependency/d' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-
-	# Avoid a weird, and failing, test testing already installed code.
-	sed -e '/has an up-to-date caller_filter file/,/end/ s:^:#:' -i spec/rspec/expectations_spec.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's/of Fixnum/of Integer/' spec/rspec/expectations/expectation_target_spec.rb spec/rspec/matchers/be_instance_of_spec.rb || die
-}
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
deleted file mode 100644
index 7ff27b85ca39..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-expectations"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*
-	=dev-ruby/rspec-support-${SUBVERSION}*"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/rspec-mocks-3.2.0:3
-		>=dev-ruby/rspec-support-3.5.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm -f Gemfile || die
-
-	# fix up the gemspecs
-	sed -i \
-		-e '/git ls/d' \
-		-e '/add_development_dependency/d' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-}
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.10.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.10.2.ebuild
deleted file mode 100644
index 89b2242466ee..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.10.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-expectations"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*
-	=dev-ruby/rspec-support-${SUBVERSION}*"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/rspec-mocks-3.2.0:3
-		>=dev-ruby/rspec-support-3.5.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm -f Gemfile || die
-
-	# fix up the gemspecs
-	sed -i \
-		-e '/git ls/d' \
-		-e '/add_development_dependency/d' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-}
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.11.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.11.0.ebuild
deleted file mode 100644
index 77f827dd4953..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.11.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-expectations"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*
-	=dev-ruby/rspec-support-${SUBVERSION}*"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/rspec-mocks-3.2.0:3
-		>=dev-ruby/rspec-support-3.5.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm -f Gemfile || die
-
-	# fix up the gemspecs
-	sed -i \
-		-e '/git ls/d' \
-		-e '/add_development_dependency/d' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-}
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.12.3.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.12.3.ebuild
new file mode 100644
index 000000000000..b51feaceeda1
--- /dev/null
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.12.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-expectations"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*
+	=dev-ruby/rspec-support-${SUBVERSION}*"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/rspec-mocks-3.2.0:3
+		>=dev-ruby/rspec-support-3.5.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Fix minitest deprecation
+	sed -i -e 's/MiniTest/Minitest/' spec/rspec/expectations/minitest_integration_spec.rb || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm -f Gemfile || die
+
+	# fix up the gemspecs
+	sed -i \
+		-e '/git ls/d' \
+		-e '/add_development_dependency/d' \
+		"${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.12.4.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.12.4.ebuild
new file mode 100644
index 000000000000..96e2fb7e5b11
--- /dev/null
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.12.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-expectations"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*
+	=dev-ruby/rspec-support-${SUBVERSION}*"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/rspec-mocks-3.2.0:3
+		>=dev-ruby/rspec-support-3.5.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Fix minitest deprecation
+	sed -i -e 's/MiniTest/Minitest/' spec/rspec/expectations/minitest_integration_spec.rb || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm -f Gemfile || die
+
+	# fix up the gemspecs
+	sed -i \
+		-e '/git ls/d' \
+		-e '/add_development_dependency/d' \
+		"${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.13.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.13.0.ebuild
new file mode 100644
index 000000000000..96e2fb7e5b11
--- /dev/null
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.13.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-expectations"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*
+	=dev-ruby/rspec-support-${SUBVERSION}*"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/rspec-mocks-3.2.0:3
+		>=dev-ruby/rspec-support-3.5.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Fix minitest deprecation
+	sed -i -e 's/MiniTest/Minitest/' spec/rspec/expectations/minitest_integration_spec.rb || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm -f Gemfile || die
+
+	# fix up the gemspecs
+	sed -i \
+		-e '/git ls/d' \
+		-e '/add_development_dependency/d' \
+		"${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.9.4.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.9.4.ebuild
deleted file mode 100644
index a075d100db38..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.9.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-expectations"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 <dev-ruby/diff-lcs-2
-	=dev-ruby/rspec-support-${SUBVERSION}*"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/rspec-mocks-3.2.0:3
-		>=dev-ruby/rspec-support-3.5.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm -f Gemfile || die
-
-	# fix up the gemspecs
-	sed -i \
-		-e '/git ls/d' \
-		-e '/add_development_dependency/d' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-}
diff --git a/dev-ruby/rspec-files/Manifest b/dev-ruby/rspec-files/Manifest
new file mode 100644
index 000000000000..756ecf8ff710
--- /dev/null
+++ b/dev-ruby/rspec-files/Manifest
@@ -0,0 +1 @@
+DIST rspec-files-1.1.3.tar.gz 6006 BLAKE2B 30f648f1d364532f81ed169a9f1e32d0cd9cd641093f8aad90b3aa4b239ee30d38ef3331136c47787203dceeada25a499bb0b1f42b08dacffb431835dbfa9698 SHA512 c2c79d0b0cef7db64e83e3335a552f437f2e1a12d703936a2d9dc8b8c81ebf69913302d1d5f65e1485fb0295af8b098c8b25ad4c335a7f8f3d31e0f086d46d2d
diff --git a/dev-ruby/rspec-files/metadata.xml b/dev-ruby/rspec-files/metadata.xml
new file mode 100644
index 000000000000..dfae27f7746a
--- /dev/null
+++ b/dev-ruby/rspec-files/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">socketry/rspec-files</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/rspec-files/rspec-files-1.1.3.ebuild b/dev-ruby/rspec-files/rspec-files-1.1.3.ebuild
new file mode 100644
index 000000000000..26bbbd9b8ac3
--- /dev/null
+++ b/dev-ruby/rspec-files/rspec-files-1.1.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="RSpec helpers for buffering and detecting file descriptor leaks"
+HOMEPAGE="https://github.com/socketry/rspec-files"
+SRC_URI="https://github.com/socketry/rspec-files/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+
+ruby_add_rdepend "dev-ruby/rspec:3"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid a test dependency on unpackaged covered
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rspec-its/rspec-its-1.3.0-r1.ebuild b/dev-ruby/rspec-its/rspec-its-1.3.0-r1.ebuild
index 70cb71d2746c..b74125a2ffbb 100644
--- a/dev-ruby/rspec-its/rspec-its-1.3.0-r1.ebuild
+++ b/dev-ruby/rspec-its/rspec-its-1.3.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="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rspec/rspec-its"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rspec-core-3.0.0 >=dev-ruby/rspec-expectations-3.0.0"
diff --git a/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.2.0-r1.ebuild b/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.2.0-r1.ebuild
index 2970fd988c41..7e11048e3ef8 100644
--- a/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.2.0-r1.ebuild
+++ b/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.2.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.2.0.ebuild b/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.2.0.ebuild
deleted file mode 100644
index 85d7523db3fd..000000000000
--- a/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Set of matchers and helpers to allow you test your APIs responses"
-HOMEPAGE="https://github.com/waterlink/rspec-json_expectations"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rspec dev-util/cucumber )"
-
-each_ruby_test() {
-	${RUBY} -S cucumber --format progress features || die
-}
diff --git a/dev-ruby/rspec-memory/Manifest b/dev-ruby/rspec-memory/Manifest
new file mode 100644
index 000000000000..e645830dffeb
--- /dev/null
+++ b/dev-ruby/rspec-memory/Manifest
@@ -0,0 +1 @@
+DIST rspec-memory-1.0.4.tar.gz 9329 BLAKE2B e67f8c2a9b788dc606ba31667065910a8dc4e68bf7a6fd0866c75eeba61851d1a1d8f93068bfc8449906120edc22d465733852ba75e6978e7f39131077907c90 SHA512 2d5f5dcd17572e17a37b59c08f1a8e6f23aa5228fea127f3a7d92afc15b54c0b067c697b5817dcbe1b4bc4d3839eccda13928cea23d83c308e57f0d06d9321b1
diff --git a/dev-ruby/rspec-memory/metadata.xml b/dev-ruby/rspec-memory/metadata.xml
new file mode 100644
index 000000000000..87c955dadfb9
--- /dev/null
+++ b/dev-ruby/rspec-memory/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">socketry/rspec-memory</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/rspec-memory/rspec-memory-1.0.4.ebuild b/dev-ruby/rspec-memory/rspec-memory-1.0.4.ebuild
new file mode 100644
index 000000000000..e1be5caded9b
--- /dev/null
+++ b/dev-ruby/rspec-memory/rspec-memory-1.0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="RSpec helpers for checking memory allocations"
+HOMEPAGE="https://github.com/socketry/rspec-memory"
+SRC_URI="https://github.com/socketry/rspec-memory/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rspec:3"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid test dependency on unpackaged covered
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index ae4aefbc18c3..f8b1647486ee 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -1,6 +1,3 @@
-DIST rspec-mocks-2.99.2-git.tgz 101731 BLAKE2B 27ae180381d427b642c53c351e7b53602caba4252ddf5393949d940be8474110eb0697901afaaa878cd8d368f081c6644c0fcbce86d9d14b9f93f48c027ae808 SHA512 dd3b9394d56de8d3089db7777cda1e1a5bbdc46486876a99a8a83b602b84ba0320913d8e8dabe5e0367645eb01b943607b93e67d87cc26e380c8db6e048e4e0d
-DIST rspec-mocks-3.10.2-git.tgz 196040 BLAKE2B 8e975dc8480d4709f650ff27c517104714156c551b8b9ec04681132bd92be80bdb11867730f462e7fb6b672430246a0a11404dec5638b5350b57d81a8eac2e57 SHA512 ab11fa77c5f9e3bec2003dc8825d9582dcbffa08a36818bd9cdbe2dfd357113de3712c818deafc165530f9e4d2683ec06e54d37c37aeb820ae3cd592f76cf2cb
-DIST rspec-mocks-3.10.3-git.tgz 196996 BLAKE2B 22759a11cefbaccfef52b2a1a37131d3d0b6eb5eb20d042172cf30e14816112bce729c2648c0b22a6506f9959fd336024710e18882bbe42f42144f0bd43e1281 SHA512 b116094873f682f14cb38a5dd7c0aa8fffac868ca28f7302bbc655bfb0c0ff64afe345b71b797d01028d9fbdad97df5ecf8398a82fc0a7252f2b47a963dbeac0
-DIST rspec-mocks-3.11.0-git.tgz 198287 BLAKE2B 74b4abec79dc601fe734e0f657b239c2435b679d5624fad1fa9318eb4822be6d3899778af656913d3a89fd51a8334019aae51e45f10ab01b57655299187fb088 SHA512 7edf3a948a56b4f2c17f34ec2a00bf7289310f40a1561fd12dacdc27f0769dfb1f42632dd07c82831e27d21208499a2feac22ce92fdf6e450acbce38543a3b71
-DIST rspec-mocks-3.11.1-git.tgz 198650 BLAKE2B bdf06f0614bb7b6c4eb6a0ff0af84d4f6ce8f456aad7c1b4324544d9750ee2e8c8a156d2181915f49afb62ba2be946c349cbd7ecc29caecb1c688ba6e47dc241 SHA512 c0095c615ba9e64f4dc9f2d5cb2a495f4e0b094b25eaf49c0d6a78bd4ab201f534a061243fbe63e86b64548c6c942d405dc36627057742135ce3e22e7561b4e9
-DIST rspec-mocks-3.9.1-git.tgz 192772 BLAKE2B abcc8fc82648993e6a407a8c4ac4f5b146b821e1e842c1dd2b95824d8468aac0ea796438d77e376c897675f66bd2bc9024da8fa5ccaf60139ea296b388d542cd SHA512 f804783fca4cf2258e83f82515cd5881ceae0bdd3aedb452a1db901e01de5dbca1d2bdef0ac0828a4bd23a1de58d127a42150c8c204219bca39ea7072619098f
+DIST rspec-mocks-3.12.6-git.tgz 207213 BLAKE2B 0b8bded9c6a04bb79910784e67f97028b9935b9e20e6934c3d1cccdf7b981b386a8dfb2e5e0c1f58fbbc2006fb68dabb108444b0f284b7f7f3b39bb73cb01cdc SHA512 f11ef99bdef109e3b332e0cc79e0d9c46db906b0c939ec6a89782219cea03e6282fe867212caaf2bf2eb272ed7ae1f4fe059a5626d131141925f731fcda3e91d
+DIST rspec-mocks-3.12.7-git.tgz 208127 BLAKE2B 86ef82c47ae7ef4992c6394718ee29f91fde70967b7f8ba3101c6f0233ab32be22c9e0e69e9041e94b4e5a587e3e936f89a14dbf464c2bdd8f6ce7d827cc5448 SHA512 c168eb653b585a37052870521e88be0723eba1b2f7f373a04557813e75a62c67448577809fbe1c0d04b21311b29c9874ed7509800bc7c05cb618f208066c8eac
+DIST rspec-mocks-3.13.0-git.tgz 208594 BLAKE2B c84b606094f8aba49cb32c07caedccaf4592110b3dbade60990c5bc7e6927576b57acd071ae43171328cb47ab9591aacef341389f3dcd6aa671f69511a5ce54a SHA512 5d7f52ac3594b37a87d377fcd2300fa1811490fff392ed0bbb4a6de471ae5cc627a7f9e7e7c351031558b87f78e3fcc2fff77ba2fffbb838972a9eb28b6c53da
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2-r1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2-r1.ebuild
deleted file mode 100644
index 89cc3f97f072..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="http://rspec.rubyforge.org/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-core-2.10.0:2
-		>=dev-ruby/rspec-expectations-2.99.0:2
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	# Avoid a weird, and failing, test testing already installed code.
-	sed -e '/has an up-to-date caller_filter file/,/end/ s:^:#:' -i spec/rspec/mocks_spec.rb || die
-
-	# Psych and Syck are not supported by default anymore on ruby22.
-	rm spec/rspec/mocks/serialization_spec.rb || die
-
-	sed -i -e '/does not affect the ability to access the top-level constant/,/end/ s:^:#:' spec/rspec/mocks/mutate_const_spec.rb || die
-
-	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild
deleted file mode 100644
index cecb8a217cbb..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-#RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-mocks"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
-	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-core-3.3.0:3
-		>=dev-ruby/rspec-expectations-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
-
-	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.10.3.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.10.3.ebuild
deleted file mode 100644
index 3238c9421b17..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.10.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-#RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-mocks"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
-	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-core-3.3.0:3
-		>=dev-ruby/rspec-expectations-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
-
-	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.11.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.11.0.ebuild
deleted file mode 100644
index 2cd5b07d4234..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.11.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-#RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-mocks"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
-	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-core-3.3.0:3
-		>=dev-ruby/rspec-expectations-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
-
-	sed -i -e 's/git ls-files --/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.11.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.11.1.ebuild
deleted file mode 100644
index 97623f7a6fee..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.11.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-#RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-mocks"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
-	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-core-3.3.0:3
-		>=dev-ruby/rspec-expectations-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
-
-	sed -i -e 's/git ls-files --/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.12.6.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.12.6.ebuild
new file mode 100644
index 000000000000..346d017433e8
--- /dev/null
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.12.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+#RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-mocks"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
+	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-core-3.12.0:3
+		>=dev-ruby/rspec-expectations-2.99.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm Gemfile || die
+
+	# And consequently avoid specs using bundler. This also avoids a
+	# circular dependency on aruba.
+	rm -f spec/integration/rails_support_spec.rb spec/support/aruba.rb || die
+
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	rm .rspec || die
+
+	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
+
+	sed -i -e 's/git ls-files --/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.12.7.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.12.7.ebuild
new file mode 100644
index 000000000000..113c3889a987
--- /dev/null
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.12.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+#RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-mocks"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
+	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-core-3.12.0:3
+		>=dev-ruby/rspec-expectations-2.99.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm Gemfile || die
+
+	# And consequently avoid specs using bundler. This also avoids a
+	# circular dependency on aruba.
+	rm -f spec/integration/rails_support_spec.rb spec/support/aruba.rb || die
+
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	rm .rspec || die
+
+	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
+
+	sed -i -e 's/git ls-files --/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.13.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.13.0.ebuild
new file mode 100644
index 000000000000..113c3889a987
--- /dev/null
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.13.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+#RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-mocks"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
+	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-core-3.12.0:3
+		>=dev-ruby/rspec-expectations-2.99.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm Gemfile || die
+
+	# And consequently avoid specs using bundler. This also avoids a
+	# circular dependency on aruba.
+	rm -f spec/integration/rails_support_spec.rb spec/support/aruba.rb || die
+
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	rm .rspec || die
+
+	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
+
+	sed -i -e 's/git ls-files --/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.9.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.9.1.ebuild
deleted file mode 100644
index cbb2f5de921f..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.9.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-#RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-mocks"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
-	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-core-3.3.0:3
-		>=dev-ruby/rspec-expectations-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
-
-	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rspec-pending_for/Manifest b/dev-ruby/rspec-pending_for/Manifest
new file mode 100644
index 000000000000..2bac2e90cb2c
--- /dev/null
+++ b/dev-ruby/rspec-pending_for/Manifest
@@ -0,0 +1 @@
+DIST rspec-pending_for-0.1.16.tar.gz 12841 BLAKE2B fb95f7e21e681454252e6dd625c7a7766ee5853ec60f3280c25e591d91a6163dd307ed8583d6e966cca9f1eeac3e3d8543a539f557abaaf41ae424dc8d91d68a SHA512 4d87c82814a2b8f51f79d1c22030870dce98b846add8cab8897d211129ab2116dd28fffe4999e42c35f70393d90448b11067be424af28594600c7dd461de2e80
diff --git a/dev-ruby/rspec-pending_for/metadata.xml b/dev-ruby/rspec-pending_for/metadata.xml
new file mode 100644
index 000000000000..b04340acafd3
--- /dev/null
+++ b/dev-ruby/rspec-pending_for/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pboling/rspec-pending_for</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/rspec-pending_for/rspec-pending_for-0.1.16.ebuild b/dev-ruby/rspec-pending_for/rspec-pending_for-0.1.16.ebuild
new file mode 100644
index 000000000000..f5be95bd68d4
--- /dev/null
+++ b/dev-ruby/rspec-pending_for/rspec-pending_for-0.1.16.ebuild
@@ -0,0 +1,31 @@
+# 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_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="rspec-pending_for.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mark specs pending or skipped for specific Ruby engine / version combinations"
+HOMEPAGE="https://github.com/pboling/rspec-pending_for"
+SRC_URI="https://github.com/pboling/rspec-pending_for/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/rspec-core
+	dev-ruby/ruby_engine:2
+	dev-ruby/ruby_version:1
+"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index 3ec5d83eb04a..4d7a4dc61789 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,6 +1,5 @@
-DIST rspec-rails-3.9.1.tar.gz 143459 BLAKE2B 87a691df63a438b15b5726a802632c16373c784cc66216c1b099ed7e36e0916fdfe7ca1fb964904678b779b8fa90f0659971c4af00f9ca3a1071adf2216466bd SHA512 247acda67672ea3fa0641ea36d6209c8876597c63180979713db257e02cb4282b122af4cc0aa540dae984acdb16afdc4359012360b951f0599710fe422cdccac
-DIST rspec-rails-4.1.2.tar.gz 156296 BLAKE2B ca454065c8fb318148e745162514b9f21aaf6050ae72981d12a23b838bc7d985350c8abd60a36c07cb5c8c8bd80dd7b97b0dcb9ab6f5fb30ec4a6d99aaf189d4 SHA512 c0555d3b0d1ea91c9460981216cb0e4d1999e712daf18e5270aa20daee9667e3e669c918204e863bea0b6a97a63a79cdb1cd261d396743fdfbcc41109211ce89
-DIST rspec-rails-5.0.2.tar.gz 156991 BLAKE2B a1700fad43ed2eb441d95307fd14fe8c0f96c51edaaddaa13a94b6c740711ddb96c9c7058051c1160746111e52c56a5685808532795aa0e32cab2f91b287b6fc SHA512 c2154f0cac634ead0109daf0e91782e9c770783104d3b2a4b0e097d46f8a9ebb49fe993733a7a3f6c4e3d037d5ab25f424cf8e3386a161172fb8c68e731b076e
-DIST rspec-rails-5.0.3.tar.gz 156964 BLAKE2B 3f47428f887044acc2f4b374f6aaf135d44f2015b66ae5caa2a1f46923921ca2f96de47c7fc8faec951c15d8a18ee7efbf12fb80798e279784c70e3c31c09838 SHA512 3732c35603e5fe16deed1404c6ab0814cfaa6922da74befe31e3e2b23ba78f4de8316862894057f37b9d0aa79838d21d7028e1cbc592b8ef79de17f25bc81ea5
-DIST rspec-rails-5.1.1.tar.gz 157454 BLAKE2B 580a3443cfe088d4056815e3fc344f9b91e5df9ff52099942f8e74c062e6ffb8ff528e5bcb17b33684be0e6b4ce7791a1df38a7fbead0ca348567cbbf3f6a863 SHA512 68ba2af02619bcf304237e744f728772e9de889d7aba5ab5fef236d40e1c047b03bf0c199bb28074f2d4cf47e1811f241e67b56d8c362dbc8ad69e066bd3d7f0
 DIST rspec-rails-5.1.2.tar.gz 157523 BLAKE2B b500aa53f8bd965f7b95e90403d46096073780fa4e318295bffba44211cfb9d5eab36549e6fc3afc144700a8224ebe808489959a172f1d9e76c43320b7022979 SHA512 f9ef3a3812590a7cd50bd34e9e6cd9669fab24736ac7693b3fffe3f8be9b8313e31b0c7b7571a735f20bc5d9194a94c2f447e69f6491190536b6534211e1b070
+DIST rspec-rails-6.0.3.tar.gz 161663 BLAKE2B 02fdd54524e469387264013e5da9035014533b01ba1164ffe8e3038679585af0943ad82c074f987230b98f837395e57817134466ad33e02c42650dd3ebafb707 SHA512 cf0e34fbc8f653713dd1ba184f01c9ad33ea8739b8c46d5e377387b7c6fc0ebc7999d1a7abbb0581735297ff8a3aa9c665d13616a1eefd6abd4a85cd657203d5
+DIST rspec-rails-6.0.4.tar.gz 163654 BLAKE2B d8680bc410a63b746d568b3a71a1eb4cdac4b620740fe87e898187855e2340fb0fc0dd9e12d02ae738e2c4f68e085e75b58640c77dca0221901104ad8a6de40d SHA512 1090a76fcad4deeb2a9b8a4895dbe3a884887768f607e26e1b8903a2968c187dcf3361492cfa19a2638b1516948a94e5b0a6688a02041d94357ebe0f724f7039
+DIST rspec-rails-6.1.1.tar.gz 165310 BLAKE2B a8c40c203a756a23344c480afd59a9fbd626a6ba4de3716510797269d51d2060d3a719182a174d6225ceb18581f74cde2ad3cc5b71553e71634dbb0894500c55 SHA512 063de268b98aede351437829ecf27151b6015943bc27aa32b01968713a365f75036f357b0516c33a452c2ba5f35c7629de602774054e455eb642a7c67bd57441
+DIST rspec-rails-6.1.2.tar.gz 165532 BLAKE2B ade1da3b3fa080d05b664aff2806e5f95ce873ca777676d4e4d761b541a5ab40308f2c0a12d1d29961e39029fb7918227fafc3d3a0f7d3d7438755462f2d623d SHA512 a25424fa2443c49ebec238d30a059a2ce3cc051a391179abd77aacd96ee532963f0804cf75c27fa233b97638d6a2022ebf678b2dc44451ce3a0b54425bf25d2d
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.9.1.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.9.1.ebuild
deleted file mode 100644
index 186d3b997e1d..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-3.9.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-#RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="https://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
-	>=dev-ruby/actionpack-3.0:*
-	>=dev-ruby/railties-3.0:*
-	=dev-ruby/rspec-${SUBVERSION}*"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? (
-	>=dev-ruby/capybara-2.2.0
-	>=dev-ruby/ammeter-1.1.2
-	<dev-ruby/rails-6
-	~dev-ruby/rspec-rails-${PV}
-)"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm -f .rspec || die
-
-	# Avoid bundler-specific specs.
-	rm -f spec/sanity_check_spec.rb || die
-
-	# Avoid broken controller generator specs for now.
-	rm -fr spec/generators/rspec || die
-
-	# Avoid loading rspec/rails explicitly since ammeter/init will also
-	# do this and loading it twice causes an error
-	sed -e '/rspec\/rails/ s:^:#:' \
-		-e '1igem "rails", "<6"' \
-		-i spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rspec-rails/rspec-rails-4.1.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-4.1.2.ebuild
deleted file mode 100644
index 4414e29a7f7c..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-4.1.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-#RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="https://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	|| ( dev-ruby/activesupport:6.0 dev-ruby/activesupport:5.2 )
-	|| ( dev-ruby/actionpack:6.0 dev-ruby/actionpack:5.2 )
-	|| ( dev-ruby/railties:6.0 dev-ruby/railties:5.2 )
-	>=dev-ruby/rspec-3.10:3"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? (
-	>=dev-ruby/capybara-2.2.0
-	>=dev-ruby/ammeter-1.1.5
-	~dev-ruby/rspec-rails-${PV}
-)"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	echo "--require spec_helper" > .rspec || die
-
-	# Avoid bundler-specific specs.
-	rm -f spec/sanity_check_spec.rb || die
-
-	# Avoid broken controller generator specs for now.
-	rm -fr spec/generators/rspec || die
-
-	# Test with a compatible rails version
-	sed -i -e '1igem "rails", "<6.1"' spec/spec_helper.rb || die
-
-	# Fix gemspec.
-	sed -e 's/git ls-files --/find/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rspec-rails/rspec-rails-5.0.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-5.0.2.ebuild
deleted file mode 100644
index 4728ae27c258..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-5.0.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-#RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="https://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	|| ( dev-ruby/activesupport:6.1 dev-ruby/activesupport:6.0 dev-ruby/activesupport:5.2 )
-	|| ( dev-ruby/actionpack:6.1 dev-ruby/actionpack:6.0 dev-ruby/actionpack:5.2 )
-	|| ( dev-ruby/railties:6.1 dev-ruby/railties:6.0 dev-ruby/railties:5.2 )
-	>=dev-ruby/rspec-3.10:3"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? (
-	>=dev-ruby/capybara-2.2.0
-	>=dev-ruby/ammeter-1.1.5
-	~dev-ruby/rspec-rails-${PV}
-)"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	echo "--require spec_helper" > .rspec || die
-
-	# Avoid bundler-specific specs.
-	rm -f spec/sanity_check_spec.rb || die
-
-	# Avoid broken controller generator specs for now.
-	rm -fr spec/generators/rspec || die
-
-	# Test with a compatible rails version
-	sed -i -e '1igem "rails", "<6.1"' spec/spec_helper.rb || die
-
-	# Fix gemspec.
-	sed -e 's/git ls-files --/find/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rspec-rails/rspec-rails-5.0.3.ebuild b/dev-ruby/rspec-rails/rspec-rails-5.0.3.ebuild
deleted file mode 100644
index 60b773dfffd9..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-5.0.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-#RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="https://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	|| ( dev-ruby/activesupport:6.1 dev-ruby/activesupport:6.0 dev-ruby/activesupport:5.2 )
-	|| ( dev-ruby/actionpack:6.1 dev-ruby/actionpack:6.0 dev-ruby/actionpack:5.2 )
-	|| ( dev-ruby/railties:6.1 dev-ruby/railties:6.0 dev-ruby/railties:5.2 )
-	>=dev-ruby/rspec-3.10:3"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? (
-	>=dev-ruby/capybara-2.2.0
-	>=dev-ruby/ammeter-1.1.5
-	~dev-ruby/rspec-rails-${PV}
-)"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	echo "--require spec_helper" > .rspec || die
-
-	# Avoid bundler-specific specs.
-	rm -f spec/sanity_check_spec.rb || die
-
-	# Avoid broken controller generator specs for now.
-	rm -fr spec/generators/rspec || die
-
-	# Test with a compatible rails version
-	sed -i -e '1igem "rails", "<6.1"' spec/spec_helper.rb || die
-
-	# Fix gemspec.
-	sed -e 's/git ls-files --/find/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rspec-rails/rspec-rails-5.1.1.ebuild b/dev-ruby/rspec-rails/rspec-rails-5.1.1.ebuild
deleted file mode 100644
index 93617fc028c1..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-5.1.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-#RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="https://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	|| ( dev-ruby/activesupport:6.1 dev-ruby/activesupport:6.0 dev-ruby/activesupport:5.2 )
-	|| ( dev-ruby/actionpack:6.1 dev-ruby/actionpack:6.0 dev-ruby/actionpack:5.2 )
-	|| ( dev-ruby/railties:6.1 dev-ruby/railties:6.0 dev-ruby/railties:5.2 )
-	>=dev-ruby/rspec-3.10:3"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? (
-	>=dev-ruby/capybara-2.2.0
-	>=dev-ruby/ammeter-1.1.5
-	~dev-ruby/rspec-rails-${PV}
-)"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	echo "--require spec_helper" > .rspec || die
-
-	# Avoid bundler-specific specs.
-	rm -f spec/sanity_check_spec.rb || die
-
-	# Avoid broken controller generator specs for now.
-	rm -fr spec/generators/rspec || die
-
-	# Test with a compatible rails version
-	sed -i -e '1igem "rails", "<7.0"' spec/spec_helper.rb || die
-
-	# Fix gemspec.
-	sed -e 's/git ls-files --/find */' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rspec-rails/rspec-rails-5.1.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-5.1.2.ebuild
index 26882edd577b..b6042f93e71f 100644
--- a/dev-ruby/rspec-rails/rspec-rails-5.1.2.ebuild
+++ b/dev-ruby/rspec-rails/rspec-rails-5.1.2.ebuild
@@ -1,9 +1,9 @@
-# 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"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -24,9 +24,10 @@ KEYWORDS="~amd64"
 IUSE=""
 
 ruby_add_rdepend "
-	|| ( dev-ruby/activesupport:6.1 dev-ruby/activesupport:6.0 dev-ruby/activesupport:5.2 )
-	|| ( dev-ruby/actionpack:6.1 dev-ruby/actionpack:6.0 dev-ruby/actionpack:5.2 )
-	|| ( dev-ruby/railties:6.1 dev-ruby/railties:6.0 dev-ruby/railties:5.2 )
+	|| ( dev-ruby/activerecord:6.1[sqlite] )
+	|| ( dev-ruby/activesupport:6.1 )
+	|| ( dev-ruby/actionpack:6.1 )
+	|| ( dev-ruby/railties:6.1 )
 	>=dev-ruby/rspec-3.10:3"
 
 # Depend on the package being already installed for tests, because
@@ -36,6 +37,7 @@ ruby_add_bdepend "test? (
 	>=dev-ruby/capybara-2.2.0
 	>=dev-ruby/ammeter-1.1.5
 	~dev-ruby/rspec-rails-${PV}
+	dev-ruby/rails:6.1
 )"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/rspec-rails/rspec-rails-6.0.3.ebuild b/dev-ruby/rspec-rails/rspec-rails-6.0.3.ebuild
new file mode 100644
index 000000000000..2736fb5e3cd5
--- /dev/null
+++ b/dev-ruby/rspec-rails/rspec-rails-6.0.3.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="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+#RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="RSpec's official Ruby on Rails plugin"
+HOMEPAGE="https://rspec.info/"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	|| ( dev-ruby/activesupport:7.0 dev-ruby/activesupport:6.1 )
+	|| ( dev-ruby/actionpack:7.0 dev-ruby/actionpack:6.1 )
+	|| ( dev-ruby/railties:7.0 dev-ruby/railties:6.1 )
+	>=dev-ruby/rspec-3.12:3"
+
+# Depend on the package being already installed for tests, because
+# requiring ammeter will load it, and we need a consistent set of rspec
+# and rspec-rails for that to work.
+ruby_add_bdepend "test? (
+	|| ( dev-ruby/activerecord:7.0[sqlite] dev-ruby/activerecord:6.1[sqlite] )
+	>=dev-ruby/capybara-2.2.0
+	>=dev-ruby/ammeter-1.1.5
+	~dev-ruby/rspec-rails-${PV}
+)"
+
+all_ruby_prepare() {
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	echo "--require spec_helper" > .rspec || die
+
+	# Avoid bundler-specific specs.
+	rm -f spec/sanity_check_spec.rb || die
+
+	# Avoid broken controller generator specs for now.
+	rm -fr spec/generators/rspec || die
+
+	# Test with a compatible rails version
+	#sed -i -e '1igem "rails", "<7.0"' spec/spec_helper.rb || die
+
+	# Fix gemspec.
+	sed -e 's/git ls-files --/find */' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rspec-rails/rspec-rails-6.0.4.ebuild b/dev-ruby/rspec-rails/rspec-rails-6.0.4.ebuild
new file mode 100644
index 000000000000..7daef9df667b
--- /dev/null
+++ b/dev-ruby/rspec-rails/rspec-rails-6.0.4.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="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+#RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="RSpec's official Ruby on Rails plugin"
+HOMEPAGE="https://rspec.info/"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	|| ( dev-ruby/activesupport:7.0 dev-ruby/activesupport:6.1 )
+	|| ( dev-ruby/actionpack:7.0 dev-ruby/actionpack:6.1 )
+	|| ( dev-ruby/railties:7.0 dev-ruby/railties:6.1 )
+	>=dev-ruby/rspec-3.12:3"
+
+# Depend on the package being already installed for tests, because
+# requiring ammeter will load it, and we need a consistent set of rspec
+# and rspec-rails for that to work.
+ruby_add_bdepend "test? (
+	|| ( dev-ruby/activerecord:7.0[sqlite] dev-ruby/activerecord:6.1[sqlite] )
+	>=dev-ruby/capybara-2.2.0
+	>=dev-ruby/ammeter-1.1.5
+	~dev-ruby/rspec-rails-${PV}
+)"
+
+all_ruby_prepare() {
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	echo "--require spec_helper" > .rspec || die
+
+	# Avoid bundler-specific specs.
+	rm -f spec/sanity_check_spec.rb || die
+
+	# Avoid broken controller generator specs for now.
+	rm -fr spec/generators/rspec || die
+
+	# Test with a compatible rails version
+	#sed -i -e '1igem "rails", "<7.0"' spec/spec_helper.rb || die
+
+	# Fix gemspec.
+	sed -e 's/git ls-files --/find */' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rspec-rails/rspec-rails-6.1.1.ebuild b/dev-ruby/rspec-rails/rspec-rails-6.1.1.ebuild
new file mode 100644
index 000000000000..97a54c4cf41b
--- /dev/null
+++ b/dev-ruby/rspec-rails/rspec-rails-6.1.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+#RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="RSpec's official Ruby on Rails plugin"
+HOMEPAGE="https://rspec.info/"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	|| ( dev-ruby/activesupport:7.1 dev-ruby/activesupport:7.0 dev-ruby/activesupport:6.1 )
+	|| ( dev-ruby/actionpack:7.1 dev-ruby/actionpack:7.0 dev-ruby/actionpack:6.1 )
+	|| ( dev-ruby/railties:7.1 dev-ruby/railties:7.0 dev-ruby/railties:6.1 )
+	>=dev-ruby/rspec-3.12:3"
+
+# Depend on the package being already installed for tests, because
+# requiring ammeter will load it, and we need a consistent set of rspec
+# and rspec-rails for that to work.
+ruby_add_bdepend "test? (
+	|| ( dev-ruby/activerecord:7.1[sqlite] dev-ruby/activerecord:7.0[sqlite] dev-ruby/activerecord:6.1[sqlite] )
+	>=dev-ruby/capybara-2.2.0
+	>=dev-ruby/ammeter-1.1.5
+	~dev-ruby/rspec-rails-${PV}
+)"
+
+all_ruby_prepare() {
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	echo "--require spec_helper" > .rspec || die
+
+	# Avoid bundler-specific specs.
+	rm -f spec/sanity_check_spec.rb || die
+
+	# Avoid broken controller generator specs for now.
+	rm -fr spec/generators/rspec || die
+
+	# Test with a compatible rails version
+	#sed -i -e '1igem "rails", "<7.0"' spec/spec_helper.rb || die
+
+	# Fix gemspec.
+	sed -e 's/git ls-files --/find */' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rspec-rails/rspec-rails-6.1.2-r1.ebuild b/dev-ruby/rspec-rails/rspec-rails-6.1.2-r1.ebuild
new file mode 100644
index 000000000000..36279a08e464
--- /dev/null
+++ b/dev-ruby/rspec-rails/rspec-rails-6.1.2-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+#RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="RSpec's official Ruby on Rails plugin"
+HOMEPAGE="https://rspec.info/"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	|| ( dev-ruby/activesupport:7.1 dev-ruby/activesupport:7.0 dev-ruby/activesupport:6.1 )
+	|| ( dev-ruby/actionpack:7.1 dev-ruby/actionpack:7.0 dev-ruby/actionpack:6.1 )
+	|| ( dev-ruby/railties:7.1 dev-ruby/railties:7.0 dev-ruby/railties:6.1 )
+	>=dev-ruby/rspec-3.13:3"
+
+# Depend on the package being already installed for tests, because
+# requiring ammeter will load it, and we need a consistent set of rspec
+# and rspec-rails for that to work.
+ruby_add_bdepend "test? (
+	|| ( dev-ruby/activerecord:7.1[sqlite] dev-ruby/activerecord:7.0[sqlite] dev-ruby/activerecord:6.1[sqlite] )
+	|| ( dev-ruby/actionmailer:7.1 dev-ruby/actionmailer:7.0 dev-ruby/actionmailer:6.1 )
+	>=dev-ruby/capybara-2.2.0
+	>=dev-ruby/ammeter-1.1.5
+	~dev-ruby/rspec-rails-${PV}
+)"
+
+all_ruby_prepare() {
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	echo "--require spec_helper" > .rspec || die
+
+	# Avoid bundler-specific specs.
+	rm -f spec/sanity_check_spec.rb || die
+
+	# Avoid broken controller generator specs for now.
+	rm -fr spec/generators/rspec || die
+
+	# Test with a compatible rails version
+	#sed -i -e '1igem "rails", "<7.0"' spec/spec_helper.rb || die
+
+	# Fix gemspec.
+	sed -e 's/git ls-files --/find */' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rspec-retry/rspec-retry-0.6.2.ebuild b/dev-ruby/rspec-retry/rspec-retry-0.6.2.ebuild
index c82c2bbfb528..4d3c3a18ab54 100644
--- a/dev-ruby/rspec-retry/rspec-retry-0.6.2.ebuild
+++ b/dev-ruby/rspec-retry/rspec-retry-0.6.2.ebuild
@@ -1,24 +1,30 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRADOC="changelog.md README.md"
 
 inherit ruby-fakegem
 
-DESCRIPTION="Retry intermittently failing rspec examples"
+DESCRIPTION="Retry randomly failing rspec example"
 HOMEPAGE="https://github.com/NoRedInk/rspec-retry"
-IUSE=""
-SLOT="0"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/rspec-core-3.3:3"
+ruby_add_rdepend ">=dev-ruby/rspec-core-3.3"
 
 all_ruby_prepare() {
 	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid specs accessing class variables from the top level
+	sed -e '/with :retry => 0/ s/context/xcontext/' \
+		-e '/should be exposed/ s/it/xit/' \
+		-i spec/lib/rspec/retry_spec.rb || die
 }
diff --git a/dev-ruby/rspec-stubbed_env/Manifest b/dev-ruby/rspec-stubbed_env/Manifest
index 59a169465bd2..c7e1cbae15a1 100644
--- a/dev-ruby/rspec-stubbed_env/Manifest
+++ b/dev-ruby/rspec-stubbed_env/Manifest
@@ -1 +1 @@
-DIST rspec-stubbed_env-1.0.0.gem 11264 BLAKE2B 1f00ef85dc0677a35814d2bb6a59e8c836cf08bda2de024f9cf7f8d4696a409ef286d72303428854cb7ca59a7c479a89c731d7e412cd97ae6fae0edaafa84d1e SHA512 e4624614852674035d2c0a7b426d9aa62d8f621a7e52c4f79410ac9e3f833980f50530a7f7da7241c763ec92926bf87bf0be2d2dab4200faa9a17eaacd404640
+DIST rspec-stubbed_env-1.0.1.tar.gz 21188 BLAKE2B b84dfd729b0f8f362b10ac36a18e7469d137d05108f031d6d96b6f8da658b20e9c11fea8f70f2f217c511505e41ea69ffbfb182582615798804ddc22e9bc136b SHA512 7ac1b2ece0812edd8e884c025300eb693fe22da22f1ca126ad62107c2ca1559b25311be588e7839e97b84fc98a9a5aa161e3f1718a4a42c69a23b8a2301d7593
diff --git a/dev-ruby/rspec-stubbed_env/rspec-stubbed_env-1.0.0.ebuild b/dev-ruby/rspec-stubbed_env/rspec-stubbed_env-1.0.0.ebuild
deleted file mode 100644
index 9108b55cd22b..000000000000
--- a/dev-ruby/rspec-stubbed_env/rspec-stubbed_env-1.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-# Gem does not contain tests and upstream releases are not tagged
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Stub environment variables in a scoped context for testing"
-HOMEPAGE="https://github.com/pboling/rspec-stubbed_env"
-IUSE=""
-SLOT="1"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-ruby_add_rdepend ">=dev-ruby/rspec-3.0"
diff --git a/dev-ruby/rspec-stubbed_env/rspec-stubbed_env-1.0.1.ebuild b/dev-ruby/rspec-stubbed_env/rspec-stubbed_env-1.0.1.ebuild
new file mode 100644
index 000000000000..c324ee9636f3
--- /dev/null
+++ b/dev-ruby/rspec-stubbed_env/rspec-stubbed_env-1.0.1.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="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="rspec-stubbed_env.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Stub environment variables in a scoped context for testing"
+HOMEPAGE="https://github.com/pboling/rspec-stubbed_env"
+SRC_URI="https://github.com/pboling/rspec-stubbed_env/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE=""
+SLOT="1"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+ruby_add_rdepend ">=dev-ruby/rspec-3.0"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-block_is_expected )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 66ac550cd40e..1c3c458b9e9d 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,4 +1,4 @@
-DIST rspec-support-3.10.2-git.tgz 74812 BLAKE2B e6c7e768d0df05fa5e77055efcc69699192928a35029264300faccf500b1ce7367e74e9c2ae0f7f8f0a5e755692ac83b982d0a3dab3da3ab697ad2c5766aa30d SHA512 bd1fb5d737dfdbb7399d766854f0b173dad89675bac580cf65c5d42ab6cd04ad1773e7cfa875dfa4c6fac14f4ccbd6b48813bae5de26c931c804962d29b014be
-DIST rspec-support-3.10.3-git.tgz 75447 BLAKE2B d3eae3b148ef56d6a8668ad4c92ce52ea066c82442448446cbdc6d37137c6fa32bf54e5f579d4a39525305fdd795feee792dac29234c568ab85d59d684af4b84 SHA512 21d7f3076e11467ef6c5b7ce23d5a8635320ca21f61f0d640e45c4e7855995a672fe400fc11f7dbea37097f6eefe09f24d3b177c86e75b2454a97c898f9a1cdf
-DIST rspec-support-3.11.0-git.tgz 75644 BLAKE2B 349df9b326e98fd3564ae22c8659c95205d5e623f0e67721cdb3dd658bdbee5ec574f4286d9548984567079178997c6e9b419211c7c3da601dd02ad3aa0d448f SHA512 38bd7c132b6dea3036c8c18e6c535c2dfb5faa0601fb13eb406c8bb279e42e460cecb823527b04a22966f0e965eda6b539e48cbac20c663ae3a17c01f4fbd0e0
-DIST rspec-support-3.9.4-git.tgz 72490 BLAKE2B 03c3ba8316a2c6a79faf68db87adf193b684b82119dd9c5b67f2954f3ce72cf03e3e16898e2f5d57d76aef37bb8fb08ab8dacf8aaef6d1445a8257e2be14afe5 SHA512 95be2e03c37117d6bc132ce466779a8ac3c4fedadfb2a6dabb1fa11601aae908e341c87436dd526bbc8b02040b23200c95bd113d0475405afdb4acd099c67403
+DIST rspec-support-3.12.1-git.tgz 78764 BLAKE2B f3e6cd0123096971ee2793a69d02e4c34289904285ee9fe7081f7697c724ecc4195a3cc0e8042bd0c76ff070d6c332fbe41862c31afad9089f68f3846a613dd6 SHA512 88577e184a90f9f48ea97a53e5bd0bd6a2fd5e43275c4bd5cf52a4f8a36637ddb0a1043723b5902d3c0b5bd0cfe0c17a035af702cb094fb8c9543fae6401768a
+DIST rspec-support-3.12.2-git.tgz 79544 BLAKE2B 874196a4c6fded0254c33d3959a7827d1bf9a85976b9cb975ecc7767d2e1bf094cdf3d95b0533560505dc80dfcd4b945cb88d673430b85a239936735844706ef SHA512 76748d3ca1d9415e15f0be8f14b99f9d16fd6b20548913915ab3e2d56dfe94fa744a9c97ec0747bfa66360cebd6584881e8997ecf46baf45c508f14f96bc644a
+DIST rspec-support-3.13.0-git.tgz 79720 BLAKE2B 53302f0b13bf4e36be452e4b548a4a2161a2550e46ab1c8660ebcbcbafc136311cb770943f33162a7379c79df1777a39ad973420a5aa4b62716eff30ab1d0906 SHA512 7d86016c69e8b1c85543d5a0017b37bdddc1f6ec4f0bf887e94dc94b5609511505ea0ff33044cf627903efd3d3261b045dae40d80dabf314c6a3985dcc8a1ed7
+DIST rspec-support-3.13.1-git.tgz 79672 BLAKE2B 73a1b7c8508fd361ca06a647b3291e51eb5cd7f5ea3061b41b81daa724a8811a4891a8b0fadd440b163cf7cf8c43cb2e81e440da57613e82f791cb656913ecf5 SHA512 afbd76d937c5e2bfff8eccd69f4cd5081befc667fdef699743f809bf3f3bdda2404a24fb2408bce3373d7995406ca11a76c734d973957aeb6ada3d41fa59249c
diff --git a/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild b/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
deleted file mode 100644
index 420caa87edaf..000000000000
--- a/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-support"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove spec that, by following symlinks, tries to scan pretty much
-	# the whole filesystem.
-	rm spec/rspec/support/caller_filter_spec.rb || die
-
-	# Avoid spec that requires a dependency on git
-	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
-
-	# Avoid a spec requiring a specific locale
-	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
-
-	# Avoid a brittle spec depending on ruby implementation details
-	# should be fixed upstream in next version
-	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Use the ruby version being tested
-	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB=lib ${RUBY} -S rspec spec || die
-}
diff --git a/dev-ruby/rspec-support/rspec-support-3.10.3.ebuild b/dev-ruby/rspec-support/rspec-support-3.10.3.ebuild
deleted file mode 100644
index 1c31cea5242d..000000000000
--- a/dev-ruby/rspec-support/rspec-support-3.10.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-support"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove spec that, by following symlinks, tries to scan pretty much
-	# the whole filesystem.
-	rm spec/rspec/support/caller_filter_spec.rb || die
-
-	# Avoid spec that requires a dependency on git
-	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
-
-	# Avoid a spec requiring a specific locale
-	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
-
-	# Avoid a brittle spec depending on ruby implementation details
-	# should be fixed upstream in next version
-	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Use the ruby version being tested
-	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB=lib ${RUBY} -S rspec spec || die
-}
diff --git a/dev-ruby/rspec-support/rspec-support-3.11.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.11.0.ebuild
deleted file mode 100644
index b96226389e9e..000000000000
--- a/dev-ruby/rspec-support/rspec-support-3.11.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-support"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove spec that, by following symlinks, tries to scan pretty much
-	# the whole filesystem.
-	rm spec/rspec/support/caller_filter_spec.rb || die
-
-	# Avoid spec that requires a dependency on git
-	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
-
-	# Avoid a spec requiring a specific locale
-	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
-
-	# Avoid a brittle spec depending on ruby implementation details
-	# should be fixed upstream in next version
-	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Use the ruby version being tested
-	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
-
-	case ${RUBY} in
-		*ruby31)
-			# Avoid specs failing when run in Gentoo, possibly due to different IO
-			sed -e '/outputs unified diff message of two arrays/askip "ruby31 IO"' \
-				-e '/outputs unified diff message for hashes inside arrays with differing key orders/askip "ruby31 IO"' \
-			    -i spec/rspec/support/differ_spec.rb || die
-			;;
-	esac
-}
-
-each_ruby_test() {
-	RUBYLIB=lib ${RUBY} -S rspec spec || die
-}
diff --git a/dev-ruby/rspec-support/rspec-support-3.12.1.ebuild b/dev-ruby/rspec-support/rspec-support-3.12.1.ebuild
new file mode 100644
index 000000000000..7a33ee949ce0
--- /dev/null
+++ b/dev-ruby/rspec-support/rspec-support-3.12.1.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="ruby30 ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-support"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Remove spec that, by following symlinks, tries to scan pretty much
+	# the whole filesystem.
+	rm spec/rspec/support/caller_filter_spec.rb || die
+
+	# Avoid spec that requires a dependency on git
+	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
+
+	# Avoid a spec requiring a specific locale
+	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Use the ruby version being tested
+	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
+
+	case ${RUBY} in
+		*ruby31|*ruby32|*ruby33)
+			# Avoid specs failing when run in Gentoo, possibly due to different IO
+			sed -e '/outputs unified diff message of two arrays/askip "ruby31 IO"' \
+				-e '/outputs unified diff message for hashes inside arrays with differing key orders/askip "ruby31 IO"' \
+				-i spec/rspec/support/differ_spec.rb || die
+			;;
+	esac
+}
+
+each_ruby_test() {
+	RUBYLIB=lib ${RUBY} -S rspec spec || die
+}
diff --git a/dev-ruby/rspec-support/rspec-support-3.12.2.ebuild b/dev-ruby/rspec-support/rspec-support-3.12.2.ebuild
new file mode 100644
index 000000000000..ba109801fee2
--- /dev/null
+++ b/dev-ruby/rspec-support/rspec-support-3.12.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-support"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Remove spec that, by following symlinks, tries to scan pretty much
+	# the whole filesystem.
+	rm spec/rspec/support/caller_filter_spec.rb || die
+
+	# Avoid spec that requires a dependency on git
+	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
+
+	# Avoid a spec requiring a specific locale
+	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Use the ruby version being tested
+	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
+
+	case ${RUBY} in
+		*ruby31|*ruby32|*ruby33)
+			# Avoid specs failing when run in Gentoo, possibly due to different IO
+			sed -e '/outputs unified diff message of two arrays/askip "ruby31 IO"' \
+				-e '/outputs unified diff message for hashes inside arrays with differing key orders/askip "ruby31 IO"' \
+				-i spec/rspec/support/differ_spec.rb || die
+			;;
+	esac
+}
+
+each_ruby_test() {
+	RUBYLIB=lib ${RUBY} -S rspec spec || die
+}
diff --git a/dev-ruby/rspec-support/rspec-support-3.13.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.13.0.ebuild
new file mode 100644
index 000000000000..ba109801fee2
--- /dev/null
+++ b/dev-ruby/rspec-support/rspec-support-3.13.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-support"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Remove spec that, by following symlinks, tries to scan pretty much
+	# the whole filesystem.
+	rm spec/rspec/support/caller_filter_spec.rb || die
+
+	# Avoid spec that requires a dependency on git
+	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
+
+	# Avoid a spec requiring a specific locale
+	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Use the ruby version being tested
+	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
+
+	case ${RUBY} in
+		*ruby31|*ruby32|*ruby33)
+			# Avoid specs failing when run in Gentoo, possibly due to different IO
+			sed -e '/outputs unified diff message of two arrays/askip "ruby31 IO"' \
+				-e '/outputs unified diff message for hashes inside arrays with differing key orders/askip "ruby31 IO"' \
+				-i spec/rspec/support/differ_spec.rb || die
+			;;
+	esac
+}
+
+each_ruby_test() {
+	RUBYLIB=lib ${RUBY} -S rspec spec || die
+}
diff --git a/dev-ruby/rspec-support/rspec-support-3.13.1.ebuild b/dev-ruby/rspec-support/rspec-support-3.13.1.ebuild
new file mode 100644
index 000000000000..ba109801fee2
--- /dev/null
+++ b/dev-ruby/rspec-support/rspec-support-3.13.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-support"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Remove spec that, by following symlinks, tries to scan pretty much
+	# the whole filesystem.
+	rm spec/rspec/support/caller_filter_spec.rb || die
+
+	# Avoid spec that requires a dependency on git
+	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
+
+	# Avoid a spec requiring a specific locale
+	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Use the ruby version being tested
+	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
+
+	case ${RUBY} in
+		*ruby31|*ruby32|*ruby33)
+			# Avoid specs failing when run in Gentoo, possibly due to different IO
+			sed -e '/outputs unified diff message of two arrays/askip "ruby31 IO"' \
+				-e '/outputs unified diff message for hashes inside arrays with differing key orders/askip "ruby31 IO"' \
+				-i spec/rspec/support/differ_spec.rb || die
+			;;
+	esac
+}
+
+each_ruby_test() {
+	RUBYLIB=lib ${RUBY} -S rspec spec || die
+}
diff --git a/dev-ruby/rspec-support/rspec-support-3.9.4.ebuild b/dev-ruby/rspec-support/rspec-support-3.9.4.ebuild
deleted file mode 100644
index 0bcf347fe79f..000000000000
--- a/dev-ruby/rspec-support/rspec-support-3.9.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-support"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove spec that, by following symlinks, tries to scan pretty much
-	# the whole filesystem.
-	rm spec/rspec/support/caller_filter_spec.rb || die
-
-	# Avoid spec that requires a dependency on git
-	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
-
-	# Avoid a spec requiring a specific locale
-	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
-
-	# Avoid a brittle spec depending on ruby implementation details
-	# should be fixed upstream in next version
-	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Use the ruby version being tested
-	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB=lib ${RUBY} -S rspec spec || die
-}
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index fe90372c668e..def7a7063160 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -1,4 +1,2 @@
-DIST rspec-2.99.0.gem 5632 BLAKE2B eba837aeebcb0d65dc18a644fd935f241a6703998885418460b2c0bb59574ef144c416518099a77905ca7676852903804169d1bafc2cf8b3f79654b669c43762 SHA512 bcdf5e86938b102200144c49370e0a0691e39a8720048df2eab1a55f95a5bc5e4ced84c7da86d0ddc83ee4ce0f40602c2ae7ee10e55dccf8bb8b769ab048ebb8
-DIST rspec-3.10.0.gem 10752 BLAKE2B e0af9c31a5263b0656341be7432e1597afa56af9bfc5e6d21f1daa7553e5bd3daf2b383a7e1a5b6f761a5880540020e7accd8d4eb6cca6e57d616dcc41690970 SHA512 dd1a3a1c7c73ae9c053e071d7851780d8cf61e92ddba24072b9f2c00a342ed08c81090332ba2eaf7ab96adac3fc723685996195e5cc584e15de57ff02a4455ec
-DIST rspec-3.11.0.gem 10752 BLAKE2B 24941576037669a53373d263bda99c7c98e295f5d616c08964d95dd3b0697d64c5399ed554d15705c1ea3f11c8bed667de00e0aef28d6cd1fd119057ece5f626 SHA512 233f80500446066a61a50d8e3f8a602316071beaa82e95776390684f7d58fa0acf8807386bee7d08b21f5481933e031b968fd752cf97efa74ba6cd411a8d1395
-DIST rspec-3.9.0.gem 10752 BLAKE2B 212cebbae9e71b8a090757ec4b9902f20043eaf95b079a409247990e1fca4236e13d0e9a3bd9b9eacfbc2d2aaab19583452dbe08b298ca69a85e20f0163741c2 SHA512 a7dbb22f01d842a41b54c375d32d94c77a7b964d1ea5b1971e7c228dfd5dbfcfe03c007d687781addb93f819dde8de664dda307c266137fdd0a07dab96f96fad
+DIST rspec-3.12.0.gem 10752 BLAKE2B 80beb56bfed2200e05c8fbe040a265f4176a7142a7c077564821057eec2aa02f68c2417eae5e0309221457d419bf0c9af9123c5e8f1f19992a9361298240c0c8 SHA512 24278c467e5226ad1a5bb4c64190fb5d1077777237d9c2e5c4f16a00b026bf26d8f15e2c74a34221b198992f73ef06af314488a61358968e2083f935467e5a35
+DIST rspec-3.13.0.gem 10752 BLAKE2B 41df21678a628fff7f86167bf80afcc602da2d5263c2f12e666cbce9401a51ff82887cfdf32fec85194b2511930525e2b2f1dda902437379ed45b78d99f830b2 SHA512 4031dc10cfd3fbdd8f023328df661159bf01d6fefac89a2750119c2dbe58ed2daf75737598002164c9760e366bdb7e5c1076430c2d67502ab0cae51ef94b5ed7
diff --git a/dev-ruby/rspec/rspec-2.99.0.ebuild b/dev-ruby/rspec/rspec-2.99.0.ebuild
deleted file mode 100644
index c24833cd4559..000000000000
--- a/dev-ruby/rspec/rspec-2.99.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="http://rspec.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-core-${SUBVERSION}*
-	=dev-ruby/rspec-expectations-${SUBVERSION}*
-	=dev-ruby/rspec-mocks-${SUBVERSION}*"
diff --git a/dev-ruby/rspec/rspec-3.10.0.ebuild b/dev-ruby/rspec/rspec-3.10.0.ebuild
deleted file mode 100644
index 9fc7a4756c84..000000000000
--- a/dev-ruby/rspec/rspec-3.10.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-core-${SUBVERSION}*
-	=dev-ruby/rspec-expectations-${SUBVERSION}*
-	=dev-ruby/rspec-mocks-${SUBVERSION}*"
diff --git a/dev-ruby/rspec/rspec-3.11.0.ebuild b/dev-ruby/rspec/rspec-3.11.0.ebuild
deleted file mode 100644
index d05d6b4a8d7e..000000000000
--- a/dev-ruby/rspec/rspec-3.11.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-core-${SUBVERSION}*
-	=dev-ruby/rspec-expectations-${SUBVERSION}*
-	=dev-ruby/rspec-mocks-${SUBVERSION}*"
diff --git a/dev-ruby/rspec/rspec-3.12.0.ebuild b/dev-ruby/rspec/rspec-3.12.0.ebuild
new file mode 100644
index 000000000000..cdbf5e89fc62
--- /dev/null
+++ b/dev-ruby/rspec/rspec-3.12.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-core-${SUBVERSION}*
+	=dev-ruby/rspec-expectations-${SUBVERSION}*
+	=dev-ruby/rspec-mocks-${SUBVERSION}*"
diff --git a/dev-ruby/rspec/rspec-3.13.0.ebuild b/dev-ruby/rspec/rspec-3.13.0.ebuild
new file mode 100644
index 000000000000..696efc9c4ae0
--- /dev/null
+++ b/dev-ruby/rspec/rspec-3.13.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-core-${SUBVERSION}*
+	=dev-ruby/rspec-expectations-${SUBVERSION}*
+	=dev-ruby/rspec-mocks-${SUBVERSION}*"
diff --git a/dev-ruby/rspec/rspec-3.9.0.ebuild b/dev-ruby/rspec/rspec-3.9.0.ebuild
deleted file mode 100644
index 524c08e7e727..000000000000
--- a/dev-ruby/rspec/rspec-3.9.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-core-${SUBVERSION}*
-	=dev-ruby/rspec-expectations-${SUBVERSION}*
-	=dev-ruby/rspec-mocks-${SUBVERSION}*"
diff --git a/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild b/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
deleted file mode 100644
index 2c02f801759e..000000000000
--- a/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="RSpec support and matchers"
-HOMEPAGE="https://github.com/thekompanee/rspectacular"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rspec-3.1:3 dev-ruby/fuubar:2 dev-ruby/shoulda-matchers:3"
diff --git a/dev-ruby/rspectacular/rspectacular-0.70.8-r2.ebuild b/dev-ruby/rspectacular/rspectacular-0.70.8-r2.ebuild
new file mode 100644
index 000000000000..fc6f5004e297
--- /dev/null
+++ b/dev-ruby/rspectacular/rspectacular-0.70.8-r2.ebuild
@@ -0,0 +1,28 @@
+# 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=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="RSpec support and matchers"
+HOMEPAGE="https://rubygems.org/gems/rspectacular"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+ruby_add_rdepend ">=dev-ruby/rspec-3.1:3 dev-ruby/fuubar:2"
+
+# Note that shoulda-matchers is an optional RDEPEND as a plugin.
+# rspectacular doesn't seem to be actively developed anymore and its only
+# reverse dependency passes tests w/o this dep installed, which figures given
+# it's a plugin.
+USE_RUBY="ruby27 ruby30 ruby31" ruby_add_rdepend "dev-ruby/shoulda-matchers:3"
diff --git a/dev-ruby/rss/Manifest b/dev-ruby/rss/Manifest
index 6cf3533dc7f5..000035828af2 100644
--- a/dev-ruby/rss/Manifest
+++ b/dev-ruby/rss/Manifest
@@ -1 +1,2 @@
 DIST rss-0.2.9.gem 106496 BLAKE2B 4b8b4b8fc59f05b7ed513294a809b0961dcd0c8b94cbfff3cbb09102a9ad056063c4b2a5d00b30e2eebc76701b10c3b28125ba2daf49fb420c5ff37a47dd600b SHA512 24d983ae2ee8570c3e433675f9cdacd1c35d6160beb28689a0f8cf446b6b465147bef68dab644a85cb089870d6a9fb2df85cbaed12ed4d6a6fb2d07b12c6ca3f
+DIST rss-0.3.0.tar.gz 107114 BLAKE2B a66d1b317e3dd9016f6cb4942e1daed215622b54c50bc5a318d16c145ec20ca7c0bdf330d173ff5484aa529c293fb4391896fda8127ce00cd865fddc17918e30 SHA512 86b7097e3dcf0da03284b44493be43e972a1facb2f20e81cc3303ea0c39336a364858f3d37e04a2397851ca897bd484284eb81cd6d6b55f4c0d77d811350688e
diff --git a/dev-ruby/rss/rss-0.2.9-r1.ebuild b/dev-ruby/rss/rss-0.2.9-r1.ebuild
index ddd792528c77..b7ce59261128 100644
--- a/dev-ruby/rss/rss-0.2.9-r1.ebuild
+++ b/dev-ruby/rss/rss-0.2.9-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
@@ -12,7 +12,7 @@ DESCRIPTION="Family of libraries that support various formats of XML feeds"
 HOMEPAGE="https://github.com/ruby/rss"
 
 LICENSE="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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/rss/rss-0.2.9.ebuild b/dev-ruby/rss/rss-0.2.9.ebuild
deleted file mode 100644
index f84ec6297ee9..000000000000
--- a/dev-ruby/rss/rss-0.2.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Family of libraries that support various formats of XML feeds"
-HOMEPAGE="https://github.com/ruby/rss"
-
-LICENSE="BSD-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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"
-
-ruby_add_rdepend "dev-ruby/rexml"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/^helper.install/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/rss/rss-0.3.0.ebuild b/dev-ruby/rss/rss-0.3.0.ebuild
new file mode 100644
index 000000000000..1b0f2795d21c
--- /dev/null
+++ b/dev-ruby/rss/rss-0.3.0.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="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+RUBY_FAKEGEM_GEMSPEC="rss.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Family of libraries that support various formats of XML feeds"
+HOMEPAGE="https://github.com/ruby/rss"
+SRC_URI="https://github.com/ruby/rss/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/rexml"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/,/^helper.install/ s:^:#:' Rakefile || die
+
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/ruby-atk/Manifest b/dev-ruby/ruby-atk/Manifest
index 7f70af3b2295..023bc72357e4 100644
--- a/dev-ruby/ruby-atk/Manifest
+++ b/dev-ruby/ruby-atk/Manifest
@@ -1 +1 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
+DIST ruby-gnome2-4.1.2.tar.gz 2708791 BLAKE2B ef24788d8c65f96c76b43d8adc38af21dfb3bfe2f8ae2157f6978993fe65e9735030e9912e8eb1ff5ff90ab1c67701ae61ac3b0790cb285646f26b6193d74be5 SHA512 898ae5bcd7a6347d7392b7888c19493905f6e660afb61f17a60b1f22e4069329ef6ccc9277375a2c40b4d998a309b61de6797f50c4633c0f5de22d2e85252537
diff --git a/dev-ruby/ruby-atk/ruby-atk-3.4.3.ebuild b/dev-ruby/ruby-atk/ruby-atk-3.4.3.ebuild
deleted file mode 100644
index 0da677dbae1d..000000000000
--- a/dev-ruby/ruby-atk/ruby-atk-3.4.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Atk bindings"
-KEYWORDS="amd64 ~ppc ~riscv ~x86"
-IUSE=""
-DEPEND+=" dev-libs/atk[introspection]"
-RDEPEND+=" dev-libs/atk[introspection]"
-
-ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}"
diff --git a/dev-ruby/ruby-atk/ruby-atk-4.1.2.ebuild b/dev-ruby/ruby-atk/ruby-atk-4.1.2.ebuild
new file mode 100644
index 000000000000..c637edf92d92
--- /dev/null
+++ b/dev-ruby/ruby-atk/ruby-atk-4.1.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Atk bindings"
+KEYWORDS="amd64 ~ppc ~riscv ~x86"
+IUSE=""
+RDEPEND+=" dev-libs/atk[introspection]"
+
+ruby_add_rdepend "
+	~dev-ruby/ruby-glib2-${PV}
+	~dev-ruby/ruby-gobject-introspection-${PV}"
diff --git a/dev-ruby/ruby-augeas/metadata.xml b/dev-ruby/ruby-augeas/metadata.xml
index e7a14ad6931c..ed057f07708c 100644
--- a/dev-ruby/ruby-augeas/metadata.xml
+++ b/dev-ruby/ruby-augeas/metadata.xml
@@ -1,11 +1,14 @@
 <?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>ruby@gentoo.org</email>
-<name>Gentoo Ruby Project</name>
-</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hercules-team/ruby-augeas</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r4.ebuild b/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r4.ebuild
deleted file mode 100644
index 65d3d6c1f23e..000000000000
--- a/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_DOCDIR="doc/site/api"
-RUBY_FAKEGEM_EXTRADOC="NEWS README.rdoc"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/augeas/extconf.rb)
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby bindings for Augeas"
-HOMEPAGE="http://augeas.net/"
-SRC_URI="http://download.augeas.net/ruby/${P}.gem"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=app-admin/augeas-1.1.0"
-DEPEND="${RDEPEND}
-		dev-libs/libxml2"
diff --git a/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r5.ebuild b/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r5.ebuild
new file mode 100644
index 000000000000..a912b6035674
--- /dev/null
+++ b/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc/site/api"
+RUBY_FAKEGEM_EXTRADOC="NEWS README.rdoc"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/augeas/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby bindings for Augeas"
+HOMEPAGE="https://augeas.net/"
+SRC_URI="http://download.augeas.net/ruby/${P}.gem"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86"
+IUSE=""
+
+RDEPEND=">=app-admin/augeas-1.1.0"
+DEPEND="${RDEPEND}
+		dev-libs/libxml2"
diff --git a/dev-ruby/ruby-cairo-gobject/Manifest b/dev-ruby/ruby-cairo-gobject/Manifest
index 7f70af3b2295..023bc72357e4 100644
--- a/dev-ruby/ruby-cairo-gobject/Manifest
+++ b/dev-ruby/ruby-cairo-gobject/Manifest
@@ -1 +1 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
+DIST ruby-gnome2-4.1.2.tar.gz 2708791 BLAKE2B ef24788d8c65f96c76b43d8adc38af21dfb3bfe2f8ae2157f6978993fe65e9735030e9912e8eb1ff5ff90ab1c67701ae61ac3b0790cb285646f26b6193d74be5 SHA512 898ae5bcd7a6347d7392b7888c19493905f6e660afb61f17a60b1f22e4069329ef6ccc9277375a2c40b4d998a309b61de6797f50c4633c0f5de22d2e85252537
diff --git a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.4.3.ebuild b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.4.3.ebuild
deleted file mode 100644
index 0c9cbdd97de1..000000000000
--- a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.4.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby cairo-gobject bindings"
-KEYWORDS="amd64 ~ppc ~riscv ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/cairo"
-RDEPEND+=" x11-libs/cairo"
-
-ruby_add_rdepend "dev-ruby/rcairo
-	~dev-ruby/ruby-glib2-${PV}"
diff --git a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-4.1.2.ebuild b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-4.1.2.ebuild
new file mode 100644
index 000000000000..ed2b894792bb
--- /dev/null
+++ b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-4.1.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby cairo-gobject bindings"
+KEYWORDS="amd64 ~ppc ~riscv ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/cairo"
+RDEPEND+=" x11-libs/cairo"
+
+ruby_add_rdepend "dev-ruby/rcairo
+	~dev-ruby/ruby-glib2-${PV}
+	test? ( ~dev-ruby/ruby-gobject-introspection-${PV} )"
diff --git a/dev-ruby/ruby-clutter-gdk/Manifest b/dev-ruby/ruby-clutter-gdk/Manifest
deleted file mode 100644
index 7f70af3b2295..000000000000
--- a/dev-ruby/ruby-clutter-gdk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
diff --git a/dev-ruby/ruby-clutter-gdk/metadata.xml b/dev-ruby/ruby-clutter-gdk/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-clutter-gdk/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.4.3.ebuild b/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.4.3.ebuild
deleted file mode 100644
index ac7d0d682627..000000000000
--- a/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.4.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby binding of GDK specific API of Clutter"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND+=" media-libs/clutter[gtk,introspection]"
-
-ruby_add_rdepend "~dev-ruby/ruby-clutter-${PV}
-	~dev-ruby/ruby-gdk3-${PV}"
-
-# No test
-unset -f each_ruby_test
diff --git a/dev-ruby/ruby-clutter-gstreamer/Manifest b/dev-ruby/ruby-clutter-gstreamer/Manifest
deleted file mode 100644
index 7f70af3b2295..000000000000
--- a/dev-ruby/ruby-clutter-gstreamer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
diff --git a/dev-ruby/ruby-clutter-gstreamer/metadata.xml b/dev-ruby/ruby-clutter-gstreamer/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-clutter-gstreamer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.4.3.ebuild b/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.4.3.ebuild
deleted file mode 100644
index d0d391d82ce4..000000000000
--- a/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.4.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_GNOME2_NEED_VIRTX=yes
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Clutter bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" media-libs/clutter-gst[introspection]"
-RDEPEND+=" media-libs/clutter-gst:*[introspection]"
-
-ruby_add_rdepend "~dev-ruby/ruby-clutter-${PV}
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-gstreamer-${PV}"
diff --git a/dev-ruby/ruby-clutter-gtk/Manifest b/dev-ruby/ruby-clutter-gtk/Manifest
deleted file mode 100644
index 7f70af3b2295..000000000000
--- a/dev-ruby/ruby-clutter-gtk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
diff --git a/dev-ruby/ruby-clutter-gtk/metadata.xml b/dev-ruby/ruby-clutter-gtk/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-clutter-gtk/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.4.3.ebuild b/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.4.3.ebuild
deleted file mode 100644
index 370337ee090c..000000000000
--- a/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.4.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_GNOME2_NEED_VIRTX=yes
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Clutter-GTK bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" media-libs/clutter-gtk[gtk,introspection]"
-RDEPEND+=" media-libs/clutter-gtk[gtk,introspection]"
-
-ruby_add_bdepend "~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-clutter-gdk-${PV}"
-ruby_add_rdepend "~dev-ruby/ruby-clutter-${PV}
-	~dev-ruby/ruby-gtk3-${PV}"
diff --git a/dev-ruby/ruby-clutter/Manifest b/dev-ruby/ruby-clutter/Manifest
deleted file mode 100644
index 7f70af3b2295..000000000000
--- a/dev-ruby/ruby-clutter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
diff --git a/dev-ruby/ruby-clutter/metadata.xml b/dev-ruby/ruby-clutter/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-clutter/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-clutter/ruby-clutter-3.4.3.ebuild b/dev-ruby/ruby-clutter/ruby-clutter-3.4.3.ebuild
deleted file mode 100644
index 8f814003e453..000000000000
--- a/dev-ruby/ruby-clutter/ruby-clutter-3.4.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_GNOME2_NEED_VIRTX=yes
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Clutter bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" media-libs/clutter[introspection]"
-RDEPEND+=" media-libs/clutter[introspection]"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/ruby-cairo-gobject-${PV}
-		~dev-ruby/ruby-gobject-introspection-${PV}
-		~dev-ruby/ruby-glib2-${PV}
-		~dev-ruby/ruby-pango-${PV}
-	)"
-ruby_add_rdepend "~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}
-	~dev-ruby/ruby-pango-${PV}"
diff --git a/dev-ruby/ruby-dict/ruby-dict-0.9.4-r5.ebuild b/dev-ruby/ruby-dict/ruby-dict-0.9.4-r5.ebuild
index 92b72038db39..abf7e6a97497 100644
--- a/dev-ruby/ruby-dict/ruby-dict-0.9.4-r5.ebuild
+++ b/dev-ruby/ruby-dict/ruby-dict-0.9.4-r5.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby30 ruby31 ruby32"
 
 inherit ruby-ng
 
diff --git a/dev-ruby/ruby-elf/Manifest b/dev-ruby/ruby-elf/Manifest
deleted file mode 100644
index 07d27f7196fc..000000000000
--- a/dev-ruby/ruby-elf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-elf-1.0.8.tar.gz 1958368 BLAKE2B c12464d55dc318301e7b999de5057bc6efb306c2393942200e866d7a48c05a179a09991366bddbf10d4a181d9db36c1dbadb0e2ba50ea1021f012a47dce200e7 SHA512 40eb774b9869948812c56193c46548f5c372a1fbd3892b7e6ecd7865607e0edba81ba7e857b6571acb9abb67e066aed312d48a3d0ddd64c8f51f142eb45f8d8f
diff --git a/dev-ruby/ruby-elf/metadata.xml b/dev-ruby/ruby-elf/metadata.xml
deleted file mode 100644
index 553247c52d17..000000000000
--- a/dev-ruby/ruby-elf/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">Flameeyes/ruby-elf</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-elf/ruby-elf-1.0.8-r1.ebuild b/dev-ruby/ruby-elf/ruby-elf-1.0.8-r1.ebuild
deleted file mode 100644
index 54fcb4fa924c..000000000000
--- a/dev-ruby/ruby-elf/ruby-elf-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-GITHUB_URI="https://github.com/Flameeyes/${PN}"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="${GITHUB_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-DESCRIPTION="Ruby library to access ELF files information"
-HOMEPAGE="https://www.flameeyes.eu/projects/ruby-elf"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="test"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/test-unit:2 )
-	dev-ruby/rake"
-
-# for the man pages
-DEPEND+="
-	dev-libs/libxslt
-	app-text/docbook-xsl-ns-stylesheets"
-
-RDEPEND+="
-	virtual/man"
-
-all_ruby_compile() {
-	# build the man pages
-	rake manpages || die "rake manpages failed"
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test_*.rb
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman manpages/*.1
-	dodoc DONATING README.md
-}
diff --git a/dev-ruby/ruby-feedparser/Manifest b/dev-ruby/ruby-feedparser/Manifest
index c7d591f01bc9..c50e8d61204c 100644
--- a/dev-ruby/ruby-feedparser/Manifest
+++ b/dev-ruby/ruby-feedparser/Manifest
@@ -1,2 +1 @@
-DIST ruby-feedparser-0.10.0.tar.gz 2697849 BLAKE2B 679e8442b5b11eb56b30d346edc54d76d8f94f43ab26299ec0dd831faf6acb7fde304b4d6f8147d67ab013c9d7e50c163fcb75e8aa10ddc9091529e29eeb0d79 SHA512 0cbf8543a73385f1bd7fd2bcd647828e4e03ec648a62cd898cfd58ed574ede68760184037a5c7ba58acc42d1d51c54158ad1247216ede415791d0bbaf99a5ce8
-DIST ruby-feedparser-0.9.7.tar.gz 2705854 BLAKE2B d64d35696dd66890013643339817cf470e714fef4ecb5ad8c12a221fd949af53b6fa3668ec2ec16ac0a5fa76eb8dedf037530881ce2545356a4bf20dc7153b01 SHA512 6283e21448cebbfc0d07c01d24be48acadb852110c9e940983a22ce3c95592aea12a99dc4763aa267ba7386c935e2f58e52427b57171aa8fcaa332c6bb440fed
+DIST ruby-feedparser-0.11.2.tar.gz 2698609 BLAKE2B b516c7d50ba6bfd769dd42b5cfe85142df596556d21551f69c7d180eb172cae1d4c8ad86e44ae20cd87734b1d8f4b11456315b9c2a7df1a428a05dd8060bd8fd SHA512 1e067b0170f2c9df531b9378d004b06d098ddc21899755843fa2a2ae37a965e1f6060272525943e8b140b9f82bb6aad37a307dbb77adf74743ae76fd2a7c26d0
diff --git a/dev-ruby/ruby-feedparser/ruby-feedparser-0.10.0.ebuild b/dev-ruby/ruby-feedparser/ruby-feedparser-0.10.0.ebuild
deleted file mode 100644
index 8b34225bd149..000000000000
--- a/dev-ruby/ruby-feedparser/ruby-feedparser-0.10.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-GITHUB_USER="feed2imap"
-
-DESCRIPTION="Ruby library to parse ATOM/RSS feeds"
-HOMEPAGE="https://github.com/feed2imap/ruby-feedparser"
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/magic"
-
-ruby_add_bdepend "dev-ruby/magic
-	test? ( dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	# Extract gemspec source from Rakefile
-	sed -n -e '/Gem::Specification/,/end$/p' Rakefile > ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e 's/PKG_NAME/"'${PN}'"/' \
-		-e 's/PKG_VERSION/"'${PV}'"/' \
-		-e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	sed -i -e '/PKG_VERSION/ s:ruby:'${RUBY}':' Rakefile || die
-}
diff --git a/dev-ruby/ruby-feedparser/ruby-feedparser-0.11.2.ebuild b/dev-ruby/ruby-feedparser/ruby-feedparser-0.11.2.ebuild
new file mode 100644
index 000000000000..ea66a5ed4a44
--- /dev/null
+++ b/dev-ruby/ruby-feedparser/ruby-feedparser-0.11.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+GITHUB_USER="feed2imap"
+
+DESCRIPTION="Ruby library to parse ATOM/RSS feeds"
+HOMEPAGE="https://github.com/feed2imap/ruby-feedparser"
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/magic"
+
+ruby_add_bdepend "dev-ruby/magic
+	test? ( dev-ruby/mocha:1.0 )"
+
+all_ruby_prepare() {
+	# Extract gemspec source from Rakefile
+	sed -n -e '/Gem::Specification/,/end$/p' Rakefile > ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e 's/PKG_NAME/"'${PN}'"/' \
+		-e 's/PKG_VERSION/"'${PV}'"/' \
+		-e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '2igem "mocha", "<2"' test/tc_sgml_parser.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e '/PKG_VERSION/ s:ruby:'${RUBY}':' Rakefile || die
+}
diff --git a/dev-ruby/ruby-feedparser/ruby-feedparser-0.9.7.ebuild b/dev-ruby/ruby-feedparser/ruby-feedparser-0.9.7.ebuild
deleted file mode 100644
index bcaa2442bb43..000000000000
--- a/dev-ruby/ruby-feedparser/ruby-feedparser-0.9.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-GITHUB_USER="feed2imap"
-
-DESCRIPTION="Ruby library to parse ATOM/RSS feeds"
-HOMEPAGE="https://github.com/feed2imap/ruby-feedparser"
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/magic"
-
-ruby_add_bdepend "dev-ruby/magic
-	test? ( dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	# Extract gemspec source from Rakefile
-	sed -n -e '/Gem::Specification/,/end$/p' Rakefile > ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e 's/PKG_NAME/"'${PN}'"/' \
-		-e 's/PKG_VERSION/"'${PV}'"/' \
-		-e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	sed -i -e '/PKG_VERSION/ s:ruby:'${RUBY}':' Rakefile || die
-}
diff --git a/dev-ruby/ruby-filemagic/Manifest b/dev-ruby/ruby-filemagic/Manifest
index a69c7dfd96db..781f9cc25f7a 100644
--- a/dev-ruby/ruby-filemagic/Manifest
+++ b/dev-ruby/ruby-filemagic/Manifest
@@ -1,2 +1 @@
-DIST ruby-filemagic-0.7.2.gem 19456 BLAKE2B 5008fb27a5b6bbd93522c72381b1c74788e544e6120f3c44f4a594b360ee783d4e92e73ef584a8e56c1776a5e5e824d6fa603df135b6e1779fa460c19c3bb4a7 SHA512 b68324dfb0cd2e55cd200696fabe87c0aa68a11922789ae40abc999db7d200810cffa2c414c07bc96e2fee54aab775f01752f951b3a3273289594201ca547494
 DIST ruby-filemagic-0.7.3.gem 18944 BLAKE2B 5694e4e2dfa4af05c6e9966715feaf1442c4c884b42fe98751af1a4fc74506461c9d42cd42cbe99ed341670950dda5c06ae5a23afb73bf8a88273f9ca6880cd6 SHA512 8bbc7fcb1dd7746061264ee433d501a842bfea30d7eff40b6dfb0f5c567192e6aa161e67181a474a4b805bb1adb9fa3bd43e314abf14c3ce3ac11d72598b2fc6
diff --git a/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.2-r1.ebuild b/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.2-r1.ebuild
deleted file mode 100644
index b8b2c7ec7e6c..000000000000
--- a/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README TODO"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/filemagic/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/filemagic"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby binding to libmagic"
-HOMEPAGE="https://github.com/blackwinter/ruby-filemagic"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-DEPEND="${DEPEND} sys-apps/file test? ( >=sys-apps/file-5.30 )"
-RDEPEND="${RDEPEND} sys-apps/file"
-
-all_ruby_prepare() {
-	# Fix up tests for newer sys-apps/file definitions
-	sed -i -e '/test_abbrev_mime_type/,/^  end/ s/ms-office/ms-excel/' test/filemagic_test.rb || die
-
-	# Fix up broken test symlink and regenerate compiled magic file
-	pushd test || die
-	rm -f pylink && ln -s pyfile pylink || die
-	file -C -m perl || die
-	popd || die
-}
-
-each_ruby_test() {
-	find test
-	${RUBY} -Ctest -I../lib filemagic_test.rb || die
-}
diff --git a/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.3.ebuild b/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.3.ebuild
index 84da5465bfd0..7ed5b5610070 100644
--- a/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.3.ebuild
+++ b/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.3.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="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="ChangeLog README TODO"
@@ -17,9 +17,9 @@ inherit ruby-fakegem
 DESCRIPTION="Ruby binding to libmagic"
 HOMEPAGE="https://github.com/blackwinter/ruby-filemagic"
 
-LICENSE="Ruby"
+LICENSE="Ruby-BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND="${DEPEND} sys-apps/file test? ( >=sys-apps/file-5.30 )"
diff --git a/dev-ruby/ruby-gdk3/Manifest b/dev-ruby/ruby-gdk3/Manifest
index 7f70af3b2295..023bc72357e4 100644
--- a/dev-ruby/ruby-gdk3/Manifest
+++ b/dev-ruby/ruby-gdk3/Manifest
@@ -1 +1 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
+DIST ruby-gnome2-4.1.2.tar.gz 2708791 BLAKE2B ef24788d8c65f96c76b43d8adc38af21dfb3bfe2f8ae2157f6978993fe65e9735030e9912e8eb1ff5ff90ab1c67701ae61ac3b0790cb285646f26b6193d74be5 SHA512 898ae5bcd7a6347d7392b7888c19493905f6e660afb61f17a60b1f22e4069329ef6ccc9277375a2c40b4d998a309b61de6797f50c4633c0f5de22d2e85252537
diff --git a/dev-ruby/ruby-gdk3/ruby-gdk3-3.4.3.ebuild b/dev-ruby/ruby-gdk3/ruby-gdk3-3.4.3.ebuild
deleted file mode 100644
index ba265486a943..000000000000
--- a/dev-ruby/ruby-gdk3/ruby-gdk3-3.4.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_GNOME2_NEED_VIRTX=yes
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby GDK-3.x bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/gtk+:3[introspection]"
-RDEPEND+=" x11-libs/gtk+:3[introspection]"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-pango-${PV}
-"
diff --git a/dev-ruby/ruby-gdk3/ruby-gdk3-4.1.2.ebuild b/dev-ruby/ruby-gdk3/ruby-gdk3-4.1.2.ebuild
new file mode 100644
index 000000000000..943c8695cde9
--- /dev/null
+++ b/dev-ruby/ruby-gdk3/ruby-gdk3-4.1.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_GNOME2_NEED_VIRTX=yes
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby GDK-3.x bindings"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/gtk+:3"
+RDEPEND+=" x11-libs/gtk+:3"
+
+ruby_add_rdepend "
+	~dev-ruby/ruby-cairo-gobject-${PV}
+	~dev-ruby/ruby-gdkpixbuf2-${PV}
+	~dev-ruby/ruby-pango-${PV}"
diff --git a/dev-ruby/ruby-gdkpixbuf2/Manifest b/dev-ruby/ruby-gdkpixbuf2/Manifest
index 7f70af3b2295..023bc72357e4 100644
--- a/dev-ruby/ruby-gdkpixbuf2/Manifest
+++ b/dev-ruby/ruby-gdkpixbuf2/Manifest
@@ -1 +1 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
+DIST ruby-gnome2-4.1.2.tar.gz 2708791 BLAKE2B ef24788d8c65f96c76b43d8adc38af21dfb3bfe2f8ae2157f6978993fe65e9735030e9912e8eb1ff5ff90ab1c67701ae61ac3b0790cb285646f26b6193d74be5 SHA512 898ae5bcd7a6347d7392b7888c19493905f6e660afb61f17a60b1f22e4069329ef6ccc9277375a2c40b4d998a309b61de6797f50c4633c0f5de22d2e85252537
diff --git a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.4.3.ebuild b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.4.3.ebuild
deleted file mode 100644
index f4621b5d3828..000000000000
--- a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.4.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_NAME="gdk_pixbuf2"
-
-inherit ruby-ng-gnome2
-
-RUBY_S=ruby-gnome-${PV}/gdk_pixbuf2
-
-DESCRIPTION="Ruby GdkPixbuf2 bindings"
-KEYWORDS="amd64 ~ppc ~riscv ~x86"
-IUSE=""
-
-DEPEND+=" test? ( x11-libs/gdk-pixbuf[jpeg] )"
-RDEPEND+=" x11-libs/gdk-pixbuf[introspection]"
-
-ruby_add_rdepend "~dev-ruby/ruby-gio2-${PV}"
diff --git a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-4.1.2.ebuild b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-4.1.2.ebuild
new file mode 100644
index 000000000000..bad421cbf73a
--- /dev/null
+++ b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-4.1.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_NAME="gdk_pixbuf2"
+
+inherit ruby-ng-gnome2
+
+RUBY_S=ruby-gnome-${PV}/gdk_pixbuf2
+
+DESCRIPTION="Ruby GdkPixbuf2 bindings"
+KEYWORDS="amd64 ~ppc ~riscv ~x86"
+IUSE=""
+
+DEPEND+=" test? ( x11-libs/gdk-pixbuf[jpeg] )"
+RDEPEND+=" x11-libs/gdk-pixbuf[introspection]"
+
+ruby_add_rdepend "~dev-ruby/ruby-gio2-${PV}"
diff --git a/dev-ruby/ruby-gegl/Manifest b/dev-ruby/ruby-gegl/Manifest
deleted file mode 100644
index 7f70af3b2295..000000000000
--- a/dev-ruby/ruby-gegl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
diff --git a/dev-ruby/ruby-gegl/metadata.xml b/dev-ruby/ruby-gegl/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-gegl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-gegl/ruby-gegl-3.4.3.ebuild b/dev-ruby/ruby-gegl/ruby-gegl-3.4.3.ebuild
deleted file mode 100644
index 0facf8214c7b..000000000000
--- a/dev-ruby/ruby-gegl/ruby-gegl-3.4.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby GEGL bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" media-libs/gegl:0.4[introspection]"
-RDEPEND+=" media-libs/gegl:0.4[introspection]"
-
-ruby_add_rdepend "~dev-ruby/ruby-gio2-${PV}"
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index 403376185deb..097142b1ee33 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,3 +1,4 @@
-DIST gettext-3.3.5.gem 290816 BLAKE2B 74434c3feaedc16a17ee530669dacbc4b32ae0be95eb903ce89131619e862e1c823351653ce3c5f95f0882c183e3b2fe87b423a245aa2d8803688ce7e6afb5f7 SHA512 6777b96dd73b3d454c0a14a40d2ac0eac52894fa58067ba9ec976627c96efc98b294b1498bed965d0426bcaa1b371dcde5745101e05e21e408397b4e8d31894b
-DIST gettext-3.3.7.gem 292352 BLAKE2B 76232148ec89720553e7f260c7222b8c5f9eccf0dd0b0b3afa776d9fe6dc6205b21f7853fd1a1edb6e28208ebbd56e327d160af179a4b7c7aaab12965243b806 SHA512 6e7906d68b3e834e1a9d69cea26a61ffed07abd035c9a8ffc3456bc2fdcb9495700c2aaa4d099cf75f88dc6916899510208012e02d1d4f15de3d5148251b4233
-DIST gettext-3.4.1.gem 231936 BLAKE2B c225a3b0239f01fade9406d4e7704905971369bb37cfc29a5aa3c1bdd60e3b71057b2f7f736cfc3dde60709efcd935a609917384a324178badd760f8e40dfa01 SHA512 c4c88aa9b1d81772dce533bcb6a24c2bcde81f15e2f3947e491c7e391099f23c1ac27b6a25fa012f9f7b01c16711446adaf0c014f46d55acc73bc4a7a3317af9
+DIST gettext-3.4.4.gem 232960 BLAKE2B 7822245f1efc63c3faccae299c84f671f0eb264776288cd4d60f9981988f4942fd3b3033fdcd58e03d2129f5ece3a579dbf3bdffb567c96d9affbabe7355613f SHA512 2321e13d9789dc059518c8ae0501bc26fe74fd0a24c9336c913a9ce8d2a2d77b0a7ece883f5c36e286144256077ecdbdacc84ffc37fb7753fe8bc589d473b00b
+DIST gettext-3.4.6.gem 232960 BLAKE2B 108e89bd34e0a3341d4c09b7a444a2ba3a6c84e3f95ba22df4fd0ed5374bb7ad94131fc6ceb2407b16d9e7995383853b80101ab61319a87ee57147cc40ca3279 SHA512 1c98ef539509231aa7bdd7d725767576bebd7000b55599c2ac59bc915fc52aac7a4075575907893701322bd06bf7035dbcc7e262b39d93b5eeaa6f9a3511a20f
+DIST gettext-3.4.7.gem 233472 BLAKE2B d180bcddfb861e321cf6447a9a3868f71338984989ba9e525bd55fee6aed81ac6041f572f66133acfa054e7e680d2d5a14670775f251bc547d713c8995f4c9d4 SHA512 4f9d3a56ae9613fd4651f249dc6e0eea82366e898e963c8ca84484b32b9312bb20cf6c396bd48aedfc039db60191bf7804769c4924a9d89f1851aafd3d24ace2
+DIST gettext-3.4.9.gem 234496 BLAKE2B bc1fd26ae048a959df1291cbe6bc5ce4fe060dc66baff2e3a9030dfbbc937e6e2aef5586259cfb1ef0f6eb5e2924badd6db579f7d268ae4bb079d06248655e87 SHA512 756fc65210ccc88c06ed07da699e88aca865b0b3b2b2b92824d3e17062a1008d9d561f1572d0795478bfe7ad542e3aaf8c65ee2f80fed1ead202638bd32dc77a
diff --git a/dev-ruby/ruby-gettext/metadata.xml b/dev-ruby/ruby-gettext/metadata.xml
index 658c72b1920d..413e46808413 100644
--- a/dev-ruby/ruby-gettext/metadata.xml
+++ b/dev-ruby/ruby-gettext/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">ruby-gettext/gettext</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.3.5.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.3.5.ebuild
deleted file mode 100644
index 59e481b36230..000000000000
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.3.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_NAME="${PN/ruby-/}"
-RUBY_FAKEGEM_VERSION="${PV%_*}"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locale po"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
-HOMEPAGE="https://ruby-gettext.github.io/"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="doc test"
-SLOT="0"
-LICENSE="|| ( Ruby LGPL-3+ )"
-
-ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	dev-ruby/racc"
-ruby_add_bdepend "test? (
-	dev-ruby/test-unit:2
-	dev-ruby/test-unit-rr )"
-
-RDEPEND+=" sys-devel/gettext"
-DEPEND+=" sys-devel/gettext"
-
-all_ruby_prepare() {
-	# Fix broken racc invocation
-	sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
-
-	# Avoid bundler dependency
-	sed -i -e '/bundler/,/helper.install/ s:^:#:' \
-		-e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
-
-	# Avoid dependency on developer-specific tools.
-	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
-
-	# Avoid tests failing due to a missing test file.
-	#sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
-
-	# Avoid SAFE mode test that fails on ruby 2.6
-	sed -i -e '/test_safe_mode/aomit' test/test_gettext.rb || die
-}
-
-each_ruby_test() {
-	# Upstream tries to daisy-chain rake calls but they fail badly
-	# with our setup, so run it manually.
-	${RUBY} test/run-test.rb || die "tests failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r samples
-}
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild
deleted file mode 100644
index c34dbaf5547d..000000000000
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_NAME="${PN/ruby-/}"
-RUBY_FAKEGEM_VERSION="${PV%_*}"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locale po"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
-HOMEPAGE="https://ruby-gettext.github.io/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="doc test"
-SLOT="0"
-LICENSE="|| ( Ruby LGPL-3+ )"
-
-ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	dev-ruby/racc"
-ruby_add_bdepend "test? (
-	dev-ruby/test-unit:2
-	dev-ruby/test-unit-rr )"
-
-RDEPEND+=" sys-devel/gettext"
-DEPEND+=" sys-devel/gettext"
-
-all_ruby_prepare() {
-	# Fix broken racc invocation
-	sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
-
-	# Avoid bundler dependency
-	sed -i -e '/bundler/,/helper.install/ s:^:#:' \
-		-e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
-
-	# Avoid dependency on developer-specific tools.
-	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
-
-	# Avoid tests failing due to a missing test file.
-	#sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
-
-	# Avoid SAFE mode test that fails on ruby 2.6
-	sed -i -e '/test_safe_mode/aomit' test/test_gettext.rb || die
-}
-
-each_ruby_test() {
-	# Upstream tries to daisy-chain rake calls but they fail badly
-	# with our setup, so run it manually.
-	${RUBY} test/run-test.rb || die "tests failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r samples
-}
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.4.1.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.4.1.ebuild
deleted file mode 100644
index 89ae1989fed2..000000000000
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.4.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_NAME="${PN/ruby-/}"
-RUBY_FAKEGEM_VERSION="${PV%_*}"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locale po"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
-HOMEPAGE="https://ruby-gettext.github.io/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="doc test"
-SLOT="0"
-LICENSE="|| ( Ruby LGPL-3+ )"
-
-ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	dev-ruby/racc"
-ruby_add_bdepend "test? (
-	dev-ruby/test-unit:2
-	dev-ruby/test-unit-rr )"
-
-RDEPEND+=" sys-devel/gettext"
-DEPEND+=" sys-devel/gettext"
-
-all_ruby_prepare() {
-	# Fix broken racc invocation
-	sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
-
-	# Avoid bundler dependency
-	sed -i -e '/bundler/,/helper.install/ s:^:#:' \
-		-e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
-
-	# Avoid dependency on developer-specific tools.
-	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_test() {
-	# Upstream tries to daisy-chain rake calls but they fail badly
-	# with our setup, so run it manually.
-	${RUBY} test/run-test.rb || die "tests failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r samples
-}
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.4.4.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.4.4.ebuild
new file mode 100644
index 000000000000..8078919cc70d
--- /dev/null
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.4.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_NAME="${PN/ruby-/}"
+RUBY_FAKEGEM_VERSION="${PV%_*}"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locale po"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
+HOMEPAGE="https://ruby-gettext.github.io/"
+
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+IUSE="doc test"
+SLOT="0"
+LICENSE="|| ( GPL-2 Ruby-BSD LGPL-3+ )"
+
+ruby_add_rdepend "
+	dev-ruby/erubi
+	>=dev-ruby/locale-2.0.5
+	dev-ruby/prime
+	dev-ruby/racc
+	>=dev-ruby/text-1.3.0
+"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	dev-ruby/racc"
+ruby_add_bdepend "test? (
+	dev-ruby/test-unit:2
+	dev-ruby/test-unit-rr )"
+
+RDEPEND+=" sys-devel/gettext"
+DEPEND+=" sys-devel/gettext"
+
+all_ruby_prepare() {
+	# Fix broken racc invocation
+	sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
+
+	# Avoid bundler dependency
+	sed -i -e '/bundler/,/helper.install/ s:^:#:' \
+		-e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
+
+	# Avoid dependency on developer-specific tools.
+	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	# Borrowed from Fedora
+	local -x LANG=C.UTF-8
+	local -x LANGUAGE=ja_JP.utf8
+
+	# Upstream tries to daisy-chain rake calls but they fail badly
+	# with our setup, so run it manually.
+	${RUBY} test/run-test.rb || die "tests failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r samples
+}
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.4.6.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.4.6.ebuild
new file mode 100644
index 000000000000..8078919cc70d
--- /dev/null
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.4.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_NAME="${PN/ruby-/}"
+RUBY_FAKEGEM_VERSION="${PV%_*}"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locale po"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
+HOMEPAGE="https://ruby-gettext.github.io/"
+
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+IUSE="doc test"
+SLOT="0"
+LICENSE="|| ( GPL-2 Ruby-BSD LGPL-3+ )"
+
+ruby_add_rdepend "
+	dev-ruby/erubi
+	>=dev-ruby/locale-2.0.5
+	dev-ruby/prime
+	dev-ruby/racc
+	>=dev-ruby/text-1.3.0
+"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	dev-ruby/racc"
+ruby_add_bdepend "test? (
+	dev-ruby/test-unit:2
+	dev-ruby/test-unit-rr )"
+
+RDEPEND+=" sys-devel/gettext"
+DEPEND+=" sys-devel/gettext"
+
+all_ruby_prepare() {
+	# Fix broken racc invocation
+	sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
+
+	# Avoid bundler dependency
+	sed -i -e '/bundler/,/helper.install/ s:^:#:' \
+		-e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
+
+	# Avoid dependency on developer-specific tools.
+	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	# Borrowed from Fedora
+	local -x LANG=C.UTF-8
+	local -x LANGUAGE=ja_JP.utf8
+
+	# Upstream tries to daisy-chain rake calls but they fail badly
+	# with our setup, so run it manually.
+	${RUBY} test/run-test.rb || die "tests failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r samples
+}
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.4.7.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.4.7.ebuild
new file mode 100644
index 000000000000..3b7d7223cfca
--- /dev/null
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.4.7.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_NAME="${PN/ruby-/}"
+RUBY_FAKEGEM_VERSION="${PV%_*}"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locale po"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
+HOMEPAGE="https://ruby-gettext.github.io/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc test"
+SLOT="0"
+LICENSE="|| ( GPL-2 Ruby-BSD LGPL-3+ )"
+
+ruby_add_rdepend "
+	dev-ruby/erubi
+	>=dev-ruby/locale-2.0.5
+	dev-ruby/prime
+	dev-ruby/racc
+	>=dev-ruby/text-1.3.0
+"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	dev-ruby/racc"
+ruby_add_bdepend "test? (
+	dev-ruby/test-unit:2
+	dev-ruby/test-unit-rr )"
+
+RDEPEND+=" sys-devel/gettext"
+DEPEND+=" sys-devel/gettext"
+
+all_ruby_prepare() {
+	# Fix broken racc invocation
+	sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
+
+	# Avoid bundler dependency
+	sed -i -e '/bundler/,/helper.install/ s:^:#:' \
+		-e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
+
+	# Avoid dependency on developer-specific tools.
+	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	# Borrowed from Fedora
+	local -x LANG=C.UTF-8
+	local -x LANGUAGE=ja_JP.utf8
+
+	# Upstream tries to daisy-chain rake calls but they fail badly
+	# with our setup, so run it manually.
+	${RUBY} test/run-test.rb || die "tests failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r samples
+}
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.4.9.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.4.9.ebuild
new file mode 100644
index 000000000000..2cf8607e5955
--- /dev/null
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.4.9.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_NAME="${PN/ruby-/}"
+RUBY_FAKEGEM_VERSION="${PV%_*}"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locale po"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
+HOMEPAGE="https://ruby-gettext.github.io/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc test"
+SLOT="0"
+LICENSE="|| ( GPL-2 Ruby-BSD LGPL-3+ )"
+
+ruby_add_rdepend "
+	dev-ruby/erubi
+	>=dev-ruby/locale-2.0.5
+	dev-ruby/prime
+	dev-ruby/racc
+	>=dev-ruby/text-1.3.0
+"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	dev-ruby/racc"
+ruby_add_bdepend "test? (
+	dev-ruby/test-unit:2
+	dev-ruby/test-unit-rr )"
+
+RDEPEND+=" sys-devel/gettext"
+DEPEND+=" sys-devel/gettext"
+
+all_ruby_prepare() {
+	# Fix broken racc invocation
+	sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
+
+	# Avoid bundler dependency
+	sed -i -e '/bundler/,/helper.install/ s:^:#:' \
+		-e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
+
+	# Avoid dependency on developer-specific tools.
+	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	# Borrowed from Fedora
+	local -x LANG=C.UTF-8
+	local -x LANGUAGE=ja_JP.utf8
+
+	# Upstream tries to daisy-chain rake calls but they fail badly
+	# with our setup, so run it manually.
+	${RUBY} test/run-test.rb || die "tests failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r samples
+}
diff --git a/dev-ruby/ruby-gio2/Manifest b/dev-ruby/ruby-gio2/Manifest
index 7f70af3b2295..023bc72357e4 100644
--- a/dev-ruby/ruby-gio2/Manifest
+++ b/dev-ruby/ruby-gio2/Manifest
@@ -1 +1 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
+DIST ruby-gnome2-4.1.2.tar.gz 2708791 BLAKE2B ef24788d8c65f96c76b43d8adc38af21dfb3bfe2f8ae2157f6978993fe65e9735030e9912e8eb1ff5ff90ab1c67701ae61ac3b0790cb285646f26b6193d74be5 SHA512 898ae5bcd7a6347d7392b7888c19493905f6e660afb61f17a60b1f22e4069329ef6ccc9277375a2c40b4d998a309b61de6797f50c4633c0f5de22d2e85252537
diff --git a/dev-ruby/ruby-gio2/ruby-gio2-3.4.3.ebuild b/dev-ruby/ruby-gio2/ruby-gio2-3.4.3.ebuild
deleted file mode 100644
index 8fc8b3da1fa5..000000000000
--- a/dev-ruby/ruby-gio2/ruby-gio2-3.4.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby binding of gio-2"
-KEYWORDS="amd64 ~ppc ~riscv ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/glib
-	test? ( sys-apps/dbus )"
-RDEPEND+=" dev-libs/glib"
-ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}"
-
-each_ruby_test() {
-	XDG_RUNTIME_DIR=${T} dbus-launch ${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-gio2/ruby-gio2-4.1.2.ebuild b/dev-ruby/ruby-gio2/ruby-gio2-4.1.2.ebuild
new file mode 100644
index 000000000000..18216ea171e3
--- /dev/null
+++ b/dev-ruby/ruby-gio2/ruby-gio2-4.1.2.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="ruby31 ruby32 ruby33"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby binding of gio-2"
+KEYWORDS="amd64 ~ppc ~riscv ~x86"
+IUSE=""
+
+DEPEND+=" dev-libs/glib
+	test? ( sys-apps/dbus )"
+RDEPEND+=" dev-libs/glib"
+ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}
+	~dev-ruby/ruby-gobject-introspection-${PV}"
+
+all_ruby_prepare() {
+	ruby-ng-gnome2_all_ruby_prepare
+
+	# Avoid test requiring network access
+	rm -f test/test-resolver.rb || die
+}
+
+each_ruby_test() {
+	XDG_RUNTIME_DIR=${T} dbus-launch ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-glib2/Manifest b/dev-ruby/ruby-glib2/Manifest
index 7f70af3b2295..023bc72357e4 100644
--- a/dev-ruby/ruby-glib2/Manifest
+++ b/dev-ruby/ruby-glib2/Manifest
@@ -1 +1 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
+DIST ruby-gnome2-4.1.2.tar.gz 2708791 BLAKE2B ef24788d8c65f96c76b43d8adc38af21dfb3bfe2f8ae2157f6978993fe65e9735030e9912e8eb1ff5ff90ab1c67701ae61ac3b0790cb285646f26b6193d74be5 SHA512 898ae5bcd7a6347d7392b7888c19493905f6e660afb61f17a60b1f22e4069329ef6ccc9277375a2c40b4d998a309b61de6797f50c4633c0f5de22d2e85252537
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.4.3.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.4.3.ebuild
deleted file mode 100644
index a90c72451f74..000000000000
--- a/dev-ruby/ruby-glib2/ruby-glib2-3.4.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Glib2 bindings"
-KEYWORDS="amd64 ~ppc ~ppc64 ~riscv x86"
-IUSE=""
-RDEPEND+=" >=dev-libs/glib-2"
-DEPEND+=" >=dev-libs/glib-2"
-
-all_ruby_prepare() {
-	ruby-ng-gnome2_all_ruby_prepare
-
-	# Skip spawn tests since our sandbox also provides items in the
-	# environment and this makes the test fragile.
-	rm -v test/test-spawn.rb || die
-}
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-4.1.2.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-4.1.2.ebuild
new file mode 100644
index 000000000000..d56bdd14102a
--- /dev/null
+++ b/dev-ruby/ruby-glib2/ruby-glib2-4.1.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Glib2 bindings"
+KEYWORDS="amd64 ~ppc ~ppc64 ~riscv x86"
+IUSE=""
+RDEPEND+=" >=dev-libs/glib-2"
+DEPEND+=" >=dev-libs/glib-2"
+
+all_ruby_prepare() {
+	ruby-ng-gnome2_all_ruby_prepare
+
+	# Skip spawn tests since our sandbox also provides items in the
+	# environment and this makes the test fragile.
+	rm -v test/test-spawn.rb || die
+}
diff --git a/dev-ruby/ruby-gnome2/metadata.xml b/dev-ruby/ruby-gnome2/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-gnome2/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-gnome2/ruby-gnome2-3.4.3.ebuild b/dev-ruby/ruby-gnome2/ruby-gnome2-3.4.3.ebuild
deleted file mode 100644
index a02ce88cfa6b..000000000000
--- a/dev-ruby/ruby-gnome2/ruby-gnome2-3.4.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng
-
-DESCRIPTION="Ruby Gnome2 bindings"
-HOMEPAGE="http://ruby-gnome2.sourceforge.jp/"
-SRC_URI=""
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-atk-${PV}
-	~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-clutter-${PV}
-	~dev-ruby/ruby-clutter-gdk-${PV}
-	~dev-ruby/ruby-clutter-gstreamer-${PV}
-	~dev-ruby/ruby-clutter-gtk-${PV}
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-gdk3-${PV}
-	~dev-ruby/ruby-gegl-${PV}
-	~dev-ruby/ruby-gio2-${PV}
-	~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-gnumeric-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}
-	~dev-ruby/ruby-goffice-${PV}
-	~dev-ruby/ruby-gsf-${PV}
-	~dev-ruby/ruby-gstreamer-${PV}
-	~dev-ruby/ruby-gtk2-${PV}
-	~dev-ruby/ruby-gtk3-${PV}
-	~dev-ruby/ruby-gtksourceview-${PV}
-	~dev-ruby/ruby-gtksourceview3-${PV}
-	~dev-ruby/ruby-gtksourceview4-${PV}
-	~dev-ruby/ruby-libsecret-${PV}
-	~dev-ruby/ruby-pango-${PV}
-	~dev-ruby/ruby-poppler-${PV}
-	~dev-ruby/ruby-rsvg-${PV}
-	~dev-ruby/ruby-vte-${PV}
-	~dev-ruby/ruby-vte3-${PV}
-	~dev-ruby/ruby-webkit2-gtk-${PV}
-	~dev-ruby/ruby-wnck3-${PV}"
diff --git a/dev-ruby/ruby-gnumeric/Manifest b/dev-ruby/ruby-gnumeric/Manifest
deleted file mode 100644
index 7f70af3b2295..000000000000
--- a/dev-ruby/ruby-gnumeric/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
diff --git a/dev-ruby/ruby-gnumeric/metadata.xml b/dev-ruby/ruby-gnumeric/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-gnumeric/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-gnumeric/ruby-gnumeric-3.4.3.ebuild b/dev-ruby/ruby-gnumeric/ruby-gnumeric-3.4.3.ebuild
deleted file mode 100644
index 9019310e136e..000000000000
--- a/dev-ruby/ruby-gnumeric/ruby-gnumeric-3.4.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_GNOME2_NEED_VIRTX=yes
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Gnumeric bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" app-office/gnumeric[introspection]"
-RDEPEND+=" app-office/gnumeric[introspection]"
-
-ruby_add_bdepend "~dev-ruby/ruby-goffice-${PV}"
-ruby_add_rdepend "~dev-ruby/ruby-goffice-${PV}"
-
-# Test is currently disabled.
-# https://github.com/ruby-gnome/ruby-gnome/blob/master/gnumeric/test/test-convert.rb#L27
-each_ruby_test() {
-	:
-}
diff --git a/dev-ruby/ruby-gobject-introspection/Manifest b/dev-ruby/ruby-gobject-introspection/Manifest
index 7f70af3b2295..023bc72357e4 100644
--- a/dev-ruby/ruby-gobject-introspection/Manifest
+++ b/dev-ruby/ruby-gobject-introspection/Manifest
@@ -1 +1 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
+DIST ruby-gnome2-4.1.2.tar.gz 2708791 BLAKE2B ef24788d8c65f96c76b43d8adc38af21dfb3bfe2f8ae2157f6978993fe65e9735030e9912e8eb1ff5ff90ab1c67701ae61ac3b0790cb285646f26b6193d74be5 SHA512 898ae5bcd7a6347d7392b7888c19493905f6e660afb61f17a60b1f22e4069329ef6ccc9277375a2c40b4d998a309b61de6797f50c4633c0f5de22d2e85252537
diff --git a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.4.3.ebuild b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.4.3.ebuild
deleted file mode 100644
index 50494b226cc5..000000000000
--- a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.4.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby GObjectIntrospection bindings"
-KEYWORDS="amd64 ~ppc ~riscv ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/glib
-	dev-libs/gobject-introspection"
-RDEPEND+=" dev-libs/glib
-	dev-libs/gobject-introspection"
-
-ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}"
diff --git a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-4.1.2.ebuild b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-4.1.2.ebuild
new file mode 100644
index 000000000000..1d073f4d314a
--- /dev/null
+++ b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-4.1.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby GObjectIntrospection bindings"
+KEYWORDS="amd64 ~ppc ~riscv ~x86"
+IUSE=""
+
+DEPEND+=" dev-libs/glib
+	dev-libs/gobject-introspection"
+RDEPEND+=" dev-libs/glib
+	dev-libs/gobject-introspection"
+
+ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}"
diff --git a/dev-ruby/ruby-goffice/Manifest b/dev-ruby/ruby-goffice/Manifest
deleted file mode 100644
index 7f70af3b2295..000000000000
--- a/dev-ruby/ruby-goffice/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
diff --git a/dev-ruby/ruby-goffice/metadata.xml b/dev-ruby/ruby-goffice/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-goffice/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-goffice/ruby-goffice-3.4.3.ebuild b/dev-ruby/ruby-goffice/ruby-goffice-3.4.3.ebuild
deleted file mode 100644
index 50e96f153494..000000000000
--- a/dev-ruby/ruby-goffice/ruby-goffice-3.4.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_GNOME2_NEED_VIRTX=yes
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby GOffice bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/goffice[introspection]"
-RDEPEND+=" x11-libs/goffice[introspection]"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-gsf-${PV}
-	~dev-ruby/ruby-gtk3-${PV}"
-
-all_ruby_prepare() {
-	ruby-ng-gnome2_all_ruby_prepare
-
-	# https://github.com/ruby-gnome/ruby-gnome/issues/1316
-	sed -i -e '/only_goffice_version/s/0, 10, 27/0, 10/' \
-		test/test-data-scalar-str.rb
-}
diff --git a/dev-ruby/ruby-gsf/Manifest b/dev-ruby/ruby-gsf/Manifest
deleted file mode 100644
index 7f70af3b2295..000000000000
--- a/dev-ruby/ruby-gsf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
diff --git a/dev-ruby/ruby-gsf/metadata.xml b/dev-ruby/ruby-gsf/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-gsf/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-gsf/ruby-gsf-3.4.3.ebuild b/dev-ruby/ruby-gsf/ruby-gsf-3.4.3.ebuild
deleted file mode 100644
index a6111a183e3c..000000000000
--- a/dev-ruby/ruby-gsf/ruby-gsf-3.4.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby GSF bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" gnome-extra/libgsf[introspection]"
-RDEPEND+=" gnome-extra/libgsf[introspection]"
-
-ruby_add_rdepend "~dev-ruby/ruby-gio2-${PV}"
diff --git a/dev-ruby/ruby-gstreamer/Manifest b/dev-ruby/ruby-gstreamer/Manifest
deleted file mode 100644
index 7f70af3b2295..000000000000
--- a/dev-ruby/ruby-gstreamer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
diff --git a/dev-ruby/ruby-gstreamer/metadata.xml b/dev-ruby/ruby-gstreamer/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-gstreamer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.4.3.ebuild b/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.4.3.ebuild
deleted file mode 100644
index c6954f8d49f0..000000000000
--- a/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.4.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_GNOME2_NEED_VIRTX=yes
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby GStreamer bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND+="
-	dev-libs/glib
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]"
-DEPEND+="
-	dev-libs/glib
-	dev-libs/gobject-introspection
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}
-"
diff --git a/dev-ruby/ruby-gtk2/Manifest b/dev-ruby/ruby-gtk2/Manifest
deleted file mode 100644
index 7f70af3b2295..000000000000
--- a/dev-ruby/ruby-gtk2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
diff --git a/dev-ruby/ruby-gtk2/metadata.xml b/dev-ruby/ruby-gtk2/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-gtk2/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-gtk2/ruby-gtk2-3.4.3.ebuild b/dev-ruby/ruby-gtk2/ruby-gtk2-3.4.3.ebuild
deleted file mode 100644
index 604a4507eb9d..000000000000
--- a/dev-ruby/ruby-gtk2/ruby-gtk2-3.4.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_GNOME2_NEED_VIRTX=yes
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Gtk2 bindings"
-KEYWORDS="amd64 ~ppc ~riscv ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/glib
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/gtk+:2[introspection]
-	x11-libs/libX11
-	x11-libs/pango[introspection]
-	x11-themes/hicolor-icon-theme"
-RDEPEND+=" dev-libs/glib
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/gtk+:2[introspection]
-	x11-libs/libX11
-	x11-libs/pango[introspection]"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-atk-${PV}
-	~dev-ruby/ruby-pango-${PV}"
diff --git a/dev-ruby/ruby-gtk3/Manifest b/dev-ruby/ruby-gtk3/Manifest
index 7f70af3b2295..023bc72357e4 100644
--- a/dev-ruby/ruby-gtk3/Manifest
+++ b/dev-ruby/ruby-gtk3/Manifest
@@ -1 +1 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
+DIST ruby-gnome2-4.1.2.tar.gz 2708791 BLAKE2B ef24788d8c65f96c76b43d8adc38af21dfb3bfe2f8ae2157f6978993fe65e9735030e9912e8eb1ff5ff90ab1c67701ae61ac3b0790cb285646f26b6193d74be5 SHA512 898ae5bcd7a6347d7392b7888c19493905f6e660afb61f17a60b1f22e4069329ef6ccc9277375a2c40b4d998a309b61de6797f50c4633c0f5de22d2e85252537
diff --git a/dev-ruby/ruby-gtk3/files/ruby-gtk3-4.1.2-c99.patch b/dev-ruby/ruby-gtk3/files/ruby-gtk3-4.1.2-c99.patch
new file mode 100644
index 000000000000..0da13a4a6344
--- /dev/null
+++ b/dev-ruby/ruby-gtk3/files/ruby-gtk3-4.1.2-c99.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/921145
+https://github.com/ruby-gnome/ruby-gnome/commit/c196bf19a5d6a395011a90c3d1cb8f039d15824d
+
+From c196bf19a5d6a395011a90c3d1cb8f039d15824d Mon Sep 17 00:00:00 2001
+From: Sutou Kouhei <kou@clear-code.com>
+Date: Sat, 19 Aug 2023 15:45:46 +0900
+Subject: [PATCH] gtk3: fix a wrong type warning
+
+    compiling rb-gtk3-spin-button.c
+    rb-gtk3-spin-button.c:70:15: warning: incompatible function pointer types passing 'VALUE (VALUE)' (aka 'unsigned long (unsigned long)') to parameter of type 'VALUE (*)(VALUE, VALUE)' (aka 'unsigned long (*)(unsigned long, unsigned long)') [-Wincompatible-function-pointer-types]
+                  rb_gtk3_spin_button_input_rescue, (VALUE)&input_data);
+                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    /Users/runner/hostedtoolcache/Ruby/3.2.2/x64/include/ruby-3.2.0/ruby/internal/iterator.h:364:62: note: passing argument to parameter 'r_proc' here
+    VALUE rb_rescue(VALUE (*b_proc)(VALUE), VALUE data1, VALUE (*r_proc)(VALUE, VALUE), VALUE data2);
+                                                                 ^
+
+Reported by MATSUMOTO Katsuyoshi. Thanks!!!
+--- a/ext/gtk3/rb-gtk3-spin-button.c
++++ b/ext/gtk3/rb-gtk3-spin-button.c
+@@ -46,7 +46,7 @@ rb_gtk3_spin_button_input_body(VALUE user_data)
+ }
+ 
+ static VALUE
+-rb_gtk3_spin_button_input_rescue(VALUE user_data)
++rb_gtk3_spin_button_input_rescue(VALUE user_data, VALUE error)
+ {
+     InputData *input_data = (InputData *)user_data;
+     g_value_set_int(input_data->data->return_value, GTK_INPUT_ERROR);
+
diff --git a/dev-ruby/ruby-gtk3/ruby-gtk3-3.4.3.ebuild b/dev-ruby/ruby-gtk3/ruby-gtk3-3.4.3.ebuild
deleted file mode 100644
index a588582b874c..000000000000
--- a/dev-ruby/ruby-gtk3/ruby-gtk3-3.4.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_GNOME2_NEED_VIRTX=yes
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Gtk3 bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/glib
-	dev-libs/gobject-introspection
-	x11-libs/gtk+:3[introspection]"
-RDEPEND+=" dev-libs/glib
-	dev-libs/gobject-introspection
-	x11-libs/gtk+:3[introspection]"
-
-ruby_add_bdepend "~dev-ruby/ruby-glib2-${PV}
-	~dev-ruby/ruby-pango-${PV}"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-atk-${PV}
-	~dev-ruby/ruby-gdk3-${PV}
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-	~dev-ruby/ruby-gio2-${PV}
-	~dev-ruby/ruby-pango-${PV}
-"
diff --git a/dev-ruby/ruby-gtk3/ruby-gtk3-4.1.2-r1.ebuild b/dev-ruby/ruby-gtk3/ruby-gtk3-4.1.2-r1.ebuild
new file mode 100644
index 000000000000..0410d6b9acb2
--- /dev/null
+++ b/dev-ruby/ruby-gtk3/ruby-gtk3-4.1.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_GNOME2_NEED_VIRTX=yes
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Gtk2 bindings"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+IUSE=""
+
+DEPEND+=" dev-libs/glib
+	dev-libs/gobject-introspection
+	x11-base/xorg-proto
+	x11-libs/gtk+:3"
+RDEPEND+=" dev-libs/glib
+	dev-libs/gobject-introspection
+	x11-libs/gtk+:3"
+
+ruby_add_rdepend "
+	~dev-ruby/ruby-atk-${PV}
+	~dev-ruby/ruby-gdk3-${PV}"
+ruby_add_bdepend "
+	~dev-ruby/ruby-cairo-gobject-${PV}
+	~dev-ruby/ruby-glib2-${PV}
+	~dev-ruby/ruby-gobject-introspection-${PV}
+	~dev-ruby/ruby-pango-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/ruby-gtk3-4.1.2-c99.patch
+)
diff --git a/dev-ruby/ruby-gtk3/ruby-gtk3-4.1.2.ebuild b/dev-ruby/ruby-gtk3/ruby-gtk3-4.1.2.ebuild
new file mode 100644
index 000000000000..8e9684c3b797
--- /dev/null
+++ b/dev-ruby/ruby-gtk3/ruby-gtk3-4.1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_GNOME2_NEED_VIRTX=yes
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Gtk2 bindings"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+IUSE=""
+
+DEPEND+=" dev-libs/glib
+	dev-libs/gobject-introspection
+	x11-base/xorg-proto
+	x11-libs/gtk+:3"
+RDEPEND+=" dev-libs/glib
+	dev-libs/gobject-introspection
+	x11-libs/gtk+:3"
+
+ruby_add_rdepend "
+	~dev-ruby/ruby-atk-${PV}
+	~dev-ruby/ruby-gdk3-${PV}"
+ruby_add_bdepend "
+	~dev-ruby/ruby-cairo-gobject-${PV}
+	~dev-ruby/ruby-glib2-${PV}
+	~dev-ruby/ruby-gobject-introspection-${PV}
+	~dev-ruby/ruby-pango-${PV}"
diff --git a/dev-ruby/ruby-gtksourceview/Manifest b/dev-ruby/ruby-gtksourceview/Manifest
deleted file mode 100644
index 7f70af3b2295..000000000000
--- a/dev-ruby/ruby-gtksourceview/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
diff --git a/dev-ruby/ruby-gtksourceview/metadata.xml b/dev-ruby/ruby-gtksourceview/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-gtksourceview/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.4.3.ebuild b/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.4.3.ebuild
deleted file mode 100644
index 20aed6fcf528..000000000000
--- a/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.4.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_NAME="gtksourceview2"
-RUBY_GNOME2_NEED_VIRTX=yes
-
-inherit ruby-ng-gnome2
-
-RUBY_S=ruby-gnome-${PV}/gtksourceview2
-
-DESCRIPTION="Ruby bindings for gtksourceview"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" dev-libs/glib
-	x11-libs/gdk-pixbuf
-	x11-libs/gtksourceview:2.0
-	x11-libs/gtk+:2"
-RDEPEND+=" dev-libs/glib
-	x11-libs/gdk-pixbuf
-	x11-libs/gtksourceview:2.0
-	x11-libs/gtk+:2"
-
-ruby_add_rdepend "~dev-ruby/ruby-gtk2-${PV}"
diff --git a/dev-ruby/ruby-gtksourceview3/Manifest b/dev-ruby/ruby-gtksourceview3/Manifest
deleted file mode 100644
index 7f70af3b2295..000000000000
--- a/dev-ruby/ruby-gtksourceview3/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
diff --git a/dev-ruby/ruby-gtksourceview3/metadata.xml b/dev-ruby/ruby-gtksourceview3/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-gtksourceview3/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.4.3.ebuild b/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.4.3.ebuild
deleted file mode 100644
index b2f0c5e16d6c..000000000000
--- a/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.4.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_GNOME2_NEED_VIRTX=yes
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby gtksourceview-3.x bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/gtksourceview:3.0[introspection]"
-RDEPEND+=" x11-libs/gtksourceview:3.0[introspection]"
-
-ruby_add_rdepend "~dev-ruby/ruby-gtk3-${PV}"
diff --git a/dev-ruby/ruby-gtksourceview4/Manifest b/dev-ruby/ruby-gtksourceview4/Manifest
deleted file mode 100644
index 7f70af3b2295..000000000000
--- a/dev-ruby/ruby-gtksourceview4/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
diff --git a/dev-ruby/ruby-gtksourceview4/metadata.xml b/dev-ruby/ruby-gtksourceview4/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-gtksourceview4/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-gtksourceview4/ruby-gtksourceview4-3.4.3.ebuild b/dev-ruby/ruby-gtksourceview4/ruby-gtksourceview4-3.4.3.ebuild
deleted file mode 100644
index 164190e8b5b5..000000000000
--- a/dev-ruby/ruby-gtksourceview4/ruby-gtksourceview4-3.4.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_GNOME2_NEED_VIRTX=yes
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby GtkSourceView4 bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/gtksourceview:4[introspection]"
-RDEPEND+=" x11-libs/gtksourceview:4[introspection]"
-
-ruby_add_rdepend "~dev-ruby/ruby-gtk3-${PV}"
diff --git a/dev-ruby/ruby-hmac/ruby-hmac-0.4.0-r2.ebuild b/dev-ruby/ruby-hmac/ruby-hmac-0.4.0-r2.ebuild
index bdb99d38044c..713c1da14f64 100644
--- a/dev-ruby/ruby-hmac/ruby-hmac-0.4.0-r2.ebuild
+++ b/dev-ruby/ruby-hmac/ruby-hmac-0.4.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://ruby-hmac.rubyforge.org/"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-ruby_add_bdepend "
-	test? ( >=dev-ruby/hoe-2.5.0 )"
+each_ruby_test() {
+	${RUBY} -Ilib test/test_hmac.rb || die
+}
diff --git a/dev-ruby/ruby-ldap/files/ruby-ldap-0.9.20-clang16-fix.patch b/dev-ruby/ruby-ldap/files/ruby-ldap-0.9.20-clang16-fix.patch
new file mode 100644
index 000000000000..580584c61994
--- /dev/null
+++ b/dev-ruby/ruby-ldap/files/ruby-ldap-0.9.20-clang16-fix.patch
@@ -0,0 +1,12 @@
+Bug: https://bugs.gentoo.org/884405
+--- a/ldap.c
++++ b/ldap.c
+@@ -201,7 +201,7 @@ rb_ldap_hash2mods (VALUE self, VALUE op, VALUE hash)
+   VALUE tmp;
+ 
+   tmp = rb_assoc_new (op, rb_ary_new ());
+-  rb_iterate (rb_each, hash, rb_ldap_hash2mods_i, tmp);
++  rb_iterate (rb_each, hash, (rb_block_call_func_t)rb_ldap_hash2mods_i, tmp);
+ 
+   return rb_ary_entry (tmp, 1);
+ }
diff --git a/dev-ruby/ruby-ldap/files/ruby-ldap-0.9.20-ruby32.patch b/dev-ruby/ruby-ldap/files/ruby-ldap-0.9.20-ruby32.patch
new file mode 100644
index 000000000000..b7b101db2f30
--- /dev/null
+++ b/dev-ruby/ruby-ldap/files/ruby-ldap-0.9.20-ruby32.patch
@@ -0,0 +1,24 @@
+From aa43040eb6b6d591e42a19ee385fc1ba17c7202b Mon Sep 17 00:00:00 2001
+From: Jeremy Evans <code@jeremyevans.net>
+Date: Tue, 27 Dec 2022 17:19:45 -0800
+Subject: [PATCH] Don't use rb_cData
+
+This fixes ruby-ldap on Ruby 3.2+
+---
+ conn.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/conn.c b/conn.c
+index e628695..39eeb5f 100644
+--- a/conn.c
++++ b/conn.c
+@@ -1855,7 +1855,8 @@ Init_ldap_conn ()
+ {
+   rb_ldap_sort_obj = Qnil;
+ 
+-  rb_cLDAP_Conn = rb_define_class_under (rb_mLDAP, "Conn", rb_cData);
++  rb_cLDAP_Conn = rb_define_class_under (rb_mLDAP, "Conn", rb_cObject);
++  rb_undef_alloc_func(rb_cLDAP_Conn);
+   rb_define_attr (rb_cLDAP_Conn, "referrals", 1, 0);
+   rb_define_attr (rb_cLDAP_Conn, "controls", 1, 0);
+   rb_define_attr (rb_cLDAP_Conn, "sasl_quiet", 1, 1);
diff --git a/dev-ruby/ruby-ldap/files/ruby-ldap-0.9.20-tainted.patch b/dev-ruby/ruby-ldap/files/ruby-ldap-0.9.20-tainted.patch
new file mode 100644
index 000000000000..84c9ee29610d
--- /dev/null
+++ b/dev-ruby/ruby-ldap/files/ruby-ldap-0.9.20-tainted.patch
@@ -0,0 +1,28 @@
+From 849ca6bb46bf4826d51648feddd453142281e541 Mon Sep 17 00:00:00 2001
+From: Hisashi MINAMINO <minamino@iij.ad.jp>
+Date: Thu, 28 May 2020 14:04:05 +0900
+Subject: [PATCH] for ruby-2.7
+
+---
+ rbldap.h | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/rbldap.h b/rbldap.h
+index 1fa04e1..b7b1765 100644
+--- a/rbldap.h
++++ b/rbldap.h
+@@ -205,3 +205,14 @@ VALUE rb_ldap_mod_vals (VALUE);
+         rb_define_method(rb_cLDAP_Mod,method,cfunc,argc)
+ 
+ #endif
++
++#if RUBY_VERSION_CODE >= 270
++# if defined rb_tainted_str_new
++#  undef rb_tainted_str_new
++# endif
++# if defined rb_tainted_str_new2
++#  undef rb_tainted_str_new2
++# endif
++# define rb_tainted_str_new(p,l)	rb_str_new((p),(l))
++# define rb_tainted_str_new2(p)		rb_str_new_cstr((p))
++#endif
diff --git a/dev-ruby/ruby-ldap/metadata.xml b/dev-ruby/ruby-ldap/metadata.xml
index 99b7b414bd44..8ae599f79692 100644
--- a/dev-ruby/ruby-ldap/metadata.xml
+++ b/dev-ruby/ruby-ldap/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">ruby-activeldap</remote-id>
-		<remote-id type="sourceforge">ruby-ldap</remote-id>
+		<remote-id type="github">bearded/ruby-ldap</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r2.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r2.ebuild
deleted file mode 100644
index ee6c408713bb..000000000000
--- a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit multilib ruby-fakegem
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="ChangeLog FAQ NOTES README TODO"
-
-DESCRIPTION="A Ruby interface to some LDAP libraries"
-HOMEPAGE="https://github.com/bearded/ruby-ldap"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-IUSE="ssl"
-DEPEND=">=net-nds/openldap-2:=
-	dev-libs/cyrus-sasl
-	ssl? ( dev-libs/openssl:0= )"
-RDEPEND="${DEPEND}"
-
-# Current test set is interactive due to certificate generation and requires
-# running LDAP daemon
-RESTRICT="test"
-
-each_ruby_configure() {
-	local myconf="--with-openldap2"
-	if ! use ssl ; then
-		myconf="${myconf} --without-libcrypto --without-libssl"
-	fi
-	${RUBY} extconf.rb ${myconf} || die "extconf.rb failed"
-	sed -i -e 's:-Wl,--no-undefined::' \
-		-e "s/^ldflags  = /ldflags = $\(LDFLAGS\) /" Makefile || die
-}
-
-each_ruby_compile() {
-	emake V=1
-	cp ldap$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r3.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r3.ebuild
deleted file mode 100644
index f1c7107cf8db..000000000000
--- a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTENSIONS=(./extconf.rb)
-RUBY_FAKEGEM_EXTRADOC="ChangeLog FAQ NOTES README TODO"
-
-DESCRIPTION="A Ruby interface to some LDAP libraries"
-HOMEPAGE="https://github.com/bearded/ruby-ldap"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
-IUSE="ssl"
-DEPEND=">=net-nds/openldap-2:=
-	dev-libs/cyrus-sasl
-	ssl? ( dev-libs/openssl:0= )"
-RDEPEND="${DEPEND}"
-
-# Current test set is interactive due to certificate generation and requires
-# running LDAP daemon
-RESTRICT="test"
-
-each_ruby_configure() {
-	local myconf="--with-openldap2"
-	if ! use ssl ; then
-		myconf="${myconf} --without-libcrypto --without-libssl"
-	fi
-	RUBY_FAKEGEM_EXTENSION_OPTIONS=${myconf} each_fakegem_configure
-}
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r5.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r5.ebuild
new file mode 100644
index 000000000000..adfd19c39389
--- /dev/null
+++ b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_EXTENSIONS=(./extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="ChangeLog FAQ NOTES README TODO"
+
+DESCRIPTION="A Ruby interface to some LDAP libraries"
+HOMEPAGE="https://github.com/bearded/ruby-ldap"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+IUSE="ssl"
+DEPEND=">=net-nds/openldap-2:=
+	dev-libs/cyrus-sasl
+	ssl? ( dev-libs/openssl:0= )"
+RDEPEND="${DEPEND}"
+
+# Current test set is interactive due to certificate generation and requires
+# running LDAP daemon
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.20-clang16-fix.patch
+	"${FILESDIR}"/${PN}-0.9.20-ruby32.patch
+	"${FILESDIR}"/${PN}-0.9.20-tainted.patch
+)
+
+each_ruby_configure() {
+	local myconf="--with-openldap2"
+	if ! use ssl ; then
+		myconf="${myconf} --without-libcrypto --without-libssl"
+	fi
+	RUBY_FAKEGEM_EXTENSION_OPTIONS=${myconf} each_fakegem_configure
+}
diff --git a/dev-ruby/ruby-libsecret/Manifest b/dev-ruby/ruby-libsecret/Manifest
deleted file mode 100644
index 7f70af3b2295..000000000000
--- a/dev-ruby/ruby-libsecret/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
diff --git a/dev-ruby/ruby-libsecret/metadata.xml b/dev-ruby/ruby-libsecret/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-libsecret/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-libsecret/ruby-libsecret-3.4.3.ebuild b/dev-ruby/ruby-libsecret/ruby-libsecret-3.4.3.ebuild
deleted file mode 100644
index 7808fec95785..000000000000
--- a/dev-ruby/ruby-libsecret/ruby-libsecret-3.4.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby libsecret bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" app-crypt/libsecret[introspection]"
-RDEPEND+=" app-crypt/libsecret[introspection]"
-
-ruby_add_rdepend "~dev-ruby/ruby-gobject-introspection-${PV}"
diff --git a/dev-ruby/ruby-macho/Manifest b/dev-ruby/ruby-macho/Manifest
index 46a51e20bfac..6595b05045bd 100644
--- a/dev-ruby/ruby-macho/Manifest
+++ b/dev-ruby/ruby-macho/Manifest
@@ -1 +1,2 @@
-DIST ruby-macho-2.5.1.tar.gz 67901 BLAKE2B 4e3c04b86c664b44d022dc6ffe91e981a9f936152d85999cf8f11846eb51a6e38625e2316f09a1685ace546174800131cf899ebc8810e0f2c6d95950384005cb SHA512 4836af6b81a0452e19a3950e140c8131fded97a45853c2fdfe3955aff52e1619a01471a789c575e092fa62e5c9f09034b6b4d76e669f9c6475669e6b25d3c617
+DIST ruby-macho-3.0.0.tar.gz 70743 BLAKE2B 6dc48445382d879b6fa67fb8720dbf9643294adebb3424e811775f436d29d9b22b4a57e0443c9a6d08203fb3514267d4c2e4b8431cc9be4d54000e059acb49db SHA512 c718e6b22331511c18a6a51c1e88443121f6601dcc0e8e66a3ab60771b9a9e68cb33b83470bf60ff6af9ce696d50ceadee2c4dc348a0bf3fa2ff4d8aebcf3bd3
+DIST ruby-macho-4.0.1.tar.gz 80183 BLAKE2B 9762ea051fcf62aae1f00c17ffbe935a6bacd57fe1e59f43473f7d8f3b3090d1c92d1b57f4e48309c7deff4c3e13b6f5240d4fa561c433a0b2718cd3ba96509b SHA512 19d748b93367e703090058c0456e5bd70bc8ce9ec0f1f209d53fbec78a00a14123f97fcf84c439e00ffa74fb56d4a8ef974caaf7c797ab6c7576d81e2e10c9da
diff --git a/dev-ruby/ruby-macho/metadata.xml b/dev-ruby/ruby-macho/metadata.xml
index 11cdebc087b7..01860597e23c 100644
--- a/dev-ruby/ruby-macho/metadata.xml
+++ b/dev-ruby/ruby-macho/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
   <maintainer type="project">
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
diff --git a/dev-ruby/ruby-macho/ruby-macho-2.5.1.ebuild b/dev-ruby/ruby-macho/ruby-macho-2.5.1.ebuild
deleted file mode 100644
index eb611fd69a35..000000000000
--- a/dev-ruby/ruby-macho/ruby-macho-2.5.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_GEMSPEC="ruby-macho.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for viewing and manipulating Mach-O files in Ruby"
-HOMEPAGE="https://github.com/Homebrew/ruby-macho"
-SRC_URI="https://github.com/Homebrew/ruby-macho/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid benchmarks with additional dependencies
-	rm -f test/bench.rb || die
-	sed -i -e '/test\/bench/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/ruby-macho/ruby-macho-3.0.0.ebuild b/dev-ruby/ruby-macho/ruby-macho-3.0.0.ebuild
new file mode 100644
index 000000000000..1f074313e98c
--- /dev/null
+++ b/dev-ruby/ruby-macho/ruby-macho-3.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_GEMSPEC="ruby-macho.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for viewing and manipulating Mach-O files in Ruby"
+HOMEPAGE="https://github.com/Homebrew/ruby-macho"
+SRC_URI="https://github.com/Homebrew/ruby-macho/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+all_ruby_prepare() {
+	# Avoid benchmarks with additional dependencies
+	rm -f test/bench.rb || die
+	sed -i -e '/test\/bench/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/ruby-macho/ruby-macho-4.0.1.ebuild b/dev-ruby/ruby-macho/ruby-macho-4.0.1.ebuild
new file mode 100644
index 000000000000..0bea149e0afa
--- /dev/null
+++ b/dev-ruby/ruby-macho/ruby-macho-4.0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_GEMSPEC="ruby-macho.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for viewing and manipulating Mach-O files in Ruby"
+HOMEPAGE="https://github.com/Homebrew/ruby-macho"
+SRC_URI="https://github.com/Homebrew/ruby-macho/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+
+all_ruby_prepare() {
+	# Avoid benchmarks with additional dependencies
+	rm -f test/bench.rb || die
+	sed -i -e '/test\/bench/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.10-r1.ebuild b/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.10-r1.ebuild
index c9a38b958d32..69e7ed1491da 100644
--- a/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.10-r1.ebuild
+++ b/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.10-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
 RUBY_FAKEGEM_GEMSPEC="ruby-mp3info.gemspec"
@@ -10,19 +10,24 @@ RUBY_FAKEGEM_GEMSPEC="ruby-mp3info.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="A pure Ruby library for access to mp3 files (internal infos and tags)"
-HOMEPAGE="http://rubyforge.org/projects/ruby-mp3info/"
+HOMEPAGE="https://github.com/moumar/ruby-mp3info"
 SRC_URI="https://github.com/moumar/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE=""
+IUSE="test"
 
 DEPEND+=" test? ( media-sound/id3v2 )"
 
-ruby_add_bdepend "test? ( dev-ruby/hoe dev-ruby/test-unit:2 )"
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
 
 all_ruby_prepare() {
-	sed -i -e 's:/tmp/test.mp3:'${T}'/test.mp3:' test/test_ruby-mp3info.rb || die
+	sed -i -e "s:/tmp/test.mp3:${T}/test.mp3:" test/test_ruby-mp3info.rb || die
+	sed -i -e 's/MiniTest/Minitest/' test/helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_ruby-mp3info.rb || die
 }
diff --git a/dev-ruby/ruby-net-ldap/Manifest b/dev-ruby/ruby-net-ldap/Manifest
index 631b1e3f0889..e677ee568488 100644
--- a/dev-ruby/ruby-net-ldap/Manifest
+++ b/dev-ruby/ruby-net-ldap/Manifest
@@ -1 +1,2 @@
-DIST ruby-net-ldap-0.17.0.tar.gz 92548 BLAKE2B 45dd1f6205af25735c8ed55a28ec91084e0b95403fa4c4a06310a19f1a9c247cb4cd1e8be7bbb26b2423c0d05afb4cfd4e8b2eed4e552aa78c9b4b44102f34d8 SHA512 417e946f044db2fda8ceb8ebfee2376310308ac6a1949e165beff0a9c2a8b410f88ffcb607d27ab060d1d55364cb75fd41753d101a404874be6dbbec3875f192
+DIST ruby-net-ldap-0.18.0.tar.gz 94296 BLAKE2B 92c7f36ac94e9822f99931f58de83f05ca949c8f38482846c1bb0e4b43ed3b08799160643c720de8d724091c031c09926818e6199f32535a6033b636ea38fd5d SHA512 21b8241d3eef6f75f2f552af1df169d748e89948aba3527659a54cc3c4da5d6efcba41269c0ee40f6651adb363d0c7082dae71c3efc11cc65d103e1236e7d6d1
+DIST ruby-net-ldap-0.19.0.tar.gz 94763 BLAKE2B e3cf5da4116e86b735f7f1e0f97e9e183eee7d0ac1ba86acc96e44e7fa097c12d617babc78c34765320fe7165c908e40020efac7c1fa99a75be2aeda0f996438 SHA512 4e8a8b8e33109a884ab320db8e34a5331e4c6559b891e35e52e0ad4edb879f4bbe2e63e181ea27eedc4009faf3055a19ce77dc4adb0b7cdf88b73f3d9410a8b5
diff --git a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.17.0.ebuild b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.17.0.ebuild
deleted file mode 100644
index fd0a3e09c8b6..000000000000
--- a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.17.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test spec"
-RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc"
-
-RUBY_FAKEGEM_NAME="net-ldap"
-
-RUBY_FAKEGEM_GEMSPEC="net-ldap.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure ruby LDAP client implementation"
-HOMEPAGE="https://github.com/ruby-ldap/ruby-net-ldap"
-SRC_URI="https://github.com/ruby-ldap/ruby-net-ldap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/flexmock-1.3.0 )"
-
-all_ruby_prepare() {
-	sed -i -e "s:_relative ': './:" ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.18.0.ebuild b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.18.0.ebuild
new file mode 100644
index 000000000000..1fed1af1f8ad
--- /dev/null
+++ b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.18.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST="test spec"
+RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc"
+
+RUBY_FAKEGEM_NAME="net-ldap"
+
+RUBY_FAKEGEM_GEMSPEC="net-ldap.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pure ruby LDAP client implementation"
+HOMEPAGE="https://github.com/ruby-ldap/ruby-net-ldap"
+SRC_URI="https://github.com/ruby-ldap/ruby-net-ldap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+ruby_add_bdepend "test? ( >=dev-ruby/flexmock-1.3.0 )"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ': './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.19.0.ebuild b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.19.0.ebuild
new file mode 100644
index 000000000000..1fed1af1f8ad
--- /dev/null
+++ b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.19.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST="test spec"
+RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc"
+
+RUBY_FAKEGEM_NAME="net-ldap"
+
+RUBY_FAKEGEM_GEMSPEC="net-ldap.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pure ruby LDAP client implementation"
+HOMEPAGE="https://github.com/ruby-ldap/ruby-net-ldap"
+SRC_URI="https://github.com/ruby-ldap/ruby-net-ldap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+ruby_add_bdepend "test? ( >=dev-ruby/flexmock-1.3.0 )"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ': './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/ruby-odbc/Manifest b/dev-ruby/ruby-odbc/Manifest
index 3c2d2a3dfd7b..68c562527d41 100644
--- a/dev-ruby/ruby-odbc/Manifest
+++ b/dev-ruby/ruby-odbc/Manifest
@@ -1,2 +1,2 @@
-DIST ruby-odbc-0.99999.tar.gz 76934 BLAKE2B 59de5a544b7eefe8e181f2c6a9a61915361743ef5f7554f778667b50ca0dc57fd0c4f71e406ad6f1d00fb2c6a6509030e61ad34dddecff61896f7bfe383d0a9b SHA512 05e3e67a895406e1a57fbea6f8ecd1c087d836794ea3245bd9eec888eb3c46fa2bf2607cc1b8fdc416d7bc531d783d621c03c9fde004db8c2e431fe838c531af
 DIST ruby-odbc-0.999991.tar.gz 77110 BLAKE2B dd32698811f14e05f1190ffd73b390fa02924a1dd936db0b2b3c6ac9d8d8663f5d400ff89e03591081b45d558378a76701cf6b8be8502297a141c271dde3c24b SHA512 3f1e2e75e31f10f47392cda1cd28aa54451a499c3bd6e9224466a7b338406835a5d453600e79a3bac040197397c31d9f744567969058969685d6f4e06e72addb
+DIST ruby-odbc-0.999992.tar.gz 77614 BLAKE2B 5103a656ab43740682532bfac453e1d98ed50b39bdcb5ebc374498da47d379aa6e808073decdbbf1029c6a8b7ee87f862b790b6b12658b05f66d13699fcfe6fb SHA512 b4eee475ad93d112d51ef7955dc2df60b035e87338d991bc069e59d77918ab08a7e96069d975be156e57d401fea4b2ee57486dc7caf83f9dfac9fe49f935607b
diff --git a/dev-ruby/ruby-odbc/ruby-odbc-0.99999.ebuild b/dev-ruby/ruby-odbc/ruby-odbc-0.99999.ebuild
deleted file mode 100644
index 53bada59107e..000000000000
--- a/dev-ruby/ruby-odbc/ruby-odbc-0.99999.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README ChangeLog"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RubyODBC - For accessing ODBC data sources from the Ruby language"
-HOMEPAGE="http://www.ch-werner.de/rubyodbc/"
-SRC_URI="http://www.ch-werner.de/rubyodbc/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="${DEPEND} >=dev-db/unixODBC-2.0.6"
-RDEPEND="${RDEPEND} >=dev-db/unixODBC-2.0.6"
-
-# tests require to have an ODBC service enabled, so we can't run them
-# for now :(
-RESTRICT=test
-
-all_ruby_prepare() {
-	# Make sure that it doesn't try to use the absolute-local path for
-	# the extension as we'd be unable to run it properly otherwise.
-	sed -i -e 's:\./odbc:odbc:' test/{,utf8/}test.rb || die
-
-	# Since lib should not get installed avoid it entirely…
-	mv lib contrib || die
-}
-
-each_ruby_configure() {
-	for dir in ext ext/utf8; do
-		${RUBY} -C${dir} extconf.rb --disable-dlopen || die "extconf (${dir}) failed"
-	done
-}
-
-each_ruby_compile() {
-	for dir in ext ext/utf8; do
-		emake V=1 -C${dir}
-	done
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	ruby_fakegem_newins ext/odbc.so lib/odbc.so
-	ruby_fakegem_newins ext/utf8/odbc_utf8.so lib/odbc_utf8.so
-}
-
-all_ruby_install() {
-	all_fakegem_install
-	dodoc doc/*.html
-}
diff --git a/dev-ruby/ruby-odbc/ruby-odbc-0.999991-r1.ebuild b/dev-ruby/ruby-odbc/ruby-odbc-0.999991-r1.ebuild
index 6c5bf2cef9db..2d9c3bfbfb39 100644
--- a/dev-ruby/ruby-odbc/ruby-odbc-0.999991-r1.ebuild
+++ b/dev-ruby/ruby-odbc/ruby-odbc-0.999991-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
@@ -19,9 +19,9 @@ DESCRIPTION="RubyODBC - For accessing ODBC data sources from the Ruby language"
 HOMEPAGE="http://www.ch-werner.de/rubyodbc/"
 SRC_URI="http://www.ch-werner.de/rubyodbc/${P}.tar.gz"
 
-LICENSE="|| ( GPL-2 Ruby )"
+LICENSE="|| ( GPL-2 Ruby-BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="${DEPEND} >=dev-db/unixODBC-2.0.6"
diff --git a/dev-ruby/ruby-odbc/ruby-odbc-0.999991.ebuild b/dev-ruby/ruby-odbc/ruby-odbc-0.999991.ebuild
deleted file mode 100644
index 0d56029f1021..000000000000
--- a/dev-ruby/ruby-odbc/ruby-odbc-0.999991.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README ChangeLog"
-
-RUBY_FAKEGEM_GEMSPEC="ruby-odbc.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RubyODBC - For accessing ODBC data sources from the Ruby language"
-HOMEPAGE="http://www.ch-werner.de/rubyodbc/"
-SRC_URI="http://www.ch-werner.de/rubyodbc/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="${DEPEND} >=dev-db/unixODBC-2.0.6"
-RDEPEND="${RDEPEND} >=dev-db/unixODBC-2.0.6"
-
-# tests require to have an ODBC service enabled, so we can't run them
-# for now :(
-RESTRICT=test
-
-all_ruby_prepare() {
-	# Make sure that it doesn't try to use the absolute-local path for
-	# the extension as we'd be unable to run it properly otherwise.
-	sed -i -e 's:\./odbc:odbc:' test/{,utf8/}test.rb || die
-
-	# Since lib should not get installed avoid it entirely…
-	mv lib contrib || die
-}
-
-each_ruby_configure() {
-	for dir in ext ext/utf8; do
-		${RUBY} -C${dir} extconf.rb --disable-dlopen || die "extconf (${dir}) failed"
-	done
-}
-
-each_ruby_compile() {
-	for dir in ext ext/utf8; do
-		emake V=1 -C${dir}
-	done
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	ruby_fakegem_newins ext/odbc.so lib/odbc.so
-	ruby_fakegem_newins ext/utf8/odbc_utf8.so lib/odbc_utf8.so
-}
-
-all_ruby_install() {
-	all_fakegem_install
-	dodoc doc/*.html
-}
diff --git a/dev-ruby/ruby-odbc/ruby-odbc-0.999992.ebuild b/dev-ruby/ruby-odbc/ruby-odbc-0.999992.ebuild
new file mode 100644
index 000000000000..93bc4436c676
--- /dev/null
+++ b/dev-ruby/ruby-odbc/ruby-odbc-0.999992.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README ChangeLog"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb ext/utf8/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="ruby-odbc.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="RubyODBC - For accessing ODBC data sources from the Ruby language"
+HOMEPAGE="http://www.ch-werner.de/rubyodbc/"
+SRC_URI="http://www.ch-werner.de/rubyodbc/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 Ruby-BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+DEPEND="${DEPEND} >=dev-db/unixODBC-2.0.6"
+RDEPEND="${RDEPEND} >=dev-db/unixODBC-2.0.6"
+
+# tests require to have an ODBC service enabled, so we can't run them
+# for now :(
+RESTRICT=test
+
+all_ruby_prepare() {
+	# Make sure that it doesn't try to use the absolute-local path for
+	# the extension as we'd be unable to run it properly otherwise.
+	sed -i -e 's:\./odbc:odbc:' test/{,utf8/}test.rb || die
+
+	# Since lib should not get installed avoid it entirely…
+	mv lib contrib || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+	dodoc doc/*.html
+}
diff --git a/dev-ruby/ruby-oembed/Manifest b/dev-ruby/ruby-oembed/Manifest
index a5af76ff40dd..405fba9c45f8 100644
--- a/dev-ruby/ruby-oembed/Manifest
+++ b/dev-ruby/ruby-oembed/Manifest
@@ -1,2 +1,2 @@
-DIST ruby-oembed-0.16.0.tar.gz 4547329 BLAKE2B 2132098010884b3734e1842e6bccd5a6fd2a2c5ce5d1cf7d9a3eccf8e5afcc2a01fb20e17cbaedd7b8e4996df1ed1c07fa0df997355a0a8116dd4f2f1d20a4c8 SHA512 3e076b544b013f527a700c6610336a66b32cb293ee38f1f952bb16603105b85668ca239f0c8090d532e89d164a35ec4e85e18cbb48c60651587f564c547109dc
 DIST ruby-oembed-0.16.1.tar.gz 4547399 BLAKE2B 929d0a63aa0bd8acb005630c3f774a56e5fffed83b8e6c80c491dbf93df1b85b555b37ef8dedc77428cfcc8ad00c9eee54e49c8e31467efb8a8eae28e25397a7 SHA512 71241c818478c4321844276e4ba5e726536fb40f35c18b0ff9ead46e7d8b2ec1b58ba6738b179e62164c352005fff947baa156ac48bf6c021e29da8be3f2ad38
+DIST ruby-oembed-0.17.0.tar.gz 4548719 BLAKE2B d91c4321b745b5c96f866468f8985ec5a27b8318450b14b92f4c7456cea3dea048fb66d5d1c93a3ebd7b12d52a5ea6b2a543987f9d83d35b64521f46bf204d05 SHA512 ec130cca009dd63d18ff3498be2bd05eacdef28c3e7dbae9a373da7700949a18184714dfb3b942154b5af0e305ccdcaf7d18652f36236599d04f0ba531d8aca4
diff --git a/dev-ruby/ruby-oembed/metadata.xml b/dev-ruby/ruby-oembed/metadata.xml
index d4327f5a5f2f..a7f9e6f04d0c 100644
--- a/dev-ruby/ruby-oembed/metadata.xml
+++ b/dev-ruby/ruby-oembed/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">judofyr/ruby-oembed</remote-id>
+    <remote-id type="github">ruby-oembed/ruby-oembed</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-oembed/ruby-oembed-0.16.0.ebuild b/dev-ruby/ruby-oembed/ruby-oembed-0.16.0.ebuild
deleted file mode 100644
index 70968be2d9c7..000000000000
--- a/dev-ruby/ruby-oembed/ruby-oembed-0.16.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
-RUBY_FAKEGEM_GEMSPEC="ruby-oembed.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An oEmbed consumer library written in Ruby"
-HOMEPAGE="https://github.com/ruby-oembed/ruby-oembed"
-SRC_URI="https://github.com/ruby-oembed/ruby-oembed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test?
-	(
-		dev-ruby/json
-		dev-ruby/vcr:5
-		dev-ruby/xml-simple
-		dev-ruby/nokogiri
-		dev-ruby/webmock:3
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler but keep vcr version requirement
-	rm -f Gemfile || die
-	sed -i -e '1igem "vcr", "~> 5.0"' spec/spec_helper.rb || die
-
-	# Avoid development dependencies
-	sed -i -e '/coverall/I s:^:#:' spec/spec_helper.rb || die
-
-	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/ruby-oembed/ruby-oembed-0.16.1.ebuild b/dev-ruby/ruby-oembed/ruby-oembed-0.16.1.ebuild
index 70968be2d9c7..0de3d697de69 100644
--- a/dev-ruby/ruby-oembed/ruby-oembed-0.16.1.ebuild
+++ b/dev-ruby/ruby-oembed/ruby-oembed-0.16.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -23,7 +23,7 @@ IUSE="test"
 ruby_add_bdepend "test?
 	(
 		dev-ruby/json
-		dev-ruby/vcr:5
+		dev-ruby/vcr:6
 		dev-ruby/xml-simple
 		dev-ruby/nokogiri
 		dev-ruby/webmock:3
@@ -32,10 +32,17 @@ ruby_add_bdepend "test?
 all_ruby_prepare() {
 	# Remove bundler but keep vcr version requirement
 	rm -f Gemfile || die
-	sed -i -e '1igem "vcr", "~> 5.0"' spec/spec_helper.rb || die
+	sed -i -e '1igem "vcr", "~> 6.0"' spec/spec_helper.rb || die
 
 	# Avoid development dependencies
 	sed -i -e '/coverall/I s:^:#:' spec/spec_helper.rb || die
 
 	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Fix kwargs expectations for ruby30
+	sed -e '455 s/:format => @default/{format: @default}/' \
+		-e '460 s/:format=>:xml/{format: :xml}/' \
+		-e '465 s/:format=>:json/{format: :json}/' \
+		-e '477 s/:format => @default/{format: @default}/' \
+		-i spec/provider_spec.rb || die
 }
diff --git a/dev-ruby/ruby-oembed/ruby-oembed-0.17.0.ebuild b/dev-ruby/ruby-oembed/ruby-oembed-0.17.0.ebuild
new file mode 100644
index 000000000000..497a57abc714
--- /dev/null
+++ b/dev-ruby/ruby-oembed/ruby-oembed-0.17.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
+RUBY_FAKEGEM_GEMSPEC="ruby-oembed.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An oEmbed consumer library written in Ruby"
+HOMEPAGE="https://github.com/ruby-oembed/ruby-oembed"
+SRC_URI="https://github.com/ruby-oembed/ruby-oembed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test?
+	(
+		dev-ruby/json
+		dev-ruby/vcr:6
+		dev-ruby/xml-simple
+		dev-ruby/nokogiri
+		dev-ruby/webmock:3
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler but keep vcr version requirement
+	rm -f Gemfile || die
+	sed -i -e '1igem "vcr", "~> 6.0"' spec/spec_helper.rb || die
+
+	# Avoid development dependencies
+	sed -i -e '/coverall/I s:^:#:' spec/spec_helper.rb || die
+
+	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/ruby-ole/Manifest b/dev-ruby/ruby-ole/Manifest
index 529d3b0226c3..73cdb8ab6831 100644
--- a/dev-ruby/ruby-ole/Manifest
+++ b/dev-ruby/ruby-ole/Manifest
@@ -1 +1,2 @@
 DIST ruby-ole-1.2.12.2.gem 56832 BLAKE2B 489dbaff30d5d293f5c04672c2e8dd2a6144f6b32fb22319c4691a351318f0aee8fd5d01106f3ef6abaab40e81cd86c8ba9d93ddb1e004240eb052ab6ce5675e SHA512 2c28336a827e42faed4183d79ae61d4dd2b888f3d13eb26fb2b7e967057127a01e184fb509c6e4718e7beebb7490ea2f7aa230f2c5e29efae49994fa92d604b7
+DIST ruby-ole-1.2.13.1.gem 56832 BLAKE2B d3d4a94428c5e3c2ea24db0740daeb3856ecdb9211455711a994da0011191d6aebacdd83187f5a64824ee1e6744731a9f696a76f954d2accf8eb3b36610289cc SHA512 5281d14e490b8dcae5b97f0e9c5088593c4c2ba39452884e4b0dda234638d4d701eb88f44d3863ec7436f39b770d5a9b556d2cd1cc6ac42c39951174cfe1ce88
diff --git a/dev-ruby/ruby-ole/ruby-ole-1.2.12.2-r1.ebuild b/dev-ruby/ruby-ole/ruby-ole-1.2.12.2-r1.ebuild
index ccc0514b0eb5..746bf140c5ca 100644
--- a/dev-ruby/ruby-ole/ruby-ole-1.2.12.2-r1.ebuild
+++ b/dev-ruby/ruby-ole/ruby-ole-1.2.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=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 # Avoid the complexity of the "rake" recipe and run testrb-2 manually.
 RUBY_FAKEGEM_RECIPE_TEST=none
diff --git a/dev-ruby/ruby-ole/ruby-ole-1.2.13.1.ebuild b/dev-ruby/ruby-ole/ruby-ole-1.2.13.1.ebuild
new file mode 100644
index 000000000000..e688f3070f8d
--- /dev/null
+++ b/dev-ruby/ruby-ole/ruby-ole-1.2.13.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# Avoid the complexity of the "rake" recipe and run testrb-2 manually.
+RUBY_FAKEGEM_RECIPE_TEST=none
+
+# Same thing for the docs whose rake target just calls rdoc.
+RUBY_FAKEGEM_RECIPE_DOC=rdoc
+RUBY_FAKEGEM_EXTRADOC="ChangeLog README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby library for easy read/write access to OLE compound documents"
+HOMEPAGE="https://github.com/aquasync/ruby-ole"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 --pattern='test.*\.rb' test/
+}
diff --git a/dev-ruby/ruby-opengl/ruby-opengl-0.10.0-r1.ebuild b/dev-ruby/ruby-opengl/ruby-opengl-0.10.0-r1.ebuild
index 223e0018ba1a..fa5b616c6674 100644
--- a/dev-ruby/ruby-opengl/ruby-opengl-0.10.0-r1.ebuild
+++ b/dev-ruby/ruby-opengl/ruby-opengl-0.10.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="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 # Two tests fails but the README already indicates that this may not
 # work. Additionally these tests require access to video devices such as
@@ -23,7 +23,7 @@ HOMEPAGE="https://github.com/larskanis/opengl"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-ruby/ruby-opengl/ruby-opengl-0.10.0.ebuild b/dev-ruby/ruby-opengl/ruby-opengl-0.10.0.ebuild
deleted file mode 100644
index ee4729a2f4b2..000000000000
--- a/dev-ruby/ruby-opengl/ruby-opengl-0.10.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-# Two tests fails but the README already indicates that this may not
-# work. Additionally these tests require access to video devices such as
-# /dev/nvidiactl.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_NAME="opengl"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="OpenGL / GLUT bindings for ruby"
-HOMEPAGE="https://github.com/larskanis/opengl"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-
-IUSE=""
-
-DEPEND+=" virtual/opengl
-	media-libs/freeglut"
-RDEPEND+=" virtual/opengl
-	media-libs/freeglut"
-
-each_ruby_configure() {
-	${RUBY} -Cext/opengl extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/opengl V=1
-
-	cp ext/*/*$(get_modname) lib/opengl/ || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r examples
-}
diff --git a/dev-ruby/ruby-openid/ruby-openid-2.9.2.ebuild b/dev-ruby/ruby-openid/ruby-openid-2.9.2.ebuild
index eb13ac12b314..ffcefcbc6ac1 100644
--- a/dev-ruby/ruby-openid/ruby-openid-2.9.2.ebuild
+++ b/dev-ruby/ruby-openid/ruby-openid-2.9.2.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md NOTICE UPGRADE.md"
@@ -20,8 +20,16 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="test"
 
+ruby_add_bdepend "test? ( dev-ruby/webrick )"
+
 all_ruby_prepare() {
 	sed -i -e "/[Bb]undler/d" Rakefile || die
+
+	# Avoid test failing due to new sematics in ruby 3
+	sed -i -e '/test_no_host/askip "Ruby 3 incompatibility"' test/test_discover.rb || die
+
+	# Fix Bignum deprecation in tests
+	sed -i -e 's/Bignum/Integer/' test/test_cryptutil.rb || die
 }
 
 all_ruby_install() {
diff --git a/dev-ruby/ruby-pango/Manifest b/dev-ruby/ruby-pango/Manifest
index 7f70af3b2295..023bc72357e4 100644
--- a/dev-ruby/ruby-pango/Manifest
+++ b/dev-ruby/ruby-pango/Manifest
@@ -1 +1 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
+DIST ruby-gnome2-4.1.2.tar.gz 2708791 BLAKE2B ef24788d8c65f96c76b43d8adc38af21dfb3bfe2f8ae2157f6978993fe65e9735030e9912e8eb1ff5ff90ab1c67701ae61ac3b0790cb285646f26b6193d74be5 SHA512 898ae5bcd7a6347d7392b7888c19493905f6e660afb61f17a60b1f22e4069329ef6ccc9277375a2c40b4d998a309b61de6797f50c4633c0f5de22d2e85252537
diff --git a/dev-ruby/ruby-pango/ruby-pango-3.4.3.ebuild b/dev-ruby/ruby-pango/ruby-pango-3.4.3.ebuild
deleted file mode 100644
index aa671d82ef89..000000000000
--- a/dev-ruby/ruby-pango/ruby-pango-3.4.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby Pango bindings"
-KEYWORDS="amd64 ~ppc ~riscv ~x86"
-IUSE=""
-DEPEND+=" dev-libs/glib
-	>=x11-libs/pango-1.2.1[introspection]"
-RDEPEND+=" dev-libs/glib
-	>=x11-libs/pango-1.2.1[introspection]"
-
-ruby_add_rdepend "
-	dev-ruby/rcairo
-	~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-gobject-introspection-${PV}
-"
-
-all_ruby_prepare() {
-	ruby-ng-gnome2_all_ruby_prepare
-
-	# Remove test depending on specific locales to be set up: bug 526248
-	rm -f test/test-language.rb || die
-}
-
-each_ruby_test() {
-	# Include pango path since run-test does not list it
-	${RUBY} -Iext/pango test/run-test.rb || die
-}
diff --git a/dev-ruby/ruby-pango/ruby-pango-4.1.2.ebuild b/dev-ruby/ruby-pango/ruby-pango-4.1.2.ebuild
new file mode 100644
index 000000000000..4f75391e5208
--- /dev/null
+++ b/dev-ruby/ruby-pango/ruby-pango-4.1.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Pango bindings"
+KEYWORDS="amd64 ~ppc ~riscv ~x86"
+IUSE=""
+DEPEND+=" dev-libs/glib
+	>=x11-libs/pango-1.14.0[introspection]"
+RDEPEND+=" dev-libs/glib
+	>=x11-libs/pango-1.14.0[introspection]"
+
+ruby_add_rdepend "
+	~dev-ruby/ruby-cairo-gobject-${PV}
+	~dev-ruby/ruby-glib2-${PV}
+	~dev-ruby/ruby-gobject-introspection-${PV}
+"
+
+all_ruby_prepare() {
+	ruby-ng-gnome2_all_ruby_prepare
+
+	# Remove test depending on specific locales to be set up: bug 526248
+	rm -f test/test-language.rb || die
+}
+
+each_ruby_test() {
+	# Include pango path since run-test does not list it
+	${RUBY} -Iext/pango test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-poppler/Manifest b/dev-ruby/ruby-poppler/Manifest
index 7f70af3b2295..023bc72357e4 100644
--- a/dev-ruby/ruby-poppler/Manifest
+++ b/dev-ruby/ruby-poppler/Manifest
@@ -1 +1 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
+DIST ruby-gnome2-4.1.2.tar.gz 2708791 BLAKE2B ef24788d8c65f96c76b43d8adc38af21dfb3bfe2f8ae2157f6978993fe65e9735030e9912e8eb1ff5ff90ab1c67701ae61ac3b0790cb285646f26b6193d74be5 SHA512 898ae5bcd7a6347d7392b7888c19493905f6e660afb61f17a60b1f22e4069329ef6ccc9277375a2c40b4d998a309b61de6797f50c4633c0f5de22d2e85252537
diff --git a/dev-ruby/ruby-poppler/ruby-poppler-3.4.3.ebuild b/dev-ruby/ruby-poppler/ruby-poppler-3.4.3.ebuild
deleted file mode 100644
index ae896fada18a..000000000000
--- a/dev-ruby/ruby-poppler/ruby-poppler-3.4.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby poppler-glib bindings"
-KEYWORDS="amd64 ~ppc ~riscv ~x86"
-IUSE=""
-
-RDEPEND+=" app-text/poppler[cairo,introspection]"
-DEPEND+=" app-text/poppler[cairo,introspection]"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-gio2-${PV}
-"
diff --git a/dev-ruby/ruby-poppler/ruby-poppler-4.1.2.ebuild b/dev-ruby/ruby-poppler/ruby-poppler-4.1.2.ebuild
new file mode 100644
index 000000000000..e31095a2fa88
--- /dev/null
+++ b/dev-ruby/ruby-poppler/ruby-poppler-4.1.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby poppler-glib bindings"
+KEYWORDS="amd64 ~ppc ~riscv ~x86"
+IUSE=""
+
+RDEPEND+=" app-text/poppler[cairo,introspection]"
+DEPEND+=" app-text/poppler[cairo,introspection]"
+
+ruby_add_rdepend "
+	~dev-ruby/ruby-cairo-gobject-${PV}
+	~dev-ruby/ruby-gio2-${PV}
+"
diff --git a/dev-ruby/ruby-prof/Manifest b/dev-ruby/ruby-prof/Manifest
index 2f622cfe7461..7a913905280d 100644
--- a/dev-ruby/ruby-prof/Manifest
+++ b/dev-ruby/ruby-prof/Manifest
@@ -1 +1,2 @@
-DIST ruby-prof-1.4.3.tgz 232032 BLAKE2B 68df149718869afac89b2240263cd3dd48c28b592f32cd7bc8a918b67de7a10abc3a1af04cb00eeaec9e6f7292e5258d22ba8bec0243361289add943535ffe39 SHA512 fd19d97b88b52c07331bf885c69215267eccb3a0519eb3bb6cd6e5907af55ebbace32f3bdef5b1f340bc3c4779666d7f4100878e647fdfde4da3a4df2a946ebe
+DIST ruby-prof-1.6.3.tgz 247407 BLAKE2B aac1ec36ee274faba919aa04be625b7b97ef61df105266f3d1b629cef6948db0bffbe67e70782f90a059221cb11cdb0df18031c9061f84cc882029cdde84629f SHA512 3172251fbd445c73f0eec734e09021ec0e375fd2f2999ec357569c679aa98ea5e0e08a18be1236e2572a8f0c302a1157d6a0d36ef04dffc4d0767accce629118
+DIST ruby-prof-1.7.0.tgz 251253 BLAKE2B e9cc60591d5cb8b3be528ba57c6374e7965b2f23394d468f3eb62a547e50edc7cc4ea99a6985726a30f063a0ce4823863b468e0ef2c89ef58cfbbe0362bfdb96 SHA512 ecea55a2a77d832f4aeca73aab578372a57a4fdf2cfc4db1fb14a899fed35ddfac79a078ab8207af8a4e70cdd0c4bb1e44a9ead8642e06b27ac4214d7d5981ef
diff --git a/dev-ruby/ruby-prof/ruby-prof-1.4.3.ebuild b/dev-ruby/ruby-prof/ruby-prof-1.4.3.ebuild
deleted file mode 100644
index 1924a8778cde..000000000000
--- a/dev-ruby/ruby-prof/ruby-prof-1.4.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGES"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="ruby-prof.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/ruby_prof/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/ruby_prof"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A module for profiling Ruby code"
-HOMEPAGE="https://github.com/ruby-prof/ruby-prof"
-SRC_URI="https://github.com/ruby-prof/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# Avoid bundler
-	sed -i -e '/bundler/I s:^:#:' -e '/:build/ s:^:#:' Rakefile || die
-
-	sed -i -e '2igem "test-unit"' -e '/bundler/ s:^:#:' test/test_helper.rb || die
-
-	# We install the shared object in lib, not ext.
-	sed -i -e 's#../ext/ruby_prof#../lib/ruby_prof#' lib/ruby-prof.rb || die
-
-	# Avoid unneeded dependency on rake-compiler
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/end/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/ruby-prof/ruby-prof-1.6.3-r1.ebuild b/dev-ruby/ruby-prof/ruby-prof-1.6.3-r1.ebuild
new file mode 100644
index 000000000000..8c7014bf30fa
--- /dev/null
+++ b/dev-ruby/ruby-prof/ruby-prof-1.6.3-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGES"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="ruby-prof.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/ruby_prof/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A module for profiling Ruby code"
+HOMEPAGE="https://github.com/ruby-prof/ruby-prof"
+SRC_URI="https://github.com/ruby-prof/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	# Avoid bundler
+	sed -i -e '/bundler/I s:^:#:' -e '/:build/ s:^:#:' Rakefile || die
+
+	sed -i -e '2igem "test-unit"' -e '/bundler/ s:^:#:' test/test_helper.rb || die
+
+	# We install the shared object in lib, not ext.
+	sed -i -e 's#../ext/ruby_prof#../lib/ruby_prof#' lib/ruby-prof.rb || die
+
+	# Avoid unneeded dependency on rake-compiler
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/end/ s:^:#:' Rakefile || die
+
+	# Don't strip library by default
+	sed -i -e '/LDFLAGS/ s/-s//' ext/ruby_prof/extconf.rb || die
+}
diff --git a/dev-ruby/ruby-prof/ruby-prof-1.7.0.ebuild b/dev-ruby/ruby-prof/ruby-prof-1.7.0.ebuild
new file mode 100644
index 000000000000..5de91d47156c
--- /dev/null
+++ b/dev-ruby/ruby-prof/ruby-prof-1.7.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGES"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="ruby-prof.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/ruby_prof/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A module for profiling Ruby code"
+HOMEPAGE="https://github.com/ruby-prof/ruby-prof"
+SRC_URI="https://github.com/ruby-prof/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	# Avoid bundler
+	sed -i -e '/bundler/I s:^:#:' -e '/:build/ s:^:#:' Rakefile || die
+
+	sed -i -e '2igem "test-unit"' -e '/bundler/ s:^:#:' test/test_helper.rb || die
+
+	# We install the shared object in lib, not ext.
+	sed -i -e 's#../ext/ruby_prof#../lib/ruby_prof#' lib/ruby-prof.rb || die
+
+	# Avoid unneeded dependency on rake-compiler
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/end/ s:^:#:' Rakefile || die
+
+	# Don't strip library by default
+	sed -i -e '/LDFLAGS/ s/-s//' ext/ruby_prof/extconf.rb || die
+}
diff --git a/dev-ruby/ruby-progressbar/Manifest b/dev-ruby/ruby-progressbar/Manifest
index de30f3165066..71930b4b3bd9 100644
--- a/dev-ruby/ruby-progressbar/Manifest
+++ b/dev-ruby/ruby-progressbar/Manifest
@@ -1,2 +1 @@
-DIST ruby-progressbar-1.10.1.tar.gz 53416 BLAKE2B ee435291cd55558843ab05254c01a6148711aee54a5ce80d7b03902e32fd8735fda2e3686794f3f2c8a62c7ca26d90df4d63b48c8d947a471279c35131c49898 SHA512 6cbd791833a1638949c7283b5c475164b44ec8a5d4c7eb417d741da5c9cda9e777481a785f112be7fd1c3714668ad58cbf9aa39eecb61d1022fb3bb35ddb6203
-DIST ruby-progressbar-1.11.0.tar.gz 61341 BLAKE2B 558de9d15f6c3eafb0a9ef0b39db279727651c8f86234f3ffad1faac7e9ab7f6bdef6662fadb2132bf10d70bcac9412801a695e0bb3afa5879a48dd363920734 SHA512 5a5c8a6af410746ef601821ec171933d781d32bfb7cb5f67f9cf877824a399941c11be69bb74380941f2271f6f5139928599881441f88860a71f8b7f7b55d4b4
+DIST ruby-progressbar-1.13.0.tar.gz 67185 BLAKE2B 27ea25e4caeb70aefb2523a4f4399056bdb9973deb567fc80eb9daeab6193ecc3693c8364bb43fc94906e6b63a0db1ace6bbd9b00defa0e02177983371b54ad3 SHA512 64723422d6216f2640bc60c8068c8d0437fbc5f315343b13c3167130d868a0aa978f098554ace3ea71406688c0b3c0ed94296adc6b9229ea14df5dbcb56322a3
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild
deleted file mode 100644
index beddeb9f6974..000000000000
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Text Progress Bar Library for Ruby"
-HOMEPAGE="https://github.com/jfelchner/ruby-progressbar"
-SRC_URI="https://github.com/jfelchner/ruby-progressbar/archive/releases/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="ruby-progressbar-releases-v${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/rspectacular dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/warning_filter/ s:^:#:' \
-		spec/spec_helper.rb || die
-	# Avoid ruby24 syntax for an unneeded check
-	sed -i -e '/^return/ s:^:#:' spec/ruby-progressbar/refinements/enumerator_spec.rb || die
-}
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.11.0.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.11.0.ebuild
deleted file mode 100644
index 4a0dda0d56ff..000000000000
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-1.11.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="ruby-progressbar.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Text Progress Bar Library for Ruby"
-HOMEPAGE="https://github.com/jfelchner/ruby-progressbar"
-SRC_URI="https://github.com/jfelchner/ruby-progressbar/archive/releases/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="ruby-progressbar-releases-v${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/rspectacular dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/warning_filter/ s:^:#:' \
-		spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.13.0-r1.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.13.0-r1.ebuild
new file mode 100644
index 000000000000..b8659a7f3211
--- /dev/null
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.13.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="ruby-progressbar.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Text Progress Bar Library for Ruby"
+HOMEPAGE="https://github.com/jfelchner/ruby-progressbar"
+SRC_URI="https://github.com/jfelchner/ruby-progressbar/archive/releases/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-progressbar-releases-v${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+ruby_add_bdepend "test? ( dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -e '/warning_filter/ s:^:#:' \
+		-e '/rspectacular/arequire "ruby-progressbar"; require "timecop"' \
+		-e '/rspectacular/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.13.0.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.13.0.ebuild
new file mode 100644
index 000000000000..246a5e415ee2
--- /dev/null
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.13.0.ebuild
@@ -0,0 +1,28 @@
+# 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_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="ruby-progressbar.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Text Progress Bar Library for Ruby"
+HOMEPAGE="https://github.com/jfelchner/ruby-progressbar"
+SRC_URI="https://github.com/jfelchner/ruby-progressbar/archive/releases/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-progressbar-releases-v${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+ruby_add_bdepend "test? ( dev-ruby/rspectacular dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -i -e '/warning_filter/ s:^:#:' \
+		spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r3.ebuild b/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r3.ebuild
index c683a3db28ac..ee4cdbc0f908 100644
--- a/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r3.ebuild
+++ b/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r3.ebuild
@@ -1,8 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -11,7 +12,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 
 inherit ruby-fakegem
 
-DESCRIPTION="A pure Ruby implementation of the Rc4 algorithm"
+DESCRIPTION="A pure Ruby implementation of the RC4 algorithm"
 HOMEPAGE="https://github.com/caiges/Ruby-RC4"
 
 LICENSE="MIT"
diff --git a/dev-ruby/ruby-romkan/ruby-romkan-0.4-r7.ebuild b/dev-ruby/ruby-romkan/ruby-romkan-0.4-r7.ebuild
index 832c7cc94925..feceaf035d94 100644
--- a/dev-ruby/ruby-romkan/ruby-romkan-0.4-r7.ebuild
+++ b/dev-ruby/ruby-romkan/ruby-romkan-0.4-r7.ebuild
@@ -1,18 +1,18 @@
-# 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"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 inherit ruby-ng
 
 DESCRIPTION="A Romaji <-> Kana conversion library for Ruby"
 HOMEPAGE="http://0xcc.net/ruby-romkan/"
 SRC_URI="http://0xcc.net/ruby-romkan/${P}.tar.gz"
-LICENSE="Ruby"
+
+LICENSE="Ruby-BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
 DOCS="ChangeLog *.rd"
 
diff --git a/dev-ruby/ruby-rsvg/Manifest b/dev-ruby/ruby-rsvg/Manifest
deleted file mode 100644
index 7f70af3b2295..000000000000
--- a/dev-ruby/ruby-rsvg/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
diff --git a/dev-ruby/ruby-rsvg/metadata.xml b/dev-ruby/ruby-rsvg/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-rsvg/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-rsvg/ruby-rsvg-3.4.3.ebuild b/dev-ruby/ruby-rsvg/ruby-rsvg-3.4.3.ebuild
deleted file mode 100644
index b08e2854aefd..000000000000
--- a/dev-ruby/ruby-rsvg/ruby-rsvg-3.4.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_NAME=rsvg2
-
-inherit ruby-ng-gnome2
-
-RUBY_S=ruby-gnome-${PV}/rsvg2
-
-DESCRIPTION="Ruby bindings for librsvg"
-KEYWORDS="amd64 ~ppc ~x86"
-
-RDEPEND+=" >=gnome-base/librsvg-2.16.1[introspection]"
-
-ruby_add_rdepend "
-	~dev-ruby/ruby-cairo-gobject-${PV}
-	~dev-ruby/ruby-gdkpixbuf2-${PV}
-"
-
-all_ruby_prepare() {
-	ruby-ng-gnome2_all_ruby_prepare
-
-	# Avoid test that fails and may be version-specific
-	sed -i -e '/test_unlimited/aomit "version specific?"' \
-		test/test-handle.rb || die
-}
diff --git a/dev-ruby/ruby-sdl/Manifest b/dev-ruby/ruby-sdl/Manifest
deleted file mode 100644
index 6f6345227ac6..000000000000
--- a/dev-ruby/ruby-sdl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-sdl-2.1.2.tar.gz 178105 BLAKE2B 84870279edcf2616159861267ffc8666b482786f43a30c8729cd4c59f25219956648270452bf38b72115e05235786ec8c0f0e7913469cc8573d9eda813d25726 SHA512 1ddae367fb4145cc8142edbf3c61acaf56604054f710ac37cadb8d04f93db24fc3595c1bc8e0fb5f330aabc815884f31b5f2a39c0108026fca442fc0b3bc2807
diff --git a/dev-ruby/ruby-sdl/metadata.xml b/dev-ruby/ruby-sdl/metadata.xml
deleted file mode 100644
index 5334d73e1c74..000000000000
--- a/dev-ruby/ruby-sdl/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <use>
-    <flag name="image">Enable <pkg>media-libs/sdl-image</pkg> support</flag>
-    <flag name="mixer">Enable <pkg>media-libs/sdl-mixer</pkg> support</flag>
-    <flag name="sge">Enable sdl-sge support</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">ohai/rubysdl</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r3.ebuild b/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r3.ebuild
deleted file mode 100644
index 43c4580b3a0a..000000000000
--- a/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-inherit ruby-ng
-
-RELEASE="rel-${PV//./-}"
-RUBY_S="rubysdl-${RELEASE}"
-
-DESCRIPTION="Ruby/SDL: Ruby bindings for SDL"
-HOMEPAGE="https://www.kmc.gr.jp/~ohai/rubysdl.en.html"
-SRC_URI="https://github.com/ohai/rubysdl/archive/${RELEASE}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-IUSE="image mixer truetype mpeg sge"
-
-CDEPEND="
-	>=media-libs/libsdl-1.2.5[joystick]
-	truetype? ( >=media-libs/sdl-ttf-2.0.6 )
-	image? ( >=media-libs/sdl-image-1.2.2 )
-	mixer? ( >=media-libs/sdl-mixer-1.2.4 )
-	mpeg? ( >=media-libs/smpeg-0.4.4-r1 )
-	sge? ( media-libs/sge )"
-DEPEND="${DEPEND} ${CDEPEND}"
-RDEPEND="${RDEPEND} ${CDEPEND}"
-
-all_ruby_prepare() {
-	# Remove already compressed image
-	rm -f sample/icon.bmp.gz || die
-}
-
-each_ruby_configure() {
-	${RUBY} extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1
-}
-
-each_ruby_install() {
-	emake V=1 DESTDIR="${D}" install
-}
-
-all_ruby_install() {
-	dodoc README.en README.ja NEWS.en NEWS.ja
-	dodoc -r doc-en sample
-}
-
-pkg_postinst() {
-	if ! use image || ! use mixer || ! use truetype || ! use mpeg || ! use sge; then
-		echo ""
-		ewarn "If any of the following packages are not installed, Ruby/SDL"
-		ewarn "will be missing some functionality. This is ok, but may"
-		ewarn "cause errors in Ruby/SDL programs that need these libraries:"
-		ewarn ""
-		ewarn "\tmedia-libs/sdl-image\tImage loading (PNG, JPEG, etc.)"
-		ewarn "\tmedia-libs/sdl-mixer\tSound mixing"
-		ewarn "\tmedia-libs/sdl-ttf\tTrueType Fonts"
-		ewarn "\tmedia-libs/sge\t\tVarious cool graphics extensions"
-		ewarn "\tmedia-libs/smpeg\tMPEG playback (including mp3)"
-		ewarn ""
-		ewarn "If you need the functionality offered by these libraries,"
-		ewarn "emerge the desired libraries, then re-emerge dev-ruby/rubysdl"
-		echo ""
-	fi
-}
diff --git a/dev-ruby/ruby-shadow/Manifest b/dev-ruby/ruby-shadow/Manifest
index e46da29229ac..7e0ec21e92f8 100644
--- a/dev-ruby/ruby-shadow/Manifest
+++ b/dev-ruby/ruby-shadow/Manifest
@@ -1,2 +1 @@
-DIST ruby-shadow-2.5.0.gem 11264 BLAKE2B 22012d4672528e76a860e534fecb2a40d27c15f7440a0be6880c4ffd06be26e58d2f5279c385c49aca611864c8959ed0ea3afdd78bcdb28ac0912123f18a35e0 SHA512 1abd54df1bd4f29e135093df9b22886a726824f8b72b742017fd31bdc3fa39e3d79410a747cf2ebe4117f75e665fb89c904375b5c44a674bec91a4cc37646520
 DIST ruby-shadow-2.5.1.gem 11264 BLAKE2B 0371fbf8f01dd6907b26369c33e69bc11664282ce1005792cff70113b0a05bfe0ce0eddd15896a9c6bcc9de38671d73034414f354f34d2716fd4f9265d823cbf SHA512 401ba31f6f87b9b50597e3924c67ef9d0a8f566ea4649735caf59e2b706861babf9b3aa273b7c47ca1cc9c8b4fde79ab21d2e264cd7ba58041fe7b8f9fd87411
diff --git a/dev-ruby/ruby-shadow/files/ruby-shadow-2.5.1-ruby32-taint.patch b/dev-ruby/ruby-shadow/files/ruby-shadow-2.5.1-ruby32-taint.patch
new file mode 100644
index 000000000000..4c66e63fbb1a
--- /dev/null
+++ b/dev-ruby/ruby-shadow/files/ruby-shadow-2.5.1-ruby32-taint.patch
@@ -0,0 +1,54 @@
+From 70330521b99e84c8f7445c213dfde0768f45a690 Mon Sep 17 00:00:00 2001
+From: Michael Hashizume <michael.hashizume@puppet.com>
+Date: Thu, 20 Oct 2022 13:28:09 -0700
+Subject: [PATCH] Removes taint checking functions
+
+Taint checking has been completely removed from Ruby as of Ruby
+3.2.0. This commit removes taint checking functions from ruby-
+shadow.
+
+See https://bugs.ruby-lang.org/issues/16131
+---
+ pwd/shadow.c    | 6 +++---
+ shadow/shadow.c | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/pwd/shadow.c b/pwd/shadow.c
+index eeb96d4..46313d4 100644
+--- a/pwd/shadow.c
++++ b/pwd/shadow.c
+@@ -56,8 +56,8 @@ static VALUE convert_pw_struct( struct passwd *entry )
+ {
+   /* Hmm. Why custom pw_change instead of sp_lstchg? */
+   return rb_struct_new(rb_sPasswdEntry,
+-         rb_tainted_str_new2(entry->pw_name), /* sp_namp */
+-         rb_tainted_str_new2(entry->pw_passwd), /* sp_pwdp, encryped password */
++         rb_str_new2(entry->pw_name), /* sp_namp */
++         rb_str_new2(entry->pw_passwd), /* sp_pwdp, encryped password */
+          Qnil, /* sp_lstchg, date when the password was last changed (in days since Jan 1, 1970) */
+          Qnil, /* sp_min, days that password must stay same */
+          Qnil, /* sp_max, days until password changes. */
+@@ -66,7 +66,7 @@ static VALUE convert_pw_struct( struct passwd *entry )
+          INT2FIX(difftime(entry->pw_change, 0) / (24*60*60)), /* pw_change */
+          INT2FIX(difftime(entry->pw_expire, 0) / (24*60*60)), /* sp_expire */
+          Qnil, /* sp_flag */
+-         rb_tainted_str_new2(entry->pw_class), /* sp_loginclass, user access class */
++         rb_str_new2(entry->pw_class), /* sp_loginclass, user access class */
+          NULL);
+ }
+ 
+diff --git a/shadow/shadow.c b/shadow/shadow.c
+index 35a77a1..9a2ae70 100644
+--- a/shadow/shadow.c
++++ b/shadow/shadow.c
+@@ -34,8 +34,8 @@ static VALUE rb_eFileLock;
+ static VALUE convert_pw_struct( struct spwd *entry ) 
+ {
+   return rb_struct_new(rb_sPasswdEntry,
+-		      rb_tainted_str_new2(entry->sp_namp),
+-		      rb_tainted_str_new2(entry->sp_pwdp),
++		      rb_str_new2(entry->sp_namp),
++		      rb_str_new2(entry->sp_pwdp),
+ 		      INT2FIX(entry->sp_lstchg),
+ 		      INT2FIX(entry->sp_min),
+ 		      INT2FIX(entry->sp_max),
diff --git a/dev-ruby/ruby-shadow/files/ruby-shadow-2.5.1-ruby32.patch b/dev-ruby/ruby-shadow/files/ruby-shadow-2.5.1-ruby32.patch
new file mode 100644
index 000000000000..3cbcf4b088b3
--- /dev/null
+++ b/dev-ruby/ruby-shadow/files/ruby-shadow-2.5.1-ruby32.patch
@@ -0,0 +1,31 @@
+From eab4aba3f5e06ea8f124d3e5ff6b3fa88c4807cd Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka@fedoraproject.org>
+Date: Thu, 1 Dec 2022 12:23:05 +0900
+Subject: [PATCH] extconf.rb: use Rbconfig::CONFIG instead of mkmf CONFIG
+
+In mkmf.rb CONFIG is defined as CONFIG is defined as RbConfig::MAKEFILE_CONFIG
+and RbConfig::MAKEFILE_CONFIG is almost same as RbConfig::CONFIG
+except that RbConfig::MAKEFILE_CONFIG uses reference for other variables.
+
+Using CONFIG in extconf.rb causes error with ruby3.2 because now
+CONFIG['host_os'] uses reference for target_os variable, and extconf.rb
+expects that this variable is all expanded. So instead, use RbConfig::CONFIG .
+
+Closes #30
+---
+ extconf.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extconf.rb b/extconf.rb
+index d17f926..55dcff5 100644
+--- a/extconf.rb
++++ b/extconf.rb
+@@ -14,7 +14,7 @@
+           else; ''
+           end
+ 
+-implementation = case CONFIG['host_os']
++implementation = case RbConfig::CONFIG['host_os']
+                  when /linux/i; 'shadow'
+                  when /sunos|solaris/i; 'shadow'
+                  when /freebsd|mirbsd|netbsd|openbsd/i; 'pwd'
diff --git a/dev-ruby/ruby-shadow/ruby-shadow-2.5.0-r1.ebuild b/dev-ruby/ruby-shadow/ruby-shadow-2.5.0-r1.ebuild
deleted file mode 100644
index f36241999c84..000000000000
--- a/dev-ruby/ruby-shadow/ruby-shadow-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ruby30: does not compile
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="HISTORY README README.euc"
-
-RUBY_FAKEGEM_EXTENSIONS=(./extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby shadow bindings"
-HOMEPAGE="https://github.com/apalmblad/ruby-shadow http://ttsky.net"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86"
-IUSE=""
diff --git a/dev-ruby/ruby-shadow/ruby-shadow-2.5.1.ebuild b/dev-ruby/ruby-shadow/ruby-shadow-2.5.1.ebuild
index 2cb56fd60c1d..2e42f05bcf5a 100644
--- a/dev-ruby/ruby-shadow/ruby-shadow-2.5.1.ebuild
+++ b/dev-ruby/ruby-shadow/ruby-shadow-2.5.1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
@@ -14,9 +14,19 @@ RUBY_FAKEGEM_EXTENSIONS=(./extconf.rb)
 inherit ruby-fakegem
 
 DESCRIPTION="ruby shadow bindings"
-HOMEPAGE="https://github.com/apalmblad/ruby-shadow http://ttsky.net"
+HOMEPAGE="https://github.com/apalmblad/ruby-shadow"
 
-LICENSE="Ruby"
+LICENSE="|| ( public-domain Unlicense )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-ruby32.patch"
+	"${FILESDIR}/${P}-ruby32-taint.patch"
+)
+
+all_ruby_prepare() {
+	sed -e '16i$CFLAGS += ENV["CFLAGS"]' \
+		-i extconf.rb || die
+}
diff --git a/dev-ruby/ruby-shout/files/ruby-shout-2.2.2-errno.patch b/dev-ruby/ruby-shout/files/ruby-shout-2.2.2-errno.patch
new file mode 100644
index 000000000000..91e484ab4295
--- /dev/null
+++ b/dev-ruby/ruby-shout/files/ruby-shout-2.2.2-errno.patch
@@ -0,0 +1,13 @@
+--- a/ext/shout_ext.c	2024-01-23 14:02:08.404056464 +0100
++++ b/ext/shout_ext.c	2024-01-23 14:03:47.152700002 +0100
+@@ -91,8 +91,8 @@
+ /* For metadata-related errors, which don't relate to a shout_t, so we can't
+  * use shout_get_errno or shout_get_error on them.
+  */
+-static void raise_nonspecific_shout_error(int errno) {
+-        rb_raise(cShoutError, "%d", errno);
++static void raise_nonspecific_shout_error(int err_no) {
++        rb_raise(cShoutError, "%d", err_no);
+ }
+ 
+ /*
diff --git a/dev-ruby/ruby-shout/ruby-shout-2.2.2-r1.ebuild b/dev-ruby/ruby-shout/ruby-shout-2.2.2-r1.ebuild
deleted file mode 100644
index 0e08b4e535f3..000000000000
--- a/dev-ruby/ruby-shout/ruby-shout-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.textile"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby interface to libshout2"
-HOMEPAGE="https://github.com/niko/ruby-shout"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND+=" >=media-libs/libshout-2.0"
-DEPEND+=" >=media-libs/libshout-2.0"
diff --git a/dev-ruby/ruby-shout/ruby-shout-2.2.2-r2.ebuild b/dev-ruby/ruby-shout/ruby-shout-2.2.2-r2.ebuild
index 8d40212427f6..59543decf60d 100644
--- a/dev-ruby/ruby-shout/ruby-shout-2.2.2-r2.ebuild
+++ b/dev-ruby/ruby-shout/ruby-shout-2.2.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
@@ -16,10 +16,12 @@ inherit ruby-fakegem
 DESCRIPTION="A Ruby interface to libshout2"
 HOMEPAGE="https://github.com/niko/ruby-shout"
 
-LICENSE="Ruby"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND+=" >=media-libs/libshout-2.0"
 DEPEND+=" >=media-libs/libshout-2.0"
+
+PATCHES=( "${FILESDIR}/${P}-errno.patch" )
diff --git a/dev-ruby/ruby-termios/ruby-termios-1.1.0-r1.ebuild b/dev-ruby/ruby-termios/ruby-termios-1.1.0-r1.ebuild
deleted file mode 100644
index 0a566cbe514e..000000000000
--- a/dev-ruby/ruby-termios/ruby-termios-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md termios.rd"
-
-# There are no tests in the gem, and the upstream tests only work
-# with a normal TTY, bug 340575.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby interface to termios"
-HOMEPAGE="http://arika.org/ruby/termios"
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
-IUSE=""
diff --git a/dev-ruby/ruby-termios/ruby-termios-1.1.0-r2.ebuild b/dev-ruby/ruby-termios/ruby-termios-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..9b7fc27f4864
--- /dev/null
+++ b/dev-ruby/ruby-termios/ruby-termios-1.1.0-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md termios.rd"
+
+# There are no tests in the gem, and the upstream tests only work
+# with a normal TTY, bug 340575.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby interface to termios"
+HOMEPAGE="http://arika.org/ruby/termios"
+LICENSE="Ruby-BSD"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~mips ~ppc x86"
+IUSE=""
diff --git a/dev-ruby/ruby-termios/ruby-termios-1.1.0.ebuild b/dev-ruby/ruby-termios/ruby-termios-1.1.0.ebuild
deleted file mode 100644
index 57c5686b4afb..000000000000
--- a/dev-ruby/ruby-termios/ruby-termios-1.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md termios.rd"
-
-# There are no tests in the gem, and the upstream tests only work
-# with a normal TTY, bug 340575.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby interface to termios"
-HOMEPAGE="http://arika.org/ruby/termios"
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ~ppc x86"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext V=1
-	cp ext/termios$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/ruby-vte/Manifest b/dev-ruby/ruby-vte/Manifest
deleted file mode 100644
index 7f70af3b2295..000000000000
--- a/dev-ruby/ruby-vte/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
diff --git a/dev-ruby/ruby-vte/metadata.xml b/dev-ruby/ruby-vte/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-vte/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-vte/ruby-vte-3.4.3.ebuild b/dev-ruby/ruby-vte/ruby-vte-3.4.3.ebuild
deleted file mode 100644
index ef669ac0b306..000000000000
--- a/dev-ruby/ruby-vte/ruby-vte-3.4.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby vte bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND+=" dev-libs/glib
-	x11-libs/gtk+:2
-	x11-libs/pango
-	>=x11-libs/vte-0.12.1:0"
-DEPEND+=" dev-libs/glib
-	x11-libs/gtk+:2
-	x11-libs/pango
-	>=x11-libs/vte-0.12.1:0"
-
-ruby_add_rdepend "~dev-ruby/ruby-gtk2-${PV}"
-
-each_ruby_test() {
-	:
-}
diff --git a/dev-ruby/ruby-vte3/Manifest b/dev-ruby/ruby-vte3/Manifest
deleted file mode 100644
index 7f70af3b2295..000000000000
--- a/dev-ruby/ruby-vte3/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
diff --git a/dev-ruby/ruby-vte3/metadata.xml b/dev-ruby/ruby-vte3/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-vte3/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-vte3/ruby-vte3-3.4.3.ebuild b/dev-ruby/ruby-vte3/ruby-vte3-3.4.3.ebuild
deleted file mode 100644
index 46b5feb2c6fc..000000000000
--- a/dev-ruby/ruby-vte3/ruby-vte3-3.4.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_GNOME2_NEED_VIRTX=yes
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby VTE bindings for use with GTK3"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/vte:2.91[introspection]"
-RDEPEND+=" x11-libs/vte:2.91[introspection]"
-
-ruby_add_bdepend "~dev-ruby/ruby-glib2-${PV}"
-ruby_add_rdepend "~dev-ruby/ruby-gtk3-${PV}"
-
-all_ruby_prepare() {
-	ruby-ng-gnome2_all_ruby_prepare
-
-	# Avoid tests that require a real pty.
-	rm -f test/test-pty.rb || die
-}
diff --git a/dev-ruby/ruby-webkit2-gtk/Manifest b/dev-ruby/ruby-webkit2-gtk/Manifest
deleted file mode 100644
index 7f70af3b2295..000000000000
--- a/dev-ruby/ruby-webkit2-gtk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
diff --git a/dev-ruby/ruby-webkit2-gtk/metadata.xml b/dev-ruby/ruby-webkit2-gtk/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-webkit2-gtk/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.4.3.ebuild b/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.4.3.ebuild
deleted file mode 100644
index 4045df88ac7c..000000000000
--- a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.4.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit virtualx ruby-ng-gnome2
-
-DESCRIPTION="Ruby WebKitGtk+ for Gtk 3.0 bindings"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND+=" net-libs/webkit-gtk:4[introspection]"
-RDEPEND+=" net-libs/webkit-gtk:4[introspection]"
-
-ruby_add_rdepend "~dev-ruby/ruby-gobject-introspection-${PV}
-	~dev-ruby/ruby-gtk3-${PV}"
-
-each_ruby_test() {
-	DCONF_PROFILE="${T}" virtx ${RUBY} test/run-test.rb
-}
diff --git a/dev-ruby/ruby-wnck3/Manifest b/dev-ruby/ruby-wnck3/Manifest
deleted file mode 100644
index 7f70af3b2295..000000000000
--- a/dev-ruby/ruby-wnck3/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
diff --git a/dev-ruby/ruby-wnck3/metadata.xml b/dev-ruby/ruby-wnck3/metadata.xml
deleted file mode 100644
index 3b50d592e675..000000000000
--- a/dev-ruby/ruby-wnck3/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-wnck3/ruby-wnck3-3.4.3.ebuild b/dev-ruby/ruby-wnck3/ruby-wnck3-3.4.3.ebuild
deleted file mode 100644
index a7f27c24650f..000000000000
--- a/dev-ruby/ruby-wnck3/ruby-wnck3-3.4.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_GNOME2_NEED_VIRTX=yes
-
-inherit ruby-ng-gnome2
-
-DESCRIPTION="Ruby libwnck 3 bindings"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND+=" x11-libs/libwnck:3[introspection]"
-RDEPEND+=" x11-libs/libwnck:3[introspection]"
-
-ruby_add_rdepend "~dev-ruby/ruby-gtk3-${PV}"
diff --git a/dev-ruby/ruby-xslt/Manifest b/dev-ruby/ruby-xslt/Manifest
deleted file mode 100644
index 80ecdef10380..000000000000
--- a/dev-ruby/ruby-xslt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby-xslt-0.9.10.gem 35328 BLAKE2B aa0a627e76fcbc5626018389b5adbdbef1d54cc228f5622fd8cef4305e2d79c023c193031b8f8cc5f0e63d9c0af96edc0398beea4ac7f5eafe3dcf13ad2ff0ea SHA512 b196a517b19c6cb91ed6f4543ecfc6b58532e66f460029d2618e792cfe4078342fcb4428642328cbe6d97d1d942a6025ecff617578fc3abe2b0e414bf61ca1c4
diff --git a/dev-ruby/ruby-xslt/metadata.xml b/dev-ruby/ruby-xslt/metadata.xml
deleted file mode 100644
index 658c72b1920d..000000000000
--- a/dev-ruby/ruby-xslt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/ruby-xslt/ruby-xslt-0.9.10-r1.ebuild b/dev-ruby/ruby-xslt/ruby-xslt-0.9.10-r1.ebuild
deleted file mode 100644
index 70b45d16c9b6..000000000000
--- a/dev-ruby/ruby-xslt/ruby-xslt-0.9.10-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.rdoc AUTHORS.rdoc README.rdoc"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/xslt_lib/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/xml"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby class for processing XSLT"
-HOMEPAGE="https://github.com/glejeune/ruby-xslt"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+=" >=dev-libs/libxslt-1.1.12"
-RDEPEND+=" >=dev-libs/libxslt-1.1.12"
-
-all_ruby_prepare() {
-	# Remove forced -g compiler flag.
-	sed -i -e 's/-g //' ext/xslt_lib/extconf.rb || die
-
-	# One test fails but we have installed this code already for a long
-	# time so this probably isn't a regression. No upstream bug tracker
-	# to report the problem :-(
-	sed -i -e '/test_transformation_error/,/^  end/ s:^:#:' test/test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -I../lib:lib -Ctest test.rb || die
-}
diff --git a/dev-ruby/ruby-xslt/ruby-xslt-0.9.10.ebuild b/dev-ruby/ruby-xslt/ruby-xslt-0.9.10.ebuild
deleted file mode 100644
index d1f5ff9fe47c..000000000000
--- a/dev-ruby/ruby-xslt/ruby-xslt-0.9.10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.rdoc AUTHORS.rdoc README.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby class for processing XSLT"
-HOMEPAGE="https://github.com/glejeune/ruby-xslt"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-DEPEND+=" >=dev-libs/libxslt-1.1.12"
-RDEPEND+=" >=dev-libs/libxslt-1.1.12"
-
-all_ruby_prepare() {
-	# Remove forced -g compiler flag.
-	sed -i -e 's/-g //' ext/xslt_lib/extconf.rb || die
-
-	# One test fails but we have installed this code already for a long
-	# time so this probably isn't a regression. No upstream bug tracker
-	# to report the problem :-(
-	sed -i -e '/test_transformation_error/,/^  end/ s:^:#:' test/test.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext/xslt_lib extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/xslt_lib V=1
-	cp ext/xslt_lib/xslt_lib$(get_modname) lib/xml/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -I../lib:lib -Ctest test.rb || die
-}
diff --git a/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r3.ebuild b/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r3.ebuild
index bdab6a9ee4be..d1427b629b38 100644
--- a/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r3.ebuild
+++ b/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r3.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRADOC="README"
 inherit ruby-fakegem
 
 DESCRIPTION="A ruby library for performing Yadis service discovery"
-HOMEPAGE="http://yadis.rubyforge.org/"
+HOMEPAGE="https://rubygems.org/gems/ruby-yadis"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-ruby/ruby2_keywords/Manifest b/dev-ruby/ruby2_keywords/Manifest
index 88121a2a7a16..1f13a2e9d486 100644
--- a/dev-ruby/ruby2_keywords/Manifest
+++ b/dev-ruby/ruby2_keywords/Manifest
@@ -1,2 +1 @@
-DIST ruby2_keywords-0.0.4.gem 5632 BLAKE2B 1d2d4a71823e61a14fdf15edc2ad8ed8df70e3f52f621940d3d3e00c18f58e76d7c18ca2ff409b1c2b5d77216f90e72e1d50bad00093fa1f7740ccf8375c11a2 SHA512 22cc0c9c08f84ee6485e02f1d1fa244219dc96846a638b428970e0876c83056b87939e8a3cddac833d6feb493e34420604e81a3973d7cfa4dc969a6639b13439
 DIST ruby2_keywords-0.0.5.gem 10752 BLAKE2B 430ddd02ed59c73c8dfff7762a2f4bbee2b4514d7c8c38a9bf34928a254799cc9e7401672d92b926e4284b005ed6ce59eb2f4503cabe76c5200626b89055bfa1 SHA512 f6b9078b111e68c0017e0025ecdccb976c7a32f35c1a8adf9fd879db0c91f89eb9bd799f9527a846e28056f2a5fbf0f3610cda9538570288c493613c35c83a6f
diff --git a/dev-ruby/ruby2_keywords/metadata.xml b/dev-ruby/ruby2_keywords/metadata.xml
index 658c72b1920d..0fcf0f1d9f19 100644
--- a/dev-ruby/ruby2_keywords/metadata.xml
+++ b/dev-ruby/ruby2_keywords/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/ruby2_keywords</remote-id>
+    <remote-id type="rubygems">ruby2_keywords</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.4.ebuild b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.4.ebuild
deleted file mode 100644
index edabe3ae9b88..000000000000
--- a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shim library for Module#ruby2_keywords"
-HOMEPAGE="https://github.com/ruby/ruby2_keywords"
-
-LICENSE="Ruby"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
diff --git a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5-r1.ebuild b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5-r1.ebuild
new file mode 100644
index 000000000000..68e53e285053
--- /dev/null
+++ b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Shim library for Module#ruby2_keywords"
+HOMEPAGE="https://github.com/ruby/ruby2_keywords"
+
+LICENSE="|| ( BSD-2 Ruby-BSD )"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
diff --git a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5.ebuild b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5.ebuild
deleted file mode 100644
index 7772f5700f63..000000000000
--- a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shim library for Module#ruby2_keywords"
-HOMEPAGE="https://github.com/ruby/ruby2_keywords"
-
-LICENSE="Ruby"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
diff --git a/dev-ruby/ruby2ruby/Manifest b/dev-ruby/ruby2ruby/Manifest
index ecdf2b73ae7e..269c5b406a8b 100644
--- a/dev-ruby/ruby2ruby/Manifest
+++ b/dev-ruby/ruby2ruby/Manifest
@@ -1 +1,2 @@
 DIST ruby2ruby-2.4.4.gem 26624 BLAKE2B d330cd65513218a96c9e35fe2b69d859fa103ad6dd1b8e8a671bddb9732f99cd65540b404632e671ababbe5842ed2be34a29c2b1fb3bc4c43935f5a7a0735d9e SHA512 51728d702d2142e9a7599fe53c2b58906cd386be429fe97590f850df8cf461c046c67a99fc7b7e277551013b78e35d21609c8125fb568ef90270d146a685c04d
+DIST ruby2ruby-2.5.0.gem 29184 BLAKE2B f1c8a8e904bf93a07e4b57c82bddd9b2f80b286b91ca5973375700f8a853f3a08731d5a067a25eac16cd2983f7bbceec7a3996bbf8d4fd8527322b439291f575 SHA512 4b968400a40ae6eed7528c848d8d78dd4e1f1efa63481423eb82309d1dc884416a7aac301f84c945f744e898200bb83cd1be39e10c4ceec530fc751f8bf2e4ba
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
index 4b2a0c2e01ad..62dc87da176b 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.5.0.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.5.0.ebuild
new file mode 100644
index 000000000000..1fce1cd7cccc
--- /dev/null
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Generates readable ruby from ParseTree"
+HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/sexp_processor-4.6.0:4
+	>=dev-ruby/ruby_parser-3.1:3
+"
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 >=dev-ruby/sexp_processor-4.10.0:4 )"
+
+all_ruby_prepare() {
+	sed -i -e '/plugin :isolate/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/ruby_engine/Manifest b/dev-ruby/ruby_engine/Manifest
new file mode 100644
index 000000000000..4538dfe6e07b
--- /dev/null
+++ b/dev-ruby/ruby_engine/Manifest
@@ -0,0 +1,2 @@
+DIST ruby_engine-2.0.0.gem 21504 BLAKE2B b931969150735aa30fe910ad5e9861853180cb4247a803149e91b302fef0e7b48ccddf7316d855cbb23e8cc0d1e1b6cdb598b9bf6ed3e973090221b096184f28 SHA512 de1363617c57caa813f1526b71c9119f5f29e49b86e11476299e56234c585d9cbb594a7c5383fed988abfc1b5ec13d2005a96d96f6671bfdf316fa6836fba9de
+DIST ruby_engine-2.0.1.gem 7680 BLAKE2B d26a396d10fa92de884cb85489daa3ff6e65ff923cc48b96bb1b6a5b5def9e49629aea7abf0ec2ca1a9290ce0a0cbb81f954b1e3e2a4263173caab503e7a82e3 SHA512 30413fe71e58824d63649f91b7bc38a0395f254e35d36e19df2ff26c351e00f22e932ffba456884b5274af667e59581d9fdfbb7098ad22a0c101a410a40c479b
diff --git a/dev-ruby/ruby_engine/metadata.xml b/dev-ruby/ruby_engine/metadata.xml
new file mode 100644
index 000000000000..9f2b7707c89e
--- /dev/null
+++ b/dev-ruby/ruby_engine/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janlelis/ruby_engine</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/ruby_engine/ruby_engine-2.0.0.ebuild b/dev-ruby/ruby_engine/ruby_engine-2.0.0.ebuild
new file mode 100644
index 000000000000..a6dc855182a8
--- /dev/null
+++ b/dev-ruby/ruby_engine/ruby_engine-2.0.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A RubyEngine class that simplifies checking for your Ruby implementation"
+HOMEPAGE="https://github.com/janlelis/ruby_version"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
diff --git a/dev-ruby/ruby_engine/ruby_engine-2.0.1.ebuild b/dev-ruby/ruby_engine/ruby_engine-2.0.1.ebuild
new file mode 100644
index 000000000000..38ba499f7db2
--- /dev/null
+++ b/dev-ruby/ruby_engine/ruby_engine-2.0.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A RubyEngine class that simplifies checking for your Ruby implementation"
+HOMEPAGE="https://github.com/janlelis/ruby_version"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
diff --git a/dev-ruby/ruby_gntp/Manifest b/dev-ruby/ruby_gntp/Manifest
deleted file mode 100644
index 98da1781076d..000000000000
--- a/dev-ruby/ruby_gntp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ruby_gntp-0.3.4.gem 10240 BLAKE2B dff0f192ee0308793171f0233379b41e8ff8cf8e3af3497c5f04f323dc5f75d4f310f2fc21538beda271f4d3bedc8fcad200afe7b4d24ec864e023346c5899c6 SHA512 876b728430183b273bf97a7e7b662c0614bcc21a3d1a7c4c07b2af9b1643c9a9bc96e92843e6118903d75d99b21c2faff0f27c22fbc8822db14560937e6a5dd8
diff --git a/dev-ruby/ruby_gntp/metadata.xml b/dev-ruby/ruby_gntp/metadata.xml
deleted file mode 100644
index ed7abccf1a9c..000000000000
--- a/dev-ruby/ruby_gntp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">snaka/ruby_gntp</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ruby_gntp/ruby_gntp-0.3.4-r1.ebuild b/dev-ruby/ruby_gntp/ruby_gntp-0.3.4-r1.ebuild
deleted file mode 100644
index 5fe27dde44c9..000000000000
--- a/dev-ruby/ruby_gntp/ruby_gntp-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="README ChangeLog"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby library for GNTP(Growl Notification Transport Protocol)"
-HOMEPAGE="https://github.com/snaka/ruby_gntp"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/rr )"
-
-all_ruby_prepare() {
-	mv test spec || die
-	sed -i -e "s/Spec::Runner/RSpec/" \
-		-e "s#\.\./lib/##"\
-		spec/ruby_gntp_spec.rb || die
-
-}
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index 69b63f0c6143..c5eef809819d 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -1,3 +1,5 @@
-DIST ruby_parser-3.14.2.gem 466432 BLAKE2B 2694888b5b705733468eaf074f7f059814e2a230d1ec7390ef6b093c717534bfc6648a00240fd07d0f108ee1dcdc9f81b121a0ff0446d4ebf75fa5bf87006fa0 SHA512 65b8977fff322d4ecdbb8da1276d76318f08a13a25d8cf8429ba5ca7097c2b58c03431d60b05eec6cb62be316cf9b1efc753b86e8b67e076fd413d2324bc6655
-DIST ruby_parser-3.18.1.gem 634880 BLAKE2B 046ca70510a62e515873039c3846c6dfe7eda204b10c28d1a2892052ee9662be46c99e8f3474577e1e513bee395a404e05d2bcc133d293ae04e2b8b0accdf95b SHA512 820b7dd75f92daef364db9b691ac7c71e460ad0f7f20491036c659310fd08561ae83f227bb5d82748d3b4a40fbb745c57144d8503a395a30eaba934df47f33bc
-DIST ruby_parser-3.19.1.gem 777728 BLAKE2B 883c945e0b151ec937a710b1092ee72e8796bb77feeb7f483179c6d683b4d706536b97cf0e2dba8910e5a6adc8d519487109098f0270ed1d6345ac323bd8e8d7 SHA512 5f55b8a400cd81af837614122360af92f12f4625b68acf6caf6008ab1be604db55de336626118cb73ae20262d4123539bfd0eb3b57243855e5d487c5017df325
+DIST ruby_parser-3.19.2.gem 778240 BLAKE2B b9a136f8aa93fe915eedc5ca16a54a8c21446a48db89e86f7936dbbd4ee913f7bc61fcbaf136cd1965bbbd6601634a6832a09f0226647cf2ea802689251946c6 SHA512 c71e7e76e37ebe6e9489e9f0bb963b7b34adc8f4afa73ea4ad90356579725bd1a234f6e015a9c19b2c294c1ffe0d6b093be838ec0059a61fb5866cfe9e04f18b
+DIST ruby_parser-3.20.0.gem 852992 BLAKE2B fd261c46e1fd0dbdbe13f02aa0c063334294a82a22af1491d760af2f1922a0c71355d2c002dcaa1fcf7c24fc9a157a4a640969ed946750ba90dfb87dcf8e785a SHA512 4cbd35703c35a799d8e06b78708adff378ff82d53f658908fb6cccfddbd6c200892bb2a3b4923fc17d2c4f7f611af12e3c942495a511d5470a05abb61ee1fba7
+DIST ruby_parser-3.20.1.gem 856576 BLAKE2B 8944c8c1403bb23aeb77ea19fe5ff7596879c94350609fcffc839c15b9009efe7c172369363aa99edd561cfdf4fcf081e665dea494cf87d88b105c797cea25a4 SHA512 50e77dcf4893e0b56399e10804e7c6652f57b812444edcd247d3c70f89cf4e5308a90103dd63e032588557472513bc2e6ac49988fddeea81f9f7262e14653abd
+DIST ruby_parser-3.20.3.gem 854528 BLAKE2B 0451390ffd1b5c9e9d8abb557f0e87a7f15024ee2f187a2a03802e0406242489b952c97250982610a52f94453078ce15b3e6cb9f47adb16624b10c0e94d0f62b SHA512 1d7b0956fdd6dc01ca280d7c3ac2875b4b24074b017e1952aa660896b0c7838b967c872bb9d425a4505a0ae6b17a4642f265f082c7e3bf8e5dc00fb6dd221ce4
+DIST ruby_parser-3.21.0.gem 765952 BLAKE2B 7a616e7b5af08a12d40ec6c8761dc0a6edbdbda60cd024bbae6710303cd569ff59b4b0c1168c555a08aa8f374350e7cec6a524f884ec715fc4b31f2c1139cec2 SHA512 2d911adf41651ab942ea6acfffb4a97b036aea41f209476182361622bc93771d0fb8dff4b8d10d89ed0041dc9590783be0264282985ebcfc03bd610bbd46b69b
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
deleted file mode 100644
index e1478efd9d0c..000000000000
--- a/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby parser written in pure ruby"
-HOMEPAGE="https://github.com/seattlerb/ruby_parser"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4"
-
-ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.13.0:4 )"
-
-DEPEND+=" test? ( dev-util/unifdef )"
-
-all_ruby_prepare() {
-	# Remove reference to perforce method that is not in a released
-	# version of hoe-seattlerb.
-	#sed -i -e '/perforce/d' Rakefile || die
-	sed -i -e '/license/d' Rakefile || die
-	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.18.1.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.18.1.ebuild
deleted file mode 100644
index 73a5e7da7259..000000000000
--- a/dev-ruby/ruby_parser/ruby_parser-3.18.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby parser written in pure ruby"
-HOMEPAGE="https://github.com/seattlerb/ruby_parser"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sexp_processor-4.16.0:4"
-
-ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.16.0:4 )"
-
-DEPEND+=" test? ( dev-util/unifdef )"
-
-all_ruby_prepare() {
-	# Remove reference to perforce method that is not in a released
-	# version of hoe-seattlerb.
-	#sed -i -e '/perforce/d' Rakefile || die
-	sed -i -e '/license/d' Rakefile || die
-	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.19.1.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.19.1.ebuild
deleted file mode 100644
index 12b223ec4716..000000000000
--- a/dev-ruby/ruby_parser/ruby_parser-3.19.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby parser written in pure ruby"
-HOMEPAGE="https://github.com/seattlerb/ruby_parser"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sexp_processor-4.16.0:4"
-
-ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.16.1:4 )"
-
-DEPEND+=" test? ( dev-util/unifdef )"
-
-all_ruby_prepare() {
-	# Remove reference to perforce method that is not in a released
-	# version of hoe-seattlerb.
-	#sed -i -e '/perforce/d' Rakefile || die
-	sed -i -e '/license/d' Rakefile || die
-	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.19.2.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.19.2.ebuild
new file mode 100644
index 000000000000..f9338c82f320
--- /dev/null
+++ b/dev-ruby/ruby_parser/ruby_parser-3.19.2.ebuild
@@ -0,0 +1,36 @@
+# 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.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby parser written in pure ruby"
+HOMEPAGE="https://github.com/seattlerb/ruby_parser"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/sexp_processor-4.16.0:4"
+
+ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.16.1:4 )"
+
+DEPEND+=" test? ( dev-util/unifdef )"
+
+all_ruby_prepare() {
+	# Remove reference to perforce method that is not in a released
+	# version of hoe-seattlerb.
+	#sed -i -e '/perforce/d' Rakefile || die
+	sed -i -e '/license/d' Rakefile || die
+	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.20.0.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.20.0.ebuild
new file mode 100644
index 000000000000..ca27abe02501
--- /dev/null
+++ b/dev-ruby/ruby_parser/ruby_parser-3.20.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby parser written in pure ruby"
+HOMEPAGE="https://github.com/seattlerb/ruby_parser"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/sexp_processor-4.16.0:4"
+
+ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.17.0:4 )"
+
+DEPEND+=" test? ( dev-util/unifdef )"
+
+all_ruby_prepare() {
+	# Remove reference to perforce method that is not in a released
+	# version of hoe-seattlerb.
+	#sed -i -e '/perforce/d' Rakefile || die
+	sed -i -e '/license/d' Rakefile || die
+	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.20.1.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.20.1.ebuild
new file mode 100644
index 000000000000..489adba616d9
--- /dev/null
+++ b/dev-ruby/ruby_parser/ruby_parser-3.20.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby parser written in pure ruby"
+HOMEPAGE="https://github.com/seattlerb/ruby_parser"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/sexp_processor-4.16.0:4"
+
+ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.17.0:4 )"
+
+DEPEND+=" test? ( dev-util/unifdef )"
+
+all_ruby_prepare() {
+	# Remove reference to perforce method that is not in a released
+	# version of hoe-seattlerb.
+	#sed -i -e '/perforce/d' Rakefile || die
+	sed -i -e '/license/d' Rakefile || die
+	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.20.3.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.20.3.ebuild
new file mode 100644
index 000000000000..019696ac2ac2
--- /dev/null
+++ b/dev-ruby/ruby_parser/ruby_parser-3.20.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby parser written in pure ruby"
+HOMEPAGE="https://github.com/seattlerb/ruby_parser"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/sexp_processor-4.16.0:4"
+
+ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.17.0:4 )"
+
+DEPEND+=" test? ( dev-util/unifdef )"
+
+all_ruby_prepare() {
+	# Remove reference to perforce method that is not in a released
+	# version of hoe-seattlerb.
+	#sed -i -e '/perforce/d' Rakefile || die
+	sed -i -e '/license/d' Rakefile || die
+	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.21.0.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.21.0.ebuild
new file mode 100644
index 000000000000..d46e4e00c0f0
--- /dev/null
+++ b/dev-ruby/ruby_parser/ruby_parser-3.21.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby parser written in pure ruby"
+HOMEPAGE="https://github.com/seattlerb/ruby_parser"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/sexp_processor-4.16.0:4"
+
+ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.17.0:4 )"
+
+DEPEND+=" test? ( dev-util/unifdef )"
+
+all_ruby_prepare() {
+	sed -i -e '/license/d' Rakefile || die
+	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/ruby_smb/Manifest b/dev-ruby/ruby_smb/Manifest
index bae94582503c..91a4807b7a0e 100644
--- a/dev-ruby/ruby_smb/Manifest
+++ b/dev-ruby/ruby_smb/Manifest
@@ -1 +1 @@
-DIST ruby_smb-1.1.0.gem 175104 BLAKE2B ffa4a7b3666f736fd721c8d561c28724709c7db6a2a4075e183a0a931e5df0c8047e428a2537a747eda9482d9023c2ed8fd8157d1b40244615b3818dc0c0bc37 SHA512 038ca625b580ac32455d08c675a5d7319e320944fe3aef6ed7272872fdc6affbbf2bda325897369cb23d4d62e24923a74b13fe392017854c6c5b9889c5e003f6
+DIST ruby_smb-3.2.5.tar.gz 371107 BLAKE2B 452e93b2623f5354d257588a5b80803285a5b90c97b7f7318971986a9a0c3c18c80b00a0d1a32fba24447ceda73279656a76bc36ee38ea758a274db7cfe43d2c SHA512 15122587f7aa6ee85bcbd4a328b85e6db250b344754d1f059693d2710a8cce2b5ecdf034bd680bd9f2b0f752cf3378fbef9736b81448ac1436505f8aac98ae14
diff --git a/dev-ruby/ruby_smb/files/ruby_smb-3.2.5-import-pathname-no-simplecov.patch b/dev-ruby/ruby_smb/files/ruby_smb-3.2.5-import-pathname-no-simplecov.patch
new file mode 100644
index 000000000000..074c5a70b343
--- /dev/null
+++ b/dev-ruby/ruby_smb/files/ruby_smb-3.2.5-import-pathname-no-simplecov.patch
@@ -0,0 +1,21 @@
+https://github.com/rapid7/ruby_smb/pull/250
+
+From a786565241b721e971ec60697d91516695cecb0a Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 22 Mar 2023 07:22:14 +0000
+Subject: [PATCH] virtual_disk: Add 'pathname' require
+
+Needed for join()'s call to Pathname.new(). Only comes up if disabling
+simplecov because of a transitive-require.
+--- a/lib/ruby_smb/server/share/provider/virtual_disk/virtual_pathname.rb
++++ b/lib/ruby_smb/server/share/provider/virtual_disk/virtual_pathname.rb
+@@ -3,6 +3,8 @@ class Server
+     module Share
+       module Provider
+         class VirtualDisk < Disk
++          require 'pathname'
++
+           # This object emulates Ruby's builtin Pathname object but uses a virtual file system instead of the real local
+           # one.
+           class VirtualPathname
+
diff --git a/dev-ruby/ruby_smb/metadata.xml b/dev-ruby/ruby_smb/metadata.xml
index 25f027cde7c6..bd776838d83c 100644
--- a/dev-ruby/ruby_smb/metadata.xml
+++ b/dev-ruby/ruby_smb/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zerochaos@gentoo.org</email>
-		<name>Rick Farina</name>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">rapid7/ruby_smb</remote-id>
diff --git a/dev-ruby/ruby_smb/ruby_smb-1.1.0.ebuild b/dev-ruby/ruby_smb/ruby_smb-1.1.0.ebuild
deleted file mode 100644
index 3021fe1286fc..000000000000
--- a/dev-ruby/ruby_smb/ruby_smb-1.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="pure Ruby implementation of the SMB Protocol Family"
-HOMEPAGE="https://github.com/rapid7/ruby_smb"
-
-LICENSE="BSD"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/bindata:*
-	dev-ruby/rubyntlm
-	dev-ruby/windows_error"
-
-all_ruby_prepare() {
-	sed -i -e '/simple[Cc]ov/d' -e '/coveralls/d' spec/spec_helper.rb
-	sed -i -e '/[Ss]imple[Cc]ov/,/end/d' \
-		-e '/[Cc]overalls/,/end/d' spec/spec_helper.rb
-	sed -i '/TRAVIS/d' spec/spec_helper.rb
-	sed -i -e '1irequire "rubyntlm"; require "time"' spec/spec_helper.rb
-}
diff --git a/dev-ruby/ruby_smb/ruby_smb-3.2.5.ebuild b/dev-ruby/ruby_smb/ruby_smb-3.2.5.ebuild
new file mode 100644
index 000000000000..74f82135e43e
--- /dev/null
+++ b/dev-ruby/ruby_smb/ruby_smb-3.2.5.ebuild
@@ -0,0 +1,46 @@
+# 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="spec"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+inherit ruby-fakegem
+
+DESCRIPTION="Pure Ruby implementation of the SMB Protocol Family"
+HOMEPAGE="https://github.com/rapid7/ruby_smb"
+SRC_URI="https://github.com/rapid7/ruby_smb/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~x86"
+
+ruby_add_rdepend "
+	dev-ruby/bindata:*
+	dev-ruby/rubyntlm
+	dev-ruby/windows_error
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.5-import-pathname-no-simplecov.patch
+)
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/simplecov/Id' \
+		-e '/coveralls/d' \
+		-e '/TRAVIS/d' \
+		-e '1irequire "rubyntlm"; require "time"' \
+		spec/spec_helper.rb || die
+
+	sed -i \
+		-e '/fivemat/d' \
+		${PN}.gemspec || die
+
+	sed -i \
+		-e '/pry-byebug/d' \
+		-e '/pry-rescue/d' \
+		-e '/coveralls/d' \
+		Gemfile || die
+}
diff --git a/dev-ruby/ruby_version/Manifest b/dev-ruby/ruby_version/Manifest
new file mode 100644
index 000000000000..a0845d21a8d9
--- /dev/null
+++ b/dev-ruby/ruby_version/Manifest
@@ -0,0 +1 @@
+DIST ruby_version-1.0.3.gem 8192 BLAKE2B 6585ae4ef9c3c7a968c35ce503696fcf64b10212147cf02171e6ed9be6059d9ba9d355bd4f5e848b16f78995c61d30bcd0ee6b37708854ce446bcb945c20acfc SHA512 8e03113f06a2d52f0e8ae89c4936bdb9b4d244be17303d178f2c7bcb129b655e7a7841e967322beaec0e16d46d05233542cc007d81a9b2d6e75e60e34dba612d
diff --git a/dev-ruby/ruby_version/metadata.xml b/dev-ruby/ruby_version/metadata.xml
new file mode 100644
index 000000000000..b3209d9c58f8
--- /dev/null
+++ b/dev-ruby/ruby_version/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janlelis/ruby_version</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/ruby_version/ruby_version-1.0.3.ebuild b/dev-ruby/ruby_version/ruby_version-1.0.3.ebuild
new file mode 100644
index 000000000000..1e369f7f8840
--- /dev/null
+++ b/dev-ruby/ruby_version/ruby_version-1.0.3.ebuild
@@ -0,0 +1,18 @@
+# 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.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A class which offers a convenient DSL for checking for the right Ruby version"
+HOMEPAGE="https://github.com/janlelis/ruby_version"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 970240b561c6..b5d4a0edca71 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -1,7 +1,8 @@
-DIST rubygems-3.0.3.tgz 904175 BLAKE2B d99de4bdd51779ab214bc4a81f55483341a2c193d4304b8eeb6105cb95877e0a33fe03d93c47433ad3c6bdc8d3e453e33ffb799fd36164feac31616f95eeced4 SHA512 1dd585243341901c7b4cc60a4902000c10ce57fe2cc9c28e27e274a2e6029f936cde1c99d7097c93c2c5b2c8bcee5d692c8fe5cc00c996a040e4954b674e330e
-DIST rubygems-3.0.9.tgz 886153 BLAKE2B 942f641c7dec30d3dd2f0756d04b1b6b071f5d3b5a9481c406e51ab125fa9da0e4e1ebde79c6a663e8847125c1ed8657f6af69000cf0d7191360e7aab99ba508 SHA512 1a6d7b3b08024d95988e033c772bfb6b5ed8f94ff4ddb194280bd3a7530cc384cb90fd56d44b6d56760cffbb23c5a6ab5917737ca46ec85fe61e1ae79d7ba4ca
-DIST rubygems-3.1.6.tgz 996339 BLAKE2B 8dc242a64c6f934b876de841cb6ea86455d7754cbe3902620a10ac40bb97264c03c1002b45a5734d1882617d95e8b390873ed390d00fe7e54b6d8f11a301c2b3 SHA512 730381cf683cd57f7ea7889f63cf21abb699bf28d2a25fa63f510756ece285cb63e4208130c20fa7c0232d6093d869e5d99d5b5fdad9bc68be5e8ead21863d97
-DIST rubygems-3.2.14.tgz 987419 BLAKE2B cfd1545f022194f8b7a99b1698a38d4cfae08b8fe25c45fc7b7c935953ec7a66b0b00f21f77eefe757226d80f19a2093f2b85767e5caabfe13f445fbf6dc5508 SHA512 de28bdfdc239cd49bb5a1f78f0a9e3ec432fb70c8326c7899f7ef0a088f60becd99ba81285b20388296f96afb46ca3ca359208621d88a6be68b7388d155a2383
-DIST rubygems-3.2.22.tgz 1236895 BLAKE2B c4782e064d2d9748519f915264411e11151edf9273e6a0473e70c39d9fc484b0c2d45e5fe4f00c6b83d9f27393a487c9e0b87a6f9d02449b370ae64a32f891a6 SHA512 6872e08b22ed3903e9d6e67ed03bb79f1ab6819eac0837b9f1003c0ef88ee751a380f9f55e548988baf2658470fcad204eca289acbd2043e04a9d12ed23eac16
-DIST rubygems-3.2.33.tar.gz 12131881 BLAKE2B 6ec9321d808df2ee1bbde7f9889471bb7dbadb719872577a9f04863ccf7c314f6b9e2edb178efa8b1996070112673163efb2cf7501d289cecbddd134770dcb12 SHA512 dcabbbbc57031ffa3ca04227a631323559ea99cb0b26e082b3bc51dd4f9b34b996903c7701932aa303192c0483a9e1c66661424233937d1d406773b4279263a4
-DIST rubygems-3.3.8.tar.gz 12928096 BLAKE2B f09f7da32db03b9240515cbc114b94fdec0e7d9da6c4ac1ca297f76989be154da3dd6dbf4701e295d01dac957fbd4429ea39eee3ee66bc4fb6d4e6194ccec96a SHA512 bc5719204ac81d9a70df0c8affd99c6e45835f3aa140c9d262d34bee879a7b932a0b5069453e949054e9f3feeab7d376f1a02e1aeaed167b30bf59fe57d0af40
+DIST rubygems-3.3.26.tar.gz 12995476 BLAKE2B c06400d263f64ee988781b49628eebde2b78b5c3cdf3796fe5e1ce5891cb0b41b5e50313293afc72c9b278ab00415b91a862f4245107c63e8eedb9904a5d33e2 SHA512 5aad9f6f0f7187d7d3f2a77ceb50b4b293290dc2e83fb55654c8fdf8e222568d40ef0c64d603ae2ff0db39e7a39ee89ec3c48bb102d434637145863881851086
+DIST rubygems-3.4.1.tar.gz 12999634 BLAKE2B 019364e3abd3b12f2a37b08a8d32546cd002c47653a4cdd4e06d8605010dcfcbf3f82f2d375c6bd51a8f1b462b624cefb85932c075b965d5038c26d6079de261 SHA512 2183f7d6ab914c47c02b53cafa6f39845986e4b38713d320402b98f0f0926dbbd957ef11c00b4fbe8f6c9985a1a5d9f551b2df9d47f00c389026e373dbd6f6ed
+DIST rubygems-3.4.15.tar.gz 15033712 BLAKE2B 01fa4160549d49dbb0fd9e8c2c3c570e837cdb0d074a0ba484bb37ae8b7a19f853387dacb980615f63e4be9ab080e3b8fb9b429da97b6ffe98ea33178efdf2e6 SHA512 37aec02ac91427d3b44b3914308a4262d2c9b2c603b6fdd986ce0858175642290b2588a85540f555d0b5f5342960469337609546c2329d312280bb0accd6c932
+DIST rubygems-3.4.19.tar.gz 15037850 BLAKE2B adf618f326fa83a8eb7febb9872a71f2bf78048dfa7c4db07343c9813ba5d858c86bcd6e54df1a559e60e458ba8d73d2a7ac82ee5e0cbde6e9d8b45c12793d4c SHA512 8d0bc225ef01d3cc5e3ad12a1bf0bbb3923349bb9b79b76a9ac58bb8dcf79666a478a871d19919adc15f1aa2599efde5d3938c61801579277117b569e7007656
+DIST rubygems-3.4.22.tar.gz 15054005 BLAKE2B 856b60bf3a2f477b6e0aeaa4522f17934a6bf8c434f0d3a69afb823801975a74294f27e0906fc940c456414fd5bf94f71809e09676b839b0123a6f40dc3cefb4 SHA512 c69a03524936eb51e6a919ee0ee614c4e0bedf5a0bbe55314a876b3277116b6e8c92e52072368704415286b673d4c4b995b81665cc73b152a12377faee289916
+DIST rubygems-3.4.3.tar.gz 15002575 BLAKE2B be8dfb7233754e0ef9147eab1c64d363c38de5a6c296087a193b801c9fa1a12d2a21d7b3b01360f53a30caa6815b3bcdf3d14ecd19ac19dfd2e88115526b5a97 SHA512 7f3907b6ab8f001bd856c2b25b71c5ec32b21b2b5fa16ba369e3108c44698712ac3f5ace430554a4b15dc0adef2d87fa41bffa03dcd01f524fe8bbd80de9807b
+DIST rubygems-3.4.6.tar.gz 15011157 BLAKE2B a06178a1d5dbd8231493dce9d075451062edaa6b4affee6892d60c727e30ef4b7ff7933baf4ae49fedaa684f9898325ed1313648dac318bd62e9c733de374926 SHA512 d1c23b534f2254ff4dec564098f7eba83462eb9348da59a84de01fc4053ef3be02b2852af4542447de89a36d835f68634606040672d2a2f987c5670b9f373fe9
+DIST rubygems-3.5.3.tar.gz 13495997 BLAKE2B 1c9e01cc15a7afb0dfeaf61d14cea43fa19844a901cf6337f542b14da608dfa016ba438807276018b372f9c6ce8a44df2ea491f08a1217bd9f3fd04cd1ec57a7 SHA512 50f6ccd9f47c6d56c20c2bc23a35f0ca0edb2d55ae9904749bf03d1181acee499cce668df6a8847a5a59b37de0efb884acf028df6b768cb7cd2f1993ca4f8db2
diff --git a/dev-ruby/rubygems/files/gentoo-defaults-3.rb b/dev-ruby/rubygems/files/gentoo-defaults-3.rb
deleted file mode 100644
index 9d499b73f89d..000000000000
--- a/dev-ruby/rubygems/files/gentoo-defaults-3.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-# Gentoo defaults for rubygems 3.x
-#
-# Gentoo policy is to install all manually installed code into
-# /usr/local and to keep /usr managed by Gentoo. This policy file
-# ensures that all manually installed gems using "gem install" are
-# installed in /usr/local. Gentoo gems are installed in /usr.
-
-# TODO: We used to manipulate the default_dir, but this no longer
-# works since this is now the base for the new "default" gems that
-# ruby 2.6 uses with irb. So default_dir should refer to the system
-# default now. rubygems also provides various hooks so we may be able
-# to use those to install gems in /usr/local by default in a less
-# intrusive way.
-module Gem
-
-  class << self
-    def portage_gems_dir
-      ConfigMap[:sitelibdir].gsub('site_ruby', 'gems')
-    end
-
-    def local_dir
-      portage_gems_dir.gsub('@GENTOO_PORTAGE_EPREFIX@/usr',
-                            '@GENTOO_PORTAGE_EPREFIX@/usr/local')
-    end
-
-    def install_dir
-      Process.euid.zero? ? local_dir : user_dir
-    end
-
-    undef :default_path
-    def default_path
-      path = []
-      path << user_dir if user_home && File.exist?(user_home)
-      path << default_dir
-      path << vendor_dir if vendor_dir && File.directory?(vendor_dir)
-      path << local_dir
-      path << portage_gems_dir
-    end
-
-    def system_config_path
-      '@GENTOO_PORTAGE_EPREFIX@/etc'
-    end
-
-    # Set Gentoo defaults for gem commands
-    begin
-      undef :operating_system_defaults
-    rescue NameError
-      # Avoid either runtime errors or redefinition warnings since
-      # this method is not present in all rubygem versions distributed
-      # with dev-lang/ruby.
-    end
-    def operating_system_defaults
-      {
-        'install' => "--install-dir #{install_dir}",
-        'uninstall' => "--install-dir #{install_dir}",
-        'update' => "--install-dir #{install_dir}"
-      }
-    end
-
-  end
-end
diff --git a/dev-ruby/rubygems/files/gentoo-defaults-4.rb b/dev-ruby/rubygems/files/gentoo-defaults-4.rb
deleted file mode 100644
index 1da07f64ddef..000000000000
--- a/dev-ruby/rubygems/files/gentoo-defaults-4.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-# Gentoo defaults for rubygems 3.x
-#
-# Gentoo policy is to install all manually installed code into
-# /usr/local and to keep /usr managed by Gentoo. This policy file
-# ensures that all manually installed gems using "gem install" are
-# installed in /usr/local. Gentoo gems are installed in /usr.
-
-# TODO: We used to manipulate the default_dir, but this no longer
-# works since this is now the base for the new "default" gems that
-# ruby 2.6 uses with irb. So default_dir should refer to the system
-# default now. rubygems also provides various hooks so we may be able
-# to use those to install gems in /usr/local by default in a less
-# intrusive way.
-module Gem
-
-  class << self
-    def portage_gems_dir
-      RbConfig::CONFIG['sitelibdir'].gsub('site_ruby', 'gems')
-    end
-
-    def local_dir
-      portage_gems_dir.gsub('@GENTOO_PORTAGE_EPREFIX@/usr',
-                            '@GENTOO_PORTAGE_EPREFIX@/usr/local')
-    end
-
-    def install_dir
-      Process.euid.zero? ? local_dir : user_dir
-    end
-
-    undef :default_path
-    def default_path
-      path = []
-      path << user_dir if user_home && File.exist?(user_home)
-      path << default_dir
-      path << vendor_dir if vendor_dir && File.directory?(vendor_dir)
-      path << local_dir
-      path << portage_gems_dir
-    end
-
-    def system_config_path
-      '@GENTOO_PORTAGE_EPREFIX@/etc'
-    end
-
-    # Set Gentoo defaults for gem commands
-    begin
-      undef :operating_system_defaults
-    rescue NameError
-      # Avoid either runtime errors or redefinition warnings since
-      # this method is not present in all rubygem versions distributed
-      # with dev-lang/ruby.
-    end
-    def operating_system_defaults
-      {
-        'install' => "--install-dir #{install_dir}",
-        'uninstall' => "--install-dir #{install_dir}",
-        'update' => "--install-dir #{install_dir}"
-      }
-    end
-
-  end
-end
diff --git a/dev-ruby/rubygems/files/gentoo-defaults.rb b/dev-ruby/rubygems/files/gentoo-defaults.rb
deleted file mode 100644
index a645f4868281..000000000000
--- a/dev-ruby/rubygems/files/gentoo-defaults.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-module Gem
-
-  class << self
-    def portage_gems_dir
-      ConfigMap[:sitelibdir].gsub('site_ruby', 'gems')
-    end
-
-    def local_dir
-      portage_gems_dir.gsub('@GENTOO_PORTAGE_EPREFIX@/usr', '@GENTOO_PORTAGE_EPREFIX@/usr/local')
-    end
- 
-    undef :default_dir
-    def default_dir
-      Process.euid == 0 ? local_dir : user_dir
-    end
-
-    undef :default_path
-    def default_path
-      [user_dir, local_dir, portage_gems_dir]
-    end
-
-    undef :default_bindir
-    def default_bindir
-      Process.euid == 0 ? "@GENTOO_PORTAGE_EPREFIX@/usr/local/bin" : File.join(user_dir, 'bin')
-    end
-
-    undef :ruby_engine
-    def ruby_engine
-      if defined? RUBY_DESCRIPTION and RUBY_DESCRIPTION =~ /Ruby Enterprise Edition/
-        "rubyee"
-      else
-        # Ruby 1.8 and Ruby 1.9.2_rc2 and later install here, and JRuby
-        # rewrites that anyway.
-        "ruby"
-      end
-    end
-
-    def system_config_path
-      "@GENTOO_PORTAGE_EPREFIX@/etc"
-    end
-  end
-end
diff --git a/dev-ruby/rubygems/metadata.xml b/dev-ruby/rubygems/metadata.xml
index 56f4e8e2ad14..77531829e324 100644
--- a/dev-ruby/rubygems/metadata.xml
+++ b/dev-ruby/rubygems/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<use>
-		<flag name="server">Install support for the rubygems server</flag>
-	</use>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <use>
+    <flag name="server">Install support for the rubygems server</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">rubygems/rubygems</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rubygems/rubygems-3.0.3.ebuild b/dev-ruby/rubygems/rubygems-3.0.3.ebuild
deleted file mode 100644
index ab3a8fd1f2eb..000000000000
--- a/dev-ruby/rubygems/rubygems-3.0.3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="https://rubygems.org/"
-LICENSE="GPL-2 || ( Ruby MIT )"
-
-SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="server test"
-RESTRICT="!test? ( test )"
-
-PDEPEND="server? ( =dev-ruby/builder-3* )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/json
-		dev-ruby/minitest:5
-		dev-ruby/rdoc
-	)"
-
-all_ruby_prepare() {
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	sed -i -e '/assert_self_install_permissions/,/^  end/ s/^.*RUBY_INSTALL_NAME.*//' test/rubygems/test_gem.rb || die
-
-	# Skip tests for default gems that all fail
-	sed -i -e '/test_default_gems_use_full_paths/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	sed -i -e '/test_execute_ignore_default_gem_verbose/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
-	sed -i -e '/test_execute_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
-	sed -i -e '/test_execute_\(default_details\|show_default_gems\)/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
-	sed -i -e '/test_execute_all/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
-	sed -i -e '/\(test_default_gem\|test_check_executable_overwrite\|test_require_works_after_cleanup\)/,/^  end/ s:^:#:' \
-		test/rubygems/test_{gem_installer,require}.rb || die
-	sed -i -e '/test_\(load_default_gem\|default_spec_stub\|self_stubs\)/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
-	sed -i -e '/test_uninstall_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
-	rm -f test/rubygems/test_gem_indexer.rb || die
-	sed -i -e '/test_\(require_when_gem_defined\|realworld_default_gem\)/,/^  end/ s:^:#:' test/rubygems/test_require.rb || die
-	rm -f test/rubygems/test_gem_commands_setup_command.rb || die
-
-	# Avoid tests playing tricks with ruby engine that don't seem to
-	# work for us.
-	rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
-
-	# Avoid test requiring network access
-	sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
-
-	# Avoid test requiring file system permission changes
-	sed -i -e '/test_traverse_parents_does_not_crash_on_permissions_error/,/^  end/ s:^:#:' test/rubygems/test_gem_util.rb || die
-
-	# Avoid uninvestigated test failure in favor of security release
-	sed -i -e '/test_self_install_permissions_with_format_executable/askip "uninvestigated failure"' test/rubygems/test_gem.rb || die
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
-			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
-
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
-}
-
-all_ruby_install() {
-	dodoc History.txt README.md
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(23|24|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-3.0.9.ebuild b/dev-ruby/rubygems/rubygems-3.0.9.ebuild
deleted file mode 100644
index 2293e7bb26e6..000000000000
--- a/dev-ruby/rubygems/rubygems-3.0.9.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="https://rubygems.org/"
-LICENSE="GPL-2 || ( Ruby MIT )"
-
-SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="server test"
-RESTRICT="!test? ( test )"
-
-PDEPEND="server? ( =dev-ruby/builder-3* )"
-
-ruby_add_depend "virtual/ruby-ssl"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/json
-		dev-ruby/minitest:5
-		dev-ruby/rdoc
-	)"
-
-all_ruby_prepare() {
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults-3.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	sed -i -e '/test_env_shebang_flag/askip' test/rubygems/test_gem_commands_setup_command.rb || die
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
-			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
-
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
-}
-
-all_ruby_install() {
-	dodoc History.txt README.md
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(23|24|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-3.1.6.ebuild b/dev-ruby/rubygems/rubygems-3.1.6.ebuild
deleted file mode 100644
index 2080e379d03b..000000000000
--- a/dev-ruby/rubygems/rubygems-3.1.6.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="https://rubygems.org/"
-LICENSE="GPL-2 || ( Ruby MIT )"
-
-SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="server test"
-RESTRICT="!test? ( test )"
-
-PDEPEND="server? ( =dev-ruby/builder-3* )"
-
-ruby_add_depend "virtual/ruby-ssl"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/json
-		dev-ruby/minitest:5
-		dev-ruby/rake
-		dev-ruby/rdoc
-	)"
-
-all_ruby_prepare() {
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults-4.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	# Avoid test that won't work as json is also installed as plain ruby code
-	sed -i -e '/test_realworld_default_gem/askip "gentoo"' test/rubygems/test_require.rb || die
-
-	# Update manifest after changing files to avoid a test failure
-	if use test; then
-		rake update_manifest || die
-	fi
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
-			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
-
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
-}
-
-all_ruby_install() {
-	dodoc History.txt README.md
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(25|26|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-3.2.14.ebuild b/dev-ruby/rubygems/rubygems-3.2.14.ebuild
deleted file mode 100644
index 647e0f26cabb..000000000000
--- a/dev-ruby/rubygems/rubygems-3.2.14.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="https://rubygems.org/"
-LICENSE="GPL-2 || ( Ruby MIT )"
-
-SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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="server test"
-RESTRICT="!test? ( test )"
-
-PDEPEND="server? ( =dev-ruby/builder-3* )"
-
-ruby_add_depend "virtual/ruby-ssl"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/json
-		dev-ruby/minitest:5
-		dev-ruby/rake
-		dev-ruby/rdoc
-		dev-ruby/webrick
-	)"
-
-all_ruby_prepare() {
-	# Remove unpackaged automatiek from Rakefile which stops it from working
-	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults-4.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	# Avoid test that won't work as json is also installed as plain ruby code
-	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/askip "gentoo"' test/rubygems/test_require.rb || die
-
-	# Avoid test that requires additional utility scripts
-	rm -f test/test_changelog_generator.rb || die
-
-	# Update manifest after changing files to avoid a test failure
-	if use test; then
-		rake update_manifest || die
-	fi
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
-			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
-
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
-}
-
-all_ruby_install() {
-	dodoc CHANGELOG.md README.md
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(25|26|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-3.2.22.ebuild b/dev-ruby/rubygems/rubygems-3.2.22.ebuild
deleted file mode 100644
index 1f5750cf81f4..000000000000
--- a/dev-ruby/rubygems/rubygems-3.2.22.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="https://rubygems.org/"
-LICENSE="GPL-2 || ( Ruby MIT )"
-
-SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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="server test"
-RESTRICT="!test? ( test )"
-
-PDEPEND="server? ( =dev-ruby/builder-3* )"
-
-ruby_add_depend "virtual/ruby-ssl"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/json
-		dev-ruby/minitest:5
-		dev-ruby/rake
-		dev-ruby/rdoc
-		dev-ruby/webrick
-	)"
-
-all_ruby_prepare() {
-	# Remove unpackaged automatiek from Rakefile which stops it from working
-	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults-4.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	# Avoid test that won't work as json is also installed as plain ruby code
-	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die
-
-	# Avoid test that requires additional utility scripts
-	rm -f test/test_changelog_generator.rb || die
-
-	# Update manifest after changing files to avoid a test failure
-	if use test; then
-		rake update_manifest || die
-	fi
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
-			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
-
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
-}
-
-all_ruby_install() {
-	dodoc CHANGELOG.md README.md
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(25|26|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-3.2.33.ebuild b/dev-ruby/rubygems/rubygems-3.2.33.ebuild
deleted file mode 100644
index 752c178a4872..000000000000
--- a/dev-ruby/rubygems/rubygems-3.2.33.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="https://rubygems.org/"
-LICENSE="GPL-2 || ( Ruby MIT )"
-
-SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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="server test"
-RESTRICT="!test? ( test )"
-
-PDEPEND="server? ( =dev-ruby/builder-3* )"
-
-ruby_add_depend "virtual/ruby-ssl"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/json
-		dev-ruby/minitest:5
-		dev-ruby/rake
-		dev-ruby/rdoc
-		dev-ruby/webrick
-	)"
-
-all_ruby_prepare() {
-	# Remove unpackaged automatiek from Rakefile which stops it from working
-	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	sed -i -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' test/rubygems/test_gem_path_support.rb || die
-	# Avoid test that won't work as json is also installed as plain ruby code
-	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die
-
-	# Avoid test that requires additional utility scripts
-	rm -f test/test_changelog_generator.rb || die
-
-	# Update manifest after changing files to avoid a test failure
-	if use test; then
-		rake update_manifest || die
-	fi
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
-			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
-
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
-}
-
-all_ruby_install() {
-	dodoc CHANGELOG.md README.md
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(25|26|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-3.3.26.ebuild b/dev-ruby/rubygems/rubygems-3.3.26.ebuild
new file mode 100644
index 000000000000..e222c4a05186
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.3.26.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		dev-ruby/minitest:5
+		dev-ruby/rake
+		dev-ruby/rdoc
+		dev-ruby/webrick
+	)"
+
+all_ruby_prepare() {
+	# Remove unpackaged automatiek from Rakefile which stops it from working
+	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -i -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' test/rubygems/test_gem_path_support.rb || die
+	# Avoid test that won't work as json is also installed as plain ruby code
+	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die
+
+	# Avoid test that requires additional utility scripts
+	rm -f test/test_changelog_generator.rb || die
+
+	# Avoid tests that require a network connection (for crates.io)
+	rm -f test/rubygems/test_gem_ext_cargo_builder.rb || die
+
+	# Update manifest after changing files to avoid a test failure
+	if use test; then
+		rake update_manifest || die
+	fi
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+	dodoc CHANGELOG.md README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(30|31|...)"
+	ewarn
+}
diff --git a/dev-ruby/rubygems/rubygems-3.3.8.ebuild b/dev-ruby/rubygems/rubygems-3.3.8.ebuild
deleted file mode 100644
index e088e73f7852..000000000000
--- a/dev-ruby/rubygems/rubygems-3.3.8.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="https://rubygems.org/"
-LICENSE="GPL-2 || ( Ruby MIT )"
-
-SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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="server test"
-RESTRICT="!test? ( test )"
-
-PDEPEND="server? ( =dev-ruby/builder-3* )"
-
-ruby_add_depend "virtual/ruby-ssl"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/json
-		dev-ruby/minitest:5
-		dev-ruby/rake
-		dev-ruby/rdoc
-		dev-ruby/webrick
-	)"
-
-all_ruby_prepare() {
-	# Remove unpackaged automatiek from Rakefile which stops it from working
-	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	sed -i -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' test/rubygems/test_gem_path_support.rb || die
-	# Avoid test that won't work as json is also installed as plain ruby code
-	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die
-
-	# Avoid test that requires additional utility scripts
-	rm -f test/test_changelog_generator.rb || die
-
-	# Update manifest after changing files to avoid a test failure
-	if use test; then
-		rake update_manifest || die
-	fi
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
-			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
-
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
-}
-
-all_ruby_install() {
-	dodoc CHANGELOG.md README.md
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(25|26|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-3.4.1.ebuild b/dev-ruby/rubygems/rubygems-3.4.1.ebuild
new file mode 100644
index 000000000000..e81974f2fa11
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.4.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		dev-ruby/minitest:5
+		dev-ruby/rake
+		dev-ruby/rdoc
+		dev-ruby/webrick
+	)"
+
+all_ruby_prepare() {
+	# Remove unpackaged automatiek from Rakefile which stops it from working
+	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -i -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' test/rubygems/test_gem_path_support.rb || die
+	# Avoid test that won't work as json is also installed as plain ruby code
+	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die
+
+	# Avoid test that requires additional utility scripts
+	rm -f test/test_changelog_generator.rb || die
+
+	# Avoid tests that require a network connection (for crates.io)
+	rm -f test/rubygems/test_gem_ext_cargo_builder.rb || die
+
+	# Update manifest after changing files to avoid a test failure
+	if use test; then
+		rake update_manifest || die
+	fi
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+	dodoc CHANGELOG.md README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(30|31|...)"
+	ewarn
+}
diff --git a/dev-ruby/rubygems/rubygems-3.4.15.ebuild b/dev-ruby/rubygems/rubygems-3.4.15.ebuild
new file mode 100644
index 000000000000..29a8044cef95
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.4.15.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		dev-ruby/minitest:5
+		dev-ruby/rake
+		dev-ruby/rdoc
+		dev-ruby/webrick
+	)"
+
+all_ruby_prepare() {
+	# Remove unpackaged automatiek from Rakefile which stops it from working
+	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' \
+		-i test/rubygems/test_gem_path_support.rb || die
+	# Avoid test that won't work as json is also installed as plain ruby code
+	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die
+
+	# Avoid test that requires additional utility scripts
+	rm -f test/test_changelog_generator.rb || die
+
+	# Avoid tests that require a network connection (for crates.io or other downloads)
+	rm -f test/rubygems/test_gem_ext_cargo_builder.rb || die
+	sed -e '/test_gem_exec_gem_uninstall/aomit "requires network"' \
+		-i test/rubygems/test_gem_commands_exec_command.rb || die
+
+	# Update manifest after changing files to avoid a test failure
+	if use test; then
+		rake update_manifest || die
+	fi
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+	dodoc CHANGELOG.md README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(30|31|...)"
+	ewarn
+}
diff --git a/dev-ruby/rubygems/rubygems-3.4.19.ebuild b/dev-ruby/rubygems/rubygems-3.4.19.ebuild
new file mode 100644
index 000000000000..781d823d66ce
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.4.19.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		dev-ruby/minitest:5
+		dev-ruby/rake
+		dev-ruby/rdoc
+		dev-ruby/webrick
+	)"
+
+all_ruby_prepare() {
+	# Remove unpackaged automatiek from Rakefile which stops it from working
+	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' \
+		-i test/rubygems/test_gem_path_support.rb || die
+	# Avoid test that won't work as json is also installed as plain ruby code
+	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die
+
+	# Avoid test that requires additional utility scripts
+	rm -f test/test_changelog_generator.rb || die
+
+	# Avoid tests that require a network connection (for crates.io or other downloads)
+	rm -f test/rubygems/test_gem_ext_cargo_builder.rb || die
+	sed -e '/test_gem_exec_gem_uninstall/aomit "requires network"' \
+		-i test/rubygems/test_gem_commands_exec_command.rb || die
+
+	# Update manifest after changing files to avoid a test failure
+	if use test; then
+		rake update_manifest || die
+	fi
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' exe/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { require _1 }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+	newbin exe/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+	dodoc CHANGELOG.md README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(30|31|...)"
+	ewarn
+}
diff --git a/dev-ruby/rubygems/rubygems-3.4.22.ebuild b/dev-ruby/rubygems/rubygems-3.4.22.ebuild
new file mode 100644
index 000000000000..781d823d66ce
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.4.22.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		dev-ruby/minitest:5
+		dev-ruby/rake
+		dev-ruby/rdoc
+		dev-ruby/webrick
+	)"
+
+all_ruby_prepare() {
+	# Remove unpackaged automatiek from Rakefile which stops it from working
+	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' \
+		-i test/rubygems/test_gem_path_support.rb || die
+	# Avoid test that won't work as json is also installed as plain ruby code
+	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die
+
+	# Avoid test that requires additional utility scripts
+	rm -f test/test_changelog_generator.rb || die
+
+	# Avoid tests that require a network connection (for crates.io or other downloads)
+	rm -f test/rubygems/test_gem_ext_cargo_builder.rb || die
+	sed -e '/test_gem_exec_gem_uninstall/aomit "requires network"' \
+		-i test/rubygems/test_gem_commands_exec_command.rb || die
+
+	# Update manifest after changing files to avoid a test failure
+	if use test; then
+		rake update_manifest || die
+	fi
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' exe/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { require _1 }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+	newbin exe/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+	dodoc CHANGELOG.md README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(30|31|...)"
+	ewarn
+}
diff --git a/dev-ruby/rubygems/rubygems-3.4.3.ebuild b/dev-ruby/rubygems/rubygems-3.4.3.ebuild
new file mode 100644
index 000000000000..e81974f2fa11
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.4.3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		dev-ruby/minitest:5
+		dev-ruby/rake
+		dev-ruby/rdoc
+		dev-ruby/webrick
+	)"
+
+all_ruby_prepare() {
+	# Remove unpackaged automatiek from Rakefile which stops it from working
+	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -i -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' test/rubygems/test_gem_path_support.rb || die
+	# Avoid test that won't work as json is also installed as plain ruby code
+	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die
+
+	# Avoid test that requires additional utility scripts
+	rm -f test/test_changelog_generator.rb || die
+
+	# Avoid tests that require a network connection (for crates.io)
+	rm -f test/rubygems/test_gem_ext_cargo_builder.rb || die
+
+	# Update manifest after changing files to avoid a test failure
+	if use test; then
+		rake update_manifest || die
+	fi
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+	dodoc CHANGELOG.md README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(30|31|...)"
+	ewarn
+}
diff --git a/dev-ruby/rubygems/rubygems-3.4.6.ebuild b/dev-ruby/rubygems/rubygems-3.4.6.ebuild
new file mode 100644
index 000000000000..07516f718180
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.4.6.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		dev-ruby/minitest:5
+		dev-ruby/rake
+		dev-ruby/rdoc
+		dev-ruby/webrick
+	)"
+
+all_ruby_prepare() {
+	# Remove unpackaged automatiek from Rakefile which stops it from working
+	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -i -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' test/rubygems/test_gem_path_support.rb || die
+	# Avoid test that won't work as json is also installed as plain ruby code
+	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die
+
+	# Avoid test that requires additional utility scripts
+	rm -f test/test_changelog_generator.rb || die
+
+	# Avoid tests that require a network connection (for crates.io)
+	rm -f test/rubygems/test_gem_ext_cargo_builder.rb || die
+
+	# Update manifest after changing files to avoid a test failure
+	if use test; then
+		rake update_manifest || die
+	fi
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+	dodoc CHANGELOG.md README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(30|31|...)"
+	ewarn
+}
diff --git a/dev-ruby/rubygems/rubygems-3.5.3.ebuild b/dev-ruby/rubygems/rubygems-3.5.3.ebuild
new file mode 100644
index 000000000000..d1f12abbe3fc
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.5.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		dev-ruby/minitest:5
+		dev-ruby/rake
+		dev-ruby/rdoc
+		dev-ruby/webrick
+	)"
+
+all_ruby_prepare() {
+	# Remove unpackaged automatiek from Rakefile which stops it from working
+	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' \
+		-i test/rubygems/test_gem_path_support.rb || die
+	# Avoid test that won't work as json is also installed as plain ruby code
+	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die
+
+	# Avoid test that requires additional utility scripts
+	rm -f test/test_changelog_generator.rb || die
+
+	# Avoid tests that require a network connection (for crates.io or other downloads)
+	rm -f test/rubygems/test_gem_ext_cargo_builder.rb || die
+	sed -e '/test_gem_exec_gem_uninstall/aomit "requires network"' \
+		-i test/rubygems/test_gem_commands_exec_command.rb || die
+
+	# Update manifest after changing files to avoid a test failure
+	if use test; then
+		rake update_manifest || die
+	fi
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' exe/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { require _1 }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+	newbin exe/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+	dodoc CHANGELOG.md README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(30|31|...)"
+	ewarn
+}
diff --git a/dev-ruby/rubyntlm/metadata.xml b/dev-ruby/rubyntlm/metadata.xml
index 4855e30bd2ca..0ff260b98458 100644
--- a/dev-ruby/rubyntlm/metadata.xml
+++ b/dev-ruby/rubyntlm/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">winrb/rubyntlm</remote-id>
-    <remote-id type="rubygems">rubyntlm</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">winrb/rubyntlm</remote-id>
+		<remote-id type="rubygems">rubyntlm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rubyntlm/rubyntlm-0.6.3-r1.ebuild b/dev-ruby/rubyntlm/rubyntlm-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..fcb483e3a3ce
--- /dev/null
+++ b/dev-ruby/rubyntlm/rubyntlm-0.6.3-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby/NTLM provides message creator and parser for the NTLM authentication"
+HOMEPAGE="https://github.com/winrb/rubyntlm"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc64 ~x86"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rubyntlm/rubyntlm-0.6.3.ebuild b/dev-ruby/rubyntlm/rubyntlm-0.6.3.ebuild
deleted file mode 100644
index abb1dd3757dc..000000000000
--- a/dev-ruby/rubyntlm/rubyntlm-0.6.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby/NTLM provides message creator and parser for the NTLM authentication"
-HOMEPAGE="https://github.com/winrb/rubyntlm"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rubypants/Manifest b/dev-ruby/rubypants/Manifest
index 2978d0a3801c..ccd404aaf939 100644
--- a/dev-ruby/rubypants/Manifest
+++ b/dev-ruby/rubypants/Manifest
@@ -1,2 +1 @@
-DIST rubypants-0.7.0.gem 13824 BLAKE2B c132b3c60390b712c08ec54b10a14255e21d9622399b9ddba8d2359915411c604052569e5713fdb4b1a3fefcc3416f4d5af16baca19063a0b79203838b8f3066 SHA512 cacd05e0cc87389b5513c83fe085db39202c2789b882b564caaded6b84b1ecb1acbde8232462dadf501c68c1c881ee7b7f4e640feec47c9c0f7a08758b5f5724
 DIST rubypants-0.7.1.gem 14336 BLAKE2B 6a2fd50f07e6eca0ee76a3f653fd378b9c389349a23bfa98cbf1be42e46a58cb76769e4f653bf83d72faa318be81b60920d0dbd900053f85489fe2c6a1a69a23 SHA512 48f04e621cefecb9911ee346ea9b4f185ee52a603f9a307d5424d314d3be88d0efda959a5654b5f532dfdd5af9ce2c0c6baceca4e09ad6d1471bf31c990e79bb
diff --git a/dev-ruby/rubypants/rubypants-0.7.0.ebuild b/dev-ruby/rubypants/rubypants-0.7.0.ebuild
deleted file mode 100644
index a97b04f5ff82..000000000000
--- a/dev-ruby/rubypants/rubypants-0.7.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby port of the SmartyPants PHP library"
-HOMEPAGE="http://chneukirchen.org/repos/rubypants/README"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/ecov/I s:^:#:' test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -I. test/rubypants_test.rb || die "tests failed"
-}
diff --git a/dev-ruby/rubypants/rubypants-0.7.1-r1.ebuild b/dev-ruby/rubypants/rubypants-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..d2658c4e89d5
--- /dev/null
+++ b/dev-ruby/rubypants/rubypants-0.7.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby port of the SmartyPants PHP library"
+HOMEPAGE="https://leahneukirchen.org/repos/rubypants/README"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/ecov/I s:^:#:' test/helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -I. test/rubypants_test.rb || die "tests failed"
+}
diff --git a/dev-ruby/rubypants/rubypants-0.7.1.ebuild b/dev-ruby/rubypants/rubypants-0.7.1.ebuild
deleted file mode 100644
index 817933cec0d3..000000000000
--- a/dev-ruby/rubypants/rubypants-0.7.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby port of the SmartyPants PHP library"
-HOMEPAGE="https://leahneukirchen.org/repos/rubypants/README"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/ecov/I s:^:#:' test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -I. test/rubypants_test.rb || die "tests failed"
-}
diff --git a/dev-ruby/rubytest-cli/metadata.xml b/dev-ruby/rubytest-cli/metadata.xml
index 658c72b1920d..f3c13f7e202f 100644
--- a/dev-ruby/rubytest-cli/metadata.xml
+++ b/dev-ruby/rubytest-cli/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">rubyworks/lemon</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rubytest-cli/rubytest-cli-0.2.0-r1.ebuild b/dev-ruby/rubytest-cli/rubytest-cli-0.2.0-r1.ebuild
index cca58fc37ae5..bf055dceaded 100644
--- a/dev-ruby/rubytest-cli/rubytest-cli-0.2.0-r1.ebuild
+++ b/dev-ruby/rubytest-cli/rubytest-cli-0.2.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="yard"
diff --git a/dev-ruby/rubytest/metadata.xml b/dev-ruby/rubytest/metadata.xml
index 658c72b1920d..f0c008fc4fbd 100644
--- a/dev-ruby/rubytest/metadata.xml
+++ b/dev-ruby/rubytest/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">rubyworks/rubytest</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rubytest/rubytest-0.8.1-r1.ebuild b/dev-ruby/rubytest/rubytest-0.8.1-r1.ebuild
index 84956108303e..97495fe21dd3 100644
--- a/dev-ruby/rubytest/rubytest-0.8.1-r1.ebuild
+++ b/dev-ruby/rubytest/rubytest-0.8.1-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="yard"
diff --git a/dev-ruby/rubytter/metadata.xml b/dev-ruby/rubytter/metadata.xml
index e053409e4db0..8ffec225e070 100644
--- a/dev-ruby/rubytter/metadata.xml
+++ b/dev-ruby/rubytter/metadata.xml
@@ -9,4 +9,7 @@
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">jugyo/rubytter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rubytter/rubytter-1.5.1-r2.ebuild b/dev-ruby/rubytter/rubytter-1.5.1-r2.ebuild
deleted file mode 100644
index 7f8529cad3d6..000000000000
--- a/dev-ruby/rubytter/rubytter-1.5.1-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc examples/*"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rubytter is a simple twitter library"
-HOMEPAGE="https://wiki.github.com/jugyo/rubytter"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/json-1.1.3:* >=dev-ruby/oauth-0.3.6"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e '/check_dependencies/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/rubytter/rubytter-1.5.1-r3.ebuild b/dev-ruby/rubytter/rubytter-1.5.1-r3.ebuild
new file mode 100644
index 000000000000..30ab34eae74f
--- /dev/null
+++ b/dev-ruby/rubytter/rubytter-1.5.1-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc examples/*"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rubytter is a simple twitter library"
+HOMEPAGE="https://github.com/jugyo/rubytter"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/json-1.1.3:* >=dev-ruby/oauth-0.3.6"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/check_dependencies/ s:^:#:' Rakefile || die
+
+	# Make specs work with rspec 3
+	sed -i -e 's/stub!/stub/ ; 250 s/pending/skip/' spec/rubytter_spec.rb || die
+
+	# Make specs work with ruby30
+	sed -i -e '27i{' -e '30i}' spec/rubytter/oauth_spec.rb || die
+}
diff --git a/dev-ruby/rubyzip/Manifest b/dev-ruby/rubyzip/Manifest
index 70718105c8b5..218936ed3a05 100644
--- a/dev-ruby/rubyzip/Manifest
+++ b/dev-ruby/rubyzip/Manifest
@@ -1,2 +1 @@
-DIST rubyzip-1.3.0-git.tgz 156664 BLAKE2B 2bde6515ddc71da32fc2d2819770857f7dde8605718c868f73edb8493f7db5ce66a7115d09933ffc6a06ac0979ab07e8cbdcd47984707688b7a5db43394847bc SHA512 5a764725d1f6a797f710581dbe07bd7971f0a8a5b0ffb7fc9b1a627c32e6e342ff54e2ad39e74e294dd283b8cbf358ed2dc40857f6f656007adff80d4769b9f4
 DIST rubyzip-2.3.2-git.tgz 225923 BLAKE2B ed901326cd0f79c8be004d9c14b32d7e67e90ab4d2d5b67dc64559fd4691dfb63cfa1ee18363a7cf864bd62559f1bc2fae71fc25ad1c727d7cc01f94d1ec62ee SHA512 6c64e53c1f5ca530abfa22baf388f87c8cf098d81cc9c639f20903e5193cf26243fbf861ac12002ae954f026e04168d8a55beeaf3ac5542bd0618ca85a5c90de
diff --git a/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild b/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
deleted file mode 100644
index 20c157d72842..000000000000
--- a/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md TODO"
-
-RUBY_FAKEGEM_GEMSPEC="rubyzip.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby library for reading and writing zip files"
-HOMEPAGE="https://github.com/rubyzip/rubyzip"
-# Tests are not included in the gem.
-SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="Ruby"
-SLOT="1"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${DEPEND} test? ( app-arch/zip )"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
-
-all_ruby_prepare() {
-	# Avoid dependencies on simplecov and coveralls
-	sed -i -e '/simplecov/ s:^:#:' test/test_helper.rb || die
-
-	# Avoid dependency on bundler
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-
-	# Fix hardcoded path to /tmp
-	sed -i -e 's:/tmp/:'${T}'/:g' test/entry_test.rb || die
-
-	# Add missing requires
-	sed -i -e '1irequire "forwardable"; require "pathname"' test/input_stream_test.rb || die
-
-	# Fix broken test that uses native endian
-	sed -i -e '/pack/ s/LLS/VVv/' test/file_extract_test.rb || die
-}
diff --git a/dev-ruby/rubyzip/rubyzip-2.3.2-r1.ebuild b/dev-ruby/rubyzip/rubyzip-2.3.2-r1.ebuild
index c44bdc3a4f9b..54f13b3b2f7f 100644
--- a/dev-ruby/rubyzip/rubyzip-2.3.2-r1.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-2.3.2-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md TODO"
@@ -19,9 +19,9 @@ HOMEPAGE="https://github.com/rubyzip/rubyzip"
 # Tests are not included in the gem.
 SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-LICENSE="Ruby"
+LICENSE="Ruby-BSD"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 RDEPEND=""
@@ -44,7 +44,7 @@ all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#: ; /rubocop/I s:^:#:' Rakefile || die
 
 	# Fix hardcoded path to /tmp
-	sed -i -e 's:/tmp/:'${T}'/:g' test/entry_test.rb || die
+	sed -i -e "s:/tmp/:${T}/:g" test/entry_test.rb || die
 
 	# Add missing requires
 	sed -i -e '1irequire "forwardable"; require "pathname"' test/input_stream_test.rb || die
diff --git a/dev-ruby/safe_yaml/Manifest b/dev-ruby/safe_yaml/Manifest
deleted file mode 100644
index ca8a9f884fbf..000000000000
--- a/dev-ruby/safe_yaml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST safe_yaml-1.0.5.gem 30720 BLAKE2B affbf5331cf290c3e7932f53da9b0f488730ae9138f0b28eb1e8e0323c7056635ed73bcadebd52f725895030a153dab13e243d997e84004f5bfac82e82dcebe2 SHA512 d9c8d9c28c3c8708f97cb0545f58152af81056f5e79147424dd7bf625f8e533440d1ed41d6abe2faf84578754823a1215ba28772c2e8593bfcfc397d647187b9
diff --git a/dev-ruby/safe_yaml/metadata.xml b/dev-ruby/safe_yaml/metadata.xml
deleted file mode 100644
index 658c72b1920d..000000000000
--- a/dev-ruby/safe_yaml/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild b/dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild
deleted file mode 100644
index 8be3fdee610c..000000000000
--- a/dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parse YAML safely, alternative implementation of YAML.load"
-HOMEPAGE="https://dtao.github.com/safe_yaml"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/hashie
-	dev-ruby/heredoc_unindent
-	dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/local timezone/askip "timezone"' spec/transform/to_date_spec.rb || die
-}
-
-each_ruby_test() {
-	# Run specs with monkeypatch
-	${RUBY} -S rspec-3 spec --tag ~libraries || die
-
-	# Running specs without monkeypatch
-	${RUBY} -S rspec-3 spec --tag libraries || die
-}
diff --git a/dev-ruby/sanitize/Manifest b/dev-ruby/sanitize/Manifest
index 218c83856ed8..bce1c617f411 100644
--- a/dev-ruby/sanitize/Manifest
+++ b/dev-ruby/sanitize/Manifest
@@ -1,2 +1 @@
-DIST sanitize-5.2.3.tar.gz 1353257 BLAKE2B 8b74376e2c184e6219d089f5404cce0f0ec2acb2002d49eead0045b5771331960b6c1c47ff876aad155d822d04b282c2be6881b25d9864f68e617c2be45e6ac2 SHA512 0cb30811251fbb60a7f37307010ccdc8917ca4a5bc8c9c702767e3c00d9e68fb79d5f0fe2afed3ce74646d9195eff8060e11e0fae1ee1e9c3f5c9e05af14f111
-DIST sanitize-6.0.0.tar.gz 1353309 BLAKE2B 3056b79ee9611797cb8058f37a694f029e7609b4df8d968ccbece4ffe562c30aa55d9fafdbb9abc1ded86aa0c605fbd48546b8fbedef06272f0184c16f7e9dad SHA512 8a3ce765b6bc0ef8418af785e1fea5ae3b2a32eda82cfc21f9ea36df164c293250fd277ad8ac065757db18ea104b826fcebcbd46d5ad2ab059807e377765476d
+DIST sanitize-6.1.0.tar.gz 1352762 BLAKE2B 7bd05780437387767dc6b2779458e6422483168ec8d5ea11ddb582c1a6375d7d2f0b686e64d769124be79a285774fbc175079024474a9ccee69e3a750f30ae7d SHA512 506df1324bb767aa7409c2bc8a0a309ad5d174d313940ced37b61b0a63ec756ecf91dd4c1ba43ab2d6386f51ad2970fb0dbd8b9b919822a5d12ddce4fe0eedc7
diff --git a/dev-ruby/sanitize/sanitize-5.2.3.ebuild b/dev-ruby/sanitize/sanitize-5.2.3.ebuild
deleted file mode 100644
index 71a7a8914abf..000000000000
--- a/dev-ruby/sanitize/sanitize-5.2.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Sanitize is a whitelist-based HTML sanitizer"
-HOMEPAGE="https://github.com/rgrove/sanitize"
-SRC_URI="https://github.com/rgrove/sanitize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/crass-1.0.2 =dev-ruby/crass-1.0*
-	>=dev-ruby/nokogiri-1.8.0
-	dev-ruby/nokogumbo:2"
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-each_ruby_test() {
-	${RUBY} -Ilib test/test_sanitize.rb || die
-}
diff --git a/dev-ruby/sanitize/sanitize-6.0.0.ebuild b/dev-ruby/sanitize/sanitize-6.0.0.ebuild
deleted file mode 100644
index 2cc0a8edecfe..000000000000
--- a/dev-ruby/sanitize/sanitize-6.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Sanitize is a whitelist-based HTML sanitizer"
-HOMEPAGE="https://github.com/rgrove/sanitize"
-SRC_URI="https://github.com/rgrove/sanitize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/crass-1.0.2 =dev-ruby/crass-1.0*
-	>=dev-ruby/nokogiri-1.12.0
-"
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-each_ruby_test() {
-	${RUBY} -Ilib test/test_sanitize.rb || die
-}
diff --git a/dev-ruby/sanitize/sanitize-6.1.0.ebuild b/dev-ruby/sanitize/sanitize-6.1.0.ebuild
new file mode 100644
index 000000000000..9bbcca7f7233
--- /dev/null
+++ b/dev-ruby/sanitize/sanitize-6.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Sanitize is a whitelist-based HTML sanitizer"
+HOMEPAGE="https://github.com/rgrove/sanitize"
+SRC_URI="https://github.com/rgrove/sanitize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/crass-1.0.2 =dev-ruby/crass-1.0*
+	>=dev-ruby/nokogiri-1.12.0
+"
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_sanitize.rb || die
+}
diff --git a/dev-ruby/sass-listen/Manifest b/dev-ruby/sass-listen/Manifest
deleted file mode 100644
index 27e4fbcb81f0..000000000000
--- a/dev-ruby/sass-listen/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sass-listen-4.0.0.tar.gz 49449 BLAKE2B bb44a91a6fbdca1b6d1b8b2253efd1709fb89713631d9772ce91dab9bc701b197a6551391699f5566d3a75ae42f9958d5d6d8346de9f74b45d7b60d88cca5ee7 SHA512 799e1e70f86b4be671c3286ae860cbcec83d8a1311d67fb37956dc527e2961888094439fd8377d50c78798c494f19ddbed3a412f02e76e429dcc1717c93b7e19
diff --git a/dev-ruby/sass-listen/files/listen-3.1.5-ruby26.patch b/dev-ruby/sass-listen/files/listen-3.1.5-ruby26.patch
deleted file mode 100644
index f90ab1ed213c..000000000000
--- a/dev-ruby/sass-listen/files/listen-3.1.5-ruby26.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2908365366792ac3ba010fa32bc3be2beaed451a Mon Sep 17 00:00:00 2001
-From: Samuel Williams <samuel.williams@oriontransfer.co.nz>
-Date: Sun, 16 Dec 2018 11:32:45 +1300
-Subject: [PATCH] Use raw Pathname to fix Linux specs.
-
----
- lib/listen/adapter/linux.rb           |  2 +-
- spec/lib/listen/adapter/linux_spec.rb | 12 +-----------
- 2 files changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/spec/lib/listen/adapter/linux_spec.rb b/spec/lib/listen/adapter/linux_spec.rb
-index d77f0c0..da48319 100644
---- a/spec/lib/listen/adapter/linux_spec.rb
-+++ b/spec/lib/listen/adapter/linux_spec.rb
-@@ -10,17 +10,7 @@
-   end
- 
-   if linux?
--    let(:dir1) do
--      instance_double(
--        Pathname,
--        'dir1',
--        to_s: '/foo/dir1',
--        cleanpath: real_dir1
--      )
--    end
--
--    # just so cleanpath works in above double
--    let(:real_dir1) { instance_double(Pathname, 'dir1', to_s: '/foo/dir1') }
-+    let(:dir1) {Pathname.new("/foo/dir1")}
- 
-     let(:config) { instance_double(Listen::Adapter::Config) }
-     let(:queue) { instance_double(Queue) }
diff --git a/dev-ruby/sass-listen/metadata.xml b/dev-ruby/sass-listen/metadata.xml
deleted file mode 100644
index a8ced35735af..000000000000
--- a/dev-ruby/sass-listen/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">sass/listen</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/sass-listen/sass-listen-4.0.0-r1.ebuild b/dev-ruby/sass-listen/sass-listen-4.0.0-r1.ebuild
deleted file mode 100644
index 38ea9189f39a..000000000000
--- a/dev-ruby/sass-listen/sass-listen-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/sass/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Fork of guard/listen provides a stable API for users of the ruby Sass CLI"
-HOMEPAGE="https://github.com/guard/listen"
-RUBY_S="listen-${PV}"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86"
-IUSE="test"
-
-PATCHES=( "${FILESDIR}/listen-3.1.5-ruby26.patch" )
-
-ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.7"
-
-ruby_add_bdepend "test? ( dev-ruby/thor )"
-
-all_ruby_prepare() {
-	rm -f Gemfile || die
-	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
-	sed -i -e "/rb-fsevent/d"  lib/sass-listen/adapter/darwin.rb || die
-	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
-}
-
-each_ruby_prepare() {
-	mkdir spec/.fixtures || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	rm -rf spec/.fixtures || die
-}
diff --git a/dev-ruby/sass-rails/Manifest b/dev-ruby/sass-rails/Manifest
index d489960dce02..12f56588108f 100644
--- a/dev-ruby/sass-rails/Manifest
+++ b/dev-ruby/sass-rails/Manifest
@@ -1,2 +1 @@
-DIST sass-rails-5.0.8.tar.gz 90020 BLAKE2B 20e9e6e4701b0a14ff10f343fb94065af0110d86aab1bb4676de4806e20f8031b4cf7961002828438c3ae6be9802b3a2e4367882241e8fe745029747d31f9b04 SHA512 05d9e8d269c608723158831e215599a8482383fe79a9c3416fa8efd11bf9bae7935c5b7a1f5e8a22a85336abf4ceecc50578f0c8e51310c09b2540831959652e
 DIST sass-rails-5.1.0.tar.gz 89994 BLAKE2B dc0083af8399d2ff1210a6430d47ccaaac88b337da5cfeb61c7a4f0c6b1f55d59d896a874945a943cc322fabfb3a31d80a1a467a12d04f2c1a1f9c84cbb452a0 SHA512 894b957b6b72d340ef2eebdc721c58c2d101fd275a10265f859f17f654736b3d3542a7100db922236925af40ae090406689815a4bb4f623c5f70652685571b7e
diff --git a/dev-ruby/sass-rails/sass-rails-5.0.8.ebuild b/dev-ruby/sass-rails/sass-rails-5.0.8.ebuild
deleted file mode 100644
index f9e3ab5413f8..000000000000
--- a/dev-ruby/sass-rails/sass-rails-5.0.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official Ruby-on-Rails Integration with Sass"
-HOMEPAGE="https://github.com/rails/sass-rails"
-SRC_URI="https://github.com/rails/sass-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-
-IUSE=""
-
-# Restrict tests for now since it is hard to set up the right
-# environment with the correct ruby interpreter and Rails test
-# application.
-RESTRICT="test"
-
-#ruby_add_bdepend "test? ( dev-ruby/sfl dev-ruby/bundler )"
-
-ruby_add_rdepend ">=dev-ruby/sass-3.1:* =dev-ruby/sass-3*:*
-	>=dev-ruby/railties-5.2.0
-	>=dev-ruby/sprockets-rails-2.0:* <dev-ruby/sprockets-rails-4:*
-	>=dev-ruby/sprockets-2.8:* <dev-ruby/sprockets-4:*
-	>=dev-ruby/tilt-1.1:* <dev-ruby/tilt-3:*"
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rake test || die
-}
diff --git a/dev-ruby/sass-rails/sass-rails-5.1.0-r1.ebuild b/dev-ruby/sass-rails/sass-rails-5.1.0-r1.ebuild
new file mode 100644
index 000000000000..d593abeefec5
--- /dev/null
+++ b/dev-ruby/sass-rails/sass-rails-5.1.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Official Ruby-on-Rails Integration with Sass"
+HOMEPAGE="https://github.com/rails/sass-rails"
+SRC_URI="https://github.com/rails/sass-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+IUSE=""
+
+# Restrict tests for now since it is hard to set up the right
+# environment with the correct ruby interpreter and Rails test
+# application.
+RESTRICT="test"
+
+#ruby_add_bdepend "test? ( dev-ruby/sfl dev-ruby/bundler )"
+
+ruby_add_rdepend ">=dev-ruby/sass-3.1:* =dev-ruby/sass-3*:*
+	>=dev-ruby/railties-5.2.0
+	>=dev-ruby/sprockets-rails-2.0:* <dev-ruby/sprockets-rails-4:*
+	>=dev-ruby/sprockets-2.8:* <dev-ruby/sprockets-4:*
+	>=dev-ruby/tilt-1.1:* <dev-ruby/tilt-3:*"
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}
diff --git a/dev-ruby/sass-rails/sass-rails-5.1.0.ebuild b/dev-ruby/sass-rails/sass-rails-5.1.0.ebuild
deleted file mode 100644
index 8afabb145978..000000000000
--- a/dev-ruby/sass-rails/sass-rails-5.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official Ruby-on-Rails Integration with Sass"
-HOMEPAGE="https://github.com/rails/sass-rails"
-SRC_URI="https://github.com/rails/sass-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-
-IUSE=""
-
-# Restrict tests for now since it is hard to set up the right
-# environment with the correct ruby interpreter and Rails test
-# application.
-RESTRICT="test"
-
-#ruby_add_bdepend "test? ( dev-ruby/sfl dev-ruby/bundler )"
-
-ruby_add_rdepend ">=dev-ruby/sass-3.1:* =dev-ruby/sass-3*:*
-	>=dev-ruby/railties-5.2.0
-	>=dev-ruby/sprockets-rails-2.0:* <dev-ruby/sprockets-rails-4:*
-	>=dev-ruby/sprockets-2.8:* <dev-ruby/sprockets-4:*
-	>=dev-ruby/tilt-1.1:* <dev-ruby/tilt-3:*"
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rake test || die
-}
diff --git a/dev-ruby/sass/Manifest b/dev-ruby/sass/Manifest
index 75cdba4a8532..7faff870b0c9 100644
--- a/dev-ruby/sass/Manifest
+++ b/dev-ruby/sass/Manifest
@@ -1,3 +1 @@
-DIST sass-3.4.25.gem 352768 BLAKE2B f3c725ee75f0d5b3a30cfbfdbf5dd949fc2b6d99878039a073c3b369753609f9b202ea6f756016783b251877831d1480dad4032db8338dff453b088b219b799a SHA512 5ff4bd47857425832c6a39b963ae4465dd91d63774eb35196ec28075082ad231254babe507d7071304ddb73cdfc1168a547bf231225afaeb3b7ddd677c0bd712
-DIST sass-3.5.7.gem 320000 BLAKE2B aeae548d1005b9f420c82f4efc96b2428d3025395b49784917c298fa48228d8052f758c1f851fb6e4e8024c63d48a9880f6c2e88411cd2125e76ad291e469bc0 SHA512 a72b499cfca4862fb4bfeb5201fda788339bb57d97b467c427e9c8365b03088b886a0f3cb3a6d87b1426e1497032b8394a948eb4a2f45004be80c03070304f95
 DIST sass-3.7.4.tar.gz 401442 BLAKE2B 52abe37390282d2aead3eea6c2a049da529a5e96bac44b01ccded1e3c4d2c332d82f164da941413c0138fd3a94f59cda084d8fb724db87fc522f33dd7bc31adb SHA512 4bebb6ddc84e7f2687d9b801e6b30e897d83a46940249349d775e0139d1fca8ffd96d0976f4c35a7a0dba9ebf786883a70aff2ff002708e28b685a034634aaf2
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/metadata.xml b/dev-ruby/sass/metadata.xml
index 658c72b1920d..916c1e3cd990 100644
--- a/dev-ruby/sass/metadata.xml
+++ b/dev-ruby/sass/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">sass/ruby-sass</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/sass/sass-3.4.25-r1.ebuild b/dev-ruby/sass/sass-3.4.25-r1.ebuild
deleted file mode 100644
index b633fea8d942..000000000000
--- a/dev-ruby/sass/sass-3.4.25-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="rails init.rb VERSION VERSION_NAME"
-
-# Allow the latest slot to provide these
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, and more"
-HOMEPAGE="http://sass-lang.com/"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux"
-SLOT="$(get_version_component_range 1-2)"
-IUSE=""
-
-ruby_add_bdepend "doc? ( >=dev-ruby/yard-0.5.3 )"
-
-ruby_add_rdepend ">=dev-ruby/listen-1.3.1:1"
-
-# tests could use `less` if we had it
-
-all_ruby_prepare() {
-	rm -rf vendor/listen || die
-
-	# Don't require maruku as markdown provider but let yard decide.
-	sed -i -e '/maruku/d' .yardopts || die
-}
-
-each_ruby_test() {
-	RUBOCOP=false ${RUBY} -S rake test:ruby || die
-}
diff --git a/dev-ruby/sass/sass-3.4.25.ebuild b/dev-ruby/sass/sass-3.4.25.ebuild
deleted file mode 100644
index 660ae10c454c..000000000000
--- a/dev-ruby/sass/sass-3.4.25.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-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 versionator
-
-DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, and more"
-HOMEPAGE="http://sass-lang.com/"
-LICENSE="MIT"
-
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux"
-SLOT="$(get_version_component_range 1-2)"
-IUSE=""
-
-ruby_add_bdepend "doc? ( >=dev-ruby/yard-0.5.3 )"
-
-ruby_add_rdepend ">=dev-ruby/listen-1.3.1:1"
-
-# tests could use `less` if we had it
-
-all_ruby_prepare() {
-	rm -rf vendor/listen || die
-
-	# Don't require maruku as markdown provider but let yard decide.
-	sed -i -e '/maruku/d' .yardopts || die
-}
-
-each_ruby_test() {
-	RUBOCOP=false ${RUBY} -S rake test:ruby || die
-}
diff --git a/dev-ruby/sass/sass-3.5.7-r1.ebuild b/dev-ruby/sass/sass-3.5.7-r1.ebuild
deleted file mode 100644
index 9974c2caf1bd..000000000000
--- a/dev-ruby/sass/sass-3.5.7-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="rails init.rb VERSION VERSION_DATE VERSION_NAME"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, and more"
-HOMEPAGE="https://sass-lang.com/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-SLOT="$(ver_cut 1-2)"
-IUSE=""
-
-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-listen:4"
-
-# tests could use `less` if we had it
-
-all_ruby_prepare() {
-	# 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/sass/sass-3.5.7.ebuild b/dev-ruby/sass/sass-3.5.7.ebuild
deleted file mode 100644
index 1759626884af..000000000000
--- a/dev-ruby/sass/sass-3.5.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="rails init.rb VERSION VERSION_DATE VERSION_NAME"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, and more"
-HOMEPAGE="https://sass-lang.com/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-SLOT="$(ver_cut 1-2)"
-IUSE=""
-
-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-listen:4"
-
-# tests could use `less` if we had it
-
-all_ruby_prepare() {
-	# 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/sass/sass-3.7.4-r1.ebuild b/dev-ruby/sass/sass-3.7.4-r1.ebuild
deleted file mode 100644
index cbc5c9d39c72..000000000000
--- a/dev-ruby/sass/sass-3.7.4-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-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"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
-SLOT="$(ver_cut 1-2)"
-IUSE=""
-
-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/sass-listen:4"
-
-# tests could use `less` if we had it
-
-all_ruby_prepare() {
-	# 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/sass/sass-3.7.4-r2.ebuild b/dev-ruby/sass/sass-3.7.4-r2.ebuild
new file mode 100644
index 000000000000..06df40183f11
--- /dev/null
+++ b/dev-ruby/sass/sass-3.7.4-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+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 ~sparc x86 ~amd64-linux"
+IUSE="doc test"
+
+ruby_add_bdepend "
+	doc? ( >=dev-ruby/yard-0.5.3 )
+	test? ( dev-ruby/minitest )
+"
+
+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() {
+	# 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
+
+	# Fix minitest deprecations
+	sed -e 's/MiniTest/Minitest/' \
+		-i test/test_helper.rb test/sass/test_helper.rb test/sass/*_test.rb test/sass/{scss,util}/*_test.rb || die
+}
+
+each_ruby_test() {
+	RUBOCOP=false ${RUBY} -S rake test:ruby || die
+}
diff --git a/dev-ruby/sass/sass-3.7.4.ebuild b/dev-ruby/sass/sass-3.7.4.ebuild
deleted file mode 100644
index a690b9a849fb..000000000000
--- a/dev-ruby/sass/sass-3.7.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-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 eapi7-ver
-
-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"
-
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux"
-SLOT="$(ver_cut 1-2)"
-IUSE=""
-
-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/sass-listen:4"
-
-# tests could use `less` if we had it
-
-all_ruby_prepare() {
-	# 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/sassc-rails/files/sassc-rails-2.1.2-test-directories.patch b/dev-ruby/sassc-rails/files/sassc-rails-2.1.2-test-directories.patch
new file mode 100644
index 000000000000..dd4ae709084c
--- /dev/null
+++ b/dev-ruby/sassc-rails/files/sassc-rails-2.1.2-test-directories.patch
@@ -0,0 +1,73 @@
+From 9b653021e7a5a192758968a81b0dc81c68f298d0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Mon, 27 Feb 2023 16:38:38 +0100
+Subject: [PATCH] Run test cases in separate test directories
+
+This is in preparation to be able to run the tests in isolation, because
+recent versions of Rails does not allow multiple to calls to
+`initialize!`.
+---
+ test/sassc_rails_test.rb | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/test/sassc_rails_test.rb b/test/sassc_rails_test.rb
+index a15110d..f8c36e4 100644
+--- a/test/sassc_rails_test.rb
++++ b/test/sassc_rails_test.rb
+@@ -4,14 +4,18 @@
+ 
+ class SassRailsTest < MiniTest::Test
+   attr_reader :app
++  attr_reader :test_dir
+ 
+   def setup
+     Rails.application = nil
+ 
++    @test_dir = Dir.mktmpdir("sassc-rails")
++    FileUtils.cp_r File.join(File.dirname(__FILE__), "dummy"), test_dir
++
+     @app = Class.new(Rails::Application)
+     @app.config.active_support.deprecation = :log
+     @app.config.eager_load = false
+-    @app.config.root = File.join(File.dirname(__FILE__), "dummy")
++    @app.config.root = File.join(test_dir, "dummy")
+     @app.config.log_level = :debug
+ 
+     # reset config back to default
+@@ -30,8 +34,7 @@ def setup
+   end
+ 
+   def teardown
+-    directory = "#{Rails.root}/tmp"
+-    FileUtils.remove_dir(directory) if File.directory?(directory)
++    FileUtils.remove_dir(test_dir) if File.directory?(test_dir)
+   end
+ 
+   def render_asset(asset)
+@@ -169,7 +172,7 @@ def test_line_comments_active_in_dev
+ 
+     css_output = render_asset("css_scss_handler.css")
+     assert_match %r{/* line 1}, css_output
+-    assert_match %r{.+test/dummy/app/assets/stylesheets/css_scss_handler.css.scss}, css_output
++    assert_match %r{.+#{test_dir}/dummy/app/assets/stylesheets/css_scss_handler.css.scss}, css_output
+   end
+ 
+   def test_context_is_being_passed_to_erb_render
+@@ -287,7 +290,7 @@ def test_globbed_imports_work_when_globbed_file_is_changed
+     begin
+       initialize!
+ 
+-      new_file = File.join(File.dirname(__FILE__), 'dummy', 'app', 'assets', 'stylesheets', 'globbed', 'new_glob.scss')
++      new_file = File.join(test_dir, 'dummy', 'app', 'assets', 'stylesheets', 'globbed', 'new_glob.scss')
+ 
+       File.open(new_file, 'w') do |file|
+         file.puts '.new-file-test { color: #000; }'
+@@ -314,7 +317,7 @@ def test_globbed_imports_work_when_globbed_file_is_added
+ 
+       css_output = render_asset("glob_test.css")
+       refute_match /changed-file-test/, css_output
+-      new_file = File.join(File.dirname(__FILE__), 'dummy', 'app', 'assets', 'stylesheets', 'globbed', 'new_glob.scss')
++      new_file = File.join(test_dir, 'dummy', 'app', 'assets', 'stylesheets', 'globbed', 'new_glob.scss')
+ 
+       File.open(new_file, 'w') do |file|
+         file.puts '.changed-file-test { color: #000; }'
diff --git a/dev-ruby/sassc-rails/files/sassc-rails-2.1.2-test-isolation.patch b/dev-ruby/sassc-rails/files/sassc-rails-2.1.2-test-isolation.patch
new file mode 100644
index 000000000000..afd2274fe0a0
--- /dev/null
+++ b/dev-ruby/sassc-rails/files/sassc-rails-2.1.2-test-isolation.patch
@@ -0,0 +1,90 @@
+From d2f47f3f7d6ea382a45b87042dfebde7dfe57b9a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Mon, 27 Feb 2023 16:43:07 +0100
+Subject: [PATCH] Run the test cases in isolation
+
+This is to prevent test errors in recent versions of Rails such as:
+
+~~~
+SassRailsTest#test_setup_works:
+FrozenError: can't modify frozen Array: []
+    railties (7.0.4.2) lib/rails/engine.rb:574:in `unshift'
+    railties (7.0.4.2) lib/rails/engine.rb:574:in `block in <class:Engine>'
+    railties (7.0.4.2) lib/rails/initializable.rb:32:in `instance_exec'
+    railties (7.0.4.2) lib/rails/initializable.rb:32:in `run'
+    railties (7.0.4.2) lib/rails/initializable.rb:61:in `block in run_initializers'
+    usr/share/ruby/tsort.rb:228:in `block in tsort_each'
+    usr/share/ruby/tsort.rb:350:in `block (2 levels) in each_strongly_connected_component'
+    usr/share/ruby/tsort.rb:422:in `block (2 levels) in each_strongly_connected_component_from'
+    usr/share/ruby/tsort.rb:422:in `block (2 levels) in each_strongly_connected_component_from'
+    usr/share/ruby/tsort.rb:431:in `each_strongly_connected_component_from'
+    usr/share/ruby/tsort.rb:421:in `block in each_strongly_connected_component_from'
+    railties (7.0.4.2) lib/rails/initializable.rb:50:in `each'
+    railties (7.0.4.2) lib/rails/initializable.rb:50:in `tsort_each_child'
+    usr/share/ruby/tsort.rb:415:in `call'
+    usr/share/ruby/tsort.rb:415:in `each_strongly_connected_component_from'
+    usr/share/ruby/tsort.rb:421:in `block in each_strongly_connected_component_from'
+    railties (7.0.4.2) lib/rails/initializable.rb:50:in `each'
+    railties (7.0.4.2) lib/rails/initializable.rb:50:in `tsort_each_child'
+    usr/share/ruby/tsort.rb:415:in `call'
+    usr/share/ruby/tsort.rb:415:in `each_strongly_connected_component_from'
+    usr/share/ruby/tsort.rb:349:in `block in each_strongly_connected_component'
+    usr/share/ruby/tsort.rb:347:in `each'
+    usr/share/ruby/tsort.rb:347:in `call'
+    usr/share/ruby/tsort.rb:347:in `each_strongly_connected_component'
+    usr/share/ruby/tsort.rb:226:in `tsort_each'
+    usr/share/ruby/tsort.rb:205:in `tsort_each'
+    railties (7.0.4.2) lib/rails/initializable.rb:60:in `run_initializers'
+    railties (7.0.4.2) lib/rails/application.rb:372:in `initialize!'
+    railties (7.0.4.2) lib/rails/railtie.rb:226:in `public_send'
+    railties (7.0.4.2) lib/rails/railtie.rb:226:in `method_missing'
+    builddir/build/BUILD/sassc-rails-2.1.2/usr/share/gems/gems/sassc-rails-2.1.2/test/sassc_rails_test.rb:48:in `initialize_dev!'
+    builddir/build/BUILD/sassc-rails-2.1.2/usr/share/gems/gems/sassc-rails-2.1.2/test/sassc_rails_test.rb:57:in `test_setup_works'
+    minitest (5.17.0) lib/minitest/test.rb:102:in `block (3 levels) in run'
+    minitest (5.17.0) lib/minitest/test.rb:199:in `capture_exceptions'
+    minitest (5.17.0) lib/minitest/test.rb:97:in `block (2 levels) in run'
+    minitest (5.17.0) lib/minitest.rb:296:in `time_it'
+    minitest (5.17.0) lib/minitest/test.rb:96:in `block in run'
+    minitest (5.17.0) lib/minitest.rb:391:in `on_signal'
+    minitest (5.17.0) lib/minitest/test.rb:247:in `with_info_handler'
+    minitest (5.17.0) lib/minitest/test.rb:95:in `run'
+    minitest (5.17.0) lib/minitest.rb:1051:in `run_one_method'
+    minitest (5.17.0) lib/minitest.rb:365:in `run_one_method'
+    minitest (5.17.0) lib/minitest.rb:352:in `block (2 levels) in run'
+    minitest (5.17.0) lib/minitest.rb:351:in `each'
+    minitest (5.17.0) lib/minitest.rb:351:in `block in run'
+    minitest (5.17.0) lib/minitest.rb:391:in `on_signal'
+    minitest (5.17.0) lib/minitest.rb:378:in `with_info_handler'
+    minitest (5.17.0) lib/minitest.rb:350:in `run'
+    minitest (5.17.0) lib/minitest.rb:182:in `block in __run'
+    minitest (5.17.0) lib/minitest.rb:182:in `map'
+    minitest (5.17.0) lib/minitest.rb:182:in `__run'
+    minitest (5.17.0) lib/minitest.rb:159:in `run'
+    minitest (5.17.0) lib/minitest.rb:83:in `block in autorun'
+rails test /builddir/build/BUILD/sassc-rails-2.1.2/usr/share/gems/gems/sassc-rails-2.1.2/test/sassc_rails_test.rb:56
+~~~
+
+This is caused by multiple calls to `initialize!` method and very likely
+due to this commit in Rails:
+
+https://github.com/rails/rails/commit/fe4377098b3800c3998f0583549a414b99b72b19
+---
+ test/sassc_rails_test.rb | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/test/sassc_rails_test.rb b/test/sassc_rails_test.rb
+index f8c36e4..36686cb 100644
+--- a/test/sassc_rails_test.rb
++++ b/test/sassc_rails_test.rb
+@@ -1,8 +1,11 @@
+ # frozen_string_literal: true
+ 
+ require "test_helper"
++require 'active_support/testing/isolation'
+ 
+ class SassRailsTest < MiniTest::Test
++  include ActiveSupport::Testing::Isolation
++
+   attr_reader :app
+   attr_reader :test_dir
+ 
diff --git a/dev-ruby/sassc-rails/sassc-rails-2.1.2-r1.ebuild b/dev-ruby/sassc-rails/sassc-rails-2.1.2-r1.ebuild
deleted file mode 100644
index 0b7eee92eff3..000000000000
--- a/dev-ruby/sassc-rails/sassc-rails-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Integrate SassC-Ruby with Rails"
-HOMEPAGE="https://github.com/sass/sassc-rails"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/sassc-2.0
-	dev-ruby/tilt:*
-	>=dev-ruby/railties-4:*
-	>=dev-ruby/sprockets-3.0:*
-	dev-ruby/sprockets-rails:*
-"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/bundler dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -e '/rake/ s/,.*$//' \
-		-e '/pry/ s:^:#:' \
-		-e 's/git ls-files -z/find . -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/pry/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rake test || die
-}
diff --git a/dev-ruby/sassc-rails/sassc-rails-2.1.2-r3.ebuild b/dev-ruby/sassc-rails/sassc-rails-2.1.2-r3.ebuild
new file mode 100644
index 000000000000..8be99f2eddbb
--- /dev/null
+++ b/dev-ruby/sassc-rails/sassc-rails-2.1.2-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Integrate SassC-Ruby with Rails"
+HOMEPAGE="https://github.com/sass/sassc-rails"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-test-directories.patch" "${FILESDIR}/${P}-test-isolation.patch" )
+
+ruby_add_rdepend "
+	>=dev-ruby/sassc-2.0
+	dev-ruby/tilt:*
+	|| ( dev-ruby/railties:7.0 dev-ruby/railties:6.1 )
+	>=dev-ruby/sprockets-3.0:*
+	dev-ruby/sprockets-rails:*
+"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/bundler dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -e '/rake/ s/,.*$//' \
+		-e '/pry/ s:^:#:' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/pry/ s:^:#:' test/test_helper.rb || die
+	sed -e '/test_line_comments_active_in_dev/askip "Fails for unknown reason"' \
+		-e '/test_globbed_imports_work_when_globbed_file_is_added/askip "Fails intermittently, similar to test above"' \
+		-e 's/MiniTest/Minitest/' \
+		-i test/sassc_rails_test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}
diff --git a/dev-ruby/sassc/sassc-2.4.0-r1.ebuild b/dev-ruby/sassc/sassc-2.4.0-r1.ebuild
index 00ac747def08..a2d18d74f317 100644
--- a/dev-ruby/sassc/sassc-2.4.0-r1.ebuild
+++ b/dev-ruby/sassc/sassc-2.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -15,7 +15,7 @@ DESCRIPTION="Use libsass with Ruby"
 HOMEPAGE="https://github.com/sass/sassc-ruby"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 SLOT="2"
 IUSE=""
 
@@ -34,12 +34,15 @@ all_ruby_prepare() {
 	# Use unbundled libsass
 	rm -rf ext || die
 
-	sed -i -e '/ffi_lib/ s:__dir__:"'${ESYSROOT}'/usr/'$(get_libdir)'":' \
+	sed -i -e "/ffi_lib/ s:__dir__:\"${ESYSROOT}/usr/$(get_libdir)\":" \
 		lib/sassc/native.rb || die
 
 	# Avoid version-specific test so newer libsass versions can be used.
 	sed -i -e '/test_it_reports_the_libsass_version/,/end/ s:^:#:' test/native_test.rb || die
 
+	# Fix minitest deprecation
+	sed -i -e 's/MiniTest/Minitest/' test/*_test.rb || die
+
 	sed -i -e '/pry/ s:^:#:' test/test_helper.rb || die
 }
 
diff --git a/dev-ruby/sawyer/Manifest b/dev-ruby/sawyer/Manifest
index 436db72d48ed..c78b1e4e730c 100644
--- a/dev-ruby/sawyer/Manifest
+++ b/dev-ruby/sawyer/Manifest
@@ -1 +1 @@
-DIST sawyer-0.8.2.tar.gz 15059 BLAKE2B 11a82158493fba69695b4eee15db223a07ebd81f8e39910553ef197a253a3342cffd00045385706c56c6f5e46bf4e20872cf61028acaf02d6f81fa2f640fc09b SHA512 fdaf88d33d87922bd0d44de919b920938b7072ad437db4b98370c507e22e4229ec0c68c613944fd2e20dde060ae5d34de6c001568eb7d1f38098831ca29b0c13
+DIST sawyer-0.9.2.tar.gz 15545 BLAKE2B 83fc7b6776e888ed4f26a21febc93edf954a1d926c14311078b5ecf7db57614472ed42d33ffc30bceb23c4ea1f1b1047cf3c1a0be9feecb4a3c92458938c6c03 SHA512 560c5bb6fd8f73f68b4dc1151608bc3b1f60aec511fef449cd6361a1307e2c1bf64cfa6cc7ad951ce92db22ce90f3318668af31708f0c1ee5909db3684566c72
diff --git a/dev-ruby/sawyer/sawyer-0.8.2-r1.ebuild b/dev-ruby/sawyer/sawyer-0.8.2-r1.ebuild
deleted file mode 100644
index 97e52a84ddef..000000000000
--- a/dev-ruby/sawyer/sawyer-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="sawyer.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Secret User Agent of HTTP"
-HOMEPAGE="https://github.com/lostisland/sawyer"
-SRC_URI="https://github.com/lostisland/sawyer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	<dev-ruby/faraday-2.0:*
-	>=dev-ruby/addressable-2.3.5"
-
-all_ruby_prepare() {
-	# Avoid tests that require network acces
-	sed -i -e '/test_blank_response_doesnt_raise/,/^    end/ s:^:#:' test/agent_test.rb || die
-}
diff --git a/dev-ruby/sawyer/sawyer-0.8.2.ebuild b/dev-ruby/sawyer/sawyer-0.8.2.ebuild
deleted file mode 100644
index d2533faadf12..000000000000
--- a/dev-ruby/sawyer/sawyer-0.8.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Secret User Agent of HTTP"
-HOMEPAGE="https://github.com/lostisland/sawyer"
-SRC_URI="https://github.com/lostisland/sawyer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	<dev-ruby/faraday-2.0:*
-	>=dev-ruby/addressable-2.3.5"
-
-all_ruby_prepare() {
-	# Avoid tests that require network acces
-	sed -i -e '/test_blank_response_doesnt_raise/,/^    end/ s:^:#:' test/agent_test.rb || die
-}
diff --git a/dev-ruby/sawyer/sawyer-0.9.2.ebuild b/dev-ruby/sawyer/sawyer-0.9.2.ebuild
new file mode 100644
index 000000000000..e50de92104ae
--- /dev/null
+++ b/dev-ruby/sawyer/sawyer-0.9.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="sawyer.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Secret User Agent of HTTP"
+HOMEPAGE="https://github.com/lostisland/sawyer"
+SRC_URI="https://github.com/lostisland/sawyer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+ruby_add_rdepend "
+	<dev-ruby/faraday-3:*
+	>=dev-ruby/addressable-2.3.5
+"
+
+all_ruby_prepare() {
+	# Avoid tests that require network access
+	sed -i -e '/test_blank_response_doesnt_raise/,/^    end/ s:^:#:' test/agent_test.rb || die
+}
diff --git a/dev-ruby/sdoc/metadata.xml b/dev-ruby/sdoc/metadata.xml
index 3b436b548ba2..00703716e979 100644
--- a/dev-ruby/sdoc/metadata.xml
+++ b/dev-ruby/sdoc/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zerochaos@gentoo.org</email>
-		<name>Rick Farina</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>
diff --git a/dev-ruby/sdoc/sdoc-1.1.0-r1.ebuild b/dev-ruby/sdoc/sdoc-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..c30c7dc8d7ab
--- /dev/null
+++ b/dev-ruby/sdoc/sdoc-1.1.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-fakegem
+
+DESCRIPTION="rdoc generator html with javascript search index"
+HOMEPAGE="https://rubygems.org/gems/sdoc"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ppc ~riscv ~sparc ~x86"
+
+ruby_add_rdepend ">=dev-ruby/rdoc-5.0"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/ s:^:#:' sdoc.gemspec || die
+
+	sed -i -e '/bundler/I s:^:#:' Rakefile spec/spec_helper.rb || die
+
+	# Avoid spec that appears to be broken with newer rdoc versions.
+	sed -i -e '/should display SDoc version/askip' spec/rdoc_generator_spec.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -I lib:spec:. -e 'Dir["spec/*_spec.rb"].each { require _1 }' || die
+}
diff --git a/dev-ruby/sdoc/sdoc-1.1.0.ebuild b/dev-ruby/sdoc/sdoc-1.1.0.ebuild
deleted file mode 100644
index ab8c3885fee6..000000000000
--- a/dev-ruby/sdoc/sdoc-1.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-inherit ruby-fakegem
-
-DESCRIPTION="rdoc generator html with javascript search index"
-HOMEPAGE="https://rubygems.org/gems/sdoc"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ~riscv ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/rdoc-5.0"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/ s:^:#:' sdoc.gemspec || die
-
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid spec that appears to be broken with newer rdoc versions.
-	sed -i -e '/should display SDoc version/askip' spec/rdoc_generator_spec.rb || die
-}
diff --git a/dev-ruby/securerandom/Manifest b/dev-ruby/securerandom/Manifest
new file mode 100644
index 000000000000..b3873f9a4aa8
--- /dev/null
+++ b/dev-ruby/securerandom/Manifest
@@ -0,0 +1,2 @@
+DIST securerandom-0.3.0.tar.gz 10302 BLAKE2B a5dd123fa6d48eebda20eaee70152c237b5018e8c04fbd83f4d8d53b2459453fc0676265341e26328252a5acf3a675f4455f04331a2698ece40bb693a554fbe4 SHA512 a61901b3de95007cb9296e0555ec36ca3ea4aa0a0ed55b0e6a1e5b53ca79240dd93e3d59ef1b6914e4cd646d038f499695196b8348eb829fd8822406a7fc7cb6
+DIST securerandom-0.3.1.tar.gz 10593 BLAKE2B bfa122d91f356c3164924ba0409e74da10822ee2298293adeb3c066c5f1d89e4b84755c4b46e970eec3fbce29cef41c698c69eb55bec200acb36446a04635c00 SHA512 1d312c66d6e66afce3d8e812a5fd9baa1a763d022b184227d758aed26d97d12ab69ed16c62163a76d6bc0eac4d4219f0f63bdd846a0078bb0c6a19b67e27cca3
diff --git a/dev-ruby/securerandom/metadata.xml b/dev-ruby/securerandom/metadata.xml
new file mode 100644
index 000000000000..f615da12f671
--- /dev/null
+++ b/dev-ruby/securerandom/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/securerandom</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/securerandom/securerandom-0.3.0.ebuild b/dev-ruby/securerandom/securerandom-0.3.0.ebuild
new file mode 100644
index 000000000000..234e636a26d7
--- /dev/null
+++ b/dev-ruby/securerandom/securerandom-0.3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="securerandom.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Interface for secure random number generator"
+HOMEPAGE="https://github.com/ruby/securerandom"
+SRC_URI="https://github.com/ruby/securerandom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/securerandom/securerandom-0.3.1.ebuild b/dev-ruby/securerandom/securerandom-0.3.1.ebuild
new file mode 100644
index 000000000000..b7de3a467068
--- /dev/null
+++ b/dev-ruby/securerandom/securerandom-0.3.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="securerandom.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Interface for secure random number generator"
+HOMEPAGE="https://github.com/ruby/securerandom"
+SRC_URI="https://github.com/ruby/securerandom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/seed-fu/seed-fu-2.3.9-r1.ebuild b/dev-ruby/seed-fu/seed-fu-2.3.9-r1.ebuild
new file mode 100644
index 000000000000..eb703873cbe3
--- /dev/null
+++ b/dev-ruby/seed-fu/seed-fu-2.3.9-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_GEMSPEC="seed-fu.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Advanced seed data handling for Rails"
+HOMEPAGE="https://github.com/mbleigh/seed-fu"
+SRC_URI="https://github.com/mbleigh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/activerecord-3.1:*
+	>=dev-ruby/activesupport-3.1:*"
+ruby_add_bdepend "test? ( dev-ruby/sqlite3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' spec/spec_helper.rb || die "sed failed"
+
+	# Avoid failing test that appears not be innocent
+	sed -i -e '/raise an ActiveRecord::RecordNotSaved/,/end/ s:^:#:' spec/seeder_spec.rb || die
+}
diff --git a/dev-ruby/seed-fu/seed-fu-2.3.9.ebuild b/dev-ruby/seed-fu/seed-fu-2.3.9.ebuild
deleted file mode 100644
index 213283008dc9..000000000000
--- a/dev-ruby/seed-fu/seed-fu-2.3.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Advanced seed data handling for Rails"
-HOMEPAGE="https://github.com/mbleigh/seed-fu"
-SRC_URI="https://github.com/mbleigh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/activerecord-3.1:*
-	>=dev-ruby/activesupport-3.1:*"
-ruby_add_bdepend "test? ( dev-ruby/sqlite3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' spec/spec_helper.rb || die "sed failed"
-
-	# Avoid failing test that appears not be innocent
-	sed -i -e '/raise an ActiveRecord::RecordNotSaved/,/end/ s:^:#:' spec/seeder_spec.rb || die
-}
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index f3e39888e196..ab6c40b274ce 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -1,3 +1,5 @@
-DIST selenium-webdriver-3.142.7.gem 865280 BLAKE2B 650011848afaa3ea4fab7c8172828c7562df212383a8fbea9615a5136e3382aba0fcf17952d941c7b514e5229c0aafe3dbc320386698eb8756f567eff67722bd SHA512 0e7891c19b8a0b20441d85bc17032ecf03cba7ca435846e03abc50b62b0c53c075dc70456796c9bfcd1ecd28ecc517f907a3d6868346a07617fd1d0c1b9437c0
-DIST selenium-webdriver-4.0.3.gem 152576 BLAKE2B 671909863bbbe328bbaf30a9e3c9e459e9eb6b892f554729892327230c03dd03f7819d9e8beb901cea986cb0d97877ce49853de856e1f802369686a03e5e9086 SHA512 260ad111ef9c512835f410fc7283df90b245d42db12274028148575e0a89a8c71639f0132a621f326921317b3181564521d9e801f2a7f14e5f196cde2550773c
 DIST selenium-webdriver-4.1.0.gem 153088 BLAKE2B f437b5e6c19b9a2b7d0393646b11bcaa0808fb9981c847ca0d86bd55ef04fc109d439eb0f41fce543ea121fde096fe3e72c56d1db861b6554f673a3de07bdff8 SHA512 9760c6a96dbef25f558216986a9cedcb00fe19313273ea5c3a4866d5afae327fbe3895e3e2ee405714f8a9410c290b0e51352b68465cb0df9ff31b6d2749b174
+DIST selenium-webdriver-4.10.0.gem 5803008 BLAKE2B 898e795bbad23aca1343fa49c059963a9c3b0d3ab27b3e9521381cb70259ef76fa81bf9063ad82f7348266f20fed05352be2450be4e4356515b4a05e015c21a7 SHA512 9217022b0af08d5d4b24d412bea4423afd327314e260de0449d723a9232c4f0895a36626da009ce51c304bedc933195b434a9dc620da8daffc736b5fc9842f33
+DIST selenium-webdriver-4.11.0.gem 6300672 BLAKE2B bedbc18c14ab67c1bde05a35b5b66f1fb6da576d616a40d5293358efc51dfaa00f816d70e92578b1bee82de0a17ee39950eb69542ef2e661bd6a015f5f01032a SHA512 6f24440c44eb9a1276e1d016788b14bdf41fd466ed688ca7dbdc19b0e7163ff2354a508733f0903ede70fc6b49fbd05bd2ec9c5d0e0b70567823c4d07e3d1a9d
+DIST selenium-webdriver-4.14.0.gem 9017344 BLAKE2B 03e211398b79849c42e18928897f9ed847905d3e92edac35ba0ca1e4b7afa67ffa860a8c27617f8f06b4244fb6d637073a305b72b5422b3a3a372631c766f759 SHA512 72c8b68e387c0b02f3b4de617989eb813a67eb66457fcf3b6d098579c54aaba476aead5ba52bf86870ca857071da0d095b1fd97613bb961636a0f9ea8969e795
+DIST selenium-webdriver-4.15.0.gem 9260544 BLAKE2B 9d00b65bfb3e705e81de81057c860cc9ffd8e0da21e901187bf2951c14857c9358b6b20248c1f26ee16c26d5bf051a309534a28148b443a2da2b7fc97f5d5ed9 SHA512 e5aa61cdc82fd9a9eb9a56a83387f86cbd1918b2b7387bb7c201960ee033875208892eca4d9833018be8ee7e8937f0fe542d4eac6bd1330cf7f0a11fec61ce4a
diff --git a/dev-ruby/selenium-webdriver/files/selenium-webdriver-4.13.1-selenium-manager.patch b/dev-ruby/selenium-webdriver/files/selenium-webdriver-4.13.1-selenium-manager.patch
new file mode 100644
index 000000000000..b9d1635067f2
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/files/selenium-webdriver-4.13.1-selenium-manager.patch
@@ -0,0 +1,20 @@
+--- a/lib/selenium/webdriver/common/selenium_manager.rb	2023-10-06 08:41:15.713237699 +0200
++++ b/lib/selenium/webdriver/common/selenium_manager.rb	2023-10-06 08:42:45.809927730 +0200
+@@ -31,7 +31,7 @@
+         attr_writer :bin_path
+ 
+         def bin_path
+-          @bin_path ||= '../../../../../bin'
++          @bin_path ||= '/usr/bin'
+         end
+ 
+         # @param [Options] options browser options.
+@@ -82,7 +82,7 @@
+               elsif Platform.mac?
+                 "#{directory}/macos/selenium-manager"
+               elsif Platform.linux?
+-                "#{directory}/linux/selenium-manager"
++                "#{directory}/selenium-manager"
+               end
+             end)
+ 
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7-r1.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7-r1.ebuild
deleted file mode 100644
index 443cbb2b93fc..000000000000
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# NOTE: this package contains precompiled code. It appears that all
-# source code can be found at https://code.google.com/p/selenium/ but the
-# repository is not organized in a way so that we can easily rebuild the
-# suited shared object. We'll just try our luck with the precompiled
-# objects for now.
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_GEMSPEC="selenium-webdriver.gemspec"
-
-RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
-QA_PREBUILT="*/x_ignore_nofocus.so"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem provides Ruby bindings for WebDriver"
-HOMEPAGE="https://github.com/seleniumhq/selenium"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/childprocess-0.5:2
-	>=dev-ruby/rubyzip-1.2.2:*"
-
-all_ruby_prepare() {
-	# Loosen childprocess dependency
-	sed -i -e '/childprocess/ s/4.0/5.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-4.0.3.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-4.0.3.ebuild
deleted file mode 100644
index 48a9afa6621d..000000000000
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-4.0.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-# NOTE: this package contains precompiled code. It appears that all
-# source code can be found at https://code.google.com/p/selenium/ but the
-# repository is not organized in a way so that we can easily rebuild the
-# suited shared object. We'll just try our luck with the precompiled
-# objects for now.
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_GEMSPEC="selenium-webdriver.gemspec"
-
-RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
-QA_PREBUILT="*/x_ignore_nofocus.so"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem provides Ruby bindings for WebDriver"
-HOMEPAGE="https://github.com/seleniumhq/selenium"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/childprocess-0.5:2
-	>=dev-ruby/rexml-3.2.5:3
-	>=dev-ruby/rubyzip-1.2.2:*"
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-4.1.0-r1.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..94d0a1f7408e
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-4.1.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# NOTE: this package contains precompiled code. It appears that all
+# source code can be found at https://code.google.com/p/selenium/ but the
+# repository is not organized in a way so that we can easily rebuild the
+# suited shared object. We'll just try our luck with the precompiled
+# objects for now.
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_GEMSPEC="selenium-webdriver.gemspec"
+
+RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
+QA_PREBUILT="*/x_ignore_nofocus.so"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver"
+HOMEPAGE="https://github.com/seleniumhq/selenium"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/childprocess:5
+	>=dev-ruby/rexml-3.2.5:3
+	>=dev-ruby/rubyzip-1.2.2:*"
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 4e6109e913ef..e76c9e2a9822 100644
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-4.1.0.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-4.1.0.ebuild
@@ -1,9 +1,9 @@
-# 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="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
@@ -28,7 +28,7 @@ HOMEPAGE="https://github.com/seleniumhq/selenium"
 
 LICENSE="Apache-2.0"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/childprocess-0.5:2
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-4.10.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-4.10.0.ebuild
new file mode 100644
index 000000000000..d55164923ba6
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-4.10.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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
+# repository is not organized in a way so that we can easily rebuild the
+# suited shared object. We'll just try our luck with the precompiled
+# objects for now.
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_GEMSPEC="selenium-webdriver.gemspec"
+
+RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
+QA_PREBUILT="*/x_ignore_nofocus.so"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver"
+HOMEPAGE="https://github.com/seleniumhq/selenium"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/rexml-3.2.5:3
+	>=dev-ruby/rubyzip-1.2.2:*
+	dev-ruby/websocket:0
+"
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-4.11.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-4.11.0.ebuild
new file mode 100644
index 000000000000..25f546c4e387
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-4.11.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32 ruby33"
+
+# NOTE: this package contains precompiled code. It appears that all
+# source code can be found at https://code.google.com/p/selenium/ but the
+# repository is not organized in a way so that we can easily rebuild the
+# suited shared object. We'll just try our luck with the precompiled
+# objects for now.
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_GEMSPEC="selenium-webdriver.gemspec"
+
+RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
+QA_PREBUILT="*/x_ignore_nofocus.so"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver"
+HOMEPAGE="https://github.com/seleniumhq/selenium"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/rexml-3.2.5:3
+	>=dev-ruby/rubyzip-1.2.2:*
+	dev-ruby/websocket:0
+"
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-4.14.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-4.14.0.ebuild
new file mode 100644
index 000000000000..27f311e8c8f2
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-4.14.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_GEMSPEC="selenium-webdriver.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver"
+HOMEPAGE="https://github.com/seleniumhq/selenium"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND+=" >=dev-util/selenium-manager-$(ver_cut 1-2)"
+
+ruby_add_rdepend "
+	>=dev-ruby/rexml-3.2.5:3
+	>=dev-ruby/rubyzip-1.2.2:*
+	dev-ruby/websocket:0
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.13.1-selenium-manager.patch" )
+
+all_ruby_prepare() {
+	# Remove the pre-compiled selenium-manager executables
+	rm -fr bin || die
+}
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-4.15.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-4.15.0.ebuild
new file mode 100644
index 000000000000..2706840797ff
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-4.15.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_GEMSPEC="selenium-webdriver.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver"
+HOMEPAGE="https://github.com/seleniumhq/selenium"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND+=" >=dev-util/selenium-manager-$(ver_cut 1-2)"
+
+ruby_add_rdepend "
+	>=dev-ruby/rexml-3.2.5:3
+	>=dev-ruby/rubyzip-1.2.2:*
+	dev-ruby/websocket:0
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.13.1-selenium-manager.patch" )
+
+all_ruby_prepare() {
+	# Remove the pre-compiled selenium-manager executables
+	rm -fr bin || die
+}
diff --git a/dev-ruby/semantic_puppet/Manifest b/dev-ruby/semantic_puppet/Manifest
index 90bc5047302f..3499e960aa11 100644
--- a/dev-ruby/semantic_puppet/Manifest
+++ b/dev-ruby/semantic_puppet/Manifest
@@ -1,3 +1,2 @@
-DIST semantic_puppet-1.0.2.gem 31744 BLAKE2B fd80225f799f55fe668c712cec20ad57163c3829ce70f49a30e7b73037883ea1960be0ea8f510e147c30254b7527e64f323fd7f9edb30f934762088ed997a241 SHA512 b059d8c7b13ae96dfe012318e7c6ee483cc09986d5d065c8422167a27a14d8e99433229c90388a7ff9ee425a0f5b6a6a6d5bc55f8b81901490afd8039ea86480
-DIST semantic_puppet-1.0.3.gem 32256 BLAKE2B bbde7e40e2d7361b09906974b451a33a2698dcc33db1ab3c790968318b21f4c72d2ce775eb56c331b0509666972cde2e5a1db64580eb6e558d604ff025e389d0 SHA512 bdca6793a064d37d15010551c579f61837b1095025d84469ed8893d4bbed4372cde005ed452460a8d771c8e4bf842283628f2c613295bab0af3834cdc163f7ba
 DIST semantic_puppet-1.0.4.gem 32256 BLAKE2B 4704a6d913388d10cf32442511d66d742bcdba792d81d67de960209dbffc8ade970431e794934152b71031de83a75d9e09bda830e6e66838b68913d2bbb9da0a SHA512 8b830626e973bc74fb4f4147e83ca8048d412751ff48dbe96ec6e790645eae7a51c665b75a09d0f0fdec3b29d3798158c38b613e2f83d115d1ba2a4c8d24362a
+DIST semantic_puppet-1.1.0.gem 32768 BLAKE2B e5f41d88afe1b7c760772e4de05f820b84a1cccc809fe692e0d76bdedc75e1bec1d9c0b66d49ff4468ae0b20fdd3c724bdd5305709af4f1faa2ca867f8a5a679 SHA512 22d5596f445faa7c7a779c11e4a9b52e1ca3f77fcc63270798e4b0fc7dddd59c66bab1644214f1526a0fa5732e349522e8664ea6285f0ca107f35009e8a1d151
diff --git a/dev-ruby/semantic_puppet/semantic_puppet-1.0.2.ebuild b/dev-ruby/semantic_puppet/semantic_puppet-1.0.2.ebuild
deleted file mode 100644
index 2693101b352f..000000000000
--- a/dev-ruby/semantic_puppet/semantic_puppet-1.0.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library of tools for working with Semantic Versions and module dependencies"
-HOMEPAGE="https://github.com/puppetlabs/semantic_puppet"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE=""
diff --git a/dev-ruby/semantic_puppet/semantic_puppet-1.0.3.ebuild b/dev-ruby/semantic_puppet/semantic_puppet-1.0.3.ebuild
deleted file mode 100644
index ce1be8b94a38..000000000000
--- a/dev-ruby/semantic_puppet/semantic_puppet-1.0.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library of tools for working with Semantic Versions and module dependencies"
-HOMEPAGE="https://github.com/puppetlabs/semantic_puppet"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
diff --git a/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild b/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild
index a1c0f89e14d4..e3c5359cfddc 100644
--- a/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild
+++ b/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/puppetlabs/semantic_puppet"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86"
 IUSE=""
diff --git a/dev-ruby/semantic_puppet/semantic_puppet-1.1.0.ebuild b/dev-ruby/semantic_puppet/semantic_puppet-1.1.0.ebuild
new file mode 100644
index 000000000000..65ce05f547c5
--- /dev/null
+++ b/dev-ruby/semantic_puppet/semantic_puppet-1.1.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library of tools for working with Semantic Versions and module dependencies"
+HOMEPAGE="https://github.com/puppetlabs/semantic_puppet"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
diff --git a/dev-ruby/semver2/Manifest b/dev-ruby/semver2/Manifest
deleted file mode 100644
index ced0e6073ad7..000000000000
--- a/dev-ruby/semver2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST semver2-3.4.2.tar.gz 9048 BLAKE2B dd0f7d0ec826b0d893aba07203fc1ff01367b9d0406c24157dd76290a7c3bb6301e8656d149aaa9a76f2ace5a1c9559df56aa5236f3a305bc982f30450c36ff9 SHA512 7f724397ac4a58a459e7b4794d2097111d2796837150634c318c6785d321299215099d4c359d010036d1da2a7d78e50ef6bad1629d01363650687e0e678a51d5
diff --git a/dev-ruby/semver2/metadata.xml b/dev-ruby/semver2/metadata.xml
deleted file mode 100644
index 658c72b1920d..000000000000
--- a/dev-ruby/semver2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/semver2/semver2-3.4.2-r1.ebuild b/dev-ruby/semver2/semver2-3.4.2-r1.ebuild
deleted file mode 100644
index 745ef372efb5..000000000000
--- a/dev-ruby/semver2/semver2-3.4.2-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="semver2.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="maintain versions as per http://semver.org"
-HOMEPAGE="https://github.com/haf/semver"
-SRC_URI="https://github.com/haf/semver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="semver-${PV}"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
diff --git a/dev-ruby/semver2/semver2-3.4.2.ebuild b/dev-ruby/semver2/semver2-3.4.2.ebuild
deleted file mode 100644
index d1dc782a41af..000000000000
--- a/dev-ruby/semver2/semver2-3.4.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="maintain versions as per http://semver.org"
-HOMEPAGE="https://github.com/haf/semver"
-SRC_URI="https://github.com/haf/semver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="semver-${PV}"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
diff --git a/dev-ruby/sequel/Manifest b/dev-ruby/sequel/Manifest
new file mode 100644
index 000000000000..89917ef2a49e
--- /dev/null
+++ b/dev-ruby/sequel/Manifest
@@ -0,0 +1,5 @@
+DIST sequel-5.74.0.tar.gz 1751332 BLAKE2B 2f75703fce84e987ddffe5049f75a656ebc1363e62f350059feb1ac986f5c0e48a7712817f5ac654128055c4fa753b74d7b69b781c1f4b4de74d904c61d56aab SHA512 4f4c11ffedf6dad79fc8b89e601bcda2061bfc3d8f67c41559630d1b7c83ab0da0ad1fb2c7f1ad3999e0db541b5da4df2413de00e1947211d8013eeaf1a34307
+DIST sequel-5.75.0.tar.gz 1753433 BLAKE2B 9315198887f267010a5d325a880c974681ac080f822c5191ccf4bdeaa3cd64bfc0cd54736e5ced1ae0c3f5cc77da1a721e631aaf7e344b39fc752f3f91ec5dba SHA512 ecef39140d3b15d309f06aac36f7196dd46e2c737732a95843f50e91fb0cf998c39749d8dd7d0f6352d676c82aef0bbb23bfb75e6b4ace301ac37a61fd9bef78
+DIST sequel-5.76.0.tar.gz 1758202 BLAKE2B f8b28d5cb5f03281a7649f654e65d809134421aff68e363d5f887113fa9b5f7a8ccf64c9f96d4451c274ebdedd3996d0504c65abc40ce942c5be12ac69865b21 SHA512 71da653013ba27e32288ed801cf45096b2878cb50bdae9db14b82554aed4a70743b49de3453c35f68726bec91a2ff57503c040e3e7b2f66beac30bf2b8bbe2e6
+DIST sequel-5.77.0.tar.gz 1761861 BLAKE2B d3a99213a7862ff7a585ed07b2ab8645464cfc118da0120281d8d725cc3426983d3518fdc3050541a3b7a714e2d7b0754132a208fdddd126be385de1a13b25a3 SHA512 ead09479da174737cfdab79cf3bef42b801e2b7b351a8fa6b4000e984cbb7dad9c0e71ddb3f45afbed1829d32923673de4f3f62f0c278da4f85c3fbc65a7201b
+DIST sequel-5.78.0.tar.gz 1765505 BLAKE2B 5841d1eeb6065188855f40ff8f1812f694c5d2851a30911265eeb37d111e7df442e3888d22567470569bd0c7d0fced4bdb8b778a14a69f643b42ce2d7b6efb94 SHA512 f706e57cd9dfcb1ea304abe47d2eed40ad412767f3ac58b83e4904e38cb7e970faabe3e40c5c34a44369a7e8b9e526fa06b566eb3768eedd245c0878246a0b8e
diff --git a/dev-ruby/sequel/metadata.xml b/dev-ruby/sequel/metadata.xml
new file mode 100644
index 000000000000..49c310e4449a
--- /dev/null
+++ b/dev-ruby/sequel/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jeremyevans/sequel</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/sequel/sequel-5.74.0.ebuild b/dev-ruby/sequel/sequel-5.74.0.ebuild
new file mode 100644
index 000000000000..9cffa9a08213
--- /dev/null
+++ b/dev-ruby/sequel/sequel-5.74.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+RUBY_FAKEGEM_GEMSPEC="sequel.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A lightweight database toolkit for Ruby"
+HOMEPAGE="https://sequel.jeremyevans.net/"
+SRC_URI="https://github.com/jeremyevans/sequel/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/bigdecimal"
+
+ruby_add_bdepend "test? (
+	dev-ruby/activemodel
+	dev-ruby/minitest
+	dev-ruby/minitest-global_expectations
+	dev-ruby/minitest-hooks
+	dev-ruby/nokogiri
+	dev-ruby/tzinfo
+)"
diff --git a/dev-ruby/sequel/sequel-5.75.0.ebuild b/dev-ruby/sequel/sequel-5.75.0.ebuild
new file mode 100644
index 000000000000..9cffa9a08213
--- /dev/null
+++ b/dev-ruby/sequel/sequel-5.75.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+RUBY_FAKEGEM_GEMSPEC="sequel.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A lightweight database toolkit for Ruby"
+HOMEPAGE="https://sequel.jeremyevans.net/"
+SRC_URI="https://github.com/jeremyevans/sequel/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/bigdecimal"
+
+ruby_add_bdepend "test? (
+	dev-ruby/activemodel
+	dev-ruby/minitest
+	dev-ruby/minitest-global_expectations
+	dev-ruby/minitest-hooks
+	dev-ruby/nokogiri
+	dev-ruby/tzinfo
+)"
diff --git a/dev-ruby/sequel/sequel-5.76.0.ebuild b/dev-ruby/sequel/sequel-5.76.0.ebuild
new file mode 100644
index 000000000000..aef18fe0b910
--- /dev/null
+++ b/dev-ruby/sequel/sequel-5.76.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+RUBY_FAKEGEM_GEMSPEC="sequel.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A lightweight database toolkit for Ruby"
+HOMEPAGE="https://sequel.jeremyevans.net/"
+SRC_URI="https://github.com/jeremyevans/sequel/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/bigdecimal"
+
+ruby_add_bdepend "test? (
+	dev-ruby/activemodel
+	dev-ruby/minitest
+	dev-ruby/minitest-global_expectations
+	dev-ruby/minitest-hooks
+	dev-ruby/nokogiri
+	dev-ruby/tzinfo
+)"
diff --git a/dev-ruby/sequel/sequel-5.77.0.ebuild b/dev-ruby/sequel/sequel-5.77.0.ebuild
new file mode 100644
index 000000000000..aef18fe0b910
--- /dev/null
+++ b/dev-ruby/sequel/sequel-5.77.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+RUBY_FAKEGEM_GEMSPEC="sequel.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A lightweight database toolkit for Ruby"
+HOMEPAGE="https://sequel.jeremyevans.net/"
+SRC_URI="https://github.com/jeremyevans/sequel/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/bigdecimal"
+
+ruby_add_bdepend "test? (
+	dev-ruby/activemodel
+	dev-ruby/minitest
+	dev-ruby/minitest-global_expectations
+	dev-ruby/minitest-hooks
+	dev-ruby/nokogiri
+	dev-ruby/tzinfo
+)"
diff --git a/dev-ruby/sequel/sequel-5.78.0.ebuild b/dev-ruby/sequel/sequel-5.78.0.ebuild
new file mode 100644
index 000000000000..79946a650e04
--- /dev/null
+++ b/dev-ruby/sequel/sequel-5.78.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+RUBY_FAKEGEM_GEMSPEC="sequel.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A lightweight database toolkit for Ruby"
+HOMEPAGE="https://sequel.jeremyevans.net/"
+SRC_URI="https://github.com/jeremyevans/sequel/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/bigdecimal"
+
+ruby_add_bdepend "test? (
+	dev-ruby/activemodel
+	dev-ruby/minitest
+	dev-ruby/minitest-global_expectations
+	dev-ruby/minitest-hooks
+	dev-ruby/nokogiri
+	dev-ruby/tzinfo
+)"
diff --git a/dev-ruby/serialport/files/serialport-1.3.2-clang16-build-fix.patch b/dev-ruby/serialport/files/serialport-1.3.2-clang16-build-fix.patch
new file mode 100644
index 000000000000..9dd22090541c
--- /dev/null
+++ b/dev-ruby/serialport/files/serialport-1.3.2-clang16-build-fix.patch
@@ -0,0 +1,13 @@
+Bug: https://bugs.gentoo.org/883127
+Upstream PR: https://github.com/hparra/ruby-serialport/pull/75
+--- a/ext/native/posix_serialport_impl.c
++++ b/ext/native/posix_serialport_impl.c
+@@ -110,7 +110,7 @@ VALUE sp_create_impl(class, _port)
+    struct termios params;
+ 
+    NEWOBJ(sp, struct RFile);
+-   OBJSETUP(sp, class, T_FILE);
++   OBJSETUP((VALUE)sp, class, T_FILE);
+    MakeOpenFile((VALUE) sp, fp);
+ 
+    switch(TYPE(_port))
diff --git a/dev-ruby/serialport/metadata.xml b/dev-ruby/serialport/metadata.xml
index daac6fdb7252..c8a4b8ba58d1 100644
--- a/dev-ruby/serialport/metadata.xml
+++ b/dev-ruby/serialport/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">hparra/ruby-serialport</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/serialport/serialport-1.3.2-r1.ebuild b/dev-ruby/serialport/serialport-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..6fd74bbb98bf
--- /dev/null
+++ b/dev-ruby/serialport/serialport-1.3.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/native/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="a library for serial port (rs232) access in ruby"
+HOMEPAGE="https://github.com/hparra/ruby-serialport/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-clang16-build-fix.patch
+)
+
+all_ruby_prepare() {
+	# Fix the miniterm script so that it might actually work, we'll
+	# install it as example.
+	sed -i -e 's:\.\./serialport.so:serialport:' test/miniterm.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc test/miniterm.rb
+}
diff --git a/dev-ruby/serialport/serialport-1.3.2.ebuild b/dev-ruby/serialport/serialport-1.3.2.ebuild
deleted file mode 100644
index 812e30d502b9..000000000000
--- a/dev-ruby/serialport/serialport-1.3.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/native/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="a library for serial port (rs232) access in ruby"
-HOMEPAGE="https://github.com/hparra/ruby-serialport/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Fix the miniterm script so that it might actually work, we'll
-	# install it as example.
-	sed -i -e 's:\.\./serialport.so:serialport:' test/miniterm.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc test/miniterm.rb
-}
diff --git a/dev-ruby/serverengine/Manifest b/dev-ruby/serverengine/Manifest
index 46ebcf03af8d..115a4cafa0d3 100644
--- a/dev-ruby/serverengine/Manifest
+++ b/dev-ruby/serverengine/Manifest
@@ -1 +1 @@
-DIST serverengine-2.2.5.gem 40960 BLAKE2B a7b256c1029c38b35673d104f6aba118bc5644947db7feb185d57456af60baebafb3c6a74996998630b7a0dbe3ee0baa5d4f260538ca7a8abf542b7528cd7204 SHA512 fb4abbf35553b8d69447be195a14018e335cbce0756b9ae91160bc4dc8253968a4b94c383f40aad1e1bd20aaeb700efced91341f3b26077a0d44b3dc00aa89c7
+DIST serverengine-2.3.2.gem 43520 BLAKE2B f07972501906ee8a8418461d80125d019364b1d025740d22e50f862e70054682affdb1a65015e38b72ab971792f2d3cb8c41d7ce45c5f99ce9398c2ae236d6bb SHA512 9ca32740d4579fb8cbeb613780ed78a9a2e5a72fb427d24aa26a9a805f83de0d2840eb3de6e2e4205a771e1c58bcc4a171869807fdb49ddbb017ceeb8ca08c73
diff --git a/dev-ruby/serverengine/metadata.xml b/dev-ruby/serverengine/metadata.xml
index 658c72b1920d..e922d46606d0 100644
--- a/dev-ruby/serverengine/metadata.xml
+++ b/dev-ruby/serverengine/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">treasure-data/serverengine</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/serverengine/serverengine-2.2.5.ebuild b/dev-ruby/serverengine/serverengine-2.2.5.ebuild
deleted file mode 100644
index bab728791f52..000000000000
--- a/dev-ruby/serverengine/serverengine-2.2.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A framework to implement robust multiprocess servers"
-HOMEPAGE="https://github.com/fluent/serverengine"
-LICENSE="Apache-2.0"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sigdump-0.2.2:0"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	sed -i -e '/rake/ s/~>/>=/' \
-		-e '/rspec/ s/2.13.0/2.13/' \
-		-e '/rake-compiler/ s:^:#:' serverengine.gemspec || die
-}
-
-each_ruby_test() {
-	# The specs spawn ruby processes with bundler support
-	${RUBY} -S bundle exec rspec-2 spec || die
-}
diff --git a/dev-ruby/serverengine/serverengine-2.3.2.ebuild b/dev-ruby/serverengine/serverengine-2.3.2.ebuild
new file mode 100644
index 000000000000..257e9cb77cea
--- /dev/null
+++ b/dev-ruby/serverengine/serverengine-2.3.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A framework to implement robust multiprocess servers"
+HOMEPAGE="https://github.com/treasure-data/serverengine"
+LICENSE="Apache-2.0"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/sigdump-0.2.2:0"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/rr-3.1:0 dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -i -e '/rake/ s/~>/>=/' \
+		-e '/rspec/ s/3.12.0/3.12/' \
+		-e '/rake-compiler/ s:^:#:' serverengine.gemspec || die
+
+	sed -i -e '/color_enabled/ s:^:#:' -e '1irequire "fileutils"' spec/spec_helper.rb || die
+
+	sed -i -e '/raises SystemExit/askip "Exits rspec 3"' spec/multi_process_server_spec.rb || die
+}
+
+each_ruby_test() {
+	# The specs spawn ruby processes with bundler support
+	${RUBY} -S bundle exec rspec-3 spec || die
+}
diff --git a/dev-ruby/set/Manifest b/dev-ruby/set/Manifest
index 523aa8d0ff96..e6b30463920e 100644
--- a/dev-ruby/set/Manifest
+++ b/dev-ruby/set/Manifest
@@ -1 +1,2 @@
-DIST set-1.0.2.tar.gz 14237 BLAKE2B 767e8ea3684a91475f8dfc1190e2a8022b4330071ceb12ee06f76c23d688f6203571c127592adf5de7ff7b5722999d7a7605df8dc5215e183dabd65fb7863c80 SHA512 b64aeb47b7abe1e1245d33cc081c21f36ab66a115a88678c8b99c44149ef87eb1a522f166d8e02abe614623178992758cb88e9a0aea25fee0e39229265eab59c
+DIST set-1.0.3.tar.gz 14549 BLAKE2B 73ced396e10bd65df7e11edf0c553b7fd517dbc74c6f0721c61dba5e70ec730ed98fe45a834224059a5fb84ca60f194b535763f698b7f5e96b45a6118233ecc3 SHA512 5e4effabcfb7034b054ad5276243bf1aab378d0446790fe99c6911970ff1881acc9b704607acab836db75117903b8187d2aeb33e33d9e39d0ee53b41ea7a6086
+DIST set-1.1.0.tar.gz 14923 BLAKE2B 6f66a6fa53c7cd7b82ddeb91c1f820a5a062e21b3a9b0ce9df6ae433ed35b1fc9090adde43cb886435b6953f43ea59c1d7e7dc62de2b9d81ffacc342b2e19d76 SHA512 cc7b79ca07d1df9490cf6500c77afc4e972138a4d4c133e8eecbd1c2f80d5622c613040f36771beaeb1a8712f7a6c12dec592833b966f65be9beb454062e2970
diff --git a/dev-ruby/set/metadata.xml b/dev-ruby/set/metadata.xml
index 7a38fd1850ff..77b24b04ff24 100644
--- a/dev-ruby/set/metadata.xml
+++ b/dev-ruby/set/metadata.xml
@@ -5,4 +5,7 @@
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/set</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/set/set-1.0.2.ebuild b/dev-ruby/set/set-1.0.2.ebuild
deleted file mode 100644
index 2ca245abc0f2..000000000000
--- a/dev-ruby/set/set-1.0.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_GEMSPEC="set.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a class to deal with collections of unordered, unique values"
-HOMEPAGE="https://github.com/ruby/set"
-SRC_URI="https://github.com/ruby/set/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/set/set-1.0.3.ebuild b/dev-ruby/set/set-1.0.3.ebuild
new file mode 100644
index 000000000000..c87fd13b12dc
--- /dev/null
+++ b/dev-ruby/set/set-1.0.3.ebuild
@@ -0,0 +1,23 @@
+# 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_GEMSPEC="set.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a class to deal with collections of unordered, unique values"
+HOMEPAGE="https://github.com/ruby/set"
+SRC_URI="https://github.com/ruby/set/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/set/set-1.1.0-r1.ebuild b/dev-ruby/set/set-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..b5b6f3d7c810
--- /dev/null
+++ b/dev-ruby/set/set-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="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="set.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a class to deal with collections of unordered, unique values"
+HOMEPAGE="https://github.com/ruby/set"
+SRC_URI="https://github.com/ruby/set/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's/git ls-files -z/find * -print0/' \
+		-e 's/__FILE__/"set.gemspec"/' \
+		-e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -e '/test_error/aomit "Fails when sorted_set gem is installed"' \
+		-i test/test_sorted_set.rb || die
+}
diff --git a/dev-ruby/settingslogic/settingslogic-2.0.9-r2.ebuild b/dev-ruby/settingslogic/settingslogic-2.0.9-r2.ebuild
index 5d2b70ee8217..21d845360dbb 100644
--- a/dev-ruby/settingslogic/settingslogic-2.0.9-r2.ebuild
+++ b/dev-ruby/settingslogic/settingslogic-2.0.9-r2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 inherit ruby-fakegem
 
@@ -23,4 +23,7 @@ PATCHES=( "${FILESDIR}/${P}-psych-4.patch" )
 
 all_ruby_prepare() {
 	sed -i -e '/check_dependencies/d' Rakefile || die
+
+	# Use rspec 3
+	sed -i -e 's/be_false/be false/' spec/settingslogic_spec.rb || die
 }
diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest
index 95225c3cc2cc..902ead55d063 100644
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@@ -1,3 +1,3 @@
-DIST sexp_processor-4.15.0.gem 56320 BLAKE2B 8624b7fe28f4aa9447f42cf4f8c5b424088ca2c1628f3e785f746ceb60725449812205dc657ea856c5bead616ac18d689330315fdb44e92447ee3a89740557d1 SHA512 f7877ca59191ab39848c6d3b0cf9625c2e1c180784cd757c00a7cea67aa6eee5549ab5630641f4044c875a1aaadc89b8237f8adadc961ed86c5379cb72db33c3
-DIST sexp_processor-4.16.0.gem 56832 BLAKE2B 431005f5adc04605f6be5a34eb8933b32e4c90426f7099c670f70753381fc8892f9f9b39cba715e6192cd26a9a042ca4d7122ef7e75d2310d72772c3ba470fd2 SHA512 d6300b963782fcaa1f0854a0a10714e9fd65aac2925ba99e9c986eb62f2e940c18652f919640bcb9f8bb13ea613bee723f80a3237bd6a692bf719e726dc917f3
 DIST sexp_processor-4.16.1.gem 56832 BLAKE2B fa17cf32d67cec6a89c202d10dd18af463c70ad2e5455c891b4a68bee6fe6971577067192ae5ad2bfb7eb3f932a1988cb878ad5d901191538a69d62968c9d12f SHA512 eda019d253cce8cd6a93532745dc03e8129f7667e798543b0d38488dceb951b058e292976fe085126c421412c289c3d650ce1cf14c0fbbbafdef896b4db615b2
+DIST sexp_processor-4.17.0.gem 57344 BLAKE2B 04355e8a9230095d90a43bb643c1f421a54edf7a0a97280c63026702cabba8fc39ed359df5478667cb087242b444c2ec0768a07ead1d7a7e474eb8117ddc6ba9 SHA512 ce946554e1cf23581d4e5d2071b7ec91999d533a4a2e1403e45775fb5091dd865836c778e345f478f229e068836180fe6ad008bea9cc36942ad66579411513a9
+DIST sexp_processor-4.17.1.gem 57344 BLAKE2B ac95894c5d69c687d953f5a6c84d7aa271917791142fa6008af62a8718a8057f24f20547f3f7e83fecab4641c43eea8e4180da0a5a9d1711a89b622e6a6632a9 SHA512 56eccb98bdcc60db09dadb1f82858602087878be2c8cdfb0ce29bb26420746569fb93f3e5eac0716b55e9bc7fe5e86bde9ada4954dd645b2789e7f3e0fa50e02
diff --git a/dev-ruby/sexp_processor/metadata.xml b/dev-ruby/sexp_processor/metadata.xml
index 658c72b1920d..da57b9a67d16 100644
--- a/dev-ruby/sexp_processor/metadata.xml
+++ b/dev-ruby/sexp_processor/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">seattlerb/sexp_processor</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
deleted file mode 100644
index 862809482e71..000000000000
--- a/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
-HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/minitest-5.5
-	)"
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.16.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.16.0.ebuild
deleted file mode 100644
index c27d8b477f73..000000000000
--- a/dev-ruby/sexp_processor/sexp_processor-4.16.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
-HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/minitest-5.5
-	)"
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.16.1.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.16.1.ebuild
index 2e9c5c428d8d..7ccd13c39911 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.16.1.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.16.1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.17.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.17.0.ebuild
new file mode 100644
index 000000000000..24245f570472
--- /dev/null
+++ b/dev-ruby/sexp_processor/sexp_processor-4.17.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
+HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/minitest-5.5
+	)"
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.17.1.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.17.1.ebuild
new file mode 100644
index 000000000000..0b0afbdcef7c
--- /dev/null
+++ b/dev-ruby/sexp_processor/sexp_processor-4.17.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
+HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/minitest-5.5
+	)"
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/shoulda-context/Manifest b/dev-ruby/shoulda-context/Manifest
index 1e75b8b29b29..436b7385e5a5 100644
--- a/dev-ruby/shoulda-context/Manifest
+++ b/dev-ruby/shoulda-context/Manifest
@@ -1 +1,2 @@
 DIST shoulda-context-1.2.2.gem 24064 BLAKE2B a6068da369c00a36e6056a8ebba96eca90efddf94613dfc90c9f2a47bec2c054a41fa61b861b2f3ec1195e417bdc54ab60d53f91bc5e0f167eac07b84880892b SHA512 b09f5ce2db59bbb26d5678b17b6641b79df7983d25e81a31bc10c42b702bdba09795b692d711d59c103beb2f691b503567e37c46668f77e600416551ef2c5e05
+DIST shoulda-context-2.0.0.gem 34304 BLAKE2B b31f7e052b54fb60fb7fff84fc48beed406864b871f3c125db4f28d1ce0f400bb0ad3479d438d20a28f585b6e5da101b71228f598e6bdc177512f048273a8524 SHA512 c8d856a95b3dfe85fd92c79f18e03a2765ad219b83ab132017fefcffd0262b04bcebf267e6bbaec0ed3dff1d4d345bd74c1f9db1d2a22938ee8d85ee1078ac6e
diff --git a/dev-ruby/shoulda-context/files/shoulda-context-2.0.0-file-exists.patch b/dev-ruby/shoulda-context/files/shoulda-context-2.0.0-file-exists.patch
new file mode 100644
index 000000000000..78f7dfc3f0b5
--- /dev/null
+++ b/dev-ruby/shoulda-context/files/shoulda-context-2.0.0-file-exists.patch
@@ -0,0 +1,26 @@
+From ee3aeb239ea69c9a855d64e8c1cfda87958c833d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Thu, 22 Dec 2022 15:03:17 +0100
+Subject: [PATCH] Use File.exist?
+
+`File.exists?` was deprecated while ago and removed in Ruby 3.2.
+
+https://bugs.ruby-lang.org/issues/17391
+https://github.com/ruby/ruby/pull/5352
+---
+ exe/convert_to_should_syntax | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/exe/convert_to_should_syntax b/exe/convert_to_should_syntax
+index d1264d07..ebdda984 100755
+--- a/exe/convert_to_should_syntax
++++ b/exe/convert_to_should_syntax
+@@ -31,7 +31,7 @@ usage("Temp directory '#{TMP}' is not valid. Set TMPDIR environment variable to
+ 
+ file = ARGV.shift
+ tmpfile = File.join(TMP, File.basename(file))
+-usage("File '#{file}' doesn't exist") unless File.exists?(file)
++usage("File '#{file}' doesn't exist") unless File.exist?(file)
+ 
+ FileUtils.cp(file, tmpfile)
+ contents = File.read(tmpfile)
diff --git a/dev-ruby/shoulda-context/metadata.xml b/dev-ruby/shoulda-context/metadata.xml
index 658c72b1920d..5bd462be9980 100644
--- a/dev-ruby/shoulda-context/metadata.xml
+++ b/dev-ruby/shoulda-context/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">thoughtbot/shoulda-context</remote-id>
+    <remote-id type="rubygems">shoulda-context</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/shoulda-context/shoulda-context-1.2.2-r1.ebuild b/dev-ruby/shoulda-context/shoulda-context-1.2.2-r1.ebuild
index 027669796650..9a78de8730e1 100644
--- a/dev-ruby/shoulda-context/shoulda-context-1.2.2-r1.ebuild
+++ b/dev-ruby/shoulda-context/shoulda-context-1.2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
 
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/thoughtbot/shoulda-context"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit:2
diff --git a/dev-ruby/shoulda-context/shoulda-context-2.0.0-r1.ebuild b/dev-ruby/shoulda-context/shoulda-context-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..61cc12eb8528
--- /dev/null
+++ b/dev-ruby/shoulda-context/shoulda-context-2.0.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="tasks"
+
+# Don't install the conversion script to avoid collisions with older
+# shoulda.
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Context framework extracted from Shoulda"
+HOMEPAGE="https://github.com/thoughtbot/shoulda-context"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc test"
+
+PATCHES=( "${FILESDIR}/${P}-file-exists.patch" )
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2
+	>=dev-ruby/mocha-1.0 )"
+
+all_ruby_prepare() {
+	sed -e '/\(current_bundle\|CurrentBundle\)/ s:^:#:' \
+		-e '/pry-byebug/ s:^:#:' \
+		-e '/warnings_logger/ s:^:#: ; /WarningsLogger/,/^)/ s:^:#:' \
+		-e '/rails_application_with_shoulda_context/ s:^:#:' \
+		-i test/test_helper.rb || die
+	rm -f test/shoulda/{railtie,rerun_snippet,test_framework_detection}_test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/shoulda/*_test.rb"].each { require _1 }' || die
+}
diff --git a/dev-ruby/shoulda-context/shoulda-context-2.0.0.ebuild b/dev-ruby/shoulda-context/shoulda-context-2.0.0.ebuild
new file mode 100644
index 000000000000..5a6a7399f6e7
--- /dev/null
+++ b/dev-ruby/shoulda-context/shoulda-context-2.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="tasks"
+
+# Don't install the conversion script to avoid collisions with older
+# shoulda.
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Context framework extracted from Shoulda"
+HOMEPAGE="https://github.com/thoughtbot/shoulda-context"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="doc test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2
+	>=dev-ruby/mocha-1.0 )"
+
+all_ruby_prepare() {
+	sed -e '/\(current_bundle\|CurrentBundle\)/ s:^:#:' \
+		-e '/pry-byebug/ s:^:#:' \
+		-e '/warnings_logger/ s:^:#: ; /WarningsLogger/,/^)/ s:^:#:' \
+		-e '/rails_application_with_shoulda_context/ s:^:#:' \
+		-i test/test_helper.rb || die
+	rm -f test/shoulda/{railtie,rerun_snippet,test_framework_detection}_test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/shoulda/*_test.rb"].each { require _1 }' || die
+}
diff --git a/dev-ruby/shoulda-matchers/Manifest b/dev-ruby/shoulda-matchers/Manifest
index d53346569fbf..951ec2dd21fe 100644
--- a/dev-ruby/shoulda-matchers/Manifest
+++ b/dev-ruby/shoulda-matchers/Manifest
@@ -1,5 +1,5 @@
 DIST shoulda-matchers-3.1.3.gem 208384 BLAKE2B 0ce7cb91ec8a311ecd4872ca45b178686fedb126fd5a05d55cc8654f5a40d1ed7e0a1da2b2c47c34ce3e5ed13a302a1d309f4afa67bafb37d5ed8a724945e97f SHA512 c61397d20724f3048172a8a20ef8abaeafdba3a1d5d4b923b1b11480b25c70820fd372eb2851c6eb307894bc0b7e1aae515e23a3581a83db1b65a2c778b22d67
-DIST shoulda-matchers-4.4.1.tar.gz 240423 BLAKE2B 5fca9389601f35c536fa8a37adc6a14282fdb4aba21453223d739e503fc226c74473791880d2fc0b4f308bf9deccc1bd640c320e86f586f075b5d1add69e33f2 SHA512 3103bbad862848d00f9ab8c71c20fef1fdc131c6ed13a5d6ae9e11c3da8ecd2aa09e5996f8b28ad08a5588b02ab5783dcc37d04357d13357ea3fa8ca28a02e3d
 DIST shoulda-matchers-4.5.1.tar.gz 243634 BLAKE2B 32d846d0dc3c8725a9bd0d60e858eb9fe4106a20222503ac908d1a9c9c310d8e1477aa6264f06961812151b9bd1a1a33488707d9c96524cd3431ed7b3246e534 SHA512 8c240fe7699094a63db824145ca28c245526e95d489fac82e1a28a2418ae40524ba0a184a7f9b269b7c31ad7ae2cbc24b453547cab0845639fdea442bada483a
-DIST shoulda-matchers-5.0.0.tar.gz 241021 BLAKE2B 68d70f0ac503deaf05a769b39ad905ee87108b2e2a3f5d76d23b2772c0374e83e3c5cb0b0024a771e7c04958da0b890f3b564287230fffa0d207d501bb8d4c0d SHA512 c81c514071c297a2372b05caa987fc39cf03af25ba0d7ba4ef1f23deebbad81013d80ac5b360a00f5fc0a155e75f3ff65b782c56a5682348f683ea11814ba710
-DIST shoulda-matchers-5.1.0.tar.gz 241567 BLAKE2B 5e778175ca80619b5e3da04fc235a6c68ef150e4abbe34520502fda5a86f44530dec3b0d4d448f87c30c54e062085a00bf6cfe3dee83c82825e238050480e10c SHA512 2abb23126aabc83d1787838468c1959442a32ecdafb244a6f20a08e382990a716ccf2219abee6f8121ff0a3f720e86a6775dee5ae351299416e51df12ad21b32
+DIST shoulda-matchers-5.3.0.tar.gz 244767 BLAKE2B 4a1a006702bb352acb338c71e0c3152bfce288c51d676c194ce3135d41057d119c02053c26e5e9079dee49514f3396f6f0155fd310063713a975d747221d8e34 SHA512 5794f1eafdb852732e35433b7ba06975a65ec25363b8c7dedf154644fbf65ecb8b929da538f1a49ad4e767b286f7e8910cd06fa6f41f5ccc6f0e8a62f498c56e
+DIST shoulda-matchers-6.0.0.tar.gz 256754 BLAKE2B cf231b2f331d3b2f89a4db5e3146241c1274191b2a175bb98643b6bff2732ed0373214a9bcfca8201b3374038a385ea39725528af9479d9a0e5d3feb27cec07e SHA512 c3136f5b214416f5c8a47ddfeb7467255cdacd474480294ff0a19f6eded35f4db9431560fb6716a1a1dc23605f8ec4ede398682964b11a8c5181fab2665799c0
+DIST shoulda-matchers-6.1.0.tar.gz 259348 BLAKE2B 50319c30eebea9c86642cc9942e0e8c4a21bf5359fab48fd88ec03c9df535f5bf6b65a44cfc2ab0a7bf79e3f99788ce19a76f043c8a9a8514b8f27f406d05db0 SHA512 c990f3fbbb0b505583e3a2bf0c0e09ee38fa914617e3a1952e638964df94e5ec452d6610a1437ecfae931f313dbb8df629bf516ed8bfa90d67e9fcbc6cfd0d0b
diff --git a/dev-ruby/shoulda-matchers/metadata.xml b/dev-ruby/shoulda-matchers/metadata.xml
index a4d2f2e6fc5c..4d190d2c5eab 100644
--- a/dev-ruby/shoulda-matchers/metadata.xml
+++ b/dev-ruby/shoulda-matchers/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
   <maintainer type="project">
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r1.ebuild
deleted file mode 100644
index bb1bdd9cc4d3..000000000000
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_RECIPE_TEST=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="NEWS.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-4.0.0:*"
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r2.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r2.ebuild
index cd7ae2fe058b..1291d75132f0 100644
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r2.ebuild
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
-RUBY_FAKEGEM_RECIPE_TEST=""
+RUBY_FAKEGEM_RECIPE_TEST="none"
 
 RUBY_FAKEGEM_EXTRAINSTALL="NEWS.md README.md"
 
@@ -18,7 +18,6 @@ HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 ruby_add_rdepend ">=dev-ruby/activesupport-4.0.0:*"
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-4.4.1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-4.4.1.ebuild
deleted file mode 100644
index d0c989b52cd9..000000000000
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-4.4.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
-SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
-
-all_ruby_prepare() {
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/s.files/,/^  end/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-4.5.1-r1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-4.5.1-r1.ebuild
index 2353fb1f39ed..dcca6f261291 100644
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-4.5.1-r1.ebuild
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-4.5.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
@@ -21,8 +21,7 @@ SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
 
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-5.0.0.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-5.0.0.ebuild
deleted file mode 100644
index 076c24445e44..000000000000
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-5.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
-SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
-
-all_ruby_prepare() {
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-	#sed -i -e '/s.files/,/^  end/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-5.1.0.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-5.1.0.ebuild
deleted file mode 100644
index ff1abe80e35a..000000000000
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-5.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
-SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-5.2.0:*"
-
-all_ruby_prepare() {
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-	#sed -i -e '/s.files/,/^  end/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-5.3.0.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-5.3.0.ebuild
new file mode 100644
index 000000000000..9cfecde2e3e8
--- /dev/null
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-5.3.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRAINSTALL="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Making tests easy on the fingers and eyes"
+HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
+SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+
+# Fedora manage to run the tests, but it's still pretty tricky.
+# https://src.fedoraproject.org/rpms/rubygem-shoulda-matchers/blob/rawhide/f/rubygem-shoulda-matchers.spec
+RESTRICT="test"
+
+ruby_add_rdepend ">=dev-ruby/activesupport-5.2.0:*"
+
+all_ruby_prepare() {
+	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
+
+	#rm Gemfile.lock || die
+
+	# Avoid Appraisal and Bundler.
+	#sed -i "/current_bundle/ s/^/#/" \
+	#	spec/acceptance_spec_helper.rb \
+	#	spec/support/unit/load_environment.rb || die
+	#sed -i "/CurrentBundle/ s/^/#/" \
+	#	spec/acceptance_spec_helper.rb \
+	#	spec/support/unit/load_environment.rb || die
+
+	# Avoid git and sprockets dependencies.
+	#sed -i '/def rails_new_command/,/^    end$/ {
+	#	/rails new/ s/"$/ --skip-git --skip-asset-pipeline&/
+	#}' spec/support/unit/rails_application.rb || die
+	#sed -i '/def rails_new_command/,/^    end$/ {
+	#	/rails new/ s/"$/ --skip-git --skip-asset-pipeline&/
+	#}' spec/support/acceptance/helpers/step_helpers.rb || die
+}
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-6.0.0.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-6.0.0.ebuild
new file mode 100644
index 000000000000..2e226c418752
--- /dev/null
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-6.0.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRAINSTALL="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Making tests easy on the fingers and eyes"
+HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
+SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Fedora manage to run the tests, but it's still pretty tricky.
+# https://src.fedoraproject.org/rpms/rubygem-shoulda-matchers/blob/rawhide/f/rubygem-shoulda-matchers.spec
+RESTRICT="test"
+
+ruby_add_rdepend ">=dev-ruby/activesupport-5.2.0:*"
+
+all_ruby_prepare() {
+	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
+
+	#rm Gemfile.lock || die
+
+	# Avoid Appraisal and Bundler.
+	#sed -i "/current_bundle/ s/^/#/" \
+	#	spec/acceptance_spec_helper.rb \
+	#	spec/support/unit/load_environment.rb || die
+	#sed -i "/CurrentBundle/ s/^/#/" \
+	#	spec/acceptance_spec_helper.rb \
+	#	spec/support/unit/load_environment.rb || die
+
+	# Avoid git and sprockets dependencies.
+	#sed -i '/def rails_new_command/,/^    end$/ {
+	#	/rails new/ s/"$/ --skip-git --skip-asset-pipeline&/
+	#}' spec/support/unit/rails_application.rb || die
+	#sed -i '/def rails_new_command/,/^    end$/ {
+	#	/rails new/ s/"$/ --skip-git --skip-asset-pipeline&/
+	#}' spec/support/acceptance/helpers/step_helpers.rb || die
+}
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-6.1.0.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-6.1.0.ebuild
new file mode 100644
index 000000000000..2e226c418752
--- /dev/null
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-6.1.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRAINSTALL="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Making tests easy on the fingers and eyes"
+HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
+SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Fedora manage to run the tests, but it's still pretty tricky.
+# https://src.fedoraproject.org/rpms/rubygem-shoulda-matchers/blob/rawhide/f/rubygem-shoulda-matchers.spec
+RESTRICT="test"
+
+ruby_add_rdepend ">=dev-ruby/activesupport-5.2.0:*"
+
+all_ruby_prepare() {
+	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
+
+	#rm Gemfile.lock || die
+
+	# Avoid Appraisal and Bundler.
+	#sed -i "/current_bundle/ s/^/#/" \
+	#	spec/acceptance_spec_helper.rb \
+	#	spec/support/unit/load_environment.rb || die
+	#sed -i "/CurrentBundle/ s/^/#/" \
+	#	spec/acceptance_spec_helper.rb \
+	#	spec/support/unit/load_environment.rb || die
+
+	# Avoid git and sprockets dependencies.
+	#sed -i '/def rails_new_command/,/^    end$/ {
+	#	/rails new/ s/"$/ --skip-git --skip-asset-pipeline&/
+	#}' spec/support/unit/rails_application.rb || die
+	#sed -i '/def rails_new_command/,/^    end$/ {
+	#	/rails new/ s/"$/ --skip-git --skip-asset-pipeline&/
+	#}' spec/support/acceptance/helpers/step_helpers.rb || die
+}
diff --git a/dev-ruby/shoulda/Manifest b/dev-ruby/shoulda/Manifest
index ed2a8d37e25d..28daf91eead2 100644
--- a/dev-ruby/shoulda/Manifest
+++ b/dev-ruby/shoulda/Manifest
@@ -1,2 +1,2 @@
-DIST shoulda-2.11.3.tar.gz 145068 BLAKE2B 5e6d9b78b255612ec18c78076f9c4d45265a3e02a8fd56a127ea8f235e3b344005942c4b6e53014e6328206501c178ce76e1554a9d995ba0de04f5afefe4a0f7 SHA512 0b347c4a8be177b5806364114c25dc786ca2ac95a11c93a723dbc9ea1f6d8ae62df7fb420a52d477cd1e10e8d894074072a040eef36ee8a43440e5256c8427e4
 DIST shoulda-3.6.0.tar.gz 22691 BLAKE2B 798b88e208355b0325b9e8b48f66687ad2702e1b5fc058d45504648fe7c7760b018eaf3d1c7bd45c68656c7bbba8fccc9b74d72003ee0b78ac53a277567609bb SHA512 10f7c6801eaabafa08eb2bc9c4d2a96237d4494aee7d40e5db8cf9c1abd8cccfe86aa21b0e68e2ec42cf222d285cdbec11ed2fdd804ffb8bd65ffd2efa3e72ac
+DIST shoulda-4.0.0.tar.gz 17408 BLAKE2B 8e5bd8b5a01292d8c08f76434496a3e99669f4c02c35092e17f4216a8164867f476c6a596a9f1986416106f21daa0d0b24ddb2d04be13c8b2583e98715301bf8 SHA512 850cc685d055ae1e7367f48e963d2839fee3c48a076e079bf3e1c6de2e30d808e78c07c425d0bbcf7ceaeeb944dc647c4f11ceac1ca48134b6b8b555fda53bfe
diff --git a/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild b/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild
deleted file mode 100644
index 57b50f9e1b02..000000000000
--- a/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTION_GUIDELINES.rdoc README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC=shoulda.gemspec
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="http://thoughtbot.com/projects/shoulda"
-SRC_URI="https://github.com/thoughtbot/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-RUBY_S="thoughtbot-${PN}-*"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# tests seem to be quite broken :( They require working version of
-# various rails versions. There appear to be unit and matcher tests but
-# they can't be run on their own.
-RESTRICT=test
diff --git a/dev-ruby/shoulda/shoulda-3.6.0-r1.ebuild b/dev-ruby/shoulda/shoulda-3.6.0-r1.ebuild
deleted file mode 100644
index 88a3b81ac991..000000000000
--- a/dev-ruby/shoulda/shoulda-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="http://thoughtbot.com/projects/shoulda"
-SRC_URI="https://github.com/thoughtbot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-# This now more or less a meta-gem and it only contains features for
-# integration tests using Appraisals, which we don't currently package.
-RESTRICT=test
-
-ruby_add_rdepend ">=dev-ruby/shoulda-context-1.0.1
-	dev-ruby/shoulda-matchers:3"
-
-all_ruby_prepare() {
-	sed -e '/executables/,/^  end/d ; /test_files/d; s/git ls-files/find . -print/' -i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/shoulda/shoulda-3.6.0-r2.ebuild b/dev-ruby/shoulda/shoulda-3.6.0-r2.ebuild
index ffa03c933f02..00c8a7e1334a 100644
--- a/dev-ruby/shoulda/shoulda-3.6.0-r2.ebuild
+++ b/dev-ruby/shoulda/shoulda-3.6.0-r2.ebuild
@@ -1,9 +1,9 @@
-# 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"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/thoughtbot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 # This now more or less a meta-gem and it only contains features for
diff --git a/dev-ruby/shoulda/shoulda-3.6.0-r3.ebuild b/dev-ruby/shoulda/shoulda-3.6.0-r3.ebuild
new file mode 100644
index 000000000000..dc60ed190d3a
--- /dev/null
+++ b/dev-ruby/shoulda/shoulda-3.6.0-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Making tests easy on the fingers and eyes"
+HOMEPAGE="https://github.com/thoughtbot/shoulda"
+SRC_URI="https://github.com/thoughtbot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+# This now more or less a meta-gem and it only contains features for
+# integration tests using Appraisals, which we don't currently package.
+RESTRICT=test
+
+ruby_add_rdepend ">=dev-ruby/shoulda-context-1.0.1:0
+	dev-ruby/shoulda-matchers:3"
+
+all_ruby_prepare() {
+	sed -e '/executables/,/^  end/d ; /test_files/d; s/git ls-files/find * -print/' -i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/shoulda/shoulda-4.0.0.ebuild b/dev-ruby/shoulda/shoulda-4.0.0.ebuild
new file mode 100644
index 000000000000..87c0b420b2b1
--- /dev/null
+++ b/dev-ruby/shoulda/shoulda-4.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Making tests easy on the fingers and eyes"
+HOMEPAGE="https://github.com/thoughtbot/shoulda"
+SRC_URI="https://github.com/thoughtbot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# This now more or less a meta-gem and it only contains features for
+# integration tests using Appraisals, which we don't currently package.
+RESTRICT=test
+
+ruby_add_rdepend "
+	dev-ruby/shoulda-context:2
+	dev-ruby/shoulda-matchers:4"
+
+all_ruby_prepare() {
+	sed -e '/executables/,/^  end/d ; /test_files/d; s/git ls-files/find * -print/' -i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/sigar/Manifest b/dev-ruby/sigar/Manifest
deleted file mode 100644
index 9405c0d5a6d6..000000000000
--- a/dev-ruby/sigar/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sigar-0.7.3.gem 205312 BLAKE2B 1a1d526e2f60a4a91ef405bbb7bf6aede2d4707631108f2779dfd1533d345b9e2c1fb586aa748d13ff1f7cb0b228e34618a0e8d549a3b4b4dc44a37684f2e970 SHA512 cdab3ec8b9662bfa3a432f0206c34c99c6e6e0ac5c85a93cb472367a9f325a27d5232bf2166f5c2955817e3ab8bd1035db06aad709ce20cc261f1b15d89dea2a
diff --git a/dev-ruby/sigar/metadata.xml b/dev-ruby/sigar/metadata.xml
deleted file mode 100644
index 658c72b1920d..000000000000
--- a/dev-ruby/sigar/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/sigar/sigar-0.7.3-r1.ebuild b/dev-ruby/sigar/sigar-0.7.3-r1.ebuild
deleted file mode 100644
index 5a197ce6e33b..000000000000
--- a/dev-ruby/sigar/sigar-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST=""
-RUBY_FAKEGEM_EXTRADOC="README"
-RUBY_FAKEGEM_EXTENSIONS=(bindings/ruby/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="System Information Gatherer And Reporter"
-HOMEPAGE="http://sigar.hyperic.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND+=" || ( <sys-libs/glibc-2.26 net-libs/libtirpc )"
-
-all_ruby_prepare() {
-	sed -i -e '25i$CFLAGS += " -std=gnu89 -I/usr/include/tirpc"' \
-		-e '25i$LDFLAGS += " -ltirpc"' bindings/ruby/extconf.rb || die
-
-	# Fix compatibility with glibc 2.25
-	sed -i -e '26i#include <sys/sysmacros.h>' \
-		-e '27i#include <ctype.h>' bindings/ruby/rbsigar.c src/os/linux/linux_sigar.c || die
-}
diff --git a/dev-ruby/sigdump/Manifest b/dev-ruby/sigdump/Manifest
index 66de317f1079..3ed07b3b9bf6 100644
--- a/dev-ruby/sigdump/Manifest
+++ b/dev-ruby/sigdump/Manifest
@@ -1 +1 @@
-DIST sigdump-0.2.4.gem 9216 BLAKE2B 66c3d61eca7f1288de6d95e8d0376d27ab39fee6e5168430801d0f2016f6488eb20cc92e83967d69f690e5ff064952d2696ed08ecd0ab0c4e98c61fdfdbf38cf SHA512 c079f538d3e4e1af61325f18b0580a8d92869800736fc770bc7b193358df480105f1ff223158d52e62ea272e1c375be82ab6415b43c28cc1d74c57cc7640d9cd
+DIST sigdump-0.2.5.gem 12288 BLAKE2B 6d0fa601b9df6c1b3e6bf7d95c1e36a24a01f4b68f37b2e897ba9e0bcd27caa7ec7c96155cd62718deac7958541e9029148bb0ccdfdd8836e26d47dd9a565891 SHA512 2400403768f4606cb21a3fc34b4630800846ef5ad4c06f1bfca3b04fb62208bfd48a53f1f090b8c65858b49d1bf594c42f555c2f997534129793773c837cfa73
diff --git a/dev-ruby/sigdump/metadata.xml b/dev-ruby/sigdump/metadata.xml
index 658c72b1920d..f51aa85da01a 100644
--- a/dev-ruby/sigdump/metadata.xml
+++ b/dev-ruby/sigdump/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">fluent/sigdump</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/sigdump/sigdump-0.2.4-r1.ebuild b/dev-ruby/sigdump/sigdump-0.2.4-r1.ebuild
deleted file mode 100644
index 5ded826a80f4..000000000000
--- a/dev-ruby/sigdump/sigdump-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Setup signal handler which dumps backtrace of threads and allocated objects"
-HOMEPAGE="https://github.com/frsyuki/sigdump"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
diff --git a/dev-ruby/sigdump/sigdump-0.2.5.ebuild b/dev-ruby/sigdump/sigdump-0.2.5.ebuild
new file mode 100644
index 000000000000..e2db6b3450e7
--- /dev/null
+++ b/dev-ruby/sigdump/sigdump-0.2.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Setup signal handler which dumps backtrace of threads and allocated objects"
+HOMEPAGE="https://github.com/fluent/sigdump"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
diff --git a/dev-ruby/simple-rss/metadata.xml b/dev-ruby/simple-rss/metadata.xml
index daac6fdb7252..e4a8abc9cfb7 100644
--- a/dev-ruby/simple-rss/metadata.xml
+++ b/dev-ruby/simple-rss/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">cardmagic/simple-rss</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/simple-rss/simple-rss-1.3.3-r1.ebuild b/dev-ruby/simple-rss/simple-rss-1.3.3-r1.ebuild
index 42fe41ebb5fe..3b80840365a2 100644
--- a/dev-ruby/simple-rss/simple-rss-1.3.3-r1.ebuild
+++ b/dev-ruby/simple-rss/simple-rss-1.3.3-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC="doc"
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
@@ -14,7 +14,7 @@ DESCRIPTION="A simple, flexible, extensible, and liberal RSS and Atom reader for
 HOMEPAGE="https://github.com/cardmagic/simple-rss"
 LICENSE="LGPL-2"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/simple-rss/simple-rss-1.3.3.ebuild b/dev-ruby/simple-rss/simple-rss-1.3.3.ebuild
deleted file mode 100644
index 3f9cd88cea72..000000000000
--- a/dev-ruby/simple-rss/simple-rss-1.3.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple, flexible, extensible, and liberal RSS and Atom reader for Ruby"
-HOMEPAGE="https://github.com/cardmagic/simple-rss"
-LICENSE="LGPL-2"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid dependency on bundler
-	sed -i -e '/bundler/d' \
-		-e '/rubyforgepublisher/I s:^:#:' \
-		Rakefile || die
-
-	# Avoid tests that require unpackaged test data
-	sed -i -e '/@\(media_rss\|rss20_utf8\)/ s:^:#:' \
-		-e '/test_rss_utf8/aomit "missing data"' \
-		test/base/base_test.rb || die
-}
diff --git a/dev-ruby/simple_oauth/simple_oauth-0.3.1-r1.ebuild b/dev-ruby/simple_oauth/simple_oauth-0.3.1-r1.ebuild
index d9033969aa22..dd7f12d1d5b1 100644
--- a/dev-ruby/simple_oauth/simple_oauth-0.3.1-r1.ebuild
+++ b/dev-ruby/simple_oauth/simple_oauth-0.3.1-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/laserlemon/simple_oauth/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/simplecov-html/Manifest b/dev-ruby/simplecov-html/Manifest
index 341008caf600..1a3d8a02a52c 100644
--- a/dev-ruby/simplecov-html/Manifest
+++ b/dev-ruby/simplecov-html/Manifest
@@ -1,3 +1 @@
-DIST simplecov-html-0.10.2.gem 183296 BLAKE2B f4edfe25249927d46f32d422b004d8a03671926792ea78016864764242f8bf8dc9131a0580b9519db6798beb3fa093f79a0d585b63d6b6b62c9faf7ae94087e8 SHA512 141b9d55ca7cbf1bb64616482828107c7c33c7d6db1b5650ae9d463e5ece7a7fb56d123c539c7364fe2a35e5faea382620a0b34e337d4c9d4871caafc794a967
-DIST simplecov-html-0.11.0.gem 184832 BLAKE2B d70fa7688752d0286fc72de57352169749a78737b9ecd97bb735d26951476c872eac87c4a41eb9dd5fa4513474c21071750accaff6297c6d8a4f31206a36364b SHA512 2971769d9bd5d84229ca074fbefab5223874946062804bc4ce195b1773e96d374338908684b72a0b33c2d37ee6778ca01de888b09d856944f018aec6ac7365d5
 DIST simplecov-html-0.12.3.gem 336896 BLAKE2B 94cfbae7085163ba714b2bdf14b7c5eb1a4bc5fcf39d7e99689d74bb1e693d5b534ca067ba5609f6cfecdba64667dc514b4f5dede020aea176ae2328d1806ea0 SHA512 7fd6dad02b16f512d7fb859f62e5e8bd0a277af103c7829143795ccae60a9a057c323728ac36a1c42dbd143a2f0d175648f6e223e6e7e3e6394a52491d3733af
diff --git a/dev-ruby/simplecov-html/metadata.xml b/dev-ruby/simplecov-html/metadata.xml
index 6af8b28166ad..aa09779b502d 100644
--- a/dev-ruby/simplecov-html/metadata.xml
+++ b/dev-ruby/simplecov-html/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">colszowka/simplecov</remote-id>
+    <remote-id type="github">simplecov-ruby/simplecov</remote-id>
+    <remote-id type="rubygems">simplecov-html</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/simplecov-html/simplecov-html-0.10.2.ebuild b/dev-ruby/simplecov-html/simplecov-html-0.10.2.ebuild
deleted file mode 100644
index b0863b436354..000000000000
--- a/dev-ruby/simplecov-html/simplecov-html-0.10.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets public views"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Generates a HTML report of your SimpleCov ruby code coverage results"
-HOMEPAGE="https://github.com/colszowka/simplecov"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0.10"
-IUSE="doc"
diff --git a/dev-ruby/simplecov-html/simplecov-html-0.11.0.ebuild b/dev-ruby/simplecov-html/simplecov-html-0.11.0.ebuild
deleted file mode 100644
index 6e974d8d79eb..000000000000
--- a/dev-ruby/simplecov-html/simplecov-html-0.11.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets public views"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Generates a HTML report of your SimpleCov ruby code coverage results"
-HOMEPAGE="https://github.com/colszowka/simplecov"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1-2)"
-IUSE="doc"
diff --git a/dev-ruby/simplecov-html/simplecov-html-0.12.3-r1.ebuild b/dev-ruby/simplecov-html/simplecov-html-0.12.3-r1.ebuild
new file mode 100644
index 000000000000..909e1f573bcd
--- /dev/null
+++ b/dev-ruby/simplecov-html/simplecov-html-0.12.3-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets public views"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Generates a HTML report of your SimpleCov ruby code coverage results"
+HOMEPAGE="https://github.com/simplecov-ruby/simplecov-html"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+SLOT="$(ver_cut 1-2)"
+IUSE="doc"
diff --git a/dev-ruby/simplecov-html/simplecov-html-0.12.3.ebuild b/dev-ruby/simplecov-html/simplecov-html-0.12.3.ebuild
deleted file mode 100644
index 0987aea03092..000000000000
--- a/dev-ruby/simplecov-html/simplecov-html-0.12.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets public views"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Generates a HTML report of your SimpleCov ruby code coverage results"
-HOMEPAGE="https://github.com/colszowka/simplecov"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~riscv"
-SLOT="$(ver_cut 1-2)"
-IUSE="doc"
diff --git a/dev-ruby/simplecov/Manifest b/dev-ruby/simplecov/Manifest
index c119b765e596..faa4da37e6cc 100644
--- a/dev-ruby/simplecov/Manifest
+++ b/dev-ruby/simplecov/Manifest
@@ -1 +1 @@
-DIST simplecov-0.19.1.tar.gz 107430 BLAKE2B 0f18cd4c8ddfd324f4e3326ad8503530862f0ae67658865183984b81a59ad9aa5fcf650fa9f64fa6841ea23afa07d25e38443a79ad0be26b966fa99b6805a090 SHA512 2d781008769abd79020be96f7c1f91cfb9f27d51d00436f737c408a9b9d57a82955cbe5ba5ee5a628b9a7e8835d9b3e1542b67499355373c4f9b2638bee83235
+DIST simplecov-0.22.0.tar.gz 115236 BLAKE2B d013f254d534ddd1ad273e2a6990c7ec96710cef106c73ecaba18c04ac5922bad52e086f11bf019abb21dd6cfc2f4b02e058b5042029716c6e3ed64e1c35993a SHA512 ba7e1a29a219337c1e00d055408d825b20a7b81ec4768612d9d5e8a18af08d47d86a42cee78c64ae0f431196136b5dd522364882d83e5210366d8aa03d5c54b4
diff --git a/dev-ruby/simplecov/files/simplecov-0.22.0-ruby32-gentoo.patch b/dev-ruby/simplecov/files/simplecov-0.22.0-ruby32-gentoo.patch
new file mode 100644
index 000000000000..293fbe51d747
--- /dev/null
+++ b/dev-ruby/simplecov/files/simplecov-0.22.0-ruby32-gentoo.patch
@@ -0,0 +1,19 @@
+This test is only activated for >= ruby32 because ruby32 adds support
+for assessing coverage within an eval. But the failure isn't anything
+to do with eval.
+
+The test tries to call 'ruby' which in Gentoo isn't (yet!) wrapped,
+so it ends up calling an older Ruby which then results in 0 coverage
+being found. Replace it with a string we can safely sed with the
+correct Ruby per-test.
+--- a/spec/coverage_for_eval_spec.rb
++++ b/spec/coverage_for_eval_spec.rb
+@@ -16,7 +16,7 @@ RSpec.describe "coverage for eval" do
+     end
+ 
+     context "foo" do
+-      let(:command) { "ruby eval_test.rb" }
++      let(:command) { "@GENTOO_RUBY@ eval_test.rb" }
+ 
+       it "records coverage for erb" do
+         expect(@stdout).to include(" 2 / 3 LOC")
diff --git a/dev-ruby/simplecov/simplecov-0.19.1.ebuild b/dev-ruby/simplecov/simplecov-0.19.1.ebuild
deleted file mode 100644
index 89da8c8d6181..000000000000
--- a/dev-ruby/simplecov/simplecov-0.19.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_GEMSPEC="simplecov.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Code coverage with a configuration library and merging across test suites"
-HOMEPAGE="https://github.com/simplecov-ruby/simplecov"
-SRC_URI="https://github.com/simplecov-ruby/simplecov/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~riscv"
-SLOT="0.8"
-IUSE="doc"
-
-ruby_add_rdepend "
-	dev-ruby/simplecov-html:0.12
-	>=dev-ruby/docile-1.1:0"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/rspec:3
-	dev-ruby/test-unit:2
-)"
-
-# There are also cucumber tests that require poltergeist and unpackaged phantomjs gem.
-
-all_ruby_prepare() {
-	# Avoid test depending on spawning ruby and having timing issues
-	sed -i -e '/blocks other processes/askip "gentoo"' spec/result_merger_spec.rb || die
-
-	sed -i -e '5i require "bundler"' spec/helper.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec spec/*spec.rb || die
-
-	#${RUBY} -S cucumber features || die
-}
diff --git a/dev-ruby/simplecov/simplecov-0.22.0.ebuild b/dev-ruby/simplecov/simplecov-0.22.0.ebuild
new file mode 100644
index 000000000000..62da02883a20
--- /dev/null
+++ b/dev-ruby/simplecov/simplecov-0.22.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_GEMSPEC="simplecov.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Code coverage with a configuration library and merging across test suites"
+HOMEPAGE="https://github.com/simplecov-ruby/simplecov"
+SRC_URI="https://github.com/simplecov-ruby/simplecov/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+SLOT="0.8"
+IUSE="doc"
+
+ruby_add_rdepend "
+	dev-ruby/simplecov-html:0.12
+	>=dev-ruby/simplecov_json_formatter-0.1:0
+	>=dev-ruby/docile-1.1:0"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/rspec:3
+	dev-ruby/test-unit:2
+)"
+
+# There are also cucumber tests that require poltergeist and unpackaged phantomjs gem.
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.22.0-ruby32-gentoo.patch
+)
+
+all_ruby_prepare() {
+	# Avoid test depending on spawning ruby and having timing issues
+	sed -i -e '/blocks other processes/askip "gentoo"' spec/result_merger_spec.rb || die
+
+	sed -i -e '5i require "bundler"' spec/helper.rb || die
+
+	sed -e '/start_coverage_measurement/,/^  end/ s|with(lines: true)|with({lines: true})|' \
+		-e '/start_coverage_measurement/,/^  end/ s|with(lines: true, branches: true)|with({lines: true, branches: true})|' \
+		-i spec/simplecov_spec.rb || die
+}
+
+each_ruby_test() {
+	sed -i -e "s:@GENTOO_RUBY@:${RUBY}:" spec/coverage_for_eval_spec.rb || die
+	RUBYLIB="${S}/lib" RSPEC_VERSION=3 ruby-ng_rspec spec/ || die
+}
diff --git a/dev-ruby/simplecov_json_formatter/Manifest b/dev-ruby/simplecov_json_formatter/Manifest
new file mode 100644
index 000000000000..1bb9762f6cd8
--- /dev/null
+++ b/dev-ruby/simplecov_json_formatter/Manifest
@@ -0,0 +1 @@
+DIST simplecov_json_formatter-0.1.4.gem 6656 BLAKE2B 57a03ca27911ed798ec2aa7e84a8d037e4565b0b9fec261d0a72d9276355ba27eb8fedea31195bc8b6e6b67b94b9a5f903f326720b862a46790bacd282e83c63 SHA512 1b90167acf4ad9565084488b455ee25ab8930a70a849191228e2868c15f29d257dc5256bb578e11351a942d887dcdeda9191a541cd0fb70e3f0eb8466fb13ddf
diff --git a/dev-ruby/simplecov_json_formatter/metadata.xml b/dev-ruby/simplecov_json_formatter/metadata.xml
new file mode 100644
index 000000000000..0670a7dfae0d
--- /dev/null
+++ b/dev-ruby/simplecov_json_formatter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">codeclimate-community/simplecov_json_formatter</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/simplecov_json_formatter/simplecov_json_formatter-0.1.4.ebuild b/dev-ruby/simplecov_json_formatter/simplecov_json_formatter-0.1.4.ebuild
new file mode 100644
index 000000000000..7ca5c11b4f4c
--- /dev/null
+++ b/dev-ruby/simplecov_json_formatter/simplecov_json_formatter-0.1.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="JSON formatter for SimpleCov"
+HOMEPAGE="https://github.com/codeclimate-community/simplecov_json_formatter"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+SLOT="$(ver_cut 1)"
+IUSE="doc"
+
+# Not packaged in the gem and very fragile for e.g. simplecov versions
+RESTRICT="test"
diff --git a/dev-ruby/simpleidn/simpleidn-0.2.1-r1.ebuild b/dev-ruby/simpleidn/simpleidn-0.2.1-r1.ebuild
index e3aae6c410ce..3a3d0a7ed145 100644
--- a/dev-ruby/simpleidn/simpleidn-0.2.1-r1.ebuild
+++ b/dev-ruby/simpleidn/simpleidn-0.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/sinatra-partial/Manifest b/dev-ruby/sinatra-partial/Manifest
deleted file mode 100644
index 9e03f313c77c..000000000000
--- a/dev-ruby/sinatra-partial/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sinatra-partial-1.0.1.gem 16384 BLAKE2B d129940c425a7e1b079860ab5c9f6459c39fc04d4256a0c1a5f25bcb9f3198133c897bd4b447429cd1e5ef11fdbaffa8d8b9384898d80d2564cbadb08e2131cd SHA512 04fb0826cdc9f6d8ce6ae8d80a9eafb3b0b37136fcecfb3f5e45a1bac101dac0486168473ff66de75979a5153d4efbdce17b63d774f5ddcd0e7fa251df0da1bd
diff --git a/dev-ruby/sinatra-partial/metadata.xml b/dev-ruby/sinatra-partial/metadata.xml
deleted file mode 100644
index 658c72b1920d..000000000000
--- a/dev-ruby/sinatra-partial/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/sinatra-partial/sinatra-partial-1.0.1-r1.ebuild b/dev-ruby/sinatra-partial/sinatra-partial-1.0.1-r1.ebuild
deleted file mode 100644
index a93ff2f77947..000000000000
--- a/dev-ruby/sinatra-partial/sinatra-partial-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.markdown README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Just the partials helper in a gem"
-HOMEPAGE="https://github.com/yb66/Sinatra-Partial"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/sinatra-1.4"
-
-ruby_add_bdepend "test? ( dev-ruby/haml dev-ruby/rack-test dev-ruby/rspec-its dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index cdb58e6d0774..2631da1f397a 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -1 +1,4 @@
-DIST sinatra-2.2.0.tar.gz 513752 BLAKE2B e407b9241cab27e326c0a2d4d83593e292de902b6ed19a12f17b0cd114230b0d10f1ffaa8f8b8237d17b547c7e012c57456af357019b228f3d7a88847220cf33 SHA512 be9432a8efa93578accc836cd0fecca128e56989d8596f1b3d33d2d956e90acd80244b98473fff2adae13ed4a1e933c41e73c80755a6f3418a65cdf33c011145
+DIST sinatra-3.0.5.tar.gz 266205 BLAKE2B 16e0631ed49e62610c7bc1e43f03f21f57ee968b0f3ac98b599748e9572cc0bfc9121dc8731a0dcc9dd1bce04837373f93f198bff56c0de9f50932711b4040e8 SHA512 9ec41c3f0c4e4faaa181fddb2fe3262796a29e93fc07349422ca20dc845632c127c3e82e67f16ca19d2b2bcd43ad48fdca918d70b6747d8a2088ce1c84fd8eb2
+DIST sinatra-3.0.6.tar.gz 268815 BLAKE2B 2993a4c28ad4559e65e6e0dc4e5f9bc25f4118f1f0d5462e0469808e873197823a13f682abb4762426860322df4408faddde037f120d370d0e206abc2b1753ef SHA512 83643b634d2a992144ced65fc1466fded29bf6fae2e20f359b2d440c46013df26f4595f842cbed36319c5278beb77383eea6ac6eb4281f508501cee4e1c6e67a
+DIST sinatra-3.1.0.tar.gz 272066 BLAKE2B 4bae4e3356adaec8f347dfc25ab9311f6740ff4f5c1486c7230269df0154e8127a4f61f6ebf47098f24848381a6e8e82429184c431cfb89c8beb9e4838135456 SHA512 b0b82a5319caf5768c830b2929f76a4fc9414adff4c32d6723a439747f756d2467c12b1391557a1afe31e5f8eab99872a51dadb59cf1cf8ace373e7a92dd5eb2
+DIST sinatra-3.2.0.tar.gz 273145 BLAKE2B 5d995e3deec3ff9dfe577a7ee816b69321dbc6848e69688c2b0781fbe6440f72eb7a589e0a5609f0f747200bf634e8472006587867e47d30779eb9bdbd4e4cde SHA512 7fa684a1f7f39ad764ae1c6ad304df9020187817d9e6982c1670cb23e7ff03df1968608cfedac13442b59e13032b567e5b46ea7168015f9ff1b40d3b3d3ebd68
diff --git a/dev-ruby/sinatra/metadata.xml b/dev-ruby/sinatra/metadata.xml
index 658c72b1920d..a14add969f1a 100644
--- a/dev-ruby/sinatra/metadata.xml
+++ b/dev-ruby/sinatra/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sinatra/sinatra</remote-id>
+    <remote-id type="rubygems">sinatra</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/sinatra/sinatra-2.2.0.ebuild b/dev-ruby/sinatra/sinatra-2.2.0.ebuild
deleted file mode 100644
index e1b5bdf64a8e..000000000000
--- a/dev-ruby/sinatra/sinatra-2.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-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="http://www.sinatrarb.com/"
-SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/mustermann:1
-	dev-ruby/rack:2.2
-	~dev-ruby/rack-protection-${PV}
-	dev-ruby/tilt:2"
-ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder <dev-ruby/activesupport-7 )"
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	sed -i -e '/active_support\/core_ext\/hash/igem "activesupport", "<7"' test/helper.rb || die
-}
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..d0af42498ea2
--- /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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~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/sinatra/sinatra-3.0.6.ebuild b/dev-ruby/sinatra/sinatra-3.0.6.ebuild
new file mode 100644
index 000000000000..021ceb5a53ff
--- /dev/null
+++ b/dev-ruby/sinatra/sinatra-3.0.6.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="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~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() {
+	sed -i \
+		-e "/require 'rack'/igem 'rack', '~> 2.2', '>= 2.2.4'" \
+		-e '/active_support\/core_ext\/hash/igem "activesupport", "<7"' \
+		test/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/sinatra/sinatra-3.1.0.ebuild b/dev-ruby/sinatra/sinatra-3.1.0.ebuild
new file mode 100644
index 000000000000..685935e657d0
--- /dev/null
+++ b/dev-ruby/sinatra/sinatra-3.1.0.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="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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~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() {
+	sed -i \
+		-e "/require 'rack'/igem 'rack', '~> 2.2', '>= 2.2.4'" \
+		-e '/active_support\/core_ext\/hash/igem "activesupport", "<7"' \
+		test/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/sinatra/sinatra-3.2.0.ebuild b/dev-ruby/sinatra/sinatra-3.2.0.ebuild
new file mode 100644
index 000000000000..a3d628baf4bd
--- /dev/null
+++ b/dev-ruby/sinatra/sinatra-3.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/mustermann:3
+	>=dev-ruby/rack-2.2.4:2.2
+	~dev-ruby/rack-protection-${PV}
+	dev-ruby/tilt:2"
+
+# dev-ruby/haml is an optional test dependency, but it will lead to
+# circular dependencies so we don't require it for tests.
+ruby_add_bdepend "
+	test? (
+		dev-ruby/builder
+		dev-ruby/erubi
+		>=dev-ruby/rack-test-0.5.6
+		dev-ruby/activesupport
+	)
+"
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e "/require 'rack'/igem 'rack', '~> 2.2', '>= 2.2.4'" \
+		test/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/singleton/Manifest b/dev-ruby/singleton/Manifest
new file mode 100644
index 000000000000..f8acd5f1b3ee
--- /dev/null
+++ b/dev-ruby/singleton/Manifest
@@ -0,0 +1,2 @@
+DIST singleton-0.1.1.tar.gz 4975 BLAKE2B 3957c7d622aaad6a71b5675ad950b2a4622ec520b59075df25a966609e54c2f47581ba35c5a004c67a1a36f50de13dacadbc96ee1fd113790e6793e97131787c SHA512 a0817b42e8b056488b999eca8de09d75efe79e5624f4817289164d90051c92279dc9f8a087e69df89bec913127c460b8b6586fde17b73e08d4ec5b6da4dec18d
+DIST singleton-0.2.0.tar.gz 5179 BLAKE2B 8d0ed2fb38ff8fc8bd5da3969c4e0dcc3c5556b69dfa7faceb9d02d80b69d902418d54b8a313188927938adb1431fa593aaea0249109c34b809c6d3a35ba08b4 SHA512 e6c827f277754fc20722afbf20c67b22fc44095337777e69afa0eff8c88390be86741b244ee35124fc2684fbe048d439dfe96499617ec672275fdd7e64d36e43
diff --git a/dev-ruby/singleton/metadata.xml b/dev-ruby/singleton/metadata.xml
new file mode 100644
index 000000000000..2c38c2ef94ba
--- /dev/null
+++ b/dev-ruby/singleton/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/singleton</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/singleton/singleton-0.1.1.ebuild b/dev-ruby/singleton/singleton-0.1.1.ebuild
new file mode 100644
index 000000000000..6756244a043b
--- /dev/null
+++ b/dev-ruby/singleton/singleton-0.1.1.ebuild
@@ -0,0 +1,31 @@
+# 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_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="singleton.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The Singleton module implements the Singleton pattern"
+HOMEPAGE="https://github.com/ruby/singleton"
+SRC_URI="https://github.com/ruby/singleton/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/singleton/singleton-0.2.0.ebuild b/dev-ruby/singleton/singleton-0.2.0.ebuild
new file mode 100644
index 000000000000..7d16b1739029
--- /dev/null
+++ b/dev-ruby/singleton/singleton-0.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="singleton.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The Singleton module implements the Singleton pattern"
+HOMEPAGE="https://github.com/ruby/singleton"
+SRC_URI="https://github.com/ruby/singleton/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/six/Manifest b/dev-ruby/six/Manifest
deleted file mode 100644
index 21b619aa7b89..000000000000
--- a/dev-ruby/six/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST six-0.2.0.tar.gz 6747 BLAKE2B acf034ac527b3e5379a55ad95bacdf18d544577cad9e7f7ea322e6b05d2b1557f5712915ec79d51e48e5d246661f384207a5eae07775a85e27548fb9af99e6fb SHA512 8c3bfbe2b07b5682b696800a9235ebf542c7d292f69728aa9c9707f92fa042fe7bfee6a0b28808dab86f8ec80fec5ba993be5e42f4a098d8cfccbc7611fa2016
diff --git a/dev-ruby/six/metadata.xml b/dev-ruby/six/metadata.xml
deleted file mode 100644
index c1012fea0110..000000000000
--- a/dev-ruby/six/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">randx/six</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/six/six-0.2.0-r1.ebuild b/dev-ruby/six/six-0.2.0-r1.ebuild
deleted file mode 100644
index c5cbff4ef242..000000000000
--- a/dev-ruby/six/six-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.markdown"
-RUBY_FAKEGEM_GEMSPEC="six.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An ultra lite authorization library"
-HOMEPAGE="https://github.com/randx/six"
-SRC_URI="https://github.com/randx/six/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die "sed failed"
-}
diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index 01dd2ce3af84..202f243ff664 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -1,2 +1,3 @@
-DIST slim-3.0.9.gem 99840 BLAKE2B e449585fe5642c1980b4d8fb0c93979d8c16020c331f1bc2993c6f7b5bb3e55c1b85595711bf3acdc369c6a3fbfdc6873a8208c59aedaa49dead1cd9166347d4 SHA512 220dbcde230aab05e294022924346fbb02a1bf813a7c97910c2f60d7b3a7dd498d04f6f4f2883b895d2a3e6e9f526331914e3ab4560e748de2bd991358cca90d
-DIST slim-4.1.0.gem 103424 BLAKE2B 87de8411d6284569ac56366d4e2f3ee351c6908001cbda2926312f25c1c39520662371e826493d1346722bb507348bd8c117f3b0447b433bdb406435b80a70e2 SHA512 a929edcd1b194bc6abddf5757e0e942835f6c5e1555aa7bf021b0e850d74c9777637a2a0eafbdf2de7f0f0574eb03866c562826c656adcc0517cc4bfcb5ca897
+DIST slim-5.1.1.gem 100864 BLAKE2B ea5c469702dca808bdc0555044a8d6a5a0b34e8d5b03a9c97e6e31ccb169725be6f76fc1f252d14673e92a53ac1a42caf023a3d1bacb66c4091710f8e9772c1a SHA512 935d488ad11478b28d51125ddbf7f0cb81f7791587bb69c7ead434eacf44c309958459dcff7228b6562b8972d6cb7125f3d451d21bfa2ded2f7ee1b55703d1f4
+DIST slim-5.2.0.gem 101376 BLAKE2B 19039b0f6d4a789564ff00df90bee214ccdb1827349d0f95b658d06fedd593cae6abbc50cf5e5438691d15c8d660964b38217f700f2d2c726c7670104c10af0f SHA512 85fd367460296eba9d4244832b1225b41f052f05b17ec9e38cc5db6accae1a5cd551bd61290a0c6885a42970f8219d5d00c0fd229616f3369e0f5575b6df72ea
+DIST slim-5.2.1.gem 101376 BLAKE2B 4c713440daa74461818be56ed263a3574b7022f17055a27219525fe79d3e80eeb5618d6e450ae1019265b514f0deb65e48d33fff9c3b593fbb2e0f3bf82db22b SHA512 bfe0f45bc928aa73604961b5e1253303c30e0c8e87935dc01f44b7014a34ed5661fb55a0dcfb21fbf355f366adb0aa476a327bca2d74f59bb6fcd7e630cc3e68
diff --git a/dev-ruby/slim/metadata.xml b/dev-ruby/slim/metadata.xml
index 658c72b1920d..16149c1d51b2 100644
--- a/dev-ruby/slim/metadata.xml
+++ b/dev-ruby/slim/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">slim-template/slim</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/slim/slim-3.0.9-r1.ebuild b/dev-ruby/slim/slim-3.0.9-r1.ebuild
deleted file mode 100644
index 8c301dc90bf4..000000000000
--- a/dev-ruby/slim/slim-3.0.9-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A template language aiming to reduce the syntax to the essential parts"
-HOMEPAGE="http://slim-lang.com/"
-LICENSE="MIT"
-
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
-SLOT="0"
-IUSE="doc"
-
-ruby_add_rdepend ">=dev-ruby/tilt-1.3.3:* <dev-ruby/tilt-2.1:*
-	>=dev-ruby/temple-0.7.6:0.7"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/redcarpet )"
-
-ruby_add_bdepend "test? ( dev-ruby/redcarpet dev-ruby/sass )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# This sinatra code expects tests to be installed but we strip those.
-	sed -i -e "s/require 'sinatra'/require 'bogussinatra'/" Rakefile || die
-
-	# Avoid tests for things we don't have. The builder test does not pass with tilt 2.x
-	sed -i -e '/test_wip_render_with_asciidoc/,/^  end/ s:^:#:' \
-		-e '/test_render_with_wiki/,/^  end/ s:^:#:' \
-		-e '/test_render_with_creole/,/^  end/ s:^:#:' \
-		-e '/test_render_with_builder/,/^  end/ s:^:#:' \
-		-e '/test_render_with_org/,/^  end/ s:^:#:' test/core/test_embedded_engines.rb || die
-
-	sed -i -e '/s\.files/ s/git ls-files/find . -type f -print/' \
-		-e '/s\.executables/ s:git ls-files -- bin/\*:find bin -type f -print:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	sed -i -e '/Open3/ s:ruby:'${RUBY}':' test/core/test_commands.rb || die
-}
diff --git a/dev-ruby/slim/slim-4.1.0-r1.ebuild b/dev-ruby/slim/slim-4.1.0-r1.ebuild
deleted file mode 100644
index 598b0ee96d48..000000000000
--- a/dev-ruby/slim/slim-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_RECIPE_DOC="rake"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A template language aiming to reduce the syntax to the essential parts"
-HOMEPAGE="http://slim-lang.com/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-SLOT="$(ver_cut 1)"
-IUSE="doc"
-
-ruby_add_rdepend ">=dev-ruby/tilt-2.0.6:* =dev-ruby/tilt-2.0*:*
-	>=dev-ruby/temple-0.7.6:0.7
-	!!<dev-ruby/slim-3.0.9-r1"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/redcarpet )"
-
-ruby_add_bdepend "test? ( dev-ruby/redcarpet dev-ruby/sassc )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# This sinatra code expects tests to be installed but we strip those.
-	sed -i -e "s/require 'sinatra'/require 'bogussinatra'/" Rakefile || die
-
-	# Add missing include, bug 816573
-	sed -i -e "1irequire 'ostruct'" test/core/test_code_evaluation.rb || die
-
-	# Avoid tests for things we don't have. The builder test does not pass with tilt 2.x
-	sed -i -e '/test_wip_render_with_asciidoc/,/^  end/ s:^:#:' \
-		-e '/test_render_with_wiki/,/^  end/ s:^:#:' \
-		-e '/test_render_with_creole/,/^  end/ s:^:#:' \
-		-e '/test_render_with_builder/,/^  end/ s:^:#:' \
-		-e '/test_render_with_org/,/^  end/ s:^:#:' test/core/test_embedded_engines.rb || die
-
-	sed -i -e '/s\.files/ s/git ls-files/find . -type f -print/' \
-		-e '/s\.executables/ s:git ls-files -- bin/\*:find bin -type f -print:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	sed -i -e '/Open3/ s:ruby:'${RUBY}':' test/core/test_commands.rb || die
-}
diff --git a/dev-ruby/slim/slim-4.1.0-r2.ebuild b/dev-ruby/slim/slim-4.1.0-r2.ebuild
deleted file mode 100644
index 5ff227866234..000000000000
--- a/dev-ruby/slim/slim-4.1.0-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_RECIPE_DOC="rake"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A template language aiming to reduce the syntax to the essential parts"
-HOMEPAGE="http://slim-lang.com/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-SLOT="$(ver_cut 1)"
-IUSE="doc"
-
-ruby_add_rdepend ">=dev-ruby/tilt-2.0.6:* =dev-ruby/tilt-2.0*:*
-	>=dev-ruby/temple-0.7.6:0.7
-	!!<dev-ruby/slim-3.0.9-r1"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/redcarpet )"
-
-ruby_add_bdepend "test? ( dev-ruby/redcarpet dev-ruby/sassc )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# This sinatra code expects tests to be installed but we strip those.
-	sed -i -e "s/require 'sinatra'/require 'bogussinatra'/" Rakefile || die
-
-	# Add missing include, bug 816573
-	sed -i -e "1irequire 'ostruct'" test/core/test_code_evaluation.rb || die
-
-	# Avoid tests for things we don't have. The builder test does not pass with tilt 2.x
-	sed -i -e '/test_wip_render_with_asciidoc/,/^  end/ s:^:#:' \
-		-e '/test_render_with_wiki/,/^  end/ s:^:#:' \
-		-e '/test_render_with_creole/,/^  end/ s:^:#:' \
-		-e '/test_render_with_builder/,/^  end/ s:^:#:' \
-		-e '/test_render_with_org/,/^  end/ s:^:#:' test/core/test_embedded_engines.rb || die
-
-	sed -i -e '/s\.files/ s/git ls-files/find . -type f -print/' \
-		-e '/s\.executables/ s:git ls-files -- bin/\*:find bin -type f -print:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	sed -i -e '/Open3/ s:ruby:'${RUBY}':' test/core/test_commands.rb || die
-}
diff --git a/dev-ruby/slim/slim-4.1.0.ebuild b/dev-ruby/slim/slim-4.1.0.ebuild
deleted file mode 100644
index a618317cb6de..000000000000
--- a/dev-ruby/slim/slim-4.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_RECIPE_DOC="rake"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A template language aiming to reduce the syntax to the essential parts"
-HOMEPAGE="http://slim-lang.com/"
-LICENSE="MIT"
-
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
-SLOT="$(ver_cut 1)"
-IUSE="doc"
-
-ruby_add_rdepend ">=dev-ruby/tilt-2.0.6:* =dev-ruby/tilt-2.0*:*
-	>=dev-ruby/temple-0.7.6:0.7
-	!!<dev-ruby/slim-3.0.9-r1"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/redcarpet )"
-
-ruby_add_bdepend "test? ( dev-ruby/redcarpet )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# This sinatra code expects tests to be installed but we strip those.
-	sed -i -e "s/require 'sinatra'/require 'bogussinatra'/" Rakefile || die
-
-	# Avoid tests for things we don't have. The builder test does not pass with tilt 2.x
-	sed -i -e '/test_wip_render_with_asciidoc/,/^  end/ s:^:#:' \
-		-e '/test_render_with_wiki/,/^  end/ s:^:#:' \
-		-e '/test_render_with_creole/,/^  end/ s:^:#:' \
-		-e '/test_render_with_builder/,/^  end/ s:^:#:' \
-		-e '/test_render_with_org/,/^  end/ s:^:#:' test/core/test_embedded_engines.rb || die
-
-	sed -i -e '/s\.files/ s/git ls-files/find . -type f -print/' \
-		-e '/s\.executables/ s:git ls-files -- bin/\*:find bin -type f -print:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	sed -i -e '/Open3/ s:ruby:'${RUBY}':' test/core/test_commands.rb || die
-}
diff --git a/dev-ruby/slim/slim-5.1.1.ebuild b/dev-ruby/slim/slim-5.1.1.ebuild
new file mode 100644
index 000000000000..c914625d9a54
--- /dev/null
+++ b/dev-ruby/slim/slim-5.1.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_RECIPE_DOC="rake"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A template language aiming to reduce the syntax to the essential parts"
+HOMEPAGE="https://slim-template.github.io/"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
+IUSE="doc"
+
+ruby_add_rdepend "
+	!dev-ruby/slim:5
+	>=dev-ruby/tilt-2.1.0:*
+	>=dev-ruby/temple-0.10.0:0.7
+"
+# sass tests are currently disabled:
+# https://github.com/slim-template/slim/commit/bd9d4601cd8142aa9fdbc0d87c9f9132a9a56cda
+ruby_add_bdepend "
+	doc? (
+		dev-ruby/yard
+		dev-ruby/redcarpet
+	)
+	test? (
+		dev-ruby/minitest:5
+		dev-ruby/kramdown:2
+		dev-ruby/redcarpet
+		dev-ruby/sassc
+		>=dev-ruby/test-unit-3.5
+	)
+"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# This sinatra code expects tests to be installed but we strip those.
+	sed -i -e "s/require 'sinatra'/require 'bogussinatra'/" Rakefile || die
+
+	# Add missing include, bug 816573
+	sed -i -e "1irequire 'ostruct'" test/core/test_code_evaluation.rb || die
+
+	# Avoid tests for things we don't have. The builder test does not pass with tilt 2.x
+	sed -i -e '/test_wip_render_with_asciidoc/,/^  end/ s:^:#:' \
+		-e '/test_render_with_wiki/,/^  end/ s:^:#:' \
+		-e '/test_render_with_creole/,/^  end/ s:^:#:' \
+		-e '/test_render_with_builder/,/^  end/ s:^:#:' \
+		-e '/test_render_with_org/,/^  end/ s:^:#:' test/core/test_embedded_engines.rb || die
+
+	# Avoid test failing due to tilt providing yet another markdown implementation
+	sed -i -e '/test_render_with_markdown/askip "new tilt version"' test/core/test_embedded_engines.rb || die
+	sed -i -e '/test_no_translation_of_embedded/askip "new tilt version"' test/translator/test_translator.rb || die
+
+	# Fix minitest deprecation
+	sed -i -e 's/MiniTest/Minitest/' test/literate/helper.rb || die
+
+	sed -i -e '/s\.files/ s/git ls-files/find . -type f -print/' \
+		-e '/s\.executables/ s:git ls-files -- bin/\*:find bin -type f -print:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+	sed -i -e '/Open3/ s:ruby:'${RUBY}':' test/core/test_commands.rb || die
+}
diff --git a/dev-ruby/slim/slim-5.2.0.ebuild b/dev-ruby/slim/slim-5.2.0.ebuild
new file mode 100644
index 000000000000..b2f698a165ae
--- /dev/null
+++ b/dev-ruby/slim/slim-5.2.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_RECIPE_DOC="rake"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A template language aiming to reduce the syntax to the essential parts"
+HOMEPAGE="https://slim-template.github.io/"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc"
+
+ruby_add_rdepend "
+	!dev-ruby/slim:5
+	>=dev-ruby/tilt-2.1.0:*
+	>=dev-ruby/temple-0.10.0:0.7
+"
+# sass tests are currently disabled:
+# https://github.com/slim-template/slim/commit/bd9d4601cd8142aa9fdbc0d87c9f9132a9a56cda
+ruby_add_bdepend "
+	doc? (
+		dev-ruby/yard
+		dev-ruby/redcarpet
+	)
+	test? (
+		dev-ruby/minitest:5
+		dev-ruby/kramdown:2
+		dev-ruby/redcarpet
+		dev-ruby/sassc
+		>=dev-ruby/test-unit-3.5
+	)
+"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# This sinatra code expects tests to be installed but we strip those.
+	sed -i -e "s/require 'sinatra'/require 'bogussinatra'/" Rakefile || die
+
+	# Avoid tests for things we don't have. The builder test does not pass with tilt 2.x
+	sed -i -e '/test_wip_render_with_asciidoc/,/^  end/ s:^:#:' \
+		-e '/test_render_with_wiki/,/^  end/ s:^:#:' \
+		-e '/test_render_with_creole/,/^  end/ s:^:#:' \
+		-e '/test_render_with_builder/,/^  end/ s:^:#:' \
+		-e '/test_render_with_org/,/^  end/ s:^:#:' test/core/test_embedded_engines.rb || die
+
+	# Avoid test failing due to tilt providing yet another markdown implementation
+	sed -i -e '/test_render_with_markdown/askip "new tilt version"' test/core/test_embedded_engines.rb || die
+	sed -i -e '/test_no_translation_of_embedded/askip "new tilt version"' test/translator/test_translator.rb || die
+
+	sed -i -e '/s\.files/ s/git ls-files/find . -type f -print/' \
+		-e '/s\.executables/ s:git ls-files -- bin/\*:find bin -type f -print:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+	sed -i -e '/Open3/ s:ruby:'${RUBY}':' test/core/test_commands.rb || die
+}
diff --git a/dev-ruby/slim/slim-5.2.1.ebuild b/dev-ruby/slim/slim-5.2.1.ebuild
new file mode 100644
index 000000000000..f00526fbee05
--- /dev/null
+++ b/dev-ruby/slim/slim-5.2.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_RECIPE_DOC="rake"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A template language aiming to reduce the syntax to the essential parts"
+HOMEPAGE="https://slim-template.github.io/"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc test"
+
+ruby_add_rdepend "
+	!dev-ruby/slim:5
+	>=dev-ruby/tilt-2.1.0:*
+	>=dev-ruby/temple-0.10.0:0.7
+"
+# sass tests are currently disabled:
+# https://github.com/slim-template/slim/commit/bd9d4601cd8142aa9fdbc0d87c9f9132a9a56cda
+ruby_add_bdepend "
+	doc? (
+		dev-ruby/yard
+		dev-ruby/redcarpet
+	)
+	test? (
+		dev-ruby/minitest:5
+		dev-ruby/kramdown:2
+		dev-ruby/redcarpet
+		dev-ruby/sassc
+		>=dev-ruby/test-unit-3.5
+	)
+"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# This sinatra code expects tests to be installed but we strip those.
+	sed -i -e "s/require 'sinatra'/require 'bogussinatra'/" Rakefile || die
+
+	# Avoid tests for things we don't have. The builder test does not pass with tilt 2.x
+	sed -i -e '/test_wip_render_with_asciidoc/,/^  end/ s:^:#:' \
+		-e '/test_render_with_wiki/,/^  end/ s:^:#:' \
+		-e '/test_render_with_creole/,/^  end/ s:^:#:' \
+		-e '/test_render_with_builder/,/^  end/ s:^:#:' \
+		-e '/test_render_with_org/,/^  end/ s:^:#:' test/core/test_embedded_engines.rb || die
+
+	# Avoid test failing due to tilt providing yet another markdown implementation
+	sed -i -e '/test_render_with_markdown/askip "new tilt version"' test/core/test_embedded_engines.rb || die
+	sed -i -e '/test_no_translation_of_embedded/askip "new tilt version"' test/translator/test_translator.rb || die
+
+	sed -i -e '/s\.files/ s/git ls-files/find . -type f -print/' \
+		-e '/s\.executables/ s:git ls-files -- bin/\*:find bin -type f -print:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+	sed -i -e '/Open3/ s:ruby:'${RUBY}':' test/core/test_commands.rb || die
+}
diff --git a/dev-ruby/slop/Manifest b/dev-ruby/slop/Manifest
index 7b1f98b217a4..2122306408cb 100644
--- a/dev-ruby/slop/Manifest
+++ b/dev-ruby/slop/Manifest
@@ -1 +1 @@
-DIST slop-4.9.2.tgz 16633 BLAKE2B 8907314016066569279dbab6b52f50cee58044b46c1a88c7cfab3a31e1bd7e702f63da170a42f113c5611080d5d212b970dddd1e3aeb2bc8e86d5ea577b9f163 SHA512 dbecbc5edaf257131edf54fb5577531a962a6ed64f9414342b5060bee479cf7e4c9cfb891af3553644fbe7817a2067de3c83b379651a62da5983f0c42cd68fd6
+DIST slop-4.10.1.tgz 17752 BLAKE2B d7be110a9fa012af3df26aa4a7dc055fe9443ca131ee078adb05fb4ef87c6976520ee96aca23893abb651bd6fa22ea350be5851ca6f142b301551447c0b12c34 SHA512 0ffca1dcb550a4b21188647bbc433345c62c61dcb5c6e647727ab21d0816a13b6e6cb17180eb86a870eb50ed67b2f44f72f38490f907ba21acaa81c2a2febc53
diff --git a/dev-ruby/slop/metadata.xml b/dev-ruby/slop/metadata.xml
index 80aed364f446..9e9d448e833c 100644
--- a/dev-ruby/slop/metadata.xml
+++ b/dev-ruby/slop/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">injekt/slop</remote-id>
+    <remote-id type="github">leejarvis/slop</remote-id>
+    <remote-id type="rubygems">slop</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/slop/slop-4.10.1.ebuild b/dev-ruby/slop/slop-4.10.1.ebuild
new file mode 100644
index 000000000000..286858229e1f
--- /dev/null
+++ b/dev-ruby/slop/slop-4.10.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="slop.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple option parser with an easy to remember syntax and friendly API"
+HOMEPAGE="https://github.com/leejarvis/slop"
+SRC_URI="https://github.com/leejarvis/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' slop.gemspec || die
+}
diff --git a/dev-ruby/slop/slop-4.9.2.ebuild b/dev-ruby/slop/slop-4.9.2.ebuild
deleted file mode 100644
index adc818e81c51..000000000000
--- a/dev-ruby/slop/slop-4.9.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="slop.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple option parser with an easy to remember syntax and friendly API"
-HOMEPAGE="https://github.com/injekt/slop"
-SRC_URI="https://github.com/injekt/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' slop.gemspec || die
-}
diff --git a/dev-ruby/slow_enumerator_tools/slow_enumerator_tools-1.1.0-r1.ebuild b/dev-ruby/slow_enumerator_tools/slow_enumerator_tools-1.1.0-r1.ebuild
index b43766e39fcb..3effc45d00b9 100644
--- a/dev-ruby/slow_enumerator_tools/slow_enumerator_tools-1.1.0-r1.ebuild
+++ b/dev-ruby/slow_enumerator_tools/slow_enumerator_tools-1.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
diff --git a/dev-ruby/snaky_hash/Manifest b/dev-ruby/snaky_hash/Manifest
new file mode 100644
index 000000000000..a4c2ff91aebb
--- /dev/null
+++ b/dev-ruby/snaky_hash/Manifest
@@ -0,0 +1 @@
+DIST snaky_hash-2.0.1.tar.bz2 15275 BLAKE2B 77a7ee4bb4194b991a54e359c53a5a6ab45134026185e976c197737746e20842cff6ecf526d773711ed403cb80a50593429038a6194cd4360cbc7907336335a3 SHA512 8d618410106fcab5b986de5047db8bd6e4192b3ee27926107428e82aba905a66203c0cb1dd83de50b89aeffe0e29e93ae0c36b175d7751b8f68249c8014061d5
diff --git a/dev-ruby/snaky_hash/metadata.xml b/dev-ruby/snaky_hash/metadata.xml
new file mode 100644
index 000000000000..69f62d1504e8
--- /dev/null
+++ b/dev-ruby/snaky_hash/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="gitlab">oauth-xx/snaky_hash</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/snaky_hash/snaky_hash-2.0.1.ebuild b/dev-ruby/snaky_hash/snaky_hash-2.0.1.ebuild
new file mode 100644
index 000000000000..34882129dcfd
--- /dev/null
+++ b/dev-ruby/snaky_hash/snaky_hash-2.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="snaky_hash.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Hashie::Mash joint to make #snakelife better"
+HOMEPAGE="https://gitlab.com/oauth-xx/snaky_hash"
+SRC_URI="https://gitlab.com/oauth-xx/snaky_hash/-/archive/v${PV}/snaky_hash-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+RUBY_S="snaky_hash-v${PV}"
+IUSE=""
+SLOT="1"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+
+ruby_add_rdepend "
+	dev-ruby/hashie:*
+	>=dev-ruby/version_gem-1.1.1:1
+"
+
+ruby_add_depend "test? ( dev-ruby/rspec-block_is_expected )"
+
+all_ruby_prepare() {
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e 's/if RUN_COVERAGE/if false/' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/sorted_set/metadata.xml b/dev-ruby/sorted_set/metadata.xml
index 7a38fd1850ff..e3eef5d46cd0 100644
--- a/dev-ruby/sorted_set/metadata.xml
+++ b/dev-ruby/sorted_set/metadata.xml
@@ -5,4 +5,7 @@
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">knu/sorted_set</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/sorted_set/sorted_set-1.0.3.ebuild b/dev-ruby/sorted_set/sorted_set-1.0.3.ebuild
index 9653d09dade6..675cb7a84566 100644
--- a/dev-ruby/sorted_set/sorted_set-1.0.3.ebuild
+++ b/dev-ruby/sorted_set/sorted_set-1.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_GEMSPEC="sorted_set.gemspec"
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/knu/sorted_set/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/sourcemap/sourcemap-0.1.1-r1.ebuild b/dev-ruby/sourcemap/sourcemap-0.1.1-r1.ebuild
index d6b2785f30b6..c7fa15a88ec1 100644
--- a/dev-ruby/sourcemap/sourcemap-0.1.1-r1.ebuild
+++ b/dev-ruby/sourcemap/sourcemap-0.1.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -13,10 +13,11 @@ HOMEPAGE="https://github.com/maccman/sourcemap"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE=""
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e 's/MiniTest/Minitest/' test/test_*.rb || die
 }
diff --git a/dev-ruby/sparklines/files/sparklines-0.5.2-rmagick4-deprecation.patch b/dev-ruby/sparklines/files/sparklines-0.5.2-rmagick4-deprecation.patch
new file mode 100644
index 000000000000..5dcb556318be
--- /dev/null
+++ b/dev-ruby/sparklines/files/sparklines-0.5.2-rmagick4-deprecation.patch
@@ -0,0 +1,20 @@
+--- a/lib/sparklines.rb	2023-04-26 07:46:30.263829168 +0200
++++ b/lib/sparklines.rb	2023-04-26 07:48:47.140656193 +0200
+@@ -685,7 +685,7 @@
+     @draw = Magick::Draw.new
+     @draw.pointsize = @@pointsize # TODO Use height
+     @draw.pointsize = @options[:font_size] if @options.has_key?(:font_size)
+-    @canvas = Magick::Image.new(w , h) { self.background_color = bkg_col }
++    @canvas = Magick::Image.new(w , h) { |image| image.background_color = bkg_col }
+ 
+     # Make room for label and last value
+     unless @options[:label].nil?
+@@ -697,7 +697,7 @@
+       w += @label_and_data_last_width
+     end
+ 
+-    @canvas = Magick::Image.new(w , h) { self.background_color = bkg_col }
++    @canvas = Magick::Image.new(w , h) { |image| image.background_color = bkg_col }
+     @canvas.format = "PNG"
+ 
+     # Draw label and last value
diff --git a/dev-ruby/sparklines/sparklines-0.5.2-r7.ebuild b/dev-ruby/sparklines/sparklines-0.5.2-r7.ebuild
deleted file mode 100644
index 20011854a68c..000000000000
--- a/dev-ruby/sparklines/sparklines-0.5.2-r7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Create sparklines, small graphs to be used inline in texts"
-HOMEPAGE="http://sparklines.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND+="test? ( media-gfx/imagemagick[png] )"
-
-ruby_add_rdepend "dev-ruby/rmagick:*"
-
-ruby_add_bdepend "test? ( dev-ruby/tidy_table dev-ruby/dust )"
-
-all_ruby_prepare() {
-	# Don't use deprecated rmagick require for compatibility with newer
-	# versions.
-	sed -i -e '/require/ s/RMagick/rmagick/' lib/sparklines.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -I. test/test_all.rb || die
-}
diff --git a/dev-ruby/sparklines/sparklines-0.5.2-r8.ebuild b/dev-ruby/sparklines/sparklines-0.5.2-r8.ebuild
new file mode 100644
index 000000000000..6d604998fa0d
--- /dev/null
+++ b/dev-ruby/sparklines/sparklines-0.5.2-r8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Create sparklines, small graphs to be used inline in texts"
+HOMEPAGE="http://sparklines.rubyforge.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND+="test? ( media-gfx/imagemagick[png] )"
+
+ruby_add_rdepend "dev-ruby/rmagick:*"
+
+ruby_add_bdepend "test? ( dev-ruby/tidy_table dev-ruby/dust )"
+
+PATCHES=( "${FILESDIR}/${P}-rmagick4-deprecation.patch" )
+
+all_ruby_prepare() {
+	# Don't use deprecated rmagick require for compatibility with newer
+	# versions.
+	sed -i -e '/require/ s/RMagick/rmagick/' lib/sparklines.rb || die
+
+}
+
+each_ruby_test() {
+	${RUBY} -I. test/test_all.rb || die
+}
diff --git a/dev-ruby/spreadsheet/Manifest b/dev-ruby/spreadsheet/Manifest
index 90d9c1e6c7cf..420f48a617f8 100644
--- a/dev-ruby/spreadsheet/Manifest
+++ b/dev-ruby/spreadsheet/Manifest
@@ -1,3 +1 @@
-DIST spreadsheet-1.2.6.tar.gz 4656515 BLAKE2B a3b94804db9f4aceb8f6db66da7319082c86f625fc1c6bee5b1c1dc65b121970876cf5adfcc7d6d6800cadab38b017d67c7d0ecd1d708759a6ccd9726666c50e SHA512 4e05dd759f56de97979823864b4f4bed17c7b9c35cb2cc76e817d309ee2b0db38ae5efedba401b1259f3b80b7c954d95c6d26e928ebf03f329bc07d53f8013af
-DIST spreadsheet-1.2.9.tar.gz 4657114 BLAKE2B 6fda8b63688b21ff393402f15cda6685aee540528690ce3aec8a1d3edbf2f68f4145da8edb35706a506506b72ef8b8a32c31fa737863096349a3f2d871b728a4 SHA512 82beea72426aaf92fff16fa80d9a6d0ea4c465aaff6ea311a70fd20abf8824bf384adbe101ebb84b676157b4436bfb0d5c1ce6e11ed087c42a1a4b0538f26598
 DIST spreadsheet-1.3.0.tar.gz 4654545 BLAKE2B c3658dbab73874d403da2be235d862be80ee8764eeac4cbf31b78121fa288ecfa2821734b6d97a31eecf29f21b52b9f7bd752ccb6b45edf7d2ef7c8ecc3cc410 SHA512 1e671d01fc4b21f6fee034cace68c711968983978cc815b5bda051c5ed14c736653a4151fa6f4393416b914a678e4ac471db795c318816036c17c2ac79703c05
diff --git a/dev-ruby/spreadsheet/metadata.xml b/dev-ruby/spreadsheet/metadata.xml
index 1268a5d798b7..131ac902a539 100644
--- a/dev-ruby/spreadsheet/metadata.xml
+++ b/dev-ruby/spreadsheet/metadata.xml
@@ -10,6 +10,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
+    <remote-id type="github">zdavatz/spreadsheet</remote-id>
     <remote-id type="rubygems">spreadsheet</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/spreadsheet/spreadsheet-1.2.6.ebuild b/dev-ruby/spreadsheet/spreadsheet-1.2.6.ebuild
deleted file mode 100644
index e05cf10718a6..000000000000
--- a/dev-ruby/spreadsheet/spreadsheet-1.2.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-# Avoid the complexity of the "rake" recipe and run testrb-2 manually.
-RUBY_FAKEGEM_RECIPE_TEST=none
-
-RUBY_FAKEGEM_EXTRADOC="GUIDE.md History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="spreadsheet.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby library to read and write spreadsheet documents"
-HOMEPAGE="https://github.com/zdavatz/spreadsheet"
-SRC_URI="https://github.com/zdavatz/spreadsheet/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-ruby_add_rdepend ">=dev-ruby/ruby-ole-1.0"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 --pattern='.+.rb' --exclude='suite\.rb' test/
-}
diff --git a/dev-ruby/spreadsheet/spreadsheet-1.2.9.ebuild b/dev-ruby/spreadsheet/spreadsheet-1.2.9.ebuild
deleted file mode 100644
index b618329c8fbd..000000000000
--- a/dev-ruby/spreadsheet/spreadsheet-1.2.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-# Avoid the complexity of the "rake" recipe and run testrb-2 manually.
-RUBY_FAKEGEM_RECIPE_TEST=none
-
-RUBY_FAKEGEM_EXTRADOC="GUIDE.md History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="spreadsheet.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby library to read and write spreadsheet documents"
-HOMEPAGE="https://github.com/zdavatz/spreadsheet"
-SRC_URI="https://github.com/zdavatz/spreadsheet/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-ruby_add_rdepend ">=dev-ruby/ruby-ole-1.0"
-
-all_ruby_prepare() {
-	sed -i -e "s:_relative ': './:" ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 --pattern='.+.rb' --exclude='suite\.rb' test/
-}
diff --git a/dev-ruby/spreadsheet/spreadsheet-1.3.0.ebuild b/dev-ruby/spreadsheet/spreadsheet-1.3.0.ebuild
index f5b0399c44bc..ff81ea84e1ed 100644
--- a/dev-ruby/spreadsheet/spreadsheet-1.3.0.ebuild
+++ b/dev-ruby/spreadsheet/spreadsheet-1.3.0.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="ruby31 ruby32 ruby33"
 
 # Avoid the complexity of the "rake" recipe and run testrb-2 manually.
 RUBY_FAKEGEM_RECIPE_TEST=none
diff --git a/dev-ruby/spring/Manifest b/dev-ruby/spring/Manifest
index 9dd870b38763..039571d73d13 100644
--- a/dev-ruby/spring/Manifest
+++ b/dev-ruby/spring/Manifest
@@ -1,3 +1,2 @@
-DIST spring-2.1.1.tar.gz 44000 BLAKE2B b7a5855b4a53852ccf82c14e82c134e61bc17a26e20bbf3597259763bbe81a545d3299d5490302681ca616ed1b7f4d42d522134b87d8a40588aa4904f8b650b2 SHA512 44c8619253567d2f506c9652ac28da5933517113dc38e8eb5a8b58fcc7d28ff0192cc98a655579767972649f5cead63cff0c7aa909046b41cfc1d37780e0ee77
-DIST spring-3.1.1.tar.gz 46013 BLAKE2B 54297c4a24e3e65fbcfce75b5339e140ff79f075741a0ee1f1df6b32a62426e25734e0a0a5b4103700e712a0dad401863630511789696ca5761fe6828942200f SHA512 3fe985894d22f94ecdc46c735dd144c24552ade39b801aa24b829512d7586892d1db1359b2658799b7fa67b887fb63ecf5ef7160a6f3116a697b2a4c7076d602
-DIST spring-4.0.0.tar.gz 46258 BLAKE2B 9e02594dff1882f3f7f47af682afddafc3f4be97f9c3dcc0ee3289be9fb1bc252260e24bec44d024ce808a26a2ac571840357df8fcc719e60ca9ca159460b998 SHA512 c5ed7e389c97dea3b183d6cd373823c3230a84f21427cabacd72ea2bc97f00bcbf9855d36808a1bf3257ccaea21ee35f2070716dc4f0b64205a674202eac6b94
+DIST spring-4.1.1.tar.gz 46849 BLAKE2B 08e66e8e8869ae900bd134ceb82e55d08ba005291b8a7c83a61225c04373b8b89488f0636c4bcf0a8fdc6407ae2b1da26ac7092a3cdd5b1209d2ae2c4a6abd06 SHA512 caf85cf8588825b62cc8284bea79ad3b1faa5b61cf773db78c4f62b24df1e0fd5d6ba148d993045ab8dc768dde5a3401aa228ba51b4985b98f5ce4080f695e43
+DIST spring-4.1.3.tar.gz 46968 BLAKE2B e41245e3723e874bdfe641b6770aa015605cdc9d87a190895a2d48d21469c529f15c28e31c387a493b79bbebc5d0279d3ce82310edca20650b63f1d9813913d9 SHA512 2a6732fa68c6c30dbcdecdab2d5bb3870459897381ae7ee6d21e4b71b8e0b3a7fe78f3771402baf45c54b38a7c164977a1b057fe39d810338005d25c7e8e71cb
diff --git a/dev-ruby/spring/spring-2.1.1.ebuild b/dev-ruby/spring/spring-2.1.1.ebuild
deleted file mode 100644
index 83758b05933a..000000000000
--- a/dev-ruby/spring/spring-2.1.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-
-RUBY_FAKEGEM_GEMSPEC="spring.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rails application preloader"
-HOMEPAGE="https://github.com/rails/spring"
-SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2:*"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )"
-
-all_ruby_prepare() {
-	sed -i -e '/files/d' \
-		-e '/bump/d' ${PN}.gemspec || die
-	sed -i -e '/bump/d' Rakefile || die
-}
diff --git a/dev-ruby/spring/spring-3.1.1.ebuild b/dev-ruby/spring/spring-3.1.1.ebuild
deleted file mode 100644
index 830d32686e8c..000000000000
--- a/dev-ruby/spring/spring-3.1.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-
-RUBY_FAKEGEM_GEMSPEC="spring.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rails application preloader"
-HOMEPAGE="https://github.com/rails/spring"
-SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2:*"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )"
-
-all_ruby_prepare() {
-	sed -i -e '/files/d' \
-		-e '/bump/d' ${PN}.gemspec || die
-	sed -i -e '/bump/d' Rakefile || die
-}
diff --git a/dev-ruby/spring/spring-4.0.0.ebuild b/dev-ruby/spring/spring-4.0.0.ebuild
deleted file mode 100644
index 3abfbcdaa757..000000000000
--- a/dev-ruby/spring/spring-4.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-
-RUBY_FAKEGEM_GEMSPEC="spring.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rails application preloader"
-HOMEPAGE="https://github.com/rails/spring"
-SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )"
-
-all_ruby_prepare() {
-	sed -i -e '/files/d' \
-		-e '/bump/d' ${PN}.gemspec || die
-	sed -i -e '/bump/d' Rakefile || die
-}
diff --git a/dev-ruby/spring/spring-4.1.1.ebuild b/dev-ruby/spring/spring-4.1.1.ebuild
new file mode 100644
index 000000000000..e7e2c2dfad42
--- /dev/null
+++ b/dev-ruby/spring/spring-4.1.1.ebuild
@@ -0,0 +1,33 @@
+# 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_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_TASK_TEST="test:unit"
+
+RUBY_FAKEGEM_GEMSPEC="spring.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rails application preloader"
+HOMEPAGE="https://github.com/rails/spring"
+SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )"
+
+all_ruby_prepare() {
+	sed -i -e '/files/d' \
+		-e '/bump/d' ${PN}.gemspec || die
+	sed -i -e '/bump/d' Rakefile || die
+}
diff --git a/dev-ruby/spring/spring-4.1.3.ebuild b/dev-ruby/spring/spring-4.1.3.ebuild
new file mode 100644
index 000000000000..39f8d99276fa
--- /dev/null
+++ b/dev-ruby/spring/spring-4.1.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_TASK_TEST="test:unit"
+
+RUBY_FAKEGEM_GEMSPEC="spring.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rails application preloader"
+HOMEPAGE="https://github.com/rails/spring"
+SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )"
+
+all_ruby_prepare() {
+	sed -i -e '/files/d' \
+		-e '/bump/d' ${PN}.gemspec || die
+	sed -i -e '/bump/d' Rakefile || die
+}
diff --git a/dev-ruby/sprockets-rails/Manifest b/dev-ruby/sprockets-rails/Manifest
index 40341527b8e9..a1fc6a6bf256 100644
--- a/dev-ruby/sprockets-rails/Manifest
+++ b/dev-ruby/sprockets-rails/Manifest
@@ -1,2 +1 @@
-DIST sprockets-rails-3.3.0.tar.gz 109701 BLAKE2B ba614e3110c355370fa39ac0ecf4120f86095e34d70dee470320f700c21d65159adc2f6837ad2307f38fcd5a9d753820d5ee537bd7e592514f24f8e02e5fc3e6 SHA512 f6bc9920f19ac76e383a36ed550f06b16a4de628a8df15c6e70f005fe60c0050a01002c9334359adfb182b449a8baaec35733c846240258702a430f14dcdefe2
 DIST sprockets-rails-3.4.2.tar.gz 111038 BLAKE2B 36495540d8756bd44ba55ed0bf055c35ed963e1d5a8214766f61ff86515285babd409f44816bd9dae8321dd5473f7f5515d2c1c5ffa6b6042788ee50b4bfd247 SHA512 a01a23b189bc0fcde8fa3a0734c239dc9ee9119ca7a0828f04974cc28344e6c5743a6f60f1ab8ae8ed28c0e111103948209593ccd88dc974e2d12b55a1a2b49a
diff --git a/dev-ruby/sprockets-rails/sprockets-rails-3.3.0.ebuild b/dev-ruby/sprockets-rails/sprockets-rails-3.3.0.ebuild
deleted file mode 100644
index 1cd6cd8e035f..000000000000
--- a/dev-ruby/sprockets-rails/sprockets-rails-3.3.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-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/railties-5.2:*
-		dev-ruby/test-unit:2
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/sprockets-rails/sprockets-rails-3.4.2-r1.ebuild b/dev-ruby/sprockets-rails/sprockets-rails-3.4.2-r1.ebuild
deleted file mode 100644
index 7602826ae9e4..000000000000
--- a/dev-ruby/sprockets-rails/sprockets-rails-3.4.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-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/railties-5.2:*
-		dev-ruby/test-unit:2
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
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..5678567561c9
--- /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 ~riscv ~sparc ~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-rails/sprockets-rails-3.4.2.ebuild b/dev-ruby/sprockets-rails/sprockets-rails-3.4.2.ebuild
deleted file mode 100644
index 1cd6cd8e035f..000000000000
--- a/dev-ruby/sprockets-rails/sprockets-rails-3.4.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-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/railties-5.2:*
-		dev-ruby/test-unit:2
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/sprockets/Manifest b/dev-ruby/sprockets/Manifest
index a28b7b01a84c..f271fb1fb45f 100644
--- a/dev-ruby/sprockets/Manifest
+++ b/dev-ruby/sprockets/Manifest
@@ -1,2 +1,3 @@
 DIST sprockets-3.7.2-git.tgz 369053 BLAKE2B 3c40de921d82b2f5c71e3ecaa114576293946352415da1195e60cdda6363066a6be05474eb7842ab1122e29fa6c19fd2f7a38fb0a7cf9972de0640eeb29d03f0 SHA512 bc7d79ba696a072644852b7a3a73ce086d297662309deb1d00318ad453f50ac6e494e6489632cb282795de2f334700155cfd21cc80be638dc471a3215422591f
-DIST sprockets-4.0.2-git.tgz 418502 BLAKE2B 0ae8d0e47708967a4208af852f21baf9d00c4216660b081170d7f68631ee1129fb78341e6012664fc519a0f330fac23203e314c1831d7031af50844e6b91c1f0 SHA512 f733b96c78be6466b63999aa7dc900af653a5b35f6482d84c41edf47f22b093231003f8874eee2ab31e2a2cfb7049a8109a314b51a0ef36ba30d5f6e8bd81f66
+DIST sprockets-4.2.0-git.tgz 422096 BLAKE2B 466e328895e318b9e0eecf46e91e0c6b3c04cf5dcc2b6004de2b81b6d2ab4745b9bb8b2a14bc6b9927f169e0b936c19005aa01aa01e805007d37f297750c253e SHA512 8b22cafcb439dee7f4397fae64108854047ea21d7b8faf80d60b2907d8318f28d168014645b48f35f6a765a7ec925697c3755e4ed8d7724f453cbfae1f10880b
+DIST sprockets-4.2.1-git.tgz 422155 BLAKE2B 578404338fe24dfab050ea5365a5f839e48ef9aee110df5f10ca29ad3eace2b612234321c2f1835c6b1e417209fe2ad7b4b105b88252623df1cfb685c35f10c5 SHA512 dc9e5e2acfdc36c525ac8fad566f8494fb83f516fc1bc0c99531a547652aab2b5a9cc6630f32b093651c835eaca4339eb39128d579cde249058a372ad45bac86
diff --git a/dev-ruby/sprockets/files/sprockets-3.7.2-ruby31-host-uri.patch b/dev-ruby/sprockets/files/sprockets-3.7.2-ruby31-host-uri.patch
new file mode 100644
index 000000000000..1594c18fc8ec
--- /dev/null
+++ b/dev-ruby/sprockets/files/sprockets-3.7.2-ruby31-host-uri.patch
@@ -0,0 +1,65 @@
+https://github.com/rails/sprockets/commit/39490de3bdda3cb0b3aed16544b38b3771fbcca7
+
+From 39490de3bdda3cb0b3aed16544b38b3771fbcca7 Mon Sep 17 00:00:00 2001
+From: Benoit Daloze <eregontp@gmail.com>
+Date: Mon, 19 Dec 2022 21:16:29 +0100
+Subject: [PATCH] Make the URI tests pass with ruby-head
+
+* host is "" instead of nil, following the upstream change:
+  https://github.com/ruby/uri/commit/81263c9e94bd67ca01deee238842a88c2c8885f3
+
+--- a/lib/sprockets/uri_utils.rb
++++ b/lib/sprockets/uri_utils.rb
+@@ -50,7 +50,7 @@ module Sprockets
+       # Hack for parsing Windows "file:///C:/Users/IEUser" paths
+       path.gsub!(/^\/([a-zA-Z]:)/, '\1'.freeze)
+ 
+-      [scheme, host, path, query]
++      [scheme, host || '', path, query]
+     end
+ 
+     # Internal: Join file: URI component parts into String.
+--- a/test/test_uri_utils.rb
++++ b/test/test_uri_utils.rb
+@@ -38,22 +38,22 @@ class TestURIUtils < MiniTest::Test
+     assert_equal ['file', 'localhost', '/etc/fstab', nil], parts
+ 
+     parts = split_file_uri("file:///etc/fstab")
+-    assert_equal ['file', nil, '/etc/fstab', nil], parts
++    assert_equal ['file', '', '/etc/fstab', nil], parts
+ 
+     parts = split_file_uri("file:///usr/local/bin/ruby%20on%20rails")
+-    assert_equal ['file', nil, '/usr/local/bin/ruby on rails', nil], parts
++    assert_equal ['file', '', '/usr/local/bin/ruby on rails', nil], parts
+ 
+     parts = split_file_uri("file:///usr/local/var/github/app/assets/javascripts/application.js")
+-    assert_equal ['file', nil, '/usr/local/var/github/app/assets/javascripts/application.js', nil], parts
++    assert_equal ['file', '', '/usr/local/var/github/app/assets/javascripts/application.js', nil], parts
+ 
+     parts = split_file_uri("file:///C:/Documents%20and%20Settings/davris/FileSchemeURIs.doc")
+-    assert_equal ['file', nil, 'C:/Documents and Settings/davris/FileSchemeURIs.doc', nil], parts
++    assert_equal ['file', '', 'C:/Documents and Settings/davris/FileSchemeURIs.doc', nil], parts
+ 
+     parts = split_file_uri("file:///D:/Program%20Files/Viewer/startup.htm")
+-    assert_equal ['file', nil, 'D:/Program Files/Viewer/startup.htm', nil], parts
++    assert_equal ['file', '', 'D:/Program Files/Viewer/startup.htm', nil], parts
+ 
+     parts = split_file_uri("file:///C:/Program%20Files/Music/Web%20Sys/main.html?REQUEST=RADIO")
+-    assert_equal ['file', nil, 'C:/Program Files/Music/Web Sys/main.html', 'REQUEST=RADIO'], parts
++    assert_equal ['file', '', 'C:/Program Files/Music/Web Sys/main.html', 'REQUEST=RADIO'], parts
+   end
+ 
+   def test_join_uri_path
+@@ -61,10 +61,10 @@ class TestURIUtils < MiniTest::Test
+       join_file_uri('file', 'localhost', '/etc/fstab', nil)
+ 
+     assert_equal "file:///etc/fstab",
+-      join_file_uri('file', nil, '/etc/fstab', nil)
++      join_file_uri('file', '', '/etc/fstab', nil)
+ 
+     assert_equal "file:///usr/local/bin/ruby%20on%20rails",
+-      join_file_uri('file', nil, '/usr/local/bin/ruby on rails', nil)
++      join_file_uri('file', '', '/usr/local/bin/ruby on rails', nil)
+   end
+ 
+   def test_inverse_file_uri_functions
diff --git a/dev-ruby/sprockets/sprockets-3.7.2-r1.ebuild b/dev-ruby/sprockets/sprockets-3.7.2-r1.ebuild
deleted file mode 100644
index 0b2f62510c15..000000000000
--- a/dev-ruby/sprockets/sprockets-3.7.2-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Ruby library for compiling and serving web assets"
-HOMEPAGE="https://github.com/rails/sprockets"
-SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 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=""
-
-ruby_add_rdepend "
-	dev-ruby/concurrent-ruby:1
-	>=dev-ruby/rack-1:* <dev-ruby/rack-3:*"
-
-ruby_add_bdepend "test? (
-		dev-ruby/json
-		dev-ruby/rack-test
-		=dev-ruby/coffee-script-2*
-		=dev-ruby/execjs-2*
-		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
-		dev-ruby/uglifier
-	)"
-
-all_ruby_prepare() {
-	# Avoid tests for template types that we currently don't package:
-	# eco and ejs.
-	sed -i -e '/eco templates/,/end/ s:^:#:' \
-		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
-	sed -i -e '/.ejs/ s:^:#:' test/test_asset.rb || die
-	rm -f test/test_require.rb test/test_{closure,eco,ejs,yui}_{compressor,processor}.rb || die
-	sed -i -e "/bundler/d" Rakefile || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
-}
-
-each_ruby_test() {
-	# Make sure we have completely separate copies. Hardlinks won't work
-	# for this test suite.
-	cp -R test test-new || die
-	rm -rf test || die
-	mv test-new test || die
-
-	each_fakegem_test
-}
diff --git a/dev-ruby/sprockets/sprockets-3.7.2-r2.ebuild b/dev-ruby/sprockets/sprockets-3.7.2-r2.ebuild
deleted file mode 100644
index de73a55d6b0f..000000000000
--- a/dev-ruby/sprockets/sprockets-3.7.2-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby library for compiling and serving web assets"
-HOMEPAGE="https://github.com/rails/sprockets"
-SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-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=""
-
-PATCHES=( "${FILESDIR}/${P}-erb-deprecation.patch" "${FILESDIR}/${P}-kwargs.patch" )
-
-ruby_add_rdepend "
-	dev-ruby/concurrent-ruby:1
-	>=dev-ruby/rack-1:* <dev-ruby/rack-3:*"
-
-ruby_add_bdepend "test? (
-		dev-ruby/json
-		dev-ruby/rack-test
-		=dev-ruby/coffee-script-2*
-		=dev-ruby/execjs-2*
-		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
-		dev-ruby/uglifier
-	)"
-
-all_ruby_prepare() {
-	# Avoid tests for template types that we currently don't package:
-	# eco and ejs.
-	sed -i -e '/eco templates/,/end/ s:^:#:' \
-		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
-	sed -i -e '/.ejs/ s:^:#:' test/test_asset.rb || die
-	rm -f test/test_require.rb test/test_{closure,eco,ejs,yui}_{compressor,processor}.rb || die
-	sed -i -e "/bundler/d" Rakefile || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
-}
-
-each_ruby_test() {
-	# Make sure we have completely separate copies. Hardlinks won't work
-	# for this test suite.
-	cp -R test test-new || die
-	rm -rf test || die
-	mv test-new test || die
-
-	each_fakegem_test
-}
diff --git a/dev-ruby/sprockets/sprockets-3.7.2-r3.ebuild b/dev-ruby/sprockets/sprockets-3.7.2-r3.ebuild
new file mode 100644
index 000000000000..d9704edc5370
--- /dev/null
+++ b/dev-ruby/sprockets/sprockets-3.7.2-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby library for compiling and serving web assets"
+HOMEPAGE="https://github.com/rails/sprockets"
+SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+PATCHES=(
+	"${FILESDIR}/${P}-erb-deprecation.patch"
+	"${FILESDIR}/${P}-kwargs.patch"
+	"${FILESDIR}/${P}-ruby31-host-uri.patch"
+)
+
+ruby_add_rdepend "
+	dev-ruby/concurrent-ruby:1
+	>=dev-ruby/rack-1:* <dev-ruby/rack-3:*"
+
+ruby_add_bdepend "test? (
+		dev-ruby/json
+		dev-ruby/rack-test
+		=dev-ruby/coffee-script-2*
+		=dev-ruby/execjs-2*
+		dev-ruby/nokogiri
+		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
+		dev-ruby/uglifier
+	)"
+
+all_ruby_prepare() {
+	# Avoid tests for template types that we currently don't package:
+	# eco and ejs.
+	sed -i -e '/eco templates/,/end/ s:^:#:' \
+		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
+	sed -i -e '/.ejs/ s:^:#:' test/test_asset.rb || die
+	rm -f test/test_require.rb test/test_{closure,eco,ejs,yui}_{compressor,processor}.rb || die
+	sed -i -e "/bundler/d" Rakefile || die
+
+	sed -i -e 's/MiniTest/Minitest/' test/sprockets_test.rb test/test*.rb || die
+	sed -i -e '2igem "rack", "<3"' test/sprockets_test.rb || die
+	sed -i -e '5irequire "rack/lint"' test/test_server.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
+}
+
+each_ruby_test() {
+	# Make sure we have completely separate copies. Hardlinks won't work
+	# for this test suite.
+	cp -R test test-new || die
+	rm -rf test || die
+	mv test-new test || die
+
+	each_fakegem_test
+}
diff --git a/dev-ruby/sprockets/sprockets-3.7.2.ebuild b/dev-ruby/sprockets/sprockets-3.7.2.ebuild
deleted file mode 100644
index 842fe75b2a81..000000000000
--- a/dev-ruby/sprockets/sprockets-3.7.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Ruby library for compiling and serving web assets"
-HOMEPAGE="https://github.com/rails/sprockets"
-SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 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=""
-
-ruby_add_rdepend "
-	dev-ruby/concurrent-ruby:1
-	>=dev-ruby/rack-1:* <dev-ruby/rack-3:*"
-
-ruby_add_bdepend "test? (
-		dev-ruby/json
-		dev-ruby/rack-test
-		=dev-ruby/coffee-script-2*
-		=dev-ruby/execjs-2*
-		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
-		dev-ruby/uglifier
-	)"
-
-all_ruby_prepare() {
-	# Avoid tests for template types that we currently don't package:
-	# eco and ejs.
-	sed -i -e '/eco templates/,/end/ s:^:#:' \
-		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
-	sed -i -e '/.ejs/ s:^:#:' test/test_asset.rb || die
-	rm -f test/test_require.rb test/test_{closure,eco,ejs,yui}_{compressor,processor}.rb || die
-	sed -i -e "/bundler/d" Rakefile || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
-}
-
-each_ruby_test() {
-	# Make sure we have completely separate copies. Hardlinks won't work
-	# for this test suite.
-	cp -R test test-new || die
-	rm -rf test || die
-	mv test-new test || die
-
-	each_fakegem_test
-}
diff --git a/dev-ruby/sprockets/sprockets-4.0.2.ebuild b/dev-ruby/sprockets/sprockets-4.0.2.ebuild
deleted file mode 100644
index 1258f043e5ad..000000000000
--- a/dev-ruby/sprockets/sprockets-4.0.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby library for compiling and serving web assets"
-HOMEPAGE="https://github.com/rails/sprockets"
-SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-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=""
-
-ruby_add_rdepend "
-	dev-ruby/concurrent-ruby:1
-	>=dev-ruby/rack-1:* <dev-ruby/rack-3:*
-	!<dev-ruby/sprockets-3.7.2-r1:3"
-
-ruby_add_bdepend "test? (
-		dev-ruby/json
-		dev-ruby/rack-test
-		=dev-ruby/coffee-script-2*
-		=dev-ruby/execjs-2*
-		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
-		dev-ruby/uglifier
-	)"
-
-all_ruby_prepare() {
-	# Avoid tests for template types that we currently don't package:
-	# eco and ejs.
-	sed -i -e '/eco templates/,/end/ s:^:#:' \
-		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
-	sed -i -e '/.ejs/ s:^:#:' -e '/\(es6_asset.js\|traceur.es6\)/ s:^:#:' test/test_asset.rb || die
-	sed -i -e '/compile babel source map/askip' test/test_source_maps.rb || die
-	sed -e '/change jst template namespace/askip' \
-		-e '/find_asset. does not raise an exception/askip' \
-		-e '/es6 asset/askip' \
-		-i test/test_environment.rb || die
-	rm -f test/test_require.rb test/test_{babel,closure,eco,ejs,jsminc,yui}_{compressor,processor}.rb || die
-	# Fails only within Gentoo test environment, not clear why
-	sed -i -e '/extension exporters/a skip' test/test_exporting.rb || die
-	sed -i -e "/bundler/d" Rakefile || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
-}
-
-each_ruby_test() {
-	# Make sure we have completely separate copies. Hardlinks won't work
-	# for this test suite.
-	cp -R test test-new || die
-	rm -rf test || die
-	mv test-new test || die
-
-	each_fakegem_test
-}
diff --git a/dev-ruby/sprockets/sprockets-4.2.0-r1.ebuild b/dev-ruby/sprockets/sprockets-4.2.0-r1.ebuild
new file mode 100644
index 000000000000..5d710d2dd7ab
--- /dev/null
+++ b/dev-ruby/sprockets/sprockets-4.2.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby library for compiling and serving web assets"
+HOMEPAGE="https://github.com/rails/sprockets"
+SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/concurrent-ruby:1
+	>=dev-ruby/rack-2.2.4:3.0
+"
+
+ruby_add_bdepend "test? (
+		dev-ruby/json
+		dev-ruby/rack-test
+		=dev-ruby/coffee-script-2*
+		=dev-ruby/execjs-2*
+		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
+		dev-ruby/sassc
+		dev-ruby/uglifier
+	)"
+
+all_ruby_prepare() {
+	# Avoid tests for template types that we currently don't package:
+	# eco and ejs.
+	sed -i -e '/eco templates/,/end/ s:^:#:' \
+		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
+	sed -i -e '/.ejs/ s:^:#:' -e '/\(es6_asset.js\|traceur.es6\)/ s:^:#:' test/test_asset.rb || die
+	sed -i -e '/compile babel source map/askip' test/test_source_maps.rb || die
+	sed -e '/change jst template namespace/askip' \
+		-e '/find_asset. does not raise an exception/askip' \
+		-e '/es6 asset/askip' \
+		-i test/test_environment.rb || die
+	rm -f test/test_require.rb test/test_{babel,closure,eco,ejs,jsminc,yui}_{compressor,processor}.rb || die
+	# Fails only within Gentoo test environment, not clear why
+	sed -i -e '/extension exporters/a skip' test/test_exporting.rb || die
+	sed -i -e "/bundler/d" Rakefile || die
+
+	sed -i -e 's/MiniTest/Minitest/' test/sprockets_test.rb test/test*.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
+}
+
+each_ruby_test() {
+	# Make sure we have completely separate copies. Hardlinks won't work
+	# for this test suite.
+	cp -R test test-new || die
+	rm -rf test || die
+	mv test-new test || die
+
+	each_fakegem_test
+}
diff --git a/dev-ruby/sprockets/sprockets-4.2.1.ebuild b/dev-ruby/sprockets/sprockets-4.2.1.ebuild
new file mode 100644
index 000000000000..6043672b9d83
--- /dev/null
+++ b/dev-ruby/sprockets/sprockets-4.2.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby library for compiling and serving web assets"
+HOMEPAGE="https://github.com/rails/sprockets"
+SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/concurrent-ruby:1
+	>=dev-ruby/rack-2.2.4:3.0
+"
+
+ruby_add_bdepend "test? (
+		dev-ruby/json
+		dev-ruby/rack-test
+		=dev-ruby/coffee-script-2*
+		=dev-ruby/execjs-2*
+		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
+		dev-ruby/sassc
+		dev-ruby/uglifier
+	)"
+
+all_ruby_prepare() {
+	# Avoid tests for template types that we currently don't package:
+	# eco and ejs.
+	sed -i -e '/eco templates/,/end/ s:^:#:' \
+		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
+	sed -i -e '/.ejs/ s:^:#:' -e '/\(es6_asset.js\|traceur.es6\)/ s:^:#:' test/test_asset.rb || die
+	sed -i -e '/compile babel source map/askip' test/test_source_maps.rb || die
+	sed -e '/change jst template namespace/askip' \
+		-e '/find_asset. does not raise an exception/askip' \
+		-e '/es6 asset/askip' \
+		-i test/test_environment.rb || die
+	rm -f test/test_require.rb test/test_{babel,closure,eco,ejs,jsminc,yui}_{compressor,processor}.rb || die
+	# Fails only within Gentoo test environment, not clear why
+	sed -i -e '/extension exporters/a skip' test/test_exporting.rb || die
+	sed -i -e "/bundler/d" Rakefile || die
+
+	sed -i -e 's/MiniTest/Minitest/' test/sprockets_test.rb test/test*.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
+}
+
+each_ruby_test() {
+	# Make sure we have completely separate copies. Hardlinks won't work
+	# for this test suite.
+	cp -R test test-new || die
+	rm -rf test || die
+	mv test-new test || die
+
+	each_fakegem_test
+}
diff --git a/dev-ruby/spy/Manifest b/dev-ruby/spy/Manifest
index 9257658d7eef..f3793598a9eb 100644
--- a/dev-ruby/spy/Manifest
+++ b/dev-ruby/spy/Manifest
@@ -1 +1 @@
-DIST spy-1.0.2.gem 34304 BLAKE2B 5019af0919d2015c82fc5c4e45b0ca98757294d747923ea68dfc24916d96667d5c118d628ebface8cd69d78ec4b558312c4ef9294b6b14e89e136cc75ac4c8f5 SHA512 df0bd3b95e534ca578ef612ef4afc5fa086504b7080fd187917f1b03548a140b1fa4b9d376760c41a9a7838c002c4a5606dedf13411dedbeba9d284fc4f981b9
+DIST spy-1.0.5.gem 22528 BLAKE2B 8568e16777c5979cc3542f870ac9517c8a4e0df666c05c5cb0e94f11345710c16429d542ac26df844328d9b722271ce68c89673f04ef87fe5607cd2d75d9a9ac SHA512 9a16b870c9b9ce35efb2e69cd8c1e7592e1589a3462844d956c5620df4bc818bf5574f2042cb6e82100142f6a9fd7ff25a5bfff124fbb849925a46ea7277cec0
diff --git a/dev-ruby/spy/spy-1.0.2.ebuild b/dev-ruby/spy/spy-1.0.2.ebuild
deleted file mode 100644
index a53c58410e95..000000000000
--- a/dev-ruby/spy/spy-1.0.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple opinionated mocking framework"
-HOMEPAGE="https://github.com/ryanong/spy"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/pry/d" -e "/[Cc]overalls/d" -e '/[Rr]eporters/d' Rakefile test/test_helper.rb || die
-}
diff --git a/dev-ruby/spy/spy-1.0.5.ebuild b/dev-ruby/spy/spy-1.0.5.ebuild
new file mode 100644
index 000000000000..7f17135df639
--- /dev/null
+++ b/dev-ruby/spy/spy-1.0.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple opinionated mocking framework"
+HOMEPAGE="https://github.com/ryanong/spy"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/pry/d" -e "/[Cc]overalls/d" -e '/[Rr]eporters/d' Rakefile test/test_helper.rb || die
+}
diff --git a/dev-ruby/sqlite3/Manifest b/dev-ruby/sqlite3/Manifest
index 6413ccf1c0c7..787b37a14cfd 100644
--- a/dev-ruby/sqlite3/Manifest
+++ b/dev-ruby/sqlite3/Manifest
@@ -1 +1,5 @@
-DIST sqlite3-1.4.2.gem 70656 BLAKE2B ef7fa7667fd080a6f175bcfbd1fe8dfba00d3fdf1214cc3d776f0576dc29386b627db8d6c0dd06f07ab65fff877a6803a6dcacefd4fbc5bb0f7d2149e355c88d SHA512 c4630dd2fa13914e2fcc70092c35568103f61f976958b439fe205abdfcff61702ca176d10bea40ff0cfea3169644cdb9146b7be94dff883cad3b753e84629545
+DIST sqlite3-1.6.7.gem 3249664 BLAKE2B 021edaa3d1a9d4cd8eeaaf3354e6e5aab047d8e61abbd5416ae50b2a7e426e5a6c1a484bc9f0c47a838b006b37eb3b41d7c51c200851f9d7bf0525b9dc91b597 SHA512 83455e533bbe84c71045b28ec6262b50804e774f3de4811e123cdb780ea4989227c01a8b6939179813ae3b59e1261e2d694830cc10ca05e7789dc635ff4d9b97
+DIST sqlite3-1.6.9.gem 3277312 BLAKE2B 85360858f23ad20efce1d2d0dfb5661440425ad2d45bee3ff4c26a1489a9c3e8d1a875a8a0a2f71b89f9dde85e01ab10b65ba9bebcc9f4efe2dfb9214d983a5e SHA512 d5bb7b928c9cac2a8a97f9ce4e56041713d41364bef6e37ea10e47d795576b0f524eea9a8369f2022dab12d79cf0d28f85383d731ecde1af5edfb0c6421c83ff
+DIST sqlite3-1.7.0.gem 3277824 BLAKE2B a836cccf0ad6572139589a534bd95e011108f313c0f3876da612196ddb58d4ca7e4de4534d896566c1d86e3990f5601f9953bd14b25ae9a7aa85559389ec11b1 SHA512 d87b9567e58018c51788d7d524f983f4a4503e95f2b25fd0e0eb655f357fff7c18ebdabf0cdd057a1ac2215c8c849e7eb4e10a323bdc812632830ab886510c16
+DIST sqlite3-1.7.2.gem 3305984 BLAKE2B 944ed6206476e4161361b31dfb09bcf0c91a7a5c7a675f21892aa9831d41218d367e459459a4774e86331aeabec9db1bd12956e01f004f23e2d95beed73d5808 SHA512 1e0ad4266230108f30716a1ab1dd2defc47f52e5a43250e32295e2506fa1398334010ad3aa771a60c2127618aef2344fe902e064ea525e95c99438db8c3b73b1
+DIST sqlite3-1.7.3.gem 3307008 BLAKE2B 0df742c7cb4a8f920196106b5701eae07e60e668f040ca6e3276afdd0dfdeed3fb19ed455425f332e13082ca740f42d914536ccdf565ed151b6eb0f6ccd7c676 SHA512 b6ed36a5618134ca1f993b21a351ac279ebb7e1370be521eae67ed9224a1fac11d71ddd7573b3b14da47657756cb68b3eab0164b6e6ed058d3f64fa95699bc2f
diff --git a/dev-ruby/sqlite3/sqlite3-1.4.2-r1.ebuild b/dev-ruby/sqlite3/sqlite3-1.4.2-r1.ebuild
deleted file mode 100644
index c689d3316749..000000000000
--- a/dev-ruby/sqlite3/sqlite3-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_DOC="faq"
-RUBY_FAKEGEM_DOCDIR="doc faq"
-RUBY_FAKEGEM_EXTRADOC="API_CHANGES.rdoc README.rdoc ChangeLog.cvs CHANGELOG.rdoc"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/sqlite3/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/sqlite3
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An extension library to access a SQLite database from Ruby"
-HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
-LICENSE="BSD"
-
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND+=" >=dev-db/sqlite-3.6.16:3"
-DEPEND+=" >=dev-db/sqlite-3.6.16:3"
-
-ruby_add_bdepend "
-	dev-ruby/rake-compiler
-	doc? ( dev-ruby/rdoc dev-ruby/redcloth )
-	test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	# We remove the vendor_sqlite3 rake task because it's used to
-	# bundle SQlite3 which we definitely don't want.
-	rm -f rakelib/vendor_sqlite3.rake || die
-
-	# Remove gem tasks since we don't need them and they require hoe.
-	rm -f rakelib/gem.rake || die
-
-	sed -i -e 's:, HOE.spec::' -e '/task :test/d' rakelib/native.rake || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		rdoc --title "${P} Dcoumentation" -o doc --main README.rdoc lib *.rdoc ext/*/*.c || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	# sqlite3 was called sqlite3-ruby before, so add a spec file that
-	# simply loads sqlite3 to make sure that old projects load correctly
-	# we don't even need to create a file to load this: the `require
-	# sqlite3` was already part of sqlite3-ruby requirements.
-	cat - <<EOF > "${T}/sqlite3-ruby.gemspec"
-# generated by ebuild
-# ${CATEGORY}/${PF}
-Gem::Specification.new do |s|
-	s.name = "sqlite3-ruby"
-	s.version = "${RUBY_FAKEGEM_VERSION}"
-	s.summary = "Fake gem to load sqlite3"
-	s.homepage = "${HOMEPAGE}"
-	s.specification_version = 3
-	s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
-end
-EOF
-	RUBY_FAKEGEM_NAME=sqlite3-ruby \
-		RUBY_FAKEGEM_GEMSPEC="${T}/sqlite3-ruby.gemspec" \
-		ruby_fakegem_install_gemspec
-}
diff --git a/dev-ruby/sqlite3/sqlite3-1.6.7.ebuild b/dev-ruby/sqlite3/sqlite3-1.6.7.ebuild
new file mode 100644
index 000000000000..856f3aa51cab
--- /dev/null
+++ b/dev-ruby/sqlite3/sqlite3-1.6.7.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_DOC="faq"
+RUBY_FAKEGEM_DOCDIR="doc faq"
+RUBY_FAKEGEM_EXTRADOC="API_CHANGES.md README.md ChangeLog.cvs CHANGELOG.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/sqlite3/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/sqlite3
+
+inherit ruby-fakegem
+
+DESCRIPTION="An extension library to access a SQLite database from Ruby"
+HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
+LICENSE="BSD"
+
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE=""
+
+# We track the bundled sqlite version here
+RDEPEND+=" >=dev-db/sqlite-3.43.2:3"
+DEPEND+=" >=dev-db/sqlite-3.43.2:3"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/rdoc dev-ruby/redcloth )
+	test? ( dev-ruby/minitest:5 )
+"
+
+all_ruby_prepare() {
+	sed -i -e 's/enable_config("system-libraries")/true/' ext/sqlite3/extconf.rb || die
+
+	# Remove the runtime dependency on mini_portile2. We build without
+	# it and it is not a runtime dependency for us.
+	sed -i -e '/^dependencies:/,/force_ruby_platform/d' ../metadata || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		rdoc --title "${P} Documentation" -o doc --main README.rdoc lib *.rdoc ext/*/*.c || die
+		rm -f doc/js/*.gz || die
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/sqlite3/sqlite3-1.6.9.ebuild b/dev-ruby/sqlite3/sqlite3-1.6.9.ebuild
new file mode 100644
index 000000000000..02ac7a89108d
--- /dev/null
+++ b/dev-ruby/sqlite3/sqlite3-1.6.9.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_DOC="faq"
+RUBY_FAKEGEM_DOCDIR="doc faq"
+RUBY_FAKEGEM_EXTRADOC="API_CHANGES.md README.md ChangeLog.cvs CHANGELOG.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/sqlite3/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/sqlite3
+
+inherit ruby-fakegem
+
+DESCRIPTION="An extension library to access a SQLite database from Ruby"
+HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE=""
+
+# We track the bundled sqlite version here
+RDEPEND+=" >=dev-db/sqlite-3.44.2:3"
+DEPEND+=" >=dev-db/sqlite-3.44.2:3"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/rdoc dev-ruby/redcloth )
+	test? ( dev-ruby/minitest:5 )
+"
+
+all_ruby_prepare() {
+	sed -i -e 's/enable_config("system-libraries")/true/' ext/sqlite3/extconf.rb || die
+
+	# Remove the runtime dependency on mini_portile2. We build without
+	# it and it is not a runtime dependency for us.
+	sed -i -e '/^dependencies:/,/force_ruby_platform/d' ../metadata || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		rdoc --title "${P} Documentation" -o doc --main README.rdoc lib *.rdoc ext/*/*.c || die
+		rm -f doc/js/*.gz || die
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/sqlite3/sqlite3-1.7.0.ebuild b/dev-ruby/sqlite3/sqlite3-1.7.0.ebuild
new file mode 100644
index 000000000000..6a59e359cad9
--- /dev/null
+++ b/dev-ruby/sqlite3/sqlite3-1.7.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC="faq"
+RUBY_FAKEGEM_DOCDIR="doc faq"
+RUBY_FAKEGEM_EXTRADOC="API_CHANGES.md README.md ChangeLog.cvs CHANGELOG.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/sqlite3/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/sqlite3
+
+inherit ruby-fakegem
+
+DESCRIPTION="An extension library to access a SQLite database from Ruby"
+HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE=""
+
+# We track the bundled sqlite version here
+RDEPEND+=" >=dev-db/sqlite-3.44.2:3"
+DEPEND+=" >=dev-db/sqlite-3.44.2:3"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/rdoc )
+	test? ( dev-ruby/minitest:5 )
+"
+
+all_ruby_prepare() {
+	sed -i -e 's/enable_config("system-libraries")/true/' ext/sqlite3/extconf.rb || die
+
+	# Remove the runtime dependency on mini_portile2. We build without
+	# it and it is not a runtime dependency for us.
+	sed -i -e '/^dependencies:/,/force_ruby_platform/d' ../metadata || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		rdoc --title "${P} Documentation" -o doc --main README.rdoc lib *.rdoc ext/*/*.c || die
+		rm -f doc/js/*.gz || die
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/sqlite3/sqlite3-1.7.2.ebuild b/dev-ruby/sqlite3/sqlite3-1.7.2.ebuild
new file mode 100644
index 000000000000..0824284115ae
--- /dev/null
+++ b/dev-ruby/sqlite3/sqlite3-1.7.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC="faq"
+RUBY_FAKEGEM_DOCDIR="doc faq"
+RUBY_FAKEGEM_EXTRADOC="API_CHANGES.md README.md ChangeLog.cvs CHANGELOG.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/sqlite3/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/sqlite3
+
+inherit ruby-fakegem
+
+DESCRIPTION="An extension library to access a SQLite database from Ruby"
+HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="doc test"
+
+# We track the bundled sqlite version here
+RDEPEND+=" >=dev-db/sqlite-3.45.1:3"
+DEPEND+=" >=dev-db/sqlite-3.45.1:3"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/rdoc )
+	test? ( dev-ruby/minitest:5 )
+"
+
+all_ruby_prepare() {
+	sed -i -e 's/enable_config("system-libraries")/true/' ext/sqlite3/extconf.rb || die
+
+	# Remove the runtime dependency on mini_portile2. We build without
+	# it and it is not a runtime dependency for us.
+	sed -i -e '/^dependencies:/,/force_ruby_platform/d' ../metadata || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		rdoc --title "${P} Documentation" -o doc --main README.rdoc lib *.rdoc ext/*/*.c || die
+		rm -f doc/js/*.gz || die
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/sqlite3/sqlite3-1.7.3.ebuild b/dev-ruby/sqlite3/sqlite3-1.7.3.ebuild
new file mode 100644
index 000000000000..096080242fee
--- /dev/null
+++ b/dev-ruby/sqlite3/sqlite3-1.7.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC="faq"
+RUBY_FAKEGEM_DOCDIR="doc faq"
+RUBY_FAKEGEM_EXTRADOC="API_CHANGES.md README.md ChangeLog.cvs CHANGELOG.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/sqlite3/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/sqlite3
+
+inherit ruby-fakegem
+
+DESCRIPTION="An extension library to access a SQLite database from Ruby"
+HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="doc test"
+
+# We track the bundled sqlite version here
+RDEPEND+=" >=dev-db/sqlite-3.45.2:3"
+DEPEND+=" >=dev-db/sqlite-3.45.2:3"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/rdoc )
+	test? ( dev-ruby/minitest:5 )
+"
+
+all_ruby_prepare() {
+	sed -i -e 's/enable_config("system-libraries")/true/' ext/sqlite3/extconf.rb || die
+
+	# Remove the runtime dependency on mini_portile2. We build without
+	# it and it is not a runtime dependency for us.
+	sed -i -e '/^dependencies:/,/force_ruby_platform/d' ../metadata || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		rdoc --title "${P} Documentation" -o doc --main README.rdoc lib *.rdoc ext/*/*.c || die
+		rm -f doc/js/*.gz || die
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/sshkey/Manifest b/dev-ruby/sshkey/Manifest
index d96f1c51344c..636a59ac176d 100644
--- a/dev-ruby/sshkey/Manifest
+++ b/dev-ruby/sshkey/Manifest
@@ -1 +1,2 @@
 DIST sshkey-2.0.0.gem 26112 BLAKE2B 19fb790d4eba7f57e96b57d838fb6736857b9394f678d37f4577a1794b6d7f901fe35165616c317add04d470a301ab79b55e39d64ef93b566d4c1f628a74fe22 SHA512 dfd56a8b3b4f6abe785f37b5e1a4a61799c704a864821c35beaa6ddcec51b2f9f0111ef945fdacac685cbe6141e7ce2ad0c9bae8fa4cf8a8d48354701a0e5d05
+DIST sshkey-3.0.0.gem 31232 BLAKE2B 2bf0a99dd89866ed0d63ac9df4aff9f1085178fef2485c29f4777838e26bbcaac71a80f73446fdeea443e970912f98b10796d095bb8661d3bc8e108e5ae545ca SHA512 5d72a6e6e30de68ecd81176d4d50e74d34c89f63efeb6df374ac5226f19c47254158a7d9f909661839b3a0188d88fe4521bfdaca8b20ee3aa4db72996b7519ec
diff --git a/dev-ruby/sshkey/metadata.xml b/dev-ruby/sshkey/metadata.xml
index f2ab426cb484..cadb316c849e 100644
--- a/dev-ruby/sshkey/metadata.xml
+++ b/dev-ruby/sshkey/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
     <remote-id type="github">bensie/sshkey</remote-id>
diff --git a/dev-ruby/sshkey/sshkey-2.0.0-r1.ebuild b/dev-ruby/sshkey/sshkey-2.0.0-r1.ebuild
index b72dbc2932e6..ca855bdd65b4 100644
--- a/dev-ruby/sshkey/sshkey-2.0.0-r1.ebuild
+++ b/dev-ruby/sshkey/sshkey-2.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby27 ruby30 ruby31 ruby32"
 
 inherit ruby-fakegem
 
@@ -11,7 +11,5 @@ DESCRIPTION="SSH private and public key generator in pure Ruby"
 HOMEPAGE="https://rubygems.org/gems/sshkey"
 
 LICENSE="MIT"
-
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/sshkey/sshkey-2.0.0.ebuild b/dev-ruby/sshkey/sshkey-2.0.0.ebuild
deleted file mode 100644
index 135aaec5d532..000000000000
--- a/dev-ruby/sshkey/sshkey-2.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SSH private and public key generator in pure Ruby"
-HOMEPAGE="https://rubygems.org/gems/sshkey"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/sshkey/sshkey-3.0.0.ebuild b/dev-ruby/sshkey/sshkey-3.0.0.ebuild
new file mode 100644
index 000000000000..3158985b3d38
--- /dev/null
+++ b/dev-ruby/sshkey/sshkey-3.0.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit ruby-fakegem
+
+DESCRIPTION="SSH private and public key generator in pure Ruby"
+HOMEPAGE="https://rubygems.org/gems/sshkey"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index 2e409842216f..021c6e1e76d9 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -1 +1,4 @@
-DIST sshkit-1.21.2.gem 144896 BLAKE2B ea72b1d0df7252f9c4ffe010721a957b5a86cc43697acf4dfd065a74cca5317deeb15692449d573a2e5590ef3a23ee666196b7b661d6986a2f270d16e2dc8d89 SHA512 37515726b67ae0e2ac9dff42cf7b71a32832ebe144aa192332780e4d9aead1a9e4c3cf7f6f0b994804175a5befd896b32908a82ba2e4f4a1d4e4b0f5bf01c3b3
+DIST sshkit-1.21.5.gem 145408 BLAKE2B 19fa326d30ddae12be84b7cf460d5d44c48fc52cf89f61a775999eae7cbcc985ac7b335dd4aa772e8966decc24a6e5a894621e9873ac133122fb8e18d1c82945 SHA512 e441da155323dd71c235d3ebb4ddccd41987183cffe4e23cb52404ba25a16ae4f3c1f786d7be4db6dc8733013720b99d12c8f3369f1d8841f967407b3edb28b2
+DIST sshkit-1.21.7.gem 145408 BLAKE2B e1fdeff6f9935d4d3bce846545d13779e0fce3f989bcb81e5a51e8342bcdce364b398ef480829c49a3ae90677efa5f7a5c4868de8fdc5f4b72f797c4b2513132 SHA512 7ba9fc8958293da7307720bc944c85f2d80991f8552833768793eaea3b49fde4d11d62bd39b90615a6957aa7af13f26cc7ba8b8279a29aa46a4283fa01151374
+DIST sshkit-1.22.0.gem 146944 BLAKE2B e257fc8b7c5a803a310f6193910fa93b5ae388b5265095eececcd342abefdba95a6bb9bdd3813e1eb7a999e73c116b973a9b903ae43ed804c5bface758721719 SHA512 fea5d130c0821f8762f76fa3eb9daa6104bea0f1dd59a0cf3845becc96773d2ac81b909151c9535d68dd1fd17a6f6071cde048d74c9c46105ac3d5d143c20d3b
+DIST sshkit-1.22.1.gem 146944 BLAKE2B 19e6065e1a6859e048ea1b7a5453166768397108030fcfb923f9d6ef90475f76a23859cb2a35c07a6fd9921adfd784a149d116731238b2cb8102369224114d4c SHA512 35bb7dc66827548b31be6d16a7b36b56b7357605cf12d1673162f35a5ac583524a6bf014f1a2a317038cd581b6b34922729daff711bc3bdb27ce8e193cab1929
diff --git a/dev-ruby/sshkit/sshkit-1.21.2.ebuild b/dev-ruby/sshkit/sshkit-1.21.2.ebuild
deleted file mode 100644
index 339616db4166..000000000000
--- a/dev-ruby/sshkit/sshkit-1.21.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-# There are functional tests that require vagrant boxes to be set up.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
-HOMEPAGE="https://github.com/capistrano/sshkit"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/net-ssh-2.8.0:*
-	>=dev-ruby/net-scp-1.1.2
-"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
-	sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
-		-e '1irequire "set"; require "pathname"' test/helper.rb || die
-
-	# Fix assumption about parent directory name
-	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
-}
-
-each_ruby_test() {
-	# Run tests directly to avoid dependencies in the Rakefile
-	${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/sshkit/sshkit-1.21.5.ebuild b/dev-ruby/sshkit/sshkit-1.21.5.ebuild
new file mode 100644
index 000000000000..b8afec355de2
--- /dev/null
+++ b/dev-ruby/sshkit/sshkit-1.21.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+# There are functional tests that require vagrant boxes to be set up.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
+HOMEPAGE="https://github.com/capistrano/sshkit"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/net-ssh-2.8.0:*
+	>=dev-ruby/net-scp-1.1.2
+"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
+	sed -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
+		-e '1irequire "pathname"' \
+		-i test/helper.rb || die
+
+	# Fix assumption about parent directory name
+	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
+}
+
+each_ruby_test() {
+	# Run tests directly to avoid dependencies in the Rakefile
+	${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/sshkit/sshkit-1.21.7.ebuild b/dev-ruby/sshkit/sshkit-1.21.7.ebuild
new file mode 100644
index 000000000000..c511e580cd65
--- /dev/null
+++ b/dev-ruby/sshkit/sshkit-1.21.7.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="ruby31 ruby32"
+
+# There are functional tests that require vagrant boxes to be set up.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
+HOMEPAGE="https://github.com/capistrano/sshkit"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/mutex_m
+	>=dev-ruby/net-ssh-2.8.0:*
+	>=dev-ruby/net-scp-1.1.2
+"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
+	sed -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
+		-e '1irequire "pathname"' \
+		-i test/helper.rb || die
+
+	# Fix assumption about parent directory name
+	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
+}
+
+each_ruby_test() {
+	# Run tests directly to avoid dependencies in the Rakefile
+	${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/sshkit/sshkit-1.22.0.ebuild b/dev-ruby/sshkit/sshkit-1.22.0.ebuild
new file mode 100644
index 000000000000..9e852befa916
--- /dev/null
+++ b/dev-ruby/sshkit/sshkit-1.22.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# There are functional tests that require vagrant boxes to be set up.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
+HOMEPAGE="https://github.com/capistrano/sshkit"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+ruby_add_rdepend "
+	dev-ruby/mutex_m
+	>=dev-ruby/net-ssh-2.8.0:*
+	>=dev-ruby/net-scp-1.1.2
+	>=dev-ruby/net-sftp-2.1.2
+"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
+	sed -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
+		-e '1irequire "pathname"' \
+		-i test/helper.rb || die
+
+	# Fix assumption about parent directory name
+	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
+}
+
+each_ruby_test() {
+	# Run tests directly to avoid dependencies in the Rakefile
+	${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/sshkit/sshkit-1.22.1.ebuild b/dev-ruby/sshkit/sshkit-1.22.1.ebuild
new file mode 100644
index 000000000000..5b68c7da5322
--- /dev/null
+++ b/dev-ruby/sshkit/sshkit-1.22.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+# There are functional tests that require vagrant boxes to be set up.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
+HOMEPAGE="https://github.com/capistrano/sshkit"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+ruby_add_rdepend "
+	dev-ruby/base64
+	dev-ruby/mutex_m
+	>=dev-ruby/net-ssh-2.8.0:*
+	>=dev-ruby/net-scp-1.1.2
+	>=dev-ruby/net-sftp-2.1.2
+"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
+	sed -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
+		-e '1irequire "pathname"' \
+		-i test/helper.rb || die
+
+	# Fix assumption about parent directory name
+	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
+}
+
+each_ruby_test() {
+	# Run tests directly to avoid dependencies in the Rakefile
+	${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/stamp/stamp-0.6.0-r1.ebuild b/dev-ruby/stamp/stamp-0.6.0-r1.ebuild
index c036d03dd0be..f18f5b0e93e6 100644
--- a/dev-ruby/stamp/stamp-0.6.0-r1.ebuild
+++ b/dev-ruby/stamp/stamp-0.6.0-r1.ebuild
@@ -1,9 +1,9 @@
-# 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"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="cucumber"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/state_machine/Manifest b/dev-ruby/state_machine/Manifest
deleted file mode 100644
index ada22debc86f..000000000000
--- a/dev-ruby/state_machine/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST state_machine-1.2.0.gem 604160 BLAKE2B 5fe7b3b192d887293fccbd27c2c1b289883e0c0fdc918b188564ded4366175278f172907ee62a57bb37a9d969e7e989f6cda639fe0b946935455cf81466c9ed6 SHA512 aa26d9cc99b0e873f9b146acddaa53f0332cff403463a5079cab5e00902db7b60e47957fc8b4c7ebc62861894460613a0b075b13548544392432ee564936567f
diff --git a/dev-ruby/state_machine/metadata.xml b/dev-ruby/state_machine/metadata.xml
deleted file mode 100644
index 658c72b1920d..000000000000
--- a/dev-ruby/state_machine/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/state_machine/state_machine-1.2.0-r1.ebuild b/dev-ruby/state_machine/state_machine-1.2.0-r1.ebuild
deleted file mode 100644
index 25c86f246460..000000000000
--- a/dev-ruby/state_machine/state_machine-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Adds support for creating state machines for attributes on any Ruby class"
-HOMEPAGE="http://www.pluginaweek.org"
-IUSE="test"
-SLOT="0"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/{unit,functional}/*_test.rb
-}
diff --git a/dev-ruby/stomp/Manifest b/dev-ruby/stomp/Manifest
index 055b7586488f..b0e928f9c22b 100644
--- a/dev-ruby/stomp/Manifest
+++ b/dev-ruby/stomp/Manifest
@@ -1,2 +1 @@
 DIST stomp-1.4.10.gem 99840 BLAKE2B 5dc2b18d7551629dccb599a77934bffcf92d83158b6797a1645f5fd8af6c4738e1d8d97d5a6c6bb6655c19f98accd4ecdee0677096f9a5e89bdf0295532a1087 SHA512 bff1a533e5455cf4540bab3b5d16c63f1e0783b0257b5e0bf2fd26512586670ce5db66f97e098805c7b5fc02913478553409b90a4014bdc883465bc7b474eb7e
-DIST stomp-1.4.9.gem 99328 BLAKE2B 9aa50880224cede15be69657ec7ecccf1a075db3e51de55faf3a0ba50335b90b910d1202c646585229cc35c0e2e4cf01fd99774960d9ae90ff82030c4bac6a69 SHA512 e1e3aed86621e2dac199fd7e4ba67fedc3582b5cfe9e4ff2efbdc9c545bb25d2c52391d9403e2fa935f69635e85bd3c1ca29d2d5b3c425aa850d3ccb8f7a5e86
diff --git a/dev-ruby/stomp/files/stomp-1.4.10-rspec-3.12.patch b/dev-ruby/stomp/files/stomp-1.4.10-rspec-3.12.patch
new file mode 100644
index 000000000000..f7f1ca39016b
--- /dev/null
+++ b/dev-ruby/stomp/files/stomp-1.4.10-rspec-3.12.patch
@@ -0,0 +1,149 @@
+https://github.com/stompgem/stomp/pull/175
+
+From 299923281d02e544ca386a9883e87c395135d3af Mon Sep 17 00:00:00 2001
+From: Steve Traylen <steve.traylen@cern.ch>
+Date: Thu, 30 Mar 2023 13:36:52 +0200
+Subject: [PATCH] Fix tests failing with rspec 3.12
+
+Patch from
+
+* https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1027092
+* https://salsa.debian.org/ruby-team/ruby-stomp/-/commit/5be6383a7a34a1d1891708d6aa8688cb4a6f89a5
+
+resolves rspec failure:
+
+```
+$ rspec --fail-fast spec/client_spec.rb
+RSpec version: 3.8.0
+Traceback (most recent call last):
+	9: from /home/straylen/pkgs/rubygem-stomp/stomp-1.4.9/lib/client/utils.rb:194:in `block in start_listeners'
+	8: from /home/straylen/pkgs/rubygem-stomp/stomp-1.4.9/lib/client/utils.rb:194:in `loop'
+	7: from /home/straylen/pkgs/rubygem-stomp/stomp-1.4.9/lib/client/utils.rb:195:in `block (2 levels) in start_listeners'
+	6: from /usr/share/gems/gems/rspec-mocks-3.8.1/lib/rspec/mocks/test_double.rb:102:in `method_missing'
+	5: from /usr/share/gems/gems/rspec-mocks-3.8.1/lib/rspec/mocks/proxy.rb:202:in `raise_unexpected_message_error'
+	4: from /usr/share/gems/gems/rspec-mocks-3.8.1/lib/rspec/mocks/error_generator.rb:50:in `raise_unexpected_message_error'
+	3: from /usr/share/gems/gems/rspec-mocks-3.8.1/lib/rspec/mocks/error_generator.rb:311:in `__raise'
+	2: from /usr/share/gems/gems/rspec-mocks-3.8.1/lib/rspec/mocks/error_generator.rb:327:in `notify'
+	1: from /usr/share/gems/gems/rspec-support-3.8.2/lib/rspec/support.rb:106:in `notify_failure'
+/usr/share/gems/gems/rspec-support-3.8.2/lib/rspec/support.rb:97:in `block in <module:Support>': #<Double "connection"> received unexpected message :receive with (no args) (RSpec::Mocks::MockExpectationError)
+.#<Thread:0x000055a54150bd60@/home/straylen/pkgs/rubygem-stomp/stomp-1.4.9/lib/client/utils.rb:193 run> terminated with exception (report_on_exception is true):
+Traceback (most recent call last):
+	6: from /home/straylen/pkgs/rubygem-stomp/stomp-1.4.9/lib/client/utils.rb:194:in `block in start_listeners'
+	5: from /home/straylen/pkgs/rubygem-stomp/stomp-1.4.9/lib/client/utils.rb:194:in `loop'
+```
+
+Fixes: #164
+--- a/spec/client_spec.rb
++++ b/spec/client_spec.rb
+@@ -136,13 +136,13 @@
+     end
+ 
+     it "should properly parse the URL provided" do
+-      expect(Stomp::Connection).to receive(:new).with(:hosts => [{:login => 'testlogin',
++      expect(Stomp::Connection).to receive(:new).with({:hosts => [{:login => 'testlogin',
+                                                               :passcode => 'testpassword',
+                                                               :host => 'localhost',
+                                                               :port => 12345}],
+                                                   :logger => null_logger,
+                                                   :reliable => false,
+-												:client_main => @cli_thread)
++												:client_main => @cli_thread})
+       Stomp::Client.new('testlogin', 'testpassword', 'localhost', '12345', false)
+     end
+ 
+@@ -157,13 +157,13 @@
+     end
+ 
+     it "should properly parse the URL provided" do
+-      expect(Stomp::Connection).to receive(:new).with(:hosts => [{:login => '',
++      expect(Stomp::Connection).to receive(:new).with({:hosts => [{:login => '',
+                                                               :passcode => '',
+                                                               :host => 'foobar',
+                                                               :port => 12345}],
+                                                   :logger => null_logger,
+                                                   :reliable => false,
+-												:client_main => @cli_thread)
++												:client_main => @cli_thread})
+       Stomp::Client.new('stomp://foobar:12345')
+     end
+ 
+@@ -179,13 +179,13 @@
+     end
+ 
+     it "should properly parse the URL provided" do
+-      expect(Stomp::Connection).to receive(:new).with(:hosts => [{:login => '',
++      expect(Stomp::Connection).to receive(:new).with({:hosts => [{:login => '',
+                                                               :passcode => '',
+                                                               :host => 'foo-bar',
+                                                               :port => 12345}],
+                                                   :logger => null_logger,
+                                                   :reliable => false,
+-												:client_main => @cli_thread)
++												:client_main => @cli_thread})
+       Stomp::Client.new('stomp://foo-bar:12345')
+     end
+ 
+@@ -201,13 +201,13 @@
+     end
+ 
+     it "should properly parse the URL provided" do
+-      expect(Stomp::Connection).to receive(:new).with(:hosts => [{:login => 'test-login',
++      expect(Stomp::Connection).to receive(:new).with({:hosts => [{:login => 'test-login',
+                                                               :passcode => 'testpasscode',
+                                                               :host => 'foobar',
+                                                               :port => 12345}],
+                                                   :logger => null_logger,
+                                                   :reliable => false,
+-												:client_main => @cli_thread)
++												:client_main => @cli_thread})
+       Stomp::Client.new('stomp://test-login:testpasscode@foobar:12345')
+     end
+ 
+@@ -223,13 +223,13 @@
+     end
+ 
+     it "should properly parse the URL provided" do
+-      expect(Stomp::Connection).to receive(:new).with(:hosts => [{:login => 'test-login',
++      expect(Stomp::Connection).to receive(:new).with({:hosts => [{:login => 'test-login',
+                                                               :passcode => 'testpasscode',
+                                                               :host => 'foo-bar',
+                                                               :port => 12345}],
+                                                   :logger => null_logger,
+                                                   :reliable => false,
+-												:client_main => @cli_thread)
++												:client_main => @cli_thread})
+       Stomp::Client.new('stomp://test-login:testpasscode@foo-bar:12345')
+     end
+ 
+@@ -248,13 +248,13 @@
+     end
+ 
+     it "should properly parse the URL provided" do
+-      expect(Stomp::Connection).to receive(:new).with(:hosts => [{:login => '',
++      expect(Stomp::Connection).to receive(:new).with({:hosts => [{:login => '',
+                                                               :passcode => '',
+                                                               :host => 'host.foobar.com',
+                                                               :port => 12345}],
+                                                   :logger => null_logger,
+                                                   :reliable => false,
+-												:client_main => @cli_thread)
++												:client_main => @cli_thread})
+       Stomp::Client.new('stomp://host.foobar.com:12345')
+     end
+ 
+@@ -270,13 +270,13 @@
+     end
+ 
+     it "should properly parse the URL provided" do
+-      expect(Stomp::Connection).to receive(:new).with(:hosts => [{:login => 'testlogin',
++      expect(Stomp::Connection).to receive(:new).with({:hosts => [{:login => 'testlogin',
+                                                               :passcode => 'testpasscode',
+                                                               :host => 'host.foobar.com',
+                                                               :port => 12345}],
+                                                   :logger => null_logger,
+                                                   :reliable => false,
+-												:client_main => @cli_thread)
++												:client_main => @cli_thread})
+       Stomp::Client.new('stomp://testlogin:testpasscode@host.foobar.com:12345')
+     end
+ 
diff --git a/dev-ruby/stomp/stomp-1.4.10-r1.ebuild b/dev-ruby/stomp/stomp-1.4.10-r1.ebuild
new file mode 100644
index 000000000000..b3d25fc0bea1
--- /dev/null
+++ b/dev-ruby/stomp/stomp-1.4.10-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby bindings for the stomp messaging protocol"
+HOMEPAGE="https://github.com/stompgem/stomp"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.10-rspec-3.12.patch
+)
+
+all_ruby_prepare() {
+	# Skip specs that hang the test run indefinitely, most likely
+	# because of rspec-mocks deprecation output
+	rm -f spec/connection_spec.rb || die
+}
diff --git a/dev-ruby/stomp/stomp-1.4.10.ebuild b/dev-ruby/stomp/stomp-1.4.10.ebuild
deleted file mode 100644
index 67495063da29..000000000000
--- a/dev-ruby/stomp/stomp-1.4.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby bindings for the stomp messaging protocol"
-HOMEPAGE="https://github.com/stompgem/stomp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Skip specs that hang the test run indefinitely, most likely
-	# because of rspec-mocks deprecation output
-	rm -f spec/connection_spec.rb || die
-}
diff --git a/dev-ruby/stomp/stomp-1.4.9.ebuild b/dev-ruby/stomp/stomp-1.4.9.ebuild
deleted file mode 100644
index cd1e6a88a687..000000000000
--- a/dev-ruby/stomp/stomp-1.4.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby bindings for the stomp messaging protocol"
-HOMEPAGE="https://github.com/stompgem/stomp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Skip specs that hang the test run indefinitely, most likely
-	# because of rspec-mocks deprecation output
-	rm -f spec/connection_spec.rb || die
-}
diff --git a/dev-ruby/stream/Manifest b/dev-ruby/stream/Manifest
new file mode 100644
index 000000000000..13ccabf2a478
--- /dev/null
+++ b/dev-ruby/stream/Manifest
@@ -0,0 +1 @@
+DIST stream-0.5.5.tar.gz 11828 BLAKE2B daba14d60c8978fbd7dd57eb9bc61362634ab414b2c8a88065251acbcc65beec1aa11db5f65fd09e37d0fe6abb904f4dbdcb6a1a9b58cf8c757cb90359d377c6 SHA512 bf9f48201b70f30caa9b9c4240254ff78e6e4dd760475ec23fe95d77e42cfa41b6bb43a19c2469ec8554bee8b6aafd84a3c830651b26b9602b53cdec57d976b1
diff --git a/dev-ruby/stream/metadata.xml b/dev-ruby/stream/metadata.xml
new file mode 100644
index 000000000000..d0db85479c40
--- /dev/null
+++ b/dev-ruby/stream/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">monora/stream</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/stream/stream-0.5.5.ebuild b/dev-ruby/stream/stream-0.5.5.ebuild
new file mode 100644
index 000000000000..c9962d9a9f85
--- /dev/null
+++ b/dev-ruby/stream/stream-0.5.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+RUBY_FAKEGEM_GEMSPEC="stream.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Module Stream defines an interface for external iterators"
+HOMEPAGE="https://github.com/monora/stream"
+SRC_URI="https://github.com/monora/stream/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+ruby_add_bdepend "dev-ruby/bundler dev-ruby/yard test? ( dev-ruby/test-unit )"
diff --git a/dev-ruby/stringex/Manifest b/dev-ruby/stringex/Manifest
index c6b7c372c9ab..52ca7c4beb8f 100644
--- a/dev-ruby/stringex/Manifest
+++ b/dev-ruby/stringex/Manifest
@@ -1 +1,2 @@
 DIST stringex-2.8.5.gem 130048 BLAKE2B c07eaaee07bf348690166b41b0846bc49eb49c5ba9e39c7eaeea2a3a60d6089edd7c7d1d75fd9a5208c9883c4bff8840ccf56c6f186daeabcf79e7f4fb6b4d25 SHA512 53f9908f176f465d2e884e92dffb26abcdf75593c94ee8250253da0eb29eddf489cf5b3f539135659ad4c0e2dd738d2affff6a946c50abd5f36517148d8338ce
+DIST stringex-2.8.6.gem 130048 BLAKE2B 39564e4d195c347de2e647490671688350bf3658e7d42035dc5b4acd73fbd01a44d435540be792eeebb70513a6c4fee7de0bc98a16b9d647af7d93d1ae663a23 SHA512 aea0b7b203bb6d57a72869bfd0a3b832893ba355426bd5a4e99b535a0c0a6d2a1c2aa8839f57da73de9235ccde78d900c30f86b858e55c695d921838270e25fd
diff --git a/dev-ruby/stringex/stringex-2.8.5-r1.ebuild b/dev-ruby/stringex/stringex-2.8.5-r1.ebuild
deleted file mode 100644
index 50c2d61426e1..000000000000
--- a/dev-ruby/stringex/stringex-2.8.5-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Extensions for Ruby's String class"
-HOMEPAGE="https://github.com/rsl/stringex"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test"
-
-# we could rely on activerecord[sqlite3], but since we do not remove the
-# sqlite3 adapter from activerecord when building -sqlite3, it's easier
-# to just add another dependency, so the user doesn't have to change the
-# USE flags at all.
-ruby_add_bdepend "
-	test? (
-		dev-ruby/i18n:1
-		dev-ruby/redcloth
-		dev-ruby/test-unit:2
-		|| ( dev-ruby/activerecord:7.0[sqlite] dev-ruby/activerecord:6.1[sqlite] dev-ruby/activerecord:6.0[sqlite] dev-ruby/activerecord:5.2[sqlite] )
-		)"
-
-all_ruby_prepare() {
-	# Let tests work with newer rails versions
-	sed -i -e 's/update_attributes/update/' test/unit/acts_as_url/adapter/* || die
-}
diff --git a/dev-ruby/stringex/stringex-2.8.5-r2.ebuild b/dev-ruby/stringex/stringex-2.8.5-r2.ebuild
new file mode 100644
index 000000000000..3cf725072051
--- /dev/null
+++ b/dev-ruby/stringex/stringex-2.8.5-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+inherit ruby-fakegem
+
+DESCRIPTION="Extensions for Ruby's String class"
+HOMEPAGE="https://github.com/rsl/stringex"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/i18n:1
+		dev-ruby/redcloth
+		dev-ruby/test-unit:2
+		)"
+
+all_ruby_prepare() {
+	# Let tests work with newer rails versions
+	sed -i -e 's/update_attributes/update/' test/unit/acts_as_url/adapter/* || die
+}
+
+each_ruby_prepare() {
+	if has_version "dev-ruby/activerecord[ruby_targets_${_ruby_implementation},sqlite]" ; then
+		einfo "Testing activerecord integration"
+	else
+		rm -f test/unit/acts_as_url_integration_test.rb || die
+	fi
+}
diff --git a/dev-ruby/stringex/stringex-2.8.5-r3.ebuild b/dev-ruby/stringex/stringex-2.8.5-r3.ebuild
new file mode 100644
index 000000000000..1bd1c2e18a50
--- /dev/null
+++ b/dev-ruby/stringex/stringex-2.8.5-r3.ebuild
@@ -0,0 +1,36 @@
+# 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_EXTRAINSTALL="locales"
+inherit ruby-fakegem
+
+DESCRIPTION="Extensions for Ruby's String class"
+HOMEPAGE="https://github.com/rsl/stringex"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/i18n:1
+		dev-ruby/redcloth
+		dev-ruby/test-unit:2
+		)"
+
+all_ruby_prepare() {
+	# Let tests work with newer rails versions
+	sed -i -e 's/update_attributes/update/' test/unit/acts_as_url/adapter/* || die
+}
+
+each_ruby_prepare() {
+	if has_version "dev-ruby/activerecord[ruby_targets_${_ruby_implementation},sqlite]" ; then
+		einfo "Testing activerecord integration"
+	else
+		rm -f test/unit/acts_as_url_integration_test.rb || die
+	fi
+}
diff --git a/dev-ruby/stringex/stringex-2.8.5.ebuild b/dev-ruby/stringex/stringex-2.8.5.ebuild
deleted file mode 100644
index 57771381bc08..000000000000
--- a/dev-ruby/stringex/stringex-2.8.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Extensions for Ruby's String class"
-HOMEPAGE="https://github.com/rsl/stringex"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test"
-
-# we could rely on activerecord[sqlite3], but since we do not remove the
-# sqlite3 adapter from activerecord when building -sqlite3, it's easier
-# to just add another dependency, so the user doesn't have to change the
-# USE flags at all.
-ruby_add_bdepend "
-	test? (
-		dev-ruby/i18n:1
-		dev-ruby/redcloth
-		dev-ruby/test-unit:2
-		|| ( dev-ruby/activerecord:6.0 dev-ruby/activerecord:5.2 )
-		dev-ruby/sqlite3 )"
-
-all_ruby_prepare() {
-	sed -i -e '1agem "i18n", "~>1.0"; gem "activerecord", "~> 6.0.0"' test/test_helper.rb || die
-}
diff --git a/dev-ruby/stringex/stringex-2.8.6.ebuild b/dev-ruby/stringex/stringex-2.8.6.ebuild
new file mode 100644
index 000000000000..876f28a2bbd1
--- /dev/null
+++ b/dev-ruby/stringex/stringex-2.8.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+inherit ruby-fakegem
+
+DESCRIPTION="Extensions for Ruby's String class"
+HOMEPAGE="https://github.com/rsl/stringex"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/i18n-0.7.0:1
+		>=dev-ruby/redcloth-4.2.9
+		>=dev-ruby/test-unit-3.0.9:2
+	)
+"
+
+each_ruby_prepare() {
+	if has_version "dev-ruby/activerecord[ruby_targets_${_ruby_implementation},sqlite]" ; then
+		einfo "Testing activerecord integration"
+	else
+		rm -f test/unit/acts_as_url_integration_test.rb || die
+		# These tests fails when the acts_as_url code is not loaded
+		# through the above integration test.
+		rm -f test/unit/unicode_point_suite/basic_{greek,latin}_test.rb || die
+	fi
+}
diff --git a/dev-ruby/stringio/Manifest b/dev-ruby/stringio/Manifest
index cbef6ce0b90f..de57ef3bf4d5 100644
--- a/dev-ruby/stringio/Manifest
+++ b/dev-ruby/stringio/Manifest
@@ -1,2 +1,3 @@
-DIST stringio-3.0.1.tar.gz 30570 BLAKE2B 385ebe0571ac63a694c8c07cbda74eb53983a163f91d800c880eea9fbd0ec7d53d5a92d03b8afc5a71c9e48bf1c017c2a055fb3bc09c2f555c1a7743cf19ad5a SHA512 7781ee20f7f3d546ee227d7366ac88731b65ea743c39280c4f3d2107d9001eef4a4d583760110817c31f4433f0a45812acd88a0b1b31b2863a8fdc3f54b19ea7
-DIST stringio-3.0.2.tar.gz 43051 BLAKE2B 06d3f5c64a1550969f8c8abdc0cfeec8fe89adba8cb60db68cd4b29bf622a31d51809b85b3b9fa2373b74a33ed1c48df829a44256e431288b6ba2f7654858a13 SHA512 a9ac2820ce1c2bd55aac032be42a493a910787ed04bc41f35ec33b19ffd878c925dbbca49d6c27b07cea5ffb8fa98ecdb576738c9654587dea6842e3bd1f486c
+DIST stringio-3.0.7.tar.gz 44797 BLAKE2B 2772028015b6eb5e5a45e9c86551e62e91e24a627b7280530a10b1d343f08eb19b53d4fbeaf791ed23a239e0609775e8eb4c0550dadc282f690ecc9abef7930b SHA512 fcea0a32bb70c6f1d8a3b237e8a8dbb2677b00c077f0d6ddfa72e1e382c832277ee592dd2e17abdc12003b0494665853eab18fa90bf6f34f51efa0f62f7ea1b9
+DIST stringio-3.0.9.tar.gz 34991 BLAKE2B e047831dc0c88732b9939cfb7f5df97aceeeff1bdc569d3326a5197afbed0fa64300fb844fc305a888701f164bb97239c2ca129cff05444afa496afe23f370e4 SHA512 7724ae91687408654d9686bd01aaaf7a61ef7766c11570fa62cae622c5f70ad70cda88d5386bd87147dd9e7c1edfd4e70a882d03a8e7afdacf06820e57afec49
+DIST stringio-3.1.0.tar.gz 34946 BLAKE2B 4478e6493eb96be48c3f36830948e9b554474200a8738b5e4ab98d38fcc9f429a7b52cff553c0639fd8e30da2699802f5e1c385e51ab5965b0486ae9d0a44879 SHA512 d980566af84645700ad8450ef770ba2444ae7fb9f18cb33b141be0905536bcd639ec619aa535746109777f2f837727103280d80f2ff32fc8a22461a442f09e5a
diff --git a/dev-ruby/stringio/stringio-3.0.1.ebuild b/dev-ruby/stringio/stringio-3.0.1.ebuild
deleted file mode 100644
index f1463c87a564..000000000000
--- a/dev-ruby/stringio/stringio-3.0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTENSIONS=(ext/stringio/extconf.rb)
-RUBY_FAKEGEM_GEMSPEC="stringio.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pseudo IO class from/to String."
-HOMEPAGE="https://github.com/ruby/stringio"
-SRC_URI="https://github.com/ruby/stringio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="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"
-SLOT="0"
-IUSE="test"
-
-all_ruby_prepare() {
-	sed -e "/s.version =/ s/source_version/'${PV}'/" \
-		-e 's/__dir__/"."/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/stringio/stringio-3.0.2.ebuild b/dev-ruby/stringio/stringio-3.0.2.ebuild
deleted file mode 100644
index f1463c87a564..000000000000
--- a/dev-ruby/stringio/stringio-3.0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTENSIONS=(ext/stringio/extconf.rb)
-RUBY_FAKEGEM_GEMSPEC="stringio.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pseudo IO class from/to String."
-HOMEPAGE="https://github.com/ruby/stringio"
-SRC_URI="https://github.com/ruby/stringio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="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"
-SLOT="0"
-IUSE="test"
-
-all_ruby_prepare() {
-	sed -e "/s.version =/ s/source_version/'${PV}'/" \
-		-e 's/__dir__/"."/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/stringio/stringio-3.0.7.ebuild b/dev-ruby/stringio/stringio-3.0.7.ebuild
new file mode 100644
index 000000000000..5fba86219b99
--- /dev/null
+++ b/dev-ruby/stringio/stringio-3.0.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTENSIONS=(ext/stringio/extconf.rb)
+RUBY_FAKEGEM_GEMSPEC="stringio.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pseudo IO class from/to String."
+HOMEPAGE="https://github.com/ruby/stringio"
+SRC_URI="https://github.com/ruby/stringio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -e "/s.version =/ s/source_version/'${PV}'/" \
+		-e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/stringio/stringio-3.0.9.ebuild b/dev-ruby/stringio/stringio-3.0.9.ebuild
new file mode 100644
index 000000000000..e9ef6cc8a7cf
--- /dev/null
+++ b/dev-ruby/stringio/stringio-3.0.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTENSIONS=(ext/stringio/extconf.rb)
+RUBY_FAKEGEM_GEMSPEC="stringio.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pseudo IO class from/to String."
+HOMEPAGE="https://github.com/ruby/stringio"
+SRC_URI="https://github.com/ruby/stringio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -e "/s.version =/ s/source_version/'${PV}'/" \
+		-e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/stringio/stringio-3.1.0.ebuild b/dev-ruby/stringio/stringio-3.1.0.ebuild
new file mode 100644
index 000000000000..d8350c676f2d
--- /dev/null
+++ b/dev-ruby/stringio/stringio-3.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTENSIONS=(ext/stringio/extconf.rb)
+RUBY_FAKEGEM_GEMSPEC="stringio.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pseudo IO class from/to String."
+HOMEPAGE="https://github.com/ruby/stringio"
+SRC_URI="https://github.com/ruby/stringio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
+
+all_ruby_prepare() {
+	sed -e "/s.version =/ s/source_version/'${PV}'/" \
+		-e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/strptime/metadata.xml b/dev-ruby/strptime/metadata.xml
index 658c72b1920d..2fb5c68872d9 100644
--- a/dev-ruby/strptime/metadata.xml
+++ b/dev-ruby/strptime/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">nurse/strptime</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/strptime/strptime-0.2.5-r1.ebuild b/dev-ruby/strptime/strptime-0.2.5-r1.ebuild
deleted file mode 100644
index 807ebce45fec..000000000000
--- a/dev-ruby/strptime/strptime-0.2.5-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="strptime.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/strptime/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/strptime
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A fast strptime/strftime engine which uses VM"
-HOMEPAGE="https://github.com/nurse/strptime"
-SRC_URI="https://github.com/nurse/strptime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/strptime/strptime-0.2.5-r2.ebuild b/dev-ruby/strptime/strptime-0.2.5-r2.ebuild
index bec5f0bd8e88..611ea35023af 100644
--- a/dev-ruby/strptime/strptime-0.2.5-r2.ebuild
+++ b/dev-ruby/strptime/strptime-0.2.5-r2.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -29,3 +29,8 @@ IUSE=""
 all_ruby_prepare() {
 	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
 }
+
+each_ruby_test() {
+	local -x TZ=UTC # bug #775380
+	each_fakegem_test
+}
diff --git a/dev-ruby/strscan/Manifest b/dev-ruby/strscan/Manifest
index 33c324199d1c..95e01f5f98f4 100644
--- a/dev-ruby/strscan/Manifest
+++ b/dev-ruby/strscan/Manifest
@@ -1,3 +1,5 @@
-DIST strscan-3.0.1.tar.gz 28111 BLAKE2B 4623fe6fd74a9ca30ba1818fe548fcc793f1e22798bba9d561299ccdc493dfa5deafec072b193532c92116307c5b79f2c7c7bd362602b0ba3a0d1ea778a1d528 SHA512 7cd37a24dbec02bfade6e7440139de52d149ce1c196a1ea73b5b09e4096a0a99b26d0680498bd27bd443befe62c806bb94cec08c2fbe097c4724446b56c8bfa0
-DIST strscan-3.0.2.tar.gz 34900 BLAKE2B 586bd6046e1681742650f4f612a458dc5b23b11116fa010eec0a354fc76242dbc8af512c0053330903d23bb7859345152cdf450a00a2be6f6d0783b5099de9d8 SHA512 657cab357d6cdd601a80cf4adbe141b005e116a0d7a0630b2966b07cf93d6410cc319c7a8305cffd9cb79d7975e95d98b20ac43c4133496cf38f6fe2fb6c8246
-DIST strscan-3.0.3.tar.gz 34914 BLAKE2B 00bd42816fa22c8c5a69f57191873c37c7278c8364471d3721459702171fbee3d195330127184dbaff9f432b72fdcc38c0f5faa206f22c1d0351f3d68dbd5542 SHA512 0a72d7d2b28853763e5f894e9b1e01f7e01a3483cce15f4ca6305b65ce851bd6134d189caa5a23ea79af11af38a9f95944c99a9f5cd032d96cc2a45101bd836a
+DIST strscan-3.0.6.tar.gz 36514 BLAKE2B 3a303ab8185aa12ef5fa748541a7c00dbea102e79c5a8b4f94595dcdb2f361b824d2f562b6a51184f7925dc473580de00c1faa9b6f0466bfe42ffbc5a89deb13 SHA512 63eaebb5cf1f658b447190276fc067ddfaae337a6f993392c2a3829f979ff9a3f4cd32f66fe3456404284b48d66c145da4814d582754c34c5037c983dabdcd86
+DIST strscan-3.0.7.tar.gz 37528 BLAKE2B 0b4d8e235463efe89e7beb452491cfbd58e5cdbc2950816ca6dda117f1b8f34474c5594c170e8ac2b5d24a848a9bf9f64faaa624080d60987689616f13984e2d SHA512 9b427d2f7d5d6c27a0b3f10b85806abc21a04147d8dbe6f4a6705ab9ded7e2e1365fc99d224a8967ff9bfaf17480071eed0139b46490568475e681ceb8b48a6d
+DIST strscan-3.0.8.tar.gz 26904 BLAKE2B 674870db66eaba78cfe1e058b9dd64263c93a89a0333e8028f9c2fba66c785a59ddda109370d802928ab99b0b740dc9ca62a34d0e8fe74aeddf75f8d14d44cc2 SHA512 d9afcfdaf707644d67e3dee95ec7f17b5ada8cdd861b484b0744a4d981a1baef87e1f2a33c19cbcfaea32338a98065280ec12dfdc0fe375bfb74b67050e71638
+DIST strscan-3.0.9.tar.gz 26744 BLAKE2B e7c74cc116501d5962f8072d0a7292b469f11f8c223d6721f43335af95d27975997cf1ee26c915f85ac766eb840b50f56f935dc12e8ffe7b6794fa0c0cdfc5c7 SHA512 a73f4d214a5e6a5258609b650fa33d67ff2220bfe2d2419344077b9dc204a6450b8802b4683b09bed1bd541badf8cb3329e295039e431bf7be41d04a866f748c
+DIST strscan-3.1.0.tar.gz 26840 BLAKE2B 89269ab15753953da8592a45da6d866eadc3abc077381e1501f13be37e30f69c92e831ed593dddd17ec1390becd09269bb59fe15a3ddea859eaf52a58f23942f SHA512 85e05fd60818a88e33ccfac7534f1db9cc63b7f1c6769e02950c9f7f589c27581ba19df3ab09178f571878b45cae223a89826819ad00c6665edb9169e7763782
diff --git a/dev-ruby/strscan/strscan-3.0.1.ebuild b/dev-ruby/strscan/strscan-3.0.1.ebuild
deleted file mode 100644
index cd2a0fe25581..000000000000
--- a/dev-ruby/strscan/strscan-3.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="strscan.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/strscan/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides lexical scanning operations on a String"
-HOMEPAGE="https://github.com/ruby/strscan"
-SRC_URI="https://github.com/ruby/strscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	mkdir lib || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test/lib -rhelper run-test.rb || die
-}
diff --git a/dev-ruby/strscan/strscan-3.0.2.ebuild b/dev-ruby/strscan/strscan-3.0.2.ebuild
deleted file mode 100644
index a93f81956640..000000000000
--- a/dev-ruby/strscan/strscan-3.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="strscan.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/strscan/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides lexical scanning operations on a String"
-HOMEPAGE="https://github.com/ruby/strscan"
-SRC_URI="https://github.com/ruby/strscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test/lib -rhelper run-test.rb || die
-}
diff --git a/dev-ruby/strscan/strscan-3.0.3.ebuild b/dev-ruby/strscan/strscan-3.0.3.ebuild
deleted file mode 100644
index a93f81956640..000000000000
--- a/dev-ruby/strscan/strscan-3.0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="strscan.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/strscan/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides lexical scanning operations on a String"
-HOMEPAGE="https://github.com/ruby/strscan"
-SRC_URI="https://github.com/ruby/strscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test/lib -rhelper run-test.rb || die
-}
diff --git a/dev-ruby/strscan/strscan-3.0.6.ebuild b/dev-ruby/strscan/strscan-3.0.6.ebuild
new file mode 100644
index 000000000000..cc6e68f7c54d
--- /dev/null
+++ b/dev-ruby/strscan/strscan-3.0.6.ebuild
@@ -0,0 +1,32 @@
+# 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="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="strscan.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/strscan/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides lexical scanning operations on a String"
+HOMEPAGE="https://github.com/ruby/strscan"
+SRC_URI="https://github.com/ruby/strscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test/lib -rhelper run-test.rb || die
+}
diff --git a/dev-ruby/strscan/strscan-3.0.7.ebuild b/dev-ruby/strscan/strscan-3.0.7.ebuild
new file mode 100644
index 000000000000..430d488fb073
--- /dev/null
+++ b/dev-ruby/strscan/strscan-3.0.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="strscan.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/strscan/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides lexical scanning operations on a String"
+HOMEPAGE="https://github.com/ruby/strscan"
+SRC_URI="https://github.com/ruby/strscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test/lib -rhelper run-test.rb || die
+}
diff --git a/dev-ruby/strscan/strscan-3.0.8.ebuild b/dev-ruby/strscan/strscan-3.0.8.ebuild
new file mode 100644
index 000000000000..6d633be40814
--- /dev/null
+++ b/dev-ruby/strscan/strscan-3.0.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="strscan.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/strscan/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides lexical scanning operations on a String"
+HOMEPAGE="https://github.com/ruby/strscan"
+SRC_URI="https://github.com/ruby/strscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test/lib -rhelper run-test.rb || die
+}
diff --git a/dev-ruby/strscan/strscan-3.0.9.ebuild b/dev-ruby/strscan/strscan-3.0.9.ebuild
new file mode 100644
index 000000000000..cb8dff84588d
--- /dev/null
+++ b/dev-ruby/strscan/strscan-3.0.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="strscan.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/strscan/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides lexical scanning operations on a String"
+HOMEPAGE="https://github.com/ruby/strscan"
+SRC_URI="https://github.com/ruby/strscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
+
+all_ruby_prepare() {
+	sed -i -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test/lib -rhelper run-test.rb || die
+}
diff --git a/dev-ruby/strscan/strscan-3.1.0.ebuild b/dev-ruby/strscan/strscan-3.1.0.ebuild
new file mode 100644
index 000000000000..cb8dff84588d
--- /dev/null
+++ b/dev-ruby/strscan/strscan-3.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="strscan.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/strscan/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides lexical scanning operations on a String"
+HOMEPAGE="https://github.com/ruby/strscan"
+SRC_URI="https://github.com/ruby/strscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
+
+all_ruby_prepare() {
+	sed -i -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test/lib -rhelper run-test.rb || die
+}
diff --git a/dev-ruby/subexec/Manifest b/dev-ruby/subexec/Manifest
deleted file mode 100644
index fc0fe29b59ae..000000000000
--- a/dev-ruby/subexec/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST subexec-0.2.3.tgz 4384 BLAKE2B 27dc40377f7b2fee33553543723b9e15cd02a1171bd24b5d213b3546b7b20267cb8cbf987c1a1f6c0285f594b194f1dc20c41314266587be30d961e4b514f8b9 SHA512 b6fc5ee802906a690a1d1542ada44aba1df5e6861a66f4df58623e366d8d3ab2349d2963817bf07089e1dc15932ca03f0020d16777012ec4b92879280868bb75
diff --git a/dev-ruby/subexec/metadata.xml b/dev-ruby/subexec/metadata.xml
deleted file mode 100644
index 6c7f459e4407..000000000000
--- a/dev-ruby/subexec/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">nulayer/subexec</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/subexec/subexec-0.2.3-r2.ebuild b/dev-ruby/subexec/subexec-0.2.3-r2.ebuild
deleted file mode 100644
index 78c4527665b3..000000000000
--- a/dev-ruby/subexec/subexec-0.2.3-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="subexec.gemspec"
-
-inherit ruby-fakegem
-
-GITHUB_USER="nulayer"
-
-DESCRIPTION="Subexec spawns an external command with a timeout"
-HOMEPAGE="https://github.com/nulayer/subexec"
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/shoulda )"
-
-all_ruby_prepare() {
-	rm Gemfile* || die
-	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
-	sed -i -e '/begin/,/end/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/sus-fixtures-async/Manifest b/dev-ruby/sus-fixtures-async/Manifest
new file mode 100644
index 000000000000..0f5d8096744a
--- /dev/null
+++ b/dev-ruby/sus-fixtures-async/Manifest
@@ -0,0 +1,3 @@
+DIST sus-fixtures-async-0.1.1.tar.gz 5017 BLAKE2B f293d9fe336b05e510a82c4337250f48b871eab8c38b7d9587a6402d19689197eb6a2b1f7f14e7b5823246b6f14d104e7e49f14f84a980392dd545543ffcd733 SHA512 cca073491d143b0ceaff34ada08d416ea43a035bc887c6dec02f62372724d891f47e9dfa8d749f6e485e7d14da8c395dc67185ed0a91d9ea0eb5466d3164c378
+DIST sus-fixtures-async-0.1.2.tar.gz 4988 BLAKE2B da9bfec59489ad1a2fdf0e86a75083e36826d0bb73d6fd482bdae0e842421c59db943669eb101ed4488f963130c387e4b5eed88b4388b4b4ea19cefd2ab1b9db SHA512 effc602b6ea4b3ed56fe9c578a621195ef19cc6e7e858fa06b4a9ecfbc1d27db6b302a7f6567d8b711165eff3ab0f750971eef0c02262855ee35b9eaf4448c1e
+DIST sus-fixtures-async-0.1.3.tar.gz 4991 BLAKE2B a2e8d5ff1974e0f69d7f821194fa1386efc8fc1e4592c97da99863f32d0d6002c9659ec2e8341d64e13a388807c16b0b816170c60d4f1efa985a58cf7baa58bb SHA512 1361de64829f242bcef47fc152e7a18e4b261ad5ed54be7a83111781b6f9ed196385303387f155a02a7628a91c7560654dc0c1c214419a7256133ce559627dbc
diff --git a/dev-ruby/sus-fixtures-async/files/sus-fixtures-async-0.1.1-tests-require.patch b/dev-ruby/sus-fixtures-async/files/sus-fixtures-async-0.1.1-tests-require.patch
new file mode 100644
index 000000000000..af89916b7c5f
--- /dev/null
+++ b/dev-ruby/sus-fixtures-async/files/sus-fixtures-async-0.1.1-tests-require.patch
@@ -0,0 +1,43 @@
+https://github.com/socketry/sus-fixtures-async/pull/2
+
+From 3d3a1016c1718a8a5eca6ee76cd65d88a66e2481 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 3 Apr 2023 00:36:26 +0100
+Subject: [PATCH] test: Fix version require
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When running e.g. 'ruby32 -S sus', I had:
+```
+🔥 Errored assertions:
+file test/sus/fixtures/async.rb:8
+        ⚠ NameError: uninitialized constant Sus::Fixtures::Async::VERSION
+                test/sus/fixtures/async.rb:8 block in <top (required)>
+                /usr/lib64/ruby/gems/3.2.0/gems/sus-0.20.3/lib/sus/file.rb:10 class_eval
+                /usr/lib64/ruby/gems/3.2.0/gems/sus-0.20.3/lib/sus/file.rb:10 block in <top (required)>
+                /usr/lib64/ruby/gems/3.2.0/gems/sus-0.20.3/lib/sus/file.rb:39 build
+                /usr/lib64/ruby/gems/3.2.0/gems/sus-0.20.3/lib/sus/file.rb:105 file
+                /usr/lib64/ruby/gems/3.2.0/gems/sus-0.20.3/lib/sus/registry.rb:50 load_file
+                /usr/lib64/ruby/gems/3.2.0/gems/sus-0.20.3/lib/sus/registry.rb:45 load
+                /usr/lib64/ruby/gems/3.2.0/gems/sus-0.20.3/lib/sus/config.rb:95 block in load_registry
+                /usr/lib64/ruby/gems/3.2.0/gems/sus-0.20.3/lib/sus/config.rb:94 each
+                /usr/lib64/ruby/gems/3.2.0/gems/sus-0.20.3/lib/sus/config.rb:94 load_registry
+                /usr/lib64/ruby/gems/3.2.0/gems/sus-0.20.3/lib/sus/config.rb:82 registry
+                /usr/lib64/ruby/gems/3.2.0/gems/sus-0.20.3/bin/sus:10 <top (required)>
+                /usr/bin/sus:9 load
+                /usr/bin/sus:9 <main>
+```
+
+It turns out we're missing a direct require, so chuck it in.
+--- a/test/sus/fixtures/async.rb
++++ b/test/sus/fixtures/async.rb
+@@ -4,6 +4,7 @@
+ # Copyright, 2022, by Samuel Williams.
+ 
+ require 'sus/fixtures/async'
++require 'sus/fixtures/async/version'
+ 
+ describe Sus::Fixtures::Async::VERSION do
+ 	it 'is a version string' do
+
diff --git a/dev-ruby/sus-fixtures-async/metadata.xml b/dev-ruby/sus-fixtures-async/metadata.xml
new file mode 100644
index 000000000000..8b415315d6d1
--- /dev/null
+++ b/dev-ruby/sus-fixtures-async/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">socketry/sus-fixtures-async</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/sus-fixtures-async/sus-fixtures-async-0.1.1.ebuild b/dev-ruby/sus-fixtures-async/sus-fixtures-async-0.1.1.ebuild
new file mode 100644
index 000000000000..cee9eac085d1
--- /dev/null
+++ b/dev-ruby/sus-fixtures-async/sus-fixtures-async-0.1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022-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="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Convenient fixture for testing async components in a reactor"
+HOMEPAGE="https://github.com/socketry/sus-fixtures-async"
+SRC_URI="https://github.com/socketry/sus-fixtures-async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+
+ruby_add_rdepend "
+	dev-ruby/async
+	dev-ruby/sus
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.1-tests-require.patch
+)
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Remove the sus configuration which enabled coverage checks.
+	# Its dependency is not packaged.
+	rm -f config/sus.rb || die
+}
diff --git a/dev-ruby/sus-fixtures-async/sus-fixtures-async-0.1.2.ebuild b/dev-ruby/sus-fixtures-async/sus-fixtures-async-0.1.2.ebuild
new file mode 100644
index 000000000000..1e28b846551a
--- /dev/null
+++ b/dev-ruby/sus-fixtures-async/sus-fixtures-async-0.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Convenient fixture for testing async components in a reactor"
+HOMEPAGE="https://github.com/socketry/sus-fixtures-async"
+SRC_URI="https://github.com/socketry/sus-fixtures-async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+ruby_add_rdepend "
+	dev-ruby/async
+	>=dev-ruby/sus-0.10:0
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.1-tests-require.patch
+)
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Remove the sus configuration which enabled coverage checks.
+	# Its dependency is not packaged.
+	rm -f config/sus.rb || die
+}
diff --git a/dev-ruby/sus-fixtures-async/sus-fixtures-async-0.1.3.ebuild b/dev-ruby/sus-fixtures-async/sus-fixtures-async-0.1.3.ebuild
new file mode 100644
index 000000000000..c5f987dca53a
--- /dev/null
+++ b/dev-ruby/sus-fixtures-async/sus-fixtures-async-0.1.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Convenient fixture for testing async components in a reactor"
+HOMEPAGE="https://github.com/socketry/sus-fixtures-async"
+SRC_URI="https://github.com/socketry/sus-fixtures-async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+ruby_add_rdepend "
+	dev-ruby/async
+	>=dev-ruby/sus-0.10:0
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.1-tests-require.patch
+)
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Remove the sus configuration which enabled coverage checks.
+	# Its dependency is not packaged.
+	rm -f config/sus.rb || die
+}
diff --git a/dev-ruby/sus/Manifest b/dev-ruby/sus/Manifest
new file mode 100644
index 000000000000..73121c5bcea4
--- /dev/null
+++ b/dev-ruby/sus/Manifest
@@ -0,0 +1,6 @@
+DIST sus-0.21.1.tar.gz 29580 BLAKE2B 9a30950b4ad9da13af48c50a96951ba9f9cace97fac3a603de5acfe489dc8c8d4581b064f2452c9bf5da96da4db8f488df42f89a2113dd924c8ba8fcf8fd9230 SHA512 73db74f791f47a898840db65cf9c2f98b92f3d2a5319828f26dc55c8aef8e0932060c1075f5010b3c2b887891c1467a3828728f78a84297725d851966093ce9e
+DIST sus-0.23.0.tar.gz 30932 BLAKE2B 8f08e167368c54814b674e42ab5855f06387646774b93551fd67b7b4b7eb3313aeaa82369d2346325d2214c5f134875b9730579559450519ddb49eb62b70ad40 SHA512 ee1815d70692154abef962d41cca7037b0fa1419861ff08518a0b1153e43e308c351eb21ca32b017b30fb30fbc1a3bd707681b2a59e4a74137642c36080dddbd
+DIST sus-0.24.0.tar.gz 31229 BLAKE2B 4e335d72f61ede7d946f4d375abe5a7640fefd17d2fc7697bb489f5e14dc42711a6777baaed35e91cb8c76bfba62127ecfdf866e36e54bc1d9fd0f705424ade4 SHA512 1f879dc59af1f348b29da4b1555dbe4f999c9b695a327f233a381382be33f7e7b1a47213f20f72ff420d57fc7c42024e6a1c34737666e88b808518588389d3fb
+DIST sus-0.24.2.tar.gz 31233 BLAKE2B 4090aac36d529984e5e447e529988838ed68f9ca4f2ef9b8a3829e158622216435152937d600be55c86982cce59d45c55026323c4264541ff0990a26e56e5c34 SHA512 693378800db2f4c683be78529a8b2b07c64cb25c7b67e970ad3b2ca2f3fb7b9f6069074acedb44828e5377a48318fd24ba36f811c43073eeffb19478041cf358
+DIST sus-0.24.5.tar.gz 31874 BLAKE2B 91ed9e627e2f3bffe69f9518182d0c4fe804e7e3811b4dd984672ed1007ea2cbe09caf414841df34f2a37a9eb5050c288c1be233707c7fc1f7dd0449d002be68 SHA512 b29cc2b9399245aa5a1867040e237f6a6970988c0fb01ed0bf76d574080f433da3bcd1c03b3612f80459fca75bdcc99dba7c2588266901464566d156a9df7523
+DIST sus-0.24.6.tar.gz 31923 BLAKE2B 793c8e6213ff210ff5080239f89646f3b2dfcdaca96c876ee51b210eaa68f583f3c9694afb2e2089fee46940868bee8e6db2c1d03acd4ad7b5d0a7736295da29 SHA512 6b661e0467cde29a7a192df3608ff1b629c558ea55b99c0bec40ce36b2f2876a796f7424722d6c221704edc9939a6da73cddd73a7f076287907494e027a01926
diff --git a/dev-ruby/sus/metadata.xml b/dev-ruby/sus/metadata.xml
new file mode 100644
index 000000000000..2a4c88d07149
--- /dev/null
+++ b/dev-ruby/sus/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ioquatix/sus</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/sus/sus-0.21.1.ebuild b/dev-ruby/sus/sus-0.21.1.ebuild
new file mode 100644
index 000000000000..55097f2442bc
--- /dev/null
+++ b/dev-ruby/sus/sus-0.21.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast and scalable test runner"
+HOMEPAGE="https://github.com/ioquatix/sus"
+SRC_URI="https://github.com/ioquatix/sus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Remove the sus configuration which enabled coverage checks.
+	# Its dependency is not packaged.
+	rm -f config/sus.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} bin/sus-parallel || die
+}
diff --git a/dev-ruby/sus/sus-0.23.0.ebuild b/dev-ruby/sus/sus-0.23.0.ebuild
new file mode 100644
index 000000000000..52cede312224
--- /dev/null
+++ b/dev-ruby/sus/sus-0.23.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast and scalable test runner"
+HOMEPAGE="https://github.com/ioquatix/sus"
+SRC_URI="https://github.com/ioquatix/sus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Remove the sus configuration which enabled coverage checks.
+	# Its dependency is not packaged.
+	rm -f config/sus.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} bin/sus-parallel || die
+}
diff --git a/dev-ruby/sus/sus-0.24.0.ebuild b/dev-ruby/sus/sus-0.24.0.ebuild
new file mode 100644
index 000000000000..bd56aec6e77e
--- /dev/null
+++ b/dev-ruby/sus/sus-0.24.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast and scalable test runner"
+HOMEPAGE="https://github.com/ioquatix/sus"
+SRC_URI="https://github.com/ioquatix/sus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Remove the sus configuration which enabled coverage checks.
+	# Its dependency is not packaged.
+	rm -f config/sus.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} bin/sus-parallel || die
+}
diff --git a/dev-ruby/sus/sus-0.24.2.ebuild b/dev-ruby/sus/sus-0.24.2.ebuild
new file mode 100644
index 000000000000..93ded49cded5
--- /dev/null
+++ b/dev-ruby/sus/sus-0.24.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast and scalable test runner"
+HOMEPAGE="https://github.com/ioquatix/sus"
+SRC_URI="https://github.com/ioquatix/sus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Remove the sus configuration which enabled coverage checks.
+	# Its dependency is not packaged.
+	rm -f config/sus.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} bin/sus-parallel || die
+}
diff --git a/dev-ruby/sus/sus-0.24.5.ebuild b/dev-ruby/sus/sus-0.24.5.ebuild
new file mode 100644
index 000000000000..ba4876aa8a22
--- /dev/null
+++ b/dev-ruby/sus/sus-0.24.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast and scalable test runner"
+HOMEPAGE="https://github.com/ioquatix/sus"
+SRC_URI="https://github.com/ioquatix/sus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Remove the sus configuration which enabled coverage checks.
+	# Its dependency is not packaged.
+	rm -f config/sus.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} bin/sus-parallel || die
+}
diff --git a/dev-ruby/sus/sus-0.24.6.ebuild b/dev-ruby/sus/sus-0.24.6.ebuild
new file mode 100644
index 000000000000..ba4876aa8a22
--- /dev/null
+++ b/dev-ruby/sus/sus-0.24.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast and scalable test runner"
+HOMEPAGE="https://github.com/ioquatix/sus"
+SRC_URI="https://github.com/ioquatix/sus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Remove the sus configuration which enabled coverage checks.
+	# Its dependency is not packaged.
+	rm -f config/sus.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} bin/sus-parallel || die
+}
diff --git a/dev-ruby/sync/Manifest b/dev-ruby/sync/Manifest
index 05f6e166adc9..bb95b96b4a38 100644
--- a/dev-ruby/sync/Manifest
+++ b/dev-ruby/sync/Manifest
@@ -1 +1,2 @@
+DIST sync-0.5.0-mjit.patch 705 BLAKE2B 3235e6fb9689a046a04802d0e46087970ce80283aea989b598f756953175026ad63a686339ce5767b316bc67a2f1e9d4bb280cbee32408243ba0b6dd7c424c6b SHA512 9b639bafaf262d5ccd4f851ad5969e83b5e8d296a98daa4d12373e714aa0f80b7e242d508149be3da1cbad7d51ac6daf4f326a5f5043c7fcf828c8fc352e5bfc
 DIST sync-0.5.0.tar.gz 4957 BLAKE2B 9b4b1710d2468068387d782109199dd45c783b6d7bb0357851f800df2ac4961a72143cfc2b42f522524cf7148694545ae8eab47ee6629062d8ea1505d9095ba0 SHA512 5f887d9169e0be834c7fa17ae42b71078f25ce3d83e695490cd136adc1799d6b92e4aed41ce3f3d57b3ad193a1ac4de940b37212c2864bbf6331ba3582128166
diff --git a/dev-ruby/sync/sync-0.5.0-r1.ebuild b/dev-ruby/sync/sync-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..471eb2d7da3f
--- /dev/null
+++ b/dev-ruby/sync/sync-0.5.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A module that provides a two-phase lock with a counter"
+HOMEPAGE="https://github.com/ruby/sync"
+SRC_URI="https://github.com/ruby/sync/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/ruby/sync/commit/8f2821d0819ee7c08506f204c7676f12c5ab1397.patch -> ${P}-mjit.patch"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+all_ruby_prepare() {
+	eapply "${DISTDIR}/${P}-mjit.patch"
+
+	sed -i -e 's:require_relative ":require "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/sync/sync-0.5.0.ebuild b/dev-ruby/sync/sync-0.5.0.ebuild
index 200296ae3b38..6719a035b36d 100644
--- a/dev-ruby/sync/sync-0.5.0.ebuild
+++ b/dev-ruby/sync/sync-0.5.0.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_EXTRADOC="README.md"
 
diff --git a/dev-ruby/syntax/syntax-1.2.2.ebuild b/dev-ruby/syntax/syntax-1.2.2.ebuild
index 2b4a73dbc719..955cb9466143 100644
--- a/dev-ruby/syntax/syntax-1.2.2.ebuild
+++ b/dev-ruby/syntax/syntax-1.2.2.ebuild
@@ -1,11 +1,9 @@
-# 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"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
@@ -17,7 +15,7 @@ SRC_URI="https://github.com/dblock/syntax/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-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 ~x64-solaris"
 IUSE="test doc"
 
 ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/sys-filesystem/Manifest b/dev-ruby/sys-filesystem/Manifest
new file mode 100644
index 000000000000..71619d351da4
--- /dev/null
+++ b/dev-ruby/sys-filesystem/Manifest
@@ -0,0 +1 @@
+DIST sys-filesystem-1.4.4.gem 34304 BLAKE2B 5a4b590a8b6bd29ab0abeabdc2a40cdffe8b67b433133b9126fb7c044e051bfc47be1454f319a125e9b5f5a11eb3506fab484cb87ef69987a0674b0c2f621f30 SHA512 b64ce70422966434f19478438b00941458243e6788d1ca5f9952bc7f9849fae210aa6af27ae8958a61f3463e9311ce2b26e47c44c314870cfdcb28ff850594c0
diff --git a/dev-ruby/sys-filesystem/metadata.xml b/dev-ruby/sys-filesystem/metadata.xml
new file mode 100644
index 000000000000..6434d5f2c105
--- /dev/null
+++ b/dev-ruby/sys-filesystem/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">djberg96/sys-filesystem</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/sys-filesystem/sys-filesystem-1.4.4.ebuild b/dev-ruby/sys-filesystem/sys-filesystem-1.4.4.ebuild
new file mode 100644
index 000000000000..631a490e5460
--- /dev/null
+++ b/dev-ruby/sys-filesystem/sys-filesystem-1.4.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cross-platform interface for filesystem information"
+HOMEPAGE="https://github.com/djberg96/sys-filesystem"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/ffi-1.15.0"
+
+ruby_add_bdepend "test? ( dev-ruby/mkmf-lite )"
+
+all_ruby_prepare() {
+	sed -e '/stat fragment_size is a plausible value/askip "Fails with e.g. ZFS"' \
+		-i spec/sys_filesystem_unix_spec.rb || die
+}
diff --git a/dev-ruby/sys-uname/Manifest b/dev-ruby/sys-uname/Manifest
index 5e33032ef681..5d3ec04d1252 100644
--- a/dev-ruby/sys-uname/Manifest
+++ b/dev-ruby/sys-uname/Manifest
@@ -1 +1 @@
-DIST sys-uname-1.2.2.gem 29184 BLAKE2B abfc9172cde35f946d420f8737a9b60b6810e551c2c361027614cd812a50c86bf8e92446c9a113d0e7e2f6dd09c6f40ceeb5a024defc7cacbb45c53f4b761809 SHA512 97a7a8cdbbc80e9d886be92d104aca389d82a1eac61b7a0172ce8fa27dbe751b0653dc8a027610d69051a79ed1fb2c855e2ee802308a74300dcc709c9e56b9fe
+DIST sys-uname-1.2.3.gem 29696 BLAKE2B 0ba1882a370f506de79dc533355cf808acf3f1369a76515192d900a5aa41be6255810ab68454a82bb3939248f61baf83d7c46bc1f12c8aada4a96618a4e19bb9 SHA512 86964d1bb4036711673988da96219683b6520dbc5cee81dce43b8b109a878a5d04c479d6844d75c8cf5bc36c14bb005279ca7d8c7c03809786ed9d269779a210
diff --git a/dev-ruby/sys-uname/metadata.xml b/dev-ruby/sys-uname/metadata.xml
index 658c72b1920d..9314612fa7ab 100644
--- a/dev-ruby/sys-uname/metadata.xml
+++ b/dev-ruby/sys-uname/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">djberg96/sys-uname</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/sys-uname/sys-uname-1.2.2.ebuild b/dev-ruby/sys-uname/sys-uname-1.2.2.ebuild
deleted file mode 100644
index be99b3dcf70b..000000000000
--- a/dev-ruby/sys-uname/sys-uname-1.2.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md doc/uname.rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby interface for getting operating system information"
-HOMEPAGE="https://github.com/djberg96/sys-uname"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/ffi-1.1"
diff --git a/dev-ruby/sys-uname/sys-uname-1.2.3.ebuild b/dev-ruby/sys-uname/sys-uname-1.2.3.ebuild
new file mode 100644
index 000000000000..0e941b358f90
--- /dev/null
+++ b/dev-ruby/sys-uname/sys-uname-1.2.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md doc/uname.rdoc"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby interface for getting operating system information"
+HOMEPAGE="https://github.com/djberg96/sys-uname"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/ffi-1.1"
diff --git a/dev-ruby/syslogger/Manifest b/dev-ruby/syslogger/Manifest
index dd08f849e2e0..56efa4341349 100644
--- a/dev-ruby/syslogger/Manifest
+++ b/dev-ruby/syslogger/Manifest
@@ -1,2 +1 @@
-DIST syslogger-1.6.5.gem 11776 BLAKE2B dec37278ea109dba53c44a5c285962d78890ed972f1cd14789435b8bb3b922c7a3fc7b18238ee9aa239143453be3d6f73eea6c62d0bb83eb7a8901225ff2e49c SHA512 60dc7be93092196d68d154cfdf90a3393c9883ceaff35640bd0c0dda01f692953c7d1d8243d7b9327990a368d320c474af1711ba33a6b69381f56030800cc297
 DIST syslogger-1.6.6.gem 13824 BLAKE2B c70c8e727ac9f4754a42cd3be27eaa2ad19e5ec61745433a8654fd495736a72b5242242fc663b1d4d995164c42d4ea5bf3a15edeb6711abf6f69663ce6918496 SHA512 23947699de94c6bbca4a7ca4df52e9fb9ad06fa29e29f406255369728971007bb78ec4aa1748fec123658b0202e98dd6500649092456a9f579db30acbe04c42d
diff --git a/dev-ruby/syslogger/syslogger-1.6.5.ebuild b/dev-ruby/syslogger/syslogger-1.6.5.ebuild
deleted file mode 100644
index 1fffd628b043..000000000000
--- a/dev-ruby/syslogger/syslogger-1.6.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-# if ever needed
-#GITHUB_USER="crohr"
-#GITHUB_PROJECT="${PN}"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Drop-in replacement for the standard Logger, that logs to the syslog"
-HOMEPAGE="https://github.com/crohr/syslogger"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/syslogger/syslogger-1.6.6-r1.ebuild b/dev-ruby/syslogger/syslogger-1.6.6-r1.ebuild
deleted file mode 100644
index 168bd6658f19..000000000000
--- a/dev-ruby/syslogger/syslogger-1.6.6-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-# if ever needed
-#GITHUB_USER="crohr"
-#GITHUB_PROJECT="${PN}"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Drop-in replacement for the standard Logger, that logs to the syslog"
-HOMEPAGE="https://github.com/crohr/syslogger"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activejob )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/syslogger/syslogger-1.6.6-r2.ebuild b/dev-ruby/syslogger/syslogger-1.6.6-r2.ebuild
new file mode 100644
index 000000000000..86b600dcc7e8
--- /dev/null
+++ b/dev-ruby/syslogger/syslogger-1.6.6-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+# if ever needed
+#GITHUB_USER="crohr"
+#GITHUB_PROJECT="${PN}"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Drop-in replacement for the standard Logger, that logs to the syslog"
+HOMEPAGE="https://github.com/crohr/syslogger"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/activejob )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/systemu/metadata.xml b/dev-ruby/systemu/metadata.xml
index 658c72b1920d..6ed983b73916 100644
--- a/dev-ruby/systemu/metadata.xml
+++ b/dev-ruby/systemu/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ahoward/systemu</remote-id>
+    <remote-id type="rubygems">systemu</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/systemu/systemu-2.6.5-r1.ebuild b/dev-ruby/systemu/systemu-2.6.5-r1.ebuild
index 7674a9caeffa..6b2cd7170daa 100644
--- a/dev-ruby/systemu/systemu-2.6.5-r1.ebuild
+++ b/dev-ruby/systemu/systemu-2.6.5-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -12,12 +12,11 @@ RUBY_FAKEGEM_EXTRADOC="README"
 inherit ruby-fakegem
 
 DESCRIPTION="Universal capture of STDOUT and STDERR and handling of child process PID"
-HOMEPAGE="http://codeforpeople.com/lib/ruby/systemu/"
+HOMEPAGE="https://github.com/ahoward/systemu"
 
-LICENSE="Ruby"
+LICENSE="Ruby-BSD"
 SLOT="0"
 KEYWORDS="amd64 ~riscv x86"
-IUSE=""
 
 all_ruby_install() {
 	all_fakegem_install
diff --git a/dev-ruby/tdiff/Manifest b/dev-ruby/tdiff/Manifest
index e2daa86172f4..a1aaccd9d841 100644
--- a/dev-ruby/tdiff/Manifest
+++ b/dev-ruby/tdiff/Manifest
@@ -1 +1,2 @@
 DIST tdiff-0.3.4.gem 10240 BLAKE2B fe764eaf70303670602758bba903202bb468c419e96909561c4d420a86b9237c9af4640947e9dbc27eaca7b7210e26236da20d41f03d3e8acd0556a23205a924 SHA512 2db5c9707a8654fb36b02c7fbdf2317da08c633c0d3768f0f76693ffffd1b2b44e5f4309ae97df944c3bf9f25b596fd3ae19cb88b20435c0f9e50989d22ece40
+DIST tdiff-0.4.0.gem 10752 BLAKE2B 591071c2950d0eee771d8756c803721cdea9224b581866cb3f08bea45ec41dec710e642e2441ea808ac88bf1e42a0c5f68f0254d9229ffb0695cfefb32ce55d7 SHA512 13b12be58f99e93e48aa454dc77d60f0ef2875c96a8dce890dfa8392cd46f371a5190b7e4b44cce9095968099e22ecd30a91b9879d81fee4ae4b57c78963540d
diff --git a/dev-ruby/tdiff/tdiff-0.3.4-r1.ebuild b/dev-ruby/tdiff/tdiff-0.3.4-r1.ebuild
index 5728af528d19..dd6825582bba 100644
--- a/dev-ruby/tdiff/tdiff-0.3.4-r1.ebuild
+++ b/dev-ruby/tdiff/tdiff-0.3.4-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -15,6 +15,6 @@ DESCRIPTION="Calculates the differences between two tree-like structures"
 HOMEPAGE="https://github.com/postmodern/tdiff"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/tdiff/tdiff-0.4.0.ebuild b/dev-ruby/tdiff/tdiff-0.4.0.ebuild
new file mode 100644
index 000000000000..68e69ace31e2
--- /dev/null
+++ b/dev-ruby/tdiff/tdiff-0.4.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Calculates the differences between two tree-like structures"
+HOMEPAGE="https://github.com/postmodern/tdiff"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
diff --git a/dev-ruby/temple/Manifest b/dev-ruby/temple/Manifest
index a3b0cbbf5b34..8f1cfee7924b 100644
--- a/dev-ruby/temple/Manifest
+++ b/dev-ruby/temple/Manifest
@@ -1 +1,2 @@
-DIST temple-0.8.2.gem 39424 BLAKE2B a56db910d1d4d52495806e907c74052c04e6b4843d040adc33a7f6dc28a25a02231c4c9bd41723c8e1abe6624d4d55375c2a429514a87fa4f7a7a8dcb6377796 SHA512 51923b3bf9d4c05255131be62f567ca21305ba023ea5395a08d6970236b2a2833b058f7b3906046b8a57a224b368de12a6d5e426effca39324670fb632f33b67
+DIST temple-0.10.2.gem 40960 BLAKE2B 690d4a891d30d453c303aa47c07f341334cdbf4605f3936422d939bd148cb0df412d00c2718db2e6e9b9ab7a1c2ba7f538cdc96fec17958215b95a1b60093955 SHA512 54cc549056924958ce36c52d2b795cc3303ddd689f5fbe50b01c1e806582b97d37e438d917eaf6c05519b4aad9b05fff5e305d8d614c1e8f714f1e1a88d8db23
+DIST temple-0.10.3.tar.gz 37780 BLAKE2B 9b18f9103f05935ac774423958372b0c518aa0976e46b59d4d80ab4649fae96b83486a0f650a6d3b27ae7af20ce9f9f49b50989da3313d13134e2b29bdfcd32d SHA512 3f41e5897fb43be844f7c0804c01e6bb8843034ca5cad9550eb96140136fdc3a2251ae682f4566520476d7b5e8a7e1585b65aedb5c922643d71b6c4454d3e1bd
diff --git a/dev-ruby/temple/temple-0.10.2.ebuild b/dev-ruby/temple/temple-0.10.2.ebuild
new file mode 100644
index 000000000000..7042b5281c15
--- /dev/null
+++ b/dev-ruby/temple/temple-0.10.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES EXPRESSIONS.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An abstraction and a framework for compiling templates to pure Ruby"
+HOMEPAGE="https://github.com/judofyr/temple"
+
+LICENSE="MIT"
+SLOT="0.7"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-ruby/erubi
+	>=dev-ruby/tilt-2.0.1 )"
diff --git a/dev-ruby/temple/temple-0.10.3.ebuild b/dev-ruby/temple/temple-0.10.3.ebuild
new file mode 100644
index 000000000000..e5697ac368a4
--- /dev/null
+++ b/dev-ruby/temple/temple-0.10.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES EXPRESSIONS.md README.md"
+RUBY_FAKEGEM_GEMSPEC="temple.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An abstraction and a framework for compiling templates to pure Ruby"
+HOMEPAGE="https://github.com/judofyr/temple"
+SRC_URI="https://github.com/judofyr/temple/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0.7"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-ruby/erubi
+	>=dev-ruby/tilt-2.0.1 )"
+
+all_ruby_prepare() {
+	sed -e 's/__FILE__/"."/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-e 's/git ls-files --/echo/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/temple/temple-0.8.2-r1.ebuild b/dev-ruby/temple/temple-0.8.2-r1.ebuild
deleted file mode 100644
index aad52a10d37a..000000000000
--- a/dev-ruby/temple/temple-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES EXPRESSIONS.md README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="An abstraction and a framework for compiling templates to pure Ruby"
-HOMEPAGE="https://github.com/judofyr/temple"
-
-LICENSE="MIT"
-SLOT="0.7"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bacon
-	dev-ruby/erubis
-	>=dev-ruby/tilt-2.0.1 )"
-
-each_ruby_test() {
-	${RUBY} -S bacon -Ilib -Itest --automatic --quiet || die
-}
diff --git a/dev-ruby/temple/temple-0.8.2.ebuild b/dev-ruby/temple/temple-0.8.2.ebuild
deleted file mode 100644
index cf80c44399be..000000000000
--- a/dev-ruby/temple/temple-0.8.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES EXPRESSIONS.md README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="An abstraction and a framework for compiling templates to pure Ruby"
-HOMEPAGE="https://github.com/judofyr/temple"
-
-LICENSE="MIT"
-SLOT="0.7"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bacon
-	dev-ruby/erubis
-	>=dev-ruby/tilt-2.0.1 )"
-
-each_ruby_test() {
-	${RUBY} -S bacon -Ilib -Itest --automatic --quiet || die
-}
diff --git a/dev-ruby/term-ansicolor/Manifest b/dev-ruby/term-ansicolor/Manifest
index b8c1f9c3f191..ae9bb673fc8c 100644
--- a/dev-ruby/term-ansicolor/Manifest
+++ b/dev-ruby/term-ansicolor/Manifest
@@ -1 +1,3 @@
 DIST term-ansicolor-1.7.1.gem 44544 BLAKE2B 2c2c2de0a18d1f9a975901f8a7005f740ac81a609c43705d8c184deb26dc9010876deeca411488c787132a3d8b78339c75b0776f3c9bba1ff71efa23ce3671a6 SHA512 d49f8825c31accfaa58a2f34ed5fbdaf503d4b47c23f07c52cc82bbf6cce457bd9371e197da1ec36dc83e32b95e9ea9a349922d9759a827923456ea46f81ff50
+DIST term-ansicolor-1.7.2.gem 44544 BLAKE2B 46ec73afb7f9862960a68feee4664babc2bd3597aa48dd59712c9f48d3e6d1a0a2a1bc0e6ecfdbd196a97f79d66460535f6fb6ca347edfffed52187eebf79b15 SHA512 e81fc32f07d5f85eb0f364069afb143f87dea9fab6c6dd03bba95cdcc74495cdfb87ee334f595c8636226e50801274191a083eee5b70c3e8289d04cc49a1acb6
+DIST term-ansicolor-1.8.0.gem 45056 BLAKE2B 89edaf5ecb56dada8027ab91009b71a6ee9a27c85bddeda26d281230e0fc15f32a2de1c3259d02560bdf9c81a2ed92a920521eec17670eaa0b8db1264ff7311c SHA512 4a13f369c03d3660f48f28068f311d5eb806e2e4724da6a3ee38eb0ed3c195a1ce8ea24215dfe80af5aab8df1f6a86fdd89d54c62ee2fb9b7e782f9e5ed3013f
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.7.1-r1.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.7.1-r1.ebuild
index 128bff96a352..845ead826417 100644
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.7.1-r1.ebuild
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.7.1-r1.ebuild
@@ -1,8 +1,9 @@
-# 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="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
@@ -13,11 +14,10 @@ inherit ruby-fakegem
 
 DESCRIPTION="Small Ruby library that colors strings using ANSI escape sequences"
 HOMEPAGE="https://flori.github.io/term-ansicolor/"
-LICENSE="GPL-2"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 ruby_add_rdepend ">=dev-ruby/tins-1.0"
 
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.7.1.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.7.1.ebuild
deleted file mode 100644
index 3a436cf0c600..000000000000
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.7.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_GEMSPEC="term-ansicolor.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Small Ruby library that colors strings using ANSI escape sequences"
-HOMEPAGE="https://flori.github.io/term-ansicolor/"
-LICENSE="GPL-2"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/tins-1.0"
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:tests -e 'Dir["tests/*_test.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.7.2.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.7.2.ebuild
new file mode 100644
index 000000000000..083252989b93
--- /dev/null
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.7.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_GEMSPEC="term-ansicolor.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Small Ruby library that colors strings using ANSI escape sequences"
+HOMEPAGE="https://flori.github.io/term-ansicolor/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+ruby_add_rdepend ">=dev-ruby/tins-1.0"
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:tests -e 'Dir["tests/*_test.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.8.0.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.8.0.ebuild
new file mode 100644
index 000000000000..083252989b93
--- /dev/null
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.8.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_GEMSPEC="term-ansicolor.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Small Ruby library that colors strings using ANSI escape sequences"
+HOMEPAGE="https://flori.github.io/term-ansicolor/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+ruby_add_rdepend ">=dev-ruby/tins-1.0"
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:tests -e 'Dir["tests/*_test.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/terminal-table/metadata.xml b/dev-ruby/terminal-table/metadata.xml
index 7a38fd1850ff..def52fd72286 100644
--- a/dev-ruby/terminal-table/metadata.xml
+++ b/dev-ruby/terminal-table/metadata.xml
@@ -5,4 +5,7 @@
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">tj/terminal-table</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/terminal-table/terminal-table-1.8.0-r2.ebuild b/dev-ruby/terminal-table/terminal-table-1.8.0-r2.ebuild
deleted file mode 100644
index a359b8268e93..000000000000
--- a/dev-ruby/terminal-table/terminal-table-1.8.0-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc Todo.rdoc"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, feature rich ascii table generation library"
-HOMEPAGE="https://github.com/tj/terminal-table"
-SRC_URI="https://github.com/tj/terminal-table/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm64"
-SLOT="0"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/unicode-display_width-1.1.1:1"
-
-ruby_add_bdepend "test? ( dev-ruby/term-ansicolor )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/terminal-table/terminal-table-1.8.0-r4.ebuild b/dev-ruby/terminal-table/terminal-table-1.8.0-r4.ebuild
new file mode 100644
index 000000000000..516de897522a
--- /dev/null
+++ b/dev-ruby/terminal-table/terminal-table-1.8.0-r4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc Todo.rdoc"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple, feature rich ascii table generation library"
+HOMEPAGE="https://github.com/tj/terminal-table"
+SRC_URI="https://github.com/tj/terminal-table/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm64"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/unicode-display_width-1.1.1:1"
+
+ruby_add_bdepend "test? ( dev-ruby/term-ansicolor )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/terminal-table/terminal-table-2.0.0-r1.ebuild b/dev-ruby/terminal-table/terminal-table-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..6ff3e27fedc3
--- /dev/null
+++ b/dev-ruby/terminal-table/terminal-table-2.0.0-r1.ebuild
@@ -0,0 +1,33 @@
+# 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_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc Todo.rdoc"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple, feature rich ascii table generation library"
+HOMEPAGE="https://github.com/tj/terminal-table"
+SRC_URI="https://github.com/tj/terminal-table/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm64"
+SLOT="2"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/unicode-display_width-1.1.1:1"
+
+ruby_add_bdepend "test? ( dev-ruby/term-ansicolor )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/terminal-table/terminal-table-2.0.0.ebuild b/dev-ruby/terminal-table/terminal-table-2.0.0.ebuild
deleted file mode 100644
index 8e50ad85b62c..000000000000
--- a/dev-ruby/terminal-table/terminal-table-2.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc Todo.rdoc"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, feature rich ascii table generation library"
-HOMEPAGE="https://github.com/tj/terminal-table"
-SRC_URI="https://github.com/tj/terminal-table/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm64"
-SLOT="2"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/unicode-display_width-1.1.1:1"
-
-ruby_add_bdepend "test? ( dev-ruby/term-ansicolor )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/terminal-table/terminal-table-3.0.2.ebuild b/dev-ruby/terminal-table/terminal-table-3.0.2.ebuild
index 2c26dc043438..401d5bdb2050 100644
--- a/dev-ruby/terminal-table/terminal-table-3.0.2.ebuild
+++ b/dev-ruby/terminal-table/terminal-table-3.0.2.ebuild
@@ -1,8 +1,9 @@
-# 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="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -17,11 +18,10 @@ inherit ruby-fakegem
 DESCRIPTION="Simple, feature rich ascii table generation library"
 HOMEPAGE="https://github.com/tj/terminal-table"
 SRC_URI="https://github.com/tj/terminal-table/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm64"
+LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-IUSE="test"
+KEYWORDS="~amd64 ~arm64"
 
 ruby_add_rdepend "|| ( dev-ruby/unicode-display_width:2 >=dev-ruby/unicode-display_width-1.1.1:1 )"
 
diff --git a/dev-ruby/test-unit-rr/test-unit-rr-1.0.5-r1.ebuild b/dev-ruby/test-unit-rr/test-unit-rr-1.0.5-r1.ebuild
deleted file mode 100644
index 2f063426932f..000000000000
--- a/dev-ruby/test-unit-rr/test-unit-rr-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RR adapter for Test::Unit"
-HOMEPAGE="https://github.com/test-unit/test-unit-rr"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rr-1.1.1 >=dev-ruby/test-unit-2.5.2"
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/test-unit-rr/test-unit-rr-1.0.5-r2.ebuild b/dev-ruby/test-unit-rr/test-unit-rr-1.0.5-r2.ebuild
new file mode 100644
index 000000000000..182aac598baa
--- /dev/null
+++ b/dev-ruby/test-unit-rr/test-unit-rr-1.0.5-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="RR adapter for Test::Unit"
+HOMEPAGE="https://github.com/test-unit/test-unit-rr"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rr-1.1.1 >=dev-ruby/test-unit-2.5.2"
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/test-unit-ruby-core/Manifest b/dev-ruby/test-unit-ruby-core/Manifest
new file mode 100644
index 000000000000..1375d5797a0d
--- /dev/null
+++ b/dev-ruby/test-unit-ruby-core/Manifest
@@ -0,0 +1 @@
+DIST test-unit-ruby-core-1.0.5.gem 15872 BLAKE2B a6f20b5696ad61affc8f508eac804d2816910754a4a6f99105bf7b04bedcac6c3931fc83eb0e77497b94610f31c8242c312e66463d2ebe637596c6ac0db099be SHA512 0fe157b49be30788c14c77e5676065ca3e1150f95b1ea4c0f68552ed331127263c996798ca82bb02e1d0d6afe2de9bc186da4cb89fdc922284d17ab77fe623ed
diff --git a/dev-ruby/test-unit-ruby-core/metadata.xml b/dev-ruby/test-unit-ruby-core/metadata.xml
new file mode 100644
index 000000000000..4b7391de962e
--- /dev/null
+++ b/dev-ruby/test-unit-ruby-core/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="rubygems">test-unit</remote-id>
+    <remote-id type="github">test-unit/test-unit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/test-unit-ruby-core/test-unit-ruby-core-1.0.5.ebuild b/dev-ruby/test-unit-ruby-core/test-unit-ruby-core-1.0.5.ebuild
new file mode 100644
index 000000000000..ac371c7ced8e
--- /dev/null
+++ b/dev-ruby/test-unit-ruby-core/test-unit-ruby-core-1.0.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Additional test assertions for Ruby standard libraries"
+HOMEPAGE="https://github.com/ruby/test-unit-ruby-core"
+
+LICENSE="|| ( Ruby-BSD BSD-2 ) PSF-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index fa040a7e6ad6..2409fcc7cada 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -1,3 +1,3 @@
-DIST test-unit-3.3.9.gem 121856 BLAKE2B f8ac1568aabc7d53c79715c6b141d3f2be0782e35dda36fc6184e7b7bbae419e883b94f163333e4e1a186c07f55cef181a2d86d4531e3968667e8c5fcfe8e36c SHA512 8e2a1516d33811793aacbf0b31b9609b43437ea6800cfe6c97b1c96395a8eea7c42f2788dd86b6decfda184a27e5818646bbe313d39ce3799a0869f62a0c4c32
-DIST test-unit-3.4.9.tar.gz 161212 BLAKE2B 57c1932a1049300aad41eb8d0a72459c3eaecd5b5bc89fa9f981b6975be9b8b4d378dad8ff769bb1add54e28a6e84b54f791ab13c7bd31d042ae068e37c04f6c SHA512 dccfdbbeb5319cac36dec80d17428b593905c74d8644b19b938bc2cc15ceb598818e73d2f0a681142cba6395b16d404437821af72abc152ab20987a645faf001
-DIST test-unit-3.5.3.tar.gz 161397 BLAKE2B 1d52fa1eebf25a66e7036d6709a5410a5563f381d3a3eb05ef09702493e5990b93c6ae5a3167cc4d971174a08a2d2b884b860eeea0ea5f8a1fb76e9c42379e0b SHA512 e6960bdcc67c8667cc13f0a4cf8b412be767124b0e555294be71afff71e0ce9a34e7cfa7413e33ee3c8477928a479e9439ada9e50866c0e8890b4be8dd0b38a2
+DIST test-unit-3.5.8.tar.gz 165216 BLAKE2B 1a039931d87ce3ad4afecd4c1105bb6197acc05be3b9091ca6361689f42d725d1333553b7527bc5cb46306acd3ac4df20ed809e0aca9928a760fc0d849a51e2b SHA512 ab7f492dd5f4606cd91a32240aa3ef6dffec48281b65d960bf87d0b2a9a865d6273bb4cc6896397136c5b313669f615fe6f5a83a6a4ab241013eaa51cf5e3341
+DIST test-unit-3.6.1.tar.gz 165438 BLAKE2B 5f5b912eec04ddeed6501c873850df3b5e3bd4450994581055634ba9923fa54c9c4731593fd24bc08caf1ce2e4f8181a39221bbfcc2f80359395b5fd30df80c9 SHA512 0788871faeb9d9c9e2a07cf4cae7b63d9520ff1e1be831889861c9d76b10bd6f59a60c0417c7b5ae97856bfd1c75cffd4e1c9a006f7a0c651432196733aa0f08
+DIST test-unit-3.6.2.tar.gz 165842 BLAKE2B 0eeacf817bf4b0103ce9c6b7097401a24f9788a2bea6d3ac0feed3236575556fafd778b565a63510aeb4fc5cede18f72fc0ef42249c3a6fb3a86a199d5b0a0df SHA512 d523412e080ea0ce1ac968c64279fbdc90afaed3b2052f357993583ed89a77d9977022aac74f3170bfc3cb7e716f1665a9705e0ed95a8db5f205f1b984f52d94
diff --git a/dev-ruby/test-unit/files/testrb b/dev-ruby/test-unit/files/testrb
deleted file mode 100644
index f87eabcb2bef..000000000000
--- a/dev-ruby/test-unit/files/testrb
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-gem 'test-unit', '~> 2.5'
-require 'test/unit'
-(r = Test::Unit::AutoRunner.new(true)).process_args(ARGV) or
-  abort r.options.banner + " tests..."
-exit r.run
diff --git a/dev-ruby/test-unit/metadata.xml b/dev-ruby/test-unit/metadata.xml
index be9bb8e7b571..4b7391de962e 100644
--- a/dev-ruby/test-unit/metadata.xml
+++ b/dev-ruby/test-unit/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="rubygems">test-unit</remote-id>
+    <remote-id type="github">test-unit/test-unit</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/test-unit/test-unit-3.3.9.ebuild b/dev-ruby/test-unit/test-unit-3.3.9.ebuild
deleted file mode 100644
index e869269bba8c..000000000000
--- a/dev-ruby/test-unit/test-unit-3.3.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md doc-install/text/*.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An xUnit family unit testing framework for Ruby"
-HOMEPAGE="https://rubygems.org/gems/test-unit"
-
-LICENSE="|| ( Ruby GPL-2 ) PSF-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc 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/power_assert"
-
-all_ruby_prepare() {
-	mv doc doc-install || die "moving doc directory out of the way failed"
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die "testsuite failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbin "${FILESDIR}"/testrb-3 testrb-2
-}
diff --git a/dev-ruby/test-unit/test-unit-3.4.9.ebuild b/dev-ruby/test-unit/test-unit-3.4.9.ebuild
deleted file mode 100644
index 496be5175274..000000000000
--- a/dev-ruby/test-unit/test-unit-3.4.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md doc-install/text/*.md"
-
-RUBY_FAKEGEM_GEMSPEC="test-unit.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An xUnit family unit testing framework for Ruby"
-HOMEPAGE="https://rubygems.org/gems/test-unit"
-SRC_URI="https://github.com/test-unit/test-unit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Ruby GPL-2 ) PSF-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~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/power_assert"
-
-all_ruby_prepare() {
-	mv doc doc-install || die "moving doc directory out of the way failed"
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die "testsuite failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbin "${FILESDIR}"/testrb-3 testrb-2
-}
diff --git a/dev-ruby/test-unit/test-unit-3.5.3.ebuild b/dev-ruby/test-unit/test-unit-3.5.3.ebuild
deleted file mode 100644
index 0d09033e3895..000000000000
--- a/dev-ruby/test-unit/test-unit-3.5.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md doc-install/text/*.md"
-
-RUBY_FAKEGEM_GEMSPEC="test-unit.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An xUnit family unit testing framework for Ruby"
-HOMEPAGE="https://rubygems.org/gems/test-unit"
-SRC_URI="https://github.com/test-unit/test-unit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Ruby GPL-2 ) PSF-2"
-SLOT="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"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/power_assert"
-
-all_ruby_prepare() {
-	mv doc doc-install || die "moving doc directory out of the way failed"
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die "testsuite failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbin "${FILESDIR}"/testrb-3 testrb-2
-}
diff --git a/dev-ruby/test-unit/test-unit-3.5.8.ebuild b/dev-ruby/test-unit/test-unit-3.5.8.ebuild
new file mode 100644
index 000000000000..8878b923983d
--- /dev/null
+++ b/dev-ruby/test-unit/test-unit-3.5.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md doc-install/text/*.md"
+
+RUBY_FAKEGEM_GEMSPEC="test-unit.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An xUnit family unit testing framework for Ruby"
+HOMEPAGE="https://rubygems.org/gems/test-unit"
+SRC_URI="https://github.com/test-unit/test-unit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 ) PSF-2"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "dev-ruby/power_assert"
+
+all_ruby_prepare() {
+	mv doc doc-install || die "moving doc directory out of the way failed"
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die "testsuite failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbin "${FILESDIR}"/testrb-3 testrb-2
+}
diff --git a/dev-ruby/test-unit/test-unit-3.6.1.ebuild b/dev-ruby/test-unit/test-unit-3.6.1.ebuild
new file mode 100644
index 000000000000..1684a7109808
--- /dev/null
+++ b/dev-ruby/test-unit/test-unit-3.6.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md doc-install/text/*.md"
+
+RUBY_FAKEGEM_GEMSPEC="test-unit.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An xUnit family unit testing framework for Ruby"
+HOMEPAGE="https://rubygems.org/gems/test-unit"
+SRC_URI="https://github.com/test-unit/test-unit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 ) PSF-2"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "dev-ruby/power_assert"
+
+all_ruby_prepare() {
+	mv doc doc-install || die "moving doc directory out of the way failed"
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die "testsuite failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbin "${FILESDIR}"/testrb-3 testrb-2
+}
diff --git a/dev-ruby/test-unit/test-unit-3.6.2.ebuild b/dev-ruby/test-unit/test-unit-3.6.2.ebuild
new file mode 100644
index 000000000000..69fcabebe695
--- /dev/null
+++ b/dev-ruby/test-unit/test-unit-3.6.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md doc-install/text/*.md"
+
+RUBY_FAKEGEM_GEMSPEC="test-unit.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An xUnit family unit testing framework for Ruby"
+HOMEPAGE="https://rubygems.org/gems/test-unit"
+SRC_URI="https://github.com/test-unit/test-unit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 ) PSF-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "dev-ruby/power_assert"
+
+all_ruby_prepare() {
+	mv doc doc-install || die "moving doc directory out of the way failed"
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die "testsuite failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbin "${FILESDIR}"/testrb-3 testrb-2
+}
diff --git a/dev-ruby/test_construct/test_construct-2.0.2-r1.ebuild b/dev-ruby/test_construct/test_construct-2.0.2-r1.ebuild
index fc0c489347c8..ca318ac1d14f 100644
--- a/dev-ruby/test_construct/test_construct-2.0.2-r1.ebuild
+++ b/dev-ruby/test_construct/test_construct-2.0.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
@@ -13,15 +13,17 @@ HOMEPAGE="https://github.com/bhb/test_construct"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
 	>=dev-ruby/minitest-5.0.8
-	>=dev-ruby/mocha-0.14.0
+	dev-ruby/mocha:2
 	dev-ruby/rspec:3
 )"
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+
+	sed -i -e '/mocha/ s/setup/minitest/' test/test_helper.rb || die
 }
diff --git a/dev-ruby/test_declarative/files/test_declarative-0.0.6-backport-pr24.patch b/dev-ruby/test_declarative/files/test_declarative-0.0.6-backport-pr24.patch
new file mode 100644
index 000000000000..6220353790ec
--- /dev/null
+++ b/dev-ruby/test_declarative/files/test_declarative-0.0.6-backport-pr24.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/912063
+https://github.com/svenfuchs/test_declarative/pull/24
+
+From ef9561b703990a846aa49c0f4d164009b355f0cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Tue, 22 Aug 2023 16:32:34 +0200
+Subject: [PATCH] Use Minitest::Test as a test runner
+
+The Minitest::Unit is deprecated since Minitest 5.0 and it was recenlty
+put behind environment variable:
+
+https://github.com/minitest/minitest/commit/a2c6c18570f6f0a1bf6af70fe3b6d9599a13fdd6
+---
+ test/test_declarative_test.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test_declarative_test.rb b/test/test_declarative_test.rb
+index 6ef4220..a3ab0ae 100644
+--- a/test/test_declarative_test.rb
++++ b/test/test_declarative_test.rb
+@@ -13,7 +13,7 @@ def gemfile_name
+   # Minitest >= 5
+   require 'minitest/autorun'
+   TEST_CASE = Minitest::Test
+-  RUNNER = Minitest::Unit
++  RUNNER = Minitest::Test
+ when 'Gemfile.minitest4'
+   # Minitest < 5
+   require 'minitest/autorun'
diff --git a/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild b/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild
index 90930b4d2aa8..fddfc598d4d5 100644
--- a/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild
+++ b/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
@@ -20,8 +20,9 @@ RUBY_S="svenfuchs-test_declarative-*"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
+PATCHES=( "${FILESDIR}/${PN}-0.0.6-backport-pr24.patch" )
 
 ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/minitest-5.10:5 )"
 
diff --git a/dev-ruby/text-hyphen/Manifest b/dev-ruby/text-hyphen/Manifest
index 60c5601b1b0d..4e6b57087cc2 100644
--- a/dev-ruby/text-hyphen/Manifest
+++ b/dev-ruby/text-hyphen/Manifest
@@ -1 +1 @@
-DIST text-hyphen-1.4.1.gem 751616 BLAKE2B 4a6d6a9b430c2dee2a486dde9f49405b98bc32fe8f96448c0cbe8d55f416c4e4e9bef5ae3adb57576dee6fa285680fc57b958cb279786872c8d95282cbf72e73 SHA512 4a6667aff01e56afce79302f46d0afdbf9c965ad80dbf9a7266a213143e6b6bc2cb00092d26900286bf72a700e47be6b0860cfdf87fa2856477db02261f9ef3d
+DIST text-hyphen-1.5.0.gem 836096 BLAKE2B 702363b99c33e614dab5b2509d0b77e5f37ca2f401e2c13fab466aec5bbc4f24247fe306ed6f7ed16c3e3b8cad35ca5948725175759827ec9a1b45642a7399ea SHA512 7390b057f0fe4918aa98811adc3922bf6b959aedbf327a035324fc92935675f8016574519d0ff34e11c24bc4b8fe0d110b296344ed8a7cfae018ca5a7d6ce5c9
diff --git a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r3.ebuild b/dev-ruby/text-hyphen/text-hyphen-1.4.1-r3.ebuild
deleted file mode 100644
index 0f7b5da49138..000000000000
--- a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hyphenates words according to the rules of the language the word is written in"
-HOMEPAGE="http://rubyforge.org/projects/text-format"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/hoe-2.8.0
-		dev-ruby/test-unit:2
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '2igem "test-unit", ">= 2.0"' test/test_*.rb || die
-}
diff --git a/dev-ruby/text-hyphen/text-hyphen-1.5.0.ebuild b/dev-ruby/text-hyphen/text-hyphen-1.5.0.ebuild
new file mode 100644
index 000000000000..4062a5f18f62
--- /dev/null
+++ b/dev-ruby/text-hyphen/text-hyphen-1.5.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md History.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Hyphenates words according to the rules of the language the word is written in"
+HOMEPAGE="https://rubygems.org/gems/text-hyphen"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/hoe-2.8.0
+		dev-ruby/test-unit:2
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '2igem "test-unit", ">= 2.0"' test/test_*.rb || die
+}
diff --git a/dev-ruby/text/text-1.3.1-r1.ebuild b/dev-ruby/text/text-1.3.1-r1.ebuild
index 13dbdeba4ab9..fcf9354f048e 100644
--- a/dev-ruby/text/text-1.3.1-r1.ebuild
+++ b/dev-ruby/text/text-1.3.1-r1.ebuild
@@ -1,8 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
 
diff --git a/dev-ruby/textpow/Manifest b/dev-ruby/textpow/Manifest
deleted file mode 100644
index e18ab07a486c..000000000000
--- a/dev-ruby/textpow/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST textpow-1.4.0.tar.gz 386724 BLAKE2B d2fb051810cdbe26caafae62d402ba257a644ceeb5975b1bce8858e8359026bbeac7795b264c84462cc6bd02b5a110eba70338d955ba793cec8abdf194089217 SHA512 134b38e277118cf626e3e3643e447d7c7914dc89dba527682c4d6318a0d3b96edb81a68ac5e039158058de371ab9a326088cb119069c55032de7c2f1dadffdcc
diff --git a/dev-ruby/textpow/metadata.xml b/dev-ruby/textpow/metadata.xml
deleted file mode 100644
index 9667a82929b1..000000000000
--- a/dev-ruby/textpow/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">grosser/textpow</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/textpow/textpow-1.4.0-r1.ebuild b/dev-ruby/textpow/textpow-1.4.0-r1.ebuild
deleted file mode 100644
index 6f226958c65d..000000000000
--- a/dev-ruby/textpow/textpow-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-RUBY_FAKEGEM_GEMSPEC="textpow.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A library to parse and process Textmate bundles"
-HOMEPAGE="http://textpow.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/plist-3.0.1"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' textpow.gemspec || die
-}
diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index 1f4c8fe78d1e..07df0399921a 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -1,2 +1,3 @@
-DIST thor-git-1.1.0.tgz 98252 BLAKE2B 1537cfe6e7cc0d92cc8bde56f0e2acf06b6ee4cb366a5686bb62de43dd15709a4aeaf1b30c3dfa71a6d6c7570e702deeebab6da324204388ac427337514be3f0 SHA512 d1872a834478c5a2054dde6f55e93f6765fd628536f99f888bd7495436c88658537d48c44ef1e5ad6d1388edfa294ea2a3f3cbde32c19b7d2253b78bc62bf9d0
-DIST thor-git-1.2.1.tgz 96638 BLAKE2B 03826d2545c61f5fd433325bc65b244921fd0ed0f030ea173fa6f558ca9fd62ac52dca829c66de32569321b3d52353f306559fa34c34e472b1aa52184ba3d812 SHA512 88e58b6ca6c812cb84ab59e0ee8afcd8fa70b6c24d403cd5ea05d1d40ac30e85f2c7412611cc176eb541d16878e309d25c7e4284f64c760475925ffe359250b9
+DIST thor-git-1.2.2.tgz 98213 BLAKE2B e71ee51eb5c982c585cf9bd9dffda8933975c9d0df8096015d125eefd0597a653887db1acfc132ce1f5a2e8ce4ab71c790a6c0bf39edd7c5e4c85a75de963944 SHA512 2c8af5d59f33691af63e813ba8dfe3392c279593f3e3ccf0ab2d6eb2ccce4220d93b7cb3413ad853e4bba14f4e2182c54caaf4944627cbcbefa31cdc0fabefc7
+DIST thor-git-1.3.0.tgz 102884 BLAKE2B f3f5a27ccfdbe7de6bbec71e1ae36e522d49ceec223e1d86a028898403e4e56722703dc847b4a850c46301fdeea429e70e73b7888089c35138d455c094678c02 SHA512 f561f9d05264cf0d2cd836dfb689539b645fa02a39ea8d10923001bb3d510ad6b4bcbb6551739d453e7d9ac05562bc0f454b581926becbc784c0604c5449c27e
+DIST thor-git-1.3.1.tgz 103008 BLAKE2B 790f83c74bcaff08c65934e1fdf14d41e9d7bf5f51d94419513b45c3263beeae0fd239d848206e7f71a59dceb2ad9719131bc81baf23ac42e797cb430186490d SHA512 5ecfa8c7cdf3c10006b9f50de633b6f07c7ed9a3ad3807cc6d07adbb38b9d64fd0d17aea06a5e8e928ea4abf6cf2042af55e1e87416e7c0ce5ab0a721f546a04
diff --git a/dev-ruby/thor/files/thor-1.2.2-no-coverage.patch b/dev-ruby/thor/files/thor-1.2.2-no-coverage.patch
new file mode 100644
index 000000000000..f57cbfeb63f5
--- /dev/null
+++ b/dev-ruby/thor/files/thor-1.2.2-no-coverage.patch
@@ -0,0 +1,29 @@
+--- a/spec/helper.rb
++++ b/spec/helper.rb
+@@ -1,17 +1,5 @@
+ $TESTING = true
+ 
+-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6.0")
+-  require "simplecov"
+-  require "coveralls"
+-
+-  SimpleCov.formatters = [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
+-
+-  SimpleCov.start do
+-    add_filter "/spec"
+-    minimum_coverage(90)
+-  end
+-end
+-
+ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+ require "thor"
+ require "thor/group"
+@@ -22,8 +10,6 @@ require "rspec"
+ require "diff/lcs" # You need diff/lcs installed to run specs (but not to run Thor).
+ require "webmock/rspec"
+ 
+-WebMock.disable_net_connect!(:allow => "coveralls.io")
+-
+ # Set shell to basic
+ ENV["THOR_COLUMNS"] = "10000"
+ $0 = "thor"
diff --git a/dev-ruby/thor/metadata.xml b/dev-ruby/thor/metadata.xml
index f5ad206d6531..c7f8669f3557 100644
--- a/dev-ruby/thor/metadata.xml
+++ b/dev-ruby/thor/metadata.xml
@@ -13,6 +13,7 @@
 		should be familiar to most Rake users.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">erikhuda/thor</remote-id>
+		<remote-id type="github">rails/thor</remote-id>
+		<remote-id type="rubygems">thor</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/thor/thor-1.1.0.ebuild b/dev-ruby/thor/thor-1.1.0.ebuild
deleted file mode 100644
index bc66fcb688e2..000000000000
--- a/dev-ruby/thor/thor-1.1.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2000-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_BINWRAP="thor"
-
-RUBY_FAKEGEM_GEMSPEC="thor.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A scripting framework that replaces rake and sake"
-HOMEPAGE="http://whatisthor.com/"
-
-SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux"
-IUSE="doc"
-
-USE_RUBY="ruby25 ruby26 ruby27" ruby_add_bdepend "
-	test? (
-		dev-ruby/childlabor
-		dev-ruby/webmock
-	)"
-
-RDEPEND+=" !<dev-ruby/thor-0.20.3-r1:0"
-
-all_ruby_prepare() {
-	# Remove rspec default options (as we might not have the last
-	# rspec).
-	rm .rspec || die
-
-	# Remove Bundler
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Thorfile || die
-
-	# Remove mandatory coverage collection using simplecov which is not
-	# packaged.
-	sed -i -e '/require .simplecov/,/^end/ s:^:#:' spec/helper.rb || die
-
-	# Avoid a spec that requires UTF-8 support, so LANG=C still works,
-	# bug 430402
-	sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die
-
-	# Avoid specs depending on git, bug 724058
-	rm -f spec/quality_spec.rb || die
-
-	# Avoid currently broken readline specs (already fixed upstream)
-	#rm -f spec/line_editor/readline_spec.rb spec/line_editor_spec.rb || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby30)
-			einfo "Skipping tests due to circular dependencies"
-			;;
-		*)
-			RSPEC_VERSION=3 ruby-ng_rspec spec || die
-			;;
-	esac
-}
diff --git a/dev-ruby/thor/thor-1.2.1.ebuild b/dev-ruby/thor/thor-1.2.1.ebuild
deleted file mode 100644
index f9f2ad391d8f..000000000000
--- a/dev-ruby/thor/thor-1.2.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2000-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_BINWRAP="thor"
-
-RUBY_FAKEGEM_GEMSPEC="thor.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A scripting framework that replaces rake and sake"
-HOMEPAGE="http://whatisthor.com/"
-
-SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
-IUSE="doc"
-
-USE_RUBY="ruby26 ruby27" ruby_add_bdepend "
-	test? (
-		dev-ruby/childlabor
-		dev-ruby/webmock
-	)"
-
-RDEPEND+=" !<dev-ruby/thor-0.20.3-r1:0"
-
-all_ruby_prepare() {
-	# Remove rspec default options (as we might not have the last
-	# rspec).
-	rm .rspec || die
-
-	# Remove Bundler
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Thorfile || die
-
-	# Remove mandatory coverage collection using simplecov which is not
-	# packaged.
-	sed -i -e '/require .simplecov/,/^end/ s:^:#:' spec/helper.rb || die
-
-	# Avoid a spec that requires UTF-8 support, so LANG=C still works,
-	# bug 430402
-	sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die
-
-	# Avoid specs depending on git, bug 724058
-	rm -f spec/quality_spec.rb || die
-
-	# Avoid currently broken readline specs (already fixed upstream)
-	#rm -f spec/line_editor/readline_spec.rb spec/line_editor_spec.rb || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby30)
-			einfo "Skipping tests due to circular dependencies"
-			;;
-		*)
-			RSPEC_VERSION=3 ruby-ng_rspec spec || die
-			;;
-	esac
-}
diff --git a/dev-ruby/thor/thor-1.2.2.ebuild b/dev-ruby/thor/thor-1.2.2.ebuild
new file mode 100644
index 000000000000..ee6a22ad47d1
--- /dev/null
+++ b/dev-ruby/thor/thor-1.2.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2000-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_BINWRAP="thor"
+
+RUBY_FAKEGEM_GEMSPEC="thor.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple and efficient tool for building self-documenting command line utilities"
+HOMEPAGE="http://whatisthor.com/"
+SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
+IUSE="doc"
+
+# For initial target porting (new rubies), we can make these test deps
+# conditional with:
+# 1. USE_RUBY="<old rubies>" ruby_add_bdepend ...
+# 2. skip logic in each_ruby_test
+USE_RUBY="ruby30 ruby31 ruby32" ruby_add_bdepend "
+	test? (
+		dev-ruby/childlabor
+		dev-ruby/webmock
+	)"
+
+RDEPEND+=" !<dev-ruby/thor-0.20.3-r1:0"
+
+PATCHES=(
+	"${FILESDIR}"/thor-1.2.2-no-coverage.patch
+)
+
+all_ruby_prepare() {
+	# Remove rspec default options (as we might not have the last
+	# rspec).
+	rm .rspec || die
+
+	# Remove Bundler
+	#rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Thorfile || die
+
+	# Remove mandatory coverage collection using simplecov which is not
+	# packaged.
+	#sed -i -e '/require "simplecov"/,/^end/ s:^:#:' spec/helper.rb || die
+
+	# Avoid a spec that requires UTF-8 support, so LANG=C still works,
+	# bug 430402
+	#sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die
+
+	# Avoid specs depending on git, bug 724058
+	rm -f spec/quality_spec.rb || die
+
+	# Avoid currently broken readline specs (already fixed upstream)
+	rm -f spec/line_editor/readline_spec.rb spec/line_editor_spec.rb || die
+
+	# Avoid spec failing on whitespace difference in error message
+	sed -i -e '/raises an error for unknown switches/askip "whitespace differences"' spec/parser/options_spec.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby33)
+			einfo "Skipping tests due to circular dependencies"
+			;;
+		*)
+			RSPEC_VERSION=3 ruby-ng_rspec spec || die
+			;;
+	esac
+}
diff --git a/dev-ruby/thor/thor-1.3.0.ebuild b/dev-ruby/thor/thor-1.3.0.ebuild
new file mode 100644
index 000000000000..6ce820d5822d
--- /dev/null
+++ b/dev-ruby/thor/thor-1.3.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2000-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_BINWRAP="thor"
+
+RUBY_FAKEGEM_GEMSPEC="thor.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple and efficient tool for building self-documenting command line utilities"
+HOMEPAGE="http://whatisthor.com/"
+SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux"
+IUSE="doc"
+
+# For initial target porting (new rubies), we can make these test deps
+# conditional with:
+# 1. USE_RUBY="<old rubies>" ruby_add_bdepend ...
+# 2. skip logic in each_ruby_test
+USE_RUBY="ruby31 ruby32" ruby_add_bdepend "
+	test? (
+		dev-ruby/childlabor
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove rspec default options (as we might not have the last
+	# rspec).
+	rm .rspec || die
+
+	# Remove Bundler
+	#rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Thorfile || die
+
+	# Remove mandatory coverage collection using simplecov which is not
+	# packaged.
+	sed -i -e '/require "simplecov"/,/^end/ s:^:#:' spec/helper.rb || die
+
+	# Avoid a spec that requires UTF-8 support, so LANG=C still works,
+	# bug 430402
+	#sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die
+
+	# Avoid specs depending on git, bug 724058
+	rm -f spec/quality_spec.rb || die
+
+	# Avoid currently broken readline specs (already fixed upstream)
+	rm -f spec/line_editor/readline_spec.rb spec/line_editor_spec.rb || die
+
+	# Avoid spec failing on whitespace difference in error message
+	sed -i -e '/raises an error for unknown switches/askip "whitespace differences"' spec/parser/options_spec.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby33)
+			einfo "Skipping tests due to circular dependencies"
+			;;
+		*)
+			RSPEC_VERSION=3 ruby-ng_rspec spec || die
+			;;
+	esac
+}
diff --git a/dev-ruby/thor/thor-1.3.1.ebuild b/dev-ruby/thor/thor-1.3.1.ebuild
new file mode 100644
index 000000000000..6ce820d5822d
--- /dev/null
+++ b/dev-ruby/thor/thor-1.3.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2000-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_BINWRAP="thor"
+
+RUBY_FAKEGEM_GEMSPEC="thor.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple and efficient tool for building self-documenting command line utilities"
+HOMEPAGE="http://whatisthor.com/"
+SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux"
+IUSE="doc"
+
+# For initial target porting (new rubies), we can make these test deps
+# conditional with:
+# 1. USE_RUBY="<old rubies>" ruby_add_bdepend ...
+# 2. skip logic in each_ruby_test
+USE_RUBY="ruby31 ruby32" ruby_add_bdepend "
+	test? (
+		dev-ruby/childlabor
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove rspec default options (as we might not have the last
+	# rspec).
+	rm .rspec || die
+
+	# Remove Bundler
+	#rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Thorfile || die
+
+	# Remove mandatory coverage collection using simplecov which is not
+	# packaged.
+	sed -i -e '/require "simplecov"/,/^end/ s:^:#:' spec/helper.rb || die
+
+	# Avoid a spec that requires UTF-8 support, so LANG=C still works,
+	# bug 430402
+	#sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die
+
+	# Avoid specs depending on git, bug 724058
+	rm -f spec/quality_spec.rb || die
+
+	# Avoid currently broken readline specs (already fixed upstream)
+	rm -f spec/line_editor/readline_spec.rb spec/line_editor_spec.rb || die
+
+	# Avoid spec failing on whitespace difference in error message
+	sed -i -e '/raises an error for unknown switches/askip "whitespace differences"' spec/parser/options_spec.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby33)
+			einfo "Skipping tests due to circular dependencies"
+			;;
+		*)
+			RSPEC_VERSION=3 ruby-ng_rspec spec || die
+			;;
+	esac
+}
diff --git a/dev-ruby/thread_order/thread_order-1.1.1.ebuild b/dev-ruby/thread_order/thread_order-1.1.1.ebuild
index 5c9432c94434..50071c2935ea 100644
--- a/dev-ruby/thread_order/thread_order-1.1.1.ebuild
+++ b/dev-ruby/thread_order/thread_order-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/JoshCheek/thread_order"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong 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 ~x64-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/thread_safe/thread_safe-0.3.6-r1.ebuild b/dev-ruby/thread_safe/thread_safe-0.3.6-r1.ebuild
deleted file mode 100644
index a90db6ac5b9f..000000000000
--- a/dev-ruby/thread_safe/thread_safe-0.3.6-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A collection of thread-safe versions of common core Ruby classes"
-HOMEPAGE="https://github.com/ruby-concurrency/thread_safe"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Higher atomic dependency since earlier versions crash on ruby20 while
-# running thread_safe tests.
-ruby_add_bdepend "test? ( >=dev-ruby/atomic-1.1.16 )"
-
-each_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e '/coveralls/I s:^:#:' \
-		-e '/simplecov/ s:^:#:' \
-		-e '/SimpleCov/,/^end/ s:^:#:' spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	einfo "The test suite may take up to 10 minutes to run without apparent feedback"
-	each_fakegem_test
-}
diff --git a/dev-ruby/thread_safe/thread_safe-0.3.6-r3.ebuild b/dev-ruby/thread_safe/thread_safe-0.3.6-r3.ebuild
new file mode 100644
index 000000000000..35dedb7af027
--- /dev/null
+++ b/dev-ruby/thread_safe/thread_safe-0.3.6-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A collection of thread-safe versions of common core Ruby classes"
+HOMEPAGE="https://github.com/ruby-concurrency/thread_safe"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+each_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e '/coveralls/I s:^:#:' \
+		-e '/simplecov/ s:^:#:' \
+		-e '/SimpleCov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	einfo "The test suite may take up to 10 minutes to run without apparent feedback"
+	each_fakegem_test
+}
diff --git a/dev-ruby/tidy-ext/Manifest b/dev-ruby/tidy-ext/Manifest
deleted file mode 100644
index adca93b6a591..000000000000
--- a/dev-ruby/tidy-ext/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tidy-ext-0.1.14.gem 260608 BLAKE2B 5401ec2019f25307f4083f3a1717cd2b0419e0025875b0ad461c72e50445f9b1ffc488a723db04432d262cf2dd94fd267f5261b33eb53d829f4a03d5cd29ab30 SHA512 8a8eada3cb5e815338de49332a24c85b9b2cabba0e10f2d72fe85bd4faf76924e52d82066e7b73e62bc459631aaa9d1c42a6941988ae2a71ca0ddd4f3302ad86
diff --git a/dev-ruby/tidy-ext/files/11CVE-2015-5522.patch b/dev-ruby/tidy-ext/files/11CVE-2015-5522.patch
deleted file mode 100644
index 942209873be0..000000000000
--- a/dev-ruby/tidy-ext/files/11CVE-2015-5522.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c18f27a58792f7fbd0b30a0ff50d6b40a82f940d Mon Sep 17 00:00:00 2001
-From: Geoff McLane <ubuntu@geoffair.info>
-Date: Wed, 3 Jun 2015 20:26:03 +0200
-Subject: [PATCH] Issue #217 - avoid len going negative, ever...
-
----
- src/lexer.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/lexer.c b/src/lexer.c
-index 376a3d8..664f806 100644
---- a/ext/tidy/lexer.c
-+++ b/ext/tidy/lexer.c
-@@ -3739,16 +3740,17 @@ static tmbstr ParseValue( TidyDocImpl* doc, ctmbstr name,
-         /* and prompts attributes unless --literal-attributes is set to yes      */
-         /* #994841 - Whitespace is removed from value attributes                 */
- 
--        if (munge &&
-+        /* Issue #217 - Also only if/while (len > 0) - MUST NEVER GO NEGATIVE! */
-+        if ((len > 0) && munge &&
-             TY_(tmbstrcasecmp)(name, "alt") &&
-             TY_(tmbstrcasecmp)(name, "title") &&
-             TY_(tmbstrcasecmp)(name, "value") &&
-             TY_(tmbstrcasecmp)(name, "prompt"))
-         {
--            while (TY_(IsWhite)(lexer->lexbuf[start+len-1]))
-+            while (TY_(IsWhite)(lexer->lexbuf[start+len-1]) && (len > 0))
-                 --len;
- 
--            while (TY_(IsWhite)(lexer->lexbuf[start]) && start < len)
-+            while (TY_(IsWhite)(lexer->lexbuf[start]) && (start < len) && (len > 0))
-             {
-                 ++start;
-                 --len;
diff --git a/dev-ruby/tidy-ext/metadata.xml b/dev-ruby/tidy-ext/metadata.xml
deleted file mode 100644
index 0432a268b965..000000000000
--- a/dev-ruby/tidy-ext/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">carld/tidy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/tidy-ext/tidy-ext-0.1.14-r4.ebuild b/dev-ruby/tidy-ext/tidy-ext-0.1.14-r4.ebuild
deleted file mode 100644
index aa4500bb1c4b..000000000000
--- a/dev-ruby/tidy-ext/tidy-ext-0.1.14-r4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/tidy/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="W3C HTML Tidy library implemented as a Ruby extension"
-HOMEPAGE="https://github.com/carld/tidy"
-
-LICENSE="HTML-Tidy"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/11CVE-2015-5522.patch" )
-
-all_ruby_prepare() {
-	mkdir lib || die
-
-	# Remove reference to rspec 1
-	sed -i -e '/spec/d' spec/spec_helper.rb || die
-
-	# Avoid spec that needs network connectivity.
-	rm spec/tidy/remote_uri_spec.rb || die
-}
diff --git a/dev-ruby/tidy_table/tidy_table-0.0.5-r5.ebuild b/dev-ruby/tidy_table/tidy_table-0.0.5-r5.ebuild
deleted file mode 100644
index ae0efecf5fb3..000000000000
--- a/dev-ruby/tidy_table/tidy_table-0.0.5-r5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tool to convert an array of struct into an HTML table"
-HOMEPAGE="https://github.com/topfunky/tidy_table"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Remove reference to RSpec 1
-	sed -i -e '/spec/d' -e '1irequire "date"' spec/spec_helper.rb || die
-
-	# Remove metadata so a stub gemspec will be created to avoid the
-	# wrong runtime dependency on dev-ruby/hoe.
-	rm -f ../metadata || die
-}
diff --git a/dev-ruby/tidy_table/tidy_table-0.0.5-r6.ebuild b/dev-ruby/tidy_table/tidy_table-0.0.5-r6.ebuild
index 3863956913ca..c8cec69a04e8 100644
--- a/dev-ruby/tidy_table/tidy_table-0.0.5-r6.ebuild
+++ b/dev-ruby/tidy_table/tidy_table-0.0.5-r6.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index a9095e87c6a9..77c0ab3704ee 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -1 +1,2 @@
-DIST tilt-2.0.10.tar.gz 51446 BLAKE2B de5c12dcf22994f182ae163a82c3060f1d0d8b4bc2a4495f28c9befc954b4949b9d2ae6aed42e3a9c35fb68825844881d9f15b2b68d949236e5396083ff199a3 SHA512 4a36c55347e307ea0c842aad3da72cebe98bcf8a0421040cfce7a43540d1746e736ce92b7ce7492a5cfc184372842c3ac7a006f3650b4c9420d5825ec005b4ef
+DIST tilt-2.2.0.tar.gz 57826 BLAKE2B 10729ac9cb2e2d0b2292a6fdacc0d705179d719d7f4bbdb11075e0eeaeb82933daec22063d3448ea2ada6e50f37b2b66303854707f50162efd11a6151ded45df SHA512 135a32402512fda71952dc2534b02a291d749dbdcb9e17f52c7fa6ecfe3bd7e894f28f3d3d4a595daa63ffbe90cca106347aa916541292558a26d8122fcd7c90
+DIST tilt-2.3.0.tar.gz 57454 BLAKE2B 2c3c934e73c015be850951c67731b2f1640fb340ab1807c72c654363c2ab3aca939b8452327cd54e2c1964add81176cec0dfd2639901284476f0dd13d42a2ccf SHA512 3438c196c2e0936f2c3551fe3786d71b1336118352b97c95d3504b900082ce4248bbaf715f3f812eb7fe6e959767c75e316bf6cd5b659c216bbfd630dbf678bc
diff --git a/dev-ruby/tilt/files/tilt-2.0.10-ruby30.patch b/dev-ruby/tilt/files/tilt-2.0.10-ruby30.patch
deleted file mode 100644
index 27e4d821f64f..000000000000
--- a/dev-ruby/tilt/files/tilt-2.0.10-ruby30.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 91838d57aa35ba5341368ead0d442e1dc1eb8730 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
-Date: Mon, 18 Jan 2021 12:49:31 +0100
-Subject: [PATCH] Fix Ruby 3.0 compatibility.
-
-This fixes issues such as:
-
-~~~
-  1) Error:
-CSVTemplateTest#test_compiles_and_evaluates_the_template_on_render:
-TypeError: no implicit conversion of Hash into String
-    /usr/share/ruby/csv.rb:1273:in `initialize'
-    /usr/share/ruby/csv.rb:1273:in `new'
-    /usr/share/ruby/csv.rb:1273:in `generate'
-    (__TEMPLATE__):in `__tilt_920'
-    /builddir/build/BUILD/tilt-2.0.10/usr/share/gems/gems/tilt-2.0.10/lib/tilt/template.rb:170:in `call'
-    /builddir/build/BUILD/tilt-2.0.10/usr/share/gems/gems/tilt-2.0.10/lib/tilt/template.rb:170:in `evaluate'
-    /builddir/build/BUILD/tilt-2.0.10/usr/share/gems/gems/tilt-2.0.10/lib/tilt/template.rb:109:in `render'
-    /builddir/build/BUILD/tilt-2.0.10/usr/share/gems/gems/tilt-2.0.10/test/tilt_csv_test.rb:15:in `block in <class:CSVTemplateTest>'
-~~~
----
- lib/tilt/csv.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/tilt/csv.rb b/lib/tilt/csv.rb
-index fd0e602..7dfa220 100644
---- a/lib/tilt/csv.rb
-+++ b/lib/tilt/csv.rb
-@@ -50,7 +50,7 @@ def prepare
- 
-     def precompiled_template(locals)
-       <<-RUBY
--        #{@outvar} = #{self.class.engine}.generate(#{options}) do |csv|
-+        #{@outvar} = #{self.class.engine}.generate(**#{options}) do |csv|
-           #{data}
-         end
-       RUBY
diff --git a/dev-ruby/tilt/tilt-2.0.10-r1.ebuild b/dev-ruby/tilt/tilt-2.0.10-r1.ebuild
deleted file mode 100644
index 4ebfd724eb92..000000000000
--- a/dev-ruby/tilt/tilt-2.0.10-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/TEMPLATES.md"
-
-RUBY_FAKEGEM_GEMSPEC="tilt.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Thin interface over template engines to make their usage as generic as possible"
-HOMEPAGE="https://github.com/rtomayko/tilt"
-SRC_URI="https://github.com/rtomayko/tilt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-ruby30.patch" )
-
-# Block on some of the potential test dependencies. These dependencies
-# are optional for the test suite, and we don't want to depend on all of
-# them to faciliate keywording and stabling.
-ruby_add_bdepend "test? (
-	dev-ruby/erubis
-	dev-ruby/nokogiri
-)"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -e '/bundler/I s:^:#:' -i Rakefile test/test_helper.rb || die
-
-	# Avoid tests with minor syntax differences since this happens all
-	# the time when details in the dependencies change.
-	sed -e '/test_smarty_pants_true/,/^    end/ s:^:#:' \
-		-e '/test_smart_quotes_true/,/^  end/ s:^:#:' -i test/tilt_markdown_test.rb || die
-	sed -e '/smartypants when :smart is set/,/^    end/ s:^:#:' -i test/tilt_rdiscounttemplate_test.rb || die
-
-	# Skip tests for unpackaged asciidoctor converter
-	sed -i -e '/docbook 4.5/askip' test/tilt_asciidoctor_test.rb || die
-}
diff --git a/dev-ruby/tilt/tilt-2.0.10.ebuild b/dev-ruby/tilt/tilt-2.0.10.ebuild
deleted file mode 100644
index 46a445fe60b6..000000000000
--- a/dev-ruby/tilt/tilt-2.0.10.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/TEMPLATES.md"
-
-RUBY_FAKEGEM_GEMSPEC="tilt.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Thin interface over template engines to make their usage as generic as possible"
-HOMEPAGE="https://github.com/rtomayko/tilt"
-SRC_URI="https://github.com/rtomayko/tilt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Block on some of the potential test dependencies. These dependencies
-# are optional for the test suite, and we don't want to depend on all of
-# them to faciliate keywording and stabling.
-ruby_add_bdepend "test? (
-	dev-ruby/coffee-script
-	dev-ruby/erubis
-	dev-ruby/nokogiri
-)"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -e '/bundler/I s:^:#:' -i Rakefile test/test_helper.rb || die
-
-	# Avoid tests with minor syntax differences since this happens all
-	# the time when details in the dependencies change.
-	sed -e '/test_smarty_pants_true/,/^    end/ s:^:#:' \
-		-e '/test_smart_quotes_true/,/^  end/ s:^:#:' -i test/tilt_markdown_test.rb || die
-	sed -e '/smartypants when :smart is set/,/^    end/ s:^:#:' -i test/tilt_rdiscounttemplate_test.rb || die
-
-	# Skip tests for unpackaged asciidoctor converter
-	sed -i -e '/docbook 4.5/askip' test/tilt_asciidoctor_test.rb || die
-}
diff --git a/dev-ruby/tilt/tilt-2.2.0.ebuild b/dev-ruby/tilt/tilt-2.2.0.ebuild
new file mode 100644
index 000000000000..9b0f38c10106
--- /dev/null
+++ b/dev-ruby/tilt/tilt-2.2.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/TEMPLATES.md"
+
+RUBY_FAKEGEM_GEMSPEC="tilt.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Thin interface over template engines to make their usage as generic as possible"
+HOMEPAGE="https://github.com/jeremyevans/tilt"
+SRC_URI="https://github.com/jeremyevans/tilt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# Block on some of the potential test dependencies. These dependencies
+# are optional for the test suite, and we don't want to depend on all of
+# them to facilitate keywording and stabling.
+ruby_add_bdepend "test? (
+	dev-ruby/erubi
+	dev-ruby/nokogiri
+)"
+
+all_ruby_prepare() {
+	sed -e '/bundler/I s:^:#:' -i Rakefile test/test_helper.rb || die
+	sed -e '7irequire "uri"' -i test/test_helper.rb || die
+
+	# Avoid tests with minor syntax differences since this happens all
+	# the time when details in the dependencies change.
+	rm -f test/tilt_sasstemplate_test.rb || die
+
+	# Skip tests for unpackaged asciidoctor converter
+	sed -i -e '/docbook 4.5/askip' test/tilt_asciidoctor_test.rb || die
+}
diff --git a/dev-ruby/tilt/tilt-2.3.0.ebuild b/dev-ruby/tilt/tilt-2.3.0.ebuild
new file mode 100644
index 000000000000..a784f723b03b
--- /dev/null
+++ b/dev-ruby/tilt/tilt-2.3.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/TEMPLATES.md"
+
+RUBY_FAKEGEM_GEMSPEC="tilt.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Thin interface over template engines to make their usage as generic as possible"
+HOMEPAGE="https://github.com/jeremyevans/tilt"
+SRC_URI="https://github.com/jeremyevans/tilt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+# Block on some of the potential test dependencies. These dependencies
+# are optional for the test suite, and we don't want to depend on all of
+# them to facilitate keywording and stabling.
+ruby_add_bdepend "test? (
+	dev-ruby/erubi
+	dev-ruby/nokogiri
+)"
+
+all_ruby_prepare() {
+	sed -e '/bundler/I s:^:#:' -i Rakefile test/test_helper.rb || die
+	sed -e '7irequire "uri"' -i test/test_helper.rb || die
+
+	# Avoid tests with minor syntax differences since this happens all
+	# the time when details in the dependencies change.
+	rm -f test/tilt_sasstemplate_test.rb || die
+
+	# Skip tests for unpackaged asciidoctor converter
+	sed -i -e '/docbook 4.5/askip' test/tilt_asciidoctor_test.rb || die
+}
diff --git a/dev-ruby/time/Manifest b/dev-ruby/time/Manifest
index 46d68074082b..5f2a62e3f9fb 100644
--- a/dev-ruby/time/Manifest
+++ b/dev-ruby/time/Manifest
@@ -1 +1,2 @@
-DIST time-0.2.0.tar.gz 25276 BLAKE2B e944fc0ad371608b24c543e503504e1bfd9015f8b998372e6e4a08d2b76c7d75b478ceac42d4d955c205e4ed30a018d3c008e947d9d3215fcd32d78f429aee92 SHA512 07b4896827014ab1f6394ee8a116a8074c2342c070b814bb190104a404828d684c9ca49d0c53fe5ef4518d5455de73d5f4c03051cbae47257fa631b17515d2f9
+DIST time-0.2.2.tar.gz 26129 BLAKE2B 9d7c507c06fca17c9a2734f1116524344518635562b0ba924cdf5e0b0b52cb31f6dffa7aa3c8c06e0d2f5f2c1ffdcef2a92756cd915822be6a1510f08fa91c56 SHA512 4866cd7df233222ed76cf3b35c842b6e1652b429aa15609bfe40f89683ad5df2ce7f37f41dfb0e85f610f2ebf4e431ea8046d67c3aed7aa345d928fe33ba1ae3
+DIST time-0.3.0.tar.gz 15520 BLAKE2B 05d30c8dd6da8544fe89e1f92a94d91adf198712acc236703947abef86c9ceefeedc2bc78150d3d1918b29972509c927510fea2e4bfec0a01ad12aa751e27fc2 SHA512 17483eebbddd3be40f83b35813ef5faa3b3fe695e3c13e4cc6d13579b64fd5d1637e2aca2f5e60192b4de6ae761efaa76aa6a6cbbcce7bade31f5f415f224b70
diff --git a/dev-ruby/time/time-0.2.0.ebuild b/dev-ruby/time/time-0.2.0.ebuild
deleted file mode 100644
index ae7b805d59f6..000000000000
--- a/dev-ruby/time/time-0.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="time.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Extends the Time class with methods for parsing and conversion"
-HOMEPAGE="https://github.com/ruby/time"
-SRC_URI="https://github.com/ruby/time/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -e 's/__dir__/"."/' \
-		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/time/time-0.2.2.ebuild b/dev-ruby/time/time-0.2.2.ebuild
new file mode 100644
index 000000000000..d49a30a10564
--- /dev/null
+++ b/dev-ruby/time/time-0.2.2.ebuild
@@ -0,0 +1,33 @@
+# 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_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="time.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Extends the Time class with methods for parsing and conversion"
+HOMEPAGE="https://github.com/ruby/time"
+SRC_URI="https://github.com/ruby/time/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/date"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/time/time-0.3.0.ebuild b/dev-ruby/time/time-0.3.0.ebuild
new file mode 100644
index 000000000000..b548f3127fb9
--- /dev/null
+++ b/dev-ruby/time/time-0.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="time.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Extends the Time class with methods for parsing and conversion"
+HOMEPAGE="https://github.com/ruby/time"
+SRC_URI="https://github.com/ruby/time/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/date"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/timecop/Manifest b/dev-ruby/timecop/Manifest
index 49bccbb22204..349e6553d843 100644
--- a/dev-ruby/timecop/Manifest
+++ b/dev-ruby/timecop/Manifest
@@ -1,2 +1,3 @@
-DIST timecop-0.9.4.gem 16896 BLAKE2B a8280726c8c46573eb0bc72af7b8c6f64ba4a3898a8089eb44c09bc4f53c2c6c51364784aa332c55a45d9c8f93ab9fd3b7691020f8a58f48056cf3673429abf7 SHA512 3d5f611d9a4ba9bc21f01c8096c97892cb05d6effb26f03703a0db842fe18f9614fca3cc836a1583dd5ebbd0d50d4115acf348b7b8b78d93010aaa48b168b9cf
-DIST timecop-0.9.5.gem 17408 BLAKE2B e6234759af1b3bcdf8fa5403594498507a7ddb8f652e8698ab7ce0e4879fc99828953120ccb80c3cfd555b63bbb957b0fd2f25758c4add1803d288b1807360be SHA512 4b3aa4d2fe5b95b51119be61faf0c85539d56e1ad2b507a1df182f5d7882390b37bc8b9984ef54e1b0b42bfb0d205ff4f863d016e423d4499cf3b21f2eaed7ff
+DIST timecop-0.9.6.gem 17408 BLAKE2B 53afa8313be94fb8774812b014f11d9a134b51b7dafcc0fd8d91d10756e042bfd6d56b10f8072c1d606519e532beb2e02032bd4e3f6d45b4cf41dd968ba86224 SHA512 a5cbdf38caa5bccb9887a6abb5d99bdd1470c9ff8d52d19f0c46f116dc73b62512f76021adc1ec98ca4abe85ca61a4ab1e821d80980fa7ab3c821abd13b9695a
+DIST timecop-0.9.7.tar.gz 17818 BLAKE2B c978a3765864963b4dbbb8a9cf2172208fa7b66afd68417a057bba44b6d35141bab5182bef3404d6233f394e9d874026886dc85b2e400908bdbf2f3af273b6bf SHA512 4db43b655225b8017769497b5ffc88d7b6d728677439ade09d8e0b8e8ef01c0307e49575ed9e1d2ac379cd222a5a0d34feae018d15ee34b70934e93a019a76e6
+DIST timecop-0.9.8.tar.gz 17936 BLAKE2B bb66dac74df498b6a5c284805c2c8a486523d43c2923c2e11f65d24bc2e9ad59c3bdd356bf3e93946859ed9e95ac9924e48747afb17ec81a5378e0370d7dff20 SHA512 cbf74e8d4e459f17cb841fee14353feccfa26e401d999521abb5653639a3d6b8e0dbd73d4317cb18b185d33d23e20e7603992cd6e2752ac74cbf0c0c927263b3
diff --git a/dev-ruby/timecop/metadata.xml b/dev-ruby/timecop/metadata.xml
index 4ea1d61a18ff..5aac3be6af1a 100644
--- a/dev-ruby/timecop/metadata.xml
+++ b/dev-ruby/timecop/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">jtrupiano/timecop</remote-id>
+    <remote-id type="github">travisjeffery/timecop</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/timecop/timecop-0.9.4.ebuild b/dev-ruby/timecop/timecop-0.9.4.ebuild
deleted file mode 100644
index 47d2f9d9ab2f..000000000000
--- a/dev-ruby/timecop/timecop-0.9.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A gem providing 'time travel' and 'time freezing' capabilities"
-HOMEPAGE="https://github.com/travisjeffery/timecop"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE=""
-
-# Missing testdep activesupport
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' -e '/History.rdoc/d' Rakefile test/test_helper.rb || die
-	sed -i -e '/rubygems/ a\gem "test-unit"' \
-		-e '/minitest\/rg/ s:^:#:' -e '/pry/ s:^:#:' test/test_helper.rb || die
-	# FIXME after activesupport gained ruby22 support
-	rm test/time_stack_item_test.rb || die
-}
-
-each_ruby_test() {
-	for f in test/*_test.rb ; do
-		${RUBY} -Ilib $f || die
-	done
-}
diff --git a/dev-ruby/timecop/timecop-0.9.5.ebuild b/dev-ruby/timecop/timecop-0.9.5.ebuild
deleted file mode 100644
index 3f4ec824c9f8..000000000000
--- a/dev-ruby/timecop/timecop-0.9.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A gem providing 'time travel' and 'time freezing' capabilities"
-HOMEPAGE="https://github.com/travisjeffery/timecop"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-# Missing testdep activesupport
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' -e '/History.rdoc/d' Rakefile test/test_helper.rb || die
-	sed -i -e '/rubygems/ a\gem "test-unit"' \
-		-e '/minitest\/rg/ s:^:#:' -e '/pry/ s:^:#:' test/test_helper.rb || die
-	# FIXME after activesupport gained ruby22 support
-	rm test/time_stack_item_test.rb || die
-}
-
-each_ruby_test() {
-	for f in test/*_test.rb ; do
-		${RUBY} -Ilib $f || die
-	done
-}
diff --git a/dev-ruby/timecop/timecop-0.9.6.ebuild b/dev-ruby/timecop/timecop-0.9.6.ebuild
new file mode 100644
index 000000000000..6dee71de2de0
--- /dev/null
+++ b/dev-ruby/timecop/timecop-0.9.6.ebuild
@@ -0,0 +1,39 @@
+# 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"
+
+RUBY_FAKEGEM_TASK_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A gem providing 'time travel' and 'time freezing' capabilities"
+HOMEPAGE="https://github.com/travisjeffery/timecop"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
+
+# Missing testdep activesupport
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' -e '/History.rdoc/d' Rakefile test/test_helper.rb || die
+	sed -i -e '/rubygems/ a\gem "test-unit"' \
+		-e '/minitest\/rg/ s:^:#:' -e '/pry/ s:^:#:' test/test_helper.rb || die
+	# FIXME after activesupport gained ruby22 support
+	rm test/time_stack_item_test.rb || die
+}
+
+each_ruby_test() {
+	for f in test/*_test.rb ; do
+		${RUBY} -Ilib $f || die
+	done
+}
diff --git a/dev-ruby/timecop/timecop-0.9.7.ebuild b/dev-ruby/timecop/timecop-0.9.7.ebuild
new file mode 100644
index 000000000000..5c78acdec7fd
--- /dev/null
+++ b/dev-ruby/timecop/timecop-0.9.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+RUBY_FAKEGEM_GEMSPEC="timecop.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A gem providing 'time travel' and 'time freezing' capabilities"
+HOMEPAGE="https://github.com/travisjeffery/timecop"
+SRC_URI="https://github.com/travisjeffery/timecop/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/activesupport dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -e '/bundler/ s:^:#:' -e '/History.rdoc/d' \
+		-i Rakefile test/test_helper.rb test/timecop_with_active_support_test.rb || die
+	sed -i -e '/rubygems/ a\gem "test-unit"' \
+		-e '/minitest\/rg/ s:^:#:' -e '/pry/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	for f in test/*_test.rb ; do
+		${RUBY} -Ilib $f || die
+	done
+}
diff --git a/dev-ruby/timecop/timecop-0.9.8.ebuild b/dev-ruby/timecop/timecop-0.9.8.ebuild
new file mode 100644
index 000000000000..c8a8081ee674
--- /dev/null
+++ b/dev-ruby/timecop/timecop-0.9.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+RUBY_FAKEGEM_GEMSPEC="timecop.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A gem providing 'time travel' and 'time freezing' capabilities"
+HOMEPAGE="https://github.com/travisjeffery/timecop"
+SRC_URI="https://github.com/travisjeffery/timecop/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/activesupport dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -e '/bundler/ s:^:#:' -e '/History.rdoc/d' \
+		-i Rakefile test/test_helper.rb test/timecop_with_active_support_test.rb || die
+	sed -i -e '/rubygems/ a\gem "test-unit"' \
+		-e '/minitest\/rg/ s:^:#:' -e '/pry/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	for f in test/*_test.rb ; do
+		${RUBY} -Ilib $f || die
+	done
+}
diff --git a/dev-ruby/timeout/Manifest b/dev-ruby/timeout/Manifest
index 88de8a9535b5..776b186a628d 100644
--- a/dev-ruby/timeout/Manifest
+++ b/dev-ruby/timeout/Manifest
@@ -1 +1,3 @@
-DIST timeout-0.2.0.tar.gz 15672 BLAKE2B 2a42efb4475047c947ec1a30637e4ddb8d745651d9d277af9149f952ee88cda335818156d777db283660ac16f338ac53776f6267f040b115078fed9572b4ddc7 SHA512 fe665127e90782602dc4e0f61b8ea39b3c2092a50a0d5f708fcb14bec08443868dd8539417c29166dd925389ef2beed49a67f16bb195cf998104b7121f4c1c4d
+DIST timeout-0.3.2.tar.gz 16920 BLAKE2B ec3bb38a8c60b9156a8fb8b5bb99b74a606ee8d18aa81b4b5ed5067c38cea1856ccfc00a841cc58c33cf5159fc1065f68728c48acec6df2eed28f364a36fc7a5 SHA512 70220781ecaec61a4243dfd95c6be13050513e78dd3239b58b0c8f6904b29c2bfbf895f769a1e122a30fbdad761577c2ddae94b328c4ee390867d1ab6391b8ec
+DIST timeout-0.4.0.tar.gz 6897 BLAKE2B 1fa606e15001ba929d7a1e6e254c97f7948de9042c90174263a2d3fc671b26c22197f9c1376c2cec60d8fe64361a63f29cdc02cf4e9bd0b912754bc65f594c0e SHA512 9337cac1f2ba76efb769c6602ae60fa1f3be4a6fc04ebd845c32332d1a25e0c669485f0f64611e09e1648908abe768aa78779c6568345a9729502efefa753485
+DIST timeout-0.4.1.tar.gz 7197 BLAKE2B 182b8904345228f90406b2b567a9342b0724ad0abb103392ec2682c8040168e1bb98c90256d3715d5938f09bf92e9650fc3423903dacd620b753d5119f143910 SHA512 1ca23bfcaf2c67a59805f814b20a9fe6e492b8f68e492c86290d6c638b07ea9b6f14c4cc84c14b891b5aaf611f46968af8947565ea83d783c90144df4e3e612f
diff --git a/dev-ruby/timeout/timeout-0.2.0.ebuild b/dev-ruby/timeout/timeout-0.2.0.ebuild
deleted file mode 100644
index faf7de2b8aca..000000000000
--- a/dev-ruby/timeout/timeout-0.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="timeout.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a framework for message digest libraries"
-HOMEPAGE="https://github.com/ruby/timeout"
-SRC_URI="https://github.com/ruby/timeout/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -e 's/__dir__/"."/' \
-		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/timeout/timeout-0.3.2.ebuild b/dev-ruby/timeout/timeout-0.3.2.ebuild
new file mode 100644
index 000000000000..c0e0f4c220b7
--- /dev/null
+++ b/dev-ruby/timeout/timeout-0.3.2.ebuild
@@ -0,0 +1,27 @@
+# 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_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="timeout.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a framework for message digest libraries"
+HOMEPAGE="https://github.com/ruby/timeout"
+SRC_URI="https://github.com/ruby/timeout/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/timeout/timeout-0.4.0.ebuild b/dev-ruby/timeout/timeout-0.4.0.ebuild
new file mode 100644
index 000000000000..e58a7ade545e
--- /dev/null
+++ b/dev-ruby/timeout/timeout-0.4.0.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="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="timeout.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a framework for message digest libraries"
+HOMEPAGE="https://github.com/ruby/timeout"
+SRC_URI="https://github.com/ruby/timeout/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/timeout/timeout-0.4.1.ebuild b/dev-ruby/timeout/timeout-0.4.1.ebuild
new file mode 100644
index 000000000000..4a6f8a776f71
--- /dev/null
+++ b/dev-ruby/timeout/timeout-0.4.1.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="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="timeout.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a framework for message digest libraries"
+HOMEPAGE="https://github.com/ruby/timeout"
+SRC_URI="https://github.com/ruby/timeout/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/timers/Manifest b/dev-ruby/timers/Manifest
index 758f93e50a2c..3b92b548bcbd 100644
--- a/dev-ruby/timers/Manifest
+++ b/dev-ruby/timers/Manifest
@@ -1 +1 @@
-DIST timers-4.3.3.tar.gz 12928 BLAKE2B af64b44116565a8cb6b68349de6a46e8b67d22508e16e204af104ed7a59cc1db1dae0c36917ccde1932c33e53d9d71fc57cb317570cc24aaee82531ce178f37c SHA512 4a715e4a786f98ec429a250de53cfa67bed6b5a99b6298c21251e6dcf1315f1185d8c45bea01025832046381ebac462cd35415f7573d58c55c30b47c2567d4bf
+DIST timers-4.3.5.tar.gz 15651 BLAKE2B 2dc34bb23a4971c673aff5120502714035fe31aed34854b5f7beb744ca46ad704b88d1403ad594ea49f71bb709db7942ed521d237e2477fe2e9d41cc3cd2b538 SHA512 fa5a25eda15628f5a17cd2e7acc4eb2819a766de7ffdba03d425a93cb3229f0f7b8083e9990b5308e65c2d8aab396e33dd4d152252888eff1cc0039cac6a5e46
diff --git a/dev-ruby/timers/files/timers-4.3.5-timers-slow.patch b/dev-ruby/timers/files/timers-4.3.5-timers-slow.patch
new file mode 100644
index 000000000000..da786b724a6d
--- /dev/null
+++ b/dev-ruby/timers/files/timers-4.3.5-timers-slow.patch
@@ -0,0 +1,259 @@
+https://github.com/socketry/timers/issues/82
+https://github.com/socketry/timers/commit/039bbd2750d5e50721789ef5d3404b18c36517bc
+
+From 039bbd2750d5e50721789ef5d3404b18c36517bc Mon Sep 17 00:00:00 2001
+From: Samuel Williams <samuel.williams@oriontransfer.co.nz>
+Date: Wed, 12 Apr 2023 17:25:59 +1200
+Subject: [PATCH] Modernize gem (#83)
+
+* Improve robustness of `Timer#inspect`.
+
+* 100% test coverage.
+--- a/fixtures/timer_quantum.rb
++++ b/fixtures/timer_quantum.rb
+@@ -1,3 +1,5 @@
++# frozen_string_literal: true
++
+ # Released under the MIT License.
+ # Copyright, 2022, by Samuel Williams.
+ 
+--- a/lib/timers/group.rb
++++ b/lib/timers/group.rb
+@@ -92,8 +92,9 @@ def wait
+ 		# -   0: timers ready to fire
+ 		# - +ve: timers waiting to fire
+ 		def wait_interval(offset = current_offset)
+-			handle = @events.first
+-			handle.time - Float(offset) if handle
++			if handle = @events.first
++				handle.time - Float(offset)
++			end
+ 		end
+ 		
+ 		# Fire all timers that are ready.
+--- a/lib/timers/priority_heap.rb
++++ b/lib/timers/priority_heap.rb
+@@ -84,9 +84,10 @@ def valid?
+ 
+ 		private
+ 		
+-		def swap(i, j)
+-			@contents[i], @contents[j] = @contents[j], @contents[i]
+-		end
++		# Left here for reference, but unused.
++		# def swap(i, j)
++		# 	@contents[i], @contents[j] = @contents[j], @contents[i]
++		# end
+ 		
+ 		def bubble_up(index)
+ 			parent_index = (index - 1) / 2 # watch out, integer division!
+--- a/lib/timers/timer.rb
++++ b/lib/timers/timer.rb
+@@ -23,12 +23,11 @@ def initialize(group, interval, recurring = false, offset = nil, &block)
+ 			@interval = interval
+ 			@recurring = recurring
+ 			@block = block
+-			@offset = offset
+-			
++			@offset = nil
+ 			@handle = nil
+ 			
+ 			# If a start offset was supplied, use that, otherwise use the current timers offset.
+-			reset(@offset || @group.current_offset)
++			reset(offset || @group.current_offset)
+ 		end
+ 		
+ 		def paused?
+@@ -73,7 +72,7 @@ def cancel
+ 			@handle = nil
+ 			
+ 			# This timer is no longer valid:
+-			@group.timers.delete self if @group
++			@group.timers.delete(self) if @group
+ 		end
+ 		
+ 		# Reset this timer. Do not call while paused.
+@@ -117,18 +116,18 @@ def fires_in
+ 		
+ 		# Inspect a timer
+ 		def inspect
+-			buffer = "#{to_s[0..-2]} ".dup
++			buffer = to_s[0..-2]
+ 			
+ 			if @offset
+-				if fires_in >= 0
+-					buffer << "fires in #{fires_in} seconds"
++				delta_offset = @offset - @group.current_offset
++				
++				if delta_offset > 0
++					buffer << " fires in #{delta_offset} seconds"
+ 				else
+-					buffer << "fired #{fires_in.abs} seconds ago"
++					buffer << " fired #{delta_offset.abs} seconds ago"
+ 				end
+ 				
+ 				buffer << ", recurs every #{interval}" if recurring
+-			else
+-				buffer << "dead"
+ 			end
+ 			
+ 			buffer << ">"
+--- a/lib/timers/wait.rb
++++ b/lib/timers/wait.rb
+@@ -17,6 +17,7 @@ def self.for(duration, &block)
+ 				
+ 				timeout.while_time_remaining(&block)
+ 			else
++				# If there is no "duration" to wait for, we wait forever.
+ 				loop do
+ 					yield(nil)
+ 				end
+--- a/license.md
++++ b/license.md
+@@ -28,6 +28,7 @@ Copyright, 2017-2020, by Olle Jonsson.
+ Copyright, 2020, by Tim Smith.  
+ Copyright, 2021, by Wander Hillen.  
+ Copyright, 2022, by Yoshiki Takagi.  
++Copyright, 2023, by Peter Goldstein.  
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+--- a/test/timers/group.rb
++++ b/test/timers/group.rb
+@@ -36,18 +36,31 @@
+ 			expect(called).to be == true
+ 			expect(fired).to be == true
+ 		end
++		
++		it "repeatedly calls the wait block if it sleeps less than the interval" do
++			called = 0
++			fired = false
++			
++			group.after(0.1) { fired = true }
++			
++			group.wait do |interval|
++				called += 1
++				sleep(0.01)
++			end
++			
++			expect(called).to be > 1
++			expect(fired).to be == true
++		end
+ 	end
+ 	
+ 	it "sleeps until the next timer" do
+ 		interval = 0.1
+-		started_at = Time.now
+ 		
+ 		fired = false
+ 		group.after(interval) {fired = true}
+ 		group.wait
+ 		
+ 		expect(fired).to be == true
+-		expect(Time.now - started_at).to be_within(TIMER_QUANTUM).of(interval)
+ 	end
+ 	
+ 	it "fires instantly when next timer is in the past" do
+@@ -88,6 +101,26 @@
+ 		end.to raise_exception(TypeError)
+ 	end
+ 	
++	with "#now_and_after" do
++		it "fires the timer immediately" do
++			result = []
++			
++			group.now_and_after(TIMER_QUANTUM * 2) { result << :foo }
++			
++			expect(result).to be == [:foo]
++		end
++		
++		it "fires the timer at the correct time" do
++			result = []
++			
++			group.now_and_after(TIMER_QUANTUM * 2) { result << :foo }
++			
++			group.wait
++			
++			expect(result).to be == [:foo, :foo]
++		end
++	end
++	
+ 	with "recurring timers" do
+ 		it "continues to fire the timers at each interval" do
+ 			result = []
+--- a/test/timers/group/cancel.rb
++++ b/test/timers/group/cancel.rb
+@@ -10,6 +10,17 @@
+ describe Timers::Group do
+ 	let(:group) {subject.new}
+ 	
++	it "can cancel a timer" do
++		fired = false
++		
++		timer = group.after(0.1) { fired = true }
++		timer.cancel
++		
++		group.wait
++		
++		expect(fired).to be == false
++	end
++	
+ 	it "should be able to cancel twice" do
+ 		fired = false
+ 		
+@@ -51,4 +62,18 @@
+ 		expect(group.timers).to be(:empty?)
+ 		expect(x).to be == 0
+ 	end
++	
++	with "#cancel" do
++		it "should cancel all timers" do
++			timers = 3.times.map do
++				group.every(0.1) {}
++			end
++			
++			expect(group.timers).not.to be(:empty?)
++			
++			group.cancel
++			
++			expect(group.timers).to be(:empty?)
++		end
++	end
+ end
+--- a/test/timers/wait.rb
++++ b/test/timers/wait.rb
+@@ -14,9 +14,14 @@
+ 	it "repeats until timeout expired" do
+ 		timeout = Timers::Wait.new(interval*repeats)
+ 		count = 0
++		previous_remaining = nil
+ 		
+ 		timeout.while_time_remaining do |remaining|
+-			expect(remaining).to be_within(TIMER_QUANTUM).of(timeout.duration - (count * interval))
++			if previous_remaining
++				expect(remaining).to be_within(TIMER_QUANTUM).of(previous_remaining - interval)
++			end
++			
++			previous_remaining = remaining
+ 			
+ 			count += 1
+ 			sleep(interval)
+@@ -34,4 +39,18 @@
+ 		
+ 		expect(result).to be == :done
+ 	end
++	
++	with "#for" do
++		with "no duration" do
++			it "waits forever" do
++				count = 0
++				Timers::Wait.for(nil) do
++					count += 1
++					break if count > 10
++				end
++				
++				expect(count).to be > 10
++			end
++		end
++	end
+ end
diff --git a/dev-ruby/timers/metadata.xml b/dev-ruby/timers/metadata.xml
index e299236a3f68..b93a94607cde 100644
--- a/dev-ruby/timers/metadata.xml
+++ b/dev-ruby/timers/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">tarcieri/timers</remote-id>
+    <remote-id type="github">socketry/timers</remote-id>
+    <remote-id type="rubygems">timers</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/timers/timers-4.3.3.ebuild b/dev-ruby/timers/timers-4.3.3.ebuild
deleted file mode 100644
index 3f05605b7f20..000000000000
--- a/dev-ruby/timers/timers-4.3.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="timers.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure Ruby one-shot and periodic timers"
-HOMEPAGE="https://github.com/tarcieri/timers"
-SRC_URI="https://github.com/tarcieri/timers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/bundler/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid performance specs to avoid ruby-prof dependency and
-	# because we cannot provide a good environment for performance testing.
-	rm -f spec/timers/performance_spec.rb || die
-}
diff --git a/dev-ruby/timers/timers-4.3.5-r1.ebuild b/dev-ruby/timers/timers-4.3.5-r1.ebuild
new file mode 100644
index 000000000000..ebfb920e9b77
--- /dev/null
+++ b/dev-ruby/timers/timers-4.3.5-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+
+RUBY_FAKEGEM_GEMSPEC="timers.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pure Ruby one-shot and periodic timers"
+HOMEPAGE="https://github.com/socketry/timers"
+SRC_URI="https://github.com/socketry/timers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
+
+PATCHES=(
+	# https://github.com/socketry/timers/issues/82
+	"${FILESDIR}"/${P}-timers-slow.patch
+)
+
+all_ruby_prepare() {
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid performance-based tests since we cannot guarantee specific performance levels.
+	rm -f test/timers/performance.rb || die
+}
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index d2babf75b5c2..ef60b155e9a2 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -1,3 +1,2 @@
-DIST tins-1.29.1.gem 307200 BLAKE2B b7e95094662df021d81ea7b580cee5c4ce8f9fa6a09ecf63afa2c84f42ffab62f96f37ae734392021506da373ccabbf68c2dbf55f5ff09224168e24031b1fa99 SHA512 043a49d0755bb158cfd60554b530cd315cfe869520ab02ee819addc0fea39f441960a6c416753c0e69dc0dbf122523842f940ff89dcb43e64f5825a2c0c5a53e
-DIST tins-1.31.0.gem 307712 BLAKE2B 2f4808bada4ddad9de6b6ba93c9a123d79cdd6d038bbca64712afaa46c8b031407989e522f359bbbeaa37685c65407781f34a639501b68507b9af927bc06868a SHA512 390ef8366304582e635e702f1175e8f3c59aa1051765b6a971469b4057e9d4025848c13a21961ac960c12297783e9c1f1485e13310dc117e4a04bde5c18018ed
-DIST tins-1.31.1.gem 307200 BLAKE2B 19741baa0d341a70ffde8caa1e36577c634e427f55f9d87267b1b3e6a1bc55f9cb3d452923febe624002f537c92a08d4cffe102db8a8b8a21eb2e57a1117af4b SHA512 6b3c7f7629fb2b896c7bdc0eee5bd637447d024e33bfd94c2312fb4b0de9405228b002a5e8e1addbd77202117fd7b33c335515aa6613fe0a9367d830efdf4265
+DIST tins-1.32.1.gem 307712 BLAKE2B 5e48a9895aaaf52010de4c1759a0cedcfe2133d9f2e2a44eea8041cd425804f092f47dbb2fec4c84ccaf1975e35a082988fd56056cf0e175dc08691f38799c3f SHA512 d80fcf92af1178149a2b579f12963a092d5ef8017ba710a20642ab83b7312179b4cefe31cc99f8fbc1bbd93d5c7427be4f4128cefcb2ec58807fa5cd3a96ed02
+DIST tins-1.33.0.gem 307712 BLAKE2B 73f2211e73a99b06f1ad9ff7c770b5e7a9a478eb8d596bd2b1225f072d8be031a361ebfbdf5f1fdd402844d591640523640fa362dcf21fa24da86887fe383f46 SHA512 3a287ca5e8420c3e2582f8996b5a52c5337c82e1abc8f4311751196f94c75518515d534a7fb020886cf41118b9fcc9142299ca06a809255003029a2512e5b32e
diff --git a/dev-ruby/tins/tins-1.29.1.ebuild b/dev-ruby/tins/tins-1.29.1.ebuild
deleted file mode 100644
index eca4cc63d908..000000000000
--- a/dev-ruby/tins/tins-1.29.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="All the stuff that isn't good enough for a real library"
-HOMEPAGE="https://github.com/flori/tins"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
-IUSE=""
-
-# Earlier versions of ruby bundled this dependency
-USE_RUBY="ruby26 ruby27 ruby30" ruby_add_rdepend "dev-ruby/sync"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby25)
-			sed -i -e '/sync/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-			;;
-	esac
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib tests/*_test.rb
-}
diff --git a/dev-ruby/tins/tins-1.31.0.ebuild b/dev-ruby/tins/tins-1.31.0.ebuild
deleted file mode 100644
index 5a51e33da9dc..000000000000
--- a/dev-ruby/tins/tins-1.31.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="All the stuff that isn't good enough for a real library"
-HOMEPAGE="https://github.com/flori/tins"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/sync"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby25)
-			sed -i -e '/sync/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-			;;
-	esac
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib tests/*_test.rb
-}
diff --git a/dev-ruby/tins/tins-1.31.1.ebuild b/dev-ruby/tins/tins-1.31.1.ebuild
deleted file mode 100644
index 2d7cf0aa0a2c..000000000000
--- a/dev-ruby/tins/tins-1.31.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="All the stuff that isn't good enough for a real library"
-HOMEPAGE="https://github.com/flori/tins"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/sync"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib tests/*_test.rb
-}
diff --git a/dev-ruby/tins/tins-1.32.1.ebuild b/dev-ruby/tins/tins-1.32.1.ebuild
new file mode 100644
index 000000000000..3acb801f587a
--- /dev/null
+++ b/dev-ruby/tins/tins-1.32.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="https://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/sync"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-ruby/tins/tins-1.33.0.ebuild b/dev-ruby/tins/tins-1.33.0.ebuild
new file mode 100644
index 000000000000..49ef1e3e0fb7
--- /dev/null
+++ b/dev-ruby/tins/tins-1.33.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="https://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/bigdecimal dev-ruby/sync"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-ruby/tokyocabinet/tokyocabinet-1.32.0-r1.ebuild b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0-r1.ebuild
index 85f8cb39d346..a70a1392dc75 100644
--- a/dev-ruby/tokyocabinet/tokyocabinet-1.32.0-r1.ebuild
+++ b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/tomlrb/Manifest b/dev-ruby/tomlrb/Manifest
index 7bc869c55ff5..bf4260c8cbec 100644
--- a/dev-ruby/tomlrb/Manifest
+++ b/dev-ruby/tomlrb/Manifest
@@ -1,2 +1 @@
-DIST tomlrb-1.2.8.tar.gz 15897 BLAKE2B 536eaf3a2cb2b7e54e91aac28032b95900f53c0c9b10fb48129bd963e0efab1711848cefeb20c5df3bb5ea367dc375188db57b79990daf3e62f8b781477ea30e SHA512 a6f8a7ae5db02a8efca8ae75fc1a680d26016d221ec238e4f5ecd59bead4efff7cfe14f541a0be17ea6790699aeb7621d9a4d1b7e38a40828f8f66424fc9fb94
-DIST tomlrb-2.0.1.tar.gz 21386 BLAKE2B a9f50d800f7e55c6e6e69fe0a68d1ac843d4aa3b1b68e50c86eb03209c2dd9239f2780fb03152a8638198bf8474593f815025106935a4d81befb5e342f9451f9 SHA512 9690b5689d37cc4634e65a906b1c0bb3692afa96fd92e2dd0d487f2f16dacc64e992e114822edcff270b3ddb8bacd2c6e20e2d12112cd8641c5190ea6ee4e4db
+DIST tomlrb-2.0.3.tar.gz 22929 BLAKE2B e67dd81f2d8a49e6c2d296d030d80809d10e780d1fb65e29744ba37ba35a58b8b34fe6bfc4046754ed0f919db2649b68d4feda8b31c35dd09d3df9d607100f68 SHA512 43b02de19b8816fad4e94656ee9ec22e0401cb62b982baa0ac9f4a6af2072e4e8df54ec657016c4dc407e6d977a27eab5b954a7f4ec7bb70b26062022bda96ea
diff --git a/dev-ruby/tomlrb/tomlrb-1.2.8.ebuild b/dev-ruby/tomlrb/tomlrb-1.2.8.ebuild
deleted file mode 100644
index 674c48bcf01b..000000000000
--- a/dev-ruby/tomlrb/tomlrb-1.2.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A racc based toml parser"
-HOMEPAGE="https://github.com/fbernier/tomlrb/"
-SRC_URI="https://github.com/fbernier/tomlrb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/reporters/I s:^:#:' test/minitest_helper.rb || die
-}
diff --git a/dev-ruby/tomlrb/tomlrb-2.0.1.ebuild b/dev-ruby/tomlrb/tomlrb-2.0.1.ebuild
deleted file mode 100644
index 5521fd7d69ec..000000000000
--- a/dev-ruby/tomlrb/tomlrb-2.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="tomlrb.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A racc based toml parser"
-HOMEPAGE="https://github.com/fbernier/tomlrb/"
-SRC_URI="https://github.com/fbernier/tomlrb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/reporters/I s:^:#:' test/minitest_helper.rb || die
-}
diff --git a/dev-ruby/tomlrb/tomlrb-2.0.3.ebuild b/dev-ruby/tomlrb/tomlrb-2.0.3.ebuild
new file mode 100644
index 000000000000..38c4f7936dc9
--- /dev/null
+++ b/dev-ruby/tomlrb/tomlrb-2.0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="tomlrb.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A racc based toml parser"
+HOMEPAGE="https://github.com/fbernier/tomlrb/"
+SRC_URI="https://github.com/fbernier/tomlrb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "dev-ruby/racc test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/reporters/I s:^:#:' test/minitest_helper.rb || die
+}
diff --git a/dev-ruby/totoridipjp/Manifest b/dev-ruby/totoridipjp/Manifest
deleted file mode 100644
index f035d7270422..000000000000
--- a/dev-ruby/totoridipjp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST totoridipjp-0.1.0.gem 7168 BLAKE2B 9a78da0b8309c9886506a80b7206530f3398d1591eaa75a32a4085bbdc56492da7465e6183fe5979e5e3e9ff486a089d1495ae2105f694c407fce40c29809dfe SHA512 5298fe39b0705a0b913f7f6cad452be48480a6832e9451d86a7fe9a1248fe893a76af2f56c0bd6d3a65c756d4ed3fd29b4483ef82beeccfc78dcf9dbf43ed748
diff --git a/dev-ruby/totoridipjp/metadata.xml b/dev-ruby/totoridipjp/metadata.xml
deleted file mode 100644
index 95ac3bda21f1..000000000000
--- a/dev-ruby/totoridipjp/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>naota@gentoo.org</email>
-		<name>Naohiro Aota</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="rubygems">totoridipjp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/totoridipjp/totoridipjp-0.1.0-r1.ebuild b/dev-ruby/totoridipjp/totoridipjp-0.1.0-r1.ebuild
deleted file mode 100644
index 577dfab5818a..000000000000
--- a/dev-ruby/totoridipjp/totoridipjp-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby binding to use totori.dip.jp Web API"
-HOMEPAGE="https://rubygems.org/gems/totoridipjp"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-ruby/transaction-simple/metadata.xml b/dev-ruby/transaction-simple/metadata.xml
index 64b35af0e729..b7ddee8e72fb 100644
--- a/dev-ruby/transaction-simple/metadata.xml
+++ b/dev-ruby/transaction-simple/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">halostatue/transaction-simple</remote-id>
+    <remote-id type="github">halostatue-archive/transaction-simple</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r3.ebuild b/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r3.ebuild
index 62b86fcffde6..a9c41d24844b 100644
--- a/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r3.ebuild
+++ b/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r3.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
 inherit ruby-fakegem
 
 DESCRIPTION="Provides transaction support at the object level"
-HOMEPAGE="https://github.com/halostatue/transaction-simple"
+HOMEPAGE="https://github.com/halostatue-archive/transaction-simple"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-ruby/travis/Manifest b/dev-ruby/travis/Manifest
deleted file mode 100644
index 212a737ee37f..000000000000
--- a/dev-ruby/travis/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST travis-1.10.0.gem 197632 BLAKE2B 0639f797789d1676f71b6354ed77e3e403865cca37e5e04c62e4cfd40d44e26e8e93ea0dbf39843811cccb7960e43b186d61d64f681d2eafe95de890d9fd66a7 SHA512 025e8cdf48100ff20d85925a6285993bda0d1651e145d554c2ec987c4557e2d3bc49da6529af4c577fcd9b88600549b3c12cff49b824d7fcb93a96a0c572603c
-DIST travis-1.11.0.gem 196096 BLAKE2B 2ea09d88fd45d6fd304746a96cc063c0525c8af8df6be2a0ba5c7ad06909055af23ea506f89f246f657c5a8920c429dd3aebc639f78cd1d0acb5bb03e4894434 SHA512 b6db17b149a54f7ab3c5b79439b1385386bbfe0350816d303e7c74c0494be08451fdb14550cba7fb54df3a643a530f1434bb1ee0c3e28c492ac6e8f3baf3d558
diff --git a/dev-ruby/travis/metadata.xml b/dev-ruby/travis/metadata.xml
deleted file mode 100644
index e5d01def68eb..000000000000
--- a/dev-ruby/travis/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">travis-ci/travis.rb</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-ruby/travis/travis-1.10.0-r1.ebuild b/dev-ruby/travis/travis-1.10.0-r1.ebuild
deleted file mode 100644
index 4d0f2532bcc7..000000000000
--- a/dev-ruby/travis/travis-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets"
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Travis CI Client (CLI and Ruby library)"
-HOMEPAGE="https://github.com/travis-ci/travis.rb"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-#RESTRICT="test"
-
-DEPEND+="test? ( dev-vcs/git )"
-RDEPEND+="dev-vcs/git"
-
-ruby_add_bdepend "
-	test? ( >dev-ruby/rack-test-0.6 dev-ruby/rspec-its )
-	>dev-ruby/sinatra-1.3
-"
-
-ruby_add_rdepend "
-	dev-ruby/faraday:1
-	dev-ruby/faraday_middleware:1
-	>=dev-ruby/gh-0.17
-	dev-ruby/highline:2
-	>=dev-ruby/json-2.3:2
-	>=dev-ruby/launchy-2.1
-	>dev-ruby/pusher-client-0.4
-"
-
-all_ruby_prepare() {
-	if use test ; then
-		git init --quiet . || die
-		git remote add origin "${HOMEPAGE}" || die
-		touch .travis.yml || die
-	fi
-
-	# Remove failing spec where cause is not fully clear.
-	# May be related to highline compatibility issues.
-	rm spec/cli/login_spec.rb || die
-
-	# Remove failing specs where $params keys are reset somewhere.
-	rm -f spec/cli/{cancel,restart}_spec.rb || die
-
-	sed -i -e 's/json_pure/json/' ../metadata || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbashcomp "assets/travis.sh" "travis"
-}
diff --git a/dev-ruby/travis/travis-1.11.0.ebuild b/dev-ruby/travis/travis-1.11.0.ebuild
deleted file mode 100644
index 11c5fa18fe0b..000000000000
--- a/dev-ruby/travis/travis-1.11.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets"
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Travis CI Client (CLI and Ruby library)"
-HOMEPAGE="https://github.com/travis-ci/travis.rb"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-#RESTRICT="test"
-
-DEPEND+="test? ( dev-vcs/git )"
-RDEPEND+="dev-vcs/git"
-
-ruby_add_bdepend "
-	test? ( >dev-ruby/rack-test-0.6 dev-ruby/rspec-its )
-	>dev-ruby/sinatra-1.3
-"
-
-ruby_add_rdepend "
-	dev-ruby/faraday:1
-	dev-ruby/faraday_middleware:1
-	>=dev-ruby/gh-0.17
-	dev-ruby/highline:2
-	>=dev-ruby/json-2.3:2
-	>=dev-ruby/launchy-2.1
-	>dev-ruby/pusher-client-0.4
-"
-
-all_ruby_prepare() {
-	if use test ; then
-		git init --quiet . || die
-		git remote add origin "${HOMEPAGE}" || die
-		touch .travis.yml || die
-	fi
-
-	# Remove failing specs where $params keys are reset somewhere.
-	rm -f spec/cli/{cancel,restart}_spec.rb || die
-
-	sed -i -e 's/json_pure/json/' ../metadata || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbashcomp "assets/travis.sh" "travis"
-}
diff --git a/dev-ruby/treetop/Manifest b/dev-ruby/treetop/Manifest
index cd0355a226ac..1ea51b14530c 100644
--- a/dev-ruby/treetop/Manifest
+++ b/dev-ruby/treetop/Manifest
@@ -1 +1 @@
-DIST treetop-1.6.11.tar.gz 103827 BLAKE2B ccc73373f2e44a95b872ae9f2f32f090363b218eb139d65a4e72c5595d99d5cc3ea7071527f0954aa6b63bc8d5562b0e932ecadec3de962269b3031d1f449b6c SHA512 649310b5c69bb963fc04a597d7aad6bb45deec34c3a46a193ee16203a07aff1d221732b6c7343d68fc772be44522db5f445a45e64bee5ac385ac2eb70abde14a
+DIST treetop-1.6.12.tar.gz 104225 BLAKE2B c0748409d20231d075f7461ecc7b96922a100922a4db75265fd7f687d2212c020d24fbd3011459b48b8f786bff2c025579d5f0cacbc9c7d3694a5bf717cd9d35 SHA512 210a2225a83f10ce6d79f2eb4d5937e7fa805384767f4e2d1ca91fe8408436560ad062b8d6c69209651fdf304e6a850e14b9d0a509dc25fe13ab9225d2ca7bdc
diff --git a/dev-ruby/treetop/treetop-1.6.11-r1.ebuild b/dev-ruby/treetop/treetop-1.6.11-r1.ebuild
deleted file mode 100644
index 4eb6fb5a2f01..000000000000
--- a/dev-ruby/treetop/treetop-1.6.11-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="treetop.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Treetop is a language for describing languages"
-HOMEPAGE="https://github.com/cjheath/treetop"
-SRC_URI="https://github.com/cjheath/treetop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-1.0 dev-ruby/activesupport )"
-ruby_add_rdepend ">=dev-ruby/polyglot-0.3.1:0"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r examples
-}
diff --git a/dev-ruby/treetop/treetop-1.6.12.ebuild b/dev-ruby/treetop/treetop-1.6.12.ebuild
new file mode 100644
index 000000000000..f255b7c9d3e4
--- /dev/null
+++ b/dev-ruby/treetop/treetop-1.6.12.ebuild
@@ -0,0 +1,37 @@
+# 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_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="treetop.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Treetop is a language for describing languages"
+HOMEPAGE="https://github.com/cjheath/treetop"
+SRC_URI="https://github.com/cjheath/treetop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/rr-1.0 dev-ruby/activesupport )"
+ruby_add_rdepend ">=dev-ruby/polyglot-0.3.1:0"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r examples
+}
diff --git a/dev-ruby/trollop/Manifest b/dev-ruby/trollop/Manifest
deleted file mode 100644
index 9c0ee7b42c6f..000000000000
--- a/dev-ruby/trollop/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST trollop-2.9.10.gem 29696 BLAKE2B f69b1ab8ce166f9fe6198e177266ee86e38f3bed4c3a55529705aedc4518cc04a48b9bee4463887fc4ac1cd04cad98d35c298265ad1433ced11e0ff5bc1f50ce SHA512 21a0db09d480353ff846a1311b118e0b0db4ca13a559dd1749c1478eff7080dd04e5308dbf1807215eadb68e276c991970b23357e9a3497acb9f705f7f77253c
diff --git a/dev-ruby/trollop/metadata.xml b/dev-ruby/trollop/metadata.xml
deleted file mode 100644
index daac6fdb7252..000000000000
--- a/dev-ruby/trollop/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/trollop/trollop-2.9.10.ebuild b/dev-ruby/trollop/trollop-2.9.10.ebuild
deleted file mode 100644
index 0c6f4b8930b2..000000000000
--- a/dev-ruby/trollop/trollop-2.9.10.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="FAQ.txt History.txt README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Trollop is a commandline option parser for Ruby"
-HOMEPAGE="https://manageiq.github.io/trollop/"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="2"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/chronic )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundle/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	MUTANT=true ${RUBY} -S rake test || die "Tests failed."
-}
diff --git a/dev-ruby/ttfunk/Manifest b/dev-ruby/ttfunk/Manifest
index 50acb2ac96d5..9f26518ede30 100644
--- a/dev-ruby/ttfunk/Manifest
+++ b/dev-ruby/ttfunk/Manifest
@@ -1,2 +1,2 @@
-DIST ttfunk-1.6.2.1.tar.gz 13625405 BLAKE2B c80fd7f534f7c22cce9ce3e87afe8b23870f46ac6a3a3dc860c07ef95e4e1a73998baa284797e704482fbc57ccd53997eb85f410244f4b4c548590643c62de49 SHA512 31dbcde0e7ca8325b7d88b1c5265ef054a04793b9da93e3c8973d0d84e6865bc93d8431247974ed372330a0a9b73df595ef4bea3736583cef2a23fcd4e1ecd29
 DIST ttfunk-1.7.0.tar.gz 13625349 BLAKE2B 1d401d181eb9cffea9bbb31b631b6a5d1a9c268af41baa1d976ab589111413ad02e3c32ca9c7a0493d9399dc169effa7a06e22bc9b2443afabb297cc7bb0ec03 SHA512 5b026feae0b2a32e141edc6bccd926292ddbff1569f1c11f075647e8a0e6c0fdd4d7e4ecca023bf71f08438a4782556c5f5106d067310937124ad154c7225d78
+DIST ttfunk-1.8.0.tar.gz 13640189 BLAKE2B 68e44c86aecef83dbb50f65296a9115fa870129806e59cf5a23dfd474819fba7da65637e54253522b572a19df3698250965dea5f6ac29b0ed717703fc4e2364f SHA512 af37f2ad4151bb74248156481813d700049ae68fed98aec0719636ae593e8dd3445ec2c7504072e68d07e5df340c50b29e6661a76af0fe1efbcb3469fff08777
diff --git a/dev-ruby/ttfunk/ttfunk-1.6.2.1.ebuild b/dev-ruby/ttfunk/ttfunk-1.6.2.1.ebuild
deleted file mode 100644
index ab4b156d4a23..000000000000
--- a/dev-ruby/ttfunk/ttfunk-1.6.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="ttfunk.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A TrueType font parser written in pure ruby"
-HOMEPAGE="https://github.com/prawnpdf/ttfunk/"
-SRC_URI="https://github.com/prawnpdf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 Ruby )"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/ttfunk/ttfunk-1.7.0-r1.ebuild b/dev-ruby/ttfunk/ttfunk-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..ee72ee670981
--- /dev/null
+++ b/dev-ruby/ttfunk/ttfunk-1.7.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ttfunk.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A TrueType font parser written in pure ruby"
+HOMEPAGE="https://github.com/prawnpdf/ttfunk/"
+SRC_URI="https://github.com/prawnpdf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 Ruby )"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/ttfunk/ttfunk-1.7.0.ebuild b/dev-ruby/ttfunk/ttfunk-1.7.0.ebuild
deleted file mode 100644
index cdd977a619a5..000000000000
--- a/dev-ruby/ttfunk/ttfunk-1.7.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="ttfunk.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A TrueType font parser written in pure ruby"
-HOMEPAGE="https://github.com/prawnpdf/ttfunk/"
-SRC_URI="https://github.com/prawnpdf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 Ruby )"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/ttfunk/ttfunk-1.8.0.ebuild b/dev-ruby/ttfunk/ttfunk-1.8.0.ebuild
new file mode 100644
index 000000000000..d00d42937e02
--- /dev/null
+++ b/dev-ruby/ttfunk/ttfunk-1.8.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ttfunk.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A TrueType font parser written in pure ruby"
+HOMEPAGE="https://github.com/prawnpdf/ttfunk/"
+SRC_URI="https://github.com/prawnpdf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 Ruby )"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+ruby_add_rdepend ">=dev-ruby/bigdecimal-3.1:0"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/tty-color/tty-color-0.6.0-r1.ebuild b/dev-ruby/tty-color/tty-color-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..02f13af63803
--- /dev/null
+++ b/dev-ruby/tty-color/tty-color-0.6.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="tty-color.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Terminal color capabilities detection"
+HOMEPAGE="https://github.com/piotrmurach/tty-color"
+SRC_URI="https://github.com/piotrmurach/tty-color/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+all_ruby_prepare() {
+	echo '-rspec_helper' > .rspec || die
+
+	sed -i -e 's:require_relative ":require "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/tty-color/tty-color-0.6.0.ebuild b/dev-ruby/tty-color/tty-color-0.6.0.ebuild
index 199213b20e6c..139c2d86ea3f 100644
--- a/dev-ruby/tty-color/tty-color-0.6.0.ebuild
+++ b/dev-ruby/tty-color/tty-color-0.6.0.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_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tty-command/tty-command-0.10.1-r1.ebuild b/dev-ruby/tty-command/tty-command-0.10.1-r1.ebuild
index af35c67359f5..070f71a6b410 100644
--- a/dev-ruby/tty-command/tty-command-0.10.1-r1.ebuild
+++ b/dev-ruby/tty-command/tty-command-0.10.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tty-cursor/tty-cursor-0.7.1-r1.ebuild b/dev-ruby/tty-cursor/tty-cursor-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..bf71d2b5e4ef
--- /dev/null
+++ b/dev-ruby/tty-cursor/tty-cursor-0.7.1-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="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="tty-cursor.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Move the terminal cursor around and manipulate text using intuitive method calls"
+HOMEPAGE="https://github.com/piotrmurach/tty-cursor"
+SRC_URI="https://github.com/piotrmurach/tty-cursor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+all_ruby_prepare() {
+	echo '-rspec_helper' > .rspec || die
+
+	sed -i -e 's:require_relative ":require "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/tty-cursor/tty-cursor-0.7.1.ebuild b/dev-ruby/tty-cursor/tty-cursor-0.7.1.ebuild
index 73023cfff948..bba595145135 100644
--- a/dev-ruby/tty-cursor/tty-cursor-0.7.1.ebuild
+++ b/dev-ruby/tty-cursor/tty-cursor-0.7.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=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tty-editor/tty-editor-0.7.0.ebuild b/dev-ruby/tty-editor/tty-editor-0.7.0.ebuild
index a27f02257554..3eb336c2de5b 100644
--- a/dev-ruby/tty-editor/tty-editor-0.7.0.ebuild
+++ b/dev-ruby/tty-editor/tty-editor-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby27 ruby30 ruby31 ruby32"
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
diff --git a/dev-ruby/tty-file/tty-file-0.10.0-r1.ebuild b/dev-ruby/tty-file/tty-file-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..49b275de0ec5
--- /dev/null
+++ b/dev-ruby/tty-file/tty-file-0.10.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="File manipulation utility methods"
+HOMEPAGE="https://github.com/piotrmurach/tty-file"
+SRC_URI="https://github.com/piotrmurach/tty-file/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/diff-lcs-1.3:0
+	>=dev-ruby/pastel-0.8:0
+	>=dev-ruby/tty-prompt-0.22:0
+"
+
+ruby_add_bdepend "test? ( dev-ruby/webmock )"
+
+all_ruby_prepare() {
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+	echo '-rspec_helper' > .rspec || die
+}
+
+each_ruby_prepare() {
+	mkdir tmp || die
+}
diff --git a/dev-ruby/tty-file/tty-file-0.10.0.ebuild b/dev-ruby/tty-file/tty-file-0.10.0.ebuild
deleted file mode 100644
index 4e38cd835b46..000000000000
--- a/dev-ruby/tty-file/tty-file-0.10.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="File manipulation utility methods"
-HOMEPAGE="https://github.com/piotrmurach/tty-file"
-SRC_URI="https://github.com/piotrmurach/tty-file/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/diff-lcs-1.3:0
-	>=dev-ruby/pastel-0.8:0
-	>=dev-ruby/tty-prompt-0.22:0
-"
-
-ruby_add_bdepend "test? ( dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-	echo '-rspec_helper' > .rspec || die
-}
-
-each_ruby_prepare() {
-	mkdir tmp || die
-}
diff --git a/dev-ruby/tty-platform/tty-platform-0.3.0-r1.ebuild b/dev-ruby/tty-platform/tty-platform-0.3.0-r1.ebuild
index 783e91a8a77b..54c973ca6d74 100644
--- a/dev-ruby/tty-platform/tty-platform-0.3.0-r1.ebuild
+++ b/dev-ruby/tty-platform/tty-platform-0.3.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="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tty-prompt/tty-prompt-0.23.1-r1.ebuild b/dev-ruby/tty-prompt/tty-prompt-0.23.1-r1.ebuild
new file mode 100644
index 000000000000..cdefde250a22
--- /dev/null
+++ b/dev-ruby/tty-prompt/tty-prompt-0.23.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="tty-prompt.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A beautiful and powerful interactive command line prompt"
+HOMEPAGE="https://github.com/piotrmurach/tty-prompt"
+SRC_URI="https://github.com/piotrmurach/tty-prompt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/pastel-0.8:0
+	>=dev-ruby/tty-reader-0.8:0
+"
+
+all_ruby_prepare() {
+	echo '-rspec_helper' > .rspec || die
+	sed -i -e 's:require_relative ":require "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/tty-prompt/tty-prompt-0.23.1.ebuild b/dev-ruby/tty-prompt/tty-prompt-0.23.1.ebuild
index 6128abe77738..83aeb404b223 100644
--- a/dev-ruby/tty-prompt/tty-prompt-0.23.1.ebuild
+++ b/dev-ruby/tty-prompt/tty-prompt-0.23.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=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tty-reader/tty-reader-0.9.0-r1.ebuild b/dev-ruby/tty-reader/tty-reader-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..e6a9b9c8278b
--- /dev/null
+++ b/dev-ruby/tty-reader/tty-reader-0.9.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="tty-reader.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Methods for processing keyboard input in character, line and multiline modes"
+HOMEPAGE="https://github.com/piotrmurach/tty-reader"
+SRC_URI="https://github.com/piotrmurach/tty-reader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/tty-cursor-0.7:0
+	>=dev-ruby/tty-screen-0.8:0
+	=dev-ruby/wisper-2*
+"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild b/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild
index 194a1b0880e2..093514201713 100644
--- a/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild
+++ b/dev-ruby/tty-reader/tty-reader-0.9.0.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_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tty-screen/Manifest b/dev-ruby/tty-screen/Manifest
index a7e9122631be..c31a55eed6e4 100644
--- a/dev-ruby/tty-screen/Manifest
+++ b/dev-ruby/tty-screen/Manifest
@@ -1 +1,2 @@
 DIST tty-screen-0.8.1.tar.gz 13019 BLAKE2B 9c9ccb49ae323ebc67c5bca918303586fb749813539aed32a892f3135aa392f6c77b078bab2c7bd116d9f152ee2745d72aae38a91cf4292d1f360085d88060ba SHA512 b0a01c49bb0c56f23c8b384a2d4f4b5c7168863a35c3ab7160d0f34c7d63a2b10b3b9f0f54c6d56e2424a8b16e6ba74268ac81af631976876fb37eb9c347c393
+DIST tty-screen-0.8.2.tar.gz 16861 BLAKE2B 47e1035ec9275a4034be09eab35e9bf63c2425a42fbc176cc20f314f9bfefb86e854d4ee1982ad0c90b7e47f4153f067e9b55da7e48f921b19fc36aad35f7257 SHA512 ab91cd41e888a3ec3a0029c62253bfe5fa708865ed946fe6859c2d64cc8dcfadece57ce6fa773ab924e78782b57b107e1614519088ab3197b0eaed3dd76e54b0
diff --git a/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild b/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild
index da2419fe8220..40667d07ea73 100644
--- a/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild
+++ b/dev-ruby/tty-screen/tty-screen-0.8.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=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tty-screen/tty-screen-0.8.2.ebuild b/dev-ruby/tty-screen/tty-screen-0.8.2.ebuild
new file mode 100644
index 000000000000..8e09d60f9ed2
--- /dev/null
+++ b/dev-ruby/tty-screen/tty-screen-0.8.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="tty-screen.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Terminal screen size detection which works on Linux, OS X and Windows/Cygwin"
+HOMEPAGE="https://github.com/piotrmurach/tty-screen"
+SRC_URI="https://github.com/piotrmurach/tty-screen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	echo '-rspec_helper' > .rspec || die
+	sed -i -e 's:require_relative ":require "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid performance specs. These depend on unpackaged
+	# rspec-benchmark and are likely to fail on at least some Gentoo
+	# systems.
+	rm -f spec/perf/{screen,size}_spec.rb || die
+}
diff --git a/dev-ruby/tty-which/tty-which-0.5.0.ebuild b/dev-ruby/tty-which/tty-which-0.5.0.ebuild
index b4021869b1a5..5e7be26bf8c5 100644
--- a/dev-ruby/tty-which/tty-which-0.5.0.ebuild
+++ b/dev-ruby/tty-which/tty-which-0.5.0.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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/turbolinks-source/Manifest b/dev-ruby/turbolinks-source/Manifest
deleted file mode 100644
index 3949c98031dd..000000000000
--- a/dev-ruby/turbolinks-source/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST turbolinks-source-5.2.0.gem 13824 BLAKE2B cdb7adb85e275d5e6edc4f0a03d75edac2f974ff0c1e2f7c003865edef018f0b0d24775d3db2cdabf1f7bf49869441d6af2362f236904fb9d6773b1a47173795 SHA512 19d1fc17f3af81bfc79a1e513aec88dfafa808a2f7954acb14f32909b308ce399f36bc18de313ea58812b13cdc9e65cbae5392cd4c88ea010f1efcef99356557
diff --git a/dev-ruby/turbolinks-source/metadata.xml b/dev-ruby/turbolinks-source/metadata.xml
deleted file mode 100644
index d2b2f59ce877..000000000000
--- a/dev-ruby/turbolinks-source/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rails/turbolinks-source-gem</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/turbolinks-source/turbolinks-source-5.2.0-r1.ebuild b/dev-ruby/turbolinks-source/turbolinks-source-5.2.0-r1.ebuild
deleted file mode 100644
index c0fcdd64a0db..000000000000
--- a/dev-ruby/turbolinks-source/turbolinks-source-5.2.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-# The gem does not contain runnable tests.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Turbolinks JavaScript assets"
-HOMEPAGE="https://github.com/rails/turbolinks-source-gem"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="test"
diff --git a/dev-ruby/turbolinks-source/turbolinks-source-5.2.0.ebuild b/dev-ruby/turbolinks-source/turbolinks-source-5.2.0.ebuild
deleted file mode 100644
index ad15f53224b6..000000000000
--- a/dev-ruby/turbolinks-source/turbolinks-source-5.2.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-# The gem does not contain runnable tests.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Turbolinks JavaScript assets"
-HOMEPAGE="https://github.com/rails/turbolinks-source-gem"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="test"
diff --git a/dev-ruby/turbolinks/Manifest b/dev-ruby/turbolinks/Manifest
deleted file mode 100644
index 1f7217be72c2..000000000000
--- a/dev-ruby/turbolinks/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST turbolinks-5.2.1.gem 6656 BLAKE2B 55f624ee8dbb8d27ffe21fc4b57644ad3118dbf7d89dfe59dde1909ee553d37a47e127af92e710f5081787e682b76950aac4287b604ebd9b32df4d60ededadee SHA512 e306a38dcb727a9ca9f491074154d0e82a6a0efba89aa8aa6f5db97c0c78fb468589a54b28779b83b5548c92aa03976e27a98b4beef0ef376606a97ac9dcce59
diff --git a/dev-ruby/turbolinks/metadata.xml b/dev-ruby/turbolinks/metadata.xml
deleted file mode 100644
index 0f098f2e286f..000000000000
--- a/dev-ruby/turbolinks/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rails/turbolinks</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/turbolinks/turbolinks-5.2.1.ebuild b/dev-ruby/turbolinks/turbolinks-5.2.1.ebuild
deleted file mode 100644
index a15cd68746f5..000000000000
--- a/dev-ruby/turbolinks/turbolinks-5.2.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-# The gem does not contain runnable tests.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Makes following links in your web application faster"
-HOMEPAGE="https://github.com/rails/turbolinks"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/twitter-text/twitter-text-3.1.0-r1.ebuild b/dev-ruby/twitter-text/twitter-text-3.1.0-r1.ebuild
deleted file mode 100644
index bf9b100b8fcd..000000000000
--- a/dev-ruby/twitter-text/twitter-text-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="config"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Text handling for Twitter"
-HOMEPAGE="https://github.com/twitter/twitter-text"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~riscv"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/idn-ruby
-	=dev-ruby/unf-0.1*
-"
-
-ruby_add_bdepend "test? ( >=dev-ruby/nokogiri-1.8.0 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.1.0-frozen-string.patch"
-)
-
-all_ruby_prepare() {
-	#sed -i -e 's/2.14.0/2.14/' twitter-text.gemspec || die
-	sed -i -e '/simplecov/,/end/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/twitter-text/twitter-text-3.1.0-r2.ebuild b/dev-ruby/twitter-text/twitter-text-3.1.0-r2.ebuild
new file mode 100644
index 000000000000..764525f8d6dd
--- /dev/null
+++ b/dev-ruby/twitter-text/twitter-text-3.1.0-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="config"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Text handling for Twitter"
+HOMEPAGE="https://github.com/twitter/twitter-text"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~riscv"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/idn-ruby
+	=dev-ruby/unf-0.1*
+"
+
+ruby_add_bdepend "test? ( >=dev-ruby/nokogiri-1.8.0 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.0-frozen-string.patch"
+)
+
+all_ruby_prepare() {
+	#sed -i -e 's/2.14.0/2.14/' twitter-text.gemspec || die
+	sed -i -e '/simplecov/,/end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/twitter/Manifest b/dev-ruby/twitter/Manifest
index 2f7612a48213..87742ff58691 100644
--- a/dev-ruby/twitter/Manifest
+++ b/dev-ruby/twitter/Manifest
@@ -1 +1,2 @@
-DIST twitter-7.0.0.tar.gz 831181 BLAKE2B aeb888bf1551116916cc10a4c0278dcee541e953c6e1be09bd95f348b8a2a08075d44c4b8beb736b13564d550b5797184c725141c5c3866f5423afddfdfbea19 SHA512 4b0f831ddb1f54fc5894a15010d17b54c62f6caa3eadd6a1f0e0ef37235f29f53f6315c49213244d79ab3708d5a7b1e1b9735d1f35fa291a66d439db916d3ec7
+DIST twitter-8.0.0.tar.gz 830698 BLAKE2B 187c37adb2971845730ba8ef15f7350083130c1c2f1704f3dc909aee28e8b7742e1a45b3bac8d198eb45f4e415dd15ebfe0099d9e52b7c5a5ec40ca2a6cdaa2e SHA512 b67e97385cb53cb4d75381fb16a6395d0ea72dc2fa0a900ff072ef0ef87947364967da9070e5a2449f5a938740ac0910a342d8ff3bd62095ecfb468b173a754e
+DIST twitter-8.0.1.tar.gz 830580 BLAKE2B a6a89eeaaf0095b022f31363d153fe980777e6588755115e6a3ee469ece8a753c9abf72747e986858562ec0ea4ca9b0eed31067aee1713dadc221b705db33d7e SHA512 864b882e2797efe7e3c846b8ea39bb323395cacc42128d6a1fe74106249ca4e3419efd04237c5b46a697ce0204a109fbd1af906917820d67f1a2b1ecb71501fa
diff --git a/dev-ruby/twitter/metadata.xml b/dev-ruby/twitter/metadata.xml
index 93a392dba49e..5815f286bc32 100644
--- a/dev-ruby/twitter/metadata.xml
+++ b/dev-ruby/twitter/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">sferik/twitter</remote-id>
+    <remote-id type="github">sferik/twitter-ruby</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/twitter/twitter-7.0.0-r1.ebuild b/dev-ruby/twitter/twitter-7.0.0-r1.ebuild
deleted file mode 100644
index 306bdaa160d4..000000000000
--- a/dev-ruby/twitter/twitter-7.0.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="twitter.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby wrapper around the Twitter API"
-HOMEPAGE="https://github.com/sferik/twitter/"
-SRC_URI="https://github.com/sferik/twitter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.3
-	=dev-ruby/buftok-0.2.0*
-	>=dev-ruby/equalizer-0.0.11
-	=dev-ruby/equalizer-0.0*
-	dev-ruby/http:4
-	dev-ruby/http-form_data:2
-	>=dev-ruby/http_parser_rb-0.6.0
-	>=dev-ruby/memoizable-0.4.2
-	=dev-ruby/multipart-post-2*
-	>=dev-ruby/naught-1.1
-	=dev-ruby/simple_oauth-0.3*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	dev-ruby/webmock:3
-	>=dev-ruby/timecop-0.6.1
-	)
-	doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-#	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die "Unable to remove bundler code."
-
-	sed -i -e '/simplecov/,/^end/ s:^:#:' \
-		-e '1igem "webmock", "~>3.0"' spec/helper.rb || die
-
-	# Avoid a spec that fails due to changes in dependencies.
-	sed -i -e '/#reverse_token/,/^  end/ s:^:#:' \
-		spec/twitter/rest/oauth_spec.rb
-}
-
-each_ruby_test() {
-	CI=true RSPEC_VERSION=3 ruby-ng_rspec || die
-}
diff --git a/dev-ruby/twitter/twitter-8.0.0.ebuild b/dev-ruby/twitter/twitter-8.0.0.ebuild
new file mode 100644
index 000000000000..257c39045bae
--- /dev/null
+++ b/dev-ruby/twitter/twitter-8.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="twitter.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby wrapper around the Twitter API"
+HOMEPAGE="https://github.com/sferik/twitter/"
+SRC_URI="https://github.com/sferik/twitter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.3
+	=dev-ruby/buftok-0.3.0*
+	>=dev-ruby/equalizer-0.0.11
+	=dev-ruby/equalizer-0.0*
+	>=dev-ruby/http-5.1:5
+	>=dev-ruby/http-form_data-2.3:2
+	=dev-ruby/llhttp-ffi-0.4*
+	=dev-ruby/memoizable-0.4*
+	=dev-ruby/multipart-post-2*
+	>=dev-ruby/naught-1.1
+	=dev-ruby/simple_oauth-0.3*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	dev-ruby/webmock:3
+	>=dev-ruby/timecop-0.6.1
+	)
+	doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+#	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die "Unable to remove bundler code."
+
+	sed -i -e '/simplecov/,/^end/ s:^:#:' \
+		-e '1igem "webmock", "~>3.0"' spec/helper.rb || die
+
+	# Avoid a spec that fails due to changes in dependencies.
+	sed -i -e '/#reverse_token/,/^  end/ s:^:#:' \
+		spec/twitter/rest/oauth_spec.rb
+}
+
+each_ruby_test() {
+	CI=true RSPEC_VERSION=3 ruby-ng_rspec || die
+}
diff --git a/dev-ruby/twitter/twitter-8.0.1.ebuild b/dev-ruby/twitter/twitter-8.0.1.ebuild
new file mode 100644
index 000000000000..44b8ac9258c8
--- /dev/null
+++ b/dev-ruby/twitter/twitter-8.0.1.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="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="twitter.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby wrapper around the Twitter API"
+HOMEPAGE="https://github.com/sferik/twitter-ruby/"
+SRC_URI="https://github.com/sferik/twitter-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="twitter-ruby-${PV}"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.3
+	=dev-ruby/buftok-0.3.0*
+	>=dev-ruby/equalizer-0.0.11
+	=dev-ruby/equalizer-0.0*
+	>=dev-ruby/http-5.1:5
+	>=dev-ruby/http-form_data-2.3:2
+	=dev-ruby/llhttp-ffi-0.4*
+	=dev-ruby/memoizable-0.4*
+	=dev-ruby/multipart-post-2*
+	>=dev-ruby/naught-1.1
+	=dev-ruby/simple_oauth-0.3*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	dev-ruby/webmock:3
+	>=dev-ruby/timecop-0.6.1
+	)
+	doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+#	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die "Unable to remove bundler code."
+
+	sed -i -e '/simplecov/,/^end/ s:^:#:' \
+		-e '1igem "webmock", "~>3.0"' spec/helper.rb || die
+
+	# Avoid a spec that fails due to changes in dependencies.
+	sed -i -e '/#reverse_token/,/^  end/ s:^:#:' \
+		spec/twitter/rest/oauth_spec.rb
+}
+
+each_ruby_test() {
+	CI=true RSPEC_VERSION=3 ruby-ng_rspec || die
+}
diff --git a/dev-ruby/typed-array/typed-array-0.1.2-r2.ebuild b/dev-ruby/typed-array/typed-array-0.1.2-r2.ebuild
index c0025e9f5408..ad806591d180 100644
--- a/dev-ruby/typed-array/typed-array-0.1.2-r2.ebuild
+++ b/dev-ruby/typed-array/typed-array-0.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 inherit ruby-fakegem
 DESCRIPTION="Gem provides enforced-type functionality to Arrays"
@@ -21,4 +21,6 @@ IUSE=""
 all_ruby_prepare() {
 	# There is a trash...
 	rm "${S}"/lib/typed-array/.DS_Store || die
+
+	sed -i -e 's/Fixnum/Integer/' spec/typed-array_spec.rb || die
 }
diff --git a/dev-ruby/typeprof/Manifest b/dev-ruby/typeprof/Manifest
index eb6133c7c116..b033c245d3d1 100644
--- a/dev-ruby/typeprof/Manifest
+++ b/dev-ruby/typeprof/Manifest
@@ -1,2 +1,5 @@
-DIST typeprof-0.15.2.tar.gz 501984 BLAKE2B 4139de379539dce54c350fb1da09d87ca7251274738b81b9c098f27539f8cc20757aaf053efd4c089b88a7c08050a8e612ea6c1b71ad1a007c4c634ecd6e7564 SHA512 c94b74f0a0f8f87477f80615677a5c6479d3e326564f2d67c17e4e7f7e71ef5817fe6163d14fdd45fc9bb3de2420f8b09f68f0d031962fb5bafc478679cee331
-DIST typeprof-0.21.2.tar.gz 1073317 BLAKE2B fda97cf6535937deca51f922f39ad580383420e025f8c5a418e483108e82f5d38063064102698f2ef405f7a0bf2f83ebcbb7ac7fabc32ead320e3af9d74b7cfb SHA512 53e9657ee0c98e131e8ec70400cb775cf643910e8985767742b50fda99285f33f787d810bcad08d9d633265577731a95fcf9a4e7568e4d6b0b603f14a6c10828
+DIST typeprof-0.21.10.tar.gz 1035767 BLAKE2B a36dd2a4cc607740294926f53364f67ce2f09fe9f5cb2a5e73f39d9f431fda1d9d7447d2c7e7f0205e25583e4ff935c52fc3a7cb50c7c9ff991d2a0ea5b3e919 SHA512 03eccb6717adfeaa6434fc2fc0e766a38e527830c828d54905fc8bce48f6994ef2c9b10af3ec77b3f5b1c0b2c4cd52336cb9618656dad3b43b991406c1854308
+DIST typeprof-0.21.11.tar.gz 1035785 BLAKE2B 8f121016220ba8b778710acaaac3edfbee6a7f7fec69e76130ef8dedacd034a2b3444ad6bdecabbc5b030782bb65f5fda2b1b03e65ccafd1e03bae9763eaeb67 SHA512 3ef58d5cee24f037a32984a7f9757958f0276732918a58c27aed15b11e43d57da92d4fcf41eeb017d7fe8cacfd801f0fc9cdcf03cfc2e663f8660097cde8fb61
+DIST typeprof-0.21.7.tar.gz 1036834 BLAKE2B c0a8a1ed3a0592f72489eb342cbaf132e647d11ef5f3eef003b4208e512f581aacd586cac137c9b405d59f71e1b9e2cbc9903a9c1b4791db0ad0a64485247eea SHA512 0dd149da7873ec4422a03fa31a828a8efafa5faff0c23dffde74650b71e14d472f1bb0c36d28a48e0538a761538504937ad4e0f8a711a9f5c2b52ac4128a8f37
+DIST typeprof-0.21.8.tar.gz 1035592 BLAKE2B 8fe8749e802ddc6dc94212f433acbd86bf2e9ddb96a62f1591606cde9748a52aff6287bac9139de4d4e6f55e85b03b309938329b1b0f3206b822ed9f073301b5 SHA512 1c4e7ba04b3342d688976cd03e8c0181d94035284d8bb2a8b35aabad07252938d4ce4d4118128d6647bda2b36c01d4a14465859e1d79e8a3804fb7307d6d0fb9
+DIST typeprof-0.21.9.tar.gz 1035626 BLAKE2B 20582ec0591ed4f375e68960e304f22515cbd28ad00bbe6001a0fc32ad19e03f41b54dff8cb03e9b1220417aa12ae2807d193d891b74b47e54130d277d1afb3a SHA512 53182db1fe2187d2ab0fda1a07d40c6767e485d15588b101384beabbdcacddaa8044587b59fc166e03d2b768c549938b0e9893557c4854b3431694d6e3f4bc45
diff --git a/dev-ruby/typeprof/typeprof-0.15.2.ebuild b/dev-ruby/typeprof/typeprof-0.15.2.ebuild
deleted file mode 100644
index ac6c1869b325..000000000000
--- a/dev-ruby/typeprof/typeprof-0.15.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="typeprof.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Performs a type analysis of non-annotated Ruby code"
-HOMEPAGE="https://github.com/ruby/typeprof"
-SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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"
-
-ruby_add_rdepend ">=dev-ruby/rbs-1.3.1"
-
-all_ruby_prepare() {
-	# Avoid tests that download live code using git
-	rm -r test/typeprof/{goodcheck,diff-lcs}_test.rb || die
-
-	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/typeprof/typeprof-0.21.10.ebuild b/dev-ruby/typeprof/typeprof-0.21.10.ebuild
new file mode 100644
index 000000000000..a498fca36c5b
--- /dev/null
+++ b/dev-ruby/typeprof/typeprof-0.21.10.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="typeprof.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Performs a type analysis of non-annotated Ruby code"
+HOMEPAGE="https://github.com/ruby/typeprof"
+SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/rbs-1.8.1"
+
+all_ruby_prepare() {
+	# Avoid tests that download live code using git
+	rm -r test/typeprof/diff-lcs_test.rb || die
+
+	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/typeprof/typeprof-0.21.11.ebuild b/dev-ruby/typeprof/typeprof-0.21.11.ebuild
new file mode 100644
index 000000000000..a498fca36c5b
--- /dev/null
+++ b/dev-ruby/typeprof/typeprof-0.21.11.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="typeprof.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Performs a type analysis of non-annotated Ruby code"
+HOMEPAGE="https://github.com/ruby/typeprof"
+SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/rbs-1.8.1"
+
+all_ruby_prepare() {
+	# Avoid tests that download live code using git
+	rm -r test/typeprof/diff-lcs_test.rb || die
+
+	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/typeprof/typeprof-0.21.2.ebuild b/dev-ruby/typeprof/typeprof-0.21.2.ebuild
deleted file mode 100644
index e32717b894fb..000000000000
--- a/dev-ruby/typeprof/typeprof-0.21.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="typeprof.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Performs a type analysis of non-annotated Ruby code"
-HOMEPAGE="https://github.com/ruby/typeprof"
-SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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"
-
-ruby_add_rdepend ">=dev-ruby/rbs-1.8.1"
-
-all_ruby_prepare() {
-	# Avoid tests that download live code using git
-	rm -r test/typeprof/{goodcheck,diff-lcs}_test.rb || die
-
-	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/typeprof/typeprof-0.21.7.ebuild b/dev-ruby/typeprof/typeprof-0.21.7.ebuild
new file mode 100644
index 000000000000..abc0af17aad3
--- /dev/null
+++ b/dev-ruby/typeprof/typeprof-0.21.7.ebuild
@@ -0,0 +1,32 @@
+# 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_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="typeprof.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Performs a type analysis of non-annotated Ruby code"
+HOMEPAGE="https://github.com/ruby/typeprof"
+SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/rbs-1.8.1"
+
+all_ruby_prepare() {
+	# Avoid tests that download live code using git
+	rm -r test/typeprof/{goodcheck,diff-lcs}_test.rb || die
+
+	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/typeprof/typeprof-0.21.8.ebuild b/dev-ruby/typeprof/typeprof-0.21.8.ebuild
new file mode 100644
index 000000000000..1e06e21cd0bd
--- /dev/null
+++ b/dev-ruby/typeprof/typeprof-0.21.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="typeprof.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Performs a type analysis of non-annotated Ruby code"
+HOMEPAGE="https://github.com/ruby/typeprof"
+SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/rbs-1.8.1"
+
+all_ruby_prepare() {
+	# Avoid tests that download live code using git
+	rm -r test/typeprof/diff-lcs_test.rb || die
+
+	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/typeprof/typeprof-0.21.9.ebuild b/dev-ruby/typeprof/typeprof-0.21.9.ebuild
new file mode 100644
index 000000000000..3503da9cc378
--- /dev/null
+++ b/dev-ruby/typeprof/typeprof-0.21.9.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="typeprof.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Performs a type analysis of non-annotated Ruby code"
+HOMEPAGE="https://github.com/ruby/typeprof"
+SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/rbs-1.8.1"
+
+all_ruby_prepare() {
+	# Avoid tests that download live code using git
+	rm -r test/typeprof/diff-lcs_test.rb || die
+
+	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/typhoeus/Manifest b/dev-ruby/typhoeus/Manifest
index 9dde4234ab8e..4638122f44ff 100644
--- a/dev-ruby/typhoeus/Manifest
+++ b/dev-ruby/typhoeus/Manifest
@@ -1 +1 @@
-DIST typhoeus-1.4.0.gem 56832 BLAKE2B 1f188a2c174a9d0e2cc0afc10f96d98a8c78278c1fa53eeb88da6f4f3986c8e204171a9bb817c95a217360346bda319711e7c89095ad48e878cbc3efc21e9887 SHA512 f48a99fd554f4d06d37a0a804ee79dd8423d9bff765394537ab0edba615e132d25660a6eb455e8628f59bd56c7ea26f4a195827d5287a53e58e3aeb394477284
+DIST typhoeus-1.4.1.gem 57856 BLAKE2B a1562bcaa8a824d40184b043b85f87475f3d31e6488f5bb87d84b9b37933c3fa090cee5a9b2f4910b31c61d2642ad338b321bb741c33713cd43f8cfd77a842e3 SHA512 2970793dfa94a80abf140779a148d9b8d6ab212ca0072c5353b8d158cc625e023e4c7a28ae8471d18ae3bd8cde46f31aae54bbf7a3fde33e980b533af0f81578
diff --git a/dev-ruby/typhoeus/typhoeus-1.4.0.ebuild b/dev-ruby/typhoeus/typhoeus-1.4.0.ebuild
deleted file mode 100644
index ab55524ac1c2..000000000000
--- a/dev-ruby/typhoeus/typhoeus-1.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Runs HTTP requests in parallel while cleanly encapsulating handling logic"
-HOMEPAGE="https://rubygems.org/gems/typhoeus/
-	https://github.com/typhoeus/typhoeus"
-
-LICENSE="Ruby"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/ethon-0.9.0"
-
-ruby_add_bdepend "test? ( dev-ruby/json >=dev-ruby/faraday-0.9 >=dev-ruby/sinatra-1.3 >=dev-ruby/redis-3.0 >=dev-ruby/dalli-2.7.9 )"
-
-all_ruby_prepare() {
-	sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/typhoeus/typhoeus-1.4.1.ebuild b/dev-ruby/typhoeus/typhoeus-1.4.1.ebuild
new file mode 100644
index 000000000000..5eda113ddead
--- /dev/null
+++ b/dev-ruby/typhoeus/typhoeus-1.4.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Runs HTTP requests in parallel while cleanly encapsulating handling logic"
+HOMEPAGE="https://rubygems.org/gems/typhoeus/
+	https://github.com/typhoeus/typhoeus"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+# Tests fail with ethon-0.16.0
+# https://github.com/typhoeus/typhoeus/issues/710
+ruby_add_rdepend "<dev-ruby/ethon-0.16.0"
+
+ruby_add_bdepend "test? (
+	dev-ruby/json
+	dev-ruby/faraday:1
+	dev-ruby/rack:2.2
+	>=dev-ruby/sinatra-1.3
+	>=dev-ruby/redis-3.0
+	>=dev-ruby/dalli-2.7.9
+)"
+
+all_ruby_prepare() {
+	sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
+	sed -i -e '3igem "rack", "~> 2.2.0"; gem "faraday", "<2"; require "timeout"' spec/spec_helper.rb || die
+	sed -i -e '/Rack::Handler::WEBrick/ s/options/\*\*options/' spec/support/localhost_server.rb || die
+
+	# Avoid specs failing because default headers are provided or
+	# checked now, probably due to changes in either rack or webrick.
+	sed -e '/calls on_headers and on_\(body\|complete\)/ s/it/xit/' \
+		-i spec/typhoeus/request/operations_spec.rb || die
+}
diff --git a/dev-ruby/tzinfo/Manifest b/dev-ruby/tzinfo/Manifest
index 26c73b24c489..1be2be374f26 100644
--- a/dev-ruby/tzinfo/Manifest
+++ b/dev-ruby/tzinfo/Manifest
@@ -1,2 +1,2 @@
-DIST tzinfo-1.2.9.gem 166912 BLAKE2B 6d54a5118fbdb3556d0cdc9079462cf26afa9deddd1dc21ef670240e2aa47a66d0b4fc9c9c7ed74bd14bde96dc95f6b716aef5d32ca521221618a76c8c05cda1 SHA512 ddf28ad213f681a4e551cbd803873b279acef03fae894a3e6475030d4da5a59732b31af5d5944e8c62d15b7ec922816fede24f180fb20c55c1bd3d379c879cfe
-DIST tzinfo-2.0.4.tar.gz 224673 BLAKE2B 0c7ef231767b6fc00cf95b3e1c2037894b14dfe832eaedb3f4b7c60a884ab6f7121243af5b62acf47d02da28395e7390f968421a3a3a2d731deb079e9fc51bfa SHA512 5b2ec73f737009ba21dac7dbb9504235fdef14dc45a6450e1218ba9e53dd29735ab4fa6c2854271916cc5c0244e09ae7ab19467408b72b9b82ca238e14d3fa4f
+DIST tzinfo-1.2.11.gem 166912 BLAKE2B 3fcd2917848a400ca8938914219ce3263638ab605df82a62bf42fc021e7930df9cc399e94668d03df529bff1396f0261fa6c5624c4084660ed12e7a756aea182 SHA512 21a00c464013c3122c8d647a59f7c6b6c6af6b303d3ee24226067482bcd27fd5f02a4cf51fa0b8d70d3e08831c084f54d5ffb8f6784cd1112d62dd0dff6e8aeb
+DIST tzinfo-2.0.6.tar.gz 226143 BLAKE2B 8a7918c0edc1e70f3b805dfcdc351d9ec78f42a66973ec7cb0a8bfad31d9ccdadefe93b941aca5c15510ff857bd8282046e8d20d02f308934e087de541c26383 SHA512 88af68b13becc4b6b85b4653df95e19e24d8804ac2b2393ef03cfe551b5eaee827a5aecd2156a56572d554dd5239ae828a65e5c49854671aa1989f5c31ba320d
diff --git a/dev-ruby/tzinfo/files/tzinfo-2.0.6-ruby33.patch b/dev-ruby/tzinfo/files/tzinfo-2.0.6-ruby33.patch
new file mode 100644
index 000000000000..91a9843aab22
--- /dev/null
+++ b/dev-ruby/tzinfo/files/tzinfo-2.0.6-ruby33.patch
@@ -0,0 +1,35 @@
+From 9e04c58ce10920538dc55ba6e547aa15cff39a84 Mon Sep 17 00:00:00 2001
+From: Phil Ross <phil.ross@gmail.com>
+Date: Sat, 16 Dec 2023 19:14:20 +0000
+Subject: [PATCH] Fix loading the gemspec file from rake with Ruby 3.3.
+
+Calculating the current directory name from within the gemspec would
+fail.
+
+`__FILE__` was '(eval)' with Ruby < 3.3. `File.dirname(__FILE__)` is
+'.'.
+
+`__FILE__` is '(eval at /path/Rakefile:linenumber)' with Ruby >= 3.3.
+`File.dirname(__FILE__)` is '(eval at /path'.
+---
+ Rakefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Rakefile b/Rakefile
+index 8a34fa33..69bee7b5 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -11,11 +11,11 @@ rescue LoadError, RuntimeError
+ end
+ 
+ BASE_DIR = File.expand_path(File.dirname(__FILE__))
++GEMSPEC_PATH = File.join(BASE_DIR, 'tzinfo.gemspec')
++spec = TOPLEVEL_BINDING.eval(File.read(GEMSPEC_PATH), GEMSPEC_PATH)
+ 
+ task default: [:test]
+ 
+-spec = eval(File.read('tzinfo.gemspec'))
+-
+ class TZInfoPackageTask < Gem::PackageTask
+   alias_method :orig_sh, :sh
+   private :orig_sh
diff --git a/dev-ruby/tzinfo/metadata.xml b/dev-ruby/tzinfo/metadata.xml
index daac6fdb7252..46ec7bdfdb80 100644
--- a/dev-ruby/tzinfo/metadata.xml
+++ b/dev-ruby/tzinfo/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">tzinfo/tzinfo</remote-id>
+    <remote-id type="rubygems">tzinfo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.11.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.11.ebuild
new file mode 100644
index 000000000000..f3dfe4242ab8
--- /dev/null
+++ b/dev-ruby/tzinfo/tzinfo-1.2.11.ebuild
@@ -0,0 +1,34 @@
+# 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_zoneinfo"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Daylight-savings aware timezone library"
+HOMEPAGE="https://tzinfo.github.io/"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND="sys-libs/timezone-data"
+DEPEND="test? ( sys-libs/timezone-data )"
+
+ruby_add_rdepend ">=dev-ruby/thread_safe-0.1:0"
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Avoid taint tests that throw SecurityErrors on newer ruby versions.
+	sed -i -e '/_info_tainted/askip"SecurityError"' test/tc_ruby_data_source.rb || die
+}
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.9.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.9.ebuild
deleted file mode 100644
index 740c0956497c..000000000000
--- a/dev-ruby/tzinfo/tzinfo-1.2.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="test_zoneinfo"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Daylight-savings aware timezone library"
-HOMEPAGE="https://tzinfo.github.io/"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="sys-libs/timezone-data"
-DEPEND="test? ( sys-libs/timezone-data )"
-
-ruby_add_rdepend ">=dev-ruby/thread_safe-0.1:0"
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Avoid taint tests that throw SecurityErrors on newer ruby versions.
-	sed -i -e '/_info_tainted/askip"SecurityError"' test/tc_ruby_data_source.rb || die
-}
diff --git a/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild b/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
deleted file mode 100644
index 4007acf844ec..000000000000
--- a/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_TEST="test_zoneinfo"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="tzinfo.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Daylight-savings aware timezone library"
-HOMEPAGE="https://tzinfo.github.io/"
-SRC_URI="https://github.com/tzinfo/tzinfo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="sys-libs/timezone-data"
-DEPEND="test? ( sys-libs/timezone-data )"
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Skip safe tests since we cannot guarantee the correct permissions
-	# on directories for it to pass.
-	sed -e '/safe_test/askip "does not pass in gentoo test environment"' -i test/test_utils.rb || die
-
-	# Loosen test dependencies
-	sed -e '/rake/ s/12.2.1/12.2/' \
-		-e '/simplecov/d' \
-		-i Gemfile || die
-	sed -e '/TEST_COVERAGE/d' -i Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rake test || die
-}
diff --git a/dev-ruby/tzinfo/tzinfo-2.0.6.ebuild b/dev-ruby/tzinfo/tzinfo-2.0.6.ebuild
new file mode 100644
index 000000000000..aebdb3e76137
--- /dev/null
+++ b/dev-ruby/tzinfo/tzinfo-2.0.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST="test_zoneinfo"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="tzinfo.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Daylight-savings aware timezone library"
+HOMEPAGE="https://tzinfo.github.io/"
+SRC_URI="https://github.com/tzinfo/tzinfo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND="sys-libs/timezone-data"
+DEPEND="test? ( sys-libs/timezone-data )"
+
+PATCHES=( "${FILESDIR}/${P}-ruby33.patch" )
+
+ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Skip safe tests since we cannot guarantee the correct permissions
+	# on directories for it to pass.
+	sed -e '/safe_test/askip "does not pass in gentoo test environment"' -i test/test_utils.rb || die
+
+	# Loosen test dependencies
+	sed -e '/rake/ s/12.2.1/12.2/' \
+		-e '/simplecov/d' \
+		-i Gemfile || die
+	sed -e '/TEST_COVERAGE/d' -i Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}
diff --git a/dev-ruby/uconv/uconv-0.6.1-r3.ebuild b/dev-ruby/uconv/uconv-0.6.1-r3.ebuild
index 2dd352c0a3ff..a2b77f54d30d 100644
--- a/dev-ruby/uconv/uconv-0.6.1-r3.ebuild
+++ b/dev-ruby/uconv/uconv-0.6.1-r3.ebuild
@@ -1,15 +1,15 @@
-# 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="ruby27 ruby30 ruby31 ruby32"
 
 inherit ruby-ng
 
 DESCRIPTION="A module to convert ISO/IEC 10646 (Unicode) string and Japanese strings"
 HOMEPAGE="http://www.yoshidam.net/Ruby.html#uconv"
 SRC_URI="http://www.yoshidam.net/${P}.tar.gz"
-LICENSE="Ruby"
+LICENSE="Ruby-BSD"
 SLOT="0"
 KEYWORDS="~amd64 ppc ppc64 x86"
 IUSE=""
diff --git a/dev-ruby/uglifier/uglifier-4.2.0-r1.ebuild b/dev-ruby/uglifier/uglifier-4.2.0-r1.ebuild
index c06d265668f0..d8e20e7fbce2 100644
--- a/dev-ruby/uglifier/uglifier-4.2.0-r1.ebuild
+++ b/dev-ruby/uglifier/uglifier-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="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/lautis/uglifier/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
 
 IUSE="test"
 
diff --git a/dev-ruby/ultraviolet/Manifest b/dev-ruby/ultraviolet/Manifest
deleted file mode 100644
index 9087354a2f56..000000000000
--- a/dev-ruby/ultraviolet/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ultraviolet-1.0.1.gem 46592 BLAKE2B 2dd9b69bafdb83c321eee2c4fed9a39782959893993bdd27d3c1ab8337ac1f9a68d8cf7cddbef12404041d541d183f0bd205a4c36ee4978a2c0a631d0df3fbce SHA512 f974f95743b56d7424c8ac96867c56f4d849247ba552bd09ba8893ca6520758ff2132ac46a42f22b8547732bd148531d177a7d38522fad1dfb86d54ffbb29861
diff --git a/dev-ruby/ultraviolet/metadata.xml b/dev-ruby/ultraviolet/metadata.xml
deleted file mode 100644
index e85a4a576c75..000000000000
--- a/dev-ruby/ultraviolet/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">grosser/ultraviolet</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/ultraviolet/ultraviolet-1.0.1-r1.ebuild b/dev-ruby/ultraviolet/ultraviolet-1.0.1-r1.ebuild
deleted file mode 100644
index 1b0344cdae18..000000000000
--- a/dev-ruby/ultraviolet/ultraviolet-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRADOC="Readme.md"
-RUBY_FAKEGEM_EXTRAINSTALL="render"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A syntax highlighting engine based on Textpow"
-HOMEPAGE="https://github.com/grosser/ultraviolet"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/textpow-1.3.0"
-
-all_ruby_prepare() {
-	sed -i -e '/rdoc_patter/d' Rakefile || die
-	sed -i -e '/git ls-files/d' ultraviolet.gemspec || die
-}
diff --git a/dev-ruby/unf/unf-0.1.4-r1.ebuild b/dev-ruby/unf/unf-0.1.4-r1.ebuild
index 22efe9198674..d06732c84903 100644
--- a/dev-ruby/unf/unf-0.1.4-r1.ebuild
+++ b/dev-ruby/unf/unf-0.1.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/knu/ruby-unf"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/unf_ext"
diff --git a/dev-ruby/unf_ext/Manifest b/dev-ruby/unf_ext/Manifest
index a35160384fc2..0bbf44dcbd22 100644
--- a/dev-ruby/unf_ext/Manifest
+++ b/dev-ruby/unf_ext/Manifest
@@ -1,3 +1,3 @@
-DIST unf_ext-0.0.7.7.gem 399360 BLAKE2B 040800c9598fb544d434e8d3336a7aa8aac2440a3386a520220252aa970c715462fcf242985527b23618dabb291db346d23afd02282f735df1fdb657e021be9d SHA512 7dc75f071be4d4f3cd44f64a26c5f63f01494f79f3585eea3b307c3e8133b17b1007c4b36915f7254e516ae7a62268be8f3e4b250dcec7a9a083b5a66582887d
-DIST unf_ext-0.0.8.1.gem 399360 BLAKE2B d1ce1460c46d840d983999ddf0dc48d6af4c508e8d92e8c603cd1e261399a4f79dd0c5937125d4591d627b5bf8ab3a6730999b6bf2eda3c58e714d8209bcfd51 SHA512 8bc698071471f65bf0d08f21e8ae4607778a9021b78c8b00e82725cccf3876d7357a1555d003c83b6182605247f3bf01a6c2ecc4dfac52ca93a0f37da2c76d8c
-DIST unf_ext-0.0.8.gem 399360 BLAKE2B f364808e7e1cbbe27ba1447ec45f5fdaed37d2579cc2a08c6bccd06c23135421949479f5a96ee6f27336bb28bc68509ed931d30a338d7f6079533799b5c8d0e4 SHA512 f0c1e7273aa1b74c81a8b6f108171cbee5479c3f5c256ea3eba3797cf2f5db0c346a33a524fa40bcdea02a75be60fcd470f0a17231cb7b103d28763dd0f8b56f
+DIST unf_ext-0.0.8.2.gem 399360 BLAKE2B 01c98ff018ec3471d4068e79b6a80980e891835a940b109c9b240226ed97f89ce71b3236b9185c6087a4e61fe6b77b249fc952b65483b5adb96fc25ee0d4bb05 SHA512 c9d3e54c96a525031d3b2fe349b5ffa1d03e3f28f74c3a2715af299e5274c7514526d07be5d7244a2cf9561c11e170b15c75d34c5e2a7143cef1ee25d32d2137
+DIST unf_ext-0.0.9.1.gem 399872 BLAKE2B 2c51c426a6740e56a2d15977c46c1fdfb8129691070bd234a3d11bbc8f85466e015eb75feb13ab0be565ad43958506baec9fd09e204efc3ea69f2dbf340e4588 SHA512 f2d0d58dc0ed30e3e99ac75022c8ea78bf4ad51c8803009c059de087b1cd439e06a8e7ef4c1be5c75048f85afe6c301f402ed21405ff02ad36ea73209416994d
+DIST unf_ext-0.0.9.gem 399872 BLAKE2B ec32d0357d7e72d001962b16f70fe616910eff6641eabf56dd2403f995c60a8a0dc4b1901ce3154032645e9af2378b9cdf9a23795899a5f7230f5f7ad52bd3c9 SHA512 b89edde90ccd7a71c7ae0e284ded7d8963239fcc976ea2876e569562bad44ff8eb8825ec8adcc61242772cc37c924ff1962bbcf1cea4e4333db446af1f055d30
diff --git a/dev-ruby/unf_ext/metadata.xml b/dev-ruby/unf_ext/metadata.xml
index bba7333117b4..77351690727f 100644
--- a/dev-ruby/unf_ext/metadata.xml
+++ b/dev-ruby/unf_ext/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge-jp">unf</remote-id>
 		<remote-id type="github">knu/ruby-unf_ext</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.7.7-r1.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.7.7-r1.ebuild
deleted file mode 100644
index 7ecd8a9798e3..000000000000
--- a/dev-ruby/unf_ext/unf_ext-0.0.7.7-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/unf_ext/extconf.rb)
-
-inherit ruby-fakegem multilib
-
-DESCRIPTION="Unicode Normalization Form support library for CRuby"
-HOMEPAGE="https://github.com/knu/ruby-unf_ext"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.1-r1
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ s:^:#:' Rakefile test/helper.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 test/test_*.rb
-}
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.8.1.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.8.1.ebuild
deleted file mode 100644
index e3cd634f58a4..000000000000
--- a/dev-ruby/unf_ext/unf_ext-0.0.8.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/unf_ext/extconf.rb)
-
-inherit ruby-fakegem multilib
-
-DESCRIPTION="Unicode Normalization Form support library for CRuby"
-HOMEPAGE="https://github.com/knu/ruby-unf_ext"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.1-r1
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ s:^:#:' Rakefile test/helper.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 test/test_*.rb
-}
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.8.2.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.8.2.ebuild
new file mode 100644
index 000000000000..2853bd01efb9
--- /dev/null
+++ b/dev-ruby/unf_ext/unf_ext-0.0.8.2.ebuild
@@ -0,0 +1,37 @@
+# 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_TEST="none"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/unf_ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Unicode Normalization Form support library for CRuby"
+HOMEPAGE="https://github.com/knu/ruby-unf_ext"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/test-unit-2.5.1-r1
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/,/end/ s:^:#:' Rakefile test/helper.rb || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 test/test_*.rb
+}
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.8.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.8.ebuild
deleted file mode 100644
index 6b575767ee0d..000000000000
--- a/dev-ruby/unf_ext/unf_ext-0.0.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/unf_ext/extconf.rb)
-
-inherit ruby-fakegem multilib
-
-DESCRIPTION="Unicode Normalization Form support library for CRuby"
-HOMEPAGE="https://github.com/knu/ruby-unf_ext"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.1-r1
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ s:^:#:' Rakefile test/helper.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 test/test_*.rb
-}
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.9.1.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.9.1.ebuild
new file mode 100644
index 000000000000..1731bc8730ff
--- /dev/null
+++ b/dev-ruby/unf_ext/unf_ext-0.0.9.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/unf_ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Unicode Normalization Form support library for CRuby"
+HOMEPAGE="https://github.com/knu/ruby-unf_ext"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/test-unit-2.5.1-r1
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/,/end/ s:^:#:' Rakefile test/helper.rb || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 test/test_*.rb
+}
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.9.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.9.ebuild
new file mode 100644
index 000000000000..93ee53a957d2
--- /dev/null
+++ b/dev-ruby/unf_ext/unf_ext-0.0.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/unf_ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Unicode Normalization Form support library for CRuby"
+HOMEPAGE="https://github.com/knu/ruby-unf_ext"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/test-unit-2.5.1-r1
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/,/end/ s:^:#:' Rakefile test/helper.rb || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 test/test_*.rb
+}
diff --git a/dev-ruby/unicode-display_width/Manifest b/dev-ruby/unicode-display_width/Manifest
index d78e3543029c..ffad72f4c458 100644
--- a/dev-ruby/unicode-display_width/Manifest
+++ b/dev-ruby/unicode-display_width/Manifest
@@ -1,2 +1,3 @@
 DIST unicode-display_width-1.7.0.tar.gz 10822 BLAKE2B c3db387b9d61ba4ea9d5559824b22e40f173f9e9bcf7fdad3dba1edc36b39ae90276818bd54e74a6731bd2cb8c48b28e440d07f7e3cedbd8dc13441f79a2b56c SHA512 2b6d2b0118f4a2ad69e98fe2fac611ca94adc0dc59ad076083d0243c630a81a01d650965149a25feaf8986c262a5d55294e064361420e2140b53c5ced5fb1c77
-DIST unicode-display_width-2.1.0.tar.gz 11981 BLAKE2B b8e70183b1df9f17bd719e1193c3c2ade5d9186772e4246b618d882eda997a0c22ee0179778f7b8580e32ec89461453144d57d198075f0d400ea52f3679ff7dc SHA512 f8fb1375ba0e88a41633d4aca4628198c5ee55f318a7f0055c9178b39f55818ec892f6e455021cf5050dbd1d748a102b319b1d8b9921ed1ba54a1d106d7911aa
+DIST unicode-display_width-2.4.2.tar.gz 13096 BLAKE2B 89f7f8ded131a6c049242ede8822475c2629e2377a6b06ca59b1264c1c18981039c95c0aea8a24c00488b8f5c48aed3cc1b5672785eb36bbcf3cee1af8c2cc53 SHA512 c0815c19821855fed2d3205a6cae2059e0338fb27148f55281c910b54d5b0be2d34ba4bf990ba1c328c454f7ec8dbc0c69427550f2d62d1ac4ce5174b53b8ff3
+DIST unicode-display_width-2.5.0.tar.gz 13115 BLAKE2B 93d50190346409b3ba0dc23cbce841cabab7584f07a5b152851e40fd06168ff26a38c4872aed994e1a77292cf04de31f54075ad6b4329975fd93c30d9afe38b3 SHA512 cd6302136e5d61e6209bd9c6eb432c09d562b59a6a02868a3343a5968c56239cff0f547ed5bed15d5a6a06265385a6a499b148e59f9b84778241c9f8c5efa2be
diff --git a/dev-ruby/unicode-display_width/metadata.xml b/dev-ruby/unicode-display_width/metadata.xml
index 7a38fd1850ff..320aa7dd1242 100644
--- a/dev-ruby/unicode-display_width/metadata.xml
+++ b/dev-ruby/unicode-display_width/metadata.xml
@@ -5,4 +5,8 @@
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">janlelis/unicode-display_width</remote-id>
+    <remote-id type="rubygems">unicode-display_width</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/unicode-display_width/unicode-display_width-1.7.0-r1.ebuild b/dev-ruby/unicode-display_width/unicode-display_width-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..355b9b1c4284
--- /dev/null
+++ b/dev-ruby/unicode-display_width/unicode-display_width-1.7.0-r1.ebuild
@@ -0,0 +1,28 @@
+# 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_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_GEMSPEC="unicode-display_width.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Adds String#display_width to get the display size using EastAsianWidth.txt"
+HOMEPAGE="https://github.com/janlelis/unicode-display_width"
+SRC_URI="https://github.com/janlelis/unicode-display_width/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid experimental emoji support for now
+	sed -i -e '/\[emoji\]/,/^  end/ s:^:#:' spec/display_width_spec.rb || die
+}
diff --git a/dev-ruby/unicode-display_width/unicode-display_width-1.7.0.ebuild b/dev-ruby/unicode-display_width/unicode-display_width-1.7.0.ebuild
deleted file mode 100644
index 77afd3b83be7..000000000000
--- a/dev-ruby/unicode-display_width/unicode-display_width-1.7.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-RUBY_FAKEGEM_GEMSPEC="unicode-display_width.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Adds String#display_width to get the display size using EastAsianWidth.txt"
-HOMEPAGE="https://github.com/janlelis/unicode-display_width"
-SRC_URI="https://github.com/janlelis/unicode-display_width/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid experimental emoji support for now
-	sed -i -e '/\[emoji\]/,/^  end/ s:^:#:' spec/display_width_spec.rb || die
-}
diff --git a/dev-ruby/unicode-display_width/unicode-display_width-2.1.0.ebuild b/dev-ruby/unicode-display_width/unicode-display_width-2.1.0.ebuild
deleted file mode 100644
index 408071222f82..000000000000
--- a/dev-ruby/unicode-display_width/unicode-display_width-2.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-RUBY_FAKEGEM_GEMSPEC="unicode-display_width.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Adds String#display_width to get the display size using EastAsianWidth.txt"
-HOMEPAGE="https://github.com/janlelis/unicode-display_width"
-SRC_URI="https://github.com/janlelis/unicode-display_width/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid experimental emoji support for now
-	sed -e '/\[emoji\]/,/^  end/ s:^:#:' \
-		-e '/Config object based API/,/^end/ s:^:#:' \
-		-i spec/display_width_spec.rb || die
-}
diff --git a/dev-ruby/unicode-display_width/unicode-display_width-2.4.2.ebuild b/dev-ruby/unicode-display_width/unicode-display_width-2.4.2.ebuild
new file mode 100644
index 000000000000..f4bfe763a339
--- /dev/null
+++ b/dev-ruby/unicode-display_width/unicode-display_width-2.4.2.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_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_GEMSPEC="unicode-display_width.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Adds String#display_width to get the display size using EastAsianWidth.txt"
+HOMEPAGE="https://github.com/janlelis/unicode-display_width"
+SRC_URI="https://github.com/janlelis/unicode-display_width/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid experimental emoji support for now
+	sed -e '/\[emoji\]/,/^  end/ s:^:#:' \
+		-e '/Config object based API/,/^end/ s:^:#:' \
+		-i spec/display_width_spec.rb || die
+}
diff --git a/dev-ruby/unicode-display_width/unicode-display_width-2.5.0.ebuild b/dev-ruby/unicode-display_width/unicode-display_width-2.5.0.ebuild
new file mode 100644
index 000000000000..dda7b712d77c
--- /dev/null
+++ b/dev-ruby/unicode-display_width/unicode-display_width-2.5.0.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="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_GEMSPEC="unicode-display_width.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Adds String#display_width to get the display size using EastAsianWidth.txt"
+HOMEPAGE="https://github.com/janlelis/unicode-display_width"
+SRC_URI="https://github.com/janlelis/unicode-display_width/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid experimental emoji support for now
+	sed -e '/\[emoji\]/,/^  end/ s:^:#:' \
+		-e '/Config object based API/,/^end/ s:^:#:' \
+		-i spec/display_width_spec.rb || die
+}
diff --git a/dev-ruby/unindent/unindent-1.0-r1.ebuild b/dev-ruby/unindent/unindent-1.0-r1.ebuild
deleted file mode 100644
index 064501bbac12..000000000000
--- a/dev-ruby/unindent/unindent-1.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby method to unindent strings"
-HOMEPAGE="https://github.com/mynyml/unindent"
-LICENSE="MIT"
-
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/nanotest )"
-
-each_ruby_test() {
-	${RUBY} -I.:lib test/test_unindent.rb || die
-}
diff --git a/dev-ruby/unindent/unindent-1.0-r2.ebuild b/dev-ruby/unindent/unindent-1.0-r2.ebuild
new file mode 100644
index 000000000000..1b2ef7cd6d55
--- /dev/null
+++ b/dev-ruby/unindent/unindent-1.0-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby method to unindent strings"
+HOMEPAGE="https://github.com/mynyml/unindent"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+
+ruby_add_bdepend "test? ( dev-ruby/nanotest )"
+
+each_ruby_test() {
+	${RUBY} -I.:lib test/test_unindent.rb || die
+}
diff --git a/dev-ruby/uuidtools/uuidtools-2.2.0-r1.ebuild b/dev-ruby/uuidtools/uuidtools-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..614a9762271a
--- /dev/null
+++ b/dev-ruby/uuidtools/uuidtools-2.2.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="-f tasks/yard.rake doc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple library to generate UUIDs"
+HOMEPAGE="https://github.com/sporkmonger/uuidtools"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+	# Avoid specs that require an actual network interface to get a MAC
+	# address. We can't assume that a network interface is available.
+	sed -e '/when obtaining a MAC address/,/^end/ s:^:#:' \
+		-i spec/uuidtools/mac_address_spec.rb || die
+	sed -e '/should correctly generate timestamp variant UUIDs/,/^  end/ s:^:#:' \
+		-i spec/uuidtools/uuid_creation_spec.rb || die
+	sed -e '/should not treat a timestamp version UUID as a random node UUID/,/^  end/ s:^:#:' \
+		-i spec/uuidtools/uuid_parsing_spec.rb || die
+}
diff --git a/dev-ruby/uuidtools/uuidtools-2.2.0.ebuild b/dev-ruby/uuidtools/uuidtools-2.2.0.ebuild
deleted file mode 100644
index d38636f2ee53..000000000000
--- a/dev-ruby/uuidtools/uuidtools-2.2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="-f tasks/yard.rake doc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple library to generate UUIDs"
-HOMEPAGE="https://github.com/sporkmonger/uuidtools"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	# Avoid specs that require an actual network interface to get a MAC
-	# address. We can't assume that a network interface is available.
-	sed -e '/when obtaining a MAC address/,/^end/ s:^:#:' \
-		-i spec/uuidtools/mac_address_spec.rb || die
-	sed -e '/should correctly generate timestamp variant UUIDs/,/^  end/ s:^:#:' \
-		-i spec/uuidtools/uuid_creation_spec.rb || die
-	sed -e '/should not treat a timestamp version UUID as a random node UUID/,/^  end/ s:^:#:' \
-		-i spec/uuidtools/uuid_parsing_spec.rb || die
-}
diff --git a/dev-ruby/vagrant_cloud/Manifest b/dev-ruby/vagrant_cloud/Manifest
index c9f4b4c5846d..b7c876dce84a 100644
--- a/dev-ruby/vagrant_cloud/Manifest
+++ b/dev-ruby/vagrant_cloud/Manifest
@@ -1,3 +1,3 @@
-DIST vagrant_cloud-2.0.3.tar.gz 14854 BLAKE2B 823b9ffbdb6896422e32e697075c7e9ab16ae7a299d6672eb497f17034737d2d017bdd416b56191149044afe97ee06533213311bb5e9da603e9eefcf824c8df7 SHA512 4431aa446d9bce2e67b121159a8345562b41c86937b2b1677f0397494521137fa66c997009632011caceeee9565a5a2b54d4ef6ef1ea9d4ac74ee35f8c149f5d
-DIST vagrant_cloud-3.0.2.tar.gz 34177 BLAKE2B 299014b569deac667429d90b8952f77a835669e17cf724ee7f5b6fd135c1a3f16b9292e203a75baf50cf117022d0ab4d31f797c432a07386097c6bcc338ae2da SHA512 c7e5050a0f3cefe95ad38e0734317a93939de0b54251163be1a52dfc413cdb08a4bf44e1c73215f81a0126552242a1d9f2cefe8fa43d9e60acf41ccdbed0ae80
 DIST vagrant_cloud-3.0.5.tar.gz 34844 BLAKE2B 2624219c470ed62e60056c825dc40611bf1bd2d1e822cc40e1592f8473517df53d814934f4426ef61d9adabbf89112bc1c44b61ee7129c4270e67b468fcf87cb SHA512 e3b138584baa956de30be5b307b7a05a728a9c84e5c4c831d9a703f0367886b82905057c8d6dda5e337b7b4256704d22a60869710e98493da8eea2074df70995
+DIST vagrant_cloud-3.1.0.tar.gz 62991 BLAKE2B 264c262d8d1fe4f3de93d1a463520bf6ec460c7a946067c4add71ad5bc0d971c078abe32148b35416ee01335eaf9fa95bacba58bc76d3d891158f979d10c7775 SHA512 90a0ac7047e1f3693c542ef633c77866821ba607e2c3d059ce297895217d22854f275ee61e6d17f9703bda2f9b67bf467bc55aed805840ee8fe913cb285d02d6
+DIST vagrant_cloud-3.1.1.tar.gz 63633 BLAKE2B e2d6db7079eef43441427a0288fb33a37da530276592b95698e610043b70b59020f5ba7e393f85a2455fda62cf80729e946b07103d0d8a54143211688b1974f6 SHA512 957b35111a530baabccd337c94009cc643322ca64d4c8b1874672eee292d77db9741d67d209391503ecbc45e2b9c6cd298409405183a2cd04a0c935d04e0c316
diff --git a/dev-ruby/vagrant_cloud/vagrant_cloud-2.0.3-r1.ebuild b/dev-ruby/vagrant_cloud/vagrant_cloud-2.0.3-r1.ebuild
deleted file mode 100644
index c3ef5f12f0f1..000000000000
--- a/dev-ruby/vagrant_cloud/vagrant_cloud-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Vagrant Cloud API Library"
-HOMEPAGE="https://github.com/hashicorp/vagrant_cloud"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rest-client:2"
-ruby_add_bdepend ">=dev-ruby/rake-10.4
-	test? ( >=dev-ruby/webmock-3.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
-	# loosen dependencies
-	sed -e '/rest-client/s/~>/>=/' -i ${PN}.gemspec || die
-}
diff --git a/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.2.ebuild b/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.2.ebuild
deleted file mode 100644
index 4e3c8bb9b807..000000000000
--- a/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_GEMSPEC="vagrant_cloud.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Vagrant Cloud API Library"
-HOMEPAGE="https://github.com/hashicorp/vagrant_cloud"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/excon-0.73
-	>=dev-ruby/log4r-1.1.10
-"
-ruby_add_bdepend ">=dev-ruby/rake-12.3
-	test? (
-		>=dev-ruby/webmock-3.0
-	)
-"
-
-all_ruby_prepare() {
-	# # loosen dependencies
-	sed -e 's:require_relative ":require "./:' \
-		-e '/excon/s/~>/>=/' \
-		-e '/log4r/s/~>/>=/' \
-		-e '/rake/s/~>/>=/' \
-		-e '/rspec/s/~>/>=/' \
-		-e '/webmock/s/~>/>=/' \
-		-i ${PN}.gemspec || die
-}
diff --git a/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5-r1.ebuild b/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5-r1.ebuild
new file mode 100644
index 000000000000..9c8b674c0db5
--- /dev/null
+++ b/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_GEMSPEC="vagrant_cloud.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Vagrant Cloud API Library"
+HOMEPAGE="https://github.com/hashicorp/vagrant_cloud"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/excon-0.73
+	>=dev-ruby/log4r-1.1.10
+"
+ruby_add_bdepend ">=dev-ruby/rake-12.3
+	test? (
+		>=dev-ruby/webmock-3.0
+	)
+"
+
+all_ruby_prepare() {
+	# # loosen dependencies
+	sed -e 's:require_relative ":require "./:' \
+		-e '/excon/s/~>/>=/' \
+		-e '/log4r/s/~>/>=/' \
+		-e '/rake/s/~>/>=/' \
+		-e '/rspec/s/~>/>=/' \
+		-e '/webmock/s/~>/>=/' \
+		-i ${PN}.gemspec || die
+}
diff --git a/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5.ebuild b/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5.ebuild
deleted file mode 100644
index ff677829a218..000000000000
--- a/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_GEMSPEC="vagrant_cloud.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Vagrant Cloud API Library"
-HOMEPAGE="https://github.com/hashicorp/vagrant_cloud"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/excon-0.73
-	>=dev-ruby/log4r-1.1.10
-"
-ruby_add_bdepend ">=dev-ruby/rake-12.3
-	test? (
-		>=dev-ruby/webmock-3.0
-	)
-"
-
-all_ruby_prepare() {
-	# # loosen dependencies
-	sed -e 's:require_relative ":require "./:' \
-		-e '/excon/s/~>/>=/' \
-		-e '/log4r/s/~>/>=/' \
-		-e '/rake/s/~>/>=/' \
-		-e '/rspec/s/~>/>=/' \
-		-e '/webmock/s/~>/>=/' \
-		-i ${PN}.gemspec || die
-}
diff --git a/dev-ruby/vagrant_cloud/vagrant_cloud-3.1.0.ebuild b/dev-ruby/vagrant_cloud/vagrant_cloud-3.1.0.ebuild
new file mode 100644
index 000000000000..c220002e1052
--- /dev/null
+++ b/dev-ruby/vagrant_cloud/vagrant_cloud-3.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_GEMSPEC="vagrant_cloud.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Vagrant Cloud API Library"
+HOMEPAGE="https://github.com/hashicorp/vagrant_cloud"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/excon-0.73
+	>=dev-ruby/log4r-1.1.10
+	>=dev-ruby/rexml-3.2.5 =dev-ruby/rexml-3.2*
+"
+ruby_add_bdepend ">=dev-ruby/rake-12.3
+	test? (
+		>=dev-ruby/webmock-3.0
+	)
+"
+
+all_ruby_prepare() {
+	# # loosen dependencies
+	sed -e 's:require_relative ":require "./:' \
+		-e '/log4r/s/~>/>=/' \
+		-e '/rake/s/~>/>=/' \
+		-e '/rspec/s/~>/>=/' \
+		-e '/webmock/s/~>/>=/' \
+		-i ${PN}.gemspec || die
+}
diff --git a/dev-ruby/vagrant_cloud/vagrant_cloud-3.1.1.ebuild b/dev-ruby/vagrant_cloud/vagrant_cloud-3.1.1.ebuild
new file mode 100644
index 000000000000..f870eb83df58
--- /dev/null
+++ b/dev-ruby/vagrant_cloud/vagrant_cloud-3.1.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_GEMSPEC="vagrant_cloud.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Vagrant Cloud API Library"
+HOMEPAGE="https://github.com/hashicorp/vagrant_cloud"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/excon-0.73
+	>=dev-ruby/log4r-1.1.10
+	>=dev-ruby/rexml-3.2.5 =dev-ruby/rexml-3.2*
+"
+ruby_add_bdepend ">=dev-ruby/rake-12.3
+	test? (
+		>=dev-ruby/webmock-3.0
+	)
+"
+
+all_ruby_prepare() {
+	# # loosen dependencies
+	sed -e 's:require_relative ":require "./:' \
+		-e '/log4r/s/~>/>=/' \
+		-e '/rake/s/~>/>=/' \
+		-e '/rspec/s/~>/>=/' \
+		-e '/webmock/s/~>/>=/' \
+		-i ${PN}.gemspec || die
+}
diff --git a/dev-ruby/vcard/vcard-0.3.0-r1.ebuild b/dev-ruby/vcard/vcard-0.3.0-r1.ebuild
index b292c1e31a12..580591ea1dd3 100644
--- a/dev-ruby/vcard/vcard-0.3.0-r1.ebuild
+++ b/dev-ruby/vcard/vcard-0.3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby31 ruby32 ruby33"
 
 # Avoid the complexity of the "rake" recipe and run testrb-2 manually.
 RUBY_FAKEGEM_RECIPE_TEST=none
diff --git a/dev-ruby/vcard/vcard-0.3.0.ebuild b/dev-ruby/vcard/vcard-0.3.0.ebuild
deleted file mode 100644
index 8c9fdf412fbb..000000000000
--- a/dev-ruby/vcard/vcard-0.3.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# Avoid the complexity of the "rake" recipe and run testrb-2 manually.
-RUBY_FAKEGEM_RECIPE_TEST=none
-RUBY_FAKEGEM_RECIPE_DOC=none
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby vcard support extracted from Vpim"
-HOMEPAGE="https://github.com/qoobaa/vcard"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 --load-path=lib --pattern='.*_test\.rb' test/
-}
diff --git a/dev-ruby/vcr/Manifest b/dev-ruby/vcr/Manifest
index 721b6416cf25..ed2bc6336184 100644
--- a/dev-ruby/vcr/Manifest
+++ b/dev-ruby/vcr/Manifest
@@ -1,4 +1,2 @@
-DIST vcr-4.0.0.tar.gz 146920 BLAKE2B 19ae33d2f40821d2cfe5c0fc55d5e91e02b8e6ba2bba000c326d993987fd641dd5b4cedd6a8a441f86664ecb67dfe2501d335936af9271fa83aef6dc001b12f2 SHA512 2f98eedd021f7c125fc3f29189190ddc817bb95fc8e8e0ab53e65eaf94c5c0c41f3ca4abf9d829591acdefe97b931943c47129f95c21f2ef590ed500cc6f56f9
-DIST vcr-5.1.0.tar.gz 150438 BLAKE2B 615a0ce570da29be402f97dcba1ba987c611c73cc9ebc561683333c752d57c1c2f0acae78b42164d8c56f71cded150a93566d45c0c84153bdc3dc8bb37199e4e SHA512 5297e46b1ffe31c3559df57f0af158cb8064ba48b83702ea3bf12eca4c7260bcb71d3df7ae645a3cc14817366992458beb4fd9771c1f98a56835dcd69ff107f9
-DIST vcr-6.0.0.tar.gz 153423 BLAKE2B 95f0794af34d4ce21c0ed3b3a77de64300fd3c844919624cd6021c2e74687d3a66b7d4f73b2b040f90774d9cea0305563cdfaab162b4a1df842f2367e72f6209 SHA512 9a19896ca4f5624c6e74772006aea4dfda0527d9ba733ec0d90418c6234fa5684121be1258badcfd647739cb47dbaae556b8c2e2636f309a79ea94e8835de40f
 DIST vcr-6.1.0.tar.gz 153296 BLAKE2B b34fbb88458bca2faef0b7bc801f664eb7b1ed79c09362f0fd1ed25da9d768098721cb45edbf6801cc63d9c78c8d615ef8d468daf5757043cd130de2b7029859 SHA512 62ab8abfe8e0dff391df4e8874bf10315aa58baef1cc28bb60e5fd63a207bb054a3b253dbfc9ad32dfdfe7d832557c262cb0139178fb778b77150def77214a68
+DIST vcr-6.2.0.tar.gz 154715 BLAKE2B 5d6054c81106a1498c91a578347d1c092908d98d79e58303b5718620ef699705d33bfa1ea4ea8fd37653298cc18812a84d8125b79ad5fab746277ecf27725afc SHA512 516e7a8acb06872e111f20e07f3b95713a8e2cf7b5f6939ae1b643cafa8e87488a98ee5d0cf1ec0e150c128e19241c2e6d0c4ab8e811584d9f8ed05e8f93a691
diff --git a/dev-ruby/vcr/vcr-4.0.0.ebuild b/dev-ruby/vcr/vcr-4.0.0.ebuild
deleted file mode 100644
index b1ef57cf7675..000000000000
--- a/dev-ruby/vcr/vcr-4.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Records your test suite's HTTP interactions and replay them during test runs"
-HOMEPAGE="https://github.com/vcr/vcr/"
-SRC_URI="https://github.com/vcr/vcr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
-SLOT="3"
-IUSE="json test"
-
-# Tests require all supported HTTP libraries to be present, and it is
-# not possible to avoid some of them without very extensive patches.
-RESTRICT="test"
-
-ruby_add_rdepend "json? ( dev-ruby/multi_json )"
diff --git a/dev-ruby/vcr/vcr-5.1.0.ebuild b/dev-ruby/vcr/vcr-5.1.0.ebuild
deleted file mode 100644
index e87e47f815cb..000000000000
--- a/dev-ruby/vcr/vcr-5.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md"
-
-RUBY_FAKEGEM_GEMSPEC="vcr.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Records your test suite's HTTP interactions and replay them during test runs"
-HOMEPAGE="https://github.com/vcr/vcr/"
-SRC_URI="https://github.com/vcr/vcr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-SLOT="$(ver_cut 1)"
-IUSE="json test"
-
-# Tests require all supported HTTP libraries to be present, and it is
-# not possible to avoid some of them without very extensive patches.
-RESTRICT="test"
-
-ruby_add_rdepend "json? ( dev-ruby/multi_json )"
diff --git a/dev-ruby/vcr/vcr-6.0.0.ebuild b/dev-ruby/vcr/vcr-6.0.0.ebuild
deleted file mode 100644
index 6f57d8ff35ef..000000000000
--- a/dev-ruby/vcr/vcr-6.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md"
-
-RUBY_FAKEGEM_GEMSPEC="vcr.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Records your test suite's HTTP interactions and replay them during test runs"
-HOMEPAGE="https://github.com/vcr/vcr/"
-SRC_URI="https://github.com/vcr/vcr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
-SLOT="$(ver_cut 1)"
-IUSE="json test"
-
-# Tests require all supported HTTP libraries to be present, and it is
-# not possible to avoid some of them without very extensive patches.
-RESTRICT="test"
-
-ruby_add_rdepend "json? ( dev-ruby/json )"
diff --git a/dev-ruby/vcr/vcr-6.1.0.ebuild b/dev-ruby/vcr/vcr-6.1.0.ebuild
index bd3e418c167c..fbccf7266804 100644
--- a/dev-ruby/vcr/vcr-6.1.0.ebuild
+++ b/dev-ruby/vcr/vcr-6.1.0.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="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md"
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/vcr/vcr/"
 SRC_URI="https://github.com/vcr/vcr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
 SLOT="$(ver_cut 1)"
 IUSE="json test"
 
diff --git a/dev-ruby/vcr/vcr-6.2.0.ebuild b/dev-ruby/vcr/vcr-6.2.0.ebuild
new file mode 100644
index 000000000000..97396eacf382
--- /dev/null
+++ b/dev-ruby/vcr/vcr-6.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md"
+
+RUBY_FAKEGEM_GEMSPEC="vcr.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Records your test suite's HTTP interactions and replay them during test runs"
+HOMEPAGE="https://github.com/vcr/vcr/"
+SRC_URI="https://github.com/vcr/vcr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+SLOT="$(ver_cut 1)"
+IUSE="json test"
+
+# Tests require all supported HTTP libraries to be present, and it is
+# not possible to avoid some of them without very extensive patches.
+RESTRICT="test"
+
+ruby_add_rdepend "json? ( dev-ruby/json )"
diff --git a/dev-ruby/version_gem/Manifest b/dev-ruby/version_gem/Manifest
new file mode 100644
index 000000000000..66cec4983c80
--- /dev/null
+++ b/dev-ruby/version_gem/Manifest
@@ -0,0 +1 @@
+DIST version_gem-1.1.3.tar.bz2 24554 BLAKE2B 419851cb5fcc5391449b28785aecc1c4e145bed4eafb443cdcd284d3b19d0911307afd226e43a829f34784a2fe7ece5e7e00502bfa5a9b0bb7eb49d0b6dcebf4 SHA512 77e90c6c2a52495ad9096fb83a10492f5b9bda35160287e15898351204ead174677021bde58f5dc7cd8f02f1d599736b3c3b7aba291f73e44edece10c61646e4
diff --git a/dev-ruby/version_gem/metadata.xml b/dev-ruby/version_gem/metadata.xml
new file mode 100644
index 000000000000..bcdd12220565
--- /dev/null
+++ b/dev-ruby/version_gem/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">oauth-xx/version_gem</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/version_gem/version_gem-1.1.3.ebuild b/dev-ruby/version_gem/version_gem-1.1.3.ebuild
new file mode 100644
index 000000000000..51562f14aa2a
--- /dev/null
+++ b/dev-ruby/version_gem/version_gem-1.1.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="version_gem.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+#RUBY_FAKEGEM_GEMSPEC="oauth.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Enhance that VERSION! Sugar for boring Version modules"
+HOMEPAGE="https://gitlab.com/oauth-xx/version_gem"
+SRC_URI="https://gitlab.com/oauth-xx/version_gem/-/archive/v${PV}/version_gem-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+RUBY_S="version_gem-v${PV}"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-block_is_expected )"
+
+all_ruby_prepare() {
+	sed -i -e 's/if RUN_COVERAGE/if false/' spec/spec_helper.rb || die
+
+	# Avoid broken implementation already fixed upstream
+	sed -i -e "s/'when actual' do/'when actual', pending: 'broken spec' do/" spec/version_gem/ruby_spec.rb || die
+}
diff --git a/dev-ruby/virtus/Manifest b/dev-ruby/virtus/Manifest
index 3735a9360e63..00f43398aaba 100644
--- a/dev-ruby/virtus/Manifest
+++ b/dev-ruby/virtus/Manifest
@@ -1 +1 @@
-DIST virtus-1.0.5.gem 49152 BLAKE2B 24f422d96b10c38f9599c48a2018dac5b5bb8979acce1ee206b11d64d74a852ffbd276b78bd55b3b184cc109eb00d27ff1347d143695a4e06edfb94a3e87fd5b SHA512 468b74d6a49410bb4e59c535b9f7736cd5e4743817f19f97483247b0d259e17b069044bd5ccc787d72df972d37903eb7c9a9d6ca0c6642c550f1c84a3bc71825
+DIST virtus-2.0.0.gem 50176 BLAKE2B 16a8977b782691faa48e239354c8d25d63e350bcc0e8499691586021817d462e7575eb9d6c6911c371e00a711bc404f2be6dae2168d167fc683049fb14c798f6 SHA512 17f1a0b13ca0912d0a245886b7d8c1b0bcb9f08c1ac3c89d8e5de234e6afa3989c4f15b555342827ab3f8a5570e888bfee893aff851189b1769fb34fb3f1a64a
diff --git a/dev-ruby/virtus/files/virtus-1.0.5-equalizer.patch b/dev-ruby/virtus/files/virtus-1.0.5-equalizer.patch
deleted file mode 100644
index 22fc19298505..000000000000
--- a/dev-ruby/virtus/files/virtus-1.0.5-equalizer.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From 5f33f8147fc9d84e69a33758b000486ebe42c8ae Mon Sep 17 00:00:00 2001
-From: Sergey Novik <konnigun@gmail.com>
-Date: Sun, 19 Jul 2015 18:11:07 +0300
-Subject: [PATCH 1/3] Add specs for attributes comparison (based on latest
- Equalizer gem working version)
-
----
- spec/unit/virtus/attribute/comparison_spec.rb | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
- create mode 100644 spec/unit/virtus/attribute/comparison_spec.rb
-
-diff --git a/spec/unit/virtus/attribute/comparison_spec.rb b/spec/unit/virtus/attribute/comparison_spec.rb
-new file mode 100644
-index 0000000..0b51a9c
---- /dev/null
-+++ b/spec/unit/virtus/attribute/comparison_spec.rb
-@@ -0,0 +1,23 @@
-+require 'spec_helper'
-+
-+describe Virtus::Attribute, '#== (defined by including Virtus::Equalizer)' do
-+  let(:attribute) { described_class.build(String, :name => :name) }
-+
-+  # Currently that's the way it works and it happens because default_value objects
-+  # don't have equalizer, resulting in  attributes object mismatch.
-+  # This behavior (and a spec) will need a change in future.
-+  it 'returns false when attributes have same type and options' do
-+    equal_attribute = described_class.build(String, :name => :name)
-+    expect(attribute == equal_attribute).to be_falsey
-+  end
-+
-+  it 'returns false when attributes have different type' do
-+    different_attribute = described_class.build(Integer, :name => :name)
-+    expect(attribute == different_attribute).to be_falsey
-+  end
-+
-+  it 'returns false when attributes have different options' do
-+    different_attribute = described_class.build(Integer, :name => :name_two)
-+    expect(attribute == different_attribute).to be_falsey
-+  end
-+end
-
-From 3748f6eb2cf368d6a78fb1ef50c2724648d96a9b Mon Sep 17 00:00:00 2001
-From: Sergey Novik <konnigun@gmail.com>
-Date: Sun, 19 Jul 2015 18:11:24 +0300
-Subject: [PATCH 2/3] Use Virtus::Equalizer instead of Equalizer gem in
- Virtus#Attribute (behavior preserved)
-
----
- lib/virtus/attribute.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/virtus/attribute.rb b/lib/virtus/attribute.rb
-index 999a2ef..0654d4d 100644
---- a/lib/virtus/attribute.rb
-+++ b/lib/virtus/attribute.rb
-@@ -18,7 +18,7 @@ module Virtus
-   class Attribute
-     extend DescendantsTracker, Options, TypeLookup
- 
--    include ::Equalizer.new(:type, :options)
-+    include Equalizer.new(inspect) << :type << :options
- 
-     accept_options :primitive, :accessor, :default, :lazy, :strict, :required, :finalize, :nullify_blank
- 
-
-From ef57af319334a1d4f3e0860acbde7c6d6f0eb8ef Mon Sep 17 00:00:00 2001
-From: Sergey Novik <konnigun@gmail.com>
-Date: Sun, 19 Jul 2015 18:26:50 +0300
-Subject: [PATCH 3/3] Change behavior of Attribute#== method
-
-By changing Coercer#== and DefaultValue#== methods, we allow
-Attribute#== to actually compare objects now (before, every comparison
-would return `false` because of different instances of DefaultValue
-model in options[:default_value] key.
----
- lib/virtus/attribute/default_value.rb              |  2 ++
- lib/virtus/coercer.rb                              |  1 +
- spec/unit/virtus/attribute/comparison_spec.rb      |  7 ++-----
- spec/unit/virtus/attribute_set/append_spec.rb      |  8 ++++----
- spec/unit/virtus/attribute_set/element_set_spec.rb | 22 +++++++++++++++-------
- spec/unit/virtus/attribute_set/merge_spec.rb       |  8 +++++---
- 6 files changed, 29 insertions(+), 19 deletions(-)
-
-diff --git a/lib/virtus/attribute/default_value.rb b/lib/virtus/attribute/default_value.rb
-index a2fcd31..eca7350 100644
---- a/lib/virtus/attribute/default_value.rb
-+++ b/lib/virtus/attribute/default_value.rb
-@@ -7,6 +7,8 @@ class Attribute
-     class DefaultValue
-       extend DescendantsTracker
- 
-+      include Equalizer.new(inspect) << :value
-+
-       # Builds a default value instance
-       #
-       # @return [Virtus::Attribute::DefaultValue]
-diff --git a/lib/virtus/coercer.rb b/lib/virtus/coercer.rb
-index a06e273..676d553 100644
---- a/lib/virtus/coercer.rb
-+++ b/lib/virtus/coercer.rb
-@@ -3,6 +3,7 @@ module Virtus
-   # Abstract coercer class
-   #
-   class Coercer
-+    include Equalizer.new(inspect) << :primitive << :type
- 
-     # @api private
-     attr_reader :primitive, :type
-diff --git a/spec/unit/virtus/attribute/comparison_spec.rb b/spec/unit/virtus/attribute/comparison_spec.rb
-index 0b51a9c..796cd20 100644
---- a/spec/unit/virtus/attribute/comparison_spec.rb
-+++ b/spec/unit/virtus/attribute/comparison_spec.rb
-@@ -3,12 +3,9 @@
- describe Virtus::Attribute, '#== (defined by including Virtus::Equalizer)' do
-   let(:attribute) { described_class.build(String, :name => :name) }
- 
--  # Currently that's the way it works and it happens because default_value objects
--  # don't have equalizer, resulting in  attributes object mismatch.
--  # This behavior (and a spec) will need a change in future.
--  it 'returns false when attributes have same type and options' do
-+  it 'returns true when attributes have same type and options' do
-     equal_attribute = described_class.build(String, :name => :name)
--    expect(attribute == equal_attribute).to be_falsey
-+    expect(attribute == equal_attribute).to be_truthy
-   end
- 
-   it 'returns false when attributes have different type' do
-diff --git a/spec/unit/virtus/attribute_set/append_spec.rb b/spec/unit/virtus/attribute_set/append_spec.rb
-index 7fbb20a..577b07e 100644
---- a/spec/unit/virtus/attribute_set/append_spec.rb
-+++ b/spec/unit/virtus/attribute_set/append_spec.rb
-@@ -38,10 +38,10 @@
- 
-     it { is_expected.to equal(object) }
- 
--    it 'replaces the original attribute' do
--      expect { subject }.to change { object.to_a }.
--        from(attributes).
--        to([ attribute ])
-+    it "replaces the original attribute object" do
-+      expect { subject }.to change { object.to_a.map(&:__id__) }.
-+      from(attributes.map(&:__id__)).
-+      to([attribute.__id__])
-     end
-   end
- end
-diff --git a/spec/unit/virtus/attribute_set/element_set_spec.rb b/spec/unit/virtus/attribute_set/element_set_spec.rb
-index 5db7e41..8d9c638 100644
---- a/spec/unit/virtus/attribute_set/element_set_spec.rb
-+++ b/spec/unit/virtus/attribute_set/element_set_spec.rb
-@@ -37,20 +37,28 @@
- 
-     it { is_expected.to equal(attribute) }
- 
--    it 'replaces the original attribute' do
--      expect { subject }.to change { object.to_a }.from(attributes).to([ attribute ])
-+    it "replaces the original attribute object" do
-+      expect { subject }.to change { object.to_a.map(&:__id__) }.
-+      from(attributes.map(&:__id__)).
-+      to([attribute.__id__])
-     end
- 
--    it 'allows #[] to access the attribute with a symbol' do
--      expect { subject }.to change { object['name'] }.from(original).to(attribute)
-+    it 'allows #[] to access the attribute with a string' do
-+      expect { subject }.to change { object['name'].__id__ }.
-+      from(original.__id__).
-+      to(attribute.__id__)
-     end
- 
--    it 'allows #[] to access the attribute with a string' do
--      expect { subject }.to change { object[:name] }.from(original).to(attribute)
-+    it 'allows #[] to access the attribute with a symbol' do
-+      expect { subject }.to change { object[:name].__id__ }.
-+      from(original.__id__).
-+      to(attribute.__id__)
-     end
- 
-     it 'allows #reset to track overridden attributes' do
--      expect { subject }.to change { object.reset.to_a }.from(attributes).to([ attribute ])
-+      expect { subject }.to change { object.reset.to_a.map(&:__id__) }.
-+      from(attributes.map(&:__id__)).
-+      to([attribute.__id__])
-     end
-   end
- end
-diff --git a/spec/unit/virtus/attribute_set/merge_spec.rb b/spec/unit/virtus/attribute_set/merge_spec.rb
-index 72dc39c..9981ece 100644
---- a/spec/unit/virtus/attribute_set/merge_spec.rb
-+++ b/spec/unit/virtus/attribute_set/merge_spec.rb
-@@ -21,12 +21,14 @@
- 
-   context 'with a duplicate attribute' do
-     let(:attributes) { [Virtus::Attribute.build(String, :name => name)] }
--    let(:attribute)  { Virtus::Attribute.build(String, :name => name) }
-+    let(:attribute)  {  Virtus::Attribute.build(String, :name => name) }
- 
-     it { is_expected.to equal(object) }
- 
--    it 'replaces the original attribute' do
--      expect { subject }.to change { object.to_a }.from(attributes).to([attribute])
-+    it "replaces the original attribute object" do
-+      expect { subject }.to change { object.to_a.map(&:__id__) }.
-+      from(attributes.map(&:__id__)).
-+      to([attribute.__id__])
-     end
-   end
- end
diff --git a/dev-ruby/virtus/virtus-1.0.5.ebuild b/dev-ruby/virtus/virtus-1.0.5.ebuild
deleted file mode 100644
index 331877bd8fb7..000000000000
--- a/dev-ruby/virtus/virtus-1.0.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md CONTRIBUTING.md README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attributes on Steroids for Plain Old Ruby Objects"
-HOMEPAGE="https://github.com/solnic/virtus https://rubygems.org/gems/virtus"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-equalizer.patch" )
-
-ruby_add_rdepend ">=dev-ruby/axiom-types-0.1
-	<dev-ruby/axiom-types-1
-	>=dev-ruby/coercible-1.0
-	<dev-ruby/coercible-2
-	>=dev-ruby/descendants_tracker-0.0.3
-	<dev-ruby/descendants_tracker-1
-	>=dev-ruby/equalizer-0.0.9
-	<dev-ruby/equalizer-1"
-
-ruby_add_bdepend "test? (
-	dev-ruby/inflecto
-	dev-ruby/bogus
-)"
diff --git a/dev-ruby/virtus/virtus-2.0.0.ebuild b/dev-ruby/virtus/virtus-2.0.0.ebuild
new file mode 100644
index 000000000000..ba61caa6a249
--- /dev/null
+++ b/dev-ruby/virtus/virtus-2.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md CONTRIBUTING.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Attributes on Steroids for Plain Old Ruby Objects"
+HOMEPAGE="https://github.com/solnic/virtus https://rubygems.org/gems/virtus"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/axiom-types-0.1
+	<dev-ruby/axiom-types-1
+	>=dev-ruby/coercible-1.0
+	<dev-ruby/coercible-2
+	>=dev-ruby/descendants_tracker-0.0.3
+	<dev-ruby/descendants_tracker-1
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bogus
+)"
+
+all_ruby_prepare() {
+	# Avoid specs that require unpackaged dry-inflector for now.
+	rm -f spec/unit/virtus/class_methods/finalize_spec.rb || die
+
+	# Fix specs for ruby 3.2
+	sed -i -e 's/Fixnum/Integer/' spec/integration/inheritance_spec.rb || die
+
+	# Avoid developer dependencies
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/vlad/vlad-2.7.1-r1.ebuild b/dev-ruby/vlad/vlad-2.7.1-r1.ebuild
new file mode 100644
index 000000000000..38a8ba0ce20d
--- /dev/null
+++ b/dev-ruby/vlad/vlad-2.7.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="considerations.txt History.txt README.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pragmatic application deployment automation, without mercy"
+HOMEPAGE="https://github.com/seattlerb/vlad"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_bdepend ">=dev-ruby/hoe-3.13
+	test? ( >=dev-ruby/minitest-5.7 )"
+ruby_add_rdepend ">=dev-ruby/rake-remote_task-2.3"
+
+all_ruby_prepare() {
+	# Keep Isolate from managing the dependencies.
+	sed -i -e '/isolate/ s:^:#:' -e '/rubyforge/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/vlad/vlad-2.7.1.ebuild b/dev-ruby/vlad/vlad-2.7.1.ebuild
deleted file mode 100644
index 2f3a13270c3d..000000000000
--- a/dev-ruby/vlad/vlad-2.7.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="considerations.txt History.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pragmatic application deployment automation, without mercy"
-HOMEPAGE="https://github.com/seattlerb/vlad"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend ">=dev-ruby/hoe-3.13
-	test? ( >=dev-ruby/minitest-5.7 )"
-ruby_add_rdepend ">=dev-ruby/rake-remote_task-2.3"
-
-all_ruby_prepare() {
-	# Keep Isolate from managing the dependencies.
-	sed -i -e '/isolate/ s:^:#:' -e '/rubyforge/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/warden/metadata.xml b/dev-ruby/warden/metadata.xml
index 7f87dd1fb8fb..b3477bf38d5f 100644
--- a/dev-ruby/warden/metadata.xml
+++ b/dev-ruby/warden/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">hassox/warden</remote-id>
+    <remote-id type="github">wardencommunity/warden</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/warden/warden-1.2.9-r1.ebuild b/dev-ruby/warden/warden-1.2.9-r1.ebuild
index 5806b7b14cd5..440afa9c2907 100644
--- a/dev-ruby/warden/warden-1.2.9-r1.ebuild
+++ b/dev-ruby/warden/warden-1.2.9-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -23,6 +23,10 @@ IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rack-2.0.9:*"
 
+ruby_add_bdepend "test? ( dev-ruby/rack:2.2 )"
+
 all_ruby_prepare() {
 	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '1igem "rack", "<3"' spec/spec_helper.rb || die
 }
diff --git a/dev-ruby/warden/warden-1.2.9.ebuild b/dev-ruby/warden/warden-1.2.9.ebuild
deleted file mode 100644
index 8075b9c43785..000000000000
--- a/dev-ruby/warden/warden-1.2.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="General Rack Authentication Framework"
-HOMEPAGE="https://github.com/wardencommunity/warden"
-SRC_URI="https://github.com/wardencommunity/warden/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rack-2.0.9:*"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/warning/Manifest b/dev-ruby/warning/Manifest
new file mode 100644
index 000000000000..2a94b4ffb5db
--- /dev/null
+++ b/dev-ruby/warning/Manifest
@@ -0,0 +1 @@
+DIST warning-1.3.0.tar.gz 10376 BLAKE2B 661e2af457805542e07db2eacdbc867ffda66a574a981b6834063fc497eacfa565f01ad21a0c6b0c57185a8019e0fd2d80ae14b77f902dc3378f7f655ee07000 SHA512 a6d1ef0a70f024d9527dbbe2236805a32c6aa9d00def92f1a345f4f0bc8757d23d6933784c96e9282fba038c276999b85f2d0c1bd581a2c1994efd6440adc39f
diff --git a/dev-ruby/warning/metadata.xml b/dev-ruby/warning/metadata.xml
new file mode 100644
index 000000000000..2b047cc3a096
--- /dev/null
+++ b/dev-ruby/warning/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version = '1.0' encoding = 'UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jeremyevans/ruby-warning</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/warning/warning-1.3.0.ebuild b/dev-ruby/warning/warning-1.3.0.ebuild
new file mode 100644
index 000000000000..16e4ab7846fe
--- /dev/null
+++ b/dev-ruby/warning/warning-1.3.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+RUBY_FAKEGEM_GEMSPEC="warning.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Custom processing for warnings"
+
+HOMEPAGE="https://github.com/jeremyevans/ruby-warning"
+SRC_URI="https://github.com/jeremyevans/ruby-warning/archive/${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-${P}"
+LICENSE="MIT"
+
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest-global_expectations )"
diff --git a/dev-ruby/web-console/Manifest b/dev-ruby/web-console/Manifest
index 8e4a74e49aa4..e11e6ca37822 100644
--- a/dev-ruby/web-console/Manifest
+++ b/dev-ruby/web-console/Manifest
@@ -1,2 +1,2 @@
-DIST web-console-3.7.0.tar.gz 53714 BLAKE2B d69a7b467e419e87d43c988026f278aea5ca142e336d120e0a50ef85b36186d2f388d551f19820e01d85fdca5a49c471aed69cb2ae0d6f1828a99350dfe86d55 SHA512 d44e4dc3ef12216829b3f522e3645b0fa9b8ae34fa70b5e52a96e345b8b5fc8dad9af6f9918ea23d276cae03445133b15f780041a8cb61584b182ca6934fd71b
 DIST web-console-4.2.0.tar.gz 53991 BLAKE2B 8145e5bf2e13230c7411a49af34129130fb99c8a65afc7b628d77572723cdfcb2afbdc9f3be63a9bad0d3d92013cc291882bbe228058e2b84595566a48b5cdba SHA512 3a9fd5c7a184fd28961a4d8d0e4ad9850d8a4fe39a9c97f13cbd78b34a69be49a78ad94570fcd45e8af6ef523948ead3fb4350a4e49fbbe76855b4115a9afc61
+DIST web-console-4.2.1.tar.gz 54529 BLAKE2B 71cda457da24db4f96205557a37afe46ffa0cf4beea79c8249135c31fa5ce01cf1484213bb935ac4ff6849c4f71d11c7545c1888df27f13c9e9bb417b92ecd23 SHA512 3800f89f430927eb7b77f3f613a223d666ae135958d38fc215139a77d74a21f87207c7002f364a916e021486063d2a67aed3a7d12210674add7608b89e9ff2e5
diff --git a/dev-ruby/web-console/web-console-3.7.0.ebuild b/dev-ruby/web-console/web-console-3.7.0.ebuild
deleted file mode 100644
index 01beea3d2e88..000000000000
--- a/dev-ruby/web-console/web-console-3.7.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
-
-RUBY_FAKEGEM_GEMSPEC="web-console.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A debugging tool for your Ruby on Rails applications"
-HOMEPAGE="https://github.com/rails/web-console"
-SRC_URI="https://github.com/rails/web-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/actionview-5.0:*
-	>=dev-ruby/activemodel-5.0:*
-	>=dev-ruby/bindex-0.4.0
-	>=dev-ruby/railties-5.0:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	>=dev-ruby/rails-5.0
-	dev-ruby/sqlite3
-	dev-ruby/mocha
-	www-servers/puma
-)"
-
-all_ruby_prepare() {
-	# Use an installed rails version rather than live source from github.
-	sed -i -e '/\(rack\|rails\|simplecov\)/ s/,/#/'  \
-		-e '/\(byebug\|simplecov\)/ s:^:#:' Gemfile || die
-
-	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/web-console/web-console-4.2.0.ebuild b/dev-ruby/web-console/web-console-4.2.0.ebuild
index 0f4c0b146834..d8c735f6df97 100644
--- a/dev-ruby/web-console/web-console-4.2.0.ebuild
+++ b/dev-ruby/web-console/web-console-4.2.0.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"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
 
diff --git a/dev-ruby/web-console/web-console-4.2.1.ebuild b/dev-ruby/web-console/web-console-4.2.1.ebuild
new file mode 100644
index 000000000000..088894682e5a
--- /dev/null
+++ b/dev-ruby/web-console/web-console-4.2.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
+
+RUBY_FAKEGEM_GEMSPEC="web-console.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A debugging tool for your Ruby on Rails applications"
+HOMEPAGE="https://github.com/rails/web-console"
+SRC_URI="https://github.com/rails/web-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/actionview-6.0:*
+	>=dev-ruby/activemodel-6.0:*
+	>=dev-ruby/bindex-0.4.0
+	>=dev-ruby/railties-6.0:*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	>=dev-ruby/rails-6.0
+	dev-ruby/rack
+	dev-ruby/sqlite3
+	dev-ruby/mocha
+	www-servers/puma
+)"
+
+all_ruby_prepare() {
+	# Use an installed rails version rather than live source from github, and
+	# rack is now part of rails.
+	sed -e '/\(rack\|arel\|rails\|simplecov\)/ s/,/#/'  \
+		-e '/\(byebug\|simplecov\)/ s:^:#:' \
+		-e '/arel/ s:^:#:' \
+		-i Gemfile || die
+
+	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index 11009279069d..2a6816d91bbe 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1 +1,3 @@
-DIST webmock-3.14.0.gem 126976 BLAKE2B 20dd463c8b784869d4379aeabf892a6b4602091a4cc01a4002161d88f24781bb2bae1e50bd0ce8077c40aab73a2243835d99551bd04d808ffdf019df071c2b01 SHA512 0c9ea5b29446de7619c45d0fb72ab305bf68150c9d657ddc223d0d258a400dc730e3fe401b46c994a5c8eb450db5ee8f7021fe8d2d6c85bc4723c657799c5ccc
+DIST webmock-3.18.1.gem 128000 BLAKE2B 792622ef256e5b106e480f40fbec06bfb970b41d5745dc50be125143b925f5ba1fb7c28173d39268550076d6bd5803a0150740ecdcc31537415af3fb1da9e7d6 SHA512 109f1ced28c4c273f75378e193b772314854fdb5ceea2ef1926d8b790169d07cdb30fdbe1c12e3461a9307f3fea073aa90cfe7421379bf36fa0d550d4bb93c5a
+DIST webmock-3.19.1.tar.gz 127208 BLAKE2B 0753201f8584159a01d73aecc0670bafaaad059c9b08befa51d482916cfeec50d272f6772de11b76f9b209b960021c2d92042094aa853fb4f7e082340c0807f8 SHA512 40fb5587221693662e8c970aab52b4e73114c45f26850f05799b8cc0ae5f18a2b2941ab4c5d595dbd40501b93d421c9cb3158e911a8c9b31b97966cfcebe4b14
+DIST webmock-3.23.0.tar.gz 129686 BLAKE2B 28210f5836af9b3ad66edf84380c318b055817602ee03001929613678fcad799f1a5efb79e09ec78a4aae74e162d14f8efe80b8917869392c99e590ac9cfac9f SHA512 39e8f85e0bb5ee2a497e3ae88ba8aadbbc72bee304f095c82502662cdb676cf5d00732eb89dcb75ba31ca5ab4fd87011687250df081071f43ea3486214b395ab
diff --git a/dev-ruby/webmock/webmock-3.14.0.ebuild b/dev-ruby/webmock/webmock-3.14.0.ebuild
deleted file mode 100644
index 14e65474461e..000000000000
--- a/dev-ruby/webmock/webmock-3.14.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
-HOMEPAGE="https://github.com/bblimke/webmock"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.8.0
-	>=dev-ruby/crack-0.3.2
-	>=dev-ruby/hashdiff-0.4.0:0
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/rspec:3
-	>=dev-ruby/test-unit-3.0.0
-	dev-ruby/rack
-	>=dev-ruby/httpclient-2.8.0
-)"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
-
-	# There is now optional support for curb and typhoeus which we don't
-	# have in Gentoo yet. em_http_request is available in Gentoo but its
-	# version is too old. patron's latest version is not compatible.
-	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\)/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client}/* || die
-
-	# Drop tests for dev-ruby/http for now since this package only works with ruby26
-	sed -i -e '/http_rb/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/acceptance/http_rb/* || die
-
-	# Avoid httpclient specs that require network access, most likely
-	# because mocking does not fully work.
-	sed -i -e '/httpclient streams response/,/^  end/ s:^:#:' \
-		-e '/are detected when manually specifying Authorization header/,/^    end/ s:^:#:' \
-		spec/acceptance/httpclient/httpclient_spec.rb
-
-	# Avoid specs that require network access
-	sed -i -e '/when request is not stubbed/,/^      end/ s:^:#:' spec/acceptance/shared/callbacks.rb
-}
-
-each_ruby_test() {
-	${RUBY} -S rake test NO_CONNECTION=true || die
-	${RUBY} -S rspec-3 spec || die
-
-	einfo "Delay to allow the test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/webmock/webmock-3.18.1.ebuild b/dev-ruby/webmock/webmock-3.18.1.ebuild
new file mode 100644
index 000000000000..77159821c0b0
--- /dev/null
+++ b/dev-ruby/webmock/webmock-3.18.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
+HOMEPAGE="https://github.com/bblimke/webmock"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.8.0
+	>=dev-ruby/crack-0.3.2
+	>=dev-ruby/hashdiff-0.4.0:0
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/rspec:3
+	>=dev-ruby/test-unit-3.0.0
+	dev-ruby/rack
+	dev-ruby/webrick
+)"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
+
+	# There is now optional support for curb and typhoeus which we don't
+	# have in Gentoo yet. em_http_request is available in Gentoo but its
+	# version is too old. patron's latest version is not compatible.
+	# httpclient is no longer maintained and has various test failures.
+	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\|httpclient\)/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client,httpclient}/* || die
+
+	# Drop tests for dev-ruby/http for now since this package only works with ruby26
+	sed -i -e '/http_rb/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/acceptance/http_rb/* || die
+
+	# Avoid specs that require network access
+	sed -i -e '/when request is not stubbed/,/^      end/ s:^:#:' spec/acceptance/shared/callbacks.rb
+}
+
+each_ruby_test() {
+	${RUBY} -S rake test NO_CONNECTION=true || die
+	${RUBY} -S rspec-3 spec || die
+
+	einfo "Delay to allow the test server to stop"
+	sleep 10
+}
diff --git a/dev-ruby/webmock/webmock-3.19.1.ebuild b/dev-ruby/webmock/webmock-3.19.1.ebuild
new file mode 100644
index 000000000000..a49326e4f027
--- /dev/null
+++ b/dev-ruby/webmock/webmock-3.19.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="webmock.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
+HOMEPAGE="https://github.com/bblimke/webmock"
+SRC_URI="https://github.com/bblimke/webmock/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.8.0
+	>=dev-ruby/crack-0.3.2
+	>=dev-ruby/hashdiff-0.4.0:0
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/rspec:3
+	dev-ruby/rspec-retry
+	>=dev-ruby/test-unit-3.0.0
+	dev-ruby/rack
+	dev-ruby/webrick
+)"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
+
+	# There is now optional support for curb and typhoeus which we don't
+	# have in Gentoo yet. em_http_request is available in Gentoo but its
+	# version is too old. patron's latest version is not compatible.
+	# httpclient is no longer maintained and has various test failures.
+	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\|httpclient\)/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client,httpclient}/* || die
+
+	# Drop tests for dev-ruby/http for now since this package only works with ruby26
+	sed -i -e '/http_rb/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/acceptance/http_rb/* || die
+
+	# Avoid specs that require network access
+	sed -i -e '/when request is not stubbed/,/^      end/ s:^:#:' spec/acceptance/shared/callbacks.rb
+}
+
+each_ruby_test() {
+	${RUBY} -S rake test NO_CONNECTION=true || die
+	${RUBY} -S rspec-3 spec || die
+
+	einfo "Delay to allow the test server to stop"
+	sleep 10
+}
diff --git a/dev-ruby/webmock/webmock-3.23.0.ebuild b/dev-ruby/webmock/webmock-3.23.0.ebuild
new file mode 100644
index 000000000000..475a1b5900b6
--- /dev/null
+++ b/dev-ruby/webmock/webmock-3.23.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="webmock.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
+HOMEPAGE="https://github.com/bblimke/webmock"
+SRC_URI="https://github.com/bblimke/webmock/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.8.0
+	>=dev-ruby/crack-0.3.2
+	>=dev-ruby/hashdiff-0.4.0:0
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/rspec:3
+	dev-ruby/rspec-retry
+	>=dev-ruby/test-unit-3.0.0
+	dev-ruby/rack
+	dev-ruby/webrick
+)"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
+
+	# There is now optional support for curb and typhoeus which we don't
+	# have in Gentoo yet. em_http_request is available in Gentoo but its
+	# version is too old. patron's latest version is not compatible.
+	# httpclient is no longer maintained and has various test failures.
+	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\|httpclient\)/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client,httpclient}/* || die
+
+	# Drop tests for dev-ruby/http for now since this package only works with ruby26
+	sed -i -e '/http_rb/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/acceptance/http_rb/* || die
+
+	# Avoid specs that require network access
+	sed -i -e '/when request is not stubbed/,/^      end/ s:^:#:' spec/acceptance/shared/callbacks.rb
+}
+
+each_ruby_test() {
+	${RUBY} -S rake test NO_CONNECTION=true || die
+	${RUBY} -S rspec-3 spec || die
+
+	einfo "Delay to allow the test server to stop"
+	sleep 10
+}
diff --git a/dev-ruby/webrick/Manifest b/dev-ruby/webrick/Manifest
index 1c0a3f106742..d57b3c2e1cf7 100644
--- a/dev-ruby/webrick/Manifest
+++ b/dev-ruby/webrick/Manifest
@@ -1 +1,2 @@
 DIST webrick-1.7.0.tar.gz 114413 BLAKE2B ff0d09a3137edabde37392d4c8a5e1f37d9899c60db8e96e4034ef60626225c0508c6b2797281878bbb7a0c6db16e20bd46a83b61b3de2ed059cb95e80255a38 SHA512 785e8c6af6e2f8ac497bab6d0ad0e9383fa4c4ac8dee6ceee38e20c5e9b631b805ec3c8f5438ebea651ee4113698de1a370ae506927bdc04e512ea6cac433cd1
+DIST webrick-1.8.1.tar.gz 91111 BLAKE2B eff3f2dff64d017fa0ef5370b07d97bfcd39f1df426a3b04ffdd0b5b0ea43cdd5d267420ea64bd0c3e4de3f1ee88df2f09959fd17b2b158b5ce0ddc16995b2bb SHA512 21cb396887025f85cfe04868e7fa7ef039809ca42a3acadfe1decb4dcd02eeeb3c9163e970324b56a9e0eb6202d971370af56e200c69de2d224c1941f866400c
diff --git a/dev-ruby/webrick/webrick-1.7.0-r1.ebuild b/dev-ruby/webrick/webrick-1.7.0-r1.ebuild
index 9c01c9f4e840..b1530a745e2d 100644
--- a/dev-ruby/webrick/webrick-1.7.0-r1.ebuild
+++ b/dev-ruby/webrick/webrick-1.7.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="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -15,7 +15,7 @@ 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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/webrick/webrick-1.7.0.ebuild b/dev-ruby/webrick/webrick-1.7.0.ebuild
deleted file mode 100644
index 848e0ec7904b..000000000000
--- a/dev-ruby/webrick/webrick-1.7.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="webrick.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An HTTP server toolkit"
-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 ~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
-}
diff --git a/dev-ruby/webrick/webrick-1.8.1.ebuild b/dev-ruby/webrick/webrick-1.8.1.ebuild
new file mode 100644
index 000000000000..bdac5a6095e7
--- /dev/null
+++ b/dev-ruby/webrick/webrick-1.8.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="webrick.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An HTTP server toolkit"
+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 ~x64-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
+}
diff --git a/dev-ruby/webrobots/webrobots-0.1.2-r2.ebuild b/dev-ruby/webrobots/webrobots-0.1.2-r2.ebuild
deleted file mode 100644
index 6217feedc3d3..000000000000
--- a/dev-ruby/webrobots/webrobots-0.1.2-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library to help write robots.txt compliant web robots"
-HOMEPAGE="https://github.com/knu/webrobots"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.4.4"
-
-ruby_add_bdepend "test? ( dev-ruby/shoulda dev-ruby/test-unit:2 dev-ruby/webmock dev-ruby/vcr )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/d' Rakefile test/helper.rb || die
-
-	# Avoid tests for live websites requirering a network connection.
-	sed -i -e '/robots.txt in the real world/,/^  end/ s:^:#:' test/test_webrobots.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test_*.rb
-}
diff --git a/dev-ruby/webrobots/webrobots-0.1.2-r3.ebuild b/dev-ruby/webrobots/webrobots-0.1.2-r3.ebuild
new file mode 100644
index 000000000000..37805bde0fb9
--- /dev/null
+++ b/dev-ruby/webrobots/webrobots-0.1.2-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library to help write robots.txt compliant web robots"
+HOMEPAGE="https://github.com/knu/webrobots"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.4.4"
+
+ruby_add_bdepend "test? ( dev-ruby/shoulda dev-ruby/test-unit:2 dev-ruby/webmock dev-ruby/vcr )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/,/end/d' Rakefile test/helper.rb || die
+
+	# Avoid tests for live websites requirering a network connection.
+	sed -i -e '/robots.txt in the real world/,/^  end/ s:^:#:' test/test_webrobots.rb || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib test/test_*.rb
+}
diff --git a/dev-ruby/websocket-driver/Manifest b/dev-ruby/websocket-driver/Manifest
index 47753f0acd1c..a92156788621 100644
--- a/dev-ruby/websocket-driver/Manifest
+++ b/dev-ruby/websocket-driver/Manifest
@@ -1,2 +1 @@
-DIST websocket-driver-0.6.5.tar.gz 24737 BLAKE2B 137c16a69309a1aad07fff663ff95a888a151f0fa20e78e754ae62ddfc8c2bdbfda926d7f4c53549e92646d018df7f374721e95246eb2985012e6b219970c4c6 SHA512 6915fdefac26a24e1f7d3d9a7e6bc6afc84b491150290a75a14243c233f5029d7d6e90a803b34bd6a8e8717322c6ae6fd4d3f3dad7a50c8eb18f17c3f2e9bbd0
-DIST websocket-driver-0.7.5.tar.gz 26179 BLAKE2B 8e7739d6cf48de5a2ef443f476652af74b269c075aa1e6bc13b2ac3ac17ede1699594a9380a137b307eaaed19ac2868b6a1362a66f835262f18e82f81c8e445f SHA512 538c78cd39507fb6cddeaa6196f0e2bbb89d7293f062d9b0231b6c6988a46b718c91b69a50b4cbf5b227067e6ed4ee89c61759bf340fc3e483c4af97052d42f9
+DIST websocket-driver-0.7.6.tar.gz 26332 BLAKE2B e8da76846b519603f7eef9cef53afdff3d48176cba21de1ce6b17e3718dd33b8309aaca721d4d11480e34e04b1ed2bfbb8892af507fbc72c1ff846c800f46499 SHA512 5444a0748821ab651e9e5ed40fd737c9af50eca1f8046b3110ab436bb8c0c56250ee8a8e762ae1668249d9ebfa2712b52802950529a949aba2574ffc66c1c58a
diff --git a/dev-ruby/websocket-driver/websocket-driver-0.6.5-r1.ebuild b/dev-ruby/websocket-driver/websocket-driver-0.6.5-r1.ebuild
deleted file mode 100644
index 6d1d0117d699..000000000000
--- a/dev-ruby/websocket-driver/websocket-driver-0.6.5-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/websocket-driver/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="A complete implementation of the WebSocket protocols"
-HOMEPAGE="https://github.com/faye/websocket-driver-ruby"
-SRC_URI="https://github.com/faye/websocket-driver-ruby/archive/${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-ruby-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/websocket-extensions-0.1.0"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/websocket-driver/websocket-driver-0.7.5.ebuild b/dev-ruby/websocket-driver/websocket-driver-0.7.5.ebuild
deleted file mode 100644
index fffb5983f6ca..000000000000
--- a/dev-ruby/websocket-driver/websocket-driver-0.7.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/websocket-driver/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="A complete implementation of the WebSocket protocols"
-HOMEPAGE="https://github.com/faye/websocket-driver-ruby"
-SRC_URI="https://github.com/faye/websocket-driver-ruby/archive/${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-ruby-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0.7"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/websocket-extensions-0.1.0"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/websocket-driver/websocket-driver-0.7.6.ebuild b/dev-ruby/websocket-driver/websocket-driver-0.7.6.ebuild
new file mode 100644
index 000000000000..b5338e18052a
--- /dev/null
+++ b/dev-ruby/websocket-driver/websocket-driver-0.7.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/websocket-driver/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="A complete implementation of the WebSocket protocols"
+HOMEPAGE="https://github.com/faye/websocket-driver-ruby"
+SRC_URI="https://github.com/faye/websocket-driver-ruby/archive/${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-ruby-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0.7"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/websocket-extensions-0.1.0"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/websocket-extensions/files/websocket-extensions-0.1.5-rspec-mocks.patch b/dev-ruby/websocket-extensions/files/websocket-extensions-0.1.5-rspec-mocks.patch
new file mode 100644
index 000000000000..152972e232dc
--- /dev/null
+++ b/dev-ruby/websocket-extensions/files/websocket-extensions-0.1.5-rspec-mocks.patch
@@ -0,0 +1,37 @@
+From 5891358639fcfa7a2e2004855275bd7da0c85c64 Mon Sep 17 00:00:00 2001
+From: James Coglan <jcoglan@gmail.com>
+Date: Sun, 6 Feb 2022 23:36:18 +0000
+Subject: [PATCH] As of rspec-mocks v3.10.3, mock expectations need to use
+ explicit hashes to avoid confusion with keyword args
+
+---
+ spec/websocket/extensions_spec.rb | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/spec/websocket/extensions_spec.rb b/spec/websocket/extensions_spec.rb
+index 7c1e4f1..ccb305d 100644
+--- a/spec/websocket/extensions_spec.rb
++++ b/spec/websocket/extensions_spec.rb
+@@ -134,18 +134,18 @@
+       end
+ 
+       it "activates one session with a boolean param" do
+-        expect(@session).to receive(:activate).with("gzip" => true).exactly(1).and_return(true)
++        expect(@session).to receive(:activate).with({ "gzip" => true }).exactly(1).and_return(true)
+         @extensions.activate("deflate; gzip")
+       end
+ 
+       it "activates one session with a string param" do
+-        expect(@session).to receive(:activate).with("mode" => "compress").exactly(1).and_return(true)
++        expect(@session).to receive(:activate).with({ "mode" => "compress" }).exactly(1).and_return(true)
+         @extensions.activate("deflate; mode=compress")
+       end
+ 
+       it "activate multiple sessions" do
+-        expect(@session).to receive(:activate).with("a" => true).exactly(1).and_return(true)
+-        expect(@nonconflict_session).to receive(:activate).with("b" => true).exactly(1).and_return(true)
++        expect(@session).to receive(:activate).with({ "a" => true }).exactly(1).and_return(true)
++        expect(@nonconflict_session).to receive(:activate).with({ "b" => true }).exactly(1).and_return(true)
+         @extensions.activate("deflate; a, reverse; b")
+       end
+ 
diff --git a/dev-ruby/websocket-extensions/websocket-extensions-0.1.5-r1.ebuild b/dev-ruby/websocket-extensions/websocket-extensions-0.1.5-r1.ebuild
deleted file mode 100644
index 030cd8b81b8a..000000000000
--- a/dev-ruby/websocket-extensions/websocket-extensions-0.1.5-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="websocket-extensions.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Generic extension manager for WebSocket connections"
-HOMEPAGE="https://github.com/faye/websocket-extensions-ruby"
-SRC_URI="https://github.com/faye/websocket-extensions-ruby/archive/${PV}.tar.gz -> ${P}-r1.tar.gz"
-RUBY_S="${PN}-ruby-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
diff --git a/dev-ruby/websocket-extensions/websocket-extensions-0.1.5-r2.ebuild b/dev-ruby/websocket-extensions/websocket-extensions-0.1.5-r2.ebuild
new file mode 100644
index 000000000000..2b78aff419cd
--- /dev/null
+++ b/dev-ruby/websocket-extensions/websocket-extensions-0.1.5-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="websocket-extensions.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Generic extension manager for WebSocket connections"
+HOMEPAGE="https://github.com/faye/websocket-extensions-ruby"
+SRC_URI="https://github.com/faye/websocket-extensions-ruby/archive/${PV}.tar.gz -> ${P}-r1.tar.gz"
+RUBY_S="${PN}-ruby-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-rspec-mocks.patch )
diff --git a/dev-ruby/websocket/Manifest b/dev-ruby/websocket/Manifest
index 7d9e4572a5fc..3b3c917a4fbb 100644
--- a/dev-ruby/websocket/Manifest
+++ b/dev-ruby/websocket/Manifest
@@ -1 +1,2 @@
+DIST websocket-1.2.10.gem 28672 BLAKE2B 352289d39d374032bd8ab11ec1c38f0b3abb3c3ec7cdb05373d5ccdc7419d896088412657b54cbcd93b15d4bab07a3fdf27829a38e35a0c62f09eed1b8302a05 SHA512 c06598a4988b1a4361ba55d807577c756d82295e5c5316fe9f0492a32776599b8ce878615c5c0d4ed2d70d37bfed5ec188398922dd140fd195b894262df63f57
 DIST websocket-1.2.9.gem 28160 BLAKE2B 1d0423050d26ee9c719de1803bd5fbcda80acb2c47825e2ad4203b8ac6e3e9a925fbe3cab8f5c0b283841dbfdbb97b753cc4f2c7a9c689486dadd9573b8fb87d SHA512 42044df313e1ca2525700decaac6f77b8bf9d4f1dd21723de408c636196e9f77c4b9d865abeb1de68575ad3b59ad48a9e7c30f0e16dbd15695958f8cf6ca3d57
diff --git a/dev-ruby/websocket/files/websocket-1.2.9-default-port.patch b/dev-ruby/websocket/files/websocket-1.2.9-default-port.patch
new file mode 100644
index 000000000000..5830036da62e
--- /dev/null
+++ b/dev-ruby/websocket/files/websocket-1.2.9-default-port.patch
@@ -0,0 +1,134 @@
+https://github.com/imanel/websocket-ruby/commit/736a7515aff808a5c268b87066e928b59aed769e
+
+From 736a7515aff808a5c268b87066e928b59aed769e Mon Sep 17 00:00:00 2001
+From: Bernard Potocki <bernard.potocki@imanel.org>
+Date: Thu, 17 Feb 2022 20:02:21 +0100
+Subject: [PATCH] Ensure correct port is always specified (#48)
+
+--- a/lib/websocket/handshake/base.rb
++++ b/lib/websocket/handshake/base.rb
+@@ -7,7 +7,7 @@ class Base
+       include ExceptionHandler
+       include NiceInspect
+ 
+-      attr_reader :host, :port, :path, :query,
++      attr_reader :host, :path, :query,
+                   :state, :version, :secure,
+                   :headers, :protocols
+ 
+@@ -66,6 +66,20 @@ def leftovers
+         (@leftovers.to_s.split("\n", reserved_leftover_lines + 1)[reserved_leftover_lines] || '').strip
+       end
+ 
++      # Return default port for protocol (80 for ws, 443 for wss)
++      def default_port
++        secure ? 443 : 80
++      end
++
++      # Check if provided port is a default one
++      def default_port?
++        port == default_port
++      end
++
++      def port
++        @port || default_port
++      end
++
+       # URI of request.
+       # @return [String] Full URI with protocol
+       # @example
+@@ -73,7 +87,7 @@ def leftovers
+       def uri
+         uri =  String.new(secure ? 'wss://' : 'ws://')
+         uri << host
+-        uri << ":#{port}" if port
++        uri << ":#{port}" unless default_port?
+         uri << path
+         uri << "?#{query}" if query
+         uri
+--- a/lib/websocket/handshake/client.rb
++++ b/lib/websocket/handshake/client.rb
+@@ -61,7 +61,7 @@ def initialize(args = {})
+           uri = URI.parse(@url || @uri)
+           @secure ||= (uri.scheme == 'wss')
+           @host ||= uri.host
+-          @port ||= uri.port
++          @port ||= uri.port || default_port
+           @path ||= uri.path
+           @query ||= uri.query
+         end
+--- a/lib/websocket/handshake/handler/client04.rb
++++ b/lib/websocket/handshake/handler/client04.rb
+@@ -21,7 +21,7 @@ def handshake_keys
+             %w[Connection Upgrade]
+           ]
+           host = @handshake.host
+-          host += ":#{@handshake.port}" if @handshake.port
++          host += ":#{@handshake.port}" unless @handshake.default_port?
+           keys << ['Host', host]
+           keys += super
+           keys << ['Sec-WebSocket-Origin', @handshake.origin] if @handshake.origin
+--- a/lib/websocket/handshake/handler/client75.rb
++++ b/lib/websocket/handshake/handler/client75.rb
+@@ -18,7 +18,7 @@ def handshake_keys
+             %w[Connection Upgrade]
+           ]
+           host = @handshake.host
+-          host += ":#{@handshake.port}" if @handshake.port
++          host += ":#{@handshake.port}" unless @handshake.default_port?
+           keys << ['Host', host]
+           keys << ['Origin', @handshake.origin] if @handshake.origin
+           keys << ['WebSocket-Protocol', @handshake.protocols.first] if @handshake.protocols.any?
+--- a/lib/websocket/handshake/server.rb
++++ b/lib/websocket/handshake/server.rb
+@@ -129,13 +129,13 @@ def should_respond?
+       # Host of server according to client header
+       # @return [String] host
+       def host
+-        @headers['host'].to_s.split(':')[0].to_s
++        @host || @headers['host'].to_s.split(':')[0].to_s
+       end
+ 
+       # Port of server according to client header
+-      # @return [String] port
++      # @return [Integer] port
+       def port
+-        @headers['host'].to_s.split(':')[1]
++        (@port || @headers['host'].to_s.split(':')[1] || default_port).to_i
+       end
+ 
+       private
+--- a/spec/support/all_client_drafts.rb
++++ b/spec/support/all_client_drafts.rb
+@@ -38,6 +38,10 @@ def validate_request
+     expect(handshake.query).to eql('aaa=bbb')
+   end
+ 
++  it 'returns default port' do
++    expect(handshake.port).to be(80)
++  end
++
+   it 'returns valid port' do
+     @request_params = { port: 123 }
+     expect(handshake.port).to be(123)
+--- a/spec/support/all_server_drafts.rb
++++ b/spec/support/all_server_drafts.rb
+@@ -47,11 +47,17 @@ def validate_request
+     expect(handshake.query).to eql('aaa=bbb')
+   end
+ 
++  it 'returns default port' do
++    handshake << client_request
++
++    expect(handshake.port).to be(80)
++  end
++
+   it 'returns valid port' do
+     @request_params = { port: 123 }
+     handshake << client_request
+ 
+-    expect(handshake.port).to eql('123')
++    expect(handshake.port).to be(123)
+   end
+ 
+   it 'returns valid response' do
diff --git a/dev-ruby/websocket/websocket-1.2.10.ebuild b/dev-ruby/websocket/websocket-1.2.10.ebuild
new file mode 100644
index 000000000000..861f6b2eb148
--- /dev/null
+++ b/dev-ruby/websocket/websocket-1.2.10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Universal Ruby library to handle WebSocket protocol"
+HOMEPAGE="https://github.com/imanel/websocket-ruby"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/rspec-its
+		dev-ruby/webrick
+	)
+"
diff --git a/dev-ruby/websocket/websocket-1.2.9-r1.ebuild b/dev-ruby/websocket/websocket-1.2.9-r1.ebuild
deleted file mode 100644
index d3b4e870357a..000000000000
--- a/dev-ruby/websocket/websocket-1.2.9-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Universal Ruby library to handle WebSocket protocol"
-HOMEPAGE="https://github.com/imanel/websocket-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
diff --git a/dev-ruby/websocket/websocket-1.2.9-r2.ebuild b/dev-ruby/websocket/websocket-1.2.9-r2.ebuild
new file mode 100644
index 000000000000..32f26fb23e92
--- /dev/null
+++ b/dev-ruby/websocket/websocket-1.2.9-r2.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_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Universal Ruby library to handle WebSocket protocol"
+HOMEPAGE="https://github.com/imanel/websocket-ruby"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/rspec-its
+		dev-ruby/webrick
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-default-port.patch
+)
diff --git a/dev-ruby/whole_history_rating/metadata.xml b/dev-ruby/whole_history_rating/metadata.xml
index a3c2d08a4d38..cca2e95794e4 100644
--- a/dev-ruby/whole_history_rating/metadata.xml
+++ b/dev-ruby/whole_history_rating/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>lssndrbarbieri@gmail.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <maintainer type="project">
     <email>ruby@gentoo.org</email>
     <name>Ruby project</name>
diff --git a/dev-ruby/whole_history_rating/whole_history_rating-0.1.2-r1.ebuild b/dev-ruby/whole_history_rating/whole_history_rating-0.1.2-r1.ebuild
deleted file mode 100644
index d661760bac09..000000000000
--- a/dev-ruby/whole_history_rating/whole_history_rating-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_TEST="test_units"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pure ruby implementation of Remi Coulom's Whole-History Rating algorithm"
-HOMEPAGE="https://github.com/goshrine/whole_history_rating"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/matrix"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/test-unit:2
-	)
-"
diff --git a/dev-ruby/whole_history_rating/whole_history_rating-0.1.2-r2.ebuild b/dev-ruby/whole_history_rating/whole_history_rating-0.1.2-r2.ebuild
new file mode 100644
index 000000000000..ae2429ee2142
--- /dev/null
+++ b/dev-ruby/whole_history_rating/whole_history_rating-0.1.2-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST="test_units"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure ruby implementation of Remi Coulom's Whole-History Rating algorithm"
+HOMEPAGE="https://github.com/goshrine/whole_history_rating"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/matrix"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit:2
+	)
+"
diff --git a/dev-ruby/will_paginate/Manifest b/dev-ruby/will_paginate/Manifest
index 7658f048a4d9..886ada85f58d 100644
--- a/dev-ruby/will_paginate/Manifest
+++ b/dev-ruby/will_paginate/Manifest
@@ -1 +1,2 @@
 DIST will_paginate-3.3.1.gem 34816 BLAKE2B c8506fd9c529764e539ba799b3ef12f47e8d17a8579f2337163ab316cb6d9fe40c3d41c94e9616f55b9f3766989b11e5fb0579f0a69d2ee52c3f5c6104f32b7b SHA512 6b17ba13aeb3733811d6ab10f8c873b9f3687c88a86971f2aa820df7d294b304eaf74c699f34aca2242a0be6033db03d07f67d76fc183b2685ee1be53c9c1c64
+DIST will_paginate-4.0.0.tar.gz 36062 BLAKE2B 9d2c61bc7e223be1b94b67807ef80c0d0094c062b06415dd688af8a5e8f62b9eb1a81c84c9fc15ada328cb9df28d354b98cdbbcaa5056cfa3b48a2c6d0ce1be3 SHA512 b6268ef9ec45a03cd21928578ad7df14c80de905b386978cc2dd50b42ea919c9e139ee820362cdd64ed0258bb3f38b3a1c39f4207828891cb1691d16f7699bc0
diff --git a/dev-ruby/will_paginate/will_paginate-3.3.1.ebuild b/dev-ruby/will_paginate/will_paginate-3.3.1.ebuild
index 0c766344ec96..f417796a4b52 100644
--- a/dev-ruby/will_paginate/will_paginate-3.3.1.ebuild
+++ b/dev-ruby/will_paginate/will_paginate-3.3.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"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/will_paginate/will_paginate-4.0.0.ebuild b/dev-ruby/will_paginate/will_paginate-4.0.0.ebuild
new file mode 100644
index 000000000000..c9a6d92dedaf
--- /dev/null
+++ b/dev-ruby/will_paginate/will_paginate-4.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="will_paginate.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Most awesome pagination solution for Ruby"
+HOMEPAGE="https://github.com/mislav/will_paginate/"
+SRC_URI="https://github.com/mislav/will_paginate/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	# Remove tests for unpackaged ORMs
+	rm -f spec/finders/{sequel,mongoid,data_mapper}* || die
+}
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/rails
+		dev-ruby/activerecord[sqlite]
+		dev-ruby/mocha
+	)"
diff --git a/dev-ruby/windows_error/Manifest b/dev-ruby/windows_error/Manifest
index 166474289961..d729e9cd71e6 100644
--- a/dev-ruby/windows_error/Manifest
+++ b/dev-ruby/windows_error/Manifest
@@ -1,2 +1 @@
-DIST windows_error-0.1.3.gem 227328 BLAKE2B 2d0dc8771cd68983bafb3d97d27663e30cb02c67eb982d6b76104ec46405b1a7f055437046dedf068c074deb2b2d1ea49a327109be2f25ea5bd70ab2ee2bd698 SHA512 c74d5a17c44772505b745678c67b3bcaba6710e9b4e59b9aba45daacb6993d3b6529a1f9a53f76e2c31cae922f8f36e40fefa6a232f9ed8ba9034fa109d8317d
-DIST windows_error-0.1.4.gem 227328 BLAKE2B c99a03944dd8c0bfdc3346b49b76a7980510d7665e2f4a53657b699f2134d1c1bf53d5b3b6ef375f7496bb057f3bcca2ad3833f69c9178ac7efb3a31e0fda5a6 SHA512 5731fe7a10264244066d0b282bd273c265519a483c3d6be848c32edb834714b151f1536ae7e16527a0f7fe410ca5f9d3f7dc9dff98a8b175a847a7fd77938a95
+DIST windows_error-0.1.5.gem 359936 BLAKE2B 54b713421f60d77f74048108f5da73edd72607554b2dd16bac15b6be260e5c83fdf2c975793dfdb54ef98109f2b6df3ff848292fe1aca2d8cae837912f359768 SHA512 c79d0d7fb1968edac9868e542b4a81d62b4dd549de0e1be3a60ca41cf8b949dbab5f32cf4bfdd6697ce1c48ce8d37ccaa4d91a490d0c3f4a263ebd589cd8b027
diff --git a/dev-ruby/windows_error/metadata.xml b/dev-ruby/windows_error/metadata.xml
index bc23ade9c383..32074a5c0573 100644
--- a/dev-ruby/windows_error/metadata.xml
+++ b/dev-ruby/windows_error/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zerochaos@gentoo.org</email>
-		<name>Rick Farina</name>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">rapid7/windows_error</remote-id>
diff --git a/dev-ruby/windows_error/windows_error-0.1.3.ebuild b/dev-ruby/windows_error/windows_error-0.1.3.ebuild
deleted file mode 100644
index 04889817f17c..000000000000
--- a/dev-ruby/windows_error/windows_error-0.1.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="reference for standard Windows API Error Codes"
-HOMEPAGE="https://github.com/rapid7/windows_error"
-
-LICENSE="BSD"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	rm -f .rspec || die
-}
diff --git a/dev-ruby/windows_error/windows_error-0.1.4.ebuild b/dev-ruby/windows_error/windows_error-0.1.4.ebuild
deleted file mode 100644
index 112db8a3ab16..000000000000
--- a/dev-ruby/windows_error/windows_error-0.1.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="reference for standard Windows API Error Codes"
-HOMEPAGE="https://github.com/rapid7/windows_error"
-
-LICENSE="BSD"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	rm -f .rspec || die
-}
diff --git a/dev-ruby/windows_error/windows_error-0.1.5.ebuild b/dev-ruby/windows_error/windows_error-0.1.5.ebuild
new file mode 100644
index 000000000000..fbd5690fac28
--- /dev/null
+++ b/dev-ruby/windows_error/windows_error-0.1.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="reference for standard Windows API Error Codes"
+HOMEPAGE="https://github.com/rapid7/windows_error"
+
+LICENSE="BSD"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+
+all_ruby_prepare() {
+	rm -f .rspec || die
+}
diff --git a/dev-ruby/wirble/wirble-0.1.3-r5.ebuild b/dev-ruby/wirble/wirble-0.1.3-r5.ebuild
index 928c94d84f72..aa23fdd0b4e5 100644
--- a/dev-ruby/wirble/wirble-0.1.3-r5.ebuild
+++ b/dev-ruby/wirble/wirble-0.1.3-r5.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="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="README ChangeLog"
 
@@ -13,7 +13,7 @@ inherit ruby-fakegem
 DESCRIPTION="Wirble is a set of enhancements for Irb"
 HOMEPAGE="http://pablotron.org/software/wirble/"
 
-LICENSE="Ruby"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
diff --git a/dev-ruby/wisper/wisper-2.0.1-r1.ebuild b/dev-ruby/wisper/wisper-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..b661a7733100
--- /dev/null
+++ b/dev-ruby/wisper/wisper-2.0.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A micro library providing objects with Publish-Subscribe capabilities"
+HOMEPAGE="https://github.com/krisleech/wisper"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/coverall/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/wisper/wisper-2.0.1.ebuild b/dev-ruby/wisper/wisper-2.0.1.ebuild
deleted file mode 100644
index 54e929575cba..000000000000
--- a/dev-ruby/wisper/wisper-2.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A micro library providing objects with Publish-Subscribe capabilities"
-HOMEPAGE="https://github.com/krisleech/wisper"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/coverall/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/x25519/Manifest b/dev-ruby/x25519/Manifest
index e02da291b442..784a9ec5e447 100644
--- a/dev-ruby/x25519/Manifest
+++ b/dev-ruby/x25519/Manifest
@@ -1 +1 @@
-DIST x25519-1.0.9.tar.gz 44042 BLAKE2B 65129fdfc0c40099487da3eacbd91436b625fd1224d58139a09d2ec571cb063f69767d468c89af512b0bef81912786b44b6923afaeb4a14f97a47034b702d848 SHA512 48349960b69f88177b772f431a1751ad190a9d71ebb01e0aced7dcc278a18c2e7cb1dbb621524950685b974f2f63d23039973accf067720ce1b74c5bb1eb4f77
+DIST x25519-1.0.10.tar.gz 44353 BLAKE2B 5ad7a7b68af8bdc5e64692b9b650504df3d152c63c6044cea6978e42cef856dfbd3c0bc9261b014eab80a3bfcfaaf6c7a85675806aa9529e6978228ce2956497 SHA512 10a2baeff5be2eca31ae96893f08877ae351f6c7d30d0cc5d2a9b63ada74733ab30ed7dd709b26802d3f1a130aa513747a32c370d031fc95b136e3a699eb2987
diff --git a/dev-ruby/x25519/x25519-1.0.10.ebuild b/dev-ruby/x25519/x25519-1.0.10.ebuild
new file mode 100644
index 000000000000..f7d61e4b04f4
--- /dev/null
+++ b/dev-ruby/x25519/x25519-1.0.10.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="x25519.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/x25519_ref10/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Key exchange via the X25519 (Curve25519) Elliptic Curve Diffie-Hellman function"
+HOMEPAGE="https://github.com/crypto-rb/x25519"
+SRC_URI="https://github.com/crypto-rb/x25519/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#: ; /coverall/I s:^:#:' spec/spec_helper.rb || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# The precomputed implementation only works on amd64
+	if use amd64 ; then
+		RUBY_FAKEGEM_EXTENSIONS+=(ext/x25519_precomputed/extconf.rb)
+	else
+		sed -i -e '/\(x25519_precomputed\|X25519::Provider::Precomputed\)/ s:^:#:' lib/x25519.rb || die
+		rm -f spec/x25519/provider/precomputed_spec.rb || die
+	fi
+}
diff --git a/dev-ruby/x25519/x25519-1.0.9.ebuild b/dev-ruby/x25519/x25519-1.0.9.ebuild
deleted file mode 100644
index 8a619e17e788..000000000000
--- a/dev-ruby/x25519/x25519-1.0.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="x25519.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/x25519_ref10/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="Key exchange via the X25519 (Curve25519) Elliptic Curve Diffie-Hellman function"
-HOMEPAGE="https://github.com/crypto-rb/x25519"
-SRC_URI="https://github.com/crypto-rb/x25519/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#: ; /coverall/I s:^:#:' spec/spec_helper.rb || die
-
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# The precomputed implementation only works on amd64
-	if use amd64 ; then
-		RUBY_FAKEGEM_EXTENSIONS+=(ext/x25519_precomputed/extconf.rb)
-	else
-		sed -i -e '/\(x25519_precomputed\|X25519::Provider::Precomputed\)/ s:^:#:' lib/x25519.rb || die
-		rm -f spec/x25519/provider/precomputed_spec.rb || die
-	fi
-}
diff --git a/dev-ruby/xdr/Manifest b/dev-ruby/xdr/Manifest
index af3d74a22ca1..49010f4d77ed 100644
--- a/dev-ruby/xdr/Manifest
+++ b/dev-ruby/xdr/Manifest
@@ -1,3 +1 @@
-DIST xdr-3.0.1.gem 24576 BLAKE2B e8518e0d25981462aa1b716e16418c8a0e850a10c3be36b3c542893cd0a75968a13209c82002bf43ee25106b161708159c9c16ac492f32b1dc72c1c52aa7169f SHA512 22911bd41b6a6999f9c231c09d4b4ae731a0b38c5e588be9624ae461fc3099615a20c4f0ac4a2cd614e71104b35974727770ffcbe066ae5f1c12f246fa05e5a5
-DIST xdr-3.0.2.tar.gz 22656 BLAKE2B f541f7ad210d21c0cbb154b9d7ac1593a444d771ac604844bd7458da8fcaad8c64c7249175d98b4c12afaf86501004fa42e0b89c22f70d10bf1771816e94e28f SHA512 76de3f9c9d005f366d36b5063300ad4bd2b2c6d6f7e185b5ceb62ad0e00a864c3859831d13932f403bf08ee0ac73b8ba83c895207b4ce2c41456e4f53f0fc495
 DIST xdr-3.0.3.tar.gz 26738 BLAKE2B b12016d6a6b2d20448f09a2cb768a38aaf6411ad3002712ec7b9fbb51058528912b401cbfc9f10f3cfacd57c787deb440a14df30c377aae8935a02fedfc78118 SHA512 e02e4b1580c3c9633924c7e505b8a666aa0a5883ea258e4965231e6f1e0adc379903a9f83da13bfd48dd67ce45b6eb2c02f2df045a53857801c117fde70bc776
diff --git a/dev-ruby/xdr/metadata.xml b/dev-ruby/xdr/metadata.xml
index 89d964794753..eb6dd2559c31 100644
--- a/dev-ruby/xdr/metadata.xml
+++ b/dev-ruby/xdr/metadata.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
   <maintainer type="project">
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">stellar/ruby-xdr</remote-id>
+    <remote-id type="github">astroband/ruby-xdr</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/xdr/xdr-3.0.1.ebuild b/dev-ruby/xdr/xdr-3.0.1.ebuild
deleted file mode 100644
index fbd62bcb17cb..000000000000
--- a/dev-ruby/xdr/xdr-3.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Read/write XDR encoded data structures"
-HOMEPAGE="https://github.com/stellar/ruby-xdr"
-
-LICENSE="Apache-2.0"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/activemodel-5.2.0:*
-	>=dev-ruby/activesupport-5.2.0:*"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/pry/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/xdr/xdr-3.0.2.ebuild b/dev-ruby/xdr/xdr-3.0.2.ebuild
deleted file mode 100644
index 9e2bcf1c4e34..000000000000
--- a/dev-ruby/xdr/xdr-3.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-RUBY_FAKEGEM_GEMSPEC="xdr.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Read/write XDR encoded data structures"
-HOMEPAGE="https://github.com/astroband/ruby-xdr"
-SRC_URI="https://github.com/astroband/ruby-xdr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="ruby-${P}"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/activemodel-5.2.0:*
-	>=dev-ruby/activesupport-5.2.0:*"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/pry/ s:^:#:' -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
-
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/xdr/xdr-3.0.3.ebuild b/dev-ruby/xdr/xdr-3.0.3.ebuild
index fe5f1072b523..013ae090cc56 100644
--- a/dev-ruby/xdr/xdr-3.0.3.ebuild
+++ b/dev-ruby/xdr/xdr-3.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/xml-simple/xml-simple-1.1.9.ebuild b/dev-ruby/xml-simple/xml-simple-1.1.9.ebuild
index a77e95d44b1f..4a7728708066 100644
--- a/dev-ruby/xml-simple/xml-simple-1.1.9.ebuild
+++ b/dev-ruby/xml-simple/xml-simple-1.1.9.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="ruby31 ruby32 ruby33"
 
 COMMIT=7b8bdf7b33ab872bb4d1fb8eeecba5c5e1a4a421
 
@@ -14,9 +14,9 @@ SRC_URI="https://github.com/maik/xml-simple/archive/${COMMIT}.tar.gz -> ${P}.tar
 DESCRIPTION="Easy API to maintain XML. A Ruby port of Grant McLean's Perl module XML::Simple"
 HOMEPAGE="https://github.com/maik/xml-simple"
 
-LICENSE="Ruby"
+LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
 IUSE=""
 
 RUBY_S="${PN}-${COMMIT}"
diff --git a/dev-ruby/xmlrpc/Manifest b/dev-ruby/xmlrpc/Manifest
index 6cd6559564bc..e3c2599a177f 100644
--- a/dev-ruby/xmlrpc/Manifest
+++ b/dev-ruby/xmlrpc/Manifest
@@ -1 +1,2 @@
 DIST xmlrpc-0.3.2.tar.gz 34780 BLAKE2B 9aeabd5c2549bd36a28bb56162471e5f822f873e3f976fa101a8fe26af9b0ab72bcceaf7b9bfac5488f315f79708db18bc7c507360aa567d95f136fe807084b5 SHA512 9d594971211d556f19db86e2bd5f948610342dbcee031e58cc83bc28c44bb02c54a8c00c44eb15bd96daafe02859a894193d5e507973a0a1df36251138d4999c
+DIST xmlrpc-0.3.3.tar.gz 35499 BLAKE2B 4a7ce19c9e3c656cd68cfdb3801ad2997f6de7ff2415be583c4a976f191f1775597467b1eb101ddfe9ec7a67a738ec81ada60fa4082849b8bdf16c9b8a82d9f7 SHA512 4f9872d820ba87f04b6f7ccfd0646397d19361d27f6c3103963b274eb71668f038596a66e99e2379d2bb0f636d5f6b7f34adc57289e537efa702a116b45c7644
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.2-r1.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.2-r1.ebuild
index 16c6efc21eb8..7087e62d2039 100644
--- a/dev-ruby/xmlrpc/xmlrpc-0.3.2-r1.ebuild
+++ b/dev-ruby/xmlrpc/xmlrpc-0.3.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=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -15,9 +15,9 @@ DESCRIPTION="XMLRPC is a lightweight protocol that enables remote procedure call
 HOMEPAGE="https://github.com/ruby/xmlrpc"
 SRC_URI="https://github.com/ruby/xmlrpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Ruby"
+LICENSE="Ruby-BSD"
 SLOT="0"
-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 ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/webrick"
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.3.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.3.ebuild
new file mode 100644
index 000000000000..0618bb3639e1
--- /dev/null
+++ b/dev-ruby/xmlrpc/xmlrpc-0.3.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="XMLRPC is a lightweight protocol that enables remote procedure calls over HTTP"
+HOMEPAGE="https://github.com/ruby/xmlrpc"
+SRC_URI="https://github.com/ruby/xmlrpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Ruby-BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/webrick"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+
+	# Avoid dependency on git
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/xpath/metadata.xml b/dev-ruby/xpath/metadata.xml
index 9681cadb8c35..b3826aa3c301 100644
--- a/dev-ruby/xpath/metadata.xml
+++ b/dev-ruby/xpath/metadata.xml
@@ -6,6 +6,7 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">jnicklas/xpath</remote-id>
+    <remote-id type="github">teamcapybara/xpath</remote-id>
+    <remote-id type="rubygems">xpath</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/xpath/xpath-3.2.0-r1.ebuild b/dev-ruby/xpath/xpath-3.2.0-r1.ebuild
index 497f4840b218..b7a71070fc44 100644
--- a/dev-ruby/xpath/xpath-3.2.0-r1.ebuild
+++ b/dev-ruby/xpath/xpath-3.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="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -12,10 +12,10 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 inherit ruby-fakegem
 
 DESCRIPTION="XPath is a Ruby DSL around a subset of XPath 1.0"
-HOMEPAGE="https://github.com/jnicklas/xpath"
+HOMEPAGE="https://github.com/teamcapybara/xpath"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 SLOT="3"
 IUSE=""
 
diff --git a/dev-ruby/xpath/xpath-3.2.0.ebuild b/dev-ruby/xpath/xpath-3.2.0.ebuild
deleted file mode 100644
index e13f6c3d7f17..000000000000
--- a/dev-ruby/xpath/xpath-3.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="XPath is a Ruby DSL around a subset of XPath 1.0"
-HOMEPAGE="https://github.com/jnicklas/xpath"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-SLOT="3"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.8:0"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|pry\)/d' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index b71d72557203..e1a442dc3ec2 100644
--- a/dev-ruby/yajl-ruby/Manifest
+++ b/dev-ruby/yajl-ruby/Manifest
@@ -1 +1 @@
-DIST yajl-ruby-1.4.2.gem 558592 BLAKE2B 620db8f9c5ef4b010143382a2641793bc7a59f30d35a759470aa85b50e8b0e587e7442cb0727e2fe03a98c7aa3cd1f5bb05d173294743bc8fdf2d646176e11b8 SHA512 faf775367eb3143fe659064569a235b34557b84b21bf55f9e9fc6f815dce04c8c1b58832056f367fc4c9ebc0e4389d1e55dd79b5fbb773f845860e4652269d4e
+DIST yajl-ruby-1.4.3.gem 558592 BLAKE2B f4ea86014ed7570530e77ba4a2c67bf39c998b816f6100a526406b62ee8c30bb3b7be61853432cd1f6febdc19b20596915a242b2f47645da734b21f2a2c879c3 SHA512 8cfde677f11ad80a468dce7876b97aa87fa35d78fcd727d4542e00c09cc28d1cca3301cf7c4e1f773edf2192262ec8d6ffab93b11d488d2b048d8013f6c7645a
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.4.2.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.4.2.ebuild
deleted file mode 100644
index 51836f404afd..000000000000
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.4.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/yajl/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/yajl"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby C bindings to the Yajl JSON stream-based parser library"
-HOMEPAGE="https://github.com/brianmario/yajl-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="${RDEPEND} dev-libs/yajl"
-DEPEND="${DEPEND} dev-libs/yajl"
-
-each_ruby_prepare() {
-	# Make sure the right ruby interpreter is used
-	sed -e '/capture/ s:ruby:'${RUBY}':' -i spec/parsing/large_number_spec.rb || die
-}
-
-each_ruby_test() {
-	# Set RUBYLIB to pass search path on to additional interpreters that
-	# are started.
-	RUBYLIB=lib RSPEC_VERSION=3 ruby-ng_rspec || die
-}
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.4.3.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.4.3.ebuild
new file mode 100644
index 000000000000..7ce51ee69fec
--- /dev/null
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.4.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/yajl/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/yajl"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby C bindings to the Yajl JSON stream-based parser library"
+HOMEPAGE="https://github.com/brianmario/yajl-ruby"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND="${RDEPEND} dev-libs/yajl"
+DEPEND="${DEPEND} dev-libs/yajl"
+
+each_ruby_prepare() {
+	# Make sure the right ruby interpreter is used
+	sed -e '/capture/ s:ruby:'${RUBY}':' -i spec/parsing/large_number_spec.rb || die
+}
+
+each_ruby_test() {
+	# Set RUBYLIB to pass search path on to additional interpreters that
+	# are started.
+	RUBYLIB=lib RSPEC_VERSION=3 ruby-ng_rspec || die
+}
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index 4803189e822c..89b44fe7cfb7 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,2 +1,4 @@
-DIST yard-0.9.26-git.tgz 930901 BLAKE2B 19baaefc54269bbc7eee053b42f2be85644a062cbf55b0fafb63748876aad3a3143767855f4ee7b10a1ae814110a6cf63c01e4055e054aeb31bf8512e793d80d SHA512 0f70a089d5e5ba33e326b0ae0cc84a2cacfc5a3f3080545d5fc5bb324dedbbbf65116cc9412b3496c09b2b6c15514e854a741a1fd7e2ae782804d6e4ac28fcd9
-DIST yard-0.9.27-git.tgz 932022 BLAKE2B 7390e81081c6785cd7174b9ece57dafc27a9762f0751f05bfc222d561c6b6f5a5ff1a757fc24020a6adb2014c3e77696b6e8c054f7f6918120f6db435739b977 SHA512 20f406234bed52eff254c1b1dd0e3dcbc08109e9a285e4e4041c164cd998ae00654d2414e0e442e3a9520afc5cae2c1bd5010dd25fa38ef16ee21f077527aae4
+DIST yard-0.9.34-bom-encoding.patch 1045 BLAKE2B be4ac8c52c27b916f83d87334c64427e19a831b4b81dc926db4963c651df5106b7d63a8ecd3cdf9889d023bb8f43134c00a1db0c3f10578997e6abf94d3c08fa SHA512 6af3f7c80a0044c1b14b61bff6c0e539a8512956cea8ceb9dbe84d38e1072f49c7119d95f4313af5a054f6462eb330b66dec55c199db92c1b16fcb89c6ebc482
+DIST yard-0.9.34-git.tgz 938057 BLAKE2B 0e5b96b29efc6b7ab6c52dc34a15d4df9b614eb56698eb76fc7d2dc1f1fcfa5f8883034697f5a3fbd76ff588a9ebf2c7ee164936809bfe4640663c996e9f648a SHA512 fb87e3706d2c1408a172e17cdb588aacb2c67b9e7ac8c9b2d2a4d2e8a67a0c571d05938f8a4a88357834f6dac13a38cf1faa086680d58380a65cc2fca93aad8f
+DIST yard-0.9.34-yield-ruby33.patch 920 BLAKE2B a0492919b8038c21c109732aa12afa4d494ceacf6ff5e2c8fbae56bc279b5e9c6a951f77144d069183d7dc9ad818066aab5c4d82c4dc39c31a48272dad6a0d0b SHA512 86bd7d2b8ccfccc73a46365b0814c0d741bde8508317856d80ae6a2cccff1a338ad9754afd21f8f64d2587195f8cc3f38b6eba78e8de1d729ac3b2141bdb124a
+DIST yard-0.9.36-git.tgz 938567 BLAKE2B 8672b94149b4bbecd3fb80c1d386e3cdfd4013ad88969958269abd480426e41990067df0e5352df1a983a1572129b91a31129a71eae872cc00712e6e992a07c5 SHA512 09639d7ac6fed28906b40e08c16e305f44416206f67947fbdedf4adbb0be92d1e15ade9a04509f2847063b39baaa7a5bcbd585031808baaaf5acf14f06b471d5
diff --git a/dev-ruby/yard/files/yard-0.9.34-beginless-range.patch b/dev-ruby/yard/files/yard-0.9.34-beginless-range.patch
new file mode 100644
index 000000000000..4284ad83acb9
--- /dev/null
+++ b/dev-ruby/yard/files/yard-0.9.34-beginless-range.patch
@@ -0,0 +1,38 @@
+From 8481180b935922f76a36e29e83914ee6fad782cd Mon Sep 17 00:00:00 2001
+From: Brad Feehan <git@bradfeehan.com>
+Date: Tue, 21 Jun 2022 17:05:20 +1000
+Subject: [PATCH] Fix "cannot get the first element of beginless range" error
+
+This implements the fix suggested by @akimd:
+
+See https://github.com/lsegal/yard/issues/1434#issuecomment-1087817139
+
+Fixes lsegal/yard#1434.
+---
+ lib/yard/parser/ruby/ast_node.rb | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/yard/parser/ruby/ast_node.rb b/lib/yard/parser/ruby/ast_node.rb
+index c9deb3ed1..d10bdfa3a 100644
+--- a/lib/yard/parser/ruby/ast_node.rb
++++ b/lib/yard/parser/ruby/ast_node.rb
+@@ -271,7 +271,7 @@ def has_line?
+ 
+         # @return [Fixnum] the starting line number of the node
+         def line
+-          line_range && line_range.first
++          line_range && line_range.begin || 1
+         end
+ 
+         # @return [String] the first line of source represented by the node.
+@@ -345,8 +345,8 @@ def reset_line_info
+           elsif !children.empty?
+             f = children.first
+             l = children.last
+-            self.line_range = Range.new(f.line_range.first, l.line_range.last)
+-            self.source_range = Range.new(f.source_range.first, l.source_range.last)
++            self.line_range = Range.new(f.line_range.begin || 1, l.line_range.last)
++            self.source_range = Range.new(f.source_range.begin || 1, l.source_range.last)
+           elsif @fallback_line || @fallback_source
+             self.line_range = @fallback_line
+             self.source_range = @fallback_source
diff --git a/dev-ruby/yard/yard-0.9.26.ebuild b/dev-ruby/yard/yard-0.9.26.ebuild
deleted file mode 100644
index 732a7729d01b..000000000000
--- a/dev-ruby/yard/yard-0.9.26.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_DOCDIR="doc docs"
-
-RUBY_FAKEGEM_EXTRAINSTALL="templates"
-
-RUBY_FAKEGEM_GEMSPEC="yard.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Documentation generation tool for the Ruby programming language"
-HOMEPAGE="https://yardoc.org/"
-
-# The gem lakes the gemspec file needed to pass tests.
-SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
-
-ruby_add_bdepend "test? ( dev-ruby/rack )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
-
-	sed -i -e '/samus/I s:^:#:' Rakefile || die
-
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid specs that make assumptions on load ordering that are not
-	# true for us. This may be related to how we install in Gentoo. This
-	# also drops a test requirement on dev-ruby/rack.
-	rm -f spec/cli/server_spec.rb || die
-
-	# Avoid specs that only work with bundler
-	sed -i -e '/#initialize/,/^  end/ s:^:#:' spec/cli/yri_spec.rb || die
-	sed -e '/overwrites options with data in/askip "wrong assumptions on file access"' \
-		-e '/loads any gem plugins starting with/askip "wrong assumptions on file access"' \
-		-i spec/config_spec.rb || die
-
-	# Avoid redcarpet-specific spec that is not optional
-	sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die
-
-	# Avoid asciidoc-specific spec that is not optional
-	sed -i -e '/\(AsciiDoc specific\|AsciiDoc header\)/askip "skipping asciidoc test"' spec/templates/helpers/html_helper_spec.rb || die
-}
diff --git a/dev-ruby/yard/yard-0.9.27.ebuild b/dev-ruby/yard/yard-0.9.27.ebuild
deleted file mode 100644
index 15fdb9edeb19..000000000000
--- a/dev-ruby/yard/yard-0.9.27.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_DOCDIR="doc docs"
-
-RUBY_FAKEGEM_EXTRAINSTALL="templates"
-
-RUBY_FAKEGEM_GEMSPEC="yard.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Documentation generation tool for the Ruby programming language"
-HOMEPAGE="https://yardoc.org/"
-
-# The gem lakes the gemspec file needed to pass tests.
-SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/webrick-1.7*"
-
-ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
-
-ruby_add_bdepend "test? ( dev-ruby/rack )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
-
-	sed -i -e '/samus/I s:^:#:' Rakefile || die
-
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid specs that make assumptions on load ordering that are not
-	# true for us. This may be related to how we install in Gentoo. This
-	# also drops a test requirement on dev-ruby/rack.
-	rm -f spec/cli/server_spec.rb || die
-
-	# Avoid specs that only work with bundler
-	sed -i -e '/#initialize/,/^  end/ s:^:#:' spec/cli/yri_spec.rb || die
-	sed -e '/overwrites options with data in/askip "wrong assumptions on file access"' \
-		-e '/loads any gem plugins starting with/askip "wrong assumptions on file access"' \
-		-i spec/config_spec.rb || die
-
-	# Avoid redcarpet-specific spec that is not optional
-	sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die
-
-	# Avoid asciidoc-specific spec that is not optional
-	sed -i -e '/\(AsciiDoc specific\|AsciiDoc header\)/askip "skipping asciidoc test"' spec/templates/helpers/html_helper_spec.rb || die
-}
diff --git a/dev-ruby/yard/yard-0.9.34-r2.ebuild b/dev-ruby/yard/yard-0.9.34-r2.ebuild
new file mode 100644
index 000000000000..5edc4dfc2ad4
--- /dev/null
+++ b/dev-ruby/yard/yard-0.9.34-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_DOCDIR="doc docs"
+
+RUBY_FAKEGEM_EXTRAINSTALL="templates .yardopts"
+
+RUBY_FAKEGEM_GEMSPEC="yard.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Documentation generation tool for the Ruby programming language"
+HOMEPAGE="https://yardoc.org/"
+
+# The gem lacks the gemspec file needed to pass tests.
+SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz
+	https://github.com/lsegal/yard/commit/fe4f32e06fcbadbf80540807a4033448b826dfe8.patch -> ${P}-bom-encoding.patch
+	https://github.com/lsegal/yard/commit/d840ee127dfd79abd208a155f01d66293ae290ca.patch -> ${P}-yield-ruby33.patch"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-beginless-range.patch"
+	"${DISTDIR}/${P}-bom-encoding.patch"
+	"${DISTDIR}/${P}-yield-ruby33.patch"
+)
+
+ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
+
+ruby_add_bdepend "test? ( dev-ruby/rack:2.2 >=dev-ruby/rspec-3.11.0 dev-ruby/webrick )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '3igem "rack", "~> 2.2.0"' spec/spec_helper.rb || die
+
+	sed -i -e '/samus/I s:^:#:' Rakefile || die
+
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs that make assumptions on load ordering that are not
+	# true for us. This may be related to how we install in Gentoo. This
+	# also drops a test requirement on dev-ruby/rack.
+	rm -f spec/cli/server_spec.rb || die
+
+	# Avoid specs that only work with bundler
+	sed -i -e '/#initialize/,/^  end/ s:^:#:' spec/cli/yri_spec.rb || die
+	sed -e '/overwrites options with data in/askip "wrong assumptions on file access"' \
+		-e '/loads any gem plugins starting with/askip "wrong assumptions on file access"' \
+		-i spec/config_spec.rb || die
+
+	# Avoid specs making assumptions about how rubygems works internally
+	sed -i -e '/searches for .gem file/askip "rubygems internals"' spec/cli/diff_spec.rb || die
+
+	# Fix broken spec
+	sed -i -e '/:exist?/aallow(File).to receive(:exist?).and_call_original' spec/i18n/locale_spec.rb || die
+
+	# Avoid ruby31 failure on whitespace-only differences
+	sed -i -e '/shows a list of nodes/askip "Whitespace differences on ruby31"' spec/parser/ruby/ast_node_spec.rb || die
+
+	# Avoid redcarpet-specific spec that is not optional
+	sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die
+
+	# Avoid asciidoc-specific spec that is not optional
+	sed -e '/\(AsciiDoc specific\|AsciiDoc header\)/askip "skipping asciidoc test"' \
+		-i spec/templates/helpers/html_helper_spec.rb || die
+}
diff --git a/dev-ruby/yard/yard-0.9.34.ebuild b/dev-ruby/yard/yard-0.9.34.ebuild
new file mode 100644
index 000000000000..5e2af6de6910
--- /dev/null
+++ b/dev-ruby/yard/yard-0.9.34.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_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_DOCDIR="doc docs"
+
+RUBY_FAKEGEM_EXTRAINSTALL="templates .yardopts"
+
+RUBY_FAKEGEM_GEMSPEC="yard.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Documentation generation tool for the Ruby programming language"
+HOMEPAGE="https://yardoc.org/"
+
+# The gem lacks the gemspec file needed to pass tests.
+SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
+
+ruby_add_bdepend "test? ( dev-ruby/rack:2.2 >=dev-ruby/rspec-3.11.0 dev-ruby/webrick )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '3igem "rack", "~> 2.2.0"' spec/spec_helper.rb || die
+
+	sed -i -e '/samus/I s:^:#:' Rakefile || die
+
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs that make assumptions on load ordering that are not
+	# true for us. This may be related to how we install in Gentoo. This
+	# also drops a test requirement on dev-ruby/rack.
+	rm -f spec/cli/server_spec.rb || die
+
+	# Avoid specs that only work with bundler
+	sed -i -e '/#initialize/,/^  end/ s:^:#:' spec/cli/yri_spec.rb || die
+	sed -e '/overwrites options with data in/askip "wrong assumptions on file access"' \
+		-e '/loads any gem plugins starting with/askip "wrong assumptions on file access"' \
+		-i spec/config_spec.rb || die
+
+	# Avoid specs making assumptions about how rubygems works internally
+	sed -i -e '/searches for .gem file/askip "rubygems internals"' spec/cli/diff_spec.rb || die
+
+	# Fix broken spec
+	sed -i -e '/:exist?/aallow(File).to receive(:exist?).and_call_original' spec/i18n/locale_spec.rb || die
+
+	# Avoid ruby31 failure on whitespace-only differences
+	sed -i -e '/shows a list of nodes/askip "Whitespace differences on ruby31"' spec/parser/ruby/ast_node_spec.rb || die
+
+	# Avoid redcarpet-specific spec that is not optional
+	sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die
+
+	# Avoid asciidoc-specific spec that is not optional
+	sed -e '/\(AsciiDoc specific\|AsciiDoc header\)/askip "skipping asciidoc test"' \
+		-i spec/templates/helpers/html_helper_spec.rb || die
+}
diff --git a/dev-ruby/yard/yard-0.9.36.ebuild b/dev-ruby/yard/yard-0.9.36.ebuild
new file mode 100644
index 000000000000..5d1f8575ffe4
--- /dev/null
+++ b/dev-ruby/yard/yard-0.9.36.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_DOCDIR="doc docs"
+
+RUBY_FAKEGEM_EXTRAINSTALL="templates .yardopts"
+
+RUBY_FAKEGEM_GEMSPEC="yard.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Documentation generation tool for the Ruby programming language"
+HOMEPAGE="https://yardoc.org/"
+
+# The gem lacks the gemspec file needed to pass tests.
+SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.34-beginless-range.patch"
+)
+
+ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
+
+ruby_add_bdepend "test? ( dev-ruby/rack:2.2 >=dev-ruby/rspec-3.11.0 dev-ruby/webrick )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '3igem "rack", "~> 2.2.0"' spec/spec_helper.rb || die
+
+	sed -i -e '/samus/I s:^:#:' Rakefile || die
+
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs that make assumptions on load ordering that are not
+	# true for us. This may be related to how we install in Gentoo. This
+	# also drops a test requirement on dev-ruby/rack.
+	rm -f spec/cli/server_spec.rb || die
+
+	# Avoid specs that only work with bundler
+	sed -i -e '/#initialize/,/^  end/ s:^:#:' spec/cli/yri_spec.rb || die
+	sed -e '/overwrites options with data in/askip "wrong assumptions on file access"' \
+		-e '/loads any gem plugins starting with/askip "wrong assumptions on file access"' \
+		-i spec/config_spec.rb || die
+
+	# Avoid specs making assumptions about how rubygems works internally
+	sed -i -e '/searches for .gem file/askip "rubygems internals"' spec/cli/diff_spec.rb || die
+
+	# Fix broken spec
+	sed -i -e '/:exist?/aallow(File).to receive(:exist?).and_call_original' spec/i18n/locale_spec.rb || die
+
+	# Avoid ruby31 failure on whitespace-only differences
+	sed -i -e '/shows a list of nodes/askip "Whitespace differences on ruby31"' spec/parser/ruby/ast_node_spec.rb || die
+
+	# Avoid redcarpet-specific spec that is not optional
+	sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die
+
+	# Avoid asciidoc-specific spec that is not optional
+	sed -e '/\(AsciiDoc specific\|AsciiDoc header\)/askip "skipping asciidoc test"' \
+		-i spec/templates/helpers/html_helper_spec.rb || die
+}
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index 8126e14808a4..6abe4f9d7e76 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -1,2 +1,4 @@
-DIST zeitwerk-2.4.2.tar.gz 99974 BLAKE2B 5913561057a6d5cd9bfa4eb549770ca18de3aafa1549a40e5315cd1d71a2dec5f865e7bc79f6ab2a098e515a930c5f8c83b85c91d7dbe441fa8dfb08ffdbdb03 SHA512 774cc17a8732afea0a854ea22ec860fa5bca65e8743aa800017c06a251dfdb1d2c5af8e541cb56d22a4202a9faa42707ed2ad395d9472360cf64f46ce9b907f2
-DIST zeitwerk-2.5.4.tar.gz 109202 BLAKE2B 4c1302bdb6ac30afbb23ea06ef2ac2ecea9c8139c36f1b766ec6f62bb6a77faf1efa3f670cb31b5073a6dc36d6a0bd8d66a937d8b84b12438411a7f2df29eeed SHA512 f7a4b88c030b2eeae5ba07c6e01900fa66312a58e5c9da3d13a293d0959d67bbcfb385de5790e1764188752dfc9de161c202b35e0e35ed6e0cca7bbc2c2f6c83
+DIST zeitwerk-2.6.11.tar.gz 127029 BLAKE2B 7d810c1b6087522757e60ed0d70fe73dc8633474769992a9b9864a4437a44b482e804f8a7d10c1bc54395054539e80e98be926f31025a7abde5016df87636622 SHA512 6fb2fcf158497f7c11b8edc815a4ac4318d9794c9c76af9a6bed969cee3192f552624c9dfcde8147aafbdf6a754e6715523721d91eb219174f9b768ef4688431
+DIST zeitwerk-2.6.12.tar.gz 127162 BLAKE2B 863e9ff44c14843378e49b34c1ce7694d8d5026f823df5abf69c810f01e3affe9a96de5b615b2d04ab5d71f61e24d42df5b72ef4a415f238428efb4914ac695d SHA512 9d153ed6833a799b0cc2fcbeacab9daca4ef94c2b3871ec5a5cc79cb413f845d53901a875d7b4f2d2b13bd18e2aa9f0858642b76ef3550a1b58f90a9f5d54e9e
+DIST zeitwerk-2.6.13.tar.gz 127927 BLAKE2B 434da46147eb90d171a93a415dc3cca9c326136efd29a9fa46794dfc5bfcb5fc424fa5f64215281c36473d857c81895758129a0f779f13f6dc536839e240d455 SHA512 4ce3406cc77123439f3499d3f60030d043e9fca6ab1921ec95a5be58a0d4f2af22de06c1e0f48ad9a463f194f2f851eb0d815a1d7f35d9f6a6c0cb2ab3bd403d
+DIST zeitwerk-2.6.8.tar.gz 124209 BLAKE2B 7274b0e9cd55d48fa619d1e9da44074268186c119584fdc3ba18656db33884ec2e24a76ace863d18b0ec51601cde5a3cb9ed35889dcfd3f619960ddfcb1465c6 SHA512 b0609f7d38572d95bdf1a065a9051a7c39b15a7910e354981c991862692e2535477b4abd0a3c623a5d37e53622d95566ecf0d0243ca96fef59f0135693731a71
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
deleted file mode 100644
index c11b2d4d3e37..000000000000
--- a/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Efficient and thread-safe code loader for Ruby"
-HOMEPAGE="https://github.com/fxn/zeitwerk"
-SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-	sed -i -e '/\(focus\|reporters\|Reporters\)/ s:^:#:' Gemfile test/test_helper.rb || die
-
-	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rake test || die
-}
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.5.4.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.5.4.ebuild
deleted file mode 100644
index 4f75e8c49b53..000000000000
--- a/dev-ruby/zeitwerk/zeitwerk-2.5.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Efficient and thread-safe code loader for Ruby"
-HOMEPAGE="https://github.com/fxn/zeitwerk"
-SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-	sed -i -e '/\(focus\|reporters\|Reporters\)/ s:^:#:' Gemfile test/test_helper.rb || die
-
-	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rake test || die
-}
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.6.11-r1.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.6.11-r1.ebuild
new file mode 100644
index 000000000000..5c95637eee14
--- /dev/null
+++ b/dev-ruby/zeitwerk/zeitwerk-2.6.11-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Efficient and thread-safe code loader for Ruby"
+HOMEPAGE="https://github.com/fxn/zeitwerk"
+SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/warning )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	# Dropping proveit should be fine based on https://github.com/fxn/zeitwerk/pull/253
+	# It's more of a quality check for the tests themselves rather than a test
+	sed -i -e '/\(focus\|reporters\|Reporters\|prove_\?it\)/ s:^:#:' Gemfile test/test_helper.rb || die
+
+	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.6.12.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.6.12.ebuild
new file mode 100644
index 000000000000..76e0dde2d98f
--- /dev/null
+++ b/dev-ruby/zeitwerk/zeitwerk-2.6.12.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Efficient and thread-safe code loader for Ruby"
+HOMEPAGE="https://github.com/fxn/zeitwerk"
+SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/warning )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	# Dropping proveit should be fine based on https://github.com/fxn/zeitwerk/pull/253
+	# It's more of a quality check for the tests themselves rather than a test
+	sed -i -e '/\(focus\|reporters\|Reporters\|prove_\?it\)/ s:^:#:' Gemfile test/test_helper.rb || die
+
+	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.6.13.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.6.13.ebuild
new file mode 100644
index 000000000000..eb0be93eb354
--- /dev/null
+++ b/dev-ruby/zeitwerk/zeitwerk-2.6.13.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Efficient and thread-safe code loader for Ruby"
+HOMEPAGE="https://github.com/fxn/zeitwerk"
+SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/warning )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	# Dropping proveit should be fine based on https://github.com/fxn/zeitwerk/pull/253
+	# It's more of a quality check for the tests themselves rather than a test
+	sed -i -e '/\(focus\|reporters\|Reporters\|prove_\?it\)/ s:^:#:' Gemfile test/test_helper.rb || die
+
+	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.6.8.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.6.8.ebuild
new file mode 100644
index 000000000000..3b19cabfa28f
--- /dev/null
+++ b/dev-ruby/zeitwerk/zeitwerk-2.6.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Efficient and thread-safe code loader for Ruby"
+HOMEPAGE="https://github.com/fxn/zeitwerk"
+SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/warning )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	# Dropping proveit should be fine based on https://github.com/fxn/zeitwerk/pull/253
+	# It's more of a quality check for the tests themselves rather than a test
+	sed -i -e '/\(focus\|reporters\|Reporters\|prove_\?it\)/ s:^:#:' Gemfile test/test_helper.rb || die
+
+	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}
diff --git a/dev-ruby/zentest/Manifest b/dev-ruby/zentest/Manifest
index ebd38e856919..990b476495ae 100644
--- a/dev-ruby/zentest/Manifest
+++ b/dev-ruby/zentest/Manifest
@@ -1,2 +1 @@
-DIST ZenTest-4.12.0.gem 48128 BLAKE2B 32d2d5cdd95b8355b31ce81957cad823c1d5209f0c24cbdf920fe1276d952df4995484af7e576e498273c01fbfb70eb5ed99271405977820f68cd8feac08d388 SHA512 cbce7059ed48fba1a265c9a4360d032492cbc3a67131480e11bc06c1cc7fadcd82139231f16c5ff4fd2a9b771a574f834a71eae21392ee5fdbf335366748150c
 DIST ZenTest-4.12.1.gem 48128 BLAKE2B 6e42c5974aa20cc9f926d3baa633a39f0a87d7dfed132e685b9476ea5f793eae1e747ea289705a6607c1f3cb2c0aea9d2d41a3d2607244dd25d6d7ae82ccf824 SHA512 20d51c18ddf1d4573e7350dc5b1cbca461e7c422652bb4a14d9645282d813e694134c42be7243b113d841a761fa644b9394500858c5cffc233731a3ed3ed50a7
diff --git a/dev-ruby/zentest/zentest-4.12.0.ebuild b/dev-ruby/zentest/zentest-4.12.0.ebuild
deleted file mode 100644
index 0abbf91d3938..000000000000
--- a/dev-ruby/zentest/zentest-4.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_NAME=ZenTest
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt example.txt example1.rb example2.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::Rails"
-HOMEPAGE="https://github.com/seattlerb/zentest"
-LICENSE="Ruby"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5
-	)"
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/zentest/zentest-4.12.1.ebuild b/dev-ruby/zentest/zentest-4.12.1.ebuild
index 9714536a74bd..3979fefea17e 100644
--- a/dev-ruby/zentest/zentest-4.12.1.ebuild
+++ b/dev-ruby/zentest/zentest-4.12.1.ebuild
@@ -1,22 +1,21 @@
-# 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="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_NAME=ZenTest
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.txt History.txt example.txt example1.rb example2.rb"
 
 inherit ruby-fakegem
 
 DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::Rails"
 HOMEPAGE="https://github.com/seattlerb/zentest"
-LICENSE="Ruby"
+LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 SLOT="0"
 IUSE=""