16 files changed, 54 insertions, 260 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 6c7ae604bfc4..cc7db1287018 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/faraday-net_http/Manifest b/dev-ruby/faraday-net_http/Manifest
index a45afb869690..c658e4f76c20 100644
--- a/dev-ruby/faraday-net_http/Manifest
+++ b/dev-ruby/faraday-net_http/Manifest
@@ -4,7 +4,7 @@ DIST faraday-net_http-2.1.0.tar.gz 9061 BLAKE2B 00e461718f4a92ff424e28074aa62d79
 DIST faraday-net_http-3.0.0.tar.gz 8882 BLAKE2B b23f2457e37f365b33d5eeb25967f38de323258f5bd8d1a0cb46f9264a51f1924aad1fe5d03798a66538ca6c1195097af4c1fa4ca1e188da85aa415c8644b007 SHA512 58308721819dc57813cf50cb4eee2d5dee5c83c1f5037a81d17ad7a9e225bc7449249c73dc419b4fc563a8d7754fbd287284df16e3d440a807ce8d24732f4715
 DIST faraday-net_http-3.0.1.tar.gz 8908 BLAKE2B e53e98f49c79aa5ac9bbe1499dd45653ad4c9026dc2ee3628676749d537b3b5f78be826f40deeeddb377b72fbb4c8e82f735d714c93090c63d9aca63d601eb6b SHA512 a1f954f27710e92640a71fb5e5a4ddc5967791fc42763248bdef59311377829a223bb61be7007e5faa32c2dd3e5f72e9cbca06c54dc5e23d99cc7fd01fee7a5c
 DIST faraday-net_http-3.0.2.tar.gz 8897 BLAKE2B bd69eb01e74ab00c3d14efe7cf3c74efaeb17c7a03c61916c040a79ea152c4adddb010b0767dc6eecaed072e905c5d4ec540c26abbb1d390123538c38555ea22 SHA512 e01d22c243f175f88f1a559d9c200047a28fa118225b3ad616ae0ed3e5207b6f6dd0337f8520e1b023deef18e3b1654ad84e43267971d634ba9d8e88b44627fa
-EBUILD faraday-net_http-1.0.1.ebuild 722 BLAKE2B b2909a8f5323ab6da0980f80b31c684dfd4f3c97909fc640aae69b94b9f228ead1aeb02ec7ad56e449bff89dfbd857fbc8b96d3380bdb4044104a7b653c1ea6b SHA512 71cc0cf4ab3237bb23dd623b8fb869ba2b89ab9815e12520e69d098994d4387cfce01c6d7ba10a584b3b95b402596d584b096c7b0f63112829f1004dcd41303f
+EBUILD faraday-net_http-1.0.1.ebuild 722 BLAKE2B 5dc9dd412a8fed71c8e835a3a56a5c200fdbed56877bea030b559bccc7330677fad322102156334b066dc40d92ae9b25a578d10e7c73befd08fbc9916b960edc SHA512 34120ef92bf27c0e39b0966dcc8c61b6131bc38bde5a912efea0130f8ed18516ecc0c98f5558ac970c63773080fec7f36234456bd215fad9a4ee0210949639a4
 EBUILD faraday-net_http-2.0.3.ebuild 756 BLAKE2B f91ec9313ca7fa4d2b949562f50485bff51a774b6fbb218a106fa93211beb6f8df121f900870f3d23231c786a8c915656025a1a08a6f0f7614690c1f167af031 SHA512 685c8b4fa0e3f4d97e2d429c32ba34dcf0315a424ef45815ac023d8b2b6b69895ea54a0970194a8d261e8924325b01072e181da2a2d814e91771ac6eb117abc1
 EBUILD faraday-net_http-2.1.0.ebuild 749 BLAKE2B 6175531734ce76b64a20d487b46c49c97b524aab57140c56297cc842359202abcefc58db82e228d765307b75c1abf23e982239247931e4706197f1517423d06e SHA512 31c388ac1440043cc80639181b8df5b25a4eb9fd0a9d4b4a1ca44c79bb9f7832343d954cdfb55482ed003c1a3199ccae83e36292574562d1fd203db02f28fba6
 EBUILD faraday-net_http-3.0.0.ebuild 719 BLAKE2B cf29a56b9fa072c4162f6ab88e3e17e6b8b80fe932f1617978f39c8e3472447004c1e3326c5529bb09fdba5b8b9f550d6f8c9c7b2fce1219d5e4758ebefa7eb6 SHA512 464eac718395fb54fa91489934f6c76d573586b1ed87a4a24324f0b239733b259155764fab91b74c7a83fc44f27c582f862091325e75a56ec34155b9b6bba5e4
