gentoo auto-resync : 10:01:2023 - 12:20:33

19 files changed, 31 insertions, 160 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index ea0e6d2cc36e..061ed674ca1e 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/acme-client/Manifest b/dev-ruby/acme-client/Manifest
index 3edd7475bbc2..e84e745535d1 100644
--- a/dev-ruby/acme-client/Manifest
+++ b/dev-ruby/acme-client/Manifest
@@ -1,3 +1,3 @@
 DIST acme-client-2.0.9.tar.gz 183081 BLAKE2B 8160b3fe7989645c395fde55624d71bdc933d114901138cb13f9c2114973f2bf65d48bba547f6c0740d0710f9a38a57cc519dbb27898a1507e875c71e5d7bcfb SHA512 a75b093046ec0360cfb78b55c0ad8350ecd1b6f612ab5ddb3956aa4cfef468bddff2dc992cddfc50860e7ea541e76ddc176ab4c7eaf5c3555beab521a6806ac8
-EBUILD acme-client-2.0.9.ebuild 871 BLAKE2B 4bd516dcb72b37a5f583ddf18161f9a26c71192a2f92b2690d733d57b2b7dff271ebc4683caef670fb367dac94da42abe5db8a59fd1221aedb0bca554ca31d2d SHA512 fee69558225c6fccdd731aa5ff85beaefe726e85c30e48962615ac6c299ccf9774797b1b6e547bde3e32cb247c2d672e43f9d3fa9858a6263e684b651e1c76b0
+EBUILD acme-client-2.0.9.ebuild 845 BLAKE2B 087a4b4362e5e3d44385a286af912d542951b7d5ad8f0cf0feb8d60b8bc286f264a3e7d2043ea9bbe3770c35dfb16e0c1d52dd4b81f46617f1ab4f237f73978e SHA512 b4cf5eca5cad1caa46e8c3413f55df616e3551e7c8a3cf2cd28e2f412d291c28c267cd822be07e3d8af52017f8f03b057b84bc12c9c6a869a3be9997636ae0b2
 MISC metadata.xml 451 BLAKE2B ecf374ec65cc34a0bb41c2a188c409886dfb919fe3c884569ea2a1ec0329d2a0a1fbad87817d35fcd6363bdf1f64ba8d8c70d56376cad47e98c892caa31648c5 SHA512 a0e29b08bf5f3c7013e2ecd1ecae2a48961f9b754f3f4a329f8799fe8460066645e337f73ab7a6a42f0516192d0ab7d92941fe87a4b3a35dfaef1a0115ad4a7e
diff --git a/dev-ruby/acme-client/acme-client-2.0.9.ebuild b/dev-ruby/acme-client/acme-client-2.0.9.ebuild
index 7aee24551ee4..eb40f9622a41 100644
--- a/dev-ruby/acme-client/acme-client-2.0.9.ebuild
+++ b/dev-ruby/acme-client/acme-client-2.0.9.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="ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_BINWRAP=""
 
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-ruby_add_rdepend "|| ( dev-ruby/faraday:1 >=dev-ruby/faraday-0.17:0 )"
+ruby_add_rdepend "dev-ruby/faraday:1"
 
 ruby_add_bdepend "test? (
 	>=dev-ruby/vcr-2.9.3
diff --git a/dev-ruby/addressable/Manifest b/dev-ruby/addressable/Manifest
index 3d238d0a9e41..b89327b86738 100644
--- a/dev-ruby/addressable/Manifest
+++ b/dev-ruby/addressable/Manifest
@@ -1,5 +1,5 @@
 DIST addressable-2.8.0.gem 105984 BLAKE2B 82f053c9ad052ce1ed1b6927674bd5bcda86a3f70d46b63bfc1185d51b402996fd446647d705418791c5443a1767b4ecd0b891f26de63fbe737c62f7586bd57c SHA512 c684f17940f717c2a65f9716ab9b3659948d6d51a60c38a7295fcf6fdc1c5785d2d315d2de7dab9f66a6c31f62247177d78d5d6eb556f5bb49926d4f00f8e4c8
 DIST addressable-2.8.1.gem 105984 BLAKE2B 9ba6fffe2af965be57ef7b2f86c5c86c672e0037c41996d78a3b8f31a9b5a5818e06d7e119733cff3d5469bc985186fac6fa978740f107876a975b5ac662171f SHA512 ae0b7cb5fdc0b5b8717637e9589ab9167aa3924253f4c9102134b1e5aee07c7f5e3e92e2e32ca872b4a72a3a70c8086c7073cbbddf7cbb6e1948ed97de2c9108
