Adding metadata

52 files changed, 348 insertions, 773 deletions

diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
index 1fd855716cb5..dca65cdeaa6a 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -1,3 +1,4 @@
 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
+DIST asciidoctor-2.0.23.tar.gz 1708942 BLAKE2B 870b0ea5be05ae4b2d91d7cfcf4d81b36f443740b591b8fd4f9bb547647cb777c5d9b03eb7982f84e6ac84ce5af3c9161a21e4d82ae56c70afd6ce138629675b SHA512 eeb6ef3268f8df2881fafccdb88480f203365d423f53ec9a42c3e9a91a6ec2d20048150019366a71ba0b2a9a0a90a6752fa7342ce558609ff8c242418e2f29c0
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.23.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.23.ebuild
new file mode 100644
index 000000000000..dbbcfc8b9eae
--- /dev/null
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.23.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/bundler/Manifest b/dev-ruby/bundler/Manifest
index fd285e3db234..45a4b5aac549 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -5,3 +5,4 @@ DIST bundler-2.4.19.gem 413184 BLAKE2B 34607b2fdf1c7cb36982fa7c7bbd5c6f5b7c227c5
 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
+DIST bundler-2.5.9.gem 431104 BLAKE2B e7fe8e10c3ef22c854f75f1c4a3f66eec801fa9a826d22fb6970869005c8391eafa1f11770bbbbe328ccf67dfc60185a8711a1836f3de480381870c3398f861b SHA512 bea50de47c68ed0b525d3310ba448c1dba76c46bd72410e344f885701a34e0a429490348d3a42b11ec9d7522164172f66b62ab4497b6aea0eedb0a06c431087f
diff --git a/dev-ruby/bundler/bundler-2.5.9.ebuild b/dev-ruby/bundler/bundler-2.5.9.ebuild
new file mode 100644
index 000000000000..9d74c9aee9b7
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.5.9.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"
+
+# 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/date/date-3.3.4.ebuild b/dev-ruby/date/date-3.3.4.ebuild
index 7b87d468a8bd..737b3fc0c646 100644
--- a/dev-ruby/date/date-3.3.4.ebuild
+++ b/dev-ruby/date/date-3.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 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/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"
+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/debug/debug-1.9.1.ebuild b/dev-ruby/debug/debug-1.9.1.ebuild
index 2fab65c0e6c0..2e060d63076c 100644
--- a/dev-ruby/debug/debug-1.9.1.ebuild
+++ b/dev-ruby/debug/debug-1.9.1.ebuild
@@ -33,6 +33,9 @@ ruby_add_rdepend "
 "
 
 all_ruby_prepare() {
-	sed -i -e "s:require_relative ':require './:" -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -e "s:require_relative ':require './:" \
+		-e 's/__dir__/"."/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${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
index 684a22aacf92..a78a3d956544 100644
--- a/dev-ruby/debug/debug-1.9.2.ebuild
+++ b/dev-ruby/debug/debug-1.9.2.ebuild
@@ -33,6 +33,9 @@ ruby_add_rdepend "
 "
 
 all_ruby_prepare() {
-	sed -i -e "s:require_relative ':require './:" -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -e "s:require_relative ':require './:" \
+		-e 's/__dir__/"."/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
 	sed -i -e '/bundler/I s:^:#:' Rakefile || 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
index cf46e672e926..1b12b32be672 100644
--- 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
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
@@ -17,7 +17,6 @@ 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:*
diff --git a/dev-ruby/net-imap/net-imap-0.4.10.ebuild b/dev-ruby/net-imap/net-imap-0.4.10.ebuild
index 78de90b9b8ae..94290d040cb3 100644
--- a/dev-ruby/net-imap/net-imap-0.4.10.ebuild
+++ b/dev-ruby/net-imap/net-imap-0.4.10.ebuild
@@ -16,7 +16,7 @@ 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"
+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 "
diff --git a/dev-ruby/net-protocol/net-protocol-0.2.2.ebuild b/dev-ruby/net-protocol/net-protocol-0.2.2.ebuild
index 0bd59921fc38..9e26b716eea1 100644
--- a/dev-ruby/net-protocol/net-protocol-0.2.2.ebuild
+++ b/dev-ruby/net-protocol/net-protocol-0.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/net-protocol/archive/v${PV}.tar.gz -> ${P}.tar.
 
 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"
+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 "
diff --git a/dev-ruby/net-smtp/net-smtp-0.5.0.ebuild b/dev-ruby/net-smtp/net-smtp-0.5.0.ebuild
index 8fe426c506ae..f208e2f17bd8 100644
--- a/dev-ruby/net-smtp/net-smtp-0.5.0.ebuild
+++ b/dev-ruby/net-smtp/net-smtp-0.5.0.ebuild
@@ -16,7 +16,7 @@ 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"
+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
diff --git a/dev-ruby/polyglot/polyglot-0.3.5-r1.ebuild b/dev-ruby/polyglot/polyglot-0.3.5-r1.ebuild
index d280bbd80eec..bdfa2a4033bd 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-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/rbs/Manifest b/dev-ruby/rbs/Manifest
index 60e0564225b3..ec3643dd7e4a 100644
--- a/dev-ruby/rbs/Manifest
+++ b/dev-ruby/rbs/Manifest
@@ -1,8 +1,3 @@
 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-3.1.3.ebuild b/dev-ruby/rbs/rbs-3.1.3.ebuild
deleted file mode 100644
index 0e69e175d355..000000000000
--- a/dev-ruby/rbs/rbs-3.1.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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
deleted file mode 100644
index c66d09f9c28c..000000000000
--- a/dev-ruby/rbs/rbs-3.2.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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
deleted file mode 100644
index 5302c97c811c..000000000000
--- a/dev-ruby/rbs/rbs-3.4.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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
deleted file mode 100644
index 5302c97c811c..000000000000
--- a/dev-ruby/rbs/rbs-3.4.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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
deleted file mode 100644
index 46da666c978d..000000000000
--- a/dev-ruby/rbs/rbs-3.4.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 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/rexical/Manifest b/dev-ruby/rexical/Manifest
index 5744ff0cc72b..fda15c78cdfa 100644
--- a/dev-ruby/rexical/Manifest
+++ b/dev-ruby/rexical/Manifest
@@ -1 +1,2 @@
 DIST rexical-1.0.7.gem 22016 BLAKE2B aaadf4131fbc4958a6a17be02b970070e511dcb031fd6432fb62fb841eff36b4d5c41d8f8f295aed4ac376c49e736e5d795166f71957578c6cbe14fd6cea26be SHA512 f71c86bd9764e65ebe0c66acd5446b5da7a1b38aae9d33367d70bfa253eb53c178634ce90c883c5459622219670d4d32f375b216c3023a3109329d6930dec1fc
+DIST rexical-1.0.8.gem 29696 BLAKE2B ff025d8fa2d06abb264f7f75d81c668599e2ef06522c43f9614902a1a838a228190a148b70a471069d940723dd4a1ad8bccb774343d762fa3658e42bf72e7782 SHA512 52b6c8f46636a3372291c5575742984c622231b3221d3069b978d16c620ac598caec854795201b659b13d37033c1c1ab063bab38e3445a460d3860e4c168dbee
diff --git a/dev-ruby/rexical/rexical-1.0.8.ebuild b/dev-ruby/rexical/rexical-1.0.8.ebuild
new file mode 100644
index 000000000000..74b35215ca0a
--- /dev/null
+++ b/dev-ruby/rexical/rexical-1.0.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_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/sparklemotion/rexical/tree/master"
+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="test"
+
+# File collision, bug 459116
+RDEPEND+=" !!app-admin/rex"
+
+ruby_add_depend "dev-ruby/getoptlong"
+
+ruby_add_bdepend "
+	test? (
+		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
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc sample/*
+}
diff --git a/dev-ruby/roadie-rails/Manifest b/dev-ruby/roadie-rails/Manifest
index d08879a8828e..049c8d8f812b 100644
--- a/dev-ruby/roadie-rails/Manifest
+++ b/dev-ruby/roadie-rails/Manifest
@@ -1,2 +1,3 @@
 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
+DIST roadie-rails-3.2.0.tar.gz 90816 BLAKE2B 546bc1f402c68a9ae60d240470d4e2ed706032b81319ec8ce9b59872f7bb6a102468516fc13412485cb038cb8332615ca36ab6f05b7cc5f6fba9d54bd2a41703 SHA512 10535af44fa490c2d5ab790b956055af64add14bb9eb92dedf5ec6317e1be219974195e30c5e03f876740693aafdba5e2b11c68817c8ad7fc0711262ec16c943
diff --git a/dev-ruby/roadie-rails/roadie-rails-3.2.0.ebuild b/dev-ruby/roadie-rails/roadie-rails-3.2.0.ebuild
new file mode 100644
index 000000000000..5ef4f08166b6
--- /dev/null
+++ b/dev-ruby/roadie-rails/roadie-rails-3.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"
+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/ruby-install/Manifest b/dev-ruby/ruby-install/Manifest
index 59455c743088..885193ab4014 100644
--- a/dev-ruby/ruby-install/Manifest
+++ b/dev-ruby/ruby-install/Manifest
@@ -1,3 +1 @@
-DIST ruby-install-0.8.5.tar.gz 32904 BLAKE2B 6128d489c53c02b53b96f243a7c5fd3de2a360eac8ed7873c89cfafb229e611f77f3275e66bb1aef0ccad772029f7727c0e4a62c6dc74ec1780c7badd219cc52 SHA512 4f5546652e741eb4b1b72780a73e0b41b8bd212dd979e31124b8a1a96e9bbebdcb7951da20768b992776206a446b489214f2b1261255855760e2e3477118f8d7
-DIST ruby-install-0.9.0.tar.gz 34536 BLAKE2B de44b380b47f1c194bd9c39e43527c48b61f051bc126b051d87ce23db7d5ed3c6f46a97ff454e847a47fe16535c15d5903839f07ed30446f0b2f0d063364961b SHA512 d40195519d4d49749e13fb9d1c2e8f6a4c4c7b1cb4c419ce737a2dc2f7f6fb80b0783626bfe4b4bdd642a189d6fd641a5a121a4fa661e8a7539b4eefa12435ae
-DIST ruby-install-0.9.1.tar.gz 35732 BLAKE2B b61d882d9f7a1c8e07b0b094689f6606f1a80fd03f334b2d6365e0a9b18a0ca6829ef0db009fa783821cfb58a13dc130d96a280775027a7d901eb599f0900b34 SHA512 48fdc6904b5ab7f4cb6f18385432edade88bf2f388ef167ab2752b51841a481fc0f1b735169b6ef50f2dd070e1e59c28d21c7a4aa8dabe292a668b5d41db52a7
+DIST ruby-install-0.9.3.tar.gz 39008 BLAKE2B aa498ec23eb96f1732e4b46b286939e9f39e632d1215e70bdcbc4ae05d2e490711ba4f9ae2766af4bb068e5ed9dbb041f118ff8fd4b6fb430294f5d7c84cf417 SHA512 4c9576ba5a825b696d4586034110adabbb687a8cefb27ade2d2129a23463ea7d9c01372c92395a1fcc2d35655a0d5f708a9d1368ee33051add602a8676da3c9e
diff --git a/dev-ruby/ruby-install/files/ruby-install-0.9.1-fix-version.patch b/dev-ruby/ruby-install/files/ruby-install-0.9.1-fix-version.patch
deleted file mode 100644
index 040452eed23c..000000000000
--- a/dev-ruby/ruby-install/files/ruby-install-0.9.1-fix-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/share/ruby-install/ruby-install.sh b/share/ruby-install/ruby-install.sh
-index 976c2277..a0457d9f 100644
---- a/share/ruby-install/ruby-install.sh
-+++ b/share/ruby-install/ruby-install.sh
-@@ -2,7 +2,7 @@
- 
- shopt -s extglob
- 
--ruby_install_version="0.9.0"
-+ruby_install_version="0.9.1"
- ruby_install_dir="${BASH_SOURCE[0]%/*}"
- ruby_install_cache_dir="${XDG_CACHE_HOME:-$HOME/.cache}/ruby-install"
- 
diff --git a/dev-ruby/ruby-install/ruby-install-0.8.5.ebuild b/dev-ruby/ruby-install/ruby-install-0.8.5.ebuild
deleted file mode 100644
index 706d5e5d217d..000000000000
--- a/dev-ruby/ruby-install/ruby-install-0.8.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Installs Ruby, JRuby, Rubinius, TruffleRuby (native / GraalVM), or mruby."
-HOMEPAGE="https://github.com/postmodern/ruby-install"
-SRC_URI="https://github.com/postmodern/ruby-install/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-PROPERTIES="test_network"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=app-shells/bash-3.0:*"
-RDEPEND="${DEPEND}
-	sys-apps/grep
-	|| ( >net-misc/wget-1.12 net-misc/curl )
-	dev-libs/openssl
-	app-arch/tar
-	app-arch/bzip2
-	app-arch/xz-utils
-	sys-devel/patch
-	|| ( >=sys-devel/gcc-4.2 sys-devel/clang )"
-BDEPEND="test? ( dev-util/shunit2 )"
-
-# XXX: `make check` seems to be broken (violates shellcheck tests)
-src_test() {
-	emake test
-}
-
-src_prepare() {
-	default
-
-	sed -i Makefile -e "s/^VERSION=.\+$/VERSION=${PVR}/" \
-		|| die "Cannot fix doc location to follow Gentoo/FHS guidelines"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/dev-ruby/ruby-install/ruby-install-0.9.1.ebuild b/dev-ruby/ruby-install/ruby-install-0.9.1.ebuild
deleted file mode 100644
index 4e4057cefab6..000000000000
--- a/dev-ruby/ruby-install/ruby-install-0.9.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Installs Ruby, JRuby, Rubinius, TruffleRuby (native / GraalVM), or mruby."
-HOMEPAGE="https://github.com/postmodern/ruby-install"
-SRC_URI="https://github.com/postmodern/ruby-install/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-PROPERTIES="test_network"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=app-shells/bash-3.0:*"
-RDEPEND="${DEPEND}
-	sys-apps/grep
-	|| ( >net-misc/wget-1.12 net-misc/curl )
-	dev-libs/openssl
-	app-arch/tar
-	app-arch/bzip2
-	app-arch/xz-utils
-	sys-devel/patch
-	|| ( >=sys-devel/gcc-4.2 sys-devel/clang )"
-BDEPEND="test? ( dev-util/shunit2 )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-version.patch"
-)
-
-# BUG: `make check` fails: https://github.com/postmodern/ruby-install/issues/442
-src_test() {
-	emake test
-}
-
-src_prepare() {
-	default
-
-	sed -i Makefile -e "s/^VERSION=.\+$/VERSION=${PVR}/" \
-		|| die "Cannot fix doc location to follow Gentoo/FHS guidelines"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/dev-ruby/ruby-install/ruby-install-0.9.0.ebuild b/dev-ruby/ruby-install/ruby-install-0.9.3.ebuild
index 6316a7848db7..27cb8a5e4c33 100644
--- a/dev-ruby/ruby-install/ruby-install-0.9.0.ebuild
+++ b/dev-ruby/ruby-install/ruby-install-0.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-DESCRIPTION="Installs Ruby, JRuby, Rubinius, TruffleRuby (native / GraalVM), or mruby."
+DESCRIPTION="Installs Ruby, JRuby, Rubinius, TruffleRuby, or MRuby."
 HOMEPAGE="https://github.com/postmodern/ruby-install"
 SRC_URI="https://github.com/postmodern/ruby-install/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -35,7 +35,7 @@ src_test() {
 src_prepare() {
 	default
 
-	sed -i Makefile -e "s/^VERSION=.\+$/VERSION=${PVR}/" \
+	sed -i Makefile -e "s/^VERSION=${PV}$/VERSION=${PVR}/" \
 		|| die "Cannot fix doc location to follow Gentoo/FHS guidelines"
 }
 
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index c1775ada1795..7c950ff6c319 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -4,3 +4,4 @@ DIST rubygems-3.4.19.tar.gz 15037850 BLAKE2B adf618f326fa83a8eb7febb9872a71f2bf7
 DIST rubygems-3.4.22.tar.gz 15054005 BLAKE2B 856b60bf3a2f477b6e0aeaa4522f17934a6bf8c434f0d3a69afb823801975a74294f27e0906fc940c456414fd5bf94f71809e09676b839b0123a6f40dc3cefb4 SHA512 c69a03524936eb51e6a919ee0ee614c4e0bedf5a0bbe55314a876b3277116b6e8c92e52072368704415286b673d4c4b995b81665cc73b152a12377faee289916
 DIST rubygems-3.4.6.tar.gz 15011157 BLAKE2B a06178a1d5dbd8231493dce9d075451062edaa6b4affee6892d60c727e30ef4b7ff7933baf4ae49fedaa684f9898325ed1313648dac318bd62e9c733de374926 SHA512 d1c23b534f2254ff4dec564098f7eba83462eb9348da59a84de01fc4053ef3be02b2852af4542447de89a36d835f68634606040672d2a2f987c5670b9f373fe9
 DIST rubygems-3.5.3.tar.gz 13495997 BLAKE2B 1c9e01cc15a7afb0dfeaf61d14cea43fa19844a901cf6337f542b14da608dfa016ba438807276018b372f9c6ce8a44df2ea491f08a1217bd9f3fd04cd1ec57a7 SHA512 50f6ccd9f47c6d56c20c2bc23a35f0ca0edb2d55ae9904749bf03d1181acee499cce668df6a8847a5a59b37de0efb884acf028df6b768cb7cd2f1993ca4f8db2
+DIST rubygems-3.5.9.tar.gz 13538062 BLAKE2B db8b3c17381572f53df222b7fed53c6c16e2d6bfd6a74a21aa18ee4bc43c7824c5918956076ccc15b93e4ed669d9e58bda8b9736b3435c736c8da726161634a6 SHA512 c1de5b5744665590179efb5389829ace8345703007d880ff99dc55a230482aa696c960add4c2e2d5c290f2a762c3a7a469668158c95cdf4acb4afa82c0d67ecb
diff --git a/dev-ruby/rubygems/rubygems-3.5.9.ebuild b/dev-ruby/rubygems/rubygems-3.5.9.ebuild
new file mode 100644
index 000000000000..d0c9d9d059fc
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.5.9.ebuild
@@ -0,0 +1,116 @@
+# 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-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+
+SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="|| ( Ruby 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="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/treetop/treetop-1.6.12.ebuild b/dev-ruby/treetop/treetop-1.6.12.ebuild
index f255b7c9d3e4..09526bc9a615 100644
--- a/dev-ruby/treetop/treetop-1.6.12.ebuild
+++ b/dev-ruby/treetop/treetop-1.6.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
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
index 02f13af63803..0687d392972d 100644
--- a/dev-ruby/tty-color/tty-color-0.6.0-r1.ebuild
+++ b/dev-ruby/tty-color/tty-color-0.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/piotrmurach/tty-color/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 all_ruby_prepare() {
 	echo '-rspec_helper' > .rspec || die
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
index cdefde250a22..c23b7cbd513a 100644
--- a/dev-ruby/tty-prompt/tty-prompt-0.23.1-r1.ebuild
+++ b/dev-ruby/tty-prompt/tty-prompt-0.23.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/piotrmurach/tty-prompt/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "
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
index e6a9b9c8278b..907e7d01b4e7 100644
--- a/dev-ruby/tty-reader/tty-reader-0.9.0-r1.ebuild
+++ b/dev-ruby/tty-reader/tty-reader-0.9.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/piotrmurach/tty-reader/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/tty-screen/tty-screen-0.8.2.ebuild b/dev-ruby/tty-screen/tty-screen-0.8.2.ebuild
index 8e09d60f9ed2..0966d706fcc2 100644
--- a/dev-ruby/tty-screen/tty-screen-0.8.2.ebuild
+++ b/dev-ruby/tty-screen/tty-screen-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/piotrmurach/tty-screen/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/typeprof/Manifest b/dev-ruby/typeprof/Manifest
index b033c245d3d1..91fe4b1b0d1d 100644
--- a/dev-ruby/typeprof/Manifest
+++ b/dev-ruby/typeprof/Manifest
@@ -1,5 +1,2 @@
-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.21.10.ebuild b/dev-ruby/typeprof/typeprof-0.21.10.ebuild
deleted file mode 100644
index a498fca36c5b..000000000000
--- a/dev-ruby/typeprof/typeprof-0.21.10.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 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.8.ebuild b/dev-ruby/typeprof/typeprof-0.21.8.ebuild
deleted file mode 100644
index 1e06e21cd0bd..000000000000
--- a/dev-ruby/typeprof/typeprof-0.21.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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
deleted file mode 100644
index 3503da9cc378..000000000000
--- a/dev-ruby/typeprof/typeprof-0.21.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/tzinfo/tzinfo-1.2.11.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.11.ebuild
index f3dfe4242ab8..22be6624a951 100644
--- a/dev-ruby/tzinfo/tzinfo-1.2.11.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-1.2.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST="test_zoneinfo"
 
diff --git a/dev-ruby/unicode-display_width/Manifest b/dev-ruby/unicode-display_width/Manifest
index ffad72f4c458..f6e4b3075419 100644
--- a/dev-ruby/unicode-display_width/Manifest
+++ b/dev-ruby/unicode-display_width/Manifest
@@ -1,3 +1,2 @@
 DIST unicode-display_width-1.7.0.tar.gz 10822 BLAKE2B c3db387b9d61ba4ea9d5559824b22e40f173f9e9bcf7fdad3dba1edc36b39ae90276818bd54e74a6731bd2cb8c48b28e440d07f7e3cedbd8dc13441f79a2b56c SHA512 2b6d2b0118f4a2ad69e98fe2fac611ca94adc0dc59ad076083d0243c630a81a01d650965149a25feaf8986c262a5d55294e064361420e2140b53c5ced5fb1c77
-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/unicode-display_width-1.7.0-r1.ebuild b/dev-ruby/unicode-display_width/unicode-display_width-1.7.0-r1.ebuild
index 355b9b1c4284..b81e521396e9 100644
--- 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
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
deleted file mode 100644
index f4bfe763a339..000000000000
--- a/dev-ruby/unicode-display_width/unicode-display_width-2.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/vcr/Manifest b/dev-ruby/vcr/Manifest
index ed2bc6336184..cb91f378343a 100644
--- a/dev-ruby/vcr/Manifest
+++ b/dev-ruby/vcr/Manifest
@@ -1,2 +1 @@
-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-6.1.0.ebuild b/dev-ruby/vcr/vcr-6.1.0.ebuild
deleted file mode 100644
index fbccf7266804..000000000000
--- a/dev-ruby/vcr/vcr-6.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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 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/websocket/Manifest b/dev-ruby/websocket/Manifest
index 3b3c917a4fbb..5090086846a3 100644
--- a/dev-ruby/websocket/Manifest
+++ b/dev-ruby/websocket/Manifest
@@ -1,2 +1 @@
 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/websocket-1.2.9-r2.ebuild b/dev-ruby/websocket/websocket-1.2.9-r2.ebuild
deleted file mode 100644
index 32f26fb23e92..000000000000
--- a/dev-ruby/websocket/websocket-1.2.9-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/xmlrpc/Manifest b/dev-ruby/xmlrpc/Manifest
index e3c2599a177f..c2b2ac6ce336 100644
--- a/dev-ruby/xmlrpc/Manifest
+++ b/dev-ruby/xmlrpc/Manifest
@@ -1,2 +1 @@
-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
deleted file mode 100644
index 7087e62d2039..000000000000
--- a/dev-ruby/xmlrpc/xmlrpc-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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="${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/yard/Manifest b/dev-ruby/yard/Manifest
index 89b44fe7cfb7..a9a042e008a6 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,4 +1 @@
-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/yard-0.9.34-r2.ebuild b/dev-ruby/yard/yard-0.9.34-r2.ebuild
deleted file mode 100644
index 5edc4dfc2ad4..000000000000
--- a/dev-ruby/yard/yard-0.9.34-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 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
deleted file mode 100644
index 5e2af6de6910..000000000000
--- a/dev-ruby/yard/yard-0.9.34.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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
index 5d1f8575ffe4..84bb1284caf8 100644
--- a/dev-ruby/yard/yard-0.9.36.ebuild
+++ b/dev-ruby/yard/yard-0.9.36.ebuild
@@ -25,7 +25,7 @@ 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"
+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=(