diff --git a/dev-ruby/faraday-net_http/faraday-net_http-1.0.1.ebuild b/dev-ruby/faraday-net_http/faraday-net_http-1.0.1.ebuild
index e03f6c63dc4d..5de7a758edf8 100644
--- a/dev-ruby/faraday-net_http/faraday-net_http-1.0.1.ebuild
+++ b/dev-ruby/faraday-net_http/faraday-net_http-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index a4509742d9e6..1f0e85d01b5b 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -6,7 +6,7 @@ DIST faraday-2.5.2.tar.gz 830523 BLAKE2B 2d420b7799e92a1e918d01df20b28633947b303
 DIST faraday-2.6.0.tar.gz 830744 BLAKE2B 4ed5fa0fa4412dafe0c6ed20ef03393f8242f39fc60f269701ce6755b9d6b9fa60cbe477a623146fae2b1b0685fc86619b857c1f5bd6ce5e73df4a88846f55aa SHA512 cc80d7dfc6778ea184abc85476aba65fd2046dada4a88c6764a82841b561e84e4f44367191f2ec892d67fd7552e4444b922541cadd38d0ccfc609e90222fac90
 DIST faraday-2.7.2.tar.gz 831914 BLAKE2B 424d275519cd24f03b0a678810671de2541e799512789e0a3d80d146aafbc74e2acdbb3c9d3d1cfe7224860e9b716720b234fb25c045226f04b29223c640567d SHA512 41402bdb4594988a88542289c5a5242db04ae07081ba21fbc18b756eeae108bc06298b5ad7b48842a86c586b9da4e4568fc48ec9d26697618bd858649ef86294
 EBUILD faraday-0.17.3.ebuild 1530 BLAKE2B ed407c60c9138dc038c019689cdf9c2e620082c58c65f6cf08fc8bd9e2aeb728aa804e6545ec9a8059aa117968a61e9b8a300144e17636173318b6889173508a SHA512 2ca22991606aebaf97e281035ad9b1e166017a1cd2e29b43f363badac28cd4be2551bf6a1be0f38e76245f8a76c7e9fd44f8d79cc5f42922fd20190d8eb8719c
-EBUILD faraday-1.3.1.ebuild 2321 BLAKE2B a1de018619d7cc30103cb0f3b5c56976d4236c6e449744c33ac830814e3873eeae07fdedc460f6ac12f8b1f7321bd81f47ac8e8bd43694c1ece6c78b1dc3d304 SHA512 9196e0586b9322bf1e7ace8b4d065d83c9a53ecc34e01af62854a506d12a784e6bae2b00231d3e07b218542344221fec03196d826028f43df1aa0a81d6baed62
+EBUILD faraday-1.3.1.ebuild 2439 BLAKE2B e41538c7de42c191107c94bca876198576c6fd1a7c43af9bdb23cb7e2cf7b71d799d92ad33f786736b65a4f5ba7c88bd66021c2f70254259998819aed1b3ba45 SHA512 8af16340781f5627079e7861ff4fa38d5cc55b42d3ef73e65f1e4698322632d4e55df60745d3cddea64b5659a0460816059bb834ae58f7b13ad48df715b73e8a
 EBUILD faraday-2.3.0.ebuild 1704 BLAKE2B b48ba1480ec3823e9083e5bb81fb9077e3c1715ec41675ec28a0c1c35def80b85ac755e46c2ac95bb1697df38a5079659760e3194c0d280e52e6ec1b8cb5f282 SHA512 7e30e7633b0a81f029d8b6d4773a16b078211f9603e496b27e0bc548d0846652656ae60628c5dd9eaed067049ee113f79327e046e1cdc27957a35b4dd8e2b417
 EBUILD faraday-2.4.0.ebuild 1697 BLAKE2B c5aa4b06d15b2e2d01135c5a418122b6a18c450804b820a7b18c92863c8ce6ba5fc4a826e931d2a6f0c00b522aaa671ff7eb80825f7d9fcc4fc2c6d84fad9dc0 SHA512 ead14304c73bee8e74201071e82d427df19da1a18d7e67ff4c96bc8cdd13969ea1ed639a4437c3a53986fb79a2364df5a3f5453d8d0ec3eac89880ccb77741f8
 EBUILD faraday-2.5.2.ebuild 1736 BLAKE2B 7f4eb4c6f3b93f1ed8c9a334bbe075e4099085097ea123468e00e6476b8c88ae99b4e822cdc5f988e1dd45bcc6165bf3e8d2862c1c5fc2aac4d4141c392dd4de SHA512 b0ce350645756f6023fe6e8333cbf6c669ca962051fe218989c791888d7c300f9645699223e20079860e2724a973b26a51e44b931cff2da8868b19c902a66b3d
