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 22d090d9c7037..0000000000000
--- 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 ~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/bson/Manifest b/dev-ruby/bson/Manifest
index 698796f940521..5bb4e02b81b44 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
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 0000000000000..2b68221eb2e74
--- /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="ruby27 ruby30 ruby31 ruby32"
+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/climate_control/Manifest b/dev-ruby/climate_control/Manifest
index 331ee6405b9ad..3c146a2391ba8 100644
--- a/dev-ruby/climate_control/Manifest
+++ b/dev-ruby/climate_control/Manifest
@@ -1,2 +1 @@
-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-1.0.1.ebuild b/dev-ruby/climate_control/climate_control-1.0.1.ebuild
deleted file mode 100644
index afca40f5eb3b6..0000000000000
--- 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/css_parser/Manifest b/dev-ruby/css_parser/Manifest
index 0351087c5214d..08416b7e8cf4c 100644
--- a/dev-ruby/css_parser/Manifest
+++ b/dev-ruby/css_parser/Manifest
@@ -1,3 +1 @@
-DIST css_parser-1.11.0.tar.gz 38987 BLAKE2B e3420b635a7604dee4ca4c5f434dc3a8f3caf27310fb8d1a947e8d6aedb47e1130846afbe989f9d2c9c52b1db9e1266849fec09253c243a1f28a3bcb6ea58785 SHA512 9dfc1aff7f05dca82a10504c6e1c42011385e17db5f43faa5c83a2c2226b2f7a524fc626c6f7ce69e49d1919a6fc12baed35823d0da07940d41804bd1590ba50
-DIST css_parser-1.12.0.tar.gz 39191 BLAKE2B 8c112aab26248c1566df6c2f1078b6bb068406d50dc08da7c52395f4f8dd2ee16dd1e99d3812922af7c70d50a07ccab4f979c38caf8d2974a1c5d1ff29932c2f SHA512 6f5f4af113d30ba795dcf0bf104519697a2eb6cd092342c21b3236eb6db39d12ff5fde8c29971242f955bb9658c357995f37c00de69d53cc22cc4a5860446fb9
 DIST css_parser-1.14.0.tar.gz 39396 BLAKE2B 0cbed83854bf85779b7f3e495030f796e93310794f2f022d9cd5fa4ba29699e1e3676b18b0cc1027353e2d8daeb56001b5fbfd583e000ebb67499d8ea0aae735 SHA512 2d5da004b4c904e040d9814245c8a1e05cc08a5dff5ca8ec5050c1f2f288fa65c14b952fdc73aa88e1b945403f3b262c0958e942a5b20edd89cb9a8d97e07e22
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 e2ae1feb1af3f..0000000000000
--- 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.12.0.ebuild b/dev-ruby/css_parser/css_parser-1.12.0.ebuild
deleted file mode 100644
index 1faa46577b4b0..0000000000000
--- a/dev-ruby/css_parser/css_parser-1.12.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="ruby27 ruby30 ruby31"
-
-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.14.0.ebuild b/dev-ruby/css_parser/css_parser-1.14.0.ebuild
index 3875807891b48..c92373f6efb68 100644
--- a/dev-ruby/css_parser/css_parser-1.14.0.ebuild
+++ b/dev-ruby/css_parser/css_parser-1.14.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_DOC_DIR="doc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md "
diff --git a/dev-ruby/csv/Manifest b/dev-ruby/csv/Manifest
index f15bbdd83e7b7..facf92f5ca827 100644
--- a/dev-ruby/csv/Manifest
+++ b/dev-ruby/csv/Manifest
@@ -1,4 +1 @@
-DIST csv-3.2.3.tar.gz 88749 BLAKE2B ec927ae8eaaf4f050e34218cd5a6bef2cd912828e065a03b772070e0ad9f18617b55a771a1fe2a4467106cabf2d54efe84313fdecfb758104545b9874056eec9 SHA512 104b27991f43c9d18a7a0f9db38b32bf638b7b73e25376f1a404b76910a348bf8bf7850a9a671658b928bacfbe288176cfa14dce2ae1524c64dfbeb52138a482
-DIST csv-3.2.4.tar.gz 89474 BLAKE2B a4a4b890f4c978ab933d4f7fde05d90d30f44f4f954db39ca00f867a90b2d584e52625127ee33b81dab82445bf9a6a94340e090c35cd5c6ab9e14b22320d5d57 SHA512 b024132fda678347fae4b237dfbf9f261ca3bf46c22c627db4ad8c6f17a690ab97a8ad4ffe693f6ed3c5a71620408f15ccee9d27c36196c7b51ca9abc09029a5
-DIST csv-3.2.5.tar.gz 89665 BLAKE2B d464e1d36568b30328a3b2b14a363e19f3364f9a18afc16caba3cdff86c9d5bb2565706eef4f5dc573eacb918330477892aab6d544136fe8d1eed4ed558a3860 SHA512 2f41b7a51754843dd90213931e0bd2a29e7d1c03046a526d884c5677263fcb07110f507d7b91f2976693588799df1d261ce3d7f50d473206ce218def4a461250
 DIST csv-3.2.6.tar.gz 90054 BLAKE2B 106e3ef5d5e1ad3d95e80e96711db61bf00822711259188b26738b44de52c35d8e12c8042a7dbfeda5108c0b98cc73b8beb69c4f6957b2eb2f34297c220e5736 SHA512 b89044581d1c6cac5270573e424747c42a20cc6d51dde03971bbfc01b5ced3dd5ad713290a0e9c821cf67302153e9b17750e01b7f41182dcb794e0a4f10d88a2
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 0b15ce93d71a8..0000000000000
--- 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.4.ebuild b/dev-ruby/csv/csv-3.2.4.ebuild
deleted file mode 100644
index b0a5c099d9611..0000000000000
--- a/dev-ruby/csv/csv-3.2.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=8
-
-USE_RUBY="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.5.ebuild b/dev-ruby/csv/csv-3.2.5.ebuild
deleted file mode 100644
index b0a5c099d9611..0000000000000
--- a/dev-ruby/csv/csv-3.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="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/metadata.xml b/dev-ruby/csv/metadata.xml
index 7a38fd1850ff4..45c4fb8df4314 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/curses/Manifest b/dev-ruby/curses/Manifest
index fe082c7f966e5..44b378841d99b 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 720d16c8c1bfe..0000000000000
--- 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 6b1ad29920c09..0000000000000
--- 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 0c4d1ba0bfb2a..c11684275518b 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="ruby27 ruby30 ruby31 ruby32"
 
 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/dbf/Manifest b/dev-ruby/dbf/Manifest