-EBUILD addressable-2.8.0.ebuild 1324 BLAKE2B 800ae77cc9eaba998f5c30f0ad61b5d58d0aba3dee80cc7dd93b75e04032a3a8e756c74535791d774649cb0d8a5eef7e6b1298090a6c8e8b1bdc8170e179d6b6 SHA512 df82b26890bc0b9e0d90dda4b3b93319ace52461946d3ac0f1bd300c0ea54ec2dec3847c16d26e0849f8e4276ef02c32de7a03a003d10fe1f58c73694377392a
-EBUILD addressable-2.8.1.ebuild 1348 BLAKE2B 4213e4b1729a2b4225ffd95c7e73fb18db4ff8a724a9c3a3bd66593bee3ead39e54752ca08c36d44cd65109648c3de0a7770980e426d65f5d0527bfb6d34fcdf SHA512 0a452fe63028d865901a6d59a3f92f9faac329af420ce052772f8aad069ed92ae69a73d3288950ed7a98baa9558b1732f5efb8efcd67ae4fdd4d1e78dff61700
+EBUILD addressable-2.8.0.ebuild 1292 BLAKE2B 5d10917b745b2881d6cc8777781cace7bb5c0a9953245ffd9700401b47c77e226e9af10437216d01237a4e7dd4d56d93b21cb7bef92445237445b66b7675b4ce SHA512 f4159e1500a82373eac97b5a69b3ccaca9b6090a10a3f78411843bc63b22dcd09db6dc2c12a906720d99bf9bdf7b556835255cbcce0c294149dd741a0889cbfe
+EBUILD addressable-2.8.1.ebuild 1323 BLAKE2B 2af78ac329812f68a09b14cc172fb45f86c209dcbe2bb3bb19fc3af6e02243feb4799eee7ece75e133cd8d377e838baffe8b1880a651e5ca880905fc6f74a593 SHA512 8750eb1251f6e2b4e7ca5aec855c4a4d9c41b185dc8698f0d53bc601fc38a9ed51c0fa6b4e8e01dfbebd017cb348e728a5718cf25d15b2e6a18c948eceae6a4d
 MISC metadata.xml 405 BLAKE2B bcbba1d9880e5abe377fe1e7fb1e1c732f1fd00bc32fcc48f69e5529749900d89dbe0e69de4477d4e0984d780b02164d812407951cb2bc3f9cf052e9ad5d0217 SHA512 2f270c88c5a807840b8165ab65bd6de51a878d218ab71ff0f7de18f60be298b6d048dacb8601605c0b1960852ba9b841de742e3bc64d74b96fb88d8338ca33fb
diff --git a/dev-ruby/addressable/addressable-2.8.0.ebuild b/dev-ruby/addressable/addressable-2.8.0.ebuild
index f8536e47c132..30f1e7b2d1f7 100644
--- a/dev-ruby/addressable/addressable-2.8.0.ebuild
+++ b/dev-ruby/addressable/addressable-2.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
-ruby_add_rdepend "|| ( dev-ruby/public_suffix:4 dev-ruby/public_suffix:3 )"
+ruby_add_rdepend "dev-ruby/public_suffix:4"
 
 ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
 