diff --git a/dev-ruby/faraday/faraday-1.3.1.ebuild b/dev-ruby/faraday/faraday-1.3.1.ebuild
index 40acec1e6c73..b746494a194f 100644
--- a/dev-ruby/faraday/faraday-1.3.1.ebuild
+++ b/dev-ruby/faraday/faraday-1.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="none"
@@ -34,7 +34,11 @@ ruby_add_rdepend "
 ruby_add_bdepend "test? (
 		>=dev-ruby/test-unit-2.4
 		>=dev-ruby/connection_pool-2.2.2
+		>=dev-ruby/httpclient-2.2
+		>=dev-ruby/net-http-persistent-3.0
+		>=dev-ruby/patron-0.4.2
 		dev-ruby/rack
+		>=dev-ruby/rack-test-0.6
 		dev-ruby/webmock
 	)"
 
diff --git a/dev-ruby/httpclient/Manifest b/dev-ruby/httpclient/Manifest
index c1eb8736eca8..17d56f5f4e02 100644
--- a/dev-ruby/httpclient/Manifest
+++ b/dev-ruby/httpclient/Manifest
@@ -1,3 +1,3 @@
 DIST httpclient-2.8.3.tgz 464624 BLAKE2B ce8ed523a24acce219027a4f1985caf2b4dae29bdba038ca2397e5f4d4b36c90b35cedfb62faa7faf426c3ce8589906df7832968c81b64bc9100eff6f4fe9745 SHA512 b65b5adb97af069d7ff6b6f4cccd6a42c6d9c88b797e9495768fe1f36a6bd93defe50190edc201de5e39c4e306ba0bd17a8ff2f8eba4d636dacafa06c172967d
-EBUILD httpclient-2.8.3-r2.ebuild 2755 BLAKE2B 9c72f8b951f5943b721777da20b42cc728e721852d7eae5a482efd781070fad94f96407e0ef6f6cc749d0ac0de448a07fa5204945be9f43d76a3777f445c760e SHA512 c6452eab52c2fdb742376d673b7e0bef788de201ccf0a564bb06af89065d8be103ae76fcc2f2a0267392cb768a10f8671077ebe5115efc4a7cb70f6189976c1b
+EBUILD httpclient-2.8.3-r2.ebuild 2755 BLAKE2B a70e78ab3b898d37e409da1d247c98a6ec7f881375ee52cbc7e4b282d1bfff6e2f264a19d17118c26f54d9c396edc7c20748e0e6a8b4a44a5b758901f070c418 SHA512 6bc53f061a41e7e84828249597ad03b5a1d1a44865c305fc270cdb6c6bf237fda19fbacddfb2fcc2bdc1c2ec4fdb5b04d2ee7143345c8f4f69a250172970b687
 MISC metadata.xml 342 BLAKE2B 357371edae972dc4bf17bef8a0ddf752bd81a3936a4ba6cc83ec7a253346e3d236bb0930fc71f14c1c42a486f3202bcd08352260aef38676f57b31f852dcca27 SHA512 3c3e6861463a129c5679658a044b956f1d8a4ad086c5fc77029037ad88b391af06cfbe26127127ae0b909d602c9a3b02929c48d7a26059ebd29e06c394d7b4c4