index 1d6c5034b26b8..fa7f76bc5af0f 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -1,2 +1 @@
-DIST dbf-4.1.3.gem 127488 BLAKE2B aff62a0cfe636b987989a21ed5df2094ad09748603a73df42d02f8bbe1032031493d038267b7c33d928d71d164076194dbd97331e36d1e8cb2472747c92e8b7d SHA512 4baf9f69310656ba191643b315576c1020a24cec19740ce543f349996067293798989b4e203861392cbec6f06bb117b51a1f4358a6122f5e2abb9b44edf26cc9
 DIST dbf-4.2.2.gem 130048 BLAKE2B e701819c0a868373d38d160680759c38023c32d854e637e74d1839370161ef28155b0a470a2eb477abbe4ed3a3d1198d1da393257ce81c5fdb5ddaf7241c4256 SHA512 5c53e617942f7add764cb123a719cd067d5e1b379c6da3fc4d43be2ead144d14fb5e7a367d94043490f525c6aff07058451de5f26f2c6b5b90c8dec3788eb229
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 ab922a768cc31..0000000000000
--- 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.2.2.ebuild b/dev-ruby/dbf/dbf-4.2.2.ebuild
index 7551350c38c02..7f68351f26c60 100644
--- a/dev-ruby/dbf/dbf-4.2.2.ebuild
+++ b/dev-ruby/dbf/dbf-4.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -12,8 +12,7 @@ RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
 inherit ruby-fakegem
 
-DESCRIPTION="a small fast library for reading dBase, xBase, Clipper and FoxPro
-database files"
+DESCRIPTION="Small fast library for reading dBase, xBase, Clipper, FoxPro databases"
 HOMEPAGE="https://github.com/infused/dbf"
 
 LICENSE="MIT"