diff --git a/dev-ruby/addressable/addressable-2.8.1.ebuild b/dev-ruby/addressable/addressable-2.8.1.ebuild
index 4a80cd514c1b..c6684e1001c0 100644
--- a/dev-ruby/addressable/addressable-2.8.1.ebuild
+++ b/dev-ruby/addressable/addressable-2.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
-ruby_add_rdepend "|| ( dev-ruby/public_suffix:5 dev-ruby/public_suffix:4 dev-ruby/public_suffix:3 )"
+ruby_add_rdepend "|| ( dev-ruby/public_suffix:5 dev-ruby/public_suffix:4 )"
 
 ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
 
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 89951a28695f..027b7f0049ff 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,7 +1,5 @@
 DIST capybara-3.36.0.gem 374272 BLAKE2B 51579941b95ab317fa0f7d9a21d3ad40a130a60c457f9a5d9921dac5b17bb339a423a21aa16d350da57602b22b0001c6ed2b1b5b038bb16cf56d268bd5a38ead SHA512 7ffc9d3e4058b08acd1cb223eb0313112354783cc4464f8f0747561caa45425f8623be7052f331677a66a7b9f5e645e48ae0118fe78c2d185408e5279e66f169
-DIST capybara-3.37.1.gem 376320 BLAKE2B 79a5f379d70d612402379ad8743384844e7ab85e40c96b8a10794d35f48f078b9e26eaef5f6311aa65b6fae1fe130436288fce2077309559703e46da9e5f12bd SHA512 6a602dfcd61529f6b89a0ad85cf567fcb952d0c8033bde605121ad867308b1a16c6b3d5bfd7f4c33c47c5616c365c6b034bdf8dca096a14b3447be6adc885111
 DIST capybara-3.38.0.gem 379392 BLAKE2B e1ba89daa08e43e5f97ed5c649a3ea82c27e2ee7a737844f83ba68f0379cc4ef2a0349bc2ae9af76a5cca3659c11f1ed0d1b7dcae7f7701305ca3644e40a4dee SHA512 530db1102e8bc1bfa1ac55d28a725a26a7c6c98baf89655bb15436217e99c7131edb204638f51831c416e4898b9e7c653b83c74abf8aa644eb4da0ad8cddd44c
-EBUILD capybara-3.36.0.ebuild 1853 BLAKE2B ce172b8f2a02a121524f84b98977a0aa1ed0b5f4aa0f9d5c6e77ff82f66da92dd085bb7138bac5b8ac0ba8b900f68cac75a00a23fa7ae327ce8cc0f4f75a052f SHA512 666cd1e0b36b223d8916fef964585decf8ab9d435788f1db781d4511979e17c3001add78e13762e03e00f9c37c2638c0b79ba4be4bb662a0839aa995f3ac4824
-EBUILD capybara-3.37.1.ebuild 1880 BLAKE2B 7338b59597c1d465dd24d1505c91926489fc941d7c6bd1ac9a6d7f91f7ac57b909eedda244f7f07a925e6203ff661bf4ad61d53b10b1a82e3bbec31fb9ee243b SHA512 d7a84b8db8f9ee36e97833afbc8d661d1dc028493d8ce041f825285586354cdd6b1c46ca11ce8c6b0acc2dfa1e2e12b67cc70c4fadc05bcfee5fe9a2c32dc6ee
-EBUILD capybara-3.38.0.ebuild 1880 BLAKE2B 7338b59597c1d465dd24d1505c91926489fc941d7c6bd1ac9a6d7f91f7ac57b909eedda244f7f07a925e6203ff661bf4ad61d53b10b1a82e3bbec31fb9ee243b SHA512 d7a84b8db8f9ee36e97833afbc8d661d1dc028493d8ce041f825285586354cdd6b1c46ca11ce8c6b0acc2dfa1e2e12b67cc70c4fadc05bcfee5fe9a2c32dc6ee
+EBUILD capybara-3.36.0.ebuild 1806 BLAKE2B fc062567da1a61a7abaf4bd285eaadf7aa0493dd6f12fba81e6797c0f0de3cdba061fd5fe3678d1c94dd165abf3f3a7f913ef21ff02bf412b8bbc088807973c7 SHA512 903862328c64079ccf59ca328d6922102f8deeb24d6deb93663892432a60bb16a0eb7d3443e973a508483acbf6570f31e011aa868ac7e3a315962d98dafa4f4f
+EBUILD capybara-3.38.0.ebuild 1833 BLAKE2B a166362ab25b65ecc08b5cc13da9125223468e20b154098ae4501cc589949c4b9722b7adacc68592ec468f20cc1833355586da61d72319e3009ea5b2afc9f842 SHA512 548d7a692214bc8495804c648af69b56bb4e431abd7169e9f1d57bdb6dfc9dd8cc34b1c23729678de2d81a840ec8fcf366f8854eb4c58df1b315b075405f262b
 MISC metadata.xml 344 BLAKE2B cc8fd629cca0ed4f66836cefd43f13a45baa7bb13d157fa7f90c61cdd4a12d71ef773ef9daa8dc6e5b07dcadd1b52a258995136a0792ec1870eb93fbb90cd61d SHA512 dae769c0ee80ebfdbd8b86b471fc13c3ac656bf556e554d3d5ce80108f6f6ab79dfe7a54f51b78af3d29f22807fa5ac5be48bfcf8655c60309bef7e3f80cea5d