diff --git a/dev-ruby/httpclient/httpclient-2.8.3-r2.ebuild b/dev-ruby/httpclient/httpclient-2.8.3-r2.ebuild
index 326a6f7bf631..cdaf7ad53a14 100644
--- a/dev-ruby/httpclient/httpclient-2.8.3-r2.ebuild
+++ b/dev-ruby/httpclient/httpclient-2.8.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST="-Ilib test"
 RUBY_FAKEGEM_TASK_DOC="doc"
diff --git a/dev-ruby/patron/Manifest b/dev-ruby/patron/Manifest
index 1f153e719dce..05fa5f38f969 100644
--- a/dev-ruby/patron/Manifest
+++ b/dev-ruby/patron/Manifest
@@ -1,3 +1,3 @@
 DIST patron-0.13.3.gem 65024 BLAKE2B 87aa69aab49978d14a80ed9e09d74d7853da3512875cc3aecd3f387d1523b85c84625b57a5826e5f5f999cec4feaae58c1aaae96582144a5c9dc537c9d5a4224 SHA512 afbbbd9570e338a5d1b97b4ebeda76ac95a22c29d908629723d345a47400183c2ccee67ebcaf5b6f9ecb032eb3b847e70ec9eebff75b33045a3665c215abfbd0
-EBUILD patron-0.13.3-r1.ebuild 1085 BLAKE2B bc276e5e41c03c9869b28993c92af4ec0e73b00175facb8bd8b6321c3c5e26d018721eb457ccb6d25bdc0c24e32fec7a45d0b6001b60b91039d6978d75e2726e SHA512 030d7dea9c8211b05149f7442026be9e56509ac85256462d2da741b79f3f7dd95201cf1cd0baedcef18e994485c87db3704b433792a99b9a1999c1ff3bd52e75
+EBUILD patron-0.13.3-r1.ebuild 1085 BLAKE2B 0463190284dad6f1822d75e25c733305b2ff6a5d37ca60d79f33016918a998e50e7bbf3119196f2ec4e6ea1cc51e4b8b23d92b2ad5e695880e04fcbfcc6c31a2 SHA512 977ca1721102ab4481e30b17ee4034d423e54b95dd7a76b698741deae239933edb5e1a68d3d1b2247b35358449d961957de21188b3938a02e701668d9e9b8c03
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/patron/patron-0.13.3-r1.ebuild b/dev-ruby/patron/patron-0.13.3-r1.ebuild
index c9c2afa0dd53..6bebd371fe1c 100644
--- a/dev-ruby/patron/patron-0.13.3-r1.ebuild
+++ b/dev-ruby/patron/patron-0.13.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index 79ec56f8462f..a91f6408ee7c 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -1,4 +1,3 @@
-AUX tilt-2.0.10-ruby30.patch 1482 BLAKE2B 00647a8d443e9800bc9aa7e28d91b9f0ed59ad5e0802ae14b3b545d695181774bcd909ff459832b5e99316f39b9d548ee002fb23de6fcbf394ea73521519b85d SHA512 0f261a9d02e562326902433f10f1ea58a652c2f122d8d90ab2b74259b1d6bd551854802b5f19c07fc2998a45d82133fe3cc029012103e614faf22bd6fc766047
 DIST tilt-2.0.10.tar.gz 51446 BLAKE2B de5c12dcf22994f182ae163a82c3060f1d0d8b4bc2a4495f28c9befc954b4949b9d2ae6aed42e3a9c35fb68825844881d9f15b2b68d949236e5396083ff199a3 SHA512 4a36c55347e307ea0c842aad3da72cebe98bcf8a0421040cfce7a43540d1746e736ce92b7ce7492a5cfc184372842c3ac7a006f3650b4c9420d5825ec005b4ef
 DIST tilt-2.0.11.tar.gz 53041 BLAKE2B 2509cc3efe5e6302c8943c00108eeda6ee4b23a18952ad23049e11ea28b397b80a21d34c4d241119f45cedf2a978a2673d857a6cc32d7e26a2016caa510458f9 SHA512 e28e31ab92aa42eada34e0f6c05dab6a54945d07b649588356b1635ba8a36700f6e537e8702613883693501442d21690d8b3690b06f7b9f331192134511b78b7
 EBUILD tilt-2.0.10.ebuild 1603 BLAKE2B c046401f51f7a87aeff75991d0ddbbb6c402a1cc8dee8d867ac44922ddb72791e673d296353e5eeb5f52860230d10c2eceab6e056d29f85f7df7e78c3b355a31 SHA512 9c4f2a2c43b29c76e9ed970f44be4b6b8c5b4c96ab5b34e17dfcedad416d4487efa9a6ebab332bde09b1aea5870e4bf3ac1752505838ceb506d1a464b0f16531