diff --git a/dev-ruby/ddmemoize/ddmemoize-1.0.0-r1.ebuild b/dev-ruby/ddmemoize/ddmemoize-1.0.0-r1.ebuild
index dda4c17944129..11179ff935d36 100644
--- a/dev-ruby/ddmemoize/ddmemoize-1.0.0-r1.ebuild
+++ b/dev-ruby/ddmemoize/ddmemoize-1.0.0-r1.ebuild
@@ -1,9 +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"
+# Beware: suspicious non-fatal warnings appear in tests with >=ruby31
+# Needs more investigation
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
diff --git a/dev-ruby/ddmetrics/ddmetrics-1.0.1-r1.ebuild b/dev-ruby/ddmetrics/ddmetrics-1.0.1-r1.ebuild
index c3e526fb27ee3..61f502d08a12a 100644
--- a/dev-ruby/ddmetrics/ddmetrics-1.0.1-r1.ebuild
+++ b/dev-ruby/ddmetrics/ddmetrics-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="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
diff --git a/dev-ruby/digest/Manifest b/dev-ruby/digest/Manifest
index 7831c0f62d10c..b32c8b7395bf4 100644
--- a/dev-ruby/digest/Manifest
+++ b/dev-ruby/digest/Manifest
@@ -1,2 +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-r1.ebuild b/dev-ruby/digest/digest-3.1.0-r1.ebuild
deleted file mode 100644
index e7de0f81ae177..0000000000000
--- a/dev-ruby/digest/digest-3.1.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 ruby31"
-
-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 ~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:ext/digest/lib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
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 ab155997e8f14..0000000000000
--- 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/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 ae75903d36ea5..0000000000000
--- a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-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="ruby27 ruby30"
-
-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/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 03fbee88251dd..0000000000000
--- 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/flog/Manifest b/dev-ruby/flog/Manifest
index 0516585f24b2c..ac87a44f39234 100644
--- a/dev-ruby/flog/Manifest
+++ b/dev-ruby/flog/Manifest
@@ -1,2 +1 @@
-DIST flog-4.6.5.gem 26624 BLAKE2B c1cf4377be7a2b9856e4f370b6a559ac1ebac6aba7da28bd6a27bb84fe8df613680cb7c96e3d30e42d30011b97309c60e7f4bec2c322bcc3b2ed8ad5f93172a1 SHA512 81eaf3871f6111b442fb82371720709073f00a17044885e85498e7f943e1c9f8b5345ae8ff06a56ff68db8919ee0e696284bf017b1e1e66d76419306bed90866
 DIST flog-4.6.6.gem 26624 BLAKE2B 7643813d436ca516d60bbde6cefb18d561a1ffd6fde3586a7104450a96b6d363dc6b794620b41e8ffeffd831e252cf15d681b2fdf41acb3b3c0d0cb5b4e95c25 SHA512 0689f85de19eee0d992e094f43b74f2eaf08696cfdaab849760e5f017b83bd0acb538bd0a6d6289538ac5b7f888069e12507eb6139fa35532a310122c4412c64
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 b2b88b559e647..0000000000000
--- 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/metadata.xml b/dev-ruby/flog/metadata.xml
index 658c72b1920d8..fe5c4cfffa112 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/letter_opener/Manifest b/dev-ruby/letter_opener/Manifest
index 899245c2e1936..03b5cc7366bab 100644
--- a/dev-ruby/letter_opener/Manifest
+++ b/dev-ruby/letter_opener/Manifest
@@ -1,2 +1 @@
-DIST letter_opener-1.8.0.tar.gz 12661 BLAKE2B 49e2998b0d94fd89ddb72ad75e497bef9fe5ce5876897ce05925e6b3b37732c61350d2228f9c33e6fce555af301142dddb35f49f1f215b240aba3495713fc6f4 SHA512 d1985d5b67c581c976db3fb9199e5207d2a12609f49011d91a20fd71bd8b6f8e5b35b0cdbe7592ad7df8effa7de14f70d378e1f9323f5b6113b397c1992b75c5
 DIST letter_opener-1.8.1.tar.gz 12680 BLAKE2B 3204a5f6a33f722f255f126597655f6209d87764ff9b92ac770a35342906b9d192a62aade992709aaa55baa03046a342f48c4671d3a47a5fd5350bc2e7e7d0e1 SHA512 ce360bcb9f8c07e1319f74187ff85ef799d0a3387f0081ffe3cff2e8b52a9445c22b39fed4b729aee23fb67121c5e47b280ef502f95940aacbb6be31533185be
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 b5e49dfba9c73..0000000000000
--- 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/mechanize/Manifest b/dev-ruby/mechanize/Manifest
index 682e3df988e78..ca2dbec7f44c6 100644
--- a/dev-ruby/mechanize/Manifest
+++ b/dev-ruby/mechanize/Manifest
@@ -1,2 +1 @@
-DIST mechanize-2.8.4.gem 142336 BLAKE2B d09cdf7fcb250894b358c479dff60e6f72675574ce62e3f267717538761a322730b25798ea981ccb33eaa6617d88f96942be23ff5fdc6b4c35218b64569d97b5 SHA512 3b5a82d69070a8ad57e73527519efe91e5af8c9b3b75fcd38f598d37475ea8933b8799c12a6c59edd705936bdaab12fe1cd6cb024e165df99fe3cce18f0b7d01
 DIST mechanize-2.8.5.gem 142848 BLAKE2B 73fbf0ef6e3091bd37ace311415056bbc94ef22cfe5411b440faa791747faac349765db20c18a0133037e9564c061c13b250aa2a5677152d7fa0732d8a4a10cd SHA512 8ef26d80c7c55f564084eedf6c7255849ccf6efbb2e6ce11ddb3b5f8f3591861200041b89416ab3d8b9a8595c6c8de1f9c7e01b8e0c6b63265488498e2584c94
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 81b808140577b..0000000000000
--- 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/mimemagic/mimemagic-0.3.10-r1.ebuild b/dev-ruby/mimemagic/mimemagic-0.3.10-r1.ebuild
index 14cda3064dd10..33422b38290ca 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 95b97506ad876..0000000000000
--- 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.ebuild b/dev-ruby/mimemagic/mimemagic-0.4.3.ebuild
deleted file mode 100644
index d8b4ab4e72fac..0000000000000
--- 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/net-imap/Manifest b/dev-ruby/net-imap/Manifest
index 06ce6b70fac1d..b7846097a7017 100644
--- a/dev-ruby/net-imap/Manifest
+++ b/dev-ruby/net-imap/Manifest
@@ -1,4 +1,2 @@
-DIST net-imap-0.2.3.tar.gz 61440 BLAKE2B f38bed72777ad93b5a94361ca134644ae218f4a0cb3f26330a99dd5633d30f0f846f3fc4eeb01bc94c13bd5e553cb29f1ad03264987badf83b8f5404755c73ac SHA512 69b6596a8ecc66788be10d11dad911351db6ff651f56e8dc5223f4c948efe0d2e53bd465ebf56edd96f1c414e3819413835c14b35a8e90b9f9ac59bfaa5611c6
-DIST net-imap-0.3.1.tar.gz 63981 BLAKE2B df3eca949e9736bebf6af27859c4198d05734762d8f1755fade685986f4248e05a09a6e4c48fd92d5f537a2f206bac6da75165f0c42171fa7bd533b908071d16 SHA512 b2f88b3fc2cd6ed6c0ed1e8c60100e84ac9a8c0406a780ff5b7b0f11440fb997e79dea0f67a15a139f9bb41e76bff5fcb60668fd1ed4be65142199a4d3c9e167
 DIST net-imap-0.3.4.tar.gz 103226 BLAKE2B b08ee0ad9ad788c1a58e583b3e71cef6e13f6c4f35cc1a67909715a30b0797987f71b1a790e0ca3a2a4b0da3b23ac2451c5e0fb8217506eb0e050c2c2c624362 SHA512 ced2433212738e1c54b783602dc8ed79b0d6fabef0d830d12e4d1a8b7f1df896596499a4b986dab1ac8e1e389bf88f87c854ceafbe57b7ad1cf5c0db29223ba1
 DIST rfc3454.txt 138684 BLAKE2B 56c850a7f5782c1447ae633ad9a380253b97925b9edeadbeb9001f4905157c353db967125dfb3bfef1e1bc2297142e5db424cb3b1325837ab4bb05db1f0f92a9 SHA512 79a85fede7df9202cbaf3fbb0bd59d951352c56208da2adf0baa5571ad92fd2153a6348000994b733c8a1bfdc93c38c86ed33708ecdef8571f20f906564384b6
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 d3e03b6e82316..0000000000000
--- 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.1.ebuild b/dev-ruby/net-imap/net-imap-0.3.1.ebuild
deleted file mode 100644
index 5832ba3f62d4a..0000000000000
--- a/dev-ruby/net-imap/net-imap-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="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/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-pop/Manifest b/dev-ruby/net-pop/Manifest
index 712c13df5e749..f9d3cc6842565 100644
--- a/dev-ruby/net-pop/Manifest
+++ b/dev-ruby/net-pop/Manifest
@@ -1,2 +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 019ae66747914..0000000000000
--- 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/oauth/Manifest b/dev-ruby/oauth/Manifest
index 9e0f781b453a8..b00f5bccbf13c 100644
--- a/dev-ruby/oauth/Manifest
+++ b/dev-ruby/oauth/Manifest
@@ -1,3 +1 @@
-DIST oauth-0.5.10.tar.gz 67073 BLAKE2B 30d5823151412f53af41f28f7d5831bcfa7e7cf0b86d3a122b825fd086c00dab7fca7a4838b7ed5ebb269725af7c2a64cf771fc598bd6a97b9968e480ce78b4c SHA512 0ff5cd07052e210b1948496844166e1095b09d9c39592b6b11fa3aa4909fd8debec55237493d292dc60f4fe513ddf1a8f58cdb0215949241cf753d4e53aa107e
 DIST oauth-0.5.14.tar.gz 68764 BLAKE2B 19c7f463d5fcba62a609355834ba93adf1efa05b2ce25fc5d9d3623da15d35a7cb54eff9201bb4f373a66629781f5937326430a7a1c9c615929bcc5bae099a67 SHA512 646ed55a602e9e7b8e8d59532c89929305abeeda6b38fc38bdf1d5e400deec7f5884d988bcbb9e3537eb3a0921dacb73cb5238af27e9885aff95b67196f62c99
