18 files changed, 168 insertions, 170 deletions
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index fa04ccb22366..527451a01e05 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -1,2 +1,3 @@
 DIST backports-3.25.1.tar.gz 187354 BLAKE2B 7aa7a581497c938bd6105d61fe0120e4dffa406fdada85d98a4f1255f3dc124a5c72b903a88bba19c30fce9a6cd62768a8515cdb56c114cbd73cbb337baabac6 SHA512 1e157b15108c084cdec8434a67cc2f75bca22ff196ed279a7f804b42a4b9885a7e057e23c202f29744195fb2ac19b00efe8b3e40d0866647aa0abb4d5a87a159
 DIST backports-3.25.2.tar.gz 187377 BLAKE2B 78874304083042b17fde8e7e04cbf4dc368b654eac9d9c9957aa0ff51cbb4e51aea811feabf990558b04bdee98f1c37bdf873b9bcc91ef700e8b75ffd50f7c57 SHA512 cf5716cee7e62f58dcfbf1aecadb03bf8f3c7c8ec7109917b454a52b0be359735e49298a5bb353cbea861faf512e864518826fce5696827c31d371b880a44da5
+DIST backports-3.25.3.tar.gz 187365 BLAKE2B a35a5cc7724863edad56bda2282441812c35a33f255ea61ac1e0ca98a6c5d61b661f0616657bdc444897e8533af58507afd70f2a74e681182a18c7550fdfdbed SHA512 6cc72d4fb5bbb451ca28af280665b580f90369c7998488134969376c81af530b240f77eea1d91726f97321687e4423cbff2b9f0e6952cd544df33ddc2ff7a7c6
diff --git a/dev-ruby/backports/backports-3.25.3.ebuild b/dev-ruby/backports/backports-3.25.3.ebuild
new file mode 100644
index 000000000000..38d4558ad704
--- /dev/null
+++ b/dev-ruby/backports/backports-3.25.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby32 ruby33 ruby34"
+
+RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Backports of Ruby features for older Ruby"
+HOMEPAGE="https://github.com/marcandre/backports"
+SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+all_ruby_prepare() {
+	# Avoid activesupport test that no longer works in Rails 5. This also avoids
+	# a dependency on activesupport
+	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
+
+	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/erb/Manifest b/dev-ruby/erb/Manifest
index 2f30fb69f502..f6708757cebf 100644
--- a/dev-ruby/erb/Manifest
+++ b/dev-ruby/erb/Manifest
@@ -1,5 +1,3 @@
-DIST erb-5.0.2.tar.gz 21822 BLAKE2B 0bbe198a230eda6a38ab8d059101d573d175dc8b63bbb8d325d5784f2c4f1fca408f47dd8dd029627a12d812156df77bac09fdcf88ce31da1068d7f58b32b716 SHA512 2dd7d6c450abcf2ece916112d36a25aced01843c00c367555d5f626a15765bb2155ba0273f12d40af57684a205377caeb0d318bcddea9b15c169d8bb68df6e3f
-DIST erb-5.0.3.tar.gz 29689 BLAKE2B e4873a0f1a79466717d63e45bc10536f903881d6ea67b3a4cf8c5eb7af5eac9b40ffb6f2ba56789c762c3546bcd84c8b63ae9c0909840cc749b761f5f88c1cdf SHA512 114279238ce25b0f5d7fbca43d5464fa27963b41eca33ecd142e8353899a8c8c2f216805d6a989d99849fa71c09a83fadd4c698c2d2b21651b0f50307a97eef9
-DIST erb-5.1.1.tar.gz 29868 BLAKE2B 20bfae1d24f11fefcb07d3f5c619fe91ef4ec8dfca5eba74fea21f51ab8ff5b5d7ee43d2784c07b2e237a4a847f8a2c4c68b6d1dfd7cf217ce0370b8284364e7 SHA512 f6085b78a19bd5480294c7286b320ecd2fe437ccfe2c0d70b123f9ae3b5f544493e5f5f444b4ffa7a02dc2c46f6b8b912a05f17a8900cfe0c38e03e03a5d06fc
 DIST erb-5.1.3.tar.gz 30370 BLAKE2B d7caf250b1f50c3cbb37b244e154e37a67e81cebfa759dab63a8e3710a8327616d092cba6c0d1c34a260ac41932cc35cf4765bf992c08430d378480d8f05779e SHA512 ab5a06d0e0a22a97e621f49164cb0fdc1bc0902c1c92b67f4a30b5e4dd9a2ccb25021c62a8dca13303be24b23d6cf9b6866bd62e0e2a5669b3c19b50d3c759d6
 DIST erb-6.0.0.tar.gz 29685 BLAKE2B ec6035854a4c91fe6c9dc950c526e1c6827b2a1089730d9bf0f6b6e15dfe835702a3d76afbb424cc08b9795314b8d8388a3b15c333d47f408fca3d8b9bf8cb9e SHA512 b9366150219be0c0478400db4986c434f49e2a42696500d0f1e1d70c0fd519c4a95afe70ddd2589931be9b18a01d4bf164a9028b174c0d13f85914374f9cedea
+DIST erb-6.0.1.tar.gz 29714 BLAKE2B b5fa9155013ef05b15784d3b30985df064f1a2310c0de115f46a53637cdbd5a0aa74bb6a3fbf93f928edf7da7900a58277116fb6a62f8812f0450bef10957e1d SHA512 a87cf5fe591418e90a10842d978591504344d7f6f9b61ca01d3c76fde2bc84019ccea49e3c9525436ee4963b679940b6d11581d8c23aa6aa93bdef986dcd9fe1
diff --git a/dev-ruby/erb/erb-5.0.3.ebuild b/dev-ruby/erb/erb-5.0.3.ebuild
deleted file mode 100644
index 6beaa6b5de60..000000000000
--- a/dev-ruby/erb/erb-5.0.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby32 ruby33 ruby34"
-
-# There is an erb binary in exe but that would conflict with the ruby
-# built-in version.
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/erb/escape/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/erb"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="libexec"
-RUBY_FAKEGEM_GEMSPEC="erb.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy to use but powerful templating system for Ruby"
-HOMEPAGE="https://github.com/ruby/erb"
-SRC_URI="https://github.com/ruby/erb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-all_ruby_prepare() {
-	sed -e "s:_relative ': './:" \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -rtest/lib/helper -e "Dir['test/**/test_*.rb'].each { require _1 }" || die
-}
diff --git a/dev-ruby/erb/erb-5.1.1.ebuild b/dev-ruby/erb/erb-5.1.1.ebuild
deleted file mode 100644
index 6beaa6b5de60..000000000000
--- a/dev-ruby/erb/erb-5.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby32 ruby33 ruby34"
-
-# There is an erb binary in exe but that would conflict with the ruby
-# built-in version.
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/erb/escape/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/erb"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="libexec"
-RUBY_FAKEGEM_GEMSPEC="erb.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy to use but powerful templating system for Ruby"
-HOMEPAGE="https://github.com/ruby/erb"
-SRC_URI="https://github.com/ruby/erb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-all_ruby_prepare() {
-	sed -e "s:_relative ': './:" \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -rtest/lib/helper -e "Dir['test/**/test_*.rb'].each { require _1 }" || die
-}
diff --git a/dev-ruby/erb/erb-5.0.2-r1.ebuild b/dev-ruby/erb/erb-6.0.1.ebuild
index 6beaa6b5de60..fdd2549b0122 100644
--- a/dev-ruby/erb/erb-5.0.2-r1.ebuild
+++ b/dev-ruby/erb/erb-6.0.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 USE_RUBY="ruby32 ruby33 ruby34"
 
 # There is an erb binary in exe but that would conflict with the ruby