diff --git a/dev-ruby/tilt/files/tilt-2.0.10-ruby30.patch b/dev-ruby/tilt/files/tilt-2.0.10-ruby30.patch
deleted file mode 100644
index 27e4d821f64f..000000000000
--- a/dev-ruby/tilt/files/tilt-2.0.10-ruby30.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 91838d57aa35ba5341368ead0d442e1dc1eb8730 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
-Date: Mon, 18 Jan 2021 12:49:31 +0100
-Subject: [PATCH] Fix Ruby 3.0 compatibility.
-
-This fixes issues such as:
-
-~~~
-  1) Error:
-CSVTemplateTest#test_compiles_and_evaluates_the_template_on_render:
-TypeError: no implicit conversion of Hash into String
-    /usr/share/ruby/csv.rb:1273:in `initialize'
-    /usr/share/ruby/csv.rb:1273:in `new'
-    /usr/share/ruby/csv.rb:1273:in `generate'
-    (__TEMPLATE__):in `__tilt_920'
-    /builddir/build/BUILD/tilt-2.0.10/usr/share/gems/gems/tilt-2.0.10/lib/tilt/template.rb:170:in `call'
-    /builddir/build/BUILD/tilt-2.0.10/usr/share/gems/gems/tilt-2.0.10/lib/tilt/template.rb:170:in `evaluate'
-    /builddir/build/BUILD/tilt-2.0.10/usr/share/gems/gems/tilt-2.0.10/lib/tilt/template.rb:109:in `render'
-    /builddir/build/BUILD/tilt-2.0.10/usr/share/gems/gems/tilt-2.0.10/test/tilt_csv_test.rb:15:in `block in <class:CSVTemplateTest>'
-~~~
----
- lib/tilt/csv.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/tilt/csv.rb b/lib/tilt/csv.rb
-index fd0e602..7dfa220 100644
---- a/lib/tilt/csv.rb
-+++ b/lib/tilt/csv.rb
-@@ -50,7 +50,7 @@ def prepare
- 
-     def precompiled_template(locals)
-       <<-RUBY
--        #{@outvar} = #{self.class.engine}.generate(#{options}) do |csv|
-+        #{@outvar} = #{self.class.engine}.generate(**#{options}) do |csv|
-           #{data}
-         end
-       RUBY
diff --git a/dev-ruby/typhoeus/Manifest b/dev-ruby/typhoeus/Manifest
index 8abda0644c0b..24c4e3c40daa 100644
--- a/dev-ruby/typhoeus/Manifest
+++ b/dev-ruby/typhoeus/Manifest
@@ -1,4 +1,5 @@
 DIST typhoeus-1.4.0.gem 56832 BLAKE2B 1f188a2c174a9d0e2cc0afc10f96d98a8c78278c1fa53eeb88da6f4f3986c8e204171a9bb817c95a217360346bda319711e7c89095ad48e878cbc3efc21e9887 SHA512 f48a99fd554f4d06d37a0a804ee79dd8423d9bff765394537ab0edba615e132d25660a6eb455e8628f59bd56c7ea26f4a195827d5287a53e58e3aeb394477284
-EBUILD typhoeus-1.4.0-r1.ebuild 979 BLAKE2B 6765e8a956d27f75a0df6898192a5a2fefb1fdac08bb18055eb062afaf4586012e3242b77efdccb64474d81a48c4839eafdab957cfe72ab4550ac29ece4cd311 SHA512 7a0d81b86b9920648b0439f6d80bfd548bc71a9fd3138d7cf766ae461713644b755acaa74ab966f82cdd503aa9b3087b8d6c2ef6fce682e20bd42457f27cecd0
+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
 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
index 6dc99f1ce694..ffaf7dcb9362 100644
--- a/dev-ruby/typhoeus/typhoeus-1.4.0-r1.ebuild
+++ b/dev-ruby/typhoeus/typhoeus-1.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
 RUBY_FAKEGEM_TASK_DOC=""