diff --git a/dev-ruby/capybara/capybara-3.36.0.ebuild b/dev-ruby/capybara/capybara-3.36.0.ebuild
index b0f5c72ac435..25d3842f3452 100644
--- a/dev-ruby/capybara/capybara-3.36.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.36.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
 ruby_add_bdepend "test? (
 	dev-ruby/rspec:3
 	>=dev-ruby/launchy-2.4.0
-	|| ( dev-ruby/selenium-webdriver:4 >=dev-ruby/selenium-webdriver-3.142.7:3 )
+	dev-ruby/selenium-webdriver:4
 	dev-ruby/sinatra:2
 	www-servers/puma
 )"
diff --git a/dev-ruby/capybara/capybara-3.37.1.ebuild b/dev-ruby/capybara/capybara-3.37.1.ebuild
deleted file mode 100644
index 1bae1ded608f..000000000000
--- a/dev-ruby/capybara/capybara-3.37.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-# Rake tasks are not distributed in the gem.
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit virtualx ruby-fakegem
-
-DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
-HOMEPAGE="https://github.com/jnicklas/capybara"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-SLOT="3"
-IUSE="test"
-
-DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	>=dev-ruby/launchy-2.4.0
-	|| ( dev-ruby/selenium-webdriver:4 >=dev-ruby/selenium-webdriver-3.142.7:3 )
-	|| ( dev-ruby/sinatra:3 dev-ruby/sinatra:2 )
-	www-servers/puma
-)"
-
-ruby_add_rdepend "
-	dev-ruby/addressable
-	dev-ruby/matrix
-	>=dev-ruby/mini_mime-0.1.3
-	>=dev-ruby/nokogiri-1.8:0
-	>=dev-ruby/rack-1.6.0:*
-	>=dev-ruby/rack-test-0.6.3:*
-	dev-ruby/regexp_parser:2
-	>=dev-ruby/xpath-3.2:3"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die
-
-	# Avoid window-manager specific tests (sizes are specific for fluxbox)
-	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
-
-	# Avoid spec that requires unpackaged geckodriver
-	#sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
-
-	# Avoid test dependency on puma server for now
-	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
-
-	# Update spec to catch the right error code. This seems to have
-	# changed recently accross ruby versions.
-	sed -i -e '/raise_error/ s/EOFError/Net::ReadTimeout/' spec/server_spec.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} -Ilib -S rspec-3 spec
-}
diff --git a/dev-ruby/capybara/capybara-3.38.0.ebuild b/dev-ruby/capybara/capybara-3.38.0.ebuild
index 1bae1ded608f..6a27c1d397bf 100644
--- a/dev-ruby/capybara/capybara-3.38.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.38.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
 ruby_add_bdepend "test? (
 	dev-ruby/rspec:3
 	>=dev-ruby/launchy-2.4.0
-	|| ( dev-ruby/selenium-webdriver:4 >=dev-ruby/selenium-webdriver-3.142.7:3 )
+	dev-ruby/selenium-webdriver:4
 	|| ( dev-ruby/sinatra:3 dev-ruby/sinatra:2 )
 	www-servers/puma
 )"