-# built-in version.
+# built-in version and other slots.
 RUBY_FAKEGEM_BINWRAP=""
 
 RUBY_FAKEGEM_EXTENSIONS=(ext/erb/escape/extconf.rb)
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/ruby/erb"
 SRC_URI="https://github.com/ruby/erb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-SLOT="0"
+SLOT="$(ver_cut 1)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/loofah/Manifest b/dev-ruby/loofah/Manifest
index 4036e55c137c..ea40738deab5 100644
--- a/dev-ruby/loofah/Manifest
+++ b/dev-ruby/loofah/Manifest
@@ -1,2 +1,3 @@
 DIST loofah-2.24.0.tar.gz 87409 BLAKE2B de30f213d1be17c9a4fe23eb72cc66f68f91f8503b95da1bacd29fd51e213b73d5a9ef333c98ec26577c05148451a8c439c8dd51f9f09c1c5b09efa705b6365e SHA512 46969516db8220e39d640c7d7db2ac20d9fa744f70f86127aacc339d800501ac6ccd4871c12f818db013bba71551ca7b6af8b9886d232c53db54ee28b248f2ce
 DIST loofah-2.24.1.tar.gz 87491 BLAKE2B 1c8889f293eddcf34ea1e512edaecc3398bf4554941aef77abc695005bc604ce3199388753211dbe71afdc8d76eb3f2290e702c56ead375241669506d431ac7e SHA512 61520a612ce713e2c1b4c6145d5dcd28ef3b59a8bd577c1fc1cc11b88f8a96d5278f382d777ff45928c62740eca4ad07a6c771dad409016d0f054ebb30e102d4