@@ -21,9 +21,11 @@ SLOT="1"
 KEYWORDS="~amd64"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/ethon-0.9.0"
+# 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 ) >=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/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
diff --git a/dev-ruby/typhoeus/typhoeus-1.4.0-r2.ebuild b/dev-ruby/typhoeus/typhoeus-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..ffaf7dcb9362
--- /dev/null
+++ b/dev-ruby/typhoeus/typhoeus-1.4.0-r2.ebuild
@@ -0,0 +1,34 @@
+# 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/virtus/Manifest b/dev-ruby/virtus/Manifest
index 8d06bb23fd99..036eac873e6b 100644
--- a/dev-ruby/virtus/Manifest
+++ b/dev-ruby/virtus/Manifest
@@ -1,4 +1,3 @@
-AUX virtus-1.0.5-equalizer.patch 8422 BLAKE2B 939c71ea56a77c1a654e7baf11e0f2ee40b044ad0dde0c1689a0e8c50789b6adf2f8586467f662c3d20e2a9643cda21ff9af865ee19c40ccc3e48069d43e1932 SHA512 70db78b928e1dc23df126bdd081db2664dcf75379e92d3480ad0dad951df9a91d0feaa40de570a6116a71708342d891c073b07395180d85cad50e9e3dd509020
 DIST virtus-2.0.0.gem 50176 BLAKE2B 16a8977b782691faa48e239354c8d25d63e350bcc0e8499691586021817d462e7575eb9d6c6911c371e00a711bc404f2be6dae2168d167fc683049fb14c798f6 SHA512 17f1a0b13ca0912d0a245886b7d8c1b0bcb9f08c1ac3c89d8e5de234e6afa3989c4f15b555342827ab3f8a5570e888bfee893aff851189b1769fb34fb3f1a64a
 EBUILD virtus-2.0.0.ebuild 975 BLAKE2B 3ca7f5e7b2652399352425cd177740f03e53a0325af9ea17e71c02356dff8173b023f424bc7b16ae83cb1ddb333896ff3712cea7ebbe48768df97d7eee085459 SHA512 7ad23b52a30c87470378e03640f8b860e70837883fed915d76ca93b54a6613fdb9e4c11905d6bd4c2ba87deb490163330db600e0de7b705f618aa118a4f74e23
 MISC metadata.xml 390 BLAKE2B 643e41d32d7266a1db20e8e955cb60dff232b41f720d810c0a0a2b7f9ea78f70519de33b38770b0ca8982da6ab19718dc5f8796ef68ee82c51195bffb2c5b3e4 SHA512 88175c18f159270520bf9fcad6a4295ad5bce8e567996af2fc91c1ed9b4dd0f0953bd61f36d3a331eef079346df51b9ed88208e90a9d8aef1086172c8cb909ec