diff --git a/dev-ruby/net-scp/Manifest b/dev-ruby/net-scp/Manifest
index 4216c3d8d4da..860b72bb8f90 100644
--- a/dev-ruby/net-scp/Manifest
+++ b/dev-ruby/net-scp/Manifest
@@ -1,5 +1,5 @@
 DIST net-scp-3.0.0.tar.gz 27947 BLAKE2B 78a1100b7602b9c09c8f06228b6e564fce15133c6cf8c9816613cb56b1d3805d9393700eb66c3710e482771e4116beae393c12ad12963b85428e21e7cf105218 SHA512 6d68b75124ccd2d387983f6d66a8b0e040132ba17d942631c806e899dff757ffae7a031a27ea0988166bf56e803c1a6175199845a848b92c7064388564e0ac79
 DIST net-scp-4.0.0.tar.gz 27962 BLAKE2B 0531fccad790e5466da9bf5c4cdcfa6416d84e759b096fcaabebc6403293be8ad8f15546126fb51bc76929d871b6ec067302dd88859c09e9c177bbbb4ecd6ae3 SHA512 9691f707c83d2b24954670e73b306f1262437d9c10561f4ceaa4979e3b06a237d97cba9f517f73931cd44a494fd04306ded077284927dcab313ce669037a1cdf
-EBUILD net-scp-3.0.0.ebuild 1075 BLAKE2B 2c55b15a7733cc4583627a5f063ccadd828f0bd48c0692ff29aaa9ed415ae196bebfc2ee5dea8066c16e840503a7858ef2d20b9c0fbfa14bb946d7be505e9749 SHA512 eb104b6625471f04a10bb866c4bb7b31f6ae791b622540d8f2670639aba30c27e81a4be150436ef7cf57b99925e6f0fbafe565a313b5c9eb55ade569299770b7
-EBUILD net-scp-4.0.0.ebuild 1070 BLAKE2B f8b59a4911b936e27f2a353219c163479413537e3c97ecc8359d723d6f3094ac559b420b83dabfccda7b209fda4bc5fc1411031282bb33355f5f7c92ccf72438 SHA512 5048b4f802125de3e953618dd82d15449dcd985588b4033b8a2ff449d025bb38b0712801e76b841f4680ae5e1d4177b2a07bd095b9a691b4a8f5dc0e8d64a8cd
+EBUILD net-scp-3.0.0.ebuild 997 BLAKE2B 01fdd8dad9f86cd6e7cc96f1404b0197d6ba43290da451ae345986bab82ac657b850a11e9fe35f661234a514e85551db65321119262ff1d2d609eace6b7cade7 SHA512 f3bc3a10a90045020ad50969a3a7a12f24f01749b882c7169f51fc708630021331cfe8e42fd76efa0dd107d1156298d80ef1cd5ea6a352fe58aa389e6757c9ff
+EBUILD net-scp-4.0.0.ebuild 1032 BLAKE2B 48aa9a044a39286dfc78f485c3ce3f274d51778ab1007e89ac33df88e18829b631530a44e8631a008dc5b8225b77b76520b783f0ffe366411b3b784ced012b78 SHA512 141d7549f8b7a1e6dba09b5724655b044ccbccc8c9bca6034bf3de550f3019acb8efe51afaef8565582e041399e3da30a4a1fed62c86d5a71c1869360cdb8abf
 MISC metadata.xml 342 BLAKE2B ba5eb772d406d96ea5c4c0fdbc0ba183e44c26e950f55b54174519f25a0555a05e0eb1d1e09dd7fd91ab3a6732480225016c18e538489c5c65ad68261d3d21c4 SHA512 3bfa5a64b5bd0121a284d48b56a3914173f2562c84dbbedcbc0bb309910f68e1d3434037f21b962947c3f7cd162509bdaa9b04bb4ff550b61a4e26274bf078cf