+DIST loofah-2.25.0.tar.gz 88426 BLAKE2B 700438c1d8c1410732014a424346ba880d25d4d954c6bb055cc5c2a21d017f4ceae5344ca6cbf3c2782f6c52cb0efa30d949adea88db8cf99efe0181d4aee0df SHA512 31c9e23c10ab24f207a181e393b07fc92b78a0b89b6a5ce325f32e5349a5c413bd8726d73d74e7c4a2a67c49531ac3c79a5ea6d27137b93068aea3bd0afae23a
diff --git a/dev-ruby/loofah/loofah-2.25.0.ebuild b/dev-ruby/loofah/loofah-2.25.0.ebuild
new file mode 100644
index 000000000000..cfea62486e8e
--- /dev/null
+++ b/dev-ruby/loofah/loofah-2.25.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby32 ruby33 ruby34"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="loofah.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for manipulating and transforming HTML/XML documents and fragments."
+HOMEPAGE="https://github.com/flavorjones/loofah"
+SRC_URI="https://github.com/flavorjones/loofah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+IUSE="test"
+
+ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.12.0"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 )"
+
+all_ruby_prepare() {
+	# Fix version in gemspec
+	sed -i -e '/s\.version/ s/".*"/"'${PV}'"/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid unneeded development dependencies
+	sed -i -e '/concourse/I s:^:#:' Rakefile || die
+
+	# Avoid test failing on different whitespace.
+	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index 086498041ba8..8d94bd475bfd 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -3,3 +3,4 @@ DIST mocha-2.4.5.tar.gz 248872 BLAKE2B 739dfe4945d153117e5c644b6f0ed568c08e88e27
 DIST mocha-2.6.1.tar.gz 251543 BLAKE2B db9ed8d31b72c229dd56c0417fa32312fb9142b443743be896a7f02e38b46e1f7a36a5be377122c007cc9eb0c735d019fefa1958aa46c22c5d11af61a70cfc00 SHA512 25fb178d6f63b1357017b7b007c35e0cb94fd854ceaeaf74686e5a104006aa9033fc554d69e3b59e0a03cecde8d6aa06b24ac2055e2cd4467ea340ec1710c955
 DIST mocha-2.7.1.tar.gz 253415 BLAKE2B 857c188e4eda776ab00f28b79c8adcf1a92621c37ea930623a12a34cb3ee76781eb9293c9dd1091290ae3c1457da2a26255e3f3421b3b392483e5fc945dd1ae7 SHA512 951fc766e49f6bd76846e18929d9463da7575aeb4169e623dd954760eff6f8f883d696db4379ce93215a966abfd15ed734ad812c7cdc6c461690fe948141c215
 DIST mocha-2.8.2.tar.gz 257949 BLAKE2B 9437e0232d3c5f1114ff25a68a9b26ccfb3c5a412a5540a06e7d060c30e4130a8e6a711d03889d66ec5621d2fcc72833b0566d2100fc795ada676354a7a57c1b SHA512 30a287fec8dfce07b572e98fb7304fc9824c282e7210e5e4e781b55f86af95ecae1dd9f3638eaca31545e99dcdf3cc494cbb041fd26b15e839f90dd519d70574
+DIST mocha-3.0.0.tar.gz 260597 BLAKE2B e8505b117594a72a6351ef83d6a1547f4ea9752c22581cf380ab739bff7f497d23dc45abc547f2d2a6c62c6f209b6bb5593b2ce83b2cc054c2fad65e052f1fab SHA512 bc36ec0df60dfdd6d677a6e7b5c87cf618b581219def28d8269a9edc5a97502e3bacbd02ce7551d7d9ff6b3e555417f4aeafcf6fb0934f9723290d8367dddd40
diff --git a/dev-ruby/mocha/mocha-3.0.0.ebuild b/dev-ruby/mocha/mocha-3.0.0.ebuild
new file mode 100644
index 000000000000..15f63fe73734
--- /dev/null
+++ b/dev-ruby/mocha/mocha-3.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby32 ruby33 ruby34"
+
+RUBY_FAKEGEM_TASK_TEST="test:units test:acceptance"
+RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
+RUBY_FAKEGEM_GEMSPEC="mocha.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
+HOMEPAGE="https://mocha.jamesmead.org/"
+SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+ruby_add_rdepend ">=dev-ruby/ruby2_keywords-0.0.5"
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	export MOCHA_NO_DOCS=true
+	each_fakegem_test
+}
diff --git a/dev-ruby/net-imap/Manifest b/dev-ruby/net-imap/Manifest
index 52905048307a..0286512d3958 100644
--- a/dev-ruby/net-imap/Manifest
+++ b/dev-ruby/net-imap/Manifest
@@ -1,5 +1,3 @@
-DIST net-imap-0.4.20.tar.gz 268236 BLAKE2B f08faaa7e9d05f1e36ba1fb2e91c6e094d36a4f102677dff4e412710e0f6ada981937c9254c8232d8c194d2234a4338c189a7a3405eee4a0d6aacdbf14d00cf0 SHA512 3eb31fbc8fa781dd91a721e7060ebeb9d6937e9026479ab8a9d799ca695afe7f37266745a0b3317cb948a1ce6c1b451c56c5543802cb858d14c8a5cacbd374b1
 DIST net-imap-0.4.22.tar.gz 269166 BLAKE2B c1e5fecf92fb39ae7f6b25fdd61a2c52d00b13a55d70d7c5b92e5289b569fcf95e7b180f461257b61db474eebc32e11ffbe36facd1c02e445dbf78a94d33dc0b SHA512 0de1560423de45f919e96b194a0fded068ea9757c3c6de2ec57f82d60be0fdd95359b95389b0928d8a6de0b953140cb1fc8e13394557e36dea29b06b5c414939