diff --git a/dev-ruby/virtus/files/virtus-1.0.5-equalizer.patch b/dev-ruby/virtus/files/virtus-1.0.5-equalizer.patch
deleted file mode 100644
index 22fc19298505..000000000000
--- a/dev-ruby/virtus/files/virtus-1.0.5-equalizer.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From 5f33f8147fc9d84e69a33758b000486ebe42c8ae Mon Sep 17 00:00:00 2001
-From: Sergey Novik <konnigun@gmail.com>
-Date: Sun, 19 Jul 2015 18:11:07 +0300
-Subject: [PATCH 1/3] Add specs for attributes comparison (based on latest
- Equalizer gem working version)
-
----
- spec/unit/virtus/attribute/comparison_spec.rb | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
- create mode 100644 spec/unit/virtus/attribute/comparison_spec.rb
-
-diff --git a/spec/unit/virtus/attribute/comparison_spec.rb b/spec/unit/virtus/attribute/comparison_spec.rb
-new file mode 100644
-index 0000000..0b51a9c
---- /dev/null
-+++ b/spec/unit/virtus/attribute/comparison_spec.rb
-@@ -0,0 +1,23 @@
-+require 'spec_helper'
-+
-+describe Virtus::Attribute, '#== (defined by including Virtus::Equalizer)' do
-+  let(:attribute) { described_class.build(String, :name => :name) }
-+
-+  # Currently that's the way it works and it happens because default_value objects
-+  # don't have equalizer, resulting in  attributes object mismatch.
-+  # This behavior (and a spec) will need a change in future.
-+  it 'returns false when attributes have same type and options' do
-+    equal_attribute = described_class.build(String, :name => :name)
-+    expect(attribute == equal_attribute).to be_falsey
-+  end
-+
-+  it 'returns false when attributes have different type' do
-+    different_attribute = described_class.build(Integer, :name => :name)
-+    expect(attribute == different_attribute).to be_falsey
-+  end
-+
-+  it 'returns false when attributes have different options' do
-+    different_attribute = described_class.build(Integer, :name => :name_two)
-+    expect(attribute == different_attribute).to be_falsey
-+  end
-+end
-
-From 3748f6eb2cf368d6a78fb1ef50c2724648d96a9b Mon Sep 17 00:00:00 2001
-From: Sergey Novik <konnigun@gmail.com>
-Date: Sun, 19 Jul 2015 18:11:24 +0300
-Subject: [PATCH 2/3] Use Virtus::Equalizer instead of Equalizer gem in
- Virtus#Attribute (behavior preserved)
-
----
- lib/virtus/attribute.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/virtus/attribute.rb b/lib/virtus/attribute.rb
-index 999a2ef..0654d4d 100644
---- a/lib/virtus/attribute.rb
-+++ b/lib/virtus/attribute.rb
-@@ -18,7 +18,7 @@ module Virtus
-   class Attribute
-     extend DescendantsTracker, Options, TypeLookup
- 
--    include ::Equalizer.new(:type, :options)
-+    include Equalizer.new(inspect) << :type << :options
- 
-     accept_options :primitive, :accessor, :default, :lazy, :strict, :required, :finalize, :nullify_blank
- 
-
-From ef57af319334a1d4f3e0860acbde7c6d6f0eb8ef Mon Sep 17 00:00:00 2001
-From: Sergey Novik <konnigun@gmail.com>
-Date: Sun, 19 Jul 2015 18:26:50 +0300
-Subject: [PATCH 3/3] Change behavior of Attribute#== method
-
-By changing Coercer#== and DefaultValue#== methods, we allow
-Attribute#== to actually compare objects now (before, every comparison
-would return `false` because of different instances of DefaultValue
-model in options[:default_value] key.
----
- lib/virtus/attribute/default_value.rb              |  2 ++
- lib/virtus/coercer.rb                              |  1 +
- spec/unit/virtus/attribute/comparison_spec.rb      |  7 ++-----
- spec/unit/virtus/attribute_set/append_spec.rb      |  8 ++++----
- spec/unit/virtus/attribute_set/element_set_spec.rb | 22 +++++++++++++++-------
- spec/unit/virtus/attribute_set/merge_spec.rb       |  8 +++++---
- 6 files changed, 29 insertions(+), 19 deletions(-)
-
-diff --git a/lib/virtus/attribute/default_value.rb b/lib/virtus/attribute/default_value.rb
-index a2fcd31..eca7350 100644
---- a/lib/virtus/attribute/default_value.rb
-+++ b/lib/virtus/attribute/default_value.rb
-@@ -7,6 +7,8 @@ class Attribute
-     class DefaultValue
-       extend DescendantsTracker
- 
-+      include Equalizer.new(inspect) << :value
-+
-       # Builds a default value instance
-       #
-       # @return [Virtus::Attribute::DefaultValue]
-diff --git a/lib/virtus/coercer.rb b/lib/virtus/coercer.rb
-index a06e273..676d553 100644
---- a/lib/virtus/coercer.rb
-+++ b/lib/virtus/coercer.rb
-@@ -3,6 +3,7 @@ module Virtus
-   # Abstract coercer class
-   #
-   class Coercer
-+    include Equalizer.new(inspect) << :primitive << :type
- 
-     # @api private
-     attr_reader :primitive, :type
-diff --git a/spec/unit/virtus/attribute/comparison_spec.rb b/spec/unit/virtus/attribute/comparison_spec.rb
-index 0b51a9c..796cd20 100644
---- a/spec/unit/virtus/attribute/comparison_spec.rb
-+++ b/spec/unit/virtus/attribute/comparison_spec.rb
-@@ -3,12 +3,9 @@
- describe Virtus::Attribute, '#== (defined by including Virtus::Equalizer)' do
-   let(:attribute) { described_class.build(String, :name => :name) }
- 
--  # Currently that's the way it works and it happens because default_value objects
--  # don't have equalizer, resulting in  attributes object mismatch.
--  # This behavior (and a spec) will need a change in future.
--  it 'returns false when attributes have same type and options' do
-+  it 'returns true when attributes have same type and options' do
-     equal_attribute = described_class.build(String, :name => :name)
--    expect(attribute == equal_attribute).to be_falsey
-+    expect(attribute == equal_attribute).to be_truthy
-   end
- 
-   it 'returns false when attributes have different type' do
-diff --git a/spec/unit/virtus/attribute_set/append_spec.rb b/spec/unit/virtus/attribute_set/append_spec.rb
-index 7fbb20a..577b07e 100644
---- a/spec/unit/virtus/attribute_set/append_spec.rb
-+++ b/spec/unit/virtus/attribute_set/append_spec.rb
-@@ -38,10 +38,10 @@
- 
-     it { is_expected.to equal(object) }
- 
--    it 'replaces the original attribute' do
--      expect { subject }.to change { object.to_a }.
--        from(attributes).
--        to([ attribute ])
-+    it "replaces the original attribute object" do
-+      expect { subject }.to change { object.to_a.map(&:__id__) }.
-+      from(attributes.map(&:__id__)).
-+      to([attribute.__id__])
-     end
-   end
- end
-diff --git a/spec/unit/virtus/attribute_set/element_set_spec.rb b/spec/unit/virtus/attribute_set/element_set_spec.rb
-index 5db7e41..8d9c638 100644
---- a/spec/unit/virtus/attribute_set/element_set_spec.rb
-+++ b/spec/unit/virtus/attribute_set/element_set_spec.rb
-@@ -37,20 +37,28 @@
- 
-     it { is_expected.to equal(attribute) }
- 
--    it 'replaces the original attribute' do
--      expect { subject }.to change { object.to_a }.from(attributes).to([ attribute ])
-+    it "replaces the original attribute object" do
-+      expect { subject }.to change { object.to_a.map(&:__id__) }.
-+      from(attributes.map(&:__id__)).
-+      to([attribute.__id__])
-     end
- 
--    it 'allows #[] to access the attribute with a symbol' do
--      expect { subject }.to change { object['name'] }.from(original).to(attribute)
-+    it 'allows #[] to access the attribute with a string' do
-+      expect { subject }.to change { object['name'].__id__ }.
-+      from(original.__id__).
-+      to(attribute.__id__)
-     end
- 
--    it 'allows #[] to access the attribute with a string' do
--      expect { subject }.to change { object[:name] }.from(original).to(attribute)
-+    it 'allows #[] to access the attribute with a symbol' do
-+      expect { subject }.to change { object[:name].__id__ }.
-+      from(original.__id__).
-+      to(attribute.__id__)
-     end
- 
-     it 'allows #reset to track overridden attributes' do
--      expect { subject }.to change { object.reset.to_a }.from(attributes).to([ attribute ])
-+      expect { subject }.to change { object.reset.to_a.map(&:__id__) }.
-+      from(attributes.map(&:__id__)).
-+      to([attribute.__id__])
-     end
-   end
- end
-diff --git a/spec/unit/virtus/attribute_set/merge_spec.rb b/spec/unit/virtus/attribute_set/merge_spec.rb
-index 72dc39c..9981ece 100644
---- a/spec/unit/virtus/attribute_set/merge_spec.rb
-+++ b/spec/unit/virtus/attribute_set/merge_spec.rb
-@@ -21,12 +21,14 @@
- 
-   context 'with a duplicate attribute' do
-     let(:attributes) { [Virtus::Attribute.build(String, :name => name)] }
--    let(:attribute)  { Virtus::Attribute.build(String, :name => name) }
-+    let(:attribute)  {  Virtus::Attribute.build(String, :name => name) }
- 
-     it { is_expected.to equal(object) }
- 
--    it 'replaces the original attribute' do
--      expect { subject }.to change { object.to_a }.from(attributes).to([attribute])
-+    it "replaces the original attribute object" do
-+      expect { subject }.to change { object.to_a.map(&:__id__) }.
-+      from(attributes.map(&:__id__)).
-+      to([attribute.__id__])
-     end
-   end
- end