diff --git a/dev-ruby/net-scp/net-scp-3.0.0.ebuild b/dev-ruby/net-scp/net-scp-3.0.0.ebuild
index 8b6da0ff4e71..afc02e006039 100644
--- a/dev-ruby/net-scp/net-scp-3.0.0.ebuild
+++ b/dev-ruby/net-scp/net-scp-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,13 +24,13 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 ruby_add_bdepend "
-	doc? ( || ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 ) )
+	doc? ( dev-ruby/net-ssh:6 )
 	test? (
-		|| ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 )
+		dev-ruby/net-ssh:6
 		dev-ruby/mocha
 	)"
 
-ruby_add_rdepend "|| ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 )"
+ruby_add_rdepend "dev-ruby/net-ssh:6"
 
 all_ruby_prepare() {
 	sed -e "s:_relative ': './:" \
diff --git a/dev-ruby/net-scp/net-scp-4.0.0.ebuild b/dev-ruby/net-scp/net-scp-4.0.0.ebuild
index 6e81a942da16..180da120c708 100644
--- a/dev-ruby/net-scp/net-scp-4.0.0.ebuild
+++ b/dev-ruby/net-scp/net-scp-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,12 +24,12 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 ruby_add_bdepend "
-	doc? ( || ( dev-ruby/net-ssh:7 dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 ) )
+	doc? ( || ( dev-ruby/net-ssh:7 dev-ruby/net-ssh:6 ) )
 	test? (
 		dev-ruby/mocha
 	)"
 
-ruby_add_rdepend "|| ( dev-ruby/net-ssh:7 dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 )"
+ruby_add_rdepend "|| ( dev-ruby/net-ssh:7 dev-ruby/net-ssh:6 )"
 
 all_ruby_prepare() {
 	sed -e "s:_relative ': './:" \
diff --git a/dev-ruby/oauth2/Manifest b/dev-ruby/oauth2/Manifest
index 89775a14151a..130a187b86ef 100644
--- a/dev-ruby/oauth2/Manifest
+++ b/dev-ruby/oauth2/Manifest
@@ -1,5 +1,5 @@
 DIST oauth2-1.4.10.tar.gz 65553 BLAKE2B 4b147a97536ae04b81ca5bc41117bc31c577aae9b7dc1f4f34830d3cd7b7013098e90ae83997c4917ca25e858b8738398eb708bfee954882359ed14b8e810172 SHA512 cee9e1f890f66252451cc22ab7135dda60c73bb200f2f1659a450b09dccc0a219982625ec45866dc9153669a4d35fb543fb6de497bfa83522b99c66e9c8b9d9b
 DIST oauth2-1.4.7.tar.gz 32341 BLAKE2B f3db3ff7ebcf7bc0958a564fdb0812c1bfb613148c5a16655f276fda4d6dac7769196305d854ee0fc3f8b4b53a93b4ae504b348029e1b363bcb704293887347a SHA512 4a43b3f75e827e9a12a74a6fe13a29b141c0d5bcb6a0d5c86dc8d8726f650a9fd5250ecc2c31cee5e985f0cb50e02f828d27fd07577bcac4dfc8ff4e009bd710
-EBUILD oauth2-1.4.10.ebuild 1527 BLAKE2B 861283b37fd0e9f894ff0c54310adc283d5bc681f93915b2146ef251f72866a641a6acba093762cf93e122069fbcfd8220538ea4f443213a15a2cf589da5ce31 SHA512 9b1e25b631d12ffd32ed7fe145f8af969a401f9d72640c123883155568a774f507c2370cd4513aeba50bb89c0b50b7297830fe93555a8bfc6b296b70c61b08cb
+EBUILD oauth2-1.4.10.ebuild 1499 BLAKE2B 8dcb6bfb83aa65af9fb62c43e81558ce739d06a1893150c355e030b8b2bbb1abc9160dd2d3ca8f2e2ac3dfbd1ba0c27a74da4cbd078bc45794515d27ab32fc05 SHA512 fcfed86236da49c2fa5df5d0920441dde1d15b1fd7af54e2933a7c61c4a92491fa2642807dd5c663ac0f44b14e7df40ceca4586695ef3cd1094b5577234bf051
 EBUILD oauth2-1.4.7.ebuild 1478 BLAKE2B 5dd9591470cc825729a00b24de2332d27d4baaab0a78525187ac89d5895a80b7908e3b0fc485cb16d7f7673f8c4613780b5c72eddef1de1d93e99759cf717a37 SHA512 b22a376f34809b148fbfe899adcb65f8ee1544f8abd227eff9937fd05ba824a4f66ea1199515f86976bf4e6ba591e0571b4aed972e4b29c2ae961debc3787edd
 MISC metadata.xml 342 BLAKE2B 14d2af934a4327d3d6c1c5236c0b5a0436c91cc3988d6957188171153c60a0f40b6dec75cb5acac49aa60518f89cc5bdb00e92021ca99249903f937df51f1b23 SHA512 cc8c7abab8d16e0ef97ec14f58bfc5941e161b2676950aaa45912812d53e523a54570407bcb2e9cd2527a0c6acca8f348422efdde66402c162e8a04dcfaabb8f
diff --git a/dev-ruby/oauth2/oauth2-1.4.10.ebuild b/dev-ruby/oauth2/oauth2-1.4.10.ebuild
index b0d9ab2c5384..625734b0625f 100644
--- a/dev-ruby/oauth2/oauth2-1.4.10.ebuild
+++ b/dev-ruby/oauth2/oauth2-1.4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
-	|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 >=dev-ruby/faraday-0.17.3:0 )
+	|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 )
 	dev-ruby/jwt:2
 	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
 	>=dev-ruby/multi_xml-0.5:0