-DIST net-imap-0.5.10.tar.gz 308280 BLAKE2B 3d6c9cfa304501f943910cff4b30901d1b6a04d9e9fc8fe24e643dd2b1d4d013d67dd8ad83abcc79f7f48016bbc16ed24f264bf9c98013358e9929e5832cee31 SHA512 a0995e6f578279512352e5806b6ace8bd7e4e88b10dbcf0c69506d2ab652c8138d8a0dfd9ad1d868e76fdc243d75532e89d4be2dde8e8887bcaed1478df48b11
-DIST net-imap-0.5.11.tar.gz 309512 BLAKE2B 6a757a0856428c3292bad2f85d1a6b4774ec75965119251d53412f0937926d3d9729f5d361d62abf7ee2ee6c000ba6183bb4cc6c86707078d0cf0ff52a9aa3f1 SHA512 89d0c1d26490c05c05e78a4944dcdea1c45afb3d62222ccb0ffe26f6c2bd2193e0f9a13b31a5b10d67a776f47dca910d89199aabc14e42917fd96317923a8db1
 DIST net-imap-0.5.12.tar.gz 310091 BLAKE2B 6a2bae76b90a69d055e4eff0e432bae8eb52032f9d259ed9e3353f23417da2ccddc920f9819a75dae46c00d9aa8e3245375ac6fe4e20621b52982cd364a08e28 SHA512 6fb0e695d4b53418225a3f3d9bc09345211718325f3ebd05911aac288a31c8920c57256cf47e7e15cef6b6a2689674f2e8385e0cb8249bcb59490317cf964377