-DIST oauth-0.5.8.tar.gz 67852 BLAKE2B 7dc19a2f84f585fd517d677bf441c5964b45566ffea3cbd7612061db115a5570cf8315b4cbdd8788f9b0ff336b6eea91922f17c0ce17a4c626731282bd8203ca SHA512 3bf8298ea5bcffe1fe61ba894a5cfcb04a5814348154749e056ea18d975b00b10db7ed226f2187ffb9f414b755022bf32ff4bb2c02f1f429f6a9a7062032d82e
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 d2a781ddc4e8d..0000000000000
--- a/dev-ruby/oauth/oauth-0.5.10.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 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"; require "action_dispatch"' \
-		-e '/mocha/ s/mini_test/minitest/' \
-		-e '/\(byebug\|minitest_helpers\|simplecov\)/I s:^:#:' test/test_helper.rb || die
-
-	# Avoid test tripped up by kwargs confusion
-	sed -i -e '/test_authorize/askip "kwargs confusion"' test/units/test_cli.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/**/*test*.rb"].each {|f| require f}' || 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 6aacd85e42e91..0000000000000
--- 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/omniauth/Manifest b/dev-ruby/omniauth/Manifest
index 35435c5ec107a..048653b8c6676 100644
--- a/dev-ruby/omniauth/Manifest
+++ b/dev-ruby/omniauth/Manifest
@@ -1,2 +1 @@
-DIST omniauth-2.1.0.tar.gz 31135 BLAKE2B b221c084b926e3ac9e31858268940d0bd8583c667c7bcb8ce14e7fbda91c06c286191ffeff36c17d1d668ee29ca850b377312f2f2a417c47cb1dd4e8a447a641 SHA512 f1dde6f527b6aafdbed83ce6e14dae39617b738c6e80e9ece3d768ef9f63a87924ef2ef92b99ecc52bd69c0103854f16ff9c80f3d2eeb7c134fc70ab0157df63
 DIST omniauth-2.1.1.tar.gz 31414 BLAKE2B 180ee40499a61e8b6360dc4c462ca10933dc7bac976f76dd8c9579e73da6618ffae71ed532fab024f0eb65c3830db1e52f866c40b6e160e65c8fa403c7c1ab37 SHA512 e86fbd3c1f239b4950f17fdfe4ebd97a9a135831b63892dd009bae97f4372b3a6fa2452233e414c6097c3b835ee4e75821e795599da9613affdaf163d31964a3
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 16d0da9a9ceb5..0000000000000
--- 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/paint/Manifest b/dev-ruby/paint/Manifest
index 218af7b99b46f..209b8d7cb2264 100644
--- a/dev-ruby/paint/Manifest
+++ b/dev-ruby/paint/Manifest
@@ -1,2 +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 a7b57a3529d08..0000000000000
--- 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/ref/ref-2.0.0-r1.ebuild b/dev-ruby/ref/ref-2.0.0-r1.ebuild
index 14a1786924b83..d485ed6619dd3 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="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/request_store/Manifest b/dev-ruby/request_store/Manifest
index e957a1218555f..b3f238b59dd81 100644
--- a/dev-ruby/request_store/Manifest
+++ b/dev-ruby/request_store/Manifest
@@ -1,2 +1 @@
-DIST request_store-1.5.0.gem 9216 BLAKE2B 75dd49c33cfebcf0deef78be1fe054feb7198b42409ec4b339cefdbdd4fc066159bd18ae6db8001edd0fe20e1e8be1021812e6ffd033eed0bd9730603aaa2daf SHA512 c01d4505d2bc0b88456d0bc49416fcbea67da1e2ab6ef0c7fc900fae8856d82157dc39d2e1d2f299000f74b140f6f13d7352f4684e247d103bbaab7b1705910f
 DIST request_store-1.5.1.gem 9728 BLAKE2B df83be1ecdb8b6158133925167df19cff59eab3cdb2ea1b5f970359a19a79dcd114f9c8d42856a1bf0173bb69df8f89efe54c29f5c6a9dd58d4b8bb7ccfa76d2 SHA512 89ba2df4169a23c60546081c5d872c26f09ce6edbb6bfdb9bb03ba3e194ca36b7f588e3f77deaa82ae6465e2ab8c372c9199fd49232ba37bd8e5d0cdcac785f1
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 3a5247cc5319a..0000000000000
--- 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/rexml/metadata.xml b/dev-ruby/rexml/metadata.xml
index 7a38fd1850ff4..db83ebe517217 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.ebuild b/dev-ruby/rexml/rexml-3.2.5.ebuild
deleted file mode 100644
index c0aaebeb5c0ed..0000000000000
--- 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/rjb/Manifest b/dev-ruby/rjb/Manifest
index f0598577ab404..28ab61da4b823 100644
--- a/dev-ruby/rjb/Manifest
+++ b/dev-ruby/rjb/Manifest
@@ -1,3 +1 @@
-DIST rjb-1.6.5.gem 75264 BLAKE2B 0608e3d2a70fbf909c2be454e71960ae900fadeda936677c290de1b1bfebacd43e9582dea847b3b6ca6c7294c11ff6fce409c1f59c72aea22c3fbc337ca0c590 SHA512 328a2b58eaf4673d5218ae7c87708c115b817f082844893c548a1fab5b544f729d6874cdba4f4fff6443e2fde2370daa8937f729b949c842461a4988033685ac
-DIST rjb-1.6.6.gem 74752 BLAKE2B a5dc335d9d5380b9ae6a94dabbe6c2c2db3daeffbe5a4900928ebc64eaeca07b4bb6bd1957a10639153808adb0910768b76fc733175e102824508e889690d30c SHA512 6b6af001905e4b342ec54149ac5dd475c2ab240be5622e1cd8e31765ea5c273542110a75fa92e7d0e220a07689ada9d2b899b37c6840353733e59a19c8e13b1a
 DIST rjb-1.6.7.gem 74752 BLAKE2B 835bc45b4568599e030033d9cff4d1df2da2cffd63ad594a437eeae7974d5e6f1bea490631c79f0990697f006e0006aab923134860aaf57312b153f750bda62b SHA512 ae5980621900d2605372f1cb3783d213e19da7bf1a7b2834dbdb99895476ecf2dad0ee474140e2747bbd477a5ab6d4be94cc9bf4fd0b8f0109ded94d7621bb7e
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 a4c722657a3e6..0000000000000
--- 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.6.ebuild b/dev-ruby/rjb/rjb-1.6.6.ebuild
deleted file mode 100644
index 85ee9b5337861..0000000000000
--- a/dev-ruby/rjb/rjb-1.6.6.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 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/rotp/Manifest b/dev-ruby/rotp/Manifest
index 89b806db9a028..c01f7f2b2047f 100644
--- a/dev-ruby/rotp/Manifest
+++ b/dev-ruby/rotp/Manifest
@@ -1,3 +1 @@
-DIST rotp-6.2.0.tar.gz 60000 BLAKE2B dba270201593425c9282aca71efb33ecacda916996ebfffc703dd865a6c6ee3b3da4098497ce036a95157089d8d736e9413d0aa9fd0dc582d4b278ce811e05d0 SHA512 938cf9feffbe7e86f542c6dde4cd87b57e2ddd2696303e69cb76bc9fb04ffb40c9a5ef45288f23cb096d9f6706e0b48ad89907dc9322594df10c8c0521feffa1
-DIST rotp-6.2.1.tar.gz 16509 BLAKE2B aad879bcbeb32214cbf81bb6af546e9158c607a4d4dd2e042ac7eda9d8c8baa30df7f0376935bab73062f853441c3e69834625dd2c048d9194ce2cf73df5b11e SHA512 24ff3474f2c0ce30ccd0d04ef37e3da195da95b9a3fe47a2ae028484012bf9406e99499c489e5dff14ad2454a71fd590b930f7bd046e91f4791c056bf21daa3f
 DIST rotp-6.2.2.tar.gz 16554 BLAKE2B ba6688238c1e0f0674cc38f8ee0a9f4db2396afbe8a66c47f309ab5b14ef80be039e76d610cd29cad7ce15f6ce2de5be4edc40f2a27841227910a71ec9c56bfc SHA512 88292c80122eec53ed9a45682263b66f1ff6aaad04e0247e235a94faa5d27c1f12398445d81152b6da5565039810f7d5a6974af4bb179a6b8e0a3282fbd6437e
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 cf584132bc38a..0000000000000
--- 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.1.ebuild b/dev-ruby/rotp/rotp-6.2.1.ebuild
deleted file mode 100644
index f5bce8f31ffca..0000000000000
--- a/dev-ruby/rotp/rotp-6.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31"
-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/rss/rss-0.2.9.ebuild b/dev-ruby/rss/rss-0.2.9.ebuild
deleted file mode 100644
index f84ec6297ee91..0000000000000
--- 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/rubytter/rubytter-1.5.1-r2.ebuild b/dev-ruby/rubytter/rubytter-1.5.1-r2.ebuild
index ceca69b7b4e45..5722c2276077f 100644
--- a/dev-ruby/rubytter/rubytter-1.5.1-r2.ebuild
+++ b/dev-ruby/rubytter/rubytter-1.5.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=7
-USE_RUBY="ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/sanitize/Manifest b/dev-ruby/sanitize/Manifest
index 4738935cd7dc6..6cefb5874c5fa 100644
--- a/dev-ruby/sanitize/Manifest
+++ b/dev-ruby/sanitize/Manifest
@@ -1,2 +1 @@
-DIST sanitize-6.0.0.tar.gz 1353309 BLAKE2B 3056b79ee9611797cb8058f37a694f029e7609b4df8d968ccbece4ffe562c30aa55d9fafdbb9abc1ded86aa0c605fbd48546b8fbedef06272f0184c16f7e9dad SHA512 8a3ce765b6bc0ef8418af785e1fea5ae3b2a32eda82cfc21f9ea36df164c293250fd277ad8ac065757db18ea104b826fcebcbd46d5ad2ab059807e377765476d
 DIST sanitize-6.0.1.tar.gz 1352433 BLAKE2B 91614d3a5fe4f3d3741a8cc8d88a98281a43424132e82932600f4140ab857a0a3492d49ed92205a7e9a05f9eb0b350c30b3b0342790baab0b5f37ab6b83357a2 SHA512 2b43b11e211ddc10c1362bb5c78abd2c8844f3daf6dbb44ddd0731af596a44f7d5883e4f45e3d29c9b8f545794b8a1f98301565818982dadd8c86ece7fd9b2a1
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 2cc0a8edecfef..0000000000000
--- 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/sdoc/sdoc-1.1.0-r1.ebuild b/dev-ruby/sdoc/sdoc-1.1.0-r1.ebuild
index 20c6fe0c06c56..c654e79dff708 100644
--- a/dev-ruby/sdoc/sdoc-1.1.0-r1.ebuild
+++ b/dev-ruby/sdoc/sdoc-1.1.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://rubygems.org/gems/sdoc"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ppc ~riscv ~x86"
 
 ruby_add_rdepend ">=dev-ruby/rdoc-5.0"
 
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 ab8c3885fee6e..0000000000000
--- 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/set/Manifest b/dev-ruby/set/Manifest
index b00e5df18f032..5aab3c52aba28 100644
--- a/dev-ruby/set/Manifest
+++ b/dev-ruby/set/Manifest
@@ -1,2 +1 @@
-DIST set-1.0.2.tar.gz 14237 BLAKE2B 767e8ea3684a91475f8dfc1190e2a8022b4330071ceb12ee06f76c23d688f6203571c127592adf5de7ff7b5722999d7a7605df8dc5215e183dabd65fb7863c80 SHA512 b64aeb47b7abe1e1245d33cc081c21f36ab66a115a88678c8b99c44149ef87eb1a522f166d8e02abe614623178992758cb88e9a0aea25fee0e39229265eab59c
 DIST set-1.0.3.tar.gz 14549 BLAKE2B 73ced396e10bd65df7e11edf0c553b7fd517dbc74c6f0721c61dba5e70ec730ed98fe45a834224059a5fb84ca60f194b535763f698b7f5e96b45a6118233ecc3 SHA512 5e4effabcfb7034b054ad5276243bf1aab378d0446790fe99c6911970ff1881acc9b704607acab836db75117903b8187d2aeb33e33d9e39d0ee53b41ea7a6086
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 2ca245abc0f25..0000000000000
--- 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/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest
index 2650735adf301..f79276cdf9f79 100644
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@@ -1,2 +1 @@
-DIST sexp_processor-4.16.0.gem 56832 BLAKE2B 431005f5adc04605f6be5a34eb8933b32e4c90426f7099c670f70753381fc8892f9f9b39cba715e6192cd26a9a042ca4d7122ef7e75d2310d72772c3ba470fd2 SHA512 d6300b963782fcaa1f0854a0a10714e9fd65aac2925ba99e9c986eb62f2e940c18652f919640bcb9f8bb13ea613bee723f80a3237bd6a692bf719e726dc917f3
 DIST sexp_processor-4.16.1.gem 56832 BLAKE2B fa17cf32d67cec6a89c202d10dd18af463c70ad2e5455c891b4a68bee6fe6971577067192ae5ad2bfb7eb3f932a1988cb878ad5d901191538a69d62968c9d12f SHA512 eda019d253cce8cd6a93532745dc03e8129f7667e798543b0d38488dceb951b058e292976fe085126c421412c289c3d650ce1cf14c0fbbbafdef896b4db615b2