diff --git a/dev-ruby/typhoeus/Manifest b/dev-ruby/typhoeus/Manifest
index 24c4e3c40daa..22aa09b42952 100644
--- a/dev-ruby/typhoeus/Manifest
+++ b/dev-ruby/typhoeus/Manifest
@@ -1,5 +1,3 @@
 DIST typhoeus-1.4.0.gem 56832 BLAKE2B 1f188a2c174a9d0e2cc0afc10f96d98a8c78278c1fa53eeb88da6f4f3986c8e204171a9bb817c95a217360346bda319711e7c89095ad48e878cbc3efc21e9887 SHA512 f48a99fd554f4d06d37a0a804ee79dd8423d9bff765394537ab0edba615e132d25660a6eb455e8628f59bd56c7ea26f4a195827d5287a53e58e3aeb394477284
-EBUILD typhoeus-1.4.0-r1.ebuild 1069 BLAKE2B cd1d178dfd623c6a8c1d9099f1d67af4560bc838c993021b016bc48fef5dd1e5ad02c91e07a92215818c2a8eca4d3957d926bb6fe30e15fcb2cc2b676fcbd842 SHA512 69d5663fbf3240a675c125c182b003db3b829e45f7d5adf25f0bc9c51a1c7d20e61ac1ca9fd265ba2f16bebbbb486c39430804ac607c896bc85eb2678603a8b1
-EBUILD typhoeus-1.4.0-r2.ebuild 1069 BLAKE2B cd1d178dfd623c6a8c1d9099f1d67af4560bc838c993021b016bc48fef5dd1e5ad02c91e07a92215818c2a8eca4d3957d926bb6fe30e15fcb2cc2b676fcbd842 SHA512 69d5663fbf3240a675c125c182b003db3b829e45f7d5adf25f0bc9c51a1c7d20e61ac1ca9fd265ba2f16bebbbb486c39430804ac607c896bc85eb2678603a8b1
-EBUILD typhoeus-1.4.0.ebuild 785 BLAKE2B 06daf3edc28829c0632dc1c7d484f1b3e392d0fde48d3a710e436f05700ca4c044a5e2216bba38fe1d902cf82e7e2d6a0b1451c8830895ec57ddc6171acb94f8 SHA512 3db6ee3d082abb2a452a7f311786f9f237c92460f0322c859c51552d85bc8606c7bb37d2ff04c96f5fda7d2afe50f11267b3eb1edd2ab01223aa785483c7dc98
+EBUILD typhoeus-1.4.0-r2.ebuild 1037 BLAKE2B a75b53664d3df33a8b73c7fc9828aa3b21fd13454a2cc077434476c19bdd10a1e6f4cb49b64f36b5fb473141945e4bae76690e008bee0e53b85cea22c73d674c SHA512 295b9f299c09013fe4c2eb622442cde312c7a93dc5403c0608958a78d74eaa2e42009fb3d22f3a4cb5a9138556c50fdd622fb0107820757e03e8fe76c3ff1f6e
 MISC metadata.xml 384 BLAKE2B f9b2404ac92e77233601283e52811ee504d139320b17232b7ea47a43d34cfde7234f4168607c7410f87c19d738a1af7a1447a03b042c62334d0bad2908d806c6 SHA512 3a27d3081fb9b59170213edd8fe3af51fd204fca382c72b074fdbfe7b94ba3ca5d08bca123ed4acefe0f8b6763fdeeb89ef505350ca238f8a8f19b20eab0b71c