+DIST net-imap-0.6.0.tar.gz 313352 BLAKE2B 6e62c1a24ccf4ae33b89bb2b97da838e8a07ba971b1ebdc154de5ca4f703462660ba56edb501065e18bc5649effb426439a9ecc660ccb9ae495889db690d7843 SHA512 fc9bc88f4f02544dd0e35360b5e5e2b9095ebb38abc2e696802ba4eca996d4a946654c7d5ef8d16b5a9b1e0bdffde738ace7f02e413f16e7e57de637b95a9680
diff --git a/dev-ruby/net-imap/net-imap-0.4.20.ebuild b/dev-ruby/net-imap/net-imap-0.4.20.ebuild
deleted file mode 100644
index 83f53d34586f..000000000000
--- a/dev-ruby/net-imap/net-imap-0.4.20.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby32 ruby33 ruby34"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="net-imap.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby client api for Internet Message Access Protocol"
-HOMEPAGE="https://github.com/ruby/net-imap"
-SRC_URI="https://github.com/ruby/net-imap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-
-ruby_add_rdepend "
-	dev-ruby/date
-	dev-ruby/net-protocol
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/digest
-	dev-ruby/strscan
-	dev-ruby/test-unit
-	dev-ruby/test-unit-ruby-core
-)"
-
-all_ruby_prepare() {
-	sed -e 's/__dir__/"."/' \
-		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/net-imap/net-imap-0.5.11.ebuild b/dev-ruby/net-imap/net-imap-0.5.11.ebuild
deleted file mode 100644
index d14b809c667b..000000000000
--- a/dev-ruby/net-imap/net-imap-0.5.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby32 ruby33 ruby34"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="net-imap.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby client api for Internet Message Access Protocol"
-HOMEPAGE="https://github.com/ruby/net-imap"
-SRC_URI="https://github.com/ruby/net-imap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-
-ruby_add_rdepend "
-	dev-ruby/date
-	dev-ruby/net-protocol
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/digest
-	dev-ruby/strscan
-	dev-ruby/test-unit
-	dev-ruby/test-unit-ruby-core
-)"
-
-all_ruby_prepare() {
-	sed -e 's/__dir__/"."/' \
-		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -e '/SIMPLECOV_DISABLE/,/^end/ s:^:#:' \
-		-i test/lib/helper.rb || die
-}
diff --git a/dev-ruby/net-imap/net-imap-0.5.12.ebuild b/dev-ruby/net-imap/net-imap-0.5.12.ebuild
index d14b809c667b..022be8d53617 100644
--- a/dev-ruby/net-imap/net-imap-0.5.12.ebuild
+++ b/dev-ruby/net-imap/net-imap-0.5.12.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/net-imap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/net-imap/net-imap-0.5.10.ebuild b/dev-ruby/net-imap/net-imap-0.6.0.ebuild
index d14b809c667b..d14b809c667b 100644
--- a/dev-ruby/net-imap/net-imap-0.5.10.ebuild
+++ b/dev-ruby/net-imap/net-imap-0.6.0.ebuild
diff --git a/dev-ruby/oauth/Manifest b/dev-ruby/oauth/Manifest
index 74b62443ae9c..670885b18e46 100644
--- a/dev-ruby/oauth/Manifest
+++ b/dev-ruby/oauth/Manifest
@@ -1,2 +1,3 @@
 DIST oauth-0.6.2.tar.gz 81702 BLAKE2B 2775c0711beb9f3612844ae07ff59953d4db72c0f9a797c6eac49132a021a48481a13f4b1428b2037b0a04b83b5d79e621cccd4a794fe3a339a1ceb468f0b165 SHA512 22f4f734daa42339bbaed1d1d449a4591ef4404aaf8cf1753ba705735a176f6142853b2c4f5e8ff3afa3e9899163af1c5598685664326d58a5b529d94b65441f
 DIST oauth-1.1.0.tar.gz 77282 BLAKE2B f0916b0137922780981987b2977ce19c1acbb2bfb72a64948be5e530ef8c4a375a32785e5d5f5d64349ff3adf2e05ffbfb1417123ffe0674700062952d8fc0e5 SHA512 bb9025ef279d97077b1c7e03ed402f43dd3fe1921cbd55aa03b1732ce3199578fbb4221991d0d3ab8dd8720354bec2ab8b7c25ed039f10fffd296d1c4e851ff5