diff --git a/dev-ruby/sexp_processor/metadata.xml b/dev-ruby/sexp_processor/metadata.xml
index 658c72b1920d8..da57b9a67d163 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.16.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.16.0.ebuild
deleted file mode 100644
index c27d8b477f733..0000000000000
--- 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/simple_oauth/simple_oauth-0.3.1-r1.ebuild b/dev-ruby/simple_oauth/simple_oauth-0.3.1-r1.ebuild
index a5334f8204035..96b6dd5b8d531 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="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/simplecov/Manifest b/dev-ruby/simplecov/Manifest
index da9145e8068b4..5d1e9d15539c9 100644
--- a/dev-ruby/simplecov/Manifest
+++ b/dev-ruby/simplecov/Manifest
@@ -1,3 +1,2 @@
-DIST simplecov-0.19.1.tar.gz 107430 BLAKE2B 0f18cd4c8ddfd324f4e3326ad8503530862f0ae67658865183984b81a59ad9aa5fcf650fa9f64fa6841ea23afa07d25e38443a79ad0be26b966fa99b6805a090 SHA512 2d781008769abd79020be96f7c1f91cfb9f27d51d00436f737c408a9b9d57a82955cbe5ba5ee5a628b9a7e8835d9b3e1542b67499355373c4f9b2638bee83235
 DIST simplecov-0.21.2.tar.gz 114080 BLAKE2B b1bdfd45a39f97072d871a6d4ba4a2d9f2b94642cbbe329fba91b53b1d6a9b024e224e822ca49c28c4849b7bc3ade19027c6aab739d3acf28c09cd3c773ce4eb SHA512 68e9a901b2ecef07aebad214ea86a092871b0ebf5b62881ca97ca0033c1ee5b9ba395116f9960e69cd88b90f569a3b573a3879178e9ccfa06d28c94de8b4f918
 DIST simplecov-0.22.0.tar.gz 115236 BLAKE2B d013f254d534ddd1ad273e2a6990c7ec96710cef106c73ecaba18c04ac5922bad52e086f11bf019abb21dd6cfc2f4b02e058b5042029716c6e3ed64e1c35993a SHA512 ba7e1a29a219337c1e00d055408d825b20a7b81ec4768612d9d5e8a18af08d47d86a42cee78c64ae0f431196136b5dd522364882d83e5210366d8aa03d5c54b4
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 89da8c8d6181a..0000000000000
--- 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/spring/Manifest b/dev-ruby/spring/Manifest
index 54559a07d1d39..be69d6a672c4a 100644
--- a/dev-ruby/spring/Manifest
+++ b/dev-ruby/spring/Manifest
@@ -1,3 +1 @@
-DIST spring-4.0.0.tar.gz 46258 BLAKE2B 9e02594dff1882f3f7f47af682afddafc3f4be97f9c3dcc0ee3289be9fb1bc252260e24bec44d024ce808a26a2ac571840357df8fcc719e60ca9ca159460b998 SHA512 c5ed7e389c97dea3b183d6cd373823c3230a84f21427cabacd72ea2bc97f00bcbf9855d36808a1bf3257ccaea21ee35f2070716dc4f0b64205a674202eac6b94
-DIST spring-4.1.0.tar.gz 46775 BLAKE2B 5ae0b1b74438e0e8c41ef7e3bd2a5041c6277b91c8befef7a235f42d3a876f2a125c8ddf1dcca86216c4a740a7c07b49077f64baa8cd078ef695e109d2aaaa5d SHA512 f91d9ad8c87acdc9b8af593f788dd7c255da3c2b407c43d9c20d16c3e21d731f8e923c5e00e4e1ee59596ea04c7f26a2a1eb3a2251edc8cb94dd16c346654285
 DIST spring-4.1.1.tar.gz 46849 BLAKE2B 08e66e8e8869ae900bd134ceb82e55d08ba005291b8a7c83a61225c04373b8b89488f0636c4bcf0a8fdc6407ae2b1da26ac7092a3cdd5b1209d2ae2c4a6abd06 SHA512 caf85cf8588825b62cc8284bea79ad3b1faa5b61cf773db78c4f62b24df1e0fd5d6ba148d993045ab8dc768dde5a3401aa228ba51b4985b98f5ce4080f695e43
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 3abfbcdaa757f..0000000000000
--- 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.0.ebuild b/dev-ruby/spring/spring-4.1.0.ebuild
deleted file mode 100644
index c5fdc4f6bd577..0000000000000
--- a/dev-ruby/spring/spring-4.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="ruby27 ruby30 ruby31"
-
-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/thor/Manifest b/dev-ruby/thor/Manifest
index 1f4c8fe78d1ec..a89e5dfe47d4d 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -1,2 +1 @@
-DIST thor-git-1.1.0.tgz 98252 BLAKE2B 1537cfe6e7cc0d92cc8bde56f0e2acf06b6ee4cb366a5686bb62de43dd15709a4aeaf1b30c3dfa71a6d6c7570e702deeebab6da324204388ac427337514be3f0 SHA512 d1872a834478c5a2054dde6f55e93f6765fd628536f99f888bd7495436c88658537d48c44ef1e5ad6d1388edfa294ea2a3f3cbde32c19b7d2253b78bc62bf9d0
 DIST thor-git-1.2.1.tgz 96638 BLAKE2B 03826d2545c61f5fd433325bc65b244921fd0ed0f030ea173fa6f558ca9fd62ac52dca829c66de32569321b3d52353f306559fa34c34e472b1aa52184ba3d812 SHA512 88e58b6ca6c812cb84ab59e0ee8afcd8fa70b6c24d403cd5ea05d1d40ac30e85f2c7412611cc176eb541d16878e309d25c7e4284f64c760475925ffe359250b9
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 063dc3ff34fe5..0000000000000
--- a/dev-ruby/thor/thor-1.1.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2000-2023 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="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 ~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/twitter/twitter-7.0.0-r2.ebuild b/dev-ruby/twitter/twitter-7.0.0-r2.ebuild
deleted file mode 100644
index 6f9c0eb2ee14d..0000000000000
--- a/dev-ruby/twitter/twitter-7.0.0-r2.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="ruby27 ruby30"
-
-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/unf_ext/Manifest b/dev-ruby/unf_ext/Manifest
index edea899b96e65..5ff3012d144a3 100644
--- a/dev-ruby/unf_ext/Manifest
+++ b/dev-ruby/unf_ext/Manifest
@@ -1,4 +1 @@
-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.2.gem 399360 BLAKE2B 01c98ff018ec3471d4068e79b6a80980e891835a940b109c9b240226ed97f89ce71b3236b9185c6087a4e61fe6b77b249fc952b65483b5adb96fc25ee0d4bb05 SHA512 c9d3e54c96a525031d3b2fe349b5ffa1d03e3f28f74c3a2715af299e5274c7514526d07be5d7244a2cf9561c11e170b15c75d34c5e2a7143cef1ee25d32d2137
-DIST unf_ext-0.0.8.gem 399360 BLAKE2B f364808e7e1cbbe27ba1447ec45f5fdaed37d2579cc2a08c6bccd06c23135421949479f5a96ee6f27336bb28bc68509ed931d30a338d7f6079533799b5c8d0e4 SHA512 f0c1e7273aa1b74c81a8b6f108171cbee5479c3f5c256ea3eba3797cf2f5db0c346a33a524fa40bcdea02a75be60fcd470f0a17231cb7b103d28763dd0f8b56f
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 7ecd8a9798e39..0000000000000
--- 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 e3cd634f58a46..0000000000000
--- 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.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.8.ebuild
deleted file mode 100644
index e7648c32cafa1..0000000000000
--- 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/windows_error/Manifest b/dev-ruby/windows_error/Manifest
index 2b746f60fc268..d729e9cd71e62 100644
--- a/dev-ruby/windows_error/Manifest
+++ b/dev-ruby/windows_error/Manifest
@@ -1,3 +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/windows_error-0.1.3.ebuild b/dev-ruby/windows_error/windows_error-0.1.3.ebuild
deleted file mode 100644
index 04889817f17ca..0000000000000
--- 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 112db8a3ab168..0000000000000
--- 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/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index c273a431c5b17..b81038237a6b2 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -103,16 +103,21 @@ ruby_implementation_depend() {
 # Return a list of valid implementations in USE_RUBY, skipping the old
 # implementations that are no longer supported.
 _ruby_get_all_impls() {
-	local i
+	local i found_valid_impl
 	for i in ${USE_RUBY}; do
 		case ${i} in
 			# removed implementations
 			ruby19|ruby20|ruby21|ruby22|ruby23|ruby24|ruby25|ruby26|jruby)
 				;;
 			*)