diff --git a/dev-ruby/typhoeus/typhoeus-1.4.0-r1.ebuild b/dev-ruby/typhoeus/typhoeus-1.4.0-r1.ebuild
deleted file mode 100644
index ffaf7dcb9362..000000000000
--- a/dev-ruby/typhoeus/typhoeus-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Runs HTTP requests in parallel while cleanly encapsulating handling logic"
-HOMEPAGE="https://rubygems.org/gems/typhoeus/
-	https://github.com/typhoeus/typhoeus"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
-
-# Tests fail with ethon-0.16.0
-# https://github.com/typhoeus/typhoeus/issues/710
-ruby_add_rdepend "<dev-ruby/ethon-0.16.0"
-
-ruby_add_bdepend "test? ( dev-ruby/json || ( dev-ruby/faraday:1 >=dev-ruby/faraday-0.9:0 ) >=dev-ruby/sinatra-1.3 >=dev-ruby/redis-3.0 >=dev-ruby/dalli-2.7.9 )"
-
-all_ruby_prepare() {
-	sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
-	sed -i -e '3igem "faraday", "<2"; require "timeout"' spec/spec_helper.rb || die
-	sed -i -e '/Rack::Handler::WEBrick/ s/options/\*\*options/' spec/support/localhost_server.rb || die
-}
diff --git a/dev-ruby/typhoeus/typhoeus-1.4.0-r2.ebuild b/dev-ruby/typhoeus/typhoeus-1.4.0-r2.ebuild
index ffaf7dcb9362..d6edb9d53ec7 100644
--- a/dev-ruby/typhoeus/typhoeus-1.4.0-r2.ebuild
+++ b/dev-ruby/typhoeus/typhoeus-1.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,7 @@ IUSE=""
 # https://github.com/typhoeus/typhoeus/issues/710
 ruby_add_rdepend "<dev-ruby/ethon-0.16.0"
 
-ruby_add_bdepend "test? ( dev-ruby/json || ( dev-ruby/faraday:1 >=dev-ruby/faraday-0.9:0 ) >=dev-ruby/sinatra-1.3 >=dev-ruby/redis-3.0 >=dev-ruby/dalli-2.7.9 )"
+ruby_add_bdepend "test? ( dev-ruby/json dev-ruby/faraday:1 >=dev-ruby/sinatra-1.3 >=dev-ruby/redis-3.0 >=dev-ruby/dalli-2.7.9 )"
 
 all_ruby_prepare() {
 	sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
diff --git a/dev-ruby/typhoeus/typhoeus-1.4.0.ebuild b/dev-ruby/typhoeus/typhoeus-1.4.0.ebuild
deleted file mode 100644
index 707211a689b0..000000000000
--- a/dev-ruby/typhoeus/typhoeus-1.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Runs HTTP requests in parallel while cleanly encapsulating handling logic"
-HOMEPAGE="https://rubygems.org/gems/typhoeus/
-	https://github.com/typhoeus/typhoeus"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/ethon-0.9.0"
-
-ruby_add_bdepend "test? ( dev-ruby/json >=dev-ruby/faraday-0.9 >=dev-ruby/sinatra-1.3 >=dev-ruby/redis-3.0 >=dev-ruby/dalli-2.7.9 )"
-
-all_ruby_prepare() {
-	sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
-}