+DIST oauth-1.1.3.tar.gz 281541 BLAKE2B 8d284348a9eb3411c0bd246a8ed648645080c6ecd9e8101393a21d5e5f5fd41fce7c5450040d243dcdc1fcc82509ddefd46d70f5df63a73777045899619c9a6f SHA512 e89f12187a966781f1f1bb584c84dd4861bbdf03d3ef6065b3ad1532a2fb41fa3d48b632f9a47c2c59cf4665f62eb7a961ce93003ca1f176756932b738953455
diff --git a/dev-ruby/oauth/metadata.xml b/dev-ruby/oauth/metadata.xml
index 92bec6e53833..52be780b6fd8 100644
--- a/dev-ruby/oauth/metadata.xml
+++ b/dev-ruby/oauth/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">oauth-xx/oauth-ruby</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby-oauth/oauth</remote-id>
+    <remote-id type="rubygems">oauth</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/oauth/oauth-1.1.3.ebuild b/dev-ruby/oauth/oauth-1.1.3.ebuild
new file mode 100644
index 000000000000..04db5ab2e95c
--- /dev/null
+++ b/dev-ruby/oauth/oauth-1.1.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby32 ruby33 ruby34"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md TODO"
+
+RUBY_FAKEGEM_GEMSPEC="oauth.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A RubyGem for implementing both OAuth clients and servers"
+HOMEPAGE="https://github.com/ruby-oauth/oauth"
+SRC_URI="https://github.com/ruby-oauth/oauth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+IUSE="test"
+
+ruby_add_rdepend "
+	|| ( dev-ruby/base64:0.3 dev-ruby/base64:0.2 )
+	>=dev-ruby/oauth-tty-1.0.6:1
+	dev-ruby/snaky_hash:1
+	>=dev-ruby/version_gem-1.1.9:1
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/webmock
+	dev-ruby/rack
+	dev-ruby/rest-client
+	|| ( dev-ruby/actionpack:7.2 dev-ruby/actionpack:7.1 )
+	|| ( dev-ruby/railties:7.2 dev-ruby/railties:7.1 )
+)"
+
+all_ruby_prepare() {
+	sed -e 's:_relative ": "./:' \
+		-e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -e '/kettle/I s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	rm -f spec/oauth/request_proxy/curb_spec.rb || die
+}