+				found_valid_impl=1
 				echo ${i};;
 		esac
 	done
+
+	if [[ -z ${found_valid_impl} ]] ; then
+		die "No supported implementation in USE_RUBY."
+	fi
 }
 
 # @FUNCTION: ruby_samelib
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
index fe075d8692853..25ffa5d82c40c 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r11.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=7
 
-RUBY_OPTIONAL=yes
-
-inherit autotools ruby-ng flag-o-matic toolchain-funcs multilib-minimal
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
 
 MY_P=${P/_/.}
 DESCRIPTION="A library that creates colored ASCII-art graphics"
@@ -16,7 +14,7 @@ S="${WORKDIR}/all/${MY_P}"
 LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc imlib ncurses opengl ruby slang static-libs test truetype X"
+IUSE="doc imlib ncurses opengl slang static-libs test truetype X"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE=""
@@ -65,10 +63,6 @@ PATCHES=(
 	"${FILESDIR}/fix-css-path.patch"
 )
 
-pkg_setup() {
-	use ruby && ruby-ng_pkg_setup
-}
-
 src_prepare() {
 	# bug #339962
 	sed -i -e '/doxygen_tests = check-doxygen/d' test/Makefile.am || die
@@ -103,9 +97,6 @@ multilib_src_configure() {
 	if multilib_is_native_abi; then
 		# bug #44128
 		export VARTEXFONTS="${T}/fonts"
-
-		# bug #329651
-		use ruby && use ruby_targets_${USE_RUBY} && export RUBY=$(ruby_implementation_command ${USE_RUBY})
 	fi
 
 	local myeconfargs=(
@@ -120,7 +111,7 @@ multilib_src_configure() {
 		$(use_enable imlib imlib2)
 		$(use_enable test cppunit)
 		--disable-java
-		$(multilib_native_use_enable ruby)
+		--disable-ruby
 		--disable-python
 		--disable-csharp
 		$(multilib_native_use_enable doc)
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 35f06b4ef11ec..158be19da4d48 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -695,10 +695,6 @@ sys-boot/refind custom-cflags
 # Does not build
 sci-libs/linux-gpib php
 
-# Michał Górny <mgorny@gentoo.org> (2017-05-15)
-# Mask ruby20-only compatible packages
-~media-libs/libcaca-0.99_beta19 ruby
-
 # Mike Gilbert <floppym@gentoo.org> (2017-02-16)
 # Multiple test failures.
 sys-boot/grub:2 test
diff --git a/profiles/package.mask b/profiles/package.mask
index cd687afcfb412..0db842554f8ac 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2023-03-31)
+# Has suspicious test suite warnings with >=ruby31, no activity upstream, and
+# no reverse dependencies in Gentoo.
+# Removal on 2023-04-30.
+dev-ruby/ddmemoize
+
 # Ionen Wolkens <ionen@gentoo.org> (2023-03-30)
 # NVIDIA dropped support for the 390.xx branch in December 2022[1].
 #