gentoo resync : 12.05.2022

943 files changed, 3686 insertions, 5413 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index a0aaab19813b..3ffdc9f2d16c 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index add454262e68..676a677787e2 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,27 +1,25 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
 DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
 DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
 DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
 DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-EBUILD actioncable-5.2.6.2.ebuild 936 BLAKE2B 619af8dde4fb38fe35b5c7155e093969da04ba2380b49902b30a6688437754826eeb64944fa8d48aa8f1d5da634b54026da9eb1de68b178cf11eafafe7a9c300 SHA512 9bd391279fd77601af242eeeed7a587209a1890ebc0cc4d68b26e04d70dd80b8bcf048122c12074b0f90f7f6368b2b810079ab4bdb0ff2d2d705842949ae3f6a
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 EBUILD actioncable-5.2.6.ebuild 936 BLAKE2B fba18465f441371ce5291ae284941a48a408131f2f9973b608c59246fa8c81c0cd527c51d376baab722f8f0642705ff8969659db32c9b9d0d3405e32e4473fa6 SHA512 27edd8dc75e905e734d218d93c3c34e11c565758766eb4b49a5ad22425855eece0d3087daffc4ea1a587473d272a0e11c976636bfc45921f103412bf851a1659
+EBUILD actioncable-5.2.7.1.ebuild 936 BLAKE2B 619af8dde4fb38fe35b5c7155e093969da04ba2380b49902b30a6688437754826eeb64944fa8d48aa8f1d5da634b54026da9eb1de68b178cf11eafafe7a9c300 SHA512 9bd391279fd77601af242eeeed7a587209a1890ebc0cc4d68b26e04d70dd80b8bcf048122c12074b0f90f7f6368b2b810079ab4bdb0ff2d2d705842949ae3f6a
 EBUILD actioncable-5.2.7.ebuild 936 BLAKE2B 619af8dde4fb38fe35b5c7155e093969da04ba2380b49902b30a6688437754826eeb64944fa8d48aa8f1d5da634b54026da9eb1de68b178cf11eafafe7a9c300 SHA512 9bd391279fd77601af242eeeed7a587209a1890ebc0cc4d68b26e04d70dd80b8bcf048122c12074b0f90f7f6368b2b810079ab4bdb0ff2d2d705842949ae3f6a
 EBUILD actioncable-6.0.4.1.ebuild 935 BLAKE2B f58e9f657cbab6647f69f1842e084bcba4d270f482f8d359df2d81e2e91c1dd746a3b02c37dd603114d742968eabb299c45b2d4155a08b6ba162725ad2208eea SHA512 e66925308abc15016b7e0d43c006abb6f43789a035d531c81c6e334bdd115e60529b56016956dfa96d508225a72d06b4c248b9d22c93ba6acefea1183c8be2fc
-EBUILD actioncable-6.0.4.3.ebuild 928 BLAKE2B a557d525769f8784d5f738e5a880b8ed0280041fcb79254c7ddaeb6059cb88138ca893221dacb1f459d807ae9cff63d4d61285e6d34d287927a60ac6cd065eb6 SHA512 507b883403a0cece5a74492348f9cce4fb4063472550cf156530b6d0c6d33a9bde8c82eda2b6a5a4219c6bf22b7eb0fe078a9de1b52faf5582e21859d917bb94
 EBUILD actioncable-6.0.4.4.ebuild 928 BLAKE2B a557d525769f8784d5f738e5a880b8ed0280041fcb79254c7ddaeb6059cb88138ca893221dacb1f459d807ae9cff63d4d61285e6d34d287927a60ac6cd065eb6 SHA512 507b883403a0cece5a74492348f9cce4fb4063472550cf156530b6d0c6d33a9bde8c82eda2b6a5a4219c6bf22b7eb0fe078a9de1b52faf5582e21859d917bb94
-EBUILD actioncable-6.0.4.6.ebuild 928 BLAKE2B f88dbf36eb9be7a3971374e66f7996e751918bdc8d4320442a28cfc02b5cef0f85ba25706838627d97d98eae180dd4269317fa019e89d837283847bc1fd98a06 SHA512 35ea5a2908c3bfa43bbb71593c8828eddedafd32d9d888f527b7b547f475f585697ce897011082bdf86a7cf16f07f4b240a694f0b03c37490558d10d0f0dee5f
 EBUILD actioncable-6.0.4.7.ebuild 928 BLAKE2B f88dbf36eb9be7a3971374e66f7996e751918bdc8d4320442a28cfc02b5cef0f85ba25706838627d97d98eae180dd4269317fa019e89d837283847bc1fd98a06 SHA512 35ea5a2908c3bfa43bbb71593c8828eddedafd32d9d888f527b7b547f475f585697ce897011082bdf86a7cf16f07f4b240a694f0b03c37490558d10d0f0dee5f
-EBUILD actioncable-6.1.4.4.ebuild 961 BLAKE2B 227645a5a46d5031f224a61b5c39faaf2b5f803074824e35467b7aab43ac7bce8e3e975f9b76eae2103d8afe284d1792e22ac7f2415466dc31746dad095bde17 SHA512 80a6bc6af67b1a7c3fd42554f244dce6a9f8a604619cbecbc23ac44b33e6de4e2d91fea49248ec9a41e7f81bef021cf33170035f820dbb6aa89788a933e63038
-EBUILD actioncable-6.1.4.6.ebuild 961 BLAKE2B a57eadba2c7f0b24dd70da1fdcaac9a315bbbd9b946408e21777206f9303cb08d54fc2bfae859753f6724c4643701f0f6af4fc15e980672249168aef2eeae1b9 SHA512 da2dc67917b0a56e24ac6e2815adbec0b1adc6dfcdd7509b9b0f9b7bb9938dc2d208603adeb159748ced629762f838ceb152d4c18380b104089071602b1c0f95
+EBUILD actioncable-6.0.4.8.ebuild 928 BLAKE2B f88dbf36eb9be7a3971374e66f7996e751918bdc8d4320442a28cfc02b5cef0f85ba25706838627d97d98eae180dd4269317fa019e89d837283847bc1fd98a06 SHA512 35ea5a2908c3bfa43bbb71593c8828eddedafd32d9d888f527b7b547f475f585697ce897011082bdf86a7cf16f07f4b240a694f0b03c37490558d10d0f0dee5f
+EBUILD actioncable-6.1.5.1.ebuild 968 BLAKE2B 402b75efadf53319e8a270fa9b900912a5275674357a9b1eea99ebb7134891a545ad7d50c736841c96cfd8b15942d01dd2e6a8b2516415348aea2c03b97a2f0c SHA512 a28a8d64f3aac01e68f94b79e460ea291104af233b18fa945866182fb0a79745c8a9032c193c51e79474aadddbd9ba2fc13b3fdd5e1cc5faf23eef33dc2abd98
 EBUILD actioncable-6.1.5.ebuild 961 BLAKE2B a57eadba2c7f0b24dd70da1fdcaac9a315bbbd9b946408e21777206f9303cb08d54fc2bfae859753f6724c4643701f0f6af4fc15e980672249168aef2eeae1b9 SHA512 da2dc67917b0a56e24ac6e2815adbec0b1adc6dfcdd7509b9b0f9b7bb9938dc2d208603adeb159748ced629762f838ceb152d4c18380b104089071602b1c0f95
 EBUILD actioncable-7.0.2.2.ebuild 942 BLAKE2B 2de8f5b77f4c7cc09e5aeeec134757320769d5ce8b36344a1c044c02c3e5ed103853416fca09f813e776abafe7c5d2638fe78d241bd6a85c27427ff178d3fd42 SHA512 f835d9ce3c3b1a605963fc7737db879f1bd3b837e4eff74ca8c5ad0e54f29d5f5ace8c8ad813d1bd203b6d5dda6d692741531a3baa584213e7d1d13924d60516
 EBUILD actioncable-7.0.2.3.ebuild 949 BLAKE2B 94c2bdbe8d3f18d6f577941f9818379f8aaa70ea6f78ee1d0bcb1ed0c689199aa191bcdcc991ef5392d148c63a5f810ea477137747f1ef6c22a4ea732e7f1baf SHA512 f4cfc6d04442252279ed609dc296eda398273db08dfe2a56e6cc43d429476a7f052b78ac10b1d383b4cdcb0c91d1c8360d1becba4d62921c6a3f26eccd3147ec
+EBUILD actioncable-7.0.2.4.ebuild 949 BLAKE2B 94c2bdbe8d3f18d6f577941f9818379f8aaa70ea6f78ee1d0bcb1ed0c689199aa191bcdcc991ef5392d148c63a5f810ea477137747f1ef6c22a4ea732e7f1baf SHA512 f4cfc6d04442252279ed609dc296eda398273db08dfe2a56e6cc43d429476a7f052b78ac10b1d383b4cdcb0c91d1c8360d1becba4d62921c6a3f26eccd3147ec
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actioncable/actioncable-5.2.6.2.ebuild b/dev-ruby/actioncable/actioncable-5.2.7.1.ebuild
index dab392ff470a..dab392ff470a 100644
--- a/dev-ruby/actioncable/actioncable-5.2.6.2.ebuild
+++ b/dev-ruby/actioncable/actioncable-5.2.7.1.ebuild
diff --git a/dev-ruby/actioncable/actioncable-6.0.4.3.ebuild b/dev-ruby/actioncable/actioncable-6.0.4.3.ebuild
deleted file mode 100644
index ce35cc0e8d46..000000000000
--- a/dev-ruby/actioncable/actioncable-6.0.4.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.0.4.6.ebuild b/dev-ruby/actioncable/actioncable-6.0.4.8.ebuild
index e1c3359d8783..e1c3359d8783 100644
--- a/dev-ruby/actioncable/actioncable-6.0.4.6.ebuild
+++ b/dev-ruby/actioncable/actioncable-6.0.4.8.ebuild
diff --git a/dev-ruby/actioncable/actioncable-6.1.4.6.ebuild b/dev-ruby/actioncable/actioncable-6.1.5.1.ebuild
index 77aae4910664..b5ec3e98161d 100644
--- a/dev-ruby/actioncable/actioncable-6.1.4.6.ebuild
+++ b/dev-ruby/actioncable/actioncable-6.1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
diff --git a/dev-ruby/actioncable/actioncable-6.1.4.4.ebuild b/dev-ruby/actioncable/actioncable-7.0.2.4.ebuild
index 619cfd216a8b..3243972e894c 100644
--- a/dev-ruby/actioncable/actioncable-6.1.4.4.ebuild
+++ b/dev-ruby/actioncable/actioncable-7.0.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index 73f0afd751a9..7e645f7834c8 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,21 +1,19 @@
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
 DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
 DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
 DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
 DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 EBUILD actionmailbox-6.0.4.1.ebuild 1821 BLAKE2B 7b4273faff9964db379b84db9084bb4d7cd08fa97a097a2713a6ad9f022900f42bdca29c441975de7f6ec4096a75b185095046ce29d7fdaac44494993e15ef28 SHA512 deb2e5e38a5c347e767b0a0a4a9cb6f80197088a18124c5e61b46868427d2e8bfae2952772bbe3f85c7449712aed4347aff6921a8b16aff84bc183145e9bc70a
-EBUILD actionmailbox-6.0.4.3.ebuild 1814 BLAKE2B 30b4a2a061c02712eae98f356e6a076e90060d1145d4720e1755c6ff93603c317fb34bac4d1dc2919ccbfa3a3a0082212e3e6243266da88f69c5c6c8f454a23b SHA512 488cade2c172b61c0a3d844206645e6e0d018c114e826eff8b2f094277112ba243610220ba36ac1eaf6b7f4029c4a3aafe1f96c1cbe2ccf9c407f70a3d2ce9be
 EBUILD actionmailbox-6.0.4.4.ebuild 1814 BLAKE2B 30b4a2a061c02712eae98f356e6a076e90060d1145d4720e1755c6ff93603c317fb34bac4d1dc2919ccbfa3a3a0082212e3e6243266da88f69c5c6c8f454a23b SHA512 488cade2c172b61c0a3d844206645e6e0d018c114e826eff8b2f094277112ba243610220ba36ac1eaf6b7f4029c4a3aafe1f96c1cbe2ccf9c407f70a3d2ce9be
-EBUILD actionmailbox-6.0.4.6.ebuild 1814 BLAKE2B 3312aa6fcf29ccd86c163558c79357a533b63a3306e207ad55b79b8e1b3c31a2a30df08ad29f98927f762784f0d494a2fdda44dc07aa2d917d6299b71afaba76 SHA512 ba1dab97450d2204ac6ebd2a9e3332c3ecf2c3e31f2806fd9c979db485b8ccd9ec17def0998ae169a3b2ef08115540dcd966f23864337b1370437d86e3b3f758
 EBUILD actionmailbox-6.0.4.7.ebuild 1814 BLAKE2B 3312aa6fcf29ccd86c163558c79357a533b63a3306e207ad55b79b8e1b3c31a2a30df08ad29f98927f762784f0d494a2fdda44dc07aa2d917d6299b71afaba76 SHA512 ba1dab97450d2204ac6ebd2a9e3332c3ecf2c3e31f2806fd9c979db485b8ccd9ec17def0998ae169a3b2ef08115540dcd966f23864337b1370437d86e3b3f758
-EBUILD actionmailbox-6.1.4.4.ebuild 1869 BLAKE2B 13b0b41efbaf01f608745f1a08c4b9d70b5d271817c8bcd0472925110eeb6a105d7c7b730d2f07060267383c82ae63545d760f15954ab2bb88ebd7ebf82df4ae SHA512 a5dbda6ca73f1f9852b5f809be01a8fc47ee2ab0ba790f96f901dec25e5e75cc95a7fa902ae0853b16784c499fde1439dc78e1e59e9f2ca9f48166a5bf51aa13
-EBUILD actionmailbox-6.1.4.6.ebuild 1869 BLAKE2B 89f1b2f3a981ef94a906ecde6d2e401a8fc2218d441f1f165415251a720803c86818d71d9b1943d2a7d92f7cb3f67b994a8a6fa7d8fd4ba919282b2bf9aa9002 SHA512 399879aba0a7e6c5d0e997d39b76e1ff33f6e27f2e5baf3cd13fa2022b470ec9c3335620e44a1b9843890d56a4bf1f172fcd47504fcc5e733797f7e6910b2f61
+EBUILD actionmailbox-6.0.4.8.ebuild 1814 BLAKE2B 3312aa6fcf29ccd86c163558c79357a533b63a3306e207ad55b79b8e1b3c31a2a30df08ad29f98927f762784f0d494a2fdda44dc07aa2d917d6299b71afaba76 SHA512 ba1dab97450d2204ac6ebd2a9e3332c3ecf2c3e31f2806fd9c979db485b8ccd9ec17def0998ae169a3b2ef08115540dcd966f23864337b1370437d86e3b3f758
+EBUILD actionmailbox-6.1.5.1.ebuild 1885 BLAKE2B 08405d93c914d264baf641ee8e592aa308946770430564f3f45bbd3f4c54d279095b10eadc50aa9a95af02fcdeed24ee73ee149a318298c0da1e3b959f6255ff SHA512 1ba4ed9662b6225bb5dcbe3d5dd58979e7ce20feffb4aba7c9f06cbdda881aac58fd414412dd6dfd24143764fc6fd2dd10a8a84f147d0778b72edf04df9dfd0e
 EBUILD actionmailbox-6.1.5.ebuild 1869 BLAKE2B 89f1b2f3a981ef94a906ecde6d2e401a8fc2218d441f1f165415251a720803c86818d71d9b1943d2a7d92f7cb3f67b994a8a6fa7d8fd4ba919282b2bf9aa9002 SHA512 399879aba0a7e6c5d0e997d39b76e1ff33f6e27f2e5baf3cd13fa2022b470ec9c3335620e44a1b9843890d56a4bf1f172fcd47504fcc5e733797f7e6910b2f61
 EBUILD actionmailbox-7.0.2.2.ebuild 1974 BLAKE2B 352f1462d534072779abe8f1a78c492b65e85b92e76fdcad2c52628e64c1d484107fcf3fe430df060f6007d44513b160ab4875f0d4908fc9d4f42372918df0cf SHA512 81e778c01d98e57fc2dda8f0988dcdb4c9954161530ca78e4ec57e24e6ecedb54d65983b3dad490df9986d0a1f176b4c45eea02656df40cabb7a5c893f336ec6
 EBUILD actionmailbox-7.0.2.3.ebuild 1990 BLAKE2B 1ef989fabf448c590d7ee2ba602b50247cf6dc59611fc6cef71a50726f33fb0e3dada3b04f8c3659684b9c2c06068fa741ca929d26387a903379876ade1cf111 SHA512 3fd0e07f99fde448dfc1b0f840413a6e1156ad86cfd3728f381f3c4ea22dd05ebf7777505d6d6674b06d08fa69d7446377bddf77c474f26bf11344c3def9579f
+EBUILD actionmailbox-7.0.2.4.ebuild 1990 BLAKE2B 1ef989fabf448c590d7ee2ba602b50247cf6dc59611fc6cef71a50726f33fb0e3dada3b04f8c3659684b9c2c06068fa741ca929d26387a903379876ade1cf111 SHA512 3fd0e07f99fde448dfc1b0f840413a6e1156ad86cfd3728f381f3c4ea22dd05ebf7777505d6d6674b06d08fa69d7446377bddf77c474f26bf11344c3def9579f
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.4.3.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.4.3.ebuild
deleted file mode 100644
index c4b746bc96a1..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.4.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|byebug\|dalli\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.4.6.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.4.8.ebuild
index 845962ff9795..845962ff9795 100644
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.4.6.ebuild
+++ b/dev-ruby/actionmailbox/actionmailbox-6.0.4.8.ebuild
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.1.4.6.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.5.1.ebuild
index e387f1a6cc26..5fabeb5d6ccd 100644
--- a/dev-ruby/actionmailbox/actionmailbox-6.1.4.6.ebuild
+++ b/dev-ruby/actionmailbox/actionmailbox-6.1.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -37,6 +37,7 @@ ruby_add_rdepend "
 ruby_add_bdepend "test? (
 	dev-ruby/bundler
 	dev-ruby/mocha
+	dev-ruby/rexml
 	dev-ruby/sqlite3
 	dev-ruby/webmock
 )"
@@ -44,7 +45,7 @@ ruby_add_bdepend "test? (
 all_ruby_prepare() {
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
-	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\|rexml\)/ s:^:#:" \
+	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\)/ s:^:#:" \
 		-e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
 		-i ../Gemfile || die
 	rm ../Gemfile.lock || die
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.1.4.4.ebuild b/dev-ruby/actionmailbox/actionmailbox-7.0.2.4.ebuild
index 71c67a36d450..f3818bd389e1 100644
--- a/dev-ruby/actionmailbox/actionmailbox-6.1.4.4.ebuild
+++ b/dev-ruby/actionmailbox/actionmailbox-7.0.2.4.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=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -32,11 +32,16 @@ ruby_add_rdepend "
 	~dev-ruby/activestorage-${PV}
 	~dev-ruby/activesupport-${PV}
 	>=dev-ruby/mail-2.7.1:*
+	dev-ruby/net-imap
+	dev-ruby/net-pop
+	dev-ruby/net-smtp
 "
 
 ruby_add_bdepend "test? (
 	dev-ruby/bundler
 	dev-ruby/mocha
+	dev-ruby/propshaft
+	dev-ruby/rexml
 	dev-ruby/sqlite3
 	dev-ruby/webmock
 )"
@@ -44,7 +49,8 @@ ruby_add_bdepend "test? (
 all_ruby_prepare() {
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
-	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\|rexml\)/ s:^:#:" \
+	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
 		-e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
 		-i ../Gemfile || die
 	rm ../Gemfile.lock || die
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index b2e2745d41e7..2bee3aa974b7 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,27 +1,25 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
 DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
 DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
 DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
 DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-EBUILD actionmailer-5.2.6.2.ebuild 1405 BLAKE2B 4aab436a9385901985ac01766536248b92e099f89ce67bf7053d34fce5111fbc0408b0fc655bdab1ca6712cd079b98063098c6e55ee4cdb39189922a7a7d3f28 SHA512 ebd73b43abcb87e5920e672604b13d01e041762842e9d7b909e83a1d19c8fa8def5ff8a0966985ef67191de03094a3135eb86da1dbb0215c3c746ab82f4dc8dd
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 EBUILD actionmailer-5.2.6.ebuild 1405 BLAKE2B 1d24e387325e99a3c395fb599b5e92009ddfad7f577498b1adfb51cb782942c9f893d2c1b8e1e96f1cc1ab56a50de30aa92a9b0f1280626e000ee0f31b70d23a SHA512 7acb061f5bb4946282a576d3b87a441b8fcc3a11f8dfda7201f4b67e0573c4147e6faa79a3f2f1eea6f8baaeee763d55f0e762e90855cfc51b97429bf2c86e37
+EBUILD actionmailer-5.2.7.1.ebuild 1405 BLAKE2B 4aab436a9385901985ac01766536248b92e099f89ce67bf7053d34fce5111fbc0408b0fc655bdab1ca6712cd079b98063098c6e55ee4cdb39189922a7a7d3f28 SHA512 ebd73b43abcb87e5920e672604b13d01e041762842e9d7b909e83a1d19c8fa8def5ff8a0966985ef67191de03094a3135eb86da1dbb0215c3c746ab82f4dc8dd
 EBUILD actionmailer-5.2.7.ebuild 1405 BLAKE2B 4aab436a9385901985ac01766536248b92e099f89ce67bf7053d34fce5111fbc0408b0fc655bdab1ca6712cd079b98063098c6e55ee4cdb39189922a7a7d3f28 SHA512 ebd73b43abcb87e5920e672604b13d01e041762842e9d7b909e83a1d19c8fa8def5ff8a0966985ef67191de03094a3135eb86da1dbb0215c3c746ab82f4dc8dd
 EBUILD actionmailer-6.0.4.1.ebuild 1369 BLAKE2B eab6498c778d7bdd71a4e07aff5ba62284ba7814da18d1e9cea25d9c6c4f98ab36f1b5c27b1949494c04cb652e3b3e3620da0acf4291af2b89cd18698b8df526 SHA512 235f7c5944630291f7bd95125013224b03c8e69bc951ce3a5064b000375efbbbac12fcc36950b4b7dad7f7a8a97cf11a51aceaad9d1c76580cb335f8eb00bc9d
-EBUILD actionmailer-6.0.4.3.ebuild 1362 BLAKE2B faa04d645b7af0b4c6ba5beb721d0c4125ab791daf4e74ebb03faac3f1ee7b93f0bdfa6118ebc1bee3265b76481428f1d175da27afc4ec409972bb92d3ba4f98 SHA512 474a6d7f7006a1d1c39495cd3d44ea636a10f23b80db8a779be7e9b0ae800cc2a7a403f74cc95b79dd6f99f4ec1b2d71f062ec65e2353029bb40a99a1e64ade1
 EBUILD actionmailer-6.0.4.4.ebuild 1362 BLAKE2B faa04d645b7af0b4c6ba5beb721d0c4125ab791daf4e74ebb03faac3f1ee7b93f0bdfa6118ebc1bee3265b76481428f1d175da27afc4ec409972bb92d3ba4f98 SHA512 474a6d7f7006a1d1c39495cd3d44ea636a10f23b80db8a779be7e9b0ae800cc2a7a403f74cc95b79dd6f99f4ec1b2d71f062ec65e2353029bb40a99a1e64ade1
-EBUILD actionmailer-6.0.4.6.ebuild 1362 BLAKE2B 2d4f9011b0348c5411a87da2980dbcdc545b723bcf26a86075916638811b5eb343a7bdbbe6ad950497ac18db2873a69179b6b1bf696d2e4a17546cd017de56fa SHA512 6eb13171a019a2350015629c444b1d65eb35fd5540a178ac64b2e24823f14aa1e60913abf59e996be1e1de8869fe73ae0ebdffecda79b12b8d71d054cb664757
 EBUILD actionmailer-6.0.4.7.ebuild 1362 BLAKE2B 2d4f9011b0348c5411a87da2980dbcdc545b723bcf26a86075916638811b5eb343a7bdbbe6ad950497ac18db2873a69179b6b1bf696d2e4a17546cd017de56fa SHA512 6eb13171a019a2350015629c444b1d65eb35fd5540a178ac64b2e24823f14aa1e60913abf59e996be1e1de8869fe73ae0ebdffecda79b12b8d71d054cb664757
-EBUILD actionmailer-6.1.4.4.ebuild 1261 BLAKE2B e0840777a547bcadd939cdbbcf4c7e5ec1c718ee034af830b4c7fe3e38887b1a9cf3874b51424d99c9d0113bcd795903cf083e344ae66cd2b11254cda421480f SHA512 cd14c917a42cff78b41e744e3267347eb4253aff5895691d45f519811911d12a6c48c747be498ba5f8ed0924694eef0222b4c8c5b11b67a365c2f13d05e0a55f
-EBUILD actionmailer-6.1.4.6.ebuild 1261 BLAKE2B 3851fdd29ba3e54d215899df953e52b448144b9d9aecd57c05a6f110ebca853c35f30e5ff6c11ee5b2e6ed31e65995b2890c955dccb1226d0e28c11efc505db7 SHA512 d0785152cbd1c748fd97a6ea26b5a4ccc7d28ccb5cc45213bf6c9a4559d8ba3f936b2bcb4a79b84caf3dbd122c355afb9622e795b913303f064c2b2c66006a44
+EBUILD actionmailer-6.0.4.8.ebuild 1362 BLAKE2B 2d4f9011b0348c5411a87da2980dbcdc545b723bcf26a86075916638811b5eb343a7bdbbe6ad950497ac18db2873a69179b6b1bf696d2e4a17546cd017de56fa SHA512 6eb13171a019a2350015629c444b1d65eb35fd5540a178ac64b2e24823f14aa1e60913abf59e996be1e1de8869fe73ae0ebdffecda79b12b8d71d054cb664757
+EBUILD actionmailer-6.1.5.1.ebuild 1268 BLAKE2B ffe0b2a2319e50bf9b4e37bbc98e9a97ef0ea2177be520dc0ef4cc5df15946271ceceecef2a4f915aa22366de0f4cc556547c862ca77bfb35ec20db767b31ee0 SHA512 b23ef1349e8a199afe210a231365cd8601a3930d4360db399cea101dbf7fddfe59af0011a74d5da20804dec36aece892b8f831e2fbc7891a27e02a5cf7e1abb9
 EBUILD actionmailer-6.1.5.ebuild 1261 BLAKE2B 3851fdd29ba3e54d215899df953e52b448144b9d9aecd57c05a6f110ebca853c35f30e5ff6c11ee5b2e6ed31e65995b2890c955dccb1226d0e28c11efc505db7 SHA512 d0785152cbd1c748fd97a6ea26b5a4ccc7d28ccb5cc45213bf6c9a4559d8ba3f936b2bcb4a79b84caf3dbd122c355afb9622e795b913303f064c2b2c66006a44
 EBUILD actionmailer-7.0.2.2.ebuild 1242 BLAKE2B 273bfbd5fddfa7a0062f478f647a9ee6da724f3f63ceabbafb8b0915ae19e43d4be76c2e6902bde8e25fba0d2d0f18ee19f373203c8ca55034e2c18d81f69d20 SHA512 d155f175cb3916fd51c57fd2e758eb42c4a3fe1f7639f3e64a43aa94c3363ed27439a574fb7338f9b4b0a2c580059b056fb409e304e8b794d9a6317df9d936f0
 EBUILD actionmailer-7.0.2.3.ebuild 1249 BLAKE2B 15c34906810befc6d8a27518a53a68239604162862b953c88717fc00cc33c415434fa9e39aa80388bfe6637ddf2c596bce5e6eb14d095e83ce729d065793bb9f SHA512 1a96ba560954fee98d205c4f43f3f23ceffe005591ab1582858e2a0a545c074c32f1eb4a7d4895255bf32a9bb6da6991ccb825ca99a590cb0347fafe561f38d2
+EBUILD actionmailer-7.0.2.4.ebuild 1249 BLAKE2B 15c34906810befc6d8a27518a53a68239604162862b953c88717fc00cc33c415434fa9e39aa80388bfe6637ddf2c596bce5e6eb14d095e83ce729d065793bb9f SHA512 1a96ba560954fee98d205c4f43f3f23ceffe005591ab1582858e2a0a545c074c32f1eb4a7d4895255bf32a9bb6da6991ccb825ca99a590cb0347fafe561f38d2
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actionmailer/actionmailer-5.2.6.2.ebuild b/dev-ruby/actionmailer/actionmailer-5.2.7.1.ebuild
index 66a548ab61fc..66a548ab61fc 100644
--- a/dev-ruby/actionmailer/actionmailer-5.2.6.2.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-5.2.7.1.ebuild
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.4.3.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.4.3.ebuild
deleted file mode 100644
index 5c5d6a444fcc..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.0.4.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '2igem "railties", "~> 6.0.0" ; gem "activejob", "~> 6.0.0"' test/abstract_unit.rb || die
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.4.6.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.4.8.ebuild
index 9f52f098010e..9f52f098010e 100644
--- a/dev-ruby/actionmailer/actionmailer-6.0.4.6.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-6.0.4.8.ebuild
diff --git a/dev-ruby/actionmailer/actionmailer-6.1.4.6.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.5.1.ebuild
index 2b16b080cc19..95aa6013c4aa 100644
--- a/dev-ruby/actionmailer/actionmailer-6.1.4.6.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-6.1.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
diff --git a/dev-ruby/actionmailer/actionmailer-6.1.4.4.ebuild b/dev-ruby/actionmailer/actionmailer-7.0.2.4.ebuild
index 847ea3753e4b..75c786bf6d3e 100644
--- a/dev-ruby/actionmailer/actionmailer-6.1.4.4.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-7.0.2.4.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=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionpack-action_caching/Manifest b/dev-ruby/actionpack-action_caching/Manifest
index 47c284289e52..fb5a57e7add3 100644
--- a/dev-ruby/actionpack-action_caching/Manifest
+++ b/dev-ruby/actionpack-action_caching/Manifest
@@ -1,5 +1,3 @@
-DIST actionpack-action_caching-1.2.1.gem 16384 BLAKE2B 5bda3597a10bdba21fcaf6f2a854832b79c7bec4791f5ca736e3ebcc266ee1d604b932b653df592892a6c59969bb7e405f55e5ac59400762da23a1392e1e7e5a SHA512 340a0159596fbc36706cef2dd11a542353cbd2b3f5941e005e5e8e2a2bcadbdfbaa000e79db1aa6b438c9e9f2d21c125071c40e2e46b2d30c876490553b386a4
 DIST actionpack-action_caching-1.2.2.gem 16384 BLAKE2B dc41343b2645b9ca6ab2148f175c73dba8c54eef227720c8be06ff17e724338fd2edce6dac9939f379676cd759acd87d07b580cf8b53570a321adce1c009b02d SHA512 aff795fe47f6bf97875afdcc6d55ecf5769850985f3f989a95beb46e09989d70e6b05b3182b78029f98ab1545715a7877c1021dda5b4bdbf575a3a540623bbaa
-EBUILD actionpack-action_caching-1.2.1.ebuild 771 BLAKE2B 2017092c23f9c3a5f25b549743c9a1a4b752241e7160eebf7389174254e213ad1797336ef388cffc2dbc590f17b9c74d7c210cb0bea76879474caf0d07259cce SHA512 77166292cf986698463ae445e0643283cd15c4c40a0798555540f07bc19bb07951e99cc7ad08c00217fdd67da5dad6369ce063e8f86d0140867974f848080bce
-EBUILD actionpack-action_caching-1.2.2.ebuild 771 BLAKE2B 044fdecf2fe7c0f30edbc03a4564fd4272162a498ab83471a58f0418530c7faca571c090434dce8511b89eeec0d94690597409fc2cf047992d97beacb706bac8 SHA512 4733030f9c1d808fe570b94aa2c2d8f9da646fd5974d1e46e9bea92fc7339ffc8bfb0f57d5c1701f66169cdf845396e7266e86872be0cf717c5ebb071eb53a8a
+EBUILD actionpack-action_caching-1.2.2.ebuild 871 BLAKE2B 10018b7b99d89fb4a279d0cd3ebd3eb25fbd8aa6c79e15c0ae94adf266a190bb7cb9f01356e72da9561bc73729aa626eac91ffccb9062ddc229cfa2155adc72d SHA512 dae72ba301b5a64cae47b0aed264c2d07000daabc63a9b86e2e130691e580393e1a8c3a4d1c74e68374ce3ca9737f80789eea68cefb623443001f310fe32d58a
 MISC metadata.xml 348 BLAKE2B caec430a233f193f8f82733848c4ad64a47e3450426df9730dd24012d5c5604a31ad808c3e3c6a85e20fd3e025885cb7d9d195f7ca98a113f6fe9b460033b120 SHA512 f7a1d5974be1e5e18fc15f4853042381ea59364038b76ef7cefece45493e1ee5f251bcaca8da81cf718fdfd1f10ec9f71155b5081c86a4b20a418d3a13ea9ec9
diff --git a/dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.1.ebuild b/dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.1.ebuild
deleted file mode 100644
index 3b747d08b775..000000000000
--- a/dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Action caching for Action Pack (removed from core in Rails 4.0)"
-HOMEPAGE="https://github.com/rails/actionpack-action_caching"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/actionpack-4.0.0:*"
-
-ruby_add_bdepend "test? ( >=dev-ruby/activerecord-4.0.0
-	dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" Rakefile test/abstract_unit.rb || die
-	sed -i -e "/git/d" ${PN}.gemspec || die
-	sed -i -e "2irequire 'mocha/setup'" test/caching_test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/caching_test.rb || die
-}
diff --git a/dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.2.ebuild b/dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.2.ebuild
index b3549be733db..a0b93e8ad1d9 100644
--- a/dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.2.ebuild
+++ b/dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.2.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="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -19,12 +19,13 @@ IUSE=""
 ruby_add_rdepend ">=dev-ruby/actionpack-4.0.0:*"
 
 ruby_add_bdepend "test? ( >=dev-ruby/activerecord-4.0.0
+	|| ( dev-ruby/railties:6.1 dev-ruby/railties:6.0 dev-ruby/railties:5.2 )
 	dev-ruby/mocha )"
 
 all_ruby_prepare() {
 	sed -i -e "/bundler/d" Rakefile test/abstract_unit.rb || die
 	sed -i -e "/git/d" ${PN}.gemspec || die
-	sed -i -e "2irequire 'mocha/setup'" test/caching_test.rb || die
+	sed -i -e '1igem "activerecord", "<7"; gem "railties", "<7"' test/abstract_unit.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/actionpack-xml_parser/Manifest b/dev-ruby/actionpack-xml_parser/Manifest
index 3c865f9a3776..4f2df6a46702 100644
--- a/dev-ruby/actionpack-xml_parser/Manifest
+++ b/dev-ruby/actionpack-xml_parser/Manifest
@@ -1,3 +1,4 @@
 DIST actionpack-xml_parser-2.0.1.tar.gz 6494 BLAKE2B 271e1352085e7c75754253222c9f861f7ece9875102a0bb4c47e20311367fcc040c5680ad0406112f8e312c4a8ae1a3f9b6d33f3736db3614ca1c3584942f800 SHA512 a240e59178722025a0c967cfc2f63ca1ed8a2aff55ad913652f06018b712a7009eecd915f494dc4087de12ad5dbe5a0f3c7290fc530a2e475b39318520809112
 EBUILD actionpack-xml_parser-2.0.1-r1.ebuild 945 BLAKE2B 1cdfea88ddb72dabdf8fc04bb64064a65877bf11326659402d6e5b6de6beda6dfd3abb8e6c24d6a6d40a3de2c5bf412954a11756247cd07eff14967120250950 SHA512 84f98220c32b41ec0ee35547728806d6dc403d09bc0f7f2b5996567f57e7d4fc0662d0c5dc76eddbe729162304405eac1f330dbcc8d5abea8ecacdadbaeefff0
+EBUILD actionpack-xml_parser-2.0.1-r2.ebuild 1151 BLAKE2B b9480cf54eed3b879a26a3d651ee6e1568485108e690adc014bf47c8b5f528194a0a766ba37db588a031029db932074ff9ccfed6f1cf92be1325f54189e0daf6 SHA512 1c955b416d00f9b331ae3e880afc5665ae1fc145fde9169ba92010c61644efaa9b49b6bdc9b29f4a8a193f7113c5ea62763fa52ee8ce98cc871d782ebf624cdd
 MISC metadata.xml 344 BLAKE2B 280da381c421db0e35576611d08935ada8f66db9d36db801a6c2a623d587b0a39f598decbfabf14867f19b96f5fcf414e01751617df4d1798216bcfb38656faf SHA512 be499fc209854fa43050f1d9d11126755974632c248cf5da733aaec553e7aa9ba7f544fad5e7c39b77f02513cbb5e390f7b1ec7153c3c677f0a18288525747da
diff --git a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1-r2.ebuild b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1-r2.ebuild
new file mode 100644
index 000000000000..bf9852deb7b4
--- /dev/null
+++ b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1-r2.ebuild
@@ -0,0 +1,38 @@
+# 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_GEMSPEC="actionpack-xml_parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="XML parameters parser for Action Pack (removed from core in Rails 4.0)"
+HOMEPAGE="https://github.com/rails/actionpack-xml_parser"
+SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="2"
+IUSE=""
+
+ruby_add_rdepend "
+	|| ( dev-ruby/actionpack:6.1 dev-ruby/actionpack:6.0 dev-ruby/actionpack:5.2 )
+	|| ( dev-ruby/railties:6.1 dev-ruby/railties:6.0 dev-ruby/railties:5.2 )
+"
+
+ruby_add_bdepend "test? ( =dev-ruby/railties-6* )"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" Rakefile test/helper.rb || die
+	sed -i -e '1igem "actionpack", "~>6.0"' test/helper.rb || die
+
+	# Skip test that is not compatible with Rails 5.2
+	sed -i -e '/occurring a parse error if parsing unsuccessful/askip "rails 5.2"' test/xml_params_parsing_test.rb || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:.:test -e "Dir['test/*_test.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index e70256666730..23e581289b90 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,27 +1,25 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
 DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
 DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
 DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
 DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-EBUILD actionpack-5.2.6.2.ebuild 2211 BLAKE2B 02b535272a4351dd1058f293d95ef317b42b6527e2d412573e27d484d53dfdec15c3e19e76f9609aa09723fa149d35bab0e6acb1d265e570936c96ac8eed0bf1 SHA512 9f11b62c75292479c49e36b9dd9e1c2613060d246f7025e7455c679f346a7cd0b19bb35001dd17f6ff9eb3b48c0c799068bcc5de62d1aefad725b757344d4799
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 EBUILD actionpack-5.2.6.ebuild 2210 BLAKE2B b2a432e92d419452ead9e92b3e78d83ee82d2d8a21f8f7c1bef69820f0bbf657aaa634fa18e00cf73edab6332b85906336a7f3a3a7d15dad469a4f2f32cfacfc SHA512 cd4e8d49cd04507d1ab995181df66d6793c422efed150887fbdab3dc7abc328ad76a958b149b4f202dc111635141fe49188470b5233b36b73721935cbe5be3f5
+EBUILD actionpack-5.2.7.1.ebuild 2245 BLAKE2B 198c85192ead2a81fb04b085460fd59a7e4a5b184011675520dcaf58ade528a58408cc443ea3fdb241982b2da3f785b4443a27973896542c06a27fe5cd58c043 SHA512 82487e49f5218522d515ef9f9bb94500a0301bdf6b4949d2079ce2b83c29c38eb3b1cc750ab6a28510fa2f987f325ad65d238a3c6f6a359741b8bf50b0a568da
 EBUILD actionpack-5.2.7.ebuild 2245 BLAKE2B 198c85192ead2a81fb04b085460fd59a7e4a5b184011675520dcaf58ade528a58408cc443ea3fdb241982b2da3f785b4443a27973896542c06a27fe5cd58c043 SHA512 82487e49f5218522d515ef9f9bb94500a0301bdf6b4949d2079ce2b83c29c38eb3b1cc750ab6a28510fa2f987f325ad65d238a3c6f6a359741b8bf50b0a568da
 EBUILD actionpack-6.0.4.1.ebuild 2028 BLAKE2B 145b19617b893dc8db70ac306dfb8f5c54f15d590071713ed7482790e75b57e08a33cb6fa74c606d906deb350aa9e0293073013cebdfb59c3336f8fe76ccd679 SHA512 2970a86b6dff81dd3f7fe0f22ebed43093c82fb6064adbe3a33c272763124dfed0a82bc75ada7623f2babca8e89c7f226babdba46976118d0f89b40a36889a19
-EBUILD actionpack-6.0.4.3.ebuild 2022 BLAKE2B aae188b4b9379f62d8fb2792c21893d4da1105c67c8af6d3fc9eab1da0c13cad39a6859fa19fcdef61e90a8b7765e6321eb9831b4565bd28cf1977a6dfffe5ba SHA512 a9fd7d4b90c65accb2ec413d92f6c511c7b61d656c8dfd9fc443dc99fac9f23076e61d22cf17072834b8ec9d78e076eeab74e3c3a12608ac3fcbe3a592c73ec9
 EBUILD actionpack-6.0.4.4.ebuild 2021 BLAKE2B d1520835e397eaff88421ba6f24e714f385064901f1aed81b1319afdc8de847940941e1f45c7ccbbd58c0e5a047afe1235e6535ee02f2d4483172d594fbf5e89 SHA512 45a20453e9d18db11b478de983fb50be8bb8b895b40068549ff6f3f43d9a0e3adf1dcd89d6bf8d0627eeb4280be44dc044a97d42167202f856ba1e9de9efd24a
-EBUILD actionpack-6.0.4.6.ebuild 2022 BLAKE2B d51b86f4c5d1fc9246c42213d45f2c09136b24ab294c416ab004daa116b0eb0302ac76e4d2fb90d369d0a39a52fec82b00ed1046ca3a945640292ce2f0666a80 SHA512 d9c212ce6b0cbd229062460cb38538bcb1ce66d0955aa9cfd31b3777ac2d1391c54ceae64d046ac1f8dd1ee7767bcea31853f8a3b69f4d0e47b4722dad0fa0ac
 EBUILD actionpack-6.0.4.7.ebuild 2045 BLAKE2B ebe4a713c1202259b066a09d891c29eccb2202be6d83546a74a90bc8d1d520e9dc8f8a7bb91afbbdad4e1368374ebce6ad2e8871eda5ad9671d2bfe0853c21e9 SHA512 1f987ad71f5c4f5615e0ed70d100002a7eb200ec0ae5c497490c7aaecd1934236c09131f17d4558c79120a3174fe3e34fb07497446df243f7c69bfcd89035cb9
-EBUILD actionpack-6.1.4.4.ebuild 1997 BLAKE2B 1447c3089f177d990dffe3a328a2f56a2c6e717b731284dc50ae6f133b5f157537e69cf7990a87da6146b157cf1f01dbb02292162d5106b655accc6b63089241 SHA512 95d17f7ded0f4e60b8e3465a8c0be794ffa1e5b4f971d9d7c9d595ad6ff8bd7c563fb4d34bfa0437f72573f2fedbf7142ed211ac20bf6be92c19dc8915f9eef2
-EBUILD actionpack-6.1.4.6.ebuild 2101 BLAKE2B f8184aaedf9b9ec58a18e7044e46b481c1064eeffc0e8d2bdf86efa85cba10352334bec2f324383c3e4d0ba578ba658371458fccae0defe048194f3ee5286c4d SHA512 76da4d1d40995fdf615757058d7b3c7e46f05f30d9ada03a3dc4a76c9f056a6b3dfafc43c298a5eaa162a8c0445038cd479201c75314728bbb77fd71c582b6aa
+EBUILD actionpack-6.0.4.8.ebuild 2045 BLAKE2B ebe4a713c1202259b066a09d891c29eccb2202be6d83546a74a90bc8d1d520e9dc8f8a7bb91afbbdad4e1368374ebce6ad2e8871eda5ad9671d2bfe0853c21e9 SHA512 1f987ad71f5c4f5615e0ed70d100002a7eb200ec0ae5c497490c7aaecd1934236c09131f17d4558c79120a3174fe3e34fb07497446df243f7c69bfcd89035cb9
+EBUILD actionpack-6.1.5.1.ebuild 2108 BLAKE2B 2914eaa7a835dc96082a490fdd276f25b42f039af007f84359c544ce1774a651322428dcf32bbc0fdefc8f02200c56d9504d08a65566f829427afd1837cf3942 SHA512 af5f04b94dcfaa2285ea151f4ff59835b3c85cf5a546c8ee091d34533181d5e5f8002ce9d09bfa699176a6337b3091dcb3a2b3e0fd542ea3f50bebcb2575ecef
 EBUILD actionpack-6.1.5.ebuild 2101 BLAKE2B f8184aaedf9b9ec58a18e7044e46b481c1064eeffc0e8d2bdf86efa85cba10352334bec2f324383c3e4d0ba578ba658371458fccae0defe048194f3ee5286c4d SHA512 76da4d1d40995fdf615757058d7b3c7e46f05f30d9ada03a3dc4a76c9f056a6b3dfafc43c298a5eaa162a8c0445038cd479201c75314728bbb77fd71c582b6aa
 EBUILD actionpack-7.0.2.2.ebuild 2010 BLAKE2B 29043e9235890692bec84283b2cce34832c0ce5b9109e587a958feb9a36a12d70f2f77fe800a153cc5d60795b2b25c1fb5e86ebddb68d8887eb3a7e02d10198e SHA512 4604d9f21e86a7770ecbc6c2e1961ce72aec1767e3023979f62ad58d9eb712861c2977d23a8665273e19e360b79ef5d9ab8c5c45de6d5ed5dda9299d78ace1f2
 EBUILD actionpack-7.0.2.3.ebuild 2017 BLAKE2B 1d3c74798f4215eadf845865bcb35d08cbfe03bb4011dfa7c751fd0ed995eaeb76d06066b24da8ffcbfd4a92df6387ea8bdbfd34de0e5e517fc550abc8ae0be1 SHA512 c0a2c3adc78f19940da860371df3221f7f7b79277ee5312005b37d9db467c0afdec53d865a196ec382d6325117904b541e9efeeb663c13199b2f2cad13c8141c
+EBUILD actionpack-7.0.2.4.ebuild 2017 BLAKE2B 1d3c74798f4215eadf845865bcb35d08cbfe03bb4011dfa7c751fd0ed995eaeb76d06066b24da8ffcbfd4a92df6387ea8bdbfd34de0e5e517fc550abc8ae0be1 SHA512 c0a2c3adc78f19940da860371df3221f7f7b79277ee5312005b37d9db467c0afdec53d865a196ec382d6325117904b541e9efeeb663c13199b2f2cad13c8141c
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actionpack/actionpack-5.2.6.2.ebuild b/dev-ruby/actionpack/actionpack-5.2.7.1.ebuild
index f33cf17b7909..6328b72c5add 100644
--- a/dev-ruby/actionpack/actionpack-5.2.6.2.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.2.7.1.ebuild
@@ -56,6 +56,7 @@ all_ruby_prepare() {
 	sed -e '1i gem "activemodel", "~> 5.2.0"' \
 		-e '1i gem "actionview", "~> 5.2.0"' \
 		-e '1i gem "railties", "~> 5.2.0"' \
+		-e '1i gem "psych", "~> 3.0"' \
 		-i test/abstract_unit.rb || die
 
 	# Use different timezone notation, this changed at some point due to an external dependency changing.
diff --git a/dev-ruby/actionpack/actionpack-6.0.4.3.ebuild b/dev-ruby/actionpack/actionpack-6.0.4.3.ebuild
deleted file mode 100644
index ac4da8e160c5..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.4.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.2
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-3.35.0
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
-	# Avoid tests that depend on an old dependency
-	rm -f test/dispatch/system_testing/driver_test.rb
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.0.4.6.ebuild b/dev-ruby/actionpack/actionpack-6.0.4.8.ebuild
index 53d984e57fff..eec7005b2c02 100644
--- a/dev-ruby/actionpack/actionpack-6.0.4.6.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.0.4.8.ebuild
@@ -60,5 +60,5 @@ all_ruby_prepare() {
 	# Avoid tests that depend on an old dependency
 	rm -f test/dispatch/system_testing/driver_test.rb
 
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"' test/abstract_unit.rb || die
+	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
 }
diff --git a/dev-ruby/actionpack/actionpack-6.1.4.6.ebuild b/dev-ruby/actionpack/actionpack-6.1.5.1.ebuild
index f1c324e78586..8a43d94f6c01 100644
--- a/dev-ruby/actionpack/actionpack-6.1.4.6.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/actionpack/actionpack-6.1.4.4.ebuild b/dev-ruby/actionpack/actionpack-7.0.2.4.ebuild
index e5771567378e..f920a8e063fe 100644
--- a/dev-ruby/actionpack/actionpack-6.1.4.4.ebuild
+++ b/dev-ruby/actionpack/actionpack-7.0.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -43,6 +43,7 @@ ruby_add_bdepend "
 		~dev-ruby/activemodel-${PV}
 		~dev-ruby/railties-${PV}
 		>=dev-ruby/rack-cache-1.2:1.2
+		dev-ruby/selenium-webdriver:4
 		www-servers/puma
 	)"
 
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index bce45110ba13..2c6142e57ea7 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,21 +1,19 @@
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
 DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
 DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
 DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
 DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 EBUILD actiontext-6.0.4.1.ebuild 1736 BLAKE2B 05482635d764a53af6b6514d68722c11030a45c28c52621f5800517d41a3dddbf7282b2e5adca22e2b0538f95766c33d01e2eb53dae95299bce122bcb88f75be SHA512 1f951606009ccd8dc70b3120f3d937b6d83ed8b3f06d18748a0acf14e9d801ad0f8dd94207d002d516050d67a2bed1698cf7af223e2e90f6d6da6567e535e778
-EBUILD actiontext-6.0.4.3.ebuild 1729 BLAKE2B 94ccc8c3b0db6206b7b0943a549957c1c7e27ffd95b15e0e08e367e613552fc4c09d4eb9532df957d8c29832a024a31f5161ea8c7b30ce01cc6dcaf150a977c3 SHA512 dc312d5d78902e9b083f5cdb0b6f6d33b9c38f987351464b04dc50a8606e5d0b884a716b22a685fbadf4c0cfcd95257843a67d921f76e8173f532e363bff3bb3
 EBUILD actiontext-6.0.4.4.ebuild 1729 BLAKE2B 94ccc8c3b0db6206b7b0943a549957c1c7e27ffd95b15e0e08e367e613552fc4c09d4eb9532df957d8c29832a024a31f5161ea8c7b30ce01cc6dcaf150a977c3 SHA512 dc312d5d78902e9b083f5cdb0b6f6d33b9c38f987351464b04dc50a8606e5d0b884a716b22a685fbadf4c0cfcd95257843a67d921f76e8173f532e363bff3bb3
-EBUILD actiontext-6.0.4.6.ebuild 1729 BLAKE2B 8c659919012f1ebbfc8f0002947a167fcecc940f90736b621ec29c92b7816a5c7272cb5fbd50cd22433f3abd3cb150614c29cf73742a34ba550d129277dacec2 SHA512 abaa35a0f39eb5cc68c96b64f203048d5a7fdcb0a98fa358b2b1ae4aaacbd95ee836ba22aa9265b5a4e67ef9a9d26facb94619feb253f3c2749b767595e57165
 EBUILD actiontext-6.0.4.7.ebuild 1729 BLAKE2B 8c659919012f1ebbfc8f0002947a167fcecc940f90736b621ec29c92b7816a5c7272cb5fbd50cd22433f3abd3cb150614c29cf73742a34ba550d129277dacec2 SHA512 abaa35a0f39eb5cc68c96b64f203048d5a7fdcb0a98fa358b2b1ae4aaacbd95ee836ba22aa9265b5a4e67ef9a9d26facb94619feb253f3c2749b767595e57165
-EBUILD actiontext-6.1.4.4.ebuild 1785 BLAKE2B 8af3e9a96c57c9b093116e25fe652089734cbffd814ac519e212e3d430a264f7b09c188266256a02e436776ecf1d3e8507d8af6fe3c02201150016aa97eea2e9 SHA512 82660c81a17ad049818d6dd65feebb662c391b2a87ed63929e187344e55990dbc0c251518c9e54d06f7987bf64d109dac3d9e22de0d5b81e0631aa720a4b922d
-EBUILD actiontext-6.1.4.6.ebuild 1785 BLAKE2B ec9b7ca5f66f03628c980abe85063f46f331d36344e7cf266d2a089d6c8ac7763b6d73671623ba5b6327cd85442e04cf95adefeaf6ef89d8d51c8013bc7a997f SHA512 18dbbcb90ca9f32422c3016c01d5b1153e758f7628cc5653cdc7bbc753a94f55355913b5188068a212819dd5c555468ab327ee8d380397a0aa4cb04108b53c5c
+EBUILD actiontext-6.0.4.8.ebuild 1729 BLAKE2B 8c659919012f1ebbfc8f0002947a167fcecc940f90736b621ec29c92b7816a5c7272cb5fbd50cd22433f3abd3cb150614c29cf73742a34ba550d129277dacec2 SHA512 abaa35a0f39eb5cc68c96b64f203048d5a7fdcb0a98fa358b2b1ae4aaacbd95ee836ba22aa9265b5a4e67ef9a9d26facb94619feb253f3c2749b767595e57165
+EBUILD actiontext-6.1.5.1.ebuild 1792 BLAKE2B 26e4517697dae8e152cb45bcecd02c9993f478e162b01fb4395491f373434483dcb79cf69321bde6049f9d620d57582e15a2ea3ce9883186b73eedd2b5672910 SHA512 dbcf4d15c3006bd0cd967457b5fbfc665dad7b23e7007478a866dba239630a96604fc2734791fa02a58abd27b91f9de493b0bd1be89f1cafa605db414b7b2ab7
 EBUILD actiontext-6.1.5.ebuild 1785 BLAKE2B ec9b7ca5f66f03628c980abe85063f46f331d36344e7cf266d2a089d6c8ac7763b6d73671623ba5b6327cd85442e04cf95adefeaf6ef89d8d51c8013bc7a997f SHA512 18dbbcb90ca9f32422c3016c01d5b1153e758f7628cc5653cdc7bbc753a94f55355913b5188068a212819dd5c555468ab327ee8d380397a0aa4cb04108b53c5c
 EBUILD actiontext-7.0.2.2.ebuild 1861 BLAKE2B 7b292e99304101925df1c05747a374752ffd51496be3cc647290dad2e6c81d305949b07ed94a78ea87239138fdde86074228b1be3b3a36a01616b48b1b6bbe3b SHA512 63f432cc1d87d93718da277a080c3be763f4b5977e21e17efbe81e6fd2466d8372590055077e6645266f654ec98a952267e6678a7ea6396d93d61c4fed3ac618
 EBUILD actiontext-7.0.2.3.ebuild 1868 BLAKE2B d5ba0971a8aa7737c63c67d12a86893c2de7d48c45d63668caf556530f004cfc6cf97331555e2543b06a3d90f473d73e07990d21698c221397622c05d05d9b13 SHA512 85e3dd11f112d0917dbe94eaef2fa73bc846f4ef291ef12cf809eead5aeedd10148c08c054f74a3e2a14e47eac2dfc1e4e7b81ba4118035d893eddc05a0285a9
+EBUILD actiontext-7.0.2.4.ebuild 1868 BLAKE2B d5ba0971a8aa7737c63c67d12a86893c2de7d48c45d63668caf556530f004cfc6cf97331555e2543b06a3d90f473d73e07990d21698c221397622c05d05d9b13 SHA512 85e3dd11f112d0917dbe94eaef2fa73bc846f4ef291ef12cf809eead5aeedd10148c08c054f74a3e2a14e47eac2dfc1e4e7b81ba4118035d893eddc05a0285a9
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actiontext/actiontext-6.0.4.3.ebuild b/dev-ruby/actiontext/actiontext-6.0.4.3.ebuild
deleted file mode 100644
index 6578fa8e6b1a..000000000000
--- a/dev-ruby/actiontext/actiontext-6.0.4.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|byebug\|dalli\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.0.4.6.ebuild b/dev-ruby/actiontext/actiontext-6.0.4.8.ebuild
index bcf2b5e89081..bcf2b5e89081 100644
--- a/dev-ruby/actiontext/actiontext-6.0.4.6.ebuild
+++ b/dev-ruby/actiontext/actiontext-6.0.4.8.ebuild
diff --git a/dev-ruby/actiontext/actiontext-6.1.4.6.ebuild b/dev-ruby/actiontext/actiontext-6.1.5.1.ebuild
index b644b504cc65..e0c1fe100689 100644
--- a/dev-ruby/actiontext/actiontext-6.1.4.6.ebuild
+++ b/dev-ruby/actiontext/actiontext-6.1.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/actiontext/actiontext-6.1.4.4.ebuild b/dev-ruby/actiontext/actiontext-7.0.2.4.ebuild
index 2f8569204837..8c0fa471c2ba 100644
--- a/dev-ruby/actiontext/actiontext-6.1.4.4.ebuild
+++ b/dev-ruby/actiontext/actiontext-7.0.2.4.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=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -30,18 +30,21 @@ ruby_add_rdepend "
 	~dev-ruby/activerecord-${PV}
 	~dev-ruby/activestorage-${PV}
 	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.6.0
 	>=dev-ruby/nokogiri-1.8.5
 "
 
 ruby_add_bdepend "test? (
 	dev-ruby/bundler
 	dev-ruby/mocha
+	dev-ruby/propshaft
 )"
 
 all_ruby_prepare() {
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
 	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
 		-e '/:job/,/end/ s:^:#:' \
 		-e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
 		-i ../Gemfile || die
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 921bcaaaaf48..26390ccbccd3 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,27 +1,25 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
 DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
 DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
 DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
 DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-EBUILD actionview-5.2.6.2.ebuild 1949 BLAKE2B 2318f15ab6862d872d64734e008b337c0b51ab4a95f0a2fc1184de5d09bae6efc164dfab01a0a38e22b4778767ac2a674115ee6a1ede2f96ca99ce956a22dd01 SHA512 facfff17ed8150d196d99bc042d2c276e8aedf3791eb25a27309decb09bd97f3c508e95fc7bc00dc5c0db77fb7808e562f47c9889f2686dbe7d2d9d78710f132
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 EBUILD actionview-5.2.6.ebuild 1948 BLAKE2B 91fab33b6925a4cf77c575279a5d329f856931362dadff109acb4e6bdb9195a1e1f3bc90c1520e5cb78a478bda6c681825b20c09c7107626be51647bac76c7ff SHA512 60cb6494d5b13170bd0730cb13ec3b75dc64a66b808fdad3219bd739ba997adceec772c6e5844c94654050921e4e1c030479dfc17af7f8e4abf91b5aa10aa63f
+EBUILD actionview-5.2.7.1.ebuild 1949 BLAKE2B 2318f15ab6862d872d64734e008b337c0b51ab4a95f0a2fc1184de5d09bae6efc164dfab01a0a38e22b4778767ac2a674115ee6a1ede2f96ca99ce956a22dd01 SHA512 facfff17ed8150d196d99bc042d2c276e8aedf3791eb25a27309decb09bd97f3c508e95fc7bc00dc5c0db77fb7808e562f47c9889f2686dbe7d2d9d78710f132
 EBUILD actionview-5.2.7.ebuild 1949 BLAKE2B 2318f15ab6862d872d64734e008b337c0b51ab4a95f0a2fc1184de5d09bae6efc164dfab01a0a38e22b4778767ac2a674115ee6a1ede2f96ca99ce956a22dd01 SHA512 facfff17ed8150d196d99bc042d2c276e8aedf3791eb25a27309decb09bd97f3c508e95fc7bc00dc5c0db77fb7808e562f47c9889f2686dbe7d2d9d78710f132
 EBUILD actionview-6.0.4.1.ebuild 2242 BLAKE2B 42b0f4c405e3ae296a5ea487851978ed8a9e37e4981aafd84b3e248cbb72b002b48c486b3ceec143fea4e772e56c071be7a442d1a7d033d3f600b600abd6d7bd SHA512 8094a406f78109c27172958c4d2e3e8070a3f9a42fef6e043204cbdb2e7b83ca709665059f39ec274166629a50dbf493d2db9b770090fe52b393ba91bb6d9b8d
-EBUILD actionview-6.0.4.3.ebuild 2236 BLAKE2B 15d2210418dd02c967c2e69b2802b3f481f19789c60d5b80c85381e607b01e6b1b0b83beee37a6883cfac108498863ddb1914e13785f5a5445394cc4379fa291 SHA512 6f30e81accca884e2f080361bd26f1945da251b9c62ddec916c62c7fa6e16d687b3360a66bc9edb084d578c69ce0914bd02cd1c0d0d842496f02fafc088a7c61
 EBUILD actionview-6.0.4.4.ebuild 2235 BLAKE2B 32ec4454b288c2c99803c25296f51191860129c8a6ef6697fc2059e62bf10e042850d5c6424a7d8b817ade50649c1a74969650cd9c792edbb39fe4d5244ff128 SHA512 a01647e768670731e8e9cbf0aa46385da06514cc7c50f2d000c684a8c915c2bc7778364654ae3d9a2c6e1cec33119d9f639d3382dc68cd7b1cfd958c75514fb2
-EBUILD actionview-6.0.4.6.ebuild 2236 BLAKE2B 68c1c51040a891e1257898159b5343b1a23522148c203d0361fe37cb3d2e890bb9bbcd68ef2133e60413ef7851a1f09305c4b3d2035476d92e546f1aa405c827 SHA512 d52a6739f7076c8adf19d7087d7c17f742f29d5f796a5a1125912e039372e5d996b34c20c71cfde6c7834cda3fcb8234017fc16ee432e51965d5242cce1f2236
 EBUILD actionview-6.0.4.7.ebuild 2259 BLAKE2B 19a6b5f501cc3c958e0d756fe8b809a37ea994121fe3619d65ccbd5218a2ea215973ebc23c2bf6ef1f562f34a9d35752f1c8e9ed680960389a217d84d713f5c6 SHA512 162fe9ea8ac920e20e10bf458c0de55b95ec65b70fdb0bbfd17fb90c4bfaa99fedc33a583f8124bcb0f8050a16c23240a0a6f5e799cf4474ccdaa9830102b0b3
-EBUILD actionview-6.1.4.4.ebuild 2158 BLAKE2B 76d0dadb270b110b67f0ef4da18c1e70b24d3fe20c2bb9fbc4fcf804e652cc9f404a011c466c0ab56de69a022c7a25cd3eb299073f8ec1f68ed33fd194661136 SHA512 61d199342fb0943edde384544609b402a28e925e30c5930bacf6b36bd3a88e19614fc2e8b71fc9ebffadb0afccd1aac3b3f04c1f8f6b38eceb52a8e0ee6e787b
-EBUILD actionview-6.1.4.6.ebuild 2060 BLAKE2B 346a9891060ab1f570bda2523c06b2eef15a1d6158f9900b357fbaf246c6d416f4f3a4aea6e7f5786e540d84a8af82f8be0a651da46250ad50b9713c4d556425 SHA512 27b00db883d55a869934f0f4108cc53f586a516a383784689b578acc4eb2be985a5407cac7be3edd122b03c371d7ea5c9614c520a4f1839cc4f1d2d70a9a6c9f
+EBUILD actionview-6.0.4.8.ebuild 2259 BLAKE2B 19a6b5f501cc3c958e0d756fe8b809a37ea994121fe3619d65ccbd5218a2ea215973ebc23c2bf6ef1f562f34a9d35752f1c8e9ed680960389a217d84d713f5c6 SHA512 162fe9ea8ac920e20e10bf458c0de55b95ec65b70fdb0bbfd17fb90c4bfaa99fedc33a583f8124bcb0f8050a16c23240a0a6f5e799cf4474ccdaa9830102b0b3
+EBUILD actionview-6.1.5.1.ebuild 2067 BLAKE2B 8a426722a87d183141f843eb2a73ed8728ede4ebad0c1b46df8896c96a4a7b4fbb1038084bef9d6c8280000f0a6c0055bdc00934fc6dd596784644670f4f0cae SHA512 e58ad6c657f930a82b06e4648eb026dce8d501eabf7b92084093288d7a9134abe27c591cea7f0e2a489ef05c932d6cafdb6c441853b07dc5a5f52a5e11ede962
 EBUILD actionview-6.1.5.ebuild 2060 BLAKE2B 346a9891060ab1f570bda2523c06b2eef15a1d6158f9900b357fbaf246c6d416f4f3a4aea6e7f5786e540d84a8af82f8be0a651da46250ad50b9713c4d556425 SHA512 27b00db883d55a869934f0f4108cc53f586a516a383784689b578acc4eb2be985a5407cac7be3edd122b03c371d7ea5c9614c520a4f1839cc4f1d2d70a9a6c9f
 EBUILD actionview-7.0.2.2.ebuild 2139 BLAKE2B 27d6b9c2e9e5e3bfcf32a3e58962405108f9a002d6bd6c7571b001b05be62f5b071519c89f3da6be2333e59ab6a40e2751304b775e17fa14206ee734ff32d1f9 SHA512 3af4e190ce1958862353af95154827c358a116f695087c7dfa30030941183c0f655215d1fef3318e2711de88a96b93723265c7a3f30a5a817eecf2add55a38ac
 EBUILD actionview-7.0.2.3.ebuild 2146 BLAKE2B fe17efbef17a596d2647a1a9e6ed1b9fd2887d95742f768b860ca07370333380e2178c2eff0a970a6fa27aeb645df6d310f4b7cc69f4bb9c24154659cdb1866b SHA512 00fe7697ed2c1e2ab91fa7f14a06a0204691284d9028e7067527ca5e10817da2652ed13bc450e31272d0494f5503d09453c7f970923570b2ff9d3cd9a05ab569
+EBUILD actionview-7.0.2.4.ebuild 2146 BLAKE2B fe17efbef17a596d2647a1a9e6ed1b9fd2887d95742f768b860ca07370333380e2178c2eff0a970a6fa27aeb645df6d310f4b7cc69f4bb9c24154659cdb1866b SHA512 00fe7697ed2c1e2ab91fa7f14a06a0204691284d9028e7067527ca5e10817da2652ed13bc450e31272d0494f5503d09453c7f970923570b2ff9d3cd9a05ab569
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actionview/actionview-5.2.6.2.ebuild b/dev-ruby/actionview/actionview-5.2.7.1.ebuild
index 7f7393b68107..7f7393b68107 100644
--- a/dev-ruby/actionview/actionview-5.2.6.2.ebuild
+++ b/dev-ruby/actionview/actionview-5.2.7.1.ebuild
diff --git a/dev-ruby/actionview/actionview-6.0.4.3.ebuild b/dev-ruby/actionview/actionview-6.0.4.3.ebuild
deleted file mode 100644
index 8e0441011e0a..000000000000
--- a/dev-ruby/actionview/actionview-6.0.4.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/activerecord-${PV}
-		~dev-ruby/railties-${PV}
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid tests failing due to missing logger setup in activerecord,
-	# most likely related to test environment setup.
-	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
-	# Fix loading of activerecord integration tests. This avoids loading
-	# activerecord twice and thus redefining constants leading to
-	# failures. Bug #719342
-	sed -e '/abstract_unit/arequire "active_record/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.0.4.6.ebuild b/dev-ruby/actionview/actionview-6.0.4.8.ebuild
index 0de79afe0968..0021524ea0b6 100644
--- a/dev-ruby/actionview/actionview-6.0.4.6.ebuild
+++ b/dev-ruby/actionview/actionview-6.0.4.8.ebuild
@@ -65,5 +65,5 @@ all_ruby_prepare() {
 		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
 		-i test/active_record_unit.rb || die
 
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"' test/abstract_unit.rb || die
+	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
 }
diff --git a/dev-ruby/actionview/actionview-6.1.4.6.ebuild b/dev-ruby/actionview/actionview-6.1.5.1.ebuild
index 85b9d4b84d88..7beb67cb12f0 100644
--- a/dev-ruby/actionview/actionview-6.1.4.6.ebuild
+++ b/dev-ruby/actionview/actionview-6.1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/actionview/actionview-6.1.4.4.ebuild b/dev-ruby/actionview/actionview-7.0.2.4.ebuild
index bdb512619eb3..c700736654d7 100644
--- a/dev-ruby/actionview/actionview-6.1.4.4.ebuild
+++ b/dev-ruby/actionview/actionview-7.0.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 29a9e87120de..717e7ded7078 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,28 +1,26 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
 DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
 DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
 DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
 DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-EBUILD activejob-5.2.6.2.ebuild 1194 BLAKE2B eafe15e498ef2337038d194cc7938766da9eca94eb3b8b31b2ecc236c75d07dc0db04f890689c2812bf5c5c78b566aae707ec0415fb9be647f7af0662a6f2f30 SHA512 781652a8bef99bfde9b33cb33229f72c23132bf27ba72d7b5b256c4bd2a3c253e53a40b6b9f1d817f4cc1901a96e0a62c1071de3bcf77a2fbf60083dd5c6862a
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 EBUILD activejob-5.2.6.ebuild 1194 BLAKE2B fb5d5dc3f503d114a248d4b5a908785923754a59085a142124547cede3c177706f0ed937b14fa7611bd4a9bbf1a5b3cf5ddc84463bc3459919ed321c47718100 SHA512 4b9e1d5c99a192bd64a678541fed2955a5abd7ccd69ae13b3341ad05eb7bf5b895372a732cd9b54e92898bfa3c3ba4f1af27fdc802985becc57d3ad589dde687
+EBUILD activejob-5.2.7.1.ebuild 1194 BLAKE2B eafe15e498ef2337038d194cc7938766da9eca94eb3b8b31b2ecc236c75d07dc0db04f890689c2812bf5c5c78b566aae707ec0415fb9be647f7af0662a6f2f30 SHA512 781652a8bef99bfde9b33cb33229f72c23132bf27ba72d7b5b256c4bd2a3c253e53a40b6b9f1d817f4cc1901a96e0a62c1071de3bcf77a2fbf60083dd5c6862a
 EBUILD activejob-5.2.7.ebuild 1194 BLAKE2B eafe15e498ef2337038d194cc7938766da9eca94eb3b8b31b2ecc236c75d07dc0db04f890689c2812bf5c5c78b566aae707ec0415fb9be647f7af0662a6f2f30 SHA512 781652a8bef99bfde9b33cb33229f72c23132bf27ba72d7b5b256c4bd2a3c253e53a40b6b9f1d817f4cc1901a96e0a62c1071de3bcf77a2fbf60083dd5c6862a
 EBUILD activejob-6.0.4.1.ebuild 1207 BLAKE2B 2381e5b47f9ea214bf25fce72612f345fe2e0a1427d2daf5b17cab981c95233486b6c94a5aeb363951f589541a92b46b34e09c449170de9dbe62636258b25e11 SHA512 3192959ef70e56e1c53f5795086a26322301638411804a11891169c754acfbac907ae40eb149efc3034cf514d54a422469cd28d873f575b4399865d6f9114f1e
-EBUILD activejob-6.0.4.3.ebuild 1200 BLAKE2B b25de3d787173d7e09260afbc2b94b0511fc8c019a8c8c4fc4b45d8b07f09f05de2a3d46c6a15eb796c9867c404fae727e9ece495dbdcda31930616c22f81a97 SHA512 d7e47985f0f709bfea1d151b9d691dce08595de9cf3ae3113777c2bd949749388fb96ffc0e5831eb4642bc371e545e09ea3c97a14e370ac3fb0dd448a18a7f85
 EBUILD activejob-6.0.4.4.ebuild 1200 BLAKE2B b25de3d787173d7e09260afbc2b94b0511fc8c019a8c8c4fc4b45d8b07f09f05de2a3d46c6a15eb796c9867c404fae727e9ece495dbdcda31930616c22f81a97 SHA512 d7e47985f0f709bfea1d151b9d691dce08595de9cf3ae3113777c2bd949749388fb96ffc0e5831eb4642bc371e545e09ea3c97a14e370ac3fb0dd448a18a7f85
-EBUILD activejob-6.0.4.6.ebuild 1200 BLAKE2B c0f66d62d5d3d5fc3e2a7660655387adcaf4809a8eeafaedc522af934141472f50a749da5062ee5c72c3f68b19436ee7d22082c393cf51e65749b558c000129e SHA512 b65aa787da316c02b0b468fbe3461b96529ea86e0fa2501873a02e4260022f72ccd7191fcb7f6867e5be03decf16409ebc013c2b98b9a50690da2dbce17f6ac4
 EBUILD activejob-6.0.4.7.ebuild 1200 BLAKE2B c0f66d62d5d3d5fc3e2a7660655387adcaf4809a8eeafaedc522af934141472f50a749da5062ee5c72c3f68b19436ee7d22082c393cf51e65749b558c000129e SHA512 b65aa787da316c02b0b468fbe3461b96529ea86e0fa2501873a02e4260022f72ccd7191fcb7f6867e5be03decf16409ebc013c2b98b9a50690da2dbce17f6ac4
-EBUILD activejob-6.1.4.4.ebuild 1136 BLAKE2B 9a6b3201d075a9d760975c0b93824a45d43ceb6a6975e3fd52b68c2ea984e78eabfcd3c17e635d91c3d877b6f643b93cac8db3f4464eb19529b121ef22841067 SHA512 88d2f1cfb9a892540481425a8d8d56a7d9581b25ea05c6436d123b179d985aea3f9ca384aa01cb328e7410712e8b93ed1066114acc5557c2e3a885ba86932907
-EBUILD activejob-6.1.4.6.ebuild 1135 BLAKE2B 338e21f624aa8b72cd87dd506501ad9534ecc592a23862d4b3d0fd02e8fdbbd6308a1861830d340fccb91d79da0123961ec5a93bb03e068466de58e318aa1ace SHA512 643683f734dbd441ecc072695461fe64f9bd82a816f1a47558904fb2415c000a7acd3c8ac9a8b1b9edcfd852921a210d9eb9849ed2e7f23fa0de18bb8550db27
+EBUILD activejob-6.0.4.8.ebuild 1200 BLAKE2B c0f66d62d5d3d5fc3e2a7660655387adcaf4809a8eeafaedc522af934141472f50a749da5062ee5c72c3f68b19436ee7d22082c393cf51e65749b558c000129e SHA512 b65aa787da316c02b0b468fbe3461b96529ea86e0fa2501873a02e4260022f72ccd7191fcb7f6867e5be03decf16409ebc013c2b98b9a50690da2dbce17f6ac4
+EBUILD activejob-6.1.5.1.ebuild 1142 BLAKE2B 8deaf55632d87a517d0fe3e6f0895def8214ef06845567405dbaae6244a93ae926c1c99a0f3819897f2a34144bfe6d394069c89934f3cfa520187299398c97e4 SHA512 787bc385126637ac1ff4940337e05de90dbf2d15fff41344770834ba94fb9ece75657d378c0393d262f56153f33ab6e6165d614b2718c09ad493fa42b3bee448
 EBUILD activejob-6.1.5.ebuild 1135 BLAKE2B 338e21f624aa8b72cd87dd506501ad9534ecc592a23862d4b3d0fd02e8fdbbd6308a1861830d340fccb91d79da0123961ec5a93bb03e068466de58e318aa1ace SHA512 643683f734dbd441ecc072695461fe64f9bd82a816f1a47558904fb2415c000a7acd3c8ac9a8b1b9edcfd852921a210d9eb9849ed2e7f23fa0de18bb8550db27
 EBUILD activejob-7.0.2.2.ebuild 1182 BLAKE2B db5cd8c33b1609e0018edda573def225e99e414d8ec0088dc5f7e065c383a0194e70348a51be30a209961a6f25778961ac0a638d9b469be39427b4b8de11f48a SHA512 1b1a7ae3ff0ca10aad1b8d20f69928abb0d80ccb17b2c1c22661b9ef1c4356a5ac6797074c9afdc4a9d71c3f047196611fc135cff60f69b9f0f089130add126b
 EBUILD activejob-7.0.2.3-r1.ebuild 1177 BLAKE2B 3e30f3386f579e0ecfd305e8043b3a22a91c27410c4f7d287f2c9a7d7657d511429a1731c4c58efd1c3af339b1e67e9523c2d122b322a4eaea8b7e11c517ec47 SHA512 33e483a82038f0d7334e525aa488f5702a3dc445b0c2ffdc4aaad5eb4bf5d83210f896035d8ff47fa37edf9b9f5f0cbf2c150d038e134f7531bc9d37ffabf66a
 EBUILD activejob-7.0.2.3.ebuild 1182 BLAKE2B db5cd8c33b1609e0018edda573def225e99e414d8ec0088dc5f7e065c383a0194e70348a51be30a209961a6f25778961ac0a638d9b469be39427b4b8de11f48a SHA512 1b1a7ae3ff0ca10aad1b8d20f69928abb0d80ccb17b2c1c22661b9ef1c4356a5ac6797074c9afdc4a9d71c3f047196611fc135cff60f69b9f0f089130add126b
+EBUILD activejob-7.0.2.4.ebuild 1189 BLAKE2B 19c984bf8d98c3abb4f985ded7eefe0f47752eaca407536e238ffa059ec2ada62d7a209a3d2e0d778cb285157bb423d5887159f6364f011c1a38be83765a6e03 SHA512 2186ed2f6431c0b7a81805f8863fb1f84fad5f919925ace28c293c420d270c4c3538cf965f3157b0012e5fef69feb40e0632ba846314a8af593285db9761e1d3
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activejob/activejob-5.2.6.2.ebuild b/dev-ruby/activejob/activejob-5.2.7.1.ebuild
index 802f472cf81e..802f472cf81e 100644
--- a/dev-ruby/activejob/activejob-5.2.6.2.ebuild
+++ b/dev-ruby/activejob/activejob-5.2.7.1.ebuild
diff --git a/dev-ruby/activejob/activejob-6.0.4.3.ebuild b/dev-ruby/activejob/activejob-6.0.4.3.ebuild
deleted file mode 100644
index 095ae13c2e50..000000000000
--- a/dev-ruby/activejob/activejob-6.0.4.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-	sed -i -e '2igem "railties", "~> 6.0.0"' test/helper.rb || die
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-}
diff --git a/dev-ruby/activejob/activejob-6.0.4.6.ebuild b/dev-ruby/activejob/activejob-6.0.4.8.ebuild
index 9f6d7b2fa4fb..9f6d7b2fa4fb 100644
--- a/dev-ruby/activejob/activejob-6.0.4.6.ebuild
+++ b/dev-ruby/activejob/activejob-6.0.4.8.ebuild
diff --git a/dev-ruby/activejob/activejob-6.1.4.6.ebuild b/dev-ruby/activejob/activejob-6.1.5.1.ebuild
index a0adaa549825..ca98657bca3d 100644
--- a/dev-ruby/activejob/activejob-6.1.4.6.ebuild
+++ b/dev-ruby/activejob/activejob-6.1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
diff --git a/dev-ruby/activejob/activejob-6.1.4.4.ebuild b/dev-ruby/activejob/activejob-7.0.2.4.ebuild
index ba8c187622d6..4702b811fda4 100644
--- a/dev-ruby/activejob/activejob-6.1.4.4.ebuild
+++ b/dev-ruby/activejob/activejob-7.0.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
@@ -44,4 +44,5 @@ all_ruby_prepare() {
 	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
 		-e 's/delayed_job//' Rakefile || die
 	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
+	rm -f test/cases/delayed_job_adapter_test.rb || die
 }
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index f7b4826b48c6..60318c8ac395 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,27 +1,25 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
 DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
 DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
 DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
 DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-EBUILD activemodel-5.2.6.2.ebuild 1097 BLAKE2B 3adeae4652ad5b97d19565207579665364f7cc05f0df8742b5f4d14f21291b3a3d6a2067008281428dce24e04e9cb39a674db71d7a90b13dbf647de1b48f72bb SHA512 05c8e26c50701dafd46fcd4dd3794639b0dec2e878c55e39c0950021babbbe06f3ef3b1e7f3eaf7ce6ac321198ee555e4e46fbfa20e152e5c09d24a2d54f75f8
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 EBUILD activemodel-5.2.6.ebuild 1096 BLAKE2B d5117f14855812a0b7e3788fd89fd0d75e74c765e1ac3a2e6c88aef7e877accc0e40245bb425a5968bcdac1cc7c9de79862b11af69bbf7b60fa002c5ea2e9f11 SHA512 b326348e70498784c1f045cedf47498a57eecaf633c90826cfd7e13f6913e3421b4e0cb6ab159d99c133af61579c0a8689e0cff40c94c70e4c121b06286e0b51
+EBUILD activemodel-5.2.7.1.ebuild 1120 BLAKE2B 958341ffd217e403d2a1bd68e451ef8c25d14ae621695508c165265732d929320060f9f8b0ca25813740d82ab3967f8acf1e7275aed89a6d03de6480cf517b32 SHA512 fc4140dd601b6c184e12b5844ce6a82b46a1a6e8547289f05edd5f0c8b897f40f3f8c5f3453b758b58c15e4e8eea3f9305a010bd173e16f3be608aceaad3d32f
 EBUILD activemodel-5.2.7.ebuild 1120 BLAKE2B 958341ffd217e403d2a1bd68e451ef8c25d14ae621695508c165265732d929320060f9f8b0ca25813740d82ab3967f8acf1e7275aed89a6d03de6480cf517b32 SHA512 fc4140dd601b6c184e12b5844ce6a82b46a1a6e8547289f05edd5f0c8b897f40f3f8c5f3453b758b58c15e4e8eea3f9305a010bd173e16f3be608aceaad3d32f
 EBUILD activemodel-6.0.4.1.ebuild 976 BLAKE2B 06a0c071b03b7986180ce9baf3aa2f7afed66c7f6267305bb870281e2be2dd8020821970344a1591051196be8bbba4d7d286802828dae280b6a9557f58c57fc0 SHA512 9b65a71146f045bebb9e9b8358fa9a4fcc7d5552f0c988580d415909c62a49d0e64a5ecda6d3ac79c0fbec4c57b7a75263f0e8f10f0b4186d3ed7bf3b3c7173b
-EBUILD activemodel-6.0.4.3.ebuild 970 BLAKE2B 08fa58504f28cb889b527391d6ed3a7413f21a901814020f11dd499646960114763ea3ab115563c7171d60be9c79275fe9e54220576beb1229612012391bc8d2 SHA512 fec29ef59ebcbbfc8c7e18db4398bf47dc67762e34b50bae1ccde58324ba031316d9a9c3d56d65be99389d2baee360ecd6328f0731dc09367f90eb1fbe1623ca
 EBUILD activemodel-6.0.4.4.ebuild 969 BLAKE2B f826751220996a0f02a92cdb0ec80f704f49cc280043e1d0fbc895b0c99af04543c33124806230661f4acec7b6252d6d9c00d6f8d73eb4cb55047eaaba57fca1 SHA512 1b0c0b478489e64d100842cbe8ec92330e4c5478202495753f7b13872654461901b362fc172548bba1e697e9ef067e75d073eb804e3adcaa5e882382a70e3a37
-EBUILD activemodel-6.0.4.6.ebuild 970 BLAKE2B 4db8d87371aeba9e7dbb096c43181f817b1844c336c55ad1bc5da7b16c50d13b1a57b4f659782dbaf54f49f22078a1a89fa44443da4349532cad2072e934236f SHA512 5d5169c729313e1bc724468258617815cdc44e38ab4845902e37c86a17ad787b703caafcf9b6a08fe35f54d7a9b1ba7917d6e3202f1eca6c8a393aab54c1e18f
 EBUILD activemodel-6.0.4.7.ebuild 980 BLAKE2B b983f2855d832c4b3e3f352eeead2bf79a0fe860be35569cf36d40a5b03b8048e35d28a59fe164d15de4ad21010a616b9066f9cd12e1ff54294250ef082e7280 SHA512 148928824c4dfac16be2cda888bc9d23f851e2cd165ae4d42247974efdac8030500ef1ad51f284fcf70a7bf22332945b35db9533fe80e755081c8aef0195dbfd
-EBUILD activemodel-6.1.4.4.ebuild 970 BLAKE2B ab42ef6406cc0626148e7e344f600a5c9d9fed228d72b5434513040f5a196f309131733166e747784aa08f47f49a110b4de007266c0dcc94ef0df66b0edaa707 SHA512 580594823e62894d2befb48095ccaa4ebca0d3c90c1c2a9bcbb911f1f8611321dede63a63086aa1d50deca65bafa032d41f63134ea9b87fece94c4fbd7a57581
-EBUILD activemodel-6.1.4.6.ebuild 970 BLAKE2B 8c0e5331d728f3bc538660b0ec13f72f4596b6eabeb7b3cc9d22d4b5bd25eafc10832cc2619015f10dbbafc62d14b053d00feba163266cdc9616003301ad028f SHA512 11b7694097a0d14c66c5eb197c1e7c939283b0316be3493619eef4251008ccf395940c528dbf24db8e04775685dd7275e6bc61b3136a9fad008cb8f15ee607f6
+EBUILD activemodel-6.0.4.8.ebuild 980 BLAKE2B b983f2855d832c4b3e3f352eeead2bf79a0fe860be35569cf36d40a5b03b8048e35d28a59fe164d15de4ad21010a616b9066f9cd12e1ff54294250ef082e7280 SHA512 148928824c4dfac16be2cda888bc9d23f851e2cd165ae4d42247974efdac8030500ef1ad51f284fcf70a7bf22332945b35db9533fe80e755081c8aef0195dbfd
+EBUILD activemodel-6.1.5.1.ebuild 977 BLAKE2B b9b16e6806d9a2492ab8c46e736157bf90eec764d84ae7e4934cee13d9dd57721bdf117cecd5324cdba361eb5ae11a29e7e1f245325c8f15e71fc5608513864e SHA512 0f54d0f2c0e369880989930f0997509dbb061a0b60b6476411ff072620aa9dd45797f962d1a6c78291c5ac106f74a51ca619c44e6ff3748060ddf444a37b7c08
 EBUILD activemodel-6.1.5.ebuild 970 BLAKE2B 8c0e5331d728f3bc538660b0ec13f72f4596b6eabeb7b3cc9d22d4b5bd25eafc10832cc2619015f10dbbafc62d14b053d00feba163266cdc9616003301ad028f SHA512 11b7694097a0d14c66c5eb197c1e7c939283b0316be3493619eef4251008ccf395940c528dbf24db8e04775685dd7275e6bc61b3136a9fad008cb8f15ee607f6
 EBUILD activemodel-7.0.2.2.ebuild 951 BLAKE2B 2331de2fe4e167c16996de3ea09e4ae4541d952eea2d79f631239ed9d799cccce39fd34071adbecf2ad090143356fc83b7c429c9df9d3a9a5dd2ec450abfc52d SHA512 0b347ae77b9bd6096983be1e2b15feb80fb5b594ceaaf31ee41ecffbb16aed9865ba216fa576327dd9ac9beb9d0618bf00f5656e59c2a288b8d04f6d2c08dbb0
 EBUILD activemodel-7.0.2.3.ebuild 958 BLAKE2B bafde4c47abe2504c89cfe2614be69b675895216a848bd2eb0e10fd7f82a32b7a788596e6aef46fc85c4eefdd88f2189013c70ccdad06349694a533146b21c2d SHA512 b93b747160b5174c73aeda170680cabbc3e5ec66691eeba9c7b1198052443bc12b55ab284d65ef280a87d6bdbaa5c18c783d23a420940cb6b1d2dfb598919b0b
+EBUILD activemodel-7.0.2.4.ebuild 958 BLAKE2B bafde4c47abe2504c89cfe2614be69b675895216a848bd2eb0e10fd7f82a32b7a788596e6aef46fc85c4eefdd88f2189013c70ccdad06349694a533146b21c2d SHA512 b93b747160b5174c73aeda170680cabbc3e5ec66691eeba9c7b1198052443bc12b55ab284d65ef280a87d6bdbaa5c18c783d23a420940cb6b1d2dfb598919b0b
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activemodel/activemodel-5.2.6.2.ebuild b/dev-ruby/activemodel/activemodel-5.2.7.1.ebuild
index e31ee2cc02d0..36dfba0c1e2f 100644
--- a/dev-ruby/activemodel/activemodel-5.2.6.2.ebuild
+++ b/dev-ruby/activemodel/activemodel-5.2.7.1.ebuild
@@ -41,5 +41,5 @@ ruby_add_bdepend "
 all_ruby_prepare() {
 	# Set test environment to our hand.
 	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-	sed -i -e '2igem "railties", "~> 5.2.0"' test/cases/helper.rb || die
+	sed -i -e '2igem "railties", "~> 5.2.0"; gem "psych", "~> 3.0"' test/cases/helper.rb || die
 }
diff --git a/dev-ruby/activemodel/activemodel-6.0.4.3.ebuild b/dev-ruby/activemodel/activemodel-6.0.4.3.ebuild
deleted file mode 100644
index 922d14dbfa67..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.4.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mocha
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.0.4.6.ebuild b/dev-ruby/activemodel/activemodel-6.0.4.8.ebuild
index c8e9826d1f05..4e43fc718e2d 100644
--- a/dev-ruby/activemodel/activemodel-6.0.4.6.ebuild
+++ b/dev-ruby/activemodel/activemodel-6.0.4.8.ebuild
@@ -38,5 +38,5 @@ ruby_add_bdepend "
 
 all_ruby_prepare() {
 	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+	sed -i -e '3igem "psych", "~> 3.0"' test/cases/helper.rb || die "Unable to remove load paths"
 }
diff --git a/dev-ruby/activemodel/activemodel-6.1.4.6.ebuild b/dev-ruby/activemodel/activemodel-6.1.5.1.ebuild
index 621481c37e88..72f40d438434 100644
--- a/dev-ruby/activemodel/activemodel-6.1.4.6.ebuild
+++ b/dev-ruby/activemodel/activemodel-6.1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
diff --git a/dev-ruby/activemodel/activemodel-6.1.4.4.ebuild b/dev-ruby/activemodel/activemodel-7.0.2.4.ebuild
index f41ffdd4078a..ffe12032f8e3 100644
--- a/dev-ruby/activemodel/activemodel-6.1.4.4.ebuild
+++ b/dev-ruby/activemodel/activemodel-7.0.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 85341dca6767..b099d5ab8222 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,27 +1,25 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
 DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
 DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
 DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
 DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-EBUILD activerecord-5.2.6.2.ebuild 3058 BLAKE2B 6677eb01bb77cea8080e6ce6fb30b65114488cf171b7166ffb7fe9cc335070a804d9707de0a09d1cc96b23a5cf3ccecf0bc6af29babee4dc2721804467391838 SHA512 688b4bf4c5317389ae7a80c7c35ddc1c511c5723968f8c75257b1b910e13e30675558eb238bd7822d4df4d9edf8b1a26a0ed4245bb34e24a9b88a0147e85f614
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 EBUILD activerecord-5.2.6.ebuild 2946 BLAKE2B 81d5b3915867571e063987354da77067a07e7d6fd2e28b6a58031679948fccca12b6629f159188a3f87d3ddcd28baa0512e502cfd59dee60db2783482a66d4d5 SHA512 6d42fd304dc3a052f74d7dd1e978db0bb6130136ed9449de503bf2202b8de3e46aecb09ebdd4a21797bae455c8d4f149f3665e9c2e96ba10fb7337804c5abb67
+EBUILD activerecord-5.2.7.1.ebuild 3092 BLAKE2B afce126a087c592c016e7a2cef7bc367db343e45a8b72f5e8d61575ecaa5cc5f12b161f0f8ff2fb2a17578e12efa50a6f170ed723895a406ffa6b25dcfb741cf SHA512 c456d0741cfc8b886de94f28289e1cc8a468698e261c713424f3467865969debd104224957ece76b5aee75e6d7a31f22dfc3817a893f982659dd51b58235fbd1
 EBUILD activerecord-5.2.7.ebuild 3092 BLAKE2B afce126a087c592c016e7a2cef7bc367db343e45a8b72f5e8d61575ecaa5cc5f12b161f0f8ff2fb2a17578e12efa50a6f170ed723895a406ffa6b25dcfb741cf SHA512 c456d0741cfc8b886de94f28289e1cc8a468698e261c713424f3467865969debd104224957ece76b5aee75e6d7a31f22dfc3817a893f982659dd51b58235fbd1
 EBUILD activerecord-6.0.4.1.ebuild 3152 BLAKE2B 21c8878136747d8ff16e154c26ac7361c09a5d36fffbb00d757db64a9125e9d64e805e59aab60c214727ed0f89f2d781d4f99b32b4298378e4f94cfa45c99623 SHA512 22f53a47fa85ff5898c62d52d85ca3024b620a21f7cd834bd3c79853dc039eff89e4b279b007a37710941ae02bf133d1b24ec34e3f3367c55e8d411a52cd45ec
-EBUILD activerecord-6.0.4.3.ebuild 3146 BLAKE2B 88e93b97a99b1c883a424e40e5f04556ead03606fa3af976eedfa8459ab540ad28942f5f7e8ba3078f36b1a3cdc898e84ac1fdb5f2964b60404a62826830026e SHA512 4af2a86977b8be6885b488cfa368a1b1129d119101ab3eef2789d7125ad9ffa241c6d62326af9f2287a7d2031eeac4d6f1464765b4eef8cc6a5f70209db82c25
 EBUILD activerecord-6.0.4.4.ebuild 3145 BLAKE2B f24ea20902a8800bd20e65274cdc72347949eb1cc530a53cfd5e30c2bd0cfdbd88559cf272e3956c27e37a6abbb2927cc86d5f120cf9657e7808ec7f4035b98f SHA512 9c846fc1a2acd78a1b607b8645574d54a828087f8ff751adae1b9ef94dbb50e24a120c0e1c3a8c357c3a036261d7c7d314ef2aed5c60e36ccaf75e6e21302dab
-EBUILD activerecord-6.0.4.6.ebuild 3256 BLAKE2B 7ff97f04ebd4ce54bc27c2882bbc1a747b6b3fe7c2aced8655fece54736d92cbedec4575cf44fabeaca924c8e8e886197aff0003a944e78d2d435876b3aa2f2a SHA512 5327ba8e27c8980231c2862b7d5b0516c6e04252201942f00fab715ac3f7aef197e1bf644e80676dbb99e8dfb9ed12f0b2e67a393a1d98640dd5bb824de5521e
 EBUILD activerecord-6.0.4.7.ebuild 3279 BLAKE2B 7b8a25923c1e052c4dc1ac54d9d7e6bdbfb389219562d526a6f680cc3f6eb1aca245cf3d836f04ad6f964f4ba06ef4233da78659eb515730587c06800f9166e2 SHA512 68b9f350a473142b9eedb41e5b036f5f6c1621a88c0e34c79cc91090f93cfb47db733615faaa50b105fbed9c7fddb77ab491d96750554d5c3c44ebbfb0263bfc
-EBUILD activerecord-6.1.4.4.ebuild 2950 BLAKE2B 05f5b4f4719827673f46d39acac1724b4fbeba4d1f9993a804656c8573ff0f0affd56479ee0c48134604162a1be31558f1c3175c7355ba5918886e16a21a511b SHA512 2498e205e97457f7b7406268206f196c1ddeda020b62f3fdf3603b221850b98fdd4e65a1eece840f2ddb57eeaf077a2d3bcdd4e03452dfa1ac8dc8e16270ecff
-EBUILD activerecord-6.1.4.6.ebuild 3232 BLAKE2B 79f15950605fbfb9f95ce9f9ff1b4721a5d3760b1ff61c7c2d88d31d257c586e9f0134228642e1efdf11722a96ec3811de9e1c5a3045f8dc13d5ec184ea6365e SHA512 582dc935aea21282cd53d7359966ccb806ba8835ffede43ee0bedb8e56ebfce7699a2bf9a18d79153d5c1c3f976d41535b0b041cb7f625ea5eb135584df3ae4e
+EBUILD activerecord-6.0.4.8.ebuild 3279 BLAKE2B 7b8a25923c1e052c4dc1ac54d9d7e6bdbfb389219562d526a6f680cc3f6eb1aca245cf3d836f04ad6f964f4ba06ef4233da78659eb515730587c06800f9166e2 SHA512 68b9f350a473142b9eedb41e5b036f5f6c1621a88c0e34c79cc91090f93cfb47db733615faaa50b105fbed9c7fddb77ab491d96750554d5c3c44ebbfb0263bfc
+EBUILD activerecord-6.1.5.1.ebuild 3376 BLAKE2B 16091f6b4a2ee090cc13c59ba4c5d198f7815ea0f6b45f7d719f28e561ca81829900d8f5e158045ac1027475a90001fb0551848613d0110ebd09c575a62bdd2c SHA512 7afc3d49f9025fd6a87e67a9df55aefc16a4a55bd2bb05eecc71a92a6dacf6933fb2522a91e78d7941ba6fd57767e7e8d263169166d91c94afc311ec32c340c8
 EBUILD activerecord-6.1.5.ebuild 3369 BLAKE2B 1d41bddab16daa366449d72eee3b6fc38d5bea1b3fb372e22c05b478b2c4b9dff388fa310263ad6b9d0f1d852491eefa22ec67a1a3809a0b5409df42630fca5b SHA512 6a87b5f796c70d3fb9e9cf4df1624bad7a86ca559bd88e893e9404025976d053f65de77436a8a9f62add5ac65555674e10aa29384aad040fd447aff6cccd7f6b
 EBUILD activerecord-7.0.2.2.ebuild 2950 BLAKE2B a17059c97353ae55ae0f23c63877db11620eaecffa66a2036069ee9d74097653b9f422456f396bb4a6a11be914266b9d03d94303bbac75bc39b69ee697446bac SHA512 87795ddc0914007934db30499c2cf43bae23391c2ab37db8e655c43194b2c24c30bdedd823cf813c2bf49e4bd16fce8c98fef771a622bba0a1fa2b3a80625a00
 EBUILD activerecord-7.0.2.3.ebuild 2957 BLAKE2B 50dcc61f8e2ef461da91dad821341f8c6612d37040435c1f9c3b8a87ef791b29b14a2c7e9087b175a7ef8b64389526c6780e270f15797c0a38ec73fb29db3fec SHA512 7a4a86a3457a8945e788f76579bcbc4f04c1743646860199cbcdd723e6a062c9684a7cf7458be141711762ff3f85b355d48c25e6f0a315e44a4f57e5e0e09c52
+EBUILD activerecord-7.0.2.4.ebuild 2957 BLAKE2B 50dcc61f8e2ef461da91dad821341f8c6612d37040435c1f9c3b8a87ef791b29b14a2c7e9087b175a7ef8b64389526c6780e270f15797c0a38ec73fb29db3fec SHA512 7a4a86a3457a8945e788f76579bcbc4f04c1743646860199cbcdd723e6a062c9684a7cf7458be141711762ff3f85b355d48c25e6f0a315e44a4f57e5e0e09c52
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activerecord/activerecord-5.2.6.2.ebuild b/dev-ruby/activerecord/activerecord-5.2.7.1.ebuild
index 413d3876552b..42a1a3c55ec4 100644
--- a/dev-ruby/activerecord/activerecord-5.2.6.2.ebuild
+++ b/dev-ruby/activerecord/activerecord-5.2.7.1.ebuild
@@ -65,6 +65,7 @@ all_ruby_prepare() {
 	sed -e '3i gem "activesupport", "~> 5.2.0"' \
 		-e '3i gem "activerecord", "~> 5.2.0"' \
 		-e '3i gem "activemodel", "~> 5.2.0"' \
+		-e '3i gem "psych", "~> 3.0"' \
 		-i test/cases/helper.rb || die
 
 	# Avoid test depending on mysql adapter which we don't support for
diff --git a/dev-ruby/activerecord/activerecord-6.0.4.3.ebuild b/dev-ruby/activerecord/activerecord-6.0.4.3.ebuild
deleted file mode 100644
index 8c20ff15ef51..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.4.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	sqlite? ( >=dev-ruby/sqlite3-1.4 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( dev-ruby/pg:1 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -e '/bcrypt/ s/3.0.0/3.0/' \
-		-i ../Gemfile || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.0"' test/cases/helper.rb || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single tests using mysql or postgres dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
-		-i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-
-	# Avoid test failing to bind limit length in favor of security release
-	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
-	# Avoid test failing related to rubygems
-	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-6.0.4.6.ebuild b/dev-ruby/activerecord/activerecord-6.0.4.8.ebuild
index 80126b2ba24a..dea3e73927bc 100644
--- a/dev-ruby/activerecord/activerecord-6.0.4.6.ebuild
+++ b/dev-ruby/activerecord/activerecord-6.0.4.8.ebuild
@@ -59,7 +59,7 @@ all_ruby_prepare() {
 	# earlier that implicitly required it.
 	sed -i -e '$agem "json"' ../Gemfile || die
 
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.0"' test/cases/helper.rb || die
+	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.0"; gem "psych", "~> 3.0"' test/cases/helper.rb || die
 
 	# Avoid test depending on mysql adapter which we don't support for
 	# this Rails version to simplify our dependencies.
diff --git a/dev-ruby/activerecord/activerecord-6.1.4.6.ebuild b/dev-ruby/activerecord/activerecord-6.1.5.1.ebuild
index 0f50c140b541..e6bb299bcd8d 100644
--- a/dev-ruby/activerecord/activerecord-6.1.4.6.ebuild
+++ b/dev-ruby/activerecord/activerecord-6.1.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 # this is not null so that the dependencies will actually be filled
 RUBY_FAKEGEM_TASK_TEST="test"
@@ -74,6 +74,7 @@ all_ruby_prepare() {
 
 	# Avoid tests that no longer work with newer sqlite versions
 	rm -f test/cases/adapters/sqlite3/explain_test.rb || die
+	sed -i -e '/test_references_stays_as_integer_column/askip "Fails on case difference"' test/cases/migration/compatibility_test.rb || die
 
 	# Avoid test failing to bind limit length in favor of security release
 	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
diff --git a/dev-ruby/activerecord/activerecord-6.1.4.4.ebuild b/dev-ruby/activerecord/activerecord-7.0.2.4.ebuild
index ba0d4e0cb302..f59c119d4b8c 100644
--- a/dev-ruby/activerecord/activerecord-6.1.4.4.ebuild
+++ b/dev-ruby/activerecord/activerecord-7.0.2.4.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=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 # this is not null so that the dependencies will actually be filled
 RUBY_FAKEGEM_TASK_TEST="test"
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
 IUSE="mysql postgres sqlite"
 
 RUBY_S="rails-${PV}/${PN}"
@@ -35,6 +35,7 @@ ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 
 ruby_add_bdepend "
 	test? (
+		dev-ruby/benchmark-ips
 		dev-ruby/bundler
 		~dev-ruby/actionpack-${PV}
 		>=dev-ruby/sqlite3-1.4.0
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index 69c474178d25..7f88520fd176 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,27 +1,25 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
 DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
 DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
 DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
 DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-EBUILD activestorage-5.2.6.2.ebuild 1931 BLAKE2B a22f9d410858367f434cbd9344fa280765aee175f86c9aabec3a13a0ee4d5135e2d48c74d1fbd783042404deec5944cb9a70822ae4703fd10a7bd0fa35af0547 SHA512 9269cdd38589705cbe7639340de90abee2c2b33d929937e4a56541626eca4c5cab49be95b69a00da76de0904a91109bc68e05ab4a4243fa237f8dd716c5e9711
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 EBUILD activestorage-5.2.6.ebuild 1931 BLAKE2B c21846d95430ec061a032edfc7fbf0c73fadd63e6cc7b3fa9e05ab254e5c9770911cc1e070af93f5b2ddbde7152fcaa5e6b18fbc133e4be00aded83c1f3d29d2 SHA512 cc5cb62936d3e6088bf9fab11d754650dd931aaec24b41bde568a28d8a644ab7c9f4780b60a6bfca23722c406c90be6872ca84a3a4fe3b2ae1b51a405d691739
+EBUILD activestorage-5.2.7.1.ebuild 1931 BLAKE2B a22f9d410858367f434cbd9344fa280765aee175f86c9aabec3a13a0ee4d5135e2d48c74d1fbd783042404deec5944cb9a70822ae4703fd10a7bd0fa35af0547 SHA512 9269cdd38589705cbe7639340de90abee2c2b33d929937e4a56541626eca4c5cab49be95b69a00da76de0904a91109bc68e05ab4a4243fa237f8dd716c5e9711
 EBUILD activestorage-5.2.7.ebuild 1931 BLAKE2B a22f9d410858367f434cbd9344fa280765aee175f86c9aabec3a13a0ee4d5135e2d48c74d1fbd783042404deec5944cb9a70822ae4703fd10a7bd0fa35af0547 SHA512 9269cdd38589705cbe7639340de90abee2c2b33d929937e4a56541626eca4c5cab49be95b69a00da76de0904a91109bc68e05ab4a4243fa237f8dd716c5e9711
 EBUILD activestorage-6.0.4.1.ebuild 2173 BLAKE2B e175dbe0b39307c2ace8d1a5d2f10ef4fa9bb28cd9decd234213d5a3fd3431a6c298ad2114c97b30b956f3a8a95dc847506ecb6b8bdf0bafc765a2c503b02ba7 SHA512 5f8115acebcda3b591bcfc197bbe074678abcb80f573008329983dfbd151f7c7400984654bcd211290e257831e132976b32e960ab7d317c0c49c86ce5dd2a7e4
-EBUILD activestorage-6.0.4.3.ebuild 2166 BLAKE2B 463877b18f2e8a9a4a232792773a63b45720b03421ea333d1768621e752fb7d05b42ab39fb9170516a49c0d55d92f0f6679b76d43ec797cb800fb841c86209b0 SHA512 21997ab7e51ff7d6fa0c20e64f92e4bfdcb5deb749ae17a27f380b860fd9f8f42a36abac1d7ea6a618f1b0359aa41ae6702b5d6a4686c99bd1c78566a55240c5
 EBUILD activestorage-6.0.4.4.ebuild 2166 BLAKE2B 463877b18f2e8a9a4a232792773a63b45720b03421ea333d1768621e752fb7d05b42ab39fb9170516a49c0d55d92f0f6679b76d43ec797cb800fb841c86209b0 SHA512 21997ab7e51ff7d6fa0c20e64f92e4bfdcb5deb749ae17a27f380b860fd9f8f42a36abac1d7ea6a618f1b0359aa41ae6702b5d6a4686c99bd1c78566a55240c5
-EBUILD activestorage-6.0.4.6.ebuild 2166 BLAKE2B 0f6f53ab9169d78d9f52cdfe2c0c99528796c45236333ae6f32a925c2304e529237aef43ce6c5da7c08a0412abbf15f5a9226e4e36ff48f6beb94bb0dde73136 SHA512 e011807067d6ead349412c1c5a993bdb7b085ff380edcf022d40032073b24aae8dde0195f4d5b364444fecd06fef369532e682c7b4e61681747bfdb2d5648b44
 EBUILD activestorage-6.0.4.7.ebuild 2166 BLAKE2B 0f6f53ab9169d78d9f52cdfe2c0c99528796c45236333ae6f32a925c2304e529237aef43ce6c5da7c08a0412abbf15f5a9226e4e36ff48f6beb94bb0dde73136 SHA512 e011807067d6ead349412c1c5a993bdb7b085ff380edcf022d40032073b24aae8dde0195f4d5b364444fecd06fef369532e682c7b4e61681747bfdb2d5648b44
-EBUILD activestorage-6.1.4.4.ebuild 2042 BLAKE2B 98af3e72d2930e8cc67e41a8d4835004e56ff6b4c01152afbe15bc591c0fe9d39d7ccf3eae659170528a86915c085b5a2019c071e4611898c39599ed5e1b7f41 SHA512 57ae9a525d78da3c25ff41bd90e1fca0411bac2135f11bd3f29184dcb573bcdf2ca63b62458bf7332506991b9d9d5a75e25034ca6aa598a45aea6e12a28f78ff
-EBUILD activestorage-6.1.4.6.ebuild 2042 BLAKE2B be18bb3355be7c7f0bfdb5edd8e4bf2af211769f0ca741abcd275c7e96533926fcc72048a9c753a4e29b22fd8cca0919f782bd6840d6676452bef8caa9243cfb SHA512 4bcdd75b98784c4e93606a73ab0fbcc28457ad6c929be849d242d72303bd2e4286f4c6281fc36bb65682534c167ed1d4a7ef87b761102b701f13f71de0cc7e0a
+EBUILD activestorage-6.0.4.8.ebuild 2166 BLAKE2B 0f6f53ab9169d78d9f52cdfe2c0c99528796c45236333ae6f32a925c2304e529237aef43ce6c5da7c08a0412abbf15f5a9226e4e36ff48f6beb94bb0dde73136 SHA512 e011807067d6ead349412c1c5a993bdb7b085ff380edcf022d40032073b24aae8dde0195f4d5b364444fecd06fef369532e682c7b4e61681747bfdb2d5648b44
+EBUILD activestorage-6.1.5.1.ebuild 2049 BLAKE2B 843e293c3ebbfa45f11bb1f8e5119b956466e8f1dc37dca62dde9cb0c8510117d6ede7e93df63040e1e1fcced5085f66018e818582b27f94f8aaa7a3085d507c SHA512 302a8e5c7d516b83795b2fe19f91d74d32d334ae2897e93d6d88a6150b1909886e0d530dd5306ef749cbd22456b3457619b7eff1047a6f4c43b346615915a8e0
 EBUILD activestorage-6.1.5.ebuild 2042 BLAKE2B be18bb3355be7c7f0bfdb5edd8e4bf2af211769f0ca741abcd275c7e96533926fcc72048a9c753a4e29b22fd8cca0919f782bd6840d6676452bef8caa9243cfb SHA512 4bcdd75b98784c4e93606a73ab0fbcc28457ad6c929be849d242d72303bd2e4286f4c6281fc36bb65682534c167ed1d4a7ef87b761102b701f13f71de0cc7e0a
 EBUILD activestorage-7.0.2.2.ebuild 2468 BLAKE2B 7d7bee4258b13812247e55b0986f862080020a10c4f11c31373aaafd8b7abda740a8c3bf5d4808c07bdfde14d989d2452bf2072720b804bfb241846ffd9e7482 SHA512 94551935e2242e3e86ba8291cd2e22f98bdb573599ea2ae8bd1a8f8ba19d3ddce5cdd070df31d33b5ff480d0e57bb1d4fda089a3ee567cdfb56ec087363c6322
 EBUILD activestorage-7.0.2.3.ebuild 2475 BLAKE2B 9eb0730624ccd559c66123af846c21cf18ca71c020fc871f1b4cb0b20fd9254a21f35233b98b91dcb697a07478ba3535e8d86efda4d636ccee8b2dfebdf564f8 SHA512 375a0f524fe77750397236e78a76bb8f4e10db415b3d2cd65b96e3381fb484fc9f83430bd3135d8161eee9875a00c976b762abd049747f0e07b91a5b35de59bc
+EBUILD activestorage-7.0.2.4.ebuild 2475 BLAKE2B 9eb0730624ccd559c66123af846c21cf18ca71c020fc871f1b4cb0b20fd9254a21f35233b98b91dcb697a07478ba3535e8d86efda4d636ccee8b2dfebdf564f8 SHA512 375a0f524fe77750397236e78a76bb8f4e10db415b3d2cd65b96e3381fb484fc9f83430bd3135d8161eee9875a00c976b762abd049747f0e07b91a5b35de59bc
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activestorage/activestorage-5.2.6.2.ebuild b/dev-ruby/activestorage/activestorage-5.2.7.1.ebuild
index 443f3b9ac6a7..443f3b9ac6a7 100644
--- a/dev-ruby/activestorage/activestorage-5.2.6.2.ebuild
+++ b/dev-ruby/activestorage/activestorage-5.2.7.1.ebuild
diff --git a/dev-ruby/activestorage/activestorage-6.0.4.3.ebuild b/dev-ruby/activestorage/activestorage-6.0.4.3.ebuild
deleted file mode 100644
index 4f45ca8b516b..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.4.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	dev-ruby/marcel:1.0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	   # Remove items from the common Gemfile that we don't need for this
-		# test run. This also requires handling some gemspecs.
-		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Skip test that has already been updated in later versions upstream
-		sed -i -e '/resized variation of BMP blob/askip "broken test"' test/models/variant_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.0.4.6.ebuild b/dev-ruby/activestorage/activestorage-6.0.4.8.ebuild
index 2655d687a077..2655d687a077 100644
--- a/dev-ruby/activestorage/activestorage-6.0.4.6.ebuild
+++ b/dev-ruby/activestorage/activestorage-6.0.4.8.ebuild
diff --git a/dev-ruby/activestorage/activestorage-6.1.4.6.ebuild b/dev-ruby/activestorage/activestorage-6.1.5.1.ebuild
index c613c84ed18d..102dbabfb7ed 100644
--- a/dev-ruby/activestorage/activestorage-6.1.4.6.ebuild
+++ b/dev-ruby/activestorage/activestorage-6.1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
diff --git a/dev-ruby/activestorage/activestorage-6.1.4.4.ebuild b/dev-ruby/activestorage/activestorage-7.0.2.4.ebuild
index 97d4734e1c15..cdac79348cac 100644
--- a/dev-ruby/activestorage/activestorage-6.1.4.4.ebuild
+++ b/dev-ruby/activestorage/activestorage-7.0.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -43,19 +43,25 @@ ruby_add_bdepend "
 	test? (
 		~dev-ruby/railties-${PV}
 		>=dev-ruby/image_processing-1.2:0
-		dev-ruby/test-unit:2
+		>=dev-ruby/minitest-5.15.0:5
 		dev-ruby/mini_magick
 		dev-ruby/mocha
 		dev-ruby/rake
+		dev-ruby/sprockets-rails
 		dev-ruby/sqlite3
 	)"
 
 all_ruby_prepare() {
-	   # Remove items from the common Gemfile that we don't need for this
+		# Remove items from the common Gemfile that we don't need for this
 		# test run. This also requires handling some gemspecs.
-		sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
+		sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\|propshaft\|sprockets-export\)/ s:^:#:" \
+			-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
 			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
 			-i ../Gemfile || die
 		rm ../Gemfile.lock || die
+
+		# Use mini_magick since vips is not packaged on Gentoo
+		sed -i -e '/mini_magick/aActiveStorage.variant_processor = :mini_magick' test/test_helper.rb || die
+		# Avoid vips-specific tests
+		sed -i -e '/\(resized and monochrome variation of JPEG blob\|monochrome with default variant_processor\|disabled variation of JPEG blob\)/askip "No vips support"' test/models/variant_test.rb || die
 }
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index e02e04c22bc0..c507a705a06d 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,27 +1,25 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
 DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
 DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
 DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
 DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-EBUILD activesupport-5.2.6.2.ebuild 2544 BLAKE2B cecb4991221da7198484239c53415b48b63935b824442618e68432d6a8829c9457099039ca5abf4eb55c7e8fae102e166cc62e7f586ea28d2c4d87f08dc381ad SHA512 cad7bb189a674e718d768aaecb9253864ac1b93213b52aaae70d71e6351988dffef1cf5241b71a83a4fd1e82bf2ae05ccae17ec8458c3eb9474064a9be7bec72
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 EBUILD activesupport-5.2.6.ebuild 2542 BLAKE2B e35b58d232635db20c433dcf8237da6f990462f6c974f2d7a43a3b83bab0a60369d41e4827f54a03014411959952e27d41b333d7b3e1c9fcd0bc7e2d83a1035c SHA512 a242ec95b4068ed86bd5085c982a2c017f4e8cda427b5fd9b9af715db5d7ac57192f6ef117f8b2d850bea3a2bb8c2befea2dbd5a65916090f8fbeb1e9804802c
+EBUILD activesupport-5.2.7.1.ebuild 2559 BLAKE2B c09a8886f4da6f8c762c5a92ee99e37a5e97d1e378d73a913d8a171114c90c4b9e029900876a3c4b203f5f62e573e76473eac11efea755888500e670dab7bd5c SHA512 a68fe114f59d46131b7353fc728773a1e3823cb7c71e5d39043a896ac99911430e18ad534b77178f297f5e21199aa40d29dc4d530e4b704895819240f6b4b078
 EBUILD activesupport-5.2.7.ebuild 2567 BLAKE2B e6a79f1d878bc8254fc0478d1cd220e298a62ac64a0642c41c63037355949ca4f260745b9532c6a2ac23fb98d1a603e2c09cefe06582e22d613587cc5647b3ab SHA512 8d286efed8835abaefc125b0c83494fb45c35dce04e77115b0372d91f17109aaeda327ede229616d4648b24e286985a175bedb646ac865218f6e9c305bf874f2
 EBUILD activesupport-6.0.4.1.ebuild 2577 BLAKE2B c911f5ec8f7d00f4f40f67c5fe2dc84804d8b260d771e0511ffe325c9452d3a53497458b6cea8d02706f52080512c59e76dfb3620a331634b824f04b796ff81c SHA512 cb3ca951abce0c852ce23e324494d684f6b30146062c8a9a87ce67e2e5856b233d32514dafadd01a3087a6c21527ef32d64f3b259c584ca70555e0fa0c0c0fd0
-EBUILD activesupport-6.0.4.3.ebuild 2572 BLAKE2B 8b792d3a11fb86a5d4c46d275494ed4854f494d9ed5787192614dd332b4e87950754591624bb69c21abe8a6f063959875f84bd3c67e2e71db4c82e7710565f24 SHA512 41b75ae9cbc129ec82db280df1f566357992f9bf24aff400320dde567a985a5a16ceb4dbac3e3685b3ff622ed051f1587a5c406fb397e6a2c96fb83147af5992
 EBUILD activesupport-6.0.4.4.ebuild 2571 BLAKE2B 7d26d5bbb0973f316862af5b0b590e6c4b0d3c14a4e528675ff936a6d63049a3daaf77076ca8f51689f6ff986ad5804b090c4b8f56b4e82b65bfc7357b00a8a1 SHA512 36e5ab500a30b0d1a05ed3e16af03e080121b2c11a8e6e76119b6eff6cf544eb975c6f94c41ac17678923dc094d13585e271a2819edc3051d5101d94d7f0d249
-EBUILD activesupport-6.0.4.6.ebuild 2572 BLAKE2B dee68a83d5fdd2e464c76e652018cd2a04f2fa6f8c7e6633491fc12873fc68f2ab0eab0444a282af9a59bac4507e403814827bfd033abd738c310c5d331818fe SHA512 6f4611d5e5919e221b4404008e472590ababcf3e05bd13b5869b7179269ab52110dfdab4605edb353ce9693f091772d47e76003794c5f9b4327e448c4d46193d
 EBUILD activesupport-6.0.4.7.ebuild 2595 BLAKE2B 9ca5342c7e9de1ecefe1dd832321c38c22f0d883426225769cb363329e6f93225d8a8c0028b5aa8a70a7cde4455c161b2bcbd4bbbc84339b860dc955f36bac76 SHA512 6d1efd335f20ebb1c45c645dcd43518f3be79dc73af876109c8269b8a4c217de76b130aacbceed01bacf347cb1f697b6b3d3b1d20620ccea7b569aa82b19fad9
-EBUILD activesupport-6.1.4.4.ebuild 2666 BLAKE2B 0e72dacda9bdf7e913a6216e63d26161d580d7f06fcccc11f97b484c6b7daf0b8d85ebef6bed59dd306d7095bceb49510257771f7e8d95e88d5cec6626af1b94 SHA512 d560d2423471f719129ddff2190078fbb1ee4c9670f538aff8c04ae3d47050d86cacf112dfdef5ab98a688f3e113fc55bbd8d29ff47ab3dc9e6cc4567577599c
-EBUILD activesupport-6.1.4.6.ebuild 2666 BLAKE2B 10f2e670ec335dde229cedf1c69f1aeae0d2a3484df2d2ced1d05841d6943d5572ab2d10365c72280eca8494544977ad559c88a2ed9dda33f7d2cf17e13690aa SHA512 4cdedeba4fe08110d8bb680e39d9571a5f8fde55e9fcd6cf135bc3b04467b5320dd98577f4421bad81bdadb1f0008077514b24a2701824e9a69cb65309f158ea
-EBUILD activesupport-6.1.5.ebuild 2673 BLAKE2B 07924dddc38963aa6e01c4a8a8131bf3ed07cc0014ec7b7bdb7a6489af9180ae01bf4ec8d0f176380837bf30b3d4c7e66c9cd010e25c45ac48f4ae238d37457d SHA512 b758812ced335a644736e3d8e0633677dda56593d19a1b0731df90fe98ee13fd2c2921fc9a72b55e37c36005d7c85b8e37de75f0c91b05ab3da35f861903504c
+EBUILD activesupport-6.0.4.8.ebuild 2594 BLAKE2B f863950cd753d007919595ab4235a65b411ee0f576cb01b733c6719d9024fc338bfe7089caa09ceb95cc52f7484598cbbcc7cfc0d5be1e828172e26457239820 SHA512 e6150ca20fae74de1a239523d5ba306b38366eba1570e712da0685bfd47b7d05bc49dfe51a51d3f4d8164d08a3439e84c7b2004ba27cdbf56131a8dff0e8e5fb
+EBUILD activesupport-6.1.5.1.ebuild 2686 BLAKE2B 64ca20f79b35e3122338d86e561cfe94ca26043aacee60846cd322942126771c914eb55b3acff504d25e197b62e08e2dba587fe63add53729a2967f5a6810ccd SHA512 1671dadf7797a7edc97f55cca0067ff544d4293ca39a6aa2cbfc9fabc25c8e51cffc7c854f5906054aadea45c4843dc76a2b693e04602aaf92def5b377e101f6
+EBUILD activesupport-6.1.5.ebuild 2679 BLAKE2B 0943d17143645d51a64269f7a1227dd74621b9d381a0724f5ca9f393dcb1dfcb210f419fe146e01faea20d296ac45cc9ca2633a9e21034235f20f8f31f916be5 SHA512 4c79f4fb00dc2e8d29e2a08751ce6d3fb48affd8cce268c9366e2ee6ca81543ba09e16489e3d3b8af9cd8b7b036fa807c69d49eeaa50d6727b0bfa445a2bc30f
 EBUILD activesupport-7.0.2.2.ebuild 2634 BLAKE2B 20a361f65ee46633a929f89198ea014688fe4f461c90c2fc6c36e800ee8e8192d02021bb64aa0e547d9aa0da288594c7f65d08ed4262810a9b143a038db8b478 SHA512 c75a5ad29150d369473f0a8089e25365436e6c01b680c43b52adef3a670cfa16fbaaf764233c8b32e54f034f10f89a6552e7e97e9811033c7fb19b77062eb093
-EBUILD activesupport-7.0.2.3.ebuild 2641 BLAKE2B c5c1d43fe279f50f6daca102ff58f512a9ffb27d7a7b9d718ca29f231756ded6376c790d9a16954cc1d2fa3e89d6ee2ebd05a89282ad27562c21a06f14385062 SHA512 b7796a98bc83ef3ae28cb10305620ae39b6cb30cdd73cb9aadf9dcfd77a870e09df1a45381be13194f9abb2295565eee9dffd20d42ec54f623c38668cbfec2e2
+EBUILD activesupport-7.0.2.3.ebuild 2647 BLAKE2B 1ba06dda035f25868903d4cd18a651f539f2750d6d119fb983080e4d1cd5a5ac754b517ac46a7e1a1324970b7ff0dd04b1371bd2309422b51761c8b8f7355587 SHA512 bec8593cd5a925aa1c9bd8e89d11fea9184bdf804986369c064a19f5d22e4e9edb8f1dc5062762f88392f56c8cc597df77d57e5387cfc6ff6d41b664979838e6
+EBUILD activesupport-7.0.2.4.ebuild 2654 BLAKE2B 18b341807ecfc5657b2f75d6649f5e4fa21aa02d976146c4b873796482f1cafea278f0dfd0ffdcf27985c08e2394736d3ddd625b74410cd14b7eb7fae1db0ae3 SHA512 977b8788acd684828c64cc854d633eb55247037bd41e876b94b99385e11535ef34e710dc40cb240656a5c52bd724e11d3b2bf546580dc09c7bf307d67d554562
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activesupport/activesupport-5.2.6.2.ebuild b/dev-ruby/activesupport/activesupport-5.2.7.1.ebuild
index 840a994edda8..a3e5ad214065 100644
--- a/dev-ruby/activesupport/activesupport-5.2.6.2.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.2.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby26"
 
 RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
 
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -57,7 +57,7 @@ all_ruby_prepare() {
 		-e 's/gemspec/gemspec path: "activesupport"/' \
 		-e '5igem "builder"; gem "rack"' ../Gemfile || die
 	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
+	sed -i -e '1igem "tzinfo", "~> 1.1"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
 
 	# Avoid test that depends on timezone
 	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
diff --git a/dev-ruby/activesupport/activesupport-6.0.4.3.ebuild b/dev-ruby/activesupport/activesupport-6.0.4.3.ebuild
deleted file mode 100644
index 2172557e84f9..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.4.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.2:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.0.4.6.ebuild b/dev-ruby/activesupport/activesupport-6.0.4.8.ebuild
index 50fc1ff5c4cb..8a635120c3c3 100644
--- a/dev-ruby/activesupport/activesupport-6.0.4.6.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.0.4.8.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -57,7 +57,7 @@ all_ruby_prepare() {
 		-e 's/gemspec/gemspec path: "activesupport"/' \
 		-e '5igem "builder"; gem "rack"' ../Gemfile || die
 	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
+	sed -i -e '1igem "tzinfo", "~> 1.1"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
 
 	# Avoid test that depends on timezone
 	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
diff --git a/dev-ruby/activesupport/activesupport-6.1.4.6.ebuild b/dev-ruby/activesupport/activesupport-6.1.5.1.ebuild
index cfa49feb955e..f42cc171e0c8 100644
--- a/dev-ruby/activesupport/activesupport-6.1.4.6.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-6.1.5.ebuild b/dev-ruby/activesupport/activesupport-6.1.5.ebuild
index e5022b82fb44..af3f42e0b0bc 100644
--- a/dev-ruby/activesupport/activesupport-6.1.5.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.1.5.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-7.0.2.3.ebuild b/dev-ruby/activesupport/activesupport-7.0.2.3.ebuild
index 578da2a557be..0a0ffb05e4cc 100644
--- a/dev-ruby/activesupport/activesupport-7.0.2.3.ebuild
+++ b/dev-ruby/activesupport/activesupport-7.0.2.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-6.1.4.4.ebuild b/dev-ruby/activesupport/activesupport-7.0.2.4.ebuild
index c6f8f6598edb..111aab567962 100644
--- a/dev-ruby/activesupport/activesupport-6.1.4.4.ebuild
+++ b/dev-ruby/activesupport/activesupport-7.0.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -29,13 +29,12 @@ ruby_add_rdepend "
 	>=dev-ruby/i18n-1.6:1
 	dev-ruby/tzinfo:2
 	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.3:2
 "
 
 # memcache-client, nokogiri, builder, and redis are not strictly needed,
 # but there are tests using this code.
 ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
+	>=dev-ruby/dalli-3.0.1
 	dev-ruby/connection_pool
 	>=dev-ruby/nokogiri-1.8.1
 	>=dev-ruby/builder-3.1.0
@@ -51,12 +50,12 @@ all_ruby_prepare() {
 
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\)/ s:^:#:" \
-		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\) do/,/^end/ s:^:#:' \
+	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|propshaft\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\|view\) do/,/^end/ s:^:#:' \
 		-e 's/gemspec/gemspec path: "activesupport"/' \
 		-e '5igem "builder"; gem "rack"' ../Gemfile || die
 	rm ../Gemfile.lock || die
-#	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
 
 	# Avoid test that depends on timezone
 	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
diff --git a/dev-ruby/addressable/Manifest b/dev-ruby/addressable/Manifest
index 7fbc1630abb4..234863ca2714 100644
--- a/dev-ruby/addressable/Manifest
+++ b/dev-ruby/addressable/Manifest
@@ -1,3 +1,3 @@
 DIST addressable-2.8.0.gem 105984 BLAKE2B 82f053c9ad052ce1ed1b6927674bd5bcda86a3f70d46b63bfc1185d51b402996fd446647d705418791c5443a1767b4ecd0b891f26de63fbe737c62f7586bd57c SHA512 c684f17940f717c2a65f9716ab9b3659948d6d51a60c38a7295fcf6fdc1c5785d2d315d2de7dab9f66a6c31f62247177d78d5d6eb556f5bb49926d4f00f8e4c8
-EBUILD addressable-2.8.0.ebuild 1314 BLAKE2B 8ac6ff2554c85ca456a5e01c8f201bef716ff3b6ffe586cd30f608bbf41d96f9d3ac097e48ceb3b48e82454965280fe6539bd35155cdb34a1db71aa3711f02d8 SHA512 d5843e27646b5bf2209d87eb5a77738e678fb7694158b3136a5d2b19ea935521796454909f1474cdbc83a7e5ac3197fcfc281eb8c5e820c306d1c4e6886c5569
+EBUILD addressable-2.8.0.ebuild 1326 BLAKE2B f1397f7fbc1db9fb70f35ce94d638944f8a2de7087cc17ee54b9431ff6e833ea7276f6c5b519f52cea5f8ac4b16aa10f6258edb0d4e38f2c7dcfecc562ecb61d SHA512 0c3705eafd8efe812a1a8b07c5aaf78037980e1d8c8168cf8946b8db8b2bab60ffd9f103d97ddc80f8ef667f2df1a8d7da7e383b5c4ef958f5a130bf780be726
 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 7ecdc7778419..1a492303bd01 100644
--- a/dev-ruby/addressable/addressable-2.8.0.ebuild
+++ b/dev-ruby/addressable/addressable-2.8.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/a
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+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 )"
diff --git a/dev-ruby/afm/Manifest b/dev-ruby/afm/Manifest
index 76d4ce0c810b..6f2fb8861cd0 100644
--- a/dev-ruby/afm/Manifest
+++ b/dev-ruby/afm/Manifest
@@ -1,3 +1,3 @@
 DIST afm-0.2.2.gem 17408 BLAKE2B 79f11d6663408893036f7894ef4c88336d1239865cca6a94aa67ff97366c5204356501ace90f8f6665f0e73a1af6a12f4f6da04529abd9dde73ada81e878c0dc SHA512 9325ec0baee12194253e053d162fae252c65e452d38ffb592908759c29669d1938dba877e152988b6acd25f556514936c8dc09895762254483aadf46b09858f1
-EBUILD afm-0.2.2-r1.ebuild 579 BLAKE2B 3def6433a5142367d0a6a6d0489f85a85cac728091dde65fac43e10f35191a4fd12a8a6f40b0195f832c81e250ac66aed9694fd638b4d161eec00cfd686c0cb8 SHA512 adbe326a6200997b72d9318c5c4025d7c280b88c6a52a4888b48f0db6d283b6e78fb993ffff4e4b1c0a1434fdf1ca4115521c7f139bebb160ac12e45e8a478fc
+EBUILD afm-0.2.2-r1.ebuild 579 BLAKE2B f34e332fad16ab9fdc866f29911e8645e117c0415b70c11eebaf6403077b654e66376ad0922c038ca13c1ae8b21401b1f23fd3a357a9761329c4776d2798e8ae SHA512 c3cdd2d6a8500d2f4a7edce0704266c3be04e227fb9e5f0bfd0ae9849504862660352894f3eea986457e4a6e6529f930442d0b739814c89b299925cf8d1d937a
 MISC metadata.xml 339 BLAKE2B 75b027a06c629f9c7c3052adc73134f4a68870fb2a39542182cd59a87edd862db055bc79426ed4c58e15f4ef6d8192452f2c6c55b02e604fcc6fe399871e11b1 SHA512 b512d24792db7186991a0e94f8cd4712e44d0d82ef642976fb4b578ec56da3fde1f6011831acacbba22ab39abbc44d9554c15868a8c2c7520ca88cd8b232605c
diff --git a/dev-ruby/afm/afm-0.2.2-r1.ebuild b/dev-ruby/afm/afm-0.2.2-r1.ebuild
index 51fbde2f60b2..753750fb5ffc 100644
--- a/dev-ruby/afm/afm-0.2.2-r1.ebuild
+++ b/dev-ruby/afm/afm-0.2.2-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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
 
diff --git a/dev-ruby/airbrussh/Manifest b/dev-ruby/airbrussh/Manifest
index 7c83780e521b..d61e1456ff7a 100644
--- a/dev-ruby/airbrussh/Manifest
+++ b/dev-ruby/airbrussh/Manifest
@@ -1,3 +1,4 @@
 DIST airbrussh-1.4.0.tar.gz 1450070 BLAKE2B 94f128cd25c5af48f17fa771c366d3cdf744dc4e7ccef23de583b1ed60ffe1640dd7d02d76fb78573936beb3412c277151b36a870ac3e11222c3135f34b0e140 SHA512 e3a5cb80365a963875e89d15fa2b4dc86985d6b5f13ecfa9baf9ad599b5780ef8ea2c2e4040bb35498a5ecd1c6becb081b3e917cfe082d2db63fd74ba54755b7
+EBUILD airbrussh-1.4.0-r1.ebuild 1003 BLAKE2B ff926aabb611e45e4905bd63b17958fdae4f2c04a2672cb5406065abcfc9c2c8d2cb74729141cb4ceed4eb8f603124b7b2cb42d7566f20f01487c1e629c5a5c2 SHA512 6e9d33da14942670d79cb5b1cd891e4ae201f75f05551cc344bd1512a2ac2a40a4f3a2b225f55ab34ab057d21c2131d7508e73ffc31471a09584cf6d82a16033
 EBUILD airbrussh-1.4.0.ebuild 889 BLAKE2B a2b6121b61bfd7a21e2c1942be0ed9cae00c8ff2a62ead036a7a00c7125ebfe46855ecefb9fd278b57b13e603d3a505e93fab81481b9d394e1d5fe95b11c195a SHA512 2a6280d45b3d9684d0bdc9369895bc7bb024a2c54e8cafc5aa9bae566276a64854f91960f18daa2043d4124afc7930af893c3b17c3c7d89f888e504fda9dca20
 MISC metadata.xml 396 BLAKE2B d27f0009de40add27cbe4a8a668ac4a82fa98eef30d794c61add8ad293db7e6b76c948499646c1dc23046cd4d88cfb36b41c1c14ebf78316ba6a4547493edb87 SHA512 98a3ccc2e6734e249cfb13754015cbd79485d20bc018312f7ff8500fa3c011db88c3955990a97da714dc6af7a6c94196057839eb76fd1612f30dba9e623ee0a6
diff --git a/dev-ruby/airbrussh/airbrussh-1.4.0-r1.ebuild b/dev-ruby/airbrussh/airbrussh-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..4915591df832
--- /dev/null
+++ b/dev-ruby/airbrussh/airbrussh-1.4.0-r1.ebuild
@@ -0,0 +1,36 @@
+# 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_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="airbrussh.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A replacement log formatter for SSHKit"
+HOMEPAGE="https://github.com/mattbrictson/airbrussh"
+SRC_URI="https://github.com/mattbrictson/airbrussh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	rm -f test/support/minitest_reporters.rb || die
+
+	# Add missing require
+	sed -i -e '1irequire "rake" ; require "rake/task"' test/support/rake_task_definition.rb || die
+
+	# Avoid a test poluting the environment
+	sed -i -e '/test_color_is_can_be_forced_via_env/,/^  end/ s:^:#:' test/airbrussh/console_test.rb || die
+}
diff --git a/dev-ruby/amatch/Manifest b/dev-ruby/amatch/Manifest
index 4c81e210bc42..d8b4d3879b0b 100644
--- a/dev-ruby/amatch/Manifest
+++ b/dev-ruby/amatch/Manifest
@@ -1,3 +1,3 @@
 DIST amatch-0.4.0.gem 38912 BLAKE2B 065b4c537a2727cbb7f7d52aff545a3f7f8434b37553e59b261d9760ed304c24a20e4778c375e7b7fa11f40655cac786ca15cdb11360ac7296f03186439be480 SHA512 c5a1d17b46f51796d3f082ab9d18845625a28e08339756ebc0689ad6c50b1406611fd5a316e628e4dab6d9b654c969a4fc6e8c2b2079f04c64e3d990e95a64a0
-EBUILD amatch-0.4.0-r1.ebuild 836 BLAKE2B ee9bc7ea8d7fd3dc2aeba3a51f3c59c06186dd6e7a01b4f8716374985478554d68b5cb4093216e8723de2b3cf4ebfafaeb141c182a45cda85df09f82bf59f82a SHA512 1766cb652e1d07c1ae3a7960f7ff4b1410298d9c1beebc5a77ceb3f8de3a34c20fbf9640bade6a44d744d6b2b8c3c8606892370899758ac53bf9d79baab102c5
+EBUILD amatch-0.4.0-r1.ebuild 843 BLAKE2B dc01955a1aa62dc6075cd9b0a40163e2a70194da5d38abf36090634fb9e743e156bc8c737cfb4e2f0a3c5de150d9d9878d8581264499ffee8631d3206bb3d820 SHA512 78263e9d537f8f0c0f42349120ae76a8b18430e63774e7a31e1fda7e26e753784f63ede9e610c9845304fb54b23afc3f256798f14b178166c5f703f32d7c5b7b
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/amatch/amatch-0.4.0-r1.ebuild b/dev-ruby/amatch/amatch-0.4.0-r1.ebuild
index 80c571f78f69..c435a13d7944 100644
--- a/dev-ruby/amatch/amatch-0.4.0-r1.ebuild
+++ b/dev-ruby/amatch/amatch-0.4.0-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
diff --git a/dev-ruby/annoy/Manifest b/dev-ruby/annoy/Manifest
index 48b41e231222..0cf211e2c992 100644
--- a/dev-ruby/annoy/Manifest
+++ b/dev-ruby/annoy/Manifest
@@ -1,3 +1,3 @@
 DIST annoy-0.5.6.gem 9728 BLAKE2B e8d4c8cef99be2a380c96fa596547b108a2ed7d8b9e8f996bf8bad163d8030c73c627a17afd564cbf446660bccad1a0287c6a05db9e6d68db8b55e20a5a6bbd1 SHA512 6cade9d766fa315042ba04922bba315157872a25bc2c7e5ea428c1f2343045d0a5d400dc8eade20f650f2cc6a64492020ef608d355963c09c5e6e8d454d3cc8f
-EBUILD annoy-0.5.6-r2.ebuild 508 BLAKE2B e8ac897822689076d274741dc040e85a49edb7320114ab3273df4ee6e5fa272747a24d256c9f1f081e64a809059c030cc0282e3cc4380fb16ab9bb03ea3887ca SHA512 221dab3f5705c0498035935f8a1d681d026948e205494508ea63aae54b2a48fda12d5cb7244cc2107d835df568408dd05db117c9c6e05b978f3fce55529b909c
+EBUILD annoy-0.5.6-r2.ebuild 515 BLAKE2B a3b9f2c27aa8731a993522ce8e619465fa055bb7f0084f89cbc595fa3a338788a89331f069ce440644b9b170329225ca750934b00a838832bb1db6450529fdae SHA512 deab5cf0c777a92578180c3ffac32d0c3100b7a868d4dcf0a84acfa39c12a0a10fe0b9872a7f355d164d29d8b668888fed44a55ef43473b09affb5210339e749
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/annoy/annoy-0.5.6-r2.ebuild b/dev-ruby/annoy/annoy-0.5.6-r2.ebuild
index 90a6c8e64eb0..57484bc869ab 100644
--- a/dev-ruby/annoy/annoy-0.5.6-r2.ebuild
+++ b/dev-ruby/annoy/annoy-0.5.6-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/arel-helpers/Manifest b/dev-ruby/arel-helpers/Manifest
index 7c79c501c1d5..9cd018d22a92 100644
--- a/dev-ruby/arel-helpers/Manifest
+++ b/dev-ruby/arel-helpers/Manifest
@@ -1,7 +1,3 @@
-DIST arel-helpers-2.12.0.gem 21504 BLAKE2B f2897b70e679df8a58ace7b88204a3345a2f22bedcaf13ef27f4176a5f02a716e9c7a0b09c3d242c8bef96cc6423a513820d20b15999415d99eb3d61b3b93889 SHA512 6da9d69b49d18f70dd911a5f1cf6edb29055423b6179858ae65f8f826f9c98fae7b9d4a7d6f1365c5efe382adbaeb42f30898c2329b721941428b0a6f58b3aef
-DIST arel-helpers-2.12.1.gem 16896 BLAKE2B 32809d895c630d8c5d3d1bfadb70d4b37fdeebe41dd3be303abd20295cb06e210ad48db8996673d5ca851e247420bf65ccbe0a7b3da352943e56094b38937911 SHA512 6d10bd57d74ccf1780927aa1fdccb4697a2e9cdbdf93bcc392b9453890043a8a6a4b57bef25d43f1f7d1597ef92d938afa9c67c54140b9e0b36b7b23c2de1837
 DIST arel-helpers-2.13.0.gem 16896 BLAKE2B 3cdf4164b20dcc3511e058666486ea0d5a5eb50a7825d56338715f5bdba2dc5124ba030ea0e27480225be9d715a86016ff0eb85d0e60f07bdd5f3f214c3f5bcc SHA512 31e88e136a85f49e6b8b6d7c244bf98744cdf0546f0916ff1b403904330a1d2acc4a4d97ba5eb59190b9c0592176e4872d0463b4d4662b63a99f9d3bbcc29c15
-EBUILD arel-helpers-2.12.0.ebuild 826 BLAKE2B 2888cd55047b4b42a114e80abcd301373fbfeaeeec8b6c05598c7afd273f9138f447944602dc8515d9d240e9c3abd51e5042e45a9020f42739c635d3a2c6a5df SHA512 92964c801c801c379717eca89429524215dea3d1f7a3f555597a189aa2cc5f8f330f9ef5df817dc74369e3b780ff090920092eec8d1d80f17ca5fea93f88a100
-EBUILD arel-helpers-2.12.1.ebuild 819 BLAKE2B a308c185656509a320fd17400f1dc93399f87993886c5a0885cce27658576382d8d013545566d2af56044220672423934140b2c4165cf874faf0f2168903530c SHA512 2d57053686ccb6499a37ec2b7649082d2682aee4331d2f318c31c42f7c04903b04cc107d711a4bbe7f711bd01f7310eb397c2c9861506e0069f88bdc82f8a83c
 EBUILD arel-helpers-2.13.0.ebuild 819 BLAKE2B a308c185656509a320fd17400f1dc93399f87993886c5a0885cce27658576382d8d013545566d2af56044220672423934140b2c4165cf874faf0f2168903530c SHA512 2d57053686ccb6499a37ec2b7649082d2682aee4331d2f318c31c42f7c04903b04cc107d711a4bbe7f711bd01f7310eb397c2c9861506e0069f88bdc82f8a83c
 MISC metadata.xml 345 BLAKE2B 4f44dad77778d15d8011c1372ed51e02c20313b118be5abf981c5f4727da135ac60218922c264b4a95ca7c8410893c8e105fbe39ca0c15951ec8f6063b1c577f SHA512 6d8f2dbb987e8a105515d4af49c2913aadfaef04c424ac2b4bc449ea3c7d37f283bd44f7d0225caba26774b9c71c8a73a1e38eeef6b82c1d849984d203c0f6b5
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.12.0.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.12.0.ebuild
deleted file mode 100644
index 90fe06a86ca9..000000000000
--- a/dev-ruby/arel-helpers/arel-helpers-2.12.0.ebuild
+++ /dev/null
@@ -1,38 +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"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools to help construct database queries"
-HOMEPAGE="https://github.com/camertron/arel-helpers"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "|| (
-			dev-ruby/activerecord:6.1
-			dev-ruby/activerecord:6.0
-			dev-ruby/activerecord:5.2
-			)"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rr
-	dev-ruby/activerecord[sqlite]
-	dev-ruby/bundler
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/pry-/ s:^:#:' spec/spec_helper.rb || die
-	sed -e '/rake/ s/~>/>=/' -e '/appraisal/ s:^:#:' -e '/database_cleaner/ s/1.8/1.7/' -i arel-helpers.gemspec || die
-}
-
-each_ruby_test() {
-	bundle exec rspec spec || die
-}
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.12.1.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.12.1.ebuild
deleted file mode 100644
index 2ce0bc2f3056..000000000000
--- a/dev-ruby/arel-helpers/arel-helpers-2.12.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools to help construct database queries"
-HOMEPAGE="https://github.com/camertron/arel-helpers"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "|| (
-			dev-ruby/activerecord:6.1
-			dev-ruby/activerecord:6.0
-			dev-ruby/activerecord:5.2
-			)"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rr
-	dev-ruby/activerecord[sqlite]
-	dev-ruby/bundler
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/pry-/ s:^:#:' spec/spec_helper.rb || die
-	sed -e '/rake/ s/~>/>=/' -e '/appraisal/ s:^:#:' -e '/database_cleaner/ s/1.8/1.7/' -i arel-helpers.gemspec || die
-}
-
-each_ruby_test() {
-	bundle exec rspec spec || die
-}
diff --git a/dev-ruby/ascii85/Manifest b/dev-ruby/ascii85/Manifest
index 5d03c1d76798..218e5a9ba856 100644
--- a/dev-ruby/ascii85/Manifest
+++ b/dev-ruby/ascii85/Manifest
@@ -1,5 +1,3 @@
-DIST Ascii85-1.0.3.gem 11776 BLAKE2B e08bbc089546dd3b91ff5fd85b8652dd6f5c06025c29ac67004bd7d4c7bb8fc38c77b604dd5a884970b05041e173f37eaf895f0bb9ac1947ce70e4f0cc54906c SHA512 b324ff06ea0cd46a679619a2bfca9f05c30ece9f0342f8a8d097841f3fb4dbb29cf4b6f6832742c50fe5a51895a9048308981be296466422269ce34c4d936f5c
 DIST Ascii85-1.1.0.gem 12288 BLAKE2B 637ee421b51ec8ee88f00c32acc4d05a818fe7a26ec9f512a207d5c2e8c9b99e9866b904451a2ae811f024cd26b810b3dfbc346b6d935fd135a2c2615f2453ef SHA512 f160dbc06f49aaf1c678ece5b94fab4c3878cf7fe6accc267e64505e412072cb28b9dc28ec1ed8bf01ddbd7c08c920d95fbe182f756072d614b9827f6ec50094
-EBUILD ascii85-1.0.3.ebuild 658 BLAKE2B c206728f056b8b15dcc05c6955e82cd60b4a0768f7c91aad57e2b6ed463ac64bd5ef15a4936b9ab8c6b70efea768e51ab7671b7022831dea7c6f08cdaeff3487 SHA512 8d0512f16345752ab93f2a724f42391c8c2363983d86ad624374256c4b08813303fd099dafad31c06f678da901e40fafbdeb6309bdb02759df6a4714942d81b7
-EBUILD ascii85-1.1.0.ebuild 658 BLAKE2B 9ddacfb3e938caf3933ef5827a25d092b62388138739e07f8003ce24c0391f5f97fa57f130f222a934dcc68b44899b0b9ced05a2a47a6d251aaa90ea4ea5a26d SHA512 f2615bd17400307d1dd8503e5bc458bbd4555fc19c929b56314fcd0075430459e3d9bd1c570b29a6a74f262b18a950931360b51003aaf56b37a7b037ef60f372
+EBUILD ascii85-1.1.0.ebuild 658 BLAKE2B 350c007dce597a71971b4bd635ebe08c44ed5152ebee7a3758be91cad0e4972257fc47f319666667c6f26c977c059fa096e997fecc3ac9e62395ea71100e0214 SHA512 d15452a137048eaa7d72c7d169970dd3c75e1cd8810e7c9dbc71c1ad54c6a0fddc80bbf2db43e0fc76ce4d23564c248bd9e605c297f39e0192cd81279d6fd392
 MISC metadata.xml 348 BLAKE2B 9b7110c73591321bc218f8be59bfae081ea4411a2293295e6ccfe661f9024677324a27bd6e37cb26209497561bcc058f90e6706a5a15bf6539cf3b35b346f55e SHA512 8979f0ed7b576f8ffdcb68a7242756fdaa86b7e80a8105b5632d6e677a386ffcd6fe6d8266d8a8b491db4c819b905ed4d9c8acd9bfaa82d75722cde1f151db99
diff --git a/dev-ruby/ascii85/ascii85-1.0.3.ebuild b/dev-ruby/ascii85/ascii85-1.0.3.ebuild
deleted file mode 100644
index 5ccf1f7ba102..000000000000
--- a/dev-ruby/ascii85/ascii85-1.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md History.txt"
-
-RUBY_FAKEGEM_NAME="Ascii85"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Methods for encoding/decoding Adobe's binary-to-text encoding of the same name"
-HOMEPAGE="https://github.com/datawraith/ascii85gem"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-}
diff --git a/dev-ruby/ascii85/ascii85-1.1.0.ebuild b/dev-ruby/ascii85/ascii85-1.1.0.ebuild
index 979829671885..c28d7b412d5a 100644
--- a/dev-ruby/ascii85/ascii85-1.1.0.ebuild
+++ b/dev-ruby/ascii85/ascii85-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md History.txt"
diff --git a/dev-ruby/asciidoctor-diagram/Manifest b/dev-ruby/asciidoctor-diagram/Manifest
index c4b871ad6cb9..73304fd5b58a 100644
--- a/dev-ruby/asciidoctor-diagram/Manifest
+++ b/dev-ruby/asciidoctor-diagram/Manifest
@@ -1,3 +1,4 @@
 DIST asciidoctor-diagram-2.0.5.tar.gz 12482984 BLAKE2B b0ef8596d2f2dfcf11fcbba876141aee38e8615195159f76e07b45c00b46bd85824dd6e8e9f571b396bbd9d082c5d60d4e05cdeac27719bfca53216c0d1b1816 SHA512 7e3bfbfb08d7389a039b1727bc173fca82e05134bebd89f3ca65d5e7860555034ff5e785c32e55ea2cc9826343456c6ecdfa15fc76f4d94858461356ab3ced71
+EBUILD asciidoctor-diagram-2.0.5-r1.ebuild 1024 BLAKE2B acc00fdff7b19a7fd4ab9bb3422e9b83d4fe261e4c7e640aebc88ab895e4e09a7e505e3e40097e37e5dab0d9def209c0d8142d1b44b54e57a15af5d60848d290 SHA512 3299d20354716a34e9ee45cd55581224f26157a7be81d2b6377db468ee2ad263527e3f860a61950971daa5019c2c03f7be16e77330ce44c2a4c1fbea9301f8d0
 EBUILD asciidoctor-diagram-2.0.5.ebuild 1000 BLAKE2B b6acfc52ca81cdf236bbcc6b7712e62ef9e82381f9d05f81cbb26a860c435eb477f8b14cc291939aec9c13ffc197591a45d2a67e8561ec70c2d4307b3c71fb26 SHA512 987dd89d93cd91f3eeae8082490971fb3797a4d3c17628c76952fb85ce2df2b43ba51bd0b7b49bf1661c5f051f731b420dde3bef0f5f62aa8cf98a28ab7ad972
 MISC metadata.xml 358 BLAKE2B 0a7ccfa951823c5c42d8ce280483f15e73abaf453c24b79b68bce29717bb3ae4e4656f40d7bc320479e65d8942bf43cb4abca9b9d916d2c27275880ef2034367 SHA512 4cb3cea3081700e1eb920452d2408fbf7ef730232e2979edc057c10b1ff879d14d97914765c644fc8d055c5705b8bb16b2a9651001733b102b8a05a1e72e1cdb
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5-r1.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5-r1.ebuild
new file mode 100644
index 000000000000..e19bb7db440a
--- /dev/null
+++ b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5-r1.ebuild
@@ -0,0 +1,38 @@
+# 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="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc LICENSE.txt README.adoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A set of Asciidoctor extensions that enable you to add diagrams"
+HOMEPAGE="https://github.com/asciidoctor/asciidoctor-diagram"
+SRC_URI="https://github.com/asciidoctor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND+=" virtual/jre"
+ruby_add_rdepend ">=dev-ruby/asciidoctor-1.5.7 <dev-ruby/asciidoctor-3"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/c.formatter/ s:^:#:' spec/test_helper.rb || die
+
+	# Avoid specs for unpackaged tools
+	rm -f spec/{a2s,blockdiag,bpmn,bytefield,dpic,erd,mermaid,msc,nomnoml,pikchr,shaape,smcat,svgbob,symbolator,syntrax,umlet,vega,wavedrom}_spec.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+}
diff --git a/dev-ruby/asciimath/Manifest b/dev-ruby/asciimath/Manifest
index e61b0e6625b9..d571882dc5bd 100644
--- a/dev-ruby/asciimath/Manifest
+++ b/dev-ruby/asciimath/Manifest
@@ -3,9 +3,11 @@ DIST asciimath-2.0.0.gem 57344 BLAKE2B 18cb2ca27a626bbb241768d070c47c981ae1f3a62
 DIST asciimath-2.0.1.gem 58880 BLAKE2B 6c17698f6515468c1c0b17408968f492a40a90cbec5184e78da8c9b9c23f2a6887f4d8ed1c99a68ed36489d27187dd73dc6ce992efc3ce144091131e36bc5e40 SHA512 e8c63e5f6035189460ac4975bb0471ffa418ba139ab806ae46badb74c1164d2852aef3aa799a0713a01486cea5c6087add6115ea22908bf3b70d1ab5fe339768
 DIST asciimath-2.0.2.gem 59904 BLAKE2B 2a8d57a606412be75ef047b5af29acb519b05026b12c6b691eab0630190706e00d1d8d65101d4397321191ad6d2c8f9e359e25994dd17302ff2692ebaa025a91 SHA512 53f573a9d7b01eded3c951b42a8353716679c189edd68129c49cdf0a719316f26d39ccf2704ae24c22dd64770bb8337553aa32d4f240bf1e249133ca95d849a8
 DIST asciimath-2.0.3.gem 59392 BLAKE2B 7d1d373c5d80172e88ba5737ea2244c384f274c200fed2104b23e76b6615f5bc987e14acb5c8d9088069f590eed5c645a2f51338540197a2ef9c44696f704488 SHA512 748c8ff121190470299c1e04100e063fd7352a0adaeda160a235d1f0f0ccb02108274ffe8ab4f1f54b07eb750d637e26f2efb6aac12d3389dafe1c00be103f4c
+DIST asciimath-2.0.4.gem 60416 BLAKE2B 9a5d6bf967962d37e620d0b49204ba8dafadf65e95a613924c7c169fee98f00203861fbbb1c06db1ee833e401f9a2141566dc693237e1cb7e797e639c63dccfa SHA512 28ab7fd7f43320112c0e7166fb2a6ef269eb91314940deb88606443bec055792cf3c49bc2d9b75c1e5ee5690c3071e66f15f817c4539fc6246da7a8d792f1803
 EBUILD asciimath-1.0.9.ebuild 463 BLAKE2B b9f363552ecf9a6c429280a4e17de7fb05d19efdf2e8a0e52da36e5112fca5706d9c0fdd575f3865d20f3f849e773059a10e8e8c1219eb7976a5fb613fd8ea93 SHA512 e8d19d6e49b727c75f5df69f68855ac85eb981dc33c353b881137755c16b02d848f5e8d43949aecbf3f70a649a602383e21d1a63c5732b171165fb7f5fc4689f
 EBUILD asciimath-2.0.0.ebuild 517 BLAKE2B 6f6355aaab1dc196c9241a3fa86bb6cef8d7b071ae83ea0489c3fcb914243559463487a694e4f755152c88965c23c86d6d2513546ed2cf94318f59478dccdbfc SHA512 a1c369453fcb0e35afd8f170ea14e2379c1b63e8da99524fcf57058d3c30b0ea13cb8abccfaa95c4cf6de87f704d977fa3842961a9e3a76e82f0f6bb69054321
 EBUILD asciimath-2.0.1.ebuild 510 BLAKE2B b4278881c98f8b22fed5bcaa4fdab2bad20112f78e6268d423fbc08dcfca364e97c40cb7f2cbb245421f33175ad9cea0ff2444245a507d01a25453962167f24c SHA512 10d693d3ca74fd0588ce8f1a8814cc1ae0fc34bc1895935a004211052b7e5215c95f9aefa9e7284fb311d09c83ce5e17174503c2e3ef1f1ee78152f4afd6275f
 EBUILD asciimath-2.0.2.ebuild 510 BLAKE2B bd2f704be03174e98b8e6a7c02af299ab87dc55d3ab89887a988307640a02895ef3c01e2b2710c2e586a55b8546e2e9f340489b68465db38ccf0e94c51d69fde SHA512 f75d76b58d2e47833a2e6c22fba8450c83bd75b3361579d7b5272dd6b73e61cb40edadfcc133951c9da0c40c583580c1feff218a55ac92091895f80d984b02a2
 EBUILD asciimath-2.0.3.ebuild 517 BLAKE2B 3c21de7e43e386a56d7f5932cfa67f3950a7f006dbf29854eddf35b708bef8dd4929de100d843519195a175616bec3de82cabf734f0ff9684dd9c2f957ca08ff SHA512 ba5d0a80f7084ca356ca0cf6689e320ceaca995a63b31c52512de1b5a5cc9acdfeac232c86f4947ac8bec918e58c8f03883618197cc855296a0f53ba78908870
+EBUILD asciimath-2.0.4.ebuild 517 BLAKE2B 4469d8013f5a1e33fa929730d3233a28517dc84209b813524d463b790f3ef1a887adf19bf2bc6e1a9dc0e4a3f64578b5a416535552ba4f5ac4c607dc9e7f261d SHA512 21428651ffb6fdbc8716f0641888321cd0420b90196d7bdb0c2da4d596c962cdf8bd31b4fe1f6cb952902b1bc6ab2d2f005391b2a0171c74b4252110223f68e8
 MISC metadata.xml 345 BLAKE2B ef3c44119073cf7d78c3d16ffbe42f3e1e9868efe1c0c5cba6e2fc83f57b3347db85e8357d8011eeea76fe9c90dfe5870dfea389183567a1c5728c047b168ae7 SHA512 8e1dfce281e0a933b8813407546a8d49ef4d529a5090f59d04ae289f4980d9e4ea8c2e3be4088c6b8a3219af88342e820e2a1bbac5fbd5552089ce71e3c5d766
diff --git a/dev-ruby/asciimath/asciimath-2.0.4.ebuild b/dev-ruby/asciimath/asciimath-2.0.4.ebuild
new file mode 100644
index 000000000000..505bbab1dbf1
--- /dev/null
+++ b/dev-ruby/asciimath/asciimath-2.0.4.ebuild
@@ -0,0 +1,21 @@
+# 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="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby AsciiMath parsing and conversion library"
+HOMEPAGE="https://github.com/pepijnve/asciimath"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
diff --git a/dev-ruby/atomic/Manifest b/dev-ruby/atomic/Manifest
index 2d0718ca1c94..73147097dcf8 100644
--- a/dev-ruby/atomic/Manifest
+++ b/dev-ruby/atomic/Manifest
@@ -1,3 +1,3 @@
 DIST atomic-1.1.101.gem 17920 BLAKE2B 50f4efc215293e931380b6307231279b3c5ca055aa8082fee8575963a68b3d54262449bf45fb1a514dab18f53a1dd9e0467a0f7ac67dea7a45fcce09155721dd SHA512 59c82fa5ec984b7ecd97964ea075ea327511fd4e71cc5ac72d3fb573b777c9fb289f462d022ea1e0256b38dc369c9f7fa7a61b7af877bd06ec94252237111e8d
-EBUILD atomic-1.1.101-r1.ebuild 660 BLAKE2B cd3b9566717a02852ab5d332ee7e054273672a5668feea401b56cd36c089cd326a1c07178267a3dc1606d2ec02d00932257283a78573e1d680a4d0a5a71a573c SHA512 bbb2759748b4d6a3c4d510e262e3a76f54b3cb6696dd68f67725ecbafc52783a1eaae1b0f692af49e4e864a119b17ad4e61eb29bbea9552db70958d76f3068de
+EBUILD atomic-1.1.101-r1.ebuild 666 BLAKE2B a243d0ccdb25c5e7d86945beb6e9cd27886b06679ee0498376bc1fc813e43b080ee8b5b6847f97c2a1e13fd1d8539273dfef3383f78a927731bf1d7abf247a95 SHA512 20560cdfff01ba4f63b4d125363bb3ac19d97f6917e0ba1bd60ac19116cd135b0aee63e697ce57637475ab78d4f3ef2db92fafeefa039fa0fb4ecfaa2a5fea22
 MISC metadata.xml 346 BLAKE2B 41b837d95a689bdd6803f4d60706db14c77c8ce7498024eb728a3acc35f2bb68ba1544e456c5a6b8b5b99c6b029fd0ed6cc4141b5cf9df98ebca2579154d609f SHA512 4617111e9b858ce1ff0b1b752faa73ecbd31df135c0342f7fe4bd1bd7f85af9a7adda282c5b5117e625551fb0bc7b33d5d00ea3e56475e9df3f75637a75d5b92
diff --git a/dev-ruby/atomic/atomic-1.1.101-r1.ebuild b/dev-ruby/atomic/atomic-1.1.101-r1.ebuild
index d57ffa12793e..b00b7bb450c4 100644
--- a/dev-ruby/atomic/atomic-1.1.101-r1.ebuild
+++ b/dev-ruby/atomic/atomic-1.1.101-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/headius/ruby-atomic"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index fbec7861f7f4..e8ac59b483bb 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -1,7 +1,9 @@
 DIST autoprefixer-rails-10.3.1.0.tar.gz 1357327 BLAKE2B 2071b3a9c5848e06695e32445224f6e101481fac0ca73a23b86d138bfada9f7339bd51031f121ab8b0f614d2ea1ec386cb81dbbcf8f728075b12ff2393c0c8b5 SHA512 fff90cad950228e9d3b61259f26bee26b2fe3cd87557ed81f1235630357204e3cf9ce6cc9439551727d4d62d27f3510c8c2683ab12b05ad11549945f741e5db5
 DIST autoprefixer-rails-10.4.2.0.tar.gz 1368753 BLAKE2B b5c9374f6161f9f13f78404788cdba60d88f50f68f909cead6cb5389a4f26f05cdd20925cf91d9a0b01af0ce14929b11d69f85a1ce8493c660c50c6032460a0c SHA512 00303b7dec4b261b2d3ffa72ebdfea2883cb473df3f8149853b0d2fcb5c2e48d63e24a17604619289893d0472afe237f1dc13710d2c7c3528067c143789abf61
+DIST autoprefixer-rails-10.4.7.0.tar.gz 1372138 BLAKE2B 5d4ad1cb82fc0e82557232fc1a050f87fc2758967c21e2e566049686efec41b599e3cf7e2b432d164c6a29c2463ab3c695703878c23188ee97a46e5aff6a26a2 SHA512 c1d3a1200c05a3b1219716058eb28babef4bc26eaca1ebdc09a901709435f25f097d3c39398a07283a75ed37b30a45398fbe31095e649f6d94fdc6de2346aad6
 DIST autoprefixer-rails-9.8.6.5.gem 231936 BLAKE2B 7c702f5484f9aa2318408fb8c5c8866ccf9d3565d3282e43279b9bea875ac3610b26c0ec302b2bed0779dcd46eca12badaa16faba1046585cddcfa3e8b22b51c SHA512 6b7281661fcaf0c17ee258a321f8d18664f2f305172719f76fe1f3ef6b04fa1460c7102946e95153df7ecf5c3ade3bfc8c22d302927f2e2183ef3b0f3ef8d623
 EBUILD autoprefixer-rails-10.3.1.0.ebuild 956 BLAKE2B ab61a2cd608d5d8f64bfbd4e52903556ee80d5b83277b717e5fd853ea0a163cf46a83934b022dfd5394dae296076019d2b6ba1156711220dd027bf01955ac04d SHA512 b4541812a6e97072489608f041e54e992b65476a44f56e9a9eb71340214ff891bea9c6e4f45a9ae694fdd0221f85311d4797c1c8d9bf89432923e0e79d29ffbe
 EBUILD autoprefixer-rails-10.4.2.0.ebuild 956 BLAKE2B 58e52b57a45c6ccc4d61fc04c5a7403f1e71c6262e53081ccd454dcd3eb2e425eadd34d2def345ac9163db48379286945c149f7a07dab7a54fff7ea032de150a SHA512 adaf394e4e391b9f718a4b2e0f571ead27a72a2bebb957af309adf15c5d96aa85686d9dbe623770a1e0df2f759aa839f1a39154f3d4f0f46698c4859059d0481
+EBUILD autoprefixer-rails-10.4.7.0.ebuild 982 BLAKE2B 64aafdab415da6da3fdc66b1754e4d1cf861fb8404374379a581343589c094bb7e58a59891f5d5074f9e42ceb8afc6fdc4649f446758741c6155a70e6ba29dca SHA512 19f8b293f9f6316480b3690bccd48f1f827d1c5d4016e0b4016d415488c2dc146bfe3f56e682632865b85cf6ed5ce8660f398d43299d0a8485eb7214e59ef28f
 EBUILD autoprefixer-rails-9.8.6.5.ebuild 884 BLAKE2B 9cab1081148382ce4444ffcf206d53028180b2562f02e913459ec7ee4710592a0c0360532251884e1e7a0d702cb4dfdf46f097acb9ef4bac9345b92f5318180a SHA512 8e3ec03aeddfced88c758094c3d45f83c2f4e76f12e3e3883e7edcf7933d3ee8219753305a6c46cdba608b4bbbff004905fc41c6c68aa43d1d2ef0f400182491
 MISC metadata.xml 348 BLAKE2B 12e9c7a355924818b5a7325556728b401a1f54ebc3482f9087ed959976038fcc946d976b2a664440cee124fe0962c476c0c1fb34946b040fbe5cbabcd9d63f78 SHA512 cf6112194ed7aa00fbda32165cc0829d338d86cbba4d099147b5b21531a1f6a5acec58647a0960ac9c5540086c1c2ea14a4e8aadb4eb5482431f68b3116ef6e6
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.7.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.7.0.ebuild
new file mode 100644
index 000000000000..1e2a93be0a5d
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.4.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+RUBY_FAKEGEM_GEMSPEC="autoprefixer-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
+HOMEPAGE="https://github.com/ai/autoprefixer-rails"
+SRC_URI="https://github.com/ai/autoprefixer-rails/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/execjs"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/rails-5.0.0
+	dev-ruby/rake
+	dev-ruby/rspec-rails
+	dev-ruby/sprockets-rails
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+	sed -i -e "/Bundler/ s:^:#:" \
+		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
+	rm -f spec/rails_spec.rb || die
+}
diff --git a/dev-ruby/aws-sigv4/Manifest b/dev-ruby/aws-sigv4/Manifest
index 26eab33258c7..967a8803224e 100644
--- a/dev-ruby/aws-sigv4/Manifest
+++ b/dev-ruby/aws-sigv4/Manifest
@@ -1,7 +1,9 @@
 DIST aws-sigv4-1.2.3.gem 16384 BLAKE2B 55da04b54005107075e3e4ef6a16de03e25ee355938bb1846f2c1ab79f1d9c72b0d272acb8b8c58eb7803710f3ad9be7e2d137b0c387d84d4841f7dcb0fb82aa SHA512 5d3aa9256f5e0fec5841ca5c9ca5aeb9a32cb4cf69f30221476d380c22e8f1863d2fbb4c826b89634c65f8080b83debdd84efe6e14e31f0a01bcf18b9fd71750
 DIST aws-sigv4-1.2.4.gem 16384 BLAKE2B 31aee1c3c028b9ccd6b20e967af97394e3800d27cfec2f19a4f12b0a7f0ed2ed931b720beb7d3e3ae737ca33eb7c4271f565053f201a3e233625c5d1faf33fab SHA512 1c03bf59899c7e7f6b01a786e75985c73459f0aacd3f01df70bac562db452e369317f8cb749f30d30629f058845687d9e2f614547f6f3ca1a4378db724170e4f
 DIST aws-sigv4-1.4.0.gem 16896 BLAKE2B 42a619d5037e6974a64ba329d50b83b221177d50abe89f8cc3dd38cb8c91eb7d049fc2e93b1c3c29910778ab5254b7a65936257fb1809ca92535841a3b58b77b SHA512 250dfd5755fa5163c65c122ff33c4e3b700359281a2b7c0640fb25ad8fbd2f01afa6034413345eb395d0219dc7c4cd6f4ab899c21321b76a336fa49a7ff298de
+DIST aws-sigv4-1.5.0.gem 17920 BLAKE2B 5e9ce828e69e6cd0161ef214bab56c3bb0a2c4250622172a6c80ebfa701c6fe7ea1686e29c229fed093470723e06bff7924f3d8924cea0bb05d898cb90fe2e43 SHA512 aaca9142be244212481726fc60c8f38dcb56ffc57373e2232dbb07aa2dc917559419c56bfe17a9da4f0c0e03f88898679f844bf65f3662016f32c4daf4fa9021
 EBUILD aws-sigv4-1.2.3.ebuild 483 BLAKE2B a94e6a949ad9223d1cbbc048eab8083434ad490a21945860502423e80e57ccbe0eefef3431143757122bac2141db1f81d90fe45daacd362dcf3ec9ac1e5451e1 SHA512 c7aa3fedd13e529034d390347e53f8445709ec62eb15feb9976403c02e58b7f217ab0060d4e823179d39ee09813e55e3e266bbd25bf5171f476884e0aebaafb4
 EBUILD aws-sigv4-1.2.4.ebuild 476 BLAKE2B bcb4424604ef813d6da66a6d528ee1f8772a6b0819c0b4140f3646fbd05cfc70924251eeee09228ca442154561909d1481f085734cc035dd396482bb09aa9681 SHA512 c3e18187701bc7411354d2e35ea1bdbd11607ac9d29b37dfec515bd5f4806ef85c36854fc84bfd69cac94742c2e3996f8a99f990daf252940af3c3e2dc8eabb0
 EBUILD aws-sigv4-1.4.0.ebuild 476 BLAKE2B bcb4424604ef813d6da66a6d528ee1f8772a6b0819c0b4140f3646fbd05cfc70924251eeee09228ca442154561909d1481f085734cc035dd396482bb09aa9681 SHA512 c3e18187701bc7411354d2e35ea1bdbd11607ac9d29b37dfec515bd5f4806ef85c36854fc84bfd69cac94742c2e3996f8a99f990daf252940af3c3e2dc8eabb0
+EBUILD aws-sigv4-1.5.0.ebuild 476 BLAKE2B 9b05c9a4a517ead37c39f3cc227d7734702a6e9647e28ead38bcb916ca1a23787f7c693d65cb32c915b426e8773af7cae4aa6749ef03d17182503b10ccd0b6ce SHA512 8983ec26394585a2cfbfcdab7653a93e79f160ce7123d4e63837f36ad79fcff35b53884716223c72859143da4c036a41aa3b50adea504357f18b48e297538d42
 MISC metadata.xml 343 BLAKE2B 842db55bef3eb3ba8366da82693ca0edd09103a3d0fe2749029dab5641b054bd183a56d59f573841211c1c277f8902f1785228f96d6681255f019271a9d5c7ff SHA512 8b810531a103b842972d49ca0925ca25b53141527cf0a58ee11aa49e1993badc6b90db44403be433351e2444fcc9dcea6d7a15321e6b022b4e0a9c43d0b2a620
diff --git a/dev-ruby/aws-sigv4/aws-sigv4-1.5.0.ebuild b/dev-ruby/aws-sigv4/aws-sigv4-1.5.0.ebuild
new file mode 100644
index 000000000000..6a85a6fda115
--- /dev/null
+++ b/dev-ruby/aws-sigv4/aws-sigv4-1.5.0.ebuild
@@ -0,0 +1,22 @@
+# 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_EXTRADOC="CHANGELOG.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Amazon Web Services Signature Version 4 signing library"
+HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/aws-eventstream-1.0.2:1"
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index 8c0f3bdde363..359453bcc89f 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -3,5 +3,5 @@ DIST backports-3.21.0.tar.gz 178706 BLAKE2B b895655fbbd15e99021f3d9d4f5efe84957c
 DIST backports-3.23.0.tar.gz 181501 BLAKE2B ef9841366b27b19837e61177f727cbd0acd58650cebab03329c174d699147fadfe51b4ac404d11332e681285c5f0ddcf387bdf6304237ff32c77048a1f5670b6 SHA512 b5b16b78c4dfbadbd60735b29541268cc6446f283ad686add208974fb861b270ffc46ec3cb6702c2ecf760e0de83d31025dbeba90e79383ffda6b4ca0b52a06c
 EBUILD backports-3.20.2-r1.ebuild 792 BLAKE2B ae1508b983697efd7b4e7291a4700cb49c94bb02a43c574568283b09e73b7d592941fd05cb6f93cd879d52c3e0e7e572cad936f918a0a9e00f31f97ae34bd678 SHA512 85e46a36b524194839f3c4250382993c0fc69653ac8339666bd196ed0c48a544df369b7d3a3c885682ad70f676ee2296ac7d27007c971f8beaef1b9bb96afd1d
 EBUILD backports-3.21.0.ebuild 792 BLAKE2B 0c9e5d2b2f54c1e5c7965bd4267e4ee1e13a459753f047ced428342fe299910350ed0c75552db811a12129bead6f1478bb5a8c1f16b7d82735610c24368850ad SHA512 d147eddd18ee7abc4b630bc298141bbea1fd38e24bb2ad1b12228e943d79fba7d70296999ce2236a7d2485b2715c028e43110a8808e1486e3532bfd56fc896d6
-EBUILD backports-3.23.0.ebuild 792 BLAKE2B 56bd5d6dd71d13c6fbbd60bdd063fd06c6d7ffcf383f0a0345b398a610bb4e1d7fe4563f044b76c1acd99ea12e74c466e22d452a50bd1ac0017bcecd73ca42d1 SHA512 1a2fc3742e6f4e9c825a70fca9af637c28cd48b5d9ed9b2ba6b044b3ddff60aaa5ba032076b18292dd8ee35f7bbd6c896309c2a27665fc90c9fefeb2b6bf9d69
+EBUILD backports-3.23.0.ebuild 799 BLAKE2B 8655ea61ab77d4a07f40c3ad34b705768d66f9babb61c025d8f87e3a6d277bc9aef388b60295ece8eeb6e5a4982ba04a1bd45b699f4c4f30f2100bbb6cf4fbb9 SHA512 75cffd19bcdd2b74a93f296a7bbf6ccbfabe008d98108c4d566be178f4b793b06aee9d9d2a2dd04b51a02d704e9f9227b3e79c0781d51588e664e6f21399778c
 MISC metadata.xml 336 BLAKE2B fb9482efc94ceedae0a44003dfe8a539ed8f728b93cd5e924f5e44778049598f14874908e3ccf0b393809fe35eab9027533ddb0407c16a767012c6f04962d8ac SHA512 848ee492c5952bbc00d5cce3f17f5d68e56ee0235c23f0eec19cf0a85cf097e20484ce6ac209d4fed6fb0dcd5323b45bdc662cb9ed6fd9a9bf50321724df3c5f
diff --git a/dev-ruby/backports/backports-3.23.0.ebuild b/dev-ruby/backports/backports-3.23.0.ebuild
index bae239847268..555ca131979d 100644
--- a/dev-ruby/backports/backports-3.23.0.ebuild
+++ b/dev-ruby/backports/backports-3.23.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 RUBY_FAKEGEM_TASK_TEST="test"
 
 RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
diff --git a/dev-ruby/base32/Manifest b/dev-ruby/base32/Manifest
index f69eec57b8de..6059908b91aa 100644
--- a/dev-ruby/base32/Manifest
+++ b/dev-ruby/base32/Manifest
@@ -1,4 +1,4 @@
 DIST base32-0.3.4.gem 9216 BLAKE2B 370c18e0e4689a3f59d7a75c03ecd1cb43d1748fd2239d3b9755e529c79863af8ad1c747e445d1ffdce7d900ea5300a12d1b63f6045798e4abd308efbe4d79fe SHA512 43ac8e2d2e801401f57d8013cf55cb5ab19a6349e610af151220a18f1b997d3a29d1423db93c4169a2b335d988e8458be447415d2bbc7745592fb3eb54dea0ff
-EBUILD base32-0.3.4-r1.ebuild 512 BLAKE2B 8369e1fcf678401249da3480e23c097b973449bdc1315316b88278e3c0e2668e71628fd687dc6c7982e7a4fabe625d8793ff24414b3d4fd35255f2360f7be511 SHA512 8559fc9e94bfceb47717e0387f97701411aa707eeaadd1b03d21b58d9ab938c90f8ceaa1baa22c2a66734b07cfb25add23977cfe930adb52c497f47380926179
+EBUILD base32-0.3.4-r1.ebuild 519 BLAKE2B d13dd3ad9edd5dec5c3809944bf0f6d03a88eb0ffca64673770387411edb18fcddc3bc6eb4acf7a38c85a5eba2c2cc6ea39724dc308ba86d682316b994dcd3f0 SHA512 5147869fa6ca1f6b33bd51977524639a478b405e8442f896e7c975961c57ba20bda6288b7de035d55a6b36127def7cec0ce29a8cb5d172109cb24d38e359509b
 EBUILD base32-0.3.4.ebuild 512 BLAKE2B 89e9c83f858c1910d3bf441db558d45bb6b01f23eadb6d68a39845fe93de8ee2f0a9038be7ab1c9b1940ce34538c3eb59cda756163d8a73be90361a407d6082c SHA512 3cfce8f5b54f213ef7f5bc3f569d37d9a07aa4d1d0c945af837dc962548804d0bed4e82600615cb341201ff05fcb39b1203978fee65a19c26d1db3d967fd328c
 MISC metadata.xml 378 BLAKE2B ad0d76f14f02df074e2dec486e3451dcbd0d29c358b28b82e241d56410d5b6c78a524d261372a747c713fe301f4d43caf9acfbace8bab9316954c9f2857ec6b1 SHA512 d46a84168b74053cbeb4b11eb2bb7d1b62e8449b7704c969f8d2e6eeaad5250bc143695860dd6d26a8951a8994eb5e20dc8c2bde657fac360e96d95cb8d91c45
diff --git a/dev-ruby/base32/base32-0.3.4-r1.ebuild b/dev-ruby/base32/base32-0.3.4-r1.ebuild
index de1ac86309ed..ebb79637eb79 100644
--- a/dev-ruby/base32/base32-0.3.4-r1.ebuild
+++ b/dev-ruby/base32/base32-0.3.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/bcrypt-ruby/Manifest b/dev-ruby/bcrypt-ruby/Manifest
index 24a711444cc6..fa6db983c0e7 100644
--- a/dev-ruby/bcrypt-ruby/Manifest
+++ b/dev-ruby/bcrypt-ruby/Manifest
@@ -3,5 +3,5 @@ DIST bcrypt-3.1.17.gem 55808 BLAKE2B e2e3d6ebeaf3d52fa69eb2da340c9558c09f526cc29
 EBUILD bcrypt-ruby-3.1.16-r1.ebuild 1519 BLAKE2B 9ff961a847dd27953e2e32a2e3fbbcf25daee6911dac73cb4f924b4c13c3a807e7d9c5ea1144ad61309de8a300766baf61a7a65f473f1618934e55e4722c91c4 SHA512 5d87dde0caaad763eb7e8ecb96becae9f32e1fb82c7ed9de8f2449530f26bb35375c5a0559dca66372e8c01e9cde6abeedf98140dcb3973b93c0accc8dc4c805
 EBUILD bcrypt-ruby-3.1.16-r2.ebuild 1519 BLAKE2B 81fb15fe435f56c71cf63fe954c73b634a2b6e52e897558e3b345b5b06989e8bb7a70f1df2b0a0278bee3a88433aae7b6ea3935bd347c33487fea39e60a875ab SHA512 6fdbd5bf05a55e60d2d3aed5cbe1e6125552c91c6700192ecb8e6b6fe0ff9f8a2004b3a64e9cde134963756837f31aff26d5921521b62ca3c921bfca563f9e2e
 EBUILD bcrypt-ruby-3.1.16.ebuild 1615 BLAKE2B 4534b33b84d784b5afb0a86da52bd8c3cac4c8e9c03620b2091644eb88e308d0a7e70d3b9fe5d8f6845861af79b5fceaf022b9136d68fe9bedd066f509b6d436 SHA512 870b244082f21c1241b2dedfc8ef904e35260683c0ea2e164043e69078d0f28f800082cf8ce1a59c53dfcbf080b1f20e788ea582bc956929f1bf9bb8ee752026
-EBUILD bcrypt-ruby-3.1.17.ebuild 1526 BLAKE2B 54f49baf5098316d84e9515bb2cf0c8f32d218c4e118ff17b12c481d390fbeaf1f0ba2ede4b56c8dcfb24fd46c218a1fa504ec0bdfd60818f3236e0691e6ab6a SHA512 9503fda57c18b77247f4b12477700402e78e5a5a51ff1d366fd926cc5666fbd514ecf03d7a9f27f6332e291d411f6a2c08e75635cba58d3aa5033b7fcfc849f3
+EBUILD bcrypt-ruby-3.1.17.ebuild 1533 BLAKE2B 69738a384505b712164237c827ee423b29a778cf4aa1ed4a9b4c498370cc03454da18ac784df7db8b90d4e82155b577a12dd31220297ab975617a18d8862dc8e SHA512 5e7dcb1ee2eb9a855a42f0c46f8b066f844a663afb189af9b1d8b5517752770f8254949d67632768a2b67165f2e417c57689b3fbf13aaa1b8e0baa4a43c3d448
 MISC metadata.xml 347 BLAKE2B 5430c9a624d1e922507758954755b4b7e29ffc5c9bec8a78bb9a726b17fb50e492fbf7476964cba269b80d1c6d34ab4ad9d482115825b6c18a25d61fa6dead89 SHA512 901e5c0b9da6c30ae04a0976010dff1faef88fb07d190ecea9eee06abaa1204280176b94dca90e0b5bc5af6423bb72a0657d8460eacd22b8aaf48fbf30b9f2c8
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.17.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.17.ebuild
index e17248c3c712..2d97b3822298 100644
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.17.ebuild
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/binding_of_caller/Manifest b/dev-ruby/binding_of_caller/Manifest
index 4788143cf135..e802e9491eb9 100644
--- a/dev-ruby/binding_of_caller/Manifest
+++ b/dev-ruby/binding_of_caller/Manifest
@@ -1,6 +1,3 @@
-DIST binding_of_caller-0.8.0.gem 87552 BLAKE2B 9097fe2dbf1e5ea2361bee94cb83ce8152f7e1357caecf1217b1643be225e21e5aa793e7fccbef5c983d5c204b95e633ded490158dfdd1d4e99fca81c51cb910 SHA512 d6ea4e893415eaf3614b109f8f36c3fa2378da9997d013fccbd0fc1e598886d11f7843023ceed2468184d5b8df01e2329ef16c7af57bc60bbd47304a53b43974
 DIST binding_of_caller-1.0.0.tar.gz 7473 BLAKE2B 2a8f3cee555e11c9eeb56935d0ee51deb037ea5fc631b4ef5eb50a831e48ba47c6a94e9104456bd8e6c4910bc76c5bc7e268db7de8c5ed283886b80c3feffd62 SHA512 89c58fec180b7bc25c5124035ed69692961148a3ddcb561643e7b8b1a78c3b103795408b52e70264db7c4b62080991219af977c5b981a135d573ecd56cebebba
-EBUILD binding_of_caller-0.8.0.ebuild 576 BLAKE2B e78491de6adb0de769ebce72fbabab41b4a26ba3410e26452ee177e60fcd770369c44969a6358398de130c373c90981d9c5b6400b549a9039a2594bebb523959 SHA512 4f832eb9a856fb0d6377786a6d0e2d6d16270bfdf1d9d60a40f66fcee6d1e2906fea0c8eed63c64b3dff2a29bd80ca3f65611df7b95a87abebdf5e6085bcf9e5
-EBUILD binding_of_caller-1.0.0-r1.ebuild 815 BLAKE2B eb77b9d4599af8b5d7b501b01abd0dcc987add41320532c59c09891b8f1f05ad8065f9639fe36d65b38ecf67c290c95ff9212696cd5374e9c157070316051498 SHA512 682e5774094b0d5a480ed462291aaacab43f89cd7d2f987d26d912c9c3ec2c68bd63662ea0099c06bef2b0fbb45d9d7621381f9e1a29f186455299948545ccfb
-EBUILD binding_of_caller-1.0.0.ebuild 808 BLAKE2B 58e4df4996d67fe3b9d850c7b9be3ba598c5baac264e9771dc51947240c37d1aa3703c1b5b2246f6c6a246fa068fd916de6deaea3cb50335c258655926ea043b SHA512 12ce0383563bdffc384a93d5d4c019e31ba4c3f75b14671f9784f14053ff9509af3492d55303ff7c858b0562cd5325a0597e20d1ce8281757028bd87bf832b40
+EBUILD binding_of_caller-1.0.0-r1.ebuild 815 BLAKE2B 2c9b2c6c585d9fc40e08254c3506fae6b2ccb3017ae9021fda0c297e5f7da5ff2ac0022a250ada9e6c43560cc070e6181ada24a56132f7475a2ab2d3493f503a SHA512 6dd986f542e6ebf5b38bbb80151c5464af46cd70bfccdbee3c6c3d646b05b45126a3ceb3bcd9d2cb34170dd5e04a75db250742dae9e22669368b52d907cf0583
 MISC metadata.xml 353 BLAKE2B 98df56b2350f4fe9a6f8bb9317e70381b00db0e81e686a73fab121ce87e3ad3db7e048d3d2d863bfe0d31028ed58a5a3d97feb88556222ec8ae131e288cbca93 SHA512 5940fa7d5cb39433dfad0ff67580c4cc073b79df96912539ec4ad0d2486b160d5597e45d95ee5ee695b18c2ef215c509ffc344ddba5164d67d8cef08b9bd4506
diff --git a/dev-ruby/binding_of_caller/binding_of_caller-0.8.0.ebuild b/dev-ruby/binding_of_caller/binding_of_caller-0.8.0.ebuild
deleted file mode 100644
index a634b5730bdb..000000000000
--- a/dev-ruby/binding_of_caller/binding_of_caller-0.8.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="HISTORY README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Retrieve the binding of a method's caller"
-HOMEPAGE="https://github.com/banister/binding_of_caller"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/debug_inspector-0.0.1"
-
-ruby_add_bdepend "test? ( dev-ruby/bacon )"
-
-each_ruby_test() {
-	${RUBY} -S bacon -Itest -rubygems -a -q || die
-}
diff --git a/dev-ruby/binding_of_caller/binding_of_caller-1.0.0-r1.ebuild b/dev-ruby/binding_of_caller/binding_of_caller-1.0.0-r1.ebuild
index 51161fe0e1f7..ff79d8237c16 100644
--- a/dev-ruby/binding_of_caller/binding_of_caller-1.0.0-r1.ebuild
+++ b/dev-ruby/binding_of_caller/binding_of_caller-1.0.0-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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/binding_of_caller/binding_of_caller-1.0.0.ebuild b/dev-ruby/binding_of_caller/binding_of_caller-1.0.0.ebuild
deleted file mode 100644
index 47de67cdbd75..000000000000
--- a/dev-ruby/binding_of_caller/binding_of_caller-1.0.0.ebuild
+++ /dev/null
@@ -1,30 +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"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="binding_of_caller.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Retrieve the binding of a method's caller"
-HOMEPAGE="https://github.com/banister/binding_of_caller"
-SRC_URI="https://github.com/banister/binding_of_caller/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/debug_inspector-0.0.1"
-
-all_ruby_prepare() {
-	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/bit-struct/Manifest b/dev-ruby/bit-struct/Manifest
index 0a1f55bd9a39..36df115729e9 100644
--- a/dev-ruby/bit-struct/Manifest
+++ b/dev-ruby/bit-struct/Manifest
@@ -1,5 +1,3 @@
-DIST bit-struct-0.16.gem 31232 BLAKE2B ed08c7054cab88ba0614863d706681601615b03e2dd3f19a4a1b8284dace17bf30e92ca9f1b0948c8c5e50424ab41b97f65cb65c804f771a207672b497c9df33 SHA512 8c31592d53daea5f283f8309a52c22c96c519d51c4e3c1657b36e83b802899aafe95eab9b88d9ec692e84207fc6bc952a1f1ff1354fc2b99fc327d58934bec8d
 DIST bit-struct-0.17.gem 31232 BLAKE2B 8dd802d22b543dbde4e59f9bbdf158379045b633e427ed2d01fa0a141f48298e2d3da48f19a2c113426b8dafab7ce139948fa8d097e6b87dc9957eecf65bf95b SHA512 9f3cc652d0f2983edc5a67a5b7ad5a64a2cd73b45414b3636fdd9e6d18fe971ec9d5cd3553ef384f039bfb166489fd303724c8c0c9d882cd757610c7986b0f1f
-EBUILD bit-struct-0.16.ebuild 381 BLAKE2B 56096f2d2ae299efc2f912d3dafe1d6644046004b4b55bdf95cc00a8ba3b24ca0a8ea7027a0b727bc097d8ac0c7ee4e270523c1ff820744ba2a0c2e7c6a7a54e SHA512 8746d1789d7e9402bdc7bfa063f5a6f0f6c159cbb2c582299260b818a84b3c8359f0a7da3ee3f855581aa70450a7d83bac5a9328d73c8d96eea6d89d897845d2
 EBUILD bit-struct-0.17.ebuild 349 BLAKE2B 49307724ef95454d91dcf6b5939e45435cdd865aed9ea2b2217cd582987e564917cb2fee8129eb9ea9b894ab310183fc78c1ac1a276a788d756983bc8463c362 SHA512 12efd6fc87cdcaa87b9b40a323d99cd728ad34358a1d531a76f199d323ff0a0cbc3dcdeb70f5197f9f369bf7a5554baf0f0474f6c74d4383d197198f630ce504
 MISC metadata.xml 393 BLAKE2B a1fcffeeafe987d026ff1e8db66d08d9a71081443c5e525aa5fa32979ba61324d56d99031624bc9a56ec96f8ac1c06821f40e57f880e056678c9f35a76cbb33b SHA512 b7f1540a265e54dfed28c2674ec7c27b701bbafe3dc35293ed302e9658b02d4a393cf8c1a929f18db2298fb1d82c899c32a0911bd80ab7900117ecdde978bfef
diff --git a/dev-ruby/bit-struct/bit-struct-0.16.ebuild b/dev-ruby/bit-struct/bit-struct-0.16.ebuild
deleted file mode 100644
index 121af0d4a7dd..000000000000
--- a/dev-ruby/bit-struct/bit-struct-0.16.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for packed binary data stored in ruby Strings"
-HOMEPAGE="https://github.com/vjoel/bit-struct"
-
-LICENSE="Ruby-BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/blankslate/Manifest b/dev-ruby/blankslate/Manifest
index c9515e734265..8a9abc316e3d 100644
--- a/dev-ruby/blankslate/Manifest
+++ b/dev-ruby/blankslate/Manifest
@@ -1,3 +1,3 @@
 DIST blankslate-3.1.3.gem 8192 BLAKE2B ff5494661e875290a354089efbd79ba8f7af50ff261d56f99201c9a11162fe7d61c0089c0c9e4839523a7f95e3a2cf8e79cbd5db14be3530f1a86ac696deaa42 SHA512 4164c2e9ecb6a294fbd0d25f70bae36ee9277da3a75aae6c99d37147f8111c40a6cfb85ddc3819e45c361c49fd9c3fc724ecea201763f7f9891b96589226f245
-EBUILD blankslate-3.1.3-r1.ebuild 618 BLAKE2B 5661856f8c5633cc3cac993460459f5290b1cd18ef36a55420ffbb590b98a0e5a6b811aa87f03c7c523b41b2fb2798ba068d32f8e45c3509501dcda98582f17a SHA512 63191f4a72a5442cdc60e4bcaa38f83d1edfdeb52a0b4c5741171b712f5978b94d01e690b81b02e49383c0d58a30068671ca6b05674e4cfa0d6a57f2f24d22d7
+EBUILD blankslate-3.1.3-r1.ebuild 631 BLAKE2B 73f28cf878c7a600ec3f707eda7a75a5e17c97dd3431dd5e0922eb17b625a94485af2ca3b60958990640fe10303f9c0ce897e5a735c6d1e05e3eced7c480e0ca SHA512 adb2423737de4629b749d05637d81ff3a917a89aa2f8630712823dc2ec864547540b1acce9832769ea1cfc7e0a307e4537831e2bb66ca9caa9896dbd48b68f7a
 MISC metadata.xml 329 BLAKE2B 93ab7f57a5949245158446d4193670bcee82aa18ad35e70a07b4842462cfbe28d65c6056840050b1388bc9ce7c75d4e07f2b341966ae2cd46d0537a4de1df7df SHA512 fc12c0e1318f7e394d2015f4e137cbf871a38b6aed876702598096bd4e0f8d61b5f7949d86ffdd3537f28d50c0024a3d18e48f067152f98ef8209a1af1b31c6c
diff --git a/dev-ruby/blankslate/blankslate-3.1.3-r1.ebuild b/dev-ruby/blankslate/blankslate-3.1.3-r1.ebuild
index e6769e50526d..5e339b253e06 100644
--- a/dev-ruby/blankslate/blankslate-3.1.3-r1.ebuild
+++ b/dev-ruby/blankslate/blankslate-3.1.3-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://rubygems.org/gems/blankslate"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 all_ruby_prepare() {
 	# Avoid test failing with rspec 2.x.
diff --git a/dev-ruby/brass/Manifest b/dev-ruby/brass/Manifest
index 0c77c5c81b3e..14e67a84533f 100644
--- a/dev-ruby/brass/Manifest
+++ b/dev-ruby/brass/Manifest
@@ -1,3 +1,3 @@
 DIST brass-1.2.1.gem 8704 BLAKE2B 4a0af72ad5ea91fb9c59fdad83745b92c712a858cc4d0ea1b1c0066174cbd40e0e3e1f2ce88be7032d78299a4832be99eb54759cf5e722526543bcec231efdec SHA512 8afb72d3123ca0d582adf11d4c7d86f1ee3b9e9b7cf1544fd4bd2d87891748b5ec5d88d2721763dfdc89cdea3fa1b94bf62e884c4b108d60dcca430f5a03bedd
-EBUILD brass-1.2.1-r1.ebuild 441 BLAKE2B 6b91e5963d59808002bc815a9fb48dd11ea0943f181005ff1b0cfcb17593c26d8546d2f9e46449674ca7e06d69a7dc55a1b8d8ef0cd803ae5e332eac48417097 SHA512 8f06c5425a09e275fc3267de2be262ee8fbc1405db117be17facc70fe58a9237a55a6bad2511b2754842af519c8cdb69a40a7ecf71aca6e326a9296845b06a1c
+EBUILD brass-1.2.1-r1.ebuild 448 BLAKE2B e2b263d70476e41c16c947949b6689ccf83eb68323f84d4cb354718bf1541acb83dc5725001cd80baaf380720b4687f80e14bed86642d0c46d82e9468b1d2b99 SHA512 776b60d669d6f601f0e0c82d7d64bf00d9350e3965716505ad41c7a0a43c75d23d3a9e5ccefe24bc148f25d8b41773da6171108c3d0fd1d99882cc91d4e76373
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/brass/brass-1.2.1-r1.ebuild b/dev-ruby/brass/brass-1.2.1-r1.ebuild
index 6bf6c5e25704..4c4b0a54f0b1 100644
--- a/dev-ruby/brass/brass-1.2.1-r1.ebuild
+++ b/dev-ruby/brass/brass-1.2.1-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/brotli/Manifest b/dev-ruby/brotli/Manifest
index 5eea7e736584..e7d30a838d43 100644
--- a/dev-ruby/brotli/Manifest
+++ b/dev-ruby/brotli/Manifest
@@ -1,4 +1,3 @@
 DIST brotli-0.4.0.tar.gz 9460 BLAKE2B b5d5e490c3ab086d6817c1ecc9143aefe88487d65d6774bda939b25bdb6aaaea4e28d99e01d49b90dbbccceba6643c0b5fdab0cea930eaf1661454996e61fab7 SHA512 7d1d2a1343aec11e840d840358d7d27b4ef93954bc17170d581b16d46191902b6fdf6380344f0d172e5e7f3fc0948146312659a44dc95973ec30ac3344f4a656
-EBUILD brotli-0.4.0-r1.ebuild 875 BLAKE2B 9cbc276ffc10de7a5ce46b0b26e4139690067fed26e34e6e1ad6c7a902b58e23e34dd3704f9190879b8dc12fe4cea614523ff53a09958b0b39ca6f2008e29942 SHA512 189b2873ab67943c31745762bbf20aab87365d1b606cb16a8b53fd38a86f1be2ce61a6171d7ee06fb5c732b9f9a09dbb84bc6a2eac1fd2f9ea401cf4bb64b8d9
-EBUILD brotli-0.4.0-r2.ebuild 875 BLAKE2B 909353e53876dc2c25903561a20bdd1bc0474dc6bd98dcb5d61b1b4f594ad6dccbcfc27c91d59b38090897e5f5e8c1d57c73c29452938bd30efa03478b29cddc SHA512 232f8316dba8f5cc9c5a628e411443e972489020a3fc9236e460acd8a9fb5e6580251e769e56f4582f12d5c5c2e9fab4ba6dca03151cb5b7a1f025ae1d4997ea
+EBUILD brotli-0.4.0-r2.ebuild 882 BLAKE2B 2d4d06a6ced56b37af8010dd225238d933a914ab1ede86de26545861738a6435ba923d3c4d105f2676cc334088856ca88cbdf9e41c6a2c3e580b9fd83217b41c SHA512 0599d3c261415354f1d4562eb8e8baa06b0854440aa372574693aae97a777640114bea658c5b2d49359262b09f49d82058471a28050d43de3bdd88b46e174160
 MISC metadata.xml 340 BLAKE2B 25156a37a996a4091ff75bb3cc45ba8d9fc65653fab708f0779a6606113492f0b0723b914d43e9dea4a6eb0d06325c5b4a31212b1389b82f845ef1a541a0f2fe SHA512 0b7485f8ba6fa314acda731d7f5cca43dbca1fab14cc928d2c239635b91dae19a10c2680b3c9526e6018c6f515d57ec87354e2e76ad75863408c38b9d5153ecc
diff --git a/dev-ruby/brotli/brotli-0.4.0-r1.ebuild b/dev-ruby/brotli/brotli-0.4.0-r1.ebuild
deleted file mode 100644
index a871349f521a..000000000000
--- a/dev-ruby/brotli/brotli-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,38 +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"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="brotli.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/brotli/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="Brotli compressor/decompressor"
-HOMEPAGE="https://github.com/miyucy/brotli"
-SRC_URI="https://github.com/miyucy/brotli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND+=" >=app-arch/brotli-1.0.7"
-DEPEND+=" >=app-arch/brotli-1.0.7"
-
-# Depends on the test data in app-arch/brotli
-RESTRICT="test"
-
-all_ruby_prepare() {
-	sed -e 's/git ls-files -z -- spec/find spec -print0/' \
-		-e 's/git ls-files -z/find . -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/brotli/brotli-0.4.0-r2.ebuild b/dev-ruby/brotli/brotli-0.4.0-r2.ebuild
index b8f10a86c71f..86623acf1fe8 100644
--- a/dev-ruby/brotli/brotli-0.4.0-r2.ebuild
+++ b/dev-ruby/brotli/brotli-0.4.0-r2.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/bsearch/Manifest b/dev-ruby/bsearch/Manifest
index f27e0ccae0a2..0c2cac29951d 100644
--- a/dev-ruby/bsearch/Manifest
+++ b/dev-ruby/bsearch/Manifest
@@ -1,3 +1,3 @@
 DIST bsearch-1.5.0.gem 27648 BLAKE2B 6b57cfbdfbb56df9c1c8374fccc59746241a7571aa7328519ef2f5c85e13e0cf8f54c90cb55deef2b08a902c9123c63d0b299ca7026ccde9b02aad02d4411181 SHA512 6246921be42e15ac35cf862833e156a01a0de9e0d2bff53af8eaadb3e7a512b7ab1e9dbef5b05282b82b26e589e45ecb6e31567b382dfc6eb62757e658cdc660
-EBUILD bsearch-1.5.0-r3.ebuild 599 BLAKE2B f89844c7669ac8f2f957cafe8b4cb706cd22251d843f7ab539073137538fe9fb2766ccf13fcfd141768c7345c3b1dfbfc84a8b7251c740084ef7a0c26ddcb751 SHA512 c87e221c2771c48189b3c45491611ecc3d1741530e6caeb71b2f2ab088e3e969704c190d5cbef6ebd3cd0c7db76c221891d1de60d2cc7b3a953e2c3f57b6378c
+EBUILD bsearch-1.5.0-r3.ebuild 599 BLAKE2B c47c12c99b1f98c7233c471239c3c7538cb7baa0f77280b6536100196f2132db73d18c767d72fe507e425c59c6efaf98c3400d7d8673d8ecabfb54b39934a42f SHA512 0f34af3acef8af82fe0fe7adea03898480da99ee729ab9708067e07a10e5a0856767baea054ebb6d4b72aa0d04a095bf677da0fd37a05727e9ae2c56872171e8
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/bsearch/bsearch-1.5.0-r3.ebuild b/dev-ruby/bsearch/bsearch-1.5.0-r3.ebuild
index 92e57b79b1bf..257d47e6baff 100644
--- a/dev-ruby/bsearch/bsearch-1.5.0-r3.ebuild
+++ b/dev-ruby/bsearch/bsearch-1.5.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="doc/*"
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 inherit ruby-fakegem
 DESCRIPTION="A binary search library for Ruby"
diff --git a/dev-ruby/buftok/Manifest b/dev-ruby/buftok/Manifest
index 2b709555c5f3..098dd352626f 100644
--- a/dev-ruby/buftok/Manifest
+++ b/dev-ruby/buftok/Manifest
@@ -1,5 +1,5 @@
 DIST buftok-0.2.0.gem 8192 BLAKE2B 673a14423e6a5b3fedf078f320116c9470b49e26aa7c4ef1bda47856a4befb7653d6b62bbf621ef8614885f64fcf078d9b2e24037c663a22b350ad44dac68070 SHA512 2be11c56b49254f16cadfd8abc7c414a16a54b32ec416402a4c87be72c2ce9c524aaa17ede9bb3535555191f2a7b1d7d863199db5b4af8874880bcd16d3c3b45
 DIST buftok-0.3.0.tar.gz 5710 BLAKE2B 9c00b72e0b4f2f55d6fb66e9665a620a6fe7228293906ff1104735cafcf2043f0a98c0a3dd38e3253552eebe86622099dcc0b97a1a892c17eb1c9e707ff3c1dc SHA512 b721eeda2173cee3276329282524a7173713a901bd338bb2ce6a0e2e121cd48b6647f51579d04f7353590a0da3208f4cced5321aaee77f4b7eb9ed256b674748
 EBUILD buftok-0.2.0-r2.ebuild 469 BLAKE2B 939db47d2233b1b4eb10e78f169f52634ed95dd0eab82dfe6bcbc055342dd6aeab973214ef91778f894ce318e7f01e7724424ad1283592d223e5dae7b7302b3f SHA512 ed3c81f91a07bda909a6d1fd62ad11e16f4c028f223301b3121e03e8884d5cec08cf45136cd70ee50d3be6f8ba2c61731402b7500b280808254d87c13d81e7fd
-EBUILD buftok-0.3.0.ebuild 570 BLAKE2B ebc5dbc1e086df8b741fa3837bf928c1f1e2b266fbefb4e2efdc2a4354a5795e71c363fba1e5b0ac845beb2a505c6ef5dd4b11053c431e1e294079c35cb16bd2 SHA512 27d218cc47649422b0c94117bd0323da4ff7eb8b0443f2e59ce6a3788f72722629550f3eedacb1503e3d5defdb766e9ebeacef097af3828901c0daf81b115710
+EBUILD buftok-0.3.0.ebuild 570 BLAKE2B 12e91e6e13d26854a3b5b87ef9c2c5bba2573109331662a930ac24bf450849342aa7eac9621fa63e7e3d39b6eef6192dd2401f7573845f0bd2ea2c5ccf1a262a SHA512 e6fa034545b066922d66dc28013898cc7afd4e363e79b593811d87a099be883742d3d45f032faf827303a06b6fcc6e193a4ffcf9a7a0ee31a6c7102d0dd2cfa8
 MISC metadata.xml 340 BLAKE2B f1ebf9749b2c78941463cd160b1d69d7aa2808ccebd95f7be40b896d290e576b2327fe19f95d3345e1478060b8e36d4ae68272eb721b0ff98ecaa90b52bf16da SHA512 0001ad0e5f5edaf65578a70a2bbc41ce5a4f2238380876a05ffae272dd6106f50ab833d0fb7226e11ae7bfe3c882ebff47881a7e0cbf134b02977bebb6e999fb
diff --git a/dev-ruby/buftok/buftok-0.3.0.ebuild b/dev-ruby/buftok/buftok-0.3.0.ebuild
index 3af1e7d55bfb..dd19127abd85 100644
--- a/dev-ruby/buftok/buftok-0.3.0.ebuild
+++ b/dev-ruby/buftok/buftok-0.3.0.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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
 
diff --git a/dev-ruby/builder/Manifest b/dev-ruby/builder/Manifest
index b0584fcbd171..9f9075d83e31 100644
--- a/dev-ruby/builder/Manifest
+++ b/dev-ruby/builder/Manifest
@@ -1,4 +1,4 @@
 DIST builder-3.2.4.gem 32256 BLAKE2B a2768fe25023631d134f062d8e7ff2aa25f6b4db0358bdc0d4baebb33d93673fca66049b8b9c42382bad3494f6e03cefdedc72d71958dff63d43eb7a2a187c75 SHA512 730317ec0a4af33e183283e309e38d47deb08db0ab6bd6dfebdedcebb7470bd383c6c1d32ad674adc43298e0f86930b97c652fff9827ca8890db2d1d68e792f1
-EBUILD builder-3.2.4-r1.ebuild 1028 BLAKE2B 36b739ecb614e74ad5727008cee27de7e301ae1e24fb1d1d26cb2554619ec524ae40ad89396daab770b1d49e209c2dd7b864181382bc73af292097d6f9bbf024 SHA512 0a69851e62e85bdd8192e3ba66e0937f5ef2a33f22d514516316af7c4ef1a11dd9cfda03e9075862aa09ef491132dd3d80b9527f8585123c53da6584097c7888
+EBUILD builder-3.2.4-r1.ebuild 1035 BLAKE2B 4f33ef5786d69ea41bbd5706ff7d414ea99a9ab7dfef97a6f007e3fc9b822662c3c937728346c61a6a2f7a7b0df8f79160f90b10620d3b48808b51c2515bf594 SHA512 ae6849a6cfd44fabe953229cfd03ec81d9d126e701f9ad21eb2e2b0dd0759759b0dcda47ebe40fea7ce77be41bf86bbe5edbb65622fc5b00956a5584ab62d729
 EBUILD builder-3.2.4.ebuild 812 BLAKE2B c1b221b439cb2f34515406b14efc94f4a24fbe33a3898dada6a6af44cc9704110291ebb881d129fecc9dfcdb093c2dc54bcd981e9cb463f425ae4bc5c0f13dd2 SHA512 b809a6eabbdc68366694c98ec61e60d1920883d268a41f56467e56793a13dbc692b31e0c52f310668a1f8f07820ca415cc9ba329239588079ba7e662cb086e6f
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/builder/builder-3.2.4-r1.ebuild b/dev-ruby/builder/builder-3.2.4-r1.ebuild
index 4c68ce67a785..9baea544e313 100644
--- a/dev-ruby/builder/builder-3.2.4-r1.ebuild
+++ b/dev-ruby/builder/builder-3.2.4-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://onestepback.org/"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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() {
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index a0c9b6b24d8b..0f1a5bb05897 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -13,5 +13,5 @@ EBUILD bundler-2.2.25.ebuild 905 BLAKE2B bc9f94a4342ff9431d94c6e85a31d26727d3850
 EBUILD bundler-2.2.29.ebuild 905 BLAKE2B bc9f94a4342ff9431d94c6e85a31d26727d385032caaa57ba9eaadd2ad03fd9f31011e9992499f7c946e3417c46b48695256a4d54c8bef4e9112ada21e9aac5f SHA512 33078fb7351b4384bd3db2006823d1bb4bccbf3f2cba280d3d37e64eedf38f0adbf575cfb0c056d401645e79b2af326626d3b0fb4e2b1b67afc3b122379344b6
 EBUILD bundler-2.2.31.ebuild 905 BLAKE2B bc9f94a4342ff9431d94c6e85a31d26727d385032caaa57ba9eaadd2ad03fd9f31011e9992499f7c946e3417c46b48695256a4d54c8bef4e9112ada21e9aac5f SHA512 33078fb7351b4384bd3db2006823d1bb4bccbf3f2cba280d3d37e64eedf38f0adbf575cfb0c056d401645e79b2af326626d3b0fb4e2b1b67afc3b122379344b6
 EBUILD bundler-2.2.33.ebuild 905 BLAKE2B 1744e1ff514205f6cda60d53c539b1a89e99608a66ad9b642bf4d66b156ce625ccf8cf2374b7f8fbac96e80a69f6cbe66d790ac061c9644071348db52fd742cd SHA512 5f6c9ab6206aa665917b9728608067af48b80f16b47dcc898b56062e6041990a36c5f6fa9201832736fdfb8c423e3e6c1c912fb48e179e3f3c45ba02bf08eb0d
-EBUILD bundler-2.3.8.ebuild 912 BLAKE2B c8736778009143e817dcb3b5174cacda3d3ed19005b2663cce72f8df776904c874dbb397569e8a835f85c65eca5a180859abdf8964190ff79c9af2802243a524 SHA512 7afc4b7f1cc12bc1b91aecc0a9a859a3fb57c72d539a328a75c319341e3d991817cc241f9518febab35d08138b288d2178796f0767c01c95b4ec53782c8deaf4
+EBUILD bundler-2.3.8.ebuild 919 BLAKE2B f360aaf6bcd38d0665c41f6e302a5da0281dbb777c00d0b57394285a31ac895204e34fa73c9ce907115475ffe8cc02664a1e2743cc1f59b8fc4c591b9528b654 SHA512 4a33a068940ce9816e66686c0e1141dde37bb898edd63b5269fe1aafe2551cd16a8dc373978d49f4bb56cc77159110ee1da779731984e0da428db8819354431b
 MISC metadata.xml 343 BLAKE2B 2526cf508fc4002f02cab371f22490c1d7316a06ce2e18eca7563cc672a935e829afd850c99fb6cf8069e8193f1739a4dc6fba3d327b339c564183f43d008f1e SHA512 495c6e0c73b0574ef644c13f2001dcdbc785f07a036b8220e8982fde16983aaf816440f33c060bd7cee9843183c8059c930ab7b5e5cfdb847e2671bee8c33c97
diff --git a/dev-ruby/bundler/bundler-2.3.8.ebuild b/dev-ruby/bundler/bundler-2.3.8.ebuild
index edb4e5d01e3b..0a1222240786 100644
--- a/dev-ruby/bundler/bundler-2.3.8.ebuild
+++ b/dev-ruby/bundler/bundler-2.3.8.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/carlhuda/bundler"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/c21e/Manifest b/dev-ruby/c21e/Manifest
index 100c022dca6e..54c6939d7cff 100644
--- a/dev-ruby/c21e/Manifest
+++ b/dev-ruby/c21e/Manifest
@@ -1,5 +1,5 @@
 DIST c21e-1.2.1.gem 6656 BLAKE2B b6c1f8919206e8eea04a33fb3a21c42e1758a2dbfbf2ad06486543e8bfbd37234d3c8a113a10c8473d04873f20076baed042e90eab34b96b6ea10c7cc6684ad7 SHA512 1f36251c4c6c7923d46ab186df1f1d380cb329daa7316327f65d4221493eb988fdaf83f2b43e8eb7eebef9e58f8b475bf4b36095cd4cfdb4a787719eca4b36a7
 DIST c21e-2.0.0.gem 6656 BLAKE2B 64b840ee83bd89ae29486527f4a0f59bc029dc27217bd48944629c357a7c8845cc98521054ed88f4c1cdc967f8248b3bf7a8b74019d181c60312a35f8a6f9dbe SHA512 e36bd75c87608efb1bb776f69b3400a307a2a1d1bb6375246613a5aed53a4673599a61f7723a53cae3a639e1bb2dd03b6635d54979de4e32885fd3cb1f29a1b8
 EBUILD c21e-1.2.1.ebuild 433 BLAKE2B 2e456c2f3943665ca5f094d5c2cbf978a74a027674b14c3c6d441d4d962fce64a47af8bc07fa33c1407d6333297cfdf4fd2580e3f1f27fc4e8616efc4fbc5626 SHA512 ef6cbb25bbc59340296c69560e759670faa04045f01dfc5fd640069b708c6f84723cb048ded1d9a65c720141a27de991751ec81753f57478dd57225a91fed5ef
-EBUILD c21e-2.0.0.ebuild 413 BLAKE2B 91c3a6df024da53504fdfb267609d46e27c11a8328ae2388c13b98b5bc3ef50108141a2c0330de170b81b98a7b343b0fa86f93c5c814ce84fcd90fe8809aaa42 SHA512 6690b86b3c22c4f883529974c029ec71633a12ed1a2f2a0b90e23a6655dc64b4cfaf1d19bad664a07a194b9d970ddd2fa78a34ac2b026aa0870e1f4e351a6d73
+EBUILD c21e-2.0.0.ebuild 420 BLAKE2B e90087103fe3cc8b50020f6a322e0f83ea1515ccf96530fd728e12f8f48a5fd655f31ccb32bcc375ebf340c34349b8cb3c02350b6e65161993b63766c4b43cbb SHA512 af587f34b2ff75b26b884ce39750a396fcb0655c9a05258bb981fe0680a47e4d955cbb11d149db7109decf7a07968a61f54a915854e27b4536b4235a0bba8ab5
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/c21e/c21e-2.0.0.ebuild b/dev-ruby/c21e/c21e-2.0.0.ebuild
index 965c35068fb9..8db4c001c003 100644
--- a/dev-ruby/c21e/c21e-2.0.0.ebuild
+++ b/dev-ruby/c21e/c21e-2.0.0.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index 8afa492d29fd..fdbed9494868 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -1,6 +1,8 @@
 AUX capistrano-2.15.5-sudo-cleanup.patch 656 BLAKE2B 06c0d83cf2b20337d7692ca3286a6ab8fb3797d67d81ee3498a5cd49f37d94458d19afda1eebc4904c5209809ab869087cd6568af1a4c89aba1b2a2826226fb5 SHA512 846f9c25b1c7806d082ec73faa2b5b9d4b6be285a33acf1d98dc36b9eddab54d664d915c3bab1da28fa2d86225fb1619fd746354cd605b8e3e8a5d0a05cfb96f
 DIST capistrano-2.15.5.gem 132096 BLAKE2B bbaa6bd482cf9bbe7aa01540aa5dab3f32401ffa1476d9057bb8ad420194f1ab2c32d8e744d7c982ebece5c4b5369133dc8378b7adf54c78732f9cb249db2a9e SHA512 10168080c7481ec6fc6f918ac90a3b1ce8f2b36f77411375e33cc915b02d5196ab061ac47e767edd724c82cffd1c2ad0a23ba1f0519cf1f2aae5b429167b19ff
 DIST capistrano-3.16.0.gem 69120 BLAKE2B 3e1c4f639c2d5cd36ae305746f53e68350d5eee39fbd5c5ec828ea5b69f47a3a5f8b4e6f4b65de2e24717f71cf4a9443879fc3d076474ab020e2023372085180 SHA512 ec5aa465065cd115f0a1b7db06b7c68f2034e81feb3b814b730a6aca464756e545fd5c065ea941a3076bb637448e2a0f04aeb56de2578cdf22a6f208d27a2219
+DIST capistrano-3.17.0.gem 69632 BLAKE2B 57430e8e73bddb11d170c579cae8b2fa6bd1390b5aaeb5e41a81a17ffb84d02623a4ca27c518b0d2ba16c78a639d34e05e68d1fad0d94afadecb846e7d515ea1 SHA512 d4298c1d71d51a3cb5216a23fb1181ba11f544a9572939b95f1f7fef80f64e6ebb2eb5cda4b22a77092ec0bb7d7aaa2d72eff88d715290cb989b78033d6053e5
 EBUILD capistrano-2.15.5-r3.ebuild 1242 BLAKE2B 844be23d3f0cb937c4abda2aad1789096462a24b3b68c41e0a593809f0eb8c20330a7ce31ee1484e00592a6d7b94752a5b911f278e3080c6b9f10997eede3947 SHA512 3aaedc46b4633aff5a29f178e030d9b55f01189dba8e6019f082694f0aeedf7b11f78c5c9b9c90d346145413a1865c8df59e97ca75a968b6db06040d66035bfe
 EBUILD capistrano-3.16.0.ebuild 925 BLAKE2B bc050c047edfae2e35d848149c247626aab342d588798355d85ec1cb17b60aaa0fc015468a0ad0c1d8264db412e6c963592aabbdef393ff5e0e218efd9e614a2 SHA512 3ec663167b9bab9dfef3cf44ffe55b3ee210d1e8f4bbbfef339211016993183167af5c13b5af13ef3fb987c7b735a629c358d8249f4ae4d4ba6a9070d0fb6215
+EBUILD capistrano-3.17.0.ebuild 926 BLAKE2B dbd96f5f51179cc81d891327b4892e42a514a968c7d6d5a7d6d6de438aece07d645f57bc4d2e5874b9a10f93d9e2b94bde9f6987d4d4b182d162f5d90f9fdd61 SHA512 0505cd440669002ef853f492d00eaed7f79de8644c66e55b9ead5f51b9e4f1c7eff73fc1f8236578083a953678ebb02b0e87c3c2c7a256ee78d76a934096ea4d
 MISC metadata.xml 396 BLAKE2B d27f0009de40add27cbe4a8a668ac4a82fa98eef30d794c61add8ad293db7e6b76c948499646c1dc23046cd4d88cfb36b41c1c14ebf78316ba6a4547493edb87 SHA512 98a3ccc2e6734e249cfb13754015cbd79485d20bc018312f7ff8500fa3c011db88c3955990a97da714dc6af7a6c94196057839eb76fd1612f30dba9e623ee0a6
diff --git a/dev-ruby/capistrano/capistrano-3.17.0.ebuild b/dev-ruby/capistrano/capistrano-3.17.0.ebuild
new file mode 100644
index 000000000000..687c83bef12a
--- /dev/null
+++ b/dev-ruby/capistrano/capistrano-3.17.0.ebuild
@@ -0,0 +1,37 @@
+# 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_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A distributed application deployment system"
+HOMEPAGE="https://capistranorb.com/"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/airbrussh-1.0.0
+	>=dev-ruby/sshkit-1.9:0
+	>=dev-ruby/rake-10.0.0
+	dev-ruby/i18n:*"
+ruby_add_bdepend "
+	test? (	dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	# Avoid specs that depend on capistrano already being installed
+	rm -f spec/lib/capistrano/doctor/gems_doctor_spec.rb || die
+
+	# Avoid specs that require a TTY
+	sed -i -e '/asking for a variable/,/^  end/ s:^:#:' spec/integration/dsl_spec.rb || die
+	rm -f spec/lib/capistrano/configuration/question_spec.rb || die
+}
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index ec16b9fc45c8..f115f18a1710 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,5 +1,9 @@
 DIST capybara-3.35.3.gem 371712 BLAKE2B e50c892897cf2838cafb77cb7cfcb54e5fc52c3cdaf11489b60168511f3a213d2ad7f94c67ad236e6177b849f99445733aa4de9691755011bd32f524e5c440b3 SHA512 90507b2254fdd7aff375a305c1112b878d5f0a7c909e7d95b62c6728acc340f73d244304efc07c3dcc707825afcd9b23b088e5d889717efe4edc2dab4dd38d2a
 DIST capybara-3.36.0.gem 374272 BLAKE2B 51579941b95ab317fa0f7d9a21d3ad40a130a60c457f9a5d9921dac5b17bb339a423a21aa16d350da57602b22b0001c6ed2b1b5b038bb16cf56d268bd5a38ead SHA512 7ffc9d3e4058b08acd1cb223eb0313112354783cc4464f8f0747561caa45425f8623be7052f331677a66a7b9f5e645e48ae0118fe78c2d185408e5279e66f169
+DIST capybara-3.37.0.gem 376320 BLAKE2B 6e2a6f1d0edd9bc9111b4e7e3a9c32a8363b88934b47981a2d4e869700ffea2af0b90d217ab6e3f5115f168fda91498a75bb8c813986963043db3ce6dca51882 SHA512 1ba9c2bbc5082023982641eb831ebba5862396431f25b1f9fcc4e24289992980980806a7255cb08d94dafccacc6a17d047677b0411a700051b6c104eb79ac2ab
+DIST capybara-3.37.1.gem 376320 BLAKE2B 79a5f379d70d612402379ad8743384844e7ab85e40c96b8a10794d35f48f078b9e26eaef5f6311aa65b6fae1fe130436288fce2077309559703e46da9e5f12bd SHA512 6a602dfcd61529f6b89a0ad85cf567fcb952d0c8033bde605121ad867308b1a16c6b3d5bfd7f4c33c47c5616c365c6b034bdf8dca096a14b3447be6adc885111
 EBUILD capybara-3.35.3.ebuild 1833 BLAKE2B 5b8dfe1dc852eb6d4ce3ed2d1bae46bb00b1e1de163f578474dd4652c2eb2a856895ad5af9928f111cc7583504fe29786df27e79aef95b401061382282556f97 SHA512 0d3cdedacdb1e0611b45859cc76f2aa06be1d2f61b932c6e63c860b048f05b4ed408c797126fa296a811834e2fe66d1b3876c08df72aac21c33b46f9f1c09e12
-EBUILD capybara-3.36.0.ebuild 1892 BLAKE2B 7947deb07a07d9b586bea346b75d00d3b8063670ec10713b48f393227f02f127ed144ee31f0b30040407ef00860de8aa18cd90dcfcc3b62577642b13d46375ba SHA512 58427ae17da86eb2259602e25787d9539be8ae8d68594900433c75781d57a4c7ee10f612553b0de4072d82bd1e35f2828de10bf14dcd6e34c52f1e7b5f6a53d6
+EBUILD capybara-3.36.0.ebuild 1891 BLAKE2B 0f29566d7d89a89eede7ac8efc82095e16d29498b22d7ca0150ac1e2e29ce117183f193add5888073bc66b943870ba2a700f7939b3bd422aa175325378fc0955 SHA512 c583ba58e03ffb442670616c93be20d40249edd7de873cf6b46c1565c3fc1b1666642d14dbd6a15fc7399c598989b54307e8e32263fc7b9a0feb88dad4b533ae
+EBUILD capybara-3.37.0.ebuild 1885 BLAKE2B 266f20b1fdb6f10b980fe0e4b9d119b8b942d8ab8b26a6f9cf075440da23e3dc3046c264204f3da51c91af569e8a80d225c127fe33794ff86671e1856629ab7f SHA512 9e48c7a88afb20b87a6b5c5c96e6d4f61a503e8144be5fdcf326c52f63e04b21abb151c9cc7bc6613393791eb5de28fddb587ee84f2e333784c112f282110816
+EBUILD capybara-3.37.1.ebuild 1885 BLAKE2B 266f20b1fdb6f10b980fe0e4b9d119b8b942d8ab8b26a6f9cf075440da23e3dc3046c264204f3da51c91af569e8a80d225c127fe33794ff86671e1856629ab7f SHA512 9e48c7a88afb20b87a6b5c5c96e6d4f61a503e8144be5fdcf326c52f63e04b21abb151c9cc7bc6613393791eb5de28fddb587ee84f2e333784c112f282110816
 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 3a96df44af06..36fc914f1929 100644
--- a/dev-ruby/capybara/capybara-3.36.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.36.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.37.0.ebuild b/dev-ruby/capybara/capybara-3.37.0.ebuild
new file mode 100644
index 000000000000..0a7c16dcb371
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.37.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30"
+
+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: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/regexp_parser-1.5:1 )
+	>=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.37.1.ebuild b/dev-ruby/capybara/capybara-3.37.1.ebuild
new file mode 100644
index 000000000000..0a7c16dcb371
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.37.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30"
+
+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: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/regexp_parser-1.5:1 )
+	>=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/charlock_holmes/Manifest b/dev-ruby/charlock_holmes/Manifest
index 1f43597d1ccf..c23a3f3f8bc5 100644
--- a/dev-ruby/charlock_holmes/Manifest
+++ b/dev-ruby/charlock_holmes/Manifest
@@ -1,3 +1,3 @@
 DIST charlock_holmes-0.7.7.tar.gz 1192739 BLAKE2B f057a0b53f8624f12029679c96be754e9225bdeaab4db8077ab8b48c1e04883ea6a9a3019cc0c5d875179b287ef0d70aae591201d8c22c2a6e4a5b4d6c592294 SHA512 5950db982fbbcf41c6c8f893b2d5e1d755ec85e55bd6ce9072507c06925251edb3198840fdf346e8b74f06f4dc1d63bf94657ce582b78947751d20980f71aa8e
-EBUILD charlock_holmes-0.7.7-r1.ebuild 986 BLAKE2B 9278c5a85a986a9cc2ac653292267155915995e7bf65f61c68d323f45fb2dae411dcf57a8060c42ca3da837e107d21e6cf9a6d045204a8482bb2fcbe712e54d1 SHA512 dd56ea163a435967f9326e1811cba5f4295e20e73531efb7f2b90ba7f553fa22718a28443fa473ffc646d1a71b838ac2d52b2b70f68681b83379a02c6f3c19ec
+EBUILD charlock_holmes-0.7.7-r1.ebuild 993 BLAKE2B fa2e51018b9a20d6c917915a99752473ddcdf75967fc1936bb1c70815f15bca0bf0e915d44fcc88e7c8a8820aca73fbe2688a6eda400925b865168a74b37692f SHA512 9cce993adb656921d8c06eb4bab4bb9799eb37af59df20a0d3626b49a2707313047f685c777011ae9f0f3bbfeda0de513534ec9fec5d8d49d6dfa8eb3f8d106e
 MISC metadata.xml 353 BLAKE2B eae222f98b7bf2aaf0e55ab65941125fe64a9d9acf104da1fcb14c267254d25eadcb47738fea0f4a38f5eeb5d4c6b2d3728d46986f96c5a85794828688938d22 SHA512 6d075bb4e4e1702f6afb9278c149a19775f71b3b07b3adeeaf963739dfc0c6540d2144714f9395d9bccd588431b6df185ab87cd270c844b254106c1a83633769
diff --git a/dev-ruby/charlock_holmes/charlock_holmes-0.7.7-r1.ebuild b/dev-ruby/charlock_holmes/charlock_holmes-0.7.7-r1.ebuild
index b3f5ce0bc07d..c397ff037089 100644
--- a/dev-ruby/charlock_holmes/charlock_holmes-0.7.7-r1.ebuild
+++ b/dev-ruby/charlock_holmes/charlock_holmes-0.7.7-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/childlabor/Manifest b/dev-ruby/childlabor/Manifest
index 6aa1a2c105ac..5bc20b8bedb1 100644
--- a/dev-ruby/childlabor/Manifest
+++ b/dev-ruby/childlabor/Manifest
@@ -1,3 +1,3 @@
 DIST childlabor-0.0.3.tar.gz 3120 BLAKE2B 555310e2b6b70292b580451b3627973a2cfc33ae0a8ceb5507fcc92ee70f388802644b1586c18736b34339418a9aaa6450f07e5353f3925a7238f02d397a640a SHA512 d18f3f90204b12e3b4a21be1439fcf44a4eb9f905402633966e6ab2a3cc9412a28c502a8c78487834a82e1de24f0f905691f33f443de930f670c70b17288fb6e
-EBUILD childlabor-0.0.3-r2.ebuild 1021 BLAKE2B c9e9321d40f1013564704f04f3aad80159ae9d7014a438279670404f2f741e036b836dfc5a261b4f43d1772d33e5a60b637791209d3152354fd835fb0b33ff4d SHA512 612063b944c70f58ea11ab77655cdcd4b68da81543131c6b8ccaa88678f4bb6de8252c67871ae201a6729d09fcf1cd5c992c760758452cc9a28725b6892f18ac
+EBUILD childlabor-0.0.3-r2.ebuild 1033 BLAKE2B c2eac1547a52bbef2e26b8278db0d06637f8032037589a55e8669b3b06e1ac31da1ed942c8e36d2a36c7b284885117a226f9b13cfd1477006532ff808987e54d SHA512 98f57a646c816825ac258ce8e99e1e62590b209ae905b412a118c49e190f44c09160ded72866116942f3fc56b4a2c8bd45f6019076d66bc0e982119baf3de118
 MISC metadata.xml 348 BLAKE2B c762375aacc3e71a19cca6bc56921bc95af9118d414b9c4ea107ca14d0d03a48139aac70b3bffa97ef8a79bc304c77d19ec886cc6afceaf507978045df5580ed SHA512 7fc536d6c210376169edeb9141883a08a163193c2551f7a6f55d9b896ca455fd4933cc8bb2c311ad6eaf448a56acb161f6dec9d8f6f426d23620ad3d38f0e392
diff --git a/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild b/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild
index 7b1cd5ca9557..0def3600e1e5 100644
--- a/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild
+++ b/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/carllerche/childlabor/archive/${COMMIT_ID}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 
 RUBY_S="${PN}-${COMMIT_ID}"
diff --git a/dev-ruby/childprocess/Manifest b/dev-ruby/childprocess/Manifest
index e6da6fc4258d..40948ecbb0ff 100644
--- a/dev-ruby/childprocess/Manifest
+++ b/dev-ruby/childprocess/Manifest
@@ -1,7 +1,3 @@
-DIST childprocess-3.0.0.gem 33792 BLAKE2B 7927e29efdff3fe5ad26fdf8ff5d55328412c89d442d3ad34fd44b642a91edf5cde3a271f2f7929a6365a3a740212f3f1364867ecec09c0d5c3846466922cf82 SHA512 56aa9303f1a88d57d0928f9c7177291a115736a5989e30bdabfb0b7fa1e6b02e42e45bf5e0498efc5ab9bb5f58a44004ed56bda61d95ca9a8d8df156b9f30ada
-DIST childprocess-4.0.0.gem 34304 BLAKE2B f27188ae722a8a3fd1279916f8f364365778053dd3c9fe2510abe35d60df4be430c9988ba5575acb1864f55c4c9130cb300328f0915d808e1760ec2b3bd7350c SHA512 89ea5f9d437ac2e5d246fc849002a5d14fba2907b5055cbf12a7ec89545bc3daa531dcc0217ebc7a7d88ee21798e2886a899679f6d25f2e664390752ab32dbe2
 DIST childprocess-4.1.0.gem 34304 BLAKE2B 81ca075bde9705eed57c80b0d37e1d8fcf3938bd0319a40f2178dab9be08cba570d90cc5292d585b3911eca5a90b4ff861d1fc79ba487d1a4f08b0fbd9a78c48 SHA512 e635c3acfa5ad85891c3879f240c7e96d47d7d5ec3f472f4ce6661552b0fb7bd72c5e3b9fb73f4f9312b749fbe554b4be388e56a31a3c63c39743d055d774def
-EBUILD childprocess-3.0.0.ebuild 939 BLAKE2B 2f6889a9eb8d9c66ec905a6a1b85d6d2934bf73e8b3950cbbe084ae59e371c39fc9453f52df7d307e868fedfcba37efff04ad723abd4f7841b939d28461d4a82 SHA512 a36d33da58a4503c804101095d0906abb378bcb69e1286aa464fc353322f367cf964947368c6fe919af5055cddd918bde6755d1bdc2ad7ee851029b156e1214a
-EBUILD childprocess-4.0.0.ebuild 1033 BLAKE2B 93612f7a02ec27144de1d30ebe87859c0047bb1fffad1fe44407adb63ee3e16c5d4134295ede7ece49c3ec213a8b0ad3f62dbfad02cf84f39ad6ab0c6c97d4ab SHA512 daeb97e68276be1d4c3de87d1cf1ee2c2eb0fa7bbf03ab9ace6817bde8bccc7481d9fcfef4b25267f32e9f0ccb986568c272e913e756938092b7a79f1478ac60
-EBUILD childprocess-4.1.0.ebuild 1033 BLAKE2B 8d57b1c999b5b05a2f4133d877fb553b460b5f608dbc52d18ee855e195c68984412d591cafef71949d0356d2db8e76459c4269c050d86d854ccfddcb346ad03c SHA512 104468eb5a215bad7c89a8ee7a0a6fef723564e86c3b72d489178255c3d7affac424db2cfcc92d36d668eaec06b60a5406c1cb8ee785ae8aeb768d448f670754
+EBUILD childprocess-4.1.0.ebuild 1040 BLAKE2B 34eccf40097137d671c629db68a8601972f24e8ff0bb1a8afd491222f1a0bf01d5366836e1ea6037057fdc1ba5c123baefcf2564cf85302aaac9c30b4e9b8f7a SHA512 edc452d1295c4423a0b4589f09d99264b7eed2f5595ba082b0f1cfae2d002cd2ccd9c5f51b026f57fe1c2f8967a565e027ace65dcec84b0a181a55e57d027ec8
 MISC metadata.xml 345 BLAKE2B 6c1e132dd9debd6a0f3a3da070ca48f1cbdfa8b091e4f7a686406552b27ea938d9e97e23b5311a93666aab8bfa90ec629c5a622fba67bbb85523dc06af38a5fb SHA512 c39abef104e244da843db9d772211e68a47739dc64d939d7e99d031b1fcad7a50da19c68dca4095c30069e0aab9f7a60750ae470c15347e21d2f9056f08e58bf
diff --git a/dev-ruby/childprocess/childprocess-3.0.0.ebuild b/dev-ruby/childprocess/childprocess-3.0.0.ebuild
deleted file mode 100644
index 8ab0dffa83b8..000000000000
--- a/dev-ruby/childprocess/childprocess-3.0.0.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="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Solution for controlling external programs running in the background"
-HOMEPAGE="https://github.com/jarib/childprocess"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/ffi-1.0.11"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	rm Gemfile || die
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e "/[Cc]overalls/d" spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:'ruby':'"${RUBY}"':" spec/childprocess_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB=lib RSPEC_VERSION=3 ruby-ng_rspec
-}
diff --git a/dev-ruby/childprocess/childprocess-4.0.0.ebuild b/dev-ruby/childprocess/childprocess-4.0.0.ebuild
deleted file mode 100644
index 296f3f0a6e54..000000000000
--- a/dev-ruby/childprocess/childprocess-4.0.0.ebuild
+++ /dev/null
@@ -1,41 +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="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Solution for controlling external programs running in the background"
-HOMEPAGE="https://github.com/jarib/childprocess"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/ffi-1.0.11"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	rm Gemfile || die
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e "/[Cc]overalls/d" spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:'ruby':'"${RUBY}"':" spec/childprocess_spec.rb spec/spec_helper.rb || die
-	sed -i -e '/system/ s:ruby:'${RUBY}':' spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB=lib RSPEC_VERSION=3 ruby-ng_rspec
-}
diff --git a/dev-ruby/childprocess/childprocess-4.1.0.ebuild b/dev-ruby/childprocess/childprocess-4.1.0.ebuild
index 65ae8e67a21f..8f16adfff41e 100644
--- a/dev-ruby/childprocess/childprocess-4.1.0.ebuild
+++ b/dev-ruby/childprocess/childprocess-4.1.0.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/jarib/childprocess"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/ffi-1.0.11"
diff --git a/dev-ruby/chronic/Manifest b/dev-ruby/chronic/Manifest
index 54a5ddf005ae..f5cb8c7fa732 100644
--- a/dev-ruby/chronic/Manifest
+++ b/dev-ruby/chronic/Manifest
@@ -1,3 +1,3 @@
 DIST chronic-0.10.2.gem 43008 BLAKE2B 669361fb9aa9da9ea71f6b131dbd4d0101f63bdace26b3f1355f2f3bb793e52ec59ef2cd51e71953cbbfc6c1cf7bbcec215a7d9f65dc40099ec717eeac9b527f SHA512 4efaa6453a38e62f15e7286b9b62891fdf2b4363cf8bc0b1078d22ab18863bb65db46ad523801801c76c5b751e52809a769d49743ca9369ddee2be1c526c67be
-EBUILD chronic-0.10.2-r1.ebuild 690 BLAKE2B 61c87fb87c467a5496edba392b098a296f20f9f4fae1abd98fa4a31aa9214eaa860860f715b01851ae629288e9831a8a087c517002e03b763e803e029025eff4 SHA512 7b3d3993db9b48ef7d9f801b33034bb2a4a140a5874bf8313e0962260248612b80e9d8ab332a78f4a5b41e3904c25dc579575b1d2c45d79c78e175fb5e8c872d
+EBUILD chronic-0.10.2-r1.ebuild 697 BLAKE2B 639b6aefe08cdcf048c0cbb89253133f49d2083af5512af1599d175a7e215ec697156761a5c2965de305083125a66959402a9d0c0bfcf357a12e18b7c5e05ab6 SHA512 00cab20db8f88aadd1676864757ab4f89b6395e0286e863dc4447f3f074f0bbeed4e8df7ec878526a24708542f87a50c4efb0d3289a25366352bc8291089272c
 MISC metadata.xml 342 BLAKE2B 254f5b27ae347f3322ad254dfbfcb4d3cab470a748c6d6c5a6081b05f1baa1e614c0eb50e3671b8528f6d0faa76d412b7feab3ffe68558b372bd8a86d2d3321a SHA512 e19fbb213afbfa77d23c23972a871520f0e64d6e6334e2095b8e11a4e66bbe322eb28f5ade05008d9e83563ac17924171edf94e709929f3e5a9b5a953d5340c9
diff --git a/dev-ruby/chronic/chronic-0.10.2-r1.ebuild b/dev-ruby/chronic/chronic-0.10.2-r1.ebuild
index 29c5fa93ed04..42b160ad19dd 100644
--- a/dev-ruby/chronic/chronic-0.10.2-r1.ebuild
+++ b/dev-ruby/chronic/chronic-0.10.2-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
diff --git a/dev-ruby/chunky_png/Manifest b/dev-ruby/chunky_png/Manifest
index cd5548ab8316..1307fe01f73e 100644
--- a/dev-ruby/chunky_png/Manifest
+++ b/dev-ruby/chunky_png/Manifest
@@ -1,7 +1,3 @@
-DIST chunky_png-1.3.14.gem 363008 BLAKE2B b35dc7523583b2b6b5c42024ab0e29b90c3c2db734d80ae4c6690f34feb8af22eda09b17ef598fd96dab245d86dd20392b7d8ef727be4ee968d39225aa914bcc SHA512 d52aca34f94749dc58c8850f552bacc6354c93bccf041435d4fd1ed81a88e7564840fca191d6b40d56dfa69a74bbe09f7adbed1517e363e4e00884f7c81c4494
-DIST chunky_png-1.3.15.gem 363008 BLAKE2B e94b366aced2214a052f321ea828c7de9df2d9cf91f5a0926a1f17dd258774681db1172a3a04b033cbbae6f3f9bcb114bde3d07f166a6028e523a433926f6e81 SHA512 a53d3ba7b5d879a2f1dc3bccf20c4ba99fd35fa8224b21a4652904de9554ec4776b81186b8b75f5f77c6c1a63543ff1ace91c1723b76c1c4c7155bbc2a819239
 DIST chunky_png-1.4.0.gem 363008 BLAKE2B 3fc484985565f223127c43eb1d55137ee9b58fc5ab6f25256dd54efddb817a5ecf78b39754a042fd09b83493cbdfdf02d0b90d150ab90b084f01c9a98aba5a8e SHA512 1276ba527723af973ca00535baab0dd3be8185cfaa77efb28c3b1ef1e949312710a616ca55711923875e54cb9c92b38de71062d2ba68b2314c7b9ce7a9b50b11
-EBUILD chunky_png-1.3.14.ebuild 753 BLAKE2B 74682ed8fade797e87c2f3e4c74e162ee839054993f7a6c1a4b759d171c8f28f9b14645cd433700f2ccd3041a673595e3b51ae39cd959d4e06414bdc4e6aae41 SHA512 7f083da715a03d0bf0eca20a987315ff2234def44b3f369ae9fcb4ccc57aeaa5feb6c68a8b5c11f63089a7e75b8da4cb06c028b2156e0a254db49452423d54ab
-EBUILD chunky_png-1.3.15.ebuild 753 BLAKE2B 74682ed8fade797e87c2f3e4c74e162ee839054993f7a6c1a4b759d171c8f28f9b14645cd433700f2ccd3041a673595e3b51ae39cd959d4e06414bdc4e6aae41 SHA512 7f083da715a03d0bf0eca20a987315ff2234def44b3f369ae9fcb4ccc57aeaa5feb6c68a8b5c11f63089a7e75b8da4cb06c028b2156e0a254db49452423d54ab
-EBUILD chunky_png-1.4.0.ebuild 760 BLAKE2B 97d5782b94cfa8d70fdc25dd0cb0de4c46b412969de21de80f1c82ed107cf81a2ed3c5b2c3d2e9b9b536f5cd5cee91677209c596e9537f9be683d71e6511753b SHA512 c154700829444aff21e1dbd82fb6788c3f74dc14f92161dec16eeb8cf71a4be2ad0878e8c53e0bc5ee5561064e95b0de5bef552ebf9110bfc5c6b2c75ecb0e9c
+EBUILD chunky_png-1.4.0.ebuild 760 BLAKE2B 9f26fe1da568311d6e8e07975d567f779598d103c504b84410cba9ce20c872521077c30951f5fe87f1f74e514b981a5fed8180807e1ee99f3ccae4174af93fc2 SHA512 ef1ac9d27e8766e19753e6aea7a3812fe4e484e57d3e22eb353f0bbe5f9331ca2db0c043e2317de6a277ff3b224be455ecddaa2e5eb067783a625d06fb99e4b4
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.14.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.14.ebuild
deleted file mode 100644
index 58f7a1ed2e69..000000000000
--- a/dev-ruby/chunky_png/chunky_png-1.3.14.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-
-RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc CHANGELOG.rdoc README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure Ruby library that can read and write PNG images"
-HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
-	rm Gemfile* || die
-
-	# Avoid git dependency
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.15.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.15.ebuild
deleted file mode 100644
index 58f7a1ed2e69..000000000000
--- a/dev-ruby/chunky_png/chunky_png-1.3.15.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-
-RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc CHANGELOG.rdoc README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure Ruby library that can read and write PNG images"
-HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
-	rm Gemfile* || die
-
-	# Avoid git dependency
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/chunky_png/chunky_png-1.4.0.ebuild b/dev-ruby/chunky_png/chunky_png-1.4.0.ebuild
index e6a1202264c5..9a9da8027236 100644
--- a/dev-ruby/chunky_png/chunky_png-1.4.0.ebuild
+++ b/dev-ruby/chunky_png/chunky_png-1.4.0.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/climate_control/Manifest b/dev-ruby/climate_control/Manifest
index a6c6e2925a00..724ae21fe261 100644
--- a/dev-ruby/climate_control/Manifest
+++ b/dev-ruby/climate_control/Manifest
@@ -1,3 +1,5 @@
 DIST climate_control-0.2.0.gem 9728 BLAKE2B 9868eef8836189d7567d8fd8f5dade874ed4baef883f38b2d6148bde4f1e24544f31fae75ff7bcec4dc685c1fdd23d5164817460eeaf151d8eb105e023bbd741 SHA512 c264d731fb02c7a15932d2724bcd54dff91d2370a0b5336444e167e0d39596974c3826db502be7dc1b6d99cdbbc022135822222a5a6cb6b822aa32a0913c1ec9
+DIST climate_control-1.0.1.gem 9728 BLAKE2B f2d267e86c58fdbb7a85508f56a091166809d108c2e66702df50962086a89a134e6a47a1e53c36272c563f1d4a0225fc613490616d67fbe04e9647b7fe8cfda6 SHA512 2dfd790b444409275571881d19c3712c6542890499f3d55e5f8ea3775166c01adbb216a0749b0c4e126d631cba690c0edc3f8c49143fc0ff3bcc8b25545bf218
 EBUILD climate_control-0.2.0.ebuild 654 BLAKE2B 82f8da5eb9baceed06080311e8d868770d97a9a1c9622a17e82bae44d60f58238188b67dac7df2d76f270504456c97374c5f462dab838db0bea02cc19b7c6c36 SHA512 0650b4e987f2131369493e8ccd65817a6a73ce6a9a2884edecaf872beab69f5bbea5a7c7cb4801f8cb10cbf29f9d93f38b40a35560a9b3cfc240eca5dc016a25
+EBUILD climate_control-1.0.1.ebuild 667 BLAKE2B 0b3cdf28086058ed66460d8a29cfc21b57f19de9fa900a1dfa16dc8e40c6d91a8b39f807bfcfc95c8be1a641d66572365f83cfd0f885f046919133b009a60e53 SHA512 c24b32678f574dfa64c8ac1edc513624fa2586aafe1270a2fc8181d4c43678edbc60229f0132704cdf9cd5b5ec6144561d348fa64f25471e685640a458dcf6a0
 MISC metadata.xml 353 BLAKE2B cf312c36f2d8076cfd604113e542eafa044972d799f7ace6b3d142e668191d9b9a9e2b768f0be7b359d4c729f4d47a4b2067a72998e9f2aea37530515aa4aaa1 SHA512 a886da2546baa1ade602d8970ec40e6163ef78f1e2c9f1b5cbab20d824aebebef7264e249af1f730fb67f5834e0dd6781c9bc8919e7992abd2e05eb86986eeb3
diff --git a/dev-ruby/climate_control/climate_control-1.0.1.ebuild b/dev-ruby/climate_control/climate_control-1.0.1.ebuild
new file mode 100644
index 000000000000..afca40f5eb3b
--- /dev/null
+++ b/dev-ruby/climate_control/climate_control-1.0.1.ebuild
@@ -0,0 +1,29 @@
+# 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/cmdparse/Manifest b/dev-ruby/cmdparse/Manifest
index ad30954afbce..5ef769db1b6c 100644
--- a/dev-ruby/cmdparse/Manifest
+++ b/dev-ruby/cmdparse/Manifest
@@ -1,4 +1,3 @@
 DIST cmdparse-3.0.7.gem 54784 BLAKE2B 2ce8b26b362ed78cd6e5ecc1d678c32a6065dc38c402e82f6715ee2bd834c49bcca2ec93d2dd11d2ae2ac809068efa4fe640f98f367c4278da6d0cccae094222 SHA512 5ee929c9aaf6254686a916fa11e4f4809693434f2cff7ad5e14aef2b1a95bfcd2e818afc0e4337616836971a85c980b76e89bbe61f6be250c372ec0587dc58b0
 EBUILD cmdparse-3.0.7-r1.ebuild 437 BLAKE2B bf094b22fe3e87a8273f29849a81693acb7e3c8c3c29aa82098ab1ca0626464360d179b4e54c6d2445282dc2ce0c764dc1f2eb66892dd2f1774b67c94bdf902b SHA512 ccad5ee91b7c93606ea810687233fc6ac0edeead25d31d32eaef1c74b31859bf99a6f57c348b6633c96ef4104044b18ec4d4e0c4527acebf1b9871e0377d71f3
-EBUILD cmdparse-3.0.7.ebuild 430 BLAKE2B 64aa5bd61bbf0c9a2e6ddb5c44fe424a421e8036c6c337b5ecb92bb572cccf614589ab682f1fa2d9bab21c8e6f54b5a56aa4cc53c7397bee05734a520fa5fab9 SHA512 f6cb2f64535a6d26454f494c7f54470290d4c65dbc6c69dc057db00a40210275b8830d6706622668beae8bec3d793e39a8872e819ba3ba6bac87b89acef85d2e
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/cmdparse/cmdparse-3.0.7.ebuild b/dev-ruby/cmdparse/cmdparse-3.0.7.ebuild
deleted file mode 100644
index 1c3fbb262809..000000000000
--- a/dev-ruby/cmdparse/cmdparse-3.0.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-IUSE=""
-
-DESCRIPTION="Advanced command line parser supporting commands"
-HOMEPAGE="https://cmdparse.gettalong.org/"
-
-KEYWORDS="~amd64 ~ppc64 ~x86"
-LICENSE="MIT"
-SLOT="3"
diff --git a/dev-ruby/coderay/Manifest b/dev-ruby/coderay/Manifest
index 446580da9774..5cac9439d0da 100644
--- a/dev-ruby/coderay/Manifest
+++ b/dev-ruby/coderay/Manifest
@@ -3,5 +3,5 @@ DIST coderay-1.1.2.tar.gz 220645 BLAKE2B 85405da2b148ae23573abf2c3fcf94a64302475
 DIST coderay-1.1.3.tar.gz 229139 BLAKE2B a900cc5fbac950f66814d9300876d6a273b296d07139297d5344d26c5710d23c37761e5743ef972f523afa20fa663f239c03d9d2ad47232b77e53fe5053736f0 SHA512 a5208965e8dbad53d179fdc1c57df59ba4e13522a1a57c371ccd3f9369408a1c7d878867df48b201a1d590b46ef0f9bada3f3e7810866f17d244b5b370aba3fb
 EBUILD coderay-1.1.2.ebuild 1349 BLAKE2B ab08112a58cdadd308cb89a58a2f9260155c7648e1550a1aa796a62a78bfcf94e0343f8141d558648bad5267f257c397ae7623030c87f935425d89ba10134fee SHA512 d5b4745f057ced13541c0e48b23fb134e25d1e9025c26824f5bf509935e28ae425f8b43f21857f21b1188c347a1b6e31adbce47a72605cabcf86e6450eaf060d
 EBUILD coderay-1.1.3-r1.ebuild 1586 BLAKE2B fc31fc4399b03d75ca56d5f7d613a0b2759a71a38077b5ed79451e71996c3cdc6ddc5f5c5224491af3495f8219b31b749ad8440ff0b55ce3256ae17678abbc6f SHA512 56366ceae810f66ec5101aea12416eeb5aedefbb548e9ef1de74cf131eb4bed9e4a87cc4d3154388204ed00615408607780b54ca727290e49a877904fe61833b
-EBUILD coderay-1.1.3-r2.ebuild 1586 BLAKE2B b8828c3e8e183f1af3c7ab9a0951480d3aba81935f3b4b7aa543cfa395c496305df83fd2040021d8880deb1be2b26cf62b8f5ddfd7c1e393ee7c925a2e387628 SHA512 102feafdc8b80ca053dbe25c8259e364123a48a11b7ca647c56a4d5d0dc7b41d68bafdffece0efe57ff98bcd103485db3710c4cc599e677ebe0745a96b9d6359
+EBUILD coderay-1.1.3-r2.ebuild 1593 BLAKE2B 5cf85d924137f25acab02a7e8a0d398743ec40dedf5429ffa7e756672ccdfacf3ba3b511a28758cda82a5feaa96746bb7a6affb9b90aabf38cdae24bba90f884 SHA512 a1cc571ef3dea2cd5d2e05b198552d8a0957acf5a36208dd562c3c23dc16c25663499deccdf1881d925b080da9dccc9d8ba01f5eec7c61ab53fa6899bf51efd0
 MISC metadata.xml 343 BLAKE2B ab708c520474d5d977634451ec6b6ef75398273f4197e7e9b3e825056e88a0f8ac9394ed996be392a74493993512e2e52a271e3aa2f10dc75d8d789b543f183a SHA512 38231f059928acbe3e8881885133c2ddb54b004ad3323e8c95f1d663f0592dca4890aa0065bfc1abd94c7039f26e7effeaa7fd1d0673726c30b86f188d8c7139
diff --git a/dev-ruby/coderay/coderay-1.1.3-r2.ebuild b/dev-ruby/coderay/coderay-1.1.3-r2.ebuild
index e02963145021..6f617d0935ba 100644
--- a/dev-ruby/coderay/coderay-1.1.3-r2.ebuild
+++ b/dev-ruby/coderay/coderay-1.1.3-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/rubychan/coderay/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=("${FILESDIR}/${P}-ruby30.patch")
diff --git a/dev-ruby/color/Manifest b/dev-ruby/color/Manifest
index fb9a270eb5f1..af851765a003 100644
--- a/dev-ruby/color/Manifest
+++ b/dev-ruby/color/Manifest
@@ -1,3 +1,3 @@
 DIST color-1.8.tar.gz 42530 BLAKE2B 4a0f0ff4d4f82530fab5bad345350ea0cd983bc7d1bd8898c8a4da16de788efc908cff919d622ce0a9c445257e1dfef0adda4b29641d3eda55d0a8c917db932f SHA512 be48a8895b5dd33326a9debe250c87df37025eb2dca05a0eb61b82b31dbc1ee27c175fc1e37262bce88729e882dfb66f449a3a29c76b9ef0ac2064ffa2b4266c
-EBUILD color-1.8-r1.ebuild 648 BLAKE2B 0784d15b02d3b909a3d98af5680c5709b95ce0c3d7fcae35aa72e28ead236f44f565c3a766d807b5363540b483844d84e89ce4abda27ca593943e677d22c8f30 SHA512 acd85ed9cc71a75606771ed79f237a6925765e52492ec430060c2002aa7e92ec60ea7c5256524da7197b79c9906475f50c99e37b2c52adbaee6d97874769c5d8
+EBUILD color-1.8-r1.ebuild 655 BLAKE2B b338ff34aebf9c038a2d7cab2a7f081d65e018436a6d1a4d68e52b47f22665b33a78141ca2e6b56f34aa5829992dce20e76d547cd6b444656540f54c93df92e5 SHA512 43b00812ba3ce4ab067acc96f3a9279a83106ea2bce3830ef740b1e28fa3844c734f2533acc9885129d4a537eeba265f9961226aaf7d4b89196380707da44e9b
 MISC metadata.xml 343 BLAKE2B 59004534581e85a3babfbbe1266e0b1f03521a9d162fb0394b6cc42d202e2cb0af484425553c322b4aec461e6ae231890092c03b140e4242f0bcf7ea748d9a0e SHA512 810c9bbf27ebc5a25850534b2d28b3048c8b8a38230bd734b8882bac93023e25660e1a5871abaca4f1580104cba5037c40bd291f24bef94c293c3295099b83a0
diff --git a/dev-ruby/color/color-1.8-r1.ebuild b/dev-ruby/color/color-1.8-r1.ebuild
index 3cd0aea63b82..43c9bfaf760e 100644
--- a/dev-ruby/color/color-1.8-r1.ebuild
+++ b/dev-ruby/color/color-1.8-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
 RUBY_FAKEGEM_GEMSPEC="color.gemspec"
diff --git a/dev-ruby/colorator/Manifest b/dev-ruby/colorator/Manifest
index 25c667a53f81..f45c75f597cc 100644
--- a/dev-ruby/colorator/Manifest
+++ b/dev-ruby/colorator/Manifest
@@ -1,3 +1,3 @@
 DIST colorator-1.1.0.tar.gz 5112 BLAKE2B 89c297ad2de64b4befd0e0f5b8b4fed07c9456fc1e013d70f3084e15e8392b8e319737eaf9eb9172e4b5a32a36039b096f754de2351ae4f5b68f0f1884230f55 SHA512 7bc2e85f8c4db8ca6db5140c9ebb471d3b1733c1c408595eb0bec531ec5f08fc86f4ee793a451bf51f359c8d4f07beac9e5ae9f418e2752be1c4fb0442b802de
-EBUILD colorator-1.1.0-r1.ebuild 716 BLAKE2B 11b04dc1ee1ceaf2979edd5994172b903704a37055a031ca9d04ae73abfd6384dd3f172aa94a92bc06e8ef8e1fd046ea36c14b396cdcc5c6823d0d08d932ab85 SHA512 f54068f67a31dfa734c35211520310c9462b9f30a27645f892ed54e9e70abd7a2acc36fa02d4ef1af0ff3573c34617fc9e0913f99fc1db191e60e254fe359c6a
+EBUILD colorator-1.1.0-r1.ebuild 723 BLAKE2B bc75fe95f69c09df03a70c6758c5adb12b8de8d5d2b0f8502b386d24e8c15aadf9abfc0d7d8481ba8803d38cb53ebfc289b07c4d9578f06b9a785c1021f1d4d8 SHA512 5f723e4707a1c960f46ba8c00e9cc85c4f7d4d85e314e74d5719adfd36c4975d0bb13fb102246eec3f09b3a525996a23ba05a73b1b0639df316f7d0209cdc84f
 MISC metadata.xml 346 BLAKE2B 5cf1cb7ed2ce1730d9bfe039c501cd35b476184276892db83d23d3f08065ee8eb4d4f8048ed502d77cf78542d3784a0cfbf9cd66ca74c503b9168fcd996f6b64 SHA512 b827f181e3750eae3bad4b424904eb470dc5b07aa61a90b5cc2e3ac68fe106b5756e9580ce94ce20a012f8b4c97ff42a7f076cf59ced5b4690c9f1591e926b7b
diff --git a/dev-ruby/colorator/colorator-1.1.0-r1.ebuild b/dev-ruby/colorator/colorator-1.1.0-r1.ebuild
index 51126d3d1003..e634550f7885 100644
--- a/dev-ruby/colorator/colorator-1.1.0-r1.ebuild
+++ b/dev-ruby/colorator/colorator-1.1.0-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
 RUBY_FAKEGEM_GEMSPEC="colorator.gemspec"
diff --git a/dev-ruby/colored/Manifest b/dev-ruby/colored/Manifest
index cbf69ce90a80..e4f2625648ef 100644
--- a/dev-ruby/colored/Manifest
+++ b/dev-ruby/colored/Manifest
@@ -1,3 +1,3 @@
 DIST colored-1.2.gem 5632 BLAKE2B cb384fe13692d453f86e403a8684604d07543e3ea3270ad15b6d6d8be2c0d3610911a23b82f23c40e0472f40174a290948804eeb8cf5c496f36ab49d56ee4413 SHA512 92a50ba1c434b6a0b409e546812ae6f4331be00a68725cd207504bdd65c9512f4fc3bf83057dd4fad09b8a3e5869595a6bb572c4303f0bef1f241ce63d4fc90b
-EBUILD colored-1.2-r1.ebuild 372 BLAKE2B c3afa7e7f258b93813d07f16eb9696125e4a20edcdbbfe1307d9730918d9bc7f9b1b0af9fd9929399fea256258982650bdc4113d994ffe7b365eb912fb9eba3b SHA512 a636846d06143267d8e84253badf45bfeae81fa9c5728bb2605362bd0cb93a3d75bddf88e488a2a3cc5027fd915dc115bdb311922f3a2ded956a3bbcd237b8df
+EBUILD colored-1.2-r1.ebuild 379 BLAKE2B 5426c980bd1776b4ae8f52460d77b1cd5a497f8953ad4e1f69929d9ecca9f603783a20509bc07c6130679fb462ef40dbf8a398c6da9b21b7e4ed5e45de566956 SHA512 6df9dd31d706ca4876bcc226ba37d5fff2e3bfde4119c573cce6a8f4149e1d20dfe0538671f6712b305a99c6faed6ca4784b25532cc46ea6d114f177c11081e9
 MISC metadata.xml 342 BLAKE2B dc673388fe81a59c0811d8456c7618e3fbf72639c050e33204279ddce9cf00da4df0d59857c594f8dd005d951c43e9c46ca62339dfff2ab5c52dcc50c1714256 SHA512 7374591f0a9a2b225fad85944ba903bcebcc0824074678fda64be5d1358a772a3891665a17cb54568ccee4a25ae2df842b2d4f27e8323d294e00c203a00cd2c2
diff --git a/dev-ruby/colored/colored-1.2-r1.ebuild b/dev-ruby/colored/colored-1.2-r1.ebuild
index 2d33a155d46a..0c0e2d8559a2 100644
--- a/dev-ruby/colored/colored-1.2-r1.ebuild
+++ b/dev-ruby/colored/colored-1.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/colored2/Manifest b/dev-ruby/colored2/Manifest
index 31212a879ca1..a2ad65abcb0a 100644
--- a/dev-ruby/colored2/Manifest
+++ b/dev-ruby/colored2/Manifest
@@ -1,3 +1,3 @@
 DIST colored2-3.1.2.gem 10240 BLAKE2B 6dbf0dd1bce8712fecb4f34b0f4480da21f97db6d5d002e1758a7131120bbd68c02588b2f05eb50b09aaf2f398761e6d281b49b2b7a021724b7f4a416ae9d2d1 SHA512 20a3d610e7ff4097129eebf8d5f6cd5618cd5763dc14ad97c2570047c4f75ff371d3bea1b528f8c1b806b102e13834fd0092f9ae50590f11e70157e4584b915b
-EBUILD colored2-3.1.2.ebuild 474 BLAKE2B edf9e848dec6af228f962f7a3118db05354e26dd89a381362558ca81e5df0c8756b79936cf772aeb81a78cd03e22331a1cd79609fbcf2bcd9557e71ecd4505ca SHA512 bef85ccc984ac30d548df798cb1d2d696c0c46b918d899f4a93213989fbc20c9ecfbf8baec12263ea4d6fdc7451bdccae53bbf7b26a09a7ed3d61fbd9ddb3cc1
+EBUILD colored2-3.1.2.ebuild 474 BLAKE2B 88524418264fba540c03d0e892c2204c3bc677686527e7a00c96aa5df9c20ddd326ed4198134aadaa240957e1102807cd56e45c80c7e62e90bac5bdf198ca51b SHA512 71220062c0edc31e6a5f0d80b785653b7ee77393c8fcb55439604238b02a011aee9329aaef6a5d5020686fc98bc8ce2b56d0cd85ca75ef65d12e992b26e5f8bf
 MISC metadata.xml 343 BLAKE2B 114b0286eb61ba51b6d6ea9489117379287c61aaa7d5bafcc0c1c15cbcbeb935582cdbc196fcb3485a5bfa56a5e078925ca16d634434651c6c1a03452f785c95 SHA512 242b2e1d4818082f6b82a73a70ba5b3df10a7af33b2f915356a8c5bd67b25848a534b37048fe4b4c86bc63d3b95f279a1c9154a657ede945d109ae839f1b937b
diff --git a/dev-ruby/colored2/colored2-3.1.2.ebuild b/dev-ruby/colored2/colored2-3.1.2.ebuild
index 5a158dea39ff..935065681ac8 100644
--- a/dev-ruby/colored2/colored2-3.1.2.ebuild
+++ b/dev-ruby/colored2/colored2-3.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/colorize/Manifest b/dev-ruby/colorize/Manifest
index dd14d7742530..19e67cc88bb0 100644
--- a/dev-ruby/colorize/Manifest
+++ b/dev-ruby/colorize/Manifest
@@ -1,3 +1,3 @@
 DIST colorize-0.8.1.gem 15872 BLAKE2B fe8e3a3e010d55954fb9e3e26626202e1d3eba5478e27009fc86bd4029c98fe5a2ed2f2b0d5d1615e892435554272a70c1cbfcdadadea8bcaab894cb290e7992 SHA512 0819dfaa94150c85cbe633c77006f2f4bdd6c4f9bf9dfa954b8c4038b8a680c99a2b4b160da05bf426402d287a0db4c4eb1cc66a949405188b632f39da381c72
-EBUILD colorize-0.8.1-r1.ebuild 620 BLAKE2B fcd76ab62919fa7496892a4d0dff395b3aa5ebc7055a201ac390e8f5299e892d659a54d3b5c4b7fd1b88820eb1521bcfa053b0cc26ade8fa54d3d909fe5d824c SHA512 900766be07fc77ea35ceacc13d530f41c5c415c676634c5d07fa02f8c9dc59c6e2032ff2c55faf1a9f6aa94ccf0c6062eee57eb00c4be820e387c6148842c250
+EBUILD colorize-0.8.1-r1.ebuild 620 BLAKE2B 2f53fa6ead93064bd0b2d2b7476904d984fb1c47ba1012f93aa77e22d0f778ea388693105cb0fc532efd5842a7dd44dc5916c31e17bb32cd5fb0be1d88522002 SHA512 98fa4639afc4460f930b63bc2405b55d5b79d0533f2c8fa1ad4888268af8a1060071684c9aad036ad3c4f6c37d789962f276e4963124b2c1086018a221639b51
 MISC metadata.xml 344 BLAKE2B 5262445ecd7094595496227408c33e21782ec5e216fc9bb9c8e457b3bc30f93435d31beb84a6eefd6058cea8d4bf34cad7d2a88abd84396d585b5f1ee282f8ea SHA512 afb66a90e485bc54295f83d4fb25c66ed5bff62ce95949ffe6fcb5cdfeb28298738f4e88e3a8c7499d491968100119fc2e38120340c86a40902504f6ead99890
diff --git a/dev-ruby/colorize/colorize-0.8.1-r1.ebuild b/dev-ruby/colorize/colorize-0.8.1-r1.ebuild
index 9cf49b11f5e7..17c7662c97f0 100644
--- a/dev-ruby/colorize/colorize-0.8.1-r1.ebuild
+++ b/dev-ruby/colorize/colorize-0.8.1-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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
 
diff --git a/dev-ruby/columnize/Manifest b/dev-ruby/columnize/Manifest
index 1bbef316734f..493c0301e1d1 100644
--- a/dev-ruby/columnize/Manifest
+++ b/dev-ruby/columnize/Manifest
@@ -1,3 +1,3 @@
 DIST columnize-0.9.0.gem 16896 BLAKE2B 46821b72e3c0b70b5788002904fe6079dbab28f9f5d085ac269de8b2765c00f22294bbb36a288ea5688baf3a0bfeed9a4edfbe78eb41be67321433032ec99811 SHA512 b85f478db0e70740ff2d09e0c0a0e6eef378cbd0f025f8583726619412c0dd93ce85705978550ed13713f35e90db846ff087110c210742dfc3223bac3da7176c
-EBUILD columnize-0.9.0-r1.ebuild 445 BLAKE2B 4b31c16bdff907aedd589e1536885201d09f88042032b1ceaf781d2b4666bc7796722938d241dc588fd5dda92f64469c7976d4be1f5dd00b9dd5aa7356e34ea6 SHA512 201abcdbcbe83ee6ead977354757180a459f24b58606795a4ddc5a525519c9f112c38c86bd9e94a9269cc7103cc7147b4ab6b939699454d83a91a4cb34517d4e
+EBUILD columnize-0.9.0-r1.ebuild 445 BLAKE2B 102917231be683a20b8f76d3b7aa4c96756653f3326e4895f2390279ae2b7de3a35a51e6b868d9703b6451e7755103fd01bb931b64d37ea0163371c635b7f56d SHA512 a01ce8a92b887606164267478344061015cb026b9d10c9bde8014daba6dc94f965b8834cc4ccb5a303f00bcb324c6dc262421347377fde28080ba1d7e0cb0e83
 MISC metadata.xml 342 BLAKE2B 2ea1721becba00103210456b83ce0fc7d0e7584dcd61a21325ed1255430eaa3aa10498c1e551c12c6018e44c85b05931351e87b89c342d95b05d6d9595e5b810 SHA512 a17db116d5836fe555a8acb5fa2689cc9954e99fcf60e83dcc81712832b2aa96743dfd0daa6d0621d2bb206a30379f01d88aa4fcc5192807e83ec8dde13035da
diff --git a/dev-ruby/columnize/columnize-0.9.0-r1.ebuild b/dev-ruby/columnize/columnize-0.9.0-r1.ebuild
index 1307826334f7..61dc3cc6ac28 100644
--- a/dev-ruby/columnize/columnize-0.9.0-r1.ebuild
+++ b/dev-ruby/columnize/columnize-0.9.0-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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="AUTHORS ChangeLog NEWS README.md"
 
diff --git a/dev-ruby/commander/Manifest b/dev-ruby/commander/Manifest
index 5bd229cf129a..f2218178640a 100644
--- a/dev-ruby/commander/Manifest
+++ b/dev-ruby/commander/Manifest
@@ -1,5 +1,5 @@
 DIST commander-4.5.2.gem 37888 BLAKE2B e78e009a414e432d24a820dea6e85c9240e3a661eb15a17d71c152616dfd32fb02eea1e513a487ae90b8dc81e6ebc208d0bf432c37dc5a116c03c9df12ed057f SHA512 22ea0a5c88d4ec03658ca8e0fe12801a5a5918bc09031400e1cde2883bf061b85feb6d77448b256bc21f5ddee00e4afb2c08b99132cd7862f00c7cad13588564
 DIST commander-4.6.0.gem 38400 BLAKE2B c4adf5b58fe679378012a893526cb00ee71c4cda5686d397ee93aeb11dcf1b32a4aa8c4e6b77c2ed07af75bf2492da65591cf49b2e05a658e753e78a9a12736a SHA512 01e7d4076b6ff632f6852e15bf995033034a71d6320c5b3b41751e86894f5eca35b408311e757c555334d220a9a811a0d60c0fc993414961f1050d948cb9f5c7
 EBUILD commander-4.5.2.ebuild 558 BLAKE2B 1b9232e2bab5ed69eeac9597b6315ccd7846bee6772264a331603494d323ee2d701652e18bc5d97a89c8bb919342a74ebda8c44b452470662eba8d02ece00df5 SHA512 16b89db5ecbfb0de20454588338d0d0cca2e366b1c2e0da350f58487c8605c44c2dcd9ff33611ca20b52bff410c4134200c0eca499f7c19238383d6a7fcc515e
-EBUILD commander-4.6.0.ebuild 551 BLAKE2B ad3a42d4f10216176d440315b801bfe7aa4fe1a4b883ecd4e74217c5e69c703089119500d5f5e7074a9cf544877c74539a448ad0b23194acab1189346bb07cf6 SHA512 b94e0dcaa6a3f9f5c36fbb8fe9a3619ae91eee8e859d6ea666aae6dc0f96c420424518d6ba6cd2a0500862f0211af3663637825e9a7ad81b319ab350d6d74759
+EBUILD commander-4.6.0.ebuild 558 BLAKE2B 68646d6de9a8a043ff5dff5c992a47347a03bf93f446332898a5a72d14693719f1cce67e4f90575fedb6b0cac8237f14f593a5df76c457e691b8ed65627229bf SHA512 0e3991cd68e2254eed79e5456edb0cd2ff644a01fd78a5fbb9e4ecebfb5057bee81e49e46dfe88e0f1751c930d12bff3e42ae2972b30d14f7cb8d8111ebbd0e2
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/commander/commander-4.6.0.ebuild b/dev-ruby/commander/commander-4.6.0.ebuild
index 542600a4b740..38630ac5c726 100644
--- a/dev-ruby/commander/commander-4.6.0.ebuild
+++ b/dev-ruby/commander/commander-4.6.0.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="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/concurrent-ruby/Manifest b/dev-ruby/concurrent-ruby/Manifest
index 5590505d31f5..1b3cd98cab1e 100644
--- a/dev-ruby/concurrent-ruby/Manifest
+++ b/dev-ruby/concurrent-ruby/Manifest
@@ -1,5 +1,5 @@
 DIST concurrent-ruby-1.1.10.tar.gz 6013684 BLAKE2B d271579a49ab52c9c41a7a0a31451775e1cba8ce19486b52a9eb3df7abbc66f7610d31284fc02747a8ee5f429983d8283b6fe92f22b911dcda5bc515da58b48f SHA512 cfb67ce806d1f2a5bae509806247bfefb05c56794741cedcaa7ab6ff708085e374d150e8f46ff8e04dcb0918fde8ab5a593c60550da9ff6dc00af116e123f064
 DIST concurrent-ruby-1.1.9.tar.gz 4923746 BLAKE2B 2bfea989db31f17c69ee479091135516e2aeef7ac74234ccea91b2e4b3626395683a7b2ebba1d13cb527903d3d83c51e873bdb859f0ff1983062fea4fa90a1e4 SHA512 243fc20795bcd7399bdf77a9b0db9b0bccb1b05edacf4fbc8f5515f59502300b4033a2a59bfb6adea9befdb20759c9f58bbf0e7744e934c85738085bef714ea6
-EBUILD concurrent-ruby-1.1.10.ebuild 1383 BLAKE2B ea9b072dc59b704f60cf415b6b1f6dbf118ab28a69c09cb7f3023da2b49014fb150b5947c9368ad00750cfc70bf6aa7182e6193a6cfe00028d404e65886b8c98 SHA512 3d76b0e66c317ca280c7157abb2df5a1651a8bba7512f15deb73831957a77e4b48d3143e99bafb5fc7da944cbcb944874392dd1ee590e5391b24cf4662707356
+EBUILD concurrent-ruby-1.1.10.ebuild 1396 BLAKE2B 15974663f6284c0f4e430be9b3e87cfdc9b77b8edf8a0f1a4e163a774ad2f343f8a8b2d62067fe34ee34c0172be70b3cc6881574c1c09ebadd05ea37be6ee034 SHA512 9d67ecbbc1a06dbbfd3c68cefb87a002182fdb2e242c07f999d8043dcf3e990a1488c0640e544a03676cd3ab5308f3b35e3f5547cbdfc7d0e5982cf915bda18c
 EBUILD concurrent-ruby-1.1.9.ebuild 1369 BLAKE2B d8cf99b8b1d9111d543188ebd016aa609ade7127cff9fa5ff09d3d4937d3fd49a1b0a3b512199c8b8e855b0a003072283bf58bd2e22c3520ac1b4ec9433ee2c4 SHA512 57b2a1eaf4ac68757cde40e68cb445dcdd56c6ecdac76cfc4174a063565ac91366568a7e9b38d8904a0caf922ae638d6c66bddfac24479a9816e95e4eb3d40d6
 MISC metadata.xml 359 BLAKE2B 2db8e9c1e575575ead6e6f86d5c883e356dbd84d3def08d6d2b9473e8cb10951268bd85208f56b14047b6bf57388e025f4ad626555d001d266bb0a87db954f45 SHA512 39f31f985f90fb6514f2c282c01a0d38e325371ec18671dda808372891caa83eb28a6eaf0a3090999a0427e5ca6cf3ba5f75b59e86b0e8713dc85ff3a6eacb68
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.10.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.10.ebuild
index 4e6cb7eb5ab8..5f84dd6a038e 100644
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.10.ebuild
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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_bdepend "test? ( >=dev-ruby/timecop-0.7.4 )"
diff --git a/dev-ruby/connection_pool/Manifest b/dev-ruby/connection_pool/Manifest
index b22206ac78e5..0e32a97f11ca 100644
--- a/dev-ruby/connection_pool/Manifest
+++ b/dev-ruby/connection_pool/Manifest
@@ -1,3 +1,3 @@
 DIST connection_pool-2.2.5.gem 14848 BLAKE2B d3e21e5d3c330fb501e9890260c0fed003f3c8afc6a9106c139f77e879c45232de1cbc16be6088c757a1204f3c64b0797010fddc0d1c9cf555389348b6f61152 SHA512 3bc4e4d241cd4b1adb00d341aafe7795bbf0eff459ace962670d83c20c0eaa0d42f49a1f5e61c2327ff4fcbf3abfbc6f6c910f7a31d4a0f62bc55c782ab20e45
-EBUILD connection_pool-2.2.5.ebuild 758 BLAKE2B c72cd87699b2614c9654e42a494ef003f0fc1471229153b6675b401f61e6f8c55da987ff66dd5d2eaaa72e109b0b528f99f8685906f0ff8d74f9ab89b45be35e SHA512 d4f4787b39f9cdb3dfdb58d0a40d866e311fdec3e500c8f7f125608e51fb94d5d75e61e9b812506faf681174afac2e85a57fe572e4e37bc3ac8ad5bb657b8a58
+EBUILD connection_pool-2.2.5.ebuild 771 BLAKE2B 9a1cbea11bea0f33cb19d07ea2f83adf0b190be605b4837783562b5959ddae606d36dab38897846c5662dce51564efdf6783154fda5b6a0f3d2c40ac58e8b68b SHA512 20c2f5366a0ef29f49949b1321e6cb8889e230a8cf0ae3656c28b371da43b446ba93a2c182e7da78825e1e785bc8aae612a64f846dba492148a7a7352248ff8e
 MISC metadata.xml 350 BLAKE2B 9a703bda88725974dbaaf272241eed5ac6da6789fd05221852d904b53b506861c85b93f7a8a0c43c6ae4f75864ad1a9e8686f1edd44231f55671b2be80745dd7 SHA512 7cf078db32bc0d8f6f5b02516027dd0231b2276cfae19b7ede7adca0342e96a994233c78decf9ba83ec7bf4cda66525192cd6fff0f27fd4e3689e557b97d90b1
diff --git a/dev-ruby/connection_pool/connection_pool-2.2.5.ebuild b/dev-ruby/connection_pool/connection_pool-2.2.5.ebuild
index 96c12330dc93..874f8711c51d 100644
--- a/dev-ruby/connection_pool/connection_pool-2.2.5.ebuild
+++ b/dev-ruby/connection_pool/connection_pool-2.2.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/mperham/connection_pool"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5 )"
diff --git a/dev-ruby/contracts/Manifest b/dev-ruby/contracts/Manifest
index d0ac43a3e7de..1fc7638dc3e0 100644
--- a/dev-ruby/contracts/Manifest
+++ b/dev-ruby/contracts/Manifest
@@ -1,7 +1,5 @@
-DIST contracts-0.16.0.gem 55296 BLAKE2B 71b058fd2bcbdf5dfc2ff60631ecfc56cb405dea08fb5b2a67fb23c859a3941ed0aa3963ef639e9cb6670d871a6301a0c8b360fff3912413c10ad44ee8dcde2f SHA512 27d757c3a6d25920ada1b24842a5ed8521bc8902b1840b6060c94dc17e5eecb91501439eb764fa2fec97dedc6591d2c2978630f56d4b38e7b607e9fccfb60ad7
 DIST contracts-0.16.1.gem 57856 BLAKE2B 72978a2a47b75411d2ae74521470d5958ef711351e2ce6776f1331b0d3f4b175d43f991a73fd2332ac0e1f6732b05a65887054a0be4452fd62f058a28ba929be SHA512 bc182431de9efbc6d23603c68a64eddcd3f27ea1ac8c2c9ff00840cf38d2f58ba595304127e6b43e504d3aa387559a5c1429b671dadac175d3a4ad2c02edbf6a
 DIST contracts-0.17.gem 58368 BLAKE2B 2bccd3a552268821b3c34a08fef3d6c0e43e27f8a0e56a2b7b0291d388142a2efb3686230d4daaea6e82c45be8d42f2ab61d1aa3d6a7f682bd7d99a0af7f179d SHA512 bce1417e7b505ec35b43917d53cbdb175995ff877da2a6122e08b3c7e537d557785987a0110006525dd079f09d574be3f5f4793154f99ac91c32f83662fa311b
-EBUILD contracts-0.16.0.ebuild 517 BLAKE2B 072ccdc8151f17161d6a84da566e8bed9808c70f7ec4c29406f2450dd3a9bc8764c6581a92c2ff7f56c12dc4d14ee5b0ac54cdf23f2514d5e237d362bde8f96d SHA512 95269f78676dd3e3a6bcd504a676eeb13da6fc9ff0b259622883cd739167f9850ff73fb05cf416d1604a6b4eeb46d93450523b14e1f67fcaf9d556518f8a3c8a
-EBUILD contracts-0.16.1.ebuild 486 BLAKE2B 3f8a2fb9e263d24cb7a693a33f44122109e970fe3b86daef7b37baac32d10844a8041587a99f403516bb26416356941f640172c9e7162e4cb24faeb3a65e591f SHA512 eff26e68689a86985897f84578349e1c73c56d158a972fbc083e5191e0114f289d0f11535e00b965c9bc95b04300b3d484e8d78871d248fe1e4d94afa3e36e5c
-EBUILD contracts-0.17.ebuild 478 BLAKE2B ed95bc5a518d6c60afd52e9438db83ed9dc02cbc3a2d9659e80b74558a1e1eb5c67aa135dbbb07462980bb544a388ecb69563539a44d662bb77f0fce88c3c61a SHA512 fa692ed77a20fae79c8d84781a6e561078ccc5a7f39a397dab3ed2623cdb6745e595e5268bcc7c62df273f7a0208240a4310c4d8da34f4640f8336e64fa226db
+EBUILD contracts-0.16.1.ebuild 493 BLAKE2B 260637f892121209606ced2306f0a7224700f5036d185d35ddc3691d6c6a3890cb8335d231a0c67717613162c01fd7b53481375cba784ccb174a3916ded09d41 SHA512 24ee4b0e1befa12fcc27bee1bc69d35479bdc9bbe127b0b86a1444024508ab53496c415fbca1b82a002ba03a2a035b74b20b0836a78da22cc8ebca1faf3e6742
+EBUILD contracts-0.17.ebuild 492 BLAKE2B fb26eb9db6d6a24bf92ae6f0116db1ea1643f8448efa76fcd95eb4162e659854696b2489eafc47f539748000de45fd81244137aa848442a0befeb0707d321b01 SHA512 19ec5f48bb51d1e04c5bdb54855d9ff50c4d61cb42be9506cd60f0c1af7eaff1875f2780b5f075b64ade68552eaad8e85a47e1750280ce28b03f4e435b76fae0
 MISC metadata.xml 353 BLAKE2B ec68a13b1faccc1cf044530138380700063502c1844fe5fd23c79717b15aaaebc7c0a65789b60c0bed1ebac36f87d4fbedf93374fe0fee300e5cb4fe81653838 SHA512 b03899010b43019e54ad01b3a160bd76cead6cb7e3cad3ab1ca0f1a63ce497ae7522530b01578de8d9de962061629d0453ae99154b4d97a90815df71b47f2466
diff --git a/dev-ruby/contracts/contracts-0.16.0.ebuild b/dev-ruby/contracts/contracts-0.16.0.ebuild
deleted file mode 100644
index cde566992069..000000000000
--- a/dev-ruby/contracts/contracts-0.16.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.md TODO.markdown TUTORIAL.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="provides contracts for Ruby"
-HOMEPAGE="https://github.com/egonSchiele/contracts.ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
diff --git a/dev-ruby/contracts/contracts-0.16.1.ebuild b/dev-ruby/contracts/contracts-0.16.1.ebuild
index 6d9599539f5f..3be3ff966b31 100644
--- a/dev-ruby/contracts/contracts-0.16.1.ebuild
+++ b/dev-ruby/contracts/contracts-0.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/egonSchiele/contracts.ruby"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
diff --git a/dev-ruby/contracts/contracts-0.17.ebuild b/dev-ruby/contracts/contracts-0.17.ebuild
index cdcdf09d1eb8..3a0540c5fac5 100644
--- a/dev-ruby/contracts/contracts-0.17.ebuild
+++ b/dev-ruby/contracts/contracts-0.17.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="ruby30"
+USE_RUBY="ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/egonSchiele/contracts.ruby"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
diff --git a/dev-ruby/coolio/Manifest b/dev-ruby/coolio/Manifest
index 35ffad53c1ec..195b379237e6 100644
--- a/dev-ruby/coolio/Manifest
+++ b/dev-ruby/coolio/Manifest
@@ -1,3 +1,3 @@
 DIST cool.io-1.7.1.gem 112640 BLAKE2B 107d7541180de46c78542eab4b131220c4ae4a10210c7ff870f54eb24178b364fcac1abc4b93f8d0eccea197fb746cede95416aea8f3d5cc458626b1fa9a02f4 SHA512 9ab3e6ddd1689b2825f9bd82714b4ef5ac921dc4b2f84786971c3ec448577613cee73084c99090382878b0da43c9228cb2fd3a8627dc8f62ceeeff274dbdc929
-EBUILD coolio-1.7.1-r1.ebuild 1246 BLAKE2B 9ef7b959127bac1a709fd33d857824909bdfdb4a2c861060c03670818939f8d465676693b789732d239ecf0a5af7bb5e8240c2a9cd845655661e19606a045ba0 SHA512 47e72aec678cf545817d216a57b47ecc2ae97fc2aff3ac07fd79a2c9065311f12f230c63d4b882ed959a16082ed202e19582074248b1f217751a2edc34217bc6
+EBUILD coolio-1.7.1-r1.ebuild 1246 BLAKE2B 6ee674ffd5bc7b019ef5fed160ad3e77821f653d35e870ba1f6c32fef0246aa6615df4b34d2bf59478df55e0ce07b7af483b1347023e186461c31fe6920f6048 SHA512 68078fcb033d642033a1be86055bb6c23c5fcba59b4b3ce80c9a428682ff092224fba1d7e703a4cec673f05afa67e12258e5afa2aa048c5da417b908b4995de3
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/coolio/coolio-1.7.1-r1.ebuild b/dev-ruby/coolio/coolio-1.7.1-r1.ebuild
index b7f9b1eec0bd..717ae48c1ac0 100644
--- a/dev-ruby/coolio/coolio-1.7.1-r1.ebuild
+++ b/dev-ruby/coolio/coolio-1.7.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
diff --git a/dev-ruby/countdownlatch/Manifest b/dev-ruby/countdownlatch/Manifest
index f9b7caf6a2ea..1835be12cf91 100644
--- a/dev-ruby/countdownlatch/Manifest
+++ b/dev-ruby/countdownlatch/Manifest
@@ -1,3 +1,3 @@
 DIST countdownlatch-1.0.0.gem 7168 BLAKE2B 5261ccfec2c743fb2bdd785bf48c1695ded01be94e0d216d96f2322d5422000450dd6205a0b7ad3597de665b0629f09369937c2ea7cc377dd700a5e233662327 SHA512 3e8e23212b253d6d29ae7834131e7dd5ccb40d6ecb43fe31fa84b8314e932b5ef1cc8ce61f59ba8256bfc80c6f7c131b149748e99ce9b4667f2da7ac8b8279a5
-EBUILD countdownlatch-1.0.0-r2.ebuild 574 BLAKE2B 5da5f1072af39c5467868115afa3630a3f1c0bc709195b10b06155847361ea753bf18b4f7600659ae5d4d23b306da990d4f1036703c6d1f77d254e63d9621f78 SHA512 97bfb46742bbadd11e9bfffec49e8e274a307fc053dbfd9c3ca5687eb8fce21867a7792c1f1f75400536a27e798179afaae0977d5f2e070f51fea613d91403dd
+EBUILD countdownlatch-1.0.0-r2.ebuild 581 BLAKE2B 56634566dc51a5a38a5204f146803d1e886b9ab199c63b6767495d94e1fd977b5fb6dff590b991ef326b65715bbb78bc60284c53fc0a0af2fdb433f1b78832dd SHA512 bd025062666a129b2fc9e14c0fa6d5cbb0a8235046254c6e007531a1e4ac985ac261bc456ca6589173415af56c26d50844c099c11a7f40d53d5e48e51153b335
 MISC metadata.xml 353 BLAKE2B 9a099c6429301e215ad14e8bc0bf9976e44a4d3d1482b1948d76f7b7979e37c52666c1da8a56b1de3d77433c6ab6e60eebf89e2ab93a352caebf630913eed10c SHA512 f4d811700976ef8169412b958148447553176ef84b05a2f71d2bdd26049c2afada3f83207ef9257365d802deda87120b0e373912f0f0caa521f0429fcb531fb2
diff --git a/dev-ruby/countdownlatch/countdownlatch-1.0.0-r2.ebuild b/dev-ruby/countdownlatch/countdownlatch-1.0.0-r2.ebuild
index 3b5c7208e942..8e91f5622a34 100644
--- a/dev-ruby/countdownlatch/countdownlatch-1.0.0-r2.ebuild
+++ b/dev-ruby/countdownlatch/countdownlatch-1.0.0-r2.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/crack/Manifest b/dev-ruby/crack/Manifest
index 82557d8829b5..846b6f32908a 100644
--- a/dev-ruby/crack/Manifest
+++ b/dev-ruby/crack/Manifest
@@ -1,3 +1,3 @@
 DIST crack-0.4.4.tar.gz 586633 BLAKE2B 26e2cda6e9447fb3c9fe02092a6e9d6a8097c7bca6a483a3af42aa8ba491b737bc0dc3ae1936ef8ffb5c5d5cbbed3fde69c9641f05b9e3eb3beab87c375f68fd SHA512 3f86c76718a3c2a65ee11b15434035396c2355a8562bdb642432a659b52c3e811e930318e0dc2df3ff06bd53ac14d0694471e425420ae3b7971f5d4f818bba87
-EBUILD crack-0.4.4.ebuild 1097 BLAKE2B caf863d17a2414e60e2a206b16ade9b1cf83e328c7f2e1ff9043ccd8551a9162130b6dfe7f2009d603391decf5243837b7b65284c8aa8ca2a047c28bd5413fec SHA512 15e2d2021517ee7bd6b0ed01db5e0536a06a77fd7cd119501c9a34cb20a72e0cedce4cc827b05217bbd163e898dc67579dfbabf8777271860ace775c7cd001b6
+EBUILD crack-0.4.4.ebuild 1109 BLAKE2B 37b3ad2f2414feb1d6cb2e87d6e8f6c8b0fa24c386bcd1dcf966574ff7f81f736fab734a5cb5bc857e8e383609caca5a8ec8bde3af54dba70cac4da76f2b6f0f SHA512 ccb73624450355c4fbfd88b5edf6ffad020d778f6588ee9cf5d529702f61d247862566a8c93f9188fc7c405b6fbb214dd584bfbc6b620b88e5cd0568a6ee40c1
 MISC metadata.xml 343 BLAKE2B e98d01493c40195b22fa423e30e512b5f4b5ef08676138f4c5c3b7d18aae166fdc5fbb11ea465370de681fc85ded672dabefe34546f2b3140379984a187399f0 SHA512 44de19ae2a745da9ef90d7300e56efc80f892f0a7173ea6967c1bd079a24d0b50fa5de6eb1565254d7db84b5875679c9e70d2f3a87a60c31c9aa33f7bb4d6616
diff --git a/dev-ruby/crack/crack-0.4.4.ebuild b/dev-ruby/crack/crack-0.4.4.ebuild
index ad34d2ef45ba..fc9731fd8cc5 100644
--- a/dev-ruby/crack/crack-0.4.4.ebuild
+++ b/dev-ruby/crack/crack-0.4.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/jnunemaker/crack/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong 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_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/creole/Manifest b/dev-ruby/creole/Manifest
index 9ddf1e469d7f..ef5b5dc60fb0 100644
--- a/dev-ruby/creole/Manifest
+++ b/dev-ruby/creole/Manifest
@@ -1,3 +1,3 @@
 DIST creole-0.5.0.tar.gz 10664 BLAKE2B cf284a80fc43d24dd9e232055b78b9f76e5ee7c44dc86fb3311cc191503d38cd31e6e8f7f6290c451860da3e2dc5646c5baaefa79fa5df9165d2eb867c5dc8ef SHA512 80f82018637f2c33c71cc57e65b6bf372fb508c890269c3a04cf171b549115f3cb09daf7fa29935824780b886c1077db20a6e7dd38af35d715529683d965bc07
-EBUILD creole-0.5.0-r1.ebuild 756 BLAKE2B a946dcc62122174b1c3e40c0e9024f0a8d6deb3e73c5741542c0c2d55b7d298c9ae168014f60392708e70d2557985425acce974de49b68d4d2e3d955b571f596 SHA512 fc985127ff55d94748e1de8438ad915e8c98a36944d820e04a64fa65e5db4538530d688d57a39be50e166a21bb021917591e166cd101581f8a931fadfeed88d7
+EBUILD creole-0.5.0-r1.ebuild 756 BLAKE2B 7e44a0eb2e26574c68589805fb876e29f53eaa4bd4b12310406c70602306039fe9591ae2321bdd41e775fc7c8bcd33c4b84d889389dee538ae43522f6048f3ea SHA512 fb8a21545647c6bdeb419fa8826a1c85945e7817dbf78db1f9feafd45a9c722a94e50d6e4ccc7f99fa96c188772877315ab70663de9a9b56acd43af0a0ac441e
 MISC metadata.xml 339 BLAKE2B 213172aef7c762e9e3018c7e7c53f3d4de2004045b744cd191db960942be03d592ca78663d5d85f670f3e20095db7234fc3586bb7dae8723070d2da8ee5c5051 SHA512 8ec250e92ac8729a17e8afc336668e4bff46e4edf94f466053957078095f90172fb087b5e764c128aceda6874ef3092c0c1560bc5a86584d53308ac792b1f4b7
diff --git a/dev-ruby/creole/creole-0.5.0-r1.ebuild b/dev-ruby/creole/creole-0.5.0-r1.ebuild
index 87c7dc48ceae..481e13dfef48 100644
--- a/dev-ruby/creole/creole-0.5.0-r1.ebuild
+++ b/dev-ruby/creole/creole-0.5.0-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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rake"
 RUBY_FAKEGEM_RECIPE_DOC="none"
diff --git a/dev-ruby/curb/Manifest b/dev-ruby/curb/Manifest
index 7a419f01d1e3..b12c6bbb8581 100644
--- a/dev-ruby/curb/Manifest
+++ b/dev-ruby/curb/Manifest
@@ -1,3 +1,5 @@
 DIST curb-0.9.11.gem 88576 BLAKE2B 1656a17070151ddd1bd63c3e23885d36d8e2b133b19e00347892363a9a20c88baa10932ceb5273733b18847d8d19dc403aa4b7f36fbd80c8dde126ae46743796 SHA512 000ee2054a5866de09042dfc5894330900e401aa94a0fe8bb133fe9c661f7899992adff0585e5ed3725d3564cd9819d76653655f3539faaa61ca6acabe3a8602
+DIST curb-1.0.1.gem 90624 BLAKE2B b54404e0ea81ccb2ea03e262abce247ca4e0db1a5208cfecd57a6c0e423c36b282cdaef7db9bd3fe70d3fdb8cfa60c6085be04ff78daac71e83b63fe25bfef06 SHA512 78eeef1b3a778c64517243a25ff82889cb4703589d27f08cff6e84d39a806610a80bb749c51ddba93a82e02a18797978b55ebc4643948caa8900e76d343f4bc6
 EBUILD curb-0.9.11-r1.ebuild 1391 BLAKE2B 462de9fb6407457864bd56b2a0de59bb4723da435455b1371b2df8acd349e4a6424909897521e0a0dd7fd75520af11346bfc3193cd572247d64beca032a7ed2b SHA512 59706c93edaada27f54a15cc8ec7735b28d05a7d2736dbf0b00bf15b5502850466fb45b0278c735655493b5128e0813bc80b0cea2253541434b8611733deb222
+EBUILD curb-1.0.1.ebuild 1399 BLAKE2B aab3e44d95e6dc654a2e8b86a9f9a6ceb4321db481e742a5498f5885604143f90bc2d6d49edc0d396ec18776c8e82cd71c3f92cbe793022e32f4dff851bee4a6 SHA512 87b2e4cd6b9935a24c84e9bbe1bd4b1055609c6cb68c2d098372c5896f79828ea629ba845087516be56dd4c6606fe1bd2c9ae8102a65094329e25c80f965e9f2
 MISC metadata.xml 336 BLAKE2B fd9820c5561af2381bf081eb2f3370727020edc79f306bd94b90699e8a817d218edb11ccc60ae9aa43f1713218a91c9b53cff0a6c23fc3d189e06bc5a1265b71 SHA512 f948d0e7f36c4b9912c58d6a7bf1b2ac5934075780fc7de3d6f759276e4ee297850f725259c06245affca40745bdc2bab0ab78bbd60b308a5d11fc97edeb4ac1
diff --git a/dev-ruby/curb/curb-1.0.1.ebuild b/dev-ruby/curb/curb-1.0.1.ebuild
new file mode 100644
index 000000000000..b82ed935cd1c
--- /dev/null
+++ b/dev-ruby/curb/curb-1.0.1.ebuild
@@ -0,0 +1,45 @@
+# 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="rake"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby-language bindings for libcurl"
+HOMEPAGE="https://github.com/taf2/curb"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND+=" net-misc/curl[ssl] test? ( net-misc/curl )"
+RDEPEND+=" net-misc/curl[ssl]"
+
+all_ruby_prepare() {
+	# fix tests when localhost is also ::1
+	sed -i -e 's|localhost:|127.0.0.1:|g' tests/*.rb || die
+
+	# avoid tests making outside network connections
+	rm tests/bug_postfields_crash.rb || die
+	sed -e '/test_easy_http_verbs_must_respond_to_str/,/^  end/ s:^:#:' \
+		-i tests/tc_curl_easy.rb || die
+	sed -e '/test_connection_keepalive/aomit "network connection needed"' \
+		-i tests/tc_curl_multi.rb || die
+
+	# Fix test that expects wrong output
+	sed -i -e 's/200 OK /200 OK/' tests/tc_curl_easy.rb || die
+
+	# avoid failing tests where failure condition seems weird, no
+	# upstream travis so not clear if the test is indeed broken.
+	sed -i -e '/test_multi_easy_http/,/^  end/ s:^:#:' tests/tc_curl_multi.rb || die
+
+	# avoid test requiring ntlm support on curl which is no longer available in gentoo
+	sed -i -e '/test_username_password/aomit "ntlm support in curl needed"' -i tests/tc_curl_easy.rb || die
+}
diff --git a/dev-ruby/curses/Manifest b/dev-ruby/curses/Manifest
index 72c70a3415a7..6006fceb0726 100644
--- a/dev-ruby/curses/Manifest
+++ b/dev-ruby/curses/Manifest
@@ -3,5 +3,5 @@ DIST curses-1.4.3.gem 524288 BLAKE2B a4f0ab5d1bb2723ac406c8d61b0ef6ed1b257d4959d
 DIST curses-1.4.4.gem 524800 BLAKE2B 00749022a097a69b8a1a42b88b64a81a60cd6e6914dbc0636a1ed17db6f7b3f1f0e583b965b9b296ff27a5dc97786024f0511b2ed59e337ef29a799dda0fc577 SHA512 5e275b7bc035c9745ed19d563da97aba090f66d4831a4cf07144ff29f3b49a36bbee592e1292719d6bcfd1f6a77d2955de5d7e5ff34ce487d574482a0cee1a53
 EBUILD curses-1.4.2.ebuild 533 BLAKE2B 7dea0c7fd544995554ce01e900055d2a07a84faac372fb9532f96a6f36d3ee140e121e3adb868cbcd0c1fd02a00bd11f640a900e59a32da0bebb20dc65e0bbe3 SHA512 1e937ae22390d5252da7c47fbde733ab8198405e13d925266b33d3665c89b3f480289d935b7c8e6583831cc8da0574cd0599cf00171ac33877e29513a029e087
 EBUILD curses-1.4.3.ebuild 526 BLAKE2B 0478da45f1a95acb282760fe90fedf80f573abc68741c6fa3d444a13b558f9841c81429b974757b7e1e8a7e5f28aedace5f01ec559fe7577c31d2dbaeed4b481 SHA512 6c3b83da89f75de96cbf2fb678331554c6e4735a1646a71bedae81d1dfd251f59d22c53a07cedc21e12032c88c9e47b2993f50c7b7857423560aa36e8a893d67
-EBUILD curses-1.4.4.ebuild 526 BLAKE2B 0478da45f1a95acb282760fe90fedf80f573abc68741c6fa3d444a13b558f9841c81429b974757b7e1e8a7e5f28aedace5f01ec559fe7577c31d2dbaeed4b481 SHA512 6c3b83da89f75de96cbf2fb678331554c6e4735a1646a71bedae81d1dfd251f59d22c53a07cedc21e12032c88c9e47b2993f50c7b7857423560aa36e8a893d67
+EBUILD curses-1.4.4.ebuild 533 BLAKE2B 2e09455a9911e689ac4e175b64ccc08ad8b61d6cd1d38a1773c6e542ff2818d38708442e27558dd3edd7f109f76e558da8f4ded375162ed5a67a6958624b8ecf SHA512 55de4ad9ddd8789fcd09369e001aed95811b959c3457dce0272a0f5d69ad5540f2b6e5c598479dcc47d1102650611f15334aa1f1324f0fc4dfb665b1a2fe959e
 MISC metadata.xml 338 BLAKE2B abd01018668395bdc0e27d71ccc6341beb96b969dc215cb05760e478e46766948116542416274e0a99284458f2773dd0ab73e6041112f62181efa441d879082b SHA512 d074a3168d313769de5bcb360d0e70bafa37a5c37fd9416ea3d0b9c992648d7e5416c71256d16bdfdf83abf11b77e1fec8069fcbf56bd2c909a9ade07adb219a
diff --git a/dev-ruby/curses/curses-1.4.4.ebuild b/dev-ruby/curses/curses-1.4.4.ebuild
index 6b1ad29920c0..0c4d1ba0bfb2 100644
--- a/dev-ruby/curses/curses-1.4.4.ebuild
+++ b/dev-ruby/curses/curses-1.4.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/daemons/Manifest b/dev-ruby/daemons/Manifest
index 68c5215653cf..73e200c79f91 100644
--- a/dev-ruby/daemons/Manifest
+++ b/dev-ruby/daemons/Manifest
@@ -3,5 +3,5 @@ DIST daemons-1.4.0.tar.gz 29257 BLAKE2B 6f8f108727e8d77c18435fae7a8305ecd615eb65
 DIST daemons-1.4.1.tar.gz 29310 BLAKE2B 4f376f0a1a9322d95b32b74862beae93ae5d8636c0d321b059c335053760077b6ba78780cc4c22d5e98fbb95e2dffb85fd5ccfb1dc5152653698c29a0ac86577 SHA512 5b55f644a53efe93a6bb80ca534207c7a847a7c21df127d17ba6f09e2c2d8c665d87e6355382d2d51c3c9f50741fa9a31f5bfd228d9bb45ba8d5d099b7b5d026
 EBUILD daemons-1.3.1.ebuild 815 BLAKE2B 3498d3d79c05cd822dbcbc21451c87a3ac6ab3d55624caca7aeddb8de56e3f6f0ad003c6eb9dd53e433e1502774ced592c8e4ff71b91dfdfa0bfaedcf9725f3e SHA512 e1de60088d4e7f399aa55b6ee3f53197e3937743e04dd3178fe6bfdb3315a1736b73c0823b6c435f0a5185d450780d2a4de40c90196021515799367b56a0bc66
 EBUILD daemons-1.4.0.ebuild 894 BLAKE2B 08ffca8128f192789526d7f8772ee159b31710f4e6e9cfed5867b6d4a124b830bacf98e90c72df3dc213748959969dd2e845ee05931b2c9e144fc07cb740a9dd SHA512 c06410bc02a5d2b88b70b4e108bff13dba5bb79f36a2a81b299c9a78e2f39dbe4e94fb22820b7e1613d9fcb51e75dc326c53b18aed3594687f59cde050483f38
-EBUILD daemons-1.4.1.ebuild 887 BLAKE2B 9a79d2b0816e3414630ec34f10b1875fe7ec9e92e5d66d5692492ab0995e1cbfc88c9b9714f4a0995bc6ece6a0fdaac328fc1dd40a9fc8e31f7093d8d91cccd0 SHA512 06952b645625508cae865cc23eeebc111a7ecb2bfd2f7e0b86520f21eec65e43f04e1f438a76d8278280b678392f56c5436ef621c3f0c91cac9eea91c4bcc4f8
+EBUILD daemons-1.4.1.ebuild 894 BLAKE2B c91a286c821751d1a9f7de244029a10787b2fe18dc1be768f9c07fa394fdc9c36cc5f4f3fa5f1b974b4fe6f9a1e9271e05808fa751f38decd3406a6773fd1420 SHA512 be87ee46f1c3ebd6c15d7079dcf372e612c8e20896e72fe7f30fd2a3e615299f6c7dd5d97833b73df7d39ba5e1dec736b0e746aed8a44e476d1004390925208f
 MISC metadata.xml 346 BLAKE2B 4080b9b881a57f1949e1cfd6d9a474ad8ed6e5b153888b24aff577b30d8a15beb64e688b372dffecf1295d1093c6bdecf1832993b438b7a7f9650de81a8f56f8 SHA512 92d1e03932da5ad62e191cd675a64be9e6dfe0d64e36efeac88ffa7c711b23c978661459bdda312afe546706112ec8271d962875ef35b816dbed42d1269dae7d
diff --git a/dev-ruby/daemons/daemons-1.4.1.ebuild b/dev-ruby/daemons/daemons-1.4.1.ebuild
index 54b393dd44b2..22f662138b2d 100644
--- a/dev-ruby/daemons/daemons-1.4.1.ebuild
+++ b/dev-ruby/daemons/daemons-1.4.1.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="Releases README.md"
 
diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index 931cb339c5fc..5da153543266 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -3,5 +3,5 @@ DIST dalli-3.0.3.tar.gz 47633 BLAKE2B ee47bc7e4efcbd0d60c1663bf514f5a21d0fdeb70c
 DIST dalli-3.2.1.tar.gz 69926 BLAKE2B c3cd0c6d817b04aed786df7792b84c8659fa1ea79d69d2fc477549869fb5d7d4880c1d897f90c35020c04babc17f16ee55724339b150eec1a8b887de27b4d02e SHA512 5328ea5aecb4270a33ca08f498588f08259b56e36e1ed404f062d39b8693874878f019dbfe154892b1d192ec136f5473da5612ee7d095b8760caf628be3c67a7
 EBUILD dalli-2.7.11.ebuild 1580 BLAKE2B 39f0f7be69f4e765a7b1d071254b50ddcfe40a2da74eaabbec89ec4b326ff8021423fb9b9689480105e73ffc4e9dd4f1d099bd61b1cb1675233607149c80cc21 SHA512 e18919458eb72a224bd69849eb991af5e973d799873af42d97404eb8b864eee3336fb63f71d6d2cd08456d310e26cc9ff5d9037ff4d292237b54a3e11571ad98
 EBUILD dalli-3.0.3.ebuild 1008 BLAKE2B 28fcfcf1cf5820cc67d3f1c6ec6752ada1f7d32e0593bc92e8408bf0fc6081c28d87740e56a431efbbd7e16ae3a66028115c5002ee2e112a346f764475c62d4b SHA512 ec61b8630a2cb9e5475f008fc8dd540b1423e64ffd1e8357b37b1ae75b07de8e91087b88bd1287870a63d488db9235857847fc22ca5980ad36bca7effc6333b3
-EBUILD dalli-3.2.1.ebuild 1114 BLAKE2B 2705452bcc2a6c31b6b6e65d00cad3435cde46eb0fe5e13ed4ec6b5f5c4065170d8c82d523c9f88b8a834e2af33c5ef4e2cc93be0729d26279e686c96679ed8a SHA512 cc451f33a6465af01848051794ed13302d7367bdfed883eb3d7500078d5168610d1e764fdcb31a06f6fe2b651be9fc18b4407188ce1467d60ace0220853e2fda
+EBUILD dalli-3.2.1.ebuild 1127 BLAKE2B ee67b14babe5a7bec170174da60e454ea806fe55ccaacbd7c564dc022e1dd1669295a7f49725343a74775c9654b62afd04708010a9402885e84a2dd9882e36ce SHA512 5b2a9f46070988dde82dcdc5461776e54dc6f7a98edc3f070ef4e7b3b9eac3540c7899de43ac3563d1dcaa6f11880e00dea77c3111b492402b3f36672084ea55
 MISC metadata.xml 347 BLAKE2B f1e7c89c18e4fb1a02714796274401469ee66687a98d56445ed894024667a9bb277d0d1c1f6cc4ddfd90c3d3b3cd2f826bad7dda8fc5f3d6111b8326865228bd SHA512 7645efc96c6c7d275946260d28055c704f3fb45674e864b60a4a60e7265c8c61e82105373a243ecad18101c850ec47ea3c9a5a2a0538b4f9c99232ba1fa36c6e
diff --git a/dev-ruby/dalli/dalli-3.2.1.ebuild b/dev-ruby/dalli/dalli-3.2.1.ebuild
index cef16dff0e59..3b6b5f10081f 100644
--- a/dev-ruby/dalli/dalli-3.2.1.ebuild
+++ b/dev-ruby/dalli/dalli-3.2.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/petergoldstein/dalli"
 SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
 IUSE=""
 
 DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4[ssl(-)] )"
diff --git a/dev-ruby/database_cleaner-active_record/Manifest b/dev-ruby/database_cleaner-active_record/Manifest
index 548dd39d32d6..2949b299d3a3 100644
--- a/dev-ruby/database_cleaner-active_record/Manifest
+++ b/dev-ruby/database_cleaner-active_record/Manifest
@@ -1,3 +1,3 @@
 DIST database_cleaner-active_record-2.0.1.gem 12288 BLAKE2B 3c9afbca6186d7489b271b8f52834cc30d0087176129c06403a99cbdc18b3d565ce0422e916ca7e4b2f8bbe96f1deaba1b7fd982eab676aab0fa7db55923fbb3 SHA512 5b52b1e1a3f0c75dbd699ca5a2a5e6eacb9b93ca5c69661cc277eb2b3170b93240c72b1ce4d751e768e78eb4d933a3179b3d32dd1c57ae2ffa7b572acb8e3745
-EBUILD database_cleaner-active_record-2.0.1.ebuild 673 BLAKE2B 978055642f61b521c7b7caa1400ebef351e9b751ac555b1c741ed8a6e2336ed042b4ed0f217c3337108420ac49ff7f4ba20e8c06e746626dac5fc4db532943ec SHA512 75696691147eacdb5c37aad47d522ab349cf59f7cb76e50493e5d4a055426270c84afb9d8b42730d8b99ca212e88425fdd46a82ec585ad2b993bb694b9eafa80
+EBUILD database_cleaner-active_record-2.0.1.ebuild 673 BLAKE2B d7c61c19e403e836699f3172228ed1847cead518e8acedc3170f0b4289b0675e4fc020b1aa0e9fd10827badae55ac694dd063d98782bfda830d5985cb70a9300 SHA512 12549d116db991f6b669406a9de7288bce5808e3c1ea851cabfbe85442ef1cd19f2a1e20c56a2bbc634be5e123a646e49b05cf31704d666e087495d522ffac65
 MISC metadata.xml 350 BLAKE2B f42703e55d293daadd797b18c265425895467081b79bf8d2ed8e5bb01e5d48407f30ac4968914a189f04163623988dc654245d2a279ef7d5d606623e146909ad SHA512 69517c984a348540d92ef2debb2ac2e3fb4f34f497faeebb9485272cb360e8e8a16904a8a3b22714d674b25c774d39248b140d6c5c53bae8fa33bc9b69472903
diff --git a/dev-ruby/database_cleaner-active_record/database_cleaner-active_record-2.0.1.ebuild b/dev-ruby/database_cleaner-active_record/database_cleaner-active_record-2.0.1.ebuild
index 069967365a87..5e38460e01af 100644
--- a/dev-ruby/database_cleaner-active_record/database_cleaner-active_record-2.0.1.ebuild
+++ b/dev-ruby/database_cleaner-active_record/database_cleaner-active_record-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/database_cleaner/Manifest b/dev-ruby/database_cleaner/Manifest
index 9e5aa389edb1..73f6f770cfd0 100644
--- a/dev-ruby/database_cleaner/Manifest
+++ b/dev-ruby/database_cleaner/Manifest
@@ -1,5 +1,5 @@
 DIST database_cleaner-1.7.0.gem 32256 BLAKE2B 496a1f02bb34aa2210e91367ade3575884e5c68ed18d1ba076fe8a5a7b0c5303a8acedec198a3de4adeb8f85cb2147d1c1d3c1f7badfb890ca1c7df8ecd7eae7 SHA512 4bdf6c66a0530a65ce2c746ff5190ef0aa42ab3d3ed787fbfe9c00de99d7ba816de3b6ad11cbaf4887760b9a19178f9968b8d604bc023dce83ec9ef748c0e336
 DIST database_cleaner-2.0.1.gem 4608 BLAKE2B 9cd2d7028a95089aa7c1e6744305724977a395136de9f1672094ca5faf48dfe875cb23d68465b78a3a00798badb1dfeb14d7bdf00a637e2e8680da32286d67e6 SHA512 e1acbf853feecbd46ce1bf021b0b8cbc96c9697d5c61ab1a2f4f92005b779102cd1ffd9bb81eae94a94d0c4a50e0bd7f55d28f0b4fdd6596f677f37edb01ca38
 EBUILD database_cleaner-1.7.0.ebuild 561 BLAKE2B 84db49217724a00c77fe527a8aa98a047fd89969fb8fd0077b26a2a15a0634bc5335a636aadb15315887c4e8255d6245ba2c48d8654ebe102f1e3fefd2ecb05f SHA512 a279c60bf773abcafc1295da7ff68f75dc68bb220a2bbee0c19c3c9cde6628b0d30895cd541e5bf29cd552b7add594cb5b453475b179848a5aecda08cf246a61
-EBUILD database_cleaner-2.0.1.ebuild 501 BLAKE2B 65d3a11fb2ab97794cbcf052d94c7ed5c4c1ca94acc1a651d095b8c8918dcbd5acd25de182a6f78980337e095a335dd7b1a604e10d456674ed6defbd0972c172 SHA512 f5f1b6c4bed146136df2a4e038c2dd2ce0220dcb8aa6eae5824c9c56b410e3e38cec1abc29299f3548f06cf54e6366ddc12cd446efd6c1c0cb427d41037bd237
+EBUILD database_cleaner-2.0.1.ebuild 501 BLAKE2B 5e3d58a27770ae4ef4408bc811516f12428c1dc8fa0bf950de6f2596890fb872f0b71a540a2571b198718eee7e1f903687d6923dd030c5c88c77247d7e64dc84 SHA512 219faf3cc748412d3103994a70fdef8d965249d6ddb8f0678de2e57d507c61f5bb093f0276cc228e4aff4acd1ef968ce8bdc2ef2ea93e6fa96de6d2a2c4346f9
 MISC metadata.xml 464 BLAKE2B 29db298a655a49054d23b758536848fb4222921b6ad07dae4890caf627b6b1add49998f41a0ed5658e1769456b85775b27aa376c3b65ae7cdd45d91bc15da510 SHA512 7295d6b44e9cc76a5bef59e79840be7567ea4c23dea91e87a554e58b9e07fd07ad2b338cdc3f222668a0946ebac29f4143ecaa0af82ef15edcfe9216092dcbd8
diff --git a/dev-ruby/database_cleaner/database_cleaner-2.0.1.ebuild b/dev-ruby/database_cleaner/database_cleaner-2.0.1.ebuild
index 52e7a601af60..8533fce64b78 100644
--- a/dev-ruby/database_cleaner/database_cleaner-2.0.1.ebuild
+++ b/dev-ruby/database_cleaner/database_cleaner-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 # There are specs and features but they all require configured databases.
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/date_validator/Manifest b/dev-ruby/date_validator/Manifest
index b62c35567238..16469a94ebbf 100644
--- a/dev-ruby/date_validator/Manifest
+++ b/dev-ruby/date_validator/Manifest
@@ -1,7 +1,5 @@
-DIST date_validator-0.10.0.gem 12800 BLAKE2B 0cbb11e70cb72a1203c2ec33581d4ed48be346af6998faa89e4323c8c6bf70b5c979b55bc79630153a940697c89ce140eb511538cd55adb0f12566f2f1a317a9 SHA512 4348835898ebfe311a8ea456adc10f7bbfd1dc21daf2678e32b1615ba3eef3d36671f67f533109882f40516c836f23d7e0a4072c9ecaa55a1b0eade0b6aa75b7
 DIST date_validator-0.11.0.gem 12800 BLAKE2B ce45caa57bd1e29900ed0732bdbfbf81c68836de71efbf099bdc595a9b586872175960af40129af6d793ed5ce49ba222a3ca7d0172ef764ee02c88f4eae04e9e SHA512 269f3e234c8157a667c81d725497eafd21621cd35811f35707590242a3dc78065bd6dbe7b772a38761fdb8c95ae40f99976919444dac061f7bd2150fc9178afa
 DIST date_validator-0.12.0.gem 12800 BLAKE2B 235434dbd7e4441698bc90e0dd37bf9e5b8f1f742424e8155876e677e5d7dbe7beb4edd2f7dda7dba2729a024dcda72ac816e4f6a7dd38fdfaa4ea79f21d078e SHA512 e7796375d6d6af2fc9ce6e7d6174d59bd35ddbac90c4e5b54b321e33ed25f3e816c58013fa61f2003724e87fc96495ce81c132d056c9c9331bd1a236eb7dec38
-EBUILD date_validator-0.10.0.ebuild 1048 BLAKE2B 8c86303cd1ff60115e42c0c2e5597725ab5e26e24315f34a54f651a492b2c467fcc4458800f1bfcc880421f0cdae3333b88189342942b9e78bdf8fe5ce7a7b7e SHA512 d8047c2ba77a606f66ff84636ec87c59b55cc3c855a47b92455bfcffcd91e8d79918d93613f86ebb7953ef695046ca9962b646343bff202a60e9a810f89ac519
 EBUILD date_validator-0.11.0.ebuild 1048 BLAKE2B 8c86303cd1ff60115e42c0c2e5597725ab5e26e24315f34a54f651a492b2c467fcc4458800f1bfcc880421f0cdae3333b88189342942b9e78bdf8fe5ce7a7b7e SHA512 d8047c2ba77a606f66ff84636ec87c59b55cc3c855a47b92455bfcffcd91e8d79918d93613f86ebb7953ef695046ca9962b646343bff202a60e9a810f89ac519
 EBUILD date_validator-0.12.0.ebuild 1082 BLAKE2B 96151fde0757a5bf369907d61dad3d10a3302158506a401243a61cb3e1f0d1bcb2518d9899006116ae9688f682628ca96dcf5fef9dc497c641cc60c4fd4f55da SHA512 0380e4e305db560e9d50999784f98ff17f7de46be7f1c1d94347161b873110410255130bf72c9028cd1778ac3d1db8cef5d372e39120199cb31dbf90ccea374a
 MISC metadata.xml 350 BLAKE2B bd7fb0d977e2f3cc8ebd8bdf2cdf424ad2f6e90b20b2948711ab868ae8cefdec3091a80083e4df8c6e244a157cc02e90b527596391cbb92893ee1b9922bb9e25 SHA512 7f387024832bfa6191223788be7c6bd4017bc1a3805c03436ac92769f7ccb86a17705d89a9571f2c3150326ca492a4dc0c542ebc8b66b82ab43e26d3efc82f75
diff --git a/dev-ruby/date_validator/date_validator-0.10.0.ebuild b/dev-ruby/date_validator/date_validator-0.10.0.ebuild
deleted file mode 100644
index 8d4f4549e483..000000000000
--- a/dev-ruby/date_validator/date_validator-0.10.0.ebuild
+++ /dev/null
@@ -1,48 +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"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_EXTRADOC="Readme.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-# if ever needed
-#GITHUB_USER="codegram"
-#GITHUB_PROJECT="${PN}"
-#RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails"
-HOMEPAGE="https://github.com/codegram/date_validator"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activemodel-3.0:*
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest
-		>=dev-ruby/tzinfo-0.3
-		>=dev-ruby/activesupport-3.0
-	)
-	doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/git ls-files/d' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i \
-		-e '/[Bb]undler/s/^/#/' Rakefile || die
-	# Fix tests
-	sed -i -e "1irequire 'active_support'; require 'active_support/core_ext/time/zones'" test/test_helper.rb || die
-}
diff --git a/dev-ruby/dbf/Manifest b/dev-ruby/dbf/Manifest
index 7260f3e83961..eb1a3f35d3fd 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -3,5 +3,5 @@ DIST dbf-4.1.6.gem 217088 BLAKE2B 5d0808884aaab5585e7477287539849e9386353490ec43
 DIST dbf-4.2.0.gem 218112 BLAKE2B 701939004fefa45132924ac47dc8bc908cbe5385baae86cd4b2117668a13cff3df72f4e8146000b31d3c232795eabf386e6550d05cf76587a7340189bc2162a3 SHA512 715b541d86f0737d16ed5a5609f23ae64cc07c213a3ad0c2abf6f9b731d11e460b940c6c3996229e14f744fc5c43ec0e38e705d6bd553ae26681e4bf16eac8a3
 EBUILD dbf-4.1.3.ebuild 455 BLAKE2B 408a076c0dea34fbb85a6a823c4065bfbd11594924f9ec6f129f36c4706b1eee872624f386b5bfe1d2ac671d9cf18aab4c65e3cc0f725932083af03cc82d128a SHA512 7d5125c8c6c31f640343bd5d3c954a33b1e67821b84498ec6164e89c1008e5b1e9a81d56d8b4ac86b4722c6fec3751b37db4845f671389b026e2be63f040f919
 EBUILD dbf-4.1.6.ebuild 470 BLAKE2B 4c0514f6c14572f0d1f5808ff32caf98f1cf66c540c854cf0950afb4b821a70f4e6d4eb08996dd54f18b3641d2e3b7b28461a9dc1cc38e9164a1e1e7afcbb8dc SHA512 e5db2374fd246b896c495b37d788db442879b3493d092a44d190eb1e1180b4dd8bd08186ea8c8a381324f9e36e82a91a7aa77d5aacace6cb799c930a51e489cc
-EBUILD dbf-4.2.0.ebuild 470 BLAKE2B 4c0514f6c14572f0d1f5808ff32caf98f1cf66c540c854cf0950afb4b821a70f4e6d4eb08996dd54f18b3641d2e3b7b28461a9dc1cc38e9164a1e1e7afcbb8dc SHA512 e5db2374fd246b896c495b37d788db442879b3493d092a44d190eb1e1180b4dd8bd08186ea8c8a381324f9e36e82a91a7aa77d5aacace6cb799c930a51e489cc
+EBUILD dbf-4.2.0.ebuild 477 BLAKE2B 9af2bc736ac0727fbd56711d0151d3718a096bff46af17f4099f9002fd98eb2252e8d9b2f907b1e03743983290848d5a36bf80f61384d094fdda45d617f7e6f0 SHA512 901d1f0265a9bd816f033bc5a8c6b2fdc838bb1abd7988cd4af701c5e4b0959a20164a4711f051d1b289c0bdcc5dc27db5ecb1e1a910fe306a46183a8ecfedd4
 MISC metadata.xml 474 BLAKE2B a8bc2fe69db29e3a1d22deeb896e5f161cd4511f0687c229b3ebffa0fea1bdf0b4cbbf7636c9955275b1f53ec79538b26de24547b88b8a274fdc182729051a5a SHA512 16d3345d2d5e205aedeb24bdd1a4d80af014035ac817f9933840ea005f945905ae4c059f76b90b73cf040c71a0d4f1b98c9c95609316b34c25db1c565adb5f63
diff --git a/dev-ruby/dbf/dbf-4.2.0.ebuild b/dev-ruby/dbf/dbf-4.2.0.ebuild
index a4db00c12b53..9cb0c52cd377 100644
--- a/dev-ruby/dbf/dbf-4.2.0.ebuild
+++ b/dev-ruby/dbf/dbf-4.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/ddmemoize/Manifest b/dev-ruby/ddmemoize/Manifest
index 7d49a0efb206..2d7da08f41fa 100644
--- a/dev-ruby/ddmemoize/Manifest
+++ b/dev-ruby/ddmemoize/Manifest
@@ -1,3 +1,4 @@
 DIST ddmemoize-1.0.0.gem 11776 BLAKE2B 3acf18cc70aed6c35ee98f42e6004ae13c623299abb0e8a3c0dbe7e7908775b9b6e2f81cc2977e4ca04ad584e7b5c43219979187448e3c87e6abc2d78a1c8f15 SHA512 b0a4c825c789f578031d12ff38f204bb5256db769fe71fcda98f1ab23a3d61c9d9d6cc486a2bfa566c1ea1fc8617b2563e97f05eac40b7587f35c618fd495eb2
+EBUILD ddmemoize-1.0.0-r1.ebuild 602 BLAKE2B fa901f0cdcbb43268d325f232214cb2ad7db9fa70aab0816f752f11d35fc7dbb8d6bb85bb1e72fa252c9f6787780e531078cf1e3f97eaee6713367e25028ce0b SHA512 917024d6596598cc1affbd7e48e7c4637ab1086ed50af20930cd0ef6a35495c966d97a4d83134e8cd0c12e7c466ae3de8e2ccf4723516c6a41b3da71a2b1ea8c
 EBUILD ddmemoize-1.0.0.ebuild 640 BLAKE2B 48d288be2c84f0f6af8ed7981de2a383267263904bf6410ee1030be7a7db9ec1514356fd1eb5ade6892e420b26412636bfa8974f884d687de8b35178f9dec151 SHA512 1d4cef510c7b6da06420d156e871c4119f2181b3f2dc8a8b67e76733feda032eb323c0a91385b3f02496507baa43e8a2b076421f1902c959290fdbf22d871101
 MISC metadata.xml 345 BLAKE2B e4bf86ab71206f79075d1c318b7eb3b6bc64c001211a809182773439f6a3713389f8353f210aa43bc2518d627ff53faae40f5f5b29c0d690917d92ee4935d675 SHA512 b7dbf395aa08794c971b35485be2b2eb4968e62c06934ee5fd9561b99fdc46f6b2d1cd1be1718e7418becf813b7d00d453ad0c903ebbb524621f0bb1ed1deac6
diff --git a/dev-ruby/ddmemoize/ddmemoize-1.0.0-r1.ebuild b/dev-ruby/ddmemoize/ddmemoize-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..dda4c1794412
--- /dev/null
+++ b/dev-ruby/ddmemoize/ddmemoize-1.0.0-r1.ebuild
@@ -0,0 +1,30 @@
+# 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="NEWS.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Adds support for memoizing functions"
+HOMEPAGE="https://github.com/ddfreyne/ddmemoize/"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~riscv"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/ddmetrics:1
+	dev-ruby/ref:2
+"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/^SimpleCov.formatter/ s:^:#:' \
+		-e '/fuubar/,/^end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/debug_inspector/Manifest b/dev-ruby/debug_inspector/Manifest
index 5c12efdc08a4..3947e4aaa077 100644
--- a/dev-ruby/debug_inspector/Manifest
+++ b/dev-ruby/debug_inspector/Manifest
@@ -1,3 +1,3 @@
 DIST debug_inspector-1.1.0.tar.gz 5837 BLAKE2B 49f2c4b8b872ad2be0e6c41d02f7cb64e3f2928e8f02e06ed99f2f2befffe1da4c25024a2069b8d2f19dc71ab182459f6cf75c5b717662e5cfab16a5b66cf41f SHA512 c66d5bf412d9b6a61f456e943a901dbe9018cf92c171e1a7d9a19807c7894ffdb6acaeaed2c8f688927130a14909d0e0714e5b728ad7ccbff0e5f1c0ad20c600
-EBUILD debug_inspector-1.1.0.ebuild 679 BLAKE2B 479d3c2065ddae3eef6489d3cbbc5309edaddc52d736efd04498850097969c32b3bd1e12be4a4b611f21c1b1fe73ed590ee84b1cba5b30cf58b85f0d2c3718e0 SHA512 38ea7d6a4117c18fe2f1d5b30aa4068ba35b58d08220f54ffe85029a5e6b46c00cfd037784e215eb56272c75102e4a9728ccc9596cbaf11b818349f60d8ac4b9
+EBUILD debug_inspector-1.1.0.ebuild 679 BLAKE2B 1ce541ab6145d850dbc2ae961da0a5ca85b80a8a04078848ade6631c0a37ae1737acaccecb78a691c14a09921ca57c6b0b766414c891773279c13109468dfe80 SHA512 b134aeca1b313d60339b6a930b45e584ce400b9e67b9530b7cbc5a345ace0cc7138569412f96a570aa04628be9011016c408ee5ce516b496367a7529d78cb1f4
 MISC metadata.xml 351 BLAKE2B f257a2ee28e3b834d9bde72e9f4024f9f93a3fe043a95a376ca15199fa7edb38cdedf1856438243a05337d3ff8513a88dcf886896c776b3807d1cf4437ac8668 SHA512 c9d8cacc1c0df621f009d74dcc9bdc34df08becfe8675b9931a12e492c91d758409c7803adb3f33bad81bd1c496b54f3b1c3d10ad2e8509c68b62f08dca85730
diff --git a/dev-ruby/debug_inspector/debug_inspector-1.1.0.ebuild b/dev-ruby/debug_inspector/debug_inspector-1.1.0.ebuild
index 3e51cfc9dfca..4b48f59684fa 100644
--- a/dev-ruby/debug_inspector/debug_inspector-1.1.0.ebuild
+++ b/dev-ruby/debug_inspector/debug_inspector-1.1.0.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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/delayer-deferred/Manifest b/dev-ruby/delayer-deferred/Manifest
index b0cc9e59d47f..9d382e661947 100644
--- a/dev-ruby/delayer-deferred/Manifest
+++ b/dev-ruby/delayer-deferred/Manifest
@@ -1,3 +1,3 @@
 DIST delayer-deferred-2.2.0.gem 22016 BLAKE2B 992005fcdd3cb7d7b131e676a1e73f56b64c3316c4c66e984cb8c80c655e98f2fa1a72be34979c11e9f3b7def7de71a74a922e06b6ec8699fc1bc03f2cedf627 SHA512 f285183556d8414db6467cf51a6bb123b2b5db3b517295464e8d0205f25b7bad61ee9364277916e30f0bde4453a7bf4666bd71f0a54faa4506ed8d339507418d
-EBUILD delayer-deferred-2.2.0.ebuild 635 BLAKE2B 8ed7b2e48ec16986e7efa8087c5da486da8387187aa928196078a1d10743aa5f137f826d4f96498cda40819651b681888a0a24e879dadd0b77e402e939a1237e SHA512 576c9eea522df3dfb7b32e60c6ef0c4fce88d3a2b18d8627f3b8f9c571710891ff0e32bbdd1edb4731506c200ad5a608880646432191a8850acd1629876aa077
+EBUILD delayer-deferred-2.2.0.ebuild 642 BLAKE2B 63726cdf34d275fb2c5b5e87ddb7a34e7c1f089d7e9e537e5852b10dcc4aad3825dd20d00d8c13b4ba9830a68be23254eb53866114fc6cd4c0f7c549dab2736e SHA512 4d5eeb2b9a446dda408744f3bcf8ba3f12624c17ec12fbd0cd94b06a30010634a935f0ff2d0791c9dc7faad90572fd45e8b3963173666578ab3eaeb771d30fc8
 MISC metadata.xml 503 BLAKE2B b06897da2a8f53e99a9268dd04311a60402f6a705a75e7b72aa7a96e22748576955d55a7c37dadcad99b5ecab73c150ff0069beb3d58a0b252d1af8e7ce82493 SHA512 913712afe9928ae5b18ff0115caa56cb3278fb9d21d25d224b0a0ce6c679dffde1d70ee0fe824901c6e0c08c48e7af3368281224e67d5184a5f005b496fba9ec
diff --git a/dev-ruby/delayer-deferred/delayer-deferred-2.2.0.ebuild b/dev-ruby/delayer-deferred/delayer-deferred-2.2.0.ebuild
index a7acf83bc9e6..41589bc45cbf 100644
--- a/dev-ruby/delayer-deferred/delayer-deferred-2.2.0.ebuild
+++ b/dev-ruby/delayer-deferred/delayer-deferred-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/dependor/Manifest b/dev-ruby/dependor/Manifest
index 01a56ef9e995..39abb1b26f95 100644
--- a/dev-ruby/dependor/Manifest
+++ b/dev-ruby/dependor/Manifest
@@ -1,4 +1,3 @@
 DIST dependor-1.0.1.gem 12288 BLAKE2B 728cb4a1ec8e2b7d8e770dc7c2b997f8a474963530cd2b3e8209babacf16aad8f69f1fab64aa1e932b477922c6eef8c3c46073421966285204a49c00f3a3bab5 SHA512 4233a270d8fc956a530008121fcb0110c2c66f77f51aa98a5db75b857c83f80f90b8e8ae67d098aa2363c21deaf1dbbba146c09b83fe6fa8004832249acea9e7
-EBUILD dependor-1.0.1-r1.ebuild 532 BLAKE2B b3e398bda490de3a14e9257df2c1dd662a2c48e114d1ff3d81e73d7543d30024e30c9fab379029799a66caf835c81782753c63e18df3c8e2178275a5693b7b2e SHA512 be14f4e5aafa45adaee7828177942806ad35819de8f8c34ea0e4ace679e99aad5f4286528fd0de7a8a851c24d4f5d0bb3afe8bc57208369f0ba880e7b385e8aa
-EBUILD dependor-1.0.1.ebuild 533 BLAKE2B 4099ebee732bc869ea120b182de9143e09181c531f7f2a9753e1115b8324e2c89d24b9e27a952b2df513236badf533a08919d662f52dbd8fb0e79a6256900076 SHA512 13d79474d051f50bd712cbd2e2ace660bb1142266255b3ca94bfd2d3726fadb36ca96dc994fa6ad7649e3d4c79384d1bb65c55d1ad75174a77bd594a225f3954
+EBUILD dependor-1.0.1-r1.ebuild 539 BLAKE2B 652f3ecff1c49054e391118f0a41201bee460c530399a264bf01ccda3517caf6eb6ef95382da4a3e2522b173d6393909b49c22ba2a95a0ea45fe5994fea6eeb6 SHA512 0a82d188ad41a31e91048beb292120a3cfebf06ff33f082d70b338f6beec2d48ff50ba9c57b6ad21cbf262815aa7d86b4a51554d7c18aca67f84ce0c71210468
 MISC metadata.xml 341 BLAKE2B f58ae1d6a405615ab758b4b042ea6aefaa8503c0f23c5025710407901456f3191053ff36f6f543cebf8cdfd1f7e475c62825509f7551ad2c683cd3d392d7c04c SHA512 d230ba6ec5f4a5ddac80679b10c600d64f3d10c879d576a97065d3fe64f2ab638012178fd69c5d6d913c86ee7ce987cdc5d500c2802365efa217607f69b9ddf9
diff --git a/dev-ruby/dependor/dependor-1.0.1-r1.ebuild b/dev-ruby/dependor/dependor-1.0.1-r1.ebuild
index 24455dba0a49..2fc78ef81b5f 100644
--- a/dev-ruby/dependor/dependor-1.0.1-r1.ebuild
+++ b/dev-ruby/dependor/dependor-1.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/dependor/dependor-1.0.1.ebuild b/dev-ruby/dependor/dependor-1.0.1.ebuild
deleted file mode 100644
index cfa8c5971b27..000000000000
--- a/dev-ruby/dependor/dependor-1.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Reduces duplication when doing manual dependency injection"
-HOMEPAGE="https://github.com/psyho/dependor"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/deprecated/Manifest b/dev-ruby/deprecated/Manifest
index 83ceec8b63a8..9d9266254517 100644
--- a/dev-ruby/deprecated/Manifest
+++ b/dev-ruby/deprecated/Manifest
@@ -1,3 +1,3 @@
 DIST deprecated-3.0.1.gem 6144 BLAKE2B 69ef1b95168ada9e66dda556d0c6731109b2b7845f8c4be0ba75749f2e7af092c3b800d0334c4cd1c555905c09bb12dd945f4692eabf0155fc32f4ea380c52da SHA512 c4280f8bd6914a6b073cbc443db5dd5232379abb7870d90cd0146c08312f82aa8fd8c042b48c2b9b26c4120dc8afb326070a1256c51355f1cfa898905ec59e51
-EBUILD deprecated-3.0.1-r3.ebuild 521 BLAKE2B c644465905e7b386dda3ce3d0df0ca6f817e81ed3e4d4aaba693c238492249162986682214a2947583512e09ea4e3abd2f8325546ca0d3f350dbb7b307e161fb SHA512 32071c4088883489f26011b97afc2c0b13e03ff97d011912cfc0bf23549f8e795094374e8ab707b5acfd59ab4484a337034a92c67453d15f289a8c6f2dd14cfe
+EBUILD deprecated-3.0.1-r3.ebuild 528 BLAKE2B 841a1236f8b505c09a21a6e51fdd04764d2562a42ca3221aada0efe0d3a4aecaedf3e097b6c1465261772812a5c7fa04b0122febca36a3d1abe651dc46437a17 SHA512 b38c938a59026d6b06dd068dc87e84bc03b2932548c2e468225d5cb85a217a24c69ce0e8360d32b46077acbd85fd03ed0c3511051097c4c824f111622ec066ce
 MISC metadata.xml 343 BLAKE2B a5da26f1c3672356b9180e93e87df2b3b59d7c4fb3ef918073816574cd73e6bc334f34c85e0fadd57d58d17cdf18a09c57db5dcec247f5fd1eb8b8b511314499 SHA512 476df3cabc2c29bcc20d4127abe6cc0b80d4c5c8b42f34324005ec38fc8d4b989bccef5196b4061e5626e6e4c11ae09abed9f0b7df028c747ac032a834ede1be
diff --git a/dev-ruby/deprecated/deprecated-3.0.1-r3.ebuild b/dev-ruby/deprecated/deprecated-3.0.1-r3.ebuild
index 0d47a2655f3c..1f2537e99cb1 100644
--- a/dev-ruby/deprecated/deprecated-3.0.1-r3.ebuild
+++ b/dev-ruby/deprecated/deprecated-3.0.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/descendants_tracker/Manifest b/dev-ruby/descendants_tracker/Manifest
index 1609e081d47d..f7938301521c 100644
--- a/dev-ruby/descendants_tracker/Manifest
+++ b/dev-ruby/descendants_tracker/Manifest
@@ -1,3 +1,3 @@
 DIST descendants_tracker-0.0.4.gem 11264 BLAKE2B 65557a3e4859eb589ee468611f6d29b97ea96897711ce8fcb70c8da6d54849eb4e84fc999db4def4b6e6d5a56a84724b7319e47aee5ef739b23763b1c74f9dc5 SHA512 e079b0ba9b14056707780f1752297c22e81c144fcc7903bc0ef4aa5ad8f343628f493d6d87cc1d5c61cbf8f69066914210eb407b5492aa414949ad799f9a9b69
-EBUILD descendants_tracker-0.0.4-r1.ebuild 785 BLAKE2B aceda65db9770100552b0322e472958a85b0f7c811b797a1011eeff057553d9a1428e9424bf4e7cc8f2f340d3936ef2c900c6e681e3ae01338e56c55f2d368f8 SHA512 cd5d13b940d5541621e442de66eb6555f5f6cd7b411a6158790b950fac67008e75910cf96a4799fa5f017d207fce238bfdc7f271a1eeb775f0bb167fe2556312
+EBUILD descendants_tracker-0.0.4-r1.ebuild 792 BLAKE2B d04f52094bc181243def672cb97f08427544095e400ab2ce2798cb954335571ae2420e89c938ee8257862dc4ca6b55fb546668128c2009fc590c60348e91778d SHA512 552d7e9bcfb86dcce9c3654b31fed040d4fb3968890788bd7bf5856927f814b3f4826e5610510308428033e9f090c146e18154fd8d29e5b8919039f72173fe51
 MISC metadata.xml 352 BLAKE2B 683a1aa5a249b28bb7b78f3a6ac1068764adb46b24fbf099d05c134f12f59222bd206ca32375539496f65520dfe2c81aa81717cd2f09d10e47029c8fe1bdf160 SHA512 21ae246254f724681ff10df49a8d10ef60241c971947aafd08d0d61a656131a11dbbd496398c485103b3338e3d020009930dc1dfe819bc7501959657cdb2ee26
diff --git a/dev-ruby/descendants_tracker/descendants_tracker-0.0.4-r1.ebuild b/dev-ruby/descendants_tracker/descendants_tracker-0.0.4-r1.ebuild
index 73fa7c8e28bb..57def8104230 100644
--- a/dev-ruby/descendants_tracker/descendants_tracker-0.0.4-r1.ebuild
+++ b/dev-ruby/descendants_tracker/descendants_tracker-0.0.4-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/did_you_mean/Manifest b/dev-ruby/did_you_mean/Manifest
index 46ab9efabb52..e77247706b4e 100644
--- a/dev-ruby/did_you_mean/Manifest
+++ b/dev-ruby/did_you_mean/Manifest
@@ -3,5 +3,5 @@ DIST did_you_mean-1.5.0.gem 34304 BLAKE2B deefea833d1fe12733a6b1422e5ae43d0cfa7f
 DIST did_you_mean-1.6.1.gem 35840 BLAKE2B 618e11c23135edac66cea95c0cc4212045fcced1148c46543ba243b5993e577c0ae610e168b6b3b5b178c1642ff47436ea765b4880f6cb0da505931e9643b197 SHA512 3d29ed5ea25d163963c7281be2f70d08b47f7aeedf997674e5bcab11d6dacf231ae48a5c9d2a9fcee9ca607883867a5b39c59184da722ad0f822730747380ea6
 EBUILD did_you_mean-1.4.0.ebuild 669 BLAKE2B 5486983f1c62524241b10f81c1276c89548dabfceba67077b12d40f5eb2bdfb853da72c7fc7493a0ba4fd93f4ca1b166c3e9901c24712b69fb2d7343a2c641ea SHA512 f6f3a2a0f57c11028ff433dc10cb4cd3573219d9fc2801eacc660c144aa0f3704f661a067a4f383a2a6d0498bd7dfaea399ac8c015e9e12ac5fbea6c0669c33c
 EBUILD did_you_mean-1.5.0.ebuild 691 BLAKE2B cce861947b4e1ae7a3a99ad21590ca07bfd6d0a4a67cbcc4390f47692fac04c63da34250e260ef4dfdc5d91d54d23ac73a65aa69efce9947d0f743721e242672 SHA512 50c333eb63aa54ec4e5cf4afa0eb3bf7db6792d3ab607bb7dae5e258e4dcdbbfac25fda84e26be342ae8a6a43e3ea263f4baf2ab998d47e43b1f4b2f77ef9386
-EBUILD did_you_mean-1.6.1.ebuild 691 BLAKE2B fdc2f6b335d4946dfd26c7d2c2c969c167191c30cc76b1a4a0dea740f34f9ebf4556953bf54122af21de089ee3443a56c8a6fee69c4caa83e95039f28deaf024 SHA512 5a8c9cb425ef9e1dc0d751a11f572374773b3cb87c3a562b0b5e3dc2532320a6fb0226425d86a28b7bed32ed299b4da02eaa26129b2c910836c7d11fbdc43ff0
+EBUILD did_you_mean-1.6.1.ebuild 698 BLAKE2B 4dd8c8f26e6cb6bb5b2a08e651853c6d1e4abe3adbf894d4eee28e378a6541027d5cf2e09f16cbb1f25cf70bbeb340f3460cd7f9007bb28f1c5c1dff98979e00 SHA512 0b2d968cfa50d337b9b0d5efa96f90de445dc71eb4e4026825b558244075e9422f61c7313a75e437003c3c8c9a8550aa444e7838b0a1c2cba3f8a21e6641bd89
 MISC metadata.xml 346 BLAKE2B 7168c0159e7fefc614f4574bffe30a5ed799c93fa130be05777e155fb457f1674629a75388f704d82df8931c1b5686b91a62488e27de5dc2a0cfa97238a2e3f7 SHA512 15a8957c29c10e64cf244aec15aa6cc6b8dbc8e993b22dfd82c9f96914ecf5f82b65f924556e01f5124e8fecb122a10cdd889f9af7d5d833fedc0baec0186987
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.6.1.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.6.1.ebuild
index ac22136edecb..8cdd9ac07f46 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.6.1.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.6.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
 
 LICENSE="MIT"
 SLOT="2.6"
-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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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_bdepend "test? ( dev-ruby/minitest:5 )"
diff --git a/dev-ruby/diff-lcs/Manifest b/dev-ruby/diff-lcs/Manifest
index 29b2e02b0734..1be260a4e02b 100644
--- a/dev-ruby/diff-lcs/Manifest
+++ b/dev-ruby/diff-lcs/Manifest
@@ -1,5 +1,5 @@
 DIST diff-lcs-1.4.4.gem 50688 BLAKE2B 0b72890b147696425120f2dc71f8d741d993411bd8e76d130d3c12e3b4f451b0812a3cd34b09e653ec7024c616d7ffb4bd1c40303b66ca4a13e26c397d5913b6 SHA512 fcc6c86f392697c4b3690827f7c20d50fe68e367626b85a56446356d7bb21b4020bdb2bc5c2faf4e82807cd9f3049d71c94d166c85a1a4231f0fd9fc032f41c7
 DIST diff-lcs-1.5.0.gem 52736 BLAKE2B ff405fd3ed5238af3eba2ab4fa277edca0eec66df93b0e8d6fba1a52980d484623e57f70587de31fec1696e556f2ae90d82af4b856a9bd4a248de12aa74ada4a SHA512 5cef9dc1d143217cc402173e2b84ffdcbb8d5a4d05716bdbca732ac00d73591e4cab2f7e792382a3686d8e72fdc32269fd7100941d602ca6d683e7645229ef8d
 EBUILD diff-lcs-1.4.4.ebuild 748 BLAKE2B a7695379d7435cd699cff8fccb1981147e4409a31da624fd98204325d2176600317c034a4fd0d5a8f2e4d8fe94b0b2990cff1d9ef6bf545329f51a5ee952a854 SHA512 d91388bf7614c38a730a102aeed032e6f1a9c04fdc638a7cfd62d41461f6047896daa0b59c56cca962d72d82e94fc6af055603819ed78c4478ea99dcfce5ba67
-EBUILD diff-lcs-1.5.0.ebuild 613 BLAKE2B 1f78374e2cb47ffbde0edf221243932fe940074fa282767e424915acb30f935004905c802dc561673d4e41b43298eccd6df2b45c22abdc91b326a7735a60dbc1 SHA512 db360c9dde2b543aa0933533f583acf94e4463ad3a5479a5ef268f2cbebed35c026d00a0b4de67bba1719bb530fc6d7a8a43219f16317c880b255dd90b9ffaf6
+EBUILD diff-lcs-1.5.0.ebuild 620 BLAKE2B 93e7479b07079eb67dd853e47fc9e8fcd96828056453e674fd833b130efd97dd7bce1edd5140e9661bec0d7631454caac0d32828431a7532f988fbcb1a36e762 SHA512 46bbb0c1b546ef0a3d5ad1208af9d2109ea0f55cc9619eb2266566eedc32c47bfaf82fd8a18ccaed26d8902e0be6c5e45c80aafb18b125e5d277c24f545fb32a
 MISC metadata.xml 346 BLAKE2B 2f30df61a72a09bd4d12a5adaed82179b86b78d84beb8406478fac7c98b25958cd6feafc72389b454542771e4e836eee8b757223d100264edd984db918c70144 SHA512 632730a4ff8486ca00126bd2933198c5ece0b38361fccf2ca3a7b79e4d0f78c801a86218d3c545e3aa62102e5a7e31ff14524bcd3f40001f81ce44693631e0ae
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.5.0.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.5.0.ebuild
index 38a898e746b6..96193d839e37 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.5.0.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.5.0.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/halostatue/diff-lcs"
 
 LICENSE="|| ( MIT Ruby GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/diva/Manifest b/dev-ruby/diva/Manifest
index 0dd5d84d3508..0f3835fd26fb 100644
--- a/dev-ruby/diva/Manifest
+++ b/dev-ruby/diva/Manifest
@@ -1,5 +1,7 @@
 DIST diva-1.0.2.tar.gz 13638 BLAKE2B 461e8487e06749d0482b86fd30945dc83d53daea06750628839c899b6f8d419599c9cc322b62f58d3eb956a2a99a3674dd591c4bb2fc5483bd1853bc40154634 SHA512 b60d80ca55c98a2f6fcf269aa4a2188f2239b871b0e77f328490d5924a6d0e6801c67d0eef4de28b584303f38bed3752a3ceb2c1e4f2c7d17be13dad03c643b5
 DIST diva-1.1.0.tar.gz 15859 BLAKE2B 58e9ca4d9f1b8f4fb3a75cb16437d565fc99a358ce20017a6b6a6a3c505fcc07347141b51b450c8d6eb34869ad5e1040f62e8e92188736799e4d96280194cb05 SHA512 1d53618b11ab49e8c4837ea23326a8c428f1c098e1c3b6e3c3850d7d978dd5fde5a5e23287fa3eb890fbc5c9f0c5609fe92c0368ac72c6fdfbe30dca4df68de9
+DIST diva-1.1.1.tar.gz 15974 BLAKE2B 2a3b497181a931eb6cf6c43b9d43ff9e0e7a34a753864bec422b69c6d01aa39b5f9dcc6abd54b85ca27b34d38a647c3e80450c2d7dd9cea1c62859eb3366d28d SHA512 36c7048cba2774567191b40ff88fa7804b61cb9334992dadd43a62f18be6635aa48753593ccba93a7c0438adfb7d75266b26b7a62e102aaf99afff7401c4e99a
 EBUILD diva-1.0.2-r2.ebuild 749 BLAKE2B c5a03821dd00693a807a5650e221deeac6dd85a91120347dee5a2d76b75f843554922eb598afefc77f4702953c6bbb25243ff2dc992bf01f22f5fcb0d6b31b4a SHA512 d1b3035916d9848ebed62100568ad31bc141349824ae0248c5ecaed5a3a4b4c238a8ac755f791e281c37a76b6085875080d339c4d690497ffabddd54414eb3ed
 EBUILD diva-1.1.0.ebuild 806 BLAKE2B 045fda2c1cf24d83574e6005ef8c0d406dd9cbe26bb78ec364c234657aa99a51ec143065c9b42d7c74e62db0bbe465dd783db5e3b230dffb6ac0f99c029b2bd3 SHA512 2863b07d39c99712d0a50a221ca7eb00bcd072638bd3c2c7a78ccfebd439206c629142937ae28837944a0c99e2b7d96d209c97d50209c4391aedb7ec85422cdc
+EBUILD diva-1.1.1.ebuild 799 BLAKE2B ebb004f74d54988519596b495ed6be670fc27d5d95d440eca21b7a9baacb08c6d53137a3c762fc5c05bafd5469652455658cd5e97b18e73b0a957bd0c08d316d SHA512 c50af92e7d8f927fdb60254e4f10fa422ec74aa79c514546ba4bcfe22b1816884eb734f08872594587506ecfa59ad1eb8750c783d7bca223e5a5d382c40c9dd2
 MISC metadata.xml 428 BLAKE2B 60e3e72fabb06df16796be60dd22f9a54b960a6bf8cf36eeac02893246694df282ebb1f95bfd7b434065737cb0c0cb5a1c97975342e20959abf790082e594c9a SHA512 cd07530fc72aa675ecec8f88c4b8a5f93583f7bc6f2b08a80b4e472ca6542cfa2560643222d0b7a9dede5c01a860efaacd9bde3fa32f4854b4e7f30ef61d63ba
diff --git a/dev-ruby/diva/diva-1.1.1.ebuild b/dev-ruby/diva/diva-1.1.1.ebuild
new file mode 100644
index 000000000000..d17232e2a269
--- /dev/null
+++ b/dev-ruby/diva/diva-1.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="diva.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implementation of expression for handling things"
+HOMEPAGE="https://github.com/toshia/diva https://rubygems.org/gems/diva"
+SRC_URI="https://github.com/toshia/diva/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE=""
+
+ruby_add_rdepend "<dev-ruby/addressable-2.9"
+ruby_add_bdepend "test? ( dev-ruby/simplecov )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/addressable/ s/2.8/2.9/' -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/dnsruby/Manifest b/dev-ruby/dnsruby/Manifest
index c58370011828..fb21e601bf7f 100644
--- a/dev-ruby/dnsruby/Manifest
+++ b/dev-ruby/dnsruby/Manifest
@@ -1,7 +1,3 @@
-DIST dnsruby-1.61.3.gem 259584 BLAKE2B 578d6f2b693de5007d4d15350a4fc6cb948f9e16ee9b0bb511e6b6dc92cf828d30e645522b834a6d42af5dd94b85f0675332b2363e0c2ba3b97c9b35b73bd82f SHA512 4cdf6d83c39c3209873e9bbd15ba33f851f3fb878cf746de98cf615b0f547dfc5af8b4be7d505f87f581755ff73de079b6ea3f6f8c5a11074c1c46d5bc9e8c07
-DIST dnsruby-1.61.7.gem 261632 BLAKE2B 28accc37bc8ca99ca348acea3ead30079f72deeff39d31b323344b758b874fca23f65ea7b6f8f8c780d74de491875b0e4a11354af14b5064cf7aa329a7a94a4f SHA512 454378b7eca03483533ca1c1e01a86361c20ce88971ecc6adc72e11bb9ef03709ea1332d2549eefc1c41ed13d5a752b1a7f76e2117ffc9076776663ab6e02d1f
 DIST dnsruby-1.61.9.gem 261632 BLAKE2B f86682fbc50bc0b20f59b3a7bb825081824a3dfa5a6de36f3083b39fac9617ff770d3a53c17f015bcaff5dfe5a96ddafd78b1aaf72bcba9bf990a649cf3a0c63 SHA512 ba692db6ab5234c0669076cb5290d5e4613886956d3cea23c22837f99ee2a970e7f86c7c7fdc7542ac4873d324f52b83b0f5e14bb9c3d5107b068fdf419f6ba1
-EBUILD dnsruby-1.61.3.ebuild 846 BLAKE2B 83d74ee2270400ce80dab80080347ac666fa93e7e09daedcde22c11454feae702f2fcfbd70d9eeed7a5c47152e5dae16d431165cc5c334ed7e4b8a500433bb69 SHA512 9296d7e6206d0d3fd93ea534be6a9514744067c2b05c1ea957ef15ec9de2fe0d2966dcf570f9ba4a028a5cd8497e27bc9e3bab22b2b8c55e720890e4178000d7
-EBUILD dnsruby-1.61.7.ebuild 844 BLAKE2B c7717b55905d00df0e0d8c11d4334db6699a0becdc233f1d5c8896d875ae28673e1c3ac535458c70334bde64c9fc06fbbde49355f178026d83107eabb6dd13d6 SHA512 547d5f4c4227f519366142e6321bf147c7ed606dff7f3f5e3885ee630020712dee1652a86b636bead2b0cc66bb1279dcb5d763f2dbd447274ccb3294e09ee8d6
-EBUILD dnsruby-1.61.9.ebuild 844 BLAKE2B 34c3f9a415ba26bd87bea389cbe1d9da37f063570114151dc4909710e71db3da1df8a104bf81fdae5580250245540cb1fe79d2d6a41bf6805dfc869514fd32a6 SHA512 ec5c4e2232cfd9638fa1f2fe60376c5a2dacfa13adf05c746b061c4f990c79369378a01a455345d502a06d117074990753b454d7fa56f1e5044bbd4b34036437
+EBUILD dnsruby-1.61.9.ebuild 851 BLAKE2B 07493a1dae8e7175b9baec5ea8deea8dfc59bc16f0a5bdc95618541ab105c729e3227cf94e3e25bfbd89458bd88855cdfe450133c1f8ceba6315cae82553c583 SHA512 14eb014b92408ef90399cf0b779213a280b65081021a522f8c294a405edd8821ee8787cd54c192d1b7d664468bcd92949166e77f0219bfb10db9c80effc6cf33
 MISC metadata.xml 414 BLAKE2B c4ccb95f7844c4f0ec41dda18d5b80f8972d3f81fc571fea8feeb15ed8c0284358fa180248f2536ee0cb518bc6d48a992305eb9b1c032dcde79d25f13b6ecdc1 SHA512 e4fae933534b8a4988d008dbf8be50cd2675eb9142108c85b4c0fe4b0a06b5f553827773e08f58a09371a0cd44623c7c86c7c93fda34899614ff5b513cc33e54
diff --git a/dev-ruby/dnsruby/dnsruby-1.61.3.ebuild b/dev-ruby/dnsruby/dnsruby-1.61.3.ebuild
deleted file mode 100644
index 09e3dc0ebb01..000000000000
--- a/dev-ruby/dnsruby/dnsruby-1.61.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_DOCDIR="html"
-RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README.md"
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby DNS client library"
-HOMEPAGE="https://github.com/alexdalitz/dnsruby"
-
-KEYWORDS="~amd64 ~arm ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/addressable-2.5:0"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Cc]overall/d" Rakefile || die
-	sed -i -e '/display/d' \
-		-e '/Display/,/^}/d' test/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	# only run offline tests
-	#${RUBY} -I .:lib test/ts_dnsruby.rb || die "test failed"
-	${RUBY} -I .:lib test/ts_offline.rb || die "test failed"
-}
diff --git a/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild b/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild
deleted file mode 100644
index 838329b05dfa..000000000000
--- a/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild
+++ /dev/null
@@ -1,35 +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"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_DOCDIR="html"
-RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README.md"
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby DNS client library"
-HOMEPAGE="https://github.com/alexdalitz/dnsruby"
-
-KEYWORDS="~amd64 ~arm ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/simpleidn-0.1:0"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Cc]overall/d" Rakefile || die
-	sed -i -e '/display/d' \
-		-e '/Display/,/^}/d' test/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	# only run offline tests
-	#${RUBY} -I .:lib test/ts_dnsruby.rb || die "test failed"
-	${RUBY} -I .:lib test/ts_offline.rb || die "test failed"
-}
diff --git a/dev-ruby/dnsruby/dnsruby-1.61.9.ebuild b/dev-ruby/dnsruby/dnsruby-1.61.9.ebuild
index b1b12dd543f6..d716d4fc9d06 100644
--- a/dev-ruby/dnsruby/dnsruby-1.61.9.ebuild
+++ b/dev-ruby/dnsruby/dnsruby-1.61.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_DOCDIR="html"
diff --git a/dev-ruby/docile/Manifest b/dev-ruby/docile/Manifest
index 7f4a9549d023..2ae13da9f38e 100644
--- a/dev-ruby/docile/Manifest
+++ b/dev-ruby/docile/Manifest
@@ -1,5 +1,5 @@
 DIST docile-1.3.5.tar.gz 16345 BLAKE2B c06fe60bc6e0fc0dec699271fcdc0b23febeba939aab513a23d5065d33bc7ce5d1cd6391d7b05a5f163c4420c199e12c97a79855d03fb252b61661c2532ac879 SHA512 be193eff58b73e0367a109d459e28097d04e0486b152b084f2fd6bcc795aedbaa12c13dae6d845ec4ef3d52335563ce2b22d5424d689e8b93ff9adf7dbe7b0e9
 DIST docile-1.4.0.tar.gz 16932 BLAKE2B 7e2472a64bcf27899d537444f77cb1fce587400d04c64abe17e2c39b1a50af027941f6ae72d6423817dc7ddfed8e15aa113cc4d32c30b97f166ff37fb7663000 SHA512 78350144a9b0d84d6025770d05b1e9999f34ce431691c08e73232f8b10537bc265f9f06409ff6feabf2e6f20d018dbb83aaf8c0f66e7dcec3e195475820481cd
 EBUILD docile-1.3.5.ebuild 738 BLAKE2B 28f6e9b21c3acba40b0df45b55c93cad359a0e3c29996ff2603b98d6bc6d328e04531ea3f9ed908d6e8d8cce0e1a11cf902809eccc2c03389e6b3da58fa0ab7c SHA512 924a37471398fe680f09502245bbb56bc7695c07b19555f44736ffe791e2f31d5ab5532f455df56a4cfbc604689962aa076b571f1970a1cd2f8331843d4567c6
-EBUILD docile-1.4.0.ebuild 779 BLAKE2B a2774d8ce02cd8a958748d080ae632a9434319902471c819803288f77b4db66370b9632123e77cd7aaa46a43dc05bd7f68a13ff773ffd75c195cb1d80685ede2 SHA512 49dd2b8ccd2f32065c89376585df7c9f2f2c12283c38908fef2b0b7d74a062d8c37dc41fefac1954bbc1a28eb1852a384a2a027a20f0f055d1651995999e52b7
+EBUILD docile-1.4.0.ebuild 779 BLAKE2B 2cb14dafe60cb6d130d8c4e46a17af9247cc7f90e596b6d245610049fe143b3577743b7fef733747882c994adcc0d81ee3bba751e4721dfb3bc0fc2bd760bf0d SHA512 f50324048f3bd84b9f7958ba7b4a7987338470cd4502a10cd88368a28be8232d2228222ded2f04d9448fac9fb1fde620c715801d4728557e0a0ec9fc2d0bf2df
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/docile/docile-1.4.0.ebuild b/dev-ruby/docile/docile-1.4.0.ebuild
index ff02c328fec7..a32b1cd6ff1d 100644
--- a/dev-ruby/docile/docile-1.4.0.ebuild
+++ b/dev-ruby/docile/docile-1.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/domain_name/Manifest b/dev-ruby/domain_name/Manifest
index 17f17dbd8867..87f225f561de 100644
--- a/dev-ruby/domain_name/Manifest
+++ b/dev-ruby/domain_name/Manifest
@@ -1,3 +1,4 @@
 DIST domain_name-0.5.20190701.gem 131072 BLAKE2B 86ee60824d9480e71535312fb72c192f3d88326c72539b833132872ff15298842f09bac612e9c3d8b87a3ef6a60459b14e777105613fd76da79757d6a30abcbc SHA512 445f0e8a377bb700f8a3b926970f4351d28759e237947d6c755afff52726141c6b821b43b2a761d4d0d6237969304ef749404a5f383f69710b04803410dc70aa
-EBUILD domain_name-0.5.20190701.ebuild 1085 BLAKE2B d9f86fa95e9f04c08f66aa26c529de89cdf1182cbb93e8bf2fe4fdf700e280e5ab3adc07c2ee83e5f7ea31ad74f547eccd7c073de0aad3e4a454f9038cd8e1c2 SHA512 ad88efa15a2c47550a42cf8de12b551329c7460fdc6893874477e23b83153074f1ef5815e38c7d4b7a0f11fe90211f0f218c534b57c9dd921b3e01c8426994ff
+EBUILD domain_name-0.5.20190701-r1.ebuild 1110 BLAKE2B aac48bc838e6003e07fe4dc4c1ec9a5461ea9c79dd6a779ab8f587216a0845ff0289e963d33fa6497354d13b0ca666e0749e16b1fcc4e2658d58bca19c1d4f6c SHA512 cf7743f6d33dc14f068c57b2ba3334fc0829d86519e21be05f3aca4fa4a34a9e4c69410e1f6b5a3fd0e91e66b8b75221dd67de90f38deaaf7b8e510918c27efc
+EBUILD domain_name-0.5.20190701.ebuild 1091 BLAKE2B 142955100452f20386780602479aa9f3e87837bcd56bb4cdfe912f4c4d5028d087abd2903c416eb6e4ec4302f37619be78ab34d6b273ac6ec8a6cdf3c6bcebf7 SHA512 73055c963a257647bd166e91ac4216cecab7bced8686021b336aeb2c014d9165c0e9454a2d6b6fa04a9ca5589daf4cb8020caa81eef5d8d33886d61977ac6b42
 MISC metadata.xml 347 BLAKE2B 3317da08cd7700ed10004bff1dbf71a979dfe0894bb39c67af80d0b83d5fe19fd0f8be96d855adfad6ee39e331c8d6600872dc9be3ce526d05065a1446b7f7ef SHA512 bb716928ee6cfc1b3e1c6e5d06b1271a728085b1556430014d47d0129881c6740c64f0c3f76835dc672d53eec1cfe6866d8400b32ce6879f610be00b76bfe534
diff --git a/dev-ruby/domain_name/domain_name-0.5.20190701-r1.ebuild b/dev-ruby/domain_name/domain_name-0.5.20190701-r1.ebuild
new file mode 100644
index 000000000000..ed99f7e6bc39
--- /dev/null
+++ b/dev-ruby/domain_name/domain_name-0.5.20190701-r1.ebuild
@@ -0,0 +1,46 @@
+# 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_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Domain Name manipulation library for Ruby"
+HOMEPAGE="https://github.com/knu/ruby-domain_name"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/test-unit-2.5.5
+		dev-ruby/shoulda
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/,/end/ d; i gem "unf"' test/helper.rb || die
+	rm Gemfile* || die
+
+	# Remove development dependencies
+	sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rdoc\)/d' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on git.
+	sed -i -e 's/`git ls-files`/""/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib:test test/test_*.rb
+}
diff --git a/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild b/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
index dcc7ab1c61ba..ebdf1437cf9a 100644
--- a/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
+++ b/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/knu/ruby-domain_name"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0"
diff --git a/dev-ruby/dust/Manifest b/dev-ruby/dust/Manifest
index 722d2a1bf83f..8465f232a83a 100644
--- a/dev-ruby/dust/Manifest
+++ b/dev-ruby/dust/Manifest
@@ -1,3 +1,3 @@
 DIST dust-0.1.7.gem 6656 BLAKE2B 2bc1015c87edf755a55544efda76a4c7c27a26026208c07f6a379dd60c9dfb383a528abfd91ca28dc650d59ed439664e8c5a757914d1a36ed24fd7f9bf630513 SHA512 f5b6d46dc4316a5c8aa49ba6122284f9ca08a491768cb5f89c6a5bfde4ff8b95df7b0234c67a27334af236801e474f27cd7cfdb0f5aaf4c65cc324977926ae1f
-EBUILD dust-0.1.7-r3.ebuild 656 BLAKE2B f66dc25a17f7d3a60c47283777b886006a646c032a936ab2a5e3a89a24b380866da5354be71a0e42a09d2f21c621d8a6e5ab1b6e439c764d5faebd9a14756aa3 SHA512 3441c19219926f0949aaf8efb2fd846d3afc7967d6182c08a88708fde946ce89c006307cffd74995d457a6d39de61cc8a977ae00e01d0117c0820fe010e1b640
+EBUILD dust-0.1.7-r3.ebuild 663 BLAKE2B 31876472716ae7c51aa049ea226e3e37f92fabc4b3a27ee48f381e186fcced96164e6b07396bd27463be2f5f31612f5930b63d5aa606125b93a15230dc5ce6c4 SHA512 104d496667e95bd330f578c6236f754dfabe7c8ec87514062ac31c31c9137730447afd831ffb65548341d5cdf5fff09a6a0a2199c53559493b90dd82ceadea70
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/dust/dust-0.1.7-r3.ebuild b/dev-ruby/dust/dust-0.1.7-r3.ebuild
index d62bf684f36a..981aa22ca32c 100644
--- a/dev-ruby/dust/dust-0.1.7-r3.ebuild
+++ b/dev-ruby/dust/dust-0.1.7-r3.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README"
 
diff --git a/dev-ruby/ed25519/Manifest b/dev-ruby/ed25519/Manifest
index 4f0330263cc5..49e6a744d38f 100644
--- a/dev-ruby/ed25519/Manifest
+++ b/dev-ruby/ed25519/Manifest
@@ -1,6 +1,5 @@
 DIST ed25519-1.2.4.tar.gz 136685 BLAKE2B d0fd78f16df2b09f5835fca4b0963cee930e17ece2c4eea2cbf4544ed1a5e30c7dc63525b285f4e1e150e5e70d1e8207ca07ce985c27441a903c69875fd92dee SHA512 cf2de7781848d804f3a279baef26f887846d7d846d225293c74dc3f4e301d18518c9edc8b721f9637fff8f087703e91d2376119f2d8185ef19be5862f99801b3
 DIST ed25519-1.3.0.tar.gz 137160 BLAKE2B 520ffa6bd0a801faa9f5f63873d705a211c3dba0e5319246b77bd455585e60baf7c7829ddebb892a896c1ae763e6df732115675307451c33bb20f56bb7c89be4 SHA512 dbd108769e131d15e4f31eaf7f4a46530769f279ccbbe4a10b5fe9e1d394bafb0ea6af95b6b1da2d66db00072576ff9d6d5c9156d949d79daf929a9dbd22eea8
 EBUILD ed25519-1.2.4-r1.ebuild 699 BLAKE2B d9e6ff84082a9aa7c0661f79f5867e9e2f3e35ec1924dd253dcafa9007759403fb19966214eb4c21f4bfc516a56b82634d9065aa4c5d6310dbc78267add62c39 SHA512 c78937ffc2aa9650990cb991e88bea0acca84d3ad0540838ac51dd87754bbaec096aed0cbd60f0137c7032a6e7829533d9d9d45eb0620e92bb4f0684a78c6605
-EBUILD ed25519-1.2.4.ebuild 815 BLAKE2B a58c3884ae37997621baa3a286096dbaf7ea304bb10f059549b4c8535c8db1b3b5b31940cd1f3f037f25b636e55687dbd5b1c68ff250a447e886366f6f4c8622 SHA512 4e8b1e76e7b9eac7aa36a4d18d6921581927e1dde8d759adf13bbdaab93ea4ead06f6c3e78f65c1a04e5130fc5c3ab130925195496a0c2693f5b7cef1bbc26dd
 EBUILD ed25519-1.3.0.ebuild 718 BLAKE2B 389645a70d410d501cf18d747e80b95d25a233ab719ce41f04f191c3090bc71f2ae5a1724be04b65293eab139a16618cce6fdb40d73c708a5c5caf3c1222fa71 SHA512 cb44d34b4845455e0593d4dbc0bbc4c44a64e41e1db2b79587d18582c1f23175a1a20d9de5d647f3353173b00780d3ce12d58decb85529a7220e74e109df6d5e
 MISC metadata.xml 344 BLAKE2B f217757eb80df9d9c454509c710832b5db19b897af04a0e3c7af5b096c57b4bad153a7369c698479160542df569d8008e861bffe1fabe7082d8ed533fc35d2e9 SHA512 7b437dd29237939c019b1760f65533a80c39f11176736276a612e4a616fe10f890b45b891791b18e06802f53dd208ae82cc37f4c317f4fdee25c012b2681b317
diff --git a/dev-ruby/ed25519/ed25519-1.2.4.ebuild b/dev-ruby/ed25519/ed25519-1.2.4.ebuild
deleted file mode 100644
index 282a543f34f2..000000000000
--- a/dev-ruby/ed25519/ed25519-1.2.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for the Ed25519 public-key signature system"
-HOMEPAGE="https://github.com/crypto-rb/ed25519"
-SRC_URI="https://github.com/crypto-rb/ed25519/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/ed25519_ref10 extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/ed25519_ref10
-	cp ext/ed25519_ref10/ed25519_ref10.so lib/ || die
-}
diff --git a/dev-ruby/elasticsearch-api/Manifest b/dev-ruby/elasticsearch-api/Manifest
index 1e791b55e056..c7c462ee87bd 100644
--- a/dev-ruby/elasticsearch-api/Manifest
+++ b/dev-ruby/elasticsearch-api/Manifest
@@ -1,5 +1,5 @@
 DIST elasticsearch-ruby-6.8.1.tar.gz 336746 BLAKE2B b7e7f039c1605ca808f57ee2ecb5fd346672d89b1b1cc8eb2d30c8bfcab9d7283f082d9852f0f186a36298dadae98f6951cdbd6a0f401568640f7de006976b0c SHA512 01ab96c92ff04818e29dbab34d73865c1f2adc816670e1fbdfe29a545eb224ff2c6368d7e0f90264c71db76a4f369626ed2e0a4ed3401adf749e0cac41d1f41d
 DIST elasticsearch-ruby-6.8.3.tar.gz 345447 BLAKE2B 6f10b4345d098b36c5b4d8e90e8745b10313de0df1f5bd9285e72f891a871bff8569318d5bd15ab5cca0ada722042affb6bd20ddb68117eb689eadc0c2a16706 SHA512 3001760ff49bf72ba9ac5e11f3338e320c828bfb245d45535325f422e438b693d1ae7a4f73ab766386a76282eca435849c670f3ad98e9431b80b402e97268f83
 EBUILD elasticsearch-api-6.8.1.ebuild 1494 BLAKE2B 2e890462d0c433658b7bec05c229ddc6e651ca1a1f1fc55f889662a5275f5dc13d48f9647f66fc24aeb84c5689cf24b45b4934fe1ec4dc7d456a51850abd5883 SHA512 9997097f1574e1e7cc22a8e1bcfadebc6309cfcf9322e14b2a74eb4347fdeb864ca4467c8f50cec3dd94fe31a666117041686eab6c12b62fac41b0c43e8b78be
-EBUILD elasticsearch-api-6.8.3.ebuild 1532 BLAKE2B 92aba41640caae5faefbf8392435d84c007f3f33c67c34daac0c4cb925fe4854d265d7159c403270626f3c7ede8460c32f3e5bc61287767021e2867d574dd4b1 SHA512 0ac1f18c34bc33a59ea3042c965f045c9946dc9555362afa7f4e4a1306969b9c532f4d53e0563d4135d962f2aa9a3f87fe53f4a161cc317c1bf06114706a77df
+EBUILD elasticsearch-api-6.8.3.ebuild 1539 BLAKE2B d8f43d5876929fb2ca2f3388f7e14eb117def4c17471969c308c01ee520110cc319e9de5740e77b5bd9d18168e32d8e1f78dd2948a7685efc34c9059858972b9 SHA512 dbb18448fb5df02163942ddc2ebb0d62bfb63beae8c49375d4075806d135d7829346732fd14f60e616f87d5681c7c20f17d9a99a5ec9cd3458f13b61df991618
 MISC metadata.xml 217 BLAKE2B 44cd99deb3ba3d549068a5a41f8bbec35a6da1585ee80ce5ec9427f2a629646c213a55913bcb8faa5fe6c9c79e49ff02a90a93593ef2310745326e079363ff61 SHA512 c73cd82aab671d2b498c6de775a1a61ee2960da36d12470a333024ae9328426a65437ad6223cafd969619702e2596e72e47e8bfadff41ae0a19efc8b6028282b
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.3.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.3.ebuild
index 95e0821f2261..958f6af5d6bf 100644
--- a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.3.ebuild
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.3.ebuild
@@ -1,9 +1,9 @@
-# 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"
+USE_RUBY="ruby26 ruby27 ruby30"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 RUBY_FAKEGEM_TASK_DOC=doc
 
diff --git a/dev-ruby/elasticsearch-transport/Manifest b/dev-ruby/elasticsearch-transport/Manifest
index 9db2284799ef..4a94c4afc8a4 100644
--- a/dev-ruby/elasticsearch-transport/Manifest
+++ b/dev-ruby/elasticsearch-transport/Manifest
@@ -1,5 +1,5 @@
 DIST elasticsearch-ruby-6.8.1.tar.gz 336746 BLAKE2B b7e7f039c1605ca808f57ee2ecb5fd346672d89b1b1cc8eb2d30c8bfcab9d7283f082d9852f0f186a36298dadae98f6951cdbd6a0f401568640f7de006976b0c SHA512 01ab96c92ff04818e29dbab34d73865c1f2adc816670e1fbdfe29a545eb224ff2c6368d7e0f90264c71db76a4f369626ed2e0a4ed3401adf749e0cac41d1f41d
 DIST elasticsearch-ruby-6.8.3.tar.gz 345447 BLAKE2B 6f10b4345d098b36c5b4d8e90e8745b10313de0df1f5bd9285e72f891a871bff8569318d5bd15ab5cca0ada722042affb6bd20ddb68117eb689eadc0c2a16706 SHA512 3001760ff49bf72ba9ac5e11f3338e320c828bfb245d45535325f422e438b693d1ae7a4f73ab766386a76282eca435849c670f3ad98e9431b80b402e97268f83
 EBUILD elasticsearch-transport-6.8.1.ebuild 1298 BLAKE2B cf1ca78351cdb27139af7cab950bdfcb00af19c63ba3906d0d872e8a1623c0c428f61d8850fa4c0966c16c856414ff11696405b5924b3d8fc2042490b0d6390e SHA512 8a382cb220e350e3750169bda8a60fa20912052f85563b8026f52c7b004167201ff3639fef71cc90acd8cc1878ef96b454c47f8f759802d344cbd326082acc3f
-EBUILD elasticsearch-transport-6.8.3.ebuild 1261 BLAKE2B 8ae7304f830a5c562aed7e42a2fccc8759a70326e686e85f5c49eff00771a9b52e2ebb1e5b9ad01c5770663b7a5f98cf9cb7bdeb12ae744e0c17e529bf358075 SHA512 455635ed089b2a76a1ecdecb3f8a9f8846cd02dbcab6ac86cb135fd2aca68f627401a6f0215fecedab5135b0e7e918719a97365b3901ee5e0bb8d4b68b466215
+EBUILD elasticsearch-transport-6.8.3.ebuild 1268 BLAKE2B 45188540ce39121c506e20f73068bbb7926bb9a0bdc4b1baab723a575dcf1ffcb8454f3148d9e07c6dd1b16b61b9fac0694c71da2f001770490f3cc88b9c55fd SHA512 19982e19087bf01c8cd26b61a6ab2375f62d4e0bbf6201d8e7e47d94bf19e0746d74769c0ca703639c5786bfae1d7bcfc972d78c334cc50840a6bea9f3f6244f
 MISC metadata.xml 217 BLAKE2B 44cd99deb3ba3d549068a5a41f8bbec35a6da1585ee80ce5ec9427f2a629646c213a55913bcb8faa5fe6c9c79e49ff02a90a93593ef2310745326e079363ff61 SHA512 c73cd82aab671d2b498c6de775a1a61ee2960da36d12470a333024ae9328426a65437ad6223cafd969619702e2596e72e47e8bfadff41ae0a19efc8b6028282b
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild
index 59e8b4b1615a..fcc6c603bf6c 100644
--- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild
@@ -1,9 +1,9 @@
-# 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"
+USE_RUBY="ruby26 ruby27 ruby30"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
 RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
diff --git a/dev-ruby/elasticsearch/Manifest b/dev-ruby/elasticsearch/Manifest
index 6917d9a9f847..27cb7df29e35 100644
--- a/dev-ruby/elasticsearch/Manifest
+++ b/dev-ruby/elasticsearch/Manifest
@@ -1,5 +1,5 @@
 DIST elasticsearch-ruby-6.8.1.tar.gz 336746 BLAKE2B b7e7f039c1605ca808f57ee2ecb5fd346672d89b1b1cc8eb2d30c8bfcab9d7283f082d9852f0f186a36298dadae98f6951cdbd6a0f401568640f7de006976b0c SHA512 01ab96c92ff04818e29dbab34d73865c1f2adc816670e1fbdfe29a545eb224ff2c6368d7e0f90264c71db76a4f369626ed2e0a4ed3401adf749e0cac41d1f41d
 DIST elasticsearch-ruby-6.8.3.tar.gz 345447 BLAKE2B 6f10b4345d098b36c5b4d8e90e8745b10313de0df1f5bd9285e72f891a871bff8569318d5bd15ab5cca0ada722042affb6bd20ddb68117eb689eadc0c2a16706 SHA512 3001760ff49bf72ba9ac5e11f3338e320c828bfb245d45535325f422e438b693d1ae7a4f73ab766386a76282eca435849c670f3ad98e9431b80b402e97268f83
 EBUILD elasticsearch-6.8.1.ebuild 1199 BLAKE2B d05a0e8c4d34d33abe7efdb3b45c33977371370f3c2ef1a2ff49484ebaa003ce9c6fc2815604b8b8020dcd25283cfcd9c1d9b4f36936944389850cd515f1a48f SHA512 f74067326ffbdd71676a022436ccf6a815a92ebc7628498f5c6c57647d71ba0e15b220f0b6a42c6dd9d86ada659597ca28f970eec18bff9b7df2f87f67ac9819
-EBUILD elasticsearch-6.8.3.ebuild 1194 BLAKE2B 82806cc673d6cfff39bacf9f041dcb98b7ef9f7fbfe8f2315155e2273449fcfd58bdac220ce0e6902aa8d04a29213e39f5636365742894f10435a92a83a08c23 SHA512 a44b2d9dab3cf873494c7930b8c7665750b8839528f5f3207fb11e9401073374b929afdf786a2f35c89ed8ffc7907a65fe302c2600fc99f54c91fbf30ea974c1
+EBUILD elasticsearch-6.8.3.ebuild 1201 BLAKE2B c32188403d43f36e5ceab90b54a625deb6bed1dd551e99cbc0038f2811bbd001f03a6cba49973ff07f3a0eefb7b0ca414934b9c72c88d914960dc6f4dfdeb0a7 SHA512 b279aa737d818780c219652a9aa8284bd5545c15bd1a8cf944842703f92a310a9c27f0a46444a24e5338b87fcf11ee797a61ec4add3c95a64d071bf2b6f1809e
 MISC metadata.xml 217 BLAKE2B 44cd99deb3ba3d549068a5a41f8bbec35a6da1585ee80ce5ec9427f2a629646c213a55913bcb8faa5fe6c9c79e49ff02a90a93593ef2310745326e079363ff61 SHA512 c73cd82aab671d2b498c6de775a1a61ee2960da36d12470a333024ae9328426a65437ad6223cafd969619702e2596e72e47e8bfadff41ae0a19efc8b6028282b
diff --git a/dev-ruby/elasticsearch/elasticsearch-6.8.3.ebuild b/dev-ruby/elasticsearch/elasticsearch-6.8.3.ebuild
index a5542e7c2894..b19211d3f50f 100644
--- a/dev-ruby/elasticsearch/elasticsearch-6.8.3.ebuild
+++ b/dev-ruby/elasticsearch/elasticsearch-6.8.3.ebuild
@@ -1,9 +1,9 @@
-# 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"
+USE_RUBY="ruby26 ruby27 ruby30"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 RUBY_FAKEGEM_TASK_DOC=doc
 
diff --git a/dev-ruby/equalizer/Manifest b/dev-ruby/equalizer/Manifest
index 12b3aa9536ef..1d713bda425a 100644
--- a/dev-ruby/equalizer/Manifest
+++ b/dev-ruby/equalizer/Manifest
@@ -1,3 +1,3 @@
 DIST equalizer-0.0.11.gem 12800 BLAKE2B e5a56aa1620273d393987da28b2a010f3cdf26c6abe2e31c4743130c6308abde8ef7656f3d8b3e1ec0ec8ad15a298af5548e31558213272120707c0f46218e8a SHA512 01273a8e83124178f5b7d7eed08a4ca6286772c26202e028fa957f3e9d655869c51a7710312a52bb654672c7cbaee5de15fa2eee01c5413f2589cf05e02700a9
-EBUILD equalizer-0.0.11-r1.ebuild 668 BLAKE2B 2129d31b6ae01ca118035ac934bd708104b400f9ac22f9d062fd70fb7639d586cda9b80d96a714c190742d007eae1dfecc89ea5c532e4ed7bebe20404acffddb SHA512 566c62470117234a778cd123a569de2fac5bd3fc16c44ea82e59e1ab24f284c0be24c92493fb5d8ab80eb7dee077f69499be1a9cf7bae4be0c3066e074b307bd
+EBUILD equalizer-0.0.11-r1.ebuild 668 BLAKE2B 43408a33bae88a69272610fb5767d9d4c98652e3c7a1d17e1e37c4a5e98fd3ddf6b87f51dbcede064bf0c01d2bfc0993e709b73e2aca668cb28bc6a515bbd456 SHA512 e6ec7b182a5232d31015b25c0c9804520fa8a000f7ed86ec8ae6884e0c6047bf1b70eac3a9a8f3136d1e63fa8a29eedf86cdf36c1a866ea0f7a8832a907a8401
 MISC metadata.xml 342 BLAKE2B b1f430a65a3090cfc47b60ba05d28ffdb5d0f89a0dd0b7d0d00753a8d2134c0efabbae5c12d23b4f55fcf5ce196c962e375d97b781162b314c5a1c3bb1b52d22 SHA512 3740ab1e82a66d480af24d67b092da21e99f82cb914c82be66ad5ff0a98a2640a485c70403234c9b9ecba4aecda865530417e5ab5920a59fa06fecf095f33acd
diff --git a/dev-ruby/equalizer/equalizer-0.0.11-r1.ebuild b/dev-ruby/equalizer/equalizer-0.0.11-r1.ebuild
index f796c0589bfb..14822f7e41dc 100644
--- a/dev-ruby/equalizer/equalizer-0.0.11-r1.ebuild
+++ b/dev-ruby/equalizer/equalizer-0.0.11-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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/equatable/Manifest b/dev-ruby/equatable/Manifest
index 79f03c869e97..be61611d6c3c 100644
--- a/dev-ruby/equatable/Manifest
+++ b/dev-ruby/equatable/Manifest
@@ -1,5 +1,3 @@
-DIST equatable-0.6.1.gem 10752 BLAKE2B f544d330fd72c12c81757ca1220f209126e9200b0309d7720005c720ad7f89288cb40d3b7bca004f624f162bfebedef8341997e94cdf5f51e6fe86fa2ab0b0e1 SHA512 442a6c9afd31ec2c41f3802703515827cb8d100bea3932c1fadeb036bb96a045883050712f480ebe4f7ea9bda5dab335b0f0d9dcc90a42bf45ce6bcc504fe0d4
 DIST equatable-0.7.0.tar.gz 10403 BLAKE2B 297543648fb78a9ce7603ebafedb45f69769317d3544951f6ea775087c4db2efe8c4cf30964899b20858169d60a3fb1f0c448b082f3b4596852420fb323626bd SHA512 5b6928cdabeddc23473c2be50122dba1a2e225c78fcae4976b89e145def1056a5b108939ee6156019568a3204f771032f1e2b5d0b440db5d7e8722f152455064
-EBUILD equatable-0.6.1.ebuild 529 BLAKE2B e187049dbd03d4f752c26d5f2815ec5af7c9cd735738a751d49c5dbd6b49ecc91ff85b8de35c68461503573eefa81e56c059383f251febd07ebe29e7e53601f2 SHA512 c4defa5ebe7f85a0d475e0938df7636da4c70168aeea46b2a57deca14c4bf5b96b265e74449e175d796c82262b62850e91216c3a2fe512401ccf759ce9450b0f
-EBUILD equatable-0.7.0.ebuild 654 BLAKE2B cbb58574e1ba5080a190c5a25e2edde60931eafb39b5c7a042ea1836fbac3c547769bddc098db33bb8fa2d721d958916531d22b0dea1fc657413aba84f0997be SHA512 766e29a688a902632a19ea2508691d37a3df0f158ee8242adc9cb361cb03128816cfb318a6eeac31026a75cc0c1ff724d92251e5305ce50e5046099e782c4597
+EBUILD equatable-0.7.0.ebuild 654 BLAKE2B 2c226780ac509ffcff4b2171ffceebfca7012eb8447ab6b8318f71d0ab30410c5462a5a6e4054bd53210c9ef4bf1f0e28dd619d37d416862e2b8610ffcdd97e1 SHA512 0aaa9a192c9cd07291c6bcafbe4cf6d2066a0475b0b81112ae302dfa890a1ab43000bbb36f5121c5976b08e27e018f89f3d0afbe1e2e8827659e2ca01e5548af
 MISC metadata.xml 338 BLAKE2B 3a7c93bd0f7ebd1be2988143c4f0737dde9ef8e906abac9ddd68f74ea6cbb425a5374d7897bd9cbf9efa5788f6935a7693aac9c8d4e5cf561def02ef19b43468 SHA512 b6ea5746303bc89739d6667f7c753243c42fa4d82eda7dd228557b999a9804f9c0afe85e23304dd0a376bf0f2176b871f9089d542f8b931521df3655b1ad3aa6
diff --git a/dev-ruby/equatable/equatable-0.6.1.ebuild b/dev-ruby/equatable/equatable-0.6.1.ebuild
deleted file mode 100644
index 5be235e92d0a..000000000000
--- a/dev-ruby/equatable/equatable-0.6.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows ruby objects to implement equality comparison and inspection methods"
-HOMEPAGE="https://github.com/piotrmurach/equatable"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	echo "-rspec_helper" > .rspec || die
-}
diff --git a/dev-ruby/equatable/equatable-0.7.0.ebuild b/dev-ruby/equatable/equatable-0.7.0.ebuild
index fe460e5d01a7..8ab58bafe50b 100644
--- a/dev-ruby/equatable/equatable-0.7.0.ebuild
+++ b/dev-ruby/equatable/equatable-0.7.0.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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/erubi/Manifest b/dev-ruby/erubi/Manifest
index 761b42b18881..58f958b547f0 100644
--- a/dev-ruby/erubi/Manifest
+++ b/dev-ruby/erubi/Manifest
@@ -1,6 +1,6 @@
 DIST erubi-1.10.0.tar.gz 11212 BLAKE2B 1a31994bc02a6acd0a5ec025c71961422dc8850de1b871a23b6b89fba59b0d3221153a1e1418d2c279ae40b2a942c53290f4695793b0fedba0a4e7b7c324b41a SHA512 adf62511ce9324b4c5f7a95863254c9d95cf40f2107eddad1118ef97d7f534fb74d79b48575ff17209e492811a9a8f87c52fa7a30e4b6ea4e50504cf5572c024
 DIST erubi-1.9.0.gem 13824 BLAKE2B 00cb428e3433090370e9f61d2445f98553a45e2a92181076114db2601fa7261d8ffc44c3f4a0ecb73d616fb5e93dcc52ca6a2efab3945b11bd17d4a53c68fed1 SHA512 34770c01215b323797739af54c5c821d28e982309a76f0a212657868629625ae6dfca3e9e2f5ae16893813fc81b5afbb172c397ddad1e2f93108c5112c540bd6
-EBUILD erubi-1.10.0-r1.ebuild 674 BLAKE2B ad62a46a87a179254a2bc285a1dc917db26b128497713fabf338f091f551ea84ab24322ad25d3c26de7d91d8ca005edd933cd0cc5fd38304768f69bbbc3b0617 SHA512 036917d1d61656fe6840388e827689be188748170a9e0121ffb0a763eea546ae8ab1a40f1dee50d62240ff800720c5103e46fd053df18514db2f1bb1bbb4ef83
+EBUILD erubi-1.10.0-r1.ebuild 680 BLAKE2B 8a5b86c0ab18124b417d0131472676aa6fc0d98bf3ba614eaadc2178817255799c6db42bfe4a9193d4f60dc147cdb40ffcda6b52bba1ebb132e99af260233f5d SHA512 4a38894f89b461fe1051776ef9c7fb23c9d3ebd341ae498690da944c139879f9a110e3e0e85cb027f66876af2a0ec625c3dfaaeacc2986ec9a1bd75bcb7fd0e2
 EBUILD erubi-1.10.0.ebuild 674 BLAKE2B 60bacb1dedcd659a0c777ca6397c8c51991d2cc03407d23f94b3e106ef4e97333c3a93c3eeb5a7944fa2c0f199728da6c402c7346a7cc6f4b027ea4d8dda48b6 SHA512 07130e99dc2e8997b38116eaef7128f1e6c9a84d7e81dced3a74f50b54ccff51fb5736faed85ead68cd173c36d25634900523049018aa2f09c027670af128ce5
 EBUILD erubi-1.9.0.ebuild 552 BLAKE2B a91c6fa724b5b3667de2ce9b68653deee079f87a30d1f98dd963d9a2383aceb5782d5431219b16e2c86b10ac8ae6d13ec19a8d27a55470d836873226bdaa8f4e SHA512 7169ac29042525609712634b46857e2bbfa122b77f3430a77864d6987964f86ac159b653910203e40445d2487add5b79433403f9a613fb4bed22dc0d5613ff21
 MISC metadata.xml 393 BLAKE2B 9471b64d59937408d5e1c68e23ed6ce5aa116c2eb141afbce293064755410b38daa6c35dd72412fbc71477923189caa094017769544db6cc489ef2cc2af8e95b SHA512 41bb4dcb0c47bb0ba8f4156ee3790f451decc3427afbfda092c77068117672dd6c701e501c7a94e6e76802766a572423b81416b4e5f9561129df50d9eb119c9d
diff --git a/dev-ruby/erubi/erubi-1.10.0-r1.ebuild b/dev-ruby/erubi/erubi-1.10.0-r1.ebuild
index 63edd94ddc3b..b810571cdebe 100644
--- a/dev-ruby/erubi/erubi-1.10.0-r1.ebuild
+++ b/dev-ruby/erubi/erubi-1.10.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
 
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jeremyevans/erubi/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-global_expectations )"
diff --git a/dev-ruby/ethon/Manifest b/dev-ruby/ethon/Manifest
index e07009ed96fc..aa3fcfac5bf2 100644
--- a/dev-ruby/ethon/Manifest
+++ b/dev-ruby/ethon/Manifest
@@ -1,5 +1,5 @@
 DIST ethon-0.14.0.gem 57344 BLAKE2B 10dd81966e3e11607f3954616d17fed79be4ba0793cb4e67b39d5b0768ce2adcea88551238c57889b6d14b3d4d9b8e96110d622f5fc40c3856788338a288d4c6 SHA512 765454c3c9132204d6cc0ff09478b252e5cbc78d4f3ca35654942ba19b5aa541d846f1c37ec16e51c54aa41e03debdf8fc084b8f4540d230431d0e6f885f1a51
 DIST ethon-0.15.0.gem 59904 BLAKE2B 9a6bcec605d6133054c3ee9b4546aab4d9282266876cd9c6e9c923d3405a5541871ebe83385185dcc42f0cea37735cddd9977e2da72badbcaaac55b8c634b94c SHA512 6e04c70e105fb95f1e0ff62e1d6ae009bb7b39a60d85ec9e43b10c016f33f679620ded253089a738e0cef5010e9023d1093dd92b1caacdde8f6a745cbae2b5b5
 EBUILD ethon-0.14.0.ebuild 699 BLAKE2B 95e35b489f2826e3df5b4c03bc56d0ca4d4f978e2301b1c16618ec3414df6b53eea2e23dc9b90bf22c820cc704954c5524721b2df400e889c009f7928058c622 SHA512 b251d81dff73ba01a0c7ecfc80c8560d1ce20a86451e1367ecd3d130c0019e55d46c1066d0627f8c23fb1c8e9e5247e782906557086855165077711b8ef39067
-EBUILD ethon-0.15.0.ebuild 692 BLAKE2B 4082992d9d58b5055320e475bb4cbd053659c9b56acbdac781a1f1b128282b923ee094e6e3470b2a115979a9950fcf9bc7f7a2229d2874c263de6d7d21847ee9 SHA512 3fd6d7ba132637a264f417b49be09a2fc37fedace1dbec6460e372b79d86a39efee14b5f586de1cfca26c7f025e9c34d1cbf3f550b480acaf82ff3aeb9f1232b
+EBUILD ethon-0.15.0.ebuild 699 BLAKE2B ab1e68224e15cf0fd84410d28fd415ad66f4875491a48b9f2d8ba2be4ff2baa91df48e8838bc4336c1a99384dca513dc9dcbbf338c3f4a2ac589b4a20cbb386f SHA512 a047550f667095bd3cb9a4d3ad7246584642d1bd46af9ba41d002186ddba6709eb0a81896b1a62d3afd7f225245510191447d6506197367896c27ac24f7c6172
 MISC metadata.xml 341 BLAKE2B 34c556cae0be837fca96c8414dc02507ce4a590994a02ac326bb07a577817e748139394f6e7a06edf6f6bdd85f01bd8fe8b36f82245417fa6113602185df7045 SHA512 f62b2ef5e0f393ad1d4a34459d68119d26dcf8afca20dc743c52e52de2ad675ae88791537634631465c203220e0bd94b4037c3b4155d0108cbbb57907eeaac06
diff --git a/dev-ruby/ethon/ethon-0.15.0.ebuild b/dev-ruby/ethon/ethon-0.15.0.ebuild
index 0527c5d42892..ff6b1a7b59ba 100644
--- a/dev-ruby/ethon/ethon-0.15.0.ebuild
+++ b/dev-ruby/ethon/ethon-0.15.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/excon/Manifest b/dev-ruby/excon/Manifest
index eb3e21cf9d2f..8a3bf82fdaeb 100644
--- a/dev-ruby/excon/Manifest
+++ b/dev-ruby/excon/Manifest
@@ -1,7 +1,7 @@
-DIST excon-0.91.0.tar.gz 214359 BLAKE2B 82e0ee05c0f2e9eb0bbf9371459e43d02e75d72063f24738b0230272aaeeef5f5985eedf5c0e72a2962a093ee5bc2431b4de171835067a23f1b2fe26a1a7f609 SHA512 ab5b535bbc6f1bad408481c2496a101a198de3899fc185df6aff4377c5c22dcf39af5e022ee52fff111f84f20fed11f75237da0ede0237c3a3ffc5eb405db923
-DIST excon-0.92.0.tar.gz 214364 BLAKE2B b0909aa0976085a7b720951623b7d341e370e23fc15972d955c9175f396a91bac3d22d244c092828532f3ad79d71ef77835d03e658c359f69c1d945c5fe25b42 SHA512 4e9ce9e0dceb9ff2983e6e10cd1224035a44b658398a3a0fb2fd13f1c36682965be383d4580c901551b4e503f3e9ac72a20bdbb31bbb690b781103866824e540
 DIST excon-0.92.1.tar.gz 212980 BLAKE2B 66832dbc309c825137419296098df56510dc004195468b5584fb50faff07e79f0748a11d692b3682e29d280004a53b9f1fd4dc5da14a40853f6c1639793b580c SHA512 3e630a96e37f20484caa15a8c4582a6e5a49a4baf741b9b855cc1d6cca4eb633c6a7f194c8f851c2dc7fd51989bb7ce37122f6eaecefc6583df58918e1540c73
-EBUILD excon-0.91.0.ebuild 872 BLAKE2B e1560118a2a39a529c0baadeb9d8019de047d0ecb064e0456788ef0e7ca300df23db12bcf1a8d26b2dc8ad0b6433410756dc70f6ce7d1fdb8188b48782d72a98 SHA512 79ca24b633edeea11649eb6b9329499496ddc14e36dc339919a7d79c1b3a1c0466a9faee4671846e4394b0021535945292d4b98c0b486fb63ef98694fb49e1c6
-EBUILD excon-0.92.0.ebuild 872 BLAKE2B e1560118a2a39a529c0baadeb9d8019de047d0ecb064e0456788ef0e7ca300df23db12bcf1a8d26b2dc8ad0b6433410756dc70f6ce7d1fdb8188b48782d72a98 SHA512 79ca24b633edeea11649eb6b9329499496ddc14e36dc339919a7d79c1b3a1c0466a9faee4671846e4394b0021535945292d4b98c0b486fb63ef98694fb49e1c6
+DIST excon-0.92.2.tar.gz 212984 BLAKE2B 5b38a3e5435df3af6e19ac3a9bf17ee0b858470893d1fe6bcca841d21f7a7f0fbeffa79f50c98d6f278c7cc66f7e44bae95d6743575388f46c74fe02e1fcc6b8 SHA512 bc0c7d909279140b9be116b38b13b3dc2f3d8646c13732b8b9120129a645b63e0bb24e8db3d7d56072aa3f61b66bfbac6a955d8ea366dcb0c3d14f31966f95a8
+DIST excon-0.92.3.tar.gz 215423 BLAKE2B e07a2ca3289c1bbf4b0c3de1ef2802d85311461ceb931b9fa90b9b6837f779303490f8773cb71b8a977d5d87ebb60343d10a0966158541af34771d163c7cc814 SHA512 908ea503c2b7b4e865fcff080579bf18319c1b15f2e5b7ec7f52b6d4ebb0561b187cd18fad47c1ceadfa64700257ebf80e927b70f8679c8d00db3abc8d07f8c6
 EBUILD excon-0.92.1.ebuild 872 BLAKE2B e1560118a2a39a529c0baadeb9d8019de047d0ecb064e0456788ef0e7ca300df23db12bcf1a8d26b2dc8ad0b6433410756dc70f6ce7d1fdb8188b48782d72a98 SHA512 79ca24b633edeea11649eb6b9329499496ddc14e36dc339919a7d79c1b3a1c0466a9faee4671846e4394b0021535945292d4b98c0b486fb63ef98694fb49e1c6
+EBUILD excon-0.92.2.ebuild 1166 BLAKE2B 2c23376a3c87ab4ec84b6ccb8ee045642a1675e44fe17fce4b5d3e109a1e9a9395dafa6d065930d147923c9f75ae506611c28577dd91e80e997f704b82f59d16 SHA512 0e1265416c4b4fa9301f630eec45e34c17caa14a08e851f9bb05ac7157c60069983100fe140ccbee56b92a20abbdcf5201b20001f74d538aec7991daa7ac01e5
+EBUILD excon-0.92.3.ebuild 1166 BLAKE2B 2c23376a3c87ab4ec84b6ccb8ee045642a1675e44fe17fce4b5d3e109a1e9a9395dafa6d065930d147923c9f75ae506611c28577dd91e80e997f704b82f59d16 SHA512 0e1265416c4b4fa9301f630eec45e34c17caa14a08e851f9bb05ac7157c60069983100fe140ccbee56b92a20abbdcf5201b20001f74d538aec7991daa7ac01e5
 MISC metadata.xml 449 BLAKE2B a51e81b7b137d4140aaf665fe3f799af701ae62dc5d319c96a1bc995f26cd6f79d59122409af1f2a37970106a49ba9e5ae7a48e37766c5f450c102c5ee62747a SHA512 f8cf7e241dfce9528214e00dbe8026b2b6c211f8278cb7b30a093a09926e37ecdaeb2d7e30e6f5b8e63f278c3d4900d0c62e84c17a89ffa0e21ba5c18458dda2
diff --git a/dev-ruby/excon/excon-0.91.0.ebuild b/dev-ruby/excon/excon-0.92.2.ebuild
index 84ee1858942c..2f63356225e4 100644
--- a/dev-ruby/excon/excon-0.91.0.ebuild
+++ b/dev-ruby/excon/excon-0.92.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="changelog.txt README.md"
 RUBY_FAKEGEM_GEMSPEC="excon.gemspec"
@@ -25,7 +25,6 @@ ruby_add_bdepend "
 	dev-ruby/rake
 	test? (
 		dev-ruby/activesupport
-		>=dev-ruby/eventmachine-1.0.4
 		>=dev-ruby/json-1.8.5
 		dev-ruby/open4
 		dev-ruby/rdoc
@@ -37,4 +36,10 @@ all_ruby_prepare() {
 
 	# test that need network
 	rm -f spec/excon/test/server_spec.rb || die
+
+	# tests that depend on eventmachine which is broken and no longer maintained
+	rm -f tests/{bad,error,pipeline,response,request}_tests.rb \
+		tests/{batch-requests,complete_responses}.rb \
+		tests/middlewares/{decompress,mock}_tests.rb  || die
+	rm -f spec/requests/eof_requests_spec.rb spec/excon/error_spec.rb || die
 }
diff --git a/dev-ruby/excon/excon-0.92.0.ebuild b/dev-ruby/excon/excon-0.92.3.ebuild
index 84ee1858942c..2f63356225e4 100644
--- a/dev-ruby/excon/excon-0.92.0.ebuild
+++ b/dev-ruby/excon/excon-0.92.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="changelog.txt README.md"
 RUBY_FAKEGEM_GEMSPEC="excon.gemspec"
@@ -25,7 +25,6 @@ ruby_add_bdepend "
 	dev-ruby/rake
 	test? (
 		dev-ruby/activesupport
-		>=dev-ruby/eventmachine-1.0.4
 		>=dev-ruby/json-1.8.5
 		dev-ruby/open4
 		dev-ruby/rdoc
@@ -37,4 +36,10 @@ all_ruby_prepare() {
 
 	# test that need network
 	rm -f spec/excon/test/server_spec.rb || die
+
+	# tests that depend on eventmachine which is broken and no longer maintained
+	rm -f tests/{bad,error,pipeline,response,request}_tests.rb \
+		tests/{batch-requests,complete_responses}.rb \
+		tests/middlewares/{decompress,mock}_tests.rb  || die
+	rm -f spec/requests/eof_requests_spec.rb spec/excon/error_spec.rb || die
 }
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index f209793aab67..1bf60d2093cf 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -3,5 +3,5 @@ AUX facter-3.14.8-explicit-rspec-2.patch 578 BLAKE2B 7bd6134235c61e03b2706388ad0
 DIST facter-3.14.21.tar.gz 410594 BLAKE2B 30b502debaec476d7ba03a73ad3a251aeabf3347c2c552204e825dea8d85807d50cd6d06de03be32a5977e5e8cefe4869e2cc453b1ea79b9045c80369df6a0d7 SHA512 69618e54d2c46ae1230fa99ead88413ca8d5be6a01c149fcc00a7485767b9e624283fdf6064679e825a1ecb426be59a86e7ef903cd0ffca58383006ba5e9cf7f
 DIST facter-3.14.23.tar.gz 410645 BLAKE2B 7455435d1ab1b1f6e97996aa54be57321bbe0e294652b1aebe0e1ee0e7be45309c1a89fae4079a4350fd6e689c0fe782a7f5d3eee3d766842fba1e8b70a702b7 SHA512 be207d37cf5eac4b6b95cb13e8c2598ccc03af3bcbeedb0d814e5c11c43eb7579427fa1fc1a29eb6db4d6c43b19b2c87c88bd0c85ac3550fa886753267626986
 EBUILD facter-3.14.21.ebuild 2109 BLAKE2B 7254af54a1da94f294292d6356123fb35e6d6924d7ee0d67f3d266bd26442f01d38649214fd9b12fd85b3977392eeb4993cf533aa528c7f51f7dc6e9d49aa023 SHA512 bca419520fae55af55242d0daf70abce704f6628584ce0688b5f5aff2b67e2ed424bfb25168e915411a68ade62c19fe3c033958fa1a3eb840f78d057f16f624f
-EBUILD facter-3.14.23.ebuild 2111 BLAKE2B 504a96d5bde24ed9d4b3060bc5be3427918d2316f47fda0f420672a221daa649a8629819b1074669692bccab2becd198defc0dcea7c816396131793974da6a3b SHA512 67c568a844df56e7c346513a291f695a3e33b2b4332d6ce43ef931e90c60add931f6109bab4391055b48de2cf86c62143a9867171b29565148a66782a0e66536
+EBUILD facter-3.14.23.ebuild 2109 BLAKE2B 7254af54a1da94f294292d6356123fb35e6d6924d7ee0d67f3d266bd26442f01d38649214fd9b12fd85b3977392eeb4993cf533aa528c7f51f7dc6e9d49aa023 SHA512 bca419520fae55af55242d0daf70abce704f6628584ce0688b5f5aff2b67e2ed424bfb25168e915411a68ade62c19fe3c033958fa1a3eb840f78d057f16f624f
 MISC metadata.xml 540 BLAKE2B 584d6db1a27bfa9383048929df3d6da07040cf507acc2aa58de7a4e9ba665079cac60b48b398bbb0510914acc03be1fd3468e5678e690f8d6fd03060e659dd4a SHA512 c1311ca348655bf9566889ec9edcd012a2d003f0b1122749caa9066cea2005d3fed7b7a0d1bca75281396e8e43cb6a2f611550572523dc011113424d642c2a2f
diff --git a/dev-ruby/facter/facter-3.14.23.ebuild b/dev-ruby/facter/facter-3.14.23.ebuild
index 1c29d28561ba..a8b3fb88f65b 100644
--- a/dev-ruby/facter/facter-3.14.23.ebuild
+++ b/dev-ruby/facter/facter-3.14.23.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_BRANCH="master"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-ruby/faraday-net_http/Manifest b/dev-ruby/faraday-net_http/Manifest
new file mode 100644
index 000000000000..b4c39d893fe7
--- /dev/null
+++ b/dev-ruby/faraday-net_http/Manifest
@@ -0,0 +1,3 @@
+DIST faraday-net_http-1.0.1.tar.gz 8436 BLAKE2B 16feb3c79af7db3b69373826a2fc55a8373620c7c6bb229ec27ada2e07a75e862e4211a13a991c9d280b9dfd9643d1eec400fb0b925a846d966cc609c562aefe SHA512 57a7ea2f452844200119cb9e99ae4bfee5e01b0630b38b4ef4e615dfcc05e1476e3da8511698bf199c62b816b5253fb364ed6cffdc59dcd4e9d706c7f1e6e56b
+EBUILD faraday-net_http-1.0.1.ebuild 723 BLAKE2B 94073cf9d8e593621fd1a78d87fd8b0fce8c7f597b7eff7ee33e09558c24844583016fef668192b7ce5a722783bf01106d4a0a2ca6964181a516743d0fb93dbd SHA512 1b620a6afec414faca437241a719d400541a901d2287add3bfd1414710cad2a2575a364ba1a7e558f7b5727f47f1a5c76b2dcd13b5d3574c8f75bbb5d1117a54
+MISC metadata.xml 354 BLAKE2B 1273b11e3f0f51d2b444d56d37d0c620248e5932a974de9de6ee0d5d734fdb7354e0e4b8b31d481ab05bbb66be3bc8169c6a375bba61cdf19fd495846e983654 SHA512 8f6bb7b8ec5d8a3e57b9ef8a668fd49ddc7feef6b13b0df48495ff51b9712c8710bc2e43fcc265e66be8078d4fe67cff61172a533683ba9e932a22fd6fa369f9
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
new file mode 100644
index 000000000000..35f84a277481
--- /dev/null
+++ b/dev-ruby/faraday-net_http/faraday-net_http-1.0.1.ebuild
@@ -0,0 +1,30 @@
+# 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_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faraday adapter for Net::HTTP"
+HOMEPAGE="https://github.com/lostisland/faraday-net_http"
+SRC_URI="https://github.com/lostisland/faraday-net_http/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/faraday-1.3.1:1 )"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ':'./:" ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/faraday-net_http/metadata.xml b/dev-ruby/faraday-net_http/metadata.xml
new file mode 100644
index 000000000000..2f1389424781
--- /dev/null
+++ b/dev-ruby/faraday-net_http/metadata.xml
@@ -0,0 +1,11 @@
+<?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">lostisland/faraday-net_http</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index 0a1fa78ace00..d31f7b165e7f 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -1,5 +1,7 @@
 DIST faraday-0.17.3.tar.gz 76786 BLAKE2B 0706f4386233861564aa1ba5fb8da9ad374a0b553a3f6ccd4ce6509b690f6da3e9f695f90605e0e15b41b6354841943ecc4f5eb826638565687bf62b36f1f456 SHA512 346e93b5d980626a0c460d9010ca09091faf84a1a8f2717c16d345ddc51585ce45959d7fcf41fbd0ba248d38460939544945fa0e81bcb80ab73dfe080182e325
 DIST faraday-1.2.0.tar.gz 840216 BLAKE2B a52d2ddc2a57ba87b28e9143123985df12e118d6a8062b5272e77aa7807d7b2fd770408090c7e406631173eb276efcb973f96efdb17ab0f3ea684acda41b8d34 SHA512 7198e8954ec71bdbdfb58df52c6962ebe05599bf871fcb669f32ee2a5fb094b6934492396a92033e0fa858390f454f0d2daa41616f9e212f260080be016e1ea9
+DIST faraday-1.3.1.tar.gz 840638 BLAKE2B 284f7f612d3ab791a00ceab823be0246685fa38356bfeb6e01c12e81c7369c500719a6023dd929160ca598b41401b82cda0d8e9e363d0e7bdd91791742f8e68f SHA512 b89839e5d602911904ce009f52d011c124f84811e0676a3a524d22ea7084d99a971b6573dcde6d512bf933909cc461ef01cd82a8eeb9df581c56f17f31966b1b
 EBUILD faraday-0.17.3.ebuild 1530 BLAKE2B ed407c60c9138dc038c019689cdf9c2e620082c58c65f6cf08fc8bd9e2aeb728aa804e6545ec9a8059aa117968a61e9b8a300144e17636173318b6889173508a SHA512 2ca22991606aebaf97e281035ad9b1e166017a1cd2e29b43f363badac28cd4be2551bf6a1be0f38e76245f8a76c7e9fd44f8d79cc5f42922fd20190d8eb8719c
 EBUILD faraday-1.2.0.ebuild 2260 BLAKE2B 4d303ac1436ed45bd50ff06b62eede4742ab5be0e159013358fa85f15bd209df690a000f3a26dcb0359c3bc6521cde81d4ff4c2d3be5f9c40f8a0646f42f6a5d SHA512 21450af436ea955d572bb23b6eb21c8e729e40ff57d3f132e4d2c6055d12b1ddf76a22ac0cd51895f9f0dc9731b9e305e2343fba3a8fff7a5a7143229937d730
+EBUILD faraday-1.3.1.ebuild 2322 BLAKE2B 593241e0327060d1674cb1ff1d1696f6e564e88a5ef32aeec5e8c92f0b13877d8853d9b6575e1d088237d66b0e560399989d64320febda0dc28b38081fa214bb SHA512 acc2575811f92c47a4808d97363df4fb2eeb3bad26e0ec1d6d3d921fc2a743461ab18ec029608ddfe206f9cc1de411b35f60f4bcaac7b9983981d15e5245157f
 MISC metadata.xml 345 BLAKE2B 3f30f745aae665ba534c93898368c8b231fa204fbaeda63ff9afdb34c9576d65f516a323ee80e93c8195ebecb1804c5da7e04efb841510f8274e3d498dcc43d3 SHA512 b6f789f6e999463339fe59008d20af965abffb4bd5b4d3bb57552f81cdc00cc70eccc5077907a6222949bfe94dec687c46fee225a559153f8b29a03175250289
diff --git a/dev-ruby/faraday/faraday-1.3.1.ebuild b/dev-ruby/faraday/faraday-1.3.1.ebuild
new file mode 100644
index 000000000000..7124c6897dbb
--- /dev/null
+++ b/dev-ruby/faraday/faraday-1.3.1.ebuild
@@ -0,0 +1,85 @@
+# 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="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="spec"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend "
+	dev-ruby/faraday-net_http:1
+	>=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3
+	dev-ruby/ruby2_keywords
+"
+ruby_add_bdepend "test? (
+		>=dev-ruby/test-unit-2.4
+		>=dev-ruby/connection_pool-2.2.2
+		dev-ruby/rack
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
+	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
+	# Avoid loading all lib files since some of them require unpackaged dependencies.
+	sed -e '/[Cc]overall/ s:^:#:' \
+		-e '/lib\/\*\*/ s:^:#:' \
+		-e '/simplecov/ s:^:#:' \
+		-e '/SimpleCov/,/end/ s:^:#:' \
+		-e '/pry/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	sed -e '/git ls-files/ s:^:#:' \
+		-e "s:_relative ': './:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid multipart tests that require an unpackaged dependency
+	# that appears to be no longer maintained.
+	rm -f spec/faraday/request/multipart_spec.rb || die
+	sed -e '/multipart_parser/ s:^:#:' \
+		-i spec/support/helper_methods.rb || die
+
+	# Remove specs for unpackaged adapters
+	rm -f spec/faraday/adapter/{em_http,em_synchrony,excon}_spec.rb || die
+
+	# Make this adapter optional since it comes with a long list of
+	# dependencies.
+	if ! has_version "dev-ruby/typhoeus:1" ; then
+		rm -f  spec/faraday/adapter/typhoeus_spec.rb || die
+	fi
+}
+
+each_ruby_prepare() {
+	# Make sure the test scripts use the right ruby interpreter
+	sed -i -e 's:ruby:'${RUBY}':' script/* || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true each_fakegem_test
+
+	# Sleep some time to allow the sinatra test server to die
+	einfo "Waiting for test server to stop"
+	sleep 10
+}
diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index 2b935f0efd38..d5cfd011eaf8 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -1,7 +1,9 @@
 DIST faraday_middleware-0.14.0.tar.gz 26313 BLAKE2B 2d925f0bd9e4a10505bcdd3b483ac7b8ed2c42dc1187e04069505216dc739af3f10f5c7f2252e3f474e5ddaf972a7b8fe009be9957e66ab625fe49c364a0d217 SHA512 d8e86da166022c04c12acc37981de446ba30050330dc0320eec0414157bdd6c8e92ff49ce92b390a2f5d457c396144dbde698d61993302c0ac416559e7078a8d
 DIST faraday_middleware-1.0.0.tar.gz 28279 BLAKE2B d881f59e106a695e2d41936d552fe6cb16465964fcb2107806123ea1b34ee6db8e82bb1e6fe3a0135af04da70b56a3e8c933e44591b3f75901642a1fe7a3ea1a SHA512 478dd04840c27120c162e5d9c764a210d4cc55ac54f2d44935942ab5195ee5a0f198a4cc0c98805029f3eab4596cc3963a763cda1fcc1ce6daf1811186e0b5a7
 DIST faraday_middleware-1.1.0.tar.gz 28104 BLAKE2B be490abc57a11c64331c45f1529e55b38df699fe20e81f3783ca92ba7c5c573c1ba2494086f40bdcc7080581ffb2df89093bbabadf8c46721dcca2cb6a0310c1 SHA512 e9c3ada418e47c397272b52706bbcbfa1c98b7b467c148c0094b1dfe47d28fc57e397461e6e7446c5bb8d71ed968e74e1b7e67e793e30d3f47e9fb1aae549912
+DIST faraday_middleware-1.2.0.tar.gz 28332 BLAKE2B 09aefce13f0145e4098d68d2b8887fff5b535b3eda520335fdcaeea05256d1a256501fe9fee4273636fb0bb9d806d38ff7588a489840d2e425ce6666c496a4d1 SHA512 abfc6faf725c4646d0c1c59d2bde23db13dd78f81e74d313368bd0ec4945c33f24c8e8f3f252c6fa499fa845bdda19544876ea93bb9118b3fa4d3c7615366283
 EBUILD faraday_middleware-0.14.0.ebuild 1759 BLAKE2B aa619b492a17e2b4361d0e4f28a2d10c5c18b9f5628620e74639f5cf77ab53ac222dbe4cc3633577770f29bff53ce851aa4953572d4118e001ecdfc4bb915d9d SHA512 b0059c01e7f72f5910664fe1d826e87b80c741a876ac3ab23e0f5247a0f3028f5b4bb38bf6f33fc3adf4908a342a5463f45ef953d97ce04a1876868da0aa58ae
 EBUILD faraday_middleware-1.0.0.ebuild 1695 BLAKE2B 494f0688de5319c53547112c920575b87c6a24bce6e61698f6c8aea0890359e6dddd04d1a5cbaf749497a4896231836472ed9323b49dc75895aec5c2f9427dc8 SHA512 344daac4c69f0f2afd180744e4d229b6294670802995fd6c8c08d124350b3c9bb752b88638e436d0678ea5e37e783575de930a7113973cc9b913c315ce703a8f
 EBUILD faraday_middleware-1.1.0.ebuild 1694 BLAKE2B 5c72148f44baf0c9bf4cddaddb806be325a2b1a24e9dede08bf47e93c73db7db3b7196dbed80ff24e7a189498c803b77c41efe32f83777ddf3d1c5c16e191b33 SHA512 710546f9fe4655299ad0c5d390a7f9dd942bbe4179abbd3eeebde94571d84b3a824a373c1b297d0c482b84a981c0e35cb8ff8cca22bb239ff56649c02ab6c961
+EBUILD faraday_middleware-1.2.0.ebuild 1694 BLAKE2B 67660f363cf4d87ba50011c2418f0d216a3863344ef02ca78a59f0394657b97ddc7c2189688cc18cd6d8977a6053ce94352347ba5c5302d87385a9d45dbf547e SHA512 e8aca88eae945db80a25de106f47ef96795d12d92ffc82d52748589982431961a44bf4261fce980ea261a17786505a9b0a3f1eb0a48fad5ec85ae1badc54e36c
 MISC metadata.xml 730 BLAKE2B 64f366662ab812afd769d94c56eb3829c55803a968afc445cf2e43f16f3c02b6c25541459fa10a93adfacf7064c0fe136321d64e546e8a570365ad002ccc5397 SHA512 9ea2039688d9139404e6d0bd1322f399ce4019e5e36e6d4941296559ce64bc9ca99807d7e0f10c776c4b597e0839a49698d6240c432be4102bfbdaac09b46e2a
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-1.2.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-1.2.0.ebuild
new file mode 100644
index 000000000000..b08b6146db7d
--- /dev/null
+++ b/dev-ruby/faraday_middleware/faraday_middleware-1.2.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Various middleware for Faraday"
+HOMEPAGE="https://github.com/lostisland/faraday_middleware"
+SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="+parsexml +oauth +mashify +rashify"
+
+ruby_add_rdepend "
+	dev-ruby/faraday:1
+	parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
+	oauth? ( >=dev-ruby/simple_oauth-0.1 )
+	mashify? ( >=dev-ruby/hashie-1.2:* )
+	rashify? ( >=dev-ruby/rash_alt-0.4.3 )"
+
+# Bundler must be used because the optional dependencies have different
+# version requirements that must be resolved.
+ruby_add_bdepend "test? (
+	>=dev-ruby/brotli-0.1.8
+	dev-ruby/bundler
+	dev-ruby/addressable
+	>=dev-ruby/rake-12.3.3
+	dev-ruby/webmock:3
+	dev-ruby/json
+	>=dev-ruby/multi_xml-0.5.3
+	>=dev-ruby/rack-cache-1.1
+	>=dev-ruby/simple_oauth-0.1
+	>=dev-ruby/hashie-1.2
+	>=dev-ruby/rash_alt-0.4.3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(cane\|parallel\|rubocop\|simplecov\)/ s:^:#:' \
+		-e '/rspec/ s/>=/~>/' \
+		-e "/addressable/ s/, '< 2.4'//" \
+		-e "/rack/ s/< 2/< 2.3/" \
+		-e "/rack-cache/ s/, '< 1.3'//" \
+		-e "/simple_oauth/ s/, '< 0.3'//" \
+		-e "/webmock/ s/2.3/3.0/" Gemfile || die
+
+	# Avoid unneeded dependency on git
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '1irequire "fileutils"' spec/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rspec-3 spec || die
+}
diff --git a/dev-ruby/fast-stemmer/Manifest b/dev-ruby/fast-stemmer/Manifest
index a40f15f618b9..212d41548143 100644
--- a/dev-ruby/fast-stemmer/Manifest
+++ b/dev-ruby/fast-stemmer/Manifest
@@ -1,3 +1,4 @@
 DIST fast-stemmer-1.0.2.gem 11776 BLAKE2B 090f7a9bd63fbef2c9ef84a7089c7a4881f69f9d77fb8f90377424f1417e97a636d956c4ed646b1f45c25abc1ac16a7836ca70ec1591659e77242f11b6368e60 SHA512 7a7a17c62ecc9ce6eaaed9d0783f161c53c5c6faa07b7b0577da5a46d4539bf3880f71e4e9097a489c045222738d0441c322fb5cef5e02a1483405f815a81b29
 EBUILD fast-stemmer-1.0.2-r3.ebuild 572 BLAKE2B 0c32b0ac21f283a34bca544c311d26c76649137c9ae72c74954e39628199eeed9cd5a5b790da94e7d99a5a032f954d069f53b7e77ae6bcef81fae8f9a7e4ebac SHA512 9f7a42d7d15b12794b60eb8aa3eaf6ce5748d3f51e6cf3d51a7c8465da073753da471fd68d4a140e13df6c5972a56209d5bc69bbb35bc22f8776bc23f3925530
+EBUILD fast-stemmer-1.0.2-r4.ebuild 563 BLAKE2B aa57ec7e404871e4e24fec402c9581c05736a90341c1a9441ec49e76426a7adab92e0b99aca9daca899417c8a25e81e23745baa2d0dfa5838ce615fe174c59e8 SHA512 0e2eced41246c467b6d592f3b5a8d38def8e677e2ae3bd6104585b13e8e7f77b75f570641b0a18a07db1afa4ad20b3cd6a780f796c30b9263904977f45dd239d
 MISC metadata.xml 348 BLAKE2B 12a6f65f842f1ddf27cf6e5c54f13287a8538683d42c0d8e2c6e91b3888f6eb0188a1ef82925e8bce96cb038e22465d43348a81393a949a92f8edb6ec82d0d82 SHA512 b5ef26aeda1ba1f5bb8607b7c7ba1f2b1db9f5a400264db96e6bb2bb1f0cb1d5aeb530f8970c5cb831c6d923741f6fc94c17cc1debce4dd91f7fa5e1dd5025d1
diff --git a/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r4.ebuild b/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r4.ebuild
new file mode 100644
index 000000000000..7840a1559e99
--- /dev/null
+++ b/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r4.ebuild
@@ -0,0 +1,27 @@
+# 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"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit 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/fast_gettext/Manifest b/dev-ruby/fast_gettext/Manifest
index b0c26cb018f8..4c38cedb2fb2 100644
--- a/dev-ruby/fast_gettext/Manifest
+++ b/dev-ruby/fast_gettext/Manifest
@@ -1,9 +1,5 @@
 DIST fast_gettext-1.8.0.tar.gz 89309 BLAKE2B 8ead2922662667c24d07dbc1145002583b1a65edd3cb581ac5bc058560aca38ed083e0470d4834cfdc5abae36f1e8264171b75649343675ab415b28ea2f0e8ab SHA512 0657b5955268166787a32bb74481cd07309018429c21707e061e022d67d5d2448d2d173149f164d16ff5f6c9ffa0feef38369b79daa299e1283fdcdc019ad72e
-DIST fast_gettext-2.0.3.tar.gz 92262 BLAKE2B ebcbb081e8197e3443c2adc0ec6d1b4c3ebc7ccc8623a857705d893aa5e17af4be367802b5feb313256e337c1f751b74b45fd71f6aa5cb2188d6b71fe52718bb SHA512 b9a51c32a8cec8700cc4dea85862b48196aa87a567c813bfa45ecddcb841afbeeac8b061ef7f95a5f6573d78311bf5504e10adee44547b78ae412080bfb258d1
-DIST fast_gettext-2.1.0.tar.gz 91241 BLAKE2B 8364ea569d8993106a97f052c96d7a66217154a6cee2ffbcfc4f54b871e9175e85a3d06e0d180e567680d8969eaa0affc93f440534b28d18e488a563751712a4 SHA512 7768e947c723efef8f625a8baa6a1ea641ee33d5a3bb579d0f39f6b47914c46da23a6e167ac7d4fa29a05691ad3789334df144820e4ff84178f0a9dad31313f9
 DIST fast_gettext-2.2.0.tar.gz 93511 BLAKE2B 8f4a8b169533194a82465ca29b4cbf52e9c724b9976355ad64459826ff9ad15da9762c6e90e237fef046fc6a8114abf54e0022eec573abf98a56bd067e7c06dd SHA512 06daacf46e4c8ef272ac2a60f8fad1abbb3eaa2bf5242991e7f32fd87e911917b6baf4965b0cbc96c11d0be0425585d501258d0c1faa065469dea6c3b8c97797
 EBUILD fast_gettext-1.8.0.ebuild 2010 BLAKE2B a86d0eb16b0f907663d736ec4b1b06b157139053c2871203eb67d32b705fa75ab7cc05c9cbeedf357b2cc5d98e9d621f4b6f2bdca9328569056f3a139c0d8319 SHA512 bd1d901b4f773a8379505d7f3523cf13660a313066b3fd83d6b3ddfc224ffffe04ffb23aa635d290190cd8ce5b433cd67b039aae1d1814bb53ce413437ded851
-EBUILD fast_gettext-2.0.3.ebuild 2202 BLAKE2B 113b8ec7d97a2a55ce9f8da0a8315f9d227f2e804e3419ea271a59ed1e9286b52274afe79b91da394b686afce66e97a6ff9631f3f267e55bbd114a5f3205e537 SHA512 b4841e80d4bd22400979ca2b0b148e2374262a5e7c6d34825a24aafce6e0092fed285bfb8e71699601f39784b13dd9054628d9b7e4808654eea2518ea8c989d7
-EBUILD fast_gettext-2.1.0.ebuild 2195 BLAKE2B af26084e3dc71f72bd17b55ae3195b4e9ab6fda3865fbb6b6d23b61883e785c9a096bfa141a687dc3d9930d23ed30ced0245dbc853c33119b72db4063039c0b2 SHA512 fed1ec95df1b7e5ba1055839e5df36a27222651f6e69c16fef604f1bcda5ed765d0b269f485fa5b089df863b496a3e9f6bcd69f9ee30a03095b7d41d0a0079fe
-EBUILD fast_gettext-2.2.0.ebuild 2202 BLAKE2B 41be7310e5808f6bc24c0c6d433fa8f55a04d1a13b5637a6b188549a6fa97059079674f20cde4c9736d06a6aa42ece48b6055518e94b2c46cccf7b0e2619ba57 SHA512 fe06aa56a4ed2e024f07b997d19f3190b3cc10519b3d5627cb528d2f871a4226285e2bab022b7e95b3b38b3a721ff421f6b6855095bd81d609ad99efb2256e13
+EBUILD fast_gettext-2.2.0.ebuild 2209 BLAKE2B 0502c21afaa161370bdc1eebb47a751515dfa4059fea7773b41fe239ac3108140828d142c8f95ee61fae970295ffd8c689e7e38768ac9668497ae76f41962aec SHA512 8a4d7d002b575025671cdbd2e5dd19a0a705ffd961e20cdb5de86071ce74a4c702a7001c01b3d7796c4912cd5b49021d1cd863e58bee9f78fb1ccd12ab10abfa
 MISC metadata.xml 347 BLAKE2B 4e31a112651c27ed99d38aa80ef658f244f365711abef6b17a30a89a39b1b86c183529aea6332260a424aa4024a43ed9502ba4ae9fd00e33218ef8ad3c9b9275 SHA512 d5284171ff8ee29ff612e0cdb406696963a90006d350e549ae09bb9d596e305b1901c6010c832f20071b91624fb5958575499b64561450e456890ddf64741ed6
diff --git a/dev-ruby/fast_gettext/fast_gettext-2.0.3.ebuild b/dev-ruby/fast_gettext/fast_gettext-2.0.3.ebuild
deleted file mode 100644
index 193ba2972e99..000000000000
--- a/dev-ruby/fast_gettext/fast_gettext-2.0.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="fast_gettext.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!"
-HOMEPAGE="https://github.com/grosser/fast_gettext"
-SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm Gemfile.lock || die
-
-	# Remove jeweler and bump from Gemfile since they are not needed for tests.
-	sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die
-	sed -i -e '/single/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/SingleCov/ s:^:#:' spec/{*,*/*}/*spec.rb || die
-
-	# Avoid unneeded dependency on git and development dependencies.
-	sed -e '/git ls-files/ s:^:#:' \
-		-e '/\(wwtd\|bump\|sqlite3\|activerecord\|i18n\|single_cov\|forking_test_runner\|rubocop\)/ s:^:#:' \
-		-e 's:require_relative ":require "./:' \
-		-i fast_gettext.gemspec || die
-
-	# Avoid a test dependency on activerecord since this is now in the
-	# dependency tree for app-admin/puppet and many arches don't have
-	# rails keyworded.
-	sed -i -e '/active_record/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/fast_gettext/translation_repository/db_spec.rb || die
-	rm -f spec/fast_gettext/storage_spec.rb || die
-	sed -i -e '/with i18n loaded/,/^  end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die
-
-	# Don't run a test that requires safe mode which we can't provide
-	# due to insecure directory settings for the portage dir. This spec
-	# also calls out to ruby which won't work with different ruby
-	# implementations.
-	sed -i -e '/can work in SAFE mode/,/^  end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Make sure the right ruby interpreter is used
-	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
-}
diff --git a/dev-ruby/fast_gettext/fast_gettext-2.1.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-2.1.0.ebuild
deleted file mode 100644
index 31d37e6b883b..000000000000
--- a/dev-ruby/fast_gettext/fast_gettext-2.1.0.ebuild
+++ /dev/null
@@ -1,60 +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_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="fast_gettext.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!"
-HOMEPAGE="https://github.com/grosser/fast_gettext"
-SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm Gemfile.lock || die
-
-	# Remove jeweler and bump from Gemfile since they are not needed for tests.
-	sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die
-	sed -i -e '/single/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/SingleCov/ s:^:#:' spec/{*,*/*}/*spec.rb || die
-
-	# Avoid unneeded dependency on git and development dependencies.
-	sed -e '/git ls-files/ s:^:#:' \
-		-e '/\(wwtd\|bump\|sqlite3\|activerecord\|i18n\|single_cov\|forking_test_runner\|rubocop\)/ s:^:#:' \
-		-e 's:require_relative ":require "./:' \
-		-i fast_gettext.gemspec || die
-
-	# Avoid a test dependency on activerecord since this is now in the
-	# dependency tree for app-admin/puppet and many arches don't have
-	# rails keyworded.
-	sed -i -e '/active_record/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/fast_gettext/translation_repository/db_spec.rb || die
-	rm -f spec/fast_gettext/storage_spec.rb || die
-	sed -i -e '/with i18n loaded/,/^  end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die
-
-	# Don't run a test that requires safe mode which we can't provide
-	# due to insecure directory settings for the portage dir. This spec
-	# also calls out to ruby which won't work with different ruby
-	# implementations.
-	sed -i -e '/can work in SAFE mode/,/^  end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Make sure the right ruby interpreter is used
-	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
-}
diff --git a/dev-ruby/fast_gettext/fast_gettext-2.2.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-2.2.0.ebuild
index 29366668c044..011935009a60 100644
--- a/dev-ruby/fast_gettext/fast_gettext-2.2.0.ebuild
+++ b/dev-ruby/fast_gettext/fast_gettext-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
diff --git a/dev-ruby/fcgi/Manifest b/dev-ruby/fcgi/Manifest
index 2e88c769065f..c7338930805f 100644
--- a/dev-ruby/fcgi/Manifest
+++ b/dev-ruby/fcgi/Manifest
@@ -1,3 +1,3 @@
 DIST fcgi-0.9.2.1.gem 15872 BLAKE2B 1f3a9cfa79f06a655bbe3ecd36be8b650f7c1f856f84f82502c87c06f43ee9c91eed75e5441c65a635c700b8c682745f631e3268701555268eb3a1568347573f SHA512 1ffdd429ce4f2bbac771b7ac2368a5194015a7327b8b43b803914257edc174235573df6bb41a53fb71db0bf179fc24ce2392b244b5b55563d67e045c47da8579
-EBUILD fcgi-0.9.2.1-r2.ebuild 578 BLAKE2B 7aadbb35a4a6b54d8f65f78ba1d9fc57d3af0604d1036261b93be8e1dbf95ba7ea5463c4c98d7be492f59590e1907b2349a0788a3c63fc3b214c6f680f4e36de SHA512 c9cde1ea34b0e1db92f5febc28cc1e53ef979e544a90760cbd7a3d4a451c67b805e9beb7383473ff00b1aacdf12e6c73b26b2697d1b94d120bba0a36dfb21c03
+EBUILD fcgi-0.9.2.1-r2.ebuild 585 BLAKE2B a1126f6bcd3f21bf198e7a881ce51f431205d3812cca29ac0ebf3a224d776890f77463c1d47aa133049e0a1a48b650d91a0719ad3c57d7dd555f461179521aac SHA512 cfa9919402f06d3ede4adb7fc3d2bf50d8574551edac7929b23ca959d86d8ffc716965b759e74a9eaa2f9171669ccfa8e2cab96c91356f51c9d98d8a5b52ff16
 MISC metadata.xml 348 BLAKE2B 44f57d6e39a30e0dd73b056ec092b2832bdc12d931c6c4d64ecc6c962f3c6c83c32ec0d3723036602fd92ae5050d7a923832909daf9575168168207176e26891 SHA512 d1e929373d07fe777e232c45efa4a98cf612b0dccb091366fb4b0aae7d78110be22992dd446d7395283b9175eba503c383555a803d4a97b67589acf369fe1330
diff --git a/dev-ruby/fcgi/fcgi-0.9.2.1-r2.ebuild b/dev-ruby/fcgi/fcgi-0.9.2.1-r2.ebuild
index 2593e4ff73b4..e3ea29b2c4cf 100644
--- a/dev-ruby/fcgi/fcgi-0.9.2.1-r2.ebuild
+++ b/dev-ruby/fcgi/fcgi-0.9.2.1-r2.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/ffaker/Manifest b/dev-ruby/ffaker/Manifest
index d1c6c5d853dc..17ce49ed6c92 100644
--- a/dev-ruby/ffaker/Manifest
+++ b/dev-ruby/ffaker/Manifest
@@ -1,11 +1,5 @@
-DIST ffaker-2.17.0.gem 438272 BLAKE2B 620abe73efeb7f076804b17129d18eef491969e13833308468faffc86fbbf5dff358ea159219b8bf78c1ad69f57e4c2d3248759be4dec7ad96de6da41f52e734 SHA512 af6a04d6e960af23962c5596d58c097b078eb43ab72fc61997b4e4c30a459ef959508e13b1bc0a7cbfa2d83dddf7b684d6bf97b69cbed1fbb0994890a3e6dd6c
-DIST ffaker-2.18.0.gem 445952 BLAKE2B 3a0d9bc201810f6055417283e821655e70d45916282e6b01530c3221826ce555ad3670ab81cc21e14739c53b3fbb2940d9eb0d45b7613e9374f10d15df138515 SHA512 d57f1baa5fa40ab8d7ac7aec21d18a2ae2611f960b2e59f2deb41c2d1319f546ed18eda0f3ba02f58c34dc80f00da2487c7ec7940cb213f55dc6c900e44ff934
-DIST ffaker-2.19.0.gem 461312 BLAKE2B d80ae70604fcd579ad42b268e6139e3395dcc10aa90e828d4ac8b402624b6391e88d25ed233db699c953feb279348de95e9f731455e10b58970069feebd72bdf SHA512 2de34cdfae50bcb460dc8fb6eb7cd5ee69034de4b66e97a408e5c6265efd9370eb3c38e5a61eefdc42b67e5e569e6ba3a1f7621ffe1a8cf6beb76fad40bf5d6e
 DIST ffaker-2.20.0.gem 461312 BLAKE2B 1e0f38b83c957407e44a25e955ffa58b848a5a88e7200087e874d8998bbe65f49be28eb428fd28796c9f1f0663da97f0970763e767e38aed9f541edd62440b63 SHA512 aa908505c771636b307f1309511f9eb489dc14b07022960ae58f25321ebae46dc6e0406ea91863acd82b02402d5ee70aa71d77fd4aa753918c6d79c690764eb8
 DIST ffaker-2.21.0.gem 463360 BLAKE2B 90742c81b719ef6930269d2b6927add981f7d001a1465b5835894acf4e627e3870123d3e0c5c9449468c2f34c1b783e625daf668d900d6956487f6036ea8da8a SHA512 bff7f36ab6c90ac66781ddf034a628323a673a13325b93f3b12b0298d4934df3d7752e512daf7c1a893378c8d66b2d3facd2d407bfabd1dd02b64944acf73a08
-EBUILD ffaker-2.17.0.ebuild 527 BLAKE2B ef36a197ea7715596a160dadb13e3f1c92ab0b7aa7abb565872bf8aec0605cfc6759eaaecf7d542e2492a3df3793b72f2fe2d5cbd244c325002e5536bcbd4fe2 SHA512 e2c7e88d226893ef8e9a4b054f5e99b13de034fcaaee45da5baa08ad801860521d9f70bb473d3b67fe5a8da6d66b03ac2bda55f68c8496c8fe613a04a1d55595
-EBUILD ffaker-2.18.0.ebuild 527 BLAKE2B 99007936ee18a985435ba157a82d79cb6c5406f2d10b55895e4b4a818d9d3f1c14b3e738fe43eb9681a2eb108f65de408fa17a71edfcdc9178a7689cf242539e SHA512 eee17304c6fc80e3b44fae6d58cccff4f1db15728828263f2f6c056ef16f0f5e75870dc1a11f2773772b272f7026633ec217c899c4340fb3c23cc9f2d91b7b9e
-EBUILD ffaker-2.19.0.ebuild 527 BLAKE2B 912549da872e6c71a5c21cc166889c56ba2d5202c761d8d4a366d390fb9190f4f4447829d5db754b217eb236e30fd0285466a6e2b87715c4571ccaef13de0df5 SHA512 01e332d8b52f720486125f4bf9d805872f84f3a864324b7aad9282dddb7913929f5ae28722a985d3c0eea4ed195ad2832600faee551f021536751f26aafa385d
 EBUILD ffaker-2.20.0.ebuild 527 BLAKE2B 912549da872e6c71a5c21cc166889c56ba2d5202c761d8d4a366d390fb9190f4f4447829d5db754b217eb236e30fd0285466a6e2b87715c4571ccaef13de0df5 SHA512 01e332d8b52f720486125f4bf9d805872f84f3a864324b7aad9282dddb7913929f5ae28722a985d3c0eea4ed195ad2832600faee551f021536751f26aafa385d
 EBUILD ffaker-2.21.0.ebuild 534 BLAKE2B cf8473958c9c1156562465daf9d90dda9481567594ea29939484ad9829f55596693038955bea23e5ad3ccac6e6beae746293ac0888ed106e16e9e5b3359b9efd SHA512 1c6e3e2cc435ca57538854ae6690a2c93a9dfd1781640ca06678d0001ca74b082bc6dd68ff8f4b41f10365251498fc25da88a594aabd39dc3ff5f257cc1d1a2e
 MISC metadata.xml 345 BLAKE2B 2800fe3f1d57e8647e5372158763dc1889bace409b761b76602dcf196eee0be685f3247997e1e76809314c28f2c4c4ce68d3db264c268c6090078f23efd8648b SHA512 6f9206b94abc4e6e40afc7db09fdf6a6e73fa31b2c9b6a784c5dcd70cf46ef66424ecb0e7396335be8645d2c029ff2c28d8d1d92c1e14c5bf6e0ebecccf9b0bd
diff --git a/dev-ruby/ffaker/ffaker-2.17.0.ebuild b/dev-ruby/ffaker/ffaker-2.17.0.ebuild
deleted file mode 100644
index 267c5520faf5..000000000000
--- a/dev-ruby/ffaker/ffaker-2.17.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Faster Faker, generates dummy data"
-HOMEPAGE="https://github.com/emmanueloga/ffaker"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	sed -i -e '/test_image_file/aomit "network"' test/test_image.rb || die
-}
diff --git a/dev-ruby/ffaker/ffaker-2.18.0.ebuild b/dev-ruby/ffaker/ffaker-2.18.0.ebuild
deleted file mode 100644
index 1073b3dfb7b9..000000000000
--- a/dev-ruby/ffaker/ffaker-2.18.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"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Faster Faker, generates dummy data"
-HOMEPAGE="https://github.com/emmanueloga/ffaker"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	sed -i -e '/test_image_file/aomit "network"' test/test_image.rb || die
-}
diff --git a/dev-ruby/ffaker/ffaker-2.19.0.ebuild b/dev-ruby/ffaker/ffaker-2.19.0.ebuild
deleted file mode 100644
index d2dfeeaaf3a1..000000000000
--- a/dev-ruby/ffaker/ffaker-2.19.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Faster Faker, generates dummy data"
-HOMEPAGE="https://github.com/emmanueloga/ffaker"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	sed -i -e '/test_image_file/aomit "network"' test/test_image.rb || die
-}
diff --git a/dev-ruby/ffi-compiler/Manifest b/dev-ruby/ffi-compiler/Manifest
index c8aa1f627a46..11e72f274646 100644
--- a/dev-ruby/ffi-compiler/Manifest
+++ b/dev-ruby/ffi-compiler/Manifest
@@ -1,3 +1,3 @@
 DIST ffi-compiler-1.0.1.gem 18432 BLAKE2B 9832d9836a0b55d3099085b53e0c8e15cc5ae79cfadadea942603ef8595b5fa4d781b5f031f0592b2688acb1416acffa9e525e3cbc004c2c51aaaea12a722706 SHA512 7a13625ab1c5748d05ec93d68708dd9435ec92dcd0c823109c44173fdaf8710aec5f5b4fb11966475f10ae91401c7ca3c620f9d36bb9ca665114e1ed70f4edd0
-EBUILD ffi-compiler-1.0.1-r1.ebuild 469 BLAKE2B 287b98550e535a112c49dfc612b11455d0ce59a7b1a3ddb868bfa238715b2c5d1e46ce32350135ddef87735ddf6467341cc1dbcdff7af7004d390e7f173e1a42 SHA512 95a49239cfc4b9e873ba6d5131861ce94aa0b273cc46733890d7a6ac284a8340e7b7ca3b36b8f05e9fe4aa86b5d078c8ece07981d8aaa9c990288cc31a7e59dc
+EBUILD ffi-compiler-1.0.1-r1.ebuild 476 BLAKE2B 74c38026898f17915585aafa81155e24cd6e93a63cd8507e86bef7ef4c01403b44035e3e4e9569110a8ae91064806095047e472fb949e81ea8f670cff95a5ea5 SHA512 05c6d8ebb4d016456840bb2366d7c5ccc65d3e8e26ee5a54a43e2f4f2e6220ec6bd53b2055b0b306446decec688f987fdd8ff1a966dc9684a16483d29df62139
 MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
diff --git a/dev-ruby/ffi-compiler/ffi-compiler-1.0.1-r1.ebuild b/dev-ruby/ffi-compiler/ffi-compiler-1.0.1-r1.ebuild
index 6ca7b935aa2a..0e36fcac82ef 100644
--- a/dev-ruby/ffi-compiler/ffi-compiler-1.0.1-r1.ebuild
+++ b/dev-ruby/ffi-compiler/ffi-compiler-1.0.1-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 24fe78dea986..354fe9d86d96 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -2,5 +2,5 @@ AUX ffi-1.14.2-32bit-long-double.patch 701 BLAKE2B d8a3f2a00f8b93f42953bf5317cf6
 DIST ffi-git-1.14.2.tgz 165100 BLAKE2B 598d1771860a7884f8dc6a4cf0006cb42f741308bdd01720d7ea4b63690d42ff6e93f2d48de7132f5d82b275b30672b0bf1ac586b713994b68e98da4cf71a481 SHA512 20fffab047d810ddea1d4d2b66a563adf5787a0602a26cc59724090d393852ae57464a8c7b5a47ca0534efc453bb06d2f8fbf00a203a7060cd3ac78b683119f5
 DIST ffi-git-1.15.5.tgz 168139 BLAKE2B 2ddd5bd7bfb7bcd39b6d740cbb1e0f4cd419ce6cb4ec12926f91f254b3f3142bc6166728a81a6f23dccfbf7aec911c63237c20fb0e2c70d30d48f4648e352585 SHA512 3668bafae936bf5010f014fbcf63258b023bcc318882775e7d2fcfc11334722ec2b6e8a8b9c910d406889fb173dd503c5c13f5af8e4f6927921f12f688461707
 EBUILD ffi-1.14.2-r1.ebuild 1635 BLAKE2B ef999eedbb4c80ef9d64e04c21f7b8abdf390bf1189fd4c24683934930323fd71cefd70d734c76e8b908473d5167463a3da73b1bfbb2d15ddbbca6f4214b30c5 SHA512 fb9af61383048819156d2a2919c487a41bc30e67a4bf6602cd6e9c9383e63ae001f8c26c3b4562bf011234c4d16b187d418ff667ac17126ac9f265dcafdfb84e
-EBUILD ffi-1.15.5.ebuild 1667 BLAKE2B d7c0a8feea68ef8767941230b199e988a08d5d78da0223a7145f3766b9c40d8eb61ba16be598ff445676db35313aa76ab96b0b9cfcec99ad3a2687fc7e3376fb SHA512 425e773f4644b570c5f4ec57a5ca525d6e9783a28a476450685f16b599d06458dcfa7fb69a3a13a5209848f9f5bb4581bb0730fa26f479f946f39c960dcb11e8
+EBUILD ffi-1.15.5.ebuild 1679 BLAKE2B 0f21e74f3843306c7416d8b11e43ec8ab279ea1f79662d50a77b8a430806d6d526ca529b13017130f05f1ce2709d3a90b8f4a8efce5231dfd96ca944a0866d5d SHA512 460791276a6e6d158e041a9b57aba47a7535095e6e4f776d8a883d5d8b7e08c61f346ca7b5cc9180d0d4143e4967043a6c96f02a097719195034b81ee4c412ce
 MISC metadata.xml 334 BLAKE2B 02ad2c909797d4aaf2a23497611777a790000683866cfbd9d12c4b19cca6de902e219584c4edc85c46b4b0dc51c63e770506a077a4c1052b46f8df19a9588c15 SHA512 e72dc6ce177ad3881f5465f10cd44ca6740b7603ab4e55cfa9e6088be3c6615abeefaee4b717e76fab2850c64d66eee626115544e10709f64c4187f1987bcfe3
diff --git a/dev-ruby/ffi/ffi-1.15.5.ebuild b/dev-ruby/ffi/ffi-1.15.5.ebuild
index 74f94884b3af..db12dcdf45b3 100644
--- a/dev-ruby/ffi/ffi-1.15.5.ebuild
+++ b/dev-ruby/ffi/ffi-1.15.5.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND+=" dev-libs/libffi:="
 DEPEND+=" dev-libs/libffi:="
diff --git a/dev-ruby/file-tail/Manifest b/dev-ruby/file-tail/Manifest
index f0bf550cf48a..347d2550747c 100644
--- a/dev-ruby/file-tail/Manifest
+++ b/dev-ruby/file-tail/Manifest
@@ -1,3 +1,3 @@
 DIST file-tail-1.2.0.gem 19968 BLAKE2B 8a9ef8b73d2e7c8c21ec04e817991ebe40ba62800e565b607dbae9732b0192074cff4b3fc9dc7a495be9a2315eab63b48126e524091d72b37f7e8261cb1333f1 SHA512 ac20e5e855144f7462ef0471be08ab56e521a7b22117f1653e06624e1d81ac11d047a21a6979476bc8547dd88d90f25e51052950148acbe3ea64bdd3c35e1da3
-EBUILD file-tail-1.2.0-r1.ebuild 820 BLAKE2B da2b97adc56e9a7165b587a6c689ebd29ef4b5d8d728f7aa2b09aa2995d50fe3394bcabf375f2ca81c5094196a8ce325ca6f0f0cb64525abedc23f9c3a5c0192 SHA512 9d745a804afec05abc1c108eee30fc49c845faf40f6a0c2baae764dab4ce76ada6c7130b41173ade8002a71af66ae795b609bac9b220b3121ed1ad856b825f83
+EBUILD file-tail-1.2.0-r1.ebuild 827 BLAKE2B 093ca0de29f9568d943fc41877a0c42fc5730f2ecdc3dcb2e79009bc4fe5759e214979d87a4c714839c3d17279f73984db9b65f60e5b2651a5d9508954ec01ee SHA512 deb8d388994b9c582e9598d1c546ec715f4fe57b7ffdb17e2339a6bb901c671e34dc067ed59007fb5d3ad8f451a754fa79b3c983ccac2c3258e366b36d4833d1
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/file-tail/file-tail-1.2.0-r1.ebuild b/dev-ruby/file-tail/file-tail-1.2.0-r1.ebuild
index 59c9c229f209..4572ac8e387d 100644
--- a/dev-ruby/file-tail/file-tail-1.2.0-r1.ebuild
+++ b/dev-ruby/file-tail/file-tail-1.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
diff --git a/dev-ruby/filesize/Manifest b/dev-ruby/filesize/Manifest
index 6d300ee315e3..283530bebb88 100644
--- a/dev-ruby/filesize/Manifest
+++ b/dev-ruby/filesize/Manifest
@@ -1,3 +1,4 @@
 DIST filesize-0.2.0.gem 8192 BLAKE2B dddf9a19712d03bed55d234f89a4d2ec9afb713ea8d2f63ad8cf9c1daf6ee9d8e6a7219dcd7c76b19a548e3d58ed4712b4c953ee1c573706ae010042c81c41d2 SHA512 87d13278e62fc6ff7ef08f9a287951a1ac3f502b69e1c3b9f5579971a2ad167875f4028a1f51f24f3bb54de38f7cb0e735ab3763bf8774ceeda68c8d3f8de42a
+EBUILD filesize-0.2.0-r1.ebuild 447 BLAKE2B af37a4e80d8a29843b58d14dc2ff63cabc089fe516db8138b9f433b07acd44e8532b98bbe55be72409b75ddb368c1351d5846e58ebb32bb8fded0d66a8807a7e SHA512 66a49947095e9acd35c063e1c4dc4d6bf88a9765e00ae461a1053cfccd692414cf19914da8384da3489fb80e8806b957470a9912fbd19ad0b614dd719a0f745d
 EBUILD filesize-0.2.0.ebuild 471 BLAKE2B b675b6d23117eb187f9392ae2684918918b9d1f7ece95188e2abdd15ddb2bb49b9ce54e361641c7563e6987844ed9bfcf06be38b7a5120426fc0f50e6e7ed3da SHA512 1ff22cfba153c381f93756af4b9825b110588f13a7e6c512e1b4e923950a35ed75c9fe7c02c7e917b8785568c7051d1aaee9409e76a2628882d434932bece648
 MISC metadata.xml 340 BLAKE2B deb5c3b256bb1138f8961c8c408e3bef3073ebee4f7d423a30387e06efaee36cf33856e4e73dbe0c8748af81befa412cf5f66bd4a9e2e7b3c0a45297bb5b24ef SHA512 1bf557a10930fbdda22e5399b932feacc68f3b99eef3ace12a083d88f9c53dfdcf5b250f75dba3ee023d2215bc1d877817ffbab2ba78b56148820ba91c9c21df
diff --git a/dev-ruby/filesize/filesize-0.2.0-r1.ebuild b/dev-ruby/filesize/filesize-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..f6d3f6f01e45
--- /dev/null
+++ b/dev-ruby/filesize/filesize-0.2.0-r1.ebuild
@@ -0,0 +1,19 @@
+# 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="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="small ruby class for handling filesizes with both the SI and binary prefixes"
+HOMEPAGE="https://github.com/dominikh/filesize"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/dev-ruby/filigree/Manifest b/dev-ruby/filigree/Manifest
index 8f202b7533e5..0ed5ab22f1f9 100644
--- a/dev-ruby/filigree/Manifest
+++ b/dev-ruby/filigree/Manifest
@@ -1,3 +1,3 @@
 DIST filigree-0.4.1.gem 31232 BLAKE2B edcffb0b98192205c19b401babc4320c6550d3683460827425269ea8090b7dc4164582d1e73fd251a6d4e21225fc0ffaeab1eb52e7ff571631981835aab9b8ea SHA512 068ada1cac6c79cbaed150ac6168951894b3d76fd82764afc6aa9322f406a26b59777b83e1deae9348b1c20cca56db36e6acedcc92446847746d923f21009b82
-EBUILD filigree-0.4.1.ebuild 452 BLAKE2B af1816807f34596b8af65741c399fd9d1388390a79a4ed0df11a776e96539f2bdea5abadfed446ab300e3a3e34cbc34f9ae6b31bb2ab1c296a9862c5fbc794aa SHA512 e568df4cac7d8cf5b51712b0ee72af72a82d936d3610f1c9301012155631361ae285bae0c31295a5fea13f64d84ea6e11fefea25e550eba2a06976a9a2fee9f9
+EBUILD filigree-0.4.1.ebuild 452 BLAKE2B b0c98b39d0a53e881a7a45c538e7999d4689ed30ea307e6ec4845a1edd5053c3ee43874b258e48724958b181af77909519a49ea707a8a17d9eef75c790c9a88b SHA512 3ddbd33f973f6ec501b12f9d43265d99431eb78d0a479d2f6ab7c1c7f5d621c5148bbea1be4e66d01148b36570e62f4a4937dcca3b5bd65477e97496640134c1
 MISC metadata.xml 347 BLAKE2B 9950d2a727afeaa0449789c52258f01f3777a95afca3da47e172612193e9801b7a467262bca3f8e82b8c1df8547ec65b9fe67cecba6faeff5303ce0d2b729686 SHA512 3c27408cc05f0d8e81b3644bbc20de9613399ade612d1244db49369f9ee66f55a0a37c3ef68b5f1e95e3883a1edad95ca6c2f2844065fc42d425e05f39d3020b
diff --git a/dev-ruby/filigree/filigree-0.4.1.ebuild b/dev-ruby/filigree/filigree-0.4.1.ebuild
index 285e80ea3849..e3c5f76a19b0 100644
--- a/dev-ruby/filigree/filigree-0.4.1.ebuild
+++ b/dev-ruby/filigree/filigree-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/font-awesome-rails/Manifest b/dev-ruby/font-awesome-rails/Manifest
index 03fbd6715b6e..62ca7a2ce305 100644
--- a/dev-ruby/font-awesome-rails/Manifest
+++ b/dev-ruby/font-awesome-rails/Manifest
@@ -1,5 +1,3 @@
-DIST font-awesome-rails-4.7.0.7.gem 638464 BLAKE2B 2cd0a992377f88ae94db8b52260e5bd14138268bb901c808ec48f615d29311326cacf3f8e3c3fe0b6b6da6c2d8383fca9933d479fd72cb42b7c57e5277694112 SHA512 15db10613b41d122b5a4632226254de018d798e951391177322abf78294b1b7ddb2a13363410dff84903d1b6624a793a8c3af0591da9bdb56232d4e585eb5149
 DIST font-awesome-rails-4.7.0.8.gem 638464 BLAKE2B 5aaea78b2f8601004f349b6a526c6e19dfd42686dbe424dac112c9ae99eabe8f09ee571cf0b07fc2b1b0221a3fdeb7a005b9e466aa281a2d85d1c71804debc0c SHA512 011d2a3f66345f5629b98b1224ace1818657447635610c5b927def5595f8dd1878d7b65e526ab6f078fb717cf44804aa989d3502072c6e341f01b75d2f7b9936
-EBUILD font-awesome-rails-4.7.0.7.ebuild 473 BLAKE2B ad1e66e71aa46de1f94a0bac17186fb43cd9c26b602ebdccceb26462b10660fb66545b34598d4211d17ed0e1134b79123fbff782168b2138c9d37809f5f3faaa SHA512 cef55f3bb2916c13b3ca98211c3410ce2d07eb6835b24db10b7b64fcbf23cb3d4c73743e61dc4453cf7329ff73c45335fb108d80039616460d5226f64d8d347d
-EBUILD font-awesome-rails-4.7.0.8.ebuild 466 BLAKE2B 54254e3ed45c29a1aef213fe5c6d0031115c7849a568bf0200d76dc44f33e574e9968be3515c14b26c8417f9e7d236d74efec38e263bdc9f3f731310176ccecb SHA512 a8b24baf5e65e85072f20cb553f5fd0ce216bc1c31bab32c243de2fb413d1e662ca300213c5df94c58009246261155fff334aaa88d2d915a3254e28b3fd1c1b4
+EBUILD font-awesome-rails-4.7.0.8.ebuild 473 BLAKE2B d28dd8c4499c9bc3d195ffd081592b0a52f82a1f96423584a7ea739a80a66afd0eb460847187439f044309c06ed6fdbfa14120231db04b69ef76cce93ca3ed4c SHA512 7f1c8bd9e3b6a8e86dc55f453c1fbed79c9bb7daac8fb844e7766912d8e38f98b98a98bf25b6dd9611e3f80f45d297f3ce063c9c8e86f0aa517578f7b77345a0
 MISC metadata.xml 403 BLAKE2B b404ef92bc36bbb37a597966a63c2835509641ae98bb26c68dcf5284581de91507a615845b1744469d8a9b73edeba734324e94d715e652786b0d9527b0a55eaf SHA512 0fb5addd2f849897f540da63e8c335618e48e37f55133e8b4499efc027493a720cab358e2979d41c50831ebed01e88e402b0a2dbb576c5e5afa489dc20f106b7
diff --git a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.7.ebuild b/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.7.ebuild
deleted file mode 100644
index 51833f152643..000000000000
--- a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.7.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"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Font-awesome for the asset pipeline"
-HOMEPAGE="https://github.com/bokmann/font-awesome-rails https://rubygems.org/gems/font-awesome-rails"
-
-LICENSE="MIT OFL"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/railties-6.2:*
-	>=dev-ruby/railties-3.2:*"
diff --git a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.8.ebuild b/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.8.ebuild
index 4e4ca50caccf..c7c5f0afb6cd 100644
--- a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.8.ebuild
+++ b/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/forgery/Manifest b/dev-ruby/forgery/Manifest
index ce60f6b6ba66..b8a781e167b5 100644
--- a/dev-ruby/forgery/Manifest
+++ b/dev-ruby/forgery/Manifest
@@ -1,3 +1,3 @@
 DIST forgery-0.8.1.gem 47616 BLAKE2B 291e7424235cdeb5a85b3f983fb6cbc9d0d2727952fcea44a538445ffe9e5da9976973389a3b4a99e73434f1522209144870c72be4b035545513f03ee3202dc6 SHA512 16f4ae810bc68d8913e527d39c68cf655e8bec750f02f5f6f8701962b455515fc9e8cb6550951e244999765f9428cb52d7eedbe1f5c7e41a55d7d749be16291a
-EBUILD forgery-0.8.1.ebuild 489 BLAKE2B 4eaecaf0f5842e0c45d0eea4fc4eeb48826bb2d50d1bc89303be51306c8895cd48dddeb593cc293d4df4fee6a80f523a6b05a12f5dce2bccb945bed9d5c25845 SHA512 f202bffd846f66d50dc3f888f7e2cf254e8f49b5445b5c25ed363489b9529355d38a6c35f8f6cd7bd1ea6980c1243af283fd73b635d32f604087a4842707f5cc
+EBUILD forgery-0.8.1.ebuild 496 BLAKE2B 8505a0f117c210e6713ff7ceee5291f2992e369743f0cab54eabe1702b9adb2badaa5febe6ed890f1624b21c8d881b422fe7b2774904dcf0154c96ab23207e83 SHA512 b333f5f5c7b94f791a5988721707bc1ef4f953c7f3e3a977e0f2a516dcd9ffa802288aaf38c6279e7107692dea06cb8f508a23385e24cfe0d212560e34ff2c23
 MISC metadata.xml 344 BLAKE2B db81e0d7f8e12e6dab9b9145e2a4133fcca937c412b6569a4d3dd71c1142fde8c7c42bfa8ea5805dd60715089df1ece23a8a61a93953fe17501851ca99d6de00 SHA512 a22592296147961a9f32a384bf397d438f1fa670f8cb69cf5426975c4285d221c730b02ea4fea82f3f5755ae8e1e959f834b75957811f8d3aea3f86897d85bf4
diff --git a/dev-ruby/forgery/forgery-0.8.1.ebuild b/dev-ruby/forgery/forgery-0.8.1.ebuild
index 29ae437b96f6..66650e553d57 100644
--- a/dev-ruby/forgery/forgery-0.8.1.ebuild
+++ b/dev-ruby/forgery/forgery-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/forwardable-extended/Manifest b/dev-ruby/forwardable-extended/Manifest
index f637a8e37a63..6a81726c271b 100644
--- a/dev-ruby/forwardable-extended/Manifest
+++ b/dev-ruby/forwardable-extended/Manifest
@@ -1,3 +1,3 @@
 DIST forwardable-extended-2.6.0.tar.gz 6602 BLAKE2B 2ad027f671bb308a02de8b0620df9b9dfdf49d08e9f6fcc6bc60becc57e3e7d184d131a2acb689d08dec26c4ec004f5791b4630ab653f974a0accdbb5f46331c SHA512 23a682e06ee823b076d6b9925a1ef4ada4f1fc7fa63b02d1b9122485204b62f55c191866170b63b34891934c762ac903df46bf5a2b17055d7504ee7a70627a8b
-EBUILD forwardable-extended-2.6.0-r2.ebuild 719 BLAKE2B 49b48255679b8f61ebac38fde1de3ad7c7376785c8c211c6df9b5ba8f36d6256d877f7c2fd78cefac189a22f608b3172c5c2e32791edf134e4966f41b87a0d1e SHA512 23f1a99e18f032169ae0ae1a96b95e293248a99309cfd8c92c92ae8aebbf12470bccebb2e248e133896a30e701febc9863d62e999fb46169a56bb2018e7f2772
+EBUILD forwardable-extended-2.6.0-r2.ebuild 726 BLAKE2B bf179f9b54d595c119907bdc374ce42ca95d73289e0bb1beb39567f3f6c150c6b3ba1a0549fc5083f380e738a9041285ee6cefaea8ed729983817fa5e647bb36 SHA512 f45d9a0e36e93eb94c3e295ec4d37b1f08c4e72db89d60b6413ac87e562efb2ff1915c797d96dec84ac74148e45f17435417dbcef1ff847336d5456ddf498901
 MISC metadata.xml 421 BLAKE2B b4c9e87b0e207ae10e0a948be511dca9e391a12d8c0040f17052d458bce237626bfc6cf154498d0cfa303450244fd4ff578d2be6afb33ba6f3c80c3e2dab7d9d SHA512 dfb262a2f8a709339cfaf90c2accaf4e1097e4c1786f005e3513a67cffd21883d9ac79f1dbaf2958cf3938bbbb970668c690c155e2041bae6d575ef671f2c213
diff --git a/dev-ruby/forwardable-extended/forwardable-extended-2.6.0-r2.ebuild b/dev-ruby/forwardable-extended/forwardable-extended-2.6.0-r2.ebuild
index 79fbcede11cb..d17d2b52e61b 100644
--- a/dev-ruby/forwardable-extended/forwardable-extended-2.6.0-r2.ebuild
+++ b/dev-ruby/forwardable-extended/forwardable-extended-2.6.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/gist/Manifest b/dev-ruby/gist/Manifest
index b3c2a39f3b32..6cf29aeebd7e 100644
--- a/dev-ruby/gist/Manifest
+++ b/dev-ruby/gist/Manifest
@@ -1,3 +1,3 @@
 DIST gist-6.0.0.gem 28160 BLAKE2B c231eb3a165fabaac104f5a3e2e10668f15ec8fdde4a5b7a925e35372854f44f0cbbe72f67f6777d42402a1b1d028c5c96d254f0860ff1cde78d39b1d15ba898 SHA512 ba1fb6636a2312c6cf598d2bdb181e354c19496266a65e097e0d27db8702c08ab5fab7744cc2a6911578ae1df0bbacb5c1e2712b18d090dedb69458ce6817cec
-EBUILD gist-6.0.0.ebuild 482 BLAKE2B aa1cbb5f30c13f551240b68b4b972f51485eaa2066590cafa10ac5310e17c97b2e6f88d4da90c839acafb14552c0050522da60fcff74739b5113c7efeb3bae4a SHA512 2d4fcb5161694e7adda0d3a1c8f8367d570cad2129674824d1cbd1ceb4abdaea8911a12f62556b6c08d5e50cc7f6ff79f64422dba095def2705b1ab3df4ff6a9
+EBUILD gist-6.0.0.ebuild 482 BLAKE2B 83bf4eb4a91385ae099b068738385cf2678391d5345a01bfb132e800e1b35bd5804a37fa0a5ef86b8e9d0f9117dd38d1954942af5e693afca5990a98e81d6eb6 SHA512 23360954728bc0dcdb93c8726923bef15028f417dc286b0441aea14d722dd975155c925ffed4b565fa5e992b0b37798bd5582e0ddeed348a006109c81d1dfbe2
 MISC metadata.xml 440 BLAKE2B f875012fbd660079390a84ca41130ba1c9a7a986ac3014cceb1b6114116a63a5b32151f32887b403d595613ff22794c44c815a23b94890fdae898a6409460e95 SHA512 c8c0dacb7d3a132f4c42be86209862e1fea973ef5974fd8e61f237728d81a2749b5a0e82a7f92d9057dd53bfa4232c7ae6d25b77e7f4760ed369c5bf7bbbabb4
diff --git a/dev-ruby/gist/gist-6.0.0.ebuild b/dev-ruby/gist/gist-6.0.0.ebuild
index ce5eb800019f..cb8d1ae3d382 100644
--- a/dev-ruby/gist/gist-6.0.0.ebuild
+++ b/dev-ruby/gist/gist-6.0.0.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="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/git/Manifest b/dev-ruby/git/Manifest
index 04b1555363f4..fd555f38cb4c 100644
--- a/dev-ruby/git/Manifest
+++ b/dev-ruby/git/Manifest
@@ -1,7 +1,5 @@
-DIST git-1.10.0.tar.gz 207412 BLAKE2B e18406a9690d4c0fc3009b57629515e701f41113592fd7533b6b2ae659b90ec1b635410deb7bcb3bd711ce291aaec2010bfcfb4bfb812b9fffdafac167d33bb9 SHA512 717ae5df3cf2b700395df91e8f6e9632062c804955c8f18215c5220ec373a33c2a991534f2a63155111643a867f45f2e7056e2dd6e297340372143770bb70021
 DIST git-1.10.2.tar.gz 212738 BLAKE2B 4059066fac1a22e8f19ecce1ebaed648fedc30767b91cb38cf9cf4c9f7091f55f5e9682183e188357dd12ed06dc1ad905d9b688db0c536623487e3c5431ba6f8 SHA512 5d8150a8f974c9b9f531d169e2899b311965a9e9d48d1e45c8bb778a48ea0887ccecf7681baf7cbfad4d22509ba0aafb9886559565e918b84f740b3da7430d86
-DIST git-1.9.1.tar.gz 206509 BLAKE2B 3f8739286f3197fa86a3fccfab357510d562415f568726126cf96c8b74c716c4fbb592f854cafda26cf2f0371e4bc9b52a9f5efdea860d0ea6836198ca48b887 SHA512 ee1df3e704b8bf0687c9fce83d73502d3d46e7f3291da90906961dda057d8e6ec3a0fda5b68c258dd8542559055f1bfabf8915a7e594edafa4b3f267f302f397
-EBUILD git-1.10.0.ebuild 1200 BLAKE2B 991615dd67fe42429b509737211c7315f46a56a3648806acae33cdd3e7740defaa01571ad2bbeb4898902efb84d03e7d19c3274134cd132e1d8e50ad3085748b SHA512 e3fd22e22c2fd9e594e7e7d77fa2c11af491cb500d7589f18a2d3f71a50b840509037fb93bdb7d027ab9eb134846d26ad3f6ead54eeeacba400c419fccf1d006
-EBUILD git-1.10.2.ebuild 1224 BLAKE2B a78685594f262c426ae6fd5aad44dfec5c2078aafd4f1c3e058dd5c6c233d8647ddb9502ecb14230c3df84f35e224344f82ecb9ea4faec07340134393499307a SHA512 6136428443fa4f501f1e388d0fecafefae6f83a61521d5fdecea854d81507ae8ae6916b36b019b7c502fc7d74df88da8bdcf80ddbe8d70e1c79bec0fa74c4a07
-EBUILD git-1.9.1.ebuild 1268 BLAKE2B 19969628ac8dffcfe08bf9da5019623bfd92d224a8bada17fc823ec6fff2c91087b6cc377804d7f6b6de5eae6558cca6847c42b4be2761c53f13d06ce8061f3c SHA512 38a51246fe194c10e8178c9fc736a622d027ad0d15da4c93957f8aff3dfd3e5e337b4c677b36e6be88bb09085a15f03b2f7230ab3ccbbf4cac3ff9d88b760f02
+DIST git-1.11.0.tar.gz 214161 BLAKE2B 69471f89fddf18bf31d74e318141046395281ba64de1f91fd49cb866508dca9cf7c568c113ed7d7e928bf1d7dfdb0e130a193d4069b87155a4dbc046d6dd6ce9 SHA512 a71da8890622b6ad5a341908e968040ef6c00e2f9edd0bfee1a0c1e9f110cc12b9c01015605b0fb902fdf04fab6011adfbffcf5e8f853c550bff7c263d2e6bd6
+EBUILD git-1.10.2.ebuild 1223 BLAKE2B a67e85fa46696d86a668a252ce204c7a889f9df5966224d889cb9ae923db9158ca1e1f7d976894a2d5db8129d446090b30c7b7fd69676e76c4c4237729befe9d SHA512 efde69da7636dfe17ac57a98a2392a043634e19302d5855dbf23163add3bb2457e7a082e11ec9a7db0ebe30e6a36dfcada61a978ca4646190ec6e4371fb4757f
+EBUILD git-1.11.0.ebuild 1231 BLAKE2B be872f7dfc58513b26870b7f0af0d7a018ec0f1247bfa2d4c7a82b00c8644afb62f64b84c4c8faf2de17f79d7d6a66c8bdae49253a492bd03fb4bf3b4846b5df SHA512 9d8ecf43ef18941de1936da1befd314a62fdaf08508c0d22b28bd8d5c2b70528a4de0e4350309b2608b25814c019d6af137230f2ae0ad35336773e7379d58d6c
 MISC metadata.xml 343 BLAKE2B bc9a79524aa9216ddb3624e81f61f8ecaf988538693155f5b8de7289effc0613a5d102b55b4c9c9eccc50d8556b0c4fdcec1e9a9cdab67d28753008204c9af2d SHA512 d599ff9d1df8510ff8603e9030a65c294bef3ee93f0e5a438300a8bb5c0ffe3c4a9bdd7ec41fd5effa27b4b7e1c978faefe95dceedc270b6a995bb928f2d70be
diff --git a/dev-ruby/git/git-1.10.2.ebuild b/dev-ruby/git/git-1.10.2.ebuild
index e8578adcddc4..d643d9294e7c 100644
--- a/dev-ruby/git/git-1.10.2.ebuild
+++ b/dev-ruby/git/git-1.10.2.ebuild
@@ -18,7 +18,7 @@ RUBY_S="ruby-git-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
diff --git a/dev-ruby/git/git-1.10.0.ebuild b/dev-ruby/git/git-1.11.0.ebuild
index 48659e920ef8..6029dfa5687c 100644
--- a/dev-ruby/git/git-1.10.0.ebuild
+++ b/dev-ruby/git/git-1.11.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
+RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
 RUBY_FAKEGEM_GEMSPEC="git.gemspec"
diff --git a/dev-ruby/git/git-1.9.1.ebuild b/dev-ruby/git/git-1.9.1.ebuild
deleted file mode 100644
index caa61b6460d3..000000000000
--- a/dev-ruby/git/git-1.9.1.ebuild
+++ /dev/null
@@ -1,42 +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="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="git.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for using Git in Ruby"
-HOMEPAGE="https://github.com/schacon/ruby-git"
-SRC_URI="https://github.com/schacon/ruby-git/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="ruby-git-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
-RDEPEND+=">=dev-vcs/git-1.6.0.0"
-
-ruby_add_rdepend ">=dev-ruby/rchardet-1.8:1"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/minitar dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Don't use hardcoded /tmp directory.
-	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
-	sed -i -e "1irequire 'pathname'" tests/test_helper.rb || die
-
-	sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	git config --global user.email "git@example.com" || die
-	git config --global user.name "GitExample" || die
-	${RUBY} -Ilib:.:test -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/globalid/Manifest b/dev-ruby/globalid/Manifest
index e60579c17f6e..fa29c003c167 100644
--- a/dev-ruby/globalid/Manifest
+++ b/dev-ruby/globalid/Manifest
@@ -1,13 +1,6 @@
-AUX globalid-0.4.2-integer-time.patch 778 BLAKE2B 5414dffd32180cc6306f26076583d804ed4c26bde10c941944647e859383516ba2cfc5f68175ad11bb97fc9098e71cd20b8dcf462c22337abd49a97bfbc6923f SHA512 2c7cbbfc3c1a8740721f85647d504d947bf9911897429ae2b006c983dc39c03bb02a11ec2e695b8c4f5157c1d78aa8a96f3800b717e37e3c2871340560170ed6
-DIST globalid-0.4.2.tar.gz 18669 BLAKE2B 7773362a16f5e3d0fec2a45e9bc768b5f22072d148bc77289c6841f24e4187f88b34bb9134f3ac086390bea5664d4cfa4281d96b0b8a3750e09e461350a0a50a SHA512 2f101601e36fdb6ba912652bbcc78a0561e0233c58d481dacbddd250ed39a1fa68a9b9c1cdadbdc708ac3147f64475fd6b68562d1ebab376fd2a517c93a23e49
-DIST globalid-0.5.1.tar.gz 18978 BLAKE2B bf13df8d8a5ce21f85c5bec3c5d0b690ceea94a51b0fbfe9bcb7dd9fe55d8abf2c5a36589147a72b6a68d1263afa130a2acff7fbe0075599e6a67fc416ac20a9 SHA512 998478876781b70cadb6c6ce0624443033f6e29ce9cb7ce145f5e3f288b7998267c63aa1b43ce0d3f7c5fc378d7e148ee11b9d88b63665fa951efb1cc72ad93e
-DIST globalid-0.5.2.tar.gz 19137 BLAKE2B 8e01b965b396aa04149f83b30066ae99a50970fb2de97c99e09c422f4ccd59325bd7697de6a0873d3876cee9e1ead7ff0715233eaa3abf03b10cc1ed7168e4af SHA512 4954b9f558048eb143d4a9d1b041dc438f5852779340e11d93840e540f1c030714da2412e9eb2777d3eaafc887cc94c43ffabdc0060cc809a033e7e6352fb4a6
 DIST globalid-0.6.0.tar.gz 20908 BLAKE2B 764d25ffb216ad73098c86aaa0ebbef412e6e97ff36beb0ad780e2613e41ed1404b1c93c27332cb3f85d29c774f243bf77caa44c179433057e92320acb8bf838 SHA512 5adc8035a10942318825c348dde8cc988255962b00d96df0f1aa7eebfa316e2637a7f5c79af559661c02837b0690e5e9c4a8cc3f4ee58ac75a6b180397485e0f
 DIST globalid-1.0.0.tar.gz 20916 BLAKE2B 4e932269cce13d319bb44ee8da878fd94d95a82badf67a8f3aa7f5c2064a401e9aaa743cbd763305de65dea242c4e8316c742a8c24e3f1a06b30a799578372f1 SHA512 228c672aa2934a726677e11a90124767f302910791153b68024aa8b44921f2ed1444903ac592c46240f19c9dae25c170405ac2a21fc269c573b066d4cd34b04d
-EBUILD globalid-0.4.2-r2.ebuild 828 BLAKE2B 1f2fb67010d33eab7831a911f7a7cbd95a056ceb214b6741c38cfa6932ab2fc4513735990c29edab19392b454fe2af9292c3f872204059d3d6c6c95d3cf0feb8 SHA512 1a38d7cf266efdd9938fcf0b739fbd67bc4bab4586fa2411a1db7d07e7f622d19ea7bc264a422f26b5cd3726a14a5861362b9e05afe4c174cd81b3b06d175c7b
-EBUILD globalid-0.5.1.ebuild 764 BLAKE2B 917ff93e91fc33e82169d2591ca885cd7ac08af8248b25b8e1867ea0e1497edfa33cf9e583e0170eb028b8434dfd4ba973f5995eaac070cbe1f8ea489ea2fbb6 SHA512 fb78487f6eb890f680bfe105c4a1c2869e01c481bdf71d5ccccd33c6a534a91e93b72647a9c99f8d6021372d8463fef1f77f6cbc27e2ef0c81e22e994d713253
-EBUILD globalid-0.5.2.ebuild 764 BLAKE2B 917ff93e91fc33e82169d2591ca885cd7ac08af8248b25b8e1867ea0e1497edfa33cf9e583e0170eb028b8434dfd4ba973f5995eaac070cbe1f8ea489ea2fbb6 SHA512 fb78487f6eb890f680bfe105c4a1c2869e01c481bdf71d5ccccd33c6a534a91e93b72647a9c99f8d6021372d8463fef1f77f6cbc27e2ef0c81e22e994d713253
 EBUILD globalid-0.6.0.ebuild 764 BLAKE2B 917ff93e91fc33e82169d2591ca885cd7ac08af8248b25b8e1867ea0e1497edfa33cf9e583e0170eb028b8434dfd4ba973f5995eaac070cbe1f8ea489ea2fbb6 SHA512 fb78487f6eb890f680bfe105c4a1c2869e01c481bdf71d5ccccd33c6a534a91e93b72647a9c99f8d6021372d8463fef1f77f6cbc27e2ef0c81e22e994d713253
-EBUILD globalid-1.0.0-r1.ebuild 759 BLAKE2B f4dd16b81b1f930dbd84c1733781980a2ed67f162df4e0ac0e9816b2b30f9a44f1d1755ec2ac3e9d944ca10b5b42b73fb6e29208f7ec9ce676a1ff7fab851cc9 SHA512 f02b10a70d9c33f5312c1efbf6038382d601b55778435f310938ea7c504db91f8b32a997b2d20efbaff85f52788a1871b1ee1b6c4f7a8660e5f89c139353a071
+EBUILD globalid-1.0.0-r1.ebuild 771 BLAKE2B 9f7640b12950f54f6a5c9d9d9e868716193c6ba8d02c2b53f2678d9979447b4cb2375a81782584986b4c8fa163e0d3fb1f58be8d97f644de2a2e6fe04f6ecc8f SHA512 05c65d1191b876d4dad02de9e06c752badbb21fbfcb52e7a1418824a7bfc094bb4435f33ecbe46030c66c066990092d4fe8fb324b5f275cf1b2f1aaa50ffb38c
 EBUILD globalid-1.0.0.ebuild 764 BLAKE2B 917ff93e91fc33e82169d2591ca885cd7ac08af8248b25b8e1867ea0e1497edfa33cf9e583e0170eb028b8434dfd4ba973f5995eaac070cbe1f8ea489ea2fbb6 SHA512 fb78487f6eb890f680bfe105c4a1c2869e01c481bdf71d5ccccd33c6a534a91e93b72647a9c99f8d6021372d8463fef1f77f6cbc27e2ef0c81e22e994d713253
 MISC metadata.xml 341 BLAKE2B e15397f0d2b0ce51ddb3da642f55ca1ed8ce12d69621757ac84ac8649108faa27948164eb1adcd1f5e1aee48b5cb2d01a2c75faf93285bb06c33841f04805600 SHA512 330c1a59a0a77ee5e02a685fb2b6884c16f99028960c308319077b2815a0b86eb4e320bbcae48fc4efadf80931da56ab2163c8b51b544d18c6aab896053c5733
diff --git a/dev-ruby/globalid/files/globalid-0.4.2-integer-time.patch b/dev-ruby/globalid/files/globalid-0.4.2-integer-time.patch
deleted file mode 100644
index 7cd1c627daf2..000000000000
--- a/dev-ruby/globalid/files/globalid-0.4.2-integer-time.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 1aec708b98d8657ef241d02813960e8af8ebd952 Mon Sep 17 00:00:00 2001
-From: Eugene Kenny <elkenny@gmail.com>
-Date: Sun, 26 Apr 2020 17:35:41 +0100
-Subject: [PATCH] Require time core extension for 1.year
-
-Since 39ab83a43a64b339739c6e8c7ab24bb1325204ed this file uses `1.year`
-without requiring the Active Support core extension that defines it.
----
- lib/global_id/railtie.rb | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/global_id/railtie.rb b/lib/global_id/railtie.rb
-index edc90d8..096c20b 100644
---- a/lib/global_id/railtie.rb
-+++ b/lib/global_id/railtie.rb
-@@ -5,6 +5,7 @@
- require 'global_id'
- require 'active_support'
- require 'active_support/core_ext/string/inflections'
-+require 'active_support/core_ext/integer/time'
- 
- class GlobalID
-   # = GlobalID Railtie
diff --git a/dev-ruby/globalid/globalid-0.4.2-r2.ebuild b/dev-ruby/globalid/globalid-0.4.2-r2.ebuild
deleted file mode 100644
index 556a7328ac76..000000000000
--- a/dev-ruby/globalid/globalid-0.4.2-r2.ebuild
+++ /dev/null
@@ -1,31 +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"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="globalid.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Reference models by URI"
-HOMEPAGE="https://github.com/rails/globalid"
-SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-integer-time.patch" )
-
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-4.2.0 >=dev-ruby/railties-4.2.0 )"
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-
-	sed -i -e '2irequire "forwardable"' test/helper.rb || die
-}
diff --git a/dev-ruby/globalid/globalid-0.5.1.ebuild b/dev-ruby/globalid/globalid-0.5.1.ebuild
deleted file mode 100644
index 8795d175a2a6..000000000000
--- a/dev-ruby/globalid/globalid-0.5.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="globalid.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Reference models by URI"
-HOMEPAGE="https://github.com/rails/globalid"
-SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-5.0 >=dev-ruby/railties-5.0 )"
-ruby_add_rdepend ">=dev-ruby/activesupport-5.0:*"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-
-	sed -i -e '2irequire "forwardable"' test/helper.rb || die
-}
diff --git a/dev-ruby/globalid/globalid-0.5.2.ebuild b/dev-ruby/globalid/globalid-0.5.2.ebuild
deleted file mode 100644
index 8795d175a2a6..000000000000
--- a/dev-ruby/globalid/globalid-0.5.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="globalid.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Reference models by URI"
-HOMEPAGE="https://github.com/rails/globalid"
-SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-5.0 >=dev-ruby/railties-5.0 )"
-ruby_add_rdepend ">=dev-ruby/activesupport-5.0:*"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-
-	sed -i -e '2irequire "forwardable"' test/helper.rb || die
-}
diff --git a/dev-ruby/globalid/globalid-1.0.0-r1.ebuild b/dev-ruby/globalid/globalid-1.0.0-r1.ebuild
index 17c165a2b331..c685e133c73d 100644
--- a/dev-ruby/globalid/globalid-1.0.0-r1.ebuild
+++ b/dev-ruby/globalid/globalid-1.0.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-5.0 >=dev-ruby/railties-5.0 )"
diff --git a/dev-ruby/gnuplot/Manifest b/dev-ruby/gnuplot/Manifest
index 3c8b66552742..f275b7fb52e1 100644
--- a/dev-ruby/gnuplot/Manifest
+++ b/dev-ruby/gnuplot/Manifest
@@ -1,3 +1,3 @@
 DIST gnuplot-2.6.2.gem 13824 BLAKE2B 5fe89c44bcfc8f73e4685fbf8300b5a43845ed8292db84bf3b21f884656a8cf29623bdef37fd4aebbb54ef1a582567fd2c12029a2e4584a92b52f66dad3b8e4f SHA512 bcc9dbdade4fdcaa590006ca925c4f1eb71b4c7d6235c948266a185c937d991ff559a1749f33993baca4437252afdfa7bde1a43c6e05dc6f180e9e7b06a4a8e6
-EBUILD gnuplot-2.6.2-r3.ebuild 742 BLAKE2B 82b1cd9d19b478710a2ac405514393dc00e49f9b86868333465e1045d99761a717fe6b7340b9c3d37b1aa00a7546084260b925ff4a05cd4f6d073eb877e0ff5e SHA512 d345c75d25e2f555094fea5c90a41692fca8760ca1d2ca41d6497509ee69ee8f1b14a810bbf7ad8417364698b0a1ab54ceff1c4f1e3e3494e723b4ad618cab38
+EBUILD gnuplot-2.6.2-r3.ebuild 749 BLAKE2B 0c3c2794455bcc0bb64c48f3fef33072882ae4c0b7b68df40bec08cb762d0238f617264c2da99309bcd5374ffc11a4d0d7992051c1c09f818693eaf0d2c1c344 SHA512 4d4386aa3fd745697e577bd9b0b387f66fb96cc42fe7e238405645b65fad5f6037c399bdfe4235c53c328ec2e95331e7d9f9adcb7850c08373469c2a1bf84c39
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/gnuplot/gnuplot-2.6.2-r3.ebuild b/dev-ruby/gnuplot/gnuplot-2.6.2-r3.ebuild
index 8db2219c84e6..b8592af4af13 100644
--- a/dev-ruby/gnuplot/gnuplot-2.6.2-r3.ebuild
+++ b/dev-ruby/gnuplot/gnuplot-2.6.2-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="AUTHORS.txt ChangeLog README.textile"
diff --git a/dev-ruby/gpgme/Manifest b/dev-ruby/gpgme/Manifest
index 913a2a119a8d..90126fb6a932 100644
--- a/dev-ruby/gpgme/Manifest
+++ b/dev-ruby/gpgme/Manifest
@@ -1,4 +1,4 @@
 DIST ruby-gpgme-2.0.20.tar.gz 2801991 BLAKE2B f5d4c58fd9ef38e0e843e3c59e9653166666ce3635cf479fcd007581b6c6c42ce7852bd36542b378e4152bd471af0131685c8a9f1024953f41832a54c477e1ac SHA512 3267cc77b57c22de3e505c34dfb0a8a4a76cda1fe6dbe547dfdb9ca1a75cf949ca75b3718fe6b6190c06dfdddf21d76b0d0a71631e53e4f439284ce7cf95f6df
 EBUILD gpgme-2.0.20-r2.ebuild 1427 BLAKE2B 631da04e3abce8b61a901c7977aa6c0934533b200d8864153ed03d81a4a84152914a9507dfd0e8f02baa5c232818378ab12c73d4bea57a08c24529157cfc317d SHA512 2bce0dd2902baa7cf2dd1f767b97359aba649235c9654068cc6954456598eaa0b15bae61334e13c2c87951957be638fa7e4e268209a12b764c09f050c66267cf
-EBUILD gpgme-2.0.20-r3.ebuild 1301 BLAKE2B 6239d7a159af4de0ed4329f90a5ed3514d3b303cbc5ac0f29b0cc50fe653f5460122b131420b6d642240fca4ec54aa945689d3384539efd38312faf5497bf874 SHA512 65b6f64a68e5625c5f77dba5784297872e216896c827d7f6f3a75a365443b0ab42eec0d35f47e7a2eb747becb9d4c2de82a9a1e87854e0f12840d1db3663e26c
+EBUILD gpgme-2.0.20-r3.ebuild 1308 BLAKE2B 1de43a9c895d114eb12c0c45dd6103f9841823bbc17f4e9cd8a70604f83df2ec52dca922d960cb7203002516e91e2979c074b69c8c6da58fe25da53e95642a4d SHA512 e3334daa7e3c319d8a39f43ff14e7ac8e847fe71e8459d14629d77711f95fc0b968c75491fc736b46589eed04ecbc1a82d5ee6b3a34931928a69bb90c53bcff9
 MISC metadata.xml 468 BLAKE2B 0ede8ab453101f97cdff99ad2f3d7412e21e4799622f242ff8771ea0761591aa26aa66f5788a8a8e00fbd42f8c42618c0d49a92a78eb0e1dc77dcb1a8a9f7c8e SHA512 9ffed8f871ca6952d5a73f4c11c79293db6a9b66dfd38431d377356c340cf1245a1176cf0531e5e3aebaedb6f75249a38015cdfac7dbd65ebf560661b659edcf
diff --git a/dev-ruby/gpgme/gpgme-2.0.20-r3.ebuild b/dev-ruby/gpgme/gpgme-2.0.20-r3.ebuild
index 3200ae3ba2e0..27438ef561db 100644
--- a/dev-ruby/gpgme/gpgme-2.0.20-r3.ebuild
+++ b/dev-ruby/gpgme/gpgme-2.0.20-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS README.rdoc"
 
diff --git a/dev-ruby/gruff/Manifest b/dev-ruby/gruff/Manifest
index e997a83e2fd4..7ce07b76164c 100644
--- a/dev-ruby/gruff/Manifest
+++ b/dev-ruby/gruff/Manifest
@@ -1,3 +1,7 @@
 DIST gruff-0.14.0.tar.gz 20193671 BLAKE2B b8cdaaca71c5b034206c4f88b1e50e09f8d9c5a3227eaa59a5c66718468ffa643509acfe8bd6919fd012a50daa27709569c210b030e25207c17a0ce13b60616f SHA512 e3c3acbce0888698e2aa92b8e86d2ada5499f394d100209b94ac4284f05a6a4f64c2bdcce91f76be7cec860d0546ebf5fa24aab73b51c0ca9763dc07855c8a68
+DIST gruff-0.15.0.tar.gz 20408532 BLAKE2B 979d027b7763a03dc98e42b195df36d8095f85118187ba63c10fb504ce5e12191691d1a512e780b95030129e2c30a6b9525a4ff3424cd2638e4fa5e42578b33f SHA512 05fadae5895340130dedf2d75a4c99852602334148c7a3179e48001abdb885d519400883067599044f660ea2ef6aded815cdef96dffda307f749af3d2e7751d0
+DIST gruff-0.16.0.tar.gz 23371113 BLAKE2B 94d83e8b410c391283e06b6bde9171851599181cc553cd0e924254c07f6ba3724a8737667f56487c7ada97b28aa4b25c97585312fbc7b70b528a492359524358 SHA512 1e4199620cb049b8e70c4462cd9ce9a4d72d3639522c97bf320e176cdd3484f632533573f6ead53b881c87ef0886461c86ec5051d470febfc9cfa26d9a012c60
 EBUILD gruff-0.14.0.ebuild 1599 BLAKE2B 5e5439740be12d01d3e86691bfc1c359e9fdc3fe13e412d3d27fbcfc6e73b31f81696d0a2da597cdc484dd42779d4ceabd74cd5d6681b8fe486cfa0d36bf3765 SHA512 2fd1fb7b239fe48ddaa6d990531a18cae93e01b365d445c6bd9d8815a98b229ac18586af797585a7e4f1d57aa5bda37c193f866bbd6117d0cf78ade274f36fc2
+EBUILD gruff-0.15.0.ebuild 1614 BLAKE2B 29ef31b0dc62069b979bd7a38a01de1684e62fb46e92b1febeb72318ab399f5d5bd6b1025e32a2d5284ac267709aac4521595912a31f385abd0e521f9dce0167 SHA512 510d3accf7dd1e6200636445588fc8ead49bec6c85a1f6acb082860379f7f6b555f929a79836461fd22579aedc92f4aa4fc2b2cee522e85c6443043b7124cf09
+EBUILD gruff-0.16.0.ebuild 1614 BLAKE2B 29ef31b0dc62069b979bd7a38a01de1684e62fb46e92b1febeb72318ab399f5d5bd6b1025e32a2d5284ac267709aac4521595912a31f385abd0e521f9dce0167 SHA512 510d3accf7dd1e6200636445588fc8ead49bec6c85a1f6acb082860379f7f6b555f929a79836461fd22579aedc92f4aa4fc2b2cee522e85c6443043b7124cf09
 MISC metadata.xml 341 BLAKE2B d27e2cd08a5540fee57b4633b95cfe34569da56bca5e4638fa799aacfdfa8ccd4f3f195ebbca6782da97734bea84ba4adb8f49f08c8ec5b6757a3867ca70dd80 SHA512 ebf3fc986abccac99d46c2d66a1480ec3d9748660c314615b180e390bc5a55d7780c28ff85280390ef0e0f219aee626cae775d44f2c2ec1cfe047157055f20f9
diff --git a/dev-ruby/gruff/gruff-0.15.0.ebuild b/dev-ruby/gruff/gruff-0.15.0.ebuild
new file mode 100644
index 000000000000..7823d71da2ac
--- /dev/null
+++ b/dev-ruby/gruff/gruff-0.15.0.ebuild
@@ -0,0 +1,53 @@
+# 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_TASK_DOC=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
+
+RUBY_FAKEGEM_GEMSPEC="gruff.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Beautiful graphs for one or multiple datasets"
+HOMEPAGE="https://github.com/topfunky/gruff"
+SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# imagemagick is an indirect dependency through rmagick. However, for
+# gruff to work properly imagemagick needs to be compiled with truetype
+# support and this cannot be expressed in the rmagick dependency. Tests
+# also require imagemagick to have jpeg and png support.
+DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
+RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
+
+ruby_add_rdepend "dev-ruby/histogram >=dev-ruby/rmagick-4.2:*"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/\(reporters\|simplecov\)/I s:^:#:' test/gruff_test_case.rb || die
+	sed -i -e '2irequire "date"' test/test_scatter.rb || die
+
+	sed -e 's/git ls-files/find . -print/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	# Skip the image comparison checks since the images are not
+	# pixel-perfect identical, most likely due to the use of a slightly
+	# different font.
+	SKIP_CHECK=true ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/gruff/gruff-0.16.0.ebuild b/dev-ruby/gruff/gruff-0.16.0.ebuild
new file mode 100644
index 000000000000..7823d71da2ac
--- /dev/null
+++ b/dev-ruby/gruff/gruff-0.16.0.ebuild
@@ -0,0 +1,53 @@
+# 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_TASK_DOC=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
+
+RUBY_FAKEGEM_GEMSPEC="gruff.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Beautiful graphs for one or multiple datasets"
+HOMEPAGE="https://github.com/topfunky/gruff"
+SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# imagemagick is an indirect dependency through rmagick. However, for
+# gruff to work properly imagemagick needs to be compiled with truetype
+# support and this cannot be expressed in the rmagick dependency. Tests
+# also require imagemagick to have jpeg and png support.
+DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
+RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
+
+ruby_add_rdepend "dev-ruby/histogram >=dev-ruby/rmagick-4.2:*"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/\(reporters\|simplecov\)/I s:^:#:' test/gruff_test_case.rb || die
+	sed -i -e '2irequire "date"' test/test_scatter.rb || die
+
+	sed -e 's/git ls-files/find . -print/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	# Skip the image comparison checks since the images are not
+	# pixel-perfect identical, most likely due to the use of a slightly
+	# different font.
+	SKIP_CHECK=true ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/haml-rails/Manifest b/dev-ruby/haml-rails/Manifest
index d00dd380ca5e..3dc361de44f7 100644
--- a/dev-ruby/haml-rails/Manifest
+++ b/dev-ruby/haml-rails/Manifest
@@ -1,3 +1,4 @@
 DIST haml-rails-2.0.1.gem 13824 BLAKE2B 24fded0f576d92083a10737954e1a32eb8e5f6a8db11fabc55ac0de3b17377419606d44f5b2e202e0733d9f538166172a6b5f7e08ee7efd71ddf7d3e7f6c9107 SHA512 7ccf9d618ca7b7c1681a063c51cf9dae9ce5e245479e3e7ba87a170ee1ba3eb35ff59061195928792f19f7e33a12ae7de3d5a36d35958e2a1761a12dc51b26d0
+EBUILD haml-rails-2.0.1-r1.ebuild 681 BLAKE2B a1660b1762b38009592c501904194284488d0e7120dadb0ab0f7af7b507d877c3a7330c3808c2db852c6c1d7ba556d03552006cb272baed5232973c09984a379 SHA512 fd335658c2e4d3598423c0b1f8731643367febf268d724d62435eda5685035a583622893b7deb6791d0686bbd421e7542c47abef5ca4737376a11c471ed47a7a
 EBUILD haml-rails-2.0.1.ebuild 681 BLAKE2B 2effc55154632fd9be2afcb0d92be42c772a3d1c9c9a574e2ecf312405116dbb1acc2bef9a57937bea0dccb097b2428faa990b0bc3eb9d0f502379b790f7f4ad SHA512 d9687bdcd397013b7c7bbf5ddb045a1c6c9932792287f74bdb19b3cfa6fb08fc6d96b7aac5941543da48d538b87a8813c8b2b24f4ebd1ab4cda373ca8a55dad9
 MISC metadata.xml 336 BLAKE2B 54d028e53b74879f0bdc03ae29e305ae196bc34e685e54a0830dd77256aef4af2da221a3881eb9c4fba54c72b5f8e04f4a30a46cca9c5138a7496e0a92ff12e3 SHA512 4f719f4c6f8e8dd8b5df5b45aee7794bdf04f6a481da70696f7b88c644ed4942cc91a74d2d0626c893209dd3577e379550fb9f799ebcd1fd3f421a925a495321
diff --git a/dev-ruby/haml-rails/haml-rails-2.0.1-r1.ebuild b/dev-ruby/haml-rails/haml-rails-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..42ee8c50bef2
--- /dev/null
+++ b/dev-ruby/haml-rails/haml-rails-2.0.1-r1.ebuild
@@ -0,0 +1,30 @@
+# 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_DOC="yard"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides Haml generators for Rails 4"
+HOMEPAGE="https://github.com/indirect/haml-rails"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/actionpack-5.1:*
+	>=dev-ruby/activesupport-5.1:*
+	>=dev-ruby/railties-5.1:*
+	>=dev-ruby/haml-4.0.6:* <dev-ruby/haml-6:*
+	>=dev-ruby/html2haml-1.0.1"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rails-5.1 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+}
diff --git a/dev-ruby/hashdiff/Manifest b/dev-ruby/hashdiff/Manifest
index b66e3d6be445..ae7f7e873471 100644
--- a/dev-ruby/hashdiff/Manifest
+++ b/dev-ruby/hashdiff/Manifest
@@ -1,3 +1,3 @@
 DIST hashdiff-1.0.1.gem 20480 BLAKE2B 9f9723bd4e3547422b185df07d314699d0381ce6526be31c821f2d213f0721f077560567c830256a3bb2873b37a2616213113257e993fc364cd72a416b77cf10 SHA512 fa6e7ad88373038341473de25b7df5e146744efb8b5613fb4da41630498e68de585e2a8d66ba86d577ded574464948234f51e662a9caa6e695c3d6a2c3b85059
-EBUILD hashdiff-1.0.1.ebuild 638 BLAKE2B 073a04bc9d18b0e3792ab0e57907835baa57bc6281b16042f9c99943800068bc4d1e73a14491b45f3818b97820e8a70ec0f2e214cbdc069fa75526a5f631ad4f SHA512 56ac22095ae9a59c27a0d09114cfaa69b476c261f72b2a11b26c7c438f00db4ad17961c7e39c27bf8eedc7864158ba3a660543070e43ad4e92d5662e37a96de6
+EBUILD hashdiff-1.0.1.ebuild 650 BLAKE2B f5ada113ca5ec36099207df971f0b2375b542ce74b6cebe6a1fdd0fdc116d0ca30212fd6c8d161be6323a1702c914e19ad0d616bc6452c2ea737aa6ec794e097 SHA512 4ed2f36a0c6dfe5cd2688d598490509482b281b681498494a9651e276e5bc99cdfaf68182a4201b8c7053e7f271e871112d564a4b6ca60b2457dc28070f63568
 MISC metadata.xml 346 BLAKE2B 0ac82bc25e38d72b83c632f6324a83a715ed5d04092b535fe7dc5dc450a979d762d482908e763283c5fdc4b6c130a5168cc653610719b4c9789680d7841952bb SHA512 b58cf79baef304504df661970bf3bd8d4f00332332bd429f0b747792256ee9947c13012b0b50cf21d694556ece2b2ee9f6019f6af67baca84f1726045c118c77
diff --git a/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild b/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild
index 7aa3f9dd4494..d47afa1f27ff 100644
--- a/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild
+++ b/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/liufengyun/hashdiff"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+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=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/hashr/Manifest b/dev-ruby/hashr/Manifest
index 265ca01f81ea..c7417a5b276b 100644
--- a/dev-ruby/hashr/Manifest
+++ b/dev-ruby/hashr/Manifest
@@ -1,3 +1,3 @@
 DIST hashr-2.0.1.gem 10240 BLAKE2B 14455589acf3ffead6aa21ee9e789fe94c60f90beb5aeb451ac68bdf3637dc4f94c58d4b287aff5835a0bde7205172bffab26e86356105786994540138288e3a SHA512 0b79b32d857b4d6352de18ebfabf51b4af610f2a889088028d938afa8f38d4a3e91f285c3c39f120e31a92373d2eb2a92386331c082810c101fd035ac32c685d
-EBUILD hashr-2.0.1-r1.ebuild 521 BLAKE2B 58aac4e102d2c58d7cffcabf086c13711c0ffdfd0aec0e47687e3bab99d6fa6d0279485a2641b2bacac1bce16990afa62cfe7936cde416db865aedeb02a26d53 SHA512 30882e8dcc0e1b2fdef09457927fbd40e9cc1988a04805a36b9fd9db3599d02b5e334707af4413d7700f14fda04e2c938104c4e320850ee16fe251ff8f58fa63
+EBUILD hashr-2.0.1-r1.ebuild 528 BLAKE2B c3398938757dfd7dd200104c684f42b3904f1551e0da13bb1c242395ff1fd90083e489a908cf889778169705bc47cd81d47d923ff6eb602ad2ff9980e25c1524 SHA512 3be43b3ba34f3712e9ef123c227ea5f5006cb45bd313e205d42f1d02b16494ee1e38d1302839b86b21f6a82a8d3a017193e404eb466c5d0bf552d2c594c19a2e
 MISC metadata.xml 342 BLAKE2B f4dfeb935ad71464715419e83a8bff4ebf196e73c163f0fae69796d56687c6afc92b59764f6a51a4019d679f5047a0e37f590fa539ee69e8576e0fa9a9aef50e SHA512 fb31a5d7cca97a3db02a1fcdbbe406796d3365bd3aec1a903a123aa768dd0519211d061c89a1254f1a69c55e247f9e3ad731030d02025bd8b4cf2a93d6398eb9
diff --git a/dev-ruby/hashr/hashr-2.0.1-r1.ebuild b/dev-ruby/hashr/hashr-2.0.1-r1.ebuild
index 1439b1e1660f..1a13831e7cf2 100644
--- a/dev-ruby/hashr/hashr-2.0.1-r1.ebuild
+++ b/dev-ruby/hashr/hashr-2.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/heredoc_unindent/Manifest b/dev-ruby/heredoc_unindent/Manifest
index e1182650ff0d..898f7b556ce6 100644
--- a/dev-ruby/heredoc_unindent/Manifest
+++ b/dev-ruby/heredoc_unindent/Manifest
@@ -1,3 +1,3 @@
 DIST heredoc_unindent-1.2.0.gem 10240 BLAKE2B 2d29e85e03b4da87277e82ad3c7f85f8c4f4063651a5e1aa9931ae257c8e3416b6feb6403ee158b2fb6bd4bb0b6fcf00a09bf688b3ba3acc76b5000639a7c248 SHA512 a975ffdc2ae3716a7fb90145270df03d6f3d45d42d3fca3125044a2b960a9c8ffc74a7fb0e315b6021cb6ce535b08207a40351573ed89c27fe0c8e196ea02c76
-EBUILD heredoc_unindent-1.2.0-r1.ebuild 769 BLAKE2B 5273d13af51f2d95fecf9ce10e8bae1fe552b2cf237cce208ac37693574e879280159479dc25b38d2c50cff1440ba12eb05e817249a91f04a5a89fd0cabb47b9 SHA512 2cf23a4dbce7b1c766b8c98c71ae62787fa088ac1f7ac2195e152351aeec924d18609750414a96e14d3397c54b16563a46b801c703603108351ed7a8e7e269ca
+EBUILD heredoc_unindent-1.2.0-r1.ebuild 769 BLAKE2B d9ea7ca0e245e63977d4e01a1612ce9289e08ec53438c4dd5a0059d56d44f5f4b1f89f28cd7138d797fcbbd951a6282d412d72a91bd80a80a7735aeddd893395 SHA512 eab88b79c54122e1d0899fc49d59aa6b861c09e7fe4f8a25ad4454c69872ba2b5e284c037ca97ee49e6269d8c2b0b39b660c212b874f391706ba853b51d8ce27
 MISC metadata.xml 356 BLAKE2B 6a6e81e9c96012b97d98e342b79246fde39928e412f8a93ec22b03edd09871d4afa0742514bb7850968b02101098fe32b5f2eb9d912c9e4a7866ffb08c8a24e3 SHA512 3c1949783344ffdad9f57e96685bd809f9edcf8e564ddb7d3dfc2ef17c525becd86f3bfb81bd701ae06e8186b35ad5cfd12fa2d664e7fd404fc31337e5e70315
diff --git a/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0-r1.ebuild b/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0-r1.ebuild
index 971c1b63f621..481efe779974 100644
--- a/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0-r1.ebuild
+++ b/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest
index 8236408ec42e..e5ed2999dfd1 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -1,7 +1,5 @@
-DIST hiera-3.6.0.gem 40960 BLAKE2B 1e49499ac5841d5fae884ffaf7ba7c72c55e3c04ee3023b2bee3e68e29d4827825e23ed4bb4a929d6337a1ff1d19dd1fbcad329495604c3171c3ab900e21b607 SHA512 6d76845e23732875c461d5b2df8599953f067ec84ea6648044e91822fea762118a108136e43ea9b7112511939978052f846d94e895b2b8f669df607fc90afbd0
-DIST hiera-3.7.0.gem 40960 BLAKE2B 2cec1e8df126da1ca3e46015192cdd428b595084461d5bca92ad561ba7e3b2be5d6837b3565031f174b5ce7fc32f80e288ed12dd3d3cd5d9f3a369b7f2cc6dae SHA512 583da6eb8fb30f9b1029861c7e539fa0e766bd3c4de06715225975d24e46f18cfea9b80f7e4f65535d22ae9bed70c29f999c160fe131aa0897dd70e61681d1b8
 DIST hiera-3.8.0.gem 40960 BLAKE2B b368ef92bca06081c99ec7e1a1e04b69f3c1cae285fcb17f9d1b89683fd679b037d2ef26af6912a776d73d3a553a8323c6820482383065927245898c9e78daa1 SHA512 0aa8d306cce33760eee9ca702f6d1f8a0137c551321c7553a25644a4097b8539945d5432e94ff83ed9c3392603dc962b33ab1e1702ed1ab5699d3ef179de9379
-EBUILD hiera-3.6.0.ebuild 516 BLAKE2B 3d9aad2111fb9119502a96d0d41336f4ae2f3fa3fabe07241469d00396617c4270c6eae2cbcf63cebee8b9264d8661167476aa180e6620783e107a42be6defb9 SHA512 319214d13ec6fd36a490cc74400b88d48a80462bda1dc2a98695e1c24fb6d5b1d98345129daab7c9cf3af7b8b9ba45adf3173a3d99ea2f347e6d58511f8d0923
-EBUILD hiera-3.7.0.ebuild 519 BLAKE2B 0e8f23e314568cc47ada810dfbe68bccd5c5818a4f422071b62cb481224d81e919bdd80d9dc3bb76b7f06e1b237feb81f5e41ae22500c8706d895dfa5730d068 SHA512 f79d15edfc2e5fd14059140162976df9512a191542bc7095189a473ff2d0ad13da9db8772f400f7d130ad75e8eec070c0fcd65c4230ea9015010e957fa2721d6
+DIST hiera-3.9.0.gem 40960 BLAKE2B 863fe37ecfda2153b5e94afde6d53893a0b5baaa10aa3bc3a939cc7df54168bbcb709f85bb50ffad11376d7434337ae3c79bc5d9fac99433da31e7dd77213004 SHA512 6ce3598e7c7a628198638a4b75a65efcc529089c7c80d7f3dfc072c26e8a65054d8bc5c71f40ce2833465ccfaa333c5490ecdfe58578532eb3455be46a69ad0e
 EBUILD hiera-3.8.0.ebuild 523 BLAKE2B 1b7a4f94b843d62acb9c728aa02a90bc61eef8f171e0a63de00900a69024f8e12b97d50576a0ab08f3e56fd1196e0e9785c6502cbb6fa61476a39e00d8c0bf05 SHA512 09ebd67149a83f9bcd406a5945bf3f0ad52d9a795dd5a8e8ce56f2e0975a0e089697c3b8c1e01defb18b864fe58690eb5c2b3e6fbb1616227a5724f5408d8550
+EBUILD hiera-3.9.0.ebuild 526 BLAKE2B 7a8644a99a46ddbdb894dbdb10d324aa69829f3f94b55d8cc1750ad9b110cc156da5ab20c9f667d33817ecf3d72a93659cee5935150e63b7b3ca2e0c97184129 SHA512 41aa0dcff4c98eb7ec80d875b2dddb43c0cef196fd509524f33b9d7b8e7523f333527620d139d9bdca4ce01d509038de84d41d853523f1a296f4010f4ef99464
 MISC metadata.xml 442 BLAKE2B 108e882fb6805ccf19e6fa6754abfe678659b6d6f7572b57ea33a96515535b61637229d9338b67631c02648565435200d09605d13c2c61febada77ea75e4941d SHA512 6fddf1ff56b57c26963b6a42f4e0552c77090dbf7a97a6076cbedec86b38c0204455c390c335b4ff1749235f1cdedbe49379bae5e65eb94340cf3103ca9e320e
diff --git a/dev-ruby/hiera/hiera-3.6.0.ebuild b/dev-ruby/hiera/hiera-3.6.0.ebuild
deleted file mode 100644
index 03029fd73800..000000000000
--- a/dev-ruby/hiera/hiera-3.6.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple pluggable Hierarchical Database"
-HOMEPAGE="https://docs.puppet.com/hiera/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-ruby_add_rdepend "dev-ruby/deep_merge"
diff --git a/dev-ruby/hiera/hiera-3.7.0.ebuild b/dev-ruby/hiera/hiera-3.9.0.ebuild
index c5967ff1b3a7..dc9baceecec1 100644
--- a/dev-ruby/hiera/hiera-3.7.0.ebuild
+++ b/dev-ruby/hiera/hiera-3.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -17,7 +17,7 @@ HOMEPAGE="https://docs.puppet.com/hiera/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 ruby_add_bdepend "test? ( dev-ruby/mocha )"
 
diff --git a/dev-ruby/highline/Manifest b/dev-ruby/highline/Manifest
index 5108fc40cfab..055ec5f2bfad 100644
--- a/dev-ruby/highline/Manifest
+++ b/dev-ruby/highline/Manifest
@@ -1,3 +1,4 @@
 DIST highline-2.0.3.tar.gz 234205 BLAKE2B 4748c3ad8a15e551162ab9f2eb6e176297d833d13e6f5db7898f99c71f25e8a2a01057b0438c5d30b56a66333bbba0da1a435cfa07db97f2ffc5e301157618ef SHA512 f432c8836040bcfb147a84efa2dd3feee7f3f6e03eafbf4232e9457aeef8cb9ca83fcf854d3b261f59a166666abc3f2c8fc0f1279a7efeb07dea8a13be22ebde
+EBUILD highline-2.0.3-r1.ebuild 1056 BLAKE2B 236a7ce6e0f8a62b2cf2383202313b9f4da7059c93d28226f84c81fdf3d41ec3608f5ef270f8be525e3c37aa02ebcca6b920414d66b15f0ab3d0b651d561b96b SHA512 e343b0bf88bbdfb7849d189e08796642402a8579eb7bdd6df711f90148c269816bbf5abbf3ef95db022f854f914ca78d0458ea0f6eebb2cdc94d798d1364c1fe
 EBUILD highline-2.0.3.ebuild 1049 BLAKE2B 509dcf60ae5800057195b83361992ad6961afd95da51437d0b57fc409fe599920aa5ccfa8abc868157c8dd097d9a03956b08b4c8831d851d89161653496ad7f6 SHA512 9a2770abddfba0d74f4228559f20571a6239030833de90f8641427dfaa9ebd01b1fd2bed8a0f3445b2fb733d7d4dc0fed320bfbd3e75ce49391d9ceba7f70288
 MISC metadata.xml 340 BLAKE2B 813c783a68e4c7222ff9315df610902cea3e8d0e67e53ad322be2195318ea8c7b55dbac205ac998116288095d70f6dfecf29955b7867ada84b0ed43b49e0563e SHA512 aa74830fff9fbf2b622c9273f5206ead32312e67b49b64b0ea4755115bcccb1750868ece26c94ce5126cb86cfcb47ee4f768a6e63242218be5ee39f411289ad7
diff --git a/dev-ruby/highline/highline-2.0.3-r1.ebuild b/dev-ruby/highline/highline-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..7c6ab702d0ab
--- /dev/null
+++ b/dev-ruby/highline/highline-2.0.3-r1.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="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md TODO"
+
+RUBY_FAKEGEM_GEMSPEC="highline.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Highline is a high-level command-line IO library for ruby"
+HOMEPAGE="https://github.com/JEG2/highline"
+SRC_URI="https://github.com/JEG2/highline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE=""
+LICENSE="|| ( GPL-2 Ruby )"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+
+all_ruby_prepare() {
+	# fix up gemspec file not to call git
+	sed -i -e 's/git ls-files -z/find * -print0/' highline.gemspec || die
+
+	# Avoid unneeded dependencies
+	sed -i -e '/\(bundler\|code_statistics\)/ s:^:#:' \
+		-e '/PackageTask/,/end/ s:^:#:' Rakefile || die
+	sed -i -e '/simplecov/ s:^:#:' test/test_helper.rb || die
+
+	# Remove almost empty doc directory to allow rdoc recipe to work
+	rm -rf doc || die
+}
diff --git a/dev-ruby/hitimes/Manifest b/dev-ruby/hitimes/Manifest
index de974e3c841a..89a7c6a38513 100644
--- a/dev-ruby/hitimes/Manifest
+++ b/dev-ruby/hitimes/Manifest
@@ -1,3 +1,4 @@
 DIST hitimes-2.0.0.gem 27136 BLAKE2B e2bab57b70d63f3b2bbe29584b7051f6c829f7957da483fd83b38ffee4d5f6a8c1af16c2ee8aa71d56ee71160e7df87a46e420d70d0430e514ead6576453fc7e SHA512 06f1c17d9914054bc17244f1a22761c98f7409cb401136e582deec18bbee07358b339ddd49ddfbc01cf9eb46bf84fbf5e2dccd6c77eb36e98c357e99687e8201
+EBUILD hitimes-2.0.0-r1.ebuild 723 BLAKE2B a3dc5e1f5036d722c0e59b59ab73a89ae6268b701e641935f18fbfbe6f1ed8f9cad53523ef6dbaae6e0b0d41d26547086e63fc85fc4042679c1aecf81d82f349 SHA512 44cdba5e20972abd005eebe22eda37c679b73b838691600223c273b14c06891abb45473265a259221357a81a79a38bccf55081e72e3382afe8f3f4b775732038
 EBUILD hitimes-2.0.0.ebuild 725 BLAKE2B 3a32a488d2d63c88e53e58c84122a17484c2df9833920fe29e4e7eb7eae97640f6716feae65e8e2cf048d1dbe5bdcbfe6b0cd0354af298db05522e291c53196d SHA512 5544921f385e687019e96db03184e39828ce30342fab10cb3796290e1d2fed5b3caba201222e148ed93520b93c1eed9c2b82396f1151f5ea7b1d54d670f5609c
 MISC metadata.xml 350 BLAKE2B 9c59e0715c5cf61cca3ab31eec1d3094f00e3e534a6ee3fad8e7c51375cd99607d11db4efa5704505b81ba1d8a91e607c55f391cf058b637b7abe31f922df90b SHA512 50ca33269b5d44cbfa209ccfeaed2c92faa4224397f2d535c243674ea39289610b6d1976ac89cbee318a0cbfa7a3cdab6f78c040a0c48c4fdf83af914b08470c
diff --git a/dev-ruby/hitimes/hitimes-2.0.0-r1.ebuild b/dev-ruby/hitimes/hitimes-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..2012f619a1b4
--- /dev/null
+++ b/dev-ruby/hitimes/hitimes-2.0.0-r1.ebuild
@@ -0,0 +1,27 @@
+# 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 HISTORY.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast, high resolution timer library"
+HOMEPAGE="https://github.com/copiousfreetime/hitimes"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e "/RUBY_VERSION >= '1.9.2'/,+4d"  spec/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:spec:. -e 'Dir["spec/*_spec.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/hocon/Manifest b/dev-ruby/hocon/Manifest
index cc65e024fe7a..567a8d4f7de8 100644
--- a/dev-ruby/hocon/Manifest
+++ b/dev-ruby/hocon/Manifest
@@ -1,4 +1,4 @@
 DIST hocon-1.3.1.tar.gz 146330 BLAKE2B 4eaa791f148347cf30cea04c79ed63fbc804a0ef7f4bdf1640da706f857a46a99342d338a8444b2df316ef972e11d5a3e10aae8d82f464b2964aa30c2086274c SHA512 c73cfd8d6c77751d1d2a35d85cad2f2eef700a01e8b8de9449c0c9dfefe8d4a80c4a79dd3db8ee4a6d2c3649f26d6780cbe05fe9b067de05ee3711b00faf4255
-EBUILD hocon-1.3.1-r1.ebuild 636 BLAKE2B ea7fd5dd6710831b6ed8ac43393a8b02611a0a91f8ef219ae3d6dcdcf55ae3247b08d1f76347bb2f22524aa6cb98f741f7aef934588db358ce6f83ead12e57b6 SHA512 43969677bcf6ae5ee0693a19239a03009367a27cf56a43a678333a910181960471c8977d7bb854491ae214ef5ee03117bfc0b2fc722ee11b3d148a7e3b268a65
+EBUILD hocon-1.3.1-r1.ebuild 643 BLAKE2B 1eccc6e6e62243b4c9f69313aa979cca38463a9480676c37d7bfa3ead1674ef9dedb54af67e32f2fe0e94e558b9b8bf55fbe088f811becd161a4c85a35eac372 SHA512 2274bbaf6901bbe7e947c479f6cced181dde48c26d1cf9d6531b6a89e89f224e05fe0f43d7c0e67ea1d0e2b3c7c859155bd326e66303d98e8fc2c6b63e2a19d2
 EBUILD hocon-1.3.1.ebuild 634 BLAKE2B f9aa887019a7247e0c280390db573321bc0d5c46264211b4e1250814cf676382cc4afb62ceeef152d3346959a451aac623d52a0d981b24844a151295fe859691 SHA512 4c204ed96e8abd87c000a23f2c099643177c0a1d2e163905017fa8daad129478ff5648f0b0aacf6b80af3f31e6423c7518faaf158fbb47ec4e2235ad48fda3e2
 MISC metadata.xml 515 BLAKE2B b9365c4720afbf0e7391467b79850bd1925b0e074b9799b9a7b8686244cb9d5b16a2740950f921bbecea176eaf925a8a9deaeed5db8e3a3ef057f55c3f41fb44 SHA512 cd21280aef08d17c83c6069c1fad07ad58f442a04136d37d6cd626cfc1528b7f44d4ac22135a405d1291e0305d9b3fb92cd26945698258581c609f487b7ecff4
diff --git a/dev-ruby/hocon/hocon-1.3.1-r1.ebuild b/dev-ruby/hocon/hocon-1.3.1-r1.ebuild
index 0781811d1c4c..4c81ca1206b6 100644
--- a/dev-ruby/hocon/hocon-1.3.1-r1.ebuild
+++ b/dev-ruby/hocon/hocon-1.3.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/htmlentities/Manifest b/dev-ruby/htmlentities/Manifest
index d233e7eb4251..ca8ea60f49e7 100644
--- a/dev-ruby/htmlentities/Manifest
+++ b/dev-ruby/htmlentities/Manifest
@@ -1,3 +1,3 @@
 DIST htmlentities-4.3.4.gem 31744 BLAKE2B 519f84a05ab8fa5cc2e7994785606b6d66a70169af7acdd9f5e2a71d08e06a29d93587175f7e13608bf2a05a21a7597cb435653282c2485aa07d89cbfb83d9f5 SHA512 0163d6c014ffebb4ee9bdb15d32884c8d6af60681f240d3f0177811d37647776b8f8fd0aa4f1c7559403f36a5538ce8da6926bc16cc8105bd6eed5c180db700b
-EBUILD htmlentities-4.3.4-r1.ebuild 512 BLAKE2B 77429b489b5c0002d6904c5fc860e6d15be352c5434c469cd6c61e32c3c03a5bb2d080f8792fd2b1dc33f3cd5ebe65ef6be2ee4e802de7f4096d7b65b3ae9cfb SHA512 29fbd68ca27247086c839e3d01a11991e1d049b9482826a1f82ba8797c1a7e59a24973a584674574f0caf8fd12abd25047d832e9b9d3c1af6710913a5bd21d66
+EBUILD htmlentities-4.3.4-r1.ebuild 519 BLAKE2B 98d6e16d019ce8bac85f14249be5d33aceae20c88316272259beb80cafa1537de21ccbabf18478cc6ce0f1036649985101e7cb474bf7202ab7acced2888918a6 SHA512 49a5b778412bb46f072781599d246ea81f50ce5c93dcbcdfe70cffa96ca5a3e08f2f0055d25e8b2860d12aac784d6ecf04f16359caddb2dcdb9d4abbb59e435b
 MISC metadata.xml 352 BLAKE2B 0c19ef93f3378c38b05804bbf83cc4d51ea504bb022ec297a2da6125c6d15fa8a834bb6e8a698c3330306e02c177df29cb01b02176cd6279f91aa240233d7d83 SHA512 fd1356cf2e0569b1a2fa07aa57e8862d5da833867a3ad4231756d496dfc836f126cc0bdca7f18dd53334411e50d188392985fc7a3d09727c2b4d8486bed1bb6f
diff --git a/dev-ruby/htmlentities/htmlentities-4.3.4-r1.ebuild b/dev-ruby/htmlentities/htmlentities-4.3.4-r1.ebuild
index c33af966f1cd..9caf8cee292b 100644
--- a/dev-ruby/htmlentities/htmlentities-4.3.4-r1.ebuild
+++ b/dev-ruby/htmlentities/htmlentities-4.3.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/http-accept/Manifest b/dev-ruby/http-accept/Manifest
index 73a762e73be8..88c00005419e 100644
--- a/dev-ruby/http-accept/Manifest
+++ b/dev-ruby/http-accept/Manifest
@@ -1,5 +1,6 @@
 DIST http-accept-1.7.0.tar.gz 12289 BLAKE2B 5eda9bd29e2dd2b52c8f2589adf57872a80aaf93c37d28b1668dc24fc1e2fa81d00ec12766dd558691dbf3e6560bba013f456a659ead47fffd77b1565c186a7f SHA512 3502bfbd07f6bb0164843c728cd5ef27adfd675317fd60372539180de212d02d6d446cff8eb081d1cbe5a19b30d5759a55b22bc63736cea83254595bd691522f
 DIST http-accept-2.1.1.tar.gz 12488 BLAKE2B b909736c0fda14b32f30c38f12f4c4c2b2bf1a36ddf753069484b6b7151d518b80a6ae8dba929e27f8f758c0c0ae0c52c24802f02b1bfd4674ca33b50d7a0de0 SHA512 e0231cae90ce9180006714485df2cf205bf1f114887dc581ea50fb558c1c7e434838d10d0c9f69c1d747249b8d0c73e628a6ea7b1ffa1ffa7059ba2447307df2
 EBUILD http-accept-1.7.0.ebuild 491 BLAKE2B 9208b766abd74a8af829261e289409beef797d91e442a1a24ccea6e47aabbe803ef848d336ebcdab9a2ad26d78a1de9b5ebbcfa3822b8868ba6e3fa1d2718ec2 SHA512 fac2c88a82cf813e2131af55a02da2fa6d07adc49a471323ee14c56584e70d76b6c84e427e56aee1a709e75574045fab1118159c0d50bac62376783ef4c4716b
+EBUILD http-accept-2.1.1-r1.ebuild 737 BLAKE2B 1fb0caeddeafe49d69f8416f9769fa67418ca0ce89f4ad12f5b893dbd7c0a7ad348a4a401823830f1a484950354faf1ee85a08e79ecb757097fa2287d32a6d49 SHA512 a14556a4bf004498fe9618d21e5a63eef7214213ea393d3251fb9aad952e14d7e48a3f24918b6f7c578539f042677d6eee73d69e4c3032fe71a9a8859897d351
 EBUILD http-accept-2.1.1.ebuild 573 BLAKE2B c20dc015ffcf0bba2befbd24baf07c7f743704700d705f3c022e85b2065284896265b68aca7c458e83e723ac74d9c57961c4cd5bd0dbfa1b2d41327ef7158fb8 SHA512 b7445cf86adbf4f0c16ebcd86804d564ac3a67f45f5746e779b657c0a97506f1496637f4dab0cb577df0432bea11bd591818ea6183dd2749856cddf4d855a7ba
 MISC metadata.xml 347 BLAKE2B 94d85022fee1a9bba34d8d2e184cb2169dd91c680c15f1d6032d6989c22b8ec5bfc4e84c6b36452ba9fbe78f420d62bdb547fbe98e736f5830ca94126ae7a4eb SHA512 0efdea66a1d6d83efd16aba20e1dd0634bff7cc6bd5570d27a4e101a5307fb358a954b4b70253e08698afefcdff81455e2a3e3bb2f9054992354dd3a863c00ef
diff --git a/dev-ruby/http-accept/http-accept-2.1.1-r1.ebuild b/dev-ruby/http-accept/http-accept-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..ac8cdf35b333
--- /dev/null
+++ b/dev-ruby/http-accept/http-accept-2.1.1-r1.ebuild
@@ -0,0 +1,27 @@
+# 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_GEMSPEC="http-accept.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse Accept and Accept-Language HTTP headers"
+HOMEPAGE="https://github.com/socketry/http-accept"
+SRC_URI="https://github.com/socketry/http-accept/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
+	sed -e "s:_relative ': './:" \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/http-cookie/Manifest b/dev-ruby/http-cookie/Manifest
index 7879abbaf188..572480c8789f 100644
--- a/dev-ruby/http-cookie/Manifest
+++ b/dev-ruby/http-cookie/Manifest
@@ -1,3 +1,3 @@
 DIST http-cookie-1.0.4.gem 39424 BLAKE2B 06ac0e667340ac17827a8eb4ed320efe77ad97509fcd444f7e77d887a77643a6b34e84486db78eba52245891d1719e750d9a446c40a4ab7804f2304b600029bd SHA512 788fdaa642e6b596e7a91c57a7942a832c09a84fed88b30fdd8e5a8ad66d72780afc1246e6c83c4dfd5af8018c278750866dd05d804aef793aa067b09519af8d
-EBUILD http-cookie-1.0.4.ebuild 668 BLAKE2B ec6c861c1b8fe22eebbdf950d014f4b7e2a97f04a382d01f97519b8e95d02f54ec33ff08efdea59a2bdef1ef6969db8f47eee0232299b55deee7177ece477c7d SHA512 deb730e041fd93efcbdb77b0d5fa77753f621d80b6b2373df547afabfe1f7f0cf133aab5f56e96e03ed62c1dc38836eccc5d614ebc9af6047c2c86d7528d6ff8
+EBUILD http-cookie-1.0.4.ebuild 681 BLAKE2B 3eefc0cfbdd305e27ffff31cabe0d85f67320f5bd658714621f33e8cf8b3c1572d36bdaad5bdab69dc4f3153b5250679ab670cd95e4977951b0b5ea879842b75 SHA512 e3aab925fc30d8607d748caf425f9ceb345b1df2321c875338c379cc26c7d613c95be99e6d9be047868a4fe3b7f00cb5d5ce5ceb2abe2ced7fe27f62bad22b9b
 MISC metadata.xml 352 BLAKE2B 0e1cc1e4cc97d4d773c64a068d2f7246c863fae1c17504f83275d1ab15e59a9bc6535c22fdf0c02d89d778079d100b74e29170b0fbe6fc1ad5464e221751a56d SHA512 821e08b75914f51a4a341149db588c8e3b17fc401a14de9abd44918b9f6bf88bc1d9c76b460a10c1b312669db478759aab90d0bb08bc04129bc8c964e7b3a314
diff --git a/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild b/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild
index 59e73b3c8893..560386b17d90 100644
--- a/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild
+++ b/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/sparklemotion/http-cookie"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/domain_name-0.5:0"
diff --git a/dev-ruby/http-parser/Manifest b/dev-ruby/http-parser/Manifest
index 34732fd6c993..3034a359613b 100644
--- a/dev-ruby/http-parser/Manifest
+++ b/dev-ruby/http-parser/Manifest
@@ -1,4 +1,4 @@
 DIST http-parser-1.2.3.gem 31232 BLAKE2B 055ab9ccb42bb85f87b65eeaa59f645ec390f0751eb379b22b1a2c83920ef1c482a3bed8f5105843c341fe92ba0c8d44272688b929bca13c690945f7e37b282f SHA512 03c34c3e8174d9010440483af34800b74a7bbddd5daa63607e6aa2254d9c91cf36d90854ea65827b32680432de278aeeb7b8878f788f124c150f163409fa5107
-EBUILD http-parser-1.2.3-r1.ebuild 736 BLAKE2B ebb3b4d9595c1f0507967e1db4c3148d4bed371763f432ea5e04a479db5c4766111a8bc54dddae8badfe64065a7a9b48ba56053f6568f81c10c6aa32c5b9fd3a SHA512 ff812c44b7d26689d7f02064408b874eff8c4f921eb6a138875ff0be680b45beb2abafb72268febf3bdf71eaa9c9a8b62ff48c7d541895ab1a8fedce3195459a
+EBUILD http-parser-1.2.3-r1.ebuild 743 BLAKE2B 207e2813378b2eabbd0b28e5a9c92b0de39babfc1fab33b7455acc4e75905e28cc4232b449221fcafc261a95c80b8cb2a43d982d586d399edd326fa351a6b1e1 SHA512 8902aec56e835ea4910a4cab2147ff76b0a4654d4b6988bc9ae597aa6fee761053df33ec174ed779ef88ede74a59b34c3d8c2d5f4ae7f395ad7a3d69fc95326c
 EBUILD http-parser-1.2.3.ebuild 654 BLAKE2B 16820a771344d1bbdfdf51b835a7adf46857891afe20ef5a74fc3e349c263c28fa6115de3ea1cfd39c369a4d9f578e9dc129bac67fc61ef878387cb49a793d25 SHA512 79b387d1a80f00574c9b21cc056435cce8cd69b9e731beb30c5749cfeb811906373560927b2f1838a5fc313a4e771675f6ea077477df7d985512fe452c72ec5e
 MISC metadata.xml 344 BLAKE2B 58d1dc89d02bfc357babce8f091539173728d149ab56a8282397b2e53c0a1683e5a4afc163cf00f8c46074326b75cb42573032a760ab2caff2d33df4118f1220 SHA512 3b5e7ea08dee2bf9fedea843558d30e202e74d178a861d4982cdd04b6bd1fdbb20754925f3f404dd5b7891dcc4f87825a42943de460283c1dc4f4adabd31906a
diff --git a/dev-ruby/http-parser/http-parser-1.2.3-r1.ebuild b/dev-ruby/http-parser/http-parser-1.2.3-r1.ebuild
index 896944c223f9..8b85b5fe20db 100644
--- a/dev-ruby/http-parser/http-parser-1.2.3-r1.ebuild
+++ b/dev-ruby/http-parser/http-parser-1.2.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/httparty/Manifest b/dev-ruby/httparty/Manifest
index 751b821cf386..5197c5286e6e 100644
--- a/dev-ruby/httparty/Manifest
+++ b/dev-ruby/httparty/Manifest
@@ -3,5 +3,5 @@ DIST httparty-0.19.0.tar.gz 101070 BLAKE2B 921858ad7d2daf080f041b08b28b69c29b01b
 DIST httparty-0.20.0.tar.gz 101975 BLAKE2B f15eb837a4bbc98de501e6dcca5a17bb0906e8ea6671c55a85d665659ab60bcee5e84d9dafad6b2450e22cedfaf5a86e10e077e52b1120ff9ae2613a1176a651 SHA512 f5770d5a64be2e80aa70334dad899fb723b08088a673a788ca1402285b77ae6b3cef21e3ed263d9618a32879711c9183f2dc82ff7b50bcf6439a8e6bb7a2eb4e
 EBUILD httparty-0.18.1.ebuild 1843 BLAKE2B aa21a61e27231d4b4326463aa0b996947e0d711b40a83b9de78b6920f60a0c4bf397e2f54b7ecf87f0ffbb2e9a021e4ee15eaff259bcd421aa2372870e156d0a SHA512 732404c9aa489e7cc6da4991141ce927ca8ca2f227eeaa1e0343d79051670e235a0309d1fdd15b4d290d68feb995e6576c4ff53ebca126f724ad37dfacace0a0
 EBUILD httparty-0.19.0.ebuild 1837 BLAKE2B 48db30ae160ae233f06f24531d3ab23e9ec9da40827367c85e8ddfcc5704e4f78da001d5edf7c71b0c6921b921d19c004120b7259d991a4d2a6eae06598c5ebe SHA512 cab1e493f603b0d9a113cfb398acd366cc36ba8322e5c9aeda1cb1dd104b0cadd26a86d3ba59d9d610ec9007e594532f46ea1f931faffe764b78c0b0bb73b532
-EBUILD httparty-0.20.0.ebuild 1837 BLAKE2B 48db30ae160ae233f06f24531d3ab23e9ec9da40827367c85e8ddfcc5704e4f78da001d5edf7c71b0c6921b921d19c004120b7259d991a4d2a6eae06598c5ebe SHA512 cab1e493f603b0d9a113cfb398acd366cc36ba8322e5c9aeda1cb1dd104b0cadd26a86d3ba59d9d610ec9007e594532f46ea1f931faffe764b78c0b0bb73b532
+EBUILD httparty-0.20.0.ebuild 1843 BLAKE2B 39644cdf447bb9f4b9f4d0a373c1477d32ccf181f37e63412bc3e59ac6d9f18e272b20b3f23eced369c03e5955e9096f78eb0c7d60b9153ce1a6fdf05cd5c7ce SHA512 d29afcfe1816b86b1693ec90106111e33cb665c5fb7f6e0f5128c38ef768102263ee9a5e0e0e5c6c79140be054f6522d9a4c1aaca3959a1cedefd2a31eb76874
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/httparty/httparty-0.20.0.ebuild b/dev-ruby/httparty/httparty-0.20.0.ebuild
index 6db437819a69..bb9bf6443921 100644
--- a/dev-ruby/httparty/httparty-0.20.0.ebuild
+++ b/dev-ruby/httparty/httparty-0.20.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/jnunemaker/httparty/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 ruby_add_rdepend 'dev-ruby/mime-types:3 >=dev-ruby/multi_xml-0.5.2'
diff --git a/dev-ruby/httpauth/Manifest b/dev-ruby/httpauth/Manifest
index 5bb60a399cc1..b188638bdbed 100644
--- a/dev-ruby/httpauth/Manifest
+++ b/dev-ruby/httpauth/Manifest
@@ -1,3 +1,3 @@
 DIST httpauth-0.2.1.tar.gz 17300 BLAKE2B 4609f35fd26b1eb8e3d17586553f5dd5555d3c676f2189f7da5ff23057438c91919cb0838fdf219f0b26682b2a08d903c7906edc9fbfa58ce9afae9e0f58a6a8 SHA512 c861089c2dc5242b86867e0a6561672361ba53ccaaf8a931c996502fc12bbce769abf3ebd7fce826cbcfbc943fc901ba1c96e8ce014333582c5d2fa2c3e56a60
-EBUILD httpauth-0.2.1-r1.ebuild 606 BLAKE2B 50599586bab0b5d1f26b0e8e13f102c34e377a11cacaa3e0f6321927b56f9ee884acfbbd4b33b4ed6acdf52e4c831071f04a84aa632567d0371c9a1cfa20b57c SHA512 4afd7cf2957170d6c219d417781c16d5ca466fb8b29e0e7ab3a133681ecb2d75ef9d85d138171f1608ba11bab8ea0b06e2fafda6c6dc527b73cefbb965e557c9
+EBUILD httpauth-0.2.1-r1.ebuild 613 BLAKE2B d17369f9161749417c8f08a94cbb261e76e2690a4f5fc0a6c1b62bcb2a25a949411140201d7148307e753de76999593572b03b0a7c43493deab67f9d9e6d4567 SHA512 a0bd4d2f3b0412dbcb3bd65b9865ceea75bcee3308f78564f9835bf679210e1327761bacad48aa9c8608a18fe3abd04ec4418cd6b6e07398387aa2e079f9906f
 MISC metadata.xml 343 BLAKE2B 6fdaf19516858157148abd4e5d16bf3a0a55b721ea4b2719c8847ece4c6288147818f3c59dd7df05d6b0c66ee8e080438cfae62ab8aec58010465aa860512b36 SHA512 b00aa235f116654ee4fa4f9422e431d9ec4840eb27dafe5005410a25782355ff2e62ae10d1eb5a07be7a85df5b17d823592dbff3426399a30fd9d5db944b6c7e
diff --git a/dev-ruby/httpauth/httpauth-0.2.1-r1.ebuild b/dev-ruby/httpauth/httpauth-0.2.1-r1.ebuild
index 9e257ddfc835..acedb9a1fbd0 100644
--- a/dev-ruby/httpauth/httpauth-0.2.1-r1.ebuild
+++ b/dev-ruby/httpauth/httpauth-0.2.1-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md TODO"
 RUBY_FAKEGEM_GEMSPEC="httpauth.gemspec"
diff --git a/dev-ruby/httpclient/Manifest b/dev-ruby/httpclient/Manifest
index 938b3b7361c0..ee60486bb219 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 2722 BLAKE2B 2efa1a0f50106a3ee376b2a7a5920293577b3a4c717108e22e54c6c596c0f66a9e45d0b08537934dc5f79956c174598095b3e697435fd8076cee33215462d394 SHA512 c8c6e10ecf5ef6cb5ec8fa3e6de0d92f5355d5fd37a519bd5bbe2afeb1f2b4317f56562c71a8ff32d3a0d10ae668509f29dd51eaf8d00c3b1b83460676babe23
+EBUILD httpclient-2.8.3-r2.ebuild 2735 BLAKE2B 6c45ebe494bf464dfb81b2fdc9d33fa21b0fa21314bea56860653868695ae3adf7c56d650643c80a25d19141108570fa5c3a56c7f92dea1d2e68397686ab2548 SHA512 292da84ac60e8b09f3844a38d9dc128a34bbb44c7d847ddc4531ba8a2c21f019b9892b463d6fe9a58cebc4f1fc9cca18833480d6f47e5fcc84de353d2342d139
 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 02735b703690..052b168dc66a 100644
--- a/dev-ruby/httpclient/httpclient-2.8.3-r2.ebuild
+++ b/dev-ruby/httpclient/httpclient-2.8.3-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/nahi/httpclient/archive/v${PV}.tar.gz -> ${P}.tgz"
 LICENSE="Ruby"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+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=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index b93936c9e1cd..302d16fd8360 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -3,7 +3,7 @@ DIST i18n-1.8.10.tar.gz 67943 BLAKE2B 58e8041f8cf652627a305e3d987ff2450913d3dc91
 DIST i18n-1.8.11.tar.gz 67964 BLAKE2B e603077c6eb02f6fd89bafd6c06f85c72528d5eb4388854f060f05a4b49a3782a3830366a1f11bd95b191048f29fae251002a34d55cb185ecefb3afc06bb2f36 SHA512 af8fcc307de9959b5a01a79ac3c99d3a3573630f8cdf91c21208e07d35d1a0db60f4995f1b77921c5374a1a19ad66770a107cc41fb29cf480d02be00bf90634a
 DIST i18n-1.8.9.tar.gz 67899 BLAKE2B 56113d0879cb644a49ef79aea892e4452b65df0769a9532af44083852ed85c5afc8ac68cd6ae4f42d4b68a5aa548f7d92cf69371685c65e4cb5e3b3a0e29445a SHA512 0dfe43bcb341c63b10ace733246c2005f1261bbed23f8f38298b0712aab5047a3ddd61aa8f42c9e0cf3dee6564b67c04595234a6dfcf95db30d9a0d044483505
 DIST i18n-1.9.1.tar.gz 68971 BLAKE2B 00fadafb96dca76f7ed180fe5af5e8b44db96262fd98868b2fad5f57a461c3abd61e17d3c8e143603108cf05a58f8a74ed8e2c8cb062d63ec4edc8081b5580c4 SHA512 661f3f62a0933188b8b09f91d816605dbd50f6afc45c54e38ae70e76f03fb428dde33070e1dde48459d0b385521535ebfff1b18323abc2a1a104c5a6097970a4
-EBUILD i18n-1.10.0.ebuild 1553 BLAKE2B cdccb34786b5b27b4d5566c41d3adc0d404f406fcf8f23b69a42e77ce5b644a24ea32dea70c72407fa74999a0afd4adfa14a591200cf2f57ca14bc5199f4596e SHA512 57b62d59088add616c797445584e8331403fb9fe74c9eab0541485bc63e7a6e88b9d8862e5e07368388ea254997c9fead9080da58af91dc3c1d17268941adff3
+EBUILD i18n-1.10.0.ebuild 1566 BLAKE2B 73a0e10519c50a7e9fe499f3d54bf9521252d16365dd77d402e24c4d4299b7fbb2ccf5ba5ceb06f9eafb927f70fac5778f287c0308655e24a1020b6670e4d586 SHA512 fb56ce7430655fbad19579e28224b1e71a655c1cdf00521495a7f8f82dc5df696532b3120e1a1c08d932ecb20657486083f6bbbe38240b0475ae784e4c4a4f62
 EBUILD i18n-1.8.10.ebuild 1580 BLAKE2B d282f7c3fe160de710586e1bf454807e4c9c5c80b25ced3c31d41b863164e917a753b2a7cbcf02621126d749f9832e92fab00323792af7bd46b1c2b199999e2f SHA512 1f90a5e3587a6da2b16679f14608d1b39d62403bd2fd1bf819e6ba07fd6e47214b17805ae557f77884a9fec67a3a4c0e01a3f0e68330e05d9768be69a53cdfb3
 EBUILD i18n-1.8.11.ebuild 1507 BLAKE2B 25c549ec71d9ab2cfb3b50c2aa8bc264fd30e6ae79d2c6b397b45d8a8b19511d6fc9305d35c62ba04f4d6a0291afcf0304e24a0e976b0ca830f0f5aabd1ed442 SHA512 f0be173922bc84b078c6bb8a3ebdacb81d18cdd38468c58da19b4df029fd1e55bfadafa52675aed4cb6badcbaf0d3c7e99c656fec0aacd19db481e2ed2c5d02e
 EBUILD i18n-1.8.9.ebuild 1571 BLAKE2B a12efebaa78afc758b65b6bd82dd0a3a9909ae9f7f11bee834f5a22bb4691ce69f671b597a9abbfc439e785a89d966be38b6f4c901d3f98c5f89af8085f5b161 SHA512 a4ae786b0b6b2bda3585285f4209044a2a8584b9ee55279fb36cb5f108988f172c81de57bb066ddf8d497e7ef489b51cf6166cc190b427bd5a7856cd3a5da4f7
diff --git a/dev-ruby/i18n/i18n-1.10.0.ebuild b/dev-ruby/i18n/i18n-1.10.0.ebuild
index 068a9b8b2368..55a83c46c854 100644
--- a/dev-ruby/i18n/i18n-1.10.0.ebuild
+++ b/dev-ruby/i18n/i18n-1.10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~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/concurrent-ruby:1"
diff --git a/dev-ruby/ice_nine/Manifest b/dev-ruby/ice_nine/Manifest
index e9c6637436f3..896d3eb78491 100644
--- a/dev-ruby/ice_nine/Manifest
+++ b/dev-ruby/ice_nine/Manifest
@@ -1,3 +1,3 @@
 DIST ice_nine-0.11.2.gem 17920 BLAKE2B d70aee3ba5d82719936e355bacd0c157fae262abb494c8d584e8530928218fb3c8a736e15903cdef2acd421fa5d08eafda11a0544651389e8b4b791299f1afca SHA512 e75237d901235dadeea159279b324982c6288d7c200ef3363eaa09340a480d5d94b8977915341218e6e2e6e439d40364f8569d757cdf47175bdc69ddb8d959ac
-EBUILD ice_nine-0.11.2-r1.ebuild 531 BLAKE2B 4c5c17e5e79aacd44baceb47fd17d02e9a16fc1bae6e06dfab50694aa7fb0970a1215620b8af758b2e5dd12f7c864bffd13c5c843cce6f6c5f650b11163473bf SHA512 0d11ff13f10b840cac3f572cbe1e38668e58a96a42b0d21b66d8c384d67965afe8d631668356901291575643073ff4d235bc6b22c9ed1159580f95d93b81632c
+EBUILD ice_nine-0.11.2-r1.ebuild 530 BLAKE2B e530b16b33a30afde263c683db6761346dbe31886d79183abe9f536d02ab284a4bdca5632149fea2ac609b625a4b85a216ed6b1ea9348dc731d50d8a8ef99bf9 SHA512 2c94afc39fd4289c4ad7d20b895f3fd4b93d5f2f5784abeb0ddbdddf9fcd6d6b9051ecff1625d583ebad9c51c6e78dd512588e8318e4c1c611ed24b9643c3a95
 MISC metadata.xml 393 BLAKE2B f9829d62ac9b4f388605f4646b8f65bf1182d79831b345a5f5b01777b71bdcceea124dd16325f268ad105cf01b0e0650681d5f3a3820220ea2521e51a2262ee7 SHA512 225f8bd9ab69b89c073285981240ca9b666fb55dfb20e05e6154393fa521540e4a440e910d9d5fdc73a3345b3fdbbc8049d5b719591b7ec83872d5556a459695
diff --git a/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild b/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
index de31db231c9a..3e2378d72f24 100644
--- a/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
+++ b/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://rubygems.org/gems/ice_nine https://github.com/dkubb/ice_nine"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 RESTRICT="test"
diff --git a/dev-ruby/imagesize/Manifest b/dev-ruby/imagesize/Manifest
index c6b736df47b7..6e2f3cbde483 100644
--- a/dev-ruby/imagesize/Manifest
+++ b/dev-ruby/imagesize/Manifest
@@ -1,3 +1,3 @@
 DIST imagesize-0.1.1_p20100902.tar.gz 77378 BLAKE2B fae6f2a8b83b3824e184b4973e901cfdc24cfa529068cc856631b8408c225eeb00c112a0f44d369a5afa35374e95682b3b7691d6c60ee5200a1ebcf669f4476b SHA512 62f0b5d1330e5cc63cccfed79e6aaa4c9de0b2d3598d241c143067c3811788bec14128d2f2465b802b91b428c239c3df272523e3026930ce26da8c7b04c2d55b
-EBUILD imagesize-0.1.1_p20100902-r2.ebuild 686 BLAKE2B 9e846801f9d45f3bea2a72b6c7d459fe50114a7eb5ae5de33936088209d17088fbb69773733fe8e98a9c93159451fc556a0623443dd31f087b3b43e73d242c66 SHA512 cd118697e9383b485191da99cc7b995d513040e614b71bddb75854aede8288f4d41055b08939de425130dd230fc29597b84fdfa32d231dbebbe04b72220f6bf0
+EBUILD imagesize-0.1.1_p20100902-r2.ebuild 693 BLAKE2B ab8c4fb89f51e82a75d250d30ff9a0e75886c7097d38a8deba3dfaef2491c9ecce7d54fc22d82853f1087994d16aff49e6d97ffdf5b6d287421ee966515dcb40 SHA512 1858fa447f7e08fa5abb278a217ecd566a5e6b61a070052a54e49b435ea970b7faaee326bdf9ef23f5ad8dee1c7625f04d38a4ddfe067e788f7b78bb81feb2d9
 MISC metadata.xml 352 BLAKE2B fe9037e5e984119c133d21502276ef17be058df932cfeda51368a194c7bf4c2327d7a9f2230a4a85d777491197d7874e331ac355334b76adc77a3453178fcc64 SHA512 2f55cd287ae3ee5b1978a66a1ed9ecd746194cd499b70560b47e9034ac432647945acfdae423c0f7cad791256d88a5c06e8d9e8642bf4dd2c96529f66c37af8a
diff --git a/dev-ruby/imagesize/imagesize-0.1.1_p20100902-r2.ebuild b/dev-ruby/imagesize/imagesize-0.1.1_p20100902-r2.ebuild
index daa1dcc6b070..ec54a3561985 100644
--- a/dev-ruby/imagesize/imagesize-0.1.1_p20100902-r2.ebuild
+++ b/dev-ruby/imagesize/imagesize-0.1.1_p20100902-r2.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.txt"
 RUBY_FAKEGEM_GEMSPEC="imagesize.gemspec"
diff --git a/dev-ruby/inflecto/Manifest b/dev-ruby/inflecto/Manifest
index 0a05e81d52af..67dffd8fc22f 100644
--- a/dev-ruby/inflecto/Manifest
+++ b/dev-ruby/inflecto/Manifest
@@ -1,4 +1,3 @@
 DIST inflecto-0.0.2.gem 16384 BLAKE2B 08c23177c02459cd37f14dc39a838d587df775aa0ade13c9c0fc93749cc669534837f865ddff85cdc5f304d0c8582b28284d35b2061eae96469783137472b617 SHA512 dbd1aa3a199365aa301d2570894e347e4f4fe6202924d6337b936ce3e5ed934e7e5c57c6c4ade42d6e0ffa43c574f3ac530ec6dccc6ad8d16b6ff96e4d057628
-EBUILD inflecto-0.0.2-r1.ebuild 377 BLAKE2B a264bb70bd49421a167d2dad879bc3dd79731581a8e0c40d22494568ece7724049c18d537ef892f8c8cd409543d3f67c10f8fa4fc9506c8bee4d8210e81c6ac1 SHA512 b25fd13c9b5faa62f930442240531c1650fc18331f24b03c362bec9287484691d59b4e427f879f43673bf55ee69530b9c736ada0eaa40eee7a75ff8e1a640a96
-EBUILD inflecto-0.0.2.ebuild 415 BLAKE2B 095f784e2f895a08503a5fb75437b3db1e6e5afc56cfe781163251050d9253b53adf909055eed5b66f58beb22fb246c2ed89b7683871b3fec4fa83942220e9f8 SHA512 70d0659630756fbc705807f8b69eb3eed1bf3195363cf78ddfe325e23fc2e6334450b6343f6dfe8e043fd4b408b3d0d29edafb20a654b6b70023ccc7dd658030
+EBUILD inflecto-0.0.2-r1.ebuild 384 BLAKE2B 0857face9d5ff49563553f043d05648c26b4a520067a1fa0508f33174845c76a14632583c6238b9e87cd28e2c3b81cc040c0b4501f82f41d88342446599e32f2 SHA512 92aead97571e28e7cd3908be8e7a516bbec231e10ade1174088a3ef5699604aa5c25e822f9a22971028a5d62702b39d181b7291e54274754dd1c81d874cf80b3
 MISC metadata.xml 339 BLAKE2B 957b22049ba3250e43adca5946fe358da641621aed39231f580db066d20ff97a084d3818dd6656cad59a497ee63c9f5ff5a267588dbb06c74f48caaa3ec79473 SHA512 269374068067fb52bad060a9e9433c3406e84b41b72cc4f10714bc0a9b7065be1fcf3d40384340fec97cb8e5f6ebbca65b7c52a24bac6d45521a64c9555e0d23
diff --git a/dev-ruby/inflecto/inflecto-0.0.2-r1.ebuild b/dev-ruby/inflecto/inflecto-0.0.2-r1.ebuild
index 95783e9f9782..9369e3d0cfdd 100644
--- a/dev-ruby/inflecto/inflecto-0.0.2-r1.ebuild
+++ b/dev-ruby/inflecto/inflecto-0.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/inflecto/inflecto-0.0.2.ebuild b/dev-ruby/inflecto/inflecto-0.0.2.ebuild
deleted file mode 100644
index 42f33dc3e1cf..000000000000
--- a/dev-ruby/inflecto/inflecto-0.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Inflector for ruby"
-HOMEPAGE="https://github.com/mbj/inflecto"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/introspection/Manifest b/dev-ruby/introspection/Manifest
index f8d755578916..822ac1068b45 100644
--- a/dev-ruby/introspection/Manifest
+++ b/dev-ruby/introspection/Manifest
@@ -1,3 +1,3 @@
 DIST introspection-0.0.4.gem 9216 BLAKE2B c97279576a60dfd74453d16a6eb0885326dad18748bd182fe3b5c2a73121553cd3ea66690841df6554fd105e50f5f6df075afb94795b94dbd7caf4615ca67764 SHA512 c228827ac9d8a82a104e78daadf038c674cd464bf726fc3bd1efa82e9d9cab37f6ee909f578585e7846378f0b755ed4d60fa119fd699f6c40188ea2de4ac7084
-EBUILD introspection-0.0.4-r1.ebuild 668 BLAKE2B 57f55bb8d37a6ec883883a6f455bde6ff03155d06ded510df97944669dd5590b25e1af7f831af5616cc42d7fb25209930b28886a6474ff1133441682c8a8f47b SHA512 759626ae2a1192a5159b54ff8596a639954bc043f5441192eda4d18057b66de55ca39814bed91ae4633348166501544abe0eccb6e96f12669f50e1e11113899d
+EBUILD introspection-0.0.4-r1.ebuild 681 BLAKE2B 18c2321b396fdacc68846c791194ae0150d1f9b7d8fa02146139ced188d6ad3f3d5aad118d42c6f0a15dca2b8dab1b084c37500cf96e3add47af3e36f11d1497 SHA512 377738711f0915fb072875d1bcbc44c16173b4bd3a71cba3d6e4917d9662f499ce6e7c4d325631e1c59f7f67d8d23ebc5182861c4b33f3af19cc004559839e71
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/introspection/introspection-0.0.4-r1.ebuild b/dev-ruby/introspection/introspection-0.0.4-r1.ebuild
index 1d86cd5f578d..c6de90be39d0 100644
--- a/dev-ruby/introspection/introspection-0.0.4-r1.ebuild
+++ b/dev-ruby/introspection/introspection-0.0.4-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://jamesmead.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/metaclass-0.0.1"
diff --git a/dev-ruby/io-wait/Manifest b/dev-ruby/io-wait/Manifest
index 22a4aa334ef7..dad868bd4723 100644
--- a/dev-ruby/io-wait/Manifest
+++ b/dev-ruby/io-wait/Manifest
@@ -1,3 +1,5 @@
 DIST io-wait-0.2.1.tar.gz 18944 BLAKE2B c77e0f839160d0129660003586f7785447e7b2e89df47d83ff6868bbdf1e667d432f0d84afb06b5bcc8f751c433da9c8bcd7b5fc0b701adbe2f10ae338dcacab SHA512 7e914ce7d6b66fabd1799567dd448124b7c1dd266bd1ce975b24a96f18c15b7dab20d2f68a7686aa8383d518783486370225b22a07fdb3c9fddae93278282427
+DIST io-wait-0.2.3.tar.gz 22171 BLAKE2B 359bf268aafcb2dcbdf59912a0973b96bf396801678a3aa2780e3bd20e8a01471404a269eaaced939e47e4e99c417eadb86f0f2bd6ccd11fc3256bb04ca05f4f SHA512 2fbea3419152cd83e411742dd074491bd78b6a077b68a2ea5d802bac671b839bb484a06654ca11f18f45deb1e33a9019dfae0a33eeda0696c1c14b05706a95ba
 EBUILD io-wait-0.2.1.ebuild 1060 BLAKE2B d08145b22f01c2c5984f8aa5ea79ed327c19e12d342c8f11917dbfb6b9778565ce8224df2f618b1043969ed858c534a54105967c120f7e188b0fe080530dfddf SHA512 6bf446257c80ac6367ecc59d9228f857f39a6debbd3709a26e7d30bef666d3891c53182c08a1bc810a9830200a8ae48a5359c7f9db551ceda4280f2753d9f728
+EBUILD io-wait-0.2.3.ebuild 1060 BLAKE2B d08145b22f01c2c5984f8aa5ea79ed327c19e12d342c8f11917dbfb6b9778565ce8224df2f618b1043969ed858c534a54105967c120f7e188b0fe080530dfddf SHA512 6bf446257c80ac6367ecc59d9228f857f39a6debbd3709a26e7d30bef666d3891c53182c08a1bc810a9830200a8ae48a5359c7f9db551ceda4280f2753d9f728
 MISC metadata.xml 339 BLAKE2B d423aeb0d4f1db2dfd5f146248ccb212ca3d7e10efa0cf52c25b384df12930a791d215e67107e88a01710d19fa394710d7c7badf44ec7ee74efd9888df2ce1ec SHA512 b4f4d2a0238fc94cf498ae975474025308cb04cc43064c2c91631534288138ebf0c7f3f398047df3fc1fd791af0d8414984c8dc49ca60f473d022b2664b57298
diff --git a/dev-ruby/io-wait/io-wait-0.2.3.ebuild b/dev-ruby/io-wait/io-wait-0.2.3.ebuild
new file mode 100644
index 000000000000..4def09c942da
--- /dev/null
+++ b/dev-ruby/io-wait/io-wait-0.2.3.ebuild
@@ -0,0 +1,32 @@
+# 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/io/wait/extconf.rb"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="io-wait.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Waits until IO is readable or writable without blocking"
+HOMEPAGE="https://github.com/ruby/io-wait"
+SRC_URI="https://github.com/ruby/io-wait/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 -e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -e '/task :test/ s:^:#:' -i Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/itextomml/Manifest b/dev-ruby/itextomml/Manifest
index f9f412de803f..d8380406377e 100644
--- a/dev-ruby/itextomml/Manifest
+++ b/dev-ruby/itextomml/Manifest
@@ -1,5 +1,3 @@
-DIST itextomml-1.6.0.gem 125952 BLAKE2B 9422d7a7f0a872dc60fce6f5d217c8c085785787d40b1f976a0f3df04f49d8de37a6fb658d8960b27f27dec03401a013b51a9ebe2446f5deecd70cfab00a7756 SHA512 cabff2d8d36cea6b280c4c928675e368e02ce346870c2d933ebb5554722e729ef7a05132776d29e4a62f0fa89ef1ad2fdd729ac97a35d7aed6da24f90de75839
 DIST itextomml-1.6.1.gem 126976 BLAKE2B f66395ebc75f57b845897c9ec3cdabd93a67fd93561ad6fa2284c449518d4da08b3d4cb20529149b006228f0200ed73d3edca23fdc6cc943e0cdb4d09a14b47c SHA512 c122562e54618a2eda090c061d4b65c3d55cbd5325eb7f9d13249959219eeed75be5e172a1d2b8bdcc30eafc7700150eff3b7b09aaa2e5b9dd143f9e5752cd8e
-EBUILD itextomml-1.6.0.ebuild 746 BLAKE2B 11cd9370b41e463ffb1cc61d02093de607c87ee081551b1c7e185ca54e792cd6d36d1d036b8cc89f817dcde19ebd7789051d2a8a30a66120bcf4b9e1c1071095 SHA512 39c429d089ca3ae5fd598a1a21661b5a4ac043d64b1b7771766e747b14a3cc8d144fdcae6f40ed9fe5c94f4006d24daaf0d0fa730e4a1d5d7eab5c333a76e86e
-EBUILD itextomml-1.6.1.ebuild 602 BLAKE2B 44474553416b9f86de8486bf4e14204e1150cb6d176c51cd53e637601e828acbb273ce1496772bd4be89c39789010ff439bbc6aa8ba8097752e4031b017581ff SHA512 2c495c2e21f1d3f2800b9eee1739ad208754f06fd980d864661b8af428913d76ae731ae555d6dbc5a088cc05e856f632275d750ca91437573d5346b76ed76e40
+EBUILD itextomml-1.6.1.ebuild 609 BLAKE2B b6a078e787f86f56f0d6392f8aba1f2dae81bc15b485159afd70f06aee98a9155ee6616c6314c14d229b082c8adc2be1496bc5bc2ee631ad3146d08c4b268ad2 SHA512 4fc2739d7d6d5c871c402bb6b837e218386c09d679bdd996ebee4e5eed4ae12eacbf9a539d3c623d659f2ff38321aa8abb48ed3320db28d24950b80bae13c511
 MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
diff --git a/dev-ruby/itextomml/itextomml-1.6.0.ebuild b/dev-ruby/itextomml/itextomml-1.6.0.ebuild
deleted file mode 100644
index e1e1d94cfb46..000000000000
--- a/dev-ruby/itextomml/itextomml-1.6.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Native Ruby bindings to itex2MML, which converts itex equations to MathML"
-HOMEPAGE="https://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
-
-LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-#Tests don't fail here
-RESTRICT="test"
-
-each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext
-	cp ext/itex2MML$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} test/test_itextomml.rb || die
-}
diff --git a/dev-ruby/itextomml/itextomml-1.6.1.ebuild b/dev-ruby/itextomml/itextomml-1.6.1.ebuild
index a6eb145fd8c5..57fb3df7e1f6 100644
--- a/dev-ruby/itextomml/itextomml-1.6.1.ebuild
+++ b/dev-ruby/itextomml/itextomml-1.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 RUBY_FAKEGEM_EXTRADOC="README"
 
 RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
diff --git a/dev-ruby/jmespath/Manifest b/dev-ruby/jmespath/Manifest
index b66861f352b7..ffdba1d052f8 100644
--- a/dev-ruby/jmespath/Manifest
+++ b/dev-ruby/jmespath/Manifest
@@ -1,9 +1,3 @@
-DIST jmespath-1.4.0.tar.gz 40899 BLAKE2B 45e52f649950b00205af6010084e009a7327600971fdf84e0569498a031e9307876e412a4491fc176724667246fe9f81317a80dd7ff6c44b7e24a135af224e01 SHA512 2b3923a5c853c527ae10ed95da49e3f4888f80ec4eec18fcec2eff16698765e6e875575994ce2fa681977fb5329b122d95cab77fb80ead3548fc26fcbfb33859
-DIST jmespath-1.5.0.tar.gz 40777 BLAKE2B b1143860b5b52835f42293ee1f61e21f1ff392b09707f6c53997f54b3ebe8c4ecc9128ee1336010bf623c2c220a6f25c3ef6796bf66cf1cf076d1fcc3ca22b80 SHA512 823404f2c5530d1888e9d9dfa22edfd42c8171a4c275f1a5965e56914c528ae0a20af8e69d62ec9876de57659f4dc8ac737c2092b1631b499c09c060bff21e36
-DIST jmespath-1.6.0.tar.gz 40503 BLAKE2B 0ee49626b7d22859cf1f6de37875c0a49de176664eaa159357473fc069a612c9431c6aa301789d38a2b1e9f8c1986c8495b2ee573c6b5a80a9bce83343ba4d8d SHA512 b7538121494b4a1048b17f6ff2aa3c30442584a4bca4b8deb0f7005c9e13c2b61b843ceb7590e47bb68fe24274b4833abc598b59e1e71991522396aa2b73fc92
 DIST jmespath-1.6.1.tar.gz 40731 BLAKE2B 004da1c19a9990f83cc7484afccf7f7c8b6924ff538a0779752a4fd2aa0d469fd7ddf975f39e50f3f3d806109d6742adbc16237dec5760c224a59e6791954529 SHA512 8c66235463f1d83a2b061e9e01b5ef0d3d12df5a034a334d3c06a919bc2049b44dd740da0297e1774300533bc9968614f3d961deb4bfe808c9221e03d6f1bbed
-EBUILD jmespath-1.4.0.ebuild 698 BLAKE2B f20fd4fc99eea671bd702295b3cbc71ad7955b3f338521c798d03ea142ce83be0fbec45f5b58b2d98c082859aae5f4ed3516a751b07cd68cde40b088ec5f15bd SHA512 b06055a765afc6d04ef8065f723f9a65d3da7cbb9ec8188aac3853570e1900b005519610b22c0ac7d84c11b18bad8b6d09395f166fe9c3a781c23c3c273383ca
-EBUILD jmespath-1.5.0.ebuild 706 BLAKE2B 710ca7ca408e988a2c5c13e71fd60c17f5e01e4b6533b2335acbf9bb458035eb8edee2dd5ed3e7ac6badd8b475a4c9cfe78a29c5b3333fd84ee0786462fa45d6 SHA512 0cf06482c19897c81530d9082338b7ebd020c120e9b3160e59f5f5078336cc43464d9846155143ba85e40db62f707f728cc728fcc018657fdef5740212e49108
-EBUILD jmespath-1.6.0.ebuild 706 BLAKE2B 710ca7ca408e988a2c5c13e71fd60c17f5e01e4b6533b2335acbf9bb458035eb8edee2dd5ed3e7ac6badd8b475a4c9cfe78a29c5b3333fd84ee0786462fa45d6 SHA512 0cf06482c19897c81530d9082338b7ebd020c120e9b3160e59f5f5078336cc43464d9846155143ba85e40db62f707f728cc728fcc018657fdef5740212e49108
-EBUILD jmespath-1.6.1.ebuild 706 BLAKE2B 710ca7ca408e988a2c5c13e71fd60c17f5e01e4b6533b2335acbf9bb458035eb8edee2dd5ed3e7ac6badd8b475a4c9cfe78a29c5b3333fd84ee0786462fa45d6 SHA512 0cf06482c19897c81530d9082338b7ebd020c120e9b3160e59f5f5078336cc43464d9846155143ba85e40db62f707f728cc728fcc018657fdef5740212e49108
+EBUILD jmespath-1.6.1.ebuild 713 BLAKE2B db6c14b1bc742d24a0fd32ee99d849463a8cec40408445b2b680a526e924748c24bd8e03a12ff38841d70e5557f41ae3a3daab3718e3ed707f32862cc30009e3 SHA512 f114c63d6b0820ec312aa6aeaaf832144a6a07e988af506c2f2a43e37daca04e27d1288763d55d97daafe1f8737e77c713d0115371378b2c3c8370110f11bec9
 MISC metadata.xml 347 BLAKE2B 7219b16d2eb4568aff52005110e3c7ddc5c5375f64e8abff8a6d95ec52cf3dba44788a5a08ec73214bd3871a26a9944b501eb6fa42860d98cdeeb864f0197c66 SHA512 ffc19d6bba336d9abeb22a069170b684cb585072f14ac035270e3c14199eec963162b3e0d7a5545c10339fbb97347e1ac91900f2f963c151b3a2f00bab43c869
diff --git a/dev-ruby/jmespath/jmespath-1.4.0.ebuild b/dev-ruby/jmespath/jmespath-1.4.0.ebuild
deleted file mode 100644
index f513fd5c7b90..000000000000
--- a/dev-ruby/jmespath/jmespath-1.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements JMESPath for Ruby"
-HOMEPAGE="https://github.com/jmespath/jmespath.rb"
-SRC_URI="https://github.com/jmespath/jmespath.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}.rb-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' \
-		spec/{compliance_spec,compliance_without_errors_spec,spec_helper}.rb || die
-	sed -i -e '/bundler/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/jmespath/jmespath-1.5.0.ebuild b/dev-ruby/jmespath/jmespath-1.5.0.ebuild
deleted file mode 100644
index b640b015b668..000000000000
--- a/dev-ruby/jmespath/jmespath-1.5.0.ebuild
+++ /dev/null
@@ -1,26 +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_GEMSPEC="jmespath.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements JMESPath for Ruby"
-HOMEPAGE="https://github.com/jmespath/jmespath.rb"
-SRC_URI="https://github.com/jmespath/jmespath.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}.rb-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' \
-		spec/{compliance_spec,compliance_without_errors_spec,spec_helper}.rb || die
-	sed -i -e '/bundler/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/jmespath/jmespath-1.6.0.ebuild b/dev-ruby/jmespath/jmespath-1.6.0.ebuild
deleted file mode 100644
index b640b015b668..000000000000
--- a/dev-ruby/jmespath/jmespath-1.6.0.ebuild
+++ /dev/null
@@ -1,26 +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_GEMSPEC="jmespath.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements JMESPath for Ruby"
-HOMEPAGE="https://github.com/jmespath/jmespath.rb"
-SRC_URI="https://github.com/jmespath/jmespath.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}.rb-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' \
-		spec/{compliance_spec,compliance_without_errors_spec,spec_helper}.rb || die
-	sed -i -e '/bundler/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/jmespath/jmespath-1.6.1.ebuild b/dev-ruby/jmespath/jmespath-1.6.1.ebuild
index b640b015b668..d79916ac6658 100644
--- a/dev-ruby/jmespath/jmespath-1.6.1.ebuild
+++ b/dev-ruby/jmespath/jmespath-1.6.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_GEMSPEC="jmespath.gemspec"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/jquery-rails/Manifest b/dev-ruby/jquery-rails/Manifest
index 2052a87c1660..87fd834ecdd7 100644
--- a/dev-ruby/jquery-rails/Manifest
+++ b/dev-ruby/jquery-rails/Manifest
@@ -1,3 +1,4 @@
 DIST jquery-rails-4.4.0.gem 526336 BLAKE2B d6a498424fd89ed575fe778a91ba199eb81fe7c98ac042df8602d0fd680305543d8bb1c1a663d12cf696ec50e1196c59b068051c4bf34b0e3b321cc3ea898bdf SHA512 af363fe81f9689ccb7effd8a755368245b14fdbc67e14698c7dc48e69e18b731e1c65ceefedf86638d6dca6378d21c3175b02f16f6c03bd76c45494c1d0e5eab
+EBUILD jquery-rails-4.4.0-r1.ebuild 738 BLAKE2B c6d73a8b0b762225af4ee9676a03019fd846a0947ab86498db8c650e1b4ac1ed620a8414d3b048d238f38d4664b6ae53f263c127d6c6c54bcbc6599288aa6da2 SHA512 f7de27c9d4400ba0f8e476937d56601feb6b39c712c0320ab2b96817b946bb76db32091c3dfa301f75a615799232ac0cdb84e7d1a80542fa54b74783c0987d8f
 EBUILD jquery-rails-4.4.0.ebuild 738 BLAKE2B e64452fb75fcab60311dcea4a119765699d03f62867e1e20a9f4ae625ef3303bcd36f7e19c470a0d11c322c4da38772174cf8d7a0f51f344bce393db86ea4d26 SHA512 7fcc603ee7b92b846a6d501232e134c087288b9b26a691356a46b74b483ae73bb18c7b98d3741d18cc67e5b41e893dae8062751f3a841fd729e697e90c6be1d7
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/jquery-rails/jquery-rails-4.4.0-r1.ebuild b/dev-ruby/jquery-rails/jquery-rails-4.4.0-r1.ebuild
new file mode 100644
index 000000000000..975df6d4e710
--- /dev/null
+++ b/dev-ruby/jquery-rails/jquery-rails-4.4.0-r1.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="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md VERSIONS.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+RUBY_FAKEGEM_GEMSPEC="jquery-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="jQuery! For Rails! So great"
+HOMEPAGE="https://www.rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/railties-4.2.0:*
+	>=dev-ruby/thor-0.14:* <dev-ruby/thor-2:*
+	dev-ruby/rails-dom-testing:2"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' jquery-rails.gemspec || die
+}
diff --git a/dev-ruby/jquery-ui-rails/Manifest b/dev-ruby/jquery-ui-rails/Manifest
index 0b84c72b1389..87c8b251a06c 100644
--- a/dev-ruby/jquery-ui-rails/Manifest
+++ b/dev-ruby/jquery-ui-rails/Manifest
@@ -1,3 +1,4 @@
 DIST jquery-ui-rails-6.0.1.gem 175104 BLAKE2B f990968bc75d5f2c5556363f41eafd9ce2207dc08e20bbf10f857656219253fd5f29e8b4d131f7a8b942682d6c32bb11797c08621b34847f77984e7fe57e111b SHA512 ec0fd8c15ef9dbdbef01bdaca22fb36251a2ced090ade6859cff7c72e183c3c750fc384fdf757db7160ec1c6426ce84c972cce255c3d42a2bb9ebe5539390485
 EBUILD jquery-ui-rails-6.0.1-r1.ebuild 553 BLAKE2B 67558b5f8572815a44c4c2d91aa4e65a1b9c9b91865d9e988e1074278365f8b460d1dcf7e4b59dc9369dce48926fe8ccf400c462e08bab2202b1def02843259c SHA512 5992c5efd3bd770339aff9424dd3815fbddb0ba9e0843dbcca422fb74fcbee6aed17d24cdfbca3e0003bc000ed5190e9db6adc74431d1db37a4fbc898f3e4b04
+EBUILD jquery-ui-rails-6.0.1-r2.ebuild 553 BLAKE2B d4b9537f0fba786248790d586c35aa4cbf4baa1f5488c6a2415f6de153fd1876b533865f24de98f64a4e713352c97735d73995b6780a89ccf752d8cb8fb940b6 SHA512 455c35b99f3a8a65d200c606551660dcbfe20180fd852a9a9f481538bff127e0846b3d55e9c2072ecc5e7e0507683ae4b1eff4164e96f1d5ca1abc91bcf9495e
 MISC metadata.xml 339 BLAKE2B 792d2a1851deaa3603d09fb0eb826d8e985712195207d164604e7a6b1be306ce065f0de25d25afcf1baaa70c75cb7ce6abb33dbc267783d160c3cc533856c78c SHA512 178cbf8aaa736afdaa18b37ee60a84410d4b23190ee5fbc5bbe1ec2955372cef4dfdcf6700f85b74e5f5c082b955275ccbde9b28bcc0ffb2bd555ae3cd3e2943
diff --git a/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r2.ebuild b/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r2.ebuild
new file mode 100644
index 000000000000..4a0026574b82
--- /dev/null
+++ b/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r2.ebuild
@@ -0,0 +1,25 @@
+# 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_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md VERSIONS.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The jQuery UI assets for the Rails 3.2+ asset pipeline"
+HOMEPAGE="https://github.com/joliss/jquery-ui-rails"
+
+LICENSE="MIT"
+SLOT="6"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/railties-3.2.16:*"
diff --git a/dev-ruby/jsobfu/Manifest b/dev-ruby/jsobfu/Manifest
index 1ae141f711a8..8fafa17810e1 100644
--- a/dev-ruby/jsobfu/Manifest
+++ b/dev-ruby/jsobfu/Manifest
@@ -1,3 +1,4 @@
 DIST jsobfu-0.4.2.gem 27648 BLAKE2B 280629f104a6aa1cfd4603fff2edf5d2dde5885bf074e39e790e06f03d17a2cf107a6bed61fb2279a3c1e1879e4a74d7faa266561ca10590fb67543ec52e02ec SHA512 84374c8c65691eac6fbdaef78a6faf8a1659474789df2ad0b938cd9101e5b51c69ac5fb157eff3e714decb1402372fe98015a2ef3d77775f0af22fba34f93227
+EBUILD jsobfu-0.4.2-r1.ebuild 851 BLAKE2B 5b0bf4ea5f66bdaee78354bcff1b6ae34c85fbae50ada21a93ad3d9921d44c4815fe2af5636c19632b8e0d49d5e1d08e25d4b114fdc68734ed43a02c93683f06 SHA512 29e9291b62ecb6c88f934a9a4dfedc21bd4348ebe5a2c93d3ed58d7fec72bc29701d17e1666a49129eca89e20ab43111f64275b0556071ff7b69d3e2e371cef4
 EBUILD jsobfu-0.4.2.ebuild 875 BLAKE2B a8726f18d85f989099ba317ec7d5af4f7d3d8e19781b9a4b995df6d0c9bc6fba6f06142ea831ff6533960b55877da0b85949b166f5a202c53583237731998795 SHA512 5d410b90703510ada1136f6db8f82b2fc9ce78cd2471f40e572d5b1eae3f8b7d96ee9811381e8a7a3d574c61042bf4d04f0c0aa4ee95f43f626f4c864280ea38
 MISC metadata.xml 340 BLAKE2B 62a38bc48f9aeb2e6466a222a8521d383d6ec4effc8188056e0429e3c3707af86149d00fb43d41d413114567f4e52b415d51e73845f5c63cd1b503bb527a9c48 SHA512 61b8fdef9e9b5619a16ffbbfd56e8582e08c306aaa605102c046e29471f201963c59626f7dff426f72e458d29ed5f74356a94cfc6e1fe4742efe1cd552555848
diff --git a/dev-ruby/jsobfu/jsobfu-0.4.2-r1.ebuild b/dev-ruby/jsobfu/jsobfu-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..3b7f60cfb522
--- /dev/null
+++ b/dev-ruby/jsobfu/jsobfu-0.4.2-r1.ebuild
@@ -0,0 +1,36 @@
+# 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_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Javascript code obfuscator"
+HOMEPAGE="https://github.com/rapid7/jsobfu"
+
+LICENSE="BSD"
+#rapid7 gems are slotted so we can have multiple versions installed at once to support multiple versions of metasploit
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "!dev-ruby/jsobfu:0
+		>=dev-ruby/rkelly-remix-0.0.6:0"
+
+ruby_add_bdepend "test? ( dev-ruby/execjs )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/ s:^:#:' \
+		-e '/config.\(color\|tty\|formatter\)/ s:^:#:' \
+		spec/spec_helper.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper jsobfu jsobfu-${PV}
+}
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 0155d21f6b08..16046f1f9695 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,5 +1,5 @@
 DIST json-2.5.1.tar.gz 131183 BLAKE2B 2ccdf5921ef476b66cb1dbf72cc01763636c82b0eb5d0a5cfc029e14177c7c6766464e7852b11c2424db401f5b931cb64c01d3952929236c9979378a7928ea59 SHA512 4df7ec9b86692376e89c2019c2c1ab3ae9af28fb4742864acc6f985c0551fc10795742cc1124d6435e820617c00d4c5f4aa6c83b21d2fff43ed05cd9d0a89087
 DIST json-2.6.1.tar.gz 132705 BLAKE2B 5a8e83b8d11e360402324427de5d2520f39ee1567e2fbf3c92c738546792bb5dec4a9a3c36f3286a3de63161bb5d9f9e7b059c2560f7a3fa50271ce2aa3dc0fc SHA512 e9d0ef77d77ae54a0300b490e3e5c445d0b5aefbce1b160454916bd4f4f8f943131223047e6a7416347cc40d9e7fb1870101c3cbf3a2663a9053f07bdfbd13cf
 EBUILD json-2.5.1-r1.ebuild 1942 BLAKE2B 9b3c3d24aa411c7afeeff47f2f282e68a42f98c331957ce7448aa89dbd595c13445e4e6e3a4a85b604a1d8571239523890c123812a86cf2051cacae9bf30f973 SHA512 f6b76f74a51618a776b265ad9d063d0169b085aec169975b59060a3463bef3ca4a1b9599e481ef000fcec5cc0329958b1c504fc810df14e12c4eec25873923ea
-EBUILD json-2.6.1.ebuild 1950 BLAKE2B c3d90a6e66c1b0ba52a91bde4ce54b9ce71567825da1ae0455a3b30234301c53dfd7611ce85a956d98a91cf34c72827ef1f5bc294f7a6cb2fb2f2e535a991843 SHA512 582ae941b1d06b76695bc7b9b47920593a4f4fc364328cbf9e65cf663f64a074fbd010b705e5244053731c53e8862e7ac1675a584234098850c228eb9d6b9b5a
+EBUILD json-2.6.1.ebuild 1957 BLAKE2B d111fc5142b809e54e05c0af2e09737504574f5a0d02f13877f58b09769e0047ed3d4568e18dd0b7c3d5a433e1ffde02c737a99f035f6d578f300aa791ce8906 SHA512 77e74fed8c2c87d4f93f6af5906875bfff3f85f594543a1fcaa0e365c975d8fb7b65d60f0dffc079b1aa1367a4322d584e4e98a16e22af34916f97424be51331
 MISC metadata.xml 337 BLAKE2B 6b424567109cd8947377b5f955a9b32d3c12a25001e8d68cf62ac753264a0d8785f0fc60fc2ffbe5ad4e7a16ebd763add075820e4e559b50f6a230ef2f7a61a5 SHA512 e6900f34ad0c2a8310286eae9942432533dd78a14a04fb5d2551be21437cacc1a2d83b40ec93e885b30626cf49491f7db8a19b6e16009b6931cb0fd0c8ca8d5d
diff --git a/dev-ruby/json/json-2.6.1.ebuild b/dev-ruby/json/json-2.6.1.ebuild
index c17bebd12cd3..8645070d8ec3 100644
--- a/dev-ruby/json/json-2.6.1.ebuild
+++ b/dev-ruby/json/json-2.6.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/flori/json"
 SRC_URI="https://github.com/flori/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Ruby"
 
-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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="2"
 IUSE=""
 
diff --git a/dev-ruby/kirbybase/Manifest b/dev-ruby/kirbybase/Manifest
index 252bcf0ebf67..aaec0fa2e33a 100644
--- a/dev-ruby/kirbybase/Manifest
+++ b/dev-ruby/kirbybase/Manifest
@@ -1,3 +1,3 @@
 DIST KirbyBase-2.6.1.gem 304128 BLAKE2B 4fabc7d431b607d18b1474ba815ad1d19d3362734ac0a562858ab6deca6193e6fa13e668d17d84b228af4459b75d082aebbb04cc91c6dd7bfa667e9b38613032 SHA512 84a471b77ef9c91d50b61ad9993956fb25739155fe55049c1e20f1c87593f726604801ddb7968b19d8234d1d9ad9b112df53f1a2c8c85ec3559d88eedbd2314f
-EBUILD kirbybase-2.6.1-r3.ebuild 669 BLAKE2B 21a1db84001e173e774aa7d0376cc9b3ce23ae45091c7e01edeb6c45b9d399b57496a8e95a41df06ad44f1e476dea8c9f4e2e87e7fa1d70fcb323d0fa9e00629 SHA512 9a439c2a70525f1511e86308d333d8c9b9b7891db1cff616c32290eda0678cc8903e6bd97d0e4cca07d843e8290f69e176cd8a7e4955d1d4b5f53d495f9ab08b
+EBUILD kirbybase-2.6.1-r3.ebuild 676 BLAKE2B 0907ca3ef559bb2edeca8ae882e01d2a7871e190213355f0d44ea9e19f7fa5814c8b0b7294cf64ea0f68976f5ad84b477fa3947613abc451d84d30c09cc8fe95 SHA512 32dc7acc7d723723ed018386dd53273b39953188ccf6192c76548af6b822ef75726b4c92425f0ad56445de79786c82fa1911e03cf5a0bc3dc56d1c953fa1aa64
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/kirbybase/kirbybase-2.6.1-r3.ebuild b/dev-ruby/kirbybase/kirbybase-2.6.1-r3.ebuild
index e99f303de31c..6224407ceba4 100644
--- a/dev-ruby/kirbybase/kirbybase-2.6.1-r3.ebuild
+++ b/dev-ruby/kirbybase/kirbybase-2.6.1-r3.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_NAME="KirbyBase"
 
diff --git a/dev-ruby/kissfft/Manifest b/dev-ruby/kissfft/Manifest
index acbfd1dec9b2..ad0cbd090780 100644
--- a/dev-ruby/kissfft/Manifest
+++ b/dev-ruby/kissfft/Manifest
@@ -1,3 +1,3 @@
 DIST kissfft-0.0.2.gem 13824 BLAKE2B 89c08365e23dce06f1c9acea7ddc7d463d3b8df1a5c238656fe9a43fd411077b9dfdf90288437ec9a30bba16d8eeb5a6a2b1a9d725cbff7ef07c632be6877f88 SHA512 3513008db848c92948e35c01bb568dcb8d52656ffe3510b81fb57b71b5abab121b3f1e6f3c20f2c94d0cbf1870d612b48f983a6639588ecd8a54f8b736fe81cc
-EBUILD kissfft-0.0.2-r1.ebuild 455 BLAKE2B c9355768e77c615e34f893aedf9af81b18996deb9c9b9f38354557057c9520d1fbb4053eafdd3d87e985a4e26e90ff549da47d15ff749e8224c0ffe0a708ac1c SHA512 a4dc8196dac1804cf07c370a5f2a0acf41e0832707463c5b2be52315ecae3de999a93b806ecc807cebe26dbf867a4b703f296e1253c0946892a68a940fea6f29
+EBUILD kissfft-0.0.2-r1.ebuild 462 BLAKE2B 98825d4ff03c263b359e77477bee638a7cff5eefd6bde2192f4e1342646aa4c52a1b00df32911f2952168472b211c76eb798662039af7970e30c31cefb0b0a90 SHA512 3ebabc872bc2ed6724450520da9a2d4bd67d5813f7d4e8e1a007de77d401ec6491b52e0a5f2439e9ffadff63295aef5a8c998a3032b93edee138dde3bb29a0fd
 MISC metadata.xml 434 BLAKE2B 66625935bade5ebf6470c4c5d7fb78b11418280d7752ada11a22df2af133ef082fb14c215b26589bc83bf3298aaf2b2174be54ed6c74c5b4c0d9dbb5ba9cc64e SHA512 9164b6d5a2a69ff556b03a827aa4ff55c7c9a639161170903e02169f3534a79bc513fa5829e21506c7ae40050ab4456c291a4b805aff5fc8b1d8dc39f7c167ce
diff --git a/dev-ruby/kissfft/kissfft-0.0.2-r1.ebuild b/dev-ruby/kissfft/kissfft-0.0.2-r1.ebuild
index 00476a924c9e..724b3d755b5c 100644
--- a/dev-ruby/kissfft/kissfft-0.0.2-r1.ebuild
+++ b/dev-ruby/kissfft/kissfft-0.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/kpeg/Manifest b/dev-ruby/kpeg/Manifest
index fc896f2a18a8..741eab03d879 100644
--- a/dev-ruby/kpeg/Manifest
+++ b/dev-ruby/kpeg/Manifest
@@ -6,5 +6,5 @@ DIST kpeg-1.3.1.gem 57856 BLAKE2B 73f589e0bbd1ebefc3b9068b96476a607214bd32a44920
 EBUILD kpeg-1.1.0-r1.ebuild 727 BLAKE2B 0ffba3628bb74b9477789e47d091d96095903826b35351ef2e27d3c8d203938de758794947a266aab4ed486c48f2dcedb3f3ea4d9bb94d9d1de6ae40f3b083d5 SHA512 fb1f23a55bbbf40438e103b2977a1649bcd24ead55837ce739c758b93873b556ffd17a5c0343a470c72aa192bc6b8c4c11587fca24c5840985caf8d56cf95dcd
 EBUILD kpeg-1.2.0.ebuild 734 BLAKE2B 606bac56a3ff201aa84d9a8e9ff5b734cc0d0272b916dbe7deeb083fb019998d799bdba133e8d9043ad3a3389fd54479c1f1fedf7d4d6ef2fffa96a59c0cd644 SHA512 d8d7dfe826d3cd13e4c0a1650b5fcee73ba6f535ef1b708b2282bd4e1947c97afee1a6a0054d13715077ada17cd1b755d6f10dccbb9232ac13e9185e085b4af9
 EBUILD kpeg-1.3.0.ebuild 734 BLAKE2B 606bac56a3ff201aa84d9a8e9ff5b734cc0d0272b916dbe7deeb083fb019998d799bdba133e8d9043ad3a3389fd54479c1f1fedf7d4d6ef2fffa96a59c0cd644 SHA512 d8d7dfe826d3cd13e4c0a1650b5fcee73ba6f535ef1b708b2282bd4e1947c97afee1a6a0054d13715077ada17cd1b755d6f10dccbb9232ac13e9185e085b4af9
-EBUILD kpeg-1.3.1.ebuild 709 BLAKE2B 77dc1cadbb429728f05190b58a637216d0d4aa10eae555abb4b5f0462a4592995df53a19ddf30954fc99ea026ea6545ac530264d0a0b170f6246b6893529dd51 SHA512 812bc590737683b3c9bf33c397351beb5dc0d753f94c9af26a2874c2cbe3d48a1df22d94c9a13cc9709de85383aeddbe2e6d6aca2b25abe32dd717ec21dd8842
+EBUILD kpeg-1.3.1.ebuild 716 BLAKE2B c244a6d5bd110f2597cd8fed649ef67bcd6449affa938ff78b25526a052ea3e9d7cbd2deb1f36e544436190125248a04beb624688a2eb1e907d6d86e97dbc723 SHA512 293576a981e80802d8c3a6ce91ce243f0516674697c50814976390e359d4746412e223787b7e332c45afc81ac8c55944aee1235ed640cd1376abf8f0033a3398
 MISC metadata.xml 339 BLAKE2B 84a27b2b24e20e2ec895782c175d959092397b5936b4c98daabab1ff20a24b7c3b3b951cb14622f8c824629131ba9d84404cf908c31003d17e049ea91868264d SHA512 ba4fc3f1c9f36619d257f5a9fc7fb2c0e47833e81ee5e092dd2649185d7e00ced6f865fce299e97d5e866b78184bd5b7350de1b874079d41b7337b2f4ef5a124
diff --git a/dev-ruby/kpeg/kpeg-1.3.1.ebuild b/dev-ruby/kpeg/kpeg-1.3.1.ebuild
index 254aa1f1cb94..12e389acfb60 100644
--- a/dev-ruby/kpeg/kpeg-1.3.1.ebuild
+++ b/dev-ruby/kpeg/kpeg-1.3.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/evanphx/kpeg"
 
 LICENSE="MIT"
 SLOT="1"
-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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 PATCHES=( "${FILESDIR}/kpeg-1.1.0-utf8.patch" )
diff --git a/dev-ruby/kramdown-syntax-coderay/Manifest b/dev-ruby/kramdown-syntax-coderay/Manifest
index d4b0310b281f..b8fc5b5cdc87 100644
--- a/dev-ruby/kramdown-syntax-coderay/Manifest
+++ b/dev-ruby/kramdown-syntax-coderay/Manifest
@@ -1,3 +1,3 @@
 DIST kramdown-syntax-coderay-1.0.1.gem 7680 BLAKE2B 66385a651b4a03980984385d09a0076388bcf5f8506ab19267bd75824300c431630280ab5dc9bed41310e69938d2b1d9d42ecef2feace7a5b184c84e9614fdb1 SHA512 bd3e1d919cba7a797f43706f5b8543817654b10abb6c7eed56d99c3a8b75e91f7896db0c04ab999df9f39d21d7dfbc7a39a290e39129812fa5ed3cc8d674abad
-EBUILD kramdown-syntax-coderay-1.0.1.ebuild 508 BLAKE2B a2fdf5ec6b6d32b74ae386c60c0f226054d6c796b359d632a1f52aa9337671bb009bc798c81dd84e35b5946638066f7ac84fa3704a0c0279c5221f6bca91db5f SHA512 3603d862cbb0da2e659369520ce1c0ff2a739c86a080c893f338854c2c05a73de1083a849854e27582bb971fbcb2582444ff36873f17bda461d430d20bf89587
+EBUILD kramdown-syntax-coderay-1.0.1.ebuild 508 BLAKE2B 8f7e60a7c383a68fd4c02a52f7cde606a25087377fad3b5a0a149f7cec60003a71b611ee3d140703ecffdb8adbb1b6695b39a3da4c1dff3fd95efd2c4a898782 SHA512 864b14f4f9655f7d5f6ea4b8eb480ceaab6ed38c405aaa4c701b235d7c5ee386dcda8692c3533bd85129dc223580ec123d89700b8515cf368b5b82aa17e0ffd4
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/kramdown-syntax-coderay/kramdown-syntax-coderay-1.0.1.ebuild b/dev-ruby/kramdown-syntax-coderay/kramdown-syntax-coderay-1.0.1.ebuild
index f5d42549f182..08194eeeb809 100644
--- a/dev-ruby/kramdown-syntax-coderay/kramdown-syntax-coderay-1.0.1.ebuild
+++ b/dev-ruby/kramdown-syntax-coderay/kramdown-syntax-coderay-1.0.1.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="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/kramdown/Manifest b/dev-ruby/kramdown/Manifest
index f78de7974594..59d0350e48be 100644
--- a/dev-ruby/kramdown/Manifest
+++ b/dev-ruby/kramdown/Manifest
@@ -1,5 +1,7 @@
 DIST kramdown-2.3.1.gem 122368 BLAKE2B 731e20904f238f44db594c7b8efac858187c935d9fbf8a421ddceeb1aa486f0980b502953f8eaa7e3100f7b7722d09b1da35091d28977c70cfd1ef24a080c3e1 SHA512 d1955065e3c5d7a60e595b647d5e453cf07a08fe25d40c67cf6f32d30f704a2c653a52959f8c71b3290e6da74836a085fa6bf8201c878303ad572dee8cc64496
 DIST kramdown-2.3.2.gem 122368 BLAKE2B cfed374793257a152e99a0417997c39de943ae8d31b178715355841248789f3986b1bee455396a5ac8ad2d6784a5fd33e82effb8430230cddec83579cb8ca2d9 SHA512 268b55b45ad2c6dd02776abd5777c7f51ea8724c64b03d8a859bd809b54b181e018fcf5ca38170c89acfac5cef2e6de253f1c6037fe642c6c093e339fd8f4d1b
+DIST kramdown-2.4.0.gem 122368 BLAKE2B 86b1232583dc88f8a576fb17e3e2ee756f109700634783815e8ba1f722dd8c872f2f6a978d33e1970814530090665eba3693206e57d3f274bb39655a7ac2d208 SHA512 8e52c5cc53d2f0085e30188aa7bf67f92dfe7f0801297c6a45293cca307e3442baa06443638c1161dad4a4aa332cbc5b4f9b6281ba4c6346122a9fff5a3743c7
 EBUILD kramdown-2.3.1-r1.ebuild 1313 BLAKE2B 110409f7322502af0149257ae6be6575e021a73aba3fb101392102da462d92a067f9c0308973e03769f43e5a8227b2464ad2c62bdf7c7eceace438630dc5d535 SHA512 ae53453e6ecdbc2848ea3b514536c64170d50e4d129b8e90bd78c1f244c2c4de780f4091dbab44d55460755a1cd43cd395fb01932e6e34364c8ea551dfdd2f6a
-EBUILD kramdown-2.3.2.ebuild 1300 BLAKE2B 04d54ee26ed4e8d00e6efc7d5089b0ec94edd0e2cfada0b3648dc727bfcdad648102ab1751ea03e2fe77747edf18128b3b4388240689e3a49149e8be4f8399ab SHA512 508b5791e3b35964980394c3bca3b8388504a723d8f144ac32e7f65f87bef5c53f244edf12e1425e02eb6d851f3723a1233e948f83211d36a1f3d537afb594b4
+EBUILD kramdown-2.3.2.ebuild 1306 BLAKE2B cb088a2bed4eaf01043d3cf1fb41fba774b1fc27e1af1c4581228768568e51d25d898897d24cbe95da3656cb69123fd7c3e7964873c3430ac449b675ba405c95 SHA512 c1ac8328f0540f78ceb1d43df6946e5ccddcd926bda8298da15fa1c3f68426696734757512d04b6e3feac95d97e0720fefc20055ef3337ab41a331cbd58623cc
+EBUILD kramdown-2.4.0.ebuild 1306 BLAKE2B cb088a2bed4eaf01043d3cf1fb41fba774b1fc27e1af1c4581228768568e51d25d898897d24cbe95da3656cb69123fd7c3e7964873c3430ac449b675ba405c95 SHA512 c1ac8328f0540f78ceb1d43df6946e5ccddcd926bda8298da15fa1c3f68426696734757512d04b6e3feac95d97e0720fefc20055ef3337ab41a331cbd58623cc
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/kramdown/kramdown-2.3.2.ebuild b/dev-ruby/kramdown/kramdown-2.3.2.ebuild
index c54e4a8f1d41..d6208fd4678a 100644
--- a/dev-ruby/kramdown/kramdown-2.3.2.ebuild
+++ b/dev-ruby/kramdown/kramdown-2.3.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kramdown.gettalong.org/"
 LICENSE="MIT"
 
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~s390 ~sparc ~x86"
 IUSE="latex"
 
 LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
diff --git a/dev-ruby/kramdown/kramdown-2.4.0.ebuild b/dev-ruby/kramdown/kramdown-2.4.0.ebuild
new file mode 100644
index 000000000000..d6208fd4678a
--- /dev/null
+++ b/dev-ruby/kramdown/kramdown-2.4.0.ebuild
@@ -0,0 +1,55 @@
+# 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 AUTHORS CONTRIBUTERS"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition"
+HOMEPAGE="https://kramdown.gettalong.org/"
+
+LICENSE="MIT"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~s390 ~sparc ~x86"
+IUSE="latex"
+
+LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
+RDEPEND+=" ${LATEX_DEPS}"
+DEPEND+=" test? (
+	${LATEX_DEPS}
+	>=app-text/htmltidy-5.0.0
+)"
+
+ruby_add_rdepend "
+	dev-ruby/rexml
+	>=dev-ruby/rouge-3.26.0:2
+	>=dev-ruby/stringex-1.5.1
+	!!<dev-ruby/kramdown-1.17.0-r2:0"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )
+	test? ( >=dev-ruby/minitest-5.0 )"
+
+all_ruby_prepare() {
+	if ! use latex; then
+		# Remove latex tests. They will fail gracefully when latex isn't
+		# present at all, but not when components are missing (most
+		# notable ucs.sty).
+		sed -i -e '/latex -v/,/^  end/ s:^:#:' test/test_files.rb || die
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/man1/kramdown.1
+}
diff --git a/dev-ruby/levenshtein/Manifest b/dev-ruby/levenshtein/Manifest
index e4a4a66bd7d2..040a9f173df1 100644
--- a/dev-ruby/levenshtein/Manifest
+++ b/dev-ruby/levenshtein/Manifest
@@ -1,3 +1,3 @@
 DIST levenshtein-0.2.2.gem 7680 BLAKE2B f10a6b4079c74bfd5ade5113fc96e3551d7b78192aeb8ad68ef40e5813b3c00707614bab362d4cd9a7331be04f74611e016c2d95f7a82964cb2d4ef7ce813e8d SHA512 a84300b6590ab8c5fe2cc4e6f243ccec397cb97f7a241f635d2344433365b846701f9f4cccd7e574a1e50cf389ed03e3fe9992b6c2f21e12806a0c3ab08f03d0
-EBUILD levenshtein-0.2.2-r3.ebuild 562 BLAKE2B eb0da3a72b27e539f0a57c62c6d2e10860dbf498dcea1a8c6de830e3bb130e504ee9c4651c9ca20615f93e410f0dab35ef6587dfd2cbc7347237bea20beb0948 SHA512 82517e6fea46d07701ca25dd41573fa5eab1eb620b268e6f78217ef2d1e8692842d1dcc948e552150e2c116e650e013a4fb41620b291b9c78d6511f9d9649d75
+EBUILD levenshtein-0.2.2-r3.ebuild 569 BLAKE2B eeea66130a6afc89b2db07acc3e588db19f5013b3b65887d1ed71ed24fbf9d016ffc335e3c9c95b1ac924711eb562ae13c482104e95251df41f936cf384d66fa SHA512 944e276936ef710a0aec2e9fd4585ca411ce9d268992435a73a017e07636acbd9d9a8a35a3aa1a0de79aa938c8d8be1f6d25c162379231b0dd5711623381dfdc
 MISC metadata.xml 339 BLAKE2B da547365ceac6c54015f5937754ac9471f12f93db24f5b194cfaaced699945d5806716fb3cfe983313353cbf1c9a310ce8cbb08296e2e187c0e1f08585ddeae7 SHA512 b335e66ac92048d7fa9fa3e2e4bce4657855bd6409e081fabde744be58dacd79a677c0d66edf39a03ab66743e0880f93c4a9ad2aa121936645824d7bdcc6377c
diff --git a/dev-ruby/levenshtein/levenshtein-0.2.2-r3.ebuild b/dev-ruby/levenshtein/levenshtein-0.2.2-r3.ebuild
index 695a8abbc03b..1799a4098688 100644
--- a/dev-ruby/levenshtein/levenshtein-0.2.2-r3.ebuild
+++ b/dev-ruby/levenshtein/levenshtein-0.2.2-r3.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/liquid-c/Manifest b/dev-ruby/liquid-c/Manifest
index 06bf124ef845..7aeeeabb0321 100644
--- a/dev-ruby/liquid-c/Manifest
+++ b/dev-ruby/liquid-c/Manifest
@@ -1,5 +1,5 @@
 DIST liquid-c-4.0.0.gem 15872 BLAKE2B 8083ae622da685db2aa557ffff0927a900a51c92227ea2523dcf4c408ff4df6f417cbf7fe019383220c3fe580d53f40d496787d8f7328a1e42c3f17a435eebe6 SHA512 a9f3618a7286c6417e9d22cad8c0716f84f33c43e9b12708711f9c4bdebb94a30e408b3dca99cdfe0a7c5b5e5b39ffa79e978ef6b44e5359975e3d74106932be
 DIST liquid-c-4.1.0.gem 48640 BLAKE2B 4fe526b48500349526ebeb2430f87fbb8ccea2f47dcfd32f16e3db803425180955c7ae81a707628ca377fd534882d71e06aece7d4119c16cc1386d4b3b222447 SHA512 72600a5b7962b91d63350adc9f3f355255ad9b9f93b6607064a896e1e3d109a9da897f442f9fc15a7a8c2c26ccb4674e491def9e7531ef9577b790ca9a3eb884
 EBUILD liquid-c-4.0.0-r1.ebuild 623 BLAKE2B 922e4803e0c8a5fffdebc21224850557fff29c0f7a1a6b350730a18be21de34c8e29e30c612c1d2962b1638d34050948cb3462ae0858d920a516dc57135d9397 SHA512 1ba9701e82ee75dd227757b94883fa0daa39cf6f6495c6bdffb6b8f5986c84569bb5a741ac4111f183f58ffd4b86fce170fb3204b54b2f416662c403401a3ef4
-EBUILD liquid-c-4.1.0.ebuild 616 BLAKE2B 631537e3dd8b27e5481dded76007ef59235475bc9788df9f96174a383d754e20529a0b3154528ec3044e7a42d9db08be3f5f60ffb50f8ad89de5747d61744ecc SHA512 1e44879c337783ff38cafdd8a0b6338b86199ce996eaf9da3479ee32157dc8831a57e66b1f776ba749177a16e8abe462a75623bd2891a623d864253b1757f1a2
+EBUILD liquid-c-4.1.0.ebuild 623 BLAKE2B 1f07e7a52a1fed7e43c0c2188f5682abc54ca84ae8860f5943579df40f6eba0ac0408c2a75dcd3ae026a8f57fc8a1d0e919f0e9219025cde6a48994502abbddc SHA512 b09ab50f41fdd6cb547cb0b54041a21a7fc9abca2bec40924566e917a7505f0d0915b6ffb296612239ad3a686c6c02418637a9fd2c39aa00d66aef8db61f7169
 MISC metadata.xml 343 BLAKE2B b0efd047555eaf15f367fc354f66a6168b9556d407274e5bc483999f3bddc97fbcfe146f4c32309b11d4a10865e894abcd4b9d3075e8a3b9cfe126fd6af5b1c8 SHA512 0bf0cc41c993b7a3e295697e6106cb31fafc1a5b4b6d1c575f859291ff1763b18b356d64ec7040d0b6fcc11516434696a9bbce770a9a6dc9e2eb3f95640a0a03
diff --git a/dev-ruby/liquid-c/liquid-c-4.1.0.ebuild b/dev-ruby/liquid-c/liquid-c-4.1.0.ebuild
index 1cf359aa9868..9aa91c95add5 100644
--- a/dev-ruby/liquid-c/liquid-c-4.1.0.ebuild
+++ b/dev-ruby/liquid-c/liquid-c-4.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index 16defa90be25..dda7a2cd74b0 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -7,5 +7,5 @@ EBUILD listen-1.3.1-r4.ebuild 972 BLAKE2B c8062f42d923c5dfc3b352bd14c96a5afc6d79
 EBUILD listen-3.5.1.ebuild 1207 BLAKE2B e223fe981c15ee7d82dfd8c478e56b76537548047b18b48c87acb9cba25d427c38d7e3abc2405fe2c83c738bcdd401f2533d0877e2e33dd557c50fea98f46ed4 SHA512 a9016edbb630fba96ef1b3011c39666feea2783cee7d0078bcfc6a973ed04c689ca5b6a886b7fc89185788a041267ab62e33073115d35590bb34003903679cfd
 EBUILD listen-3.6.0.ebuild 1202 BLAKE2B a1645e77dc86ed485abeada0b52e2876ec7b14ba8bbce9c6bdddfca2c22d65a9ed980f7fafe30fa4312da5c3f56de45e8a760eb5933b48d055dec96378308bf7 SHA512 c0ca51bfac9dcd1270a0f3ae2b6d722bec329675270821717d8283b353c2712ea614e1f988361426ea1b70f95c798a85bd00a716be1f3fcac2a1b3cb348fa4ac
 EBUILD listen-3.7.0.ebuild 1209 BLAKE2B 407281814bbcbd60f7688efe14c57fedc7d2d2b4cd11d03a5e06b7f4e818a81577382b883ec542e5a96f6dd713f4d37a772ed97aa3c6455e9ab03ebaef1a1da9 SHA512 e11ed90de9322059fba79c85c7f10de56a1d957de07bd1310aaac129178c65099701f5e09ad7aed25ca18d58e9ff6e1a9ad8abc7ea539e9b14841e981276e42a
-EBUILD listen-3.7.1.ebuild 1209 BLAKE2B 8522cd1cb462d74fc9c6d6f09f6249a7123c135c601f6bd046314b825e2385bbcd60fdc3ebff70e905206be37e0f7cdc710fd6f79a9f863d8a11c997ebf46b95 SHA512 64263c939bb98fffe4d429cfb656a6b7a01facbce82009fadb1cd33c94bf3195d49c799f07ab137e38817b6299412151b31e0564089535669a5075114a17e36a
+EBUILD listen-3.7.1.ebuild 1222 BLAKE2B 3f88a797abc75b24fd3de3677425cfee347455d921a3315c08423d339610b755165cfa29ac18a2910eb5365b605a065bffa73ba7e3b1fbd3412333f75ba615e4 SHA512 70fd3aef1ee1ee7b85a57e7442568eadd33e122f4a052969e8fc72af5a61b16a6de73791aaeeb18e7ea7ead2116e41cb5f2123b3a0bef651e4624418743296cb
 MISC metadata.xml 339 BLAKE2B 13641c725d126e51be4bc7ce83c26afd940fd2562cdca16b523a6d447fdb876b48bd8f948dc50edc30d0573d93fc6d12c1598bc201ddc8aa33d2279b33260fa9 SHA512 269d7d6f3d427c9a4497d1f4ce13ed601d0db8f807f2378510a0fc0dc0b0bdc065059b09b8cfa8beaaefef510925d0ac47750bb790b85c13b95c0923afcde9d6
diff --git a/dev-ruby/listen/listen-3.7.1.ebuild b/dev-ruby/listen/listen-3.7.1.ebuild
index 51354f670a70..d806ca15efe2 100644
--- a/dev-ruby/listen/listen-3.7.1.ebuild
+++ b/dev-ruby/listen/listen-3.7.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/guard/listen"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 
 # Block on other packages trying to install a /usr/bin/listen
diff --git a/dev-ruby/little-plugger/Manifest b/dev-ruby/little-plugger/Manifest
index bb0c45f6868e..be9a723cec19 100644
--- a/dev-ruby/little-plugger/Manifest
+++ b/dev-ruby/little-plugger/Manifest
@@ -1,3 +1,3 @@
 DIST little-plugger-1.1.4.gem 10240 BLAKE2B 389abe95f8eaf815e4cbffe184416a2846c917cc3cd90dff6f6f7d6fc9e162c0304652f3173c84fa61b5d25135cb295131733aed4911d19719b2b032ec3c4ad7 SHA512 79b26509c56084a93997e011870de085f9e5222d631bf410c9bb2a361949e80f3d8be279b26b6c405dd47aedbea72089de212990ae0906f7493a3e8edfa8cb87
-EBUILD little-plugger-1.1.4-r1.ebuild 423 BLAKE2B 748a3ab3a78417caccd6fa562b7088f4278b3921fd60dac14442cc82fd128763cc6c0e95f6e43495d14ada8f0c579be6eecb08f12997bb9a9c720242b573ceac SHA512 ce21d572c665301244d2446f03fe82a29fa91b03df00b4272464e97cacb0079242afc69f19a10c133c920513f0e6ee8414daf2b52efee0cd628e2aab51b8b648
+EBUILD little-plugger-1.1.4-r1.ebuild 430 BLAKE2B d72fddafb857df8ac054361a2877812a0ad6b3ad41cc5d12de6d9ad65058d83c5cecd55569a9c4422b9fe371f2d6897e379b5d3a5d57e438ba07e265c1965b4d SHA512 dd00514c3e3da19390853eb4fe138eb440d166ea5764839ee7a3fe86bff0c0ef4bb26ac105cdfc29d4bed98b3bf196e24bed5bcf4e187c373f31a23193429df5
 MISC metadata.xml 345 BLAKE2B 9eb6e17b4191b17df6fe29fbb0001633ab327dd7a6be7205388ed2ff7865b9821a58ffe2537cc6fdd56b0c84b680df1a960b0e927a6ac0d740af564c4346e183 SHA512 c3af1b9f693573e87305ab5f901d4371671eeab86691bbe5272187a78f1efee29bb71c0f5da7be3576873db1f12edb2a0e8ecb75e752bb0c4eddad632d081f4c
diff --git a/dev-ruby/little-plugger/little-plugger-1.1.4-r1.ebuild b/dev-ruby/little-plugger/little-plugger-1.1.4-r1.ebuild
index 5b3db42f125d..172e92a78f34 100644
--- a/dev-ruby/little-plugger/little-plugger-1.1.4-r1.ebuild
+++ b/dev-ruby/little-plugger/little-plugger-1.1.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/lockfile/Manifest b/dev-ruby/lockfile/Manifest
index 541e332e81db..eb619e33f5cb 100644
--- a/dev-ruby/lockfile/Manifest
+++ b/dev-ruby/lockfile/Manifest
@@ -1,3 +1,3 @@
 DIST lockfile-2.1.3.gem 24064 BLAKE2B c66bccbc1ca750388138f16e730f833e8a6eaa3f357ad56ddceae4dff7cebb93bd56681714ebd499d9df48d342d79cefa2ae43817c2705b52d7657ffdc7568ab SHA512 7674d3f556bf69b547678d8e30199315437995ab86289f1f9099d5192b49862e9ff227e4312ff9bcf9bb02ff4ebb1002832a0a324a6cf672e4e124b35393d6fc
-EBUILD lockfile-2.1.3-r1.ebuild 409 BLAKE2B 75d09d7a268683b763468e1b29b48e1ef83c26b72ccd012ac8b31039039caee126f55c98981fd3f988edfaf5dd4bd3686466567eb0126702d8939719e84c89c5 SHA512 a099a3d1e8309c68535842d75a407e2149b8b1f8b9ca3582bbdc038c49b33fac6d6c71a1d4d6e45e5b3e144609c078e3108b780d3cd53f7e3b12a923c6568423
+EBUILD lockfile-2.1.3-r1.ebuild 416 BLAKE2B 63af508f8ccad77daf6bedcd58e0ac1ef8f99180df31e2d2b2afe529943f9adf3c2c6655de7b03f8b710bff6b4fb7e80a543abe7439954aaefd63195c28ebc2b SHA512 e964e60fc931f8c97aa9ac62fec5aa736d0f4af15015281260f74cd03d8736e3ff6c1be9299ebc5eed990a37629c01a8b08f3e62cbea8940f204942c02fbedc7
 MISC metadata.xml 343 BLAKE2B a407e69d1f17e82d9c386a7a966c58d00109f9f6e1a29961f6dfceeaeaf9784700463a9aa307eaf350f8b8e2542928f1ff099e5926aca89025e20f63f7a6dc88 SHA512 a11e7f94175ce4b4ebc267ba653c1412ef27cd191fc6e00a57ee9b911b3d29e5bd5bcb23cdffb8d394803c609778b777e06dc456afe2413faf8920eeff3f1039
diff --git a/dev-ruby/lockfile/lockfile-2.1.3-r1.ebuild b/dev-ruby/lockfile/lockfile-2.1.3-r1.ebuild
index b11f3b11d423..24c4d8a527b4 100644
--- a/dev-ruby/lockfile/lockfile-2.1.3-r1.ebuild
+++ b/dev-ruby/lockfile/lockfile-2.1.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/lumberjack/Manifest b/dev-ruby/lumberjack/Manifest
index 1904265d9fa8..75b5fcb94921 100644
--- a/dev-ruby/lumberjack/Manifest
+++ b/dev-ruby/lumberjack/Manifest
@@ -1,5 +1,5 @@
 DIST lumberjack-1.2.7.tar.gz 39559 BLAKE2B 2f7a5630baa5f683e137f717a7482b4bb889ccf71293b2f52a799effc23bb94ee90ed10c1bf0c9ad649de12347f22a5a66398344d0dcdde3626427fa09782c9a SHA512 356fc44669e70d8fbc05c4f8cb8296a19d7918dd34f0232a750d714fcb511146423920baf7aec8e58e099e3c72ea4d0ad63bc0b3cfd7d337603ec0958efbb008
 DIST lumberjack-1.2.8.tar.gz 40896 BLAKE2B 5a2ee1ff750e29c0869ddc8991fd58e2b4dbf69132e2a1c16e414c5373eebb0249ada7fe922666a3cfcd6875aa98e8b2e0f5f73b391ece2fe75e13fb2968b29f SHA512 8b1d9a402112ae3279e3f2b0d498e6d40faca3ed9046bab1b35d3e863dd0d8f143700f0b7039c8d6b24bde517fceeb9d1b7a8b4259a97908a34a94338f1fd995
 EBUILD lumberjack-1.2.7.ebuild 682 BLAKE2B cbc6a8075f767c6440593d562c39c1ecbebbcfe6c494a4faa40617820602c6e77eba7949a59db5997526c8d71ef3551d8658edeb5072c09696153ef4a037634d SHA512 e025670f600add0847240f0d382c32af2cdcc4ac31daa814bd849b4b116b92e28e22f6253ac1c2ed6e174e21f1e10d262fb8e67fbb9db520875954107a372e5c
-EBUILD lumberjack-1.2.8.ebuild 702 BLAKE2B f5790318ccc19cb5310425f5088a91f7d58737a8153260f5cec823686671d7ecdb714f8d91fd83c9a19dc292da88091a4a4dfbf10a76227065f9ac68d4e0cc61 SHA512 b9f43004450a8818fbe28f24137428370084252fd3335e41d66c34ea319970a32b937c520922e24441384d668fd035a1eec2198285c4aa97e441089c0898b1f5
+EBUILD lumberjack-1.2.8.ebuild 709 BLAKE2B 0c0649615066d7f168c7fb2ee2cc480634ccfe0fe721fda44c5f95db4dc1bde9f6b19887ca85bc1c0e5421f49db79d872f11fcafafbdd6417e7a2a0692f1d0cd SHA512 a8636fc21a35441b71643e7075c6cf171ec591ffcd3ebedfb3d1b87b3b794dfd15865cb9b06970e8863bb0fa40633f25deb971dc12ba2aa4262fed58053ce9e1
 MISC metadata.xml 345 BLAKE2B 052f6b629099841c92f5bd6d6d2a634fbc04bb06bc25296edb2fed33c5dbcaf8e82deebefb5c5b382655c247aae75aef2bad649bdb5e3bd7cf90f8b43baec6c4 SHA512 95497763fac2856c906d9d44fbc701a7ad2e4b0c1b3d68f07036c4558b9fd63c7eaba4b73e9a6ed28baa0541c882ba48606857cbff3b1c47bc7f2971abc08bea
diff --git a/dev-ruby/lumberjack/lumberjack-1.2.8.ebuild b/dev-ruby/lumberjack/lumberjack-1.2.8.ebuild
index 91ceee247c5d..7c80c08102c3 100644
--- a/dev-ruby/lumberjack/lumberjack-1.2.8.ebuild
+++ b/dev-ruby/lumberjack/lumberjack-1.2.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/mab/Manifest b/dev-ruby/mab/Manifest
index 0ad0bbc33e99..5ea44280e3d0 100644
--- a/dev-ruby/mab/Manifest
+++ b/dev-ruby/mab/Manifest
@@ -1,3 +1,3 @@
 DIST mab-0.0.3.gem 25088 BLAKE2B 70d250f0fde8a2b7cc8bd50836b8a95b9c0d3e4c738ab2698781c685de508ee58465ce2710ef1fdc63316bfd4db9e16b1951f0d04a9db2a7b9ec0e237bd1c416 SHA512 0761a8de59243356981555ac5000cd98a0413f75bd9eb84848f8efd77be1895a44cf3b90f1182193f90c63a256ebe4a179e8f94a992a30f30ccaf4183b8d4c67
-EBUILD mab-0.0.3-r2.ebuild 447 BLAKE2B 18087ed8d705bc89b84fbcebb1c15e718dc0c2f2d8c901a760a16bde5bc5ae89475238efa6999b592368798d625364b1de6ecc049185bc78f7a44938bdbe5f31 SHA512 3b99573852cda775e4f51b4ed78004b3f86f01be35c3db9131eb217d62df4923e48c283a293daa0d0ae259a980a2d027881bf82b0d27b724f3fc84733fd2b280
+EBUILD mab-0.0.3-r2.ebuild 454 BLAKE2B d8dc15a581991c1ff58cf49bd1ebe2eb45cb42976888bd2aa2d745dc0889ae36c237f7a00e34a18a6060547437a19ad681bb31f3517b141725ce3853f484dfcb SHA512 ec867ec52b6a7b8401b26cade9441c93766be04714978a0697e1cc5c3f1eae8d12ab3ef94dc271ad4ebbfb3af941f2a3cd5ff302a9591c8e2eb085232e6b3cbf
 MISC metadata.xml 338 BLAKE2B c4b4e29892b7c0f9c9cabc5f5cfd1c17b5a28b721c9520a672b1a5df701c4e26f8ce2a2bebf7ec08e5af8d69579330f44da7e424471e62005630a3d6f4cb1f15 SHA512 1ee556dd39dffa05299061c2c95f0ce8b9a0a0796cf227404e910edd7cd0b5cc7aff504675633691e50b72b059ca12fd9984480e368bcd6345fb5c48ce4f7c69
diff --git a/dev-ruby/mab/mab-0.0.3-r2.ebuild b/dev-ruby/mab/mab-0.0.3-r2.ebuild
index fa6bfd2c2424..2806926c3384 100644
--- a/dev-ruby/mab/mab-0.0.3-r2.ebuild
+++ b/dev-ruby/mab/mab-0.0.3-r2.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
diff --git a/dev-ruby/magic/Manifest b/dev-ruby/magic/Manifest
index cc432cabce07..4339946c4735 100644
--- a/dev-ruby/magic/Manifest
+++ b/dev-ruby/magic/Manifest
@@ -1,3 +1,4 @@
 DIST magic-0.2.9.tar.gz 11642 BLAKE2B 1208e40e1c95ebd8a31f71d860b68acf9663a165fa5f775459f874d79f41c51268a0f0be5d9f6ca416b85a838879d179ccbc10e40047cba1e330f891dbd6297c SHA512 5bc6d6e1b2646b12af7dad15273dc125db68be2d6e6c109484339c8f651349827a90ea81d8feb0441c5811567d85130cda35167e2dbb426842f952fc2ff8ea15
 EBUILD magic-0.2.9-r1.ebuild 708 BLAKE2B 9c143dabd64d7846632864b046a3c0b94498b55e6c73dece5736358794b2c9a99c0775bbb766c47906cbac9cfee38dcfd68266800115e6f6b4bc77985f8a88f9 SHA512 aede495082c8ab22bad78f4456daf47057fe5821f6b919effe81bcd00f0e42bfb4719858a35bff881fe0c50c08be08460e197b8c279d51c0874163ee5ec0c03a
+EBUILD magic-0.2.9-r2.ebuild 816 BLAKE2B c6cf02879a3d016655e238410de464fb6e4959a843e80909f99cac9aa88c1c16ca14cfcb10b736a1f3eb529f26bf6cf0aebc01686bce0ad8e02a06501c5da94b SHA512 5e5d462f17a4877816c9d72d67232645aa1f803ca699f3e396f81ea5d2fc71d00f3456a3a5620840740ec58f31422de4dc405c48ded7e6f84bf73bc2da6ebe7d
 MISC metadata.xml 339 BLAKE2B beb4876fd388f0e612240b7c9ee67e85e3a7e5ac5d502497fa9d80ce15f4b6c7ad2a6847c5235368f903af9581f0ae045ef28a1347e04c02bd577895f7470968 SHA512 652d191bf38a440cf9a0e554489ead5dc3e59ad676939cffdfa527b9f968b01c532e7f96596824fa8e0151c0cb99b1895178588b56cc161e0cf2462dcb017a92
diff --git a/dev-ruby/magic/magic-0.2.9-r2.ebuild b/dev-ruby/magic/magic-0.2.9-r2.ebuild
new file mode 100644
index 000000000000..0640c4315f96
--- /dev/null
+++ b/dev-ruby/magic/magic-0.2.9-r2.ebuild
@@ -0,0 +1,35 @@
+# 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.rdoc"
+RUBY_FAKEGEM_GEMSPEC="magic.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/qoobaa/magic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Ruby FFI bindings to libmagic"
+HOMEPAGE="https://github.com/qoobaa/magic"
+
+IUSE="test"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND+="sys-apps/file"
+DEPEND+="test? ( sys-apps/file )"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
+ruby_add_rdepend "dev-ruby/ffi"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib -Itest test/test_magic.rb || die
+}
diff --git a/dev-ruby/marcel/Manifest b/dev-ruby/marcel/Manifest
index 151fec92c285..c452303651f3 100644
--- a/dev-ruby/marcel/Manifest
+++ b/dev-ruby/marcel/Manifest
@@ -1,9 +1,5 @@
 DIST marcel-0.3.3.tar.gz 7845456 BLAKE2B e27d851119f434144a790cd1bfb1ca21662357b1875ae9193273e00c5abc6156c217efeb961356d4967d984b4c8fb4b4047620fa5d0448cc20651aa1ce05bb69 SHA512 d9be185fd6f5185fc67f3eed931ecf3084da671840b6e464bf341f51c9dec4ab1b4650abd1916e640b7caced230d6cb90370bffb559151e0047a8b03211dc751
-DIST marcel-1.0.0.tar.gz 7929941 BLAKE2B b8f956e9876a86f26ceb789d59da4821d512f83fe619b81a6ebf4c638a03eda245d617a504ff24ad89295797ca98473f613eb46f635f45382ba4e6ce92c57b1d SHA512 1c8addecc7ab2a7c58a22ff114f3bc453e7cf8f620cd212a4213da4743e5992d2becf947bdf91ce8976b8c0819ed6799bfcddc1948ab08713e9b01dd2410954e
-DIST marcel-1.0.1.tar.gz 7978633 BLAKE2B f65489e7a398099b8856d6bdffdcded56547a601d8d23f4094673694904b00a9aecb545aebee8863a2f7b52fc36956450ed293b725971e65fdb0c275ec39bb2d SHA512 d72580e6bc626173e17485996773eef895c44eae26c0695b6aec16a5b194e8cf23693b1a1b981bdbbadf1256b91c8918896ba69fada9897287613ce17c4ae533
 DIST marcel-1.0.2.tar.gz 8305198 BLAKE2B 264737cdb29852a186bf0e719748caca6c63626528f486dbefc3eedc7df6d7fe6f34e5cf68eb8b04f8b2b75c52bed59222d5f7bbcf60047cd5db7c4c935802ff SHA512 cd159545b246dcbd26ca07ac69e36ff13a965ac0e99ebd040c53b6a92f8ec8fd65786783c9a173d669fe6b32340a23d72c83c483011eec2e1097bdea73810ed6
 EBUILD marcel-0.3.3-r1.ebuild 1061 BLAKE2B 21993da1a5ec3020f53b2371311e8d2a8cbfff0857e89574e0adaf458179a3b0cf5e3d5a0cd18920e741e230658d9b366ba1e1d66318672d4b9eabab6e65e336 SHA512 b40d11abedb93fb38e355e10540e0a15928f9b879c734010fafbd3340f25a9f2d5ad0e3d3a86f830d3a10b6f4d4fb9c84007feed0632116d5c7f2181542642be
-EBUILD marcel-1.0.0.ebuild 734 BLAKE2B bd896c582254af298d87cb598648ef38dbd3e1a8993d04f4afe95b31bcf5c66c0d2b9bd936231eb539d209f6a0690752d6e66f289a01ccaf339aef99df8f9174 SHA512 1a7fb2c2a773392d596dddeb5606402a1c99c95f7e11031b6e842c25fce4549d1628c760288763b018ad4f565aef941d3a75d65a95aba25d330ad284e1ddc965
-EBUILD marcel-1.0.1.ebuild 734 BLAKE2B bd896c582254af298d87cb598648ef38dbd3e1a8993d04f4afe95b31bcf5c66c0d2b9bd936231eb539d209f6a0690752d6e66f289a01ccaf339aef99df8f9174 SHA512 1a7fb2c2a773392d596dddeb5606402a1c99c95f7e11031b6e842c25fce4549d1628c760288763b018ad4f565aef941d3a75d65a95aba25d330ad284e1ddc965
 EBUILD marcel-1.0.2.ebuild 748 BLAKE2B fadeed4846dd5008d256564910082127bf36f097f9145ef1305c96b997a94b7e94d3c5b0d07c215250489ddc35cf2721896d306a3f45d0e82c0fd103543f1da4 SHA512 93614a144459c61a87efea2f9a08ad01409ff010ec90f6b921dcfa6c22a759e8ff26f133a62f7e365eece36123f9922033318aad9566d26c576f3cf993fb33d5
 MISC metadata.xml 342 BLAKE2B 44cc52444c7ccbf38932c88133d066cd0740c8eb8538fca85665e6d7d17aa75e92ddfa941b37226a61c577c520e7240c6754ce5d94086f426cafb9b2483ccedd SHA512 59eb5165fb820bd9a0484522c5a73942d7679a2eb2e7324a4b5050c4dc3cc28089fee755de0f1e117ee31c5d6fd3488e0b5c009de884431205febace1046a8ad
diff --git a/dev-ruby/marcel/marcel-1.0.0.ebuild b/dev-ruby/marcel/marcel-1.0.0.ebuild
deleted file mode 100644
index e7b50e045730..000000000000
--- a/dev-ruby/marcel/marcel-1.0.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"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple mime type detection using magic numbers, filenames, and extensions"
-HOMEPAGE="https://github.com/basecamp/marcel"
-SRC_URI="https://github.com/basecamp/marcel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/rack )"
-
-all_ruby_prepare() {
-	sed -i -e '2irequire "pathname"' test/test_helper.rb || die
-
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/marcel/marcel-1.0.1.ebuild b/dev-ruby/marcel/marcel-1.0.1.ebuild
deleted file mode 100644
index e7b50e045730..000000000000
--- a/dev-ruby/marcel/marcel-1.0.1.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"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple mime type detection using magic numbers, filenames, and extensions"
-HOMEPAGE="https://github.com/basecamp/marcel"
-SRC_URI="https://github.com/basecamp/marcel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/rack )"
-
-all_ruby_prepare() {
-	sed -i -e '2irequire "pathname"' test/test_helper.rb || die
-
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/maruku/Manifest b/dev-ruby/maruku/Manifest
index 1885e129ff52..35a98d2d2317 100644
--- a/dev-ruby/maruku/Manifest
+++ b/dev-ruby/maruku/Manifest
@@ -1,3 +1,3 @@
 DIST maruku-0.7.3.gem 140288 BLAKE2B 31da6bf63272a2e5a77aa6f3cdc1462f0039751424bd0888d69f2f2660534cab8868238cbde37d184c2ddbe50b76dbfa5305a450fc27b9995f74284a1f962724 SHA512 efef3eea7451e32c06c0820834cb98eb5424f6837b2e66e44482679d73d958e1e2c59e790a3e5ba26e0c91ece0a5c17f91877a7797d9a15a73b5344b0d444507
-EBUILD maruku-0.7.3-r1.ebuild 1233 BLAKE2B 04b6aaf64fa9e16a669a310774cd67d08de66054ba537948dc8c49e24ba54192a9047d5d12b78eb714eacd53990eb1c79e1c0f810a33675179fe83100e7ffc26 SHA512 e1ba5227d1ae32bf456fe5550f7eaed510ccf1cab7be8a188ed0236fd623e2b4765c6b9bff04f7972bf986cd383f46cd83a667f6ae915961e017a859f8332d52
+EBUILD maruku-0.7.3-r1.ebuild 1239 BLAKE2B 42956c48dd8afa129702ee3d5c7fec2905d70843826afc231caad497bec96de51ab9fb2b401dd75acbcd0db4cff7bb2985fdc3067d21338d7d077d367a72f2d6 SHA512 b0e04d6ef85db43693cc85a6038e6bec829f45bc7d67d3388fc9a09be400a4a7eb50d8ed19e487b372cb79ea02fc452bad4bc00271bfd035d4a5a707bc8936d9
 MISC metadata.xml 455 BLAKE2B 10b13a2bb9be644ad468326dd7a4c2f2fa6ca8878e91cd8e7665f92e23c41663ff6dea3cb226d4364c8c1cd3604add834f7b48f0f5e5d343f4d8495d9f3fbc54 SHA512 57deb0bac5a43c68871b67e6ddf70724b3d9244edc535b50d488f571ec7807b7eae1313585fa5eec0e39690998dbfeb80b92ad6c8525ac9d71fc6d169fba154d
diff --git a/dev-ruby/maruku/maruku-0.7.3-r1.ebuild b/dev-ruby/maruku/maruku-0.7.3-r1.ebuild
index a0cabf56bc89..f5687ce1e7e2 100644
--- a/dev-ruby/maruku/maruku-0.7.3-r1.ebuild
+++ b/dev-ruby/maruku/maruku-0.7.3-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/bhollis/maruku"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight test"
 
 ruby_add_bdepend "test? ( dev-ruby/nokogiri-diff dev-ruby/syntax )"
diff --git a/dev-ruby/matrix/Manifest b/dev-ruby/matrix/Manifest
index 86808d5e1a05..a729908d7b4c 100644
--- a/dev-ruby/matrix/Manifest
+++ b/dev-ruby/matrix/Manifest
@@ -1,3 +1,3 @@
 DIST matrix-0.4.2.tar.gz 42649 BLAKE2B 03b7f3482d6d5a48c626fee824039c182a35242a2c25875e7cada4d781d1939ed780b5cbf8c45645d07c81e4f5d5c5559a1ec236a5152e095a60228e4ed3c59e SHA512 b47d1d662acdca703afd323fe9293726e051b0ef87162ff45c26c62fad2f3158f71d943f36f7c6706702885e2fdea8483b37ee45f25295225e86dec5f88590a4
-EBUILD matrix-0.4.2.ebuild 863 BLAKE2B 3781f872d5ace1f2a5b7a01e00c59fe23f910d9b497ad85fbc44ab26b33eb61c97847a09217c8ce80a28ec98fb544494bbd1330815a5df205f279f31489be534 SHA512 2c0753ac10a1ee27daae7beac40dc00375e9f6730e0befb44369515a79242a7b8023656527419a5752f8dd66bfb088c04ab902c8baa2920faa3775a7d46ddfae
+EBUILD matrix-0.4.2.ebuild 862 BLAKE2B da4b311a51b2e05cb59c3dea80cb82413f91885d4ecbbdb6b4e43d5060b074fee5643996a1373ab42e3366028656336e7bf170b76f3419dd0c3af327750d5184 SHA512 c7ce3ecfea2381c16fce4f32809b6982bd3cd7b53c03614b4ea5274ac3c0fd2bdfd5832ec55a78eddf4807d74886793221b4bbeeabb72cae6b4d9399f7c5eb6f
 MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
diff --git a/dev-ruby/matrix/matrix-0.4.2.ebuild b/dev-ruby/matrix/matrix-0.4.2.ebuild
index 6bb1a3c6ee61..27da3bcb74de 100644
--- a/dev-ruby/matrix/matrix-0.4.2.ebuild
+++ b/dev-ruby/matrix/matrix-0.4.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/matrix/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"
+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)"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/mecab-ruby/Manifest b/dev-ruby/mecab-ruby/Manifest
index 0b98864ba4f2..0f17f903e6d2 100644
--- a/dev-ruby/mecab-ruby/Manifest
+++ b/dev-ruby/mecab-ruby/Manifest
@@ -1,3 +1,4 @@
 DIST mecab-ruby-0.996.tar.gz 48723 BLAKE2B 205cb2764327ed9e377bc94d65711555683bfce55e87b7a2cc4a985df5078b598c932fff23aaca889040295b96ebf59b0acbcfb638e42f71c6ed338a2b9a6e37 SHA512 a6beb9992d441118e4d824a7c8378bc1bd86d232a843e2327ab43cac0e0b1bf65c17f27ca8787f336c21796c77f4e8c350813e1ee84f7938654d1dcba876b4db
 EBUILD mecab-ruby-0.996-r1.ebuild 737 BLAKE2B f521a517a3e7c39cf8cb508cc79c74fbcdf943487991465033bb20e9a4a2eef0dbed053f31a43f6e38f4a594538911cc1c0adaa699a83d6f6ac417c328f07381 SHA512 d2b745fff5035fa514c07e66640a3e682cede6e3aec40d36b7677e88d261d2f25cd163aaeec87ca3ff585d0d582d9002c4aa3a5e23fff0a6f7cb9fd1dbc1d48e
+EBUILD mecab-ruby-0.996-r2.ebuild 747 BLAKE2B d24f56b70145a14dc6e36eeb182632603bd12a234743ea02547badbf86b59f65494f227c336f16ae98ccc861e4f85a7726df63a00b6b22b0536ce8e29bb44d22 SHA512 04ddfec5c32ce1908e4e16c62a936aec78b8959cec97298d2422d0e6a073093b6225bd17b7101fca3e601f6f663cd236818385a90ff9d079ab9aabf4a35967f0
 MISC metadata.xml 413 BLAKE2B e30f9d8b15a3ab4419d79cdafa6615e9d7d353b62732b4e5bb819396f22ad951d485317b1da5d36f7e471fed9037d6efc9753e7e0f26e0c6b73b4501f50e1fc9 SHA512 99d12f9ea78a09e7b4230b8520a18d3d8c8d8d99cf77703c8a0bdcf7df63f3de64e8cdf30df7d046f5e5f98d2113abcca9c25de7671edda51da1a4e6fbc530bd
diff --git a/dev-ruby/mecab-ruby/mecab-ruby-0.996-r2.ebuild b/dev-ruby/mecab-ruby/mecab-ruby-0.996-r2.ebuild
new file mode 100644
index 000000000000..706c47049361
--- /dev/null
+++ b/dev-ruby/mecab-ruby/mecab-ruby-0.996-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+inherit ruby-ng
+
+DESCRIPTION="Ruby binding for MeCab"
+HOMEPAGE="https://taku910.github.io/mecab/"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN%-*}/${P}.tar.gz"
+
+LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="~app-text/mecab-${PV}"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS README test.rb )
+HTML_DOCS=( bindings.html )
+
+each_ruby_configure() {
+	${RUBY} extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1
+}
+
+each_ruby_install() {
+	emake DESTDIR="${D}" install
+}
+
+all_ruby_install() {
+	einstalldocs
+}
diff --git a/dev-ruby/memoist/Manifest b/dev-ruby/memoist/Manifest
index 1d7c97242c41..1a16bdd102a9 100644
--- a/dev-ruby/memoist/Manifest
+++ b/dev-ruby/memoist/Manifest
@@ -1,3 +1,3 @@
 DIST memoist-0.16.2.gem 13824 BLAKE2B c3ec292126cd5254a2561317554d4bfebd11155de88138bf82a2a09b4342a0833d87cad33dc149cd40bf962843230161b766fcd5b03c55c1d55fd705a5e768f1 SHA512 8de7c73362e621c420f04e1b37c27a21fdc46c5e341c8cfbfd835f1cb53eb1a763dc43565fcc9723bcbdaa439a7c6921a8541a741646db4ef127cb8f6018fb10
-EBUILD memoist-0.16.2.ebuild 502 BLAKE2B 78b06d93c0d537ce8324668d3ffc266f11e04a3351022b17e9a52aaccf9465b9d9c1818049af2a3c896bb9f895c970aa7ab967e909390f1d894697a01347bdf0 SHA512 80ff1ebc045adaede54f7cdf723333b74ca8c707596bc98262347a4ca31fcba50308eaa6e7490de64a10c3cf5a2b521bd4edeb48d3e6c2dba729ebc273f5b466
+EBUILD memoist-0.16.2.ebuild 502 BLAKE2B c9c0055004b45b55886da440b01cfa1ac8be52eb4ebdb0a284c0e598da5d5c8f540287e322320e7f3cf195771aafc8dbcfaca8643d17b1be0b7cd7b0938b9faf SHA512 051671b24735dbbf9eb7d01ea5dfc0b59a61bafbd4ed41ee600541d0a12d84a7ca9eb7bd805f9f6d974a822a1d6d907df8ef5064458d90d5fb989e0d5a578170
 MISC metadata.xml 508 BLAKE2B 800cdd536326682632564b66b629c9e6a3d1c47fe49241598a48bc32bfd2ca0ae0629e23d8740ca38fa0d7d50833efdfb29d7bc26431e619d475544d95685096 SHA512 1b040f39600c1251b665d909482ee7bb0812fdbb0c13e4e5c9f28b7e99945ba3bd1b193fc095c8366f022e01946283958d23afa1fadb771ab04d5ce11f36e523
diff --git a/dev-ruby/memoist/memoist-0.16.2.ebuild b/dev-ruby/memoist/memoist-0.16.2.ebuild
index 9c3a8a3098f9..bd0d05fb7fe8 100644
--- a/dev-ruby/memoist/memoist-0.16.2.ebuild
+++ b/dev-ruby/memoist/memoist-0.16.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/memoizable/Manifest b/dev-ruby/memoizable/Manifest
index 59d3c5f1085d..9ec09e7d8b6c 100644
--- a/dev-ruby/memoizable/Manifest
+++ b/dev-ruby/memoizable/Manifest
@@ -1,3 +1,3 @@
 DIST memoizable-0.4.2.gem 13312 BLAKE2B f1071a8ae50820c3a1d79950c09bf85c3885b4175c13dfe5ae24c6ab521b9ba74368544cd5d4e3d251629bd849d4e618380b45ad263986f30c547d80de25277b SHA512 6fa80eea7922bf93f9e2fcf88c0d0890e658820e8fdf9fc6bf7becf822435fbb95332a1d7b51aebb85018e787d87500899eb4d95f7467b6b2eb7c391c0e9583c
-EBUILD memoizable-0.4.2-r1.ebuild 641 BLAKE2B cbe3a8c6f78fc235bc2c1f453fb6b120f81788cc0c48705d4b9df84cae8928110c0bfb4538569579def85f7eb5826e6847a4fd2712319b08f8937257a707f713 SHA512 2e95f709cd4b7a1757eae1d24279d40c14a736a11345209c0b29c8af3304182465b2379818467494c1af45664df3209b807d1216b9dd688423e30ad0330ea546
+EBUILD memoizable-0.4.2-r1.ebuild 648 BLAKE2B de62b587e65e17f5c69a9a6408f579a9abb25455cba3e537accccd5f49277cf246d977956e3665133014bb56f8095d2712dc5767994107ef08b712d6fa481e49 SHA512 435b51ef93e9b85fc6e2f676a2cf2a6f978e064d814e614b51fb8b4be6188358297b4634f9931286e0ce1c53c9b1c0fc2a5b7a9f8ac3115aab445f23226885c6
 MISC metadata.xml 343 BLAKE2B bb8cf546f7e68d0cc6ec4a01209396525a31c5e79bf2e0bd2a5cf747b9fd84918a150ace768aab867b0be0e8bc6c25bc1f6e22af0ab8114f928dfee28dc9259a SHA512 1c77e9d1d31842961903c6545f07e690fdd5b6c8d0cfc3c22667bdb3ac0c6adbd85d0ff2dc4171477f7e3b3207dc293a916713b67eaaf04321cdfd709df156c1
diff --git a/dev-ruby/memoizable/memoizable-0.4.2-r1.ebuild b/dev-ruby/memoizable/memoizable-0.4.2-r1.ebuild
index 5bc8fe628835..98dd49f80c74 100644
--- a/dev-ruby/memoizable/memoizable-0.4.2-r1.ebuild
+++ b/dev-ruby/memoizable/memoizable-0.4.2-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/memoize/Manifest b/dev-ruby/memoize/Manifest
index 7d390b8f596a..7eb359381237 100644
--- a/dev-ruby/memoize/Manifest
+++ b/dev-ruby/memoize/Manifest
@@ -1,3 +1,3 @@
 DIST memoize-1.3.1.gem 7680 BLAKE2B 3636f1911b6aac615a216edec8a154cf143174b63904f62120dd92123dd390193aea43967c60b3674f5ae2f81dcde9874e90c3222bb211e64db58a31eda174ab SHA512 048e1f6025519a32ca828cf1cf92c97ff94a0fb60ac64bf5b4d59ec715e610472307df8905f06f0be3d46529bf8eaaaf4d4874463b6e46934af0fea4766fd3ce
-EBUILD memoize-1.3.1-r2.ebuild 491 BLAKE2B 7c6d05dcd0df5e82283ff2372f08767fe00f4721924d86c38ac1fdfcc3cedf995b81812a65125356b214a8513b3d4dd72a24adf61dcee32c1973adc02aa0ecca SHA512 13334107dd216d2eccab847b22541204be2b13985c57b099ce9262de241e87e903efc3715d2dae4652a57cf23780c94cf792f1c207dac71f8f932b40a0395cba
+EBUILD memoize-1.3.1-r2.ebuild 498 BLAKE2B 53ad482f5439bb439f610d1edd1c1c35641624fbb0b7f3cc31d506110e5612aedfc51734d7f76fc8c71acdbde4037fe9455021d2eaeb975a8110f765fd2e4d7a SHA512 f905e7380be491e909c4ed0b6d2e11089349148c0dfc06b057ef0712bbf9c43ffca3ff5298dcfd3e8a7eba21d385160834413e9851efa7b3965868da02aac901
 MISC metadata.xml 454 BLAKE2B 83bdc5ff94c918a862a0cabab78da72726cbc03dd07de3e333ab30b8b8c462687ec6117cd81e9676ff0e7af07139d1c02a67f73aa53fb21052148aeb7e46e20c SHA512 35c5aef79e95edc3a11750d84c2d4c9fc13fc2658dcc1d7ba58fc2c5c9ce5125a462dc0674602abbef7ad238ed3a3f9e4f0108f3c35ceea8412123356df83605
diff --git a/dev-ruby/memoize/memoize-1.3.1-r2.ebuild b/dev-ruby/memoize/memoize-1.3.1-r2.ebuild
index 20f46c97d4de..8ff665ccf067 100644
--- a/dev-ruby/memoize/memoize-1.3.1-r2.ebuild
+++ b/dev-ruby/memoize/memoize-1.3.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_EXTRADOC="README"
 
diff --git a/dev-ruby/mercenary/Manifest b/dev-ruby/mercenary/Manifest
index b1e8f3278ce4..28cd4fd4be89 100644
--- a/dev-ruby/mercenary/Manifest
+++ b/dev-ruby/mercenary/Manifest
@@ -1,3 +1,3 @@
 DIST mercenary-0.4.0.gem 17920 BLAKE2B 298d4f0e2e44e32d18d8043d0af41094a8ffc041690a022133d2418242d97d56979519d54041be213dbd97eb75217ec4a4f2c6a3335f5a7dfe04aeb9d765a3ed SHA512 1421bef136587f7c7cb3296b115a90f389ec7d61e7bbe6c396249cd5e090ac548c82166bbf2c43cc589725a740faef5b5f0e921fae8e9948fe506f80578045eb
-EBUILD mercenary-0.4.0.ebuild 442 BLAKE2B fe522ddc60c499ffe400292793b3ec2c00d9b304a454b7dde1bbf27dc43f98c76c10214a3adcb8ad150956d3e8751a6fdb3f232c7c9470c99f998b86408ef558 SHA512 77250ca69d24239d18bcf1f016882a1e326472393e2f5adfeb5ad54a8e80ceecc4af269dc8b11227539ec840b603e0baae152fae106c20d3b69b52c934b6ed3a
+EBUILD mercenary-0.4.0.ebuild 442 BLAKE2B bc41252596f3ffebb566d73c82662f9e0750853b775450e27a5d889e745f33fec41340a21b15d9e5893dfb45219868097667f3927a1bad6fa436ef00b8609f41 SHA512 82d21c26b76c3bd396dcd9b0e1bf815117011287b6bc16b09af77a209e2e5a902af3e4a1b86fd1b166a00ba493e58a069a2cd00054ac3fce04ffb3a39779a9bb
 MISC metadata.xml 343 BLAKE2B 296583e364b4267d0eb5e29092c8b012a2de1660ee5992cd8107eb9db15f2f7cfe637d7ce351ad40473183c873bda39635a0a6a7256cccb7a4dc8b1a91a41024 SHA512 026fd6932f2273fb86666c83700ad0767ba61d7381390b985a38a869ca018608cdf27cecd0ca982b734987f6db877953b0d8aff83d771dc3adc04f1004287f08
diff --git a/dev-ruby/mercenary/mercenary-0.4.0.ebuild b/dev-ruby/mercenary/mercenary-0.4.0.ebuild
index 78df0e87a38a..df32666d489a 100644
--- a/dev-ruby/mercenary/mercenary-0.4.0.ebuild
+++ b/dev-ruby/mercenary/mercenary-0.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="History.markdown README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/metaclass/Manifest b/dev-ruby/metaclass/Manifest
index c0981fdac269..c627b8a207a6 100644
--- a/dev-ruby/metaclass/Manifest
+++ b/dev-ruby/metaclass/Manifest
@@ -1,4 +1,4 @@
 DIST metaclass-0.0.4.tar.gz 2482 BLAKE2B f4993bbe61b0f4bd1b060f9e8b5ea0a6f6666e5012b31b1d5913c1bf31aec94f344b88f35e76c9ec9d442604550b7765a20f0683beaae0025ee64f1212237f35 SHA512 5f41fe3db9c682ab6ab01c737c8531d2b4c2fdbc0f35f8fc9f40ce09a84ddf0d442c17caa1c3e87bb2c5e4703556c5d50fd9f72434b89e03d163db375046f0a4
 EBUILD metaclass-0.0.4-r1.ebuild 847 BLAKE2B 8fc722ab742ac15f607871e6425f4ba88cbf44f0c660195cea2ae393ca28a21bb00f85abd2f9860f088b2ab04b2b6bf38f2dc749b4e1bed56ba70a796f3d15fe SHA512 0227cfaaeece75d7a0fbcfb5247751fa2240573d0b2bd95ef1c2aeb2e4e54ebc1da252ceb64b2b6d91c8a952b40b2b77460a0aa2042253edd1e6a7a487bcf981
-EBUILD metaclass-0.0.4-r2.ebuild 856 BLAKE2B 04e3befdd5b190ebc6898a80649c487441fb07620f9b3486b540a912c726ec050adbd0ddd852b79ada089fd688b0c61ad5366611cabec5fd81dbd896f65be662 SHA512 c9d61fe8502d4c722056a6d3b7d111df50332fcdb70ed31e32730558e5678d9b7b218d8f270c9423b018c235a171901bb9f697bb01afbe4355ff229eeb014a50
+EBUILD metaclass-0.0.4-r2.ebuild 869 BLAKE2B fae29d558efe9bf82c62d6d83f036bf830b6416ae49d01a85959019361d0e7abb189252846b6a1f7b056c0b3720c5f156adde6e4cd6eb79aa2fee606aaaa5636 SHA512 d8c8ce864fc4c457290d1d111d344293307e9c1782642d54dcefa871941c86247dd77b5626f65efd588d9041c20bb820c324a40f64a159246668bd589ded1e1d
 MISC metadata.xml 347 BLAKE2B 1093da3137b5ca6e64f169682334f228dae4213293b9f5cb4cdcbe4517d9738f00619800d4b8a9e90d2ca1243e5cf493e57fc744c8ae4c84008c2ddb90475e80 SHA512 088829e4c3f6509674c2a9fc024e7fbbd78181066f53f0352121649b274cfdc53bd5f933db5052f24e858bd5ddbf005678e7a7aefc2cce669c5e9b82c6fa9540
diff --git a/dev-ruby/metaclass/metaclass-0.0.4-r2.ebuild b/dev-ruby/metaclass/metaclass-0.0.4-r2.ebuild
index f426efc3f79b..8942bd6c6211 100644
--- a/dev-ruby/metaclass/metaclass-0.0.4-r2.ebuild
+++ b/dev-ruby/metaclass/metaclass-0.0.4-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/floehopper/metaclass"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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() {
diff --git a/dev-ruby/metasm/Manifest b/dev-ruby/metasm/Manifest
index dd4d435dd339..3052281e1220 100644
--- a/dev-ruby/metasm/Manifest
+++ b/dev-ruby/metasm/Manifest
@@ -1,5 +1,3 @@
-DIST metasm-1.0.4.gem 802816 BLAKE2B 8950f4c3c0d56bc414795c5a348fb07767223163c1cece4a7b5f5374b1c9c901a576b6adbb10d28b6b4541649e176863ad68da3a7e2155025c7f1bc9eaadff90 SHA512 35fe98bfd9d8b2f0d6a69cce409319288d9a54458f22a308682c3ea432e2c34d50d33a3849c08f773e87ee0a67aa5cc6bb337ec99045f23b6aca43c9f5ce70cc
 DIST metasm-1.0.5.gem 803328 BLAKE2B 24ca2cff66257b063007b872028d4fad541584bee031dd4caacf2a89ee8f823e88dec8a2cf41815c72a5ef1b8db827b69fbb8ceaabee4d67de73aa04c15f354d SHA512 74a6eac47c06e7ff53f4e400fec6c6c73981bc58d09520ce7cdd657b6b74819fc5b9d6168edaf90eeb5c9b2087fd4924df1e21743809065cc1433428efbe1dd8
-EBUILD metasm-1.0.4-r1.ebuild 844 BLAKE2B 7312f3b33f762c2cd93432d1a099ac1bb4d1c0a50e331b9bf3db829cc9fce33e7f643f20152dc2b290db8a95ebd4ce06d68b3f9f3f66819a7c2fc6a17a5828f7 SHA512 5f8bd2ed69a51eb7648f1326394ceaae2d486b8f14954ab7d80a9d8d2884ee7cea4adec10c903ce4a57dfabaaef6493eba9de5146de613f3d7805d219623703e
-EBUILD metasm-1.0.5-r1.ebuild 851 BLAKE2B 7054fb2487a970ce7a7f18c08fab21b619afce926278195e8e2f78df8b9f1548c52892ec35204ea5de41237cb202a881aa4acc675e77b3182623112e7a8bf395 SHA512 fad446eff9d6656c801952732f7f1bb4c2786afb739df46c2ce7733f106a2d9b1293929c46361659dde7b434b0200b6a397fe9f33fd42569a972e2d2ac7ffb8e
+EBUILD metasm-1.0.5-r1.ebuild 851 BLAKE2B bfd9c451426028a16187c971adb57a0119968fd20426a49870efb0e5231d1fa406b1ab96ae56eb72c4b9e97853634a2e7d7b45f98bd580288721f0238f04b0e4 SHA512 026cb02a85cdeac610395973889f6faea15ece38e359a3842d2b92a406d091c2cfca6c0dde2f617b48483f9b8265e6719d4337dcdd9a7d1f1ac7821621cf5a02
 MISC metadata.xml 254 BLAKE2B dab829460548990cfd2b33646889a135275c0d7c839f79a5385117c32282800042079806fd3e773c96ffb6d396f46bd01b948af31abdb291e2e72b2a2051996d SHA512 6277c743ddda198fe4bc57bf9468533b5d08709b88ba95a1405ad4cd2ffc46421f897d68c73170e8d40886a3baa717ef10df52a00438625fb3fd7689a890b668
diff --git a/dev-ruby/metasm/metasm-1.0.4-r1.ebuild b/dev-ruby/metasm/metasm-1.0.4-r1.ebuild
deleted file mode 100644
index 8810ff79935a..000000000000
--- a/dev-ruby/metasm/metasm-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="BUGS README TODO"
-RUBY_FAKEGEM_EXTRAINSTALL="metasm metasm.rb misc samples"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cross-architecture assembler, disassembler, linker, and debugger"
-HOMEPAGE="https://metasm.cr0.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="!dev-ruby/metasm:1.0.5
-	!dev-ruby/metasm:1.0.4
-	!dev-ruby/metasm:1.0.2"
-DEPEND="${RDEPEND}"
-
-all_ruby_prepare() {
-	mkdir bin || die
-	ln -s ../samples/disassemble.rb ./bin/disassemble || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e "Dir['tests/*.rb'].each{|f| require f}" || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper disassemble
-}
diff --git a/dev-ruby/metasm/metasm-1.0.5-r1.ebuild b/dev-ruby/metasm/metasm-1.0.5-r1.ebuild
index 59108ac0207a..abcd332d597f 100644
--- a/dev-ruby/metasm/metasm-1.0.5-r1.ebuild
+++ b/dev-ruby/metasm/metasm-1.0.5-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="BUGS README TODO"
diff --git a/dev-ruby/method_source/Manifest b/dev-ruby/method_source/Manifest
index 50ea4c7fd741..e3011f0e2bfa 100644
--- a/dev-ruby/method_source/Manifest
+++ b/dev-ruby/method_source/Manifest
@@ -1,3 +1,3 @@
 DIST method_source-1.0.0.gem 13824 BLAKE2B 1b6b4c23b2e73972acb69bf488f39d88fae3bffdc4e28559d880ce817199b9c1da8183f10cf8be5122535415b938c9f3964c9b4bade1dfba7fb4457c052185dd SHA512 d3a2dace01d987203d0520583120bfe08812237602421efc3ec7ff8054f2403b0aac13f15b8b91dfdb6e6679a519f707ede67ea6fed72cd8242edacc828a9caa
-EBUILD method_source-1.0.0.ebuild 452 BLAKE2B f7d7afc745a9aa6abb5041fd798e6231eadfd5539b9fdc3e899f6a6bc4a96eab3524c879baadeb86a99b41281b5209ba1eb8dc6b7b9efdc830c673ceaeb5ad60 SHA512 e0d54866e6b5827e4a985fe573e6d463a2bce879439e38eb1378f67cf717c1dae83800f090f1864b01f9f7932642c1a781dde63acaad368f5d58f8ba7064982a
+EBUILD method_source-1.0.0.ebuild 465 BLAKE2B 3bf24a4f999f2c8c9d3d12c8c0adc6668cdb6d21439a94fb1e80845ab4fd8094693b25c20572c11efe67eda4fee2ebc3661baad496407b4d0259bc19efb1dd3d SHA512 28e2b34e826a788262aa2e66ac1f10f610e3bd39d254bfa5461fcf4c2438b85308e8ea5143960ace15eabc54f34026424f6fe1924f95834290fb2aae9a2e8b19
 MISC metadata.xml 349 BLAKE2B d15210311d83cf9aee12141b24ac880e3832334f84f2c35c846da6d2955345790c4bbfcdcc7355c548bcf3e7fbadca72ce13342e4a333865cc392864449d5c18 SHA512 bbeb32cc215362162d7cdde91e5ab8aa077d2d3ea50d261bd9b242f63833964e338b2ae19503854ceb66ad165de5fac5d87590794322d25ff42d186d13454fcd
diff --git a/dev-ruby/method_source/method_source-1.0.0.ebuild b/dev-ruby/method_source/method_source-1.0.0.ebuild
index 12e14be77449..2380cbb77230 100644
--- a/dev-ruby/method_source/method_source-1.0.0.ebuild
+++ b/dev-ruby/method_source/method_source-1.0.0.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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
@@ -15,4 +15,4 @@ IUSE=""
 SLOT="0"
 
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-ruby/middleware/Manifest b/dev-ruby/middleware/Manifest
index 0b44ca74b7ec..7724536a3715 100644
--- a/dev-ruby/middleware/Manifest
+++ b/dev-ruby/middleware/Manifest
@@ -1,3 +1,3 @@
 DIST middleware-0.1.0.gem 11264 BLAKE2B 27d8db46ef95f30a751c26aade2331285887abf8360a07a99bce02ad1193650edf1d9dab30078ae9a6e56d8e1f3384f7c357d5a01d9a5ed52fedc9d3c4f559d3 SHA512 a485c254accefb915a56a6aaebb0bf5fa8520e5aefb1dca9945f4402fd6fb28cd69b34692d5d276f2f025c6f919d983acba44ef0ad9d8966fc571f7cfd64da12
-EBUILD middleware-0.1.0.ebuild 680 BLAKE2B d28f6f5611ab6a2b8139370843aa04043db9dcb37f48f5d6001010257457d72bb679d980efdfb62485bbe7a18aa8a23eaeaf3d418633c3ad67774a68ee6d95b4 SHA512 380a7e5738e8a39950a3b1046113c1fc011ba88199f92fc2a409471693e8e2d00b5fadc96900a87db54894fb91af8101478a3a3861d5be249e33f154c0a29ea4
+EBUILD middleware-0.1.0.ebuild 680 BLAKE2B 3ffd1c014f71b39d8a2eb2ee006edd2d34fb53c46aa0cdda9f71c9b1f3c890a3bdff21b551ec630e123c5bd6f3ae5aefceb6797022e86c233d87e01485b7cbd2 SHA512 517a46500a7a1ff33e747d613d4c83a7a38afd809eedd7e1911e59956a0254f0f5fe9dd42c87d43550f06f8bbe909f21f5ae6e3c1fdea86d13850b757492613d
 MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
diff --git a/dev-ruby/middleware/middleware-0.1.0.ebuild b/dev-ruby/middleware/middleware-0.1.0.ebuild
index 26d63aa73db9..ef4b9e788df9 100644
--- a/dev-ruby/middleware/middleware-0.1.0.ebuild
+++ b/dev-ruby/middleware/middleware-0.1.0.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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md user_guide.md"
diff --git a/dev-ruby/mime-types-data/Manifest b/dev-ruby/mime-types-data/Manifest
index b512cc3a8b78..1488f066c8e8 100644
--- a/dev-ruby/mime-types-data/Manifest
+++ b/dev-ruby/mime-types-data/Manifest
@@ -3,5 +3,5 @@ DIST mime-types-data-3.2021.1115.gem 195072 BLAKE2B 233d801305d48a6fc126b8439b20
 DIST mime-types-data-3.2022.0105.gem 196096 BLAKE2B a36b9254e256c86adf7bff10a0c2e2d4d0bd25257ff7c8b5bc65e57012b2b70a5d1ce9a1ef88126a18cf00bf801eb068160dfbdea4119afe8ee99075c54eb0ee SHA512 4b5998fb5d39ba89d4ee4f2f1fe20ec93a6b7214b28b77421dd9f7647b14c88342ba17f709f34640f65ce4c1bda08bd2be4aa35c7f99ea1ba2f9e21458540a00
 EBUILD mime-types-data-3.2021.0901.ebuild 619 BLAKE2B f6943d766129225f958c32ddb85850240a740821ff0a36ab8251294ae1fff7b8b2575481ec90b617900ca26fe9fa0202c2012cdc660b68a2828d1f6f3eaf1782 SHA512 f4e7d2032e92ab1c0390cb34ef967a98738b6c9ac9a152f99bd70976852a4427048f573420f89e68f6d6f224bf7f0c9125dc7a8f4ad30a495453ac731ef48ab0
 EBUILD mime-types-data-3.2021.1115.ebuild 621 BLAKE2B 721c9086925e7b18cf72528451c35e409ecc237460ba5ff0bd646bbeb6fd66cd9b39f0b10c2b5893e8188f191f6d4b2dc4e409c5f04ca5aa105bc5c723f5039e SHA512 3c7399bef269d48c58bef801a3fd11676433e0e159a70630c5e9d430ab0605134eeaddd479fdeacc2561bab6332763b915593493a8a8f739c1c91bc5651f7581
-EBUILD mime-types-data-3.2022.0105.ebuild 621 BLAKE2B 435583ee82a2e720d21295c92320bdd4510e49db440a3c582fc0baf33c53e5d593c2c8d80320a2ac555dfc71b57ad87ef41d3e6830daae7bd0f4da5bbcc40fcc SHA512 56bf53da2f331796b909c57a3352c9781e1484221cdf45d47a9385f547b27238d3cb7d76332562cd68043db9e6a3d9cf390c13f0c09139ebc934c1985bcda258
+EBUILD mime-types-data-3.2022.0105.ebuild 638 BLAKE2B 8911f1a50a14cb6ec5da209527935c23a12565ed3651b4fee74fa24e28657a672809f2e37e434a6ef6913060ecadccbe74c4f2701e4dfe803763492e7dbcb342 SHA512 ec6cade17738f4f4d8cd2c319f8eb9b8c294c961934844558b71a28d53af4ac11177bc20e8302c4f5f8af56f7e13be166fb18809a916b3fa4d70310b12204ee8
 MISC metadata.xml 353 BLAKE2B 8cfdcb1624b48ec3419ebaca31fe8045773377232977772d5445558947c2c0272c8777b5949fa9a30fc41275082fc284d6110ce640d465d9f6ee4c6f70e7f470 SHA512 072336e2f6abae82b5d66bd077d0b3651b6d8a3c1846d1e6e84974e0cb275881a986ec4fbabde731aeab59eb956514c44adfe5b67b185660f20eb1a286b22a26
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2022.0105.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2022.0105.ebuild
index 8b427a509007..3fb67a37c4c0 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2022.0105.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2022.0105.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="History.md README.md"
 
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/mime-types/Manifest b/dev-ruby/mime-types/Manifest
index c2d74eb32ea5..469dfc73266d 100644
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@@ -1,7 +1,7 @@
 DIST mime-types-2.99.3.gem 149504 BLAKE2B f0e34e5379948e5e742f3d9db0214bcf40bcdf425866509fe40e74188673b779da11980ab68d202c5129295ecda1a19f4b177f51f1add0b413f29669717060b7 SHA512 1a71cbe2baed27fa14a914e2ad112545c42c7560e93617a41fd3a5bf61e0ee1e5b5385e0cca7488302aecfc25eb6cd071a33d57291aa4c3280cb2621989daa48
 DIST mime-types-3.3.1.gem 36352 BLAKE2B 66b97cc51d157d445d05823a3059efb6684a59d6b976945df77beb6497979a83d3ada4832cc36a42b6fad2353d1b5f2d7d1271a7947a0264978f30b857c0c7c3 SHA512 48646c5d3cc1b65ad0418bd765c86102d5dd7d0196f1b2b4b92acd350d6927e0c0fec3d30d04bf8b073d342f56b38663dee791f2c87f82b5743c6508265692ec
 DIST mime-types-3.4.1.gem 36864 BLAKE2B 09c6c2fad3cad3535e5c357b49c84b2c1809903235f3bdbeeb766157c48bfc899f32fe95be535feab3c7835c4b535e25b49019c14f51dee1a812fdb735f0f7af SHA512 d0cec7afbe1685c008765997c3047f23bbb0bd10989cd82475805f932e61c400b3d2e60f5f95804c46919b57f0d3644c866be358b0c4c653ace43d62bbc98e4f
-EBUILD mime-types-2.99.3.ebuild 934 BLAKE2B b83b8bb6be90235512ff723aa69df883067ddec136cdbd36c4f3ddbfdc368ab94e65a65d7cfb01f049b1934269a150544abe41c4a24ed471dcb3994b79759495 SHA512 0d3579612ab146f222ee3c0535d35f49b5ca4345e823910d9e65ff2c603fc4beee1823cbd3eaaa6b94c4119bbc43c217cdb4dcbbd985d15e5881797c7e9b24c6
+EBUILD mime-types-2.99.3.ebuild 940 BLAKE2B 4cad7918c2a0be0f6e9b34cf511ab7b78f3e5840dac5f9efbe7dd4543d03e507c94343ae3e04898869399228a5b7b503af68d2c216fcfecb2e0043279139552c SHA512 cc1fa44a3acd61ab4b578062f6cc422c927d91e17dffcdd8a1ac408ee37d74e7614becb4b52ed4a2745cf869344c1c8773e915fc9fc2eb8c813fcb910815e6c0
 EBUILD mime-types-3.3.1.ebuild 883 BLAKE2B e7def86853ef408c7f97a606f28c26a892a76ed908144d6c4ce3e495335e9671691a168e6c0df4026dc40a41ac414c59dee8e6f73d86be01827495233bfd7557 SHA512 8c2bd498f2b17e8d927b4f2b561ef6eec7754e79a226a524954787dc4cfcb5b85e896076b4e2751c17bb1c81d08ff1892e38f14cb8533a71dede5f0244e82f59
-EBUILD mime-types-3.4.1.ebuild 906 BLAKE2B a69668628e09805999323839c2ffe0978d8044c0ac88380091a14e0be8a05c0fb5835dff489ee2877d8d0cf77f13acff0b59c113f8896e340cc1b8f2c44b517d SHA512 ded630d5dbef4ae267eb13a6df7f613f1d61d39495208b8b2d36a516789911b330d2dc88969aa2ab3faea16f692f0926a09c73b189553c69b072d1baa160b5f9
+EBUILD mime-types-3.4.1.ebuild 916 BLAKE2B 411716fe3e821a43aea9dbe77942eff60dd29bdc0034b9e62f8ecf96ebbbc7c5f38fe87e73847baf09c9530da508eff3540d8d9d06038bd8c80fbc22b86a2b63 SHA512 144534b399470990252be778212b4cd5c1abdf1bcdbc8314542e2c460d8ed49e6b5a4a81b35f1eb9341da4751403b567f33eab3173237f3612e808fcb64693da
 MISC metadata.xml 353 BLAKE2B d3a674bfa5b4ee14e4ae29722f8b03c7fe30f8978bf40654bf3dad99d67d09a34fd2b01c1f347cb014f2d306ffd31fdcb1f8d1f68844d5005742a979c6308618 SHA512 ec6b59001e875f74e73e645b69828d9498e39e0820016eb453341f0f0a14b7d50e4fb188d959a1893f438fb4f8f8c8b0f5422b31bc1e9ed08ca8bfc33d78a50f
diff --git a/dev-ruby/mime-types/mime-types-2.99.3.ebuild b/dev-ruby/mime-types/mime-types-2.99.3.ebuild
index 951d9ca4509f..95fcf9162b30 100644
--- a/dev-ruby/mime-types/mime-types-2.99.3.ebuild
+++ b/dev-ruby/mime-types/mime-types-2.99.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
 
 LICENSE="MIT Artistic GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 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 )"
diff --git a/dev-ruby/mime-types/mime-types-3.4.1.ebuild b/dev-ruby/mime-types/mime-types-3.4.1.ebuild
index 1fe0d52a87de..a13f22394197 100644
--- a/dev-ruby/mime-types/mime-types-3.4.1.ebuild
+++ b/dev-ruby/mime-types/mime-types-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/minitest-bonus-assertions:2 dev-ruby/minitest-hooks:1 )"
diff --git a/dev-ruby/mini_mime/Manifest b/dev-ruby/mini_mime/Manifest
index b30a573aa72b..abd845124d61 100644
--- a/dev-ruby/mini_mime/Manifest
+++ b/dev-ruby/mini_mime/Manifest
@@ -3,5 +3,5 @@ DIST mini_mime-1.1.1.tar.gz 33747 BLAKE2B 2b18012d611157c1ace9211e99f2c6b41931a9
 DIST mini_mime-1.1.2.tar.gz 33779 BLAKE2B acf4fc7bbaf4bb9df9a35aa8f093f3f607b0f57296f29511aa4d0cc8770af3c959f6c2b4e49d0e879dea6145e42a33f02d98a1f54af5f48cb248b95b3f6fa410 SHA512 696d0ddf69ba58671ff8a378e6d8bd302aa5b402f791f090b4d5413f48b90cf19de447d68942a4cdc329f4d42210bd62bf4757c1f226df5129cb269c0004a332
 EBUILD mini_mime-1.0.3.ebuild 1046 BLAKE2B e33497a70f7b14d03d7b243c66feb00732747df3b20a29308d090f5753a561572c4c99f9b7b7747db0f9f8507939b2b4ea55e8df6cceef5ab1aae784986e7053 SHA512 b5aace95732949cf447da4fa1ef44edae876dd58e8b809351c101d17f961b3a0967221c4cd3ba46f757ec41f9bd73362176a98f4e81cf357ff41fb012ac1d9ee
 EBUILD mini_mime-1.1.1.ebuild 1047 BLAKE2B c02b7f7eb3794d22a985d85bdb78463636d4c93b0d50e77751e48c006f5c571a0947940643804b625abb3a35f6ae6122d867fc0026d4fb33c17c77dc8e79fa36 SHA512 3b9c751bf8898f6c6a91753756358bd4ee04500eda39949aaa29426c55c1168eb32773cfc86e2b93da8fcdda785c4274a7aa37a770ebb1fdb465807d3d8fdb99
-EBUILD mini_mime-1.1.2.ebuild 1054 BLAKE2B f5ada0124c2ce99d9a4659fc2dd5a1615c0f25a11d98c56f19f6a26574c90981e02b853ffd68ede323f8c0e421fb7edca59c895d5588548c27ae026b09bf3025 SHA512 d07d419068299425b314e9ccf6315092c9ea97df2f582e30668a4b187680c388a250440195399a055b5412143c628bb6a505eb92bcb17a7771a492c85e545066
+EBUILD mini_mime-1.1.2.ebuild 1053 BLAKE2B 6cf6ca4f27986018228dd62f242e44b5f907da6624a765839db94d7518b01fe09eb5d2be03ded79871d4753bc2b164d05b257b896e48ab3be330ac65e6cfb19a SHA512 8c16c4dab064089f6c8844c6efa21fb85eb4c0e7064a3f6b14e6c2ba6e5e707ca27f849426b14742e731defc3030c2f81d2931021195489386f8c011d69a1457
 MISC metadata.xml 346 BLAKE2B bb121fb3666076fb31b24ae41abc0070e662ac4937121db5514acf8aed87745384ae11778464f6d0433138b38681ed4dcab62bce0ec125eb14c7ae3d411a6eb3 SHA512 8d1419c4178db23f7204cd1d1b219239fadadbe1b33e5aeac8d08d92f8c0b41f6648b6c062814dc00d8a518d2230e91518977ad4243b69d7c3fec706e0e12028
diff --git a/dev-ruby/mini_mime/mini_mime-1.1.2.ebuild b/dev-ruby/mini_mime/mini_mime-1.1.2.ebuild
index 614628696347..aa3313c65158 100644
--- a/dev-ruby/mini_mime/mini_mime-1.1.2.ebuild
+++ b/dev-ruby/mini_mime/mini_mime-1.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/mini_portile2/Manifest b/dev-ruby/mini_portile2/Manifest
index 95b462bde90d..dcec87a39768 100644
--- a/dev-ruby/mini_portile2/Manifest
+++ b/dev-ruby/mini_portile2/Manifest
@@ -3,5 +3,5 @@ DIST mini_portile2-2.7.1.gem 28160 BLAKE2B f134704aa5fc72b01f3304f7b392b1cf665e0
 DIST mini_portile2-2.8.0.gem 28672 BLAKE2B 6bf6347193106aa06221659923d5761c5bb2a88b5f6ec9b67fad859b5804ee5792ed66313bd443e5df58b0399aa815added9c1a9b0852fc767fcb593aca0d30f SHA512 74eb55b15329d31b65d363ce2fda26b849d708bf77481acdf851bdf6c97a8c3f9676d5bebf46e9e3eeb55e0e243c8e995eda6952f51f54b846762ab0f65aa7df
 EBUILD mini_portile2-2.6.1.ebuild 592 BLAKE2B bd08ae4e0754465e4d73fa12cce700a7d8a3b9eaff970e4459ec20eeb9a2d2a05145e8d70787118c7fe9df5933b4495fdc94c6d9c6713c987196f5dab0c19cf5 SHA512 e769818fd24278b16400193882ca4f1b3f1ff07af0c3943b80f0e54d836ef536725019e483e0cbdbf05688ad30734d5f9dc7c7548b9cf4d01cf74ed644fdff5a
 EBUILD mini_portile2-2.7.1.ebuild 599 BLAKE2B 3d4eaebc98009d6f0867025158d4ace9a1bf25076a5cc29d625da7761d733463abc60eaf67908c8ce0f555ad6eab70f42f60d59a8b55f0bdb9f86ff730d6ab4d SHA512 95270a7fea30f12c44953e065564fed21cbd3ec83d4347418c5f743ebe484da6a51f7094b3ec77ef9f0c88f258529df5e977629a47face1a571be10376ffbc87
-EBUILD mini_portile2-2.8.0.ebuild 599 BLAKE2B f30f9bdca1d066fcd67dd89f34e1c9053d70a49e751da7e8341fa4254f7a8a8dabfe641dc36ff73c06932ed89ece8aab9033bec0e9cd68ac70a6814cde1ea4d7 SHA512 57474aaf77f858e4402ee4719e075c56a175fa60e26a0a63459fa172c6b01ae991e7622b22350b6e5ebd51eb12f1e4b03bd64198ab7c6c6d43410dc8673e3c1b
+EBUILD mini_portile2-2.8.0.ebuild 606 BLAKE2B cae102e56ce0bebf5fbcadebbbf3d83aa9d77dcb51eca3a467127577c31305ccb1c6d770ac6810c4dd2e0d9119edefe2f6e30a521f033a9c5e408aba462a9b3c SHA512 cab2829517a91a5c92545add3aef2b99e403273a6b374f8ed9151d9c69fde383e0f21f17a506e254161454eb291c4d22fc93df60800333d7239a45d04d553413
 MISC metadata.xml 351 BLAKE2B 1089816679cc238435b30f4a2365c7d1fe7a15837602f266924604629bf4300462b1ded28a537b9337c9fe13e4b397fcb1e97672bcf901eb65162090a514751d SHA512 80f58025f07a49376e4fab08a8396ccbc5e09ea76eea09263c3388666b14cea9dae84bfadff887aca2468c8651666d5e907911782968b76b7c1f3289036586e0
diff --git a/dev-ruby/mini_portile2/mini_portile2-2.8.0.ebuild b/dev-ruby/mini_portile2/mini_portile2-2.8.0.ebuild
index 80d830ef38b6..b2692b052f1c 100644
--- a/dev-ruby/mini_portile2/mini_portile2-2.8.0.ebuild
+++ b/dev-ruby/mini_portile2/mini_portile2-2.8.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/flavorjones/mini_portile"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/minitar/Manifest b/dev-ruby/minitar/Manifest
index 40ca532f9a53..d90a1173a49f 100644
--- a/dev-ruby/minitar/Manifest
+++ b/dev-ruby/minitar/Manifest
@@ -1,4 +1,4 @@
 DIST minitar-0.9.tar.gz 33873 BLAKE2B 6d285c181510c96f173d850a9411da8a214459da14895e2d186ce712387d390c8ac95e27e4e768005540fdfb7463f32206085a72faf4de6b24c31cb732234260 SHA512 e3aaf0e664a985704cf9dccb72250ea2a7ebb2db9b6120590fb8d5525fe2717e0a90b3020f461ae0c4dfb19dc8728b4eeb6ba2e24ab75d12fbd7f5d98b269c79
-EBUILD minitar-0.9-r1.ebuild 897 BLAKE2B 825d1f66013045d977cbe8e87c1eac6418c765fcd87e0d4728957543b72b3b8c53f2eea21911208f1b0015e49a19464626e6f10d0091d63a531b4cd94e2cfe60 SHA512 bf8723d25e7c155874a45e0211db20313a6ec77aabc751e42a88c30726e5dcbb3a434a5346edf3fe7c820e89af552d707defd82872908cfdd6cbe43396b4ba7d
+EBUILD minitar-0.9-r1.ebuild 904 BLAKE2B 5c4c067eb4972fc732afd94bbb95d00f2bf44ae21b7e6cedcdcf9683cdc13f22d7ae9a2dcfc0c6faf657bd0c120b8c731a677e7a36067e1a3b634c6fafe7a974 SHA512 c587bf1b9ce2675e650d768677c701293b9ce5cc548a2e4ced7d9046e84fb065ebba5bc7757400b010e9c0b7ef3ab87db43fcc45bfca18f916446b012f2a9e86
 EBUILD minitar-0.9.ebuild 890 BLAKE2B c3029dabff83841c43c6efc56d6eeba3bd2d26bcaf391170ed03b593a4e61d2eaf3becd9f17bec9742b8b7cb9511246f393bbb202652c027a203cb33ed36e197 SHA512 9f6570fa6afadbe982fd7f7909e533912f94bdb2b2ecd2d6d241e67d64015a4e375fcfea56c33c99a019f40404dd003746b5cf434d085c47e2c1935128839c4d
 MISC metadata.xml 345 BLAKE2B a46be73631fb9e5d1a47518c20dd0fbf2eb23c106f53c8f2b4bb3dfb2478246c2e764310c02ac1176e602ac0bf73a4daca80c10703a59f1ac861124df41905ca SHA512 8107541ada060cd98c15f57dfb1106cda2f0c5bfc6b4907b90abd7e5e5d8cbd93b2398b057a56af221cc4adb52d063ebb70b7e41c623d5936c720008a24d5b33
diff --git a/dev-ruby/minitar/minitar-0.9-r1.ebuild b/dev-ruby/minitar/minitar-0.9-r1.ebuild
index bd80ebe2f6d2..002969caeb44 100644
--- a/dev-ruby/minitar/minitar-0.9-r1.ebuild
+++ b/dev-ruby/minitar/minitar-0.9-r1.ebuild
@@ -20,7 +20,7 @@ RUBY_S="minitar-${PV}"
 
 LICENSE="|| ( BSD-2 Ruby )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
diff --git a/dev-ruby/minitest-around/Manifest b/dev-ruby/minitest-around/Manifest
index 2b2ac853c85b..83b21ea9b9ce 100644
--- a/dev-ruby/minitest-around/Manifest
+++ b/dev-ruby/minitest-around/Manifest
@@ -1,4 +1,3 @@
 DIST minitest-around-0.5.0.gem 11776 BLAKE2B 1b1bacc229252e41412380d95e50ad05f918c13d37e7939f96fa19e4254c7f5222482d0f080355e5a900ff8ef89f768cc527c9b1c2644817e4d46842cbf83140 SHA512 8e57d436d39a41c5a08df6006a5cd46f92550844f01f9b6662918b9ba9536b74f6c83fcaea64180c7e025a1a14d4e037e1b17b84ae395a2b745e58f21ba5c752
 EBUILD minitest-around-0.5.0-r1.ebuild 788 BLAKE2B 942aa672717ea4b145e12489d7b36aa06c5f5d00f8148234b3f940dc940966bda4a6b35079d23636b5f594eb08bcbc91fa667341a2d745c6f717a324647f9be7 SHA512 a60aa5253bf5cd97210d0845e36b074d548efe42dc6eb171fe5717e4cc863a6718ab36eb08d77c8b9b2231bf2d9a11f56c3e748328bb387b75464296f3bc258e
-EBUILD minitest-around-0.5.0.ebuild 795 BLAKE2B c39eed2b863a2d3c36493ccd80a0d96f96790683e414a942543416fe4510f437e974b55ba4a190b17e9027b7677330659dfba9bf494456dcfd9e35a1ca251859 SHA512 eee4379bd522fce2f67466731708074db3bd71d35e6a7f0894c23cfe35421efc883393d613ad89df5ebce0e090a58b29085c45bcab3e74e92aae09b6399dc679
 MISC metadata.xml 352 BLAKE2B 299495959553f3851c1ad79b58f388357c9ad37d442d77e1ccf8cb857750ba81ccf1d0e87e7387b3fc70d8bdf63027a4356ac0827aac5d8ef47bf7e944e107fb SHA512 85dbb782b3bfddb799c94a0e03f5dd6c75282b25bce995791cf2a383d6324ffa9f36f1a6e99c1807a0cc5f7c14de93924c0534ca40f0fe003a8742aaee0f04d8
diff --git a/dev-ruby/minitest-around/minitest-around-0.5.0.ebuild b/dev-ruby/minitest-around/minitest-around-0.5.0.ebuild
deleted file mode 100644
index 3650de712461..000000000000
--- a/dev-ruby/minitest-around/minitest-around-0.5.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Alternative for setup/teardown dance"
-HOMEPAGE="https://github.com/splattael/minitest-around"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/minitest:5"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-util/cucumber )"
-
-all_ruby_prepare() {
-	sed -i -e '/bump/ s:^:#:' \
-		-e '/ls-files/d' \
-		-e '/cucumber/ s/,.*$//' minitest-around.gemspec Rakefile || die
-}
-
-each_ruby_test() {
-	for f in test/*_{test,spec}.rb ; do
-		${RUBY} -S rake test:isolated TEST="${f}" || die
-	done
-}
diff --git a/dev-ruby/minitest-bonus-assertions/Manifest b/dev-ruby/minitest-bonus-assertions/Manifest
index 8f8b4fae8fdb..107958c5fea5 100644
--- a/dev-ruby/minitest-bonus-assertions/Manifest
+++ b/dev-ruby/minitest-bonus-assertions/Manifest
@@ -1,4 +1,4 @@
 DIST minitest-bonus-assertions-3.0.gem 13824 BLAKE2B 415f8b48875b8335ded9fc21b5430b575d3d104179066de19aa58d1602da7ff9994c8ceb49b1cf34fd4c8553c76999bf1b638d2c44761af84d510ca1e276cec1 SHA512 8b07e5d3be7cf68be53b06f6b545445efd9021ff5423bb67c4b0e8e40aa004d75f34eef3fc23ebe83bceaaa064c57a5ac1b9969a28f48203a6ae4c34092c5621
-EBUILD minitest-bonus-assertions-3.0-r1.ebuild 1117 BLAKE2B e7b896be2b7aafd978a89d5c4991931246ba0d8cb39a753fb199b9333eb93d8e3673c5c81151b3ba1f15a0b6e4300df09a135f81f7a34ba755c40b1ad7c480df SHA512 ababf958369a42dfa55446f623f93c6d1e855faf49a1e2c67da44d18e7b147eac0415d73ae9e8a7a55512493591b254b1c54a2052e6af4d3daaadb08d6695cb8
+EBUILD minitest-bonus-assertions-3.0-r1.ebuild 1128 BLAKE2B 0db56d193af9c02606c60903bad364a423b7798a3ac09a364d3fca575ca076fff456308cad700bd7039c866d65dd4622915dc45d0098f9537a41c48baaf919ac SHA512 e159de50c8dfe46424f886cef8ed0346becf9cc0fd4768fb584928e00b6c71bd3f7b390a08cb7a505c47957c79e3ed9f763990d527b161555dbd2d5c251c8c5d
 EBUILD minitest-bonus-assertions-3.0.ebuild 846 BLAKE2B dfc1e69788e12e01bddf68bdf1eb141910a44e5138db82f1151856306961b182bbc623ab791fd409c7c4366b214b17d468a249b2857153e13d697456085c7bf8 SHA512 bf0058400ce0d284e62785e80ffb03a352923d0234eb2ddfc15e49a377251fd3314833baa9f09ccadebab4a24ffb557de8a43912bd85d31f71f81fb1af1184dc
 MISC metadata.xml 363 BLAKE2B cddd328941ca6a61a46b11a35faf87fd00642046213292f0fdccc30e0a57ea9ad0fe1a17209e0ed0f5732d0f87b85d39f56606b9da689cffd17f420f2bd0b073 SHA512 ff5752a50512efa89159daaf2006aa36f69deb9d354db36996834ce5e61d0776dc6202bedb0610eef0abc0ec175d45db9811fc7f83f534325bafc3daee00fafc
diff --git a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild
index 0f487e76c3ec..2faf0b82c803 100644
--- a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild
+++ b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/halostatue/minitest-bonus-assertions"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-pretty_diff )"
diff --git a/dev-ruby/minitest-global_expectations/Manifest b/dev-ruby/minitest-global_expectations/Manifest
index 26050d96c6d4..ffe8101006e0 100644
--- a/dev-ruby/minitest-global_expectations/Manifest
+++ b/dev-ruby/minitest-global_expectations/Manifest
@@ -1,4 +1,4 @@
 DIST minitest-global_expectations-1.0.1.gem 6656 BLAKE2B 19df8ad02f9dad9711e219389fa2d0114d1b2b07b3d7e263eb69e48d78596184261c5de91d3f03d996bf45e897d1a7ac6bb3efb77cede34203f6712263eb573e SHA512 e63b50b02612d751b1bd0b3c9e100e0f6b674dfa5475434a213f78c5e556004c43f00b9bf5b9c479c2381be87015125a334308fae27d70a6aed1e9b392ece546
-EBUILD minitest-global_expectations-1.0.1-r1.ebuild 418 BLAKE2B 398381c171a8ca67635c7140acf9904cd2ef59471f360b53b952499e49df5f2c65573f4831d0dec2dccf4ea8b3a44d17daa00473696b1311d1b957921034d16f SHA512 db7fce30a6baeb4c9101bdd20a08e315aea8d2ead97a4bde95c27fc0aa859cd43277a026db2cafed79f1f0cce50c4bef96fa093672cf34ddba6f7dbea0ac81ae
+EBUILD minitest-global_expectations-1.0.1-r1.ebuild 431 BLAKE2B 195b17557a83fe29e9f96b2490379f9f18a77d315a86db6b8f4bd1fe0f6f64d0a6dbf63cf526272595e6ad9e77d0ddaa84883924ee9b07964cab863365c230c4 SHA512 b419f3477bc010cbfb4609253cdb78b01b4e66eb6d76265072ed7e8b4447c09305704abdea0e0f0b656085e729390dc17d99f7c97c442e0f2724d1b5ad212fc9
 EBUILD minitest-global_expectations-1.0.1.ebuild 411 BLAKE2B 9cc22b76f0df6e1df77f868becd8150305516fb1d270a2639893ca17b6012d0d156f1cf9a58148679ef66154b7911498ed9b754595d0e890c6fc532682fbfd8e SHA512 45fb38814b375e24123c9ed5cd86dd94fabc36b971015a3c4b68e6f1b95d2f6aa6e1da30448f7e5f078bf1585fcbd87519ff16340f954d014dbd77f196ea07cc
 MISC metadata.xml 367 BLAKE2B ff82042d16a6f4cfec190c8ef280c4e5d0399d492f2d5b910d497599fc82ea55545d88a6b1fd03cc103a4b05581c3c8bd33cf397d4bd79b92a4ec1d3b58c7709 SHA512 2ecf913dbf7dca47fc7e657fc7e88f51ad52824e174de0467399ccbd69d9c2db80b9e6b9e7bf8768a6f001dd328ee4856b050293f68b9b150218faabffa32b09
diff --git a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1-r1.ebuild b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1-r1.ebuild
index a89099b526a8..e791117905eb 100644
--- a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1-r1.ebuild
+++ b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1-r1.ebuild
@@ -11,5 +11,5 @@ HOMEPAGE="https://github.com/jeremyevans/minitest-global_expectations"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
diff --git a/dev-ruby/minitest-hooks/Manifest b/dev-ruby/minitest-hooks/Manifest
index 7b242cfe9855..beddde96f88e 100644
--- a/dev-ruby/minitest-hooks/Manifest
+++ b/dev-ruby/minitest-hooks/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-hooks-1.5.0.gem 11264 BLAKE2B 740df3b75ade3372fbf75ed7bd861c70af6f11d8cd1f37819272b98bc8cd1fad6ea09375856cd48a75499e0a692411c6da4f5aec212ebae91b47531c4bedda54 SHA512 4e7c969485c6e8d3414710b787c8880ad26b71de9f0b4a93ca1bf343deba426feee1cc06fcc51eee05c4880d851664fff045026d44728e217607e4cb32aa8f4b
-EBUILD minitest-hooks-1.5.0.ebuild 525 BLAKE2B 3ac9ca7765178595ded35e726b6bf5b3c035ce6c8a6e66aa74514b37290fede292d3bd5de0959935557eb00b32d6e3684b6dc18b5ea9637f53986e1d6b1ff59e SHA512 247272888bc89e3553b46aa6943483d19ad32db0c83d0dd14e78cadbc8763e706bc95b2ecf252c53447f73db44ac0a5dda5322c14fdd28aa36db3f7d090e22b3
+EBUILD minitest-hooks-1.5.0.ebuild 538 BLAKE2B 586c918386a82b108f5a3ad26dbc66d1b1becee219386b6f0802ee7910269c7c608459e9cb43728c4f7ff5766547eef5aa5d67d492ec44340c82841417a0af45 SHA512 972c603ddef89ec13bb0dc8d36288fda62bb79b46199d643b39f312e493c366e69cb7869c6414d17c923f8ad20bb0f86e4aa994a7602ef7878ed3a6386895dd5
 MISC metadata.xml 353 BLAKE2B 56f918c9b37553f0d6a8a1d2be23fb574be145b5d4bfb159746333d9995bb689701b0f7056bd69f9721c5d3d296a2374d9134f8bf07efe172c8e97f9e8d93a72 SHA512 ccaa8d13d5ffc19a6f52dde413e8f3950c13e5b1ce81f3b67794a53678713c34b5d0723533c2da78bb95808129d76a07e74f3fe4305bf1f1b84cb99bf1e5b9ff
diff --git a/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild b/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
index bf4c2f18502e..b0b6614ee02b 100644
--- a/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
+++ b/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/jeremyevans/minitest-hooks"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
diff --git a/dev-ruby/minitest-power_assert/Manifest b/dev-ruby/minitest-power_assert/Manifest
index f12f68123a85..47e845b687a4 100644
--- a/dev-ruby/minitest-power_assert/Manifest
+++ b/dev-ruby/minitest-power_assert/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-power_assert-0.3.1.gem 8192 BLAKE2B d5b9a862d19776d673fb510d2cc52b6741ac20c9b286228a672e49f681d37d2d2c3517253c70b5d1a8d8dc08ca2ac35f8105717edb74a28b6a2ed8667d94a9c3 SHA512 178c70dbe0db2b2248fa83437241d80c7054bf51e21afce74c61bc178907b98ae5b691e0cb644d5754a497d4944520e1ebf7727f1d7f286b4aa28b4560a54cbc
-EBUILD minitest-power_assert-0.3.1.ebuild 544 BLAKE2B f85b290e612d0be76026dc39014c33b71e5bdd75797ffd59b3467c5b3748395fb3582bb3dc447c401077103abe8df654f82db6c0dd7da1c64be89c35532a8306 SHA512 533a07ce5ccc9c336db24c74b57bcd69d7c355697db4a4f40905ef0378d04d42b8208c1c2da120c0c351626e6a6ae8fe61e6bf233fc97cd04655a0106437bcba
+EBUILD minitest-power_assert-0.3.1.ebuild 550 BLAKE2B 2a64c45cb6db2d8f54022087e852c76abf00564446ce916b5acc9205902ed9ff09f557dcfcedd9a04e3fd22045a7eddd79d7ff2eff5500e73df0651c44e1588c SHA512 06e1e5dc7981ee0c428d59be5e18f7b18c5416aa5f34921b7017f8389891af0ab63a88df8d08b5e34a747f2a115a3b0a8521f99c78c15570c12f2c25d7073267
 MISC metadata.xml 353 BLAKE2B 485abd838ba0c44f8b0c80f09709e240efc2e4922f86fd2c8100a90bcc9668c8e712dbc04844a24a9de84ee67652f2ac9ba608b95ed89cdef160b57cd52183dd SHA512 2835a0301c1b16b3ad23bdc05b43cfa9abfd0f17ad2daa008b417753d56ed4f1e80bbdf22b1045374200483acaf73a6348628d1ab3731ebbdabc8c44f13f22bf
diff --git a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
index 6c87e7aa1a51..a2422721a0a1 100644
--- a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
+++ b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/hsbt/minitest-power_assert"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/minitest-pretty_diff/Manifest b/dev-ruby/minitest-pretty_diff/Manifest
index f713412f1eb4..611305d10498 100644
--- a/dev-ruby/minitest-pretty_diff/Manifest
+++ b/dev-ruby/minitest-pretty_diff/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-pretty_diff-0.1.gem 4608 BLAKE2B 4002f4f2df03885a0c1f13c5561bbf48ccd707f44af44f4e91d4f6337a31791754b3e38160f088abb7aee8ec6d9abb6734d3305dec808033697611864559efa1 SHA512 e04cbbdb9cd12f2b60824dc0e20f5f3ee3e97b6cf3c8b290da941f26af120fd8eb47e33cb501380954ebfd84db817095f2f8a205ea8ee2095868befd443172b6
-EBUILD minitest-pretty_diff-0.1-r1.ebuild 640 BLAKE2B d74a7b97296c190b735cd4e5b3d02c360abd3dfc7e7ced0ba8cd69ac0461f64754e334b0e3a7c3ffa9c774770d7359f3e0b0604293e5b5c3e3dd79e33c66d9d5 SHA512 49455a26c89d979b995dee1888344cd03f87874c0e7395ee7e2ed9904763fc51258150e3e5e445f7775fb01bf458be42ad6b7ae5d761148b662deccda0c0599d
+EBUILD minitest-pretty_diff-0.1-r1.ebuild 651 BLAKE2B 97c7da8141fd7e6e84624cd62e75cc0c693280e7b42d17b16434f1c4e9c9a0cba41ad9e5e96fd859d94d1f5efc8f6f87e02a0ad1a5047ff26da3054535b0d162 SHA512 af1c316d6d07a1c830304a494a247c2d49ead82bce9b78e67a082bcfd361610e1d7df14215dfa81ab8c041461af56c625e47f384cb20c1b352c25c2b5c1057ee
 MISC metadata.xml 355 BLAKE2B 71048e6e7841c99f5b2839218dfa55c624dd65c5d1eeee78b052e5454673654b32d32ac83d16fdfe7d35a627ada679b2e12b6054da095ca1be8f0edc462c074a SHA512 963e6f989b1d1de6c99b247ae05b7494c08f498b5dfb2bf32ec1146cea08b0942941f3bd8f9aad050bf4997f6fc86bec9e3b74fa94ab58e0b3125bfcdf5749f6
diff --git a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild
index bd3f0187a0bf..813cf333030b 100644
--- a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild
+++ b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 inherit ruby-fakegem
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/adammck/minitest-pretty_diff"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 each_ruby_test() {
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index 0fda932ee20b..35c88b115ca8 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -5,5 +5,5 @@ DIST minitest-5.15.0.gem 87040 BLAKE2B 71e7a7952c25fd37067a449867d74a2f18a8a42d1
 EBUILD minitest-5.13.0.ebuild 720 BLAKE2B c0dfaa029354a66dde23b3cb3fb1655e88cbd2d1fd8bf97bda8573e003aef8980e95ca1b38da252687c465dcc8309d62f5ac5ca7a5656971a559c9208dfa8ef8 SHA512 09c38e025fe40616270f14f05a7716b3a1c703d2d504dc3ff612f38403874f54e927835fb769b8c80c01c27c03f2f4ca7e6bf72f72feffbd585cdd6009ea257f
 EBUILD minitest-5.14.3.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
 EBUILD minitest-5.14.4.ebuild 735 BLAKE2B 22766653091e002fa662a279753ed8ebe22283ccab1156c7ddb503864f41251e1e83270f00dc5efb0496ffe0165b37add6318ae65cc04b2fb0ae2746aa8ebef2 SHA512 9fc9d5bcc391cdf6995995bfec88f39e91e23838edc4c041f17ff1accf667dd5a34ce91c36b0fed0a05f98713612fcfb4a600a45c3d857e981013d4dba43d74b
-EBUILD minitest-5.15.0.ebuild 754 BLAKE2B 72fba54559ccfa1783a91c218533c915c2acfb5ca14e8193a82b6b3e8aee4939f75d17789ff82f43c6342914376e256d480fdfb23fe5dcaad15fa1e2c3630edc SHA512 1bdf4c05bb38796606e3c4fa9bb5c478f0dabcca489b0405d09f8e4eb3b801c1127e670f94418ff8b881fdce074ff4f3849ff8abb452eef93dd3c2abd29cf8b1
+EBUILD minitest-5.15.0.ebuild 761 BLAKE2B 3b8b86a9826aaa1a2439ff70a0762175321236d94201699fda644878bd4186b149d929762010938233aec8f35d75ccba0948a0ae563bbdfb8d88f6be8cf0d971 SHA512 3e7c7244504052f7235801ff5b8be1843385bc536656d9d4756c3888d0d5a6883f944295942d9c61a7ca6bc562583c8419b689f05bb62278f4928c0939963039
 MISC metadata.xml 345 BLAKE2B aa5fc9309fc2803a64737c45818f713867ae504409b879c1481125131fb661a1c71f99d3facb5c7253561b62c32ea4d27c9344bfa0c6ad66a15eb1daea81ff42 SHA512 df9736bf7588243c9d1ff886c8b428237cf96f239fccbfe6561d60b910a07f70750db6576d3aa4597746d18fcce8a708f1aa9be4f9f2796823d1a4e154c6fb4a
diff --git a/dev-ruby/minitest/minitest-5.15.0.ebuild b/dev-ruby/minitest/minitest-5.15.0.ebuild
index 7f40be51ca3d..046c3de94efa 100644
--- a/dev-ruby/minitest/minitest-5.15.0.ebuild
+++ b/dev-ruby/minitest/minitest-5.15.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 each_ruby_test() {
diff --git a/dev-ruby/mixlib-shellout/Manifest b/dev-ruby/mixlib-shellout/Manifest
index e46d7a13e0a8..f454eec6776b 100644
--- a/dev-ruby/mixlib-shellout/Manifest
+++ b/dev-ruby/mixlib-shellout/Manifest
@@ -1,3 +1,3 @@
 DIST mixlib-shellout-3.0.9.tar.gz 42476 BLAKE2B 4fab1d0f7d7ee5190f65d312304c7137d940b5cc19bb205d4de1d14eb5bc5829671560785b7f3179220246433b15b9022f8a1d16fb7491e180940c9dc6da5280 SHA512 7234c188e25cc6da3c4859eb12e4f86ce0d6538d17e4c90b1b5105fe677fcd13d884d7045be9767473c3ac63ffcfac7af25dc8efcec184928ba32852a5a760cc
-EBUILD mixlib-shellout-3.0.9.ebuild 911 BLAKE2B e5a00f3ff73783e22f2f7334240f5c8df9df442a837bebe2661a0fbc939da5acb2caf303651baa2726e82e3b49e10b3172c77382cadc5aae0bffee408a2bdca4 SHA512 af8278834209d03b88c006460efdc5da89c695198ba1855901aa1ec3cd48b9ad930ba3aeea02acf8dd1017ca919d87eb3cb9bfcecf1fffd6b9a2bd088ed5d4e3
+EBUILD mixlib-shellout-3.0.9.ebuild 911 BLAKE2B 8a44a8bdbe5446cb1e69007591e3cd5b734f71e75a3a202223b5413637939ddeb7d99241b9cdbf21b59fa1b02eb602580e035b41bab4c71af9baf46d790a5675 SHA512 e83f97b95ee208cb31c287f5c13459a89fab9efdee7bb4c816d2c167f1bc06be470d4eff78022d749024b327eab4404a508ff546fbc6132453151514b63f4dd6
 MISC metadata.xml 350 BLAKE2B 7b6b7af3bd835dc303dd5090d04cab74732775c0f78be27872002f3fc2ab9ba030ceca56645a0c7cf486c6cf74a02126f23cfd84d2100ddbd1e4b4d2f9128907 SHA512 eb77dcc61065d1acba864d4026de41087301f4d4539816bcd8cad9e9d78b75ddb61f236ca7a1f0a7d5a9b6d702f5ac6c70153b19d641e852d65c259fd7cb3654
diff --git a/dev-ruby/mixlib-shellout/mixlib-shellout-3.0.9.ebuild b/dev-ruby/mixlib-shellout/mixlib-shellout-3.0.9.ebuild
index ffa2c2f74299..75136f68b715 100644
--- a/dev-ruby/mixlib-shellout/mixlib-shellout-3.0.9.ebuild
+++ b/dev-ruby/mixlib-shellout/mixlib-shellout-3.0.9.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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index f4cf99084173..c83b7b3eded6 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -1,5 +1,7 @@
 DIST mocha-0.14.0.gem 82944 BLAKE2B 50a066e2f5007df08a7f76785fd4c2b12327b4969c11324a0574c707bea3219d51edb9ab40635378c16b46ad826ec7eff42434a27cd61113a6f40251fa2e6930 SHA512 918e45f2ee761c7dc399c7958e4d406f9e186c90f479fd01a421aa542944b47e9b2c5e938f4fc5292a7da345726447b2d47dc5f417e114201f8a4d9893c4d461
 DIST mocha-1.13.0.tar.gz 246249 BLAKE2B 028b40646b96084f26df9813a8c8c4d5adc9f4649e11971069af086716d84f90f1acc6abc8fac8297c3a516afa51049c4bcd7ff0f6fd3917d0665fa6f9afe754 SHA512 84cbe344b0bae434e9931a83b587dcefc14e8699893022a56e30a59bff574b52e3879a123b8f2f70e77301701b167d5992489e2173191ffd3450f09db3e7383b
-EBUILD mocha-0.14.0-r1.ebuild 861 BLAKE2B b454f39405e42281948435ef50529cbc53e7535adc04148a45a1f3cf4753244d6313b8fafdb7a82e5735ee8e96592bb430fb771cf1ec611fd677c7d6d3fa5435 SHA512 bacbebe46b81eefd058bc78e36f03bf3c8958ca955555c8865bfd5d01330992ff183d39787b20d3f0a348bf1dfc8e87c83984e60e69caaf92c3ef08349290027
-EBUILD mocha-1.13.0.ebuild 992 BLAKE2B c5a812ebf945ff9871ea7d88c16cfb831724ebfbe125a3fa2aa7a88371a5f0000b558f2dbe868f5c23de227f04a556887bbde07650da77a69fece456fbcd744c SHA512 f99bb5b2323a32ad7c3d6c07b939e7f558071f094f8f6584058260bbf967befcb78d9881afbbf93dadfc1d075da07abc4a074a74613e16dc4f946c16ebf654cd
+DIST mocha-1.14.0.tar.gz 246015 BLAKE2B 836b678ca0bcbc1860cb185ee6cd5a71bbdeff4698780fdfcffe6fd38196b1291aa6c23a779e7e1e59bd8155d5ec48fbde426ace468f8186e18860f3d3764836 SHA512 41dfd1f9add0b62c8609ec4cdf07ae58580503c81eb40886cae6c97ee5a5109ae5aa6094756c9666985266c83fad38adef7c9c4a2add8ef2b7571c2c1753cfb0
+EBUILD mocha-0.14.0-r1.ebuild 874 BLAKE2B 9cffaa02080f973e929c0f4ec7d5fd85b919fa05e48d3ff5f924c66a4b96f901bec9b05c257c09232a459eaa374722d4e34f3412039d287544de23af587c53d2 SHA512 a2232d40f2f118ce99f8c44f46c0ab7e11abbbffbf7f1451ae9734c7b96c6740a7b92a08427c20e9c4ff0e97f82924a9a7bbfc8e0c129c4618f26cc4fb2b243a
+EBUILD mocha-1.13.0.ebuild 998 BLAKE2B 7e906fff5e3dd23b3090303f019a36061f08637ef0c4a5df0b327d11d927823b620af65110a9ca381724a1a32477eface4eb7f7fa44fd6130066bc3bd3555066 SHA512 cfc3fabf625b776878bf6b13c1b4367898f4f8431321aa0b3e9e82a93a4056b80ef1bfb29f4058d14ddcc4efd3033ef4379df829e02278e12601682b0a4d9b21
+EBUILD mocha-1.14.0.ebuild 1012 BLAKE2B f5acf87177fcf4e87b305410f3556957495f8d8ce580f64f9d6c626261bb1772c813bf8d9f892a0660770b98d801079329f90011e4f3860bd58713bc9bfbd79e SHA512 3e13341f1ba652ee376e4adfb16c7687494712079cd96c14439e901226f7c23c38c0ce20097606aaadd3659d364ae85229bdde6a548a8bcce6601db49bcf0714
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/mocha/mocha-0.14.0-r1.ebuild b/dev-ruby/mocha/mocha-0.14.0-r1.ebuild
index dde5ef977c2c..d4985c30a762 100644
--- a/dev-ruby/mocha/mocha-0.14.0-r1.ebuild
+++ b/dev-ruby/mocha/mocha-0.14.0-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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST="MOCHA_NO_DOCS=true test:units"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://gofreerange.com/mocha/docs/"
 
 LICENSE="MIT"
 SLOT="0.14"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/mocha/mocha-1.13.0.ebuild b/dev-ruby/mocha/mocha-1.13.0.ebuild
index d95ad4cf3f1f..eb549c40a41f 100644
--- a/dev-ruby/mocha/mocha-1.13.0.ebuild
+++ b/dev-ruby/mocha/mocha-1.13.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/mocha/mocha-1.14.0.ebuild b/dev-ruby/mocha/mocha-1.14.0.ebuild
new file mode 100644
index 000000000000..4e571cd1eff7
--- /dev/null
+++ b/dev-ruby/mocha/mocha-1.14.0.ebuild
@@ -0,0 +1,38 @@
+# 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_TASK_TEST="test:units test:acceptance"
+
+RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
+
+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="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+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/moneta/Manifest b/dev-ruby/moneta/Manifest
index f9141498463f..eea8fc7cf819 100644
--- a/dev-ruby/moneta/Manifest
+++ b/dev-ruby/moneta/Manifest
@@ -1,7 +1,9 @@
 DIST moneta-1.3.0.tar.gz 130195 BLAKE2B c6eabfe31ca39b4b0c91214eb37a6090d21b3ff62943cbbb5e1f1b2dc72e6c4087aed7227fd1ecd0678730ca0b86b82423b25e8dca3c56881f2c0a7a98fc95f3 SHA512 9ea725f095cc7e7faae9621c2f4bfa27c54c81200c16a680fce289e68f79f4a5f66d9bb55b1921578a65d303ff6dd2069f56fbba28cb9e758d898ae03bb1c3dd
 DIST moneta-1.4.0.tar.gz 129069 BLAKE2B 86b3eaa875483acb5931eb5583f56a0484851df57bc0186daf5fe1cca402c209a44226e5dca570b14026f8beb861650506ccbb386ad8d092fb7b5a9277c6f8b5 SHA512 ebcdafd4badaddccf833a43c3561421d82d0941c2340b9bed37b62a94d79e5098a36e7f04b93b1fe26c7dedfe455d6a751be3aa4606263fd2025b7a95fb5a68d
 DIST moneta-1.4.1.tar.gz 129056 BLAKE2B b5a7a9fdb1817c88c942ce8cc3353974d556f14e6362722ae4b44c40311241aa5dd7354054e4edaca84edcc3a76b3d43230dc0a376d48911409721137cbf8d01 SHA512 7ff8fec2047a7df7e110480ff87eadc8e33b776176350279dd933b456cc7def0e92b74eb5dfb7ac2b2233232959acd839ede80d491bba0f134c31414d3f7786b
+DIST moneta-1.5.1.tar.gz 133512 BLAKE2B 6027685e3e28e238b2d984b02fe2d5e7ccf1dba6646d71980932581e9b63cfa9082aa3c3a1509b679922f480e1601c71475113ad3eea5f8b7644f69998e3bbca SHA512 018b162d75eb7cb5f2d38e1e6a79e5a17abf8aefc381eb3eb4d9d4981ac88be5063ce95b786aa928de1618c6458b926a27bd26f41ad6515cf7ee3dfc1274c236
 EBUILD moneta-1.3.0.ebuild 787 BLAKE2B e82d67649e98c63ec6a1f823f9eb0dd77f6b1bde4aa0b1ddf6b7be6564d79ec9f4ede2123f69e0722b8323edb6e8dc7cc761ba3ed86b9685ab09ea8f71b5e2cc SHA512 26efe595bfbc650b29d27281e19d2e4a5523449b286f82c9f07dfac14aded294228b3abdf9646f38cfeb397ef01669707f3d8eff828da1ca2b62849fdac7ab76
 EBUILD moneta-1.4.0.ebuild 787 BLAKE2B e82d67649e98c63ec6a1f823f9eb0dd77f6b1bde4aa0b1ddf6b7be6564d79ec9f4ede2123f69e0722b8323edb6e8dc7cc761ba3ed86b9685ab09ea8f71b5e2cc SHA512 26efe595bfbc650b29d27281e19d2e4a5523449b286f82c9f07dfac14aded294228b3abdf9646f38cfeb397ef01669707f3d8eff828da1ca2b62849fdac7ab76
 EBUILD moneta-1.4.1.ebuild 794 BLAKE2B d7c5e3a02982053db218164f46446e9ee1d7b15b5fe8330bf9a9c6a5bf2d360c70048cddb7e09c7dfcbb5ea703e832174af41ba3ec49e4d4a9c9b360219400de SHA512 0e64db18aa345fc94118e2e8dc2f2854a001d1bb272bc07af4a0ed948417937f544516f84e8e66ddbfe360fb0274d9d26d7b606b4219d28172cd11bb3a5b724e
+EBUILD moneta-1.5.1.ebuild 794 BLAKE2B d7c5e3a02982053db218164f46446e9ee1d7b15b5fe8330bf9a9c6a5bf2d360c70048cddb7e09c7dfcbb5ea703e832174af41ba3ec49e4d4a9c9b360219400de SHA512 0e64db18aa345fc94118e2e8dc2f2854a001d1bb272bc07af4a0ed948417937f544516f84e8e66ddbfe360fb0274d9d26d7b606b4219d28172cd11bb3a5b724e
 MISC metadata.xml 339 BLAKE2B 21f9c4d9f4a62da269fa46aee7673be44d39ccdc286a7e2fce487405afc0468db93c14d186d99088a3004616ff825e5ef9e735e9eecbaecbd879a459f41784b9 SHA512 6335c7aca4de92722c5df1661c2b36e5c0080f189f7749ded437a2f50fcbf174b6ec8aadb47705bccee4ffed27d13163d67f307ccbb384d0c9c75d5600158aee
diff --git a/dev-ruby/moneta/moneta-1.5.1.ebuild b/dev-ruby/moneta/moneta-1.5.1.ebuild
new file mode 100644
index 000000000000..d9be5d3e4a3b
--- /dev/null
+++ b/dev-ruby/moneta/moneta-1.5.1.ebuild
@@ -0,0 +1,31 @@
+# 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_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="none"
+# test is disabled for now. It requires many packages.  Test suite also
+# takes very long run time and has high memory consumption.
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md SPEC.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+GITHUB_USER="minad"
+
+DESCRIPTION="A unified interface to key/value stores"
+HOMEPAGE="https://github.com/minad/moneta"
+SRC_URI="https://github.com/${GITHUB_USER}/moneta/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/multi_test/Manifest b/dev-ruby/multi_test/Manifest
index e5526c27e4c8..88a7b100d70c 100644
--- a/dev-ruby/multi_test/Manifest
+++ b/dev-ruby/multi_test/Manifest
@@ -1,3 +1,3 @@
 DIST multi_test-0.1.2.gem 9216 BLAKE2B 9a5888937c82f87822445855eb15406b4250b3b42f00116a2c54360ab35b923d08c4015d90b14003679aac5d674baec8756b74aae4a5246beeefbae262edcc1f SHA512 a0d59f51dc959b7febe9c32853b5ac5cbbb3215e8810de5e46fe10fa42931c1ea89df477155cc8124264d608c5928e54fd4e1949e7d0940f927e1430bfd60a2b
-EBUILD multi_test-0.1.2-r1.ebuild 520 BLAKE2B 9f7430b9af1d4dc4c5857d8c721d857ec18282c1a3ebc3b79a3d83eb4df6ff3e0fbf86b9ba3ce28030caf4e6c710a8508c6cc461cc566936ec38ba93dbeaeaf4 SHA512 ca128e324c1ae59d3cee0d9fa1f42d27ed1dd68456231ea0e8afe67288e335ea23372f08f0a64b3aa4c84be78ba36d46d229f3fdb1e592330bc46884712ec899
+EBUILD multi_test-0.1.2-r1.ebuild 534 BLAKE2B b4dd42607c4cbc00fffd83a2d519f00427849b1dd0c20c58221862855f32e0f2f5fd489f62ad3bafd8e849cba02b3ba91f2a0afef2d0cf77014e421ab4e3a1b1 SHA512 b7f5c0f84790df3b880245aa3d74a85eb2847a3c7db79e424521ce0097dd31a24d788550e97fd36c8726ae995faf6d1c464d73832daf7937ac99d214ebdd3fec
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild b/dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild
index 9e445324333c..da7b604275e5 100644
--- a/dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild
+++ b/dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="History.md README.md"
 
@@ -13,7 +13,7 @@ DESCRIPTION="A uniform interface for Ruby testing libraries"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/multipart-post/Manifest b/dev-ruby/multipart-post/Manifest
index 8c6179a36c03..2a59686df1d9 100644
--- a/dev-ruby/multipart-post/Manifest
+++ b/dev-ruby/multipart-post/Manifest
@@ -1,3 +1,4 @@
 DIST multipart-post-2.1.1.gem 13824 BLAKE2B 70a706714d14d284e2fa69aa56a69682e16eece75eb1508c1707b0b7f03b0d1fb11d1a187c7b7681dc0654a280c59bc20a0754d30e80807a4dfe5e56976b4ccc SHA512 afa16717ee136f0bbbc20fe243252831604740bb61fa7288a2437a4a67638f660a4bd491b5326b034173e9e8352f2659f27dc8aaa761721f7111b7e9e704582f
+EBUILD multipart-post-2.1.1-r1.ebuild 568 BLAKE2B 9f7ec0c6a7ee1cf8f1604710b9a180830b1bd5103cc3a0e93e5b1d4d0372ccbbd8690dae59aa1dfe8293a7a613a2adf5578a436b41830d3896629d16d2955867 SHA512 6105af91b5b22714ac478a6b6d671e3883c344e150c6692136e3c4d0f7ef7750cd7bfeff0a74360c8aed0fe343348b9c126c865352a3436d9a3a40bfdc434d44
 EBUILD multipart-post-2.1.1.ebuild 568 BLAKE2B f76acfb32f72f21599a71f24b37937eefed9aa9435378c1e3593f0b159b10b39ac872fb87110aa57c2793d0a5c4ce154d28cb55a5e0b38e0dae7bfa1565ec3ae SHA512 106ad0777f07921359ddb8fc6a382cdb35dd396627a4f73900f3276f3dad7af962a85750406dc98313aa99b91c12c40be0f6d2223f42c6bdb0607d7f0f4db43f
 MISC metadata.xml 352 BLAKE2B 7e33c1303b64811652a3e295d140cd4381913230e4f985155728b7f7832478c911bcc6342294dfd43fa94be2938989c602fda614bbbf3c62b7c36e18b3be475d SHA512 950e12a1a5831824e0605b276086b722e3737686cd4a9d9b127d7e073f886891dd6cbe05556bdc029a6d67cb5072c3610b4bec1c291161eee8548f50a77f7c4b
diff --git a/dev-ruby/multipart-post/multipart-post-2.1.1-r1.ebuild b/dev-ruby/multipart-post/multipart-post-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..4046299435f2
--- /dev/null
+++ b/dev-ruby/multipart-post/multipart-post-2.1.1-r1.ebuild
@@ -0,0 +1,25 @@
+# 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="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Adds a streamy multipart form post capability to Net::HTTP"
+HOMEPAGE="https://github.com/nicksieger/multipart-post"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/mustache/Manifest b/dev-ruby/mustache/Manifest
index 018fd18eb4a2..a8c66a724a58 100644
--- a/dev-ruby/mustache/Manifest
+++ b/dev-ruby/mustache/Manifest
@@ -1,4 +1,5 @@
 AUX mustache-1.1.1-test-ordering.patch 1206 BLAKE2B 7797403a81ed860b9bc940d07196f235722e7dd83aa42c3a8ac9200f8179284c2a6a996621f2f6332ef53fa2654772eacdbd14ce5ca0019fca54bd082a3e0155 SHA512 bb122077fa486acd9b737dcf961baeae53b766a48bc635ac48b11e675923885c8110b0095a2600f1655adb034938b04c979c1f5a5d7064d040c207f47eb4d2cc
 DIST mustache-1.1.1.gem 42496 BLAKE2B bd1becb1c296abf03cdd6c7d5a6f29b71dc6328c126dbb27420872088b3b6988ac56d91c13f669cca94932f23f4290277d9ca6597ff842ff226e092c2532dccb SHA512 91a18a374a0348317d0801d6784fedd0782d7a08f128d3ab7050e631b34e45cecd49c4b1e2a9e17204f70bf169c107a92a1e210532bd3faa98edf8b1b5e8e43c
+EBUILD mustache-1.1.1-r1.ebuild 949 BLAKE2B 8c3380c684029e68e5bb01024561030657afebf61429446f7cd784537dbbddede810473fd7d16d9bfb22139360f52c554ff602e12c12f1641ee16d2489f417d7 SHA512 f1a939e9430b44633666eea1e9953e9110b5d3b1b64dec6d57c46b7fa5075d3b8e65001a9d6725b4228494959024f4a20fdc86a9b434d0026702e05447737fc1
 EBUILD mustache-1.1.1.ebuild 957 BLAKE2B dccc7c1be8e194f015a6f143151c559d33b36fca0984b6f58f0915dd075dcab4662869faceca55f8d52c121fced7853cc02cd9dfa23cbc620b709a814a0fa3f5 SHA512 21c5e60d6f0ad7d29dd5dc359cdabcaa7d85f6b61a9961431112246100994739688e168bc4da1223290ed94c027e9eaae129d687f40c5248aa91cfc393007f8b
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/mustache/mustache-1.1.1-r1.ebuild b/dev-ruby/mustache/mustache-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..af74c86d7e22
--- /dev/null
+++ b/dev-ruby/mustache/mustache-1.1.1-r1.ebuild
@@ -0,0 +1,42 @@
+# 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_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC="man:build"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Mustache is a framework-agnostic way to render logic-free views"
+HOMEPAGE="https://mustache.github.com/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-test-ordering.patch" )
+
+ruby_add_bdepend "doc? ( app-text/ronn-ng )"
+
+all_ruby_prepare() {
+	# Fix for renamed .ron files
+	sed -i -e 's:\.ronn:.ron:' Rakefile || die
+
+	sed -i -e '/simplecov/,/^end/ s:^:#:' test/helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e "Dir['test/*.rb'].each{|f| require f}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/mustache.1 man/mustache.5
+}
diff --git a/dev-ruby/mustermann/Manifest b/dev-ruby/mustermann/Manifest
index 55adb9aed21a..a64ef8f37f8c 100644
--- a/dev-ruby/mustermann/Manifest
+++ b/dev-ruby/mustermann/Manifest
@@ -1,3 +1,3 @@
 DIST mustermann-1.1.1.gem 51712 BLAKE2B cce8b5237b8dea0dae42822ec58c02a88b07b6d75a09bff6d8699c41fbc53c900dd3bc157ef66c863ad7d646bd5380cf935f5fa3cc1b322cef39b73d26682dac SHA512 55d5fd9b8309e0b806b2fb0af409fbc71b958b8f91116991439f2c66b1f71f17647a61020b0349a86132e7d3da383121719ea330538abb8f3c8bef5fbff0b747
-EBUILD mustermann-1.1.1.ebuild 610 BLAKE2B e5e0bf300e97ba97ba613d054a5eec2f964463db648238550c830c66ac35f86a51731a6fa05f7e1998c9ed3056a3667fccf1482eae897d8eadd917c786cc38be SHA512 c9f9a576dd1a6b055a6da536b59de64d1c2300e93def5ef8b27205e295005098f6c4abed771e77e4b778e857a93ce57b74ddc8649ad74e553b956b6864bbd55f
+EBUILD mustermann-1.1.1.ebuild 610 BLAKE2B d7c415fd148be57739f4f6b6ea35c854d86a4e0e73be699d3e6a5d676c62496b21caa83d937d3788c6ba81a6992dad2fb6221f0773f788e5abf043a6a0d1b7ad SHA512 60fec248e37409cb912c3c7c4236c1257c47e9e78d4549fef25a448ca33e02ce68732ba440ce6c05391a2f4c09ce0050a129a834ce1114c5022dc1ef869c9397
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/mustermann/mustermann-1.1.1.ebuild b/dev-ruby/mustermann/mustermann-1.1.1.ebuild
index 4ff1a9fd53a5..b71baa060801 100644
--- a/dev-ruby/mustermann/mustermann-1.1.1.ebuild
+++ b/dev-ruby/mustermann/mustermann-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 # There are specs but they depend heavily on unpackaged code.
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/mysql2/Manifest b/dev-ruby/mysql2/Manifest
index eeff11e62135..a66d88c1b44f 100644
--- a/dev-ruby/mysql2/Manifest
+++ b/dev-ruby/mysql2/Manifest
@@ -1,5 +1,7 @@
 DIST mysql2-0.5.3.20210920.tar.gz 114492 BLAKE2B 589ee721838f956f90474e859d0dd2e8cf11c8622a8f89410929f9c52c82c240a5a7eea7e6b132e0212dd6e9cd13c5ca950e6cacac368d158aeca9feacc98a7c SHA512 3bec768b69ecc3b54db84048b633602e80f09c4b4631daf1fbd81810c33038410f6112b467ab7ac86051ba91e4660abb3546e55cb52d26b96531f3305b43871f
 DIST mysql2-0.5.3.gem 74240 BLAKE2B 9de25a34173ab952f6842f01d9207405c8bc6ed5937fdf66de4062129fc20f425635956f6d12f78466c8c341c49916f7d00df845f84a4101d34a98b1585b9919 SHA512 59a0ee00261b09e8bbfc586a6f75af840a465a94fd8c9463a3d7767e5ea6b7e64507c9571fb90c6d0cdde3cfff560c97fbf3f3c32b3916aca852ef5c41e1bce9
+DIST mysql2-0.5.4.tar.gz 116463 BLAKE2B 9c9ad00d813d69b6790d9a0c6c05979892d1b8bedb54e95326bf2250479a93958797fa845d60e29b5a8efcb416a80a94be66535e641d30c92b64d50c5f62c3b5 SHA512 89958220d2f5454351f4e4b93099e12355cb0a8c36824125650f2366b15cdb3e1aa208f60beb348834cd2ee6fa36aac4102581c16fe1b6bd4f2136cc1a8b5c99
 EBUILD mysql2-0.5.3-r1.ebuild 1114 BLAKE2B 5be541a84c0737f953ef451d9205052b27640fb8c78d0f422b9727f3e9bee3daf383c12eba5a06d330249d03489bad9a4edf9b547c2ca62fd794a84f0ba3b24f SHA512 9309ac33ac7c5ef24153260b7c08622ae897f8dff9213c00f9d743662ed4edffb767df5197394113e1c0686258b150c36c0b302f8b5f9ba368b7be9908dbe618
-EBUILD mysql2-0.5.3.20210920.ebuild 1420 BLAKE2B 930138bf1040d32a8eda635ccd5cda4a4020f3bffa0ea3b360b20e32c17f6fbfed019d249021deab78db5cf2fd0e31369172d27bd32cde2a608bffd0ec9ba264 SHA512 940cd69703f22f3ad0ede5e2c14845125c6382d837349bcf355b734c858181e4ee83a72428cd5d15509c94d6e59020e7de259dce81aed00d194317157eba1d12
+EBUILD mysql2-0.5.3.20210920.ebuild 1427 BLAKE2B 1460b27b6ab944e04dfc2a6be97c082f8a0b2632113a52174c46ed31f9b726eef8bd51e04b195165fc906cfccc38be3d3dfc054a619b952e1c5679f0278d2a34 SHA512 34e325e5bbc40c8d4f5493e4bdd95f6fb75d7939dbb7d1eb78b34cbc309ba28dcbb134acc03df4bb0e9e4d0f02b8df455cb1834f063aadcfe195f3686073f2c6
+EBUILD mysql2-0.5.4.ebuild 1348 BLAKE2B 8576575592038025e09154eb0eb560251bfbf31d829500cd33cddab90f76142b4c2e96800d3d88dce05d593f268d7bd6ae5eff4d495ea8eafb3ac87d9087599d SHA512 eb8abf2fdbbd2ebff5735a14f5381074ac98cf171ceb044beb7314016fda6de23699fc32c489afe1955ac88b56e4aeb69a41364954042691653ab9b4097b230e
 MISC metadata.xml 414 BLAKE2B 38309330df062150b84012dff2bacfaeccc80ad855697c841708611e167ed12f07ba7284dd4ec8d349cfe8c13c363d0c6949370ac1357057ec9efcd43b6236fe SHA512 8fa3177228145a7f3e1b2cb8d1124ad1ed3639112f17885d6464dd266858d0855ef2645954ea0238011597e3d3d99d9fcc02f6b900315c18f48386ffbe3b8ff3
diff --git a/dev-ruby/mysql2/mysql2-0.5.3.20210920.ebuild b/dev-ruby/mysql2/mysql2-0.5.3.20210920.ebuild
index 1603c28efec1..37d6e7fd7c44 100644
--- a/dev-ruby/mysql2/mysql2-0.5.3.20210920.ebuild
+++ b/dev-ruby/mysql2/mysql2-0.5.3.20210920.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 # Tests require a live MySQL database but should all pass.
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/mysql2/mysql2-0.5.4.ebuild b/dev-ruby/mysql2/mysql2-0.5.4.ebuild
new file mode 100644
index 000000000000..c37cd71d63a4
--- /dev/null
+++ b/dev-ruby/mysql2/mysql2-0.5.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+# Tests require a live MySQL database but should all pass.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/mysql2/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/mysql2
+
+RUBY_FAKEGEM_GEMSPEC="mysql2.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
+HOMEPAGE="https://github.com/brianmario/mysql2"
+SRC_URI="https://github.com/brianmario/mysql2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="mysql mariadb"
+REQUIRED_USE="^^ ( mariadb mysql )"
+
+MDEPEND="mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= )"
+DEPEND="${DEPEND} ${MDEPEND}"
+RDEPEND="${RDEPEND} ${MDEPEND}"
+
+all_ruby_prepare() {
+	sed -i -e '/s.version/ s/Mysql2::VERSION/"'${PV}'"/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	local config
+	if use mysql ; then
+		config="${EPREFIX}/usr/bin/mysql_config"
+	fi
+	if use mariadb ; then
+		config="${EPREFIX}/usr/bin/mariadb_config"
+	fi
+
+	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config="${config}" || die
+}
diff --git a/dev-ruby/nanotest/Manifest b/dev-ruby/nanotest/Manifest
index 6a69506dd4d6..0b4c58f56111 100644
--- a/dev-ruby/nanotest/Manifest
+++ b/dev-ruby/nanotest/Manifest
@@ -1,3 +1,3 @@
 DIST nanotest-0.9.4.1.gem 7680 BLAKE2B d6353949241c85df6286728938c017881763c332fe7deebfe641cf2ca85e65d9934ea4567494afd775d54171e5ebc86558ff1c376d6519fb9ff0f6d5addc1bfa SHA512 0ef48c747130fadb5f11818e131780b05032d57102a142293e29f135f75c1dd57c75005479880974342c257c645b3d2a4489432049683e3421743fa3e252cc09
-EBUILD nanotest-0.9.4.1-r1.ebuild 455 BLAKE2B 2fc8e7b7ebebc44c1f0c51ed0c4d4602248e97da99930467cb69f0bb5265084c9eed57f6583c81d0d330f856a26b2b0b7e862b973528ded9051389d890dfb626 SHA512 c3f9278524d3c18871bf2f10189cc558fb089f687d94fb33300a75b087b1bc1a64d8ae5d1e0a79b2f15201b9dbade37d15c23c6d5a48ed9c416c287aa6d81e71
+EBUILD nanotest-0.9.4.1-r1.ebuild 475 BLAKE2B 80cc117bdcc0e735873004ecf275a1142307cfed3027ac059675ce724b4f30eca570b88865106366c9d4feb09fcbfc63ecadca68605fdaecace14e486f19a5a7 SHA512 429d12e55863b3278e845ed43c9b18f5a3e6f3a66a7957138c027b3c72c33bea81d895310b32d14c6b3346e95a6fe7359320107601e708d5248c801bb8d0080e
 MISC metadata.xml 342 BLAKE2B 82a9c9d45f8975397e30e48591f7d859134b8e9533b71e1d5cd37edd8a742603e626c42af08b00a4fff10b5ca351c0461fe8afac6f8cff580719d7cdfac4781a SHA512 884bfb941feac76fb6c9548cf004215fdd9e1d614b0677d3565d54f3392b96b2df7e460a43688e479203c51c7893e2cac92e60ebbbf0c3836fae43418f134143
diff --git a/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild b/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild
index 4939d4a6b339..aff63cb7ecd0 100644
--- a/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild
+++ b/dev-ruby/nanotest/nanotest-0.9.4.1-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="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -12,7 +12,7 @@ DESCRIPTION="Extremely mynymal test framework"
 HOMEPAGE="https://github.com/mynyml/nanotest"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/naught/Manifest b/dev-ruby/naught/Manifest
index 7cf4c9511d3c..a36841cd1080 100644
--- a/dev-ruby/naught/Manifest
+++ b/dev-ruby/naught/Manifest
@@ -1,3 +1,3 @@
 DIST naught-1.1.0.gem 19456 BLAKE2B 175611b8653966500ef7cd963b8c9bd895f82e72af87b0f3358b74b91e5915dccf4da76fc916e30214d6f45ee3c84f232f83cf04afef3fa5c7b1283614c41339 SHA512 0a25825df0234f15a53dc7a8dff546846c605fde9b1e3ce0b3e88f6e1753117bd48586b450dcd08c45a0d4877a04ac19feb98fd70d929f9da3ccba8478e46a57
-EBUILD naught-1.1.0-r1.ebuild 527 BLAKE2B cc2c7b045ec23cb6e00b80f7df29cf573206592d0e810f60375933a4fdf448d06a141e06e2036918e90274448d03202082fe25eb85ac390144390350d4af4f9e SHA512 8e2170d43cd152fac260e89b6a12dfc5ec93f40944906efa16da817497672715c2078fb40a301cfb3c1806bdb58d0bc8b9d821f620c7678d5242f79ab3d6f4cb
+EBUILD naught-1.1.0-r1.ebuild 534 BLAKE2B bc86753d9a5d2100b0d759bf65c2293fb57bb8a14bb7fc57cae132cd846d6063507fa4b2087db9b30a79c164cd8f2876d79e6ecaa223a8f6cc1349d67ef6e1f6 SHA512 857a2b0428ee17d188a566359fe7a6d11f1ec145ef8a8a57df56256f75caccc2164e4ed6e9494f773d199fec4867ab825f7db169ca61ef6f872a892fa32ca2f0
 MISC metadata.xml 338 BLAKE2B 8e2a9b6f48dbd8c12b71ca48bc7351ec3aa23ab46284e021d130379df29c0579d67a2662b8b09fdea920cf6c3387262690d240a6ec244a78fe6389b20c9dce3c SHA512 fb4113edf6c586b2f2bc594f57a47533da1e8fa0f4c1b187ba092380e30f2c2bcc82fd40b7776db81dc6bf39f857bd9c845a33df17634da693125dd8994ae41b
diff --git a/dev-ruby/naught/naught-1.1.0-r1.ebuild b/dev-ruby/naught/naught-1.1.0-r1.ebuild
index ebda1f6d4c44..3d848dda9b1c 100644
--- a/dev-ruby/naught/naught-1.1.0-r1.ebuild
+++ b/dev-ruby/naught/naught-1.1.0-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/necromancer/Manifest b/dev-ruby/necromancer/Manifest
index 5f98d04182f3..821bace6636a 100644
--- a/dev-ruby/necromancer/Manifest
+++ b/dev-ruby/necromancer/Manifest
@@ -1,5 +1,5 @@
 DIST necromancer-0.5.1.gem 19968 BLAKE2B 32bf97caea056a1290ad574a32dbd8f9f258d0830694b28c3691d9d39039fcf6fb1d66c909f720350f455399fbbc9e416354de99bdad532d94843a8f8f1fdab5 SHA512 439358288bbdba674de9ebc4e43ddbba2fd8602c25114fff7a4c93fa11eb5d2a21aae7b6a95d82e78216fa19b5254270292e2e609fd08d6954f2b39afb9a3854
 DIST necromancer-0.7.0.tar.gz 22784 BLAKE2B b895677d0293adabd9c30d44c33131c69b9b30c24deca41d257c75d586cf44e34d68a090c8618a3040622be93fca3c4e637bb7510ff5db586c0392c47ee4e389 SHA512 873284964e55a0be0265675860b22345f7d46d8b49ccebb5cbe7a2103bfcb639443c3ad3af5d6d6f07d1bb2bc16dd945dc8c0a39b803640e866b82317d5f67b9
 EBUILD necromancer-0.5.1.ebuild 486 BLAKE2B 850a8526f28c0feaba13873dbe4e1196dffdf6ffcb4ce977fe2a40be293c4e9686ab222c17eb6f820936cf8e22dcb8153210d4152c8c160c77bfad8751071fc7 SHA512 90af7365fa603c02fb8c3f634a5abbb141dd49a5e47aef5c110cc17355843f9e7780b44afa41d26ae1bf83ba7910f6ccd6a81f542e5b8750428e7b38a389dd66
-EBUILD necromancer-0.7.0.ebuild 670 BLAKE2B cb4593ba5acc65af9772e8f2a4e6ca5eb9bdc5e58c1baa1603a41a9272b63f283048054f6f1e62eafa9a42c93bb51b26ba9c23838666642eb138f37227012f4f SHA512 2f8e9859d7b0248dd6d0fbffe33b66abfda637ec2b34f89a2243356fe96855b92ead33bf5a7b0f102a85ecfa8383828791e3d2667fb074d06567ca74f638021c
+EBUILD necromancer-0.7.0.ebuild 677 BLAKE2B 82f77b1d9bc240e9750b03a7fbeb388e720438f3e242c6ca3753f94035f39f9e85a67213f851c920b0aa4a0efa81af1fc3196f7e8fc30b740672d46ba614a3d0 SHA512 70afb9dec5f35d005679152ad19fd7df8b8b196ffdc7b80157a5c50c95043d571a30da08db04967e9207953f4c35f365c68c70f6d83558cf05e3c413ea09caf2
 MISC metadata.xml 340 BLAKE2B 7be9aa14d272aed7bca169055de0ba8ccba374f9bb56c360dfacd003575435d8b3cd84a2a466183e292dfede94a304a05e0e317b0309fe0f3898a1f68b0977d9 SHA512 f44d4dc94fbf819bd7f07858d9f9b76273204e42d3db913989da60f71e11f3135c9b60eba1d7bdd02318438feca25163870576a12d808923d2fdb9ad3b71c97c
diff --git a/dev-ruby/necromancer/necromancer-0.7.0.ebuild b/dev-ruby/necromancer/necromancer-0.7.0.ebuild
index b1e9e54126db..73d45d482c7d 100644
--- a/dev-ruby/necromancer/necromancer-0.7.0.ebuild
+++ b/dev-ruby/necromancer/necromancer-0.7.0.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="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/nenv/Manifest b/dev-ruby/nenv/Manifest
index cbdb4bd5e63f..127100998263 100644
--- a/dev-ruby/nenv/Manifest
+++ b/dev-ruby/nenv/Manifest
@@ -1,3 +1,3 @@
 DIST nenv-0.3.0.tar.gz 9773 BLAKE2B e3b53fd60ec89e8c068f47321880189750311192b33658ef61120390f4254a3194a8afc3c67acc0e9a2601f64e93cbe02f004c1c345f378f0f80fca3b3a9e778 SHA512 f0a50d7c78573802849b383351f3d099e55c67b935933bc00d55b752c1af944a4b7a8054b2cd41b238b192587f5bcca5de9d5c577764502300d571446de24228
-EBUILD nenv-0.3.0-r1.ebuild 769 BLAKE2B fe79d1ab14e511d75e920aa03907209ed60ed66c5c7bd7f90201750cb215a8295d14f4e00865eab3f005e16b1656289e3ae144c074eba9b7b5f6a6524316d6c9 SHA512 552303c458418358f88e1e6ab96314abf4c9f72bd1b3aae43dcaa48458ddc84112556dbec09597a7f5355ae12fc06f4819282e352a9272aa82793a6f685836e5
+EBUILD nenv-0.3.0-r1.ebuild 776 BLAKE2B a36ecd934acb776fe5d48a554a0aad00397150d52c14dcd04d77498ca507432d998613f424b607feea6566ab0c1c3f77a672e9629fc686baa3b5666a3f6b73fc SHA512 919be741d1bfdf451b52a701d48d7fa516a3e0473585121a229b854f14061f2eaad0a07c230290d0cfb48e0a3ee8f8f12e7521dfad9ae5ebe5e5e05595d2a85b
 MISC metadata.xml 334 BLAKE2B 01f25922654f3848e96c8b14dbe2774b20aa95dc53621dda075169770d0b13fca7d0371ad2ee11a8eeb22d7919f6aceefa95f52134ecd99aa2c6f0c874055f8b SHA512 bd4329301d7351ff4297c6c2b2c7d9832909006df970d8e1e5afd5ccffbc9bd8328d4a266c7b61aef0f227cbf9470ece8a76867ce9514a3e9035ad583f88acfb
diff --git a/dev-ruby/nenv/nenv-0.3.0-r1.ebuild b/dev-ruby/nenv/nenv-0.3.0-r1.ebuild
index ad6d13ad68d1..19fd0447c95d 100644
--- a/dev-ruby/nenv/nenv-0.3.0-r1.ebuild
+++ b/dev-ruby/nenv/nenv-0.3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/net-http-pipeline/Manifest b/dev-ruby/net-http-pipeline/Manifest
index c988fc0a4948..d5a9e1ed26b0 100644
--- a/dev-ruby/net-http-pipeline/Manifest
+++ b/dev-ruby/net-http-pipeline/Manifest
@@ -1,4 +1,4 @@
 AUX net-http-pipeline-accept-encoding.patch 654 BLAKE2B 11d1ecba6b2895ba4c3ae7408ef0bc3bbd5266885ab519090c172ff27c8dbb4e9adc2c90d8a03ea24e1e68043431e26236c9a1c6f939ad5f693815b2069e0183 SHA512 43c6382f01538faaedc38047d6099d26c6d91805c45eddd043fba0e98b4331fa42a2826ea8a3216ddd5ab047b37e8a7ce1ba4c52b9ed5c0c645a5483d2cd1931
 DIST net-http-pipeline-1.0.1.gem 12800 BLAKE2B ed36d871544ec203ba6d72e864aca4ecfd6e975eb5d2d29a0c1f785ba7422734824535c2a30e36d1f031c2863ac4036f103d94eeeae00a8f6905354020d713e4 SHA512 1377c20038176f6c246a7d4adbce2c6972970d730902f9faefc31b2f6446f4237603f45f0f59de70eb9545e3c1e150fe6e63cf350551203166611bef7845f4e2
-EBUILD net-http-pipeline-1.0.1-r1.ebuild 562 BLAKE2B 42c63c9bf14ee6927d88e9b139ca030d7e157eb3d1ba960d2ddb65985e56994c4624b2a1e01a4e3253ccf54207f6083602ac21d86c8d49ec161a5c7d89726e7b SHA512 8422a7baf4dba304487c1caed64780106478142321bdffd1f654f6362de012ba9412b5c22da103e6e48ab11379960585486e518a339a4967815d6e5f90efa2af
+EBUILD net-http-pipeline-1.0.1-r1.ebuild 569 BLAKE2B b6aaef522b5a0dc6d2dab36f07716a50361bb5201c6098e7f1a3ca833228c17ae1af3f562cdf8724b9dd3d91551523a4cbe94c16e146c5a6b3cd741de19a7941 SHA512 db3f53d7c0bc2a8b62e9d4283bf725dbb884022f7ef3142671036cb3ca7de9b032673b7b16ca1d3eb7be835fb3ee5a5b2c40856ffab641974ac7ff662c7f9561
 MISC metadata.xml 342 BLAKE2B bf3b5037df2144653caccd6c5cbeed381d412694dbbe7675fe39b45c509dd456ada975dd1c9c4af03e1ac9dcaba65f8a1cdaf039fb027bec5cdc06bed26acbef SHA512 5266c5d3be35c768b0a3a9631248a896f8e04b6d3067609c388c87fe643cc9ccdaea900832fc7772d4890196d5beb583976066434ac07ba0da0da9d9ae53348b
diff --git a/dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1-r1.ebuild b/dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1-r1.ebuild
index a4b32a23797d..40e1897cd99b 100644
--- a/dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1-r1.ebuild
+++ b/dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/net-telnet/Manifest b/dev-ruby/net-telnet/Manifest
index f5f8b80160c1..e567fa91b99f 100644
--- a/dev-ruby/net-telnet/Manifest
+++ b/dev-ruby/net-telnet/Manifest
@@ -1,4 +1,4 @@
 DIST net-telnet-0.2.0.tar.gz 13299 BLAKE2B 6b87974281b4e1857a1e05efdfc751a5149f9057598c89b8b288219b95268955ee3f80e21cc787ac767ef3126c9ee23d9b62e29ebcb8c317def703f0e0dc1fe6 SHA512 a4473c42d33c10594c4445c29db73f4d611555710228cce263f7fc273e71140423dcbc2e89eec2a26f35f98de48aa72eca9f44cf0cd4626d702709963ce7b02d
-EBUILD net-telnet-0.2.0-r1.ebuild 1047 BLAKE2B 41034253598686c7a3d8f5410c10589b857959fb5f5a9dd65803d54aafdd3a14137290e52bfb66c467405daaed96676fc9a1f9df7540627a05558af8023d97a4 SHA512 f794ce667bafd51efbd7deefc98e67c227c18e12476631e13ab0c585364526af8d68f925d6853ada0a3eab2ee03bf105ce828eed39e887d3535e729e29b3c757
+EBUILD net-telnet-0.2.0-r1.ebuild 1061 BLAKE2B f02341e9994746f9bc6138a19847107d8e1abdbaa7b4b3af03a028e5ee60e9c29e65c0fa747d149eb10f22c83a6b82ca2cefb21b8bae1ab21b69f399aa8852e2 SHA512 f56d8462883c8ef41bc24d3ae5a6f3f334059b6ede18f5092e2330bfa67926e3009f83b4c96a004143d3c213d4c6e317d44d5bfbab32584d6743920cc2375c58
 EBUILD net-telnet-0.2.0.ebuild 956 BLAKE2B 60aa4eb2b4278c9dcb83217f1bd47c7c0924ce21b45092f27579e9bb4b7258fd3c3c683f199a3627e7fb159a132eb350e7274416c7d6a5e23b203df9cec4fc9b SHA512 f27adc1c97108669ed91cc14c3e4249548f86a18bf4aa40d77bba69495305f4cfc245179efcd8d46d023f4b2adb4598fb38fcdbbafc9b7652b88118fba292ef9
 MISC metadata.xml 342 BLAKE2B 9a659f3d0c58ea00e32e060c2188f6b38821ffc8225788b707d21a1071024c87bdc17b394ac654c70c8830c7f88b9ccd08aeb26d8bc859a53d29bebb2c3868ff SHA512 adffb5054de27a4371669b6e373548c941e7f7398fd964e8150ce13604adbdf806c463950c5f50d3b7dad17f30c06c5342bf950ca5c8433ae3c830cc8dc3ab02
diff --git a/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild b/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
index 24bfd3876fc3..4fa7921d96bd 100644
--- a/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
+++ b/dev-ruby/net-telnet/net-telnet-0.2.0-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_GEMSPEC="net-telnet.gemspec"
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/net-telnet/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="1"
-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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/netrc/Manifest b/dev-ruby/netrc/Manifest
index e5115cbb5343..da0093a09b72 100644
--- a/dev-ruby/netrc/Manifest
+++ b/dev-ruby/netrc/Manifest
@@ -1,3 +1,3 @@
 DIST netrc-0.11.0.gem 10752 BLAKE2B 40f78989c7b58b726c1f83ea7032eace74c11776b006a2f5fc9459134224cad6129b370d6da4bcdef540d75504da6d5ca5a1d6bab9c1ab8a2620b22c3933be20 SHA512 7f0df3f79d92b891d40a49e9b893ca7131077195cf15453b155e37e68e29f8cd3810ba791a06338058262c8cb8fed56c87c295e450c133b428b3398eb99e683a
-EBUILD netrc-0.11.0-r1.ebuild 731 BLAKE2B a2adbe935cea35982875d7df8f6fd93c9aa3957b2e4f0c5a893ab281334d09fac04b5f923d3235ab8fa0425a7d311bcbb4d6271318f13382a4b7915c408c54af SHA512 28c8fe84ef82ae70a503a90f57c1944b7c7ca960390baa79642978853702732aea2b6cd9465111e56bf3af6d38a621dbbbe7866f02aec4d8129f777e12f694b6
+EBUILD netrc-0.11.0-r1.ebuild 731 BLAKE2B 7579ce3c74b4f47c77af0e0db603403b3f1db773298ae207e5f6de2eadd9cdc72bf331f6a071499d829cbc6de1300529bd13840cd92a9849cbb6f264bf6f51bc SHA512 d79dd4f80950b175e2ddc772f7f63ea6b4777792b377fc0153ec6fc30e359bf8f7abd908cde0c417470b03cc0aa49757ca6749c13675f846b71626eecc87d0da
 MISC metadata.xml 339 BLAKE2B 9bd280b0bcca879006827b8d34b8ada55efc51aa09b907f2650c13492459543ef2e89cb7fc89cdc5e27b3b46fc09f9f85d2d1cef81dd887a497c4563e430da4a SHA512 406c93472b3a479a37aec76a0f4d3ebf8e4448404e381306be0d7048430e4e245bf6a743a6aeab60a11b3b39070850a45e0b898bc90b61edb471a13fd8c082fd
diff --git a/dev-ruby/netrc/netrc-0.11.0-r1.ebuild b/dev-ruby/netrc/netrc-0.11.0-r1.ebuild
index b263f4e63950..814b9e13c084 100644
--- a/dev-ruby/netrc/netrc-0.11.0-r1.ebuild
+++ b/dev-ruby/netrc/netrc-0.11.0-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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="changelog.txt Readme.md"
 
diff --git a/dev-ruby/network_interface/Manifest b/dev-ruby/network_interface/Manifest
index ab82f045c289..e43ed109c4a8 100644
--- a/dev-ruby/network_interface/Manifest
+++ b/dev-ruby/network_interface/Manifest
@@ -1,4 +1,4 @@
 DIST network_interface-0.0.2.gem 16896 BLAKE2B a0e7898aa5989ea38c8a9214f3aaf5f9d0dbdf39e86f7e9a4d62ec6c94f29f9612a08c1465513b62351a4c62ed776e427800eabe562062ce7c9b4b75ec757a3b SHA512 8850325e7e0c5ab51b060270220099c2c00cf7031083a511ae9f8dd6d1b9219b37169fa7620e9648eb071784a840e14ce965f8d1cf5d475ff82691bfba25a202
-EBUILD network_interface-0.0.2-r1.ebuild 640 BLAKE2B 0feb4e8868af4380a16f0e84a7bb23cffb42f047f7dd1dd6373af68f15130f29b2021e080d88ddc9c593deb1146950d4b0c6d5b5d6ffc54eea048dcde551d049 SHA512 d1eac4950d30bdcd888dd2272799407e20eb403debe3aba0fdfbb322c86f1aaf1c469a3024453530ba9156a75b2dea91b8aebb59d9686c89777bf0f50d8ca45f
+EBUILD network_interface-0.0.2-r1.ebuild 647 BLAKE2B c409e8bd81da457eedeba182c969e8a501e93c3bf2b2593c642be4a294c4fa772ccce97cb4cbb401a0803fcdce62ae3d660fe1023da30d28b0667c849db13167 SHA512 577e6215237c52508b28bdf86b8766498afb624c6897d1b20f6ff1e7b7d4167003c7ad87336ab4515cf686759f033ee2ac999854346d624beb0f14c0b42a3c6b
 EBUILD network_interface-0.0.2.ebuild 823 BLAKE2B bb65f6f170cbfdd7739d44c5c61f000405a2eac1d014f7eac0822059f0fea957c82a2b354e6e47572aef0dd3e87617659338148172852a7d4c8fc65958d9e384 SHA512 f9bac94b08c17f3a15d22637ea5cb5034c9f1b8181f9a37a956d5c18e649178c98a6ae14b520e0555ea38cfd6f0d85d8cfb5b64132edb8bc51293777a70466f2
 MISC metadata.xml 347 BLAKE2B 145ba4bea55a624f1bcd5bc1792e13affd91c283ad59e9c3934048ad2298c9724fa156df4325a751b4a60376197e4eeb1f2ca6a13b04e6675697704df7fcd1e3 SHA512 0f338ef12f1d7196fe43d2be855281ee4f947298bbc6622d4280d827e671643f9e8f4f4d54fe9dd56f60ca4e8a14b51d7ba94592205fd241261f1f09a03eab4e
diff --git a/dev-ruby/network_interface/network_interface-0.0.2-r1.ebuild b/dev-ruby/network_interface/network_interface-0.0.2-r1.ebuild
index 2e4c2572c5a2..0d329543785f 100644
--- a/dev-ruby/network_interface/network_interface-0.0.2-r1.ebuild
+++ b/dev-ruby/network_interface/network_interface-0.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/nokogiri-diff/Manifest b/dev-ruby/nokogiri-diff/Manifest
index ff71eae536ae..dff5b48e04e2 100644
--- a/dev-ruby/nokogiri-diff/Manifest
+++ b/dev-ruby/nokogiri-diff/Manifest
@@ -1,4 +1,4 @@
 AUX nokogiri-diff-0.2.0-rspec3.patch 14440 BLAKE2B 7df1717f002a958778b3ef96f6ae2eeb8ae32c90bd1a1a4b2ed813d60b935c3bc2f91529f290e57ff06ea0f214b3d3383d0968af64b237631f5f10dd6b1456ab SHA512 156fdb93e15536d0ce963be77b0f24a6a466336fd2765544573c7ec698e2d87cae5b8d4154999c253e64ba09ddd3134ab2e4241cf260f1c97bf20e6a868bc6a8
 DIST nokogiri-diff-0.2.0.gem 8704 BLAKE2B e1df47db2e6e7fcd29eb229245cb9a9a7b31fded319a6fe28d04722f457f0ea7bc19e13ee49b2233f3c072eedf3c83c7e38cd8b19d5ecbc4937f709a9f4cf3a7 SHA512 9b2b6f266c9c7d01153c345567086b4cd1092a5984e6867ea81d15e00467936f296fd5e2c3ab7dc18e44d1dd2af022d250234fb4311a9be80fd3ca32b3d201ca
-EBUILD nokogiri-diff-0.2.0-r3.ebuild 672 BLAKE2B d3ab504abf20ee988983bba3852a7de89f28e8e798784826a7bd30fa969b20bdc809d290844b0f9ea4d2108cbec80cb1d9b000e42530da3a2d9fe3847d79aafb SHA512 0ea667ed710b6394873d14c334a0a21923e73e7fd5fb2ad9cba7bc392e34460f07dcb6b910d6faad3e45f940cb62c5af8aaf9bf03273eb9f5a8a3564f8478bab
+EBUILD nokogiri-diff-0.2.0-r3.ebuild 678 BLAKE2B 1df39802193ef89f8aa60e9fc5224ad3bcbdb05e0cba4b4708653cbe46c00e46baa9fa86112abafee920d28b9710e2d965566157967d17bdc921aa8dcd543708 SHA512 56e640fda8b0e1f552d156cc5b55209555407ef4c68d4cc2ca60ea4a8fe260eecf8f46cd5114116608807fe8b7a60ffbadfef22d73bb41456e1c5c99f48efe0c
 MISC metadata.xml 351 BLAKE2B 3817b4e8114fa8c6d36881c904704a3608f83ca4bb924aba73f54aa8c3662cf130f0fd5463fee37b4130ec3195a9ed74140ccc0912411b5c8c0faa2a1f6e1fa4 SHA512 333c0ec0cbe5dd9ba71889b8a09f7cd65bfd90f5e15aead5cae212b35217b60842330bd2ad3741ec6628429d2f516fa359e44507237633209759fc449eee4da9
diff --git a/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r3.ebuild b/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r3.ebuild
index c16fa9c3a1cf..7091a701d5b4 100644
--- a/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r3.ebuild
+++ b/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Calculate the differences between two XML/HTML documents"
 HOMEPAGE="https://github.com/postmodern/nokogiri-diff"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index e8a9f387dbfb..5f90004b23ab 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,7 +1,7 @@
-DIST nokogiri-1.12.5-git.tgz 6158880 BLAKE2B 994fd89c5163d92110de40e2dc654698b11d5a18524cc4b7b668ec1475e7167014e1c7604932686e6ad888f352b04ac26a7fbe526d814b20e686c5d9da95c5df SHA512 36d233df250213c4614c34d045c4fbea099e81e991a6da49067c165bc95f36b281c58cc79deb3b6a8aaccc50743a79efa27969e067cc2b546bef7615b139d79b
-DIST nokogiri-1.13.3-git.tgz 6187128 BLAKE2B 7ab47b7e5d87a83eeaf9c5e10684199f67be1af80a5fa5d616cb4a3ffe91a9598be0576dc23d8f0cc6d143f8ce601a868e44af6411615f377cd43773659b25b8 SHA512 69666c1f62124a20fcfe3fa58091a463ed64d5a9c98355572c5822944ba6992fe1e150b694fa883d23605999f14065c5c59d7a34e2273041d9de416e42d75fb6
 DIST nokogiri-1.13.4-git.tgz 6249271 BLAKE2B bc8569a0c80e4efcedd6c5bb8a46c8504cc33ec3d2acdcefe2718047ffabef9404c76003cd279ac55e5a5fb17243af12c335b7d9e300b90d8a97e84015cf92bc SHA512 cca3e8558f8739cca2424e461a5e048a3675a23bcb6549f1c71ecfea0729859cda84ef3bf09a81d2b419e1a7b8ff2616a8dd84ac12f6e1f32b9626a0bd3e1bc4
-EBUILD nokogiri-1.12.5.ebuild 2685 BLAKE2B 4f8d05be10250cd7cd02a2a7af8de9674eabf71478fd52e36100dce1a73466d1ea2f19b2464808aff85c6d73bd2c9b65fc365a17e965a32c0d63b0aedae4d8c7 SHA512 dcea02c471e20c91a0d0d0ce6ed254c720ab7e60bbdb21f783e67625a890ddf4a53179cc11397270ad49d10e6829438b31e7ab7ee9d5061cafa06b346cf14121
-EBUILD nokogiri-1.13.3.ebuild 2670 BLAKE2B be891cc660a096b6840ec0493d728d1063177d40f4e28f21d32b638ba68014efb0290292e32e1a003a19075c0fda692af20b6072273a98dbd87eb24c2e3aa655 SHA512 95e0c59d03c5b7b3b8cee7987db2ceae63b51a8db74fdc669f6407449befd2a7568f04fc1e0839cdc41aa20b546f3560db74142e109b096feb8bec287c5c4a2f
+DIST nokogiri-1.13.5-git.tgz 6249007 BLAKE2B 6fc7eed6c10f74105917a94e5e8acb0576fbe8e64fecad70e4256d352e1e4fc9cb101be2d518420c7351f72fd03ab385c3dccc3d6442638fe9e6ecfda581eb21 SHA512 a5608c137f60ec3302810154cbe8176bcf281ddae1ac075c08b71d23fd124ac6bc3ca349f326232090475e80524bd53927449cbcba0c6087917c270ddf9e6eb2
+DIST nokogiri-1.13.6-git.tgz 6249974 BLAKE2B db6a7fd70cd88fa784e70fd33102ad2a0d65a848a713bd93907d3c77b7ecc101a4f0a38febf3265b25967e045bf9091e46cf319702c08319e32f94d57a946985 SHA512 96f4e52332052bfae0d88d8c93cf334f8484b51290cafe8c1d43c820ba6ac5aa74b187c37e7177e62435d6101d859c16555b715fa88fcb06da742c84fd0e7486
 EBUILD nokogiri-1.13.4.ebuild 2663 BLAKE2B a8e536bdf3aa49df93a9ddc334cf31ed1615199399aee82a7c638c27793532f728501ab3e64428a0fcc99ba16a0ce412a9a49a6f6186d7cb39aa5ac2363e4bec SHA512 5dd6996572e55396fb73f942331ab7632d1b54b5c61cbba2c8f500aa98b0e9693be19cd79ebd5a8934280ea6b51e7b82627875774b553a070a7454db096f6376
+EBUILD nokogiri-1.13.5.ebuild 2677 BLAKE2B 1ae1bf065c3b133079db326680678175c5cbf6e03e1d593488846ac8caaf47c5d47d030eabba77f5be4b646b10bdffee2fdc8cbb7cfbfa9ad59430fd41bb6118 SHA512 d1578456113d75e9e289c6a5e4a2bdc982ea2f46c17d66e4a773f327c17249f23afd85d3d2fa10a46f0ddf78b2afa508ca1230eb98af02595f5c313686ab8572
+EBUILD nokogiri-1.13.6.ebuild 2670 BLAKE2B ee5d8c64198f5116643b3c99f380502bcc2c4750b4adcc205d582496b2e52e3049e7f2cbe7f47a27f9ee22c8afc3a88eaf6a44203d5a292e599c6a760c1c322d SHA512 b607835321765028c394a0c9689decc232841e234be9df64c29b615f6adc08f7cd3ba0e6c07a91eb669b695de2e5f84b17ea2594f9eadd6427327cd75e795b13
 MISC metadata.xml 349 BLAKE2B 824094b81182da6ed2c43f55f8697dbf614662e1e032ed62bcf8ec4ef8fb6e6a1bf346f90863a8cb7d6cfaf2696f0be70fd3027d6d01e583bba0c1334252447d SHA512 9ab17ab504279d8d1ea584f7a6f411fe778b89564016dc0d596ec7f714cf9ad80ed5e30c179ec6aa190bafe8a8b72bfdc5a964d213a8024783da246bbb817629
diff --git a/dev-ruby/nokogiri/nokogiri-1.12.5.ebuild b/dev-ruby/nokogiri/nokogiri-1.13.5.ebuild
index dc82dff12fbf..d3d2a1eac8bd 100644
--- a/dev-ruby/nokogiri/nokogiri-1.12.5.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.13.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
 
@@ -18,26 +18,25 @@ HOMEPAGE="https://www.nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE=""
 
 RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.12:=
-	>=dev-libs/libxslt-1.1.34
+	>=dev-libs/libxml2-2.9.14:=
+	>=dev-libs/libxslt-1.1.35
 	sys-libs/zlib
 	virtual/libiconv"
 DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.12
-	>=dev-libs/libxslt-1.1.34
+	>=dev-libs/libxml2-2.9.14
+	>=dev-libs/libxslt-1.1.35
 	sys-libs/zlib
 	virtual/libiconv"
 
 ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
 
 ruby_add_bdepend "
-	dev-ruby/mini_portile2:2.6
-	>=dev-ruby/pkg-config-1.1.7
+	dev-ruby/mini_portile2:2.8
 	>=dev-ruby/rexical-1.0.7
 	dev-ruby/rdoc
 	test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/nokogiri/nokogiri-1.13.3.ebuild b/dev-ruby/nokogiri/nokogiri-1.13.6.ebuild
index c4fd1981823b..82f99f83e8bc 100644
--- a/dev-ruby/nokogiri/nokogiri-1.13.3.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.13.6.ebuild
@@ -23,12 +23,12 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.13:=
+	>=dev-libs/libxml2-2.9.14:=
 	>=dev-libs/libxslt-1.1.35
 	sys-libs/zlib
 	virtual/libiconv"
 DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.13
+	>=dev-libs/libxml2-2.9.14
 	>=dev-libs/libxslt-1.1.35
 	sys-libs/zlib
 	virtual/libiconv"
diff --git a/dev-ruby/oauth/Manifest b/dev-ruby/oauth/Manifest
index c0213852f1fc..959112152cad 100644
--- a/dev-ruby/oauth/Manifest
+++ b/dev-ruby/oauth/Manifest
@@ -1,7 +1,5 @@
-DIST oauth-0.5.6.tar.gz 60887 BLAKE2B 8dea7bc6b1a3c9d5befa5badbda105fed28004d6627624fedaf1572cc261421e3a8636019bb0a600a28fb6aa933d2b1be5faf613ae3062f7d50b314b86059b17 SHA512 dcb516b90d6cf0ff3f1071fa7bf1e1b30cd998c79205f9a6df001d5c04784ad23ecd430b4e04565a6351efcc780b552dfc38ea962d0a938c9e19a6e5bd3fe070
-DIST oauth-0.5.7.tar.gz 65889 BLAKE2B 71787b6a03156a25edbb006acd05f7aae789e9bc0fffa0afe9d3f0c55a2b991fa20527c493e9933891adc0e32571c1834f1a3f928e12f2a7b3159ebc09d29286 SHA512 4bc217123aaf74482ed118344c57b241b9efea172d872d670a860e8f236fac4ae1956826fcc786025164a5728c62edded8cb453f0051091c48bc87fe1f72f931
+DIST oauth-0.5.10.tar.gz 67073 BLAKE2B 30d5823151412f53af41f28f7d5831bcfa7e7cf0b86d3a122b825fd086c00dab7fca7a4838b7ed5ebb269725af7c2a64cf771fc598bd6a97b9968e480ce78b4c SHA512 0ff5cd07052e210b1948496844166e1095b09d9c39592b6b11fa3aa4909fd8debec55237493d292dc60f4fe513ddf1a8f58cdb0215949241cf753d4e53aa107e
 DIST oauth-0.5.8.tar.gz 67852 BLAKE2B 7dc19a2f84f585fd517d677bf441c5964b45566ffea3cbd7612061db115a5570cf8315b4cbdd8788f9b0ff336b6eea91922f17c0ce17a4c626731282bd8203ca SHA512 3bf8298ea5bcffe1fe61ba894a5cfcb04a5814348154749e056ea18d975b00b10db7ed226f2187ffb9f414b755022bf32ff4bb2c02f1f429f6a9a7062032d82e
-EBUILD oauth-0.5.6.ebuild 1053 BLAKE2B e7304763762ecd688764cea37c0bbea669caf19ef4e421b27d848b869dfd2b1bd54d1226410c70db6c48b333b41d3af174711277f5f9df0b22f6de866a89d56c SHA512 297239d72c4bb9873697365cd466efb856b2d999cbabe94025bea30c1b51365c0b027d7e46c669ce02333ae01cdb44ed9a11c65b633b9726b11380b130e946e2
-EBUILD oauth-0.5.7.ebuild 1049 BLAKE2B 909bdb4db7093ba89ea90a1285eb582716cbd3a6f440912b72295315d0b5e9b872a40f34e0311267c6174a593593b726bcf92ce9c226472d250126b02cb2cc6e SHA512 9b6611b830cbe269ab02ec6963fe7e064d77b6cf112f30c9e4cd154135c3037f2b8faf273d7441153c03a371382a89e2b11c803031f50249675173115c10597c
-EBUILD oauth-0.5.8.ebuild 1056 BLAKE2B b63229bd51c2771a738616022e767abf73a1d463fc935af8a18ef05a3a499c7fa0c37f935fd87a5f3167c78eb3818c320283518748581095ee07cf2ae7bc37ab SHA512 8dfad8caa4bbfc6f7980a9ee5f439aa09ffcd452647eae7468ae7539ededb0e2502de75d15299d3ff015b9cd60ef6b39c83a4dc9dcca3c40ac9ef4e841d69654
+EBUILD oauth-0.5.10.ebuild 1063 BLAKE2B b5eb384fab6e4a1781ee4f6415ec2dc4a68091595791d4279c87b3f1b62ae6cba3f1f2cd1fda8043137c1386096aa8941d47a0134adbecddc8ab1763c323f53c SHA512 203582b890816b60f140dee53a86a0aa22e21e91b817d5645fae94b254eb3b3f25d74faea507dfd04b21ab59b2b3ed844a8c5124c15dbe516986a2baeb7f7db1
+EBUILD oauth-0.5.8.ebuild 1063 BLAKE2B b5eb384fab6e4a1781ee4f6415ec2dc4a68091595791d4279c87b3f1b62ae6cba3f1f2cd1fda8043137c1386096aa8941d47a0134adbecddc8ab1763c323f53c SHA512 203582b890816b60f140dee53a86a0aa22e21e91b817d5645fae94b254eb3b3f25d74faea507dfd04b21ab59b2b3ed844a8c5124c15dbe516986a2baeb7f7db1
 MISC metadata.xml 336 BLAKE2B ab0fbd6793480301de481d3d1cfe9b26bfd24573f43d742c154fb4ddf4d0550663acd415dda46dbace5005085a40714fe3fdd9a84b147154c8ed3fdc47d59c02 SHA512 b99860f6b76b68cad2e0bde7a8c8d7156e4806dbed1f11f4579dfd8a89c372f7963d90b273a2ca3abbae82072aa91fba475b051b9dfaa7c557e4f36cbb5c85a6
diff --git a/dev-ruby/oauth/oauth-0.5.7.ebuild b/dev-ruby/oauth/oauth-0.5.10.ebuild
index cdb746579c6c..6aacd85e42e9 100644
--- a/dev-ruby/oauth/oauth-0.5.7.ebuild
+++ b/dev-ruby/oauth/oauth-0.5.10.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=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md TODO"
 
@@ -17,7 +17,7 @@ RUBY_S="${PN}-ruby-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
@@ -26,13 +26,13 @@ ruby_add_bdepend "test? (
 	dev-ruby/mocha:1.0
 	dev-ruby/webmock
 	dev-ruby/rack
-	dev-ruby/actionpack:6.0
-	dev-ruby/railties:6.0
+	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.0.0" ; gem "actionpack", "~>6.0.0"' \
+	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/oauth/oauth-0.5.6.ebuild b/dev-ruby/oauth/oauth-0.5.6.ebuild
deleted file mode 100644
index 7fdf4be49c41..000000000000
--- a/dev-ruby/oauth/oauth-0.5.6.ebuild
+++ /dev/null
@@ -1,39 +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"
-
-RUBY_FAKEGEM_EXTRADOC="HISTORY README.rdoc 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 ~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.0
-	dev-ruby/railties:6.0
-)"
-
-all_ruby_prepare() {
-	# Require a compatible version of mocha
-	sed -i -e '1igem "mocha", "~> 1.0"; gem "railties", "~>6.0.0" ; gem "actionpack", "~>6.0.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/oauth/oauth-0.5.8.ebuild b/dev-ruby/oauth/oauth-0.5.8.ebuild
index a675a968338d..6aacd85e42e9 100644
--- a/dev-ruby/oauth/oauth-0.5.8.ebuild
+++ b/dev-ruby/oauth/oauth-0.5.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md TODO"
 
@@ -26,13 +26,13 @@ ruby_add_bdepend "test? (
 	dev-ruby/mocha:1.0
 	dev-ruby/webmock
 	dev-ruby/rack
-	dev-ruby/actionpack:6.0
-	dev-ruby/railties:6.0
+	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.0.0" ; gem "actionpack", "~>6.0.0"' \
+	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/oauth2/Manifest b/dev-ruby/oauth2/Manifest
index 36d94ca18ffd..c7ec548d58db 100644
--- a/dev-ruby/oauth2/Manifest
+++ b/dev-ruby/oauth2/Manifest
@@ -1,5 +1,5 @@
 DIST oauth2-1.4.4.tar.gz 28477 BLAKE2B 925008fcf4dd48da3b17c539713bf0f05f649d431ab1676293de625bef4165f31153271d48bbb0c6265c67d7bb6a3cbc7217ce155ba331b22a00d572a855a8ef SHA512 5398a25664e53d1942b0ecbe5d74ca9cc8f04a928c96073f40cfff207c4bf220634185320954a0d1f36944547fb48264855c9523318fbb79dd4a3779a7a46e79
 DIST oauth2-1.4.7.tar.gz 32341 BLAKE2B f3db3ff7ebcf7bc0958a564fdb0812c1bfb613148c5a16655f276fda4d6dac7769196305d854ee0fc3f8b4b53a93b4ae504b348029e1b363bcb704293887347a SHA512 4a43b3f75e827e9a12a74a6fe13a29b141c0d5bcb6a0d5c86dc8d8726f650a9fd5250ecc2c31cee5e985f0cb50e02f828d27fd07577bcac4dfc8ff4e009bd710
 EBUILD oauth2-1.4.4.ebuild 1429 BLAKE2B a665d826a2b4094e5a48c8321efd4cab23f13fa9eb2b183590d35c4cd3fae6a6c7d5b8800bed929538180bcb7316538b2e161633a8c88a7232e9392fb1967b76 SHA512 965168e464c1d2843756eecc19e7f3527b51aca89b7d5dd0ee87f064660f15dc973c6c7d955414aecf5b7b28f6c8209b40aecf1774d4111f2c5a6ec665ab02f9
-EBUILD oauth2-1.4.7.ebuild 1478 BLAKE2B c6e2af684800de7eeee2fb5ebf444da6e928ac0478c40e4b3eaf0529343ced1927a26a9c05dda3546a12d0824a150ad1f22d86096ce30f58cc6f7e861802c78a SHA512 42f3584ac4e977e206d1566479cbcc19770ba48cdef09a5677d3358fe104cefaa3af4af1820319e470b9c946d987e0f4fea5caaf73af43cabf37895344247be3
+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.7.ebuild b/dev-ruby/oauth2/oauth2-1.4.7.ebuild
index b63605b131d0..255cac1628cc 100644
--- a/dev-ruby/oauth2/oauth2-1.4.7.ebuild
+++ b/dev-ruby/oauth2/oauth2-1.4.7.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_TEST="none"
 
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index fb639ebfe03a..5e5aa7ad9815 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1,7 +1,3 @@
-DIST octokit-4.20.0.tar.gz 3127939 BLAKE2B 30b251c95cf664ea83d23473ecbd5d1652586a567775253afa3f0c954490a6381c86da40cdc3761c8c43b17c850dfe9ba80f3814e946f1f3a008be81dd3c002a SHA512 180a4846052dc223b4d5444acc7af7d78151ac941687c75e6853c119ce75d9383fa5ec1ffc7ede97a6ee6d5780ef27030f2132761484099f634be6a3c4a9d7b6
-DIST octokit-4.21.0.tar.gz 3134804 BLAKE2B 67648f7dd3a04b8b5b397d94e1c73329fe6ea0a6db1abff3c5cb5ab443beb1e5874c2bc2f072ecbeee2a13b4de229791c03184eb5fa769ba52e2d8793bf0b9c1 SHA512 364ed578ddef4b4fe50c3848559820819a517d33e2140f2867f70de4fc1e9e5a14c0fcc9b34a6bb6b2240bfaf0b9ff95038e01ff7e857e2bd0ab707f546d9fd9
 DIST octokit-4.22.0.tar.gz 3141531 BLAKE2B c852f34dc99b10fb06194bda9f15bffb4242a2b5ee7909e74defa2a7ca6b90962fd30232eb8850d97af872bfb036c87f7623acd9088efa3afd07f01cad525fe4 SHA512 e8696176227c81d5f80080fbb3c660b7b6e1b28b149b664b20d7e8cf333450988ac2fb9f5327c5e4e46528dbf7eea1246e82c94b265e6008f8fd7cd98f87423c
-EBUILD octokit-4.20.0.ebuild 964 BLAKE2B 58ae373df60ecd1494a9adca2632cc083a3476430de20d0b3484c621780bff3dc481a82335fd10d0357d67f647fdae1def7de98aa09f94d909003799ee5981b8 SHA512 d56a6181843d5a63f0fa47974ba4f18b1b017f873a93a95769043c579e2ef263fcf4f5499645343cbf7d0b8369e8fed188e612d59bb3a19a5439fb3a8e9702e3
-EBUILD octokit-4.21.0.ebuild 964 BLAKE2B 58ae373df60ecd1494a9adca2632cc083a3476430de20d0b3484c621780bff3dc481a82335fd10d0357d67f647fdae1def7de98aa09f94d909003799ee5981b8 SHA512 d56a6181843d5a63f0fa47974ba4f18b1b017f873a93a95769043c579e2ef263fcf4f5499645343cbf7d0b8369e8fed188e612d59bb3a19a5439fb3a8e9702e3
-EBUILD octokit-4.22.0.ebuild 959 BLAKE2B 1e62991cd4f5cf188418cfa385ab99d14480314b20c51ce259534001f7b122082f470d792a7c9c1fe499b1ce84cd8ef9f3d16d83f1d167ecb297f8762d511849 SHA512 2a0486a236aac0e24d662058ec78e043a899dc61cb5e0776c03d84620576249bf5c1702b9937d68b0f46df75b11e41245bca1f886f7ab3bce5bd7a964dab14c9
+EBUILD octokit-4.22.0.ebuild 964 BLAKE2B 71302f2657d5b82f65139f22cbb6596cd55f8f77b31424a8110efa15f47a5b525552caad80f06250eedd157c8da5483b355cda9ab50b9bf939c2831d171ae5e7 SHA512 59febe6e0680988d031f338e7dccb3657f9abc2b141cb9fd2b44b55dfef1dd7813567ef62a6c5b9c4185093997c25037d984016e00212bf4cf7bf36480c0fcff
 MISC metadata.xml 345 BLAKE2B ea9d229a1fa9c9e756d829b4b07d85d90cf5834f6667c622b5b9b5a886e2bd7b3f4d3e115a955ec823869ffe55d7fa810e97cee634036d7da88846462e42fd8c SHA512 afde1a713d352134bd4ada1404bb8834e0a33c4f0558a56050786d67bc76e9d397b0aa362445b74b29b620f93e2eb85b1374f2becb0d568ab618b65a4a95b689
diff --git a/dev-ruby/octokit/octokit-4.20.0.ebuild b/dev-ruby/octokit/octokit-4.20.0.ebuild
deleted file mode 100644
index 85e02ff81cfd..000000000000
--- a/dev-ruby/octokit/octokit-4.20.0.ebuild
+++ /dev/null
@@ -1,42 +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"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby toolkit for the Github API"
-HOMEPAGE="https://github.com/octokit/octokit.rb"
-SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RUBY_S=octokit.rb-${PV}
-
-ruby_add_rdepend "
-	>=dev-ruby/faraday-0.9
-	=dev-ruby/sawyer-0.8*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/jwt
-	dev-ruby/mime-types
-	>=dev-ruby/netrc-0.7.7
-	>=dev-ruby/rbnacl-7.1.1:6
-	dev-ruby/vcr:3[json]
-	dev-ruby/webmock:3 )"
-
-all_ruby_prepare() {
-	sed -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' \
-		-e '/pry/ s:^:#:' \
-		-i spec/helper.rb || die
-}
diff --git a/dev-ruby/octokit/octokit-4.21.0.ebuild b/dev-ruby/octokit/octokit-4.21.0.ebuild
deleted file mode 100644
index 85e02ff81cfd..000000000000
--- a/dev-ruby/octokit/octokit-4.21.0.ebuild
+++ /dev/null
@@ -1,42 +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"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby toolkit for the Github API"
-HOMEPAGE="https://github.com/octokit/octokit.rb"
-SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RUBY_S=octokit.rb-${PV}
-
-ruby_add_rdepend "
-	>=dev-ruby/faraday-0.9
-	=dev-ruby/sawyer-0.8*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/jwt
-	dev-ruby/mime-types
-	>=dev-ruby/netrc-0.7.7
-	>=dev-ruby/rbnacl-7.1.1:6
-	dev-ruby/vcr:3[json]
-	dev-ruby/webmock:3 )"
-
-all_ruby_prepare() {
-	sed -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' \
-		-e '/pry/ s:^:#:' \
-		-i spec/helper.rb || die
-}
diff --git a/dev-ruby/octokit/octokit-4.22.0.ebuild b/dev-ruby/octokit/octokit-4.22.0.ebuild
index e9e1d7a6daec..9c6417cf16ec 100644
--- a/dev-ruby/octokit/octokit-4.22.0.ebuild
+++ b/dev-ruby/octokit/octokit-4.22.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -32,7 +32,7 @@ ruby_add_bdepend "test? (
 	dev-ruby/mime-types
 	>=dev-ruby/netrc-0.7.7
 	>=dev-ruby/rbnacl-7.1.1:6
-	dev-ruby/vcr:3[json]
+	dev-ruby/vcr[json]
 	dev-ruby/webmock:3 )"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/open4/Manifest b/dev-ruby/open4/Manifest
index 5385da482bc3..77b51ff729b7 100644
--- a/dev-ruby/open4/Manifest
+++ b/dev-ruby/open4/Manifest
@@ -1,3 +1,3 @@
 DIST open4-1.3.4.gem 18944 BLAKE2B 00ef3139cbf6ae175aaa40526c105d39fdfb07c69f0a3aaf607feb799f0a8adac99cd5ea5caac29c884374af6591f4049b3888626c24b3d2371d4c0c9019cc7a SHA512 838a18efcd093d55d9589ff9d5c11054618abef863224c2d9b31445dc735218c2f96d954040e2d3f8d5aab0140e54b627fcc4a1b01c17e59267402a2abdd8efb
-EBUILD open4-1.3.4-r1.ebuild 642 BLAKE2B ecfad895dec2b1cd2d711ccd65e47a8655037002edb493d52949f4b0cb6fb6f84354a90a2966f255585009a45ebfa9d1a16797f1438ead5e4603ca5ce5bff299 SHA512 38a1ed650c71a0b579ea6d96088f82bc6be6c361432a35521d6173d284b3a5868cc31512339264b27fe3654437dd511d461a4fdb4270ec1d4057320f8ea082c6
+EBUILD open4-1.3.4-r1.ebuild 662 BLAKE2B 7bdcf2225feefacd3f8f44a3696a0558eee0502bda666c7a6ede19e28aa505975b543ce4191ac66c7564913826f949cd6b1b91c8e0431172486c743d99efb5e6 SHA512 30b08f734fafef27c5e0db8350246198b1e175e5ec4083369d0b2b74b6ded3f9ee28e10eafab0a8fbbda21bda2e328b0f03ca7757c062d21edf4de9f887b0dbf
 MISC metadata.xml 340 BLAKE2B 8c9f980a28145f38110bb66a94c7a3814fdc49d9bd84cb2ed6553996f964655d93730128e805fe4778fe4556b3bb74b6e4325c5daa0f1523ef244fc8a12bf8ab SHA512 bd4ac1420c2e0573647ccaa28ef997f538ea6f65337ee6dc24a925042cf3d1f7d9b361fc9329fd5a674c5db15a20115fb87a5471ecbf788e1f67ba780e1bf339
diff --git a/dev-ruby/open4/open4-1.3.4-r1.ebuild b/dev-ruby/open4/open4-1.3.4-r1.ebuild
index ecf6798d3bdb..84e47efdaea9 100644
--- a/dev-ruby/open4/open4-1.3.4-r1.ebuild
+++ b/dev-ruby/open4/open4-1.3.4-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README"
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/ahoward/open4"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/openssl-ccm/Manifest b/dev-ruby/openssl-ccm/Manifest
index 735b42778199..751e5025d581 100644
--- a/dev-ruby/openssl-ccm/Manifest
+++ b/dev-ruby/openssl-ccm/Manifest
@@ -1,3 +1,4 @@
 DIST openssl-ccm-1.2.2.gem 24576 BLAKE2B b94a205ce3b9d557ad649c0391428526339b050dd7a85633ee955b3532a94637e7c40a7cbb9bd739ff50f2922c97721e4dadf7e392c2aaaa38f35123858c01f2 SHA512 5f04af1ac65608e519fcf68259b2690f12882781cdba411939f809e1a6cb602723bf23d9cb920949e8eb7c4bfddb3e65446ae16d0276af78992de21cbfcdfc49
+EBUILD openssl-ccm-1.2.2-r1.ebuild 461 BLAKE2B 7d10d77b6f8dc0140c9b6509708e838640591f72ab2242ed13db8848eb9ca600ff1389a9d7f0e07f4d2c43d911d0497b07cb197368d8f0c1e813aa0d4404407f SHA512 68a34a80011135591e31a2a81fd7b40e6dffd1dfcf2646f033b6cb18096c7918502d5d8ddb69947799c658cad99a3d98768c97408596b712d40988a98e2df6eb
 EBUILD openssl-ccm-1.2.2.ebuild 493 BLAKE2B 5486db1d0ab8fd75e7eec06043440ca10232808abf2f95f5cb3c248070b297ae32b8ddb7fa878811f2d4c7ef1215e16ed64bb7eb10a1408e00e483f125f87ec4 SHA512 cabff8973220f5c35eb431d37c9218729864b02685a8f628b3ed076e7f38736244cee5c83e0cf0df178f7163b3ad798291191e110441131b727a2626e54a83ed
 MISC metadata.xml 344 BLAKE2B a8d224a63abfe1adbe0a829e7d2c7da31692d734d512a6f31f336a94a83c21b8c6d8caed1248f4b62d8bda8973e048e89c65cbafe118317a16c6c0c408ba9ee9 SHA512 600fea2b0131a02daf48eab55eb6042e0af24f31cda8606f207147f2ec53c749655a0a7b616bb669a5dfca0ff0f45da02c18f208e55eb06838567f9ab8dbdbaa
diff --git a/dev-ruby/openssl-ccm/openssl-ccm-1.2.2-r1.ebuild b/dev-ruby/openssl-ccm/openssl-ccm-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..e532af80584a
--- /dev/null
+++ b/dev-ruby/openssl-ccm/openssl-ccm-1.2.2-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+inherit ruby-fakegem
+
+DESCRIPTION="OpenSSL CBC-MAC (CCM) ruby gem"
+HOMEPAGE="https://github.com/SmallLars/openssl-ccm"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/coverall/I s:^:#:' test/test_ccm.rb || die
+}
diff --git a/dev-ruby/optimist/Manifest b/dev-ruby/optimist/Manifest
index e55b657d8764..5745306dd31e 100644
--- a/dev-ruby/optimist/Manifest
+++ b/dev-ruby/optimist/Manifest
@@ -1,3 +1,3 @@
 DIST optimist-3.0.1.gem 30208 BLAKE2B 66778029b9e2ac2eb38beaab5cb73a4fe58b123c401fdfc00d924073a6dd97dca05bbf8ab3a88e47ca5f94ed920a583196d901c6a2a4962e93c8a2ef905173ba SHA512 209fbb355a7ba75208cef314ccaa188955463551d1c914f10409cac189375b5be40fbcdf0d88a5ce825c527bca7138528fafd6f37cf73f5e68f3b453f3ef8485
-EBUILD optimist-3.0.1.ebuild 715 BLAKE2B 53340f6a1d4b64fc97b6c16e27d3258f2c387bb3a94a20ff52a7ac1cb15e31e2d430cab9c48199721447f010ad9b7d0c36c64895a67ff957900ddf39b37a07a0 SHA512 ea2138ecda0edae0962d44de7996c61027efd817dad225b82bb3bd4c4fe7ebb78d5c5d19b702b62b8131f6fb1cb79f2c8dc92c5220418793d635bc3bca09daa7
+EBUILD optimist-3.0.1.ebuild 715 BLAKE2B 383487dfb76df6345c309c61f044444cc16213d49de0018cbcf2f5ceea5aee893cccc5925167baef8801ae9b5374c9e5c761859a8da15267a0966bde6e95802a SHA512 335e6eebdc7aea8a0a1c5985289a932bd134293f6902c22621fe5888cf3edb5d954802c55674e8fc44cc65fd5d965a3c2d49385ff8c4b65a18f4525204ceabfd
 MISC metadata.xml 616 BLAKE2B 8d6758c96e9cc64b4e24ea5b3888dc012f4bcd3c43d7eb807834a56f10684ad8d1fbc4db9158aa4b171545488f381daad7faf3fa1bda0cc07fc222d4a9d20518 SHA512 9d7a4cbee9874bb23414c348c0f7809f09a770accea4f5c1af0fcb6e6447510af7840c39567969c38607bc6434b6398332f6e21311c752e8428acac4e826564f
diff --git a/dev-ruby/optimist/optimist-3.0.1.ebuild b/dev-ruby/optimist/optimist-3.0.1.ebuild
index 3b00cb962597..f08a822bec74 100644
--- a/dev-ruby/optimist/optimist-3.0.1.ebuild
+++ b/dev-ruby/optimist/optimist-3.0.1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="FAQ.txt History.txt README.md"
 
diff --git a/dev-ruby/optionable/Manifest b/dev-ruby/optionable/Manifest
index 75e3f6396acc..33c17ad2aa6a 100644
--- a/dev-ruby/optionable/Manifest
+++ b/dev-ruby/optionable/Manifest
@@ -1,3 +1,3 @@
 DIST optionable-0.2.0.gem 9216 BLAKE2B 4d77994fc4a5b800d03f1fa675760f4755b5b0ed6ff18e79e15cb918129261a37bf09807bca504a0caba4eae8037b688933b7bf62b2770e8e451e7f4ef94980c SHA512 4c633c83cd51fb2f1771f5f842cc8024d769f644d513a8d4486c7960d2bdda81be44746a7bb4604bb458cd58c3bbb5db28cb426d25cded6098263798f7daa465
-EBUILD optionable-0.2.0-r1.ebuild 357 BLAKE2B 6ec983d2b09972ccaf77876215fd97fcad9955f9baaafeb3dc126e537873df0635659d59da4a02fa961797cd5ce632c3121bf7cc53cdcb82399b9048842bf48d SHA512 e3592a550d3ce70bd52d15a4631a6d044974bf188da6aea501fc6d179a8dfd996a49521d24f110458b7cd179c0710264a8b085cdbd4064152e041d89f2a0dca1
+EBUILD optionable-0.2.0-r1.ebuild 364 BLAKE2B 2a12f2f0dcac995dea4159b52da7299262ee85bc6913ec34e929c8efc61e22991267c45081ff7c5e7bab1720a91212020f2af9675ebb162a3c2ff65ccb99988c SHA512 bb7b6d2b1baba0f24422d50ce2931872c83a67275e4fdf7e9c87d5b25e211aae7687246d2079f9b30ab754434340ec7b48da99cbe9d6db27ac1a5b620a860c5e
 MISC metadata.xml 344 BLAKE2B a58627af700ef54ada9cd53abf9806a66991e493e6863d3c41e88a06605c418a37b56143b0ac8565c1385c2e8a23aef7c86d095023efa02985ba1c40dd6f9fff SHA512 8afc52f98fe107b1398e3aaf20ffe5026ea25740aeca57f26f17927cc1180b810e362264032894ab0cd3841b34f67bdf54bde3beb3031d75b11b43a51970cf4f
diff --git a/dev-ruby/optionable/optionable-0.2.0-r1.ebuild b/dev-ruby/optionable/optionable-0.2.0-r1.ebuild
index f8215391936b..b1281a2fea0c 100644
--- a/dev-ruby/optionable/optionable-0.2.0-r1.ebuild
+++ b/dev-ruby/optionable/optionable-0.2.0-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index 549af37cb11f..8bf6cd9b5054 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -2,7 +2,7 @@ DIST ox-2.14.10.tar.gz 218705 BLAKE2B fc70af78d26655ec8dad64a180139446985590d579
 DIST ox-2.14.11.tar.gz 218731 BLAKE2B ca342a0cf87e9e80048511c82ade7d24fe8e59fc1efd96d24f50f5694a82527d3cbc37a762cd619ce5febd00323ccf566ffacd413a38e4516900c79e55a8cdd1 SHA512 9f34237fae1aa4c7c77e9dd01eda07fc5134e1fd5d0ca48c37bf2a52d4e257c049e71876c366bc63109727a0ee2fa37aec9fa8222f2902bdff57c3ecb87e8d84
 DIST ox-2.14.8.tar.gz 218502 BLAKE2B e3838c52096c959fcdf2eae2156a79f1562cd13c8463f0a3f0ff54f9468059547e9bfc79f2a7b750f614fd77d5ae56189679fb55f9771903697864cc80b0831b SHA512 a07e7d074c681325c84cf7f381be7d1912b9de53cb41d11762fca15a6899a66bbf0ad751119416ec4640cde8c11dae967514fcfb16acae6f5be76d03f2b46eac
 DIST ox-2.14.9.tar.gz 218618 BLAKE2B 57f5a43cf565079a07b678f45e14764ef859620d2f66c5348362d6f08e7f9d3a2b358ff81b2c2455bdb39dbf562df6aca45557895abc30d0cc16657c979b8806 SHA512 e2f178b30ad8e94873e0f8e0ed95800963655ffe31c0af9af3231df5a2d769487204507bca91573a381550ef80b08b15414e6607c5236f5bb8994a719a5ea5cb
-EBUILD ox-2.14.10.ebuild 646 BLAKE2B 8632b58789a754ea2d6db433d1f4be213624e798beda988df23e4a8fc19c70d78c4d560c7de7c1543b827c0950887bf216c2e461a4fbc876e30e5fcc3e3f6673 SHA512 10e156745c4cee2bf8c1d46de7c028fe41fe0e6d156d5e177800596ed2e5cc848f0af7a08859dc961e826b69d696fdffc913e95c7a84526f4e9f30f793fd5743
+EBUILD ox-2.14.10.ebuild 645 BLAKE2B 64ea6203ca812cd704001a51262a2ff2b4f301ea2234829302d98886c1e269e38964be448b34d6b43961a1ac12c2d35619b9145a347ef9f710f9830d71e9a1a4 SHA512 f2463993b3eeb61bf4017af722193125e32930139dd8585b9c2e36fc91b26a9d0aee7666df61e2c01c231878c8d811bee32ccb891de12bc3f2753dc657bd2e3f
 EBUILD ox-2.14.11.ebuild 646 BLAKE2B 8632b58789a754ea2d6db433d1f4be213624e798beda988df23e4a8fc19c70d78c4d560c7de7c1543b827c0950887bf216c2e461a4fbc876e30e5fcc3e3f6673 SHA512 10e156745c4cee2bf8c1d46de7c028fe41fe0e6d156d5e177800596ed2e5cc848f0af7a08859dc961e826b69d696fdffc913e95c7a84526f4e9f30f793fd5743
 EBUILD ox-2.14.8.ebuild 638 BLAKE2B 679a9c949190d7fece524287d35f3452efa27c4afe581039407f856d2a5882b14e828943de1b1f263b2eec4a42bcfcc43db404e799b5d77e36ca300a0983ea63 SHA512 d23729cd2fa5c703669bc52216ffeab096f2a400fab263d4653cd85389e8ad0486c95593dfd2ff3f5ad550103589fc92d4e424ab1553c90a8569435b80e7a58e
 EBUILD ox-2.14.9.ebuild 639 BLAKE2B bfc49982c3c595cf4f05e487c58af84caf4bef38f55c7383d8f138e46c34da8f9aa465fe30ee10c15f547c92a36e0d8725cf89c8db300ab8512191b8e05b2ba0 SHA512 c0b2d997bafd0de953a36ff8777f5735657933578dec342618cba6b4f27592a81cfbe47029e7ff32b5950da1df3f35ae12400781ef57372d20bcb2f796f8e195
diff --git a/dev-ruby/ox/ox-2.14.10.ebuild b/dev-ruby/ox/ox-2.14.10.ebuild
index 9d396a28c0f1..18c6fa807322 100644
--- a/dev-ruby/ox/ox-2.14.10.ebuild
+++ b/dev-ruby/ox/ox-2.14.10.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.ohler.com/ox/ https://github.com/ohler55/ox"
 SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/paint/Manifest b/dev-ruby/paint/Manifest
index 9b292a37c5b8..748e558ff281 100644
--- a/dev-ruby/paint/Manifest
+++ b/dev-ruby/paint/Manifest
@@ -1,5 +1,3 @@
-DIST paint-2.2.0.tar.gz 22107 BLAKE2B 4f1e978023cd6edb371ae7315cc48451f3a911522f0d39b7dea264d8d112a6db4560507c33fdc55e247b782f30cd8b844d6c790ce86194c151acc7c2abc7f9c9 SHA512 67f9752d270ff8cd2706318a16b3b3980515bd07a55a2b8900eb79b200d6da87993185c839748052457536b82d53694bba33c0f64d8ada50b61a34c9985ba009
 DIST paint-2.2.1.tar.gz 22181 BLAKE2B f0d3e39244fd103e7f248161369189e2e5dafc7eb0f0813998e0da4a80714ab355ca1ebb9357695e97b57db49a90198a2efc0a4043a4e7bfd18fedf58515d113 SHA512 8190c220310b724defa0f482b264afe32bcfd00044380dbb3d8354050857f121c1e084bd737f7b9b89a6950ea4be2c87b7f7282854641df65918bfb6bead5450
-EBUILD paint-2.2.0.ebuild 526 BLAKE2B 4e820307b79085ec23ebaaa25e01f86422d2ddedad42d7ff07eb453a44bb53503931bdb99f7e4c31b1e157c09a2aa1d798bd08467de98f1b459f814770360e2d SHA512 65f26763d055a39434e392da36a12a8563a008120a21d1bed23f78a9e095290b333bd033921424708b12bd0dbf3ef809468417306bc1170b89c1e13c56aedf72
-EBUILD paint-2.2.1.ebuild 519 BLAKE2B 0f14acbd6f378abf0818d02427a761307e01c554f9fb001c6faa8244b65a43ced2d9908beaea7bfdd7e487d3d7b93f371ab47c72cab033e9355cbb66b3788137 SHA512 dcf0f87396a84ecba629e71431bd1923f6b773924fa9ab0ab51d190a89f743f413370e2b3559f0b4f86d31c888368377abb4d9cdc408cb9492f1aa2e0ea2549f
+EBUILD paint-2.2.1.ebuild 526 BLAKE2B ba5f1d56555992825673523d6ac1c068e4f97e825d2479eee463f6e3fe0d7fb1b4ba57622179bf18dd81e20e82fc9abc0d8e37fe92cd9df5e2b433fcdef2238f SHA512 7edd1081556d257d594a20e4a6583c62cf82f0be736ff55af32e96e35e55a6e5dca3a7cdfb3e0cba131599aac254cb6614159500b5a072b58360e1fa0a434310
 MISC metadata.xml 341 BLAKE2B af96160e7a1720e8913ef163015b27d16654378e586e84fbdd8e54cb124601d546a5b306982065f41355e94540c55248bfd66dd8aae48b380cf5ab15e8efa976 SHA512 3540bc71fe6489b2c2aa2d29b7ec45ecb4877844a81f51b28062163538217ba9c34218510394bb8decbbe5e990dd6ab0f9da8bc727aa1570c5f71a6774e3c72c
diff --git a/dev-ruby/paint/paint-2.2.0.ebuild b/dev-ruby/paint/paint-2.2.0.ebuild
deleted file mode 100644
index 18aa33cbef8d..000000000000
--- a/dev-ruby/paint/paint-2.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-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/paint/paint-2.2.1.ebuild b/dev-ruby/paint/paint-2.2.1.ebuild
index fd0cedeec872..a7b57a3529d0 100644
--- a/dev-ruby/paint/paint-2.2.1.ebuild
+++ b/dev-ruby/paint/paint-2.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/pastel/Manifest b/dev-ruby/pastel/Manifest
index 27ac0cc0ab24..1baaea4b1a23 100644
--- a/dev-ruby/pastel/Manifest
+++ b/dev-ruby/pastel/Manifest
@@ -1,5 +1,3 @@
-DIST pastel-0.7.4.tar.gz 48176 BLAKE2B 3564aba28f9315d2f988dabdd0686e6c7a53c1b200e6e03519c1ebcde917503760d4f0d790e456c7a732b47535f692d7f5b88cf786e5b4236e9b2e8b5eee66d7 SHA512 a1ad8487babd1e788282e141538855370e09bb2745731670b814cb4572c54e0568955108f7657809b98f92b94d9d94cdd555e2db8146b20f80db98bbab3512ea
 DIST pastel-0.8.0.tar.gz 49560 BLAKE2B 646cdf5f7cd1e62e83d87cdcdbbdc2cb2619fd570b4715191825344346053b7bf8f8f18b177a8bad6416c13858ab007d94ccf5c16b71c123e4a3d2fd03cd0720 SHA512 8066b372f08e1d6312b87744309692e3e6fd5e2737374bce53087af45141ea4f14e67ead6dccb11df70f73cbb0611ab9e20f7fb553d87a349996bda0f7a3862d
-EBUILD pastel-0.7.4.ebuild 770 BLAKE2B eb2478af74a467d8a9590019cf5e32fdb85021c80628759909872cbed943b5aa2dd1ebf19df6d9d82908cee489ec8995bea4333050ddb06e02bd4460eff9cd9e SHA512 fc0ba91e34d06dc2ccc92a4745a2c2edb9451dbca2a8f7644c1522fb5e9fb85d39b0a4bf74b5399ff6449a565b6f19f60309a075e667b7cc3a60d15578266153
-EBUILD pastel-0.8.0.ebuild 766 BLAKE2B ba733f1a61a8e2b0a42974f32f4ce6a887bb923882d9abf989569b9912d8143e985c9541c972012a5c4b784f10b1e506100ddd192820ca116af80dd9ac3f3ddf SHA512 dbcdce06c5ca47ea704f5ff8505279f0a1e60aaffb14fbfe17ca58ce48398f7ccdfe7eb34ac6efa7f7377c2d7236599734e9b7b6aa4922b4c8356ab3293aeca9
+EBUILD pastel-0.8.0.ebuild 766 BLAKE2B 3ac47628322bae4513fce2f49101e7331f4462ab0923c67897e9dddc4c074870edbd7f3aa58783f9eaff66871f846665d246473845eef4d59d10ac55368ecff9 SHA512 03dbdab42d1bfa4d292a0a4c9a346d6a98e03ce7172d969af2a6bd0bd513ad0fdfc2636646e64d62e9dd8eebfde8a6369eb858613cb34d5e0440dd309490e403
 MISC metadata.xml 335 BLAKE2B e64ac8fab5af3884ede2cc3ffea05ce1f1921b6ae57f31610cedb99538d5f8dd52d0a2b90aa7ffd1d967a4cdd39fa8fdda6e3c3b67d21c59e10f8fc79439c5b5 SHA512 8f1f6b4be2e1a720b11d3e0e4bae20116df2560aa9a04e0e913751ac8f6ac878a7175069f5c928e1eb0284563b5e84c60bfbab67e06f1161c21c2402ee8c6a63
diff --git a/dev-ruby/pastel/pastel-0.7.4.ebuild b/dev-ruby/pastel/pastel-0.7.4.ebuild
deleted file mode 100644
index fdd5b02e3bc1..000000000000
--- a/dev-ruby/pastel/pastel-0.7.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="pastel.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Terminal strings styling with intuitive and clean API"
-HOMEPAGE="https://github.com/piotrmurach/pastel"
-SRC_URI="https://github.com/piotrmurach/pastel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/equatable-0.6:0
-	>=dev-ruby/tty-color-0.5:0
-"
-
-all_ruby_prepare() {
-	echo '-rspec_helper' > .rspec || die
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/pastel/pastel-0.8.0.ebuild b/dev-ruby/pastel/pastel-0.8.0.ebuild
index 76a2edfab1dc..ef170d9a83f2 100644
--- a/dev-ruby/pastel/pastel-0.8.0.ebuild
+++ b/dev-ruby/pastel/pastel-0.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/pdf-core/Manifest b/dev-ruby/pdf-core/Manifest
index 2276432bb2da..cfa8f621ccd1 100644
--- a/dev-ruby/pdf-core/Manifest
+++ b/dev-ruby/pdf-core/Manifest
@@ -1,3 +1,3 @@
 DIST pdf-core-0.9.0.tar.gz 45772 BLAKE2B 860d0995af759315564b91264f5d6072b8a1530f4c994700e5d2632e0d8c09fd48c9b0991ff8026f68db07c43c412bf13ad73913a82977dad0bf6477fff81dfe SHA512 668b19cd722c56c00330ed81ad4fb8fb8bfa7290c2a8a3d23ab4ca92e7f9ea44729314aaaf68da9cb02dd73643b650ea87437d8d8aba5075342917ebd7ffa2be
-EBUILD pdf-core-0.9.0.ebuild 765 BLAKE2B ac96aef89fe23568b5f3b8a7a39b88630df6d1a4d231658c15eb50be2784140f79a6bdb45a79e3160a8436453ee4e688c4486f28b675f6c6ab73efa54a92b647 SHA512 3136adbef56a8b41184f51e0efdea1c1ef5e07c8ae98398d851768e9aa65066d973f5ca93e1682a2c4c05888fa1266202b82c4c5a8cf016fd131fbe387ced5a2
+EBUILD pdf-core-0.9.0.ebuild 765 BLAKE2B 1b69c1bd476c2111fa68de82253d04f16fbf87e35b57b92b871cbd40d7154dedb55a9d421b6d73547d4991efca9c40f971ec3a28126b6fe0d72739f9c9d19a16 SHA512 f4a4d7242c4d696b41394dcceac935ff246afcfa27516dfbbb0dba119aea8f648e417f7e59de5bae0cc7b894ff3ff7fc3cefb256232229bdbb47c21e0d42a1f4
 MISC metadata.xml 344 BLAKE2B 2967a5e548c8c9e5cbb5e2021f2d2278901896ae88a39b84911e59f7861a6eee6e6b0c5e50c503305a08488fee03a75086a498d31bc6087bf50a95ace99a2444 SHA512 8af9520d3fb751bf874241e1e1507328cac496b2f08467355127a17cc47189f5cdb27e921e6f0b9eb02011881ad97e84cc54bc2618c5b8dd33efd4aa0034898a
diff --git a/dev-ruby/pdf-core/pdf-core-0.9.0.ebuild b/dev-ruby/pdf-core/pdf-core-0.9.0.ebuild
index 5f2295555955..c3afffa2aede 100644
--- a/dev-ruby/pdf-core/pdf-core-0.9.0.ebuild
+++ b/dev-ruby/pdf-core/pdf-core-0.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/pdf-inspector/Manifest b/dev-ruby/pdf-inspector/Manifest
index 891de82f3ef8..926cd261bf01 100644
--- a/dev-ruby/pdf-inspector/Manifest
+++ b/dev-ruby/pdf-inspector/Manifest
@@ -1,4 +1,3 @@
 DIST pdf-inspector-1.3.0.gem 30720 BLAKE2B b3c6b2a4085ebfcf64901a8a0edb8fe762b00db648c74c37ca3ca80b645ab65b006eaf875e1cee109f6a7d30f97617053d0f7c548360281d21acf316f496eb7a SHA512 7c89f8656908d70495fd03e3ab2faf9b133d34c607ea63978731088d8b954d29e1e6e907b1e0d81bfbc35ecfa394badbd0e2c996ff94d6bbc7e78f4d7082d115
 EBUILD pdf-inspector-1.3.0-r1.ebuild 527 BLAKE2B 11bb585c11ff21ffd016baeaaef10b5bf1277468633825d3f430146e73657e4397dba1b5838f8e9b3ff647125fbc568141b9d3d141cb9e6fa5078570dbf9b8ff SHA512 99abc8e971451df35a0b5530e312a63333d0ffb9f8c7e4b6c91531200377032c50396d7ddad4b19ccc0e513aca902c92558cf61a75a0877d4d2e61359015d2cb
-EBUILD pdf-inspector-1.3.0.ebuild 565 BLAKE2B e04aee931d15f93164aa3900ca9eb785f992cf9fe755160e6522f4e2da6e58f19eb5c2a5841ae5ece95618edce09caac904b93465572360d4b610d862a0562f7 SHA512 7e7ce28eb449510ea20cc5cb4cdbe7575ab8db5e92f9899a18b8e841be0d33577bd7e2187b7147b3da566eb3810f239796646f5cd27fbc3ff7702539af5eb88c
 MISC metadata.xml 349 BLAKE2B 23e08ed1718520b62773cda52078e90002dfd132946d29832a732fdc629285191cae371fa296fda1ff336447e79322673c722d8c15f468d2ddfeba2b4a5434c8 SHA512 11c87b285c2f43a2df879469d5c6adb4b3b60c5a1973f9fcf02b8344143e5d8e50e57461d5aab001a0e1b7750550847f51aa0ab00b40a4f00243073327636b14
diff --git a/dev-ruby/pdf-inspector/pdf-inspector-1.3.0.ebuild b/dev-ruby/pdf-inspector/pdf-inspector-1.3.0.ebuild
deleted file mode 100644
index 717b930aba91..000000000000
--- a/dev-ruby/pdf-inspector/pdf-inspector-1.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A tool for analyzing PDF output"
-HOMEPAGE="https://github.com/prawnpdf/pdf-inspector"
-
-LICENSE="|| ( Ruby GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/pdf-reader-1.0:* <dev-ruby/pdf-reader-3:*"
diff --git a/dev-ruby/pdf-reader/Manifest b/dev-ruby/pdf-reader/Manifest
index 4447aac08f56..f11af5e2ffd8 100644
--- a/dev-ruby/pdf-reader/Manifest
+++ b/dev-ruby/pdf-reader/Manifest
@@ -1,12 +1,8 @@
 DIST pdf-reader-1.4.1.tar.gz 10236680 BLAKE2B 86fb137c65b47717e758473b94ddbbf52def3ae0edaecd7b5eb3f0d880f664c9ff6097221f43d64247b006ed18220f4f9a469d6b8574592750a1d8a468ce7ddb SHA512 aaa53dafc2d58dc591f708941907ecf14b1ee73362a7bd6d34659103d51effa90888560733747ca1bfe3d217cb6834109e06b024f40a95214880ca42f54054e5
-DIST pdf-reader-2.5.0.tar.gz 12457904 BLAKE2B 6a17a586297ee238b9e0e8ae707cc0518ae3de62ec058ea31303f0787cff7f6f79f4259babfec4323adc6fb08b64b92e3f0f6f01da3a1eda29c6ea02f25aef3b SHA512 684d7ea414c8cdb7bc2aa17b2f3108a18cb6cf967b844ab26a6ac39071508b8a871b661e0e017a7f721cb3c2e6dffcd2cc0d3c31c2b33b3c61be08292c25da4a
-DIST pdf-reader-2.6.0.tar.gz 12463722 BLAKE2B c7c788871c4c99decf13509a116c266c33489d8a3f3b46988b14307d2534f2f6aa20a578af8019b44690e44f9bff780aebc8c7e7299c51f25a97cfa988070748 SHA512 5234708f9bb2ddd85bd6821023ff7320cf21fe91f70e517f6791ef0d5186909f055da6af3903f77e8a4a1498f3fc130c9797437f4c00a817b8f33ab3dccb37e7
 DIST pdf-reader-2.8.0.tar.gz 12598389 BLAKE2B 8572c4c869d09bd7ecc9967d46b44236002fadb863695675b3d7bf2f7d63560c72240f9f0544f844d63f33f65f6097d28eb315f332eeca58294a5956cf24c09b SHA512 8f1a7990d982141e6dae682ad5dd6f415a363a598f76523ac9be2fda9c460479e571140c0f407f01f950dd94d73bc006a32a827fbab08a42d1c6656024d241c9
 DIST pdf-reader-2.9.0.tar.gz 26133329 BLAKE2B b9c798e98198c2233d0b87a56213dec54fcbef2d566cdde29d38f10c0b577a8bce3066a008de8eaa11169851eb285cf2818a56ef35ba44abb3702e25723707ba SHA512 cb4f08ec0b706a553c2fb20abab4e3486e3b7de1887366b10454a67b405bdd675c437edbd5928f11dfe4f7cf0d6af64a877db3f1002e38c27e0177e0ef5a487d
 DIST pdf-reader-2.9.1.tar.gz 26134579 BLAKE2B 7900530afe2818adb621d57d67d1c16c7fb3d6d9ed64648ee3241e903cfc8ea4264f773af4302f17eeef7b945b10df5bbb9c734c4f0710e831657f9fa0b49a55 SHA512 63e95f015308c6cac2f59965c753c3d51d3b24c28ab72d6c8672c026ec5dd796033d559a4956a09855423613668a572f9c935aaa5cca3be3529b3f33ee353974
 EBUILD pdf-reader-1.4.1-r4.ebuild 1159 BLAKE2B a725a3daf9e001f0875e426ece047cfc6f0154ae2886e88b576c178769589cc320850bc178e51c135084e42689b80c1f43578e17214306fda599f0e26760308e SHA512 dc5c1fe523848da79af0ae6e4d2b6cdcfd9869e56c24fca4afbbe9c98c57acfaaed880de01a87c77e27fd5d602495b122cbaa0e7a73d1d4a50756a37d8620167
-EBUILD pdf-reader-2.5.0.ebuild 1135 BLAKE2B 7e0531988483dfc5634430530cdc5f7850382c9caf803a1b8a625ed62ef03d22b2bff1040a735c7fb38031470605548da500b6e51d3a718933e76d9979d376d3 SHA512 b4db4a10b3722154e13fa46d2a379e85a2ea88bcb8916c71809fb1fcfdfe506ff02d4a81bf31e32418a08581eef0ec08c61ef6e367b269581cf10e18ba28faa9
-EBUILD pdf-reader-2.6.0.ebuild 1128 BLAKE2B 817814148e45f009e959ba693e40a5ad7cad3cc94fc6f24f3599dd3dfd1604b4df68159e7b78d28c94d0ef9c9544b6da563ecc633fcaecd24103d05837f1456f SHA512 8acb8326119cecbfc6798f956b01783f57eed7c970459b74b35b2064404eafcadb52eed10940df73cca7248f558cbd0e3047ab2ea8dc4647959306c5cb15ff1c
 EBUILD pdf-reader-2.8.0.ebuild 1128 BLAKE2B 8e3f24a975b23d1ba7ad19fd5f160d54277aea6bc505da93e3414b97c1321cd8a7bed464262116b10098d1bc70b3424734bab84bc13428376d85ff3c746c7727 SHA512 9ac0b5ff1fc0e79600356e9e47c1b49ce33c6c8ce9e8a8106be5260e038a5b3b745bbdbdd98045fb4b5c20b7661e5de0aa9a4f07ca368e4b18a426809b3a252a
 EBUILD pdf-reader-2.9.0.ebuild 1128 BLAKE2B 8e3f24a975b23d1ba7ad19fd5f160d54277aea6bc505da93e3414b97c1321cd8a7bed464262116b10098d1bc70b3424734bab84bc13428376d85ff3c746c7727 SHA512 9ac0b5ff1fc0e79600356e9e47c1b49ce33c6c8ce9e8a8106be5260e038a5b3b745bbdbdd98045fb4b5c20b7661e5de0aa9a4f07ca368e4b18a426809b3a252a
 EBUILD pdf-reader-2.9.1.ebuild 1128 BLAKE2B 8e3f24a975b23d1ba7ad19fd5f160d54277aea6bc505da93e3414b97c1321cd8a7bed464262116b10098d1bc70b3424734bab84bc13428376d85ff3c746c7727 SHA512 9ac0b5ff1fc0e79600356e9e47c1b49ce33c6c8ce9e8a8106be5260e038a5b3b745bbdbdd98045fb4b5c20b7661e5de0aa9a4f07ca368e4b18a426809b3a252a
diff --git a/dev-ruby/pdf-reader/pdf-reader-2.5.0.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.5.0.ebuild
deleted file mode 100644
index 0de57bc42498..000000000000
--- a/dev-ruby/pdf-reader/pdf-reader-2.5.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GITHUB_USER=yob
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO"
-
-RUBY_FAKEGEM_GEMSPEC="pdf-reader.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
-HOMEPAGE="https://github.com/yob/pdf-reader/"
-
-# We cannot use the gem distributions because they don't contain the
-# tests' data, we have to rely on the git tags.
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND+=" !!<dev-ruby/pdf-reader-1.4.1-r2"
-
-ruby_add_rdepend ">=dev-ruby/afm-0.2.1 =dev-ruby/afm-0.2*
-	=dev-ruby/ascii85-1*
-	=dev-ruby/hashery-2*
-	dev-ruby/ttfunk:*
-	dev-ruby/ruby-rc4"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/pdf-reader/pdf-reader-2.6.0.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.6.0.ebuild
deleted file mode 100644
index 79b2ce3ce2a4..000000000000
--- a/dev-ruby/pdf-reader/pdf-reader-2.6.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GITHUB_USER=yob
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO"
-
-RUBY_FAKEGEM_GEMSPEC="pdf-reader.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
-HOMEPAGE="https://github.com/yob/pdf-reader/"
-
-# We cannot use the gem distributions because they don't contain the
-# tests' data, we have to rely on the git tags.
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND+=" !!<dev-ruby/pdf-reader-1.4.1-r2"
-
-ruby_add_rdepend ">=dev-ruby/afm-0.2.1 =dev-ruby/afm-0.2*
-	=dev-ruby/ascii85-1*
-	=dev-ruby/hashery-2*
-	dev-ruby/ttfunk:*
-	dev-ruby/ruby-rc4"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/permutation/Manifest b/dev-ruby/permutation/Manifest
index 4a7cbd0ed1f7..80c2d21bd9c9 100644
--- a/dev-ruby/permutation/Manifest
+++ b/dev-ruby/permutation/Manifest
@@ -1,3 +1,3 @@
 DIST permutation-0.1.8.gem 18432 BLAKE2B 719d2c8c3006d821e69a5540a387f5e783aa0b9270bc650110171ad7d049835d4317deec68535dd9d1119259272867d6abffe97aabb9daa6c55b1d367da4bbd8 SHA512 78f9679a652d3f18ea4b459aeeceb3e25c912e28b7d9052c523b930e94e841fa84daa329f9ff06a23456cd7ab826f18cea181b85dfcfecbf303747990fa9a582
-EBUILD permutation-0.1.8-r2.ebuild 486 BLAKE2B d4c950a8d43754db37316ab1768cdd8f68ec3f9e5c70e1500291b75dcb8314175646436da010b38a82c7a26cf41c0a4e6fa986ab16a7d0bef98fb2955f55bb56 SHA512 7994bdddd8615f3fbb68700e3948bbffa0d888ee2477de6781e037a2e19601d3e5998fa484ec1ad521dc40b6f367cbdbb367a8139a4e9717643961df2fcba564
+EBUILD permutation-0.1.8-r2.ebuild 493 BLAKE2B 3e33c6754f2c75466b739dbbba69fb56ca074d0529d193793bebe269853c974117f0f41ca728badff3f4c51cf4725406331310ba5fdddc6797b15877e0d662de SHA512 f647d388459aff7a4ed45a2ef2bdc7b5d1313445b2035d90da328d66d3446ad2d7fe96a94c7cb2191e02d3a6e8b3bc73dbb5e9ad2f7d23fbec6553aea8d28455
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/permutation/permutation-0.1.8-r2.ebuild b/dev-ruby/permutation/permutation-0.1.8-r2.ebuild
index 9eeb47e6729a..5a634f425a7f 100644
--- a/dev-ruby/permutation/permutation-0.1.8-r2.ebuild
+++ b/dev-ruby/permutation/permutation-0.1.8-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGES README"
 
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index a6e45c6fbd2c..f9c51c9ac93c 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -1,5 +1,7 @@
 DIST pg-1.2.2.gem 196608 BLAKE2B 068be98d190cb4074cc89bdb5b376322f323950909f7a6fddc8669a3ff0f85eef9f512bd2ec7121707e9ea077b2b428f698e84f2118c76e34f5def75ca303fca SHA512 5c7cc90afb75a66e80cfc34c4875cf22b005aa0a27e78db6f71d1829f870c6409b73326a9925f79c0d642e93ea51d1f84c7383323fea44b7488e83deb7754951
 DIST pg-1.2.3.gem 196608 BLAKE2B b3e9119d068c833f7352b61802d5fb03616ed2d13f957c8d4b51966444523ef9d884a860309209dfbda5931aa1f8199b7a63a51a89c194758de309f00bdbfbd6 SHA512 dd8fa7b256102aea7588fd7e1d4e28199be2bf9910149d266b5379e78a7a57aa2a22763d04a559f4763842cad4ba8d0fbc33e8b43b7497dc77039edfd1029585
+DIST pg-1.3.5.tar.gz 256197 BLAKE2B 8a8cd0135eb7dcf8389d2b0afa174059d12f542b1e2897fba0e292fd16f31508293ca90f64f731db9bc14e55e9ba2c740ccf744a5fe30c449d64344264e409e1 SHA512 44e8ad97a6f4136d49641c5a59a70a489d766d1c1e511f5a6f003c2ae2900466b02a2504dc0fb26c872ce3fcb56ac83ac5299a829cca99d9c02c4b7ce0f0ac75
 EBUILD pg-1.2.2.ebuild 1595 BLAKE2B f3dcdc64b69e3e8da9a9981ff97c72ebf9f58044e43be2283cceb70e45a70f349970f003d12ec469827170192c441044e92547e9ae0bd8959fc9cd34fc6d1aa1 SHA512 b90c98ddd7ee4de299f7bfad52955e76a54cd615218c8e86ed1cb20e98731cdbee20e0f8cc3b8faa125969233f3b974803f38085feece6c0cd125cf04261835d
 EBUILD pg-1.2.3.ebuild 1426 BLAKE2B c93244066819920772e2dd6bdc0412e3b0011eff3b6c9fb43b4ab9e785a311cc105dc3c6f570125b3ddb0da8b9463f7fa7c1c29d31f975e459e71dd853d683a2 SHA512 4e3c4f49004464ae462d79bb76496da6759ca5aec19d9348f96bee4daceaf2c2e0d44608344521fe6a7b1f7cc181df8150dc5999b51b8bfbaabc41697322ec8f
+EBUILD pg-1.3.5.ebuild 1930 BLAKE2B 794db20988a9d74027ccdb8fdc3e2bdfa0077021a02e4ebae4d81049b908ebd185222a95a3c3a07fe4663d8213cc39b150421ad11eec77ca7ca0fa20b6d0bc1d SHA512 c8a5653828cfb7d73a822ca26f78120a969b64ee06491cdd2fd3e01f564fbd3ac7c97dab53ecbc2200ed6823cb46c811d87bb86fcd0e115044d85f18ace0d13a
 MISC metadata.xml 338 BLAKE2B b827b967fa6a0795016f741de3ad7738103580b06bb6d1f56957fbbcde06a63eeacc6b9aa2bbd726bad77c91b28659a3318e6ec43d141cd1cd05982b209c2f1d SHA512 8f1ea2d36aaa43547b48d39df2f403bbbf63b5bd57570bddf8515f84bea573793f1ecacc807d02f05d96a919c8778465f4c87822bd1807ebeca115f6dec81e99
diff --git a/dev-ruby/pg/pg-1.3.5.ebuild b/dev-ruby/pg/pg-1.3.5.ebuild
new file mode 100644
index 000000000000..a041e4e6ee51
--- /dev/null
+++ b/dev-ruby/pg/pg-1.3.5.ebuild
@@ -0,0 +1,61 @@
+# 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_GEMSPEC="pg.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc README.rdoc History.rdoc"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
+HOMEPAGE="https://github.com/ged/ruby-pg"
+SRC_URI="https://github.com/ged/ruby-pg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-${P}"
+
+LICENSE="|| ( GPL-2 Ruby )"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND+=" dev-db/postgresql:*"
+DEPEND+=" dev-db/postgresql
+	test? ( >=dev-db/postgresql-9.4[server(+),threads] )"
+
+all_ruby_prepare() {
+	# hack the Rakefile to make it sure that it doesn't load
+	# rake-compiler (so that we don't have to depend on it and it
+	# actually works when building with USE=doc).
+	sed -i \
+		-e '/Rakefile.cross/s:^:#:' \
+		-e '/ExtensionTask/,/^end$/ s:^:#:' \
+		Rakefile || die
+
+	sed -e 's/git ls-files -z/find * -print0/' \
+		-e "s:_relative ': './:" \
+		-e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid tests that assume IPv4
+	sed -i -e '/expect.*hostaddr/ s:^:#:' spec/pg/connection_spec.rb || die
+
+	# Avoid test that only works with bundled pg
+	sed -i -e '/tells about the libpq library path/askip "gentoo"' spec/pg_spec.rb || die
+}
+
+each_ruby_test() {
+	if [[ "${EUID}" -ne "0" ]]; then
+		# Make the rspec call explicit, this way we don't have to depend
+		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
+		# the whole extension from scratch.
+		RSPEC_VERSION=3 ruby-ng_rspec
+	else
+		ewarn "The userpriv feature must be enabled to run tests."
+		eerror "Testsuite will not be run."
+	fi
+}
diff --git a/dev-ruby/pg_array_parser/Manifest b/dev-ruby/pg_array_parser/Manifest
index c7d63ab18fe4..a57d61fd2609 100644
--- a/dev-ruby/pg_array_parser/Manifest
+++ b/dev-ruby/pg_array_parser/Manifest
@@ -1,3 +1,3 @@
 DIST pg_array_parser-0.0.9.gem 8192 BLAKE2B 5b647cb3bca2b965348cfb5c442f4bf9c58d03f66c422768b22836d8a9cf73d9b2b242a055df0bea708b617d0a3ca84abe8100007ca259eeea4dd089385db860 SHA512 a1503d9598e1658eb63b6294ce1cf6f8d2e7e5c59382407946ec10d25a46b029b4bb8a8c634b190b42bef4954c4aeea60b6ffa16c596e0c3bea2df4c882896ae
-EBUILD pg_array_parser-0.0.9-r3.ebuild 1055 BLAKE2B 28ec529dd6a0402b115d801c70152885aaf523d4f7ebf2ef1bd9bf27af72ad1fa1a6f76e6796f07151a9989fecf4edfb5f630decd9b193182d49c630d8d70dc6 SHA512 745bd0044900965bef7f561bba8b259ba754ace556c6c36764019271a0589695858b81a1dbe6f88b68d4e1db9d8be7392abc15bb37812c4faefefd47b815523d
+EBUILD pg_array_parser-0.0.9-r3.ebuild 1062 BLAKE2B 295875dde094da3d90d4518339a15411951cdaafd8e842285c162e5b1b3bd6e75f526f8e9f6acfa0697e8cf7288e5ad007e772e13f79cf5abf4881ef12915e45 SHA512 54f5a5dee2962c1bfb264a393fbbb5a75702af8a3213c0a737f83bc0c4c6bc96e6cf4779335eea675b5ac48f23e97ff02eb6df6fca1089dff3b6b326ae571386
 MISC metadata.xml 347 BLAKE2B 7e1e8010f3be064e5bd3c8373a073292668fa7dad5fdb2ab5d413b0401e80dd108832cef4ec73ce0bbf22c739f1fb9e16ed80be41270f51c5db32766f994b842 SHA512 247ecfc8a886a812a527e6e8546af7a92e925303e9b6d5befc91cdb8e3aa51830703360fa4ef70a6b14ed4da98b1f08dde582261621b5658457a1e8cef9aeee0
diff --git a/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r3.ebuild b/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r3.ebuild
index eaf4ea21c240..b5d931496a25 100644
--- a/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r3.ebuild
+++ b/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r3.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 43370b940dad..98493e48b357 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -1,13 +1,7 @@
 DIST pkg-config-1.4.1.gem 22016 BLAKE2B efac610221b288bb669a3783c0e70af3951478147896315c53af2186912b60045096c0ba01a0a59ce09897a2e4e747d28a091b947281fe7f6dd6f85cea31aae7 SHA512 72d61466c1ea53a5eda66a8e8f8106fef0269fefdd349ac83959a34bb8f36796bd3e9c7fbcbad5763d2fca015c65436f9d410724e27b6d1c495e3957d26757a6
-DIST pkg-config-1.4.2.gem 22016 BLAKE2B fb8f32c811f856d11653fc0450e5615d83dea07f07f712b4914edfdca1e35f9b2da7d04578c9f28a1562cb0a405e54f6429cfac792ca2f86710d18c30a75be71 SHA512 f727f416860b08e87390c60800333bab7b0d6238fe1f93bc12b92ec67ca75c5c9ad128332a54a0b895dbf49944a50619e3bf40c49efcc7e73811d51714ae3d66
-DIST pkg-config-1.4.3.gem 22016 BLAKE2B a23bfee3790a03d4224efe16439b1c43a6174336b567d7c84d429e848035f7c77d96340e677a7f75e3cef415f236cc1d09cc0f75bee5d8769e9490bc2fc5f4c8 SHA512 4952636442d585b555d048666937e568f237789329ed6110475efe149d607f4b1946ce1b616574a91de7e4c17ef9cc5cc3b4bb2867a7dc08344183a41303f42d
-DIST pkg-config-1.4.4.gem 22016 BLAKE2B 6514405160fdfaa2be0938cb976ae779b964fdf54f0c49f6480ca09d3877459cf88af1f7b17519ee511d24c9b9bdc21087091b3050fcb252487d880f330a7beb SHA512 bb355e2183c9077d0e940d768b7eb12dff2b31fa518b1d28be751c52ecbbb16a99b326c7d6953501056074156faef9f30682dc82c3350da00f80f9a55d491550
-DIST pkg-config-1.4.5.gem 22016 BLAKE2B adbe2447e676c04eaf5e2d7dc6b1a165278f309d01c3d1b34b2a528d6639b525307cc40a62c06026e0c16fea5b7d48f2813f9b8617332586065e2f66ae3e2037 SHA512 4c3f4dc8d414efc9a140f3438c6977c6b534b7944356ac0c4a95233924dbe372c47b15296ba0f8e35cd6520664f28381131cbaafb33f8d004bb34adfdcc5c236
 DIST pkg-config-1.4.6.gem 22528 BLAKE2B 7d040576e0d035af75218e7efee6d3a8ee27206de8e12ef112c6fa7c5917f300c07149c08d510f26f89299cb73c384775403ff7f863379c195fb524c8127c59a SHA512 328fbc46bb549d4cbcd4995cb91545bd13f00f3d24610f9a70b39ea3b58c595d96801fcfe9ca9848d6664d7c9dfce44ce2702a58b894b80744619678e10b0e50
+DIST pkg-config-1.4.7.gem 22528 BLAKE2B 450dffb0c9680f92c8841bcc8c7aa2e187f73e8db1d1325ece7dd024ae0f430b8365d185742d349775bf821210ecd13dddf5b9e40bc85ede07cdaef3199b23b3 SHA512 ca93bcee16b75690af630236e6ab01c13de220f1ea128475ded5fac155f12a967ceebe9b5ab3e7e6f43d5dbf81ccb1bd79f6f25c92eabd3318019b0e50696623
 EBUILD pkg-config-1.4.1.ebuild 782 BLAKE2B e2ba8b0981bfbd85b1451a912d0589fdf518612514dc58805bbfe9a446bb7a34ef45d8ef0d2b86dd1f67526d938ca526d9c1e88aaf6cf0785de6a0987585dbd2 SHA512 4ca32118847ce4c0d63218f323c53d1a2d86bc10caeacbfd623cb77ed22afbac7bc1dae47269858eb08a1c1cd2c248057fd6a12705c9d657ccb1a0b237196880
-EBUILD pkg-config-1.4.2.ebuild 782 BLAKE2B c98e5b89f526daed4e5f6df0b5fbf74ecbe22d7c60177d43c11ff271aaed89f44f5b161946ce59995840c7eb31b72c656d13cbe900417c2937e9b3642d036698 SHA512 cda391497ad497d1ad7d20a9f731aaca1af862ae34ff1b063d26dea6aed75a497f69d44ce7a2b255a8abc7e49d909e2628a51e3672dd6c5fd10ebb4f08911975
-EBUILD pkg-config-1.4.3.ebuild 789 BLAKE2B bbd800055fab6aeaf9330028be5c028d5ba213b60b334f816651b6a79248ea72503a7c9f2a54d93cffb0ccfc88b0dbbae604731f80f3218fdd322db6d2876a35 SHA512 7ce7ae53ba76ebc321b14a02041fafdab819bff40bef5acdec81e411ecefb19ef082b3bd2fc68fc8a21b0405033b0ee37ce71f75bd2869961588cd12c2b42576
-EBUILD pkg-config-1.4.4.ebuild 643 BLAKE2B 33bce683f9945c9e6c439a99ba790990ca0488de65ce251381d2d57eef8a778840cc1b62ce8129d5703bd0c143339f579d6b32e6d56e3493968ef80b8a3deb1a SHA512 f41236d2d64280d629c4131c0d5c4877eb675d2f4e2ac2c4eabd9bf9a91dbedd7c4f756068fb5dc2be74c8028ecfd618f029e22bf6e7dee69355f8b780d55335
-EBUILD pkg-config-1.4.5.ebuild 643 BLAKE2B 33bce683f9945c9e6c439a99ba790990ca0488de65ce251381d2d57eef8a778840cc1b62ce8129d5703bd0c143339f579d6b32e6d56e3493968ef80b8a3deb1a SHA512 f41236d2d64280d629c4131c0d5c4877eb675d2f4e2ac2c4eabd9bf9a91dbedd7c4f756068fb5dc2be74c8028ecfd618f029e22bf6e7dee69355f8b780d55335
 EBUILD pkg-config-1.4.6.ebuild 650 BLAKE2B 23492383e7f855c67740272c551d0925490a97437747b0f5a2f7802fa57f3fe504eebc03462a1db279d011bc5a06980b1ee09e23f0fc099d8e715b34159ac4bc SHA512 48e3d83a5c7485bd8829bf47f9817b7630f3db6645a6ac9682a1563b94e921adfd51d7b485915e570d33d9c19df5d2f00bd334adfbf7b83085b4688274f4d73e
+EBUILD pkg-config-1.4.7.ebuild 763 BLAKE2B 77b671f006ce1e971e4b5a9ca14b83298c4839734f4e1673934090c825c5e61d4eda1d0bf9d04fc2dd47350cb82a41da8cef6692db31f1e6ca9e074fc4e76de3 SHA512 1b74e2e6ab0a58384e3eb99a911f85d5ff37273014ebec6406e4c81e7e524736231f6d16bc561df98b696c53f3b58eb172374da53dd9b585432f5a030d6973bf
 MISC metadata.xml 455 BLAKE2B 4a60efb90428ea8fecafec935f1a51c9702ccef29f3f534b777d9425a1a1efc8933937d4725b079e662baf0b9a4f3087710625347aff8561d8fc9a44820e28b0 SHA512 d57b118083a5b11acd3de88461446a56792f6d8243a994dd1808c1039f017f6392a2d837f8baa5c124888a72256821d2319bd6cc8bf0e01fa6b7b4866f350eb4
diff --git a/dev-ruby/pkg-config/pkg-config-1.4.2.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.2.ebuild
deleted file mode 100644
index 2ebdd50bb933..000000000000
--- a/dev-ruby/pkg-config/pkg-config-1.4.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pkg-config implementation by Ruby"
-HOMEPAGE="https://github.com/rcairo/pkg-config"
-LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-# this is used for testing
-DEPEND+=" test? ( x11-libs/cairo )"
-
-all_ruby_prepare() {
-	# drop failing tests
-	sed -i -e "/test_cflags/,/end/d"\
-		-e "/test_cflags_only_I/,/end/d" test/test_pkg_config.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test_${PN/-/_}.rb || die
-}
diff --git a/dev-ruby/pkg-config/pkg-config-1.4.3.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.3.ebuild
deleted file mode 100644
index 47172bfeeaaa..000000000000
--- a/dev-ruby/pkg-config/pkg-config-1.4.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 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.rdoc NEWS"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pkg-config implementation by Ruby"
-HOMEPAGE="https://github.com/rcairo/pkg-config"
-LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-# this is used for testing
-DEPEND+=" test? ( x11-libs/cairo )"
-
-all_ruby_prepare() {
-	# drop failing tests
-	sed -i -e "/test_cflags/,/end/d"\
-		-e "/test_cflags_only_I/,/end/d" test/test_pkg_config.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test_${PN/-/_}.rb || die
-}
diff --git a/dev-ruby/pkg-config/pkg-config-1.4.5.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.5.ebuild
deleted file mode 100644
index 6ad94f426799..000000000000
--- a/dev-ruby/pkg-config/pkg-config-1.4.5.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.rdoc NEWS"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pkg-config implementation by Ruby"
-HOMEPAGE="https://github.com/rcairo/pkg-config"
-LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-# this is used for testing
-DEPEND+=" test? ( x11-libs/cairo )"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test-pkg-config.rb || die
-}
diff --git a/dev-ruby/pkg-config/pkg-config-1.4.4.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.7.ebuild
index 6ad94f426799..6fc6d370faeb 100644
--- a/dev-ruby/pkg-config/pkg-config-1.4.4.ebuild
+++ b/dev-ruby/pkg-config/pkg-config-1.4.7.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="ruby25 ruby26 ruby27 ruby30"
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
 
@@ -12,7 +12,7 @@ DESCRIPTION="A pkg-config implementation by Ruby"
 HOMEPAGE="https://github.com/rcairo/pkg-config"
 LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE="test"
 
@@ -20,6 +20,10 @@ ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
 # this is used for testing
 DEPEND+=" test? ( x11-libs/cairo )"
 
+all_ruby_prepare() {
+	sed -e '/test_cflags/aomit "Fragile on Gentoo"' -i test/test-pkg-config.rb || die
+}
+
 each_ruby_test() {
 	ruby-ng_testrb-2 -Ilib test/test-pkg-config.rb || die
 }
diff --git a/dev-ruby/plist/Manifest b/dev-ruby/plist/Manifest
index 6798ec148c30..a80cf6694f3f 100644
--- a/dev-ruby/plist/Manifest
+++ b/dev-ruby/plist/Manifest
@@ -1,5 +1,3 @@
-DIST plist-3.5.0.tar.gz 36650 BLAKE2B 8f93f8ef2fdedd9da50c4bdf9c473d3b199cd828909ea1572b761bc4e8d0508e997a60737ea21c7fa96764787ecefd41aa0b0046f94d3f89de796a746a794e21 SHA512 b1c9ccd66db1e0d1ebef3931f6db0f57ace2a1bb417885da48e9658c66af28997b6675a8050db78fe0083f05afc91e1313cb823d79553288d7c0c4a3a9762920
 DIST plist-3.6.0.tar.gz 37311 BLAKE2B dd9bd1a7cf62974fb4b51744ab826ab65e6e02030073ec3b60b3d420982b65ceb3b1c1bb50e0f38fb68e25c366b17e7885cf5053418338ea05c324afad2df5b7 SHA512 d5991d944d8f02cacecdbdf9834379f34fd915eb3cf252aa1923e8d49a3b17c72ae07fbd53f1cfe9d0c14147729f4736838e4cea3fc286a90280bcc3de4b7fd1
-EBUILD plist-3.5.0.ebuild 777 BLAKE2B 1c7c3ada11258d96905ea5d8d31e842bbb01441423f156042e882eaeae08f09c8ea776b56bebe908ac71fdaa7bd18e025194f16f0ed92e19a2988660c442c4c6 SHA512 75634873f83b47bb9c63e8fbc0aeadb6df0a0020a686c690765c60ac68513f4c6c38c740a25c13153c34e486d18d33349dcf3f9ba654dc5f9efa3f9f72bbf099
-EBUILD plist-3.6.0.ebuild 746 BLAKE2B c0204067aece20845f245239e90bbba318c3452b66dcde88828fff9b03e846f869f846d5e5eb34392b381c5b8706e725b9844c6714912fad9265ea57f75fa5c2 SHA512 f296f72409811833eec558c609202cf4762fefed79315b0ae24765c2fcfe05579d9fa9b7d21915d003804faac789f9ac051888147e89de7a692b8fd566dd2c40
+EBUILD plist-3.6.0.ebuild 746 BLAKE2B c8f1a89794ecb021bb2bb8a8b6ac34fb6a81bd813740d2bb4d0424fb52c2adaf7da47e4932ab24281dda8a32023b93649638bdcd04f480adee4e662f1a0adf26 SHA512 4c75bc8c71cecbf6f6d75c62dd140cafd6fe30b08a80779090135169e0571f03f4dc478db1d27718b8a8e1c6a997f817d51d090aa15a53dd1f69ac2a20d734f3
 MISC metadata.xml 331 BLAKE2B 1ab06588a0b4c36115f96e927d4dbe3a7940a136651ab9ae52ef7753940d4712243cb72f1fb4d0e02466bf77599f53ffbf0890b2c29108bf82a27716838282d5 SHA512 19f202a62e9f20b13deb0216f5297a94b755ea8cb4f349266a1dff6f550b8efe7c98138f6d6ab1889b028677f80ddc2ae15495185687a622d6341f9e2d940a64
diff --git a/dev-ruby/plist/plist-3.5.0.ebuild b/dev-ruby/plist/plist-3.5.0.ebuild
deleted file mode 100644
index eb0ca18ca57f..000000000000
--- a/dev-ruby/plist/plist-3.5.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=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library to manipulate Property List files, also known as plists"
-HOMEPAGE="https://github.com/patsplat/plist"
-SRC_URI="https://github.com/patsplat/plist/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/plist/plist-3.6.0.ebuild b/dev-ruby/plist/plist-3.6.0.ebuild
index 3d6bd85d776b..ead510f58365 100644
--- a/dev-ruby/plist/plist-3.6.0.ebuild
+++ b/dev-ruby/plist/plist-3.6.0.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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
 
diff --git a/dev-ruby/pluggaloid/Manifest b/dev-ruby/pluggaloid/Manifest
index cdb8b80be807..6fbfffb06368 100644
--- a/dev-ruby/pluggaloid/Manifest
+++ b/dev-ruby/pluggaloid/Manifest
@@ -1,5 +1,3 @@
-DIST pluggaloid-1.5.0.gem 19968 BLAKE2B 39fce1d3077a0d2b2b969c8a6b48850b0451e8ff50e76ceca8a094f866c5de8be3a4a26458b86cae82ecba881203e1b9546464e80a482b287457c24fff3eb751 SHA512 ec5196d2ec7c61b0979693fbe603ab52451a0c66ef74b9b1486f2f9a3fbd41ffafbdc25acfb8e4f815eabf7e1829c5eb6792a71b6a7e1dfcda6a64ef21b034fb
 DIST pluggaloid-1.7.0.gem 20992 BLAKE2B 8e5dca33d4e724ce264cf94d3494d452dfa6aaa3dc373c50ac7a5e1931358484e984bb0f3e170243d7e3daf10ba6a7e15b1e7b0cc77b6394c2349e6e36e7a77d SHA512 f4ebf9fa60bf29366cafeeab09cd1cddd3c46903757f55a6b0a1326499c1b5e917258eb07a7f95934ab2ff32626dfffc2738c847eb6090725f90dce7ac90c550
-EBUILD pluggaloid-1.5.0.ebuild 536 BLAKE2B 5938d6b08fdb81537219c1d135e79a61832923701072e6b6473b6b6f7d170ec4954fe34883a84becf9147051628b042f76446dae683ad4157a40a50cf3c26f08 SHA512 63688f45ecbc61abf85787fe5563f2d98ac4078511faa87a0bee5b029913dd27c59d24412a03d51167a875e9f6579d0ac170aef33e8b6f3b69611483adff3724
-EBUILD pluggaloid-1.7.0.ebuild 550 BLAKE2B 4ff4af72cc53ca2630422494b8a1f509c3ea551e38f67239b6f381c802c461714b9a27c3eef7a271009c5231dcfbc2b13c362810650dd236e70ba8bfd19072f9 SHA512 9a3cabf10c339d3f17851523a676182244095844354c9cbab7ed0d9f2f9dc498c2f845cc24b1b0e08a7f76f7534bd03d6bd4be7b4c7b44bafeca7273188e4cae
+EBUILD pluggaloid-1.7.0.ebuild 550 BLAKE2B b4cb3311b4ba8ba574e2aa8f2fdaf1d6302cb71dab0607330a67f70452ac6767e8372863216775c76c75e9d050756e4d5d64342cf00b4e2e0c6b825b74b070e6 SHA512 afdcbfb919f29b8d650b8aca9db3d50e10694168dac58ca53c95eff61517810203c493dc321a6037c1f3645ec39428b7201c8b674be42aa27fde75a5c4fff04a
 MISC metadata.xml 440 BLAKE2B 466d6202c57da31b67b1ceddfa0cf226d3852cdef5bdb9837db7df217290de69631bbabf837f61e0e377cec6c731be19c3933ec5c7e891e91641973d57f9829d SHA512 f98b847751018553581ef5cae4f8a3f12da35800494bbbab78ff2f10c9e20209374328d7fe8e6a215b07a9f378b9e7838ded64d96e628f80fb035902aa1e66b6
diff --git a/dev-ruby/pluggaloid/pluggaloid-1.5.0.ebuild b/dev-ruby/pluggaloid/pluggaloid-1.5.0.ebuild
deleted file mode 100644
index 493b5e874163..000000000000
--- a/dev-ruby/pluggaloid/pluggaloid-1.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-DESCRIPTION="Pluggaloid is extensible plugin system for mikutter"
-HOMEPAGE="https://rubygems.org/gems/pluggaloid/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/delayer-1.1.0:1
-	dev-ruby/instance_storage:0
-"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile test/*_test.rb || die
-}
diff --git a/dev-ruby/pluggaloid/pluggaloid-1.7.0.ebuild b/dev-ruby/pluggaloid/pluggaloid-1.7.0.ebuild
index f371d505f219..60995193e2f9 100644
--- a/dev-ruby/pluggaloid/pluggaloid-1.7.0.ebuild
+++ b/dev-ruby/pluggaloid/pluggaloid-1.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/polyglot/Manifest b/dev-ruby/polyglot/Manifest
index 76e4a5d0b627..fd30ebcb8a9a 100644
--- a/dev-ruby/polyglot/Manifest
+++ b/dev-ruby/polyglot/Manifest
@@ -1,3 +1,3 @@
 DIST polyglot-0.3.5.gem 8192 BLAKE2B c9f78c05109345e09aa0d0c899e551e67ce7bf191ef00bf169cb05c9860ab538e303fa177c6aec8ac9944bd3ad4263fbf0819af0fa190e989caad1c75c1e5377 SHA512 405790c8edf5a98010334a62f7efeddd60f6dcff91ad5ff599579be3201a7e1b359787da59523a612fed5ccf8385116865316fa8872f0350e33dc078410a54cf
-EBUILD polyglot-0.3.5-r1.ebuild 528 BLAKE2B 9919886e24a4fb29794cbb97193c7eda204ee80a57f165da0291a82ee3d18bc6ccdbe708f8acccd1765ab6cbff0c92c353b1b4721285a29e82af5d41ae2fefc7 SHA512 8137541e4b9ce6e20c7d2a4affef89fa1300da3ab3cef261ef27149117e642296bde62a7cca17ba9125b859edd78189a61f4786f89441fbbbac6c1c542abc2b5
+EBUILD polyglot-0.3.5-r1.ebuild 535 BLAKE2B 160e32c6b6b5223cd1cf940bba0f08d1ec0b977ee02bebb4ec0c91e15a041ec7421f03f787a9e181bda051aa0f013300fe0305fe025c3dc1394bfea437d9c5c7 SHA512 044c35cc78117a383152384890404ccb2724b0d07003b66d89c3474d7115026aa9e5a65947b6face81530efcb37849b12995112985477f70d018016a029d7c95
 MISC metadata.xml 476 BLAKE2B 760e3572f49b9d88a8145ab5a2e6215f8a030c81b63a30db5b64fefc6b60f9029be1ea697f7607b045c7bb231b6655221f5523f59ec4e37b7d9a2e5c0a49f6b3 SHA512 a4e4a67c97d0647765408c6e9dde4e8f5221979eb898214a728649945b9caff2df37168c7c4e93472a960a9b3673e67612974040aff83bde8f4a008d019ade4a
diff --git a/dev-ruby/polyglot/polyglot-0.3.5-r1.ebuild b/dev-ruby/polyglot/polyglot-0.3.5-r1.ebuild
index 5852cac707bc..ed4b4808252c 100644
--- a/dev-ruby/polyglot/polyglot-0.3.5-r1.ebuild
+++ b/dev-ruby/polyglot/polyglot-0.3.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index b3052f1b313b..9ab13a18d601 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -5,5 +5,5 @@ DIST power_assert-2.0.1.tar.gz 17062 BLAKE2B 9c592c12e0722a3376fede86b1a609c4c5f
 EBUILD power_assert-1.1.7.ebuild 1412 BLAKE2B bfcc18a05ad28ce098e70a7d936b336630a1135cf781e36c8d533502cf1e55610b579c32b52354736d8de18a583a3d29cf0efb397764d74bf1ad8094230a6259 SHA512 c2fe441390ca188dcc1be729f558e8ceba61d4b2f2d820e2f29b06d55d72abedc293d839c782aab017231d692047cffe0a0924256efdd9b7bc41fc1d9ee88972
 EBUILD power_assert-1.2.0.ebuild 1418 BLAKE2B 718d355df9a75002823eb6ef8ae10dc4ddff649c314be77db00252a34a7f5daf95a5979195f2fc3e8d7b28ff3af86ce4bf9b2e5d5faf2484ce3eec325a7843fa SHA512 fb221535b77d9e84daf56cfbbbbe5bc9d05d0ca93c68d2d9bc6b2a09023f7eed2df7cce5221c5c9f50b687f97d29b78f079b5ace1cbe17ada16b6bf8507362f5
 EBUILD power_assert-2.0.0.ebuild 1423 BLAKE2B b7d1caae6dc82831297e1c9835026b190a5aa4e6e9c3f5a166a934f98d97842987985859d95ec66c876a6882583535ed02756b1efd6ce1b06c46abb9e2a73f2d SHA512 eca5293de390a9efd26e01439019c966213f40a53f2770159f52574dc4176d33f73475097181f3c3c2cf4526f530c79bd8ec8b365ea4acd8a50aafb19b135dcd
-EBUILD power_assert-2.0.1.ebuild 1423 BLAKE2B 921f9e51b1b9f6e8f2392409de68f8a3d5229fe2785118f28a023b9ccbc70ba3265dc543d8344deda6cb74cd63e1b80a6222fd824c1591c9b35f0e8446d7297d SHA512 c6636881d009c753e6e56ee0e041cb7af675b310fc7f5de99ad95eb2f64a77e60422eaceb8568647e3f5c6d8ec9ea481dd71cc13c88036915d7cfb6e9e2c7db5
+EBUILD power_assert-2.0.1.ebuild 1430 BLAKE2B 30482dd041426d621fe8d71253d9aa18b4522862b080fee0868b3e841743453daed89e766ead88ad8963a8a31d316bba8aaa40b0837f67939aa77d4b73996bb9 SHA512 cdf9bfe5d4e29b7fc382ca7ec11fc566be0737431c7428c9bd479b947a2d3dbf834bce06a8a8baa18647e74689e5e81fb0710d2f1a5265b1ccc14f64161d237c
 MISC metadata.xml 344 BLAKE2B ddbcc35119c2be368b7a35afe07b20b18803b73879b9b659764c0f30e926c2ea9a78be8ac186cec751c540d6d3ad738d9a675cdea077b41b8e9b04cf958103a3 SHA512 d3045523736a372d5dc690b555cc02b3833bb206c8f608e7a17746f8dc406b7a5d99821aee9e86f3cfb542ed1b780659335d9061c8098fab55e2e5e2e5b4e869
diff --git a/dev-ruby/power_assert/power_assert-2.0.1.ebuild b/dev-ruby/power_assert/power_assert-2.0.1.ebuild
index 2523bfaf469e..12835b10bbca 100644
--- a/dev-ruby/power_assert/power_assert-2.0.1.ebuild
+++ b/dev-ruby/power_assert/power_assert-2.0.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/ruby/power_assert"
 SRC_URI="https://github.com/ruby/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( Ruby 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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=""
diff --git a/dev-ruby/prawn-table/Manifest b/dev-ruby/prawn-table/Manifest
index b7a94894b5b3..f8c6b7d5e37f 100644
--- a/dev-ruby/prawn-table/Manifest
+++ b/dev-ruby/prawn-table/Manifest
@@ -1,3 +1,3 @@
 DIST prawn-table-0.2.2.gem 64512 BLAKE2B bdf1beb86aa1bc6efc9530577a98cf5e32dc3930decff6b4575645e47a53ef4c2f06f7c460c2d07e5cc875a99e1194bd1db629acf06d2a2c214402f71f4a949d SHA512 9a3c749c27b5588dc1006b952c3f59ad938c05b98575cdd6c6cf6df9fb8acc5a1cebac0e60bbe6252ef2a1df3750f2860338c2234e362ea2c5524a0bd38bb47b
-EBUILD prawn-table-0.2.2-r2.ebuild 825 BLAKE2B 59ce8f88b4f476ec0dd313404fa3db6ece74f23d4a2adb44d58b69c59bb8100cb05e456a437483fa4d94eae0a41d36966f44a39d31879ff0aa83f5d6781eca4e SHA512 6f115020c07a13930db83b1a20efb2a2ed7bcc95304bfaeb606e4f0f09c0340345155457ae8cd7fb272dda3cae568afb8b554ba7d6305c358db90c24323e1c4e
+EBUILD prawn-table-0.2.2-r2.ebuild 832 BLAKE2B 8aa4753b7f490ba1557e33a081cac8082f68b8da559b9ead3e1f474f450833965320fcfaf4510981a8c0ea527f93b357e4ce7c454057ba613938d39475a98c94 SHA512 147b55589d76d9a03dae06aeed4a5b305493df510d76159e5205ef071909c8d9e9272c20ceec6d23dc016bb19006e1d9d8ee33e12686fc8e7ca979b4a2846321
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/prawn-table/prawn-table-0.2.2-r2.ebuild b/dev-ruby/prawn-table/prawn-table-0.2.2-r2.ebuild
index 9010ec92c233..514a0845f681 100644
--- a/dev-ruby/prawn-table/prawn-table-0.2.2-r2.ebuild
+++ b/dev-ruby/prawn-table/prawn-table-0.2.2-r2.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=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/prawn/Manifest b/dev-ruby/prawn/Manifest
index 9d0ed52b3665..29025abeb4c5 100644
--- a/dev-ruby/prawn/Manifest
+++ b/dev-ruby/prawn/Manifest
@@ -1,3 +1,3 @@
 DIST prawn-2.4.0.tar.gz 5239492 BLAKE2B 5435d7715d2b3020316a04cbf2db1b7793435f2d05d34aae4832e12908a928f689c86d358562e7cd1c2675171a1743757097f0af3357eb667e4e2b9462890590 SHA512 e9fcc31ad2b5aa23592a8bf9419153fcb3080e00e53c9a91b50edc526631227fe86769eeb09336d267ea8f0a94f12336f71b24adc4d5cd9e750367d51f07c867
-EBUILD prawn-2.4.0.ebuild 984 BLAKE2B c3f715ab99824c60bcde950ba510174267ea3ee7c91a4001f80b53b1de3f0977fe06e95cf78204f2d3828d005dd40e4452b98fc4bcb3056bfe0d0acb37666b4b SHA512 dc65484f77c168f59580846abdb81a7d8c6f3e241384dce7cf672e4b44f04d2fdc48f13b6ba0fabea53add119b78a0d36228f546876504cd0479609099849b0e
+EBUILD prawn-2.4.0.ebuild 984 BLAKE2B 0efc6a3ceef8ad97a4c2c7e7c2c2388da495ae7e99c28c97f14a36e3a6fd1359fdb9d6c08f0dcf528c3effa4e6880639b9249b9aab51cb7f995c1e18300c0a66 SHA512 9bb4181c23d8e20185a1d54109646d793c46621378141e125beb1b47ee64b622249dad115840a38214bcc5da6eb6390efecd63ce7350e7e0d1e4d298b63db24a
 MISC metadata.xml 341 BLAKE2B d4bc362dc1d1c68511331c27419392311303e743175939024613a804743bccfee6d5847c9c1b6f00718f1b5657a915f2ded744b25986697f98076c25199f76ae SHA512 6dfebe5f56d94eeecb0ca8fb8dd2a7b487cb0bd042cf343baf40973e40cd46e4a849a453fff2295b92257a86f78dfef7f5bad5156f1c7f0ca00d35b6b81b9881
diff --git a/dev-ruby/prawn/prawn-2.4.0.ebuild b/dev-ruby/prawn/prawn-2.4.0.ebuild
index db051feed412..e22a8357294a 100644
--- a/dev-ruby/prawn/prawn-2.4.0.ebuild
+++ b/dev-ruby/prawn/prawn-2.4.0.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="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/pry/Manifest b/dev-ruby/pry/Manifest
index 6cb74a81ea66..d62d0e626271 100644
--- a/dev-ruby/pry/Manifest
+++ b/dev-ruby/pry/Manifest
@@ -1,7 +1,3 @@
-DIST pry-0.13.1.tar.gz 240103 BLAKE2B da4797e36aecba8bf1a785738339ed4be1e06ab28b329b66551a908898cd0515fc0da2434ba96e9fa0f350c9d32c13f850660bc0236c6c0218a4bd3182ec4ced SHA512 bec52c75dce365db68504634b2eaf6b0f312527031401199fcdbaa3ec5a9272148239d93305f8e66c4d36513f9fec3fe045e978c5a10f012a2880ab4a16b7e85
-DIST pry-0.14.0.tar.gz 238895 BLAKE2B 325a7eaa03836cf78c8599af15aa6758bc36cccf20937c3a7f222a5a831d2ffd8fc990e005b587779fe2a15077e0b8b38628c6f075b2b73de7ea44b5642e8635 SHA512 c10ba16d7dbd05308079f98a68fbcbb367d07977fd71a7077a80938b10c7588f585651e046d29a2f1499f136f56c062598f77ada8fb47a31608a4ea8536c5ef8
 DIST pry-0.14.1.tar.gz 239261 BLAKE2B 46bba71668cbfcb710ebf4f8921d1b4cbaad887b1546b4566a90f9f246f1ff41451ccabb4a8692bb8a404532227aaa72b2d530fa4451bf1b7141cb6f57dfea1a SHA512 b258d1ae7ffd82c6fbed7edbd6e9bc64006eb54e3376a2f85b7482e0517be34efb46a2264975820cac3b7c0bea89b855b4d2a6fb104ff760f25667e1afb3ba44
-EBUILD pry-0.13.1.ebuild 1254 BLAKE2B 6dcd658e86ddb9421b6203956870e7912f4e6d1eaa5eae93d4f66071667c3f288bcd5fad93855604fe49fe676dfd152a83d45eb410ef4c3fe200e6e9f45304f6 SHA512 c3fb2f31965fa566d0e52ea9e379e25b68cd9b0d608e8f0d9b05306be560fcc1a2fed16deebd9029f6d068eac3ec8917cb5ac47beaa9d482c1ab5a3fdfa4c22d
-EBUILD pry-0.14.0.ebuild 1254 BLAKE2B 4d193e15767a209bde06488f601ca5e4a4f9cc721384211cafa57832bd436eb1a9f793db09b519ae6cad2537d72719fa94d6affdb4c9e699173e014a85ed10e3 SHA512 28d4b39554d6db628011a85593fb888791b141e51c6c0fa5ecbd9cb72cafa781f4c7c2ba622ace4188a6366feac6871e0b28ed3c2cee043a67777690f993f82b
-EBUILD pry-0.14.1.ebuild 1238 BLAKE2B e10acae23ebb9decec70cd1b1da8f838c9061611bb0bf15c4d2e141453c4485771bd6ad5449c4c2bd03fc95c0dac461625447061e51f95b2a10f0663e78b1123 SHA512 0248184342b27e9f94ac3573b2edac07d270cd0643010018395237cfcabefbf5bb91ed2043997c303530c555e171ece0cba890430f74e5005f1c9d9251c42a38
+EBUILD pry-0.14.1.ebuild 1251 BLAKE2B b684919a7439df6b06b5697fc6cee7f53373e3892ba943eab55d7c65c1e674a4cff24e0cb085bdf1fd8ff0d2a99d11c754e55e4e26c4e98bcbdac43cafe50f23 SHA512 097867104f9ed10e861b17f82962af2d4a34397fcb67cd019b4b62f146d04c33af24abd3835b2ae4f8ef58893235e17123f544ad8cce2a17327ee2a0e79ab9ef
 MISC metadata.xml 334 BLAKE2B 0a3977b3c1df83701aaed5072b57e379a509beba868ee83c9274987eb05a8bc35b48b5904c658d1fff37d20233e18129ce24d259d3d048af4e6ebc2a71b85905 SHA512 6d8027dbe15c7770d4feaf6a740361c3379e0ded65e289ff4c733918a56e132a4917a9ba695f2fccd9743914a1c21b8e3223666481554df02c8ec327eeafb319
diff --git a/dev-ruby/pry/pry-0.13.1.ebuild b/dev-ruby/pry/pry-0.13.1.ebuild
deleted file mode 100644
index a6ccfb80e171..000000000000
--- a/dev-ruby/pry/pry-0.13.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-RUBY_FAKEGEM_GEMSPEC=${PN}.gemspec
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pry is a powerful alternative to the standard IRB shell for Ruby"
-HOMEPAGE="https://github.com/pry/pry/wiki"
-SRC_URI="https://github.com/pry/pry/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE=""
-SLOT="ruby19"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-ruby_add_rdepend "
-	>=dev-ruby/coderay-1.1.0 =dev-ruby/coderay-1.1*
-	=dev-ruby/method_source-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/open4-1.3
-		>=dev-ruby/rake-0.9
-		>=dev-ruby/mocha-1.0
-	)"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on git.
-	# Loosen coderay dependency.
-	sed -e '/git ls-files/d' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -e '/[Bb]undler/d' -i spec/spec_helper.rb || die
-
-	# Skip integration tests because they depend to much on specifics of the environment.
-	rm -f spec/integration/* || die
-	sed -i -e '/loads files through repl and exits/askip "depends on parent directory"' spec/cli_spec.rb || die
-}
diff --git a/dev-ruby/pry/pry-0.14.0.ebuild b/dev-ruby/pry/pry-0.14.0.ebuild
deleted file mode 100644
index 8d4d5fc87dab..000000000000
--- a/dev-ruby/pry/pry-0.14.0.ebuild
+++ /dev/null
@@ -1,45 +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_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-RUBY_FAKEGEM_GEMSPEC=${PN}.gemspec
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pry is a powerful alternative to the standard IRB shell for Ruby"
-HOMEPAGE="https://github.com/pry/pry/wiki"
-SRC_URI="https://github.com/pry/pry/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE=""
-SLOT="ruby19"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-ruby_add_rdepend "
-	>=dev-ruby/coderay-1.1.0 =dev-ruby/coderay-1.1*
-	=dev-ruby/method_source-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/open4-1.3
-		>=dev-ruby/rake-0.9
-		>=dev-ruby/mocha-1.0
-	)"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on git.
-	# Loosen coderay dependency.
-	sed -e '/git ls-files/d' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -e '/[Bb]undler/d' -i spec/spec_helper.rb || die
-
-	# Skip integration tests because they depend to much on specifics of the environment.
-	rm -f spec/integration/* || die
-	sed -i -e '/loads files through repl and exits/askip "depends on parent directory"' spec/cli_spec.rb || die
-}
diff --git a/dev-ruby/pry/pry-0.14.1.ebuild b/dev-ruby/pry/pry-0.14.1.ebuild
index 2b8ea409e63c..50feef9b7db5 100644
--- a/dev-ruby/pry/pry-0.14.1.ebuild
+++ b/dev-ruby/pry/pry-0.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ IUSE=""
 SLOT="ruby19"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 ruby_add_rdepend "
 	>=dev-ruby/coderay-1.1:0
diff --git a/dev-ruby/psych/Manifest b/dev-ruby/psych/Manifest
index dd2ed45dfc7c..08a67d9bf3c9 100644
--- a/dev-ruby/psych/Manifest
+++ b/dev-ruby/psych/Manifest
@@ -1,3 +1,3 @@
 DIST psych-4.0.3.gem 93184 BLAKE2B dd3dbd561a4abd97dfc5396d17966dca20205b8f5e7a13f858398ac7160610fb623a63b4e70cd91516c7e6e64fa5cb9986b9e3fa3c74dbb7b0752cb37f0467b9 SHA512 d28d3d4e5f9e00949f8ead2ef2224ac494c5d1b6d8c45f176e0563500829dab85b2366f10cd7b01339b4a4b6bf8f57c4616b84e3d3e245e551e382ebb3b6d0ad
-EBUILD psych-4.0.3.ebuild 728 BLAKE2B d069c527f4ead06f99e8879b239a77224f2c4ac447dec5f1754c8d3f4204895a1a871a2d580fd69f068f0b77269bee451a8162f694ffc1d3ff290ea65c23fb99 SHA512 f56c4dcabcea936a6f1f2f2eaa09a2c13e4b388050409943230f24d205a70d591b5397e815855620b5f8f3b4467af4a0e05f3fb297ac76213db5f7c3b1af0aed
+EBUILD psych-4.0.3.ebuild 735 BLAKE2B 3a27a307ce238d0d196da3cbd950457501934aff0290dbb9579bef7c728f19163b641218cae359d908a30bdea982c114dcffdb169f1831744564affc3bc22280 SHA512 e1c126a378842896796c9c420d23e5946bfcda3b4b869294d67d13a9b7a4c797033c585fa882503fd81028b4beb32afda5b91e80c949c0f4ba259b20ea57cd1c
 MISC metadata.xml 337 BLAKE2B 904a94cd470a394eac3dbb4f9688a33a4066ee90a51277179ce1ee981e273a6f9d68788ca3324fd6c04e3cee60a26f61a8279133c191aa99f5d3305afaada408 SHA512 04118cba0268824529dbf1343a09a01c953fdb924a5411bf92a757ade74ded5f3938129a444364eb10309286b255d956dd37b7c06b56bd5767ccd51441f8a36b
diff --git a/dev-ruby/psych/psych-4.0.3.ebuild b/dev-ruby/psych/psych-4.0.3.ebuild
index d89152e027fb..db09181668bb 100644
--- a/dev-ruby/psych/psych-4.0.3.ebuild
+++ b/dev-ruby/psych/psych-4.0.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="A YAML parser and emitter"
 HOMEPAGE="https://github.com/ruby/psych"
 
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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"
 
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index 5ab0fb7e92e2..d46cac76cb69 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -2,6 +2,6 @@ DIST public_suffix-3.1.1.gem 99840 BLAKE2B ef86b7ecb834a855dbb44b8a0f934de3715ed
 DIST public_suffix-4.0.6.gem 108032 BLAKE2B 4cbb10ddd924daf11d97a54d18550961f46c0951dd3dc1f23740ee7500fd8e796e78fd6421a7418a49350a69eca7d6456a09810be317ad4619ef3d3e7f71ff69 SHA512 a756c0f8f9cee2d12bd1730280108b72befa362defda12e5f6d7af6d68c40e31478c337b3eb7e7407feff9531082051d18928861003c7ba29679b4048da3b4b1
 DIST public_suffix-4.0.7.gem 113664 BLAKE2B 5da86713da01f59e7f311985a36b835e02807ca5f186ffc5e41e42cae7781cc10d96a4aca77dafb77050c78e6fb03e10f7ac55dace776c5cca68bca9f4bd7d75 SHA512 acdfe135684277a669ceaa61ea78fc70b979614f63daf27d145e78e4013221eac106651838a27b6694844f4fc33521ecc9f81102582ca1f1232fa80ce8191207
 EBUILD public_suffix-3.1.1.ebuild 874 BLAKE2B fd5a479bd94cf040749c6933a6bd012763dcbc11fc200897544c85e1a7ac83839c3f37a3f75dbb34ca4a3e050b6c1c68716ee18cc137e84c0955b67ba731997f SHA512 4a019c94279f7befa531d27969399080e2b6873c24468c4d7eee36c5acba71f0110c53e2fe7505f24e28b153a6a72516d4cac40e0c9e61a4c2f156c8b1078fa3
-EBUILD public_suffix-4.0.6.ebuild 819 BLAKE2B 259cde911ad00511dc8ac50abe797fc5269999facbe856e3d84ef5ad100cf364c62e77225faf2ed7a17c2f893fe3d3a7324d895ba9597af4465cdb7385b42ff3 SHA512 3dadd576ed3d7f9973196abd114fdc7e4139c931f7b7a791529b8f6c910385e25ad561b9b8d18c1ebfd5a01d8b27ba760e8b27066a310dc089ff508561ff4529
-EBUILD public_suffix-4.0.7.ebuild 818 BLAKE2B c774f96a351d79f8a47678bec252af9bc1b9d990f2cdec9d7bd7de1e9b4ee5fbb3768694de1c4dc3cf64648c15beb5082c2b88adc769ba07d4b5fda276e233ed SHA512 1d973de0226256ff3ca82e4fee09f8dbafea6ad5925584b570814852ab178a02e64fb088f5d14c3487dc4f108de4974fa1d3474f14fd47459bee420be929f729
+EBUILD public_suffix-4.0.6.ebuild 816 BLAKE2B ee8ab10b6c0e9aa8ab9be6306890e4de5713e8c62ae3851c56ea65f1801ddfdc662539755ac19ef3a4c94e9c0d73b4f52de7ccfbcb251f319ed56e3628859584 SHA512 fe74223c69239921ec2ead647821f44544d558550b121f47514095a5c18a99e78a998bc84be5da627552394de23af96b6c7f450a4572bfff4bb4ddb6eb323740
+EBUILD public_suffix-4.0.7.ebuild 831 BLAKE2B 97e6de0503f2db469240e3b6e968911dd57acbbd4cbb5a2f24e949b9fe614dde6d3074460051142150c3d4234f9a94328c0d25437a9b2e29cd1c9ef4e001a258 SHA512 9d5f1c764445c8a2cc8b821adeba402b1c8607aa9ebe4584c0e8f7753f69fdb98b4bb185c46a3796dc3ef2e351065cad1ddf2f816e81a4d72d95750e1637e627
 MISC metadata.xml 341 BLAKE2B b3cca7169b9fbc96674afb8199385f169236045a393efea2c899cb2ef6ba3f2887225b7f543fe4bfc7a48d67405cf88a58c2d076cd3ab8ad24a36997e836e8fe SHA512 d70ea0d3d7bcede6344839ab591ca4bb86da938f57fa8ffa1e2fc8498b0867fd9a5859a7b96b372453f577620c26250df8c20b9687aea96234a01d249251ad27
diff --git a/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild b/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild
index 895513d49c29..8e9fe4219951 100644
--- a/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild
+++ b/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild
@@ -14,7 +14,7 @@ inherit ruby-fakegem
 DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
 HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
 IUSE=""
diff --git a/dev-ruby/public_suffix/public_suffix-4.0.7.ebuild b/dev-ruby/public_suffix/public_suffix-4.0.7.ebuild
index cf9a1b081a02..6b42d2313e8a 100644
--- a/dev-ruby/public_suffix/public_suffix-4.0.7.ebuild
+++ b/dev-ruby/public_suffix/public_suffix-4.0.7.ebuild
@@ -14,7 +14,7 @@ inherit ruby-fakegem
 DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
 HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
 IUSE=""
diff --git a/dev-ruby/pundit/Manifest b/dev-ruby/pundit/Manifest
index f31727e8f345..60c2b9a56497 100644
--- a/dev-ruby/pundit/Manifest
+++ b/dev-ruby/pundit/Manifest
@@ -1,7 +1,5 @@
-DIST pundit-2.1.0.gem 25600 BLAKE2B f8284e326a68475fe4c733de85597ba91e376d37e5dd24d97c1a8da2ab7f15d2cf35cf76688370f1a96c00f8ce89df2d2bb6b3c6de1ae33d6cdfe1ffd1926e3f SHA512 3201cb3acca8301a0e07fa9bd58617ee32074842e873a85a31d9b56fac5bd93c4a78d94d8b57556a011f1713712eb484ef3281d68ae3acf1c8bf1bce13f47e0c
 DIST pundit-2.1.1.gem 26112 BLAKE2B de517b25d0d062c2a85b6ca28b6dc8ebcea25f4786435788e90394ad29338462073c946d7127172766baeced6dc98d0e21923220b1371861f200b73fe09039e9 SHA512 d5463e21801ef04e82500c671ccbee0e8fb1576a8b7b86283ecc80d1c6e81cd375abf3c81ee5fad8323eb3ba0c296df43c9a78fafc2cd6e7797f1447d02ede0d
 DIST pundit-2.2.0.gem 27136 BLAKE2B 560843f9e1d19c551ee9bdeb3ead856a483dff68187da20c463fd01cbf1ca68f48adf6d4b9589b2c755cf6c860fba98b3719af8732e9f4c284c7dc4b2a1b2f5b SHA512 fcb8c9305e7ce9301142bd62c08856ee29cf5227d63ae36ccc894c4a3b19ec9c03625c3742890e9aeabc2fc8877a5d9527d28ecc8084103bcfa8321d87458a44
-EBUILD pundit-2.1.0.ebuild 615 BLAKE2B 7ec237b656df019d8d2265381a63f546331fcc5edf38744ac888f8b2c39cc54145f56396c35c8aa10aca7d5c57ac73b975a36420a1a14d91422522df73385ff9 SHA512 83ae21c8d5c5704cbf8020947d718eeb97686e4b970dd497a4797131be183a4714be773856cd2b9fd541b306039f1f0016d24f6a27ecbc4e2636a80dee651cdf
 EBUILD pundit-2.1.1.ebuild 632 BLAKE2B b9b7b2e3f33e79eb83134cfca93a994dc17322295f23e0e1fb9079c416d4db239097feeeb316f1e951484da6755595adca00db77af048249d30e3c3266853a62 SHA512 42e846699385b552f42b69d19c385c8ddd40dcda086675e1ad2d4b2195157810f6ae6a824a387f5d9af24dc71045aa262e9b32ca5a64c5b46f21609987e97fed
 EBUILD pundit-2.2.0.ebuild 667 BLAKE2B 1929a8d1e5ecbb0357217b86344f38d5f768f203df7f794d0a2211858b79f5c71bad70cca46be74aefabf3a5622ffc49834e5f53cd478c74a31625de7f5afcea SHA512 500efc2dce60a015bae37830132d626477e34ca8ee5967da4c796a170f505de67ff3b8c6187f53760c5880091377d84b81619abb86ebfbb54dbe5ef05254dcf7
 MISC metadata.xml 377 BLAKE2B 5c9ed979f3a732ddbcfcc3a3207bd49c299c6e6a03dc549da083d5ca2f1fd213a70a66cbd47793953a8088a6e85cccf973f4db34c0b81081f288ff3f89a33d8e SHA512 d2d22dadea68584732608c01c0a7c5d39983acb1b721ae33ce4e21072098fe62d32148b0f35853a49f57620bce234008ddaea001f1769f08bdffbae00172c3dd
diff --git a/dev-ruby/pundit/pundit-2.1.0.ebuild b/dev-ruby/pundit/pundit-2.1.0.ebuild
deleted file mode 100644
index dc228494dd9b..000000000000
--- a/dev-ruby/pundit/pundit-2.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Object oriented authorization for Rails applications"
-HOMEPAGE="https://github.com/elabs/pundit https://rubygems.org/gems/pundit"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0:*"
-
-ruby_add_bdepend "test? ( >=dev-ruby/actionpack-3.0.0
-	>=dev-ruby/activemodel-3.0.0 )"
-
-all_ruby_prepare() {
-	sed -i -e "/pry/d" spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 3877bf81f22c..cd957d709181 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,5 +1,5 @@
-DIST puppetdb-termini_7.9.0-1stretch_all.deb 21860 BLAKE2B e2ecc32f216a22d1c617d9d407d58512a2d84e2eb73ed37425ed16abc7948a8e6b8a0744798baf4282b5d43605e66cc8f5fb59e42eaffe10625d486e120e8d71 SHA512 e91cd0870d02fb690c0d9585b9d56b72e53c5f64ab5bec4631651326806a270f0c6601c77279d17b5182d73924a3782f2e1ca5fdf4cf03beac1b0e3e807b36db
+DIST puppetdb-termini_7.10.1-1stretch_all.deb 22156 BLAKE2B 52b1060fcf177b37229303ef93f90424f2b6b29eadf8041aa733d20f6b417c16e163891c44bc6f7845957ced10db132c705d6d6031041abace2f8f66f3d64964 SHA512 b273ac57558c9255d342010d9f3ada729596582311b3bbe658bf1505bd457041d0f5948c35c37bad585c931a66a66dcadcc71960de695c126715ef53d08295c5
 DIST puppetdb-termini_7.9.2-1stretch_all.deb 22164 BLAKE2B fbdeb196815a09fc3b5658cf193d723bc0038ce0463cab3fa218bdc970d03828eeffa5a4756c4716afe6346a6aca2ea4ceb8c57ae4174cbae72773fffee634ce SHA512 5c399983118583d856c8160f8e21b646dbdaf56ba9044f7d5ac7a00cac14038b476b80074ea7bb696c0d9548cb50e03efc1119a32bade81532b6f10540a54d3d
-EBUILD puppetdb-termini-7.9.0.ebuild 677 BLAKE2B fdc6c947de2f779ce78573ac2f69de52d210e5698b0e3e604df01870fb1483d23e7095a3960ff74572647517f319ea4f114fc0ea244c67abcaae31c2cc472ba5 SHA512 29c48418bf0292974b9ac02d9caa1ce655a804e99a4a2419f6ce9650a1ea2350c7a5fac431fbd4c2ff516676262fb49479c774a9a5497a562cbc636f9ad27917
-EBUILD puppetdb-termini-7.9.2.ebuild 679 BLAKE2B 241983bfc591e1755289642fac8c2bf50a6116d3f2d26b8f43e4ef4ba15bf12e2f5663b66d432e24144a89ccd93f77b35c2ade3c19bc03fe1b7fefd7dbabefa1 SHA512 a8e7513a00efab09f2b40aa8321e147cfd474f12c6765de7694fc3f503c9362009bdc53b14b7bdae8cfa549b97b43927de56fa833a8aa4a7fbc24d6eb2f13e4c
+EBUILD puppetdb-termini-7.10.1.ebuild 686 BLAKE2B 29cc002da4e3e7c4c4aa551a65c84a6d004b2feff403ab99aad7ae825837cb3bca7bcdb9a5bd0652da87b40c481742de037fac2cb4a4aefac09ded0417245127 SHA512 110e86fb89ee60e793002bce44b60111fc651c68e7e0f69418890a07ebc5ed6d304a49e951af52ddebd6f27d196d5ac9f638c4536aeb4a3e30f087b2885e9635
+EBUILD puppetdb-termini-7.9.2.ebuild 677 BLAKE2B fdc6c947de2f779ce78573ac2f69de52d210e5698b0e3e604df01870fb1483d23e7095a3960ff74572647517f319ea4f114fc0ea244c67abcaae31c2cc472ba5 SHA512 29c48418bf0292974b9ac02d9caa1ce655a804e99a4a2419f6ce9650a1ea2350c7a5fac431fbd4c2ff516676262fb49479c774a9a5497a562cbc636f9ad27917
 MISC metadata.xml 367 BLAKE2B 46ba9e83a3422a65265eba357896709907ac39b394d1d02ab02d70a0252a0470944a2fc23a44bf6c76b3562f90d8f6d9f6c28055d8458ce3cecfd2e3d2c347a4 SHA512 1fbf96c090522cccba0daa607ee8edadf107ebc38abaa66ce9a8465a1e0cd1e92f748e95ed5e7e490350191b2cc03460e8e9632a7de7550662e83a098dd47335
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.9.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.10.1.ebuild
index 83bb38516615..68f1eaa1a4b6 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.9.0.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 inherit unpacker
 
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="amd64 ~arm64 ~ppc x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
 
 RDEPEND+=""
 DEPEND+=""
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.9.2.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.9.2.ebuild
index a2bc85cce4e6..83bb38516615 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.9.2.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.9.2.ebuild
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
 
 RDEPEND+=""
 DEPEND+=""
diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index da3cc129b2a5..86f26e2dc417 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -1,7 +1,9 @@
 DIST racc-1.4.16.tar.gz 451711 BLAKE2B d3bcb72a69df255d5468054541c281bf7bd3225eb3ba1997fccd6dcd219d3a8890e3df7b43fe106ffa3fc63a8d8079cab83e7096b0737f5bbacf816b7c3bbfb2 SHA512 7cdf6a62449e8f39984a8b27706045e509828a93a72d112b22a4c467184a63ee23b4b2048ef7017846053fb2ff4021aa43d96a6147fa271257df584ab3d66f38
 DIST racc-1.5.2.tar.gz 434903 BLAKE2B cfbaa09c1b2e233e82228075cf979c54688e51e702cade072d42b2952100b74a53e536d904cbbf15cb04ffc74018b48e5b27a5773adf6240614c815250d47119 SHA512 73c68dd75fa35727fd93a76886dd77afbb7032271e535c6e885a4ede6822052a93a610dec8a1f84daf24903c749b30a185831ec96d651588db2a2524f3dcd477
+DIST racc-1.6.0.tar.gz 470565 BLAKE2B 482b17723630dfb1d6e010c3eeb7da5a9f7b97f544d1a5020195134cd5446d28eff9a75b6c392a75970ddf024f560d2c7135abc4a2de76b581aa835c0901b524 SHA512 c19b7444bfafa0dfe3448600d10a1a09319702c37632e19569aeb947e7c035cc4067da040d45ede0dab35eaa197a55eac394715aae520fba41ed6e0c01c95e3d
 EBUILD racc-1.4.16-r1.ebuild 1921 BLAKE2B d94500a6f0676626661bddf4c4057ee0f2b3bccb0f2673b04ec6fa1891242cab213feca9e547e4d1bbcfdf9a4ca961a4bc06aef0d3d7245395e4abeb6acad1cf SHA512 c29be6f4315ad7d761984b2284a06eb767edbc0353d30c1720847da9966ea84d15f87d8304d8fc04013378b455804fcdaf28f730e89569e1e67bfac1db588e30
 EBUILD racc-1.5.2-r1.ebuild 1742 BLAKE2B a770ba3bd89dd17eb51246b612bf7928f7740db981e9165d82a49a9a8bf42d1a7c0e8b1d0f7564802130f73407de7190b5eb353c4b5076529a4c48416f27b01f SHA512 97f772ca30602aae276256a3e18f15acc7e64a8467c6d2e1b412bd3ec6b735d515931b35b09d99e22324736d5c64debbb3acf602ecf4d70a2ecdaa56e677ec69
 EBUILD racc-1.5.2-r2.ebuild 1742 BLAKE2B 730934ec0ca983208511289ec94ecadb4e556d535660b88f2b2f305aa5ce8a7816e05b034e9985e86c2e1d7f330672e8f425924c783334398b223448610405ac SHA512 27b87aa5228cbe86c314bc8ee1e187e8b3aa296205c1a7f540d1ae9819a61b22e637451a164297d4da5e4539a74205760aeb3087dc45d26cd075d6101a692ab9
 EBUILD racc-1.5.2.ebuild 2001 BLAKE2B f9c86a3ee7065e818e7dd6d1f865b1c6450e77d786946d6f58cbf87d07c4c413e9838a5183bacf9ab9576392b803add944d8ba92da20cf9915e0bb58fa9f1067 SHA512 9e9aaae14b6171189122c8616450a246a7969b35cb8f1ae7fec1bba22bdb332ac5cb180a77636a069077c7fc03497694fb67e45cba0cfb0eaa5a49e3fee7de26
+EBUILD racc-1.6.0.ebuild 1542 BLAKE2B 20c270204d616db23b19ff74165cc4aa8207dd12571079ecc62aa2101a37a88b964614c8e157665cf4d3e977b0290aea354f8712586bc591ec3520de92f3b722 SHA512 97b608cdf2ada1f0f13204181c7147bed9a98de1128dfe2cc094798eef9f24d958a01a5653d0d4c66e8d5e00389f0dae7465fdb7f20b49c0ef6ceb4654e934fc
 MISC metadata.xml 332 BLAKE2B a8a4b14418894206acc7f1e27c92162ef02d0554395b9e5b2727b231f435b2c31fa0ad7aa746a8e095eebeb3b0a53352709880609fd4e3427ba90c6528df9343 SHA512 88ab246151ead3016e6c9480043db93b9ecfe6c282ea0663e4882185af124e3c531b8186a96e105cc90867ac05c0cffcfcf043e0f67303bbca4f8c7cd0c56043
diff --git a/dev-ruby/racc/racc-1.6.0.ebuild b/dev-ruby/racc/racc-1.6.0.ebuild
new file mode 100644
index 000000000000..e305e9aa95a8
--- /dev/null
+++ b/dev-ruby/racc/racc-1.6.0.ebuild
@@ -0,0 +1,54 @@
+# 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="README.rdoc README.ja.rdoc TODO ChangeLog"
+
+RUBY_FAKEGEM_GEMSPEC="racc.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/racc/cparse/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/racc/cparse"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A LALR(1) parser generator for Ruby"
+HOMEPAGE="https://github.com/tenderlove/racc"
+SRC_URI="https://github.com/tenderlove/racc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "dev-ruby/rake
+	test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e 's/, :isolate//' Rakefile || die
+	sed -i -e '/bundler/ s:^:#:' -e '/rdoc/,/^end/ s:^:#:' Rakefile || die
+
+	# Avoid depending on rake-compiler since we don't use it to compile
+	# the extension.
+	sed -i -e '/rake-compiler/ s:^:#:' -e '/extensiontask/ s:^:#:' Rakefile
+	sed -i -e '/ExtensionTask/,/^  end/ s:^:#:' Rakefile
+	# Which means we need to generate the parser file here
+	rake lib/racc/parser-text.rb || die
+
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r doc
+
+	docinto examples
+	dodoc -r sample
+}
diff --git a/dev-ruby/rack-cache/Manifest b/dev-ruby/rack-cache/Manifest
index 8f452e558ffc..8b35fc860a68 100644
--- a/dev-ruby/rack-cache/Manifest
+++ b/dev-ruby/rack-cache/Manifest
@@ -1,5 +1,3 @@
-DIST rack-cache-1.12.1.tar.gz 262878 BLAKE2B c287c547496f0c4659f16cf45aa4c562cfccc5d6ba9e71a10a6507346797bba7d9d1e287ef1fe3d8c6bb6e8ef148d6c24d90e92db1ae53ea2f7d1ee91e3fd148 SHA512 f850facb28f302db819b6d67fd86e0dd18ae8f5d132044582bbcd6792b287c7d4a29219a47e708b5047fb373b5857632597d9743b4ba530b1258d29924ca4cf9
 DIST rack-cache-1.13.0.tar.gz 262945 BLAKE2B ea0dafe105c8c1e10815c39b928c5a86bf77a0cf3a31f085169028cb633dddd3db761138fb85b7f5da6c3374e749e898d97622994ad3a7b4972befbd46d31e3b SHA512 049302994663703ea593e01194e1c5c3b95afc889e628906e65302dd1fe64fc280bac9d26855db2fc7af1e287201a47c7f6a52329a3151b3efc775c0585d837c
-EBUILD rack-cache-1.12.1.ebuild 1316 BLAKE2B f41ba982000f52d9527da06c78df720c64c941b4bbb47c41cb849707d230fe13ab8c7545e7578287699ae8bc9e0368ac48245017f4c1ec13ea467905666cd768 SHA512 e55cbd7b1e8c4159dfd84635f55677cf4fb9105f98589423f68b9aa274ed9083de472c88dd8e86dd7ea780b261f4f2727f989f677c5ee1700e77fb253fe2bd7d
 EBUILD rack-cache-1.13.0.ebuild 1293 BLAKE2B e445166b40b539d00a5ce45e284cdef8e3909ddccfabd72c941de34cba5d09a92ae90ffbedac4e5829b55f1f0327374769b46a1ad9a01362a53e3b7341914735 SHA512 a7c993ac526b026f932bace9730b7c42e9625efd23ba61f6f236f7c6e913bebba9118e440b0d2d7bfe70fc4280580677298885e2d5341328a30c795aa9f24eaf
 MISC metadata.xml 336 BLAKE2B 8ec6bc6a5c4e0f07711f202690dba8fc84111f8173f5593a1e02ebd33e410e9e6381a6887e8cfb678953a3e7f24696228766693544460e87411504de9ed601d9 SHA512 48d46de12b863bd4a04d9f7fe0eed9801d6722e14b3f63073cc154133f7ec108a5643de5a3351c1074e530a1716140859c50cf631a1a6f8f2b57a17802943ea1
diff --git a/dev-ruby/rack-cache/rack-cache-1.12.1.ebuild b/dev-ruby/rack-cache/rack-cache-1.12.1.ebuild
deleted file mode 100644
index bed74014d5d1..000000000000
--- a/dev-ruby/rack-cache/rack-cache-1.12.1.ebuild
+++ /dev/null
@@ -1,47 +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"
-
-# no documentation is generable, it needs hanna, which is broken
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*"
-
-RUBY_FAKEGEM_GEMSPEC="rack-cache.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Enable HTTP caching for Rack-based applications that produce freshness info"
-HOMEPAGE="https://github.com/rtomayko/rack-cache"
-SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rack:*"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/maxitest-3.4.0
-	>=dev-ruby/minitest-5.7.0:5
-	>=dev-ruby/mocha-0.13.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' \
-		-e "2i require 'timeout'" \
-		test/test_helper.rb || die
-}
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -I.:lib:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rack-protection/Manifest b/dev-ruby/rack-protection/Manifest
index 3c154b0b55dd..10d0ddddc197 100644
--- a/dev-ruby/rack-protection/Manifest
+++ b/dev-ruby/rack-protection/Manifest
@@ -1,5 +1,3 @@
-DIST rack-protection-2.1.0.gem 17408 BLAKE2B e4804273d346c76e9e7348bfa9575f16c9d415da9db4e8677782aed70fa613b6f322c82808707734276b8db60fce9d87fbbaac807c1b8df7f6bf1960c76ae244 SHA512 965388584a2cae9065ccc0d041bbd40951f22420f05e657586d710f87ae8f854a0be32c3274b9373f96b5f8eb19354d371e3bce9b2df83c013abfea99f16bded
 DIST rack-protection-2.2.0.gem 17408 BLAKE2B d9d5d8e2473b6354dd61cfc338a05932a2c60aa12544399cb0b9b74c717d6fa48bdec638381582be0a13f845f0c69583275f412458a20198894b5eddc7b53358 SHA512 06d6c2026e3e93131a2405bbaa8a514ddde48607979828b9fc41309dbdfff2b7c8cac48a6981e76b5dda554f0cbdc7c6ff5f44b8925fce1cb9b7de0a16380ca4
-EBUILD rack-protection-2.1.0.ebuild 732 BLAKE2B 57b06570ba613148c27e8b2f9d1fceea1f27d27d87447534d66b3a717fe7262543fc3a62ef1495e0ff6452fc34a5897ccfe325f62eb1d27776ece0e93b392b12 SHA512 1a4e21449e3015b1fd1d23665b270678f15d9c796e4a022a7e5b5749925f180d428cab46356e6220bb35f701588a873ac385c22354f0bf579ba32260fb900630
-EBUILD rack-protection-2.2.0.ebuild 726 BLAKE2B 0a4bfcd1da30f6ad65008e4a2cdc1fc5bdd7330251ebdfd3a993a20327bc8bf699d7fcae3d127d5edb1463dcd8f220fdf7f635b97fb2ff1a6017f3edd06121bd SHA512 b27c24b193464a1f3d9711f9f033a7723ea64e34cc51ce99fc6607c2352a32c0e4caf33ea8713cb6672f789671617d5a95d34328f3d54a488586fac109bef1cd
+EBUILD rack-protection-2.2.0.ebuild 725 BLAKE2B d372f902acc20bc19eb727f7ef894625ad0a6575cb5101cfdc4c882ec64c0e91bb0194b84d7432b9a320257890a74f8084569f3031bd69c9202f6fac38ff7991 SHA512 bae13b6a749da3f90bdf573be908029efbc8b7639cbfb98d9cb5179f909f69401d6b00213be8d5df147ebbcfef4a0a1428e264c412a778b8d1d2c8672945c3e2
 MISC metadata.xml 489 BLAKE2B 86cb22f6328ceaf077a0e956866b44015fb19dcb81431ce6f219bd7748af6b19b524905e035b2600d385731bc7bb815dc7649e5699bb59626a8269735e853bad SHA512 86816de00c35e3f0d6d0037c9e5519a0b2e8e9a7a926d9a8a056bc04605f28d9aa1fef93279284553a3da68f3d5ce8514763c86cf2b484a28cdc3e41fa5d882b
diff --git a/dev-ruby/rack-protection/rack-protection-2.1.0.ebuild b/dev-ruby/rack-protection/rack-protection-2.1.0.ebuild
deleted file mode 100644
index c5f7a62db614..000000000000
--- a/dev-ruby/rack-protection/rack-protection-2.1.0.ebuild
+++ /dev/null
@@ -1,24 +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"
-
-# There are no specs in the gem and the source cannot be downloaded separately.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem protects against typical web attacks"
-HOMEPAGE="https://github.com/rkh/rack-protection"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rack:*"
-
-# ruby_add_bdepend "test? ( dev-ruby/rack-test )"
diff --git a/dev-ruby/rack-protection/rack-protection-2.2.0.ebuild b/dev-ruby/rack-protection/rack-protection-2.2.0.ebuild
index d4ddbd88b292..263f114e79f3 100644
--- a/dev-ruby/rack-protection/rack-protection-2.2.0.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-2.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/rkh/rack-protection"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/rack:*"
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index f73743ae0a20..73558c894131 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,3 +1,3 @@
 DIST rack-2.2.3.tar.gz 278045 BLAKE2B 2182ab6ee2ca0e40bd131dc96cf15d7e1015570a0702c2419e50da9eae6afedc0f1543a2fdc1fb32022a65788ab486b7add688c8bf201ad46a3d101b6e625a8b SHA512 0daefd1fd7d1c83a5aaf0e8a3c0d734f805f6718c3f2d20673e78242f10fa99c24f8e8d480cb7f0ee299d96a4b691e4a19c967785de946dc863e9b78e0c3ac53
-EBUILD rack-2.2.3.ebuild 1508 BLAKE2B 1d6e3c62d82c81d8ef2a4cc00d2eef3a47093f01be48cb1cb8fb2e4b0818843c0f53c5501f85053ec8b93abb9126546843e92e79cd8d8effcb3f6bd042878852 SHA512 dcee332347d9a963934ed5632b322c38581e55aa50c3a3b225a602fea4f4c4f24759b192ee8144edb166a10ed966aaf517b0d5658729b8202ff6b14c6eeca960
+EBUILD rack-2.2.3.ebuild 1521 BLAKE2B bbff1fee416b6d648f878d549c1694dedaea3686c6063b05c28bf8804dfcfb74b7084365eda9cfbc736fdcf8f679ce72641faba6a2f8ded63187f5d80cbed6f3 SHA512 211137142efc02826a6e74f9fcbbe033646f7597e7496119657415ada6decd5b872f93be1af70b1b79eb7780bb6807b09f63f20b4fc57ac66c670fee7dc53a08
 MISC metadata.xml 392 BLAKE2B 625ee54c32c0350c08e68ec422fd024c364bf2dc26b5402363db0909d5720fea9a8741cf7ef8bcdcec21bcf3ee4efb6ccc514231d12ceb87b927035ee5a1d408 SHA512 96436f55bc9e3d93373e6e3c4858048aef3811654f8d5f11aa9b37b89b012e0d1770c1617764b4ef72d5e4656b0113a1bf15f9398c9bc23f55de774591020afc
diff --git a/dev-ruby/rack/rack-2.2.3.ebuild b/dev-ruby/rack/rack-2.2.3.ebuild
index 7e7da1710ca1..6b2817efd18b 100644
--- a/dev-ruby/rack/rack-2.2.3.ebuild
+++ b/dev-ruby/rack/rack-2.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rack/rack/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/radius/Manifest b/dev-ruby/radius/Manifest
index 40ca4c99d920..e73507d97399 100644
--- a/dev-ruby/radius/Manifest
+++ b/dev-ruby/radius/Manifest
@@ -1,4 +1,3 @@
 DIST radius-0.7.5.gem 147456 BLAKE2B c62c06196bc42cd83b7d898744fd655c3332d14348318974de272491eb823861a650b5466958ea5e0b7be2a5a119c75a75a7e6c53975d7099ef1c45d912c7595 SHA512 2e1f94c45bfa23ffbcbc00b7dc6be04d4f085e513554e7a6c4193270ae2bc2ef952dac72e4995b6f7ce43e92363df3ca7e7b183758ccd1f8aafe64f82cacb074
 EBUILD radius-0.7.5-r1.ebuild 572 BLAKE2B 9ca9ebd8e9b764d13831162cfa53b823e375f602203e759f2a666acc21e33d7c861203f8d74e7e7a33a334087ca841a2d07a8867474d4ca5ce96ab113586187c SHA512 4091aa38f3ba04348411ff8b2af89e9cc3d4d201a005d0765418f514682b6fbb44fe74f4fcf23ff901b78c7920f604d16fd115fbf451a586261e2457b669a316
-EBUILD radius-0.7.5.ebuild 572 BLAKE2B 7cf953f5e53f9adf2f5d982f25a42a77876d42a017a8beeb3c296d9fcb0cd97676c66b1566c576fa72862ec77e74299d5bc9293909091dc736bd48509416e652 SHA512 bd34e2f994f59c477b9a2f0fd49be8473dad759cc41038a3a05f93f73919af71e145e61ca9f1d88e194e0ba54e03adb9c6ecf55d568b192d90e311266e2265c6
 MISC metadata.xml 339 BLAKE2B c52039581978485ac958de4d3fb92a206e6e2899dade4c109a49ae6ef7ea562a63850f330591ec047095244ca47d09051f44c3b17f315e4e89376c8f090b50ad SHA512 7fb7a393d639b0bb18beef130ce5fef7d2dcd1892b66d55f9af5cc162d8c4238b4b43069d0b7d98371efac1172b84924c7e332f0f01b766ee90bb4ac3852bd22
diff --git a/dev-ruby/radius/radius-0.7.5.ebuild b/dev-ruby/radius/radius-0.7.5.ebuild
deleted file mode 100644
index 2e5b5ce625bb..000000000000
--- a/dev-ruby/radius/radius-0.7.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG QUICKSTART.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Powerful tag-based template system"
-HOMEPAGE="https://github.com/jlong/radius"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/kramdown )"
-
-all_ruby_prepare() {
-	sed -i -e "/simplecov/,/end/d" -e "/coveralls/d" test/test_helper.rb || die
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 5df60cb8f246..89edf8d9a480 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,27 +1,25 @@
-DIST rails-5.2.6.2.gem 6656 BLAKE2B 0dc3dd914c1f1e011a01d466d74cf356ed6e65be62559672688881b0a2b624218437bedc6e1da903751d065f1ae19bd74819d88371c1a87ef3ed40749d75ef63 SHA512 ff0e4e3f2e0d655341fa17efb724a895292377dd3f3ccdc684674d9bdaeb908c5a8458cb8133df80d6d4db2a422a5e48d61aa187ea4824fb996907190893d094
 DIST rails-5.2.6.gem 6656 BLAKE2B 95052fd231c0e390b5194af01f7e80d7e8dd34b155b40b95046625f060f89d799a641e5a79fd06efb606a4f5527d556c10a86da9d972ce36c526dcdc639623b6 SHA512 9c6965dd1ad4d5a12f7116e372f7b38bd95a93d24d93b66860086922aedf30aa1ad5cc27578f87d72228d893c1d73b431c195b0d1f8b1bc5a645b00fead05f9d
+DIST rails-5.2.7.1.gem 6656 BLAKE2B 0c7da4951ac22518ede6f502bef9c7a13925c27792a97d00e9fecbb1186732e7fc728db6f8c4155a4842c32ece7a9927540e047c3f009828eb8ca3107b29dc3c SHA512 a251d8086c850e04b9e686cc9a7532872c3d81d28ed675c163c9a6bd1a8deae9474512b53216415937b2422d5461cd66220edf8225860a49bc6546923fb0da38
 DIST rails-5.2.7.gem 6656 BLAKE2B 40f06a155497cf5357e38b0390ca75f790dfff4a15966981c8f8dd937d182915b68bca1d6b581f09bb6df8133e931f5fd63df835d8bd4db993f17607e653fa02 SHA512 07ec5fb36d16134e029712f958c80a59f381ddee3ecb3a7ffe3cb50097dd11cd87ac1f29825f5f748092568e7756ee42b75fd0ba7b5c83e40faba54e7bc1ce01
 DIST rails-6.0.4.1.gem 6656 BLAKE2B f3ab76fa7ce5e3a668a98b7d1292516f34d36c466b8eea45de136791375d480ae016bfd824d6397af4e44280ff5567ce215e5df3d90867adeb0bc02bdedb1a66 SHA512 ae71bf509339b5c802dd9586caa10a3639fe73225ee4afe59a2bce2de9c58fe0f3e6faf6ed8b0e364ca579a9ec78d012c2f7a842745c6c81c5a4e9d0fa66efd1
-DIST rails-6.0.4.3.gem 6656 BLAKE2B cbe3062a6d7042955757fd58686d2de4d26a1b1023dbd48606247bb2ba189d50808c43f84e2dc198c06e6a5b5fe1c93ec8d9c13bb90ca157d55f2b4c97cc4a16 SHA512 8e0168b1b86a4884130d55f592b88a52c0644b607533f1e5b46f4713132b5f72618aa1f1f0107cd5e22fa9dd2ed0a6cd3f36cb9a947790548e8e4025f507e475
 DIST rails-6.0.4.4.gem 6656 BLAKE2B 5a86f542a1030653fdb8d9ac994199b32ce4ab19e62c04e6c11bf66ecdf870654a31b312a3b75b8ac1df7b5f6dea7e423873f8f79030dbc7777d369c3c88eb86 SHA512 369a49d6c8371f7216f030ef9a69679bb3676267b4ecb524f8bf06e89f03a28dd0ab981c4cc9498f002bb95874b3661aa3ec923c64c30cc521a77d33352b57a9
-DIST rails-6.0.4.6.gem 6656 BLAKE2B bd091cf2e9a85438fefddb8d86e481dd519c45d9cf4a5567a75c318a6c14177e561b361ab35ec3fc41b8f2af99d0d74a4e5a505141d79c168721f21eea4ae9c2 SHA512 6361436cd5b697f4765182c942cde965cf44319b023a3cc04a8ee195cf2b4643e90d15febd9a497bd2716aa727ff0513a5530f54b93a151fe010e3828d6bbdf6
 DIST rails-6.0.4.7.gem 6656 BLAKE2B 69c921093a9b0fdd13fa50afacf36bd6ac9230c5aee83b30864b1a9d3754699f6cbb7c89c6d38de475371c1608e398f12144b9649b3eae2ef3cfecdbf3c21cf0 SHA512 6b88dc394ec180053feddd4e8b3eb83152ae2af5418c8a9ba5cc53739320689157dcd2f63333ab44206c035a1fa249cd008f9545d579e73d18423653501af7d0
-DIST rails-6.1.4.4.gem 6656 BLAKE2B 13e90724226d4e125c1dba361ff31fa15e1d268417266e5f843c81fab91634a036140b5e45c1925c6f2b1cba63f06fffb8069dc9457eacb05cd5a932ae983fb9 SHA512 4c7086277c9882c6797a877c37d1e920035d772008413ecfa1b2570bd5b7f62081347bbadca10dbac747a6b1380463ac72d16b09698e7217064c39ca84683741
-DIST rails-6.1.4.6.gem 6656 BLAKE2B bebf4ae87ec8617fd4aaf480fd7a274a285bc5ab6928b957333b8e49d19364f77a006838767f2f608a316be7d2a443dafae8e22e9ef48afbc98b9b8fb5cedc08 SHA512 11057f84ab3138c2e3b69cc8a7e9193be2449d71863474cf2bfdd7ab34eb5e38bd6f8f132377efa62b60e825d8a4d591b2a267323363ad5fce5d83f08e22a24c
+DIST rails-6.0.4.8.gem 6656 BLAKE2B b4a755b32538a52d00a5e51729382c32c553eb5104c842b359c9ea069f630b1f6656375c32348c893696e63317f42db2c8efdf28ed20e7d33b3f7dacd63b3d2f SHA512 46cc2868a11f8407a63bdbeafdc4fb550b7d447d9c529dea8cca8da0b4f9848c1b4bcd8dd80999be22d86e05da8cadb6d5e7bdc4351f0f7458b3f6014d9f7689
+DIST rails-6.1.5.1.gem 6656 BLAKE2B 1f050c2c98bafdfe4c70c8581488336efb81e7a93bd86a2a996a6342aa6643e7360eb00d6455939d9412dd5bda3b3cd6770d14b66cb2f00812be4eb950a968aa SHA512 852ff9009d6820161458db0df255db96d85584453716f2b67d273558fcdb4ce9ea5c09f46dbb54a10015c327cf660ab04d5c613608beb7fd9e8a61824fc8c6f4
 DIST rails-6.1.5.gem 6656 BLAKE2B 23cf302daac889afc51fd9a3619cb229843adc91e8b1ff79531758e1d58ed009baa6fb86f04b124146475c7030754365d88b37aea1333cc002a8162182f4c3dc SHA512 f7cf72733a8662a750f3fa3d5fe00209db24109d029b7743e8f73833db5c63cb5a59a99c5711997e543f79c0ffb802f7a84a165d7ab7ea93afff9a564eecaa48
 DIST rails-7.0.2.2.gem 6656 BLAKE2B 03d726703ed8c9403326b779a84ff8af171636e686a81a92c064156fd014f00f681cca844b5eeb696c6343bf83e72b9d7e2c43237c3d7639e4dd960140b3337f SHA512 475562e77a702eef88b9300a682db04be6f2a6c6beeaab737d41cdc326f80276efc0283e8ef7c2edaedad1d21ea38098af2c5b1f944bfa6be934edb00fc56df5
 DIST rails-7.0.2.3.gem 6656 BLAKE2B 84e016d03df001149f16524dcb5e8372a7e7548eb4b8fd1419d3ec44b39809fcbc26d704c95e5934bcc6c49d57c37114d5a1f16fd93fa929956685ce5caa8dd2 SHA512 8a9cd26ad1ac42928ac9ae9d00579e29f9559aff6dd44f57eb7fbefc06ad4aed320b946aa448c0cdfacd6afc8fbc78cacef031c8d0ca6b657c9a07af359943df
-EBUILD rails-5.2.6.2.ebuild 1042 BLAKE2B 864785d9b78b23c8758ec65b79efc493aab77b2d627aa404b228cd0de0abb9b8565687d341bb2c57965fe7264e62a14a96a21b254664f2ff6ff973f8f32cbecf SHA512 a34da80e066b6bc414a6a2b9862fa74d5213b594290c3a6ca9a37aea6f9e31dc57ed823af942ce1ab57b6730bd44d52336fac88917a3b5c90f86d98bcdcc3628
+DIST rails-7.0.2.4.gem 6656 BLAKE2B fb38071f7968361cf08e3332b536e3abdd0ad9730374c19b8322d3c9d688b777c5ccf92d1312336f9cfdcf7765894c44247b5073466dfd073319aef951162ae6 SHA512 18c77aa5ee62b31b0e44a65cbdf99b64b40634ecde72b22601912ce24d7ad0bcf364ef5f8e69fb974802b4e5c1027dfd61664ba5eb8e196f53d4b244eaba5210
 EBUILD rails-5.2.6.ebuild 1042 BLAKE2B 88b896643b501daddf1625c590c9b59d197ef96ea7e6d6be9d999dd94afa0f81ea5e132417717203f246386dc6820e44f6d2750a87e5af5e3bb1b9a20554d339 SHA512 8ffcd1181a8739014be3b7b5fe1773f0c01a76c4a31b03ed3a220c2791407a743faa61229a250a070a58dd880f96f2f7ebfd75b1c273ee5846262b5b4371bb57
+EBUILD rails-5.2.7.1.ebuild 1042 BLAKE2B 864785d9b78b23c8758ec65b79efc493aab77b2d627aa404b228cd0de0abb9b8565687d341bb2c57965fe7264e62a14a96a21b254664f2ff6ff973f8f32cbecf SHA512 a34da80e066b6bc414a6a2b9862fa74d5213b594290c3a6ca9a37aea6f9e31dc57ed823af942ce1ab57b6730bd44d52336fac88917a3b5c90f86d98bcdcc3628
 EBUILD rails-5.2.7.ebuild 1042 BLAKE2B 864785d9b78b23c8758ec65b79efc493aab77b2d627aa404b228cd0de0abb9b8565687d341bb2c57965fe7264e62a14a96a21b254664f2ff6ff973f8f32cbecf SHA512 a34da80e066b6bc414a6a2b9862fa74d5213b594290c3a6ca9a37aea6f9e31dc57ed823af942ce1ab57b6730bd44d52336fac88917a3b5c90f86d98bcdcc3628
 EBUILD rails-6.0.4.1.ebuild 860 BLAKE2B 734c9789819dcc96864275748bd7a38e4130e958d6b560fc59e7e5d186bdd1e7cae969ace6ee49a630acb830de97fd17f08feea35b3dbf8d6fd37b7a091f982d SHA512 c00d8c993ae3ad90203bfbbdf7ca0af0ca6a91efa8f12d69f94b0904b51a84b67490fec2692c6db9344351189051d7a88ebdfdea501f99f977950b3a4ae6fa74
-EBUILD rails-6.0.4.3.ebuild 853 BLAKE2B 0cc894d8e4ae8065fc54d1290bcee5ff7219512e13e28cce920173255a21032973a05786a3b98c541b926d2ff5cf17b490cf462943317b4de9addeb211270481 SHA512 2a089a6364ab9688b9b27f8b36f8338df26fa186223a52dfa9893b728c259182d3163adcc2710d8e9e01d57b8fb83d874147345d93ae2ee6e233d90d3715146e
 EBUILD rails-6.0.4.4.ebuild 853 BLAKE2B 0cc894d8e4ae8065fc54d1290bcee5ff7219512e13e28cce920173255a21032973a05786a3b98c541b926d2ff5cf17b490cf462943317b4de9addeb211270481 SHA512 2a089a6364ab9688b9b27f8b36f8338df26fa186223a52dfa9893b728c259182d3163adcc2710d8e9e01d57b8fb83d874147345d93ae2ee6e233d90d3715146e
-EBUILD rails-6.0.4.6.ebuild 853 BLAKE2B 9c84647616ba27a39f70c96039e5d29603d80c54eb0ea4e56b6f8a29490125c16c0038c9ae9bc0f46be0e4a73a9aca785755e0313b140fc6a5420033f01ecdbf SHA512 5b54f65bce87008d9d1e59bc6cbb743ec8d2b6432146ef291af0054c5bd13445e0183e5c6b4f55ff3927121a31b8ec77ff107f5fce90562387fce4492a7bdf7a
 EBUILD rails-6.0.4.7.ebuild 853 BLAKE2B 9c84647616ba27a39f70c96039e5d29603d80c54eb0ea4e56b6f8a29490125c16c0038c9ae9bc0f46be0e4a73a9aca785755e0313b140fc6a5420033f01ecdbf SHA512 5b54f65bce87008d9d1e59bc6cbb743ec8d2b6432146ef291af0054c5bd13445e0183e5c6b4f55ff3927121a31b8ec77ff107f5fce90562387fce4492a7bdf7a
-EBUILD rails-6.1.4.4.ebuild 856 BLAKE2B 6a78ae848c719f160ba642b247b6648d77bf14974a93bce2a26983fa4f56303e7cb32c2b4ae09778379eeef7d2be29972c9929f90f054b475e13e016f3ed0ba1 SHA512 6c305885778eb999ca2ab0ee1d9a3f2210a7f22049475d51537122424f63616c37ebd65592e4984b25a26c70ed9b3f12cddf840011cd076dc195a6c40f873bca
-EBUILD rails-6.1.4.6.ebuild 856 BLAKE2B a19e16f324bde6694b48f11e6e7056f48e274c08911b57e614ebfd48db2f750998f70315cb6404416bd75d9cf75e454c4647beee650166ff9f8e9931d5d391dc SHA512 479f0788d4e1deb3af9277b2270a3e818c9b82e1473dbd67ec8159fb963f580c0846e01b28434cffbe325dc1c0a395395ed334f3286a8aa0e33e8866c68a6194
+EBUILD rails-6.0.4.8.ebuild 853 BLAKE2B 9c84647616ba27a39f70c96039e5d29603d80c54eb0ea4e56b6f8a29490125c16c0038c9ae9bc0f46be0e4a73a9aca785755e0313b140fc6a5420033f01ecdbf SHA512 5b54f65bce87008d9d1e59bc6cbb743ec8d2b6432146ef291af0054c5bd13445e0183e5c6b4f55ff3927121a31b8ec77ff107f5fce90562387fce4492a7bdf7a
+EBUILD rails-6.1.5.1.ebuild 863 BLAKE2B 90e111f998c2def3bb03a8031886c2b73bc770b620451dd3ad0b7bcba53b63aa7ec35390011d4a92ccfe31f38a7d9b7661d90ee36bd19076d0a18860fb390ff3 SHA512 539100848e74f7db636bc82f08713e5357de33056da990bbc6baf4d7e119d1bcca49a8e194341e03cd39508c0cda3905db8de6000b419e2983ca3df064508942
 EBUILD rails-6.1.5.ebuild 856 BLAKE2B a19e16f324bde6694b48f11e6e7056f48e274c08911b57e614ebfd48db2f750998f70315cb6404416bd75d9cf75e454c4647beee650166ff9f8e9931d5d391dc SHA512 479f0788d4e1deb3af9277b2270a3e818c9b82e1473dbd67ec8159fb963f580c0846e01b28434cffbe325dc1c0a395395ed334f3286a8aa0e33e8866c68a6194
 EBUILD rails-7.0.2.2.ebuild 849 BLAKE2B a0e75ffe3399aab2956cd7e846a81d30650445b6d320aa7a444b830030c0a9c5ec34abf7196aa537b6601dc4fed4439ca95af0d9e662859fae235ae7a2cd1bdc SHA512 2bd56fc9f6c0ff39ddb55876189c73fe1f889500c5805b096cf44c392e5dcf31821fb795ce7ff96723ca989adaf7b568658054088b26231a8fc73b3d78e1af5f
 EBUILD rails-7.0.2.3.ebuild 856 BLAKE2B 666a7e1b46fb4649234f2f2b21b85198d1e8de65467739475192be508b190bd8d2846c6371912760b687df18e4954b5802c59dcae5c03e7459a732623ff3c32c SHA512 e4fb81a45439133b13e71779f3b0f99a90fbefcfb8b164573c41148b7f296dcbdc5e9cffbc28e2893b98374058f04279a72b81ee66d0ceedecf775988c56e410
+EBUILD rails-7.0.2.4.ebuild 856 BLAKE2B 666a7e1b46fb4649234f2f2b21b85198d1e8de65467739475192be508b190bd8d2846c6371912760b687df18e4954b5802c59dcae5c03e7459a732623ff3c32c SHA512 e4fb81a45439133b13e71779f3b0f99a90fbefcfb8b164573c41148b7f296dcbdc5e9cffbc28e2893b98374058f04279a72b81ee66d0ceedecf775988c56e410
 MISC metadata.xml 492 BLAKE2B e1f39a222b68aa3fbe808220276df3f6b7aa633887a0a0dbf4624ba8c8aa6a179d32c856b71dcf04763dd0212d7dbd58a6bd734e382adda25b5e9e28a7dc121e SHA512 16b0cb56755b23acbe3635dd82e72e1fe8b313b43658a79e56a983da672b4eb2619941ca10ce8431192a5fa0201bb428a3ab96b7e67323b893fc22d0491f5f46
diff --git a/dev-ruby/rails/rails-5.2.6.2.ebuild b/dev-ruby/rails/rails-5.2.7.1.ebuild
index 56c5302b9cad..56c5302b9cad 100644
--- a/dev-ruby/rails/rails-5.2.6.2.ebuild
+++ b/dev-ruby/rails/rails-5.2.7.1.ebuild
diff --git a/dev-ruby/rails/rails-6.0.4.3.ebuild b/dev-ruby/rails/rails-6.0.4.3.ebuild
deleted file mode 100644
index 045971c6e442..000000000000
--- a/dev-ruby/rails/rails-6.0.4.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.0.4.6.ebuild b/dev-ruby/rails/rails-6.0.4.8.ebuild
index 94bcf8ba4dd3..94bcf8ba4dd3 100644
--- a/dev-ruby/rails/rails-6.0.4.6.ebuild
+++ b/dev-ruby/rails/rails-6.0.4.8.ebuild
diff --git a/dev-ruby/rails/rails-6.1.4.4.ebuild b/dev-ruby/rails/rails-6.1.5.1.ebuild
index 7cd0e97185ec..5330bc6f88eb 100644
--- a/dev-ruby/rails/rails-6.1.4.4.ebuild
+++ b/dev-ruby/rails/rails-6.1.5.1.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=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_BINWRAP=""
 
diff --git a/dev-ruby/rails/rails-6.1.4.6.ebuild b/dev-ruby/rails/rails-7.0.2.4.ebuild
index 27b1d5ff015a..b9ff7fecd2b5 100644
--- a/dev-ruby/rails/rails-6.1.4.6.ebuild
+++ b/dev-ruby/rails/rails-7.0.2.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_BINWRAP=""
 
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 40d62b0c5c83..fe4f5c0074b6 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,27 +1,25 @@
-DIST rails-5.2.6.2.tgz 8840302 BLAKE2B 54c62924252bdbc7df4b07309dc1f96973660db71c68a9b25f8f9e44fb901982cf38242c613a349220ca043ca82984ee740052fc51521a6e1f088d8b77d4f53b SHA512 f639508300258c210253be875066842553487b0ddee2b56c625b7ed99ae5b9d59d62a69181c0910ebc85786d0a5fc1001385f3700fc198d192eccbe753d2e48c
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
+DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.7.tgz 8843727 BLAKE2B f721f7d67c80e6070d827aa2209aa302a41bb004c370978d9523905cec13402fb3c9c960dd0e7504ad29d8ea987526a21a4c7e3c9ac44e475be9141a0a57ccb0 SHA512 9d871a08721d2a613dab06d7c3043816768d355c0aa022e8a2a17e7bd894e3a6116d0eb5b205cfdaf9b0192400b461cf8d3ed6145663bf1104251d5f05d2e30d
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.3.tgz 18594602 BLAKE2B 99ee38f02ffece7972b34dc4bf8de6aece131fbdd1ac92c01272296e87b033d0a877a4fc724d3acece0442025ff9906a3e735ae75a8313135f2ffc55be988b38 SHA512 ae71145cc6e2a532271f6fe063347b261a7c6b1153f4978da5fd539b51b356baa555e731b759d9b49c342b2623b30ff9962396346df66d7e97aeca1fa806b333
 DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.6.tgz 18594247 BLAKE2B e058f69e3c21afa0026dbaf43441268bf3b380123ae95414dda0171059351718d068d854659556472fd9c8c8a2954ca2a1c0a42a0dda4d48f943f8491f5a50dd SHA512 960d133e4ecc555f30f04a324b2837a119dc27fa99b8f768e6bd8df64d7186035805b475459ac05323ca21b5aad5bcf170e6963d973464f70e26bdd229d8be12
 DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
-DIST rails-6.1.4.4.tgz 11006695 BLAKE2B af5afbd1adafa259f3d58d31e8e616be5e83e73d3e7231fd62717c0a8c0012e7ecf5346f2465a61f72d96fdc71755e954069adfebc84dddddcb29cb8a215cee1 SHA512 4215be8f447e5b486a1c0d99208fbeb1f7222aa3bdff7127e31c95670a74aa315a044df0048a55fd078f42a07f17d4b7248efc09d6fac2a4b6efef8624a509ef
-DIST rails-6.1.4.6.tgz 11006958 BLAKE2B e365570a5d4b0e46803ec0c13639e43f4258c068362a706c99cce8b308463ef4612ff0ceeaa98877354dc40655d8a5d1302e1cb7b3e7b265e8fa466ce7ddc124 SHA512 89f1bbfa8bb91db26203375b979eabdfee4b085c85787557fae2d55182fa1c048cd00ff28ef20dd95f062dcaeb1f1d99be6fd081821268c8263295866ff2983e
+DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
+DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
 DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
 DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
-EBUILD railties-5.2.6.2.ebuild 1632 BLAKE2B b9768abde2b639e1c33d18723add19bcc9b7d97f351362ec260bef1961e3fa54d02520e468a3f559b813d13f3fa14b5b820bd66fa5ed6084a33f72df022e09eb SHA512 d84384ec57fd323915b413e0d33ae2d80478e24c34bfe33f337296ae1b01e6abf5e921f6f4dee4a1471f7bb2fa140a3507b6a4580dc1b15429df350f3aadcaea
+DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 EBUILD railties-5.2.6.ebuild 1631 BLAKE2B eb7b20ad815903ed036f600906e0a5c2fc3a73ec758443001924131d4e25fee6bee3ddecee01e0828bd59837303a7880d15b16dec0976ff251a8e73a77916b49 SHA512 253ab141a57d19c0a6b52d5f3be5f764539afb1650cdcb5699bc704cecbdd4113713c666d4e67195a2387bea9bf270a6658690b1c9223323d76a6c7acb3c37c7
+EBUILD railties-5.2.7.1.ebuild 1632 BLAKE2B b9768abde2b639e1c33d18723add19bcc9b7d97f351362ec260bef1961e3fa54d02520e468a3f559b813d13f3fa14b5b820bd66fa5ed6084a33f72df022e09eb SHA512 d84384ec57fd323915b413e0d33ae2d80478e24c34bfe33f337296ae1b01e6abf5e921f6f4dee4a1471f7bb2fa140a3507b6a4580dc1b15429df350f3aadcaea
 EBUILD railties-5.2.7.ebuild 1632 BLAKE2B b9768abde2b639e1c33d18723add19bcc9b7d97f351362ec260bef1961e3fa54d02520e468a3f559b813d13f3fa14b5b820bd66fa5ed6084a33f72df022e09eb SHA512 d84384ec57fd323915b413e0d33ae2d80478e24c34bfe33f337296ae1b01e6abf5e921f6f4dee4a1471f7bb2fa140a3507b6a4580dc1b15429df350f3aadcaea
 EBUILD railties-6.0.4.1.ebuild 1618 BLAKE2B 5e6ae7e09d3dcb10ebc2d7c5d7e09887d95e21e1e8c32ff10d72201c633dde61f3cfb121caa46e2ab4385287be59bf2ae838ac25edc11c56502add2f79697463 SHA512 29272aa538eafce1d26559008bc5dadd98d14dc089417675a93584798ea441b2af48c621c5ce7ed79cdbf56216714740b64efca5c7e17d110a72e9cea348f02a
-EBUILD railties-6.0.4.3.ebuild 1612 BLAKE2B abddef9bc63d69e71ad5f773fe2967e70933e187757ab629f34e31b8142b276f977559c8aeba8d46beb0ccb8478fa23a420206c8766af573fa713f15563fca3c SHA512 70d22a16f1ae2e493a6ef183a6bd9a07f8b75af83da6de6e93598f54827d373d75f5cf03564b4267e1a02342b5e5e787147e9091f20e75df8eb147de6e21dc3c
 EBUILD railties-6.0.4.4.ebuild 1611 BLAKE2B 528cf6ffafbc653cc98487956602d573db00b2755964de790f9e863ed07c8ba3014193d4def9cefdcb402f5ba60e60135f3d057300e45b70bb60a084e78b32f0 SHA512 ee8167df4ac31608495b11a7720a4464ddee2cc4479b8503b3d0b247f06cbdbbac966b52b9bd402332670c770dad638fa918b59140b07127241585a41167e269
-EBUILD railties-6.0.4.6.ebuild 1612 BLAKE2B 87d6b40cf9bf640f5cd333a4f297d6a5911d0df998188df53e66811391e060d92acbdd3ebf1eba7ff923a3b0c6f449633648d16fed8ed35651e9ce24d760129f SHA512 6766456401f7a7e0e83b11d0d5a8be58a3c47a4c01f672e491c700f2ccc3615c719a2bc0a1a27072fa129c5c3568c331f8ffa1ba7a2249856a8f4830c93d68a2
 EBUILD railties-6.0.4.7.ebuild 1612 BLAKE2B 87d6b40cf9bf640f5cd333a4f297d6a5911d0df998188df53e66811391e060d92acbdd3ebf1eba7ff923a3b0c6f449633648d16fed8ed35651e9ce24d760129f SHA512 6766456401f7a7e0e83b11d0d5a8be58a3c47a4c01f672e491c700f2ccc3615c719a2bc0a1a27072fa129c5c3568c331f8ffa1ba7a2249856a8f4830c93d68a2
-EBUILD railties-6.1.4.4.ebuild 1612 BLAKE2B b170cfc5ff96ae0cebba1ffc67a88ca50254723d54f8f81a05824a2da26cccc028e428bb131f1d4c671d5619a564f74e96fd4d36bbd6354f8b0910d7adadd920 SHA512 4c38105b868cb478d4e0bf064f4061f7ccda1421ab610d886bb3e56027fabb9118f00f9f3de530a93ac88178204b1508bf64b9c23eb756cdbbd39f76bb9241dc
-EBUILD railties-6.1.4.6.ebuild 1612 BLAKE2B ce8ec8ea8987d800964e7701c3075a2f9a8729f4ff90a08c8a0a10e8659db27cde42bd5e30652535bc7b9e59cbc5a1acf4dc0e13dc99044843de42921c9f31a9 SHA512 fd5f1ec7648b5e70c8d550d5213a6306cfbc4abb503e6ac226b04963cf7065a6bd3e19d95977ddb2913684b35a25f41e66346f8cdba1dcf81b914536c3543969
+EBUILD railties-6.0.4.8.ebuild 1612 BLAKE2B 87d6b40cf9bf640f5cd333a4f297d6a5911d0df998188df53e66811391e060d92acbdd3ebf1eba7ff923a3b0c6f449633648d16fed8ed35651e9ce24d760129f SHA512 6766456401f7a7e0e83b11d0d5a8be58a3c47a4c01f672e491c700f2ccc3615c719a2bc0a1a27072fa129c5c3568c331f8ffa1ba7a2249856a8f4830c93d68a2
+EBUILD railties-6.1.5.1.ebuild 1619 BLAKE2B c64348229554155bd319636bcd9324b40087097f75470e4b780d80cec4220f652b154d6a9a9db1019007a7d76df29efb383de61f6076a53903535170ea947e5b SHA512 57972943cfdca05134d86067423231061bcffee623e8cfc02ae75bbcddfba1f673e2e0b9fb5293e3fa34b0e55c82a8b8449ef8cd27b370f7ca7cffaf4db91c1f
 EBUILD railties-6.1.5.ebuild 1612 BLAKE2B ce8ec8ea8987d800964e7701c3075a2f9a8729f4ff90a08c8a0a10e8659db27cde42bd5e30652535bc7b9e59cbc5a1acf4dc0e13dc99044843de42921c9f31a9 SHA512 fd5f1ec7648b5e70c8d550d5213a6306cfbc4abb503e6ac226b04963cf7065a6bd3e19d95977ddb2913684b35a25f41e66346f8cdba1dcf81b914536c3543969
 EBUILD railties-7.0.2.2.ebuild 1619 BLAKE2B e93441c553f34e3f494587cb9022788cbd630245b9dee8dbf0b25fd287c850341a781d0e7f7b27e585dc092b63dccaf4738a116079057d07d2857f7443a87c9e SHA512 214fa7f5c9b602e358cdb2495d92f15b469fab8e58cded88d4935925be2c3e8b199d82aa28d5a1a10c25d8bda06319a81e555a92c6e3041a6cb49ebd05effc31
 EBUILD railties-7.0.2.3.ebuild 1626 BLAKE2B 7f2d4e179f48374114fbb37639e9e2a533b75376cb975d6e7271dcde8c7757a1144018d72c4928fb5b27fcb37d3839c9812abf30742c28f996af947761b88603 SHA512 bbc840b9384c40fca3f4d985360f0b065e8f0eda40c502463fcb1b817c53d8c9d6904efdd7dda9e91cd34490612b6d685f4b21ea738a74f20582e65071bb2ef3
+EBUILD railties-7.0.2.4.ebuild 1626 BLAKE2B 7f2d4e179f48374114fbb37639e9e2a533b75376cb975d6e7271dcde8c7757a1144018d72c4928fb5b27fcb37d3839c9812abf30742c28f996af947761b88603 SHA512 bbc840b9384c40fca3f4d985360f0b065e8f0eda40c502463fcb1b817c53d8c9d6904efdd7dda9e91cd34490612b6d685f4b21ea738a74f20582e65071bb2ef3
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/railties/railties-5.2.6.2.ebuild b/dev-ruby/railties/railties-5.2.7.1.ebuild
index 656474a80bf1..656474a80bf1 100644
--- a/dev-ruby/railties/railties-5.2.6.2.ebuild
+++ b/dev-ruby/railties/railties-5.2.7.1.ebuild
diff --git a/dev-ruby/railties/railties-6.0.4.3.ebuild b/dev-ruby/railties/railties-6.0.4.3.ebuild
deleted file mode 100644
index a9385fe2d7c5..000000000000
--- a/dev-ruby/railties/railties-6.0.4.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-6.0.4.6.ebuild b/dev-ruby/railties/railties-6.0.4.8.ebuild
index 201e99487a96..201e99487a96 100644
--- a/dev-ruby/railties/railties-6.0.4.6.ebuild
+++ b/dev-ruby/railties/railties-6.0.4.8.ebuild
diff --git a/dev-ruby/railties/railties-6.1.4.6.ebuild b/dev-ruby/railties/railties-6.1.5.1.ebuild
index a36038e9bbe8..cae1535049d0 100644
--- a/dev-ruby/railties/railties-6.1.4.6.ebuild
+++ b/dev-ruby/railties/railties-6.1.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_TEST="test:regular"
 RUBY_FAKEGEM_RECIPE_DOC=""
diff --git a/dev-ruby/railties/railties-6.1.4.4.ebuild b/dev-ruby/railties/railties-7.0.2.4.ebuild
index 32dd8c456b56..d49f8cb3826e 100644
--- a/dev-ruby/railties/railties-6.1.4.4.ebuild
+++ b/dev-ruby/railties/railties-7.0.2.4.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=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_TEST="test:regular"
 RUBY_FAKEGEM_RECIPE_DOC=""
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -37,8 +37,9 @@ ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	~dev-ruby/actionpack-${PV}
 	dev-ruby/thor:1
-	>=dev-ruby/rake-0.8.7
+	>=dev-ruby/rake-12.2
 	dev-ruby/method_source
+	>=dev-ruby/zeitwerk-2.5:2
 "
 
 ruby_add_bdepend "
diff --git a/dev-ruby/rake-compiler/Manifest b/dev-ruby/rake-compiler/Manifest
index 4409db394cbe..229dfc2b3da0 100644
--- a/dev-ruby/rake-compiler/Manifest
+++ b/dev-ruby/rake-compiler/Manifest
@@ -1,7 +1,9 @@
 DIST rake-compiler-1.1.1.tar.gz 34692 BLAKE2B c6862f24ec57c25fdeb7faeeda9eb96cb64ac972c852a81b77ec9b35d21018a5647089cd38d80b03a79e2c07d3f9af42bbaf9998457ad3beed27c8285c23689f SHA512 e9cf9752e48eae912657a34d2f86a2b41f7d57620c6e43b1fa6fb8e5715336b2fdf99bf20a4851889e8b9b7b2e834421c13e108c538abdc3cec968952345361d
 DIST rake-compiler-1.1.3.tar.gz 35894 BLAKE2B cf395392ed4940a9cae1a0c3eed530de0b2ab4af32b0662f8e316f17f1f351170b876afb18cfc74208863fc124db6031f485c37b0ead73b235029d9b0bf01f11 SHA512 542a3579baf9bbb046bb99d72799d50e2f0efe71bb18a8c8aa7a9f740d8dc5706cec1c9619a977ba50eef615f66cbf415b5f8a351843d03ea2d72ed1203ac72d
 DIST rake-compiler-1.1.9.tar.gz 36565 BLAKE2B 6c41d2e3e63cdea0d21d7b8bde6739dc719f87535e50fa1e09dab28e2aa9d88cbc71e826b813426eed7ea75f213f7d84337a01b1949ff006699c5239474d5778 SHA512 d6acc9a36c8c2778d3c958d34ca9d6cba8cdf82365849a818eefb024cc80558512652c20b84a0c756007f7349e2c0380a3818ac1e246eeb8dbfff13283405a21
+DIST rake-compiler-1.2.0.tar.gz 36596 BLAKE2B 56394a2a8d6761f0f36bbc9fa63b2c36e57a33ba6c0bc660f31ef671e9fa90c581d65acb218ba8699dda7793fe6b8eac03e988c9a6dd486df422fd1228bc8b72 SHA512 77b6dd8b976039484ec7d6bb9e0b2432d40153f218ce2e1d242246711d40dc3ed9be7ba6ec99ee8fd89192ab04d5d1a97b4d1c089c86c7d20b163eb8d4ae68d5
 EBUILD rake-compiler-1.1.1.ebuild 1626 BLAKE2B 66268d89f720c83f51476c3a3924334125f62316a8dd597216ae340731c0a1e5ed09a5b3a4d1303142e68353487480564290e07e67357c24a77c3a6bf9554088 SHA512 b6bca2a1dca33259f31a714dd07c6a7f7e828e94553387648cd86abc10189eaabcb7cf323494ce45aee0584d903c16f218482aab31c61011011f1a15fab4cc28
 EBUILD rake-compiler-1.1.3.ebuild 1618 BLAKE2B e2e5da70276bee5f5a9692ddf517c218874245e4b3699f5d37be937baf82fff728a698b19d34692322013dda59aba0d062346a84df48b133866bfc28e9aacd6a SHA512 9d555160330fd011dd961113c1fd49ead7cccc2a25692adfbef6c4d7b0ee6f0711fd43218d33a253a98496f4997bb9fc24453fd9ad6734f82d6457b747e419c1
 EBUILD rake-compiler-1.1.9.ebuild 1638 BLAKE2B 7da89d9b482ecd493cc56fe52a262dc2d40189a01012f2876ee4c775ffd328d257f4766b60bbfb47bf53c4bf5bafd9f6e6187a05c58eabec53fab061270f85de SHA512 6bf368fbe28c22bf66d343e049df6efe6e4fbcff7dc4535525d8ade57e5e22e7328636af4660d92bfd89bd03163ea5dd07b93ff55e4e17c9c218dd5f2d87e6d4
+EBUILD rake-compiler-1.2.0.ebuild 1638 BLAKE2B 7da89d9b482ecd493cc56fe52a262dc2d40189a01012f2876ee4c775ffd328d257f4766b60bbfb47bf53c4bf5bafd9f6e6187a05c58eabec53fab061270f85de SHA512 6bf368fbe28c22bf66d343e049df6efe6e4fbcff7dc4535525d8ade57e5e22e7328636af4660d92bfd89bd03163ea5dd07b93ff55e4e17c9c218dd5f2d87e6d4
 MISC metadata.xml 351 BLAKE2B 244d52aa29c9cdaa264cc545994ba23b012d8fa075fe3c173e28958c3af17b11e32216ce686d5117d8cdfc31c2761e3cc5e79801019bc5f2b36725405d085d16 SHA512 74631c371f303715421c6a61ed98889d8a898d761c8216cfe9bbed422eea27e29c4ddd344da4e49f11c4bb31c8ac5fd5df3c5d36a7ab187e80e005276c027bd5
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.2.0.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.2.0.ebuild
new file mode 100644
index 000000000000..8cf7bf67922d
--- /dev/null
+++ b/dev-ruby/rake-compiler/rake-compiler-1.2.0.ebuild
@@ -0,0 +1,55 @@
+# 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_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rake-compiler.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
+HOMEPAGE="https://github.com/luislavena/rake-compiler"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rake"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
+
+USE_RUBY="ruby26 ruby27" ruby_add_bdepend "test? ( dev-util/cucumber dev-ruby/rspec:2 )"
+
+all_ruby_prepare() {
+	# Make sure the right rspec version is used in cucumber.
+	sed -i -e "1igem 'rspec', '~>2.0'" features/support/env.rb || die
+
+	# Avoid failing features for native gems, this also fails with rubygems
+	sed -i -e '/generate native gem/,$ s:^:#:' features/package.feature || die
+
+	# Fix compatibility with newer cucumber versions. The not syntax has
+	# been supported since cucumber 3.x.
+	sed -i -e "s/~@java/'not @java'/" cucumber.yml || die
+}
+
+each_ruby_test() {
+	# Skip cucumber for new ruby versions (not ready yet due to rspec 2 usage)
+	case ${RUBY} in
+		*ruby26|*ruby27)
+			RSPEC_VERSION=3 ruby-ng_rspec
+			ruby-ng_cucumber
+			;;
+		*)
+			RSPEC_VERSION=3 ruby-ng_rspec
+			;;
+	esac
+}
diff --git a/dev-ruby/rake-remote_task/Manifest b/dev-ruby/rake-remote_task/Manifest
index e9313d3c00f6..8da1767b7c8c 100644
--- a/dev-ruby/rake-remote_task/Manifest
+++ b/dev-ruby/rake-remote_task/Manifest
@@ -1,3 +1,3 @@
 DIST rake-remote_task-2.4.4.gem 18944 BLAKE2B 3157d38346cbefe1ac522fe3d33638e65c44f58bb35ca822e5e7eab5988abbe0ed788ee22ac6f7ec2b104c72145bbd4d259effab7c2d6584f688d1b5055aaf2b SHA512 885cda1754c2f8e4a4f2ab4d688bdaf3f06924f8d5e491b9cbd61af39373a95884d2cdd78b0f964e69941f56bf0a1dac0a586cd3c7fb729fcb96ecd37715ccd8
-EBUILD rake-remote_task-2.4.4.ebuild 672 BLAKE2B acfc6fd665a4c8eb6d61f366dc027f6087ca0e7db0218dfb0d54d38e3fa99f27028d001a831affff6a7c1dd730a72825d0220eac7d8d1e6d4cfb29e7edf378c2 SHA512 e4e031727e2c9e8510bbe2bc1c019b81b1b9f04008eb3b14d5a57b33051ef056174fd2c011f9e4c0ed38ffbff89c640cb00b4a3cbd79e210af8281b9650e0fd6
+EBUILD rake-remote_task-2.4.4.ebuild 672 BLAKE2B 0afa224fa64162444dfc9804f9cd84384674356ba93bece8ce4341403e768f0a24bb4ce0aca7dfb590944810cb2ffec8578425e10e2ea13461ab9ffb995fd36f SHA512 d296117c61bfd10c44d058067035add9f8c81834d016b416bec9e9c28ef6fa2af844efb70d0ac0913bff0951dd4021d31e87562d06112b46b72fc7a1e999808b
 MISC metadata.xml 343 BLAKE2B 08020a9bff40d385ad732022e0eef559b829ccf3db7f8ec08da8de923cae3da4d05d9c216b9a1a6c6bf36ec0f77729f29a9f4f677e5c127c51f71f5a824278f1 SHA512 aecde7b03a904101ecd0386004da5d09ced73c8cdc7cbd29897198134eb3fc5dd4437184f5bf42920b86c136ce1c31413c3f4c7e64c07bc111f859fb814d571d
diff --git a/dev-ruby/rake-remote_task/rake-remote_task-2.4.4.ebuild b/dev-ruby/rake-remote_task/rake-remote_task-2.4.4.ebuild
index 75dafd1c6c79..4f6ac2c2a0e6 100644
--- a/dev-ruby/rake-remote_task/rake-remote_task-2.4.4.ebuild
+++ b/dev-ruby/rake-remote_task/rake-remote_task-2.4.4.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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
 
diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest
index c63422e3c2d2..92c989fd09f3 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -4,6 +4,6 @@ DIST rake-13.0.4.tar.gz 123399 BLAKE2B f91079b3e22f0b1e09857ac5f549ad1cd4372ccbd
 DIST rake-13.0.6.tar.gz 123485 BLAKE2B 39c99b9d125ba7519bd8eaadac85646e785cc01fafad549becea5b2801f14d74085365743f1c5eb1126d0ae32b19ebcde636badc06670a0ad0dba419082e691f SHA512 1b438be96d8cedaf70e961b0bbd2217692b0b5537b2e1d5f599158e7da3e300cf6ab0c5f0c52fea89be0beb675effbbf563d24e55c84fb673b4982013355e03c
 EBUILD rake-13.0.3-r1.ebuild 1447 BLAKE2B 96f2489a15db199dbb9359a5d2d2f030aff19cf2cf0b09df6541293261f121bce6099c2464b3f7af17b3465ffe2a908fc597806bfb6aa8c27407f796dfbd69c7 SHA512 c2cb29b463a828f0afe59643c81199677e3f990c3c9fdc45fe0e0dfbbf0d184484cbc82a80ecb47da7ead7f0b942dad4d436f54fc433d146eef5e702dd65044d
 EBUILD rake-13.0.4.ebuild 1488 BLAKE2B 81506dd9027bf056da28aa18840319ce3502057ae76552bb5ab465929c9d9c7da0da84ef1f4fe61e22069667dbfda47a9081b370573f3d7ed9351cc8558234f8 SHA512 45f5cffd067f5c2b4d6429dfa18e17fa4ee9a10459260c9780f31eb66c8960fdc6c0655ebcb443959e9aed21cfea9dd7d73c3a5b2dd2e94e64d8a228338a0c97
-EBUILD rake-13.0.6-r1.ebuild 1495 BLAKE2B 37aa50af83427de95e432034399a09d9a02e62695379ea4d0471f501429b97810e0399f70180912cafac1bab4b958087fc1e8e68a84166593ebb46a367bb3cff SHA512 d0d648e9dcd9dbe9f430b1170cf8b3ef84c2573ed7362660f5fbb9d79fa392dad07cc41760712f1f0808d1833e8f3e138e750f3b996a4ffd61838c4c1a452676
+EBUILD rake-13.0.6-r1.ebuild 1502 BLAKE2B 3d4f8713c10d752c09bfa57c854e3d75eebb6e83d7d58f67127fea60d48bb759a24020cfe6e5e03f768b32ab63c5763269cbb40256b337108ee8546f72219997 SHA512 37161c350c7a57a33540740c0478d0e0c0aacb8a3e43b1fb261f10f8f1facc9d85658df23648a83fa0fb6bc714b4036f88f8c62cf46f48ed81d84142aec99357
 EBUILD rake-13.0.6.ebuild 1495 BLAKE2B a2ac9cd9bc02871fbcd730ff671ef1de072c6f07673f3d6346dfd6531673f3c95fb8c06ecca72956069d3fff3cc6f35b4b9c5d9cbd0e999ddce854b68d4f6948 SHA512 3097bc7c795bee111cd8bf15a8a7e2dfb687dcfc87d35c07576e2479185f331b6e6c681f1622665fc08655a14df4d29ce23a5be18da11f12d68aab04cf68af06
 MISC metadata.xml 342 BLAKE2B 2ce6f0f6a15a223f7ce774b3c3ca1dc060bdd8eff79741692a6ae900ca52f3f37d9616de4c2e87826086de2fbc6d66cc2aba8a17081430d587d3b170a391de56 SHA512 484f0bbde0d79a392f8e3e95d447f62a5b3246b93b273395bfc4e5f6ef5ed18f6435cd071bbb6594d4bac2f8013a90a3c97044eb8e69d9aa437f511f77bae1e5
diff --git a/dev-ruby/rake/rake-13.0.6-r1.ebuild b/dev-ruby/rake/rake-13.0.6-r1.ebuild
index 56b5c8015f57..c1be6eaba717 100644
--- a/dev-ruby/rake/rake-13.0.6-r1.ebuild
+++ b/dev-ruby/rake/rake-13.0.6-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND+=" app-arch/gzip"
diff --git a/dev-ruby/rantly/Manifest b/dev-ruby/rantly/Manifest
index e3464fdf8d1a..5bb001deb832 100644
--- a/dev-ruby/rantly/Manifest
+++ b/dev-ruby/rantly/Manifest
@@ -1,3 +1,3 @@
 DIST rantly-2.0.0.gem 18944 BLAKE2B a124204157953780dfcc97c4777dc3fb7e152eb3f0e208dd18aff80f8252b4f41285ce7870d927433e034678e679e0a735b8796601dd061ce43693f2c3760d50 SHA512 f3eb10eb3fea3135797c57d40bfe6a2ac9d64d4f449850b89072c527913f13eca34507f62ce611831497954b1c28bf5592dc46b73b510503223d029b4b442b74
-EBUILD rantly-2.0.0.ebuild 575 BLAKE2B d72f94892ba49b1585f8667463d0b409f3c4a483fd764104db18a3195dfa36790272cc084287efa53de91d48bfa3f17fe4ac4cdbd2181d2829bb552ba8c830e8 SHA512 bd2156c588f6aa0f57df48fc173d8e26571c395cc51dc253bc83c101e13e29a84708012bb2681c6fd894df9e7650ae10e9c58a42c6f6df4721abe8920545f323
+EBUILD rantly-2.0.0.ebuild 575 BLAKE2B 4775a9bb0d2ef57d5c3eec6b13048fc69527b877a260f311a97be77fb3990e927d07acf846e7467887dc6ce928750db0ff4a1a3fca6aea1435fd620e0d94334c SHA512 6be1f63298b7d742c074ef0737edcc4ec27cbc997169e737c787ca40bd0a6477041ccd4ad1df76e6e14971c6d3fe57a5419dc98839224d4442c856230c31f59d
 MISC metadata.xml 343 BLAKE2B f1d3c3206cbf829a8a173e4462e5417f0eb3952fc1839726b66b92aedc9336767ec337ce83fcd4b1bd9ddb3306a9e4a8edcb4cecc55bdcd49b9913cf00cfb46f SHA512 ad9741e64a083a73a3d7f41af5547102937404c2d291cd8e1f9ce4138b4a2db15a622c0bdb97826a76436491992c7f19f027fd0303b641482cc7b5e3c9135b55
diff --git a/dev-ruby/rantly/rantly-2.0.0.ebuild b/dev-ruby/rantly/rantly-2.0.0.ebuild
index 94574b71ab78..caa2188e68ac 100644
--- a/dev-ruby/rantly/rantly-2.0.0.ebuild
+++ b/dev-ruby/rantly/rantly-2.0.0.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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/rb-inotify/Manifest b/dev-ruby/rb-inotify/Manifest
index 4671b49ae7f2..ab8ac1c1ed4f 100644
--- a/dev-ruby/rb-inotify/Manifest
+++ b/dev-ruby/rb-inotify/Manifest
@@ -1,3 +1,3 @@
 DIST rb-inotify-0.10.1.gem 15872 BLAKE2B 1ddf4fe8de7cdd348e007ac29ab7b41667092439f9b70eeae49d7e917351c73512e43a7ccf6679af1c9225b19efadb6a1581f63e1958d2a31d61f2bce5a13664 SHA512 7831a6228f2d6363e634b8d6b4a12206f19b96098e5dfba1d27b1e994a7284a5cb58cd0299d861a6ff275fc8248c0e68faaaf786d6222ad68f3e6b43ccea29ec
-EBUILD rb-inotify-0.10.1.ebuild 998 BLAKE2B e4d98d21c5c0eac6b79ef708df6a6e820f31457a564d93bbcb26c816487742491f7c6597b3ed85141bffb94f9c976c2167121029557462c6736b0fa6c4b4ba19 SHA512 709143d0cb5886b78c51c813b7e8fe4f885ab58875edf3ae5c6c17c564b432b8a939fb9314684d798cc0fcfd613c1f5d3f5b0c7106afe5f1c560b1120b75256b
+EBUILD rb-inotify-0.10.1.ebuild 1011 BLAKE2B 78c0047b1adb4e925a68dbf36fc1deb19ef0ff290638ddd8e31e86055a980c26c1aa71c7bc17b5f3d2449ed28a6bf56aa4dd31b962b8209e798971eaddeee0c7 SHA512 32ad778f89dc97ce78f9b2da7900b912e385005b405dc50f58dda39f6bdb90b158729e608311eb20819534db24affa95fbb1e4ca3e46949a8a4f18040ea668b3
 MISC metadata.xml 342 BLAKE2B 6f4587e7af70218aed1523368746721fd9fc5431a52adf87f2ecd31fcd3027564744087e40b0e3ae5282e2b7391b2e0bbf95121b691730796a2470c276d0fffe SHA512 c9ed5a3b063886bba917410aaf1bf45b5da718c29299197369e29e4c5a567df3ef5791f934dd265b9904a557a4a9761d8df5ac5f817eedae74e7577ccf88b5ee
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
index 4562d5b272af..19ff54bc422b 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/nex3/rb-inotify"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/ffi"
diff --git a/dev-ruby/rb-readline/Manifest b/dev-ruby/rb-readline/Manifest
index 1f0fa549a480..dac9c56dd213 100644
--- a/dev-ruby/rb-readline/Manifest
+++ b/dev-ruby/rb-readline/Manifest
@@ -1,3 +1,4 @@
 DIST rb-readline-0.5.5.gem 96768 BLAKE2B d854731957dad1dc6abe6a6e1ed72397e49faf08314c8af568c0f8e6412ecaa38e937a807ac326af4f306f24dfe89a51b830663cca1544a3618ec2aaa6cbd1b9 SHA512 53ed9919eb2c057d2b26e87ba0ecabc73f0aed7fa22398b9e7f98e82bd7a0ed7ca89cb1944bf94400bf4289d6fb404aadb9a2781fa964e2f4c77d7e218e459ae
+EBUILD rb-readline-0.5.5-r1.ebuild 650 BLAKE2B c50d5ce7150589e7863ee01dbe96a5adc1713ad7ae5338137e1bfbe44df6f7ed73829a3549b5eceb936328d5bd5644174e929adabad5fa34e339fa53cef5e851 SHA512 7491a13672cf2e345191c053664cdc3d85e20f6d3bc1fbdfe53a1e7bb6b8efaf0c5d8b0eba6ed10d151a6fb121be6ef5b948f32bb9ba6fd60cee190fe6c01147
 EBUILD rb-readline-0.5.5.ebuild 681 BLAKE2B 38422e549a648b38520bc5de3fdf8584c91267f53bef2ec71f2f5676576c6e3032cd617ed4b03e7ea1aaa91013c6a570e0ffc924f6ed9053310a722486d833b3 SHA512 a936cf7b31130488ec26106705483b9813d6b40a57cb6692f8741404d48c7e7126996aef0db9fa7c3d4f2a470045bfdadf813e3b94cdb1e35b9d1ff34d5aa608
 MISC metadata.xml 438 BLAKE2B 66ef274444ce68aaed0327570260b660b95626f56762e3c3e0d91e3addf63dc4c0fc9d756a1cdb27b283b3965d4689c1cef39d829a6133e96055e93f0636f021 SHA512 a23b1312aa9254c799643938f153d9e6c305fc737f372210c12b542773e27f0eebb01445d335acf06c47e5532fc86b6043d7ed610c6d78cc41773fdbcd9a7844
diff --git a/dev-ruby/rb-readline/rb-readline-0.5.5-r1.ebuild b/dev-ruby/rb-readline/rb-readline-0.5.5-r1.ebuild
new file mode 100644
index 000000000000..96b7e3a4e22b
--- /dev/null
+++ b/dev-ruby/rb-readline/rb-readline-0.5.5-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby implementation of the GNU readline C library"
+HOMEPAGE="https://rubygems.org/gems/rb-readline"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_bdepend "dev-ruby/rake
+		>=dev-ruby/minitest-5.2"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+
+	# Skip a test that fails when run in the ebuild environment.
+	sed -i -e '/test_readline_with_default_parameters_does_not_error/,/end/ s:^:#:' test/test_readline.rb || die
+}
diff --git a/dev-ruby/rbnacl/Manifest b/dev-ruby/rbnacl/Manifest
index 2e9f4842f5b0..04a412d7e7bc 100644
--- a/dev-ruby/rbnacl/Manifest
+++ b/dev-ruby/rbnacl/Manifest
@@ -1,3 +1,3 @@
 DIST rbnacl-7.1.1.gem 226304 BLAKE2B 4c7c356cc3414c1b49302ff16af701bffbeaaa18b49bcdb4c9d0c10fe2e1f693e7917f8031c90d5c4362d95ffe5a8d471a48476788f64f97092adbcdce0d9f72 SHA512 da7e406bd2b5112e51d2c15cab35d955b65091ed745fbd027750eaca8ff1d11d982c82f497fc15b9ee9aa6536dbd21ff9ac285bb2a2d1fb39c3374fd0f3dca5a
-EBUILD rbnacl-7.1.1.ebuild 711 BLAKE2B 4fea1cb565fb9aa98724f8697edf9d5e875d8fc33083e631f5cf6b106be5d2f1691317356d9eb8b870c28105f92c9bad3f6faae2c297fcfa3b407ca947d1e2f4 SHA512 adc7474809f65a78981b11d8bd157fe9415eba1c648b64734fa600ca418f3b2fecfc63e74fb03af6eb6f792b0b0da7f707665a10986a508969708b219d2b46d8
+EBUILD rbnacl-7.1.1.ebuild 711 BLAKE2B 264d048edc86f455ef7f3f0437f36db968530a7704fcf95205b08205fcde28d2814a11cfbb8ddd63cca56afe88d54c8e3fd6457fa0219ec9b1080eb5fedb29d0 SHA512 4a236842bbd144a4cb6beb770c6d155a194cd94e4045204f3c2432684151f01e502f0ce11ba046b6dab7a30db65dd4f328a1e89a41c2dfb7ac502b51b603422c
 MISC metadata.xml 346 BLAKE2B 95c47eeadcf87f4b0bc7d9404752205fbd51e6cb33ba5183c9cdc6684f6be94a4773dc005ea047a94379a0e09d9a7f513f5c08436ab495318bd803b3b1fe411b SHA512 bdb485b5d1df9dc9e578fdc52b5979cba9a25af669ca1407b15516ba8f4a658b60e648126387cd011b6f55f4ed6f2227d083ceedd9a5258f973e8d5e8a19cb9b
diff --git a/dev-ruby/rbnacl/rbnacl-7.1.1.ebuild b/dev-ruby/rbnacl/rbnacl-7.1.1.ebuild
index 389b2b881905..4296272cd694 100644
--- a/dev-ruby/rbnacl/rbnacl-7.1.1.ebuild
+++ b/dev-ruby/rbnacl/rbnacl-7.1.1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
 
diff --git a/dev-ruby/rbs/Manifest b/dev-ruby/rbs/Manifest
index de01c8c2f00a..7c4541f1590c 100644
--- a/dev-ruby/rbs/Manifest
+++ b/dev-ruby/rbs/Manifest
@@ -3,9 +3,11 @@ DIST rbs-1.3.3.tar.gz 632597 BLAKE2B 810f090800ecb9507c07de6991e45a089fbaaa67733
 DIST rbs-1.5.1.tar.gz 672987 BLAKE2B acdaa88627ab79626cb391f5c7dd040da648c9c0cd2e7a7ed697075436d6215edd444dea6079c0319051b326e8823d8151376193f7aa34ab10b533560ecd5987 SHA512 2104eb5ae023fec317ed5cb498a283ac8d3831360822f8917d89ea522a3e5f3479da7d4c57e878a6be6064debd7f3818e1367d4b12f0cd487d7b019f80096d9e
 DIST rbs-2.2.2.tar.gz 963888 BLAKE2B ae6e66b496501b6eb2db7b8e6d265691ab8e95193b434b1ecdc8802de6a7e1f505f4d944cf67d1ec00bc9fbb5da436e74813e7dfea07d774ded609ae2b246bc1 SHA512 3eb2ae59641b66dc6d7757074ea8a77e7621941fc0553f1b83852d507ec058c0738992931df587c38de11ecae35d994149cbfe5e5d268449f2f017f22c9955a5
 DIST rbs-2.3.1.tar.gz 977367 BLAKE2B da15dc2bbf2a10f05c3a4a86db774f9a30b8d9df28137bba363dc2e57c800fe19848cec481df7fd0df4070e5f94ac6c2aa7e5c8e978197dfac1a265790e924bc SHA512 69a052225b055c24c7bc2ce6a44f8541c099ab5bf3ee5eee1958b83a9a666328fc24e39bfa79e3eb76cfcf360eeada3fc5cf1fd333e34290164fff3abb04ffcd
+DIST rbs-2.3.2.tar.gz 977459 BLAKE2B d33984c03a962f4d72989b5b665e7e256f8928e86fa15162a8df549259a832b7898da62c949ae5bb06ed3da82d3179c3e350a392e6177d15a26600debea82539 SHA512 1ae9318265f47232bac77ca966fbf7c2b1b7a1eb3c1070258812f697c633026527c411d2e2319f3c16a3318307cf1cd0983967ba0cf2cae1f9f37a607b6aa92e
 EBUILD rbs-1.2.1.ebuild 1188 BLAKE2B e6eb0b7b25631b6d65779d737381764d6a856d5aaf2369f695fd8d2330eb3f4f5edd67d5dc0becf79581b768f68df19c7420b5bb00cc12e7aa766b8d4f88036e SHA512 21a63c61d4078bbffbed89086551f649398609e1b655f8afc8ab78641a7a0dd978b9dfc37867e2d58ad42606549e90e6d68185ff5e6b4d8059175aec3bb77b30
 EBUILD rbs-1.3.3.ebuild 1188 BLAKE2B 9c309c9befa8e76e809c4aae1dc2f2e574293bc1ad273eafca746328fa185f25d4c566ec590e634422f9d7617fa9a28af622f790e2c8e6cada2f75891de75a09 SHA512 3a896d5c0a9723c5009a9271d7125f052660a52a2ba450721133d7546b3c00d8f5697d28191c6bc4aa4db1558f09f5593972d7ec663d6b44d5235021c1f70248
 EBUILD rbs-1.5.1.ebuild 1188 BLAKE2B 9c309c9befa8e76e809c4aae1dc2f2e574293bc1ad273eafca746328fa185f25d4c566ec590e634422f9d7617fa9a28af622f790e2c8e6cada2f75891de75a09 SHA512 3a896d5c0a9723c5009a9271d7125f052660a52a2ba450721133d7546b3c00d8f5697d28191c6bc4aa4db1558f09f5593972d7ec663d6b44d5235021c1f70248
 EBUILD rbs-2.2.2.ebuild 1861 BLAKE2B 0826e19c3e8f0f644337c6a597a527ce22fbb07c79919b8984960af2ae4bce04c1541a736272644a99c42b103f6589a249ab34f49ec242c7fe51904150aa3723 SHA512 25458bdf77249e63caa1c2fcc228716649086396c2662a4e769a3ece4374663afbab5c7046d83df21587f3c508a350acc06d49e5dd9e063d563891ab2816e1ee
 EBUILD rbs-2.3.1.ebuild 1861 BLAKE2B 0826e19c3e8f0f644337c6a597a527ce22fbb07c79919b8984960af2ae4bce04c1541a736272644a99c42b103f6589a249ab34f49ec242c7fe51904150aa3723 SHA512 25458bdf77249e63caa1c2fcc228716649086396c2662a4e769a3ece4374663afbab5c7046d83df21587f3c508a350acc06d49e5dd9e063d563891ab2816e1ee
+EBUILD rbs-2.3.2.ebuild 1861 BLAKE2B 0826e19c3e8f0f644337c6a597a527ce22fbb07c79919b8984960af2ae4bce04c1541a736272644a99c42b103f6589a249ab34f49ec242c7fe51904150aa3723 SHA512 25458bdf77249e63caa1c2fcc228716649086396c2662a4e769a3ece4374663afbab5c7046d83df21587f3c508a350acc06d49e5dd9e063d563891ab2816e1ee
 MISC metadata.xml 335 BLAKE2B 287ad52f77f7c62c6fa58fcdb9b1c1498cf39010ab26b6f98655beef9719ee5803844b1ab084788af70087e342a02806a8619a8dee472bf6d4d0b2ea54d2152f SHA512 75703ccbe3a15813f6fd3fca2489a9b39e586f59ff2cd89ec8d7a6293760a8789aed715565520f0f623746932bd756820eef960e45fea5f130d34cf4cd586cb5
diff --git a/dev-ruby/rbs/rbs-2.3.2.ebuild b/dev-ruby/rbs/rbs-2.3.2.ebuild
new file mode 100644
index 000000000000..0380669086c4
--- /dev/null
+++ b/dev-ruby/rbs/rbs-2.3.2.ebuild
@@ -0,0 +1,48 @@
+# 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="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
+RUBY_FAKEGEM_EXTENSIONS=(ext/rbs_extension/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
+HOMEPAGE="https://github.com/ruby/rbs"
+SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD 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_bdepend "test? ( dev-ruby/bundler dev-ruby/rdoc dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# We compile the extension directly
+	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
+
+	# Avoid JSON schema validation tests due to a large dependency stack
+	# that would be needed.
+	rm -f test/rbs/schema_test.rb || die
+
+	# Avoid setup tests since they require a lot of development dependencies.
+	rm -f test/rbs/test/runtime_test_test.rb || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/rbs/collection/installer_test.rb test/rbs/collection/collections_test.rb test/rbs/collection/config_test.rb || die
+	sed -i -e '/def test_collection_/aomit "Requires network"' test/rbs/cli_test.rb || die
+	sed -i -e '/def test_loading_from_rbs_collection/aomit "Requires network"' test/rbs/environment_loader_test.rb || die
+
+	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
+}
diff --git a/dev-ruby/rchardet/Manifest b/dev-ruby/rchardet/Manifest
index 49f7542d33b4..cb43687859ae 100644
--- a/dev-ruby/rchardet/Manifest
+++ b/dev-ruby/rchardet/Manifest
@@ -1,3 +1,3 @@
 DIST rchardet-1.8.0.tar.gz 1903004 BLAKE2B d5860bc17f3a9dae9d6194156f1707e833ec0c440992c7b933b2e4eaca6bbc01f9964bcd7eb1dd054ff633124b863a0b797103297d6d2ff75e6d13040aa0813c SHA512 419eac7d4d4fb4a9cbe102199b5767d826f968943da9dfbfd029d03603bede596fb59d9747e590447b6848ae42c733dd0efdea57140e03d92bdcbac317dd0c6f
-EBUILD rchardet-1.8.0.ebuild 721 BLAKE2B 8bc5e826eb7e12d52f32eedddc00a0ddefd14a854042e1795c1beb532f6bd3ce9b78dc46533d7697ae1019cc2ba5d5bd6189b0252082f1acc1f3bf4860f49de7 SHA512 95737bc6f7fb65337d3d878c4bcf7aa4df28b38d8cd53d6c1bf46621a0155d677daff203ba18bdd254347c67221bc0bc463412e1da10ccd6f400cbbbe7b7dda9
+EBUILD rchardet-1.8.0.ebuild 721 BLAKE2B c03bd74ccc884cc83efcbc928cc8084c39e00183c9f6a43046205963620643dd1709013ef56213d645b3f8e33e5b753687e39348b0aa0b8fbd18af9c90bb03c6 SHA512 fe5eaeffa3d8f7f8fea0dfa28629100deb180e7af2215bb3a5fc9de4daad91f12522459b9497967d61c5f126fb91ef03d4fa9e202f619e6026cb2c96985bf4fe
 MISC metadata.xml 344 BLAKE2B c041fafb01a4cf28777c1ae0e13432b524e8054942fa29b3cb5a501c0251695eae6ceedfd29a328412f4064fe5ee23d67f028231eea1bad002168b37708db653 SHA512 037a2787ca96f5c2ca87d6cc99dde303dd6f97b7152cbe9c8f2516a01228d693a8c4a955b9060b518e40b0fe014a85c1db657e6c74f12ab55f744850fe8a3007
diff --git a/dev-ruby/rchardet/rchardet-1.8.0.ebuild b/dev-ruby/rchardet/rchardet-1.8.0.ebuild
index a5d21dd0fdfd..f7406102881c 100644
--- a/dev-ruby/rchardet/rchardet-1.8.0.ebuild
+++ b/dev-ruby/rchardet/rchardet-1.8.0.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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="Readme.md"
 
diff --git a/dev-ruby/rdiscount/Manifest b/dev-ruby/rdiscount/Manifest
index 436f1c10b5bb..1a73ceff5f4a 100644
--- a/dev-ruby/rdiscount/Manifest
+++ b/dev-ruby/rdiscount/Manifest
@@ -1,3 +1,4 @@
 DIST rdiscount-2.2.0.2.gem 68096 BLAKE2B 91f67643103a46f3fc95f80191a85ce4c89bba6a83f7ed5542cc9ec1671628c6ac0543b206d87e2ffc469dc83139e5669ee7eb6713eba4116db19c071a15f402 SHA512 97a0fabb77238173f101298e4b4b6d4728b9e15cb7d3f14e7d1d978c44ab92dd89c2e02d0c15c0fa70a836eb54abca06b0027e26e5d87540bfe145c8527be3f7
 EBUILD rdiscount-2.2.0.2-r1.ebuild 1114 BLAKE2B df26b85c4cf30b6a4fc3693a091fce629a2afc73e8c3f5db4c8de85223c609f9a7ffcdd1922cd1fcaef36b252029fde67792e1e6cb45e612c431b89521498d31 SHA512 cf29664dfea2fcdc91250d4b4bb493f325e07068b2fc84c87c1ecdb53e7ca4b4af91d5a52bc517453b0a24bb5ede24ebf074f3a0478b3b0984502bb4cd7296ec
+EBUILD rdiscount-2.2.0.2-r2.ebuild 1118 BLAKE2B 723944f06b87e89ed2317d6145db5db8c34b080d5d9d554aa6dd11a1db9d23a78764fa694b20fc45feb73d41070d4637d8a5dffa06444b5da7cd5e41e9f0da55 SHA512 983556dd6ef7a5b90f55078d1ba2408ed19bb7cc277a79332d831666d560a7d27f016e48bc927e24f25f114d05e08ee4c3c1546d97f86cff0e4640a3df728509
 MISC metadata.xml 345 BLAKE2B 83db3067d2cf0eeb028bd4793935cb94fe99eb2bff345e02fce72c35613c5c14dc266a8b366a3b518f007b6310ddc3130b3ac1f9a3e52c4940d83bfd6eac1889 SHA512 b771eeb7ff43472f242114cec8f8b1e8dd09715e0b35c1095bfd7d61b1149ec32fc05ea7153704369a270bd267d42ae0e532fab16fc7e6ca11a4454800d72900
diff --git a/dev-ruby/rdiscount/rdiscount-2.2.0.2-r2.ebuild b/dev-ruby/rdiscount/rdiscount-2.2.0.2-r2.ebuild
new file mode 100644
index 000000000000..df2316ab35f4
--- /dev/null
+++ b/dev-ruby/rdiscount/rdiscount-2.2.0.2-r2.ebuild
@@ -0,0 +1,43 @@
+# 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_TEST="test:unit"
+
+RUBY_FAKEGEM_TASK_DOC="doc man"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implementation of John Gruber's Markdown"
+HOMEPAGE="https://github.com/rtomayko/rdiscount"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	# Hanna is broken for us and therefore we don't have it in portage.
+	sed -i -e 's/hanna/rdoc/' Rakefile || die
+
+	# Remove rule that will force a rebuild when running tests.
+	sed -i -e "/task 'test:unit' => \[:build\]/d" Rakefile || die
+
+	# Provide RUBY variable no longer provided by rake.
+	sed -i -e "1 iRUBY=${RUBY}" Rakefile || die
+
+	# Remove obsolete -rubygems argument, bug 775377
+	sed -i -e '/-rubygems/ s:^:#:' Rakefile || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/rdiscount.1
+}
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 454954257662..109e9ac57635 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -4,5 +4,5 @@ DIST rdoc-6.4.0.tar.gz 755741 BLAKE2B d2519dc0dac3fac32ef7cac8c87dba1a679f0b09dc
 EBUILD rdoc-6.3.2.ebuild 2665 BLAKE2B 2b86da2ce85a2d16fd031e0a548dbbbbf201456fe5bd21641ad47cc957551cd003c31b6a634feae8f0b969c17fac0a6e628926fe1eaad9ec89f0565013c0f9c2 SHA512 a12e1e0cd08a200ce239632767fe27a75df2151cddf6e90b4bff2749d07d760c6d89f8c01cce9c2f7f47619a06b14c254bea6bdfa738efb93e853c91cbf0624d
 EBUILD rdoc-6.3.3-r1.ebuild 2677 BLAKE2B 535ed5ccd6af7728f8bb0dd54b01b4c43ce946738a64a4f30aaf045577754cadf43818f1b68e9df073ad39442bd7bc1de53984a475c42def10aace1b71e0c0da SHA512 cc3c8038cbbe43c1da64ea2fbb464ec15e9c5add669ace5784511a2d594a7ead7b00f3a8230eadcb77d736e78dae7f7a2a56c348544f106ee20d842cd0f07efc
 EBUILD rdoc-6.3.3.ebuild 2666 BLAKE2B 5036dd007974670573ad57660f9d31579427cd5c0a269451ffdcfa562d0540c1837abf5b6ab750288087e9164b5fc97673aebdf1649d6d07e93f0b0dc1013642 SHA512 ae6f0df7c9b9175020114b5373a9c282f23064ec99de95e6fdf186a40203a62d1028d0fcbb3e9fdaa26a05190375a534557cff21f3b6d1ec61a69d8c7c0010ca
-EBUILD rdoc-6.4.0.ebuild 2730 BLAKE2B 43d69f90d087c52fad11bd8877e8e7a940466071a8169edc62568e19896e0bacc746fb8680f9f6bf2b92119c5285a4425400b950ae9a5f90396e130afae2eaa8 SHA512 7d57e94e452f2cb014f73b5a05f363a77f801d10850fcc678d1bcc563c1da83721f014d7305623f4e02d1b2883abbf6804c877366e4b418f6b41856f9b8b17d4
+EBUILD rdoc-6.4.0.ebuild 2737 BLAKE2B 13811440710024e7855654f65c8e83a684e026ea645e0d620f829e007324b183abd41128311ceba6e9a172da0075fb3e6e12360b655e2f7f445ae3434bb8eac8 SHA512 004fbec35350c6ae16aa3f5113de48c80a3078b004b83f3f5eab690e4797859ca225c5bb62cd79ee8d71150208ab5657fb1a66e33d7bf836c6992c24fa3a0e56
 MISC metadata.xml 336 BLAKE2B b8daecb4713060cf3c1258c47a4e0ad25bc1930b094dd07ade2613c0700b56779ade45609d6b57db16a51d6df8de7039913bcab318bba0d85e0ac5bba9d09e12 SHA512 bb8c15dcf12c2ead3e96c0c615beb7d11de3d2b9e49d21faf024b66f39d3720e0e969319897eb640f2bfb89006896fa5b0d4c9668c51ea2c4aff05a23d56241f
diff --git a/dev-ruby/rdoc/rdoc-6.4.0.ebuild b/dev-ruby/rdoc/rdoc-6.4.0.ebuild
index 719e3d967939..03aaa77dbfa2 100644
--- a/dev-ruby/rdoc/rdoc-6.4.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.4.0.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/ruby/rdoc/"
 SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby MIT"
-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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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="doc"
 
diff --git a/dev-ruby/rdtool/Manifest b/dev-ruby/rdtool/Manifest
index 18578d3f25c5..2e7f38251c9f 100644
--- a/dev-ruby/rdtool/Manifest
+++ b/dev-ruby/rdtool/Manifest
@@ -1,4 +1,4 @@
 AUX 50rdtool-gentoo.el 174 BLAKE2B 9480cb7873a3f12db0cfff40adb1bd18a5f5fb8c8249c24767631aa9f0f341237fb8c9ccd3cc720ddbe02c63b0d7846127706f7a25def3ca23e71716099e538c SHA512 77e893e6c9660b8a6cb2b8e7d1134867c4e9d38acbf11db4ee948f288b69dfe3a938ab0d37bca7b4b9da2f6ca27fa27e2d9c17629ef3c0d49797f65c036c472f
 DIST rdtool-0.6.38.gem 115712 BLAKE2B 037575dd890512ad1f88a4a04532b6c2b8ca6d5245cccaf7ab1b7f51fad971e449bf280bf5ffdb295f212d56add4e817fff5494b0bba011229cf54d2ed74e1aa SHA512 958e9066a8b3610eb1a78069e615c5bd672aa56b3b45669604b35cd094bb8ddc549d8f373d1ee53864c27a0aa7ee038101b3256c56b3b8ffe618f75a1a939bcd
-EBUILD rdtool-0.6.38-r3.ebuild 796 BLAKE2B 2f0ee2aec0fb8c7a4041e67759186c3e59be850c258fa745e97ee3db8ee74150840d140c598856523eff40d7a7da51aebbd5085b9cfd9286209d5e93c3dc2068 SHA512 cd5b412274f7dce953ef36ec32aef837da27a8e7c31b0d9b1abdfa106fbe89a1cc1f223a5f7a50ed8ecbdee3f29f6346e67814151b3e1de1936474a7677f909f
+EBUILD rdtool-0.6.38-r3.ebuild 803 BLAKE2B 02cda608e22171710f959c335184cf08a6a9332d69dd8ab6ef92775586f325f0e0fea82e8e991d1a4811bd6f12617434ac027325e468d195108307de337b339d SHA512 2073344fe6ded8a4e99ad71b066ee8f00bd80a91cccfb6bf2b03598f83ea8c1f38c3805294fd4b97c66f6c5768f76ce36d763e7d9e9750c1ab6f2136cca50259
 MISC metadata.xml 341 BLAKE2B c7869bdbb270ce39e061039cca7efd99b85ecfad0c14daf5f7dd236e8d489d23776b0f606c78a0a5608e7902976428612aca2c3e92bca7ad2b04805d6a3c80ad SHA512 acbcaeed327c0b86b7c46a3cc0f63da5956ae66d5ba356a8bdb3d2b96589c84c95b3961ba7663991dc82ff1861903b05ea004b314de6e4b651e32a7502380a9d
diff --git a/dev-ruby/rdtool/rdtool-0.6.38-r3.ebuild b/dev-ruby/rdtool/rdtool-0.6.38-r3.ebuild
index f2f37b8773d0..9bf91b04f87d 100644
--- a/dev-ruby/rdtool/rdtool-0.6.38-r3.ebuild
+++ b/dev-ruby/rdtool/rdtool-0.6.38-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="HISTORY README.*"
diff --git a/dev-ruby/recog/Manifest b/dev-ruby/recog/Manifest
index bd363897382a..da87b5c80944 100644
--- a/dev-ruby/recog/Manifest
+++ b/dev-ruby/recog/Manifest
@@ -1,5 +1,7 @@
 DIST recog-2.3.19.gem 343552 BLAKE2B bf5aa0e2c5e8d7a27b23f03250a3fa952dfa0ed5a2844596b00940fce2e1080ada009a46b5eeb2418845ea12f803580040fc3a3aa6871675efff1a8f4d5a4ade SHA512 f09a0ee2b4a7ecb7ca6b587a70e115e162fbca8a7a1736017305346ed03207de66f71711e78593ed242c63c3c8be9af2b341c2d06c08a6592fd3d8ecbdc60147
 DIST recog-2.3.20.gem 355328 BLAKE2B 0da5bc28ef7afa9f6e6e64911c6cc423b1667a06b9ce1cb234a89d05e3680c562796ed4701015b5621f6319c1516d5ff7c0e67bd1343bbe6464ce5982ebfdeb7 SHA512 ae247adc9dc342fb3277f4f231f5f827e470a74fea5e609ca53cd1dc9b48c5742a16433536271f4e686c1af31619cc1afd4255a41285ff18518f81f21433cef1
+DIST recog-2.3.23.gem 392704 BLAKE2B 6b7ccfa2921fb7d643531c66970e757a01478b3990bbb2d05687a5364ed8b57317d16d0b116c2175cf0e667b12ea7a978c947b73d04db16fbd1a9db651ba4abf SHA512 34cb222dbc25f5da0581cb85aa92a3e6fa67b9af9d0b7b99cb3e358b1be5d71a25f582a669a06f4cadd4b6ac464c7f3d2b3856c24d5ecea0d1d6027758905774
 EBUILD recog-2.3.19.ebuild 743 BLAKE2B bf211180aa7a2651db6f923e41c91dd0ee8bdd4eabd9c2485fa06f694c3bc2b4d01a13bbb44d8f4e565f46e504480de6f5a566e8b89cb21cbb57744cebf05a28 SHA512 fbf11002303a746fd65b14375441804cc5b87f9c4c30f1e53ee7c1c62ff0fe6b44c4365b7824bdb713d31e1e25d8260495f5661f5b2bbef3779271e5a6e7f94f
 EBUILD recog-2.3.20.ebuild 743 BLAKE2B bf211180aa7a2651db6f923e41c91dd0ee8bdd4eabd9c2485fa06f694c3bc2b4d01a13bbb44d8f4e565f46e504480de6f5a566e8b89cb21cbb57744cebf05a28 SHA512 fbf11002303a746fd65b14375441804cc5b87f9c4c30f1e53ee7c1c62ff0fe6b44c4365b7824bdb713d31e1e25d8260495f5661f5b2bbef3779271e5a6e7f94f
+EBUILD recog-2.3.23.ebuild 767 BLAKE2B 212b37b082da1e091fce75ee365fde003745e7ab39dbaba1d38dc09107f616e9ad1d763ecb70dc7e069e61ae18bcfa70169276e6488ec0756a01d323af88812a SHA512 b4a7ec10ba23133a850501a7159c06f88fe9eb7208f571302aca54bc4fb5e3d49e9b09ca1f838e761a170d7945b28276de3a5eeae3ade74be12691120e3a1402
 MISC metadata.xml 335 BLAKE2B a88a64b51ba2e191dcb9fea6c4ba7a289da93db9145aa354bab3a6d4a1d9c48750143109396373992eda45890b949c56005b766c93ce75d24252226d555105f6 SHA512 b1315778b13db2b967dd451e07501a41a01a9f135289c5fbfabe7027e23f05d884ed662999f5f54c9eec43e3d1e148e3671fb1df417c2282dc3b1efe3e2c2ee1
diff --git a/dev-ruby/recog/recog-2.3.23.ebuild b/dev-ruby/recog/recog-2.3.23.ebuild
new file mode 100644
index 000000000000..5e29a01e4058
--- /dev/null
+++ b/dev-ruby/recog/recog-2.3.23.ebuild
@@ -0,0 +1,37 @@
+# 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_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="xml"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pattern recognition for hosts, services, and content"
+HOMEPAGE="https://github.com/rapid7/recog"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/nokogiri"
+
+ruby_add_bdepend "test? (
+	dev-ruby/regexp_parser
+	dev-ruby/rspec:3
+	|| ( dev-util/aruba:2 dev-util/aruba:1 )
+	dev-util/cucumber
+)"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	ruby-ng_cucumber
+}
diff --git a/dev-ruby/red-colors/Manifest b/dev-ruby/red-colors/Manifest
index 9ce55d8d2465..2735ab590624 100644
--- a/dev-ruby/red-colors/Manifest
+++ b/dev-ruby/red-colors/Manifest
@@ -1,6 +1,3 @@
-DIST red-colors-0.2.0.gem 33280 BLAKE2B 8406d2f5ef8a5a7c852298c863916418803d1de350b1108cf9d9c1ce6bc946669f2f2872fb50adb453d31766bb45f0ab7bb92c8957063f01526f74664591615b SHA512 69db857bb53d97c628cd58e0a598a97810f359cf08ba81f463b61f206a6bccb49d95833ddb483cd93fa1c865763339768145e9efb138faad1c1e5bbfaf0ed68e
 DIST red-colors-0.3.0.gem 104448 BLAKE2B 46b99c755e745eadfc1af61c024df66d54b583c9fbad37522971d44ee42b1db9a5148529a37252ad50cdb276fee8e58aca2afdc190bac3098baa67857eac0d6a SHA512 baa05634213a46da968a42e478db097c5bc47187e61807a3b3c30b8109a0fae63d587e5a3227b5bca75b921304b9d5e24a5ba945361dd5eba1c25235889c2cf1
-EBUILD red-colors-0.2.0.ebuild 365 BLAKE2B 98736c5a30b9cd170f4dd7d39d41be8e21c0e4451510915003f42169cdab091049be8e3e19147f6c07526b0215f5f1f9f63c8db1e8a433233fdbae700be71b10 SHA512 49d30c36355cbfd71d51c26e434ad3a1d50cf689befc8bad682932a5e39de232b2c79b0864b67ed7379ce3d436f5f20687e0abb95a13e6cf075b8570ab0ca11a
-EBUILD red-colors-0.3.0-r1.ebuild 398 BLAKE2B 32fb90b84cdb0f57cbef5ee0cd50b28ea76c9f16c6d93e87fc94b96702987667d1135ead71832af9b3fc49dc505984440e9c9c4577546f902d7e4a08058c20c0 SHA512 f9fb977b7fa3f3e40eec0cbfbca7465f7b27adfe786d27e9cad95b7a4767a2c7e296cc6f369d35b4b7202accd83c5d8c960a8970ee6ef5fa412c17f61e1525cb
-EBUILD red-colors-0.3.0.ebuild 358 BLAKE2B 56d7835e7f79f4df208fc476867d9002d021dd644af5995a12009372b8a2c073313aa9537325babf021933e865b581012e45f90052bac7d64f59dfd4e01f840a SHA512 c0d7dc3a17a505af72ab5defb9116c363cdd76d8dcf9850843d35f40c5a47b5808b430111f41e55248c6c25f1e366334e78bde8b361a49d2a8315220fe990c71
+EBUILD red-colors-0.3.0-r1.ebuild 405 BLAKE2B 3cfc7a7c347fdd32d96ef32756bc361ed9192074213feb6619d4f607d34503145dcfb7d35e80184883846e0cfa62e377c8b45e2aee1af2402e72a4179186c73e SHA512 c5c3229c4ac3aef4fe8e08efddb07c2be65beb4a3678dfd21a256c5890b43354e495260a7986ed481c8bc39b74ecd3c24a50668a5e483232c39f484b13edbc25
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/red-colors/red-colors-0.2.0.ebuild b/dev-ruby/red-colors/red-colors-0.2.0.ebuild
deleted file mode 100644
index 653695523929..000000000000
--- a/dev-ruby/red-colors/red-colors-0.2.0.ebuild
+++ /dev/null
@@ -1,19 +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="Color features for Ruby"
-HOMEPAGE="https://github.com/red-data-tools/red-colors"
-
-IUSE=""
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/dev-ruby/red-colors/red-colors-0.3.0-r1.ebuild b/dev-ruby/red-colors/red-colors-0.3.0-r1.ebuild
index bb0d8514dd02..09c203b5d5e0 100644
--- a/dev-ruby/red-colors/red-colors-0.3.0-r1.ebuild
+++ b/dev-ruby/red-colors/red-colors-0.3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_EXTRAINSTALL="data"
diff --git a/dev-ruby/red-colors/red-colors-0.3.0.ebuild b/dev-ruby/red-colors/red-colors-0.3.0.ebuild
deleted file mode 100644
index 8687d92ee692..000000000000
--- a/dev-ruby/red-colors/red-colors-0.3.0.ebuild
+++ /dev/null
@@ -1,19 +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_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Color features for Ruby"
-HOMEPAGE="https://github.com/red-data-tools/red-colors"
-
-IUSE=""
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/dev-ruby/redcarpet/Manifest b/dev-ruby/redcarpet/Manifest
index c2f734000c8c..198fa53e9129 100644
--- a/dev-ruby/redcarpet/Manifest
+++ b/dev-ruby/redcarpet/Manifest
@@ -1,4 +1,4 @@
 DIST redcarpet-3.5.1.tar.gz 106950 BLAKE2B 2f84e0dbadaa79827d9d244988b19161996e249e493208b20b6339f0eccf73160fe84d79f11a23419573693bbc9c1faae61e690ffe5ec133f8a0baddb69d92b5 SHA512 348ee8fc56b89bb1b9fe0b004cab08e9542f3806a885fb5fb0ff58c9a0fa704ad37611484e071951ad00d1d337988d5dae6d240cd65df890f8fe0865e242608d
-EBUILD redcarpet-3.5.1-r1.ebuild 908 BLAKE2B b721525178062f672e6085e16692fbe8fff9de2b53af5478f63cdf96c12a6178ba35c81e5b2f74f827bf7946ae96a3c2e5933d8dd7db9bc87ba29973698690b0 SHA512 042beef927f38b918a7a135ba128492072e2c2645014a9171893d7bc09c8b1f4aa88080c9d3b8d53f815040c2b642e0c23af90cce91d5ccdf7e92fdfc4a346c9
+EBUILD redcarpet-3.5.1-r1.ebuild 914 BLAKE2B 26233bbdc199669473571f224fcc2456c52a828cba93737a311dced704436979a8b906bc010982928e0d45c7f0171f8728923b74e1ab0e5458ce0fd128c9b693 SHA512 2046d875377edb336b4923d584c18569a869f2637160553741324db6ea9a963aea05ff1fceb4e333275f6f974641454222384f76b529ac7f487712a7b70bc175
 EBUILD redcarpet-3.5.1.ebuild 1002 BLAKE2B 8b4a131b06417d79b2607b948fdbc43479b33b35afa254dd8ff68731e92277c699948aaf547315145d4232bd974599a6a18e3927bdd7797cd062b3e9a156d18c SHA512 52fdcbd6645c2ddbd5b57ecf097c6b49dcf6624b5a34b49f3ae60bfc75e8e79432ffb6706157476e2213bf600ca09239554e38517156319cbdbe37352514d9e2
 MISC metadata.xml 340 BLAKE2B 6ecd160f3358aa991ab52f178132bb246abc153b05448664b38685281b3dc29704b99324e33bce621cb11266b673dc67928df1e7ea8866c382c1611b25ed4168 SHA512 aead34aa25b18b54c3348282bd72f3ea5672dc49593f34c0e59ee8a10e5c6d2043dd2c24f7e9e4ad8086931b70f67c0e041d2e78c91fea25906a3adb68b83998
diff --git a/dev-ruby/redcarpet/redcarpet-3.5.1-r1.ebuild b/dev-ruby/redcarpet/redcarpet-3.5.1-r1.ebuild
index ee35650b4c1a..56f0828759b1 100644
--- a/dev-ruby/redcarpet/redcarpet-3.5.1-r1.ebuild
+++ b/dev-ruby/redcarpet/redcarpet-3.5.1-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/vmg/redcarpet"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/ref/Manifest b/dev-ruby/ref/Manifest
index e43a2f3249d4..4ed2e21731e4 100644
--- a/dev-ruby/ref/Manifest
+++ b/dev-ruby/ref/Manifest
@@ -1,3 +1,3 @@
 DIST ref-2.0.0.tar.gz 19043 BLAKE2B b5e90630451c8f6682c572f5115b8a3960a731197eff45963f2e0a538a74cf51e666ced5ba9fd2899c96bce3a2191f091139733b04d6e9dba940d8099b5dc62c SHA512 4407111b3f8497016b1935d3804d0f7d2d1284d31922dc7d1dfb6c5dbfcb994050a46950b0874c3b8f29bde8ac0d35f2edf1dbc711dc5d654d0680b4f94a5baf
-EBUILD ref-2.0.0-r1.ebuild 639 BLAKE2B 1b6038dba18b7eecc3e15861a5c4a59fe360eb1c796d3bd66812e0c24f1573a9bb80532149cb6626e952eafad746a63e759a31149bc402d1e314c9b953f519a9 SHA512 5b800939c07aadcaecb69f48e4275776b53ba9a5f2b414a1ce504485bbeff8f4272884a542b91dfa449d8d803742ce8d2f4e67e78776bac180e8e1eab168d312
+EBUILD ref-2.0.0-r1.ebuild 646 BLAKE2B 1389e8483a0bb607c4e850ada78bc4c254796aff2ee676116f116e492f6dddc54343ebfb3691b90580ebf7effa2f9e2c58d8aae58c65eee990607e4a689e3a8e SHA512 285ccdbdff4b3ac0b63ef253a53ca949d1cf9d1cbaa0b55c41e895a74bf4e2eab2babbe02bce98b46a47b5b14cad2735591bc86dee2b187716e57ca78167c6ee
 MISC metadata.xml 347 BLAKE2B 143351fe1ad9913a8c37f1c0c4d7f46408b4c3a1fb9017ffa567190102a9774237dcfae3708c3999451b5614559c574694a118bfd7e9294b700f684f6a6773ac SHA512 19c5e2b4eb010ea052f4a863869bb6fd63ba289209c100c409e4b205166fba6c75085864829fa522d1524f76fd2c4fd2b1f07cd7da11d8ca5a39793282836a4f
diff --git a/dev-ruby/ref/ref-2.0.0-r1.ebuild b/dev-ruby/ref/ref-2.0.0-r1.ebuild
index 21dc98b1ef24..14a1786924b8 100644
--- a/dev-ruby/ref/ref-2.0.0-r1.ebuild
+++ b/dev-ruby/ref/ref-2.0.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index cd7daa7fbc25..f492728468e9 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -1,11 +1,11 @@
 DIST regexp_parser-0.5.0.tar.gz 80554 BLAKE2B 7890e6850e3ffbb927c5e72430ab29e6aeec4f8684eb56f4153414aca62702faa57f48887618e84b1d087e2ba366ec9d6b2e92200cc34472b7bbb5a8b0043415 SHA512 0d1c43fda01077b9b3d9c28ce9cb01772f10817e42d9c0ff28e6ea5cd059ad4869b940498c6a4e77d4fc6acb6ac0aba293ae67dd012650cdb58989b90868be16
 DIST regexp_parser-1.8.2.tar.gz 85592 BLAKE2B 55333dbf59606d1f203c84cc3e712ddba9551be492745f2a0ce9ca8ba56e9a6eb1aee0c9d3d5079114c65747746f6ef4df3cbbf5a917562f413ca3426fd16efc SHA512 8192ee4334d2da13af5552eccd4fed82b24ed57489e3e0d8d083e8cf72e52fa185c2e007e9adf1ec6e59b0cf4e4055eb8def28d5cc94cc7a9ab7981d14f8e727
-DIST regexp_parser-2.1.1.tar.gz 89399 BLAKE2B 7632b1e65e929f610e6bedc7954f81ca080f4f290794da617dbaeaae324186581a6e0ab78fb8d7311c33876b8cce090fdb6d4b868eeb80b82fa8461da5d82bfe SHA512 809b8c5f7bcceb0c31e97256d5a40a04bb7919cfa0a139e972e90a72ba15eee6dce8ac1f8e65f5e8f7a5f992a2fab91d6ae19f27a1f5ec7795fcc082ff037e13
 DIST regexp_parser-2.2.1.tar.gz 90169 BLAKE2B dcfa392bc5dc9e08816b3a2e401744c775a8a5c60067c410d195d60ef155eba287b31243e70677f018e3d751b371a8878933a5e34c4bd5b00cef3bf1b266c00a SHA512 a3a6fbd36e980eaf5f14d0c98c2680aed700b01c7941fbc4e406e14992e432b3ce1510a8be9ef7964ddf0ab85c55b556206cdea36a336de98e6956942b4ff726
-DIST regexp_parser-2.3.0.tar.gz 92100 BLAKE2B d3d5315e4643e118f559cdfdc6f30c5fe2104298d4b0d297b4cc0b4cadcbd4b97fbc92eb454b9ca00c917e67d0099d8c50a747d76d51806506c8cc93d0e4d02e SHA512 d297d475897586d78c6678edb77077c2d562e59483b036f65ef1a550c2f2c28b9fc3c96b2a98d5726b58d2a061d6c65b72a48c1e1b3e2a5b7c3ea01543d22746
+DIST regexp_parser-2.3.1.tar.gz 92120 BLAKE2B e4dc8d3d38a260be0d21812703380af418ea6b87c1fff66048111e2d5295b04589cf3d838f3e9eb330f300c7b49c8ccb18867c6fac41e55c0c623cc0206d2c85 SHA512 3f2502afaaeeffe6738c0fa83717f93af22de8704a1ce3cfdae910be287a6bbbab5dcd80d9ce7fb840acabea8d55a0cb06bca1696820f5e568b75c96360c3895
+DIST regexp_parser-2.4.0.tar.gz 93162 BLAKE2B cab80ca22b1f34d60a47f7bb3f671e2a7af46b598250a0d1f85049b5b682800badf82c7f0cfc676808999d4128bd8b8a6d2bd073d8a771ee7c07253f1e24e5ce SHA512 cd7a9d5d3d4882753b47a8369a807b3c6d943e36a66d0001d51d5d37d19a46c2ba078217d95952f1dc7c7434699a35bbd6414cd45264db08a0173f887a8d4826
 EBUILD regexp_parser-0.5.0.ebuild 878 BLAKE2B 065940af48ce7c93836019f0a9325e04db4e0ff31f0e9af6a13a637e86ced811bb38cd9c70b971e244df857e1d40b2ed2049fc0321a82141c43478822cac8b04 SHA512 c91492b8ea59137258d941e79659f1f511621c0d7da8af6e6c13aefa39f5473c2881e0893b68a56b428ce8da9a135e20371e4d5e0c6d5fc6996e6a77af5c22e6
 EBUILD regexp_parser-1.8.2.ebuild 888 BLAKE2B 5908b7be2be373462cd50b9445e1b111490dc0291dd4b050c2e0015ab6c77ee845b5b8dc0e34c4b223737e983a259dfa46a5c43cc0b10f825f8bb170e5e3168b SHA512 6ae591ed9ffa40bb8440cd05cec581a9a5126a2fe85768a0805d2c2e5b152aef482426a18836d2076e5cef313ce96484c686ab982ddaeb7f2a6f038ff55498d5
-EBUILD regexp_parser-2.1.1-r1.ebuild 946 BLAKE2B 683f0d77bbee02522fd168211a25560bed02b1e33f423398563fff723cdd7f3fb5c5a9adf0a19dbf4c9e7d9b8b2a9483720811d57e6ca884786af06cb39c359f SHA512 a49ec1f818d626acaa4a845a0d40425952fb9cffc76db4d8459c60c63dd218820b96eee2488b318477c190d9326d98c8cafe53617451f8a9f123c49228043387
-EBUILD regexp_parser-2.2.1.ebuild 930 BLAKE2B 44546ea0275227e56f0e1eb8e737e6c87fa5781c78d45a00eabbfff0ccc74e66ea61fdfe23bd60847991f59c3fc9f5bb6154e14087ffe0016fd086fb06b9337e SHA512 fbfcff42736f02cba4e2886592d477514d22c79f1635cba81f69ad6c8adeba54c7537c47a6fa908c99f0152aed6ef978d4a6fbd6909987b722584f52f6b11bab
-EBUILD regexp_parser-2.3.0.ebuild 947 BLAKE2B 97e9f9bd11427029254af7882489c65f49bc70bc916d36d06b1c1cb5d0e9563478b55f4a5f84cb651d949b1f411b2f4d177b2547d5e0b248bef204eb7fe1c81a SHA512 c5f08700a0dc3f3861a607a7e5a66f3a4263c768c785be8d55be2dd6ff38a8a319b825fa8b6ad0cbc615e46024a0b940e3f8bd2f93eabfbf86483638d6613996
+EBUILD regexp_parser-2.2.1.ebuild 929 BLAKE2B 80a4d2a53a748853f0f1eaab7f4410882340873582ead2e7672cf065d092da04dd44a4d4d29726ee63a52679b484ae65453feadd6c204d575f21d8a2c2b84130 SHA512 1b92b93767984477481e8006b695ae4b7cc5428a1e9169899b6552050698dfcf66633119e183d20b62e256a504937076585098cc2fa80559eba9a8e0a3d3e0ab
+EBUILD regexp_parser-2.3.1.ebuild 947 BLAKE2B 97e9f9bd11427029254af7882489c65f49bc70bc916d36d06b1c1cb5d0e9563478b55f4a5f84cb651d949b1f411b2f4d177b2547d5e0b248bef204eb7fe1c81a SHA512 c5f08700a0dc3f3861a607a7e5a66f3a4263c768c785be8d55be2dd6ff38a8a319b825fa8b6ad0cbc615e46024a0b940e3f8bd2f93eabfbf86483638d6613996
+EBUILD regexp_parser-2.4.0.ebuild 947 BLAKE2B 97e9f9bd11427029254af7882489c65f49bc70bc916d36d06b1c1cb5d0e9563478b55f4a5f84cb651d949b1f411b2f4d177b2547d5e0b248bef204eb7fe1c81a SHA512 c5f08700a0dc3f3861a607a7e5a66f3a4263c768c785be8d55be2dd6ff38a8a319b825fa8b6ad0cbc615e46024a0b940e3f8bd2f93eabfbf86483638d6613996
 MISC metadata.xml 346 BLAKE2B 91c8aefa1a1d1f9f8b70a36b65524b8e9bc41fb22d7e411e1501d74dde8abdf1fec981340832046edce885ee296cf1beea48fa57678bb5af2c39f957670a5f82 SHA512 15b3c9a8a7fdbbd2f782308687f6551cb626732c0858c2cc88640b8ac2246e453667dfe6e12ff3547c2d7e267304cfdf70fe913ade8d802c321a3df12b699a6a
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.2.1.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.2.1.ebuild
index 55ec1ab44c5b..44e9c4376318 100644
--- a/dev-ruby/regexp_parser/regexp_parser-2.2.1.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-2.2.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.3.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.3.1.ebuild
index 6f59b303702a..6f59b303702a 100644
--- a/dev-ruby/regexp_parser/regexp_parser-2.3.0.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-2.3.1.ebuild
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.4.0.ebuild
index 747700c45c47..6f59b303702a 100644
--- a/dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-2.4.0.ebuild
@@ -1,10 +1,11 @@
-# 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="ruby25 ruby26 ruby27 ruby30"
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_BINWRAP=""
 
@@ -23,7 +24,7 @@ IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
 
-ruby_add_bdepend "dev-ruby/rake
+ruby_add_bdepend "dev-ruby/rake dev-ruby/rspec:3
 	test? ( dev-ruby/ice_nine dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
 
 all_ruby_prepare() {
@@ -33,7 +34,3 @@ all_ruby_prepare() {
 each_ruby_compile() {
 	${RUBY} -S rake ragel:rb || die
 }
-
-each_ruby_test() {
-	${RUBY} -S bin/test || die
-}
diff --git a/dev-ruby/rexical/Manifest b/dev-ruby/rexical/Manifest
index 2116b70ec1b5..49f875ecfaa6 100644
--- a/dev-ruby/rexical/Manifest
+++ b/dev-ruby/rexical/Manifest
@@ -1,4 +1,4 @@
 DIST rexical-1.0.7.gem 22016 BLAKE2B aaadf4131fbc4958a6a17be02b970070e511dcb031fd6432fb62fb841eff36b4d5c41d8f8f295aed4ac376c49e736e5d795166f71957578c6cbe14fd6cea26be SHA512 f71c86bd9764e65ebe0c66acd5446b5da7a1b38aae9d33367d70bfa253eb53c178634ce90c883c5459622219670d4d32f375b216c3023a3109329d6930dec1fc
-EBUILD rexical-1.0.7-r1.ebuild 1076 BLAKE2B f5a4b8a160f0ca4b0b1195fcca96a183a74016b3c859d703b77aadeeca51be8c66856391c0c21a4d3d489fb997e6bdc65fc14c82e1671f6a78af1ef43dfd28df SHA512 178b778c09060d9451d4617d586bbfcb807b73f2edb31cff940165016be59666e8fa7fc7c9cca5e8468296df63a4e57badaaa253944c89870308d0ff5b6a6785
+EBUILD rexical-1.0.7-r1.ebuild 1083 BLAKE2B 5d7415211d59446835f966b14cbd9a267b2af2d2ab2ba004d39efdc4adbed18c28af216d7d1b894c52e75bd7ce83dc628dd599cab0fe6df9a057b710c6413fac SHA512 684938bccf911a10f3d8ab84a816df86c1b328a2b65a274121b437bf3ce690429b9e06ccfba09d17591f60f49971c187d694df297b62a5cf62b0a54ad5540814
 EBUILD rexical-1.0.7.ebuild 986 BLAKE2B 538638fe99060773105561b56ffa6a473d731adcb52ea7082103554b1597ad4410e3ebcf7cf26ab30ba5ed1c59f0e5d02324c45251f4ffc84e2ccb7b61e95bdb SHA512 9092969b0fbe1d9867b4d00c6954c4889ad21d3b3245f327080877070949e815f20e496cd69e6a73e75d8bef24121a5333c3f49d0a2bbf19984af21fdaafe6e8
 MISC metadata.xml 345 BLAKE2B 6a09a3ec53d7053b7163d9a37cced813706557fed9bfbc0afdd446edf0427e559671db7d76ce42b548a1a385310826ebf88532e0431a8243606c9dc678e934bd SHA512 a5c493b94049a4084ebfe55c88cf22a3dcb337e65f08b98a3a37c453787ca6864a70a25fe40f744bac81b724d64e781aab1ac2757d1cd63f8e91d2ced8961061
diff --git a/dev-ruby/rexical/rexical-1.0.7-r1.ebuild b/dev-ruby/rexical/rexical-1.0.7-r1.ebuild
index 097ddac4f886..b8600afdc55d 100644
--- a/dev-ruby/rexical/rexical-1.0.7-r1.ebuild
+++ b/dev-ruby/rexical/rexical-1.0.7-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Rexical is a lexical scanner generator"
 HOMEPAGE="https://github.com/tenderlove/rexical/tree/master"
 LICENSE="LGPL-2" # plus exception
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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=""
 
diff --git a/dev-ruby/rexml/Manifest b/dev-ruby/rexml/Manifest
index c54a745a3ba0..061d9a94130c 100644
--- a/dev-ruby/rexml/Manifest
+++ b/dev-ruby/rexml/Manifest
@@ -1,4 +1,4 @@
 DIST rexml-3.2.5.tar.gz 447881 BLAKE2B 4b922d51f9331ae17c2deaf3c617fbb6130b111ec0fe27892e524b89f298c3b962e64ab276b71213f3482c0a480b52cf71b3866aacc45fd6de82589baff81354 SHA512 9c62b789988b407bf4b02906768300b256734bfa342ef6b3551428ba2c1792b7e7e5a5480251d7df52318a5e5155757ab1377c0cc8d1d7c33278f33e367a5ca5
-EBUILD rexml-3.2.5-r1.ebuild 879 BLAKE2B eb8515614a67fffd864431f5e5378009258d046722359417bd5e635d631de69add8eb52cc8ea141d44fcfa82e6451dbcf67ed6f027e49e7405299ceaf963b34e SHA512 7bab1ab26b74fdf67e55d1ecf9216c84136c871774505c7f5dc949991f9ab37d9da0bba1ac77d4502e86daa715bd131c09cf980dabfc70acf5e8f605ffd29a74
+EBUILD rexml-3.2.5-r1.ebuild 886 BLAKE2B 4905535bbcbed0ae469f526ad51b174cb09665756808f44b0c00bedd1db51cc6e2ca041518370c67ae5eddda3c0cfd9cdd75d73bc4ed0f58a42552c8c33055ad SHA512 01b89cdfa0ab468b6f8b2eee781b1d4bfac1ca5c30060b82d5f70c6ea4d5ae19ee135f4aee6d4c0596682911ca88bd7338e2cc4e60ca4feba54db24725f8e2b0
 EBUILD rexml-3.2.5.ebuild 878 BLAKE2B c179e47e33e631650806b40af49f26a0d7c77c4f81b164550f54f181452c457d32f1dd50ed7e5e18d2e16deee7b5be51e9e203b1339bc4a6047eee3a18eb8b12 SHA512 59aaea04f2670b707a1df27424dec4d74888fd9fa3264bbc6d744d3801534b227e161a36a621d6d22f052ea7ef805242d074796ee531a6c8d077993c15170306
 MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
diff --git a/dev-ruby/rexml/rexml-3.2.5-r1.ebuild b/dev-ruby/rexml/rexml-3.2.5-r1.ebuild
index 1f937256f3eb..7fbbb382746d 100644
--- a/dev-ruby/rexml/rexml-3.2.5-r1.ebuild
+++ b/dev-ruby/rexml/rexml-3.2.5-r1.ebuild
@@ -18,7 +18,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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() {
diff --git a/dev-ruby/rinku/Manifest b/dev-ruby/rinku/Manifest
index cdb70af3f242..3c9d0fc6683c 100644
--- a/dev-ruby/rinku/Manifest
+++ b/dev-ruby/rinku/Manifest
@@ -1,3 +1,3 @@
 DIST rinku-2.0.6.gem 22016 BLAKE2B 9ba678996110a219e4a5121879597f5024c5bfe475af187d9557092ac871f16528e473b41d20742847127b9c7ae665b91e5db7b9aab42dddd32e2a51f20815bb SHA512 5acb6de775e050a92c7b1040af52c5399b3fea654f7569d58aa1b5db10e4f17a2e1ae7ecc05f3753be4e18bbdf63ccd8e62d4060c0c6693981c8bab7115b2ff7
-EBUILD rinku-2.0.6-r1.ebuild 574 BLAKE2B b2e7a3aa89e0d9c64c70b14958d177a5432b6664ad507bf46080015c666c35d4110f8781023bc0ab960615a2467ffd8e2a3931c6c9d00f5e7881e0907383307b SHA512 2efc97c8eef4ec3a1457ff8466abfd48d47d349fe6b3639fa95096cf1e3d617c3ecbe66eedf07c4c3c448b29ff2d82b4a117f12a1b987fb5dc69726b813db682
+EBUILD rinku-2.0.6-r1.ebuild 572 BLAKE2B a06eace0630f1b1bba06221b06b798d600a729532082369a6ab065eaf473e6090a5833e04c1dafafa24d6f7ae78b0ec8b2c549d6c740131165d80eabb120f628 SHA512 a59545863ebb934a5de7f04e78c583912c2ba717b5e1ae3a5593270b8d9988e136881049d75412dc986abf05eee782441ac22b86943c54a4a309ad04f7c108c0
 MISC metadata.xml 336 BLAKE2B fbd4d7ea287bc4204c2c8d679890d271ef296f9aef5b503bc20a7dc233230f66223b95a8f0fe456de2d3bc0ea4859ef52522b4cddc18a08d1d9b200b223a69a7 SHA512 0315782f357c588c64d305d9979608425d91737d3054aed0bbb889eddb7bbe161d88084634e437550beb09649df3f2609dfac767596456a64edbceb35c1b892e
diff --git a/dev-ruby/rinku/rinku-2.0.6-r1.ebuild b/dev-ruby/rinku/rinku-2.0.6-r1.ebuild
index c1d308f07202..65624155dc1c 100644
--- a/dev-ruby/rinku/rinku-2.0.6-r1.ebuild
+++ b/dev-ruby/rinku/rinku-2.0.6-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
 
 RUBY_FAKEGEM_EXTENSIONS=(ext/rinku/extconf.rb)
 
-inherit multilib ruby-fakegem
+inherit ruby-fakegem
 
 DESCRIPTION="A Ruby library that does autolinking"
 HOMEPAGE="https://github.com/vmg/rinku"
diff --git a/dev-ruby/ritex/Manifest b/dev-ruby/ritex/Manifest
index bdac1a6f9228..dd8c937b9c22 100644
--- a/dev-ruby/ritex/Manifest
+++ b/dev-ruby/ritex/Manifest
@@ -1,3 +1,3 @@
 DIST ritex-1.0.1.gem 27136 BLAKE2B a336f795f449b9f16d2e10fe1d866d11aa7b96d1800e157e410bd5a94ae018a4706506e4b27ff642281049ec36c4fb70ac45d5a20f59f50fdefcdb3398e1336e SHA512 dd3d13f1fabd6b7c218642b703e2426385ae14a5a5dabfa1d78ff163df0bdfeb38e9a68dd7ba2b1bdb68b122f7b5631c399f23a13fde5aac56159349c2f1de4e
-EBUILD ritex-1.0.1-r1.ebuild 701 BLAKE2B ce368a392894fe2f71cb95c9d9d645b38f0d2f9e6ba68a1dbb912fe9b260170ff06fb421f8d51cd4c828f9a25105fb7100c3bc336044b5958a66fd18057c6a65 SHA512 c8f1c22fba139a8641cb3a14dc66d523b9298ab201b1295a38415d5dfe3fcb3596cb87263a930d383ba9d1c6a7f5bdf03cf3a3d1add849729ee9062cbb82a279
+EBUILD ritex-1.0.1-r1.ebuild 708 BLAKE2B 49500e5f0a66adaedbf1c279228a0a12d82c3dbe0900ea87337b3de5668c2f01a90708933ed58b63fc25150723d99600dfd6aef8872d679a4cd263f88270ab38 SHA512 23f62ad739d195c9963b1e4cee7b25e9a654b30c056b5b02a12a1b432a52300e39bcd06b84ec3f08ffd1177e5f7751c56a818c98657344ae09c66f681284bc9f
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/ritex/ritex-1.0.1-r1.ebuild b/dev-ruby/ritex/ritex-1.0.1-r1.ebuild
index 953a40394717..b7ddb95e158f 100644
--- a/dev-ruby/ritex/ritex-1.0.1-r1.ebuild
+++ b/dev-ruby/ritex/ritex-1.0.1-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README ReleaseNotes"
diff --git a/dev-ruby/rkelly-remix/Manifest b/dev-ruby/rkelly-remix/Manifest
index 0ef8a681b5ab..8af4871bbb0c 100644
--- a/dev-ruby/rkelly-remix/Manifest
+++ b/dev-ruby/rkelly-remix/Manifest
@@ -1,3 +1,3 @@
 DIST rkelly-remix-0.0.7.gem 69632 BLAKE2B 5da7c29c13e34d319a0ef69251d1a80ea78a20ed3142e6add368c90ac05760b31257bcba8728cd8d115cffbb9d0622292191efc0b5a4eb1b56b5781fb80a9fc1 SHA512 5450b4b52b912b6626fcac3e3428dd2b4520dcb62b402e36579c9b34e8a027853e53a0860f33b4efc995517d70a3fab4f75f28ce7ab0b2b0c9e09e72ddd7cd54
-EBUILD rkelly-remix-0.0.7-r1.ebuild 438 BLAKE2B 60196d2701ad9e0c4c2f4917e2500ec0807cb3215f1bf333e3a393538e8b3290f34690dfad7619a0956068104b94d168b37abaf7a6ad813801d3b8a3d83e3624 SHA512 4a5b25d1fde2e7b13d8ac30d28a8b7389a82d84c03c7f21e5a6e16eba6cdcb7c0fc4e0cd9f8e173432f0c453f0933ad5cf9d2392d00c9691008c7064dd263aa0
+EBUILD rkelly-remix-0.0.7-r1.ebuild 445 BLAKE2B 79a3fea51a8e024b766243854b4dc2ad76a2413d960517365a8811c8ce4e6f66a4480d0dbf500d56e9f088e2b293dac1471ad3285c80cb8a2de2cb1163cbed1f SHA512 bc959bab6a465bca2b5b452c5c92fa3ef1979bfa596b5b3b88edab026cf2e5f2ba9867e6393b77ac26440c892d4586394f64f406dab94b807e04a8f1debe1ef8
 MISC metadata.xml 458 BLAKE2B 1be95c4006de1de518ef0071d52e8ebc8efafe5f5de34bbdb81be841b4150bf43d6c60abbf1df9bb9786587f61ef05a5fe33b0392c851c9dea7bd4b2071f9cad SHA512 73738a7549c8d25d0e5bc22c7592ce5be91451220108cd83d1c9016469a365026074901c5f84a4bcf5d15bf4a78242b93ebeac969c4802748a0fa98be2702098
diff --git a/dev-ruby/rkelly-remix/rkelly-remix-0.0.7-r1.ebuild b/dev-ruby/rkelly-remix/rkelly-remix-0.0.7-r1.ebuild
index ab8dfa4bf714..a40f6b8941f1 100644
--- a/dev-ruby/rkelly-remix/rkelly-remix-0.0.7-r1.ebuild
+++ b/dev-ruby/rkelly-remix/rkelly-remix-0.0.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index c42e726698e9..2dbc802e476a 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,7 +1,10 @@
+AUX rmagick-4.2.5-empty-rpath.patch 1290 BLAKE2B a50b127e7570b86c6952066306d734dca816ec5390107c8466921d02292fe5eb886b5e90af0fbc1cf74d92ccd55d46afc8c409693551872c0a810ca50bcea21b SHA512 ffe4fdd582057b281a42497a78f09df523b5604a13b301db04481c2138b8c4ce6f62da61ec1f94f0134fdfe0ad664005f7fca70f6c0193167a12e1778ae2f093
 DIST rmagick-4.2.2.tar.gz 1984143 BLAKE2B 8b8119a0002c48f3a289f72d4bbea6ac86cbecb287b34ddc14ca126fd2d951a34aefa39d68603dc4c9de674d346e47ef9e3b2c8ed96a5bc081373a4184a3ec40 SHA512 0a6a30a631786ea310d2c8add297abd527588be755d021143d6c64fbb597006aefef859c374604f8d26b0f8b1f6cd8a5f1cdd6489772ee713c71681f3980c7fd
 DIST rmagick-4.2.3.tar.gz 1984440 BLAKE2B 32dea4b8ed7d2385537ac5d67d48e3431e3f398c146b01308cc44ab6b4ad5e851292c22e373307bd2193a299f94a2a2f91b0a7d534825990cc5e1458a9efff7d SHA512 3465afc5c9a93e45511463b1f7eda00fd243f17041cf52b5cb54ceb05ff22cb6e23ea2b15d080ae31bca5daebdd92c28364ada73ea0cf6ea56cb1ec5fe1aa184
 DIST rmagick-4.2.4.tar.gz 1984584 BLAKE2B 8f3a737b851e16e16b6b010ea9f76ae14715661630eb877ca4204a71d67603967e5ca4eebdb9d8dea4caa880d049b78f525b6596feea9f866d7396fc550fb410 SHA512 89d5b616b6ce5187ac31356c44abea23aab0054e08ed00d390e3c74d1cdca421bc1ceb6708e5434858f3194756bf14b445d1331216480be5f8c072f65a889198
+DIST rmagick-4.2.5.tar.gz 1984865 BLAKE2B 5a96967da0583ca6d16252fd3e93162cc31b4b125875e16334436c2ec54cb9b739d4a0e0e08547a6218312ce844b3b78cca5f63cf4b81ae3f15abbf9816ceac8 SHA512 55835e43bf583c6c53431849caa54900902d0d63f21c7f70b0bdbcfbe69d16a71d433d1d9b949bf68ed36f6fc7f18ae512f0e96c26ff1c63a68bbc83446b52d8
 EBUILD rmagick-4.2.2.ebuild 2350 BLAKE2B 2fabcd5effb838935edaa22c252a54ea267c26e68b7fad78967346d55e80e79a89d428312d4b7b7d0a203021031d9f237dc8079652b19528bbbfd54fc94b5dbb SHA512 f428cb34408b52bec1439c1d90028e9a33b19d9836d511fac9ef2bc9b4282de50626680afe99dafee75a1d6ab7c0c2ea227baef89721483327e21b3e16d1baef
 EBUILD rmagick-4.2.3.ebuild 2340 BLAKE2B 1bac92c24b306db87e398e2afe4c484323be64c498b020204b97bb2caeec09acbbf2d214e8f418835182c8aa41871b6f35959c289a9814056629011241d15fd2 SHA512 d60a5c78b45c2693f645d54b2174b58f50f9eb6e41aa6d936dd812cc6103e5726cd51ede59f36623d91ecf53e92188c01a65e86a44afdcc98484f5a72cb314ad
 EBUILD rmagick-4.2.4.ebuild 2340 BLAKE2B 1bac92c24b306db87e398e2afe4c484323be64c498b020204b97bb2caeec09acbbf2d214e8f418835182c8aa41871b6f35959c289a9814056629011241d15fd2 SHA512 d60a5c78b45c2693f645d54b2174b58f50f9eb6e41aa6d936dd812cc6103e5726cd51ede59f36623d91ecf53e92188c01a65e86a44afdcc98484f5a72cb314ad
+EBUILD rmagick-4.2.5.ebuild 2397 BLAKE2B c96e5b2bd6f01e5387dc93545fd3cf2340aa85f338482127759463d460ff3f4bf9d0250375e6a3bd94f98c5b49e29fa88253877a68f27d9df353a815f6c694c0 SHA512 4078656f82b24e6043f43a9be35cd65f21b5048e35e53e5f1790c4ae7776ea08ef5a7499ffa9af58239305b3e02228daae79c94cf9e5504655764c99e0af00c0
 MISC metadata.xml 342 BLAKE2B cb38f3f9a158134520f82cef13b3322af5ebbe3b638bf695077e17406d754643ced9878aa304424057f0fd63da296efb787b40f5249d02e0d5993e2815256c00 SHA512 014d14485664346a449dff7c9a0c01bd1f6c549a6842da456bcb10c4f0b38111ccb025a8507f222e756cd4d136de6a217689e0ac807cf7fd0e3f806a6069fd28
diff --git a/dev-ruby/rmagick/files/rmagick-4.2.5-empty-rpath.patch b/dev-ruby/rmagick/files/rmagick-4.2.5-empty-rpath.patch
new file mode 100644
index 000000000000..13defdd24099
--- /dev/null
+++ b/dev-ruby/rmagick/files/rmagick-4.2.5-empty-rpath.patch
@@ -0,0 +1,30 @@
+commit fef59858eaba843b876c5b5f253f623ddb4d0f1c
+Author: Hans de Graaff <hans@degraaff.org>
+Date:   Sat Apr 23 08:54:42 2022 +0200
+
+    Guard against an empty rpath
+    
+    Some ImageMagick installations (e.g. on Gentoo Linux when installed
+    with the package manager) don't return any -L options in pkg-config.
+    Including an empty rpath is a security risk and should be avoided.
+    
+    Fixes #1332
+
+diff --git a/ext/RMagick/extconf.rb b/ext/RMagick/extconf.rb
+index 7b4ce1ad..3eef6cbd 100644
+--- a/ext/RMagick/extconf.rb
++++ b/ext/RMagick/extconf.rb
+@@ -69,11 +69,12 @@ module RMagick
+ 
+         libdir  = `pkg-config --libs-only-L #{$magick_package}`.chomp.sub('-L', '')
+         ldflags = "#{ENV['LDFLAGS']} " + `pkg-config --libs #{$magick_package}`.chomp
++        rpath   = libdir.empty? ? '' : "-Wl,-rpath,#{libdir}"
+ 
+         # Save flags
+         $CPPFLAGS   = "#{ENV['CPPFLAGS']} " + `pkg-config --cflags #{$magick_package}`.chomp
+         $LOCAL_LIBS = "#{ENV['LIBS']} "     + `pkg-config --libs #{$magick_package}`.chomp
+-        $LDFLAGS    = "#{ldflags} -Wl,-rpath,#{libdir}"
++        $LDFLAGS    = "#{ldflags} #{rpath}"
+ 
+         unless try_link("int main() { }")
+           # if linker does not recognizes '-Wl,-rpath,somewhere' option, it revert to original option
diff --git a/dev-ruby/rmagick/rmagick-4.2.5.ebuild b/dev-ruby/rmagick/rmagick-4.2.5.ebuild
new file mode 100644
index 000000000000..9bb20e982c14
--- /dev/null
+++ b/dev-ruby/rmagick/rmagick-4.2.5.ebuild
@@ -0,0 +1,84 @@
+# 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="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rmagick.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/RMagick/extconf.rb)
+
+MY_PV=RMagick_${PV//\./-}
+
+inherit ruby-fakegem
+
+DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
+HOMEPAGE="https://github.com/rmagick/rmagick"
+SRC_URI="https://github.com/rmagick/rmagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="rmagick-${MY_PV}"
+
+LICENSE="Artistic"
+SLOT="4"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND+=" >=media-gfx/imagemagick-6.9.0:="
+DEPEND+=" test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,lcms,postscript,tiff,webp] )"
+
+PATCHES=( "${FILESDIR}/${P}-empty-rpath.patch" )
+
+all_ruby_prepare() {
+	# Avoid unused dependency on rake-compiler. This also avoids an
+	# extra compile during tests.
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/end/ s:^:#:' \
+		-e '/compile/ s:^:#:' Rakefile || die
+	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Squelch harmless warning about imagemagick installation.
+	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
+
+	# Reading PDFs is not allowed by the default Gentoo security policy for imagemagick
+	#sed -i -e '/can read PDF file/askip "Not allowed by Gentoo security policy"' spec/rmagick/image/read_spec.rb || die
+
+	# Update version number hardcoded in tests
+	sed -i -e 's/"7.0"/"7.1"/' spec/rmagick/image/channel_mean_spec.rb || die
+
+	# Create directory used for a test
+	mkdir tmp
+}
+
+each_ruby_test() {
+	# Borrowed from media-gfx/gscan2pdf
+	# Needed to avoid test failures on e.g. ppc, bug #815856
+	# (Unclear why it doesn't manifest on amd64 here at least)
+	local confdir="${HOME}/.config/ImageMagick"
+	mkdir -p "${confdir}" || die
+	cat > "${confdir}/policy.xml" <<-EOT || die
+		<policymap>
+			<policy domain="coder" rights="read|write" pattern="PDF" />
+			<policy domain="coder" rights="read" pattern="PS" />
+		</policymap>
+	EOT
+
+	RSPEC_VERSION="3" ruby-ng_rspec
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+
+	if use doc ; then
+		docinto .
+		dodoc -r doc
+	fi
+}
diff --git a/dev-ruby/roadie-rails/Manifest b/dev-ruby/roadie-rails/Manifest
index 7a5453e40dcd..c20fe045ad46 100644
--- a/dev-ruby/roadie-rails/Manifest
+++ b/dev-ruby/roadie-rails/Manifest
@@ -5,5 +5,6 @@ DIST roadie-rails-3.0.0.tar.gz 62724 BLAKE2B d9e960f97a491724b80d3064304e4875b1a
 EBUILD roadie-rails-2.1.1.ebuild 1152 BLAKE2B 2f45b36d39da532391e21c071a8b163d34e5ef9b16f2a81a34bba365ce58e352ad29c07b25ea0defd2e7b1fa2a57e7d1d6496323aea58fa9fded841823d5b7fb SHA512 26bf371328d17e0966e57314a89662fb57783d5c8f42365a34adac82eea2db33faf1073a23095bfc50f8e107a592e2a86f94fa22ef08b1095d158c7d5b670077
 EBUILD roadie-rails-2.2.0.ebuild 1521 BLAKE2B 9583e05c5ade8d94d1cb781f6ae739abad31c60f42f4208be7c495f9a5ad64e97088e90cf186c9a4757ed7fe6f4b041e6e5a2646d9bb0842fe447ea8c3c8740b SHA512 12224ac81e3ee15951139ab6c5bea4fc8894b25b92a0a16d28685bf7bad07af85b32e8d59079ef56f9c39826cd0dd379ba16bfc3ccbfa22a3a8c6b22552527d5
 EBUILD roadie-rails-2.3.0.ebuild 1852 BLAKE2B 56a283a43b360fd22637163e93104cd2c99850fa3ac5fe9e527388302bbdd1ef97e1ac00a01e0f1364b35a8399d07acc4f3eec7558fb12bd9f7b0f87b44b0263 SHA512 73bee5b74f594e6030ddfbbedea6f4a7f0fbc06c972592795c1d1622c6ee0ac77216188066c6ba74a1c5a8dab01a7e906add158bca85e31e7d881cb7b9ac65e2
+EBUILD roadie-rails-3.0.0-r1.ebuild 1990 BLAKE2B 97f3856b81657192ea0ea17573d07d3897775d45e6f8e8be399babb45fdd618a9add822e88f6cf08cb530f0c7e9ab9dc917f1725fad707af01d3c656229cea6c SHA512 475344aa14376c1a3ce2084c515c69f7eadc23c48fdb3fffeebec7441aed401fda1e078dc94c4b4f4c9d72de9ada2cccbc1d5803222d863b9516673983556da6
 EBUILD roadie-rails-3.0.0.ebuild 1996 BLAKE2B 7a174a7633648a476c995a61774bd109404092bd5458dbde7782f95cbee541cb7363a24a19fffd7a108dc981db695e7d9ce9dcfbedc732696258d507fca9696e SHA512 69c8728da3ac852df38f66e2b12a1d5a3ffe211762c0a34294e8ddebd731cbe046507c6a61c8b679a0614257d1faa428f7595e53403114cb19af8429f74c76f4
 MISC metadata.xml 335 BLAKE2B 6ca09a61dab3b094b39d25ed398ddf94202e32c9173a7df990d8929cad1d19f12619c72f2cb69a735b2428c16c3e27183d3cc0efd213e419f6c4474264eb8a11 SHA512 f2b96e715dd1be8143e1562aeaf866198c9756af2137708a20b602831184e32e57056f9f9cc0e26001f2831c2764ce34510145879451ada4f37735796593bf4b
diff --git a/dev-ruby/roadie-rails/roadie-rails-3.0.0-r1.ebuild b/dev-ruby/roadie-rails/roadie-rails-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..8163df599dfb
--- /dev/null
+++ b/dev-ruby/roadie-rails/roadie-rails-3.0.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Hooks Roadie into your Rails application to help with email generation"
+HOMEPAGE="https://github.com/Mange/roadie-rails"
+SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend "dev-ruby/roadie:5
+	|| ( dev-ruby/railties:7.0 dev-ruby/railties:6.1 dev-ruby/railties:6.0 dev-ruby/railties:5.2 )"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		|| ( dev-ruby/rails:7.0 dev-ruby/rails:6.1 dev-ruby/rails:6.0 dev-ruby/rails:5.2 )
+		dev-ruby/rspec-rails
+		dev-ruby/rspec-collection_matchers
+		dev-ruby/sass-rails )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(simplecov\|standard\)/ s:^:#:' Gemfile || die
+	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid already removed rails version
+	sed -i -e '/rails_51/ s:^:#:' spec/integration_spec.rb || die
+
+	# Avoid dependency on optional bootsnap
+	sed -i -e '/bootsnap/ s:^:#:' spec/railsapps/rails_*/Gemfile spec/railsapps/rails_*/config/boot.rb || die
+
+	# Fix versioned sass-rails dependency
+	sed -i -e '/sass-rails/ s/>= 6/>=5/' spec/railsapps/*/Gemfile || die
+
+	# Revert https://github.com/Mange/roadie-rails/commit/03acd8fddf651d43919e92db35d541ec4281c5fc for now
+	# Fragile test which is affected by dependency versions (unclear which)
+	sed -e 's/cd95a25e70dfe61add5a96e11d3fee0f29e9ba2b05099723d57bba7dfa725c8a/322506f9917889126e81df2833a6eecdf2e394658d53dad347e9882dd4dbf28e/' \
+		-i spec/integration_spec.rb || die
+
+}
+
+each_ruby_prepare() {
+	sed -i -e '/run_in_app_context/ s:bin/rails:'${RUBY}' -S bin/rails:' spec/support/rails_app.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rspec-3 spec || die
+}
diff --git a/dev-ruby/robots/Manifest b/dev-ruby/robots/Manifest
index 9a0b559d161e..a76aeb758c73 100644
--- a/dev-ruby/robots/Manifest
+++ b/dev-ruby/robots/Manifest
@@ -1,3 +1,4 @@
 DIST robots-0.10.1.gem 10752 BLAKE2B 02c2ab5d6dcf5f861a4f290a0eac59f69083928183f79692de19e4909bb0bbfbedf718a083732b7ad5882192dca6be26c0272cac87117c61a74c53ea2b25c851 SHA512 57d5619e172961128c7e2f4175f299ecde28615680dc9fa2721ab86053515da46cae03b03dbdbf9a03a96387a361eefb013a7b3c3b3e61a26592ec4998d10bc5
 EBUILD robots-0.10.1-r2.ebuild 457 BLAKE2B 65d70c72a746e6f3e65731954a50f306d39404b096eda5bbdc6587510e74602d2d044321bc9cd2a2ce0ad7bdbb17c9d82b80c4ddf099bc3bf9d6eea0cecf1f78 SHA512 af96b8a1b568b697a60c521affc711685d3d51f88c8fc8a980a961fd1af0a5ca60f2ada7eb0a03aebbe1c834d73ef6ec24fff3427210b8e4ed3c7353047b2724
+EBUILD robots-0.10.1-r3.ebuild 457 BLAKE2B 15146ea7b6c1efe589089fd80b030920b5b78add1b7bbc9354bb547657db862e54dcc37f361055e620c74ae5755c2faa6c3bd3668ff3cd203ead8440fadda489 SHA512 0f838ea3d14f2b3ca7b28544ca6834bd6d3f290b1c7d582bc0dabe72e20eb761401ae8b2d097069649295f83581d52acfb1d0abb7ee1dad696dca093d2fddde8
 MISC metadata.xml 433 BLAKE2B a8dbc3425875ab7b8068868b6cc1a2980c2e559ce7507dc9ab4d2fcf3f46beea0b325d0d0236f24f353019ea0fe60a24b44ebded7e1191ce53d9ba58e27014fb SHA512 4d86e71802ed857575b4de6e043fbff1ee46f4ca08fb9c1d11ac410c59f0e1ad10f7533b6748433f243a7d1d06181de2c3a592f6f76b1acd0a046182c46bac69
diff --git a/dev-ruby/robots/robots-0.10.1-r3.ebuild b/dev-ruby/robots/robots-0.10.1-r3.ebuild
new file mode 100644
index 000000000000..d6175ebefe8b
--- /dev/null
+++ b/dev-ruby/robots/robots-0.10.1-r3.ebuild
@@ -0,0 +1,22 @@
+# 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="CHANGELOG README"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple Ruby library to parse robots.txt"
+HOMEPAGE="https://rubygems.org/gems/robots"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's:rake/rdoctask:rdoc/task:' Rakefile || die
+}
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index 74b180630a46..9db3369f4bae 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -5,5 +5,5 @@ DIST rouge-3.28.0.tar.gz 993680 BLAKE2B 38b360bc282887913e24e8ebd5463d792d03f55e
 EBUILD rouge-3.26.0.ebuild 977 BLAKE2B 7be79ad729709869c28fedbec40505327b663d4c5ce730c6b3e1a8414e0abe1a881182c8e5fc2086ddac05674f12843e0b1f4a5aa645501964bb2d48f6a3b379 SHA512 306244a572165afa6e545f93cc66df565c0eca65747750786d4172a9af8403d50be20d5c77ce278da2b2c308b61466fbec97c4dcaf5a9b401db3d11544a621d1
 EBUILD rouge-3.26.1.ebuild 988 BLAKE2B 2363e33d7a46117e8c8eec7c6ce85018e6fc5f9d82fe4b8e7e0d83d00e0d85370407e281f977bfab270a34e6ffd15b09a8b7a375590cd55e21ea83869657a1e5 SHA512 d6d2e20e3e83a247c92580c8c6d9a4ae9a2e1ec5236acc95f9c17c01a8c6f7cc71a2ea934558264ac25dd97f33322aa4d974898c09c04aa174257fb6a0ec77ea
 EBUILD rouge-3.27.0.ebuild 982 BLAKE2B 7763341d7109c7d99b851dd7f6a075bf98bbabb07d1461c8a86d7a30b5a583ea4e08abaee2a3f45e9a6383fcc8119b4c4562e794d63ae4db6132473d42c0bbfd SHA512 15c1cb36fefc4acbbb02c1018a9a639b97a1b09774470f20e88c2fd88bf18e97de5c7c0c6881260a024fff6b22e10c925220e5fed178a5383292406f2f16af13
-EBUILD rouge-3.28.0.ebuild 988 BLAKE2B 4347a8add9fbf7a4d32056e46e5349e0a0092019e06ecd110fa2175b9a69f5683874f82bb9217932fe4a957518ad1e8f0804b09654939a536db6e01447e40800 SHA512 e0fa75ec564c26a7953ca68331aef62f82cc2f4382994902f57465cb5743ee7aa5ed2c7212d76327d7489f87504fcd7ecd2afcf15b75252cdcc72359679ff11a
+EBUILD rouge-3.28.0.ebuild 994 BLAKE2B 5fa5e6bb1ea30c438b487934aa20e9e141eee7075b26c95a1543cd6a182b1056c2c305870eab0ea5c85b22786845c34b92a281a34aec58d7f2c904894eaa148b SHA512 56517c7d9f999def1b271a5b25ce875a87ce5d9bad3b441be04f7846a48f15e2bb9c20138f29de18c101591114d6191393e1cd9dabc329b5cdf5f9c53afa0bcb
 MISC metadata.xml 338 BLAKE2B b9a7ec25ef86f08524a092129330c037144a7316ef87b5afe7dd0f03788f7fa847eff2de644387def96ae8a360237605b8e782a01607c9783a7826486b2d5959 SHA512 8ad90512c84bd0a6bc94d2bd0a5b62424eb29fdadd65a1b31eed834d12b90a4a6f552b6906eed494cf0e531a07aa02e8a4db897968185f1095fd37811d613de1
diff --git a/dev-ruby/rouge/rouge-3.28.0.ebuild b/dev-ruby/rouge/rouge-3.28.0.ebuild
index 05bd8b392661..f5df182ee440 100644
--- a/dev-ruby/rouge/rouge-3.28.0.ebuild
+++ b/dev-ruby/rouge/rouge-3.28.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
diff --git a/dev-ruby/rqrcode/Manifest b/dev-ruby/rqrcode/Manifest
index e95918ff4d33..aa7e6ae8ecea 100644
--- a/dev-ruby/rqrcode/Manifest
+++ b/dev-ruby/rqrcode/Manifest
@@ -1,9 +1,5 @@
-DIST rqrcode-1.2.0.tar.gz 101432 BLAKE2B 98e7c6d98436d759e5d08575ca98fa292320545e69b63a06422bdeff9a64f5514d0d74c85c7c10941d334ea6168c3b392ac68c8aee19f0c58b6f7d3c125e13b2 SHA512 8a434c72fc43f04dfc92cd7cb6e0423cae94aa24d83a1a6015a170136f1aa3b010b652546b349f15f18e48c85b06a7260ae4babf19907955e0d1b4c2207e6ebc
-DIST rqrcode-2.0.0.tar.gz 107826 BLAKE2B 8b4e8b781fc0427f3bf8e9efa9463cd057019f76a691418aad60e9c5c787566ae44ba0da5d221a38c42809ebe3f78036bd44de87800201d03b394cd0ab3dd625 SHA512 4ef41ecea22187f1316c299ea1fe7ac52dcea0cc549458628247647905778fa1dc4b6301288225e892532976fd3e7a50fde46180f7d91ad146965f5a160ed84b
 DIST rqrcode-2.1.0.tar.gz 108317 BLAKE2B 4105929b5f63461ff7043b8a8ec0635f2c11b301f32de0fc25f1800449b105be707b82c4d5b21d5fb6a1b51bc015958ea9060af93a23adf3913994159d4ac918 SHA512 682999cab8a5eaa006992ea6b46d1fb52d5647c5c9faf8c9df9eb21d0985c8cb3f23c2692505293cdaacb63ce2bd042eeead7d779c598f708d10614934310da8
 DIST rqrcode-2.1.1.tar.gz 108586 BLAKE2B 69321f43473a831b97bcb54f4fe34318a42105fd78e34e8e8e9b3902d17480a493cbe98a9fc7a352eed5dd360fb83a916f5633c03d0e7e228542f0216266cd26 SHA512 8abc1c71c2c4f48f0c133bd7634b5a2220edfbe9eeb1cf4eb155dd3cf3450ecd57db30e23327cd279b927f5f836543364167b7d1ceb76148bea5db6dbffc4a68
-EBUILD rqrcode-1.2.0.ebuild 703 BLAKE2B e57b40b3b08218a88a68a476ca7a893e22b02ccd9b258b48b7ba7ebb7ba0ec6575f598846e763c0a51c42d8c0316302ad397e47ad62091a9e9e3b5d88b0ab444 SHA512 1f9c128a67605e31cbb821d0b3ae62d6c23e531c993b68be692d4570d1a0b507922148d238802f3a9ae91e4dca309e2c8c081ba1b5a9563d5f0a8ca51bdd63e3
-EBUILD rqrcode-2.0.0.ebuild 704 BLAKE2B 287ba022b3b46eee656968c0992885fdc28e3d728626be7ef39568ac09330d9237c749f6b6b301181df889c4615a3a1d49639e96ae3a5e2d3c32e07a4c65d7f5 SHA512 4c2afd5f1bb128094738a766aff752b083aa7fb93c53efa8dd7db5a76552630c6bd8494993969181cbd309a7184db896e132813d538a167ead3d982354187989
 EBUILD rqrcode-2.1.0.ebuild 754 BLAKE2B 3882071d7d783e3fbf40a55ba44e71113a08af716e7726a736034be1e9654b63e57d4426e060a7454fc0db49960edafc6f95f6a39fee6dff2a3e2b23f29ca5c7 SHA512 84f8dbb0d5ba76c39c91b08fa2524bc12f10612caf62cdb53525e6a57d745db7f98b3c880a603bdcfb05fc5ea77910bd54c5a42e357ed857236fd93b897d073f
-EBUILD rqrcode-2.1.1.ebuild 754 BLAKE2B c67faa5d84e98aeab34f4b78910e4f1e6f48e88abe3919f697588426ebd52f74802c5ce7aa8ee3242c4b84c88971a5b6d5a5c1421e206c9f74c94a4b013679b1 SHA512 09c05e2deebfb49064fe5edfef9d29ef860f880a983b534337efdc15113e5cea1eba71278b412341dba0f11914c9dd0405240767d741920c1a854b74a33c758c
+EBUILD rqrcode-2.1.1.ebuild 761 BLAKE2B 23eaa3cfb4310f37400892b604d7e18fa9c06dd2b72b41c03183c6afe134576ee56d8d3e81ab814ff10d514939a6589a7a51bdf0a817088f4a8b9aa0e90e3cdd SHA512 5d34019a2991bde9183413c83c30e61394fae2029e6de3b26d8f48dc28d0dfefb21730995f044f8f278da46fa70bed347004ddb93d43e02fb7e98ba0e3269fa7
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/rqrcode/rqrcode-1.2.0.ebuild b/dev-ruby/rqrcode/rqrcode-1.2.0.ebuild
deleted file mode 100644
index 4068cfdea0f2..000000000000
--- a/dev-ruby/rqrcode/rqrcode-1.2.0.ebuild
+++ /dev/null
@@ -1,34 +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"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="rqrcode.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for encoding QR Codes"
-HOMEPAGE="https://whomwah.github.io/rqrcode/"
-SRC_URI="https://github.com/whomwah/rqrcode/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/chunky_png:0
-	>=dev-ruby/rqrcode_core-0.2:0
-"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rqrcode/rqrcode-2.0.0.ebuild b/dev-ruby/rqrcode/rqrcode-2.0.0.ebuild
deleted file mode 100644
index f89192f2f202..000000000000
--- a/dev-ruby/rqrcode/rqrcode-2.0.0.ebuild
+++ /dev/null
@@ -1,34 +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="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="rqrcode.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for encoding QR Codes"
-HOMEPAGE="https://whomwah.github.io/rqrcode/"
-SRC_URI="https://github.com/whomwah/rqrcode/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/chunky_png:0
-	dev-ruby/rqrcode_core:1
-"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rqrcode/rqrcode-2.1.1.ebuild b/dev-ruby/rqrcode/rqrcode-2.1.1.ebuild
index 2d71a90bc741..1697439bcf43 100644
--- a/dev-ruby/rqrcode/rqrcode-2.1.1.ebuild
+++ b/dev-ruby/rqrcode/rqrcode-2.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/rqrcode_core/Manifest b/dev-ruby/rqrcode_core/Manifest
index 5ba2fbeb0703..bd775c81e946 100644
--- a/dev-ruby/rqrcode_core/Manifest
+++ b/dev-ruby/rqrcode_core/Manifest
@@ -3,5 +3,5 @@ DIST rqrcode_core-1.1.0.tar.gz 20891 BLAKE2B 1900cff03c5533453147c736e254709766e
 DIST rqrcode_core-1.2.0.tar.gz 21103 BLAKE2B 9988dc999b2853888e91b6346af074defe59dbd1be097e6c058fb7e8e68a779aedef14458ac14aa06e57e8cccdd1240e5eb003944951b47c174a1239cc35d77f SHA512 423a492b29ed8cb4e2f037305121a77f22e76dafc93675d0a24e2c6ad1918522003a8d404d55fa28e007bbb9be6d2038eafab76b2dd5e5e59c0d9adb7ab4626c
 EBUILD rqrcode_core-0.2.0.ebuild 661 BLAKE2B d8b90175f8e168e1d6e59d8d4fdae0b7e64e202b6832e13f2de349e49ac4bdd0eb3be170b828112cdc8c4bfb3303063f0d2cb884a21aed722c0b3e242aa2d62e SHA512 b6fecfb477f4cb829e14c3889a16da796ba1e8f2c8832ba030e09dac6884429c64d3d0bef52be9b79b9a066b3affca1dcb760aaad4482b34c1ccda3756774391
 EBUILD rqrcode_core-1.1.0.ebuild 774 BLAKE2B 802678ab261f2f01e6cd60dcc1547d507c63d70cc7272c1be6c2c25a8eba541ceb4a108326ebdd9b5b7f0480e7d75b2ef27e39c2d6d575a5ef71ee83b169555c SHA512 8d0df5867dae3c91f20bb8168e6dac0c07f36662b1b5714ab157d0a4b3f12154f0a7f276852a17320fd9eaca47706d5bf7fdefd60a1e215bf2684e6148816d16
-EBUILD rqrcode_core-1.2.0.ebuild 787 BLAKE2B a3cc45de5fba1e40c0a1a1f9ff4bced425c74e3b25bf28820750c6a0416a7790c30e7a23cd28ac02d857dc28708d3d8769f840edfe61d28a0d132643ac020af1 SHA512 a1843cdd6cab7235fc57c61a427103f9fe00f4c0fe1d54a429560b1089955bd6ac9e92a2cee0a0890d1c9c8a4e8e06a4707d8090fcf297cdf3dd9b278e20d0bf
+EBUILD rqrcode_core-1.2.0.ebuild 794 BLAKE2B 572c57ccb718b09802d51834b8a511900c2291d1efcfb547c2e6b10613b5776628ea26cb7f7ab7097e8d1cf216ef8d5788880a1aef47796db33ee6fc03c815d7 SHA512 0ab5c0b5dd3edc3f052b7e19d4f0c4424014accfbf92742addf5627d5424537ac4870b6d0867ceed0534320b001ee97453b84d3d64f732ef2b8826ad0de4ecb3
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/rqrcode_core/rqrcode_core-1.2.0.ebuild b/dev-ruby/rqrcode_core/rqrcode_core-1.2.0.ebuild
index ce663572b3d0..cc546529ceb1 100644
--- a/dev-ruby/rqrcode_core/rqrcode_core-1.2.0.ebuild
+++ b/dev-ruby/rqrcode_core/rqrcode_core-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/rr/Manifest b/dev-ruby/rr/Manifest
index af72f249bec5..a3089a4e79c1 100644
--- a/dev-ruby/rr/Manifest
+++ b/dev-ruby/rr/Manifest
@@ -1,5 +1,5 @@
 DIST rr-1.2.1.tar.gz 137497 BLAKE2B 3db6751d15e54da6ee6777fb7d383c1bfea2e68482dda03ceda9a70f66382cf9aa7c39f27fca9f0ce92b19858b5324bdbb5811809b3ae146e213bb03ddca0772 SHA512 df2d05ff732908da55878cb89cb7d1c4442a18c19f71940244f5bd7dc55632467a1824f55d7fade4b5122486a61277090d7ad05df9f99098030c21aa45b36dd2
 DIST rr-3.0.9.tar.gz 140053 BLAKE2B 598a8981d9d5cc84a4a93e401a39596be3d0b81c28677ccc69dc9bffda618cc68b1fa3f723d725812305de8d58f73540fb1b12a388f2cf452f8e9ccd6649de1b SHA512 df285aa1c9c226765f33338ad267abfded568bfc2b76d7d966e20b68d849f071c2a3e3a6a666c70584993d26956a7ae0ccca8be68a66a862826c9203b0e04ee9
 EBUILD rr-1.2.1.ebuild 1094 BLAKE2B 49caf7ccb853a9545414c8bd7dc82a7fa0ac3124b5f3e9029cc8b7428df9a53b278495fb0ea2458df358853881ed010ad0826e1c76230c46891aa93057670241 SHA512 26d86571134dfe9e89746f3f65907d6ffff218d6790e6aa1205c705765098ec6b8f22e8b6d6b1196ade5d955b30a715be901bf5abae5bba451db99ebfc986358
-EBUILD rr-3.0.9.ebuild 824 BLAKE2B f1cefbaec278f17d0c01075fa4fad95bab9df683ed3a2687a5186dbe9ef4652a74907ef9c619d5a11db64b8989ff6e3728746b60dc56fb46c73e971784bb031b SHA512 3c42e6c23776ee23c51168c3ab97a77e095b5031d253621ea1f616903ffb3241d7dc3be690ca423940fb53767989b3ac667d24dc47036fe58ab287b76685d827
+EBUILD rr-3.0.9.ebuild 831 BLAKE2B 46a385944fc0b6eb823af0bff87178720179524d5da32ab54737bd3260bceba5c353427a0cc6d58d97da3aee34a3b7fcf73dbbe89721bb6e7e8f57ddbcd368bf SHA512 714497892c6003564ec36f9591a351a36fe76d7a02b12cccfb3f350c9d8495da0f1b2879f8cd8361e0e2719068bff90a11424250adb41c57f6b1f3b0d3b76789
 MISC metadata.xml 332 BLAKE2B bd48ab9bc20270067f37efd109aca31b1ab136d04f3ee8d3f63ba1f88e85736991d2c584a4143a0d6d0ea1ca198b5b2d040556d48f5884f90f8fe0821a82cbbe SHA512 381259b905f2509b530d2474a09accc4c52e4e45adf96f23115756b2be71a1c9c2e36d4eb239dc4c333d5e1d6e7adaff575f4c1fba96a00d6242867235552177
diff --git a/dev-ruby/rr/rr-3.0.9.ebuild b/dev-ruby/rr/rr-3.0.9.ebuild
index 0ebc522df87e..3c2796a72e4e 100644
--- a/dev-ruby/rr/rr-3.0.9.ebuild
+++ b/dev-ruby/rr/rr-3.0.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
diff --git a/dev-ruby/rrdtool-bindings/Manifest b/dev-ruby/rrdtool-bindings/Manifest
index a6ff8ff0c31d..8d5ab3e37de1 100644
--- a/dev-ruby/rrdtool-bindings/Manifest
+++ b/dev-ruby/rrdtool-bindings/Manifest
@@ -2,5 +2,5 @@ AUX rrdtool-bindings-1.4.8-graph-ruby.patch 1857 BLAKE2B 4a36c4dee4e755bd39851c5
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
 DIST rrdtool-1.8.0.tar.gz 2955398 BLAKE2B d821d662af432c53760bc0e9636b84d9209933a810fa71091fc4c2b44518c89c7ad509bde7955d952279ee41464c3bfa4f631662dde61b6fff46699bb382653f SHA512 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1
 EBUILD rrdtool-bindings-1.7.2.ebuild 1384 BLAKE2B 41e25c46ee6396873c3116b2b240b03621c0de7238f49d7c84959477ab18be9b794f8778d2a6c7aa134e5182b4a7541fd17cb3af8210138eb8d7a2218e4d3e85 SHA512 a2a48c792d77dbed939d51fdb8e11e8af6e2eddd4f3ac7b44eff83a90e344b59405516c14081b7bd50789415279ad5b9c0cc6b18aab3b9092850bda392bea7c6
-EBUILD rrdtool-bindings-1.8.0.ebuild 1397 BLAKE2B fd2014827abee55eb9489e5655e6d12b675d947df6db6083debba1d3362e6a357ec05beafb57ae9d95bfb558005f751f7c927b9a8227c60b4a38a22acadb50c5 SHA512 51f513fab94c2f8d157fc8457980669ad944f8acb6902b58e3934b60b1be76a42936ae42824c77282655c789d289ab0d87058567007821671a2bebc0539b06de
+EBUILD rrdtool-bindings-1.8.0.ebuild 1391 BLAKE2B 4e80ea3ec0e05b0d407d5903f4e9945f5646f4c955ae8282594098f12f593aec9b3447955b63580cbc82f6e3c5300d59725828d5a0b054730a3ac7aacf984c17 SHA512 89beef5380e9e487bd36f76745a5a5f10cbfab7a32d26b7898b3d9b2f3d55a8be46f6f632c4ba6481a5625d4f1c2669f61ae5742da6f90d34f12b4bf1e90977d
 MISC metadata.xml 464 BLAKE2B 9802c0c651c611515835f1b50971c4bc91b0948503ffc62ddaa67fba4ef70f4a9beee54c1de7c9e55fffb7bf97875e6ea9cf3d5fb1882a92065bd4162a0d2ede SHA512 f4b12972651c85515f2ae49fb5124dc21bcf083483ccc1be22df06d81fc17818e16c64a729a0209146688c0552346bc5474b55791871213a946b331548e1ec8d
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.8.0.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.8.0.ebuild
index cf69222e3f3a..a30192a903de 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.8.0.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.8.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 MY_P="${P/-bindings}"
 MY_P="${MY_P/_/-}"
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 RUBY_FAKEGEM_TASK_DOC=""
 
 inherit ruby-ng
@@ -18,7 +18,7 @@ RUBY_S="$MY_P"/bindings/ruby
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="graph test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( graph )"
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 6a667a56f677..4502449dc960 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -3,9 +3,9 @@ DIST rspec-core-3.10.1-git.tgz 398302 BLAKE2B 3ecd2a93b77435ef44dd7e52e2987155f7
 DIST rspec-core-3.10.2-git.tgz 400299 BLAKE2B 82fe8689022f69f444549d654cd4799f8f1dff7c984016eba0835cffb518dce892a0af61a3ef6b251c598aa3caac66b0498620dc8d2b06a02795fc6ff3f46c41 SHA512 0ebeea8aed275f08bcac4846977b0718f85d95dedaed82b99280e5b52519713be6234d97b34b61a56e3276e767f47a13e6888401bd5a4b8a0003c9bbb518364d
 DIST rspec-core-3.11.0-git.tgz 403154 BLAKE2B 1a5043bd2120236e8e3ca931c1fd9562bc78d692674d3133ac3742ef7b7f81161a7fc550f4d11bf34575a85a8657aeb39fcc0fdccaab67cc189cc1d39a303ade SHA512 6121b805f6feade244fe13e273526e64c5a3c74a1f9d4316c895279f4ed8576dbe3189b06040f3f29fe7d3e90f862f2c78aacb0b4bef989660eae30d046ed69c
 DIST rspec-core-3.9.3-git.tgz 396080 BLAKE2B ea52a33586dc32af49a72950c7dbf24eef52a74891b2d7004ec4c5083e2e6d63c602f5033fba3a8ec1dfe6e8da349208b468a79b4e16aa5150d2fc8e93055c0e SHA512 f821ae3017c0fd9ac7f3ced0e81d0ebc54f2c17261f426c58a46c0bf1debb20efca7acc4b751b671e160de72ce5790f897bcb55d5d276fab228a4ea8d388a046
-EBUILD rspec-core-2.99.2-r2.ebuild 5107 BLAKE2B c48797239a5230b5aaea1a2e424460ec67943fc5ef2c8e8456f3a86ac7d91ce6e07872570d2edc3a4db3a55bbd6a936f909cf817509cbf5520a833efc083a379 SHA512 3468e46e9e30f4b36a7e23019fde3b25da777661dab314e5da17654c74dc6879ec473c133e6878857a0618e684dee5fe7178282466fc5bd1d2ec0f258cbedba8
+EBUILD rspec-core-2.99.2-r2.ebuild 5114 BLAKE2B 5d08c6141e2a07a076c4fbbd87b27d678ae5188b79019577030457834a785be04a3b78b8a0f010ee01ab10e362f28e5371c5854c8d5e7fb71a502fc8281a9417 SHA512 9df8b0b1d841904915d93d6b225ab320638772736605a8b034130fac1cf64b075832024ee2bb354c6539e92e10d3d11ab8012b897e2f598de48e8d58040c232b
 EBUILD rspec-core-3.10.1.ebuild 3129 BLAKE2B 97a103f3a9db0325d58c51eac48056afb0bd50447821bae73611d3bf6de377edf14c5a3df6820fc66480dc1196cf3fbebed543ba17c122c48bc6a03d754e4ee0 SHA512 67adc087c6d1d571ab8b71821e2544bc747259c8bb281073a15c821dac4c80b9d6e3f10cb26ee77198db56f72143a7e187a920d0363170f88ea4628ee4cd9286
 EBUILD rspec-core-3.10.2.ebuild 3136 BLAKE2B 6c6f1e4eae24381752ac4760912700a895ed9567e15dbba09d8b616b8eda98cd1db49849a7ce7fb889f76a5f6a6f7e1e1491bcbe6f4bb9c59d12f3cc0ea6d53f SHA512 94c1453a68ba13e4c3bba8f445129ca87046ce3e922a9e1d4b78070e5a4935cb634b8f302975a4fd52abfd35eaf2a38ad101b4f03e5898c9a830d7535b0f08c6
-EBUILD rspec-core-3.11.0.ebuild 3136 BLAKE2B bd0bec597600e56aaad777fa4b7f5553a8cb3eec20fcbd251ffdf96000543652db045e6a41a0f1bd7276d4e14cb37fb334e536306c2bc8d493b285278ccf5005 SHA512 b994edd2224891090dc5391efc8f6dd977e928bec40e98ec1f86464a6e530fb4d372adea91aaf4dfc1f81fd76291c6e0021947609b9c53fefb8999d79494f041
+EBUILD rspec-core-3.11.0.ebuild 3143 BLAKE2B f4206093e7fbb90ea1cbb4d4d1022714b78f50e0272ad08707348a21f42e28486b1864fbbbf482530eee7b482ed2d0e1a7b4c6554151162bb16a5ce26149c0a6 SHA512 b69c76f107ac9fa648fc94191e5ecb33bfc7dc5e9e264df6abd0ca63fce2b4fdd09fc0d777e003184b7c1c29ca0c432c0fee3bfff06dd99f33604012954770c7
 EBUILD rspec-core-3.9.3.ebuild 3122 BLAKE2B c8dcd45114eeb2f4acf1aea3934f9daa173ff57899cb234586f7e720508953d960bbc5d8bee29695140f4177660f0ab4081639a5b274d747b7b0f6b4a7530053 SHA512 6050a529b3c922a832403288731ac2b4ded5719693d735e5e6650c62b3a7a8a22a3091d2f66376b23a51538c2c36a61f7b638a0f5f6c701a58e4ac071a8eb076
 MISC metadata.xml 466 BLAKE2B 008536967fd0a54923be3f70885dce7b04ca3746699dec4bd0f2ef56a41997c0e44cebd553d4c899fd815c587eb1f5338d86033d1d3e96289aaffdf9a9fcde06 SHA512 9a1f175cffe5136506e4d3b185a7bb974dd3de45683beda00267d47339472ebf8fc1cbbb37ef6012f14cb3b0535e386d98e3bfb7a955f9ee20484cd2ad9013c5
diff --git a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
index 75108e8aa0c7..e8fda14e45c7 100644
--- a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong 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_bdepend "test? (
diff --git a/dev-ruby/rspec-core/rspec-core-3.11.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.11.0.ebuild
index c0b87a3cfaed..0b23febeb669 100644
--- a/dev-ruby/rspec-core/rspec-core-3.11.0.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.11.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 236a3fd8350f..8a1b3d973de9 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -3,9 +3,9 @@ DIST rspec-expectations-3.10.1-git.tgz 212281 BLAKE2B a1872a7f71c198db1662eca48b
 DIST rspec-expectations-3.10.2-git.tgz 213253 BLAKE2B 51c306d34dfd82d551b8390bed9790748f8f62b9f4b5243399486640d04465dc0c33756f7a575e98c8e61310cf6c25b93b4c1102fc1798814d916defb0ad310e SHA512 819f1b9e881a56d5563c9421e3e897726931c3cb27be5554e35f41077656e426cbac1ddced6a6e61ba21faa7c147c239433ddb9d21ae2e88592d91b286c170a7
 DIST rspec-expectations-3.11.0-git.tgz 214878 BLAKE2B f830a0a31fb0e7cd6639e711e4daa9faa98e514b6a1dd864c383259d199dc617c6c7ff45dc65f37cf53d3c4581c6ecb9148e42b77f3c37541d8985714d62af23 SHA512 209eabafe92db3de1a78524d98facda16b3f5fef11f8f0c8c74bc6fc68529c8d9a835a8196e84b8b8bdf828d548d4b00bb1acdd607cab14dad7874f55a42b0c6
 DIST rspec-expectations-3.9.4-git.tgz 206297 BLAKE2B c5dbebcf7b411c9cb5cd815dc06fb6f455e82181856661110f803b25f3910975f0676f3cf154e93fe771849363593e104e0f2dd298dfd3d8b1dd96a6ff991547 SHA512 bd025b89751b5b8d3c6bd61a90386fc05ca371e04247d93b29334bbb3eceb84bacea3f3846c20f08dbf53f174992b2dc0fe9f2bc449c4591188b5e428b1d8003
-EBUILD rspec-expectations-2.99.2.ebuild 1631 BLAKE2B 2615ea756770527b5995f6849579b352ad1ca23dead5059de56f1da33f515df4b6e6f1a8f27a2ab58d44c9d25ea0bc9a554e12006079328284573f588d01b1b0 SHA512 8e704765209e260ee881e44f5faa162e3ad68fce865bfbc2e9eaa163ae74e93063f07b6ae5195882c562db2d4a23f0f6caa7165f654cc7b9c1c8feea3af239d4
+EBUILD rspec-expectations-2.99.2.ebuild 1638 BLAKE2B a15ce1cfc2d48f2820daad095ca70e8969245eb04cbd69e1ab89a2482dcd53bb1968618396ae9ae3e7eb1ab6c8ea7aab663c4a91ccac49ea9cd7e28d6357cd3d SHA512 cc77361f64c0caa032c4ff553412f30994d8922623c5608e9cee4a682e8b08ee4d791b4738f716bd81ac567d98699791a779d138888eb3934c8dfdbabeb49984
 EBUILD rspec-expectations-3.10.1.ebuild 1311 BLAKE2B 9dfb52e62ff11b037678e39e986602c9a9d9982b1f230f126d060e5d4fd53a77e942d8c63f7a466fdabf3d2a66fcbbe21a75609643d0874b7712efa5d46df7b3 SHA512 3f82f0e97cb560ebc7d5df647dcef05ef70126f108da01dbe2d6b47bc1a54dbd19d503e9670883f28a7ff51488a69abee0eba2001223bd4e46a2c29216c87afc
 EBUILD rspec-expectations-3.10.2.ebuild 1318 BLAKE2B 728632075a61aae02e2b7457e48af0acd9eb2cd4160e211cf2b612d7b12619856f024d9c177360f700d4fcb32f1ae569b49e71531c778537ea5cc08146086747 SHA512 d46ff515a45bf7f501383296d8191d7ba07b149dfc2a10209ef9161ca79f1ad57577603fffb907779b1073b6c8f5a24a1cec5dbf13f225b7736172eba1c20a22
-EBUILD rspec-expectations-3.11.0.ebuild 1318 BLAKE2B b35bc885debcb2f57a9db42373b4616613570cb98eaac13c66b50626d5fb0f700765063f0c857cdec44c91e134ed40d0919e5e4f1d36c69980280d07486a9f50 SHA512 00d8c61ed37269e46fa0f03dfc286729caacb22d2059a0facf8f6dfc40389caf9a5d2fc589a358e5c827ba30908410c5d5e47516f310f4c8498579d465398a21
+EBUILD rspec-expectations-3.11.0.ebuild 1325 BLAKE2B 3ca7f8d244ab7207be1b5ed91a9b05f0efb2c2fa28eee1a3e6acb1043d577214cb647716e0cfe69ec6330c133e3ce10150402164a654b6eff97a095ace891787 SHA512 3e76740a1be944ca8fb28e1b55da0eba1b35c2d0adf45f2c215b0a7458548e49c0fff445a9e9b9899d47a1bf2240f38aa0c4dcba741e53cd5ac75251017be3db
 EBUILD rspec-expectations-3.9.4.ebuild 1296 BLAKE2B 17662e721fd6dedf56a32fe1d93828a0585dea6e8e43a546f552ef8dc173f3db2bc42492c82d25c263dae964f1af6436147f53cf0a9b1518ecb82ed41edaf9f2 SHA512 847676fecf6abcaee6801ecd477cc86fac1de5c5bf98c2af411200ae5005dc5598a2ee2e1de8679f0e7a9d420be97360421557cc40afa9f1734d0ce69cfd5dcc
 MISC metadata.xml 351 BLAKE2B d819679f0a74e7885241c77f001e1522143ea052a1cd511d128c3321aa96d6060b98ef11c615165f631d4081f5757c7ed463de58f44acb6187d026ce86a2042c SHA512 1f43d7394a1fc32d2aae92b66a513af0572ee1ed4bed3d391b4774df97919113ec9ec9d0da68e26f1c5558d877e1c8fef01aca6b92ce6b70bc3b256ad70dade0
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
index ba8439da565b..006ae650cb53 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong 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/diff-lcs-1.1.3"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.11.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.11.0.ebuild
index 75e012d1768d..77f827dd4953 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.11.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.11.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-its/Manifest b/dev-ruby/rspec-its/Manifest
index b73a0492d7a1..4241f79736e5 100644
--- a/dev-ruby/rspec-its/Manifest
+++ b/dev-ruby/rspec-its/Manifest
@@ -1,3 +1,3 @@
 DIST rspec-its-1.3.0.gem 14336 BLAKE2B 3dabe36bd329ee4bb9134958b1727aec2eb4e15140d3197917bebc69f7a65a7558efea8cd5fdbfa670688fdc4f5db3c6ab5fcf5bf1e5a0995668681442cf1dc0 SHA512 beff75fc84f9879095f02f4515bfd749dded877b8b4d5186423ddd78c6c16d6c5e810ebac80f3500cc7b1d23db119c72780c32888385d21d20672a26499ae94a
-EBUILD rspec-its-1.3.0-r1.ebuild 553 BLAKE2B e1aac1c4f69834445b3b5dddc73129aff468bdd0b910956779bd2763cce17a70e3df5e8e48057b55a911743d36c359483902b4856302ecd9d2d4838155074445 SHA512 84a6b2527ec4e70cf5ea2cc9c402399ff880c72996e64b68879ff7f747c1146a85505d00597520af90bf8ec3043afb6582262036e8679bbb253f6f7d703b5184
+EBUILD rspec-its-1.3.0-r1.ebuild 565 BLAKE2B 17459e6ebe31d0ad84d33a6c78baa654809007241c5a999488b5ef0368d460d1017d1e1f56179df259f35e449e8fe1f78efe9a84d9debb46b3edd763e51d3f5c SHA512 31c49d4519984a12e6025d86e6a747dd2ea8d1129035247e4678255637077b504b7fc405c5da7e1966d4f79c8cc75ebb7c81aa74e9f98915209303aad792e4a4
 MISC metadata.xml 342 BLAKE2B a88f5633ea264fbea5730115a125557aeff11ee1145adef6101868d84604d4589eaaa79495634661d00493b8b59b4fb77eca7761e64ae4eec8d1e864f1a52ddc SHA512 4c5258c6ad04da730a0c40b774b93d1538091cb12cd26be894ed1fbab3559fb237fc2e7fd2ed7045e6cf9c989f707b9139061fc777ac21aae36937ee679d8a58
diff --git a/dev-ruby/rspec-its/rspec-its-1.3.0-r1.ebuild b/dev-ruby/rspec-its/rspec-its-1.3.0-r1.ebuild
index 51f075f4fe16..70cb71d2746c 100644
--- a/dev-ruby/rspec-its/rspec-its-1.3.0-r1.ebuild
+++ b/dev-ruby/rspec-its/rspec-its-1.3.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rspec/rspec-its"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rspec-core-3.0.0 >=dev-ruby/rspec-expectations-3.0.0"
diff --git a/dev-ruby/rspec-json_expectations/Manifest b/dev-ruby/rspec-json_expectations/Manifest
index ea405e6de31d..28429df2c10a 100644
--- a/dev-ruby/rspec-json_expectations/Manifest
+++ b/dev-ruby/rspec-json_expectations/Manifest
@@ -1,4 +1,4 @@
 DIST rspec-json_expectations-2.2.0.gem 14848 BLAKE2B c2f77e908eb0f473a5bae0ed49e133ebe71d4c471e2b32a9620f84e3881ca6aa92d188b8aafae8d92ee9111edcf2cc3636598c59e9f92747422f3c43c7e14563 SHA512 90da15c4c02404ac518955d65612fc7db28e8f91a756e5a25d0e5667026113f7a1be69cdc9bc656eeb89ccc7cb41069dd241401a2680f69528fb77d5491f2a83
-EBUILD rspec-json_expectations-2.2.0-r1.ebuild 558 BLAKE2B f7a36e43df90e53d9f554fa69b5cfb9d771bf1041d5b7a4c3473b632d5572e81a48f3aa37bb4856bda32093bd5e08f61662f8b4f8c0fef12b2f82c738c67a852 SHA512 3ec16bfd37ef074f6fbdf83c0ec4f6dc221bbbe076ceac7773446b679d5516fb1ba63992364be2285c9cfd5d6dc90a823424ed55356c2e0ab0aa115b089c16af
+EBUILD rspec-json_expectations-2.2.0-r1.ebuild 557 BLAKE2B 9523958d403914e01be4d16b71c1fe6510c00ecc8e89d3013fc59c89738f9e8af40ea34cf0d5316b2d38aadebc12af6e3db43c2afd6b42483ef60e175a634ed4 SHA512 a71455e077ee995b0e2c7a12ad0c0fe6b02176f76046175b94aa053e0d918d8e5ec3aee73f1300de321f29d40a1f8f1cf20372b0312e058366ea30078eddad12
 EBUILD rspec-json_expectations-2.2.0.ebuild 596 BLAKE2B 0f6120caf03cd9aefa0533f51537b7307526d452d16b9649fe7c4aee8412adf37db47e9d33eb1f3129bd37e88af01497c5cb16f3520e4a99fe104d380e3e889b SHA512 e9e17f91999a434744a7e9bf5971d2fab915da47cd5e6a2eda4afdf90367a39b281c3123e5a5c05f3f33ae119410696e290534e45ee49d381cd3c2dad1dd0ad7
 MISC metadata.xml 360 BLAKE2B 6c326af43c46464fe6a9bf5e5511ddbc3feabee9e53f829d4d689fb3b9984197c6827930cef434300fdb60f48eedf2273419b33ae888f048e2451937529ed57e SHA512 5d84579fcc4d87aa6f52d2f64ec075006608c783a6c074cc21539d14f4a15abb55b1dd3619a7e0639dcdc63a723e89d1b3868da0ab849529eb9ae92b14ea4a46
diff --git a/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.2.0-r1.ebuild b/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.2.0-r1.ebuild
index fd64c1dfd5aa..2970fd988c41 100644
--- a/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.2.0-r1.ebuild
+++ b/dev-ruby/rspec-json_expectations/rspec-json_expectations-2.2.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/waterlink/rspec-json_expectations"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/rspec dev-util/cucumber )"
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 59d48c5f4018..4ce9ea01b6a5 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -4,10 +4,10 @@ DIST rspec-mocks-3.10.3-git.tgz 196996 BLAKE2B 22759a11cefbaccfef52b2a1a37131d3d
 DIST rspec-mocks-3.11.0-git.tgz 198287 BLAKE2B 74b4abec79dc601fe734e0f657b239c2435b679d5624fad1fa9318eb4822be6d3899778af656913d3a89fd51a8334019aae51e45f10ab01b57655299187fb088 SHA512 7edf3a948a56b4f2c17f34ec2a00bf7289310f40a1561fd12dacdc27f0769dfb1f42632dd07c82831e27d21208499a2feac22ce92fdf6e450acbce38543a3b71
 DIST rspec-mocks-3.11.1-git.tgz 198650 BLAKE2B bdf06f0614bb7b6c4eb6a0ff0af84d4f6ce8f456aad7c1b4324544d9750ee2e8c8a156d2181915f49afb62ba2be946c349cbd7ecc29caecb1c688ba6e47dc241 SHA512 c0095c615ba9e64f4dc9f2d5cb2a495f4e0b094b25eaf49c0d6a78bd4ab201f534a061243fbe63e86b64548c6c942d405dc36627057742135ce3e22e7561b4e9
 DIST rspec-mocks-3.9.1-git.tgz 192772 BLAKE2B abcc8fc82648993e6a407a8c4ac4f5b146b821e1e842c1dd2b95824d8468aac0ea796438d77e376c897675f66bd2bc9024da8fa5ccaf60139ea296b388d542cd SHA512 f804783fca4cf2258e83f82515cd5881ceae0bdd3aedb452a1db901e01de5dbca1d2bdef0ac0828a4bd23a1de58d127a42150c8c204219bca39ea7072619098f
-EBUILD rspec-mocks-2.99.2-r1.ebuild 1616 BLAKE2B 1a414ceb73933c9e386a440c58b09667a91f70e59b9f7e5dd4b18d61f5845f502e17026457aca39f149f879ea27a7fe29ccf03341186bd9733be4dd95f3ee94e SHA512 8e309d98623cd010f8027ca1e2382bd615f0c95fbe6978d64b6dd29323e143d3699b7ef54dfbc7f24da6623a1b40153fa396a52fd817dc314dc44d52219cdbe0
+EBUILD rspec-mocks-2.99.2-r1.ebuild 1623 BLAKE2B fd1169cf4a9bdab0faac65b0cd738c31dfaeb59c5925eabd2999cf0a0c7cbf60033c9109414dd6504ff6e29c85bfe6a6fc41001ced2e5cd4eccfcedca86943a5 SHA512 5c4e6639691f811cb0b3658c1d6d0ebfc546ed486868e37dfa808c8a86041d1b0fd66f877505cc8ccee7129d9c0e586f63671391caec55f0b148e51ac4f7d5fd
 EBUILD rspec-mocks-3.10.2.ebuild 1442 BLAKE2B fec61c4afdf328f06e2c2a9d7e0f3644836376b9925dbf27a55e959956f9c049343a56e95e3272cf9d062d86d2914998309d6cd51a6f6db1b86352d90cd5adc8 SHA512 11f1f35d5b2d59292a42ad277b3676c5c34bfaa72e22bf5705150eeff1d94fc3688e5f9daaf2b11e327767d481102f1a1890329562c0a6e78bbae0146e9ed3e7
 EBUILD rspec-mocks-3.10.3.ebuild 1442 BLAKE2B c980f6995e1c6e16b8c7ad463dc2a29ac19a2d9a0deae49a625d430f332ef3b1a49bf09cec4b46d80bb0a2f01abdfce478858f96731e5e771cc7430a025b83ea SHA512 a34266c160e0953251bac75dcf8ff18b19d2c42a49ab8844dea7033b22120563b29efe870755b1c2e8e4f099018c45011f77e2626775c8a1b1ee60d8351f1081
 EBUILD rspec-mocks-3.11.0.ebuild 1451 BLAKE2B 568141913af25f622e510c7287bc1ba6c16f4b119c231d6b3988abb9485ce0cf52f058219314effa3540f7cb78c212d0a87c5a8cdbc9157503cd91ab34788263 SHA512 fbc0a4d2a0d8d125506f32408b99c882ecc1849733a1c957af16b36e4e0c5bd5c0735bdf8e27bc04d6aa6f952eff70cc2767f7bea4d1ceaf2c1b15b53518c904
-EBUILD rspec-mocks-3.11.1.ebuild 1451 BLAKE2B 568141913af25f622e510c7287bc1ba6c16f4b119c231d6b3988abb9485ce0cf52f058219314effa3540f7cb78c212d0a87c5a8cdbc9157503cd91ab34788263 SHA512 fbc0a4d2a0d8d125506f32408b99c882ecc1849733a1c957af16b36e4e0c5bd5c0735bdf8e27bc04d6aa6f952eff70cc2767f7bea4d1ceaf2c1b15b53518c904
+EBUILD rspec-mocks-3.11.1.ebuild 1458 BLAKE2B 56d68d0f345b15d6ae06307d4d0261d259324ebbb79969afcd9e62975c3870bee3dc3d002a2917eb83ee7fc919bd413a406f9d17640da699cf8449f5794a8860 SHA512 dbe45a2f9757daf37f4953538be42840b16e4cea3403b4dde79541a560a5144e31dd0c6c60669a33b723a077a9c4fd5251cc148a9d5190c950fa1479f2a1d315
 EBUILD rspec-mocks-3.9.1.ebuild 1435 BLAKE2B 82814e4352a4fad72c57ff163fcfc10ef08ac94b3048b3b96fa5c5a42e0d2612a8328365b5aa8002e8ef97c3fdc85d592eb9faf6c2d90a3b0a4b0c7c2f11479c SHA512 a5b411e0173fa229e6e754335911807c10768311508d8a2f8c0decff12c422cc6185290c9d2a5b9e94c9b510c8e739ae7a6e6c5957bcf9d1becbf0c56beaa90c
 MISC metadata.xml 344 BLAKE2B 5b939c668a8c75c33348bff9e8a0fa6042702fb59cdfdc2c8b45db1d9d191950a63d6f9b1329e6a2717a097d7b001afecb9ebbd0fa08badaf95664d37b06eb17 SHA512 026e9a293c2f99d86a11f37267fddcf54dbdc33aec00f470a988d477d6e3198ccc478c03cca059be0a4e324b9f256719c99c7c81af97c75fd7cebab433d4b1a1
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2-r1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2-r1.ebuild
index bdcb716c17ec..89cc3f97f072 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2-r1.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong 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_bdepend "
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.11.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.11.1.ebuild
index 2cd5b07d4234..97623f7a6fee 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.11.1.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.11.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index 0ff071bb2424..80fe9167995f 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -3,9 +3,11 @@ DIST rspec-rails-4.1.2.tar.gz 156296 BLAKE2B ca454065c8fb318148e745162514b9f21aa
 DIST rspec-rails-5.0.2.tar.gz 156991 BLAKE2B a1700fad43ed2eb441d95307fd14fe8c0f96c51edaaddaa13a94b6c740711ddb96c9c7058051c1160746111e52c56a5685808532795aa0e32cab2f91b287b6fc SHA512 c2154f0cac634ead0109daf0e91782e9c770783104d3b2a4b0e097d46f8a9ebb49fe993733a7a3f6c4e3d037d5ab25f424cf8e3386a161172fb8c68e731b076e
 DIST rspec-rails-5.0.3.tar.gz 156964 BLAKE2B 3f47428f887044acc2f4b374f6aaf135d44f2015b66ae5caa2a1f46923921ca2f96de47c7fc8faec951c15d8a18ee7efbf12fb80798e279784c70e3c31c09838 SHA512 3732c35603e5fe16deed1404c6ab0814cfaa6922da74befe31e3e2b23ba78f4de8316862894057f37b9d0aa79838d21d7028e1cbc592b8ef79de17f25bc81ea5
 DIST rspec-rails-5.1.1.tar.gz 157454 BLAKE2B 580a3443cfe088d4056815e3fc344f9b91e5df9ff52099942f8e74c062e6ffb8ff528e5bcb17b33684be0e6b4ce7791a1df38a7fbead0ca348567cbbf3f6a863 SHA512 68ba2af02619bcf304237e744f728772e9de889d7aba5ab5fef236d40e1c047b03bf0c199bb28074f2d4cf47e1811f241e67b56d8c362dbc8ad69e066bd3d7f0
+DIST rspec-rails-5.1.2.tar.gz 157523 BLAKE2B b500aa53f8bd965f7b95e90403d46096073780fa4e318295bffba44211cfb9d5eab36549e6fc3afc144700a8224ebe808489959a172f1d9e76c43320b7022979 SHA512 f9ef3a3812590a7cd50bd34e9e6cd9669fab24736ac7693b3fffe3f8be9b8313e31b0c7b7571a735f20bc5d9194a94c2f447e69f6491190536b6534211e1b070
 EBUILD rspec-rails-3.9.1.ebuild 1511 BLAKE2B c7b77b6d1e9ec550b58e829db92d7746a45709c07a39c5af021188f0ac39ecfdcdd4425125f4f41b2da4d93622beaaaad2133e49a5457a4b46f9d287e4de4d97 SHA512 1a8f965898cf9a073b18d456834dd4c02bb25f68b53f7d818a354be2ae531b1b5d1f3c5cff1a044fa9b6953648d6907014f0ba5b2fcd81082c36a4dbe78d8421
 EBUILD rspec-rails-4.1.2.ebuild 1555 BLAKE2B d97b1683244bf2bf54c19148dd5aae18eb673a79f5b3e95d33adf0636758c92200a2034b6ff070785d129ff7b5537d190321308577713c0521d4475bbd95ba01 SHA512 d7e405df0f5949eecfbd5f3c67bc440b7cbe446c11ddc2db0b93d7c7c29d0e8baf49de69052c134e47bebc2b4affaf6a9c6a6c4668491397f9f1b4177810cd5d
 EBUILD rspec-rails-5.0.2.ebuild 1621 BLAKE2B 2c7d1f0a2e14228a12ed7c5132e689b594e0cdc97094b6a121f98bedb7054ac24365984c2a42c1e51ba8f969b59b31be12033c77387f863d48835b21fc0667ac SHA512 81fc34d57b4ed68370485f96c4af0e0172231c489a755b3620b35810f123257ff7e40baf33093c28cf025dfec591641ebaf9963e390b84881397dd3b8def54f9
 EBUILD rspec-rails-5.0.3.ebuild 1621 BLAKE2B a492e1b328988e194d25931b9744af72626eb45fe66afa12bf39fe5fc58b3cb5ee6197815742686472d62f045ecbdc963d5c8ff2397623918867e87282f93f43 SHA512 27e62e25c0a0997ec7c58462d52a83c296fc788e191de0cf73493063377aebe84f9a7f11d427b7053f4553b3bdbb50a0566b84897179bc753304b75c615008f7
 EBUILD rspec-rails-5.1.1.ebuild 1623 BLAKE2B 52ef145ad123a4ab263d8a1509261a8b856e572ca4413bff111628acb2c9eefdd022d274d2b0b00ff35aaaa5cd19de2e9cbf944bde8547676fa05c51ed83c7ae SHA512 75ca634e6209b7480ca9343920b1340e02e95d8ad9a5fed06172d6bef5321f5b6af4cfdfac569e6ccce1e981c931dde9fea5aeefa6aa2a91865958cb087174ee
+EBUILD rspec-rails-5.1.2.ebuild 1623 BLAKE2B 52ef145ad123a4ab263d8a1509261a8b856e572ca4413bff111628acb2c9eefdd022d274d2b0b00ff35aaaa5cd19de2e9cbf944bde8547676fa05c51ed83c7ae SHA512 75ca634e6209b7480ca9343920b1340e02e95d8ad9a5fed06172d6bef5321f5b6af4cfdfac569e6ccce1e981c931dde9fea5aeefa6aa2a91865958cb087174ee
 MISC metadata.xml 344 BLAKE2B 22dcdd62747138dcdc6e21c019acb6aee50548e35a9189b0b597e603869519d1ca6ac5e6eb32cb6eafb2b313adb1b74f16d7d282d4d19bf9f7bd4913788a3137 SHA512 e6782747b02a80fe50926710100a46ec28d6f55419f2fbb0bff4ebdf1db7d4f43fda195f21570fb5e149990026dd69e3c234baac337e5a6c5fa0c8f28bd62247
diff --git a/dev-ruby/rspec-rails/rspec-rails-5.1.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-5.1.2.ebuild
new file mode 100644
index 000000000000..93617fc028c1
--- /dev/null
+++ b/dev-ruby/rspec-rails/rspec-rails-5.1.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+#RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="RSpec's official Ruby on Rails plugin"
+HOMEPAGE="https://rspec.info/"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	|| ( dev-ruby/activesupport:6.1 dev-ruby/activesupport:6.0 dev-ruby/activesupport:5.2 )
+	|| ( dev-ruby/actionpack:6.1 dev-ruby/actionpack:6.0 dev-ruby/actionpack:5.2 )
+	|| ( dev-ruby/railties:6.1 dev-ruby/railties:6.0 dev-ruby/railties:5.2 )
+	>=dev-ruby/rspec-3.10:3"
+
+# Depend on the package being already installed for tests, because
+# requiring ammeter will load it, and we need a consistent set of rspec
+# and rspec-rails for that to work.
+ruby_add_bdepend "test? (
+	>=dev-ruby/capybara-2.2.0
+	>=dev-ruby/ammeter-1.1.5
+	~dev-ruby/rspec-rails-${PV}
+)"
+
+all_ruby_prepare() {
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	echo "--require spec_helper" > .rspec || die
+
+	# Avoid bundler-specific specs.
+	rm -f spec/sanity_check_spec.rb || die
+
+	# Avoid broken controller generator specs for now.
+	rm -fr spec/generators/rspec || die
+
+	# Test with a compatible rails version
+	sed -i -e '1igem "rails", "<7.0"' spec/spec_helper.rb || die
+
+	# Fix gemspec.
+	sed -e 's/git ls-files --/find */' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rspec-stubbed_env/Manifest b/dev-ruby/rspec-stubbed_env/Manifest
index c76ef0ac883d..d6d7b1904f51 100644
--- a/dev-ruby/rspec-stubbed_env/Manifest
+++ b/dev-ruby/rspec-stubbed_env/Manifest
@@ -1,3 +1,3 @@
 DIST rspec-stubbed_env-1.0.0.gem 11264 BLAKE2B 1f00ef85dc0677a35814d2bb6a59e8c836cf08bda2de024f9cf7f8d4696a409ef286d72303428854cb7ca59a7c479a89c731d7e412cd97ae6fae0edaafa84d1e SHA512 e4624614852674035d2c0a7b426d9aa62d8f621a7e52c4f79410ac9e3f833980f50530a7f7da7241c763ec92926bf87bf0be2d2dab4200faa9a17eaacd404640
-EBUILD rspec-stubbed_env-1.0.0.ebuild 569 BLAKE2B 26c03530487b736ca42f60c863638b36e953412d9fd636d246f4b57fc6b70dfc103ef338f658eefa7a0a6da6eb567c3a2226bbf0b09f7349808f3e65490c093a SHA512 543cac4a0719f33d21efd87cf73345ed3dfd59a9beefb1563a7766d63005a5bd5f93c90da539feebb338a93d820483fd76f211bb55f7ba50d36e2a196be1f262
+EBUILD rspec-stubbed_env-1.0.0.ebuild 569 BLAKE2B f04a3147520e51cad3c6f515d638360ffeff16fd583ddc0df01696f3bc9b8313012f2af72fdc2cd617f8a7d8ff0c62500695a559c4e39c95df7c7b5117e3a6cc SHA512 ef10b7d4b74d1f4a2ef87aacf2e8951a19f4bfa91992f48c1b0884952012310f29ddb10a82778111a00a33763b22b1f1fafed5841fd6f7a79e77d2c07927e16a
 MISC metadata.xml 352 BLAKE2B 98f69d5d779982ad40245e8a6fa7add7bb65f0ec2d61e5846a2bcb0a8d426170729f529e4ddf0cd660d9ecbf6b7e3b5e1ccf8806a98ba856950cb951f497896f SHA512 4170475202d1e85e2b0003f95ddee4d9819bd36d9951970d54c80a02738dc0ecb651018b40f2ed6599161f5221a33ed1e148e1620660c15613bbde665abbd73d
diff --git a/dev-ruby/rspec-stubbed_env/rspec-stubbed_env-1.0.0.ebuild b/dev-ruby/rspec-stubbed_env/rspec-stubbed_env-1.0.0.ebuild
index 5088f3012601..9108b55cd22b 100644
--- a/dev-ruby/rspec-stubbed_env/rspec-stubbed_env-1.0.0.ebuild
+++ b/dev-ruby/rspec-stubbed_env/rspec-stubbed_env-1.0.0.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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 # Gem does not contain tests and upstream releases are not tagged
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index d9da6906ab1e..be266d6f307a 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -4,6 +4,6 @@ DIST rspec-support-3.11.0-git.tgz 75644 BLAKE2B 349df9b326e98fd3564ae22c8659c952
 DIST rspec-support-3.9.4-git.tgz 72490 BLAKE2B 03c3ba8316a2c6a79faf68db87adf193b684b82119dd9c5b67f2954f3ce72cf03e3e16898e2f5d57d76aef37bb8fb08ab8dacf8aaef6d1445a8257e2be14afe5 SHA512 95be2e03c37117d6bc132ce466779a8ac3c4fedadfb2a6dabb1fa11601aae908e341c87436dd526bbc8b02040b23200c95bd113d0475405afdb4acd099c67403
 EBUILD rspec-support-3.10.2.ebuild 1765 BLAKE2B fcde701c0554886322c31ddf8b8b84e6007e8bfe8a601facabed603ae36247193ed5dc5d9db16246bc2692f5d670a0945db08f8ce16bf8dcd7bec377d0556298 SHA512 e5f98158b36e72bbe08ac8b8ac56030776e0aa6331751b9fca32a75b03809eb4f4ecc1914d642d3f859f5285c12ae33a4c329304b0569042436fcdd0303090d7
 EBUILD rspec-support-3.10.3.ebuild 1765 BLAKE2B 7890f1d241eece860ba86de1d889539a8917aa8065b44e6caf83cfaad782da16ee7970db4575b023a333caf72fcf86a1ffaf89e10a607209a8b713530b00536b SHA512 746a264e2774ebde5fab2903db7b7f78e7154ec76899e1fa774640efbc800d92bd7f978db1c2d0bcb822d9c301cdcd7dc7dee873ed847d58cc5ae751e47395be
-EBUILD rspec-support-3.11.0.ebuild 2124 BLAKE2B ee8832c4896a83687d9ff398f9332fd8d27c2d7e286734e3db29d7e990ecbb162c555575a98dcf4454f53786301b639d5b8003e5836369267c21c4f3a8970068 SHA512 ed5cd3b4ca60742a02e93b3e86d994db6acc6586e292974a159bd0d4acb786ec61de9427e0c56676316510c4f6c826b48dc84d20497c5a2d3c3a184bcae69664
+EBUILD rspec-support-3.11.0.ebuild 2131 BLAKE2B e7a389de27cd9918d1d9ab0185f4f563bcba6907657e91293bfaef46893c522f46a198ab08c249789f8c02e7104c60c218e2ae84d37c162c240ec8f98c286fc6 SHA512 86a8a690d41c668476d5a6def290f48fca72418d310e5b0c9ba099b6effebecde94a13bf27344a4c0b88d6f94938694651eedd061f5a96cfffe2153bd8f1e924
 EBUILD rspec-support-3.9.4.ebuild 1751 BLAKE2B a68477e2a7e7deb6af3b4d4ff1a31cb3810b1e545ccdb309f73b9665527f14952caf2471b4f04da4174da930c25da66a348c804c80b214ce0a889f93d87fdc54 SHA512 ef906eb462681dfc4d95458228a9f796af4ccf59cba157392492601382a4eefe629bccee1f7d6359c877c159de40e31ca604395973f08cf700843b7604ae15b2
 MISC metadata.xml 346 BLAKE2B 74d62cfe1930a3bfaad9b1b14ce55b0de81a0963f1e4e5ba0f104ea51adac0ba86c7cbc38831630029a8e487623df0d279028b5d1b2391eb2bdf060582c80be4 SHA512 60c7dd2d3d9d103b3c0e505d62975571eab89bdbc92203c2bff8cd9b854dda3020490f9592464760798b8e5d973ab3be7b142dca2d03583b822fb0a83761a225
diff --git a/dev-ruby/rspec-support/rspec-support-3.11.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.11.0.ebuild
index b655ae6d9d07..b96226389e9e 100644
--- a/dev-ruby/rspec-support/rspec-support-3.11.0.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.11.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index f43c1f166bc1..66fbc515ceb3 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -2,8 +2,8 @@ DIST rspec-2.99.0.gem 5632 BLAKE2B eba837aeebcb0d65dc18a644fd935f241a67039988854
 DIST rspec-3.10.0.gem 10752 BLAKE2B e0af9c31a5263b0656341be7432e1597afa56af9bfc5e6d21f1daa7553e5bd3daf2b383a7e1a5b6f761a5880540020e7accd8d4eb6cca6e57d616dcc41690970 SHA512 dd1a3a1c7c73ae9c053e071d7851780d8cf61e92ddba24072b9f2c00a342ed08c81090332ba2eaf7ab96adac3fc723685996195e5cc584e15de57ff02a4455ec
 DIST rspec-3.11.0.gem 10752 BLAKE2B 24941576037669a53373d263bda99c7c98e295f5d616c08964d95dd3b0697d64c5399ed554d15705c1ea3f11c8bed667de00e0aef28d6cd1fd119057ece5f626 SHA512 233f80500446066a61a50d8e3f8a602316071beaa82e95776390684f7d58fa0acf8807386bee7d08b21f5481933e031b968fd752cf97efa74ba6cd411a8d1395
 DIST rspec-3.9.0.gem 10752 BLAKE2B 212cebbae9e71b8a090757ec4b9902f20043eaf95b079a409247990e1fca4236e13d0e9a3bd9b9eacfbc2d2aaab19583452dbe08b298ca69a85e20f0163741c2 SHA512 a7dbb22f01d842a41b54c375d32d94c77a7b964d1ea5b1971e7c228dfd5dbfcfe03c007d687781addb93f819dde8de664dda307c266137fdd0a07dab96f96fad
-EBUILD rspec-2.99.0.ebuild 749 BLAKE2B fe4a984aa16df47490dda24c9480d1e4291b251d29495d064f1437c9da63f95fc4a9524882c4022b7111e9480f6e2d99fda43ad2b537dc5a1180557df164efc3 SHA512 e3b7750d2cfe4a1827ac0ca5c1c91b626f0ca0805e5b659d3a01d3d0d18a36528e32c004cd73c48c6a618d0fc88cc5d01bab9dc009ca9d5bdb7906366b423ff1
+EBUILD rspec-2.99.0.ebuild 756 BLAKE2B 9ef59d83c8444553ebd284ccb1f4b380a13da2bd4f264f1c07a2141ae5eb161140209c25f939dc8797095b98bff5f35ab44c29c4d8536fda67164c137fb04df7 SHA512 1440ee45aa7f8e9d6fc9f9794b891a2aa9c6096aabec0ba163046c67096a2fe26295e9baaf971a068f4f1aff9562668c416359ab434394249aa2f8b5021aec73
 EBUILD rspec-3.10.0.ebuild 623 BLAKE2B c7e4ef791b19198ede72a0a35e595ea4cfb6751aa2710490c2750462c0540b4c74c94840af0984a052c359aded136d0139195ab0148929a6235735774515da3d SHA512 74804528284286c96c653189683ca97996e6325789ae0c4d48815c939d98118193868d24a057576ebbff3761902dc1023648f17bc620a62fc9a773235bdcd551
-EBUILD rspec-3.11.0.ebuild 630 BLAKE2B 376b05991b66ff34df6ef031e70df43c2c15893b5dffb63deb18b73f93e698c457cb8a3c7ce6599a178f8405c20ad708b8e9faa6daebe2f096fef4a3dbc1ffe9 SHA512 407fc65c403862677f12bbe1ad4610b8d4c878cd6875151844538ef966eb0682fa068a86972b516254af5c1e4c4b51f273f3e5ff81368f76467b97df4ee98f7e
+EBUILD rspec-3.11.0.ebuild 637 BLAKE2B f5899e229e0280ee127a1910cda940b2554107da3bd07485bd1844284c518e15f4e4d2b33e793795bd96f46445ec53a87ac625813375f42ca612f1876b6d50a9 SHA512 1d7ccea55dcef85d425da79b499e6137cbd40d10fed1229d1daab24d7e3886d57e676938059b0eb2d138b3be5c333cabce3e246992712057d39b94001b9e9674
 EBUILD rspec-3.9.0.ebuild 616 BLAKE2B 5ee7420b2f39d491dd42555ffd63047cbfb40d598b39912210b37a09bc0e7f7ba633a2e4f3d53ebdc3e6658bd1fc869cdb08cb85b033bb8d18fb4814439924fc SHA512 6654d32e2f13da07e83513131653defd0717f63563c30e631e68bbb5d2ddb5dc00649b19002d94dfd5071a6af56c0234f595f4b53705929ea61e936cb615c8b0
 MISC metadata.xml 338 BLAKE2B 1e5e8d2aab4bb1d0c8d8826267a9d957cd051b4d9d687f38609d44f78222bcb13f415f7ea46aafb968f005a701b94716e00137d8e5afc55944f618694d9fdf5b SHA512 8230df512530fd14410adcb365feabe3e79b826b047759a2631d234bdc00ba807a790eeb646fba74547aac12c577a0b34cfe4ca1b71c0633728982f0b6d1bd17
diff --git a/dev-ruby/rspec/rspec-2.99.0.ebuild b/dev-ruby/rspec/rspec-2.99.0.ebuild
index ca99b70d6f0d..c24833cd4559 100644
--- a/dev-ruby/rspec/rspec-2.99.0.ebuild
+++ b/dev-ruby/rspec/rspec-2.99.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ HOMEPAGE="http://rspec.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec/rspec-3.11.0.ebuild b/dev-ruby/rspec/rspec-3.11.0.ebuild
index aeda19c5dbd0..d05d6b4a8d7e 100644
--- a/dev-ruby/rspec/rspec-3.11.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.11.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/ruby-augeas/Manifest b/dev-ruby/ruby-augeas/Manifest
index 37e6faa2ec47..47ae86163b8a 100644
--- a/dev-ruby/ruby-augeas/Manifest
+++ b/dev-ruby/ruby-augeas/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-augeas-0.5.0.gem 24064 BLAKE2B 7ee13cfed3e38bbcb7445305323d44f519239e177a9a0e2e98ee362629f6fa0166338e128ab31f48ffc3a37095ba450433128779be006a8add26eb0523e76142 SHA512 523742368543c617baa2b393e4682451d7fe20aecbcf9ab50fed0f5575119b3fbc06f79f0894cca728d2fee7d441cdd9f075dbcf81628835ba870930c3d2ac8d
-EBUILD ruby-augeas-0.5.0-r4.ebuild 591 BLAKE2B 98744a1755cda1eb275918ef0d60130da20bba20ccdfc130a0f9ccb179ae7105265e1a154bf85e46618c48acf423ba4f7bda3c32c2b03138a40b6dc897c788c5 SHA512 fd760c4693516c7e81b76876d7258ea73fa786002cbf1ebbd8ec9638ac83410e1ad1e8f4216608992a20f875ab9459e6e7d1298e464d0e16d447b047faca5af5
+EBUILD ruby-augeas-0.5.0-r4.ebuild 598 BLAKE2B ff602aa1dd3c601dcfbe4d5cfe1eec8f0322c52b1868b8b510de1169e848e67a2676202eab1523454175a03b2ef92ff5e2699df6be6b24506c815aab5923a8bf SHA512 614ab23fa4b25eac2ec79edafa60bec7c0e16cb23c780b9d9af1fd3b6daf3750a41a267700db858f68126f40d72beb568ffe76dcd1ec9451cf960211f34d16db
 MISC metadata.xml 328 BLAKE2B 699ef1b3cdbabcb5ebb270f571310e639923a4eeec31323b4c4d7f957b820337653b6f69be730e6fca7cea9460568de75374a45d19ca4f8fbc948caa6df81c62 SHA512 9698d620d6f1b05ba50732410900d6d989690350f32504f81010683c734e1459e5fa532af4482b12df0ad13e5d885174d107705d182e75b1d5cb0bc613d0319a
diff --git a/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r4.ebuild b/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r4.ebuild
index 4251ad3c24b5..65d3d6c1f23e 100644
--- a/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r4.ebuild
+++ b/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_DOCDIR="doc/site/api"
 RUBY_FAKEGEM_EXTRADOC="NEWS README.rdoc"
diff --git a/dev-ruby/ruby-dict/Manifest b/dev-ruby/ruby-dict/Manifest
index 2c0b3f900e4d..739c8e30fb9e 100644
--- a/dev-ruby/ruby-dict/Manifest
+++ b/dev-ruby/ruby-dict/Manifest
@@ -1,4 +1,4 @@
 AUX ruby-dict-ruby19.patch 472 BLAKE2B fb7fb083ce6a0d33b01da92e6eb0a44fc0494767a48a79817cddb2a17d8cd831c0f5dce3e5376d377ef916c7e72f5a066180374cf6f07a85424fd861ca33e212 SHA512 632459a8c8a46a42b7d7fdc6771ccd57e2e0058ca2fac785c8a97fa9ed08b47d80bd29ad07e4b0ba356cddab42bcb3f2144b80dcb9b9dea100998f00aed49a6b
 DIST ruby-dict-0.9.4.tar.gz 50487 BLAKE2B fa812bf222f82bc91ccf5a4f2a225e3463d7d85677004e3131547a49da88f89af3632de6f18e1b95f4ca68a5f7c5b5f909a9e811faf849865c879b3658bf43fd SHA512 54ce421c1bf49d0d52fc2549409887e05ebac5d3d1d50fc1b3a2ef55eb1242af509e3fb2ee046ee3389b088ca951a9903e9ea3ed3ca3dcfb0d521acd0eb54c59
-EBUILD ruby-dict-0.9.4-r5.ebuild 722 BLAKE2B 25c1241d4aeb3ea9e384523bd152a2a0193d9708ff149e4857c4b26a10ecbbc2d31f81f940542b9182d0e4fec312eb68034be1649ecb5ccb68d6098e9bb48e75 SHA512 6fe9c8e0c457d1e9a42d7a12725d8b783af6235f77b467b0c409303d5c58f5e680158dd5a1360dd4a9e57c6693617e50b03f944a8f8aa047d10ca480bdd76b5c
+EBUILD ruby-dict-0.9.4-r5.ebuild 729 BLAKE2B c6bcec35d77b31c6228a6107f7ab8c62774606e100e45ed9ab6760e65e7f14b317b6f380696532ad0695cf08ac35907c65ef986f86c464f7eb0bdd82c8f61907 SHA512 e62158c1d6ce9a99145fc9952d80935add0855f5d160972cca29a64d504713d17060cf5f5f43abf2140de31ac904184cc4fa225c255846a014c26f553dbbb1fe
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/ruby-dict/ruby-dict-0.9.4-r5.ebuild b/dev-ruby/ruby-dict/ruby-dict-0.9.4-r5.ebuild
index 9e223cecfe2d..92b72038db39 100644
--- a/dev-ruby/ruby-dict/ruby-dict-0.9.4-r5.ebuild
+++ b/dev-ruby/ruby-dict/ruby-dict-0.9.4-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 inherit ruby-ng
 
diff --git a/dev-ruby/ruby-feedparser/Manifest b/dev-ruby/ruby-feedparser/Manifest
index 90ae400600aa..8e50265b3a7c 100644
--- a/dev-ruby/ruby-feedparser/Manifest
+++ b/dev-ruby/ruby-feedparser/Manifest
@@ -1,5 +1,5 @@
 DIST ruby-feedparser-0.10.0.tar.gz 2697849 BLAKE2B 679e8442b5b11eb56b30d346edc54d76d8f94f43ab26299ec0dd831faf6acb7fde304b4d6f8147d67ab013c9d7e50c163fcb75e8aa10ddc9091529e29eeb0d79 SHA512 0cbf8543a73385f1bd7fd2bcd647828e4e03ec648a62cd898cfd58ed574ede68760184037a5c7ba58acc42d1d51c54158ad1247216ede415791d0bbaf99a5ce8
 DIST ruby-feedparser-0.9.7.tar.gz 2705854 BLAKE2B d64d35696dd66890013643339817cf470e714fef4ecb5ad8c12a221fd949af53b6fa3668ec2ec16ac0a5fa76eb8dedf037530881ce2545356a4bf20dc7153b01 SHA512 6283e21448cebbfc0d07c01d24be48acadb852110c9e940983a22ce3c95592aea12a99dc4763aa267ba7386c935e2f58e52427b57171aa8fcaa332c6bb440fed
-EBUILD ruby-feedparser-0.10.0.ebuild 958 BLAKE2B 5902131e8d197feac6a3d9c699d729095e6c2374b77ff8a91f2f2dd37edf65ce60698562a1162d5f23804b635c3b04bb35c364562aaee993d384bb685741b4da SHA512 9b60d253b3936bef53a84c474fb5e1878acc6703b5b1c3afed5bbfbc568cfe414bda173c833f416f543d45a897ff11bfd435ae3dc9fa6c9016e6d97a66143d00
+EBUILD ruby-feedparser-0.10.0.ebuild 965 BLAKE2B bf954f2a0f1958419764c49fa3db93f9715154552adb31cc1ab3550d0efb760f5f46ce2db7300c3a1b69b41fe23e1d7df1714c3233dab8b8304f5ff4c14525a5 SHA512 8becac2787af27d712f42cdef1a377090f3ef966478d220dc61adfbbc2bf5df3b92399d6f35ae3a55e731568e99c5df3dab1c7a33a6428cbe04f58f96d5ec8a5
 EBUILD ruby-feedparser-0.9.7.ebuild 971 BLAKE2B 22e922f929c2bc715244131edd11d6be154b0a662cd8483c46502c89d174da86064a5949a877a051c8e2a67460b2662c4f7093cb1aa52651729c75414947fa86 SHA512 a448d0196fc7bd95722ec772bf90e481e74c5cb4abf5e71d1faec4f482936d0808811ffef52b49ae1180c2d7b7694e32f50f6007c34564e6d36ae5b33845d41f
 MISC metadata.xml 352 BLAKE2B 4f2ef2ec78d4bd600e9207801e1f44c904df6fdd2baf42f361477c2ac015ce1cdcb20073d9806d579ce4df0f7e142a7b348f779888fbb07c6271c9ffbc3c22ea SHA512 3829503d9c799ae275340892ad81708393ccaea1fc0c65d678ce3c856fcae01546c02dabb340dc12582a774203e8a8b017c918adc66e1178c79a80ac35a79f2a
diff --git a/dev-ruby/ruby-feedparser/ruby-feedparser-0.10.0.ebuild b/dev-ruby/ruby-feedparser/ruby-feedparser-0.10.0.ebuild
index 23d1ea00f7fd..8b34225bd149 100644
--- a/dev-ruby/ruby-feedparser/ruby-feedparser-0.10.0.ebuild
+++ b/dev-ruby/ruby-feedparser/ruby-feedparser-0.10.0.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README"
 
diff --git a/dev-ruby/ruby-filemagic/Manifest b/dev-ruby/ruby-filemagic/Manifest
index 6a8b2b133294..b8c43357dbf5 100644
--- a/dev-ruby/ruby-filemagic/Manifest
+++ b/dev-ruby/ruby-filemagic/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-filemagic-0.7.2.gem 19456 BLAKE2B 5008fb27a5b6bbd93522c72381b1c74788e544e6120f3c44f4a594b360ee783d4e92e73ef584a8e56c1776a5e5e824d6fa603df135b6e1779fa460c19c3bb4a7 SHA512 b68324dfb0cd2e55cd200696fabe87c0aa68a11922789ae40abc999db7d200810cffa2c414c07bc96e2fee54aab775f01752f951b3a3273289594201ca547494
+DIST ruby-filemagic-0.7.3.gem 18944 BLAKE2B 5694e4e2dfa4af05c6e9966715feaf1442c4c884b42fe98751af1a4fc74506461c9d42cd42cbe99ed341670950dda5c06ae5a23afb73bf8a88273f9ca6880cd6 SHA512 8bbc7fcb1dd7746061264ee433d501a842bfea30d7eff40b6dfb0f5c567192e6aa161e67181a474a4b805bb1adb9fa3bd43e314abf14c3ce3ac11d72598b2fc6
 EBUILD ruby-filemagic-0.7.2-r1.ebuild 1102 BLAKE2B 995ce43953a029b7a1fff8e567944f274d273cd80db17ff59a7e79341434295e720d395361d84d33e5cb54f114d1903b7acb3b6f67558e7fa348e5b99cdf4c13 SHA512 39f21f1ecee6988a3e20491b7e77b70b579a5dfc5921f357d77d5bfe62630e18b4ed48daccb34151efa9287bb9a3680e921727cd38ef311d516ab62a88e24061
+EBUILD ruby-filemagic-0.7.3.ebuild 1054 BLAKE2B 339c92df63d183272891dd9cb5e1a265e0e9683d370b5d1e816f6ac32cfa3850673eea7c92e7d3217babfcea501834ad1a0a68c397ee7f7d88a13a00052c7f94 SHA512 e81a0fd6f29b70b7af6fbbeae5b9f98bc9f0573e05794fb919b26db9e6b08bf41244373a8e334fd030f0aa776b09e953dd5969ca454d4941dd88fd57d526570d
 MISC metadata.xml 343 BLAKE2B b0c693e2808144016e602ed141a51c838015d2640e2f4426fa8e35bdd412c4473f9dc8b2a866e028aa5686256563251d65b4ea07ed15b8f30795681642739fbd SHA512 0cd112a7405012ca3605c5d2e11fdea123fe1c16a34bd1fcf97a063e88e1663280d744a4cd93c2b75c1d73e3d6c4a144fa7ee915ac705615cc08838e2afe0db3
diff --git a/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.3.ebuild b/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.3.ebuild
new file mode 100644
index 000000000000..84da5465bfd0
--- /dev/null
+++ b/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.3.ebuild
@@ -0,0 +1,41 @@
+# 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="ChangeLog README TODO"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/filemagic/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/filemagic"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby binding to libmagic"
+HOMEPAGE="https://github.com/blackwinter/ruby-filemagic"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE=""
+
+DEPEND="${DEPEND} sys-apps/file test? ( >=sys-apps/file-5.30 )"
+RDEPEND="${RDEPEND} sys-apps/file"
+
+all_ruby_prepare() {
+	# Fix up broken test symlink and regenerate compiled magic file
+	pushd test || die
+	rm -f pylink && ln -s pyfile pylink || die
+	file -C -m perl || die
+	popd || die
+
+	sed -i -e '/test_check_compiled/aomit "different result with file 5.41"' test/filemagic_test.rb || die
+}
+
+each_ruby_test() {
+	find test
+	${RUBY} -Ctest -I../lib filemagic_test.rb || die
+}
diff --git a/dev-ruby/ruby-glib2/Manifest b/dev-ruby/ruby-glib2/Manifest
index 8724fd1efdf2..c1f36006256d 100644
--- a/dev-ruby/ruby-glib2/Manifest
+++ b/dev-ruby/ruby-glib2/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
-EBUILD ruby-glib2-3.4.3.ebuild 521 BLAKE2B 14edf343224b2d497df8db1ffd58c262bd1d410edbd009f451ba7f6d253d22ad2a6c658de818323bcec1e5b7a86346b8c6b9e76bbe6833c22a67f01fb6d578b4 SHA512 7166612b8732cca63bfc88a51604c789f0079dba781d35bdf44dd2c110d3eb53523c01f23b9fc332c4fbdac9793e8f4ad24de7604cedb29990f8b3774b134716
+EBUILD ruby-glib2-3.4.3.ebuild 521 BLAKE2B 2e8dcc5b352effb21f95740d18df55766463a8d14edc663d80b0607f8686cdb71d77b64ef79e0e36c986f1e604cfc4ae55e4001ce780dca4a3c4313a5642417a SHA512 e2df0aebdbaa3bb35bf1f8645f052ce0b783bea6f52f220e7dbc48c6cc90f6a4dca072f18d976c9714733fcdc3998ea68a230a0d8cef83588060bf38014a8f7c
 MISC metadata.xml 338 BLAKE2B 28afb4e4601ddbd918344e8ea4668d18b43122fd5db29849d806919be9da2889d21fa047bfc43cbad6c95ff0e0f1bcdba2c2ba0c5e0b8b27ac7a235f534cd163 SHA512 72c7dbc3d22142137d4017e7514cafc7c900b673a571b44b7c649dc8776550d504052cce7f48164594939f1cd01e0fa5034a1e8c3b9c4a5f7176f7760ba692da
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.4.3.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.4.3.ebuild
index 6c09a14b42a0..a90c72451f74 100644
--- a/dev-ruby/ruby-glib2/ruby-glib2-3.4.3.ebuild
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.4.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 inherit ruby-ng-gnome2
 
diff --git a/dev-ruby/ruby-ldap/Manifest b/dev-ruby/ruby-ldap/Manifest
index 8846431c4b1f..c241f62a0b4a 100644
--- a/dev-ruby/ruby-ldap/Manifest
+++ b/dev-ruby/ruby-ldap/Manifest
@@ -1,4 +1,4 @@
 DIST ruby-ldap-0.9.20.gem 67072 BLAKE2B 626a35ab764dacfb37c727d867e1d435222730a3e7ea745ee4e7ec051ce3a822cc5a1230b463bc12f4a2390db667ed3b61deceb9842c014f64cdf43a26d285f9 SHA512 4f4902e7eaf4fe0cd421d58c73ce4e625d61ee20ef02363d3cf5754c66237e0f378ac433b234c2b86d5f5284ae03b7ae6c46d3575c512487bc1a931d021c9517
 EBUILD ruby-ldap-0.9.20-r2.ebuild 1075 BLAKE2B 0151ea8fa3c3387b200d074667a4494cc2f41780fda788469c750cde96cc895fe249de8c6546df9117339805c1e3e107df99e44ffc57195f61241bf2f92b4d1f SHA512 7fd3c8c95b0657c0e6a22bd27c2a6b53fe4a7f8539084059577a0d8308d9752179ff1b4db3a5a282d1749fbf3e27093e53e942cd275b06a9c9f1f55556b04895
-EBUILD ruby-ldap-0.9.20-r3.ebuild 919 BLAKE2B fdbc73c5a25ece03f0b8af1c48de27b8c8c7737e5ce38194d8bb81af12873fa53ca1561440ca540bda14359a0f34c4c401e628592c25742a9c070937cbc1cc0f SHA512 6c37214b81c9f0d25651385878198d776408d0fa695b1d665b4c536b237b07ae5b82a2fd4941a8e2ffff6ff686f70289e5380e50a0da656d4060632ac9f5a4f2
+EBUILD ruby-ldap-0.9.20-r3.ebuild 917 BLAKE2B 77226f8fb5862e45dd30fabeb2ccc2f47c9f1fe78bc6ce9f6dfb183e78c4a1c60586eeda8f1b4573306c7288ad193a005eb210397c62de9dd243fecd96e3244f SHA512 9551cad66f3f0fae3ba3506ae0533291ea56c8fa72e6637d7072d75697b271276b9072a9da142b0624c3cf45708c6a85dedc3603c7289812ebd2dc79f0a34181
 MISC metadata.xml 391 BLAKE2B c7512c86b40f4a8cd418e12633883da21a0ad0d9de73d05307f5f2b0fc2aca31b9835cd709f5f0a52b487cf7197253a3a2b579d38ff44c91ae50d8469ac3716c SHA512 763bd735ebffb233f9a66e77754de2092c868585565a2c0e770f9e8909d0bf7e3bc312658f6d6d0f124e93c45e06ea9bbd864137ad5d7a1e3979f56e24713180
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r3.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r3.ebuild
index 8c703907ba09..f1c7107cf8db 100644
--- a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r3.ebuild
+++ b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="A Ruby interface to some LDAP libraries"
 HOMEPAGE="https://github.com/bearded/ruby-ldap"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="ssl"
 DEPEND=">=net-nds/openldap-2:=
 	dev-libs/cyrus-sasl
diff --git a/dev-ruby/ruby-macho/Manifest b/dev-ruby/ruby-macho/Manifest
index a8e4c98c1e15..6e968b84ac12 100644
--- a/dev-ruby/ruby-macho/Manifest
+++ b/dev-ruby/ruby-macho/Manifest
@@ -1,9 +1,3 @@
-DIST ruby-macho-2.2.0.tar.gz 65473 BLAKE2B aedb5524926649d2f1612c135bee2cd18e4740412afd5d0e21616edae46fa4111208d8490fd83a0fe95ed13bd7c33a8a347162c34667f3f4d0bbdf86258bc4c7 SHA512 bfb13d0ec52f3fd2a359d0ae8de1437c272545f0ecf594c13ee491089ee79e5d70341e3557e840e82c0ca7d12dba27daff5d011903239d5caaee44f5d5189a97
-DIST ruby-macho-2.3.0.tar.gz 66200 BLAKE2B 7ef2195a5906b8d7bef1b5baafd74887a0501c5334c6045069c00333b5f94d298487f98e6549739b090bda2f295640ccdf8bfa0d10b26608899b54ac4b02c022 SHA512 8ebcf38cc0282c32c6755d76539e7b3836de8f2ee5d2ef659d74a132b19fda73e24d85182b3e70e8d0dc599d48f904b7494e4232a508722aba9d789b151d2fd6
-DIST ruby-macho-2.5.0.tar.gz 66548 BLAKE2B 256ba814e495a10273cfb8d92e9da9947b6ecb19864b7203f334e58c1dd2aa1de9832300176826e8251784d0b76a8efda2797e1c2d5d3415dbd946e94bbdfcc0 SHA512 a7cbe2944a302e6320ec098258b08db0359808abfddee56ef82d541b0473202d92fbacc5560a73d8cd4d17dff6b0b80e1cb93c021a178a50393facd72b9a980f
 DIST ruby-macho-2.5.1.tar.gz 67901 BLAKE2B 4e3c04b86c664b44d022dc6ffe91e981a9f936152d85999cf8f11846eb51a6e38625e2316f09a1685ace546174800131cf899ebc8810e0f2c6d95950384005cb SHA512 4836af6b81a0452e19a3950e140c8131fded97a45853c2fdfe3955aff52e1619a01471a789c575e092fa62e5c9f09034b6b4d76e669f9c6475669e6b25d3c617
-EBUILD ruby-macho-2.2.0.ebuild 627 BLAKE2B 7c6cc8b3bc2beef434c6599c591e418e2fa4b0db52a62780f853282edfeb2d176ce79471c5f0c9353c35d999d31095ad5a8458a17a38ad9140c2594fbeecd67b SHA512 15833cda6a01202e0b414be8a67576c905d093c2b054ca322e1bcb556842066f10175f8619404949165d78bdf33f04700479c027b069945eab817d799806beb3
-EBUILD ruby-macho-2.3.0.ebuild 663 BLAKE2B 0374836a7f6c01b0782fb5e2b5aa496e4f2fb3972d8ff39d49a75f41cb70693db4885f6520adf8e1b61fc511f1da108374b499acee87e94e151e0c46bd7577a1 SHA512 87922dcfecf10c0b90925612ccbd5b571f2cadad8b8c5fe2dc36a326b384b5496fed6b9446618121e00318e99b66e3d228ced7994a8112f9fe37477bd61aa6f7
-EBUILD ruby-macho-2.5.0.ebuild 632 BLAKE2B 53534a8af161a1845e91862a91e41fbe2b28a77460949fb841e684b08bb99ca12021a400fb112603688bea6c3fdf02c40f30dc1d067220be969cbe6881cdf922 SHA512 82e2cacf8f53f470ae621f17a60d36059cc2a613acadf56ffd241884c6381191c50e112794c824c20ca4ae61f895e17c7ca17b958ecf5e125f7a47f21245b361
-EBUILD ruby-macho-2.5.1.ebuild 639 BLAKE2B bd3ed92fe625c586bd13b8c3d29c92dce1bcfaf6995ff8ac3dfcf3cd6c0b5212d89c8037519925075a9ff4c524f9b1b970455b12183694da9deea3c6e186e1ce SHA512 0afe4c1456e8aca90adec8a94a37d3f41cce09b85d113c0456f357f21d1d2426a3e6f8ad62b443f9828150e6bffd2ab0972f62a9397d6b162ed780ae193fb23c
+EBUILD ruby-macho-2.5.1.ebuild 639 BLAKE2B adc81f597290aaaf428a467dcfc828eb1a85edcb68f55dbe565bc0eaf3ea40c3fceb006d5144dae3599f4601adc11acc3c147f32980a5853cba7b4de79e37a45 SHA512 a18e89152cac3030906eb8d5c077ff8b6536e874409355725aa663e8a42efb38f1fb6d21520b3d341242f759a722fb3bf3c2c8fa587e5b501795388ce81c6639
 MISC metadata.xml 460 BLAKE2B 7327d978526eb3a706c0118ad6b259ad477442761fa0d5806932c76232ec1f1f8ddedf8d56101607a770a9519de9ff4472f2343c1ede5411176101fbdf7ad671 SHA512 0897a29bc6321465a4d51f4f4a139adf49efe74a7229700b6a72c88dc2fa764473663989d3e80aef75975116a4fbe43dc974c136589c3b370b1061adfedb28c1
diff --git a/dev-ruby/ruby-macho/ruby-macho-2.2.0.ebuild b/dev-ruby/ruby-macho/ruby-macho-2.2.0.ebuild
deleted file mode 100644
index 9f4b5d46e15d..000000000000
--- a/dev-ruby/ruby-macho/ruby-macho-2.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for viewing and manipulating Mach-O files in Ruby"
-HOMEPAGE="https://github.com/Homebrew/ruby-macho"
-SRC_URI="https://github.com/Homebrew/ruby-macho/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid benchmarks with additional dependencies
-	rm -f test/bench.rb || die
-	sed -i -e '/test\/bench/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/ruby-macho/ruby-macho-2.3.0.ebuild b/dev-ruby/ruby-macho/ruby-macho-2.3.0.ebuild
deleted file mode 100644
index 922d1019b682..000000000000
--- a/dev-ruby/ruby-macho/ruby-macho-2.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="ruby-macho.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for viewing and manipulating Mach-O files in Ruby"
-HOMEPAGE="https://github.com/Homebrew/ruby-macho"
-SRC_URI="https://github.com/Homebrew/ruby-macho/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid benchmarks with additional dependencies
-	rm -f test/bench.rb || die
-	sed -i -e '/test\/bench/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/ruby-macho/ruby-macho-2.5.0.ebuild b/dev-ruby/ruby-macho/ruby-macho-2.5.0.ebuild
deleted file mode 100644
index 4ad3eefba916..000000000000
--- a/dev-ruby/ruby-macho/ruby-macho-2.5.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_GEMSPEC="ruby-macho.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for viewing and manipulating Mach-O files in Ruby"
-HOMEPAGE="https://github.com/Homebrew/ruby-macho"
-SRC_URI="https://github.com/Homebrew/ruby-macho/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid benchmarks with additional dependencies
-	rm -f test/bench.rb || die
-	sed -i -e '/test\/bench/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/ruby-macho/ruby-macho-2.5.1.ebuild b/dev-ruby/ruby-macho/ruby-macho-2.5.1.ebuild
index 968b9a74ccd6..eb611fd69a35 100644
--- a/dev-ruby/ruby-macho/ruby-macho-2.5.1.ebuild
+++ b/dev-ruby/ruby-macho/ruby-macho-2.5.1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_GEMSPEC="ruby-macho.gemspec"
 
diff --git a/dev-ruby/ruby-net-ldap/Manifest b/dev-ruby/ruby-net-ldap/Manifest
index f6c7900f495a..5d2d3d526017 100644
--- a/dev-ruby/ruby-net-ldap/Manifest
+++ b/dev-ruby/ruby-net-ldap/Manifest
@@ -1,7 +1,3 @@
-DIST net-ldap-0.16.2.gem 94208 BLAKE2B aebfc53b29c3bf81eecfc50a7422bd30b7dfe1894f8b7ceaeb82e346ae0e3ecbf463f3f15aab2200d42a391782a07cea8bbbf3f1c0d1cd0ae95959ef77bc8a14 SHA512 5d0e63473b5e1b1133463a49ed1c88fbf00fda06265a9a091fdb513f1d20fb45e5227c6384a9adc82ad71082ef07786cf63143060711b15386ceb7d3bd7b800b
-DIST net-ldap-0.16.3.gem 94208 BLAKE2B 637fe661e1ccf962cfd224ca457c7c4b9b51ec15179d4ca8d429947c45be3ded8dfde1f99b5f4a2c7ecb51682828689086a8ed0598e03905c8b77448bfcb1244 SHA512 18b9b290eb37c2378953011db4d92d41c18d735ae7908a98650b0c941ccc0eb0f44a3686c8ad987066de2a3ff04a58acb9267215dc214212f44ae5fccfcbe30d
 DIST ruby-net-ldap-0.17.0.tar.gz 92548 BLAKE2B 45dd1f6205af25735c8ed55a28ec91084e0b95403fa4c4a06310a19f1a9c247cb4cd1e8be7bbb26b2423c0d05afb4cfd4e8b2eed4e552aa78c9b4b44102f34d8 SHA512 417e946f044db2fda8ceb8ebfee2376310308ac6a1949e165beff0a9c2a8b410f88ffcb607d27ab060d1d55364cb75fd41753d101a404874be6dbbec3875f192
-EBUILD ruby-net-ldap-0.16.2.ebuild 629 BLAKE2B 153ce9b90e84bd6177e46d1438b78cb61711bf3f2344922fcecb3f8d0d6c8fdb483d007c81de8b6419360a0d694b38bd487856fde0afe9d5428671c599ef8a00 SHA512 2cd38c26412f0d2f4949496a75099611b9914959febfa0917b19bdd8ced5feeb7022d8c558e3ba173d38bb3990c71432bfe4b1a5e981d019aecea5e2a97bed9c
-EBUILD ruby-net-ldap-0.16.3.ebuild 622 BLAKE2B 8670a1ff8d6d2c976da284b9fc65f7a8ae30ebbe141add8d6c766e3131480981febd22bce12a17e397d06b76ea017de54e551a82091af00c5344bf50219f3903 SHA512 25707928cfd629b4efbba14e27eefac31ac9055ec5821b4ee0aea2103a71cf36b18948f3189fcd033e90e44e18bfbc95bfa7fe34035529fc581b084292e7fb7f
 EBUILD ruby-net-ldap-0.17.0.ebuild 841 BLAKE2B 58aa88e708d9c5130ef714467edc32a3918578b6f796e3a21b2cfedd1a7e7c63426bd316c73c8b815d8901d3867d2c56074b1f06ee88cbe7ea228ee56cf871f5 SHA512 a3130d2f6f427a5bab4d6d3129557936abd1e7903af2de99a7f648bb0e28e7d316fdf416427c8cfc853ca7771aa29de33f29d1ff0dc55365be94cbc056ecf66a
 MISC metadata.xml 350 BLAKE2B 970f02950a37e39aee562a8e0c18f87598d8122b572c9938f6162343de385e8a33445a267a8ac87ccd70cfa31233e30d9e3c7b79d76c9c4f20569c278b91c4cd SHA512 e30f9f048302cafe6fa3ce2c4a5c3e9cd0adf8d2dc65b7fadb5ef3d961ef4b2ce3077a0ffaec1dd3a96aad3eba8b1df74a17328fd30f0aa5b65de7139394544d
diff --git a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.16.2.ebuild b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.16.2.ebuild
deleted file mode 100644
index 264834ae7694..000000000000
--- a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.16.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test spec"
-RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc"
-
-RUBY_FAKEGEM_NAME="net-ldap"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure ruby LDAP client implementation"
-HOMEPAGE="https://github.com/ruby-ldap/ruby-net-ldap"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/flexmock-1.3.0 )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.16.3.ebuild b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.16.3.ebuild
deleted file mode 100644
index c2909e1f1c21..000000000000
--- a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.16.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test spec"
-RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc"
-
-RUBY_FAKEGEM_NAME="net-ldap"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure ruby LDAP client implementation"
-HOMEPAGE="https://github.com/ruby-ldap/ruby-net-ldap"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/flexmock-1.3.0 )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/ruby-odbc/Manifest b/dev-ruby/ruby-odbc/Manifest
index 9971a13d93cb..cdef2e9fcbc4 100644
--- a/dev-ruby/ruby-odbc/Manifest
+++ b/dev-ruby/ruby-odbc/Manifest
@@ -1,6 +1,6 @@
 DIST ruby-odbc-0.99999.tar.gz 76934 BLAKE2B 59de5a544b7eefe8e181f2c6a9a61915361743ef5f7554f778667b50ca0dc57fd0c4f71e406ad6f1d00fb2c6a6509030e61ad34dddecff61896f7bfe383d0a9b SHA512 05e3e67a895406e1a57fbea6f8ecd1c087d836794ea3245bd9eec888eb3c46fa2bf2607cc1b8fdc416d7bc531d783d621c03c9fde004db8c2e431fe838c531af
 DIST ruby-odbc-0.999991.tar.gz 77110 BLAKE2B dd32698811f14e05f1190ffd73b390fa02924a1dd936db0b2b3c6ac9d8d8663f5d400ff89e03591081b45d558378a76701cf6b8be8502297a141c271dde3c24b SHA512 3f1e2e75e31f10f47392cda1cd28aa54451a499c3bd6e9224466a7b338406835a5d453600e79a3bac040197397c31d9f744567969058969685d6f4e06e72addb
 EBUILD ruby-odbc-0.99999.ebuild 1442 BLAKE2B 53b660e6b9f1af6b1fffd893527f541839f9d16c63e69bb5be7f001dea79f63e2f3a46145ec45336a64b6625bb48fe79704320f63d31071a1166cd92e2982449 SHA512 b0d087a0302422c8615faf5debdf97e847a76e1ae776353262e161a88db9dece320194fe400fcc03fccf58604ddc39c4047efb2440189ab319ed81b9c8f286c5
-EBUILD ruby-odbc-0.999991-r1.ebuild 1166 BLAKE2B aa7542d28ffc5f853f99a5e2d9b28ab602a8e9d0685de90edd27cd931d199a1992ca7fa4bc35cafe297c266b3798eea90195ecf52213695a8342f5a588b158fc SHA512 d36008a031a5a6f1063b6af81ce6003a0cc4e06acb852badac88ce136d02aa1dad3fdea8de3e8be06538db8ae443a304f8131c554543918693e409863125098f
+EBUILD ruby-odbc-0.999991-r1.ebuild 1173 BLAKE2B 3e943d2c587e89862c8aceea7b4a2881d10ce41e1403a5b251a23324f4ad19242eb85bfc2708adeee31a43a003170a0746ab48a0acfb426abfa96c6378b050e6 SHA512 da5e377728524e372c667f9390b018bf7262ff6266c11606ecfa49f05cec67911ea1907604519ab88daf81db0f20e4b319991b6dc7d091b5b827d1faa66b6039
 EBUILD ruby-odbc-0.999991.ebuild 1487 BLAKE2B 91f09f5a6ad22e7693755696d7358dbe6caefcc21e873306381949a4e2a7b035070566cac95f0771e51f3ded49e276a7ea1dc322692b1eac980c875217916f41 SHA512 2f11586108acbcc94d48ada8613ce93585f16ee7e10fdd89a587f5d0b5aa5fc2ff8e485d22be8443a342f44c6147a108c1c80cb6e8569569fd74ff2d7ecb7c46
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/ruby-odbc/ruby-odbc-0.999991-r1.ebuild b/dev-ruby/ruby-odbc/ruby-odbc-0.999991-r1.ebuild
index 2b0b870af052..6c5bf2cef9db 100644
--- a/dev-ruby/ruby-odbc/ruby-odbc-0.999991-r1.ebuild
+++ b/dev-ruby/ruby-odbc/ruby-odbc-0.999991-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/ruby-ole/Manifest b/dev-ruby/ruby-ole/Manifest
index 43ea51adf837..e7a636c0df8c 100644
--- a/dev-ruby/ruby-ole/Manifest
+++ b/dev-ruby/ruby-ole/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-ole-1.2.12.2.gem 56832 BLAKE2B 489dbaff30d5d293f5c04672c2e8dd2a6144f6b32fb22319c4691a351318f0aee8fd5d01106f3ef6abaab40e81cd86c8ba9d93ddb1e004240eb052ab6ce5675e SHA512 2c28336a827e42faed4183d79ae61d4dd2b888f3d13eb26fb2b7e967057127a01e184fb509c6e4718e7beebb7490ea2f7aa230f2c5e29efae49994fa92d604b7
-EBUILD ruby-ole-1.2.12.2.ebuild 711 BLAKE2B f3631132b18598908a32deef6ce4ecdca90e11443f7ba998ace5a3c1f48eb5a5826cdb076fa84fe02efe4b28a448e26a26066f0ff3c67a9a45557d716e55c782 SHA512 058f904629595c4428d9f8bb8ad7d9fb24db401037569f005318b3b39f29ee11233bdf618ff2018e91ce7d73465a8d0979005a5ee9554925fdb09c86e80509b1
+EBUILD ruby-ole-1.2.12.2-r1.ebuild 711 BLAKE2B 18a1d1bec3bf661c53a842d5bccb7d41ce6eac1b6a07561ce4b20d5171b2b3f6129e55c00e7dc0bd702a2369892f34900251731d5d5248246cee0ec4a950a671 SHA512 ec78da53d7c642dbcdbac06015863c5f1a6814fa87cde027de49f6cdebac8aadaaffe2b4d9c67f98768ee198e9d42c39d4e55cb62acd8719a93b1cb2aa6a873f
 MISC metadata.xml 457 BLAKE2B 99f740fcd9faa54b10a0cb93ad9318f294c0d0a880337167d5bb2bfa0999de7e251232dafc0e276237cba5d615644c8bcb4b399aead5ceb8e6324bf988c510c9 SHA512 668b1a24d94b9eebea8fd7f84b7795a9dad64f16b8a0cf1933720fffa79ea3a1ea655adfde94673226cdcf3c171d8c973d9f58934672e99d3057fcb01178e439
diff --git a/dev-ruby/ruby-ole/ruby-ole-1.2.12.2.ebuild b/dev-ruby/ruby-ole/ruby-ole-1.2.12.2-r1.ebuild
index 9e225ad03568..ccc0514b0eb5 100644
--- a/dev-ruby/ruby-ole/ruby-ole-1.2.12.2.ebuild
+++ b/dev-ruby/ruby-ole/ruby-ole-1.2.12.2-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=6
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 # Avoid the complexity of the "rake" recipe and run testrb-2 manually.
 RUBY_FAKEGEM_RECIPE_TEST=none
diff --git a/dev-ruby/ruby-opengl/Manifest b/dev-ruby/ruby-opengl/Manifest
index c760b0c84e7d..e5034aacd309 100644
--- a/dev-ruby/ruby-opengl/Manifest
+++ b/dev-ruby/ruby-opengl/Manifest
@@ -1,4 +1,4 @@
 DIST opengl-0.10.0.gem 565248 BLAKE2B e427590865e7ff13110d22a21d04a936cbdc7e559e80b37be94938a4b15c71ca6341d72bc093a45ca10e7cf419fe720e7c68866724a3c99ddc44314a4b054414 SHA512 8d85d7f8a25e429b18245a10c186d07a85fdc8dc4e158b0001cde2b6e4bacfe4b09552a3b3fba5e14439d2fdbe000ad23bba89563f58f612f79958283b588dde
-EBUILD ruby-opengl-0.10.0-r1.ebuild 850 BLAKE2B 7ff423bece79628be49c1b4725713dc2df1cb86960581f2bed6852eae607bd87c24d532f1cf3ebc9006ae44329451bcd9867aaa96510388299b04c57fc769594 SHA512 e175e3a93a0e5b383d234d64d05cc6a9a1de82466c18291898c2afed6ce2ac5212c5f1f8607187709e8dea6dc4070f81832b06751a5db4329497bf8ea0b97414
+EBUILD ruby-opengl-0.10.0-r1.ebuild 857 BLAKE2B db4d604b11a5461c06a1597164e0536d8f4c53b9286bf4bc55bf6c5ec0294b605afeaa2b5ea67c2f10cbaa9299bc96d2da340ee557572ee64c710cd5a2412127 SHA512 87e834e043ec2d83e1d0796b217c842ef03457004c0499c0c6f65a3de19c6bfb458a46e9c3b29de71386f93c52aa60b33c2507f4be1b19cb6a8ffb39e8022732
 EBUILD ruby-opengl-0.10.0.ebuild 965 BLAKE2B 031da0ac40d622e72e5a27b4f68ed507a84758432e9a40939d0142f8cca4d5ce509557e0d2a574c8fde869e4432d5e91915a0d76fdf8a22f526499e0fcb3e05a SHA512 cd3bc1643fc2c5c808d60f0745c990e124f9c10e2989455c51d4642dbcfecede3debfc33e603a091eddfe5ff995fdd84259d2e549c83b8a5e89ab1ead922f223
 MISC metadata.xml 343 BLAKE2B 54945a00cee8667a145873b8deaf5d66c0e66a570474cf633fc2d03a9138080d4c2d37bd5f6fd222b6c0a266670cc6b9fbc82a66f10fa420c282ef595f834ad5 SHA512 4cac2d060e9080a9dfdb1cf2d58d5e37fab395cf43e08601cb4cae9d5e66295cfab373fac3bfa266e821aef98d49697cd09642688fe43503d91e1476c32fe616
diff --git a/dev-ruby/ruby-opengl/ruby-opengl-0.10.0-r1.ebuild b/dev-ruby/ruby-opengl/ruby-opengl-0.10.0-r1.ebuild
index 588a4c366535..223e0018ba1a 100644
--- a/dev-ruby/ruby-opengl/ruby-opengl-0.10.0-r1.ebuild
+++ b/dev-ruby/ruby-opengl/ruby-opengl-0.10.0-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 # Two tests fails but the README already indicates that this may not
 # work. Additionally these tests require access to video devices such as
diff --git a/dev-ruby/ruby-openid/Manifest b/dev-ruby/ruby-openid/Manifest
index de7437c30d99..7990607bcb6f 100644
--- a/dev-ruby/ruby-openid/Manifest
+++ b/dev-ruby/ruby-openid/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-openid-2.9.2.tar.gz 514882 BLAKE2B 496b257087617537fc413931820fc721f026d9e7826d1684c85250d29d295ef031f834af31449e3448386f714c45a7db802d46531ca207fec099e2e2e80b9780 SHA512 5f4b696952d457ecbb99c6e2bc4b5c04557e8ed8d7653259eaf89a151ef43e62edc1936a28ac9e0d5a2c253379010d6c6a820be4bf2caa90bfcbf4689695d075
-EBUILD ruby-openid-2.9.2.ebuild 701 BLAKE2B 87aa65bb45f193a814d81606357593b19d72ac54507a4dfb15160215f7d2d4b118b4a3c0549a2185bd43330a932e2b5a39d13c11a850a176326ce614864184ab SHA512 e1155cea2f479f2972cc4fe95ca8aefe30db512d9d77e4f0d8b541f6f5e76bf0145cb2ced06b4d6ed09a84afbbe27e39fafc9a3f7fb334a34128a28937e30162
+EBUILD ruby-openid-2.9.2.ebuild 708 BLAKE2B 5dab3f9bb4935fac8d50ed2f82a1b12b75ade31fc4b355bc0ea06673cfb1862d3bc66ef0e788dda7aac992f78b78cb2c55d28b01627e95b726888f65664a3287 SHA512 b7f4f20c0292126a8b4b9053651667ce38cfa6866bc1aadc9740dea419d85142ce07009239a543dbed41d7522608c2e97d0af597f44eeed439cee2c2a15b07e2
 MISC metadata.xml 345 BLAKE2B 9e7d33e174f2409c99ee1c569b8002f88ca500d6b1bc9539b21cd313828c334aca2babf02bf45d2ee93cbcb30b179fa33a0859c027b6173e2c7621c75ddc7a3a SHA512 870de0ac6033ea397acdc11cc977e99c69c13e26719ebc9f9057f50164ed13442c7f740a3d8ba43d10328bf394be959b99cef948271fc4205239f9551377aefa
diff --git a/dev-ruby/ruby-openid/ruby-openid-2.9.2.ebuild b/dev-ruby/ruby-openid/ruby-openid-2.9.2.ebuild
index 12c8796205e4..eb13ac12b314 100644
--- a/dev-ruby/ruby-openid/ruby-openid-2.9.2.ebuild
+++ b/dev-ruby/ruby-openid/ruby-openid-2.9.2.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md NOTICE UPGRADE.md"
diff --git a/dev-ruby/ruby-rc4/Manifest b/dev-ruby/ruby-rc4/Manifest
index a77ef4695d3b..c1ba9a1c04d8 100644
--- a/dev-ruby/ruby-rc4/Manifest
+++ b/dev-ruby/ruby-rc4/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-rc4-0.1.5.gem 7168 BLAKE2B af70beb14218a5b83fe37c3244eea153e237258d0d5555a432340b2b4dd523ee250e2b0707d873c2e177cd12a2cc4609e42bc180ac87294d1291d5e4be13e311 SHA512 db0fd372a3534f0da6bd1c53c42f12691a54dcc36324819c14d1288aa8ba0fa99a04a3ce739035c11007f47d781f147bc0c0b9746e59bf2c8ed0e5830f2df6f5
-EBUILD ruby-rc4-0.1.5-r3.ebuild 548 BLAKE2B d43a8ef38924d85f7d20cee0282411f5fb4f2b3747fa57f60926ffb6f4f8d13f98f4bdc5c18f7ba94aaf6558cd2012894ce021219c25ed2f723f776bc24a0c1c SHA512 aceb881d3655913b56b5b487423800c01e73a62d8855fbdd0ee380c2ac857a23774fba823da6edbda3cc2021535b3bb31d3f83f1bdd7bc77c4490494c5328ad3
+EBUILD ruby-rc4-0.1.5-r3.ebuild 555 BLAKE2B e6b87bf0f2e8c316ca6656ff1bf56618291f4653b87c682161e516706c6358e0ae97e91d2f853e7912f4942f2d188ab1e00e58443edbec8435021877eeb3622f SHA512 fe3e22a182788bff611eaaeed62118e3b0681a8d3b335fc76a146122b482c76dea7e4013ca687d3c5bf7cde539c75cba74607075d809220c6870deaa7b5ccbc7
 MISC metadata.xml 342 BLAKE2B 198455d32cc5a5a9e3f2d73fad5f497d5e6246b7953ceeaf968d009feec7219ac642f71a8ac9449e4908a120ad3653a014d684b224d5bb791540708724e8412d SHA512 66a36beee52e1c777d1f438b5d3d8e25ab95ff65d38c7cc5eca59c2384ab8fc9e6909c8d71785900d0fae8ae7ee6f3d5f3cd97e3ea6d046c776ce79ef552e05f
diff --git a/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r3.ebuild b/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r3.ebuild
index 4bf7c58607fc..c683a3db28ac 100644
--- a/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r3.ebuild
+++ b/dev-ruby/ruby-rc4/ruby-rc4-0.1.5-r3.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/ruby-sdl/Manifest b/dev-ruby/ruby-sdl/Manifest
index 4fc54d4fdf84..bc856de0bd1a 100644
--- a/dev-ruby/ruby-sdl/Manifest
+++ b/dev-ruby/ruby-sdl/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-sdl-2.1.2.tar.gz 178105 BLAKE2B 84870279edcf2616159861267ffc8666b482786f43a30c8729cd4c59f25219956648270452bf38b72115e05235786ec8c0f0e7913469cc8573d9eda813d25726 SHA512 1ddae367fb4145cc8142edbf3c61acaf56604054f710ac37cadb8d04f93db24fc3595c1bc8e0fb5f330aabc815884f31b5f2a39c0108026fca442fc0b3bc2807
-EBUILD ruby-sdl-2.1.2-r3.ebuild 1922 BLAKE2B 5ae628cfc682b57e13e8c2a0700c643d6185ef03c76794993539fa31955ec37202e2ac1719a4ba346c7bf13a625590991f0c4e909fde4a604cca5330ebaecd3b SHA512 0542028ecb6d0c453ca568fda66cbb5802e571d7af2261ebc3e38abf2fedd1f37e8a686156fa0f44e1f7ea50e15a95b029f7df2662ef82e3f0e704282975ec34
+EBUILD ruby-sdl-2.1.2-r3.ebuild 1929 BLAKE2B 44f523c5fa0e2f2fffebdc216653a9d7a44e21a18e0e78c6036ee1170c6c451055ef6404964ec4e71c6f9b6191ef931fcd9b50e1f8bca48bcbaf2516f7ebd084 SHA512 2a7cb0a66ed434d8dbea3afe51982224c7e95903cd18be78cf8fd8ce9cea00753f662ba4f8aaef08b01c5935e137912d6b721617ac1e920f487fadf4ea1ff843
 MISC metadata.xml 561 BLAKE2B 68cbbaf3388b8a6cd8cfce543a9c2d699a96a7cac88099cc11025cbe718f282895f5ab45dcf3b2c49508d5634529df327c4e089dbd1ef9c74edc660282daf55e SHA512 fd927cdd409f8597ff594a6032cbfbc4bd3d86aa1d12130758d4ca3c32eaa80efcc8d4dce25bf692ca88b75d676bfab66a8655a55242933d7a1c61eee7bf6ee2
diff --git a/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r3.ebuild b/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r3.ebuild
index c377c03af5da..43c4580b3a0a 100644
--- a/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r3.ebuild
+++ b/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r3.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="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 inherit ruby-ng
 
diff --git a/dev-ruby/ruby-shadow/Manifest b/dev-ruby/ruby-shadow/Manifest
index f27354da9268..e8943c81c53c 100644
--- a/dev-ruby/ruby-shadow/Manifest
+++ b/dev-ruby/ruby-shadow/Manifest
@@ -1,5 +1,5 @@
 DIST ruby-shadow-2.5.0.gem 11264 BLAKE2B 22012d4672528e76a860e534fecb2a40d27c15f7440a0be6880c4ffd06be26e58d2f5279c385c49aca611864c8959ed0ea3afdd78bcdb28ac0912123f18a35e0 SHA512 1abd54df1bd4f29e135093df9b22886a726824f8b72b742017fd31bdc3fa39e3d79410a747cf2ebe4117f75e665fb89c904375b5c44a674bec91a4cc37646520
 DIST ruby-shadow-2.5.1.gem 11264 BLAKE2B 0371fbf8f01dd6907b26369c33e69bc11664282ce1005792cff70113b0a05bfe0ce0eddd15896a9c6bcc9de38671d73034414f354f34d2716fd4f9265d823cbf SHA512 401ba31f6f87b9b50597e3924c67ef9d0a8f566ea4649735caf59e2b706861babf9b3aa273b7c47ca1cc9c8b4fde79ab21d2e264cd7ba58041fe7b8f9fd87411
 EBUILD ruby-shadow-2.5.0-r1.ebuild 493 BLAKE2B a52b553efc3eb348d34ae417b1350f6258ee4f141626374015253e22a91dd92fb73651a9421acc63240744f7755cb4da78591f650180a0589df982b77af75207 SHA512 2763c505db57542a5f3ea7c0e41b3a0a59eab58b46b174c7ebaa653449ea261bd65cd920a3d986b87808a2bd2a11447d88a63a10398525c72c74815c1bf851d6
-EBUILD ruby-shadow-2.5.1.ebuild 483 BLAKE2B 293096f2ae80ba101fa5d6dfc6bd5acca4e1a8d9057caebb3bbe0cea8bbbd296d3d8895f47af261adbfbc16426db0434fe10de34cbd7824bb6030bcadf33875f SHA512 ce1c52fba0e4373a1b42a0433c111912f7e6a1ccfe1543b112ac4cfe5425fd64ae87352f8b2f5142af5a4af280a905d2ed6d44f81d1816624a4c2550916c0b45
+EBUILD ruby-shadow-2.5.1.ebuild 490 BLAKE2B d53ce5be039317da44aa5f64e3fef07a54b2b829b3dfd0f16003d63946d9538fba3e1a19a72cadeacf4ce7756326cf23db9eca52c292b485df767ec152534e99 SHA512 0805777d287fbb9373c918777c37eddd5e3ddea3024cc0c265b1077b2ebcf6e0e7438a3c3aacc6e99d1d1f9b63beb499b5a6a4a482e23a27978d024a0e4afb9f
 MISC metadata.xml 348 BLAKE2B ea93f8284e10399b71c36f731411b2dd8dc21062add09b74199b8a0007270591e98f7a57c388cd54296cf2d34f450674336ee112c204ea476c401cc094b14ae2 SHA512 753e086ad25985267e80210e6bea514257e8b8c339b67aaafd1f6b444e4218aa72d7c176b2faf41cda705f1c6ce8ff162ed40c497092e65882c0790d690e9956
diff --git a/dev-ruby/ruby-shadow/ruby-shadow-2.5.1.ebuild b/dev-ruby/ruby-shadow/ruby-shadow-2.5.1.ebuild
index 0fb1c2d24411..2cb56fd60c1d 100644
--- a/dev-ruby/ruby-shadow/ruby-shadow-2.5.1.ebuild
+++ b/dev-ruby/ruby-shadow/ruby-shadow-2.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/ruby-shout/Manifest b/dev-ruby/ruby-shout/Manifest
index 53dbfcf43b62..222927113982 100644
--- a/dev-ruby/ruby-shout/Manifest
+++ b/dev-ruby/ruby-shout/Manifest
@@ -1,3 +1,4 @@
 DIST ruby-shout-2.2.2.gem 13312 BLAKE2B da84e8ca777e5c5e60f4319f030467cbbb0709f8e94c08d3b7c8bb30c4db2861d27852930a01f4a0625ca8cf71ed849fd39f0398708b838c3b6bdcf85c12609d SHA512 2553518d3cef655e9cd59a734860d290928171600676dd0fa4b65d84421286eb9d79cc897cfa5544570e3731c4f761e97e8cd1dd3488d9b62246af840a1d126d
 EBUILD ruby-shout-2.2.2-r1.ebuild 519 BLAKE2B a3e7a464ef5d892bb85670a014900d460ae3d26b8ce4ba7cdc3cb7402d18d5802682f89e6521026d84ecfcde1c35dfaac5a4cac74c8fe5688684109b6e39bfb0 SHA512 87c95508d86bef5527857b8a4c74d2a09fb490e33edc8030234330d2ec86f164f74b89329d7f7fc0d880a6b7801f510afa47533ae254163eb60acbb15b03ecf5
+EBUILD ruby-shout-2.2.2-r2.ebuild 510 BLAKE2B cf36e35d390e6c92ec57e1b6caeaed527de335962d97c348a9dea05d17553407439cc5e828ce3079d490aa1ab477d332b2d0c10a66729c804cafadbaf003bba8 SHA512 6c770407c4d878cd23d6e349aa03f4dcb4a45a2528d9e0736faebb035f887ff52a8c078f66d5c89ac0200fe16ced1a5a443a8f2937186dbbb5cb685a6c65ccd4
 MISC metadata.xml 332 BLAKE2B f559791770574b95a70d4a2c94c4a9d732c07c06afb6521134ca4d19851fe00482d57c506c9d6b0fd0f4ef32c1f2a1af723053fd0da7f524668ecaa3a5f58b31 SHA512 63f80f9fadbef51e6484e659e27fd63be7e34a16ef9ae45e888735780452047bca5acdc7be87523bae08dcb93f07b3164ba3b0b3923bfe1e59806c05b3ed4399
diff --git a/dev-ruby/ruby-shout/ruby-shout-2.2.2-r2.ebuild b/dev-ruby/ruby-shout/ruby-shout-2.2.2-r2.ebuild
new file mode 100644
index 000000000000..8d40212427f6
--- /dev/null
+++ b/dev-ruby/ruby-shout/ruby-shout-2.2.2-r2.ebuild
@@ -0,0 +1,25 @@
+# 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_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.textile"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby interface to libshout2"
+HOMEPAGE="https://github.com/niko/ruby-shout"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND+=" >=media-libs/libshout-2.0"
+DEPEND+=" >=media-libs/libshout-2.0"
diff --git a/dev-ruby/ruby-termios/Manifest b/dev-ruby/ruby-termios/Manifest
index 6e93f6ddd22a..d0745f095bfc 100644
--- a/dev-ruby/ruby-termios/Manifest
+++ b/dev-ruby/ruby-termios/Manifest
@@ -1,4 +1,4 @@
 DIST ruby-termios-1.1.0.gem 17408 BLAKE2B df85f46693c17ca05736fecb2dcbddafc3831ae04cdb56e13782242e4161d04e6c095d04927eebe1959843d6f6da95f0433309018a7cee2bd42407560c2c99f9 SHA512 dc98e6d7e304fa76b4139dd88f8c6955e6f4e09ca48d5611813fac941564c93165945c24dc0d7f7f84d7cd959512d006d73f042b57fcb1dde2743ffbb3cc9b41
-EBUILD ruby-termios-1.1.0-r1.ebuild 576 BLAKE2B 8e1583460f0ab46184fe88e41168066c21259feb49d2193d5f91de1431fce359f8caece83f5441c78b627f4f8c1ca7a2fc2e575c52ebe3a6281e5e2ef5ee7363 SHA512 dfa248adb6eb1db5522534d7c41e784dd845c5b3bc194b5aec861bd13cd9aee7c60a9272088c8b71a0902e588a230ec9031f6326053156e0b073f48ce2bd4502
+EBUILD ruby-termios-1.1.0-r1.ebuild 583 BLAKE2B a8650d55f4056de987fa5ecdc28233f10cdc1f369fd950d756eab5c75b3cb03325ec51559898f5d836d8a2b1777456074ccee67a2ee585f62c75d6d51b666407 SHA512 833adbce85f3c13fdabdd9c07a6e8ce66155e427826d391fd334fef2a39955c50c5ee90b36e313a1c3d868ea0361b64d3d4b81d6ce4ddcf639a744b16d1def57
 EBUILD ruby-termios-1.1.0.ebuild 676 BLAKE2B 342d4cd119ba97190414157a566894c3092fc90f1e8abeaea182b0e3a7b0b3ef77964c6877f50bf5603b696e06fd4697a80c7a0de2016c835b2eb7b27464521d SHA512 9d629a2763d0d4803ec4f8ac88038aaec94cab45995f876b2db76ce3e859a32ca7ae8f1c48b5791336df0be5a3d783e44a9f73993352a0723ca17a9f0400a11a
 MISC metadata.xml 345 BLAKE2B 7548870113aba058a32107f58f042d6a1616855032a5e32a95b684c5142375037c6d5ed79fd7f3788cd0ebbe8db48b47a6578b7707d34d158faca579449bddc8 SHA512 a71981c265c8ef7f6845370efd733510a1f0a120794d6cf4b9af226287a5b72843602dd0c5e7925ede219a503669e76f300e4a199acb57a909f2662480f15787
diff --git a/dev-ruby/ruby-termios/ruby-termios-1.1.0-r1.ebuild b/dev-ruby/ruby-termios/ruby-termios-1.1.0-r1.ebuild
index 62fded4f986e..0a566cbe514e 100644
--- a/dev-ruby/ruby-termios/ruby-termios-1.1.0-r1.ebuild
+++ b/dev-ruby/ruby-termios/ruby-termios-1.1.0-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md termios.rd"
 
diff --git a/dev-ruby/ruby-xslt/Manifest b/dev-ruby/ruby-xslt/Manifest
index 47627d81d007..ccacb5047850 100644
--- a/dev-ruby/ruby-xslt/Manifest
+++ b/dev-ruby/ruby-xslt/Manifest
@@ -1,4 +1,4 @@
 DIST ruby-xslt-0.9.10.gem 35328 BLAKE2B aa0a627e76fcbc5626018389b5adbdbef1d54cc228f5622fd8cef4305e2d79c023c193031b8f8cc5f0e63d9c0af96edc0398beea4ac7f5eafe3dcf13ad2ff0ea SHA512 b196a517b19c6cb91ed6f4543ecfc6b58532e66f460029d2618e792cfe4078342fcb4428642328cbe6d97d1d942a6025ecff617578fc3abe2b0e414bf61ca1c4
-EBUILD ruby-xslt-0.9.10-r1.ebuild 1033 BLAKE2B d3b075a0ed86e38687fac617c6c7b38853d8fbddf1e0775d133f12cf36ad9eed6586b71408c2d17f9c8a02265245eba60315f7c15e150d2070ace0a0c7ce0d11 SHA512 e22d92f26cf2605c7438d2ed407734123110fe445d506893afb4fcfd35fdee1cde76070cf8af6f9da8f5d3e686965e5b04976b2ae73d0f88f5acaaf4b55638f6
+EBUILD ruby-xslt-0.9.10-r1.ebuild 1040 BLAKE2B 46f30fc976b83893fdffd7a34e9a951d9e9e8ec58b3cca8d35076ed5efbe44aa2740170ca71ad0837199d12c6b707e999972dd210a7c2ee212bfb3933afdd7fa SHA512 1404e4e938b87e6b4a2d56c04d884816b6f136727cd748ce1926764d3eefe6e0c1ec44ab09ca70c1aab449e21d13a18016e72054a2e4284c8a596bf85da3932d
 EBUILD ruby-xslt-0.9.10.ebuild 1134 BLAKE2B 5a4c7f08c246fe13e45851c591582db0b04ae31c9efb7b2cf8338a1a70a4592d03281b758c82fcc7b403738c8cd07a011c1f0c281b7623e6a3e1802b60e4f68f SHA512 66bd255b8d5799e220d3773ff5dc49f05084b963c84a0290282d81281034554de268dfcd8d7eb78cbbfb4cbf2696e2d39ffd86f22e3a4c37803f5a76fab12e1f
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/ruby-xslt/ruby-xslt-0.9.10-r1.ebuild b/dev-ruby/ruby-xslt/ruby-xslt-0.9.10-r1.ebuild
index 27ad1c4a5216..70b45d16c9b6 100644
--- a/dev-ruby/ruby-xslt/ruby-xslt-0.9.10-r1.ebuild
+++ b/dev-ruby/ruby-xslt/ruby-xslt-0.9.10-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/ruby-yadis/Manifest b/dev-ruby/ruby-yadis/Manifest
index 194abe9a9d69..3435d1d042ce 100644
--- a/dev-ruby/ruby-yadis/Manifest
+++ b/dev-ruby/ruby-yadis/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-yadis-0.3.4.gem 16896 BLAKE2B 69527b23900792e83e8ef52970ed8b847f69748823f0bb04d417b2b1cdbd765127b54aad81cf5b1559f532cefc7ea78d7c32e2a222a6a1364103e2b9026ccd54 SHA512 1811fda5421b630c954a493a227d4ea70a6d2722c136c3b668a33c3c94f4bf9229f34c0e807dadb452a6c74f008461ed3bb3fa192bafe4bfd5e8f1d242e6e5c9
-EBUILD ruby-yadis-0.3.4-r3.ebuild 749 BLAKE2B d24ab5117a3460983636c85795d5d7e28b61c9709943d76923116313fd870c5d6dcc9ea360d4c695accf10aedca9b942a4d98b8944c236b049ac05ca611408af SHA512 9df608386bca2e03038ff77392956a1d5d217bbbeb6c1356ef6e92329ec2438972b0d7bf0a2e5b2e940c0cb3452d4e4c0369102adbb7afe29d79677baca56340
+EBUILD ruby-yadis-0.3.4-r3.ebuild 756 BLAKE2B 40d4e08aada516efc2982f3c76ec6b6c2953bb4b2b3e80f29799298cfe63b75683438cf3bc2f0e913f799b60c30491e5bf3646f8dc8c18fac5228e9093453855 SHA512 b7ea02ca1f120f2b5a72fde4ee0480f8087aa63a6fa63e83a8a5a4b016633987ba53c5a96e80d5a86812df9291bea3f94f747366c8482e24a682521469b128c9
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r3.ebuild b/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r3.ebuild
index e6cbc268f585..bdab6a9ee4be 100644
--- a/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r3.ebuild
+++ b/dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r3.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/ruby2_keywords/Manifest b/dev-ruby/ruby2_keywords/Manifest
index c7bc9d7c9121..230205e51732 100644
--- a/dev-ruby/ruby2_keywords/Manifest
+++ b/dev-ruby/ruby2_keywords/Manifest
@@ -1,7 +1,5 @@
-DIST ruby2_keywords-0.0.2.gem 4608 BLAKE2B a13fab6800dafe557ca05a14301ed37afdd0fef22b6c4a8458be758d96099dbad47c49d7b01bd3c7297aec51d971c944005f704fbdfc45d8f50249040c244250 SHA512 a7bc02980e073a899bf3de2e32711ca9820657d43cc44dede44ca31681d8586e7f808a93b6f6778aaaaf8b84da37a48c8062e69ca33477d9469e9634d616ed8d
 DIST ruby2_keywords-0.0.4.gem 5632 BLAKE2B 1d2d4a71823e61a14fdf15edc2ad8ed8df70e3f52f621940d3d3e00c18f58e76d7c18ca2ff409b1c2b5d77216f90e72e1d50bad00093fa1f7740ccf8375c11a2 SHA512 22cc0c9c08f84ee6485e02f1d1fa244219dc96846a638b428970e0876c83056b87939e8a3cddac833d6feb493e34420604e81a3973d7cfa4dc969a6639b13439
 DIST ruby2_keywords-0.0.5.gem 10752 BLAKE2B 430ddd02ed59c73c8dfff7762a2f4bbee2b4514d7c8c38a9bf34928a254799cc9e7401672d92b926e4284b005ed6ce59eb2f4503cabe76c5200626b89055bfa1 SHA512 f6b9078b111e68c0017e0025ecdccb976c7a32f35c1a8adf9fd879db0c91f89eb9bd799f9527a846e28056f2a5fbf0f3610cda9538570288c493613c35c83a6f
-EBUILD ruby2_keywords-0.0.2.ebuild 451 BLAKE2B b8a02855e056567760ccbbbd3c78a127cbf365e7272c9b274d370b2bcf5e1fa8aa39444ed1ccc8b01a188319e4776be9a43b1d2cf40869af9d672b9e664b4f2c SHA512 07b0152d0490fb0ae7c6a4d152faa51fcadb23980a53b6332aeb2c06ad80c5aa594f03c46b15ef57b8709fbdcc72f0fe83b7596b111b140585649b0e3626ad86
 EBUILD ruby2_keywords-0.0.4.ebuild 451 BLAKE2B 7c94ccaf9d58ac6d758b2d7fcf1eee5b5e662830004c7cd1eb80d6a083f3a781b9936376032998dc11c8c083bf16120ac08e74886dd23ced21b8cbaafd9db50d SHA512 f88a3ddb64d4c3e4425a25defdea9a86ae137b1d415d5bad4bf1e426756089c3a4f7d3ec739ec8a9c458f5b3585a5b97e986271eb3037e25b0da4b638b7b8515
-EBUILD ruby2_keywords-0.0.5.ebuild 452 BLAKE2B 6901b6347ad9fad85bd1695617031501159a46744d89296cf5ab95c8b521a8ad141943a4a2971c478b75fbf84d03d6f9100e617fa91e360c6847d8ab70dd96c3 SHA512 6755660e65979501617f91c00eb4d957bb8a7bd97d415d813a4e8bf1476985f6210ea45aa516106391f889aa03815379a56a282f3eb0dbf28db2834a70b04805
+EBUILD ruby2_keywords-0.0.5.ebuild 459 BLAKE2B ca6a70c90dd7100f4fc3f9f217848b1aeeb1e443e4515f4948888427fb29fc3e6a521c5272884deebf1564c92690b98e66c3fb43fdfb5b041d8d64ecf75987e7 SHA512 d7db1120e7e31bdae9a9f8148cd6bc9723e4501a5e5a1c57019233b0d938426c3e208c311b1d0f38367dd6bb27529c8fa8c76b5ffba88dbcda5c56306c97d31a
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.2.ebuild b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.2.ebuild
deleted file mode 100644
index 6b28fe2f28a6..000000000000
--- a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shim library for Module#ruby2_keywords"
-HOMEPAGE="https://github.com/ruby/ruby2_keywords"
-
-LICENSE="Ruby"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
diff --git a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5.ebuild b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5.ebuild
index 257969768254..7772f5700f63 100644
--- a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5.ebuild
+++ b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 72e396b68186..621ab80fb941 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -19,5 +19,5 @@ EBUILD rubygems-3.1.6.ebuild 2839 BLAKE2B a43114e777b786bdca79c591dcf10bbbedbcb0
 EBUILD rubygems-3.2.14.ebuild 3154 BLAKE2B 12e440bb8a187063330c58307299c10119258238741af575582fa13e15802266e0fbec31f1b07ba9736b785925f622ac56e0a13034c9f89faca59083d84fbf09 SHA512 ab894afb51c0114f355b7189739c34de8e0718c08fad6566dc48ea6e8e7f648958da55e71d5e8efc4a09cb40aa9915705a9fe61cef0f483d02a26c96c89b3ad7
 EBUILD rubygems-3.2.22.ebuild 3147 BLAKE2B 3467a6f8ede381989f2a4303a001e01f979be15c8fa98dfe5af556443d38e4bdf72281b69e1e0fe2cf41beae1552ca5c1f5304e474c72b9b380aacf0dd4d642d SHA512 aecbf87c7f97725fdc2858ca1397aa8c0de13e7e760c28ff7005b0ff11db58018398d79d533746e098d15bfe2080412573755eda872bb4139c4c8ba4d9adb45f
 EBUILD rubygems-3.2.33.ebuild 3319 BLAKE2B 0d0efee6da06e03dc0b229f897c023e79c6c4ad374ae46479472a93111eac292fc1ee5ccab7a9701c1d9a980cacbf8653117643cd4ff2bf6905c5b21358a9831 SHA512 23abd59af15c2872995048144e8bf87e61912e2a25a405a9a37f758248f9ecb0f22c65e5897fec5679702d064b454b2a9b8e391eef45567f41ce6906bde29057
-EBUILD rubygems-3.3.8.ebuild 3326 BLAKE2B bd5d500d37a37180678e4c18cdbd01b138c364d8aba2c5fa004aae467e5499eeb9c1811c68959dd70837c89dd3d1ad9e8579535693070548e6f5cb416e483465 SHA512 a7e263b77d979256f243c649b9e9e801d721f2d4d3de8acbce9627a1bef20edb6c7498456f184843858d626fc738b65f09a64563e9baa96196c32474d6e2cbb5
+EBUILD rubygems-3.3.8.ebuild 3333 BLAKE2B 1730f57816ab414f4771f2b87c179da10b293ed6517c1c86e0f0826797c93a1c61dcb11ac7ce0b8876474a87af298591e8d8c93350d44b30f44b7a0d5fe3b61a SHA512 5f7dad9dcbc4ea6525b805a8ce646ab6ea5c9a7d7607f0ba925584bf7d2e8c756532401f9624846a9a76603ecfb8f072d338a657cfac45e5ac876dee69c1012e
 MISC metadata.xml 336 BLAKE2B ecfca0944e7009be46f398152d0858c119a01660c84767594af30797d15407baa8ad6b2ad464d1e561c9688fcaa701d9f1316942a5c32a6041aa29eb28b42f3b SHA512 533cd9bc43b23201a785034e5a8ba954201c37024d654fb57e848c1ab6eb99ef98398be224a4d346d8431d1e10a7ddedb2134babea287082b348dd1ff2392803
diff --git a/dev-ruby/rubygems/rubygems-3.3.8.ebuild b/dev-ruby/rubygems/rubygems-3.3.8.ebuild
index e272a6bf4929..e088e73f7852 100644
--- a/dev-ruby/rubygems/rubygems-3.3.8.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.3.8.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2 || ( Ruby MIT )"
 
 SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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="server test"
 RESTRICT="!test? ( test )"
diff --git a/dev-ruby/rubyntlm/Manifest b/dev-ruby/rubyntlm/Manifest
index 411600d1ac96..2245f9355c25 100644
--- a/dev-ruby/rubyntlm/Manifest
+++ b/dev-ruby/rubyntlm/Manifest
@@ -1,3 +1,3 @@
 DIST rubyntlm-0.6.3.gem 32768 BLAKE2B f9e21068e684620e2e54c685132d034a805fefa4eb90261babac9d58e38167412e0257f0d9b018603772dbd6f152eb9478340d7a390174bc908d1ac8640fcff4 SHA512 7e50c1bf63477fead9189a5ade06db65a3fad04d82bccfbffb513517ab97766053c800af9551e027dedc3aee6fb35288c234d98b1a02815299bcbc463e0edd87
-EBUILD rubyntlm-0.6.3.ebuild 539 BLAKE2B f448bbb0e17d7c39681b4b45b30e50e8adae597b2993d753e311cbf5b1723a77ed1d350ca8660c58ac145708a59617506907b2333c993c25af3bbb5077064042 SHA512 424acf8144421d5f3bdf1babbf05ac128197ad0b8d5c1141a2168d7d84d22c1be4f8ae9fee3635379585d06aa17b38cedf05d7793c125f1acc28de5ab5a3b5de
+EBUILD rubyntlm-0.6.3.ebuild 539 BLAKE2B e744b201c6d158f99a87896d18c127df42c1db2ef68149737a8c00344f1378907a4288a4d451f23da7c624e83a037b8813fc8a514a010e4485e7f12fe0b3ef71 SHA512 0ada88dd25a80dd1aed8037531ffcf9cd4a397193315ba6ce50f56a216183f589d6e06ea37eab2aedef545178e4987b9c23d4ad58c0bde063cb3fdb77c13ecf4
 MISC metadata.xml 389 BLAKE2B 603472798a646c3240ac30f447f2a97f3c76bd5139032048169c5caa02145a4832270876c91000a1b74bdcbeda095658f5e1d6f658cd759dee5668024375b25f SHA512 2edabf2f6e63877b27a155909009357177eab3f1bf56fd3a03397032d0dccd8c0a88d23b87e00c174ad5830383d23fef9d3c750d7bcee20e05c8fab30b389263
diff --git a/dev-ruby/rubyntlm/rubyntlm-0.6.3.ebuild b/dev-ruby/rubyntlm/rubyntlm-0.6.3.ebuild
index 81022cf7e63c..abb1dd3757dc 100644
--- a/dev-ruby/rubyntlm/rubyntlm-0.6.3.ebuild
+++ b/dev-ruby/rubyntlm/rubyntlm-0.6.3.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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/rubypants/Manifest b/dev-ruby/rubypants/Manifest
index 377ead60d3ca..742f1374442e 100644
--- a/dev-ruby/rubypants/Manifest
+++ b/dev-ruby/rubypants/Manifest
@@ -1,5 +1,5 @@
 DIST rubypants-0.7.0.gem 13824 BLAKE2B c132b3c60390b712c08ec54b10a14255e21d9622399b9ddba8d2359915411c604052569e5713fdb4b1a3fefcc3416f4d5af16baca19063a0b79203838b8f3066 SHA512 cacd05e0cc87389b5513c83fe085db39202c2789b882b564caaded6b84b1ecb1acbde8232462dadf501c68c1c881ee7b7f4e640feec47c9c0f7a08758b5f5724
 DIST rubypants-0.7.1.gem 14336 BLAKE2B 6a2fd50f07e6eca0ee76a3f653fd378b9c389349a23bfa98cbf1be42e46a58cb76769e4f653bf83d72faa318be81b60920d0dbd900053f85489fe2c6a1a69a23 SHA512 48f04e621cefecb9911ee346ea9b4f185ee52a603f9a307d5424d314d3be88d0efda959a5654b5f532dfdd5af9ce2c0c6baceca4e09ad6d1471bf31c990e79bb
 EBUILD rubypants-0.7.0.ebuild 593 BLAKE2B b9ce136b628fbe76fabb94f80329dae2b81eb293370df237f9ddf19e475504e24e060559f9e3b26e3506da0f56d4cd1124d668aff03387945c3a2bc924bd7bf1 SHA512 98d4c98dcb820a9da65a1af9f69a2f89252f3b3a19c288e3ebaab4647989f427f7ae43b0c41b3890476f3af65cc4e999d6cec235a09da93cd83ac2f3347bfd3f
-EBUILD rubypants-0.7.1.ebuild 574 BLAKE2B aab17c241b71f1c169fdfb7438c13684b9e5414583baa5ec539c139f62d3931af2fb283d083ff8b0328234684069f8097014f639cd9e662fe8184e297d792ca3 SHA512 85552cfdcac26ffe7fa3289ab886170f37d5e1741a7953edb72380b4a9be40f411c2f9fcfd953d0de749dc7453f0878027af3279bbccca76088f02a9cc23dc6a
+EBUILD rubypants-0.7.1.ebuild 574 BLAKE2B ff8d5b1fe7537f120d0521485bf3137ba54e4d784cf2565a9f8b575e365ab894892274b4e9a2fbbc23f38ec0b236ad793c361d49bcabb5430cacddae0c43a664 SHA512 a50f4ea5348f78aee83adb072953b5de69b87aadb632d509eb5def3442db209a3a16a22fae1d35c03e64510746648d584876a5891272791d617d38dc9597259f
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/rubypants/rubypants-0.7.1.ebuild b/dev-ruby/rubypants/rubypants-0.7.1.ebuild
index 3a80dddf0c6e..817933cec0d3 100644
--- a/dev-ruby/rubypants/rubypants-0.7.1.ebuild
+++ b/dev-ruby/rubypants/rubypants-0.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/rubyzip/Manifest b/dev-ruby/rubyzip/Manifest
index 8e2f0cf6481a..ad63b5545335 100644
--- a/dev-ruby/rubyzip/Manifest
+++ b/dev-ruby/rubyzip/Manifest
@@ -1,10 +1,5 @@
 DIST rubyzip-1.3.0-git.tgz 156664 BLAKE2B 2bde6515ddc71da32fc2d2819770857f7dde8605718c868f73edb8493f7db5ce66a7115d09933ffc6a06ac0979ab07e8cbdcd47984707688b7a5db43394847bc SHA512 5a764725d1f6a797f710581dbe07bd7971f0a8a5b0ffb7fc9b1a627c32e6e342ff54e2ad39e74e294dd283b8cbf358ed2dc40857f6f656007adff80d4769b9f4
-DIST rubyzip-2.2.0-git.tgz 224109 BLAKE2B b1d879d04c4bd23f32f82260d386a0b0ff8bb4c1af705a4eca9fc279b4095551edad27e2187aa146b9c76f183df2687fc03dd7c6d62c2dde6d70c9137226316c SHA512 c10f3574c7948ae29ed665de69f79d714e146bda27a634c3bfdf7210240b535c6a9fba43fff0228fd85afd262ca56d25002393eda90237d8da1034edda62e2a7
-DIST rubyzip-2.3.0-git.tgz 225336 BLAKE2B 24b00e02c26881953c843761d38b8bf3a9a5a04da6cafa73bea6abdeea345a71a31241a557ff3c182df274210a970f17b3e866657153784df6b03cdf472681f6 SHA512 da9c446aa1a3c457decdaedb387f4030f84a2b1c1c3ca14a0e8588103f95cf893812e7a146362c083aba478828ccda4b127cd0b80fa2fa09022e06ad041506bf
 DIST rubyzip-2.3.2-git.tgz 225923 BLAKE2B ed901326cd0f79c8be004d9c14b32d7e67e90ab4d2d5b67dc64559fd4691dfb63cfa1ee18363a7cf864bd62559f1bc2fae71fc25ad1c727d7cc01f94d1ec62ee SHA512 6c64e53c1f5ca530abfa22baf388f87c8cf098d81cc9c639f20903e5193cf26243fbf861ac12002ae954f026e04168d8a55beeaf3ac5542bd0618ca85a5c90de
 EBUILD rubyzip-1.3.0.ebuild 1321 BLAKE2B f164c3bad0db8bcc903760dba8afe1861bf7e0db1f4445185f3cd7dd69126aa24d18d8bd8b78c2cb7a8492110ac5c2b313f38b95843c1abc2bcbd2f8e869a065 SHA512 49cb399b04de09f83a8acb49ee90e519b67ed598516c344e62fee01d7aaf758791c5a55faad02a0eb5dc45da4106e18396e286f77f78f2f59764580f6bd7bb67
-EBUILD rubyzip-2.2.0.ebuild 1230 BLAKE2B 3b67eab314531caccf03ae0b6f347edeb67ad8fd21e617b64a17b38345beefba1634c04524a4d0a2ed29708f020265bca9b1e1015bff400d6f1beead932cfee5 SHA512 dda84818e3ee920eb3a68366e7e7861d296f7628397bf6073fd8ee36ec874c8b0f9d01daa62715ce9a013fc7ad1d906a83bc3f09b49f3a4afcb69d51b616dc87
-EBUILD rubyzip-2.3.0.ebuild 1383 BLAKE2B 47f532d95d907f69b3aec6d6bfa57baa3619d6bcf461d144f065b073ece7c23702f624b16d139dbeddec99d05ed0026fca59036b719662e01c1b1499bdf474db SHA512 6c31d08e43884dcde933ddef3c48b072deac408edf887564c2bdfb64bd3366062f35ced9465a451846ab46674d0de2916ebd621e804b36f0ad407bfa170c288c
 EBUILD rubyzip-2.3.2-r1.ebuild 1390 BLAKE2B cdd515d5da09fa9cb841efd62a72ee740bcc5f60f51c97a2c0c5a47ecab440a55573409ba2c47791a31edb7d4c648af3dd2cebc846491832f9fe86e3d104f4b5 SHA512 93a62fed0ec4d6f9cbee14f89bc9223bd537aaecc0e613e14b034a1b5c42e5d48947edd07ccc3b7280b0dc36770d43ba1aff3e89f4e638b0ab5b9ca08d3d24a7
-EBUILD rubyzip-2.3.2.ebuild 1390 BLAKE2B 3ed45f24bba0292cbddd3716ce03c4de560a87c4ea59a4e3e1a9805a5eb60ab55ca4226fa7f1df89196ccf6c6c3cf8e878ce4b2fbebc3b79c3b3eb83da8cb74f SHA512 1958b77da11452802ce62d4b2fc9eb28e69bcfacfefbeb10a585bf7d6483d39e0245ad826b1abb4b81b83fea1d082918cf5ae63b7ad6b594c171adb89285d9f8
 MISC metadata.xml 342 BLAKE2B 1619c520edda34ca9b5b8eed0ba9d1a69491c0411698cc0cb32b192226e3c888dce2c2b22c8996a69222ab8521402b6efe644c93567b26a6ee906bf4d3bfe8e5 SHA512 93ae61d55a80d335c5d362181e5e8fad279739b178de0fc5ed4cec7508b74f088c041a3f544ba80f511e11fc2baeb223cc589231db5ce06d9349f3cc0c85e21e
diff --git a/dev-ruby/rubyzip/rubyzip-2.2.0.ebuild b/dev-ruby/rubyzip/rubyzip-2.2.0.ebuild
deleted file mode 100644
index 35b67483c881..000000000000
--- a/dev-ruby/rubyzip/rubyzip-2.2.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md TODO"
-
-RUBY_FAKEGEM_GEMSPEC="rubyzip.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby library for reading and writing zip files"
-HOMEPAGE="https://github.com/rubyzip/rubyzip"
-# Tests are not included in the gem.
-SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="Ruby"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${DEPEND} test? ( app-arch/zip )"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
-
-all_ruby_prepare() {
-	# Avoid dependencies on simplecov and coveralls
-	sed -i -e '/simplecov/ s:^:#:' test/test_helper.rb || die
-
-	# Avoid dependency on bundler
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-
-	# Fix hardcoded path to /tmp
-	sed -i -e 's:/tmp/:'${T}'/:g' test/entry_test.rb || die
-
-	# Add missing requires
-	sed -i -e '1irequire "forwardable"; require "pathname"' test/input_stream_test.rb || die
-}
diff --git a/dev-ruby/rubyzip/rubyzip-2.3.0.ebuild b/dev-ruby/rubyzip/rubyzip-2.3.0.ebuild
deleted file mode 100644
index 63b3c7e93be4..000000000000
--- a/dev-ruby/rubyzip/rubyzip-2.3.0.ebuild
+++ /dev/null
@@ -1,54 +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_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md TODO"
-
-RUBY_FAKEGEM_GEMSPEC="rubyzip.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby library for reading and writing zip files"
-HOMEPAGE="https://github.com/rubyzip/rubyzip"
-# Tests are not included in the gem.
-SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="Ruby"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${DEPEND} test? ( app-arch/zip )"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
-
-all_ruby_prepare() {
-	# Avoid dependencies on simplecov and coveralls
-	sed -i -e '/simplecov/ s:^:#:' test/test_helper.rb || die
-
-	# Avoid dependency on bundler
-	sed -i -e '/bundler/ s:^:#: ; /rubocop/I s:^:#:' Rakefile || die
-
-	# Fix hardcoded path to /tmp
-	sed -i -e 's:/tmp/:'${T}'/:g' test/entry_test.rb || die
-
-	# Add missing requires
-	sed -i -e '1irequire "forwardable"; require "pathname"' test/input_stream_test.rb || die
-
-	# Fix broken test that uses native endian
-	sed -i -e '/pack/ s/LLS/VVv/' test/file_extract_test.rb || die
-}
diff --git a/dev-ruby/rubyzip/rubyzip-2.3.2.ebuild b/dev-ruby/rubyzip/rubyzip-2.3.2.ebuild
deleted file mode 100644
index aef8a552c081..000000000000
--- a/dev-ruby/rubyzip/rubyzip-2.3.2.ebuild
+++ /dev/null
@@ -1,54 +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_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md TODO"
-
-RUBY_FAKEGEM_GEMSPEC="rubyzip.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby library for reading and writing zip files"
-HOMEPAGE="https://github.com/rubyzip/rubyzip"
-# Tests are not included in the gem.
-SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="Ruby"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${DEPEND} test? ( app-arch/zip )"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
-
-all_ruby_prepare() {
-	# Avoid dependencies on simplecov and coveralls
-	sed -i -e '/simplecov/ s:^:#:' test/test_helper.rb || die
-
-	# Avoid dependency on bundler
-	sed -i -e '/bundler/ s:^:#: ; /rubocop/I s:^:#:' Rakefile || die
-
-	# Fix hardcoded path to /tmp
-	sed -i -e 's:/tmp/:'${T}'/:g' test/entry_test.rb || die
-
-	# Add missing requires
-	sed -i -e '1irequire "forwardable"; require "pathname"' test/input_stream_test.rb || die
-
-	# Fix broken test that uses native endian
-	sed -i -e '/pack/ s/LLS/VVv/' test/file_extract_test.rb || die
-}
diff --git a/dev-ruby/sass-listen/Manifest b/dev-ruby/sass-listen/Manifest
index ed842aa5ceda..43d71e10cf25 100644
--- a/dev-ruby/sass-listen/Manifest
+++ b/dev-ruby/sass-listen/Manifest
@@ -1,5 +1,4 @@
 AUX listen-3.1.5-ruby26.patch 1069 BLAKE2B f2b661959f36f919116568fce83c867aea45eb219f63c7549855936ff818ab5d3a22fbb76595ea3e1fed995a436521acb621475b3562f09bed640ab40698d692 SHA512 4828b97d0a970fd7a8432d999f566f89a817775c77a3c4f7261e90b146d50fc0f4791fbcd343fae84fc56bcac4ea2616d1ce46c5cb65fb0e149175b02f74b5c9
 DIST sass-listen-4.0.0.tar.gz 49449 BLAKE2B bb44a91a6fbdca1b6d1b8b2253efd1709fb89713631d9772ce91dab9bc701b197a6551391699f5566d3a75ae42f9958d5d6d8346de9f74b45d7b60d88cca5ee7 SHA512 799e1e70f86b4be671c3286ae860cbcec83d8a1311d67fb37956dc527e2961888094439fd8377d50c78798c494f19ddbed3a412f02e76e429dcc1717c93b7e19
-EBUILD sass-listen-4.0.0-r1.ebuild 1154 BLAKE2B da693f4ea1608b1ea2584aaceaa784f5a22e61f1b3886920a32550bcf1627b9d0721b5be16ea3bf7149639369cbc886d93dbad4b24305a4cac8e702a2516eb57 SHA512 fffd57965833c952d8cdffead07418f71155add450879eff1a7bbb1e6f5019cc1b0279ca3a81e65a0b45238254adb592da4363daf201bad41cffd90fe29170d3
-EBUILD sass-listen-4.0.0.ebuild 1162 BLAKE2B 6d03af0873bd858821b9654efc314cfc6c2e6597543fabe57d4eb83a54274a9781395b8d76ad8a6411aafacdb5d07027119a2fade884664391ba15b3c04e24b8 SHA512 cb708b9882bfbf17bf06c20eae83136c8674dd083947c80aa28dd4d35046ed168895f6dc029d1e6aab6620c1b6da1dce4eba9ec476fa6a2848553ecad1eed709
+EBUILD sass-listen-4.0.0-r1.ebuild 1151 BLAKE2B ed330710be58c75df249b9a9bcb2b3b121b33c9ded0b30b8645daead129dd6547ac1ec7fd99f33971954252ddc53673f69560ac243d8fbeb31ed6d51e9d3163c SHA512 3b14282385c9b6666bd586fbf58cb81e43284e8820eb1a54f788f21b40a9a650769c25dffcbe6c399560c86144496d13766ad6176210f3979ee636e1487f6168
 MISC metadata.xml 338 BLAKE2B 4738ef39880093b707248a925b33a9762b3e8ab637550448bd828088c9ff0350792f58f26928f2aecaefc940130ebbcbc16e65a25f2cddd010cf7727138bc705 SHA512 ca4455498c345f1e0121807fd0a256668bbd0cbf07b20c21bc4fe97025e3be828ffba7afa19ebe2adc461f774cfe341d8f48137270862637a57e22c47441f212
diff --git a/dev-ruby/sass-listen/sass-listen-4.0.0-r1.ebuild b/dev-ruby/sass-listen/sass-listen-4.0.0-r1.ebuild
index 07ceff39bcd6..38ea9189f39a 100644
--- a/dev-ruby/sass-listen/sass-listen-4.0.0-r1.ebuild
+++ b/dev-ruby/sass-listen/sass-listen-4.0.0-r1.ebuild
@@ -21,7 +21,7 @@ RUBY_S="listen-${PV}"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86"
 IUSE="test"
 
 PATCHES=( "${FILESDIR}/listen-3.1.5-ruby26.patch" )
diff --git a/dev-ruby/sass-listen/sass-listen-4.0.0.ebuild b/dev-ruby/sass-listen/sass-listen-4.0.0.ebuild
deleted file mode 100644
index 2f6616005a3d..000000000000
--- a/dev-ruby/sass-listen/sass-listen-4.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/sass/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Fork of guard/listen provides a stable API for users of the ruby Sass CLI"
-HOMEPAGE="https://github.com/guard/listen"
-RUBY_S="listen-${PV}"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE="test"
-
-PATCHES=( "${FILESDIR}/listen-3.1.5-ruby26.patch" )
-
-ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.7"
-
-ruby_add_bdepend "test? ( dev-ruby/thor )"
-
-all_ruby_prepare() {
-	rm -f Gemfile || die
-	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
-	sed -i -e "/rb-fsevent/d"  lib/sass-listen/adapter/darwin.rb || die
-	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
-}
-
-each_ruby_prepare() {
-	mkdir spec/.fixtures || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	rm -rf spec/.fixtures || die
-}
diff --git a/dev-ruby/sass/Manifest b/dev-ruby/sass/Manifest
index c1b66adb6dc5..eef06b770731 100644
--- a/dev-ruby/sass/Manifest
+++ b/dev-ruby/sass/Manifest
@@ -1,10 +1,10 @@
 DIST sass-3.4.25.gem 352768 BLAKE2B f3c725ee75f0d5b3a30cfbfdbf5dd949fc2b6d99878039a073c3b369753609f9b202ea6f756016783b251877831d1480dad4032db8338dff453b088b219b799a SHA512 5ff4bd47857425832c6a39b963ae4465dd91d63774eb35196ec28075082ad231254babe507d7071304ddb73cdfc1168a547bf231225afaeb3b7ddd677c0bd712
 DIST sass-3.5.7.gem 320000 BLAKE2B aeae548d1005b9f420c82f4efc96b2428d3025395b49784917c298fa48228d8052f758c1f851fb6e4e8024c63d48a9880f6c2e88411cd2125e76ad291e469bc0 SHA512 a72b499cfca4862fb4bfeb5201fda788339bb57d97b467c427e9c8365b03088b886a0f3cb3a6d87b1426e1497032b8394a948eb4a2f45004be80c03070304f95
 DIST sass-3.7.4.tar.gz 401442 BLAKE2B 52abe37390282d2aead3eea6c2a049da529a5e96bac44b01ccded1e3c4d2c332d82f164da941413c0138fd3a94f59cda084d8fb724db87fc522f33dd7bc31adb SHA512 4bebb6ddc84e7f2687d9b801e6b30e897d83a46940249349d775e0139d1fca8ffd96d0976f4c35a7a0dba9ebf786883a70aff2ff002708e28b685a034634aaf2
-EBUILD sass-3.4.25-r1.ebuild 1004 BLAKE2B c0d6bc59382a9251e415e5ab1d079866a511f9e178d22e3243a084653ec33d112e828b8cda204fbd10bff1ca7b49930986baf9567a41c9f934215dcec5d387e0 SHA512 a16b44a2783e591544a1647cb850cce9018bee9dafad3d089ce70803b8dc8e432f34311f4e0aad1f0fe6c0f940105202633ebbaffd2d904a6163c1f9fb112f40
+EBUILD sass-3.4.25-r1.ebuild 1001 BLAKE2B 09e8894248e6307f27fabd49dcba6b975375a4a3417c474e54bfb9e62b35d0d6e9c0fff024ca06acf1afff80c847afac37770fb176c643bb6bcc3117ce636db4 SHA512 23c6b96a21c1bf1906719aa8c0d732480b868dcaec59bd4b90d76558e1729301d5768b64e495233ffe331d23dcfa6fb249ecc20b834f01e2b3b39fac56c50ed3
 EBUILD sass-3.4.25.ebuild 933 BLAKE2B 48ffa6fdf6c38c8e0688c38e5a38e063c50f6e5742b43456c42d5df6eedecc9ce04f24f77bdfc93010fe8b27d89f8fbdddd032db52b3fe4b2b457c79530dd561 SHA512 4c70147999f8b6b7e62bca7bd03fa26872ed9231abcd103a225515300978b805b7caf4aae5b01792000573940e940c944af4a78a092ce376d8f8025990a6a2db
 EBUILD sass-3.5.7-r1.ebuild 1087 BLAKE2B 802ccde36fa5d972c6627af471bd9da5c8d01419be51b8f0828db20661f903f1f4a204490a5c68eaa165643a7e683a00fbb5b4ff1b289eaaaba29ab696bf6081 SHA512 b9c472c4dd5a638e7e3b53d3180fad267ae811b44ec5d083a63c36d9134618a9fcaecc5a8e1c18fef90d37c08128ea3b18753f32a68b52e6a26ea23129156c18
 EBUILD sass-3.5.7.ebuild 1062 BLAKE2B 0e8c031294b7ecde284afe9e5ac90b9f157323b8899ade0b7d4ef7e79f19de6d86ca3db8a1efa1cbb46f8ed93f9f67b4c19073bc07a2e5cfbb5ad090efec6665 SHA512 8f759c385a81fbc6a21e15170fad345e2b9e2499d505a4f8dd64e9b60a59388de87d6a9f69aa4b4e09c94b8bb8b4fd5f3c08c06df476a442759f89c45f6e869c
 EBUILD sass-3.7.4-r1.ebuild 1176 BLAKE2B 3e55a3be5aac10bd856527db4a3868dacb238264c29e97dbcc1f65c19415697c0e4426fa428c87a9ab81a4cfcc7fe0d46e64b5c0874139fc5fc1e0f2b612a902 SHA512 1d19b97b24726418e016481835933e3e6fc2f8e8d3fdb310988001e6bb1005a22c89ac36cf2226e11978324bee0b056285e3c1b4c97226bd9e79b36337ab8530
-EBUILD sass-3.7.4.ebuild 1192 BLAKE2B 77c7a336a47f7d10d700c325418885482405d033923d8d7ee5baa392d5d892c619004b7687c648c85a957a347789abe0febcecddc2fbb8625cf2739556dd0ac0 SHA512 add22f7f25ca7da35366a9a22ed815ad8e073a07e8c63cf175e9f242217254f73de234e8e29d660d6e556da90b83f4e73b065662a7baa109f0348639aad55761
+EBUILD sass-3.7.4.ebuild 1189 BLAKE2B 3116297f97558c184c15acc7ef823b91a9ff71afec6bf72e30f6eed641dbf6db37ef3e32c444dc5e50e6b72e18e4c84e787ccccc8230a86196523d428a3290d2 SHA512 ade18d1755e7e0fa3932442f4aeac486261fb7414ee73e8a5ee6319d9e831ac027162ae3a70f42f186d855a9bb02a6489f9566d0579c10903b68b68af28f1312
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/sass/sass-3.4.25-r1.ebuild b/dev-ruby/sass/sass-3.4.25-r1.ebuild
index ccaf73aaab68..b633fea8d942 100644
--- a/dev-ruby/sass/sass-3.4.25-r1.ebuild
+++ b/dev-ruby/sass/sass-3.4.25-r1.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, and m
 HOMEPAGE="http://sass-lang.com/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux"
 SLOT="$(get_version_component_range 1-2)"
 IUSE=""
 
diff --git a/dev-ruby/sass/sass-3.7.4.ebuild b/dev-ruby/sass/sass-3.7.4.ebuild
index df1782a9f2e6..a690b9a849fb 100644
--- a/dev-ruby/sass/sass-3.7.4.ebuild
+++ b/dev-ruby/sass/sass-3.7.4.ebuild
@@ -20,7 +20,7 @@ RUBY_S="ruby-sass-${PV}"
 
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux"
 SLOT="$(ver_cut 1-2)"
 IUSE=""
 
diff --git a/dev-ruby/sawyer/Manifest b/dev-ruby/sawyer/Manifest
index 218bc59e759e..ba689b68d70a 100644
--- a/dev-ruby/sawyer/Manifest
+++ b/dev-ruby/sawyer/Manifest
@@ -1,3 +1,4 @@
 DIST sawyer-0.8.2.tar.gz 15059 BLAKE2B 11a82158493fba69695b4eee15db223a07ebd81f8e39910553ef197a253a3342cffd00045385706c56c6f5e46bf4e20872cf61028acaf02d6f81fa2f640fc09b SHA512 fdaf88d33d87922bd0d44de919b920938b7072ad437db4b98370c507e22e4229ec0c68c613944fd2e20dde060ae5d34de6c001568eb7d1f38098831ca29b0c13
+EBUILD sawyer-0.8.2-r1.ebuild 707 BLAKE2B 482dd7ab2468bafdfd6da02086f5b1997e826ce4171b0ad772f8533916198a789cb6795986d51e5b2d567aaa7aca9422e155e99639e6d6e940ca8b3369ce396d SHA512 d3211afdb3fb4b70f0de772d27b355609728996ae8005c9843ec1ef373fead3de178258f0a20c493ad0a2ddef581014dcc297f7b02787e3afa56e88b430a049a
 EBUILD sawyer-0.8.2.ebuild 709 BLAKE2B 556372d9856b20c7047cbd374f3648e69640f606bcfabd4739cbc4ef58c76a9f59facb9477f0c2be1e539b68b577a455ebfaed1ecdc4cf5086bec309570a89ec SHA512 ffe12633cfb360449a4bad8c0580ecf68e6c2ac110925969b2f43645b52703c669b8fb8bd3511df2afc7534884dd7918c65329d51aeda068dc375aa9522c2919
 MISC metadata.xml 344 BLAKE2B 2fd48b8dd0cbda058db996df9a2eb78059dbee18f2f55053df724c29e336f11c6177e4ced45805464c833da30bdbb3fa451604459768f2f0f04acef5f4608add SHA512 06a2e070d29fc940208c64bba0d16add2fd24a4bd80adfc763a2bf925942f8dde700641fc7ff6ac1b3e77d17571aeccc8af21ecb313e3772aca2461835123d2e
diff --git a/dev-ruby/sawyer/sawyer-0.8.2-r1.ebuild b/dev-ruby/sawyer/sawyer-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..97e52a84ddef
--- /dev/null
+++ b/dev-ruby/sawyer/sawyer-0.8.2-r1.ebuild
@@ -0,0 +1,29 @@
+# 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_GEMSPEC="sawyer.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Secret User Agent of HTTP"
+HOMEPAGE="https://github.com/lostisland/sawyer"
+SRC_URI="https://github.com/lostisland/sawyer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	<dev-ruby/faraday-2.0:*
+	>=dev-ruby/addressable-2.3.5"
+
+all_ruby_prepare() {
+	# Avoid tests that require network acces
+	sed -i -e '/test_blank_response_doesnt_raise/,/^    end/ s:^:#:' test/agent_test.rb || die
+}
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index a1bb6a062741..7aea19924f32 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -3,5 +3,5 @@ DIST selenium-webdriver-4.0.3.gem 152576 BLAKE2B 671909863bbbe328bbaf30a9e3c9e45
 DIST selenium-webdriver-4.1.0.gem 153088 BLAKE2B f437b5e6c19b9a2b7d0393646b11bcaa0808fb9981c847ca0d86bd55ef04fc109d439eb0f41fce543ea121fde096fe3e72c56d1db861b6554f673a3de07bdff8 SHA512 9760c6a96dbef25f558216986a9cedcb00fe19313273ea5c3a4866d5afae327fbe3895e3e2ee405714f8a9410c290b0e51352b68465cb0df9ff31b6d2749b174
 EBUILD selenium-webdriver-3.142.7-r1.ebuild 1105 BLAKE2B fbd7aec91d8f5eae4a45a29c01309d7facc0e3a73ffeae3fc3a5c81b3ed551d2fbe70f61ec52225f07fa709c80eea8bec13153ac7a1484d6334b8df752c2e74c SHA512 fcc13f25d587994c569c9f7ae6da5430d50a032a7ee13fdd5010d4c9de0da97cbb188760adc059bdc2e15ba6568ee4ac18c0a82af61053b7d425f26300f2f8b9
 EBUILD selenium-webdriver-4.0.3.ebuild 1015 BLAKE2B df6b7d93c12ab49c58fd76b561597beac3452d7e41075a04fac82ac1282e43846924232015f73506ddd6c11856cca27fee8eb8e51f4587dc19f8eeb4ae941207 SHA512 2a272f961e101c996dcc4b7cacbac94dc5257e95fa6d07ac9fd4f6815273873a376482b09079dbaedbcf50e5cfd6bc59c75c2a35fe152ceffdebf6daa1cbae5b
-EBUILD selenium-webdriver-4.1.0.ebuild 1022 BLAKE2B a8462ad8e340d35359043019a4455ac6ebf2ba1e1e64418640335283844b41f7a9822c2a2b8cf564f3bb48d6c5b39b0243cd592f2b942cdd2594c1fd36f7415f SHA512 8e5e84cdd16639e43794ae53c09c80fdeb906e5f8298bcc37d3a3041fb1a51278028d112777551e4856063ba81e71185afc90d0eb671a4219638bd70acfe82ac
+EBUILD selenium-webdriver-4.1.0.ebuild 1028 BLAKE2B c4b3028f3065a6103c0d411809f79e79378bcdf031c9c031f550e45e0d7a23287abc7d436ed2a0e3132594a4a9a5fc88a8a4022f52a36b74ac3690be58ce6fae SHA512 38c2795d6916008dae0e7dd5b5d06ea1feef0ab0dd1ab8731fd105659e2cb44bd3b3e8a7ffaf7be83e5af03daa0ac1c81c84a64da9b9769c63b211b388082944
 MISC metadata.xml 336 BLAKE2B 2133927d6a27b7422141ed649e46efc069300160b5fecb9fb5bdbf575461fde2b12411696be46cc673d6996c8711f50a46e92e1cdda5ff1f7c57ae298ff76406 SHA512 d1f80b8bf35f2fd08e4689292ce535ece939a64b94123780206d4ee3ab7a20b6d9c3a2d9f5248eaa2d0d35bb32bc5707e14c09b60881d856a180435b8f656bea
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-4.1.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-4.1.0.ebuild
index 14dd5338589a..4e6109e913ef 100644
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-4.1.0.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-4.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 # NOTE: this package contains precompiled code. It appears that all
 # source code can be found at https://code.google.com/p/selenium/ but the
@@ -28,7 +28,7 @@ HOMEPAGE="https://github.com/seleniumhq/selenium"
 
 LICENSE="Apache-2.0"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/childprocess-0.5:2
diff --git a/dev-ruby/semantic_puppet/Manifest b/dev-ruby/semantic_puppet/Manifest
index 940b93e9ebd2..f942751740da 100644
--- a/dev-ruby/semantic_puppet/Manifest
+++ b/dev-ruby/semantic_puppet/Manifest
@@ -3,5 +3,5 @@ DIST semantic_puppet-1.0.3.gem 32256 BLAKE2B bbde7e40e2d7361b09906974b451a33a269
 DIST semantic_puppet-1.0.4.gem 32256 BLAKE2B 4704a6d913388d10cf32442511d66d742bcdba792d81d67de960209dbffc8ade970431e794934152b71031de83a75d9e09bda830e6e66838b68913d2bbb9da0a SHA512 8b830626e973bc74fb4f4147e83ca8048d412751ff48dbe96ec6e790645eae7a51c665b75a09d0f0fdec3b29d3798158c38b613e2f83d115d1ba2a4c8d24362a
 EBUILD semantic_puppet-1.0.2.ebuild 516 BLAKE2B 82ded36da2a07bb20348ed9cb670f7a8bd50cdd62f8497059725748dcc4e7b189e203c8263244f0815d04a790253d9ec3182fffbbea6eee3e2fb8dc2655d800d SHA512 7d098d0348cc26239bee23bd761f2dffcd586b21dac5e3bd63a39c47fcccb77a80c813d7e7920bc0b2856a19177934866a435838c0f565b4066dd39d7d776a37
 EBUILD semantic_puppet-1.0.3.ebuild 482 BLAKE2B f22e33abd253f07d0c2e1baabe1256640ce4f9c0620201f8474eef412b014baaca5c6628686aa85acf7405ea55dca63a3fa2e0777d66ea3979aed8624c073a98 SHA512 9cf20a9c8b6310f00e604d89e74ccd2d3b86012f9d454c241822071bb782007d67ed239aed049300b0dff6ea375311440ae253f6d4d95282aaf07a9328b77446
-EBUILD semantic_puppet-1.0.4.ebuild 489 BLAKE2B 5b1cc411547a721a57eab702749c771326e9d0134408ae628c3185cf81c662cbda4cf312968720962034f3d747fb3bc43759da8a5d9bebd1af3b4a0e07fe0345 SHA512 250347efa118b1e54dd10df273d36f395ea572b40c062b285cc036d97eb9f2611b3de2c9d8c5a2366b7cb529654c671ba5ee1382e192de69545016ab4ba01260
+EBUILD semantic_puppet-1.0.4.ebuild 496 BLAKE2B 0bcaa9166a6e324f5bfe19bc536feb098d1aec376a6d545084fdcfb053a9e394cc516bb56c64c209b37e639834f7188d57c8171e0e25b7b8b0b137071e32b896 SHA512 ffaa1140fc454edd23626d4399d8e5891a7a2069a69d8c473aa7d4e37a1d4dbdb99689340b69bf2872379d6ebc7365c6d91cefd55404470962ec1b95be059980
 MISC metadata.xml 454 BLAKE2B 0f6caa19f53cce31b3b89da348015176d95f146b6e964b10c33d26c84e7bcdf785d6182155dddc3fa530b5ce21a5f53db1d3cc85501eb6ad388f903307fcdc37 SHA512 a5de04c5c0c220e447835e27f441e089b9bfd1c4ff3a1122d1f2bb7f2c2763a4e5136be3509d669de2e46b37dcaf48224a399ccb52a3f0f006449a796e989aca
diff --git a/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild b/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild
index 14f02e1fa911..a1c0f89e14d4 100644
--- a/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild
+++ b/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/semver2/Manifest b/dev-ruby/semver2/Manifest
index a8f0d62e2256..590376d917c4 100644
--- a/dev-ruby/semver2/Manifest
+++ b/dev-ruby/semver2/Manifest
@@ -1,3 +1,4 @@
 DIST semver2-3.4.2.tar.gz 9048 BLAKE2B dd0f7d0ec826b0d893aba07203fc1ff01367b9d0406c24157dd76290a7c3bb6301e8656d149aaa9a76f2ace5a1c9559df56aa5236f3a305bc982f30450c36ff9 SHA512 7f724397ac4a58a459e7b4794d2097111d2796837150634c318c6785d321299215099d4c359d010036d1da2a7d78e50ef6bad1629d01363650687e0e678a51d5
+EBUILD semver2-3.4.2-r1.ebuild 542 BLAKE2B fc7b47855192531918d96276857d10c12d32cfddabf28b771336a5ec371ffd07f276f30508999319a109e7d43aa6ab8aec6c2e2abd42b1818a8cc1d7061e0255 SHA512 81a43de89a5a4c763698dde9239a02e3722862846594c4fd8069c1d77163b0162acc9d8d4bff4534cd9c618b26519e314310273389f087fb211595005511d5d0
 EBUILD semver2-3.4.2.ebuild 534 BLAKE2B 29cdc93cea21d3f7a1b61617ce6b2b5d49d4c4d28c8bd37f3c31a6723f84c3aff37479c905afcf322fba66146ca935263e706ff9180aecffc587ea45c6769853 SHA512 6c92a0bccec6e1a42c45565173ce0d2522b44ebb493465dabb22460aa8db05c4afaf6997454681299d0077e123bcc909d1549084374e7cad5bd011aa27a0800a
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/semver2/semver2-3.4.2-r1.ebuild b/dev-ruby/semver2/semver2-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..745ef372efb5
--- /dev/null
+++ b/dev-ruby/semver2/semver2-3.4.2-r1.ebuild
@@ -0,0 +1,22 @@
+# 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="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="semver2.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="maintain versions as per http://semver.org"
+HOMEPAGE="https://github.com/haf/semver"
+SRC_URI="https://github.com/haf/semver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="semver-${PV}"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
diff --git a/dev-ruby/serialport/Manifest b/dev-ruby/serialport/Manifest
index 710e78d72417..d64e6f6916ef 100644
--- a/dev-ruby/serialport/Manifest
+++ b/dev-ruby/serialport/Manifest
@@ -1,3 +1,3 @@
 DIST serialport-1.3.2.gem 25088 BLAKE2B 035e7bdb8ef321fb67ec63283c0e4c8fbf8f909ea3495994716b95cc55f212561a09a87352aed67290d96b54bb26b7802e5ed37c27e67291d768d7eb6d30850e SHA512 ff78fa04183108c2e9c5eb4f0caa9f8072a693a2a120ca084476b4125ca32ec67a6fb268bedda3ca142a9a397dbc585dffaab88f339fccc12e5ad03a09d4c28c
-EBUILD serialport-1.3.2.ebuild 754 BLAKE2B 3c8697c1f66a100173f63ecfed33caa2771b2211cf3fdf79487be0dc5849ee7016830e39478d65f14d60ea40831a1561b6e523adfaa5b45670fbeb65151ee61a SHA512 02e0dc07ed2039e61eab0c89b26ab5e9e955d67d216e0756dfee47e1214ee33f0c95457d5a63c65e0db62d809ed0977af87c901104049a2be3ccf2933d173907
+EBUILD serialport-1.3.2.ebuild 752 BLAKE2B 5e06e384ded36fc82eaa78f6f7ef85fcabbaae4f2cf84cb70b622d2fd72d1273d71c86ce162f81cc5efc16ac8b2af2c98397bd2edf02a4214910a720b3dd6377 SHA512 26a43470edc3083e8bf40bfa79c0af2988565702e1f6a6dbdaaa91d4f20fa196ba6be61f6ea8d9bb44293098ba0e88525bb93024d05768c710e141c3f49fc2ca
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/serialport/serialport-1.3.2.ebuild b/dev-ruby/serialport/serialport-1.3.2.ebuild
index 994ac57e0394..812e30d502b9 100644
--- a/dev-ruby/serialport/serialport-1.3.2.ebuild
+++ b/dev-ruby/serialport/serialport-1.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
 
 RUBY_FAKEGEM_EXTENSIONS=(ext/native/extconf.rb)
 
-inherit multilib ruby-fakegem
+inherit ruby-fakegem
 
 DESCRIPTION="a library for serial port (rs232) access in ruby"
 HOMEPAGE="https://github.com/hparra/ruby-serialport/"
diff --git a/dev-ruby/serverengine/Manifest b/dev-ruby/serverengine/Manifest
index 2affbc507077..d54f83a43f7f 100644
--- a/dev-ruby/serverengine/Manifest
+++ b/dev-ruby/serverengine/Manifest
@@ -1,5 +1,3 @@
-DIST serverengine-2.2.4.gem 40960 BLAKE2B 66e3b10c4396b4613b734d3d2764293de2935b0e99bc33c9ba0e79f69c2af6fbb53dee8e356ab351d65195124e139ec4b0aa7976594387432b88a3875e985ef9 SHA512 39f5abe2e15bf1ea6524563a7f86e441f93479160976421d41aa092e04a0fca8d4beda3b20487c45b6cd3bdffdb175d98fbebdd36ef9a85fa242ef3cf356a9c8
 DIST serverengine-2.2.5.gem 40960 BLAKE2B a7b256c1029c38b35673d104f6aba118bc5644947db7feb185d57456af60baebafb3c6a74996998630b7a0dbe3ee0baa5d4f260538ca7a8abf542b7528cd7204 SHA512 fb4abbf35553b8d69447be195a14018e335cbce0756b9ae91160bc4dc8253968a4b94c383f40aad1e1bd20aaeb700efced91341f3b26077a0d44b3dc00aa89c7
-EBUILD serverengine-2.2.4.ebuild 773 BLAKE2B a9cb0a38c1c904e0f0bfbbbd02d1dc3f1128241a9a308cdb2fa62f374dd8b4e3e5b180c44a64bb5936a41971723ccf82e8d8839c9796ef746c3ae703e91eb0b2 SHA512 1d0f1f4d7ede7f52cd9adccda8633e76d599ad96b819e043634fc1ae89fdc13dc35ea933f60a5a019cd8288473a81e17315a0818dae09a7309cc5056b99bcd1a
 EBUILD serverengine-2.2.5.ebuild 773 BLAKE2B a6c2d9ef6aed9461422a987588629133f1727185ab8f74eaf502727e7c05884d8beff4adf5f401054b19458660de0b08946d837ac8a965d6798bb6c4531bd256 SHA512 571e659ebea165fc69f4937581ab9419975456222a4ee721b63a0ee888f4044b77e51d2c4334425d40e4ff64a6bd1779b1809af7e10a5ce1b3121c999f5ab7e0
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/serverengine/serverengine-2.2.4.ebuild b/dev-ruby/serverengine/serverengine-2.2.4.ebuild
deleted file mode 100644
index 511a0437825e..000000000000
--- a/dev-ruby/serverengine/serverengine-2.2.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A framework to implement robust multiprocess servers"
-HOMEPAGE="https://github.com/fluent/serverengine"
-LICENSE="Apache-2.0"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sigdump-0.2.2:0"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	sed -i -e '/rake/ s/~>/>=/' \
-		-e '/rspec/ s/2.13.0/2.13/' \
-		-e '/rake-compiler/ s:^:#:' serverengine.gemspec || die
-}
-
-each_ruby_test() {
-	# The specs spawn ruby processes with bundler support
-	${RUBY} -S bundle exec rspec-2 spec || die
-}
diff --git a/dev-ruby/settingslogic/Manifest b/dev-ruby/settingslogic/Manifest
index b9641a7af82f..1959db26f93a 100644
--- a/dev-ruby/settingslogic/Manifest
+++ b/dev-ruby/settingslogic/Manifest
@@ -1,5 +1,4 @@
 AUX settingslogic-2.0.9-psych-4.patch 1279 BLAKE2B 6fafc241e1dab8aca1ae541c2057fd2649e04aa7b1b17c0bc99ee848ebac83fc3042b489d6d3bd96728234e23db7f63e9212d24964711f9815d221842ce3d79d SHA512 f4516b58bf0f8bfa83ab2d365d6fa083fa353cc54e81a815f1992c1d58deb04e827a589b5f182385f2025efd379143a96468e32e99a7daaf60b600068184c440
 DIST settingslogic-2.0.9.gem 10752 BLAKE2B 7910ab9a4e61c92d5b23a34e9ba58ad89bbf71b7aaf8c2e679eab3e517ea38553d83d05a32a13151c9deaa36d0e6ae44a6afd1b13cfe452a69c668e07fa618b8 SHA512 e9229231815c8d80b7539724cda78c0cfd17bcf8423d0bc2643b3ce2a046e8014f3b398c5314b095aef480a0c7de16e0c93a6592fe8eabfea4ae94742f3dab57
-EBUILD settingslogic-2.0.9-r1.ebuild 534 BLAKE2B 71362e5e0c3f13c958969a71039ea67de5d65a04a2d82850bd0f348908e5a827d07c7a7fa826fbaaa945c6010db661ae33ca2074293502b5c124bfececfb62b1 SHA512 9e876d17e6eaf096542e4ab478557d462864c86c1c620fc343b278a8dea34e7c0404484df9c8b45a5ac83755b1f2cc4678dbaaf9d0ee367f1de07718b00b6383
 EBUILD settingslogic-2.0.9-r2.ebuild 580 BLAKE2B 650728143812963c5dd91ed42835e5d24aff7f5b6c1ac2d2bff672a5134196a66ce69ea0e33597f63436dc6665589f74467c9df6883847b96059da19d9618aaa SHA512 5d6b79a5dd3716aad825198f0de1f377e7ed38a5f5f14f76c39fb6da986aab463c82346486a472b629887a3383f566e23c96851f38d1dd176c3c6281bb92234b
 MISC metadata.xml 352 BLAKE2B c8579ec17f151942684fb320b577fabd2d0ec4e7dbeb0ff7e86d548ef213522c48a61197c2fb50ab5fa8c660a5549fbd0da2374c13c990106209f0c8241cc796 SHA512 5824d698f1d9abfcb1c65a84095194bca44958b70a4642186631870809f32ab1c9ec78bdb981cbb3b3fe534fbbbfbb7178e24f769ed162085a03099e3f790dca
diff --git a/dev-ruby/settingslogic/settingslogic-2.0.9-r1.ebuild b/dev-ruby/settingslogic/settingslogic-2.0.9-r1.ebuild
deleted file mode 100644
index 87a72d7dacf6..000000000000
--- a/dev-ruby/settingslogic/settingslogic-2.0.9-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple configuration / settings solution that uses an ERB enabled YAML file"
-HOMEPAGE="https://github.com/binarylogic/settingslogic"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/check_dependencies/d' Rakefile || die
-}
diff --git a/dev-ruby/shoulda-context/Manifest b/dev-ruby/shoulda-context/Manifest
index b10f177e156e..5ee25b1dee26 100644
--- a/dev-ruby/shoulda-context/Manifest
+++ b/dev-ruby/shoulda-context/Manifest
@@ -1,3 +1,3 @@
 DIST shoulda-context-1.2.2.gem 24064 BLAKE2B a6068da369c00a36e6056a8ebba96eca90efddf94613dfc90c9f2a47bec2c054a41fa61b861b2f3ec1195e417bdc54ab60d53f91bc5e0f167eac07b84880892b SHA512 b09f5ce2db59bbb26d5678b17b6641b79df7983d25e81a31bc10c42b702bdba09795b692d711d59c103beb2f691b503567e37c46668f77e600416551ef2c5e05
-EBUILD shoulda-context-1.2.2-r1.ebuild 846 BLAKE2B d7d57110ac1d8b2429f2c368b81715d273acf77a89a8d0be562aa8710bfe4e99749abfe28ecc478f79f8636b164e7d130b9ba2386fb13468d546a8e7e9feb81d SHA512 ae180c0fab01122172d583d3a1d663063d21ad80869ae103264540f761d86ff2c234c399f7bfbf8317ba71bb5519d2ffede15286b3fda7eaa0606fc48de7f7b4
+EBUILD shoulda-context-1.2.2-r1.ebuild 859 BLAKE2B e2c0ecb860be7ea490f41dda1f39bfd9b16285fb864d0c1c2697710073df6f3200a2ba3c4b3bde77db6194cab96bc82999f2f48c75d27daed2eeec1ee3fd07bf SHA512 ff6f5a3fc08c7a6c64cd9a75d7f3c03406bb60244b1dd688ec0b2533071a7c80d34d3c46dc8985aff0909c40c43ea1c05a2e7959ffc60a4baa64d21c08ac2823
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/shoulda-context/shoulda-context-1.2.2-r1.ebuild b/dev-ruby/shoulda-context/shoulda-context-1.2.2-r1.ebuild
index 11edf3357612..027669796650 100644
--- a/dev-ruby/shoulda-context/shoulda-context-1.2.2-r1.ebuild
+++ b/dev-ruby/shoulda-context/shoulda-context-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/thoughtbot/shoulda-context"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit:2
diff --git a/dev-ruby/shoulda-matchers/Manifest b/dev-ruby/shoulda-matchers/Manifest
index 6a6d905746d1..4e191d7563b1 100644
--- a/dev-ruby/shoulda-matchers/Manifest
+++ b/dev-ruby/shoulda-matchers/Manifest
@@ -1,13 +1,12 @@
 DIST shoulda-matchers-3.1.3.gem 208384 BLAKE2B 0ce7cb91ec8a311ecd4872ca45b178686fedb126fd5a05d55cc8654f5a40d1ed7e0a1da2b2c47c34ce3e5ed13a302a1d309f4afa67bafb37d5ed8a724945e97f SHA512 c61397d20724f3048172a8a20ef8abaeafdba3a1d5d4b923b1b11480b25c70820fd372eb2851c6eb307894bc0b7e1aae515e23a3581a83db1b65a2c778b22d67
-DIST shoulda-matchers-4.3.0.tar.gz 235212 BLAKE2B 03d634a851d5b79baac7fb3c5017be2ba8ce5b36905597eb759ea6ed22d543af5ce02c0c2af0f560d913d17713a8b3c417770adb7f247a6548d0666164e0866f SHA512 ffc90760ec47502d0820decfb8ab0620fa65fd9f45f3435c1d905ce0fe96010a3e059c690e9dbab7b30146b09a9e511ed4687a220d7cdf000f2fe1060e0b5ada
 DIST shoulda-matchers-4.4.1.tar.gz 240423 BLAKE2B 5fca9389601f35c536fa8a37adc6a14282fdb4aba21453223d739e503fc226c74473791880d2fc0b4f308bf9deccc1bd640c320e86f586f075b5d1add69e33f2 SHA512 3103bbad862848d00f9ab8c71c20fef1fdc131c6ed13a5d6ae9e11c3da8ecd2aa09e5996f8b28ad08a5588b02ab5783dcc37d04357d13357ea3fa8ca28a02e3d
 DIST shoulda-matchers-4.5.1.tar.gz 243634 BLAKE2B 32d846d0dc3c8725a9bd0d60e858eb9fe4106a20222503ac908d1a9c9c310d8e1477aa6264f06961812151b9bd1a1a33488707d9c96524cd3431ed7b3246e534 SHA512 8c240fe7699094a63db824145ca28c245526e95d489fac82e1a28a2418ae40524ba0a184a7f9b269b7c31ad7ae2cbc24b453547cab0845639fdea442bada483a
 DIST shoulda-matchers-5.0.0.tar.gz 241021 BLAKE2B 68d70f0ac503deaf05a769b39ad905ee87108b2e2a3f5d76d23b2772c0374e83e3c5cb0b0024a771e7c04958da0b890f3b564287230fffa0d207d501bb8d4c0d SHA512 c81c514071c297a2372b05caa987fc39cf03af25ba0d7ba4ef1f23deebbad81013d80ac5b360a00f5fc0a155e75f3ff65b782c56a5682348f683ea11814ba710
+DIST shoulda-matchers-5.1.0.tar.gz 241567 BLAKE2B 5e778175ca80619b5e3da04fc235a6c68ef150e4abbe34520502fda5a86f44530dec3b0d4d448f87c30c54e062085a00bf6cfe3dee83c82825e238050480e10c SHA512 2abb23126aabc83d1787838468c1959442a32ecdafb244a6f20a08e382990a716ccf2219abee6f8121ff0a3f720e86a6775dee5ae351299416e51df12ad21b32
 EBUILD shoulda-matchers-3.1.3-r1.ebuild 542 BLAKE2B a378f4dea5eedb7144c5478e61810a66fa4fc1c277e616a1815d5d13d19e3f4b1b370b294b8f7a0e48283c4774176b080a8176c0090666a56cfe8b2e111e2e75 SHA512 36e0b839b7a125618c6cecdbe436813c76f045d2fcdf6148e851abf839ba421ac1754694522de702f603e44ac1330654d80b57d04a2c3639734c3c2f35363ff4
-EBUILD shoulda-matchers-3.1.3-r2.ebuild 536 BLAKE2B 4e31d245e08efe9eb06d12d43f59ab54281012fb657ea7077dfb360dc71da56335c51cbf0f10b815dd6534d1e746a2f0262e4b35944331a3d08017d775431f0b SHA512 359240947c33db4f5872f9c1ea44ceeb1ec36bd237feabf5f4fc9f76d25adb24aed9467f57d050a0c1b7e0566926d2156537edf6e1720923a439c420d682d0fd
-EBUILD shoulda-matchers-4.3.0-r1.ebuild 816 BLAKE2B e1d68caae2340c23b4abaf0691a3aedbae59bb29357417616d998e724d83f07fff075a2aee58954924d3c7449b096cf499290dd00d1e6e5ba87815e4f415545b SHA512 d1e6b7955f15d523c19a135d5de795b384cf5f81de2045354936a86506aca541017fcad00cb28fb1e825275d3deb3ae3f6be4a4fd81769767edba61eea6aeaf3
+EBUILD shoulda-matchers-3.1.3-r2.ebuild 548 BLAKE2B ea8806a4790c1e21df5373486f8a1b9e2700e273c83e0640a6e8f23102b56f752168f6eb243af5900f4189a65114b9c33d81a15f8fedd0cd6e1448b167a8e56c SHA512 bd397b5506f026ba1a7d5fbfd56c740f92e45a6f5f08890aa618a45ff97b905fdf0748c64ad8a943c62a8f168a211853e098a4088b622100610c09591c70e93c
 EBUILD shoulda-matchers-4.4.1.ebuild 826 BLAKE2B b21f3c8ee48db9c51d002a1fa99be0777b0343f4ad2ad371b47591cbfd46e3de2b20045c6274baa98b8a08519f07d7cb4faf2bb891130031005cd56a21885930 SHA512 62f4c3f846eb2f45d1019648af158ec821e752af03ea5298808755768b3216af43d2b6a0705f506700d3bef904a654cb85be0b45d8d6202124a37dc467d757d9
 EBUILD shoulda-matchers-4.5.1-r1.ebuild 828 BLAKE2B 9eee25758297fe04d6fe2fba1152efed97db6f5f9e585b845dc5b1b10ee68a3a9c390dd5e9308d1521dafbd2116980250030b1b490e5d36ff929270989b49c8e SHA512 3e6ca8ad5db58c8e25ca2de70bd8782257543410219ed6206d2c29289583d99683cf63bdfaeeff17e97ccfdfc0d38e68bb34903a320040cf99587330d462db17
-EBUILD shoulda-matchers-4.5.1.ebuild 828 BLAKE2B 5534da966d45c768a72aa432c0c2d52fb732334b307ca1f420a7d37d556233d237d2eeb4f2c60123ae2b907750c18d52c8ba6553a0c9f2d13eec29f181cd9cb9 SHA512 7489212005c817def938f140d3360d60ad12be148370c3944a492ebea73bcc062a22b8859e58ba0c5c748dda20d5ec6a009591a8f16642d64593d9c26ea8ace2
 EBUILD shoulda-matchers-5.0.0.ebuild 835 BLAKE2B 4cd1f13995f9f8d48477b828de3ac1ab1f4df0a9b389c8f2bd01a8170d7f9606e22d32ab334702875bb5f16f7ee00761beded8326e29e9c22efa7ff70aa67ef5 SHA512 dd02b4d8c42ba5e0444102ed1441a7b62c9e606b7e767adc5c227cb9bb15cf250e5d35754c970fea5da4afa13eddd49dcdd02d4609bd8acd48042a14db104af7
+EBUILD shoulda-matchers-5.1.0.ebuild 835 BLAKE2B b0ab4ca8d9a236c5178ce76bb19e61b45b2f1ec192859af1ca26fff82c268b31e1d13084ecadc4d10a87109a97839c9c59668d2649273024f5531117174415a4 SHA512 d7631d93ba08f09715fa4fc68dd215f2daf0b710e8f0acfa74af361dc0b898788b3d2be571c11da5ef0b5ea626d1e11fa232c445a482b20380c1e59160d5edda
 MISC metadata.xml 468 BLAKE2B deac17b1815c5381c7220dfd64c5b07dfcbb40ab1e9a3d60c69113e28d4132b0347e825a7c2ed836a541f3f97a898e794f4f0a9712045959c490962c757f95fe SHA512 b6dd01f25c76a89d822835ef56d8968eb53138ccd44507d7863e45834674eaac84092b825b5ef107be02109f82c5dc5d4ce60d21729da071b375f52f8fda4c4c
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r2.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r2.ebuild
index 647c9076f618..cd7ae2fe058b 100644
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r2.ebuild
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/activesupport-4.0.0:*"
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-4.3.0-r1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-4.3.0-r1.ebuild
deleted file mode 100644
index c58c911acacf..000000000000
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
-SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
-
-all_ruby_prepare() {
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/s.files/,/^  end/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-4.5.1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-5.1.0.ebuild
index 3664014594e7..ff1abe80e35a 100644
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-4.5.1.ebuild
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-5.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
@@ -21,10 +21,10 @@ SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
+ruby_add_rdepend ">=dev-ruby/activesupport-5.2.0:*"
 
 all_ruby_prepare() {
 	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
diff --git a/dev-ruby/shoulda/Manifest b/dev-ruby/shoulda/Manifest
index 443ccdbbc1a8..6e0b35efeeb4 100644
--- a/dev-ruby/shoulda/Manifest
+++ b/dev-ruby/shoulda/Manifest
@@ -1,6 +1,6 @@
 DIST shoulda-2.11.3.tar.gz 145068 BLAKE2B 5e6d9b78b255612ec18c78076f9c4d45265a3e02a8fd56a127ea8f235e3b344005942c4b6e53014e6328206501c178ce76e1554a9d995ba0de04f5afefe4a0f7 SHA512 0b347c4a8be177b5806364114c25dc786ca2ac95a11c93a723dbc9ea1f6d8ae62df7fb420a52d477cd1e10e8d894074072a040eef36ee8a43440e5256c8427e4
 DIST shoulda-3.6.0.tar.gz 22691 BLAKE2B 798b88e208355b0325b9e8b48f66687ad2702e1b5fc058d45504648fe7c7760b018eaf3d1c7bd45c68656c7bbba8fccc9b74d72003ee0b78ac53a277567609bb SHA512 10f7c6801eaabafa08eb2bc9c4d2a96237d4494aee7d40e5db8cf9c1abd8cccfe86aa21b0e68e2ec42cf222d285cdbec11ed2fdd804ffb8bd65ffd2efa3e72ac
-EBUILD shoulda-2.11.3-r3.ebuild 843 BLAKE2B d6a972dac249784ef16584fa940d86752b3cfe390616bb7c4e67a96038fc69c5db34a64119fca0f66b5e022177803297ab50410138cf93c911001b1e55b9f3a0 SHA512 2998bf823fb7719715e17313dec52b77af8161cf20a800211b0232a096eb1b810751b41a448a3ffd228b34b3e53e1a02ed93d06ea0c1c2bf1b8608aa86a3d923
+EBUILD shoulda-2.11.3-r3.ebuild 849 BLAKE2B 7e94a01c5b93b7b5f8898e4078048a4a3e5efb512dfc59bcd9071af0f819b53d1c24c8cc35dcec8b372512883195fb355a2e8f140d9e86498318cadba4d19697 SHA512 c9fdbad2f8a381cfcc0336df2f58d1a3ca3e83cb8f70a3397e66f5502b5518fc83754fdff4bef7ea3f53e6cdcb67037a5af53b997ed829da42e9dde8ee3bc030
 EBUILD shoulda-3.6.0-r1.ebuild 924 BLAKE2B b0e4344f4255760b5ce637eb53e58af37d08e772218c77fceaafcf4f81195467cc1733ff9380f36b86d2d900378d54da046f0e1196ae6237ea5ea6fee4901fee SHA512 1a14864d13555c3631653bbf87fb5d77195e8b7c7532c889ff916a0f187c05a28f2e35ad13ab3c794bf8005a42b96e7f900195ee001b59284698f26370e8f7b4
-EBUILD shoulda-3.6.0-r2.ebuild 924 BLAKE2B 6cffd9b2c3144b38d41660fdee0d902b06de7b958246bb23a312db861f3054c7bd8d067d76bc3528228209400de15b1e5cbedd525e4218e56c413d7b2c66c4a1 SHA512 c2e828439a1957fd50a6ce5ca296421ed679c655ec62a7b2293dc17ce61d0b49f4179f01bc127c8524569ca494ccb1742b8a2d5c5f2319a7e8f08d0d7681bc40
+EBUILD shoulda-3.6.0-r2.ebuild 937 BLAKE2B bcdbd3e0af8e9a1f027bdfc38207f5284659426e59c3007341c4c6f99f060cca16d122d0b78c2d1df490687f429275ac376b78c29a6377c9fe7d6538f8a34357 SHA512 6f044ced96c54f159c64ad38cc1a94fb924d81f002f2c70bce123a79ada671936cdcc5610c1a97217e5f64e3348f6f4380584a1e4d708913431f8d643e685899
 MISC metadata.xml 345 BLAKE2B 3d5e4fa847d75a6e14084e2dd5c576409fc27ee1a39605615595eb9e1151dd7f11b3e005e3287536cf846caa9911dac0d00265c90ba593c4a46feeea593728d2 SHA512 322be4170fed150e6df894ea8346ba54b83d37de2a20de99289b34d1193ac0ed8275ef54d7cdf478381db6951457e1c27635ad6840751a1c9deb9cbabf31e83d
diff --git a/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild b/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild
index fae940eb5503..0224314087a3 100644
--- a/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild
+++ b/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CONTRIBUTION_GUIDELINES.rdoc README.rdoc"
 
@@ -18,7 +18,7 @@ RUBY_S="thoughtbot-${PN}-*"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # tests seem to be quite broken :( They require working version of
diff --git a/dev-ruby/shoulda/shoulda-3.6.0-r2.ebuild b/dev-ruby/shoulda/shoulda-3.6.0-r2.ebuild
index 6eb50ff9f0c3..ffa03c933f02 100644
--- a/dev-ruby/shoulda/shoulda-3.6.0-r2.ebuild
+++ b/dev-ruby/shoulda/shoulda-3.6.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/thoughtbot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 # This now more or less a meta-gem and it only contains features for
diff --git a/dev-ruby/sigar/Manifest b/dev-ruby/sigar/Manifest
index 24bef2bb0d78..57c8b177f345 100644
--- a/dev-ruby/sigar/Manifest
+++ b/dev-ruby/sigar/Manifest
@@ -1,3 +1,3 @@
 DIST sigar-0.7.3.gem 205312 BLAKE2B 1a1d526e2f60a4a91ef405bbb7bf6aede2d4707631108f2779dfd1533d345b9e2c1fb586aa748d13ff1f7cb0b228e34618a0e8d549a3b4b4dc44a37684f2e970 SHA512 cdab3ec8b9662bfa3a432f0206c34c99c6e6e0ac5c85a93cb472367a9f325a27d5232bf2166f5c2955817e3ab8bd1035db06aad709ce20cc261f1b15d89dea2a
-EBUILD sigar-0.7.3-r1.ebuild 822 BLAKE2B 702274ba625c0913a9e5ae815f1d56bd2438c65587950503a28cef8218160875c0a93ef57494c3c74a25f5a2ffe5d9d535f6a58d9b198437037d5a45c016ebac SHA512 003b5efded664a31e4e1835413eb030baad72f45d187cad9d5c83d62728d8866c383acd11a40e18d8deba1225591ae0530a5357639d3b96eb17bf0ca06f24d29
+EBUILD sigar-0.7.3-r1.ebuild 820 BLAKE2B 6934ab05fe0509371027b7c11380e798bb4256116546b8f342e4022f5aa20226609d71411831a280ea8aa56c6e1031675cbb7cefbbde757e4630f4b1c876741b SHA512 d0edccceaae888b8cf0c51e412089b7457d53dcf6a3ca1171412691baeae2b620165ca876414097674af07d048568e4808aad9a24bdf22e84383c4c300668e5f
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/sigar/sigar-0.7.3-r1.ebuild b/dev-ruby/sigar/sigar-0.7.3-r1.ebuild
index 887ece679573..5a197ce6e33b 100644
--- a/dev-ruby/sigar/sigar-0.7.3-r1.ebuild
+++ b/dev-ruby/sigar/sigar-0.7.3-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_RECIPE_TEST=""
 RUBY_FAKEGEM_EXTRADOC="README"
 RUBY_FAKEGEM_EXTENSIONS=(bindings/ruby/extconf.rb)
 
-inherit multilib ruby-fakegem
+inherit ruby-fakegem
 
 DESCRIPTION="System Information Gatherer And Reporter"
 HOMEPAGE="http://sigar.hyperic.com/"
diff --git a/dev-ruby/sigdump/Manifest b/dev-ruby/sigdump/Manifest
index 0e0bf2d72de2..8c774d67bad1 100644
--- a/dev-ruby/sigdump/Manifest
+++ b/dev-ruby/sigdump/Manifest
@@ -1,3 +1,3 @@
 DIST sigdump-0.2.4.gem 9216 BLAKE2B 66c3d61eca7f1288de6d95e8d0376d27ab39fee6e5168430801d0f2016f6488eb20cc92e83967d69f690e5ff064952d2696ed08ecd0ab0c4e98c61fdfdbf38cf SHA512 c079f538d3e4e1af61325f18b0580a8d92869800736fc770bc7b193358df480105f1ff223158d52e62ea272e1c375be82ab6415b43c28cc1d74c57cc7640d9cd
-EBUILD sigdump-0.2.4-r1.ebuild 431 BLAKE2B d77f4480a2b209d7ee02f73519a2dd6ae315039bcbd949b2f9f1fb838611d0274a97ab50915960143b96fd2523d795c5c2fb2476b059059a027bf6943eb0d662 SHA512 3b03be2748b3947850e72e6400b7848964b50446db0c8f94da05d167d047b12021d55b413252ac2350c434de2010683a0a74bbbc1fc1ddbc0d7022ce34717925
+EBUILD sigdump-0.2.4-r1.ebuild 438 BLAKE2B 5d194e9db85622bff6963fc7e79efb76383110027f99b29270436abaefc5f2bedbf6f1f0c0d10daa98ab7e3c9e73659d63f863ab47d55dee2bc1d59f75b5dfae SHA512 9df5212e72f8b544c9d9f349bb359eb45dbe1a14d4510661d31df073fb0febeea926be03e8a649b9145bac8f6966d5a4568b2ea16827df53f6e35a72c7890ce9
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/sigdump/sigdump-0.2.4-r1.ebuild b/dev-ruby/sigdump/sigdump-0.2.4-r1.ebuild
index 65c68483cf52..5ded826a80f4 100644
--- a/dev-ruby/sigdump/sigdump-0.2.4-r1.ebuild
+++ b/dev-ruby/sigdump/sigdump-0.2.4-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
 
diff --git a/dev-ruby/simple-rss/Manifest b/dev-ruby/simple-rss/Manifest
index 6cb8cd81249f..b1f2d1a78021 100644
--- a/dev-ruby/simple-rss/Manifest
+++ b/dev-ruby/simple-rss/Manifest
@@ -1,3 +1,4 @@
 DIST simple-rss-1.3.3.gem 33280 BLAKE2B 7de333c13cb928627ed9962ceb55cb23415218d3214591a3ac2dd29e3782cfcb07bb7e99efec067ed3042eed317f38f815dc43bb11ad5246cc9212e8b03f3664 SHA512 7ce7c121889ede58344cf686ac17ab97d75eea6ba5346aedf06294e969f239999a4e19ae416db93f3933f6dae24d7dce22c408d71efb3bbea91cc8091bf43920
+EBUILD simple-rss-1.3.3-r1.ebuild 755 BLAKE2B cda3c547099325ad548ed0afdd40eb07abe81f32b84a72dfe5997e4e5a6edbefe05e8db95a7fc989bb4b0a201066e65e9f7369b39f538deeff5e6efb72debfe8 SHA512 b17226a15280cf8e64effa0a200af53afb915731ab4550fceca83a4b1a62b8cfa528f3ac1e792bc80fb7a7f8eba79d5d15b431a3b3cd428a50d8ecca2d087f43
 EBUILD simple-rss-1.3.3.ebuild 753 BLAKE2B eeb9e7897b5a8cbc11e8b44aaab69aef9fa7949e66fcd71c4acce0b56d634ded7c9114e98d3721df4179ef0711ea6b1435cc3258b9eaf6bb0c1a3dbdd1818fc9 SHA512 a893e31b29025a826ec9c3110ad74dfe9eb32154a2d34f4de5caa2bdf0214db93659d11727116247a0efe5b382986f4504ef19d72422cff733a553f7b87e5c7d
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/simple-rss/simple-rss-1.3.3-r1.ebuild b/dev-ruby/simple-rss/simple-rss-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..42fe41ebb5fe
--- /dev/null
+++ b/dev-ruby/simple-rss/simple-rss-1.3.3-r1.ebuild
@@ -0,0 +1,31 @@
+# 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="doc"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple, flexible, extensible, and liberal RSS and Atom reader for Ruby"
+HOMEPAGE="https://github.com/cardmagic/simple-rss"
+LICENSE="LGPL-2"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid dependency on bundler
+	sed -i -e '/bundler/d' \
+		-e '/rubyforgepublisher/I s:^:#:' \
+		Rakefile || die
+
+	# Avoid tests that require unpackaged test data
+	sed -i -e '/@\(media_rss\|rss20_utf8\)/ s:^:#:' \
+		-e '/test_rss_utf8/aomit "missing data"' \
+		test/base/base_test.rb || die
+}
diff --git a/dev-ruby/simple_oauth/Manifest b/dev-ruby/simple_oauth/Manifest
index 0b16e08b5b88..33c520988b3b 100644
--- a/dev-ruby/simple_oauth/Manifest
+++ b/dev-ruby/simple_oauth/Manifest
@@ -1,3 +1,3 @@
 DIST simple_oauth-0.3.1.tar.gz 9572 BLAKE2B c451850e4ece0741de8542b4736b6e68117f580974238e1a1c30714071c76d73bdd83c57c82841b7e0b131c58362d7787865000412d6d0d050d691f71f5f9e6a SHA512 9de7370b56a179e491dca703d92e093fe8dbab44783056b5f667d20e5475aa97210b5b187918159c1753458b5f80057971bb57f4ac2a6bd2f06ae133bc1a5099
-EBUILD simple_oauth-0.3.1-r1.ebuild 741 BLAKE2B f85a2f36ff2759753decb01dd2230afca8602a4d4f9585b496a8a726f1dd83b5c3da9d7a2792d5b84983af8669134a8d32774d08982aa08586bf9dc45df096b5 SHA512 ed2a956947f93a17f17805ca02c3bf118ff4045a95dad67bf193154917e43ee06e7c2ecce15d451e5cde290e7a09e536888c3a5b0bd7233bc85cc4a01693427d
+EBUILD simple_oauth-0.3.1-r1.ebuild 748 BLAKE2B b9ce68e16521bfa4a6c3bdc076f3c80c78ae6a50c93510a0a264cc9ae7a588126d121f47910d2924d2b3871c8ecad3c3f1a5af664aaaa906aa16823e75d19d3f SHA512 76dd293734d8cc691846f7f83dbd48d937b60bafa8c8c431d7f47376d46ee25404d2f43fe312801a01ce74bbd5e586134218a80aa2fef1996b26e7e56d62654c
 MISC metadata.xml 350 BLAKE2B 0524dee67b04468bf22c6ce2c8cd94bab13ee6f73f1831eac883c12f8c2e181f8e7e82a5c568f622a349383705ddd6e216efcae0553959f26c19db119a671d12 SHA512 e3d9f6c5ac0ec68f9584d288d5d9a34d1dce96e0aa00ef83602b011d5f5f30c55dab86444ef5862b6bcc03d8fb2a10a1b31dd975b70d8654a0ef5d98a3929350
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 3bd3362f87e0..d9033969aa22 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-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/simplecov-html/Manifest b/dev-ruby/simplecov-html/Manifest
index 7a6d0cc9be1a..764f779883b5 100644
--- a/dev-ruby/simplecov-html/Manifest
+++ b/dev-ruby/simplecov-html/Manifest
@@ -1,13 +1,7 @@
 DIST simplecov-html-0.10.2.gem 183296 BLAKE2B f4edfe25249927d46f32d422b004d8a03671926792ea78016864764242f8bf8dc9131a0580b9519db6798beb3fa093f79a0d585b63d6b6b62c9faf7ae94087e8 SHA512 141b9d55ca7cbf1bb64616482828107c7c33c7d6db1b5650ae9d463e5ece7a7fb56d123c539c7364fe2a35e5faea382620a0b34e337d4c9d4871caafc794a967
 DIST simplecov-html-0.11.0.gem 184832 BLAKE2B d70fa7688752d0286fc72de57352169749a78737b9ecd97bb735d26951476c872eac87c4a41eb9dd5fa4513474c21071750accaff6297c6d8a4f31206a36364b SHA512 2971769d9bd5d84229ca074fbefab5223874946062804bc4ce195b1773e96d374338908684b72a0b33c2d37ee6778ca01de888b09d856944f018aec6ac7365d5
-DIST simplecov-html-0.12.0.gem 336896 BLAKE2B 03172ebaf3320e34937dd9715bc15e4bdbe91df41a22922c38089a75a0b85fcf1eb4e7b8a803d298c6789b684df6d5d1ab582d34ce3e07f6fa9a4b5316a22619 SHA512 dd05aed77e44d35a54d272abb78d4984655eddc9bf7cee8d24f00da2088e62f486bf160dcd3327833fadcd18b79c15b34f4790300cb9e689e13bb6daf873334d
-DIST simplecov-html-0.12.1.gem 336896 BLAKE2B ef068de799698c92b1a2cc9e54c7a85a08b763af43c8e013ca409283ee77ddbbea37b92fe691270fe3fb1675c9e4d9e79264dbb232a1aeaa23bab6e4358f17cf SHA512 9f85694d283588f5be3794edd37af94d22c914bb1659da5b8f846af8a988fc82935441fe60dc61c0345b7991ad3e85673e8aa345a8f8c3337e5fd2ab327ca5c9
-DIST simplecov-html-0.12.2.gem 336896 BLAKE2B dbd735855216b395280a3d3b34493bde8fc63594543abb6a2600a4bf87165b06dd3bddd7b161aa82d18b87ef62da51599eae366e5dfb4b85163380062fd4fb77 SHA512 5f89cdaba272b841446ae68d40daacbd551f3fcf7750c2491f14b79a3e61c6c32c066305eb2f1862f8cbd2ecc1b020cc9a907a977ef567653276d8d78d584efb
 DIST simplecov-html-0.12.3.gem 336896 BLAKE2B 94cfbae7085163ba714b2bdf14b7c5eb1a4bc5fcf39d7e99689d74bb1e693d5b534ca067ba5609f6cfecdba64667dc514b4f5dede020aea176ae2328d1806ea0 SHA512 7fd6dad02b16f512d7fb859f62e5e8bd0a277af103c7829143795ccae60a9a057c323728ac36a1c42dbd143a2f0d175648f6e223e6e7e3e6394a52491d3733af
 EBUILD simplecov-html-0.10.2.ebuild 511 BLAKE2B f6a8c7f9dd6c26ab9652ab623da9c4190cc822cbdd8566bcfd36fe6530c0066482b3791a96fed1e098c4d896c2ed1dc0f07023ed70133931b3e58dae8e75aa91 SHA512 a72f84c970021218bdbda2a34533967a65e2013468f1133e76824cd9b7c821320f1733e672618aec80bccca104757f2a7f09f7ff580cb1792106b0f3226923b4
 EBUILD simplecov-html-0.11.0.ebuild 521 BLAKE2B f294f3df42d4a50f850bf90b5ebde12e22fd30112568296295e02cfd5178a1bdd0b8634b64493d792726efca68731773cdf1b96f17ee81ad163160c4d5db61e7 SHA512 751d79c858147fe6acfd2a5834cec5735b946257bab7fe7ec37cffeb73fb691f1b8645359e18ffe107f4fd52aeaf8a53549302d4b373d78f3b16b1a7fe1d9031
-EBUILD simplecov-html-0.12.0.ebuild 521 BLAKE2B f294f3df42d4a50f850bf90b5ebde12e22fd30112568296295e02cfd5178a1bdd0b8634b64493d792726efca68731773cdf1b96f17ee81ad163160c4d5db61e7 SHA512 751d79c858147fe6acfd2a5834cec5735b946257bab7fe7ec37cffeb73fb691f1b8645359e18ffe107f4fd52aeaf8a53549302d4b373d78f3b16b1a7fe1d9031
-EBUILD simplecov-html-0.12.1.ebuild 521 BLAKE2B f294f3df42d4a50f850bf90b5ebde12e22fd30112568296295e02cfd5178a1bdd0b8634b64493d792726efca68731773cdf1b96f17ee81ad163160c4d5db61e7 SHA512 751d79c858147fe6acfd2a5834cec5735b946257bab7fe7ec37cffeb73fb691f1b8645359e18ffe107f4fd52aeaf8a53549302d4b373d78f3b16b1a7fe1d9031
-EBUILD simplecov-html-0.12.2.ebuild 521 BLAKE2B f294f3df42d4a50f850bf90b5ebde12e22fd30112568296295e02cfd5178a1bdd0b8634b64493d792726efca68731773cdf1b96f17ee81ad163160c4d5db61e7 SHA512 751d79c858147fe6acfd2a5834cec5735b946257bab7fe7ec37cffeb73fb691f1b8645359e18ffe107f4fd52aeaf8a53549302d4b373d78f3b16b1a7fe1d9031
-EBUILD simplecov-html-0.12.3.ebuild 535 BLAKE2B 3ebf02a75aac2439ff85ee19ec6208d6063bef76a546f580dd7ef15c60a3a83f8f1607274993ffb377caf9e229731da2951d9b1bc6755fe58b63a6d6bcd2d535 SHA512 87394dab5831fe160a1a26841d1d6e9317a2f8ff7766e21505db138c5a135aee5cd34523038f0c9149a4f6ea2f0a238cac04e78600afa07113161e55618c067f
+EBUILD simplecov-html-0.12.3.ebuild 542 BLAKE2B 37fbdb403d2e7bd08b8237c1821d362ee3a76434d9483e2149b183d6afe4e83a09b0766e8a5bcefdf18bb568bd17a9a7dd6839c7015ba97a42c47ca37dd9c5d5 SHA512 e7f686b177938fb88d563e3c08d83b7badd34ecb452de87e379811af25492c0ea9b91d9fffce24bdcac70959445af1ab140bfc3e44d6cc28e1887f70d4a1da8b
 MISC metadata.xml 346 BLAKE2B 511f4e5e1982b2f9111acfd3dc3a85cbef39f4b428a9e8205fb537612f61aca987d02af1fa080160263b216bb25fdf2e00885410c5c56c3efc4486de0e20a578 SHA512 303107a7c72cb198c829031055ad5a7a68f0e0a286f2a77b9e19aac6d2c6441117393ddc4af6336d6c3809596a9743e575c72668c56883621ed74d4f2c4563ff
diff --git a/dev-ruby/simplecov-html/simplecov-html-0.12.0.ebuild b/dev-ruby/simplecov-html/simplecov-html-0.12.0.ebuild
deleted file mode 100644
index 6e974d8d79eb..000000000000
--- a/dev-ruby/simplecov-html/simplecov-html-0.12.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="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets public views"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Generates a HTML report of your SimpleCov ruby code coverage results"
-HOMEPAGE="https://github.com/colszowka/simplecov"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1-2)"
-IUSE="doc"
diff --git a/dev-ruby/simplecov-html/simplecov-html-0.12.1.ebuild b/dev-ruby/simplecov-html/simplecov-html-0.12.1.ebuild
deleted file mode 100644
index 6e974d8d79eb..000000000000
--- a/dev-ruby/simplecov-html/simplecov-html-0.12.1.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="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets public views"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Generates a HTML report of your SimpleCov ruby code coverage results"
-HOMEPAGE="https://github.com/colszowka/simplecov"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1-2)"
-IUSE="doc"
diff --git a/dev-ruby/simplecov-html/simplecov-html-0.12.2.ebuild b/dev-ruby/simplecov-html/simplecov-html-0.12.2.ebuild
deleted file mode 100644
index 6e974d8d79eb..000000000000
--- a/dev-ruby/simplecov-html/simplecov-html-0.12.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=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets public views"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Generates a HTML report of your SimpleCov ruby code coverage results"
-HOMEPAGE="https://github.com/colszowka/simplecov"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1-2)"
-IUSE="doc"
diff --git a/dev-ruby/simplecov-html/simplecov-html-0.12.3.ebuild b/dev-ruby/simplecov-html/simplecov-html-0.12.3.ebuild
index bce2d4784082..0987aea03092 100644
--- a/dev-ruby/simplecov-html/simplecov-html-0.12.3.ebuild
+++ b/dev-ruby/simplecov-html/simplecov-html-0.12.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/simplecov/Manifest b/dev-ruby/simplecov/Manifest
index 8659a3e1f2a2..3213c7fe61bd 100644
--- a/dev-ruby/simplecov/Manifest
+++ b/dev-ruby/simplecov/Manifest
@@ -1,7 +1,3 @@
-DIST simplecov-0.18.5.tar.gz 100495 BLAKE2B b92ebac7983e33c36aacad29ac499dbdcbae9f2bcf9d3ffb0cc07eabff112e74ba0489ada7b923453a69cf3a1487c8ea3c7af8b973242fa52671b0ba96b2a2f4 SHA512 05c452138997f4dcbf4b8cb053871591c291229e3f1fa152d128b1ea87668582ac4d72fa412c59f30fa29dbed1a4ca07fbfe8e1a1fe9470a22b2d1e931171874
-DIST simplecov-0.19.0.tar.gz 107240 BLAKE2B 64c82c4e2c89717f0fd4d24c95352a8ef435e0c7f2e968d5611c67ee275195cd5d89753f6c009338891464eb400ac87535f6bd800c2e79b9be548d75057b8e49 SHA512 81ee7a3d84346d05f4fb78b85b70a65232a1b13fc5cfec17e6bd7be567bd64fda621721bb287f756c079b2b10a11d30c9ae308270db8d9865e01e7d5f77f2352
 DIST simplecov-0.19.1.tar.gz 107430 BLAKE2B 0f18cd4c8ddfd324f4e3326ad8503530862f0ae67658865183984b81a59ad9aa5fcf650fa9f64fa6841ea23afa07d25e38443a79ad0be26b966fa99b6805a090 SHA512 2d781008769abd79020be96f7c1f91cfb9f27d51d00436f737c408a9b9d57a82955cbe5ba5ee5a628b9a7e8835d9b3e1542b67499355373c4f9b2638bee83235
-EBUILD simplecov-0.18.5.ebuild 1234 BLAKE2B da6db0a5f167613299194ec4ee80dec45a5b355695a0d567a248c21944551072a4b24ca82bd03f3aa52f0d615850d5033e023c1962e82b7ff3bd647606547327 SHA512 d374fd89e990d3a32422d2f1b096b3879379eaada9e982774dc000aa126828097057b2d7972985ff0c0a87cc32343ae53a0d2b6989dcd6c244fab2979620f927
-EBUILD simplecov-0.19.0.ebuild 1196 BLAKE2B e82f58f8ee2915582d5ce3b0acc3b963b055cebe2e7d9daeed1a9575754453faec1789f27174a1509ac6d9de214275817008a204827e1daae40b4fd1aee15881 SHA512 3db78bb56d7c531bcc7a15fa5313e46e63bec6d8b16d5f09efcc1c7b3c987e0ba2a5cb5a8714bb80008c56d56dcee6ea6944c9fe6f61861f919babb9088a5f49
 EBUILD simplecov-0.19.1.ebuild 1210 BLAKE2B f8e14f56877213b223cdfa25d8434be88f9caa108e5c1e18ceb4c716b4fc96ac8b046771eb8c1bae7b97bbbbc190efaec43185b702582b86d22a1c01951631f7 SHA512 40e3195c466478136a62cb8e8c380cc6cca67a137465809ae3eba6c83892d7203028b76e01d0a3586f605ab8c7d85730d6ad68d8aa2929e500a7808d81dcfc6c
 MISC metadata.xml 351 BLAKE2B deddbf1938c6ddb07d6e018eea6972ef42c29cbd593f830363da799cf521f90dbb286fdccd0b01ec0d50392589f7ee40275ee67b871c827b24c4ccfa46b0889c SHA512 2cb0486e6184c2e1f27275c09434035a88209adba52b677dd436d422b4efc838b430dc436a67507b85ddfa4c98e1fde1f0475f6b0d1d42aae22bd984f7934c55
diff --git a/dev-ruby/simplecov/simplecov-0.18.5.ebuild b/dev-ruby/simplecov/simplecov-0.18.5.ebuild
deleted file mode 100644
index e00e76b1cb13..000000000000
--- a/dev-ruby/simplecov/simplecov-0.18.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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://www.ruby-toolbox.com/projects/simplecov https://github.com/colszowka/simplecov"
-SRC_URI="https://github.com/colszowka/simplecov/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-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/simplecov/simplecov-0.19.0.ebuild b/dev-ruby/simplecov/simplecov-0.19.0.ebuild
deleted file mode 100644
index c6d5bd67d875..000000000000
--- a/dev-ruby/simplecov/simplecov-0.19.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-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"
-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/simpleidn/Manifest b/dev-ruby/simpleidn/Manifest
index 2ce933f5bcc5..e5c86eb8c6b1 100644
--- a/dev-ruby/simpleidn/Manifest
+++ b/dev-ruby/simpleidn/Manifest
@@ -1,4 +1,3 @@
 DIST simpleidn-0.2.1.tar.gz 204644 BLAKE2B 4c7f82af2ddaa753c8df91f80776b2b00d3a8a8dfda95c9012ebc3e5eea6503fbb0f20a7f79f8c624612e433b0e61cec79bc6a147ef6a04d418cbff72c31c867 SHA512 20a81ea5bca503b167cd2183f762993454a5f7fe082639b70234521f8cb9e4533b1f5f22dfcac18108c90a461185b13fea55f6197ab4c5996116ac359adf5033
-EBUILD simpleidn-0.2.1-r1.ebuild 831 BLAKE2B 72a8bbd95e8df2d13c8f93155e7f9d51b1efaa51fd6e5137b23aaa5bc4e7b34f74194010dec077742d9b99ba4505867fc736ced0420f77faf848270e6e4b160f SHA512 00e1dff1903543b825f06c606a5498593499f766933677c49853929c3f48e27ba00edd2f494ec03864daf25177878e4d09f3b18e32107692fb5580197cca0f3c
-EBUILD simpleidn-0.2.1.ebuild 831 BLAKE2B 6f1e8d2a81f5c580515a30cfb470fa8f3a49a9c3f164770e08b4d395de4fb5d63ea7b466bde83bbf69e413684f96866c8a7731fd0e8bdc41b4835d8ba83eb3d1 SHA512 86545e237cf1b6cc1913a49b0904bc4c03033ffea5d1582216a8fe84b71b17d5718f505868fc1b0df44b5161994cc96367158715099ab5b6b77fd3a115d453fc
+EBUILD simpleidn-0.2.1-r1.ebuild 838 BLAKE2B 277f31c705b5a20f56dd4b1785f8974f7e4e213647d462225030a510cc743cbc8df6b405c258e9f43c93bd34438185275c9d2e6e2c2188dc07ccf4e8bcebfe1f SHA512 5a87150403c36a09659348f0e5041761551080a6550a78fa5e6bc5bb158f6dc6c5070986ae8eccb47250f4090da4e0772ee8d0f7f21bffc4338325a408d1b005
 MISC metadata.xml 333 BLAKE2B 5e0406b0968db1bc76f4dde0fd0f676a23324ed5b431e7c378cac3c19da91248a8d9831d8d92033a77fbe1a61c9a276a42f816c6a8691a8332d4477dfc7677ca SHA512 9938dda4d73b0f54c161e1ac0b42f20e7cded4f2611f1d4d26edfaa92452b323f079c73e192845144b75c5bf6d656fbfe058d0f45d65f46712102196c1efdf44
diff --git a/dev-ruby/simpleidn/simpleidn-0.2.1-r1.ebuild b/dev-ruby/simpleidn/simpleidn-0.2.1-r1.ebuild
index d0cc8bdfd09c..e3aae6c410ce 100644
--- a/dev-ruby/simpleidn/simpleidn-0.2.1-r1.ebuild
+++ b/dev-ruby/simpleidn/simpleidn-0.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild b/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild
deleted file mode 100644
index 417a85ea58ae..000000000000
--- a/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild
+++ /dev/null
@@ -1,31 +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"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-RUBY_FAKEGEM_EXTRAINSTALL="tables"
-
-RUBY_FAKEGEM_GEMSPEC="simpleidn.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows easy conversion from punycode ACE to unicode UTF-8 strings and vice-versa"
-HOMEPAGE="https://github.com/mmriis/simpleidn"
-SRC_URI="https://github.com/mmriis/simpleidn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/unf-0.1.4 =dev-ruby/unf-0.1*"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/sinatra-partial/Manifest b/dev-ruby/sinatra-partial/Manifest
index 85c0fd2c79b5..458c226dbdc3 100644
--- a/dev-ruby/sinatra-partial/Manifest
+++ b/dev-ruby/sinatra-partial/Manifest
@@ -1,4 +1,3 @@
 DIST sinatra-partial-1.0.1.gem 16384 BLAKE2B d129940c425a7e1b079860ab5c9f6459c39fc04d4256a0c1a5f25bcb9f3198133c897bd4b447429cd1e5ef11fdbaffa8d8b9384898d80d2564cbadb08e2131cd SHA512 04fb0826cdc9f6d8ce6ae8d80a9eafb3b0b37136fcecfb3f5e45a1bac101dac0486168473ff66de75979a5153d4efbdce17b63d774f5ddcd0e7fa251df0da1bd
 EBUILD sinatra-partial-1.0.1-r1.ebuild 645 BLAKE2B 029e03b1a257b00ef1cda36dbfa9539dd3441f6d346ba1ca76073b2593b5702a62fcc0bf1060a511390f1f8118f676632c06aa01ef99f9d7c76232f66f49308d SHA512 b23f96730f86ea832cacf58276a9080534c358c5d23829e0e803defff2d3376aa44a5e8d08b81bc92f05118916a41f07291761c759106a587a51775a28733e30
-EBUILD sinatra-partial-1.0.1.ebuild 676 BLAKE2B ce95f4dca3f734d58a6eb88fe7b778ae90e1c2b792c9be6d57399a62c614c4c2f3f7ffe29de24a8aa20296cd3ab16111a806be3a9d48bf4e3ff835dda12108f3 SHA512 35088573f68b88b518d9afbade3e3dbaa8bad334f2586c22e3c5e37709b8a085daefa28c272c7f9085d058899a44475d3c069ffc5328aa9bfbf94cce13029f0c
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/sinatra-partial/sinatra-partial-1.0.1.ebuild b/dev-ruby/sinatra-partial/sinatra-partial-1.0.1.ebuild
deleted file mode 100644
index a3e7200db87f..000000000000
--- a/dev-ruby/sinatra-partial/sinatra-partial-1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.markdown README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Just the partials helper in a gem"
-HOMEPAGE="https://github.com/yb66/Sinatra-Partial"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/sinatra-1.4"
-
-ruby_add_bdepend "test? ( dev-ruby/haml dev-ruby/rack-test dev-ruby/rspec-its dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 86b4c8bc00ef..05e59d7ce792 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -1,4 +1,3 @@
-DIST sinatra-2.1.0.tar.gz 511138 BLAKE2B 05eea600695abf6ee9b2ef0eb2a215c106ac45a343a60017f2cdf8aba8733c1ba5c55235a9c35a4665659797754f78e28d6b8fb1e24391e99a2336ee150bacff SHA512 7127593bd44a5648407631f05d5db04100db30ae862c37e22dc264025fe271336c25df3c47839e41ba200da98be6c7b985852cd53d494a8bbda90fe701a89fe0
-EBUILD sinatra-2.1.0-r1.ebuild 1013 BLAKE2B dfd0b7bc97476ab32a906222a599c692c1db7988e5d3a5385e2abe0a3a10e1b670c60c82650d2c4d3adda8d05b468ec03864e354b76915dbff60dbc63cf7e35b SHA512 4bc8fe6fd22c540e1660bb46adc954b65d46b4ed0da582d9fdfbafd8908ca85f394b30c80e6dbe1382e44dfedfb352a821fb466e878872fa547eaf52303a07e6
-EBUILD sinatra-2.1.0.ebuild 872 BLAKE2B c8acb9775f696b87432785ded15acf0e81a3ab0cd9d4f2ca9942d9b66ea28e9d9bfcb9cdf03df772a077355ca00b754a152fab2d0907f6f68c03c64b679f84a6 SHA512 9a5f25ce46a6f1d39c67410554b99a38c501a248e1570ff8220c5b2c436eb3a4809400d93f8329746ce4f5d36f5c7cdde2c43973bd53d93e67ba286dc0170c78
+DIST sinatra-2.2.0.tar.gz 513752 BLAKE2B e407b9241cab27e326c0a2d4d83593e292de902b6ed19a12f17b0cd114230b0d10f1ffaa8f8b8237d17b547c7e012c57456af357019b228f3d7a88847220cf33 SHA512 be9432a8efa93578accc836cd0fecca128e56989d8596f1b3d33d2d956e90acd80244b98473fff2adae13ed4a1e933c41e73c80755a6f3418a65cdf33c011145
+EBUILD sinatra-2.2.0.ebuild 1012 BLAKE2B e5748efcee47332e37a741df852b5851956bac34bdc4d50c6bbf23287c143b324a0ede69a14a3153ce3d68aa3ee76244d00ddfb6b0f527c8ae98e4a880a36790 SHA512 a96d186b6330bc65b95643543d6d1816bea49fc5016baa476c75d20fad140ffcd64973a43c7dc3167bfaea4d009f71873d525cbfe6a57bdd551e627ec8eb35d9
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/sinatra/sinatra-2.1.0.ebuild b/dev-ruby/sinatra/sinatra-2.1.0.ebuild
deleted file mode 100644
index 51d577f6653a..000000000000
--- a/dev-ruby/sinatra/sinatra-2.1.0.ebuild
+++ /dev/null
@@ -1,30 +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"
-
-RUBY_FAKEGEM_TASK_TEST="test:core"
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"
-
-RUBY_FAKEGEM_GEMSPEC="sinatra.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for quickly creating web applications in Ruby with minimal effort"
-HOMEPAGE="http://www.sinatrarb.com/"
-SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/mustermann:1
-	dev-ruby/rack:2.2
-	~dev-ruby/rack-protection-${PV}
-	dev-ruby/tilt:2"
-ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder dev-ruby/activesupport )"
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
diff --git a/dev-ruby/sinatra/sinatra-2.1.0-r1.ebuild b/dev-ruby/sinatra/sinatra-2.2.0.ebuild
index 16a511abe9e4..e1b5bdf64a8e 100644
--- a/dev-ruby/sinatra/sinatra-2.1.0-r1.ebuild
+++ b/dev-ruby/sinatra/sinatra-2.2.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/slop/Manifest b/dev-ruby/slop/Manifest
index 897c8d460a64..59e94783c621 100644
--- a/dev-ruby/slop/Manifest
+++ b/dev-ruby/slop/Manifest
@@ -1,5 +1,3 @@
-DIST slop-4.9.1.tgz 16455 BLAKE2B 5d66e1a03b69ac9bbc272c20adbe0daa1a086abf8651838a59c74bde6ff4e136c6b1e10c2266a96508ed333a0f752ace98f95a223464efef2ecea7eeededb024 SHA512 3211b876b910b76413d9109ea7ab400429fb350089a3d89a56b85894a556d0c278daea258551c355a96d9ec592bc7426d9461b7a3fed935c9917e9c18069e89f
 DIST slop-4.9.2.tgz 16633 BLAKE2B 8907314016066569279dbab6b52f50cee58044b46c1a88c7cfab3a31e1bd7e702f63da170a42f113c5611080d5d212b970dddd1e3aeb2bc8e86d5ea577b9f163 SHA512 dbecbc5edaf257131edf54fb5577531a962a6ed64f9414342b5060bee479cf7e4c9cfb891af3553644fbe7817a2067de3c83b379651a62da5983f0c42cd68fd6
-EBUILD slop-4.9.1.ebuild 672 BLAKE2B d3d147bcecb988f73ef4562af762f1285d49cc4aec2f3438fb8e0a67789e58f0657706069307b9061c5037c2f22ace2919327a57a1e0958e50c4b86a8fd7f04d SHA512 fadcb2109a886b31a7be4e44571c19831a3dc79ef57f5d9b403e6e8a0046c0ea78a86afa1ec17aeb1e143057996cd2604c3a52d512fff5a991ccec88bda8cfe8
 EBUILD slop-4.9.2.ebuild 672 BLAKE2B 305f22607207147d54e9b0693f04508c8df6b56fa85f8b40dcc2f11fb4cac1c66fc88f536225e0c2a4a6b64e7d764659a8645ca3c0e039559bac67fcfd35fdc4 SHA512 6a53ac5e70f2249ee6a9a0d447fbc7006ed8ee1b74e89574e222ee52b6ac50efeae3f40e58bee6ced6944d0b97a309b66256d320aff72ffa636e60ef13674eee
 MISC metadata.xml 338 BLAKE2B 7e0918eeacaa8e3f5aa23655e94236da4df9fc40ebd525d7b8789830ad0629168490fb79d3d5f47d32fec2260f49a3d5308e1ac72c19c594afe4217f2f6ec5a2 SHA512 7668d0cdc9c62f10e2318772019485099c581eee7ae0176bc3b57f93805eec856d3e165a767122cc9144cb059eff3a45ed21ac4fd0ed46752e5482a82df45eeb
diff --git a/dev-ruby/slop/slop-4.9.1.ebuild b/dev-ruby/slop/slop-4.9.1.ebuild
deleted file mode 100644
index 794f18211550..000000000000
--- a/dev-ruby/slop/slop-4.9.1.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"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="slop.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple option parser with an easy to remember syntax and friendly API"
-HOMEPAGE="https://github.com/injekt/slop"
-SRC_URI="https://github.com/injekt/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' slop.gemspec || die
-}
diff --git a/dev-ruby/sourcemap/Manifest b/dev-ruby/sourcemap/Manifest
index 64e24d80dcbd..417d5135721c 100644
--- a/dev-ruby/sourcemap/Manifest
+++ b/dev-ruby/sourcemap/Manifest
@@ -1,3 +1,3 @@
 DIST sourcemap-0.1.1.gem 15872 BLAKE2B fac8ae7604a5d5a56b6aff82742b8c773bebfdeb41be6b6aeb3f2b5aff9c6cb2bf584b29ee7a6cfcb4b3064e6b1666e6c0341383fa4d39037759fcbf51ae57ee SHA512 d197a3aab0fe8c9e620c50d3bd994ed957b37dba071f6abc3b8a149a8a0490ee1b89512036b833ec44e6bdcdca6dacbdda9872036ba51736ac1d1e1f160ded59
-EBUILD sourcemap-0.1.1-r1.ebuild 431 BLAKE2B 7f953e392596c92ff0bcd5c9c009a1dd6fce148c98193d8f5502e0f71d57bad8b824999bfef23ab44da7810d86796e73826f22646efb49e591d77fd2ef6f8631 SHA512 dfa35c885658aba3f08e185c13cab25724d2476b9c5b8ec7cd2605090edd2c727c3a0146af37b8476f17abdd08f45d2d8a8387161719769fecd8778173e4aaa7
+EBUILD sourcemap-0.1.1-r1.ebuild 438 BLAKE2B dc978585a5bf14d36eabd81a86176c37339b77a667ca82f318aa2ce6106b0654b60b2169097bd7a091180a728799d5f4742963b5678596bd0f76325fab75e18e SHA512 42d01380aa25692c1d1051935ee283b90b24c8676cb087b86c3becedd3e6e177a17e3900568bbf365ff33a4d1adbaf581335c909d99a5f7c2cd0079b0c7ced93
 MISC metadata.xml 344 BLAKE2B 6a62ffc58a838c2bb3938f0c681cdd2e8bfe82aa7e5bfa1f98c6ac077a70663fd8c4ea3b6b8f2d0d62aa5ba74212721c50c7a9c9bb215167ae20128f6cce9d2d SHA512 9c69de58f5785ba8bd3f87ad3dcb8929a2af84f3c22d15cbf9a37b11d9bd6b1749fab33d4ffb085b81c01334e6b0470ceb22b3e66e675bab840d21eeb65bde31
diff --git a/dev-ruby/sourcemap/sourcemap-0.1.1-r1.ebuild b/dev-ruby/sourcemap/sourcemap-0.1.1-r1.ebuild
index 02cf81a4ca39..d6b2785f30b6 100644
--- a/dev-ruby/sourcemap/sourcemap-0.1.1-r1.ebuild
+++ b/dev-ruby/sourcemap/sourcemap-0.1.1-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/sparklines/Manifest b/dev-ruby/sparklines/Manifest
index d8bca3f9a7d9..318ee4e61fbb 100644
--- a/dev-ruby/sparklines/Manifest
+++ b/dev-ruby/sparklines/Manifest
@@ -1,3 +1,3 @@
 DIST sparklines-0.5.2.gem 150016 BLAKE2B 408a8a5348e0bb3a331087066dfccbb42a58f68b839b7ba24b7577e50d5ad8f9c33c8befc60ae4577d2f8b5b809e52d13c5e11f61021a1d3eafff4d5c1fb2a32 SHA512 2666db1c2f4dd97cad10fd6b9b2fc938ab6b2e619b968f93b86090db4a77cc356cb97bd5ec01582804412c214226ed99cc0f65196e2a26ea1a395b29288cc715
-EBUILD sparklines-0.5.2-r7.ebuild 794 BLAKE2B 327b182ad5f43d7aa137b6994b2093bf61bdbc5a8770796a17a3e70a4ff007e65eada3648c649990ffffef1746ba7588bb21e01711a69d71cca86538af8ae215 SHA512 5ce528af3b70a1cff129044a3ab51e28026f634db8eef55d9ffe9a30fadea746830f64a3f14b824d60dd88b5c9cb36487e2172efb960b457660751b8e4af4d52
+EBUILD sparklines-0.5.2-r7.ebuild 801 BLAKE2B 5a24067c6abe6ef8626c3aca69e5769ac7b615242d60ad6d8e1a597e43c343afa14dc8e9913b2c864b95d3dc9dc4a77820fc32c93872b90975f134c7ce36667f SHA512 9fc9c7a18a286749b548bd80051ad65a6218ef7ed0e32a3acb8e8fd92f0a4bee0e06b208e78c93b68752f63ac7b1352fd36dae879e954e518a0164f1aeca416d
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/sparklines/sparklines-0.5.2-r7.ebuild b/dev-ruby/sparklines/sparklines-0.5.2-r7.ebuild
index fede5c423980..20011854a68c 100644
--- a/dev-ruby/sparklines/sparklines-0.5.2-r7.ebuild
+++ b/dev-ruby/sparklines/sparklines-0.5.2-r7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/spreadsheet/Manifest b/dev-ruby/spreadsheet/Manifest
index e6ff4bab4ada..066acd0e1fcc 100644
--- a/dev-ruby/spreadsheet/Manifest
+++ b/dev-ruby/spreadsheet/Manifest
@@ -3,5 +3,5 @@ DIST spreadsheet-1.2.9.tar.gz 4657114 BLAKE2B 6fda8b63688b21ff393402f15cda6685ae
 DIST spreadsheet-1.3.0.tar.gz 4654545 BLAKE2B c3658dbab73874d403da2be235d862be80ee8764eeac4cbf31b78121fa288ecfa2821734b6d97a31eecf29f21b52b9f7bd752ccb6b45edf7d2ef7c8ecc3cc410 SHA512 1e671d01fc4b21f6fee034cace68c711968983978cc815b5bda051c5ed14c736653a4151fa6f4393416b914a678e4ac471db795c318816036c17c2ac79703c05
 EBUILD spreadsheet-1.2.6.ebuild 809 BLAKE2B ee66e6ca63ea682b0763ca7ee47eacca45175245b37a945ef9597a6d9bd41920754e5bbfac2a4028a0f6a9cad4bce636349fcdfa03346fa252962ad52a22d79b SHA512 e6a91908eea76853568fabac846145ed2f8ecf269ed560c6a0beb50c9e2e45fdda921e85bfc08a6b861ce56915cf240cfdc115eb3c6ac02dc5b4bd28b0deb39e
 EBUILD spreadsheet-1.2.9.ebuild 897 BLAKE2B 3e0a22ccef700781f425a8ad3aa7930a45549f88c6ecf8710aac031fa2e8b32277b184b4c06e6b96b592f98fbf3c3cd01fa58d5784e945543dc738a7c712a0d9 SHA512 1c83a65e4edd3c1ca0a55623bff9a66c3e7e1cec041a66cbcf6337222700a80cbf2370340877ca225166bc4f52a38fa67c202a210b13f7d734776e45a438b607
-EBUILD spreadsheet-1.3.0.ebuild 890 BLAKE2B addd0c1d95164c89b48f508120950c556c7bc35d582ba0f119e7de0f06ea395a75a4bc429ccc941bdd8c1a25c15e3a0c9a13c609851692d386c038ca2fbeca54 SHA512 85fccde87ee16e73817eec8c3b7873028c0aa30dc490e071aafa700f5f56160fce531523dd783427c66452950d7a89ea8c4936ee7860318670c7d52253a5a567
+EBUILD spreadsheet-1.3.0.ebuild 897 BLAKE2B 5897b7e159acb69a2862d90a4922ebf4c12f5b6b84d3b55ab7afdb67a8fbd3a3facae71cff0e83b027271c3867743b0c72ff084ac24ee8881625414c513f9ed2 SHA512 4a0d6461757e72e22ca5056081c03615cda24f413dc260ff8c45210bd15dafcc89e3700189f1917bfaa3f9212a1305da01606af57f03decfb301f18c634d1856
 MISC metadata.xml 453 BLAKE2B b42d3eeba07c2223873333c91e84506a462d06670f2c4f1bd5cd614d701515d1863e645fe485584cc1761f09e81a266bcbfc9a14d952f0c12645fac8de15c30a SHA512 df7cae9c8cadb8fc1e6beebb64f42e92536b345ae9aac02513ccc5a210bae605b5c4be42bd1a975e08092a59cd5da9339918711cafdcfb2e193f2ab491417701
diff --git a/dev-ruby/spreadsheet/spreadsheet-1.3.0.ebuild b/dev-ruby/spreadsheet/spreadsheet-1.3.0.ebuild
index 8bdd53b63007..f5b0399c44bc 100644
--- a/dev-ruby/spreadsheet/spreadsheet-1.3.0.ebuild
+++ b/dev-ruby/spreadsheet/spreadsheet-1.3.0.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 # Avoid the complexity of the "rake" recipe and run testrb-2 manually.
 RUBY_FAKEGEM_RECIPE_TEST=none
diff --git a/dev-ruby/spring/Manifest b/dev-ruby/spring/Manifest
index bf32900ab087..07c1ce4bb45d 100644
--- a/dev-ruby/spring/Manifest
+++ b/dev-ruby/spring/Manifest
@@ -1,5 +1,7 @@
 DIST spring-2.1.1.tar.gz 44000 BLAKE2B b7a5855b4a53852ccf82c14e82c134e61bc17a26e20bbf3597259763bbe81a545d3299d5490302681ca616ed1b7f4d42d522134b87d8a40588aa4904f8b650b2 SHA512 44c8619253567d2f506c9652ac28da5933517113dc38e8eb5a8b58fcc7d28ff0192cc98a655579767972649f5cead63cff0c7aa909046b41cfc1d37780e0ee77
 DIST spring-3.1.1.tar.gz 46013 BLAKE2B 54297c4a24e3e65fbcfce75b5339e140ff79f075741a0ee1f1df6b32a62426e25734e0a0a5b4103700e712a0dad401863630511789696ca5761fe6828942200f SHA512 3fe985894d22f94ecdc46c735dd144c24552ade39b801aa24b829512d7586892d1db1359b2658799b7fa67b887fb63ecf5ef7160a6f3116a697b2a4c7076d602
+DIST spring-4.0.0.tar.gz 46258 BLAKE2B 9e02594dff1882f3f7f47af682afddafc3f4be97f9c3dcc0ee3289be9fb1bc252260e24bec44d024ce808a26a2ac571840357df8fcc719e60ca9ca159460b998 SHA512 c5ed7e389c97dea3b183d6cd373823c3230a84f21427cabacd72ea2bc97f00bcbf9855d36808a1bf3257ccaea21ee35f2070716dc4f0b64205a674202eac6b94
 EBUILD spring-2.1.1.ebuild 876 BLAKE2B 2188cc38d99d35b40228ab9f6d5de447784f97132b823e16f1975e68055776615584c942bbb5b68a5343b6b40839d839765bd09aa21a1744e5240836308d2ccc SHA512 c4bf35ae919e5e1a07c036db63ecf4b63a622986d79b005a565b9d34174df64660ff2846e7e9b2f0e6f1e0813a3e6020e4be70827a29ea12c9ccbb665e406f1c
 EBUILD spring-3.1.1.ebuild 869 BLAKE2B 7753edefd31ebe2da1d58cdc3ea046731478ff6d165d76de5d279d7119d02e5442819a113c7a4df5a6401a3da28627d83814747205fd63eef49123a68c8a914d SHA512 ddd2f347c2297abeb36bbcb3c800b44a2c9d79569bb6fef96a88a72d1ff6f10b5088c60eed5f3e8d03a0769b5d6638c56d08d99bb81c1143d3d028bfa0aa1cb9
+EBUILD spring-4.0.0.ebuild 818 BLAKE2B 66128f0799bd88522540bc0714b76d0859a7e1b916a81674c582110e0094b6bc0f8303004bb2c3fbda84a81bae77e52dc03593b0ab0bccb94542cc403686e220 SHA512 e1f38bfa014d9d5fb897e0c4040dc375a7b338c36e0a2272016871f0559909b4e805d58fa36f42de8438482dacf7530cd3dbe5f06fe644595c919a5d9e6c62b6
 MISC metadata.xml 339 BLAKE2B 17c685849cee6c0fb62bc96a54cccb38c1fb12bc90518094639ba3f9e1c97f286b8beeea52556986337673361c510c4c14298e1694cfafbd955b5c6277a6dbbc SHA512 46a6a32dd12d206b3b91a2e7e0fa8ac56a4b9dc4f09ac92277c634d428ad519dc361dd94fefd9a8b19257921eba68f418e635279c6ea07dd083252ab6b3f8879
diff --git a/dev-ruby/spring/spring-4.0.0.ebuild b/dev-ruby/spring/spring-4.0.0.ebuild
new file mode 100644
index 000000000000..3abfbcdaa757
--- /dev/null
+++ b/dev-ruby/spring/spring-4.0.0.ebuild
@@ -0,0 +1,32 @@
+# 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/spy/Manifest b/dev-ruby/spy/Manifest
index 277de2637d88..7e1e23ffa4f8 100644
--- a/dev-ruby/spy/Manifest
+++ b/dev-ruby/spy/Manifest
@@ -1,5 +1,3 @@
-DIST spy-1.0.1.gem 33280 BLAKE2B cd5f0b6f74da5f693b2718ba7021359fe9292455ffc2c79510efce1fd40f84ffc49b92ea78d449e9722ee00c1d804e82ba88b3481c0297e58c0d7a8c177dbc85 SHA512 c9d7060b92f748897b2a5421df13024047c7418c1e0ba8e83b84d1a27372dcb2ed70fe2021ef23dee86f45dc5c326adb55a5ffbdc4f78895b2c6cf31838cc335
 DIST spy-1.0.2.gem 34304 BLAKE2B 5019af0919d2015c82fc5c4e45b0ca98757294d747923ea68dfc24916d96667d5c118d628ebface8cd69d78ec4b558312c4ef9294b6b14e89e136cc75ac4c8f5 SHA512 df0bd3b95e534ca578ef612ef4afc5fa086504b7080fd187917f1b03548a140b1fa4b9d376760c41a9a7838c002c4a5606dedf13411dedbeba9d284fc4f981b9
-EBUILD spy-1.0.1-r1.ebuild 553 BLAKE2B aec01cc32d0847717bf1ef2beaf1314cc66fbe0321ebeac37337bd908ae23b728b031a3392e915d16e4c5f00c02258158cde5d466c17f6c1c1c5724880bc5dc2 SHA512 efe744ecb583c46923268361e96c911c4a51922399538b8086b3162db1c2ccfe69915c0297477c11522f3cae02701efc11035966c2a3840e8301b226f52ee3a9
-EBUILD spy-1.0.2.ebuild 553 BLAKE2B b37d89a4bdcacf75a7435c46cf3063c464b3443cfd046f0378c5ebde435d90f5c5375b04d6b45cf576f7202241e711e905bff32111900c18f606eee1eee3cc25 SHA512 134cdf8da48d1db3307077a10e6b78ee8337f215f003a3de6512dc3c82bc993d10f63f0300acea91ef8a011a7acf18012cdebc14f1592248e779faf334fc4002
+EBUILD spy-1.0.2.ebuild 560 BLAKE2B 83673f0dadceee1be066f9c1f89f52a5333592a5754da1c3134beae94a07197991956423883b5fe890405a133c27e84a19f09592203f0b8afc768e17d64e7ed4 SHA512 4e1e0c75051a80e4bbd209a2c12448505fa635e7bb9b78edeacc6e563cbe1555595ba8b6733958470f54227a70808a867363651960137c7e518b663b28fe966e
 MISC metadata.xml 338 BLAKE2B 2aa35f9715605425fc1d481550d40d225dcf91123d26eef91eb4544d4d6c1c3853f06a58f8b1662362ee5f22a3aeb3d8db8838db6ac1b6e5a91eb589e8d08b6a SHA512 9bec36a190e29f3800aa6af08e01fa9cdc6b06e1234f2cb38d027152370e5d4e8f351fe94cdfd49c53227e7ac9162fceaecdfef18378f969460566ce74f50cbb
diff --git a/dev-ruby/spy/spy-1.0.1-r1.ebuild b/dev-ruby/spy/spy-1.0.1-r1.ebuild
deleted file mode 100644
index 87603d6939fa..000000000000
--- a/dev-ruby/spy/spy-1.0.1-r1.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_EXTRADOC="README.md CHANGELOG.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple opinionated mocking framework"
-HOMEPAGE="https://github.com/ryanong/spy"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/pry/d" -e "/[Cc]overalls/d" -e '/[Rr]eporters/d' Rakefile test/test_helper.rb || die
-}
diff --git a/dev-ruby/spy/spy-1.0.2.ebuild b/dev-ruby/spy/spy-1.0.2.ebuild
index fdfaa4108e0d..a53c58410e95 100644
--- a/dev-ruby/spy/spy-1.0.2.ebuild
+++ b/dev-ruby/spy/spy-1.0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
 
diff --git a/dev-ruby/sqlite3/Manifest b/dev-ruby/sqlite3/Manifest
index b63a207dcae9..26f7b9189e5f 100644
--- a/dev-ruby/sqlite3/Manifest
+++ b/dev-ruby/sqlite3/Manifest
@@ -1,3 +1,3 @@
 DIST sqlite3-1.4.2.gem 70656 BLAKE2B ef7fa7667fd080a6f175bcfbd1fe8dfba00d3fdf1214cc3d776f0576dc29386b627db8d6c0dd06f07ab65fff877a6803a6dcacefd4fbc5bb0f7d2149e355c88d SHA512 c4630dd2fa13914e2fcc70092c35568103f61f976958b439fe205abdfcff61702ca176d10bea40ff0cfea3169644cdb9146b7be94dff883cad3b753e84629545
-EBUILD sqlite3-1.4.2-r1.ebuild 2339 BLAKE2B 5450857dbd4ad91f055d4f25a6ce9a74cdb54d5a22680f24d4d8d52c2b4c69f9986b6ea4759c6715219358fbc77e42d6e3bd89f4d5efac3e57b7ac7ef76ad07c SHA512 04f24d24dcfda50dbab5bea8acc1b3f449c3289781cbc1c25430212e6fcb83512ea1db6a7b49d0525f9818234530eacf7bdba3ed6354b222adf39837042b7081
+EBUILD sqlite3-1.4.2-r1.ebuild 2339 BLAKE2B dc4a27912d5f2eb983c99fa5899c46ffbfe6bf63ab888d28567108841b7053a5993339bd5b6637e1afe926d3440c376fb6db713e481b129a4063dfd66352b714 SHA512 84d013557f52120f323d655b1ee210698585507acfea8e21f3e1b39ae0ff96ce7e9da6a52b5d6f02c96751fbd2da6805bd15259374e131784901a011d7dba94d
 MISC metadata.xml 343 BLAKE2B 8246e0b7df67080839741f0258357ae19da18bd7ad8615bb77b943bc89db7560d58f95a8cba4e770070efc477ba56ee1f5c9ba098674ffc01dd5fdd9b912189a SHA512 541f2db81c9383013da74a8a54f318ff7535ffe5c6ea789f8ddc451f629a121e56b322d8b3a0730e0b27b111e16e27d8fa49bc5805a7c61fcf91ac7110ca712b
diff --git a/dev-ruby/sqlite3/sqlite3-1.4.2-r1.ebuild b/dev-ruby/sqlite3/sqlite3-1.4.2-r1.ebuild
index f5161bc16036..c689d3316749 100644
--- a/dev-ruby/sqlite3/sqlite3-1.4.2-r1.ebuild
+++ b/dev-ruby/sqlite3/sqlite3-1.4.2-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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC="faq"
 RUBY_FAKEGEM_DOCDIR="doc faq"
diff --git a/dev-ruby/sshkey/Manifest b/dev-ruby/sshkey/Manifest
index 3c19ce8c9aea..4a792dfbde28 100644
--- a/dev-ruby/sshkey/Manifest
+++ b/dev-ruby/sshkey/Manifest
@@ -1,3 +1,4 @@
 DIST sshkey-2.0.0.gem 26112 BLAKE2B 19fb790d4eba7f57e96b57d838fb6736857b9394f678d37f4577a1794b6d7f901fe35165616c317add04d470a301ab79b55e39d64ef93b566d4c1f628a74fe22 SHA512 dfd56a8b3b4f6abe785f37b5e1a4a61799c704a864821c35beaa6ddcec51b2f9f0111ef945fdacac685cbe6141e7ce2ad0c9bae8fa4cf8a8d48354701a0e5d05
+EBUILD sshkey-2.0.0-r1.ebuild 344 BLAKE2B e2a52803473ca55b57f7b9050d5256c520571879d1c4f582bec47bfcdd10ce9afe934e03c1997628ed7f0d74cdc6524038693c60a334940b5e2d986bde552778 SHA512 cb680eae6f8bfb1ad77bbdc0266c6bf57605a64ddb5705cf6cd2381fca2b3da8574c919e7f2ef7d63bd2b3f5d4bc53d818b356ba88add14e3440e56beade1e6c
 EBUILD sshkey-2.0.0.ebuild 376 BLAKE2B f4872c96f459ba7aecc7695b526c9f1755585dbaee13c323fc7801858274105374ded3c4c23881335622a1bc0585f4c636ce908e53b88f2688a5f915acd9f000 SHA512 e6c70a634f729ee5d06c4ae8152bdd4240220ececcf586ea675a9e083aaf4dcd62fed05104014840289169a51c0189e8767e1b5832660248e6a0b36f7820266a
 MISC metadata.xml 386 BLAKE2B 232746e91c1836006824328f59a37ff1c5de32875e2629ab98f6d8bf9ef190d30914e2655ce593c66046f1ff29f605e4e70804786936579d0335b5ff1030855e SHA512 b75e63f76e0dda7f0a52adb58a118d558dd2a0c4ec553c758dab82cc478c877cf504b2f1653ce405f2c15a0bb06184c0dce54d75735e53aea28d3965c78f8e2f
diff --git a/dev-ruby/sshkey/sshkey-2.0.0-r1.ebuild b/dev-ruby/sshkey/sshkey-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..b72dbc2932e6
--- /dev/null
+++ b/dev-ruby/sshkey/sshkey-2.0.0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+inherit ruby-fakegem
+
+DESCRIPTION="SSH private and public key generator in pure Ruby"
+HOMEPAGE="https://rubygems.org/gems/sshkey"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/dev-ruby/stamp/Manifest b/dev-ruby/stamp/Manifest
index b27474b96191..8338732f3667 100644
--- a/dev-ruby/stamp/Manifest
+++ b/dev-ruby/stamp/Manifest
@@ -1,3 +1,3 @@
 DIST stamp-0.6.0.tar.gz 9099 BLAKE2B 6e5d4b95fcd6f31f47b02a4053670fad53e982bd965120f02ef3751e9b499d21a0867ef11afd628eeb2b1bcc523e3423aa319103868554b4c74341253614b1b3 SHA512 2f467444bad3c8932aeaeda061796ee3469b16d908027325efa28f7da005c8a4c8c95f0d3b84b6b1040bf5e5fe4114fc4779e3c9efc6c00817a050c13be62472
-EBUILD stamp-0.6.0-r1.ebuild 985 BLAKE2B 271be45b73d026c3a34de7b878605d6f0242f07594ee9887920847a13467ef64658943501a14f4c6228b90b1040e69223bf9dc65ba9ea0315d6c45a8bfbc03c9 SHA512 a1518d66702548733a67b5a24f8d07062f7929c26d650834cb34d5af2e3c5cca3c6a452eb8a51254313e5dba9092282c6a3a9eee162e79c404f167764e121a8f
+EBUILD stamp-0.6.0-r1.ebuild 992 BLAKE2B 962637678775a2a577d36671086ce019db55c25982093be315339efdb35b9a206afb3fe5c5ca3eed567213f738ffe797c3a427472746793a3994d0c82de17c3c SHA512 6f30eab770945ab156521e8125f6150eaf399763462622e1ad4234f4ba4f8c9011c6af0e456deb29b6ef5f076e734d72badcbcd516cf3489dde2cf291651458e
 MISC metadata.xml 340 BLAKE2B 9789125ddca307508807e81f3d319db304ac97699a7b4003fd40a8f1a06e9fba4fa113cfa465cb6107cc80641d5f3fc7cec7b3e0128fd242f92a1e86966db120 SHA512 2727b134a4b8c9ffd678a879dc2f11d9631c3abece335bc63c0c98ae6472340da798f220364646daf239d1d6972b94ad6856db17ff3da0e2e93fd2669803a616
diff --git a/dev-ruby/stamp/stamp-0.6.0-r1.ebuild b/dev-ruby/stamp/stamp-0.6.0-r1.ebuild
index 57d0cf49d992..c036d03dd0be 100644
--- a/dev-ruby/stamp/stamp-0.6.0-r1.ebuild
+++ b/dev-ruby/stamp/stamp-0.6.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="cucumber"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/state_machine/Manifest b/dev-ruby/state_machine/Manifest
index ac494700a9f2..846b84cba2a0 100644
--- a/dev-ruby/state_machine/Manifest
+++ b/dev-ruby/state_machine/Manifest
@@ -1,3 +1,3 @@
 DIST state_machine-1.2.0.gem 604160 BLAKE2B 5fe7b3b192d887293fccbd27c2c1b289883e0c0fdc918b188564ded4366175278f172907ee62a57bb37a9d969e7e989f6cda639fe0b946935455cf81466c9ed6 SHA512 aa26d9cc99b0e873f9b146acddaa53f0332cff403463a5079cab5e00902db7b60e47957fc8b4c7ebc62861894460613a0b075b13548544392432ee564936567f
-EBUILD state_machine-1.2.0-r1.ebuild 618 BLAKE2B e6e561562ed67fcda5e8222e52b9b36f7bed36240be8156008a789377df64a58f72b4c16104afc3b65011cbc9bd62de0cbca731f7e4c1fad898c55bd1960407c SHA512 505e7d1d2461da7b4c4fca55c0ad0c7d8ebdb1992d5d0362fee93f2b4c01e7681797bc69af5aebc186192aacfe77d226f326915bf408328b257110259f26a5a0
+EBUILD state_machine-1.2.0-r1.ebuild 625 BLAKE2B 31ec29d08943eef99fcf555b4914b1054430cca13660abca8b4fa4742c35d81eaff9760b86943ed36442383170de76f25868fe7b1970f557b9a0de8542eebcfd SHA512 fa1af89fd2d0dd2bca36c803437866e18bde75bcc02f4461685bf4f998ce3bfa695ab96f968ebe77704b6fbdeaf3ccfcbe2beba83af867dc9a295bc8a0e7d356
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/state_machine/state_machine-1.2.0-r1.ebuild b/dev-ruby/state_machine/state_machine-1.2.0-r1.ebuild
index f45c78ab4e74..25c86f246460 100644
--- a/dev-ruby/state_machine/state_machine-1.2.0-r1.ebuild
+++ b/dev-ruby/state_machine/state_machine-1.2.0-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/stringex/Manifest b/dev-ruby/stringex/Manifest
index 83bcb2a5f1dd..2d03d1683fb0 100644
--- a/dev-ruby/stringex/Manifest
+++ b/dev-ruby/stringex/Manifest
@@ -1,4 +1,4 @@
 DIST stringex-2.8.5.gem 130048 BLAKE2B c07eaaee07bf348690166b41b0846bc49eb49c5ba9e39c7eaeea2a3a60d6089edd7c7d1d75fd9a5208c9883c4bff8840ccf56c6f186daeabcf79e7f4fb6b4d25 SHA512 53f9908f176f465d2e884e92dffb26abcdf75593c94ee8250253da0eb29eddf489cf5b3f539135659ad4c0e2dd738d2affff6a946c50abd5f36517148d8338ce
-EBUILD stringex-2.8.5-r1.ebuild 970 BLAKE2B df2e77cf82068e4d955b5b1c7d8579d48b73cad61a2be28cfe86d900826c0523165ffa15a8b8da54537cbb7a56f4f97742702f3a39eef002f455915a9225b267 SHA512 cf475d4b22fc8f9bd9d163fac744b3601035c5e41189c46ae528226f7cee485e64c6ff8cdfd66c724a76fe82545e3dd462c72c38b2e44aabc80215441b7fc07e
+EBUILD stringex-2.8.5-r1.ebuild 976 BLAKE2B 2ab3d2e527b82ee1e9a2c069c3cb6cad1eac6dc7ee3671819a89393ccf29e2cce7d57a6d7e46a3777c603bb421d45c325b6e54aad1cf47442a20c2b555bb193e SHA512 e4a7ceef7febb1f5dbeb483f4f77b16c764f4fd4ba85d5e627361be7c5c1582b79ab388751b9ce7717ff17b50b1b60839bf849313a7b00493991b1596f16c31d
 EBUILD stringex-2.8.5.ebuild 923 BLAKE2B b23daf72180b32fa01f2f61dd577ebc8afbf5f64ed701ee48e12f319e526b7fd695bae133dc34ce5c3f5adc42d5e7d052f66adb73216cf715bb580ad1cf95c77 SHA512 6008c4d672635aeeeb4aaf31dad05d021705747c1209d8e9d64e841bd75af242cf861fecbd5ea2edd0a20fa43f691092fe161eec39e3de8ef70968f5ebe3df42
 MISC metadata.xml 339 BLAKE2B f73c3a0f80358652d11426529ad603b32ea4ef3b882be5d1862ffa94d35fc49a154406d66eff59d61544d6c35a8aaf841f553f689e4fdedffd88337d2be3ce4c SHA512 87d2f65efec8bab706894e788d2c6ac548221684034bc93cf43efc104fd2340188ad8aaf1e9e484ab40475aee38a7bd9227b55f73e8ae31c39548c297bb18d32
diff --git a/dev-ruby/stringex/stringex-2.8.5-r1.ebuild b/dev-ruby/stringex/stringex-2.8.5-r1.ebuild
index e03217216203..50c2d61426e1 100644
--- a/dev-ruby/stringex/stringex-2.8.5-r1.ebuild
+++ b/dev-ruby/stringex/stringex-2.8.5-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/rsl/stringex"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 
 # we could rely on activerecord[sqlite3], but since we do not remove the
diff --git a/dev-ruby/stringio/Manifest b/dev-ruby/stringio/Manifest
index ea88c1917477..8ab90228396b 100644
--- a/dev-ruby/stringio/Manifest
+++ b/dev-ruby/stringio/Manifest
@@ -1,3 +1,5 @@
 DIST stringio-3.0.1.tar.gz 30570 BLAKE2B 385ebe0571ac63a694c8c07cbda74eb53983a163f91d800c880eea9fbd0ec7d53d5a92d03b8afc5a71c9e48bf1c017c2a055fb3bc09c2f555c1a7743cf19ad5a SHA512 7781ee20f7f3d546ee227d7366ac88731b65ea743c39280c4f3d2107d9001eef4a4d583760110817c31f4433f0a45812acd88a0b1b31b2863a8fdc3f54b19ea7
-EBUILD stringio-3.0.1.ebuild 931 BLAKE2B 7ad70cf5fc3ad1a86b30a599c715c0fe4abf5ead774ca5cbba6e4796fd1f5fdb4fc3f01582b5625a1f4eff0e232b56131b222c76caa83e5ed2ab9539f5c0bd23 SHA512 ad5909819f1b14e25b76c6c2e33249ba63fe95122cdf1f0c14120b31510d7c069c72526748cf2099e208ded7fc7e7b93f489b006b0174408605df8542871bf28
+DIST stringio-3.0.2.tar.gz 43051 BLAKE2B 06d3f5c64a1550969f8c8abdc0cfeec8fe89adba8cb60db68cd4b29bf622a31d51809b85b3b9fa2373b74a33ed1c48df829a44256e431288b6ba2f7654858a13 SHA512 a9ac2820ce1c2bd55aac032be42a493a910787ed04bc41f35ec33b19ffd878c925dbbca49d6c27b07cea5ffb8fa98ecdb576738c9654587dea6842e3bd1f486c
+EBUILD stringio-3.0.1.ebuild 938 BLAKE2B 8c8e14d71c94626af522dcbfa30b537a8dc2e010801879606594f157e43bc097d46afe0740185c218712f974bf345f01603b96f1249d75843f05fd4b5ac20ce8 SHA512 d62803606f5022b187ede3397a06e7c0160343305803702654b1da0b3d50c2cd4b589ee3e087e565c2f1fc1852caa452365e06800efd5a93859626f652214fe1
+EBUILD stringio-3.0.2.ebuild 938 BLAKE2B 8c8e14d71c94626af522dcbfa30b537a8dc2e010801879606594f157e43bc097d46afe0740185c218712f974bf345f01603b96f1249d75843f05fd4b5ac20ce8 SHA512 d62803606f5022b187ede3397a06e7c0160343305803702654b1da0b3d50c2cd4b589ee3e087e565c2f1fc1852caa452365e06800efd5a93859626f652214fe1
 MISC metadata.xml 340 BLAKE2B bd5f8222a43eb391d2d14a1b878fadefd9f8a322e87b5058d482df79d95d70f7ef19c54e7ae12dc29e7ffc84c72e630f0ca46ac095059263cdcf6047cb4fa4d9 SHA512 f1f32d2c4c13e19500a7ff23b684b180d3dba8a79e49b8cb57b80e265d09e06cb8b7a9e6b743158a140967b7ccbb991fdf51cb3a6e95be4e24378a5f85efcbb2
diff --git a/dev-ruby/stringio/stringio-3.0.1.ebuild b/dev-ruby/stringio/stringio-3.0.1.ebuild
index 120921dc24ce..f1463c87a564 100644
--- a/dev-ruby/stringio/stringio-3.0.1.ebuild
+++ b/dev-ruby/stringio/stringio-3.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ruby/stringio"
 SRC_URI="https://github.com/ruby/stringio/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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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"
 
diff --git a/dev-ruby/stringio/stringio-3.0.2.ebuild b/dev-ruby/stringio/stringio-3.0.2.ebuild
new file mode 100644
index 000000000000..f1463c87a564
--- /dev/null
+++ b/dev-ruby/stringio/stringio-3.0.2.ebuild
@@ -0,0 +1,30 @@
+# 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_EXTENSIONS=(ext/stringio/extconf.rb)
+RUBY_FAKEGEM_GEMSPEC="stringio.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pseudo IO class from/to String."
+HOMEPAGE="https://github.com/ruby/stringio"
+SRC_URI="https://github.com/ruby/stringio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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"
+
+all_ruby_prepare() {
+	sed -e "/s.version =/ s/source_version/'${PV}'/" \
+		-e 's/__dir__/"."/' \
+		-i ${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/strptime/Manifest b/dev-ruby/strptime/Manifest
index b2b1f01e3d99..b88455b84a04 100644
--- a/dev-ruby/strptime/Manifest
+++ b/dev-ruby/strptime/Manifest
@@ -1,3 +1,4 @@
 DIST strptime-0.2.5.tar.gz 17431 BLAKE2B c9234ed0207e6bf214d4c011c883bc985cf527672f4bf9590617a742b4ea9a5cc0743388af23cc5f106350126eef16ffa89089d8715b0f8d371315412c7e5660 SHA512 6a85a3b45c43aa62a5c62e3902655351a839c4f2c397347356307c73ab160d053ea9dfc989f6d8687663bea5d8a60575f26b99b198b872bc1a3b2e0caa00a51f
 EBUILD strptime-0.2.5-r1.ebuild 751 BLAKE2B 18647262390128094bf45b805fe2a24f7524f954e9e9ec2d465a5d4dc6a445917e9b13890d9f7ba4adf52a62eff1d76f7378fed5a260dd59954fe01b8578575f SHA512 f4a43e449a6ae838fe79cd42dbb35d68fff51768ec3da9953ad0e81a4e4708117baaadb49bc6cd52459a70a9893b794414eb6b3bbb06f71e1d08e258fc2e8102
+EBUILD strptime-0.2.5-r2.ebuild 753 BLAKE2B 8c5513400bd9f6b3d50c695b29343fd931756147e10face69580da2aa3ce0ae1cbc9b45e77bdcd9a862448b905d23bf75eacd2926bf3bba3337c920c44a848dc SHA512 8226f8585f0fd3c0ad4a2ee9cf0e54cc9042711caa96e5b983772a6d19306e0283b4bade21615f1fc0da961e6ff61fc0b4e48006760d1578d8ab19c86b62cdb5
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/strptime/strptime-0.2.5-r2.ebuild b/dev-ruby/strptime/strptime-0.2.5-r2.ebuild
new file mode 100644
index 000000000000..bec5f0bd8e88
--- /dev/null
+++ b/dev-ruby/strptime/strptime-0.2.5-r2.ebuild
@@ -0,0 +1,31 @@
+# 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"
+
+RUBY_FAKEGEM_GEMSPEC="strptime.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/strptime/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/strptime
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A fast strptime/strftime engine which uses VM"
+HOMEPAGE="https://github.com/nurse/strptime"
+SRC_URI="https://github.com/nurse/strptime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/strscan/Manifest b/dev-ruby/strscan/Manifest
index aa0b54622f73..88ab6f975345 100644
--- a/dev-ruby/strscan/Manifest
+++ b/dev-ruby/strscan/Manifest
@@ -1,3 +1,7 @@
 DIST strscan-3.0.1.tar.gz 28111 BLAKE2B 4623fe6fd74a9ca30ba1818fe548fcc793f1e22798bba9d561299ccdc493dfa5deafec072b193532c92116307c5b79f2c7c7bd362602b0ba3a0d1ea778a1d528 SHA512 7cd37a24dbec02bfade6e7440139de52d149ce1c196a1ea73b5b09e4096a0a99b26d0680498bd27bd443befe62c806bb94cec08c2fbe097c4724446b56c8bfa0
+DIST strscan-3.0.2.tar.gz 34900 BLAKE2B 586bd6046e1681742650f4f612a458dc5b23b11116fa010eec0a354fc76242dbc8af512c0053330903d23bb7859345152cdf450a00a2be6f6d0783b5099de9d8 SHA512 657cab357d6cdd601a80cf4adbe141b005e116a0d7a0630b2966b07cf93d6410cc319c7a8305cffd9cb79d7975e95d98b20ac43c4133496cf38f6fe2fb6c8246
+DIST strscan-3.0.3.tar.gz 34914 BLAKE2B 00bd42816fa22c8c5a69f57191873c37c7278c8364471d3721459702171fbee3d195330127184dbaff9f432b72fdcc38c0f5faa206f22c1d0351f3d68dbd5542 SHA512 0a72d7d2b28853763e5f894e9b1e01f7e01a3483cce15f4ca6305b65ce851bd6134d189caa5a23ea79af11af38a9f95944c99a9f5cd032d96cc2a45101bd836a
 EBUILD strscan-3.0.1.ebuild 950 BLAKE2B a42bfc67ffc0841938baf2bf66019c525125d1d4ee5140931b31363905b1ef1a8ae1a8793691a6e6f6987e16b6b2e665aa1850b04296357e6beabf8e81d5d281 SHA512 ac1e3e78da76040090bc6ec655a244ec490043d6d471d7d46551a788f267dbe189ceac17076b29926b1528eb6f91f80357aa0ae325a1f0cb920ded5d2a0687bf
+EBUILD strscan-3.0.2.ebuild 907 BLAKE2B d7830696a4fb3f98e1f5cc086579e3dbf9c545f06ebdbb68ce6eb2875d856c90b6b86c02af05b63807f32395b7eeef933dbe1443d2a97db12462665f85a2d404 SHA512 40b50552e808075de4205397cb180be113e3dedf7f81040a30f6e46802980d3ddff72ad661310cabf817955ce19be226f6e082144a1c6e496d339740d0f30c57
+EBUILD strscan-3.0.3.ebuild 907 BLAKE2B d7830696a4fb3f98e1f5cc086579e3dbf9c545f06ebdbb68ce6eb2875d856c90b6b86c02af05b63807f32395b7eeef933dbe1443d2a97db12462665f85a2d404 SHA512 40b50552e808075de4205397cb180be113e3dedf7f81040a30f6e46802980d3ddff72ad661310cabf817955ce19be226f6e082144a1c6e496d339740d0f30c57
 MISC metadata.xml 339 BLAKE2B 78f4ae75b57e9192dcd9490dad00fe1ba916bad247dd6665b7eb6c4804ff1340c78407f6c79b777c555817f17e6ca3beb25a29f3d44be8b1865659a0b127f826 SHA512 8cd27e859d447843da29169be15647a5b7355d830f375aa59e8b39d701dd9b9c7c377c7f53c53eeea6c7222f4f9aec0ae0f7040673e24d6cdfb8b25f411819f0
diff --git a/dev-ruby/strscan/strscan-3.0.2.ebuild b/dev-ruby/strscan/strscan-3.0.2.ebuild
new file mode 100644
index 000000000000..a93f81956640
--- /dev/null
+++ b/dev-ruby/strscan/strscan-3.0.2.ebuild
@@ -0,0 +1,32 @@
+# 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="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="strscan.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/strscan/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides lexical scanning operations on a String"
+HOMEPAGE="https://github.com/ruby/strscan"
+SRC_URI="https://github.com/ruby/strscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+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)"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test/lib -rhelper run-test.rb || die
+}
diff --git a/dev-ruby/strscan/strscan-3.0.3.ebuild b/dev-ruby/strscan/strscan-3.0.3.ebuild
new file mode 100644
index 000000000000..a93f81956640
--- /dev/null
+++ b/dev-ruby/strscan/strscan-3.0.3.ebuild
@@ -0,0 +1,32 @@
+# 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="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="strscan.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/strscan/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides lexical scanning operations on a String"
+HOMEPAGE="https://github.com/ruby/strscan"
+SRC_URI="https://github.com/ruby/strscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+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)"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test/lib -rhelper run-test.rb || die
+}
diff --git a/dev-ruby/subexec/Manifest b/dev-ruby/subexec/Manifest
index f0a68c1e48ff..170251ea02b5 100644
--- a/dev-ruby/subexec/Manifest
+++ b/dev-ruby/subexec/Manifest
@@ -1,3 +1,3 @@
 DIST subexec-0.2.3.tgz 4384 BLAKE2B 27dc40377f7b2fee33553543723b9e15cd02a1171bd24b5d213b3546b7b20267cb8cbf987c1a1f6c0285f594b194f1dc20c41314266587be30d961e4b514f8b9 SHA512 b6fc5ee802906a690a1d1542ada44aba1df5e6861a66f4df58623e366d8d3ab2349d2963817bf07089e1dc15932ca03f0020d16777012ec4b92879280868bb75
-EBUILD subexec-0.2.3-r2.ebuild 778 BLAKE2B e445ee06e62edd9bd2e3c5e85556c18029383caf9b9e8df916f2c800504ed70a832c65ad6d88e0275ca2fc6cbe8d32c90dc16acf4d0cf6dd71998756e5b47b32 SHA512 dad2366e9ab0e5ae01541a43eae6189c46e41ae20e16794fe5d4cb6d6b0f77c636421e5bc0579dc94789a1535970031f276c10b4a121ef88309d4d0a66029e94
+EBUILD subexec-0.2.3-r2.ebuild 778 BLAKE2B 3394faf183f0c6a0d7bbc16fd8d4c35bb32d4d8bd0b975d3fd76c79b40f9a0c5ffd72c345f85244954ae3c1b9ba242ac3459b60937683254de5bcb673d850ce9 SHA512 b844bd1d9201b6bae720537e86e177fcb37b69b91af290603293012400b6d14087daa94061b5a93800ab0f637d9666c804dafb7eb0e6e182c39ea7667b905e4f
 MISC metadata.xml 342 BLAKE2B b9d91978d70bf8f4a94f51adc38a9cae8b21b1aebaa6c2936f03a63ba1b05b2fb81674fb8064077cfb808420d97dad1dd3359c9ac3daeb719003723b99c499b0 SHA512 a526325dde964c34483eda39b50516ca0de3946c9de49b90e0b1ad34b9960c191119b8c744844376001a10e7fc13fd593669e3fd739bdb7fcc1fda26c7e17d19
diff --git a/dev-ruby/subexec/subexec-0.2.3-r2.ebuild b/dev-ruby/subexec/subexec-0.2.3-r2.ebuild
index f689733762be..78c4527665b3 100644
--- a/dev-ruby/subexec/subexec-0.2.3-r2.ebuild
+++ b/dev-ruby/subexec/subexec-0.2.3-r2.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/sync/Manifest b/dev-ruby/sync/Manifest
index 729603baa041..c92d3c6c259d 100644
--- a/dev-ruby/sync/Manifest
+++ b/dev-ruby/sync/Manifest
@@ -1,3 +1,3 @@
 DIST sync-0.5.0.tar.gz 4957 BLAKE2B 9b4b1710d2468068387d782109199dd45c783b6d7bb0357851f800df2ac4961a72143cfc2b42f522524cf7148694545ae8eab47ee6629062d8ea1505d9095ba0 SHA512 5f887d9169e0be834c7fa17ae42b71078f25ce3d83e695490cd136adc1799d6b92e4aed41ce3f3d57b3ad193a1ac4de940b37212c2864bbf6331ba3582128166
-EBUILD sync-0.5.0.ebuild 659 BLAKE2B dcdb3cce98bacfd51c7d2a4bd5a86750f4a635092fce16de6da165e236779fb048219fa225e0368fd4921d72f1204b3b14355e6f8e8259a94386d27154d72f03 SHA512 7b19554cee5d2a8366249209dd4d179b21c1f1a5d7d021c8b40db43588acf9c810cdf910ad37770822ff0e9ef50e466e6e26f1f8414a32088b33e7cac9a3d24b
+EBUILD sync-0.5.0.ebuild 666 BLAKE2B 8e088dba8adcdd1c1282fa8d05788524d6df9fe441f895a6d6b9e602363211b48b394facfc317927f77b7cf0d189b51ae4ab08234ded4001847a318252c17f62 SHA512 a08bf2635bf98b39d4eea3a012a60f1e7ee405ae41017b64627271cc45c113293b3178ad528edcc1ea41ae16c0830a431651387874dfeccd01e02a1306c3d424
 MISC metadata.xml 336 BLAKE2B c6c56576f607edf4075d6bb9eca47ca898d5037dd830464c57df25c8cfa50e236afc6a318570145b9f48fea13c55255943674b1a418a016762a94ea3e348deca SHA512 98a7781b1e6f5372a564f69eed27881076a5b73609a4b87fccefc251990f3a60ca6526c99e7e9fa3acc01f285dca2beba4e268f0571201081ae55f8e85971124
diff --git a/dev-ruby/sync/sync-0.5.0.ebuild b/dev-ruby/sync/sync-0.5.0.ebuild
index 8bd4bff82435..200296ae3b38 100644
--- a/dev-ruby/sync/sync-0.5.0.ebuild
+++ b/dev-ruby/sync/sync-0.5.0.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="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/syntax/Manifest b/dev-ruby/syntax/Manifest
index 8479fce81147..56351eb1c154 100644
--- a/dev-ruby/syntax/Manifest
+++ b/dev-ruby/syntax/Manifest
@@ -1,3 +1,3 @@
 DIST syntax-1.2.2.tar.gz 41485 BLAKE2B 09a1fc9a4172ec8e6a748981a966c891038fe43303360a3e5f2302aa0fb370b1098c7fd7b8a1fc2f022365ac8491b3e9f9146f940dffc772fb68fa8be5245986 SHA512 a3be7ac736d6c77833aa532f17485c076d34e66c40426c9c6be2dbbde87b2adb7154c9b3bed3439cc12577dffc01c8148e0870a0d02b3a02ffbf9fb1d651433b
-EBUILD syntax-1.2.2.ebuild 887 BLAKE2B 8442fe2b4f2b0a912d26ce30867c8ae34034288fd9e85eb2bf68108573da9bf810fcfff73d9aa436698e2fb620f6ac1b763daad71d6e3f6bd101a3f6455c3047 SHA512 76a4b408b6e6d26deb73266d78c7e4f75e7fdc4842f3410938d8e2495ec8fd68bbdbda9969128356b99e45619b630a85008587e76fafec0b2942e42ce07328ad
+EBUILD syntax-1.2.2.ebuild 894 BLAKE2B a3282b4f090b83d256402f61b01998ad7c2a31a191ccbb26eac89e87104db36fbf4f0795bbc6fa6a785f6dc7a4a714d42ae9a9685c13c624afe69e03b6c87159 SHA512 50e4c75d2c328405003f07c770db0a842c55bc4e44c7c408c43aaa22ecbc283f7a7032b39c9ce4e81db909a1cbd80b54a98071e6e60c8d24c152d18e7ec93bbc
 MISC metadata.xml 340 BLAKE2B 962456ed8d58f70077c45c1e25321a61123b84f766464a3dd13ec1ba997470ac11c4ae155abf551ac30755181790a775437d31f66ac2079af46b427aed2939e3 SHA512 f21321695f1484807cf772bba7be2b9867329e8534108e3854ffab9b57e4742177c2767db31aafde9fd878622bcc6230c748c955423dbf3fa39719cf815a1987
diff --git a/dev-ruby/syntax/syntax-1.2.2.ebuild b/dev-ruby/syntax/syntax-1.2.2.ebuild
index 3b8fb2b04043..2b4a73dbc719 100644
--- a/dev-ruby/syntax/syntax-1.2.2.ebuild
+++ b/dev-ruby/syntax/syntax-1.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/dblock/syntax/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test doc"
 
 ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/sys-uname/Manifest b/dev-ruby/sys-uname/Manifest
index c24e8e73e5fb..aacc2ce9d780 100644
--- a/dev-ruby/sys-uname/Manifest
+++ b/dev-ruby/sys-uname/Manifest
@@ -1,3 +1,3 @@
 DIST sys-uname-1.2.2.gem 29184 BLAKE2B abfc9172cde35f946d420f8737a9b60b6810e551c2c361027614cd812a50c86bf8e92446c9a113d0e7e2f6dd09c6f40ceeb5a024defc7cacbb45c53f4b761809 SHA512 97a7a8cdbbc80e9d886be92d104aca389d82a1eac61b7a0172ce8fa27dbe751b0653dc8a027610d69051a79ed1fb2c855e2ee802308a74300dcc709c9e56b9fe
-EBUILD sys-uname-1.2.2.ebuild 584 BLAKE2B 16a8c79062658413d594c9b34af425028c3c1e106609d28a6aae0dea308d11a20bab8252e597cd944b48ab05acf90c6e11a11085c2da7bfa285a2eb4fb5a2cbb SHA512 991f87ae580634996c45058ada80e2332956646ca2596c0096b424a9376470de2813bc34d0207a5c1fdb467bdd3208214d0309ee56c7492d2b77311d4b34ad11
+EBUILD sys-uname-1.2.2.ebuild 591 BLAKE2B 2d9911a96d1b7376a4cae2e2712626558bab460225ea40e82dd4e8409e5622c6607cc8b4c41124b32674d8849bf690c6d7b146e098d3ec1511ca6ece1a5c62a5 SHA512 5c65e5431f6e3c76f4bdaa858e2cb04f011e2c15e98bc391e3f7d9de2cb6355adba8f5cf1440105f08dec3fba049e88660ea82739fe4cdc55ba7a0dff5d21e81
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/sys-uname/sys-uname-1.2.2.ebuild b/dev-ruby/sys-uname/sys-uname-1.2.2.ebuild
index 78c2c52a08be..be99b3dcf70b 100644
--- a/dev-ruby/sys-uname/sys-uname-1.2.2.ebuild
+++ b/dev-ruby/sys-uname/sys-uname-1.2.2.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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md doc/uname.rdoc"
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/djberg96/sys-uname"
 
 LICENSE="Apache-2.0"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/ffi-1.1"
diff --git a/dev-ruby/syslogger/Manifest b/dev-ruby/syslogger/Manifest
index 31d6e62180da..2c4bdd2fa37d 100644
--- a/dev-ruby/syslogger/Manifest
+++ b/dev-ruby/syslogger/Manifest
@@ -1,5 +1,5 @@
 DIST syslogger-1.6.5.gem 11776 BLAKE2B dec37278ea109dba53c44a5c285962d78890ed972f1cd14789435b8bb3b922c7a3fc7b18238ee9aa239143453be3d6f73eea6c62d0bb83eb7a8901225ff2e49c SHA512 60dc7be93092196d68d154cfdf90a3393c9883ceaff35640bd0c0dda01f692953c7d1d8243d7b9327990a368d320c474af1711ba33a6b69381f56030800cc297
 DIST syslogger-1.6.6.gem 13824 BLAKE2B c70c8e727ac9f4754a42cd3be27eaa2ad19e5ec61745433a8654fd495736a72b5242242fc663b1d4d995164c42d4ea5bf3a15edeb6711abf6f69663ce6918496 SHA512 23947699de94c6bbca4a7ca4df52e9fb9ad06fa29e29f406255369728971007bb78ec4aa1748fec123658b0202e98dd6500649092456a9f579db30acbe04c42d
 EBUILD syslogger-1.6.5.ebuild 657 BLAKE2B 84f7b923c652c8c769c0f44fae5e3169b4d1d266dffdb9abdd110b5b65fcbf6cdb647adecd78b4b26ecf4b62e9bca7e34a53f0a99260c2e175d125f985ba054a SHA512 5f8706d00a6fd05ea1b6112333819009f0ab381b118a2e96fb8b6c41fcfc33f268d6e4c428d72b4104f5611ecf11bfb080f447f2cebc07e064f9d7ad67610933
-EBUILD syslogger-1.6.6-r1.ebuild 693 BLAKE2B cb9aa2ca266c616e2b424cb41037b2281106305e04ecbc5490aadddeccaba519b8454b555c3160c884c4434a274af14a27f452597a4b27f33b4984137477a27d SHA512 7afed95ff06efa67e647324ad480ef8b8979539693edab8dbffe34974205003f61c3f2a629317461a4977eab5eca0478750a1a95bc882a983cd227143de594f8
+EBUILD syslogger-1.6.6-r1.ebuild 693 BLAKE2B 7363d23440a754da252c6ad501b10b95cd77ec6abaf19f0be80862dd550a1559eff15c04f265a61af34b09518e458425206a5f8d11a0a237f0f38ebf8daf3a88 SHA512 6ce393dae5c2e78dfc65a06274a1855945a5383fbabd6751c4735a09a0cc4c18b68423f78f2df5381786ccd072884debe8d3b873fbddbc2be4456a27deb82a7d
 MISC metadata.xml 342 BLAKE2B b0123049165c54c179063d02f66fed75c8266900322b19c7cc8d1b1d8f9475024f0c49afeb5b1fc08f5d65e07d6998a3129a17dba2c5184035a6a0caa0560d94 SHA512 0bb428624b427f6d37d659ee458a9b9e9ed26e85924069bede22f2242d0b9d90f126bccb712b0af48d4b7655309d9ab73fee00f502be256ee2a81e8fbc82edd4
diff --git a/dev-ruby/syslogger/syslogger-1.6.6-r1.ebuild b/dev-ruby/syslogger/syslogger-1.6.6-r1.ebuild
index cf6087fe7a10..168bd6658f19 100644
--- a/dev-ruby/syslogger/syslogger-1.6.6-r1.ebuild
+++ b/dev-ruby/syslogger/syslogger-1.6.6-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="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tdiff/Manifest b/dev-ruby/tdiff/Manifest
index 8cf5b5521b7a..f9b5819357bf 100644
--- a/dev-ruby/tdiff/Manifest
+++ b/dev-ruby/tdiff/Manifest
@@ -1,4 +1,3 @@
 DIST tdiff-0.3.4.gem 10240 BLAKE2B fe764eaf70303670602758bba903202bb468c419e96909561c4d420a86b9237c9af4640947e9dbc27eaca7b7210e26236da20d41f03d3e8acd0556a23205a924 SHA512 2db5c9707a8654fb36b02c7fbdf2317da08c633c0d3768f0f76693ffffd1b2b44e5f4309ae97df944c3bf9f25b596fd3ae19cb88b20435c0f9e50989d22ece40
-EBUILD tdiff-0.3.4-r1.ebuild 556 BLAKE2B d20243c31a2b1c4ea1c77196e9a18dc5bfc448b6ffcdf75daa923d65ef8a8c59e6fa5bb4ca79ca5b46ff139ed5f1d1b2d589152bffd0593808af1b5f6a640d15 SHA512 84d8989d13a742f37536ea69f72b362e9d2dd3e7ea7b6a27c227451c1c4cc97f9933b9c53c82e79a49a2a7d526065af4bb5b941708dbb88f3da0d6d3fd22eb1d
-EBUILD tdiff-0.3.4.ebuild 587 BLAKE2B 171f3f857c4e83230c38339f148362d1a6090a36ccbb9c7707a7b2b1967d19e9c903fc749dccb7b3878eb33355e85ef9be818db7ef9db43cda8bca39c0577310 SHA512 f5d442442fd5a5338da1ee56df182ac395a0b2a0e706850f201d18efab076dffd680459cdb8dc6f49a65de0376f644af6a34325efdd395a1d69ae9d4e8a1f05f
+EBUILD tdiff-0.3.4-r1.ebuild 562 BLAKE2B 91fcac7ddd74a08ee08a1f28f029eb1bed15cf504916b604af739d6cb72e6387320544d708ec7b36957632934b0d6cde757bdc6ad1f135c1b5e866562fd14d43 SHA512 7955f08e7ac9cc252ea0a92367aa7bf5eb5daeda1b26816f83976144386deae0416a5d3fa30a32760997c7bd3a04c4c53c7c63bc3c6028048d6c796efffb2ea8
 MISC metadata.xml 343 BLAKE2B 561fa6986230b5dcb223aed3d5897d61b1e5ae064b2d9771120ddf0d429c7a8ebadf43d938d6f01a933c00eae9d4f83fc797d7271bbf8f0c175d67bbf0785aa8 SHA512 b6b5ace7f6a65adcce2e371fb4c3b34473f5273a30a7b27f3c9b7ec3b03be50430478195de458df6226a2261416d70c5e631159607f8b45a8737559cdadbb639
diff --git a/dev-ruby/tdiff/tdiff-0.3.4-r1.ebuild b/dev-ruby/tdiff/tdiff-0.3.4-r1.ebuild
index cb869ba31cfa..5728af528d19 100644
--- a/dev-ruby/tdiff/tdiff-0.3.4-r1.ebuild
+++ b/dev-ruby/tdiff/tdiff-0.3.4-r1.ebuild
@@ -15,6 +15,6 @@ DESCRIPTION="Calculates the differences between two tree-like structures"
 HOMEPAGE="https://github.com/postmodern/tdiff"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/tdiff/tdiff-0.3.4.ebuild b/dev-ruby/tdiff/tdiff-0.3.4.ebuild
deleted file mode 100644
index 0c24d205ccb6..000000000000
--- a/dev-ruby/tdiff/tdiff-0.3.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Calculates the differences between two tree-like structures"
-HOMEPAGE="https://github.com/postmodern/tdiff"
-LICENSE="MIT"
-
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
diff --git a/dev-ruby/temple/Manifest b/dev-ruby/temple/Manifest
index 24c259910472..6318cc20d584 100644
--- a/dev-ruby/temple/Manifest
+++ b/dev-ruby/temple/Manifest
@@ -1,4 +1,4 @@
 DIST temple-0.8.2.gem 39424 BLAKE2B a56db910d1d4d52495806e907c74052c04e6b4843d040adc33a7f6dc28a25a02231c4c9bd41723c8e1abe6624d4d55375c2a429514a87fa4f7a7a8dcb6377796 SHA512 51923b3bf9d4c05255131be62f567ca21305ba023ea5395a08d6970236b2a2833b058f7b3906046b8a57a224b368de12a6d5e426effca39324670fb632f33b67
-EBUILD temple-0.8.2-r1.ebuild 638 BLAKE2B 1c08184cc67eae090831ac1c4eccba6c231eac2554489ee3bd005787da0b42cd3ceca2ec65249c01187072b7ed4f54d0a8a34a4fd8d08a304c1fc4ea3266317b SHA512 ec658e23d57e483f5788595d93a98c20fbd02152792e7926ff5eee8acbd90806d98f2dedef7e15d9ebd44f8087df986d5a4051468608e9089a746b25f12a9ebb
+EBUILD temple-0.8.2-r1.ebuild 645 BLAKE2B d07fb5c8252d5eb236629b72fa1be0b12174dababd2d4b73afa5323386ef3d007c37bae5a5df93e8ca548e9d72ac99c03e51942595241d639894bf2c577fb0ba SHA512 2a78032716859499c2cf8217307528e333d35d67a5fc63df100328fa335fe2598c3402b79fe0124442c6fa282675fff50be9fc82851a27fae58457d6faf27ef8
 EBUILD temple-0.8.2.ebuild 639 BLAKE2B e7f3fd372a9caab116d0a8a7048e0f7686d55606443e375e5b3804b9a9d1e56cd68f8f30b004395ea37c7943e3ebff338d6326c25cf82f811ea7e5b0b91816a6 SHA512 dba16e5bcd31a8084cc7e5fa450ba868f46cd5be3e3b9babe0a196d30d92b1db2a809f4d6f685090f6a17c8f87705e782e6c930bbbf0c1e461b5fe7c85dee34e
 MISC metadata.xml 341 BLAKE2B bb4b05f83022291b67e3d322192b7deaa8f2c7ef07990014ff3c1cbe82295beb599d649b90971b9ddbf972c1296211e2d829f14efc1d48b2bde6f1164e1ae290 SHA512 a9ab79fa9ff13f53b6634cd86efcf57df5810946275dd12a34fdf8eadac12153743cca92e98dd8ff4bc792f912cb9c72a08abf33a68b5849fe67776937e933c5
diff --git a/dev-ruby/temple/temple-0.8.2-r1.ebuild b/dev-ruby/temple/temple-0.8.2-r1.ebuild
index 9a7616a68d2b..aad52a10d37a 100644
--- a/dev-ruby/temple/temple-0.8.2-r1.ebuild
+++ b/dev-ruby/temple/temple-0.8.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGES EXPRESSIONS.md README.md"
 
diff --git a/dev-ruby/term-ansicolor/Manifest b/dev-ruby/term-ansicolor/Manifest
index e6e505d9a8fc..8075e88d7d7e 100644
--- a/dev-ruby/term-ansicolor/Manifest
+++ b/dev-ruby/term-ansicolor/Manifest
@@ -1,4 +1,4 @@
 DIST term-ansicolor-1.7.1.gem 44544 BLAKE2B 2c2c2de0a18d1f9a975901f8a7005f740ac81a609c43705d8c184deb26dc9010876deeca411488c787132a3d8b78339c75b0776f3c9bba1ff71efa23ce3671a6 SHA512 d49f8825c31accfaa58a2f34ed5fbdaf503d4b47c23f07c52cc82bbf6cce457bd9371e197da1ec36dc83e32b95e9ea9a349922d9759a827923456ea46f81ff50
-EBUILD term-ansicolor-1.7.1-r1.ebuild 848 BLAKE2B 20847f88cb3068a9861e4e77aaac4c321a0823a77dfe0074145e2c5294e95753bf51ff42acc32e1993aacfd76f91c2bd6540b5fd94917c236e048a5efb837dc9 SHA512 f0a5d7e50bb0bf8d8fd07fde8edd143d9788943e801c462dc694bd04baaa28555416d33966f315ba566405eabc0c908f7ee19e39af78b8dce646ab07a456a6a5
+EBUILD term-ansicolor-1.7.1-r1.ebuild 850 BLAKE2B cbf64168f1297771e996eaad713da3b3985b059803b7d56385eff1760f0cf8a85cb561226ab0bdd8c472e08d27261a752b6d55fccc74834aa58df0fc18d90135 SHA512 f8c14501dc0a47da47f280d4f9de8c4c5c9ebe3178f569671a5a7f3cffa42a6fa903c8de7344ba14a78655fd5d5a0a43f22cd6f4dc76791de52db084835b329e
 EBUILD term-ansicolor-1.7.1.ebuild 881 BLAKE2B 61750474d28ab6ec06820649b6f35ad7051313bd2e675fc96a7296072cfb375d1ca1bb7fd6dddf870780aa2df9febb87d7d21b2283c8f405679b5f16d155cf0a SHA512 5ddc4eb19f69d42c9bb57473b945ef7053779a100f2b2b89864dce25ff98259a350caf0b76a8d9825252eda50e6ba4807fca9fbb77517a24288091e8693f1b99
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.7.1-r1.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.7.1-r1.ebuild
index 9bc6f621f421..128bff96a352 100644
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.7.1-r1.ebuild
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.7.1-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
@@ -15,7 +15,7 @@ DESCRIPTION="Small Ruby library that colors strings using ANSI escape sequences"
 HOMEPAGE="https://flori.github.io/term-ansicolor/"
 LICENSE="GPL-2"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/terminal-table/Manifest b/dev-ruby/terminal-table/Manifest
index e3e93c1a3c77..648651bd4d6b 100644
--- a/dev-ruby/terminal-table/Manifest
+++ b/dev-ruby/terminal-table/Manifest
@@ -1,11 +1,7 @@
 DIST terminal-table-1.8.0.tar.gz 13407 BLAKE2B cf1653a18d2b6b72757b149295e01aee83d75241075912d145032e3bc73deb3e33fd00bef033f4bc90dcd51e4bd994b6966805ed7f81833392aba17bbdd7e179 SHA512 4ea4a66e8db384e448d57027e6314f9ce7a0e1511bbfa6e246e26c15a8ff3e44b46c8b6ca03dd521ffdd63b58976d400359131bc1869bf2dc04b3057f399e269
 DIST terminal-table-2.0.0.tar.gz 14286 BLAKE2B aa4e132338a8bbdb8e665584fca947a5b92ee9b8126545b1fffd727d26c7158a9b1cf2959aa917bb93a47e01a4d605ca400d8ddb3be2f73da256ab2f96e91cde SHA512 568542f1fc60cfdb37b14f9d52d6fb6c3ccc36b5c0103c95e3d70fd5e1371c124c97cdea5a4d5a2ec63e34550624b38bd11e0af1073a8eefb3c5fd9eef427576
-DIST terminal-table-3.0.0.tar.gz 23237 BLAKE2B caa8e3a4edd3be491cdcb914d3ad409da434c9dd0fbea407ced8db52f32c3490d6ae09864d3aaeb543944ce3f79d150e983baf656ceaf32bf23fceb7b8582dae SHA512 69ed7d76894e95c4456442d2c2b40ef7b5ee2b90fa2760f1e5271f1ceb569161ee34cb77e8bd9885c2543eed6c37df904c79d28cacf6dc7ddabcc1ab369206c0
-DIST terminal-table-3.0.1.tar.gz 25205 BLAKE2B af474858223e6a6a7d2339beea74c7610e2a7f20f8e3a72956d24b7a1078586f651235d708637c37399dd0c99d44c1d9b1e38b267ceabf3dbc5c40f5f1cad1d2 SHA512 fae7d19f92fc570ec0d23977a523f9381b14de6396d59c91d0e1e635de613876abeb3edfef9507955c93c29cb18ecf1dc717d7b227f118eb3b7e254835282251
 DIST terminal-table-3.0.2.tar.gz 25087 BLAKE2B 302623aa95731c242d43726e35fa0998be863546dbded41ed39d43b2ef1ef3895e2896d337df14b52153606b20d01fb6d79a291b2598e533fed30e0ab7db6fbb SHA512 5e8aa375fb1a5d2789ac0a735e5b5420261700b91650658e2b084bc9544cc195a1af329d157626b6aa4e738ad59a860245da15a099940ba68bbe0e937fd2574d
 EBUILD terminal-table-1.8.0-r2.ebuild 806 BLAKE2B ff2c57cc6196c3926f516cffe98aa18378913b20d21a4d67476ecf34e053a075e6203bb32be9d418298aec69d76b2abb7b3deab5283e0e1a9eb9210a5c890dc1 SHA512 892b3cafd66670498e4195926a601fc9efc814cdb3bcf676fe403331568303661e5a8544a8cfaf5abcfd35fddf29bb419dbcfef5db3aa1475abfdd102d0b8d31
 EBUILD terminal-table-2.0.0.ebuild 806 BLAKE2B 06655fbce9bc9477e1c975ae4026b9bb7e71a766175b7c36a2e3e423922fb7ca548b7ab8307a5966775d15f2aac5acb0995fd3971978fbb82fc13f77645e82b5 SHA512 a6d70d3de81c8253ee2ee43f148932a8f80048fa2f0bf6d709e46c1b82b61cf9aefcd93026cef435c10647c3acf0b80e3e249240856f1cc38414b311d3e561ef
-EBUILD terminal-table-3.0.0.ebuild 815 BLAKE2B 309f144d71cdef46eacb3b2d3c4352ab15f15adbe2f23bd7de42938b8fd1c386fd4bb47e27a1f4cd2d2c3ed57e8751981ed6804a50296c4aa4add6139266780e SHA512 aa93f693705b9753a6d18518e371bdee5801108d7d3d21244c426c85f4562793ee6d33f7aaf8ab76afd1fc961c3f7a63036b8150ef89bf16f6da06c82bd1793e
-EBUILD terminal-table-3.0.1.ebuild 857 BLAKE2B 347d2f7f818d427989c7b380d9e49057f8b7ed9867307af0f8af301a89681b493cc38d92eab737fc181797a6b3f5f084da151719df047762f644103cf2c599a9 SHA512 39b93aa358db8735ba142508c2457db1d3aa8e6b567cfeaa05b69552f19eafef7323f525fd526436b8b334ec6601d87ed55532cda611f5e3ece7065230149017
-EBUILD terminal-table-3.0.2.ebuild 857 BLAKE2B 14e52615e0d66076bb6ad75517e9d853d10475c3192e47ba60ab9749f2ad98e3c538c56504302db3c10baf761df118fef999b8a614fc1e925a94bac17e9390b8 SHA512 cd6605521cfc35ea9435a57c82a5764f60cb6bfccf5a5b76cf845cd48be54b44ffc0110c8080b5644c4e8bc2fc992a0bf5b56f7e8fa078b03157bd48db1b4176
+EBUILD terminal-table-3.0.2.ebuild 864 BLAKE2B 17e484997f4c41e144fbd0c4c1aad7c73f0fd1aa1b18e250e9fd385873464d35e7d971b8f2d34347e3efe6b8f03dd65e5b66ff9a194a9527a778c914a0a8ce0e SHA512 df863482cd32d0ed3a926c5dfd0cd6893ff9741ed3abc321f3ebba8295809c345eb1506f6efa2dc8a8bcba4ebbc9b2cf05c088deb2b80e975eed3170ff0a7477
 MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
diff --git a/dev-ruby/terminal-table/terminal-table-3.0.0.ebuild b/dev-ruby/terminal-table/terminal-table-3.0.0.ebuild
deleted file mode 100644
index 18408386ae7c..000000000000
--- a/dev-ruby/terminal-table/terminal-table-3.0.0.ebuild
+++ /dev/null
@@ -1,32 +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"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.md Todo.rdoc"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, feature rich ascii table generation library"
-HOMEPAGE="https://github.com/tj/terminal-table"
-SRC_URI="https://github.com/tj/terminal-table/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm64"
-SLOT="$(ver_cut 1)"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/unicode-display_width-1.1.1:1"
-
-ruby_add_bdepend "test? ( dev-ruby/term-ansicolor )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/terminal-table/terminal-table-3.0.1.ebuild b/dev-ruby/terminal-table/terminal-table-3.0.1.ebuild
deleted file mode 100644
index 98afda9cb1c4..000000000000
--- a/dev-ruby/terminal-table/terminal-table-3.0.1.ebuild
+++ /dev/null
@@ -1,32 +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"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.md Todo.rdoc"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, feature rich ascii table generation library"
-HOMEPAGE="https://github.com/tj/terminal-table"
-SRC_URI="https://github.com/tj/terminal-table/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm64"
-SLOT="$(ver_cut 1)"
-IUSE="test"
-
-ruby_add_rdepend "|| ( dev-ruby/unicode-display_width:2 >=dev-ruby/unicode-display_width-1.1.1:1 )"
-
-ruby_add_bdepend "test? ( dev-ruby/term-ansicolor )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/terminal-table/terminal-table-3.0.2.ebuild b/dev-ruby/terminal-table/terminal-table-3.0.2.ebuild
index b35f5717cf6b..2c26dc043438 100644
--- a/dev-ruby/terminal-table/terminal-table-3.0.2.ebuild
+++ b/dev-ruby/terminal-table/terminal-table-3.0.2.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/test-unit-rr/Manifest b/dev-ruby/test-unit-rr/Manifest
index 93512cb10a10..63fc2d9b21eb 100644
--- a/dev-ruby/test-unit-rr/Manifest
+++ b/dev-ruby/test-unit-rr/Manifest
@@ -1,3 +1,3 @@
 DIST test-unit-rr-1.0.5.gem 16896 BLAKE2B e9424a29e5f23d11fc9daebe431e49945262633b5c4729a70b59b054e7a9d2373cc86d69dee86a82a39526ce506e21ff63dc0878313c72859cdd5ac28476aa2f SHA512 120c0c6d0b203a40062d61f3b9c915460660d1222b60878eb4bc30111d7aa51ec271d9dba138ba0b91eaa116ab07051323e1de365c6cd21f84c372748f89d36e
-EBUILD test-unit-rr-1.0.5-r1.ebuild 582 BLAKE2B afd8d98b6a7c1ff07e51b23cda5bb74a2856d1957fa5a5deaa0e7cdeb2608794a294d093ba8adfcbda2fcb577debba804c6aa272669cfd36fb90918c65b51f7a SHA512 2cffaf2648774f933b78a235d112a624ecac55b02267ab0666d48a6da4f01d93ce1049d208fd8553d8fa0a26806463aad47fa57aaa8b750b12da08fca80a3534
+EBUILD test-unit-rr-1.0.5-r1.ebuild 582 BLAKE2B fbc746a4d39d75fc2acebae44087d585cc3a572aa227373fee9dddaf3cf53f09e70e80366c5686e55cf10042c12854737ff781ae25db279c3f9370b13ff285c2 SHA512 d8f4866d917e80a083bd897153c4cb2c356839aa907fd09de485ac78a260840c56113c4734ecf120bc5835fa57e156270b07f86bc220fd7076e4118e2a2c5bfd
 MISC metadata.xml 339 BLAKE2B f5ee155c73d7b1caf5585d18d5a2ba559e7bcfd4e8b35cdde7f41e1ded85c048c4c85383520e1c67ab7c3bb15501fb0d9e10919aab8537bd144a11ff79d552e5 SHA512 9e2743c4dc8a8a38dde0fa3da23adaf21bf154d8b5b3a30a0bb41cb16b9c7fcc0b0eafc266d36b5e206278e170b91c310da2e44e972da620de048144ab35e1fc
diff --git a/dev-ruby/test-unit-rr/test-unit-rr-1.0.5-r1.ebuild b/dev-ruby/test-unit-rr/test-unit-rr-1.0.5-r1.ebuild
index eaf9a8065e4a..2f063426932f 100644
--- a/dev-ruby/test-unit-rr/test-unit-rr-1.0.5-r1.ebuild
+++ b/dev-ruby/test-unit-rr/test-unit-rr-1.0.5-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index c8cd6eb574e4..7e838d0fcbb7 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -2,14 +2,8 @@ AUX testrb 177 BLAKE2B 7f0192ddcadda449bc4766d5910c76ef21ff8cadce1372a46db4fc236
 AUX testrb-3 183 BLAKE2B 5bd4712b7a73cc480669facf537b5bbeaf16eeae2782e21d5fe88cf92c9945845803d3f1611d465a3fc16f76838b5aba964e9b96eae35d9cef1b0b269bb94e2d SHA512 cff9584c54bb682f03a0253df953ea930053642e249a3c4573e34cc78f4b77ef943ca5a2c7d1869d926b4a8d9e173ebece69169d845724b03c03f00608bdbdfb
 DIST test-unit-3.3.9.gem 121856 BLAKE2B f8ac1568aabc7d53c79715c6b141d3f2be0782e35dda36fc6184e7b7bbae419e883b94f163333e4e1a186c07f55cef181a2d86d4531e3968667e8c5fcfe8e36c SHA512 8e2a1516d33811793aacbf0b31b9609b43437ea6800cfe6c97b1c96395a8eea7c42f2788dd86b6decfda184a27e5818646bbe313d39ce3799a0869f62a0c4c32
 DIST test-unit-3.4.9.tar.gz 161212 BLAKE2B 57c1932a1049300aad41eb8d0a72459c3eaecd5b5bc89fa9f981b6975be9b8b4d378dad8ff769bb1add54e28a6e84b54f791ab13c7bd31d042ae068e37c04f6c SHA512 dccfdbbeb5319cac36dec80d17428b593905c74d8644b19b938bc2cc15ceb598818e73d2f0a681142cba6395b16d404437821af72abc152ab20987a645faf001
-DIST test-unit-3.5.0.tar.gz 161244 BLAKE2B cbace253377c73d20e88a8457866084fb1914445d95c06e33c3dee72dd7302b12999eb9baf9402d78d6aad617b8c6c43709ae2ad2d7256d5b6c83fa374356956 SHA512 faf882d3a6faa528f3d4da0c78f7787cc43191dd6aff872c65ce172feb5f1e1169513a2ab6085fd2cf6f30716b50fcd538d88d60e669f724188adfed3ff5a76d
-DIST test-unit-3.5.1.tar.gz 161335 BLAKE2B 1b96e63934eb20d94474e25865f1631d1050383bbd8d41b851542b5fa08823e46f03792ee77a6d2d9172196c66a114001e33d54e8544a7286a31280f1c03d583 SHA512 de776d9b77a9eb4429813701ceaf5ac66346cdad05a2c79be428a7ca8e064a4191281e1a8f37bbddc736fae00e19a3fff9be8af93ba62042d11824da3c478d09
-DIST test-unit-3.5.2.tar.gz 161384 BLAKE2B 307f954bc2d8adc4ac8baf0e1adf626ff18be9eeb1dd00ae34fbd661e83ff0b0205585b3b542099343caffc33d6c1599e1eefd8469b1c0bc14a4f03244257711 SHA512 260b43458b3e993f51d255d9da21fa8308faff858f930f47c0ebaabed1a8e38543e1471cad6736ab52497e507d7aab80f75e78456202b883fcda77f5874d52eb
 DIST test-unit-3.5.3.tar.gz 161397 BLAKE2B 1d52fa1eebf25a66e7036d6709a5410a5563f381d3a3eb05ef09702493e5990b93c6ae5a3167cc4d971174a08a2d2b884b860eeea0ea5f8a1fb76e9c42379e0b SHA512 e6960bdcc67c8667cc13f0a4cf8b412be767124b0e555294be71afff71e0ce9a34e7cfa7413e33ee3c8477928a479e9439ada9e50866c0e8890b4be8dd0b38a2
 EBUILD test-unit-3.3.9.ebuild 873 BLAKE2B 2802f418211232803c5b3962e19fbdc6203b4e1dfb10294049aa43de9bfd39a1716e94831f255fab67855a4b1838c2de9f0d56fc6e035617c7ef833c3037d328 SHA512 21fff12c21222e44e94a678ea4ce171c8a6c46a6e8bcdb17747a246807a7988a2fe0399b84bf55e8a7c6a059109c01a6ae3237cfe594e0701bd5f6d318abfc10
 EBUILD test-unit-3.4.9.ebuild 1008 BLAKE2B b838232d01ce3af18a24711c4450cb6141e6aab36811e4e921298ff6c7c425b16e9f8f8b416692965b28677530369b72527afaa91156fba06b6c34393831aa35 SHA512 ba743b20ccfad454415f68f3ab808ae3969ff924535ba724347b08d56febe225568146ed51ee9df220836ea8dc887750801373b73088702676df15db3bac1094
-EBUILD test-unit-3.5.0.ebuild 1008 BLAKE2B b838232d01ce3af18a24711c4450cb6141e6aab36811e4e921298ff6c7c425b16e9f8f8b416692965b28677530369b72527afaa91156fba06b6c34393831aa35 SHA512 ba743b20ccfad454415f68f3ab808ae3969ff924535ba724347b08d56febe225568146ed51ee9df220836ea8dc887750801373b73088702676df15db3bac1094
-EBUILD test-unit-3.5.1.ebuild 1008 BLAKE2B b838232d01ce3af18a24711c4450cb6141e6aab36811e4e921298ff6c7c425b16e9f8f8b416692965b28677530369b72527afaa91156fba06b6c34393831aa35 SHA512 ba743b20ccfad454415f68f3ab808ae3969ff924535ba724347b08d56febe225568146ed51ee9df220836ea8dc887750801373b73088702676df15db3bac1094
-EBUILD test-unit-3.5.2.ebuild 1008 BLAKE2B b838232d01ce3af18a24711c4450cb6141e6aab36811e4e921298ff6c7c425b16e9f8f8b416692965b28677530369b72527afaa91156fba06b6c34393831aa35 SHA512 ba743b20ccfad454415f68f3ab808ae3969ff924535ba724347b08d56febe225568146ed51ee9df220836ea8dc887750801373b73088702676df15db3bac1094
-EBUILD test-unit-3.5.3.ebuild 1015 BLAKE2B ea290fdd18176851863a24dcd244fccc29c11955434e103c1a2a4bf160e9b846b81401b4a205bb9606d99a6b6cb4aec32bbaa827e9b834026165442fc23c5162 SHA512 12581855c8b6d65813d70a970f41ef293e8f82c70c31242b205534c0cc198277473b38c099c5648c0a87deef09b9f08df2b2ebc3482b4bd8fe3ca18ea3c774ed
+EBUILD test-unit-3.5.3.ebuild 1022 BLAKE2B 0d7a7f1e0d0c07314b4f468a08a22089305c86681f508d29147b5e6e869c3d3b5248be36542f7295c91eea7fb2099a70e216750606ed717d16ffa669d865816f SHA512 8a32f86ed3ea1bd1bc950a8a84b110ddb14f4df4a6a3b4130019abf8d3f6fca117b36b4dcde0afe92ce4e3336e7a1b90b8359ec911ed2ab5c6260d17964d900b
 MISC metadata.xml 338 BLAKE2B 3c26fa7de127d5d67019ecf239e8b98a56fe497b5b1ee5c0e43ae1f41c5032993ba4c8db5a22283058130ebd199cca1eccc8f0eb3d2927b1c69e1f8b55e93285 SHA512 42f8ada79c01ff6259be33dafc34529636a769bda5bd017b49c6c9af667665d5031aeafbedad6c1fd59c9b8d04a1a12a9b1da7f278bfe1b5e427eb0bebacb6a4
diff --git a/dev-ruby/test-unit/test-unit-3.5.0.ebuild b/dev-ruby/test-unit/test-unit-3.5.0.ebuild
deleted file mode 100644
index 496be5175274..000000000000
--- a/dev-ruby/test-unit/test-unit-3.5.0.ebuild
+++ /dev/null
@@ -1,36 +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_EXTRADOC="README.md doc-install/text/*.md"
-
-RUBY_FAKEGEM_GEMSPEC="test-unit.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An xUnit family unit testing framework for Ruby"
-HOMEPAGE="https://rubygems.org/gems/test-unit"
-SRC_URI="https://github.com/test-unit/test-unit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Ruby GPL-2 ) PSF-2"
-SLOT="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"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/power_assert"
-
-all_ruby_prepare() {
-	mv doc doc-install || die "moving doc directory out of the way failed"
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die "testsuite failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbin "${FILESDIR}"/testrb-3 testrb-2
-}
diff --git a/dev-ruby/test-unit/test-unit-3.5.1.ebuild b/dev-ruby/test-unit/test-unit-3.5.1.ebuild
deleted file mode 100644
index 496be5175274..000000000000
--- a/dev-ruby/test-unit/test-unit-3.5.1.ebuild
+++ /dev/null
@@ -1,36 +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_EXTRADOC="README.md doc-install/text/*.md"
-
-RUBY_FAKEGEM_GEMSPEC="test-unit.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An xUnit family unit testing framework for Ruby"
-HOMEPAGE="https://rubygems.org/gems/test-unit"
-SRC_URI="https://github.com/test-unit/test-unit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Ruby GPL-2 ) PSF-2"
-SLOT="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"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/power_assert"
-
-all_ruby_prepare() {
-	mv doc doc-install || die "moving doc directory out of the way failed"
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die "testsuite failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbin "${FILESDIR}"/testrb-3 testrb-2
-}
diff --git a/dev-ruby/test-unit/test-unit-3.5.2.ebuild b/dev-ruby/test-unit/test-unit-3.5.2.ebuild
deleted file mode 100644
index 496be5175274..000000000000
--- a/dev-ruby/test-unit/test-unit-3.5.2.ebuild
+++ /dev/null
@@ -1,36 +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_EXTRADOC="README.md doc-install/text/*.md"
-
-RUBY_FAKEGEM_GEMSPEC="test-unit.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An xUnit family unit testing framework for Ruby"
-HOMEPAGE="https://rubygems.org/gems/test-unit"
-SRC_URI="https://github.com/test-unit/test-unit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Ruby GPL-2 ) PSF-2"
-SLOT="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"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/power_assert"
-
-all_ruby_prepare() {
-	mv doc doc-install || die "moving doc directory out of the way failed"
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die "testsuite failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbin "${FILESDIR}"/testrb-3 testrb-2
-}
diff --git a/dev-ruby/test-unit/test-unit-3.5.3.ebuild b/dev-ruby/test-unit/test-unit-3.5.3.ebuild
index 3e9bf2936d21..0d09033e3895 100644
--- a/dev-ruby/test-unit/test-unit-3.5.3.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.5.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/test-unit/test-unit/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="|| ( Ruby GPL-2 ) PSF-2"
 SLOT="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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/test_construct/Manifest b/dev-ruby/test_construct/Manifest
index 42e813413dff..572d760aff4d 100644
--- a/dev-ruby/test_construct/Manifest
+++ b/dev-ruby/test_construct/Manifest
@@ -1,4 +1,3 @@
 DIST test_construct-2.0.2.gem 13312 BLAKE2B e1a5068e8133f739dfc407e943b0486c0c2bb2a8f18943a23b366205b206a56b792630daad7a92a021ea367d490b117aec1313faa0e5360bf6b984df3b82c16c SHA512 d73e2daf5c5974c79aedfcd7e1cd6681a3f1f6fe3f2c68bcde26690a18be920ea53b648407e4ee33444364b2a02f1517362c876e703abad02fc528a47de092ff
-EBUILD test_construct-2.0.2-r1.ebuild 592 BLAKE2B 522a079f2eca8d1bc407ff82dba2a4c3004473c6062928c3f4b927a94fea49d7c7bff459272e0211659309bf6acba9604c83d775f66c88d95aa426cede319808 SHA512 a6c2b45599c52094416bc23bd4a5710490260e2335ab58f0deb6e3a6a8beb1dc74e93d72bb9c523835a2c97b1902dfc4b26410d31cc20d264e322451cec41849
-EBUILD test_construct-2.0.2.ebuild 630 BLAKE2B 93a2dcf4f9133e2a3ce488b6e87a39232a53dc4b4faa78f18057e728c1f55f7a2c3fe5759805365f7beb0ea1167a9f9f2239e2c6b87248bafe8eef50047bb7f9 SHA512 22807d897e664f133b6ef27e499e94d029d8709eb44a2683c0d21e52a7c396262cdb76426a5f4eaf42f3b53d9d9987971db8664e9e69f0075ae6e8078c2d2da9
+EBUILD test_construct-2.0.2-r1.ebuild 599 BLAKE2B 4eeda0021cb589880df12cc2e853be3693dd9b2aa5db73e6636b8c72f78ab0ad105a37144cd0a6f4d0313262229cb56d054d212d3243ca0bf4e5947f1237e918 SHA512 4722fbbb6404c3a7756ae29a4dac1c706cb8e119d9375a0d51e4c23be705bebd5b73e6a1aeb163a1b58489901ac5514e48039540fd917faf61781c3e36bc4bd2
 MISC metadata.xml 345 BLAKE2B 3a2ff96a2f7474b98c3ccf65f06c38925248cf2ac769468e1d861a5c13379d35cb562cb5f55e1018bf11aff8bc2dfae94cb4c19461384f9e7cbcab06f7a37589 SHA512 d10509328b3445fc3eb9713c4f527365cc5491f8ec8415662a8fdf06a93049bccd63ab9da13512e7573fb25e3e9497f13969faaf0734cc01cd4ce1fc574c73b3
diff --git a/dev-ruby/test_construct/test_construct-2.0.2-r1.ebuild b/dev-ruby/test_construct/test_construct-2.0.2-r1.ebuild
index 29a9aa5571d5..fc0c489347c8 100644
--- a/dev-ruby/test_construct/test_construct-2.0.2-r1.ebuild
+++ b/dev-ruby/test_construct/test_construct-2.0.2-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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
diff --git a/dev-ruby/test_construct/test_construct-2.0.2.ebuild b/dev-ruby/test_construct/test_construct-2.0.2.ebuild
deleted file mode 100644
index 25b5c4ee4d30..000000000000
--- a/dev-ruby/test_construct/test_construct-2.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Creates temporary files and directories for testing"
-HOMEPAGE="https://github.com/bhb/test_construct"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/minitest-5.0.8
-	>=dev-ruby/mocha-0.14.0
-	dev-ruby/rspec:3
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/test_declarative/Manifest b/dev-ruby/test_declarative/Manifest
index 5f2275fc1d38..672eadece5e9 100644
--- a/dev-ruby/test_declarative/Manifest
+++ b/dev-ruby/test_declarative/Manifest
@@ -1,3 +1,3 @@
 DIST test_declarative-0.0.6.tgz 3586 BLAKE2B de8e4b011de9ce0773e2c76887d6cf7d888c2f799a07e6dda024b301594edc37ccf2c386c366c0a13d81a1f0697fe7be92932db7d66e5ed482d529fac4b9ce78 SHA512 f147fef7f3ac912c7b1cb2826cfc7cb5abf4cba92ea4f7accc2b1ba3a4f0775bff5ae06e80370144b7b1e7d03e2f3129e268c5d7056ee2aca9d77047a1b5a1c3
-EBUILD test_declarative-0.0.6-r1.ebuild 1126 BLAKE2B ac70c439fc272e100b1730451bfb88ae698c5dbd87bfae4572c5a7ea4d3b012e8bccc10fce564cfd0e0cd9e3094ae40f91d6c8af9f517f0674b5eb81c845dd79 SHA512 33733cdd103584e8151f32244725d6628e4684f6aef905534059aeb946723419909fcfade18ae05217aa6cde3f20dfe2e6dc0f9f867049806609ce3cfd91ec43
+EBUILD test_declarative-0.0.6-r1.ebuild 1146 BLAKE2B 04063d2ab686c925b7781ca8088f2fc4c17e334c1d62ea2d677b6503769f6672bb3846d8e4f45182f8ec02bb675b3141d8d90955e70ef0874d89e1b50d886591 SHA512 f9dbc0009eb73ab59f140f4d1b0e2aeb63c1337f7a1c05cec4b44c712b68d5732eb06abff55f985791bb48dc7ffc4d68f58957d7cc9e151352979365cee067af
 MISC metadata.xml 353 BLAKE2B 504efd99cbd9cd70b9241711a5ecb7ac96f10bef5a88e25288dd6293e1c42b2d215ea3042feff270a4c9b9d36c724a6f6450d180dc69a724781d034e5d91e27f SHA512 c6a704277f2ee955f9cfc5898a89285951ee0a9546760bd949bd29e06b4a8037788365b9a95e2530da65907e03fab5d52dbd0d73768ee75cfcf1b00eddea5d85
diff --git a/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild b/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild
index 4f5866174a60..90930b4d2aa8 100644
--- a/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild
+++ b/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
@@ -20,7 +20,7 @@ RUBY_S="svenfuchs-test_declarative-*"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/minitest-5.10:5 )"
diff --git a/dev-ruby/text/Manifest b/dev-ruby/text/Manifest
index 536df683f390..2c3a2264e9ca 100644
--- a/dev-ruby/text/Manifest
+++ b/dev-ruby/text/Manifest
@@ -1,3 +1,3 @@
 DIST text-1.3.1.gem 138752 BLAKE2B 19c837d83f72787ef1a70eca74d9b2d2e8336d60eb2dc07578f07fa446919984946b1c2431efcb4a3b29770f77f9eb0ea9a40c8d74dd07972786066b67aa3e2e SHA512 0380fc77e2f0d427afd9015ed904947311139e52adf3d49b748d0e6ee32c579073ec979f0cdbc117b53e3d841f25ce9f271637dd7edb5f6e124e369cca788eb8
-EBUILD text-1.3.1-r1.ebuild 398 BLAKE2B dd9ee5c22ef6574af2541010b34a29009422d4ba488488d2f2b4c19496ead48b0c4de2921141ade38b6cda992e5f7d76d12e7ce4ae458104cbe2df45f64d809b SHA512 49606d1fc963471f348f679659f49e2b2b9aa89178b92a287fc877090c3b74717f6fec40f371c20bcc3e81185f50794f7727dc177b1c0ce02e3b19a08f321cb4
+EBUILD text-1.3.1-r1.ebuild 405 BLAKE2B 53076c891a21deb938b01bf8b9da1d2d2e16333e2f9b2770ccd58b27e81e22d815324c9ff8a2eff80a33c862407ac9e8090314beeee5db4214682319a49dcdd1 SHA512 212f09509ba5d2df8d4ca301c93bceb951c06099cb5f21dcbb2582d4868e0408a6a995d6a5893bde0479207a01c9905628729bd361be3f71fc887c8713cfc72d
 MISC metadata.xml 344 BLAKE2B 6a1b407c9fbef40e4a1b79982bbf7de3b2459c6b1726d7be04500a3d1d2926fd6a697830c66c47e3d2a63f432f8d3b0b76775bf5dde17a4ad803c99390cd3b20 SHA512 0a076cc71bd6ca52aa2d418469f5d6cb6b3c3ccffc7061a9418d9face99188e33e37d07c59edaf1d211c5b3e90b06fd6352509a44d437a6f0c2f61200a68473f
diff --git a/dev-ruby/text/text-1.3.1-r1.ebuild b/dev-ruby/text/text-1.3.1-r1.ebuild
index a94790ef5361..13dbdeba4ab9 100644
--- a/dev-ruby/text/text-1.3.1-r1.ebuild
+++ b/dev-ruby/text/text-1.3.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
 
diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index 02a9d2bd3133..38b03176eacb 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -1,5 +1,5 @@
 DIST thor-git-1.1.0.tgz 98252 BLAKE2B 1537cfe6e7cc0d92cc8bde56f0e2acf06b6ee4cb366a5686bb62de43dd15709a4aeaf1b30c3dfa71a6d6c7570e702deeebab6da324204388ac427337514be3f0 SHA512 d1872a834478c5a2054dde6f55e93f6765fd628536f99f888bd7495436c88658537d48c44ef1e5ad6d1388edfa294ea2a3f3cbde32c19b7d2253b78bc62bf9d0
 DIST thor-git-1.2.1.tgz 96638 BLAKE2B 03826d2545c61f5fd433325bc65b244921fd0ed0f030ea173fa6f558ca9fd62ac52dca829c66de32569321b3d52353f306559fa34c34e472b1aa52184ba3d812 SHA512 88e58b6ca6c812cb84ab59e0ee8afcd8fa70b6c24d403cd5ea05d1d40ac30e85f2c7412611cc176eb541d16878e309d25c7e4284f64c760475925ffe359250b9
 EBUILD thor-1.1.0.ebuild 1723 BLAKE2B 459c1c524d3d43ff934ff3780e8bb03c2b5c32892cab1d7e25bae4cfd90db7a70589c6b50bbe0eb088dd52a7934b07160c048af7a54ceeb0c2d25cc046fbcec5 SHA512 db6fa89e2b968639cc67a5aba134a43f41179e26d7daa9eca26934904e3ef2d8a9ad724a59c70c3b91e9578565b25c62e1ef4220557802991b8e4f342d5b7e85
-EBUILD thor-1.2.1.ebuild 1697 BLAKE2B 7b9e46a5398891a308984493ebd70a5373bc237dc907d09a41a4065be2741c0ec5923fd312701aeba57d263dee3eed695e042e167851555386053a644b260599 SHA512 49c43f402fe6661565deb4ad328d9ef48269a5105cb0875a875fa97a2f5d0e660ec8dc884d067cd886a3d89bac1d6f31488a30f87f9b36191f1e3a4d38278d2a
+EBUILD thor-1.2.1.ebuild 1707 BLAKE2B 5e32d1a8d45906ac0a99231ae990af81bef41adb7fa2524058f726aff1b899fa7f4d63a95bc136bca0748ae13926b204f99a016004c2ed7f850aa7cd037f55c9 SHA512 18b96658822fb180e22124db0f3e7edde74029b39b7ab455bbb40ab660edcc3b2a26d2edffca5205222467c409084d62672b662ce80b69603a2ab06b945d445a
 MISC metadata.xml 681 BLAKE2B 18af48da65edba93d19a6a8541a5a79b63485d15108736b8b2c964a57006dd8e0bcc094261045a2598ab5537c3162cffc012e35dbff7c631e45f8de1657b5cd4 SHA512 ccc14bf0262a52707216bedfa51c46d5de83b04308d6768dd73e9d63a0e807ae5f069b9730b5e88311ddf51185aaec12144ffd8540044baf2b18d1208dee380a
diff --git a/dev-ruby/thor/thor-1.2.1.ebuild b/dev-ruby/thor/thor-1.2.1.ebuild
index 34dccdc26911..f9f2ad391d8f 100644
--- a/dev-ruby/thor/thor-1.2.1.ebuild
+++ b/dev-ruby/thor/thor-1.2.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
 IUSE="doc"
 
 USE_RUBY="ruby26 ruby27" ruby_add_bdepend "
diff --git a/dev-ruby/thread_safe/Manifest b/dev-ruby/thread_safe/Manifest
index 440498556c64..9af5111d9bbb 100644
--- a/dev-ruby/thread_safe/Manifest
+++ b/dev-ruby/thread_safe/Manifest
@@ -1,3 +1,3 @@
 DIST thread_safe-0.3.6.gem 120832 BLAKE2B 0e3a1aec1d34119dc1f673acdc3d2e18b8c5f970bf79726e4729a806a52ce6ab265fd713972065011e8a04cf2776dda871d3d747eec77b0e94235de776d0cb2d SHA512 a11808576392c068e1cb31faad706be2b1bbfa4837c655c2ab1d5a235b62b25ece62065de6b65bd25496fa827ed89eb0796b90467107df255825e01316ff1805
-EBUILD thread_safe-0.3.6-r1.ebuild 1048 BLAKE2B e8e795020a50128c0c1813e1b01d448806991e096593861f4e72633f4552b47164f402fe0177df25a5cb3b20e6111130713a31de6113b7afac1759595ab6df7c SHA512 49a9ba90bd1b601f1db8e5d429edca9d7cadc8dbe7ff9c775274589183d1dd1d101735ed1f09119e4fbf627a4d3c45652855b1f73627443a1fad29e2e0276849
+EBUILD thread_safe-0.3.6-r1.ebuild 1054 BLAKE2B 53e9f228694261b27bafd200b6e6093604de88a81471b47cddb70d7df97f71afb02b5b6eaa6770980f846e65bd2769c7043603621f864c6fd543893bc071769f SHA512 2187ba04ec3e88a8b9c472de1c77ff7b4bb12ff8708f18cb24a5834ef1031c39c9f39cdc3d7285ba938568c53b3f6b115a6dd5f64a96909361747199aa720e3a
 MISC metadata.xml 355 BLAKE2B 48a5dd4e2eafc4151eba3692a896d7042f03e09f1fd84f861f2f6609b28832ab680801052282ae4f672a4cb980c11324466cd8a8d7b5840182a614e1df98bf1d SHA512 bf9685ec18828014e94f6fe4fdc93d28d6c8de5ba52189c913b556c1160a4d3ffda7211c101bf0f2c73497f5c3ba4d8be283ca803a1cd5dbd2c729057779721c
diff --git a/dev-ruby/thread_safe/thread_safe-0.3.6-r1.ebuild b/dev-ruby/thread_safe/thread_safe-0.3.6-r1.ebuild
index 39afa8fe1ba0..a90db6ac5b9f 100644
--- a/dev-ruby/thread_safe/thread_safe-0.3.6-r1.ebuild
+++ b/dev-ruby/thread_safe/thread_safe-0.3.6-r1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/ruby-concurrency/thread_safe"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Higher atomic dependency since earlier versions crash on ruby20 while
diff --git a/dev-ruby/tidy_table/Manifest b/dev-ruby/tidy_table/Manifest
index bb2dccaf0a00..e1e1106fb1af 100644
--- a/dev-ruby/tidy_table/Manifest
+++ b/dev-ruby/tidy_table/Manifest
@@ -1,4 +1,4 @@
 DIST tidy_table-0.0.5.gem 7168 BLAKE2B 7c00064c266bad9db6acf5066845cc6543c2d51fb5ac85240c9ac77d15004402588b992a0e56529123a1805e6c887ba23d135e801e07fcb918411d6706e7f596 SHA512 fbe9839587c3381ebabeb874b2460767491447b54501137f464c16bd251601670a6a260881792c117ee753e5b4d428f04295df041ffee56f109a1ff772346bcf
 EBUILD tidy_table-0.0.5-r5.ebuild 749 BLAKE2B cfc7ecafa290e8dd40f0b9ee965732565b95cf98904c1b4284cf6537bdca5c0f4889dec2d98e66863060e2638e5f9328e3945671a71410c489f89815442c44c3 SHA512 2970f3410176ef12ad73d1069a20eff0c8f52d381e0c1c84c29b522a4b149eed8140ebb5717f6b5eb2df2f940637b87554b4e407601dbcd023b12790621c363d
-EBUILD tidy_table-0.0.5-r6.ebuild 713 BLAKE2B 9d857b46edcb64f3925c1277b7ff2238e88e19db892f4f1b973e4a9ee292162af41671322dd792345564f2215dec3fd054e42322963699bd98e0e4f90eb87e93 SHA512 7e8924630ebbee25a2ac2e9a9109db94a77ceb5122c8e21abfed4e9c09156ad48b603652a64e5648a34c833aa972ae31d99abde4631b401a03e1d5fe4357dac4
+EBUILD tidy_table-0.0.5-r6.ebuild 718 BLAKE2B a5feb62b1797b578eb42ce97c6284b9eb87bc46d7c8484a448050107aa100cb0a880a1bd36b912a165e57d38fe88fa1461e8ba48502d40234df0a561cf522715 SHA512 0b133982386016f478321c170ee394bb41b01280ab1707ec7061760003348580615113ce1aff35c304e64a5d3844f49b84217ff617446f789fc8573e43de069d
 MISC metadata.xml 346 BLAKE2B accf8ad449f4bde42d923f6db68aa8806fc69f4639bb224facfd6e1473cff9e0320fa79f01256d2f198346b0b8600432e3f5565c7216671a3b318578efa90006 SHA512 5010b220d0cb3e371f7838f950549919ff92eb4666148170da05b6ee8452eee82a5266bbba6eff7f97ebb64f9432cc5c6836f78b697bdbcf845fae14c5ad5f32
diff --git a/dev-ruby/tidy_table/tidy_table-0.0.5-r6.ebuild b/dev-ruby/tidy_table/tidy_table-0.0.5-r6.ebuild
index 52707fd36dd7..3863956913ca 100644
--- a/dev-ruby/tidy_table/tidy_table-0.0.5-r6.ebuild
+++ b/dev-ruby/tidy_table/tidy_table-0.0.5-r6.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/topfunky/tidy_table"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index 855c831fcb06..75edf946dc98 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -1,5 +1,5 @@
 AUX tilt-2.0.10-ruby30.patch 1482 BLAKE2B 00647a8d443e9800bc9aa7e28d91b9f0ed59ad5e0802ae14b3b545d695181774bcd909ff459832b5e99316f39b9d548ee002fb23de6fcbf394ea73521519b85d SHA512 0f261a9d02e562326902433f10f1ea58a652c2f122d8d90ab2b74259b1d6bd551854802b5f19c07fc2998a45d82133fe3cc029012103e614faf22bd6fc766047
 DIST tilt-2.0.10.tar.gz 51446 BLAKE2B de5c12dcf22994f182ae163a82c3060f1d0d8b4bc2a4495f28c9befc954b4949b9d2ae6aed42e3a9c35fb68825844881d9f15b2b68d949236e5396083ff199a3 SHA512 4a36c55347e307ea0c842aad3da72cebe98bcf8a0421040cfce7a43540d1746e736ce92b7ce7492a5cfc184372842c3ac7a006f3650b4c9420d5825ec005b4ef
-EBUILD tilt-2.0.10-r1.ebuild 1623 BLAKE2B 78f2743d88e98c88f01f584eb347e8eb0c6c4451225e79ec13d24e5dceae4b38a99dac95bceefbe316851ff54d407388b385d25872286caefc763e187789d907 SHA512 ace6e0bcef0513b38b73cba5aa1bc963ec2ba3da060507bc48fc8ba835611804fcd206fc9d02f8bf8102658879eaf9e473bca9339df518cf598cd35e955a525a
+EBUILD tilt-2.0.10-r1.ebuild 1630 BLAKE2B 51ca255cf0fce82b9de4e80e078fe16c2d43fd3540d6c44e38eb309a19111a26014e9dd1cc9d7993699cfaf0c6b6b51d76f0d786fe65ae311b793aaa770e933c SHA512 4ea13585af722c2849455f47880fa9b794e255a8475d6285521e74eded124e4e177ee51e652c5fca69dc00ea11b756704bf72b937a4eb3652e589b80ee2dfc61
 EBUILD tilt-2.0.10.ebuild 1603 BLAKE2B c046401f51f7a87aeff75991d0ddbbb6c402a1cc8dee8d867ac44922ddb72791e673d296353e5eeb5f52860230d10c2eceab6e056d29f85f7df7e78c3b355a31 SHA512 9c4f2a2c43b29c76e9ed970f44be4b6b8c5b4c96ab5b34e17dfcedad416d4487efa9a6ebab332bde09b1aea5870e4bf3ac1752505838ceb506d1a464b0f16531
 MISC metadata.xml 340 BLAKE2B 5414049365511f348e3da85bf3f207b791dc4269331e6a650f90398b6afe2502e2e62624ec9597a2d55dca4a7e4a99e209837c44bac7a901ec42139518f41647 SHA512 4be8002eca7cc4c0204311dd7dd187caeee3f40db9b00d108fb18e97009f8cec10d298a958bf83d24177297cebd78789cdd546a0c5e9c7288aa697dee1facf71
diff --git a/dev-ruby/tilt/tilt-2.0.10-r1.ebuild b/dev-ruby/tilt/tilt-2.0.10-r1.ebuild
index 00b33d3ba691..4ebfd724eb92 100644
--- a/dev-ruby/tilt/tilt-2.0.10-r1.ebuild
+++ b/dev-ruby/tilt/tilt-2.0.10-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/TEMPLATES.md"
diff --git a/dev-ruby/timecop/Manifest b/dev-ruby/timecop/Manifest
index 898f610c7f97..e299d15ae727 100644
--- a/dev-ruby/timecop/Manifest
+++ b/dev-ruby/timecop/Manifest
@@ -1,5 +1,5 @@
 DIST timecop-0.9.4.gem 16896 BLAKE2B a8280726c8c46573eb0bc72af7b8c6f64ba4a3898a8089eb44c09bc4f53c2c6c51364784aa332c55a45d9c8f93ab9fd3b7691020f8a58f48056cf3673429abf7 SHA512 3d5f611d9a4ba9bc21f01c8096c97892cb05d6effb26f03703a0db842fe18f9614fca3cc836a1583dd5ebbd0d50d4115acf348b7b8b78d93010aaa48b168b9cf
 DIST timecop-0.9.5.gem 17408 BLAKE2B e6234759af1b3bcdf8fa5403594498507a7ddb8f652e8698ab7ce0e4879fc99828953120ccb80c3cfd555b63bbb957b0fd2f25758c4add1803d288b1807360be SHA512 4b3aa4d2fe5b95b51119be61faf0c85539d56e1ad2b507a1df182f5d7882390b37bc8b9984ef54e1b0b42bfb0d205ff4f863d016e423d4499cf3b21f2eaed7ff
 EBUILD timecop-0.9.4.ebuild 1012 BLAKE2B 9dbe7e7c08fb40e4c133d79467163013df4fd1e6682dd0b470277bac86e523d262c088915c06d4a966a60505c7a8aad75eccba3c89c304b5bc7d424246ed776c SHA512 a0800c4abfa60d330c1dce81e0a7aff43fd0c337ef2818390533166d1ed550bf22e156bc69e3b90cfd41aec4c2bca5662109876f310dc2f1aae09b22720b48aa
-EBUILD timecop-0.9.5.ebuild 1019 BLAKE2B 013131f3c49c340c1ffd4aa19a9551b9551bef773850055a023e7da9ece104dda14f026e85aba0cc4d5f2ac066e4f68e1cef518596b0ce085f84d533e5b954f4 SHA512 613d52f51f616818f9df71f68dbdc549bce2d2ad075943bc7c26b0636744540cc3ab0484342df793d8f73eaf49920d4ac4b5ca6314d95098c8536b9992a56bcd
+EBUILD timecop-0.9.5.ebuild 1032 BLAKE2B 61a471eea004646574dc87fc8ee550a2877605ebab29bdae529686c147eaca7a2c143baab536bef76e3b85642329e9f74900ad7fcd8e967011e3ed7aa58971ce SHA512 be2bf40afd6b99274d4c3dbf66044c6959779315a10f527017b214d71abc233ea84b746cc9eb8e3a1e597f1863dbdd4f4479783823107c1f2b04ea29cfc09134
 MISC metadata.xml 344 BLAKE2B 1bb022e925d447ee062275a0738044ccc4205307d0fc53ae07e78b9ae07db190efb0661a8d0bf5ff4ef31d229781265a9d13a1c2a91829aa4b3885d0c9b4fd72 SHA512 3eee72420b16de1611cbfed39cf075fa026414bc2fd1fbcf5deff3aa34db2092701eb52a0f76964aae2825f74bdbe8398d755ffc6716298154e6cdf1a5f659fc
diff --git a/dev-ruby/timecop/timecop-0.9.5.ebuild b/dev-ruby/timecop/timecop-0.9.5.ebuild
index debfad270072..3f4ec824c9f8 100644
--- a/dev-ruby/timecop/timecop-0.9.5.ebuild
+++ b/dev-ruby/timecop/timecop-0.9.5.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/travisjeffery/timecop"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 # Missing testdep activesupport
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index 9b410111a767..258ee399e736 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -1,5 +1,7 @@
 DIST tins-1.29.1.gem 307200 BLAKE2B b7e95094662df021d81ea7b580cee5c4ce8f9fa6a09ecf63afa2c84f42ffab62f96f37ae734392021506da373ccabbf68c2dbf55f5ff09224168e24031b1fa99 SHA512 043a49d0755bb158cfd60554b530cd315cfe869520ab02ee819addc0fea39f441960a6c416753c0e69dc0dbf122523842f940ff89dcb43e64f5825a2c0c5a53e
 DIST tins-1.31.0.gem 307712 BLAKE2B 2f4808bada4ddad9de6b6ba93c9a123d79cdd6d038bbca64712afaa46c8b031407989e522f359bbbeaa37685c65407781f34a639501b68507b9af927bc06868a SHA512 390ef8366304582e635e702f1175e8f3c59aa1051765b6a971469b4057e9d4025848c13a21961ac960c12297783e9c1f1485e13310dc117e4a04bde5c18018ed
+DIST tins-1.31.1.gem 307200 BLAKE2B 19741baa0d341a70ffde8caa1e36577c634e427f55f9d87267b1b3e6a1bc55f9cb3d452923febe624002f537c92a08d4cffe102db8a8b8a21eb2e57a1117af4b SHA512 6b3c7f7629fb2b896c7bdc0eee5bd637447d024e33bfd94c2312fb4b0de9405228b002a5e8e1addbd77202117fd7b33c335515aa6613fe0a9367d830efdf4265
 EBUILD tins-1.29.1.ebuild 843 BLAKE2B 2abacbf3cf8e1afc0dff0b5f9f6602225d6f82f2421e36a9545545f3968fadc3e335cb99d1c553c8f22154d8afd8adba7c0500a43adac17186698c787f213681 SHA512 aca5c80a5e4155d2e7c54ac0d28ffaa9d29fc03449208a251c1221980a23c8e0d6719da1c993d70405c78426eccfe68216f5303e7db9ceae33215031431567cd
-EBUILD tins-1.31.0.ebuild 758 BLAKE2B d8899419263cfa9d5841eebf7612d00c587e6972b107adc060b467830600dc26ebf8c5c0417267f733752f8d269a81a6e81cc2980293c1a7f74a166b40aec54a SHA512 504a94f174f002c787198f3a4f1e03306c43b85b9ea4cb4b65f4e009eee2cf0dfca260a71b7e09ad5d07bd7610722bdd5eacfe1206c4782e75865971f12d6080
+EBUILD tins-1.31.0.ebuild 765 BLAKE2B 1d356161b176ebb86eb363a5ec19eb43b99e21ba9cefa20197a1c8ee95e47bcb1ca8ecca70e4c80c6aff5904e2ec2451bb76f7345a5b264bdbd1ddf99d47b29a SHA512 7f0462e9a04636b0db6a300aa928e4fff3778b6918d28a9014c5df1afbe517d45c15fc9c64c48843e24869f790b270d4800e36ac4195dcc65e2d6f72f8802a96
+EBUILD tins-1.31.1.ebuild 646 BLAKE2B a5caf9a791a0611a78cc5900634a8fa7f4dd219234f33103c2e74e6e15348c1948616944d6a8a7c25aec743a8a09d4144d45c4e5f5649f2f381530ce0d5d94ac SHA512 e90ec8ec08c2c843a4113cd36bcd5172e9fdf2122aab5a2e1c20fd892bd38e9989f2200d04eca9b140c3addf62a628a9c6ac7d8b6e0d97fc330b6e48b824a612
 MISC metadata.xml 337 BLAKE2B 488c14119bb23c3d78d6e3ea71ea808cd398fead5dcf2e2dde61c1ce7de8985b6bc440387a19378f5e123dc64b71e3561fbfe0303e87ff8a4cd79a7923183078 SHA512 e08cba10144c2eb80069fd8d8826053293e9d8d5f1ffce97048c4100af31cac83e672af0945284ba0e1bb169d4e9fad3c0eebb369cb35823b42e5dd4454cd79e
diff --git a/dev-ruby/tins/tins-1.31.0.ebuild b/dev-ruby/tins/tins-1.31.0.ebuild
index fa0092a12ee4..5a51e33da9dc 100644
--- a/dev-ruby/tins/tins-1.31.0.ebuild
+++ b/dev-ruby/tins/tins-1.31.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
diff --git a/dev-ruby/tins/tins-1.31.1.ebuild b/dev-ruby/tins/tins-1.31.1.ebuild
new file mode 100644
index 000000000000..2d7cf0aa0a2c
--- /dev/null
+++ b/dev-ruby/tins/tins-1.31.1.ebuild
@@ -0,0 +1,29 @@
+# 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_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="https://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/sync"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-ruby/tokyocabinet/Manifest b/dev-ruby/tokyocabinet/Manifest
index 2846f3e895f9..9aa579af3001 100644
--- a/dev-ruby/tokyocabinet/Manifest
+++ b/dev-ruby/tokyocabinet/Manifest
@@ -1,3 +1,3 @@
 DIST tokyocabinet-1.32.0.gem 18944 BLAKE2B d55ebba43bfb904dfe2b18bc0c22e92b30ced4cdbda8025f7e4d9088da03a2c8486f210473bd05be13fa8d8448830a8f11fc9dc9c34b9803514fd8fc5cce984c SHA512 274a72e166bfb776b66379f587a141c8d0407dec7aa17bcd2e1ce2a401784f52433e72bc356140f69dcca651351edb22d5c9da6fec09b1b1fcfd53cb5af666f3
-EBUILD tokyocabinet-1.32.0-r1.ebuild 445 BLAKE2B 0dde7443c2f5e3e6267e011aeb087110d817a4105a573fc8a8520ddc10a6ade1eac19c9bdb9ee82b4a534f0d4b9db84277c07b9758b9e2e594e069a54ef2a462 SHA512 604dcdb05cdbf76efc34b062164b3da70b115e83f5934614eac38ffc71884cee6e8814f8cd8e58649165fed52d0ac3adc035898be1cf9ccf9772a6165e2a3ad6
+EBUILD tokyocabinet-1.32.0-r1.ebuild 452 BLAKE2B 76dad8dafb9c4b39bb2aab8f1dea0eb1d15f059a9b5f14dd132a7f37d9aaeb7cfaf844c451dbd9b76065bdd543936ce669bbb80d216352e5b996e927f7712240 SHA512 7730e0f17378c908a921e81f3e25063d48022b8425c88dcc9118010d0025be41f6470b9f2d0c6204d9f04af91d680eab8e9da87b5f86832695953991d160dce4
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/tokyocabinet/tokyocabinet-1.32.0-r1.ebuild b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0-r1.ebuild
index f005a20e2b57..85f8cb39d346 100644
--- a/dev-ruby/tokyocabinet/tokyocabinet-1.32.0-r1.ebuild
+++ b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/tomlrb/Manifest b/dev-ruby/tomlrb/Manifest
index 2cce4b3b6d99..ecdd94e5aafd 100644
--- a/dev-ruby/tomlrb/Manifest
+++ b/dev-ruby/tomlrb/Manifest
@@ -1,7 +1,5 @@
 DIST tomlrb-1.2.8.tar.gz 15897 BLAKE2B 536eaf3a2cb2b7e54e91aac28032b95900f53c0c9b10fb48129bd963e0efab1711848cefeb20c5df3bb5ea367dc375188db57b79990daf3e62f8b781477ea30e SHA512 a6f8a7ae5db02a8efca8ae75fc1a680d26016d221ec238e4f5ecd59bead4efff7cfe14f541a0be17ea6790699aeb7621d9a4d1b7e38a40828f8f66424fc9fb94
-DIST tomlrb-2.0.0.tar.gz 21466 BLAKE2B 9af9654b3c4338bdac210bce776107777b1b117307cbc8a5466e963c0e93f8e560644925623466b2a2b420fb27976dbdb665a76b753ce06920bed862affd1b71 SHA512 8f8fce4fd70b5dde51e42b0a678ef68883e0c0819f26d647745577e38b761f08d128317d392ad1c905cabf485fb8c7092866aca01fd23ed1056bf94d2d7f77fe
 DIST tomlrb-2.0.1.tar.gz 21386 BLAKE2B a9f50d800f7e55c6e6e69fe0a68d1ac843d4aa3b1b68e50c86eb03209c2dd9239f2780fb03152a8638198bf8474593f815025106935a4d81befb5e342f9451f9 SHA512 9690b5689d37cc4634e65a906b1c0bb3692afa96fd92e2dd0d487f2f16dacc64e992e114822edcff270b3ddb8bacd2c6e20e2d12112cd8641c5190ea6ee4e4db
 EBUILD tomlrb-1.2.8.ebuild 631 BLAKE2B ae1d34905e9652014656876580119e2f5ad9e3ec8c44d23f2ddf8540e32d811cd2d7d73d2ed47caa7cb7bd85e7c9da6e2676d6882535c87d0e28768cbe8da3b6 SHA512 c27f38713f2f4328c04a5c702779f6d4479b2a66e518975c746076d896f47ea738ba3158ae4657048cab93d5907962ac0137574704874c9c01d2b04730ec4ab5
-EBUILD tomlrb-2.0.0.ebuild 643 BLAKE2B 85b86346079f79e213daea9b45ae3243ad830e83084680aa763026dd807185f9b31cb5249c359b8c93b2a67ac66bff2a6ce1910209e57a0b5b4221cc86602853 SHA512 372b7d32d1a37ccde7394e28a9e2d2aa25db876e7a3a7214ab99464fb9a8eaf0b27917ce8860cb22ff63040014a659a181d8e4077b323bcec12a860444bc3eb7
-EBUILD tomlrb-2.0.1.ebuild 650 BLAKE2B 3ea56fac59410e24774252404adab23682743cc8f120ba73dfaf6e4ed534e4583393e424d0edce2b2b1f5d6d2f3812debb57dd85aac2b1d8fb0b7c80402dba09 SHA512 8a127d5b749793910b9a2a93bf124bc4bb9a003bb9cf512552ef52bcbc56da08e3a85de8d6a619c71182c9bc513bc10a2981fae61a01512554090ac6ec568690
+EBUILD tomlrb-2.0.1.ebuild 650 BLAKE2B 46b008791238db1840eceb695b0cf3331e2cffbecb89fe09e56d83b070523100bb5904f2f2dd11a355d141481c9fdefe2f691e9856e16186233791b932cd7580 SHA512 047174181fc573c17fce51c8aa2e141d96ca36d29fd7c2264b65be14f33d2dec50a55bac349337c58074b13f02d154fd611e6a104f876a2dd1f173db4d8e9dd2
 MISC metadata.xml 342 BLAKE2B 603c1ce55bc673a27907657f0d61e865aff3a63662610cf0e094d56e311eb0896fa5ced43072359804ea62c741a243cf138c500b8b9ca1513c505776917e3d37 SHA512 ebb4a10c4a93729d88273ed0ecb9832b5f94d71f96b1aee567f4d9b6e11b81b43cf43cf87b04406d9f003ccd7fa18bf9c2f57e8c630042e54a55381821039a56
diff --git a/dev-ruby/tomlrb/tomlrb-2.0.0.ebuild b/dev-ruby/tomlrb/tomlrb-2.0.0.ebuild
deleted file mode 100644
index ae81c2cddc01..000000000000
--- a/dev-ruby/tomlrb/tomlrb-2.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="tomlrb.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A racc based toml parser"
-HOMEPAGE="https://github.com/fbernier/tomlrb/"
-SRC_URI="https://github.com/fbernier/tomlrb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/reporters/I s:^:#:' test/minitest_helper.rb || die
-}
diff --git a/dev-ruby/tomlrb/tomlrb-2.0.1.ebuild b/dev-ruby/tomlrb/tomlrb-2.0.1.ebuild
index 74ba70c9f65d..5521fd7d69ec 100644
--- a/dev-ruby/tomlrb/tomlrb-2.0.1.ebuild
+++ b/dev-ruby/tomlrb/tomlrb-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
diff --git a/dev-ruby/totoridipjp/Manifest b/dev-ruby/totoridipjp/Manifest
index 812bbe6fccd6..ebd3cb89a212 100644
--- a/dev-ruby/totoridipjp/Manifest
+++ b/dev-ruby/totoridipjp/Manifest
@@ -1,3 +1,3 @@
 DIST totoridipjp-0.1.0.gem 7168 BLAKE2B 9a78da0b8309c9886506a80b7206530f3398d1591eaa75a32a4085bbdc56492da7465e6183fe5979e5e3e9ff486a089d1495ae2105f694c407fce40c29809dfe SHA512 5298fe39b0705a0b913f7f6cad452be48480a6832e9451d86a7fe9a1248fe893a76af2f56c0bd6d3a65c756d4ed3fd29b4483ef82beeccfc78dcf9dbf43ed748
-EBUILD totoridipjp-0.1.0-r1.ebuild 423 BLAKE2B bce1f93c6950d2d8b8b8b2589506846847f2ae1797045a0f4108b87ffd1b8fe19af3f5611b528497de99b01ac6af1dd2ae0bde20512730041a7af960fe76965e SHA512 c0d7550256f46c6b7ea7b11806e6ce5036655528e48b8dd4e81709f82bc61cbb24215f30499f52a7461166d37fec366b9e698c35ec948699f39779ee1ce3c10f
+EBUILD totoridipjp-0.1.0-r1.ebuild 430 BLAKE2B 64781acbae5360d16228e9ec4d13a15bd6ce9397d4c9fdbffc1a307baf0ccde954fb2ce17ae8cf7928a47b8d6ba3eae9d53f1cab926d9ed675fbd53bef028fd0 SHA512 573ccb46da93377388b7208f8d977a3c1c27c2d68e3f79f113e268c8fa37f23523d6e6d99b1228f60b0529e99b29992e63aee346f1173d9cae3406e316e1e01b
 MISC metadata.xml 435 BLAKE2B c83e3d3bec6b7658c00286045917612da1886422e0ed30fdf9085e3c96a38aa63022e5c103bef899a3dc64dd07a541953de92e326ed5bee23532bbe972ae4235 SHA512 47ab4b8d49720c977d9e81adab990af6b4e2009a23ed090637353882a24dc3e4d7d663bff3a7ca634116e09fef196506286838d196a487cd10d0a0bbef28e168
diff --git a/dev-ruby/totoridipjp/totoridipjp-0.1.0-r1.ebuild b/dev-ruby/totoridipjp/totoridipjp-0.1.0-r1.ebuild
index 86ec953c14dc..577dfab5818a 100644
--- a/dev-ruby/totoridipjp/totoridipjp-0.1.0-r1.ebuild
+++ b/dev-ruby/totoridipjp/totoridipjp-0.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
diff --git a/dev-ruby/transaction-simple/Manifest b/dev-ruby/transaction-simple/Manifest
index 5e2e7558acf7..031103cd3302 100644
--- a/dev-ruby/transaction-simple/Manifest
+++ b/dev-ruby/transaction-simple/Manifest
@@ -1,3 +1,3 @@
 DIST transaction-simple-1.4.0.2.gem 17408 BLAKE2B 731564406f9904e243838ae207958857065aa7e785c6c92ce769cdfe4fe8c32e8bbaedadd1a258b40babf3c4d59c77894ddaf3607978129590c7bf642f2877d8 SHA512 083c2c0d8c094d052a5262e21911985a3bf91875892844fb0559546901eea21ef14b139d7af6446c7a7bfbd1adf177e2d73cba2798c823bf295a6c87981165a4
-EBUILD transaction-simple-1.4.0.2-r3.ebuild 623 BLAKE2B 31300420358d74d0bf59470f1495dc3d0f95f6e1714f6b3ac45dad2524bdf7d27c00d889d60ee89abb1039a2d81d69f0819785d70c77ae7219bfdbde4b361b31 SHA512 6e444f9c7b5f2a2583e0e9961596e25be6042a32c7404549516def7f3473f8a1beb86c2361b714264be2247ae5c9617762efd3a439c4b5e9264012e119251f68
+EBUILD transaction-simple-1.4.0.2-r3.ebuild 630 BLAKE2B 9671a3bc7b0175ba62e64391b089b3cb20d07a12b16092369e4cfa5752e463badc89ed580554aad479dd8e8d6da5df430c03daf447fcedfbde19c23901748a7a SHA512 5b36dec60ae47ebc5eafba191fc8b6aa5c2661b3fe35bde3dd4e27153caf8c982c782fe5e689bb51329fd97fce2340c5d8c88a81b06a95d1806e7bf1db8a3ee9
 MISC metadata.xml 356 BLAKE2B f126702b9fff448882c2bbd2321d813d414e220e0b9c66ff1e6d20d2329aa6974bebbdd51d5676cd443fbff8b2390dbea44813dc8f18556ca261ca1295d738e1 SHA512 c83b0202dfd6edc7669b56bdb511a27d499d7b8aa45553e4b6f572bb5b02bcbd985b8f9cb85fda8d0f698b9e8099eb4a1f9a905a52911177870a245ac255aa1d
diff --git a/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r3.ebuild b/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r3.ebuild
index d259e58198fc..62b86fcffde6 100644
--- a/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r3.ebuild
+++ b/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
diff --git a/dev-ruby/travis/Manifest b/dev-ruby/travis/Manifest
index c369101968f0..760e3ff8ca2d 100644
--- a/dev-ruby/travis/Manifest
+++ b/dev-ruby/travis/Manifest
@@ -1,3 +1,5 @@
 DIST travis-1.10.0.gem 197632 BLAKE2B 0639f797789d1676f71b6354ed77e3e403865cca37e5e04c62e4cfd40d44e26e8e93ea0dbf39843811cccb7960e43b186d61d64f681d2eafe95de890d9fd66a7 SHA512 025e8cdf48100ff20d85925a6285993bda0d1651e145d554c2ec987c4557e2d3bc49da6529af4c577fcd9b88600549b3c12cff49b824d7fcb93a96a0c572603c
+DIST travis-1.11.0.gem 196096 BLAKE2B 2ea09d88fd45d6fd304746a96cc063c0525c8af8df6be2a0ba5c7ad06909055af23ea506f89f246f657c5a8920c429dd3aebc639f78cd1d0acb5bb03e4894434 SHA512 b6db17b149a54f7ab3c5b79439b1385386bbfe0350816d303e7c74c0494be08451fdb14550cba7fb54df3a643a530f1434bb1ee0c3e28c492ac6e8f3baf3d558
 EBUILD travis-1.10.0-r1.ebuild 1299 BLAKE2B 57f6c4568b10a698e595a5beefb55ed75ace9bd7650a82d83b9da441a6e566f644e5bb27100acb002386176b255bafd05cc0211e2d34c4b55e17fcda846355bd SHA512 bff95d927896541df618c7c490ba04ed0e08aef337fe7f6cb82179b764fcf4bde51706a19ce4c9197c1eabf926b537a52a7c9df4696973890560ae9e8d64c337
+EBUILD travis-1.11.0.ebuild 1157 BLAKE2B 6061df7d582367bd584290c94bb33a7bc712fae6056cdbd2cbfb7a8877882ca53d1e8215566886ef141e7d814592b7ba1d06b839f2cd2f67bd55ff2f3d70bb2b SHA512 b7dedfaa326c176564d0a69a05890f817b23da40ec2bbcec032edf55210109e6d89b91f21a950b577a4f5b93f21b02cbc98a431b9866cfe96c9dd12d77004bee
 MISC metadata.xml 336 BLAKE2B b0df95e856f092ccaafb1cc47ca9ba4599c550108d92eff71fe11fb0b903d25a3805942b0a321999d00cf53073edc1f769cdcb2cc5fc0505c788583fe4868a02 SHA512 4b7091d41278401589bcbfa198d03dccd11e69ba240b1b22fd9bb0b19fe09dc33fa7a8dfab6802ba134e3d8daddf91ed777115293095e84c27f86cf00911a68e
diff --git a/dev-ruby/travis/travis-1.11.0.ebuild b/dev-ruby/travis/travis-1.11.0.ebuild
new file mode 100644
index 000000000000..11c5fa18fe0b
--- /dev/null
+++ b/dev-ruby/travis/travis-1.11.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets"
+
+inherit bash-completion-r1 ruby-fakegem
+
+DESCRIPTION="Travis CI Client (CLI and Ruby library)"
+HOMEPAGE="https://github.com/travis-ci/travis.rb"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+#RESTRICT="test"
+
+DEPEND+="test? ( dev-vcs/git )"
+RDEPEND+="dev-vcs/git"
+
+ruby_add_bdepend "
+	test? ( >dev-ruby/rack-test-0.6 dev-ruby/rspec-its )
+	>dev-ruby/sinatra-1.3
+"
+
+ruby_add_rdepend "
+	dev-ruby/faraday:1
+	dev-ruby/faraday_middleware:1
+	>=dev-ruby/gh-0.17
+	dev-ruby/highline:2
+	>=dev-ruby/json-2.3:2
+	>=dev-ruby/launchy-2.1
+	>dev-ruby/pusher-client-0.4
+"
+
+all_ruby_prepare() {
+	if use test ; then
+		git init --quiet . || die
+		git remote add origin "${HOMEPAGE}" || die
+		touch .travis.yml || die
+	fi
+
+	# Remove failing specs where $params keys are reset somewhere.
+	rm -f spec/cli/{cancel,restart}_spec.rb || die
+
+	sed -i -e 's/json_pure/json/' ../metadata || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbashcomp "assets/travis.sh" "travis"
+}
diff --git a/dev-ruby/treetop/Manifest b/dev-ruby/treetop/Manifest
index bf88342c7967..609e25cab95b 100644
--- a/dev-ruby/treetop/Manifest
+++ b/dev-ruby/treetop/Manifest
@@ -1,4 +1,3 @@
 DIST treetop-1.6.11.tar.gz 103827 BLAKE2B ccc73373f2e44a95b872ae9f2f32f090363b218eb139d65a4e72c5595d99d5cc3ea7071527f0954aa6b63bc8d5562b0e932ecadec3de962269b3031d1f449b6c SHA512 649310b5c69bb963fc04a597d7aad6bb45deec34c3a46a193ee16203a07aff1d221732b6c7343d68fc772be44522db5f445a45e64bee5ac385ac2eb70abde14a
 EBUILD treetop-1.6.11-r1.ebuild 974 BLAKE2B 0a6674968e95072fcd26b07c9de02a5cb9b3082f91d8d0ffd9f0e49f4386381d19632e088a70defb4a1efb434caf06c23ca96028244c6c28eb9da138008ff634 SHA512 2fa2205b8c8f2e1b7c2e73da74b47c0c3705ff01590ba7580c222ce6f8f40c77b3a749e3687d40edf61ab242a9d572f21ea1c54b321598cbdbe95d0a8f85d34d
-EBUILD treetop-1.6.11.ebuild 974 BLAKE2B be28dc63487a4cb059e5368a8dcc395bdd0e2e22de196a1b5adf50abd0c8d0ab41b905f1518b35916c2e8e7c8190405fce8d6831d6f4686cf403bfc2bb14c096 SHA512 a23906d84f6c7c892717223e7a3e66eba712e1c50c7f07ce6b01e0a339ed0514fb4e06bab1e915d0034752191c5e2cbb53d11ee1f81c8e257172e9d26794b6a9
 MISC metadata.xml 342 BLAKE2B ed50be281e510f8067c9eb56e3fa25137604148fc85d33b985960bac2e448d6ed9284346380916ea570fe7ce68cb3937c25ebdd73b5b53234baddd45daaccc84 SHA512 240a97d8d731d3a1d6939a32d3f92b9af48773c8a70049f2a6247405db316bd9cb788026c8e1265def0efe36fd13ebb2e4a9e7499da4606fd34ce773b8bcf086
diff --git a/dev-ruby/treetop/treetop-1.6.11.ebuild b/dev-ruby/treetop/treetop-1.6.11.ebuild
deleted file mode 100644
index a497034c749c..000000000000
--- a/dev-ruby/treetop/treetop-1.6.11.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"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="treetop.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Treetop is a language for describing languages"
-HOMEPAGE="https://github.com/cjheath/treetop"
-SRC_URI="https://github.com/cjheath/treetop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-1.0 dev-ruby/activesupport )"
-ruby_add_rdepend ">=dev-ruby/polyglot-0.3.1:0"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r examples
-}
diff --git a/dev-ruby/trollop/Manifest b/dev-ruby/trollop/Manifest
index e39505f0d35c..63e58e5096eb 100644
--- a/dev-ruby/trollop/Manifest
+++ b/dev-ruby/trollop/Manifest
@@ -1,3 +1,3 @@
 DIST trollop-2.9.10.gem 29696 BLAKE2B f69b1ab8ce166f9fe6198e177266ee86e38f3bed4c3a55529705aedc4518cc04a48b9bee4463887fc4ac1cd04cad98d35c298265ad1433ced11e0ff5bc1f50ce SHA512 21a0db09d480353ff846a1311b118e0b0db4ca13a559dd1749c1478eff7080dd04e5308dbf1807215eadb68e276c991970b23357e9a3497acb9f705f7f77253c
-EBUILD trollop-2.9.10.ebuild 693 BLAKE2B e504cb2f85e6ee3fe1cf0ad7c6a97a471d9a35debbb05844b576ed44ef3c14760e796aea6e5503c957ded5e36bee227e9763b74026dd9f92a55d51e60b9cfca9 SHA512 a7f6e6c14a9127f07bca16c1cbb4ec7c4248c12cf76d5239e79985fd92e41dd139b858e5dcf98582ff1a7ef591ca3ad03d81add7042a9fea261ca6e5da8992fd
+EBUILD trollop-2.9.10.ebuild 693 BLAKE2B 644f84c0939e100a5466fd0ebce664852b0db093494dfb4731a75cbf30a4be08cdc19378225df34c274e9c01e0ea21b177e91f5b84311fa80951a616aef0ca55 SHA512 6526f82e753b89cab5a56e4c4a8c4f121b54eea5b8a409c5df8df131fa8edd4440667d9c0a68a8368224ed4b4036c909ccb8f4c00c9f74985f4756eac45c0351
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/trollop/trollop-2.9.10.ebuild b/dev-ruby/trollop/trollop-2.9.10.ebuild
index 03b9b2720f92..0c6f4b8930b2 100644
--- a/dev-ruby/trollop/trollop-2.9.10.ebuild
+++ b/dev-ruby/trollop/trollop-2.9.10.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="FAQ.txt History.txt README.md"
 
diff --git a/dev-ruby/ttfunk/Manifest b/dev-ruby/ttfunk/Manifest
index 01c67bf257a2..137cff7eb6fb 100644
--- a/dev-ruby/ttfunk/Manifest
+++ b/dev-ruby/ttfunk/Manifest
@@ -1,5 +1,5 @@
 DIST ttfunk-1.6.2.1.tar.gz 13625405 BLAKE2B c80fd7f534f7c22cce9ce3e87afe8b23870f46ac6a3a3dc860c07ef95e4e1a73998baa284797e704482fbc57ccd53997eb85f410244f4b4c548590643c62de49 SHA512 31dbcde0e7ca8325b7d88b1c5265ef054a04793b9da93e3c8973d0d84e6865bc93d8431247974ed372330a0a9b73df595ef4bea3736583cef2a23fcd4e1ecd29
 DIST ttfunk-1.7.0.tar.gz 13625349 BLAKE2B 1d401d181eb9cffea9bbb31b631b6a5d1a9c268af41baa1d976ab589111413ad02e3c32ca9c7a0493d9399dc169effa7a06e22bc9b2443afabb297cc7bb0ec03 SHA512 5b026feae0b2a32e141edc6bccd926292ddbff1569f1c11f075647e8a0e6c0fdd4d7e4ecca023bf71f08438a4782556c5f5106d067310937124ad154c7225d78
 EBUILD ttfunk-1.6.2.1.ebuild 695 BLAKE2B 3f815c8929c855fe621336fd2f64cc97094e15a08231d54a46e43ca2da303ab6312b7c3ef8b2e5a5a4d1702df7eb95d0a383c8ebeea8928f6740a2c9551bc95b SHA512 8bd4950d1e1676ad5083634301ac381d059bc178a35eda475f1368691918d22ff84aa101f0d97e0d48ea6446e8c19680580717ca027185a55a5b8cb756b7efe7
-EBUILD ttfunk-1.7.0.ebuild 695 BLAKE2B b65a3e1b6dd868b2b99a334f0fe4e128a1487a59449271c7d18700bac3b4dbdd5c5717f2fc9e59ce01b247c1b4aba6633e0e99a60a49065519e2d028a78c0877 SHA512 edcbe0e8de84d0613f1be5634debb008e15d065325c9b6c375bd3f8c5cfca554025b843c1ce2e4dae8dbbe88b7cdad6055d3b108753ed77aa2d562e920b6f8a6
+EBUILD ttfunk-1.7.0.ebuild 695 BLAKE2B 65a838cade3f5f265cee06e35883e37a683fe7141441da292e95720bc96f17176456f258f6d133d7595fd33708ae75e7c94b71e86da66b7ae85de5ebb73402cf SHA512 8a31ccd280d751174b7d68985636a45696d01976f61cecddcbae4dd4f078e7bc38d82d5c5ddc8224b708da1268288f88614c1860d3f523c92cffa7ff83025d25
 MISC metadata.xml 342 BLAKE2B 4a5a06ba62d2e043793b8b3d7ee6a2c4feefc381494aa915deb3f91f5138024e5f7afb8479bd29bb7ad63c5b1e19a8910b3eef5176942557340e7478bf4f7b3b SHA512 65fa3f0da3442f951d82da0806b8f9ebe55e89de18782379e468cf052b7d63ba394f676bde40f478c092f3f0aef44f4f6c890f686a5bbd9c81947186e6fad36a
diff --git a/dev-ruby/ttfunk/ttfunk-1.7.0.ebuild b/dev-ruby/ttfunk/ttfunk-1.7.0.ebuild
index 6b3e58eed0f2..cdd977a619a5 100644
--- a/dev-ruby/ttfunk/ttfunk-1.7.0.ebuild
+++ b/dev-ruby/ttfunk/ttfunk-1.7.0.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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tty-color/Manifest b/dev-ruby/tty-color/Manifest
index d5e0d92b1977..73b51b3bb756 100644
--- a/dev-ruby/tty-color/Manifest
+++ b/dev-ruby/tty-color/Manifest
@@ -1,3 +1,3 @@
 DIST tty-color-0.6.0.tar.gz 12298 BLAKE2B c6d86666cbc8b46f2e5ef37556457bcffd4a92c65ae6a281ad989ded3d89ded8e3e3f5a1a3f91b009b7acdad9f2697d7100239c13eece4d2222c1fe1e8c2c2d0 SHA512 ab4f550ccf8fdc2cd0ad9368948819e4b77473a087510a4853036f18cfb21bab89e36631372cc5f2ee4f5d44c8c84954d14956d7cb7c3050e58d1ce19d11754f
-EBUILD tty-color-0.6.0.ebuild 749 BLAKE2B ef700c083cf4961e931a4d3901e4976ae26c79195894c8c022d7bcd746e43f2896e64e4c7c5a3005073c23ff04dda7bdf9d5b5a308ee7db4abbd9c11853b800d SHA512 ec80a359ae5bd634abe3dbdedb92e5f6f4ced288a12d085df52817a440d8d06b376d80fc986eaef305012c3bd35df7a90d2f78e6d2c16b494087161fb2ca3609
+EBUILD tty-color-0.6.0.ebuild 749 BLAKE2B 6be0bf79f59ff82b1d34e1984a84a85049517cb00a257d0bc84e520fe62bede2d6bf1cd7a19c0d3e90c96037dd90f2fafa4bb94bcd18e2b8d045f88a3c30520e SHA512 868a7a26a09bffddc8b54526f8e553bc6b805e1373b922f8b35b00fd53ac531d24bfbc201ec63c5e33e84920202b25f71ec9a6e13744e9f94c7609926eff4e9e
 MISC metadata.xml 338 BLAKE2B b5af92054df120ea06a7a65f578595bc74e561bcfe17d8ba4ef02c18506a420f5a0804a7661ed6357ccc2ea6b4730528e8014327ed2cd7ef997d7d7f0cfa6dbf SHA512 f54e668c43bfa8aa103feeec8af8513240a5204139c88b40b4845e1bc5b535f299900c8861a7325efae7583f39e6a4625907f9a2b9e5f000a6f85f4ce1e4ae7a
diff --git a/dev-ruby/tty-color/tty-color-0.6.0.ebuild b/dev-ruby/tty-color/tty-color-0.6.0.ebuild
index 79503c8b0eb4..5beccea83d87 100644
--- a/dev-ruby/tty-color/tty-color-0.6.0.ebuild
+++ b/dev-ruby/tty-color/tty-color-0.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tty-command/Manifest b/dev-ruby/tty-command/Manifest
index 4843ae76ad65..99af9bea4658 100644
--- a/dev-ruby/tty-command/Manifest
+++ b/dev-ruby/tty-command/Manifest
@@ -1,4 +1,3 @@
 DIST tty-command-0.10.1.tar.gz 32359 BLAKE2B 85dd115d113abda7464f1d6935a730c97c312bcd280c16bbff44f5da294ed9197df2615449656ce8d403b4118c6d363710eb32e49a2ebb3c75896f5feda85bce SHA512 aa707f3af6b72f20ea692469c7dc60bbf146bc59eaedf4a57408a463e7f96b48dc9ec60de31f2298e36b6d56320b238b4364ee0f90d1499784d001e963ea6fa1
-EBUILD tty-command-0.10.1-r1.ebuild 724 BLAKE2B a805f78e12024a8255ff1ea8e5b4c8baf209b6373673c314e83828dc436d7969df4b91a9011d1c47d7cfd83a73ec8ee171fc414d4e55bfb4e73aa2673c5e8fca SHA512 0e59237822f7db22e3a9efd1ef7e6ffb6999bfcc61a506b1fb7cc5aa986e1e13f6748dd259e07fdb91ec2b1840a61801a32c8227a1758e10c55a4210a40ba296
-EBUILD tty-command-0.10.1.ebuild 717 BLAKE2B 49546179989a39d53aadff5a809fcc49652876dc5267cb4167ae5f6a6d983ccfeca1969e40e19053e4a20f68db69310b5b260e7b1015c8bf3d95a15bd547fbd1 SHA512 fa1aace5caf0643f4ebb6d18b87de33351881d895ab9b85e952f9195f207d0169268ded5407c7d799c268328c98a00881894189a5440e8cbc7ee1488fcfb7d97
+EBUILD tty-command-0.10.1-r1.ebuild 731 BLAKE2B 1be42a860cd47ff10c4d8d78abde97b1f67ba3ce667f6175beb85b31a622453e58d558a596e2d3391b8320b1c1fa3f7bd94ae89ee6e27d668774995c70b5e18c SHA512 f86c55d8f2492b3a8012c0734a1b1bd4faccf199fba28977da71c52ea790168aa1f143d28a6ea5a4943bffe562cb8d76222d484fe7e43ba487d122f308a7ecc4
 MISC metadata.xml 340 BLAKE2B 5f0adfc79c3fd86851c191ba3b6e1d818fd6cea8bf7a8ecab90ccd95890c75e564d36be98cee39f4fc031727f448f6b4894ede1a0b8af3ac6872c2391bf6a2a1 SHA512 8d25f4c8c82d6a637a4e68052df77e86e86f37fdb1691570394df5e289fe977b2602e0b0fb7cfd37ec5459262922c6a4b2003a24de29fd13c4893a63a04127fb
diff --git a/dev-ruby/tty-command/tty-command-0.10.1-r1.ebuild b/dev-ruby/tty-command/tty-command-0.10.1-r1.ebuild
index 0b30996d4768..af35c67359f5 100644
--- a/dev-ruby/tty-command/tty-command-0.10.1-r1.ebuild
+++ b/dev-ruby/tty-command/tty-command-0.10.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tty-command/tty-command-0.10.1.ebuild b/dev-ruby/tty-command/tty-command-0.10.1.ebuild
deleted file mode 100644
index 3b7a3370f289..000000000000
--- a/dev-ruby/tty-command/tty-command-0.10.1.ebuild
+++ /dev/null
@@ -1,32 +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"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Terminal color capabilities detection"
-HOMEPAGE="https://github.com/piotrmurach/tty-command"
-SRC_URI="https://github.com/piotrmurach/tty-command/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/pastel-0.8:0"
-
-all_ruby_prepare() {
-	echo '-rspec_helper' > .rspec || die
-
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/tty-cursor/Manifest b/dev-ruby/tty-cursor/Manifest
index f729d9e612ac..553d520651dd 100644
--- a/dev-ruby/tty-cursor/Manifest
+++ b/dev-ruby/tty-cursor/Manifest
@@ -1,3 +1,3 @@
 DIST tty-cursor-0.7.1.tar.gz 11015 BLAKE2B 222602d7dd3ef2372555913dc59bdd4b4965ac5c3601268d0f77060835d4ae9bc9fa23d54f811e7c0a453b80786d4ef07e0bd26cc8d76f6b963787a04b17569b SHA512 7c1f664bfb3c8c46aab08cb3806b8a00d92b45195fae47e851967f88040cc64d598bdd80e37f782be83fa60dff82c607d93026ffbf003125fea8230f4e18639e
-EBUILD tty-cursor-0.7.1.ebuild 794 BLAKE2B 32d12fee9d97f48f5c177ebc843ecfed0cc4183ecc736ff315c4afbb47b80fa5dd7e6a952a53299dd2301eba8bf7a7263a71283aef30d779c45707409542a73b SHA512 fb60bff2db46dd7d66865336015be5a2fdd47c5ab14b8f6bcf4d4f8cab4151357ac1f8928c0a0681ab1b4028bf3cce48706bb9b888ba90e8cc6b1e7df9c86409
+EBUILD tty-cursor-0.7.1.ebuild 794 BLAKE2B 23dc48d39e4a734d4290ad9f479eb485b893c748d5958bbb733afde3bd17143d82f599aefe0eca259918f561bf1643873ac2e70af8a840e60745be1fc42a7a97 SHA512 7bb70c4c13915b4cf89f5baee9c2561ee569a276a9b896be3d3be7b4f5771c303af1fafe45856e0eb6fd0d5170cbdba0f3ca3ca32f383e999cbc4636de029069
 MISC metadata.xml 339 BLAKE2B fe18cce74818bb40c2414d8e9c2ffc6642133ffb1852b7003a4d8cb84098a26662ec7284dd991d1ab525378ab9af81303cc5c2c6f1f79811a3fc49d867610d88 SHA512 f489e49c37ba066bb3586fc50ed7deceff038d684f15e34a545de37e487cb55961d88d10d8b05b009e049f215b21287acdf080790ba15c78e9a2442897637192
diff --git a/dev-ruby/tty-cursor/tty-cursor-0.7.1.ebuild b/dev-ruby/tty-cursor/tty-cursor-0.7.1.ebuild
index 1830b2b54402..df93cfe31699 100644
--- a/dev-ruby/tty-cursor/tty-cursor-0.7.1.ebuild
+++ b/dev-ruby/tty-cursor/tty-cursor-0.7.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tty-editor/Manifest b/dev-ruby/tty-editor/Manifest
index 366aed3d8b4c..444b7bcc14b2 100644
--- a/dev-ruby/tty-editor/Manifest
+++ b/dev-ruby/tty-editor/Manifest
@@ -1,3 +1,3 @@
 DIST tty-editor-0.7.0.tar.gz 18140 BLAKE2B 917ea287b30588ffdf705d4ea06c711884b4dc7ba348f9acd08f0cf4e71c854ebcec6f7b8285e9fc1d45225f8ccb295dcb23b9493fcea2ac831c352cd7cc3680 SHA512 c5d6a781b0be00ee14e6fa30ff0bbb26fd9548726ff0e101163a8b4206bec9c7ffb520679041c1f174c2f65d76ea71177718a6fc5e06e8191dc5510aafd33175
-EBUILD tty-editor-0.7.0.ebuild 813 BLAKE2B 6947f57fd89ff0ba2d2581c0449440b8b55dae683aabff504a3aecd63b22633057a003e5da3105f265a83e734f31dd7483b0e17676753d8586fb8dbb63f77edf SHA512 4c430c350c6e8b26f2f2789e1ff98c0be420eeefe6c0c446e1f719f10cee2579cdd3a33a0aab06a9a041d7d9d074f9ea853e15fea4d136ca054c934d7491a1bc
+EBUILD tty-editor-0.7.0.ebuild 820 BLAKE2B ac8c203e8066ec045e2046500b1ef77b9e77edfe5a9f56e4ce43c56403b7c5f49d687ce33c55e0b2bb2a6d27b59f1a515aa25fa0470e49a3015ccd4975f8b40f SHA512 1224cd6149f5dc78180ea3dc4b3a7a506e714f5f45b2b6f4d21fb52f638580f5fad1a233dfc5964f0d10a233b13346bc9d2bf5862113cd8436287cdeecfa2086
 MISC metadata.xml 339 BLAKE2B 4ffb4d9cfae7538971821a03dcc54606705b57f710730a58d0c7bc07e9ea4a5dab533df9b323f9c61f5628d40a0cb380c8cb0ff84d2f7ee0fdcdc8e100fd139f SHA512 825b7e3c72b095fd929c76d7e159db8dc44ebb57ad56f4f9fe82af9efb8d8e1d0ca3d73ecaeb7aef03c48b72dc93f7cb08d45032deccde939022deb4773f98bb
diff --git a/dev-ruby/tty-editor/tty-editor-0.7.0.ebuild b/dev-ruby/tty-editor/tty-editor-0.7.0.ebuild
index 97bce9d0768c..28d97ce920bc 100644
--- a/dev-ruby/tty-editor/tty-editor-0.7.0.ebuild
+++ b/dev-ruby/tty-editor/tty-editor-0.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
diff --git a/dev-ruby/tty-file/Manifest b/dev-ruby/tty-file/Manifest
index 8fe8c0a72af1..57d22b9bfd8c 100644
--- a/dev-ruby/tty-file/Manifest
+++ b/dev-ruby/tty-file/Manifest
@@ -1,3 +1,3 @@
 DIST tty-file-0.10.0.tar.gz 31033 BLAKE2B 6d91034fb9ff83f758b260b947a9556a4c45071953025856e65a1d3bf12baab1f583f4d1b01f75aeb8329a4d21c4bcb761cc584ea2944beeda423e8452d0b07e SHA512 5bf3b08b16dc4d7ad918809c8d7860e925fd9ed02fd00f02852674c55a8cd0584d28f39a5b4f28f564aeb38eb0fbe62f89d82fb2a4a7262c874ccec843252946
-EBUILD tty-file-0.10.0.ebuild 856 BLAKE2B b2beda091993ec3a2db41f7d277dca0821f167bc2039a4ec2fcd7087d1de0e0961c167ee045c4e4adfb486908040a6c3374a59ea54b78c239ee4ff78bc9a6386 SHA512 8a5e5992a6d8de81ee6a18a67d665c309e95ddeba4f1e92fff12054ad3c8cb9fd366fe8e8aacf51677a3a022edc41ad3579bfbe1f5d9ac071ad4f06bc1251a24
+EBUILD tty-file-0.10.0.ebuild 856 BLAKE2B 9952b1afb9a915b18b9511e75bb1588bf2c03f36873c55efc0dddd2a9d1a450f2bd269223cd048e628f489d89ddaaf155048acd0af317c4499f71167378bccd3 SHA512 67e7e8807e56a36b946ac9e29376fce712a731158aa6dd0ac146bd08cb33be13a92c4465cbd3c5acd7b2b3edea6f33ab82327646ae060f2eadec1b61e1681b9d
 MISC metadata.xml 337 BLAKE2B ee36495bb6f63fd2dd9d6e35e2c10cea73a757aa01aafda67ec7c30497a8504ba782c53ad37178424d2e27752d797344c9b49f775d7fc25ed5810e1b43b65dd2 SHA512 0a26942f31e2d78389ecbb6d3f3cd2bc6085279f2b5fa1d212b8061aabe49c05e37578610ec180914eb176e166af288f576bd945128a4aae868124003f37b11a
diff --git a/dev-ruby/tty-file/tty-file-0.10.0.ebuild b/dev-ruby/tty-file/tty-file-0.10.0.ebuild
index fb4bb577f7f0..4e38cd835b46 100644
--- a/dev-ruby/tty-file/tty-file-0.10.0.ebuild
+++ b/dev-ruby/tty-file/tty-file-0.10.0.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="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tty-prompt/Manifest b/dev-ruby/tty-prompt/Manifest
index 14c401549b68..e6c2f5eab168 100644
--- a/dev-ruby/tty-prompt/Manifest
+++ b/dev-ruby/tty-prompt/Manifest
@@ -1,3 +1,3 @@
 DIST tty-prompt-0.23.1.tar.gz 554471 BLAKE2B ae39444b80781ee5c85df87f4ec2b2231b4551a23202070c4570d0e4807a3e4465bb026299dd775de9abf2b8cefe3157cb3fc5297cce4d248f6f8e2aca8c572d SHA512 5e2762d2b229f0aadde7fa09e43ccd317dbda057d829c9003fc6b18f9aaacda1416357af733c4e4f308041c8119ef344b3adc1954a6d31abf801cffdb1848a61
-EBUILD tty-prompt-0.23.1.ebuild 821 BLAKE2B 260ca02b52344beff135f9f5e1537598e2fe65d929681c713b04100bbb962648167889e9bbd9720db5d9efb4bb07495c620a978f7c21dd0025f48e333ae53311 SHA512 fdd066db6cf987c7769e369595636fa602b42433b600b686d1d6da07a0c23b79a538940ec859c14e31bb6f75e6d729e907180ae757d14c695ca846fc9ce49c2c
+EBUILD tty-prompt-0.23.1.ebuild 821 BLAKE2B f05baac5e21323d9d4519077c911867ee2e2deecad6068b9f4d657042de720c95b535dfd25e9264076ac9e6fcbf4c9b8d4084eb0e3f20e47ea196e3a3f4244bf SHA512 845c0b58b9c96ab4cce7c46b5a7d45221f9309ed409960f20d58765502b405bf62a6def4b92a464efdbd689be343700dbec487bbacc86c6ee3f87549a9b26c32
 MISC metadata.xml 339 BLAKE2B bc595203d2c93cddf7ed31e92cdd0ee86ed74ee4d40fb2d36a14a50accb24871a493b15351e3b00876abf47833611c71f6e2c0ea22b68093f7b8140203876327 SHA512 42289de16764b35a85485d581debbd4896dcad29c6c57a0a0f897602d06708e2c25c42e811c2fc8caa000f8daf30b1dddee781e8f4909968e52bd51535d44e66
diff --git a/dev-ruby/tty-prompt/tty-prompt-0.23.1.ebuild b/dev-ruby/tty-prompt/tty-prompt-0.23.1.ebuild
index c9ddb1410361..2c65ddd67c3f 100644
--- a/dev-ruby/tty-prompt/tty-prompt-0.23.1.ebuild
+++ b/dev-ruby/tty-prompt/tty-prompt-0.23.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tty-reader/Manifest b/dev-ruby/tty-reader/Manifest
index 6a30c32dce05..9423957fd319 100644
--- a/dev-ruby/tty-reader/Manifest
+++ b/dev-ruby/tty-reader/Manifest
@@ -1,3 +1,3 @@
 DIST tty-reader-0.9.0.tar.gz 461051 BLAKE2B f2a48a929fc7ec0f6f98e4508ed50638e041939ae2eadf96cb8d04e4a771304e63648d5c3a85581fef3ae4740a570114e8d427637c6b3a05ece400f7963a26cb SHA512 2480f480a6ab0fa0854386ba0c31b5e78ff53a2d65b23825b13e50929337f56f8e38d1277f61509139cb43eddd8a933fadcd9d3c916c9dbaacf4dac1ec38dbaf
-EBUILD tty-reader-0.9.0.ebuild 896 BLAKE2B fc21a68ac2f8b35cd753a8cd7ec1ec854b42fabbb67e13a6cc7ef6ccf042b0eb1866fd33951e06d9e0632136df8f1ccae2ebac8f3a777fffa0f88c94dab144e9 SHA512 17de73b5a1dc93de7adb0f7ad966c450319a7692fb3cdc9f48bcb6ca90dc1e60f2f68d1dad7db793726eaa7577ee3ee57fa386389ef95f3d349403d2c089c785
+EBUILD tty-reader-0.9.0.ebuild 896 BLAKE2B 67aba52c4e13152fd06e6309b13e058896dde8dc1e271af892ec99a4527f9fc816a393c9a75fc5eddf17f0ba61e2c0c01c50cfd37ef972da97f689d149cc629e SHA512 5350b73ea153b5c0d9ca946abe12e5ff298add6827209e619a9208786d7f749dab5bdd5e3460d4484ab07755d7c87e2c4a5193bce20650d11d7fc00d6ba2fc25
 MISC metadata.xml 339 BLAKE2B a3e0cc05713c588e4b26fce8a5975467daee7d90d9e01afede501fb829c7898fc137b76747e00252559da605607b4eceaa9e44721710a5c2d21782f05fde8eb9 SHA512 83bf2cee20f0dd32baffaac2f46fba0656834de410d743cd476c5800126a3d767a136114b0ae200938a7c9c73f452fbeebcc14228ff4e788f393b50856a9e320
diff --git a/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild b/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild
index bca162eaa83b..a52955abdd41 100644
--- a/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild
+++ b/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tty-screen/Manifest b/dev-ruby/tty-screen/Manifest
index 83316745c13e..cf7177acd5fe 100644
--- a/dev-ruby/tty-screen/Manifest
+++ b/dev-ruby/tty-screen/Manifest
@@ -1,6 +1,4 @@
 AUX tty-screen-0.8.1-ioctl-test.patch 1650 BLAKE2B e7e6e59a494d4e450ff5c7e4c6f0ac8ea33975b4820d8195e0f65d5d4e98ba65bafeac0f9cdffb17a3a74663ae90df213bd5effdb004acbf1bb2b618efdfe533 SHA512 eb6bd0137116d6ea18691451da2818297677171a74a2e0d42b8e53a184b69c55879c3ef6afce6c1dba7897f73b49b6fc64f7160479283e1459f82b80e9763d8c
-DIST tty-screen-0.7.1.tar.gz 11377 BLAKE2B 485b5610bc81524cfe525f8a837e99d13788da499dd8fa0f7c3be3f580ada63861f04652031e84817ef6ee49ce099c5fa97104b6634fc306d9ee0bbed0828ac3 SHA512 1ef5ce12cdd6337c47f09e5b6ae116985a80efe9f493d52c404496319f1377d4308cd829343d84f5c653b70327c033955232ca62fc8a134503a87a33a264130a
 DIST tty-screen-0.8.1.tar.gz 13019 BLAKE2B 9c9ccb49ae323ebc67c5bca918303586fb749813539aed32a892f3135aa392f6c77b078bab2c7bd116d9f152ee2745d72aae38a91cf4292d1f360085d88060ba SHA512 b0a01c49bb0c56f23c8b384a2d4f4b5c7168863a35c3ab7160d0f34c7d63a2b10b3b9f0f54c6d56e2424a8b16e6ba74268ac81af631976876fb37eb9c347c393
-EBUILD tty-screen-0.7.1.ebuild 735 BLAKE2B 60f62ca1543f4d20e1ba4531de9bed610e43d3021c1f8a75605c38e3e61fed8499dd8eeffadbe35137ef2ffc7a8522fd981959ee03bfa82bf8ea6ed1b76af657 SHA512 26715c2e8d7cd957a81b3651b85006f428b28ab90011cc34a73790d15c8a161a34eca8d69731e2aca67eee30b97233f1c8407f71a137b391e3bd0388d79c96b2
-EBUILD tty-screen-0.8.1.ebuild 876 BLAKE2B 1dfca74cdce042101591a44e762b96750d4d21abbfe91600a5c38a6f2dd3fb2d6811f4629d7fb626c192b31e5bdd61f27ebdf3ee5b3cb4296fa74e6449e7cadb SHA512 6c3c0d43d85a09e2932038ae6d9e63dea3f8becbb3255b8e9223e3af9360dc3a14a9254d944b62157f42f0e9eaa8b356692ff816958f8c552766daa4934b2eb3
+EBUILD tty-screen-0.8.1.ebuild 876 BLAKE2B f39d2c38e327e68ff268e2d00d0d4dd0c64dea724eb261530907300dbb739cc5b7b9f9f294fbfe04ba854f654006bfa665df20549f4520522e5806c0c49c1cbe SHA512 d2e8faac96df3aa64236d9cad1e81baa042eb391e65bfb89fe7de453ec619a09880b002926f2903dbd473e28de9b4bfba9efd6ebf654643de1c15380bf1666c7
 MISC metadata.xml 339 BLAKE2B 9f3e4ed8b89e91c69c11551c7b61384934543cd9b56cf389fb6f423722ae5e00f6c269cef8fc8b413d31da1b2967656504c21128da60055878ca20406196e52d SHA512 1a82d0b0fc5c7f3f3a8924289d3c957c3f956f01e36434ca654dea5f469a149b8a8324c4709bafb1707400dc57413ec42e5a4d74f9454cb0792b6ea45873e6b4
diff --git a/dev-ruby/tty-screen/tty-screen-0.7.1.ebuild b/dev-ruby/tty-screen/tty-screen-0.7.1.ebuild
deleted file mode 100644
index d2da38e96cae..000000000000
--- a/dev-ruby/tty-screen/tty-screen-0.7.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="tty-screen.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Terminal screen size detection which works on Linux, OS X and Windows/Cygwin"
-HOMEPAGE="https://github.com/piotrmurach/tty-screen"
-SRC_URI="https://github.com/piotrmurach/tty-screen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	echo '-rspec_helper' > .rspec || die
-	sed -i -e 's:require_relative ":require "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild b/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild
index 7b248316baa6..a0b3ffa5e9a0 100644
--- a/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild
+++ b/dev-ruby/tty-screen/tty-screen-0.8.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tty-which/Manifest b/dev-ruby/tty-which/Manifest
index a7822b4aa62f..061b577a6f39 100644
--- a/dev-ruby/tty-which/Manifest
+++ b/dev-ruby/tty-which/Manifest
@@ -1,5 +1,3 @@
-DIST tty-which-0.4.2.tar.gz 9820 BLAKE2B 07ac2aa7a3e42127f456045fbdb92db2ea9834b08e0fccbe81767e01817ec2bf7304fb8a41408b0c4da8ecba3caf8bc236de9cb5637c6f197fe3835d0e9b231e SHA512 573b4ed1bfd4dd66dc3337d076a6559bda57b76c95c75f1aeef8bb6d4e0c81ef72057f5ef0521a10afb2a550b8850e6311aaa56ef2499146221f33403621ee54
 DIST tty-which-0.5.0.tar.gz 11560 BLAKE2B 0b8d821168759ff744ded5a5d7b0864303ed71510dd233b39b6f12fe42f044c4fb48da8f9b0cb16875ae9cce5c66060af8cff858aaa88bdaddfc971886f2ce8b SHA512 a5be30dc857eed2aa8ce81f1c62467451760482b1f51f1c0654c57001a9ab828d31b22b35cd9e37ea2fe91a7514a1a15107b5fc948a561a2ee4e58e0748bacd3
-EBUILD tty-which-0.4.2.ebuild 1063 BLAKE2B eecd3cdc80b1ce80e9113fad77381b0d4df8c3c3e54f92f82e72383a4578e98ee60c3d552c51355a126193774623de5c24cb2caeaba503e9ac6c51b689c48a5a SHA512 3c580330845686950781a25c42ebca1c2ae5e0e5fad7eb3ffa15dbdbe743fb61eee7ea9d899210731b6813f74b1125561aed40a0e32e83b04dd3e1c6b45352d3
-EBUILD tty-which-0.5.0.ebuild 1063 BLAKE2B 9945b14c5f4220c4c32b11562f1e5abe6cf577af84f60b4f521c44d3e70325039bf50852c0d0ef2f8f8cfb34f5606dfc61fc626684dd1c8e2255bca6ddbdd6f8 SHA512 2885579a35df456a185edbc7509108e0aeb82cdd5da2b36b148b0148c7204d8c1fe182c49797b62ecda4af7b9f17ca111bceaae88a9f8fbeb3f21a2781362021
+EBUILD tty-which-0.5.0.ebuild 1070 BLAKE2B fd109d80990cdfa76c5212e7ce23bda92e792f71747884615bdb4b4c62e587736ccc702af20bdde72938d964aabd873550690a9a1a1c31529d80f9a69fe7c515 SHA512 bdfd8f375818c5521c64e56a9d7acfc1e9fb0126d569545088a660d89ffdc31cfe3e61f3ee7e19dc7c207765c9bf956b4da26ed27f6e26719159dcea2ac87ab7
 MISC metadata.xml 338 BLAKE2B 84c071b128f45437b99263f4ef44815f4cc720ee3558387f0e4e37b28e3f187d40e9269725d9fc8c084d934aa1970144bf0f9ff4497069b179f10aae27ec4f6c SHA512 3f06f102c75759a7f3e4b5c4077e9bfdd00e13ba711842f4f22f0d86c4e13ad48220322798d7592ca64cd13a10d16a8462a609f14c82cd2be1a8da7d2a2f1051
diff --git a/dev-ruby/tty-which/tty-which-0.4.2.ebuild b/dev-ruby/tty-which/tty-which-0.4.2.ebuild
deleted file mode 100644
index 73775797dcca..000000000000
--- a/dev-ruby/tty-which/tty-which-0.4.2.ebuild
+++ /dev/null
@@ -1,35 +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="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="tty-which.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Platform independent implementation of Unix which command"
-HOMEPAGE="https://github.com/piotrmurach/tty-which"
-SRC_URI="https://github.com/piotrmurach/tty-which/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	echo '-rspec_helper' > .rspec || die
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Fix running specs without bundler, fixed upstream
-	sed -e 's/receive(:join)$/receive(:join).and_call_original/' \
-		-e '96iallow(::File).to receive(:join).and_call_original' \
-		-e '115iallow(::File).to receive(:join).and_call_original' \
-		-i spec/unit/which_spec.rb || die
-	sed -e '5iallow(::File).to receive(:join).and_call_original' \
-		-i spec/unit/executable_file_spec.rb || die
-}
diff --git a/dev-ruby/tty-which/tty-which-0.5.0.ebuild b/dev-ruby/tty-which/tty-which-0.5.0.ebuild
index f09b9e2955ad..b4021869b1a5 100644
--- a/dev-ruby/tty-which/tty-which-0.5.0.ebuild
+++ b/dev-ruby/tty-which/tty-which-0.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/turbolinks-source/Manifest b/dev-ruby/turbolinks-source/Manifest
index 7bb4dca8a45b..fd2c37892ea9 100644
--- a/dev-ruby/turbolinks-source/Manifest
+++ b/dev-ruby/turbolinks-source/Manifest
@@ -1,3 +1,4 @@
 DIST turbolinks-source-5.2.0.gem 13824 BLAKE2B cdb7adb85e275d5e6edc4f0a03d75edac2f974ff0c1e2f7c003865edef018f0b0d24775d3db2cdabf1f7bf49869441d6af2362f236904fb9d6773b1a47173795 SHA512 19d1fc17f3af81bfc79a1e513aec88dfafa808a2f7954acb14f32909b308ce399f36bc18de313ea58812b13cdc9e65cbae5392cd4c88ea010f1efcef99356557
+EBUILD turbolinks-source-5.2.0-r1.ebuild 427 BLAKE2B bb057a3319e475b6b3ac73bd34bec11bfd7fd32a6f49a29f02e4f19987ea8e52b641311801e2e36fcfbc5dec26e5a06cf248f2841634365b1fdddf573e27f23a SHA512 fdf773e26b0dfd06de4e163926b9f73047710f946895a229cfa201245fcd6e622f439b4cb421867dd6eff9affa15cd2f881b9505cc033c6cfcbda5508942daf4
 EBUILD turbolinks-source-5.2.0.ebuild 465 BLAKE2B c8b1c4d45d5f8cfe4cd33168a33efc930ffecff2d39dd6769f4db0a9059a5dbbbd27e98792c8b8c24ef0f4cb8279add0150d0f9a633cb4c71869192e7d55e6f4 SHA512 f6e9417d4fc346aeeb61ee6d35b40e73707667528d0e02b106a605e659e9693c7d58c0596a54c5f58496147daf330f5cd9f15d4e2e5bf50f29082d8ae65425ce
 MISC metadata.xml 354 BLAKE2B cbf575659e7fb7b24059b1bf45325fe9a0f71b88b916525ce52ce9f6c6531a7d172fcfe27bee12e76643001080ac7bb51b00031a5fa3e28b7c38d7d93ef902b9 SHA512 76ae57c2274c117e4d5fefa413510109ddbbbf095d539d8857529a3c25002cbc27ca41730711b7482c20a13932f36d70f1857962d61608b151f8973de7dc507b
diff --git a/dev-ruby/turbolinks-source/turbolinks-source-5.2.0-r1.ebuild b/dev-ruby/turbolinks-source/turbolinks-source-5.2.0-r1.ebuild
new file mode 100644
index 000000000000..c0fcdd64a0db
--- /dev/null
+++ b/dev-ruby/turbolinks-source/turbolinks-source-5.2.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+# The gem does not contain runnable tests.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Turbolinks JavaScript assets"
+HOMEPAGE="https://github.com/rails/turbolinks-source-gem"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="test"
diff --git a/dev-ruby/turbolinks/Manifest b/dev-ruby/turbolinks/Manifest
index b8c462d8e713..79ce16ccbcce 100644
--- a/dev-ruby/turbolinks/Manifest
+++ b/dev-ruby/turbolinks/Manifest
@@ -1,3 +1,3 @@
 DIST turbolinks-5.2.1.gem 6656 BLAKE2B 55f624ee8dbb8d27ffe21fc4b57644ad3118dbf7d89dfe59dde1909ee553d37a47e127af92e710f5081787e682b76950aac4287b604ebd9b32df4d60ededadee SHA512 e306a38dcb727a9ca9f491074154d0e82a6a0efba89aa8aa6f5db97c0c78fb468589a54b28779b83b5548c92aa03976e27a98b4beef0ef376606a97ac9dcce59
-EBUILD turbolinks-5.2.1.ebuild 436 BLAKE2B 203c7a3ee5461ffa10516061f6f0a0bdd48b5b4b0ee406f50af049da93d634dbba0ffb13e5904c431d597cfb6d61ef1cf253661dcefb2422b78540f07c1f6147 SHA512 f65d97f8e4b1e6b6b5521c5f2a717142289ceb9e0990e6c6107be6414c5b85dab753bf6c69020e97be1a46457a12913199819f73eab1727de7737ada62ff4d21
+EBUILD turbolinks-5.2.1.ebuild 436 BLAKE2B 1c59552efa8f08a89a1d816d88d558fdedb8052b40220ceb736b39b9e76019647daa3664d7791e60b74bbb0434f46c4cc2ba0f74f858fd38439477c4052b2105 SHA512 b567bac1dbcb8b7d0315471df48c6ade2a3377874eab1ff072e580384c54cfe5ce3a5930a5c804941457f2825920973fa8c68645cf64e4815ee1c32d0d1afd3a
 MISC metadata.xml 343 BLAKE2B acf5a5b480c60580916685ea6adf12b0c4cbb66f9dbfc64ec6a97e05221fa30eb3b4354bd6432a3c6764c0c1fc8e35cc58b8c04ea5090df3a1c5a9d9efc3f4b1 SHA512 9360997e79f26d4f70aabf6bae4aa0b97c7dda776b1603e82f5c712ba63a2fc54fd862c782734b06f7c0f098eb31b94bba32cc4a67df8114f24985d2e08e0c76
diff --git a/dev-ruby/turbolinks/turbolinks-5.2.1.ebuild b/dev-ruby/turbolinks/turbolinks-5.2.1.ebuild
index 540a360a31e4..a15cd68746f5 100644
--- a/dev-ruby/turbolinks/turbolinks-5.2.1.ebuild
+++ b/dev-ruby/turbolinks/turbolinks-5.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 # The gem does not contain runnable tests.
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/twitter-text/Manifest b/dev-ruby/twitter-text/Manifest
index 43fe2fec6b08..fc5a46d1318f 100644
--- a/dev-ruby/twitter-text/Manifest
+++ b/dev-ruby/twitter-text/Manifest
@@ -1,4 +1,4 @@
 AUX twitter-text-3.1.0-frozen-string.patch 3372 BLAKE2B 2c6eb1fcb05561a8bed4114f8b86547532f53c4b2981e14387518ccc7daa69ff0ddbdabeb892cb125c97420a74e8c121f5241b500803ba6a8ef27e6c6d297c1f SHA512 153e0eb1d41e43517ea9604aaebcea40ab814c168654c76276a94833d393250ae10a3be54b83ee839660c37645df25f4144a124e4942aa34b5fd8471ef065320
 DIST twitter-text-3.1.0.gem 59392 BLAKE2B 91f906db8d4cc17086b7bc421f1730646756aec9e041166e18d816da4b680282f312743c52e412e6595d7565c2c7faf0dd18fea815f3bbc53afa675a33ac3c66 SHA512 b0d5a876bd9c1d4788378ebd5029bed51db6a0c3a7cd2c97433eab3ec3655d7bc427c3873364a368c0a10216871c7373e762cfd57c4bdd69800adc95869aa03a
-EBUILD twitter-text-3.1.0-r1.ebuild 791 BLAKE2B a63650d7f6b71395ffc8ef11f3e14a1ec7e5c54994edd60084e949254f757061de13a68bff26b1953b401f86001bc52de5e0c2e1afdbacaf9a5b5a801135448b SHA512 14679c8267e45761fd2303fe8dd90eb1491852cdd4939446e5a78bdc515267c1ff93cb40a05cd4255cc864dfde4759fadb3a3c5d3d574af9cfe0602c138153be
+EBUILD twitter-text-3.1.0-r1.ebuild 764 BLAKE2B 2dfec253926218b078c80181b76eecc17976c71ae9a0ad3201f266c53a3bf6947602ba2649f303ff1a9e2fbdc0aea61f3b6b67bdd3eb63c0476c12a5ec691418 SHA512 8ba16393e43e0d641f0ba19532eda2aad6bdf1fabdbbff545b785cc0a43f9f9a749b132fb5369c7d5c4744f75e4dcdef14054f33c384feee4d13a467d98c4059
 MISC metadata.xml 347 BLAKE2B f4d210a46945a96bb9f519ecfadddb07ce5d9761be0591eeecd68497b1a5ffa1d6d1645e2c10da6d69ecd08875cf6d8ab2cbe047f78454dff5ff0eeb6dd39344 SHA512 f912b1e9ee80be32d46ca2350f3f0e47c97ce9a3e0bc5b860886c6067a57fa8366f89ce20dc3eeba6e4137f8adfbd5d70f7cc9c396eadca89de56ed6fc0363ca
diff --git a/dev-ruby/twitter-text/twitter-text-3.1.0-r1.ebuild b/dev-ruby/twitter-text/twitter-text-3.1.0-r1.ebuild
index 96cf39c2af87..bf9b100b8fcd 100644
--- a/dev-ruby/twitter-text/twitter-text-3.1.0-r1.ebuild
+++ b/dev-ruby/twitter-text/twitter-text-3.1.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -25,8 +25,7 @@ ruby_add_rdepend "
 	=dev-ruby/unf-0.1*
 "
 
-ruby_add_bdepend "test? ( >=dev-ruby/multi_json-1.3
-	>=dev-ruby/nokogiri-1.8.0 )"
+ruby_add_bdepend "test? ( >=dev-ruby/nokogiri-1.8.0 )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.1.0-frozen-string.patch"
diff --git a/dev-ruby/typed-array/Manifest b/dev-ruby/typed-array/Manifest
index 6eeb82857b25..87c32991f10f 100644
--- a/dev-ruby/typed-array/Manifest
+++ b/dev-ruby/typed-array/Manifest
@@ -1,3 +1,3 @@
 DIST typed-array-0.1.2.gem 10752 BLAKE2B b329b08d58d964e43d8ac78d0aa5b8a86c375d7d2124314fb20582bd04dc0843f22f7932fe8302a13c7071e55b2da913d95c4bf06fb3e61de093a22dfae70015 SHA512 e61631e6c9c4835a1ab11a0c3698df3c5831a0b1b03737a51496e9af971541a07259e55ba2430471c868770d950bb8cb77b5eec810807d05d3eded506c588937
-EBUILD typed-array-0.1.2-r2.ebuild 531 BLAKE2B 887f330ed353cdb9e8681299ffa23796ec88c8463ac379a43ab3c365da49b655cfbcad3e9f88898525515b2f83cdb8ec98875ef99c0274ef1e6c9b6195f59b77 SHA512 a3ea865a2c9d54797a9db8de294b609560afea017ba094dd1a4ef4538d848841fa973e06e547c5a4b570144d4fa52cc976a373e3b1405c2e6e45e5e28e479cdf
+EBUILD typed-array-0.1.2-r2.ebuild 538 BLAKE2B f295020fb8340058419873b76439437d5414184feba3311fec2348c2053761b7a32ef4bd7f1131779d1157323913c155f5a70945406d74b69f0e9894068a0a36 SHA512 ac3c0c7382259528a92969bff4079d0b5fa4316e20b3e20e1a29d1f3120964844786c980e9005afdbf8e87b24698269fc2a4beb77b07f9f1ffe78e104ed7e072
 MISC metadata.xml 456 BLAKE2B ce184c4e270cf9abe0c4059c060894d236da683bffaf6d1b17c230efb69693fb92a05060d05051e4d286f21eb7bf3678234c779dc8da29a057020dadf6ff35cc SHA512 f262a5df0a298f84edf257cf37e55c5143361e6b84908775062f8824cbfffa9b904308687e851df603a2435f91c5a072a880af7f193488c3d5efa4683be2ba90
diff --git a/dev-ruby/typed-array/typed-array-0.1.2-r2.ebuild b/dev-ruby/typed-array/typed-array-0.1.2-r2.ebuild
index 5bcf095b0711..c0025e9f5408 100644
--- a/dev-ruby/typed-array/typed-array-0.1.2-r2.ebuild
+++ b/dev-ruby/typed-array/typed-array-0.1.2-r2.ebuild
@@ -7,7 +7,7 @@ RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 inherit ruby-fakegem
 DESCRIPTION="Gem provides enforced-type functionality to Arrays"
diff --git a/dev-ruby/typeprof/Manifest b/dev-ruby/typeprof/Manifest
index 3852e2df5bec..b9102e2006a7 100644
--- a/dev-ruby/typeprof/Manifest
+++ b/dev-ruby/typeprof/Manifest
@@ -1,11 +1,5 @@
-DIST typeprof-0.13.0.tar.gz 498218 BLAKE2B f6b8566dd25cf08952c136bf59cc7f10f01609d8c2e7633054892f296c6c35cc0f0121e086f465d9ee97776d803829f27895e1544772bff33e3fdb562ad0b9df SHA512 dda9b5d84a2fc6473ddf71b897e13aac9675a4e4ef5dfe71fe6929a3025ac2b3ab051a5882d936112de86ecddb96e0b665741ba08748a6d94c6540bc13c171b0
-DIST typeprof-0.14.1.tar.gz 499209 BLAKE2B 5c6332f6c91ebb0fb451e108d3f4ea2523740c4097f09ccedd76821f79a9f94bf9eaba6dd0ffd6ea8e9985ec56d618c802accf08dd70c92bea860fb3729f219f SHA512 071d379b304a5b37770bc86001c3e2074f11749e439f0debf311c4afdd183814c5e168baefbe3f4866e57c3b82e3d7d006201dc1cf25c6ce924e92e61c945344
-DIST typeprof-0.15.1.tar.gz 502007 BLAKE2B ffea92db2fd227f0632b07e086d51dc11c2cd21f737296cc3eae9839c52eaa085a383b460a88776387a58281d75b13cc62838e069fa5e8d575f443e799adead4 SHA512 281dd8ee4b5393c6ec177ce50018f95ed8aa8ba393bf1eca1b4f24d5431de38a76c3f87cc55c4546e41364cb921b707b6850c24fb727597a6d24c62785d09f06
 DIST typeprof-0.15.2.tar.gz 501984 BLAKE2B 4139de379539dce54c350fb1da09d87ca7251274738b81b9c098f27539f8cc20757aaf053efd4c089b88a7c08050a8e612ea6c1b71ad1a007c4c634ecd6e7564 SHA512 c94b74f0a0f8f87477f80615677a5c6479d3e326564f2d67c17e4e7f7e71ef5817fe6163d14fdd45fc9bb3de2420f8b09f68f0d031962fb5bafc478679cee331
 DIST typeprof-0.21.2.tar.gz 1073317 BLAKE2B fda97cf6535937deca51f922f39ad580383420e025f8c5a418e483108e82f5d38063064102698f2ef405f7a0bf2f83ebcbb7ac7fabc32ead320e3af9d74b7cfb SHA512 53e9657ee0c98e131e8ec70400cb775cf643910e8985767742b50fda99285f33f787d810bcad08d9d633265577731a95fcf9a4e7568e4d6b0b603f14a6c10828
-EBUILD typeprof-0.13.0.ebuild 978 BLAKE2B b94c723691165ef6576b3f71aedc48e47873b605fae9ec5e8c9258e37ae077500475f087db9cab0c98856593915fdb02a8d630445c6371e9671c88a4a7ac0340 SHA512 53fd39c4503faaa9093716fa22788723adcb416d321bcbd0aa143f5f6c57568c26502850365561a12a5cb2377ea07adf9f55b4e7570d6ef2b88de2bc204bd27a
-EBUILD typeprof-0.14.1.ebuild 985 BLAKE2B 1ee3bd59bc7dfa525e9a217de535aed36bb2755f5acec9f89243ab0854047c6f081f6004e7ac2cb47758b8c4de447338f0c60eec096deea264845be187383cd5 SHA512 79974e703b2ba9315e7ff960d403f605b3f955ac7970f072a200f0ccda3630d83bd9c78ee6d252b898db1bbb286a1d26e156bab524448edd899def7b0fc317ab
-EBUILD typeprof-0.15.1.ebuild 985 BLAKE2B 9953eb127d328f709ea14b150e2f59fa0e728ba82a3eca9e43ed5299140efa1bca9453e75ecf525f488d86a5ac6e554d54896d080b9725e50cc4c7e052ab23fa SHA512 9ee2f341ec5352d2b6f0433d4dbf12ecc2408917955937c5a1bdcec6b557e8a341d18772b71d05edf39a1d4b9abc23d1f22c45bcd65163ae58ef58b7bb4842d7
 EBUILD typeprof-0.15.2.ebuild 985 BLAKE2B 9953eb127d328f709ea14b150e2f59fa0e728ba82a3eca9e43ed5299140efa1bca9453e75ecf525f488d86a5ac6e554d54896d080b9725e50cc4c7e052ab23fa SHA512 9ee2f341ec5352d2b6f0433d4dbf12ecc2408917955937c5a1bdcec6b557e8a341d18772b71d05edf39a1d4b9abc23d1f22c45bcd65163ae58ef58b7bb4842d7
 EBUILD typeprof-0.21.2.ebuild 992 BLAKE2B b4f5985c2eddb8c277593b0a0f0e393fcd802aabfcc583e968c6f7569e9085a7465ceb718dd858f2980d11006a3cccb6a6e1d77a3002ee14b3e78ccebce6b98a SHA512 59508894babc03e7ca00809519e9b35991ae82c567c964dc3424adb0db24cff3bef5de0cc3c8a64b373ff9cde46e385d311b9618740293ac76962c772624bc52
 MISC metadata.xml 340 BLAKE2B ef30979bde6019c1290d2f6038c0465b7bb23754da9a118d1493cf5f8ba404258a97b67b0e5098d1e02fba2aa0ee569a8d0217a2ba8f5467cfb9ae795a457a8f SHA512 2a38dc39885b6693d013c28591bde40dcad4c38d1c8195944104b501b40b49808594781cfb468de8f1982c172e5b98cacb8113a42e3e215493272bf65c691e19
diff --git a/dev-ruby/typeprof/typeprof-0.13.0.ebuild b/dev-ruby/typeprof/typeprof-0.13.0.ebuild
deleted file mode 100644
index 495c43dbf0b6..000000000000
--- a/dev-ruby/typeprof/typeprof-0.13.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="typeprof.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Performs a type analysis of non-annotated Ruby code"
-HOMEPAGE="https://github.com/ruby/typeprof"
-SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~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/rbs-1.0.0"
-
-all_ruby_prepare() {
-	# Avoid tests that download live code using git
-	rm -r test/typeprof/{goodcheck,diff-lcs}_test.rb || die
-
-	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/typeprof/typeprof-0.14.1.ebuild b/dev-ruby/typeprof/typeprof-0.14.1.ebuild
deleted file mode 100644
index 54c0c82ba183..000000000000
--- a/dev-ruby/typeprof/typeprof-0.14.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="typeprof.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Performs a type analysis of non-annotated Ruby code"
-HOMEPAGE="https://github.com/ruby/typeprof"
-SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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/rbs-1.2.0"
-
-all_ruby_prepare() {
-	# Avoid tests that download live code using git
-	rm -r test/typeprof/{goodcheck,diff-lcs}_test.rb || die
-
-	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/typeprof/typeprof-0.15.1.ebuild b/dev-ruby/typeprof/typeprof-0.15.1.ebuild
deleted file mode 100644
index ac6c1869b325..000000000000
--- a/dev-ruby/typeprof/typeprof-0.15.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="typeprof.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Performs a type analysis of non-annotated Ruby code"
-HOMEPAGE="https://github.com/ruby/typeprof"
-SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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/rbs-1.3.1"
-
-all_ruby_prepare() {
-	# Avoid tests that download live code using git
-	rm -r test/typeprof/{goodcheck,diff-lcs}_test.rb || die
-
-	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/tzinfo/Manifest b/dev-ruby/tzinfo/Manifest
index 053240d9bb90..efb7ccca94b7 100644
--- a/dev-ruby/tzinfo/Manifest
+++ b/dev-ruby/tzinfo/Manifest
@@ -1,7 +1,5 @@
-DIST tzinfo-1.2.8.gem 166400 BLAKE2B 67f116171a6cfd2680c5eeac3cf7a034b446e973f2658052a70fff8d0571bfae03ee212b26d277c6b5050943f6117b5d8ce7c2ce5c5ab6891a1b8e9212bf7ded SHA512 5573b252d91a77b1e1ace2d2ccf48f7dd9bfb79b8b0b15ba2e8757e5fdcb9cbc044abdcf82beacffa284fc57ded2b579feccc393331f0f5a680e5f5c6275b62a
 DIST tzinfo-1.2.9.gem 166912 BLAKE2B 6d54a5118fbdb3556d0cdc9079462cf26afa9deddd1dc21ef670240e2aa47a66d0b4fc9c9c7ed74bd14bde96dc95f6b716aef5d32ca521221618a76c8c05cda1 SHA512 ddf28ad213f681a4e551cbd803873b279acef03fae894a3e6475030d4da5a59732b31af5d5944e8c62d15b7ec922816fede24f180fb20c55c1bd3d379c879cfe
 DIST tzinfo-2.0.4.tar.gz 224673 BLAKE2B 0c7ef231767b6fc00cf95b3e1c2037894b14dfe832eaedb3f4b7c60a884ab6f7121243af5b62acf47d02da28395e7390f968421a3a3a2d731deb079e9fc51bfa SHA512 5b2ec73f737009ba21dac7dbb9504235fdef14dc45a6450e1218ba9e53dd29735ab4fa6c2854271916cc5c0244e09ae7ab19467408b72b9b82ca238e14d3fa4f
-EBUILD tzinfo-1.2.8.ebuild 1020 BLAKE2B 36048a7062d502cf053cca71385de336633746c7f6ad1c3752100de58448f42304406158315916ff7e94b922cec345e48230abb0cd977d2ac9a37c9f0421da30 SHA512 7b319d91bc63acc74a03ad902730c098682444e6f286ce7aefcf37a8fa5d0f9e1f13a674f6ab86237aaa1cf5819ef49efa756a265d5b19ba8a8c9517541a0e5d
-EBUILD tzinfo-1.2.9.ebuild 1030 BLAKE2B 2502e09ab554034002b856e8ee351cc0fe09ffaae641e05b10288efc2e74a7559e00f3b557564bcb72efee051488293e30008bb285a4b97b6c71822cd08b8e5a SHA512 f17a862a845e95ea329c6447c831976fd6766dd54d2a1ce419644023eca9d70e7d63ccbad099e4fa4b718f19f7c5260a42882e1ad658ad08dc05e2ceff5ea3a9
-EBUILD tzinfo-2.0.4.ebuild 1429 BLAKE2B fd27e9eb70b22402299211d35357380b8e7a5f50a7b9a98004382dbb9258ebafe90c599f55cd0d47f884210fb099edf2dd261f7922d6dd0878a323cb0c7d4bda SHA512 72368e9809a510fcf595d627ea0ba39faa7c0017cb83dd349e73aa08ade98b37d777d3a3df02fbe3fced191585a1741aa32b57575ef206a8650a13fc27500794
+EBUILD tzinfo-1.2.9.ebuild 1027 BLAKE2B 3d499bc4a9c72c6d840d1143d2333cd0b62b12ca0ec0264abedec95346fb7c272e9e2fda576e072dbd141fc61b669d99476479b1b9ff54e9e34187f58034cfb3 SHA512 753812b51b74e65c769e77bac182506c6d7ebc4670fe7fb25e1080215ffade7350f93b401eb3f61de7a2c6a52f7e74172b8257ba7e82510403b67cf7aa218f25
+EBUILD tzinfo-2.0.4.ebuild 1442 BLAKE2B 6dadae626081a2746c2df00cc70e9c3217a66cce36adb3badbdfcaea7a8cf59a8f34f12525a38eb5b629627167e1511bf64f252271bf29e99749d1178f9056b7 SHA512 039f1f569a05b3553cd75bc3f4c3020de84fdac559f39df78124dbb10a68e6835aa8a16e0ac22ec70e30bf798debab66e78f8bb75b02e9592d97814cd6486ef2
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild
deleted file mode 100644
index 01b52ee296e8..000000000000
--- a/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild
+++ /dev/null
@@ -1,34 +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"
-
-RUBY_FAKEGEM_TASK_TEST="test_zoneinfo"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Daylight-savings aware timezone library"
-HOMEPAGE="https://tzinfo.github.io/"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="sys-libs/timezone-data"
-DEPEND="test? ( sys-libs/timezone-data )"
-
-ruby_add_rdepend ">=dev-ruby/thread_safe-0.1:0"
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Avoid taint tests that throw SecurityErrors on newer ruby versions.
-	sed -i -e '/_info_tainted/askip"SecurityError"' test/tc_ruby_data_source.rb || die
-}
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.9.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.9.ebuild
index 097e9add9d51..740c0956497c 100644
--- a/dev-ruby/tzinfo/tzinfo-1.2.9.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-1.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ HOMEPAGE="https://tzinfo.github.io/"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/timezone-data"
diff --git a/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild b/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
index 75a202a26d5f..4007acf844ec 100644
--- a/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-2.0.4.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="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST="test_zoneinfo"
 
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/tzinfo/tzinfo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/timezone-data"
diff --git a/dev-ruby/uconv/Manifest b/dev-ruby/uconv/Manifest
index 6f7cb87c9ccc..e3f995889d4c 100644
--- a/dev-ruby/uconv/Manifest
+++ b/dev-ruby/uconv/Manifest
@@ -1,3 +1,3 @@
 DIST uconv-0.6.1.tar.gz 740417 BLAKE2B 41bd221121e301d5df365f6d9eca56fd37e3185cbe75f653d60fe3df5d62c385c831607086330e56c45e280627cb03247be230e655f293c09d671fd1ee574723 SHA512 6f964e42886f498bd6c4111e522143d8d958b8c6e401d26f784fdf1441684f1fde7cfdc35a08d3707a42e305d5508d9ff3fbc1b735298f8af2aae3923cbda68d
-EBUILD uconv-0.6.1-r3.ebuild 715 BLAKE2B da495a9e57b340272e1aee2690ae6d713f28de060475dc687c6598f7def46cfaf098d7b69ad3a723221ab68a48ec3b86aac5b8f3b7f2f0167981cb526798be1c SHA512 d668e14e5ca85595e7688fc84acc23ebf28d6c59a3edd4d72afe0d7373bdcd9a7b76feb2dd55d27fbf15987f106d5a0c7ae74ff32806da1c2106d1cb886d9e3b
+EBUILD uconv-0.6.1-r3.ebuild 722 BLAKE2B 6cd530abe282187aac3f61a9426db3837e0fe9c37d561023af6acd299f5e0a4e909bf672e25c6a8c229ecd7e71ffe834db67e887cc109e4e88ed7ee8ce85ec24 SHA512 34bf88d21c3c2683f279830f464518ac0493a70b41d5769ed829e7a3eca087f0ed398aa11bdaa67c0b57292c30e9a3fbbc6c204bfb074d5a488134e5f823ae1d
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/uconv/uconv-0.6.1-r3.ebuild b/dev-ruby/uconv/uconv-0.6.1-r3.ebuild
index a6c7a17307b8..2dd352c0a3ff 100644
--- a/dev-ruby/uconv/uconv-0.6.1-r3.ebuild
+++ b/dev-ruby/uconv/uconv-0.6.1-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 inherit ruby-ng
 
diff --git a/dev-ruby/uglifier/Manifest b/dev-ruby/uglifier/Manifest
index 01a3e7018c3b..0b562e0afdf1 100644
--- a/dev-ruby/uglifier/Manifest
+++ b/dev-ruby/uglifier/Manifest
@@ -1,4 +1,3 @@
 DIST uglifier-4.2.0.tar.gz 201913 BLAKE2B 90390308f116dc82fbf889b603b1ecd118adf9a6f541def408fe3229db02d78f3f7ba790822cc5524870317131260ad7f8c7191a69a9e158a43d9c3822fcc95f SHA512 869194db8fffdb7d243fc5639e0286d73dfa3ca9485efda760a9eb00424e6797f0bf7aa9f6c8f410daac556e01b6a1a1701300bc373eb492ea21d864494f8246
 EBUILD uglifier-4.2.0-r1.ebuild 772 BLAKE2B 616a9e8318c3ecfd452f0a4444f327cb8906cfb1ee6841fb7a789969f49f6aa61f29be5919731cd6f86b9885b58c674e9cc837aeeec1f0c19a2b50429fd4b425 SHA512 7b3c72032f4420fe959fa3dfba0e46085a164bc63d81a318eb61f4e5a009a1c14f59f9856a84ed0c140992fc85c5a8d5b7b3bbed410a446b6d4f40623a3ba73e
-EBUILD uglifier-4.2.0.ebuild 777 BLAKE2B 539f833503cdab1c3aae9b8d03ec7a53435c6ffd4bd2e8388c3aaff7f652ff6b1b681c67eb4cff805d1e9b93aa32ebb511770a6357929a8848bce7b6e9b1f34e SHA512 8d6027e97239ed6be00887208494bb6bfab1fe23ca36d8bca919d4c74ae9d7008564329b1b3d9b4544d437bc1b15593e1fb48d4f1ee1e0335abb68fa56a2e49f
 MISC metadata.xml 342 BLAKE2B e59016392ac1884861b0f47461227593aa920690ac90fa9951d6361d2d89562de883efb0f4112e18fbf4e28e91fada13720e9cba75be2c935e2cb224282efb5b SHA512 5e8ab8b606114c96b5621c14fa2e3a3d9230ea912025c502cd9103ac00b520eb4ec1922a3e717991d4326e0d5c8b942643a8abe3685c4c646042644d70d2e0ef
diff --git a/dev-ruby/uglifier/uglifier-4.2.0.ebuild b/dev-ruby/uglifier/uglifier-4.2.0.ebuild
deleted file mode 100644
index 9535966db86d..000000000000
--- a/dev-ruby/uglifier/uglifier-4.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby wrapper for UglifyJS JavaScript compressor"
-HOMEPAGE="https://github.com/lautis/uglifier"
-SRC_URI="https://github.com/lautis/uglifier/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/execjs-0.3.0:*"
-
-ruby_add_bdepend "test? ( dev-ruby/sourcemap )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/unf/Manifest b/dev-ruby/unf/Manifest
index 8c33b8a121b4..ed0371e28de0 100644
--- a/dev-ruby/unf/Manifest
+++ b/dev-ruby/unf/Manifest
@@ -1,3 +1,3 @@
 DIST unf-0.1.4.gem 120320 BLAKE2B ab339ce957a1d3251d14944ccb4f68a9c7271f0f918f20b57c70824ded730fa18abb5078312d9820e7ef056163b5f1340c1cf72974b6c255279dcf572fb3e87a SHA512 a4784afa8b852497f758d1b6cdcf095eb9e5397a36c97b1f22b53cf8077cfedbf83fdcda36f359acf59ba61f1ab8b706ddd31d097afbc98a40d2dbd0f934292b
-EBUILD unf-0.1.4-r1.ebuild 1175 BLAKE2B 46698a2f7e65454efc1911f3deb02bff26056a99358f3265830a15b0aa9984fd888ed56c162d2ea9201bb302536abb8a3f3f89b83f8172aee6600a718737677d SHA512 1cc350d0ed570f13759eea51d880dd24ca516592ddd557e7bcf0abb5f68321b835f3a2f66c221aa4c53bc6c2f71f518f730eb94ee8196d518f7d5da1e428eb5f
+EBUILD unf-0.1.4-r1.ebuild 1195 BLAKE2B 4170e0c830ed19d3f0a8647143bbb5c6fd8e0de2680357fa322b1a1a91c9f947966674207655b46dd7dd6451d79265edd8e33a96c55943e250ba6c63727648a2 SHA512 aa2244bc186275890ce8ec687eeb1feac98993aa99ef57260963f9c6348aef632d49e2184b7cf863bafd0cbcb630c41cca521dec00c8ad39585d92dedf627f74
 MISC metadata.xml 339 BLAKE2B 453389f654780d3181aabe6239d3fbfb25272b4a1cf8719614f84159bc50aff48f45d40a5b7f77ee94ab13d9c59fa87466add2f60ad31c9978d99e3e114ef0fa SHA512 68c573840acc02e64460bbf329fe532c88a0d4f501fc9f5ebb15f0eea6c5938b5a05aa50b98c3da47f4987416d6e79be9557992f42958f36276a265a56a9e46a
diff --git a/dev-ruby/unf/unf-0.1.4-r1.ebuild b/dev-ruby/unf/unf-0.1.4-r1.ebuild
index 7373d57c72fb..22efe9198674 100644
--- a/dev-ruby/unf/unf-0.1.4-r1.ebuild
+++ b/dev-ruby/unf/unf-0.1.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/knu/ruby-unf"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/unf_ext"
diff --git a/dev-ruby/unf_ext/Manifest b/dev-ruby/unf_ext/Manifest
index 902f7093c833..59568300a56f 100644
--- a/dev-ruby/unf_ext/Manifest
+++ b/dev-ruby/unf_ext/Manifest
@@ -2,6 +2,6 @@ DIST unf_ext-0.0.7.7.gem 399360 BLAKE2B 040800c9598fb544d434e8d3336a7aa8aac2440a
 DIST unf_ext-0.0.8.1.gem 399360 BLAKE2B d1ce1460c46d840d983999ddf0dc48d6af4c508e8d92e8c603cd1e261399a4f79dd0c5937125d4591d627b5bf8ab3a6730999b6bf2eda3c58e714d8209bcfd51 SHA512 8bc698071471f65bf0d08f21e8ae4607778a9021b78c8b00e82725cccf3876d7357a1555d003c83b6182605247f3bf01a6c2ecc4dfac52ca93a0f37da2c76d8c
 DIST unf_ext-0.0.8.gem 399360 BLAKE2B f364808e7e1cbbe27ba1447ec45f5fdaed37d2579cc2a08c6bccd06c23135421949479f5a96ee6f27336bb28bc68509ed931d30a338d7f6079533799b5c8d0e4 SHA512 f0c1e7273aa1b74c81a8b6f108171cbee5479c3f5c256ea3eba3797cf2f5db0c346a33a524fa40bcdea02a75be60fcd470f0a17231cb7b103d28763dd0f8b56f
 EBUILD unf_ext-0.0.7.7-r1.ebuild 811 BLAKE2B a53e68cec4374eba6e1b0eda202b41680540859a486d250b15875e4dfdb0a49a2abd54d115fbc5ddc161b68cfd029303c689ed08539abce46422629a9c72a2d1 SHA512 11c9e2d9c349b6e5fa65e5fa090415a63337fc027b2e93cca40e24cdce783804014177aced82e75f3d5bc6fbf5a8a91467726eed627fd570e15364d0b7f6d72f
-EBUILD unf_ext-0.0.8.1.ebuild 816 BLAKE2B 881963c27b938089c7c6609b91252e74a13205d7fe7b9a84dbf5be6af0e27c30f5fcfd23d16c4c851a0f576a6d236e355e17f9287a36b6987b1271dd33b9bb2a SHA512 9b974340083510605300d0eb7ab3739ab2f769dd2773a0d46b6e1feea73a2869583adf66dd4993000a7945d958c6f16c57a97627b825d5443ba7da6e8d0140c7
-EBUILD unf_ext-0.0.8.ebuild 808 BLAKE2B 693e1ce3f39d6a94ba073426532b8233b91b90c110db56fa50c8d32a59707e2fe7fb0ef48b3ce57d0df7c3b0917df4706b01e2798808543437dfb91d1fc6e06f SHA512 0aafb49dee90d242cf95105f022af278f8c764eb39fb1086d25f44c9b81ed8224911de4271470d6052af0405ebeb9a82b9cac4a2602b9ab2f4671fbd137c0c95
+EBUILD unf_ext-0.0.8.1.ebuild 829 BLAKE2B b66133d69aa396effdffca93c603b53234d4aef3dc6247d364330507e1e9818d318a12b4d8cb7761f23b7a600214e5fc9a037b7342e7cdacf7787615c350f355 SHA512 a421b9a266d46e75fa9fbdccf44ffc6d17c94f1cff0a858fc38743d561e73e7db977f9cadd20a973060527b0e2cbd17e9404cd7e93132e63b53fe436d8fac478
+EBUILD unf_ext-0.0.8.ebuild 805 BLAKE2B eb2f18334f36295e8562ee5f0becf243e95e28c7a4b0ae30021106df357f5ee1d5a917fda5ea67d4be806c8fa18434356592e699b22cba29faed5da2143cf4f6 SHA512 603dfbbe83159ec1ce61efbdd512b6100a03f4377cce953fbac53df6f3c72aaa4a246f86209821d32ae1f486e22faa710d1e3189f9bd79caf17cae3e77778071
 MISC metadata.xml 384 BLAKE2B ab5346d66e46d12d3f45abc00f82d34acefd1dc8abcc0f15ef5c9617803f2d22e1264f7cb781dd85ff486ab0ff17e13adde6af98f70e87c169699e42e860a859 SHA512 2d3ef59ffaa5030d29d440c1a688652b76ffb6fcef9f719ea5f1c8b93746d47c75e5603a8cef365caa17df867efd55178b73026aaf3a4afeda7d84167ed79151
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
index 28110c65bfdb..e3cd634f58a4 100644
--- a/dev-ruby/unf_ext/unf_ext-0.0.8.1.ebuild
+++ b/dev-ruby/unf_ext/unf_ext-0.0.8.1.ebuild
@@ -20,7 +20,7 @@ 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"
+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 "
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.8.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.8.ebuild
index d608bfe170a4..6b575767ee0d 100644
--- a/dev-ruby/unf_ext/unf_ext-0.0.8.ebuild
+++ b/dev-ruby/unf_ext/unf_ext-0.0.8.ebuild
@@ -20,7 +20,7 @@ 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"
+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 "
diff --git a/dev-ruby/unicode-display_width/Manifest b/dev-ruby/unicode-display_width/Manifest
index a1d498749e52..7ed5df9a822a 100644
--- a/dev-ruby/unicode-display_width/Manifest
+++ b/dev-ruby/unicode-display_width/Manifest
@@ -1,7 +1,5 @@
 DIST unicode-display_width-1.7.0.tar.gz 10822 BLAKE2B c3db387b9d61ba4ea9d5559824b22e40f173f9e9bcf7fdad3dba1edc36b39ae90276818bd54e74a6731bd2cb8c48b28e440d07f7e3cedbd8dc13441f79a2b56c SHA512 2b6d2b0118f4a2ad69e98fe2fac611ca94adc0dc59ad076083d0243c630a81a01d650965149a25feaf8986c262a5d55294e064361420e2140b53c5ced5fb1c77
-DIST unicode-display_width-2.0.0.tar.gz 11947 BLAKE2B 4d145f2829922ac2c1681b9f058e218ee7120c1eeb6a440726d79ce8abd2f8bf5adf9f4112ff3de4dfa39f150c5c41bf2dd5458ba87585fca5558ef14355347f SHA512 60ffb44f1685fa8c68b0bc13216fbd77c389840e5c7354428df3daa8ef59d640052210b9e92a54f81ae02f2ac132a8e79a90bad04ae5257a8828a7810b53e227
 DIST unicode-display_width-2.1.0.tar.gz 11981 BLAKE2B b8e70183b1df9f17bd719e1193c3c2ade5d9186772e4246b618d882eda997a0c22ee0179778f7b8580e32ec89461453144d57d198075f0d400ea52f3679ff7dc SHA512 f8fb1375ba0e88a41633d4aca4628198c5ee55f318a7f0055c9178b39f55818ec892f6e455021cf5050dbd1d748a102b319b1d8b9921ed1ba54a1d106d7911aa
 EBUILD unicode-display_width-1.7.0.ebuild 748 BLAKE2B 60535e3488a0ed08ee79a7f6c32862022712fa1c2170e32738e83e0d4773cd23eff01b690e38156e7d73dda4b16c026fec853265e14617d5153f0934f1e6e8f2 SHA512 8022d2d7326be6659a3be29e74cae5ead19cccb0955ab8c97f4eecf8268e5f604e97e908aca298bd93c669ac2099b7eee2f16ff56a67e4964764783264ff8157
-EBUILD unicode-display_width-2.0.0.ebuild 808 BLAKE2B a52870f0825ff8a74218f5c772687d2f31d15987580bba2dea83114ef9d69ae0bab79ad536a9334a90e9c7070affc47a2d9f73c43d7c4f61054db6fd7329d9e0 SHA512 a22bdff04cbae443c6672d48a07c9c3e4dc11aefce37561a0e1f84ffb1b2af414dfc8170fc8f845973e7fc91809a9ec852b7b83f17515e872a779e0ed7b27bb9
-EBUILD unicode-display_width-2.1.0.ebuild 801 BLAKE2B 4ade2542b6030698694c7850eec1d27b015893871c61259d0dbbea16e2790b9c18e9a010597aa42f4281886a760dd3934f4311cec17731eb3b8c314ba3908861 SHA512 cf87d70636adf3b86b14fd7043936b7055cffb97d1fe34996e54ecf95ac626737727960171b2fd05a6795346034f8b55d209174772d9caf1c504dc226b73acda
+EBUILD unicode-display_width-2.1.0.ebuild 808 BLAKE2B 845734eb0151a09f11c1461c870bb17d4f9df412e67a3700c778794776abb818a3a732f537b6c96d090bf770c2e8c2298e463e095c917a18f38b6e27c92196e2 SHA512 ed57f2930157d03c5dba412280c2ea5a5ff80334561b68d98780a396db8d3db96aef8bbbcf43f38002f87f3fec8968b4e5e9a6861b576dd90e9e2e7299afae71
 MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
diff --git a/dev-ruby/unicode-display_width/unicode-display_width-2.0.0.ebuild b/dev-ruby/unicode-display_width/unicode-display_width-2.0.0.ebuild
deleted file mode 100644
index 916c168b40f8..000000000000
--- a/dev-ruby/unicode-display_width/unicode-display_width-2.0.0.ebuild
+++ /dev/null
@@ -1,29 +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_EXTRAINSTALL="data"
-
-RUBY_FAKEGEM_GEMSPEC="unicode-display_width.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Adds String#display_width to get the display size using EastAsianWidth.txt"
-HOMEPAGE="https://github.com/janlelis/unicode-display_width"
-SRC_URI="https://github.com/janlelis/unicode-display_width/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid experimental emoji support for now
-	sed -e '/\[emoji\]/,/^  end/ s:^:#:' \
-		-e '/Config object based API/,/^end/ s:^:#:' \
-		-i spec/display_width_spec.rb || die
-}
diff --git a/dev-ruby/unicode-display_width/unicode-display_width-2.1.0.ebuild b/dev-ruby/unicode-display_width/unicode-display_width-2.1.0.ebuild
index e65f9d9cee96..408071222f82 100644
--- a/dev-ruby/unicode-display_width/unicode-display_width-2.1.0.ebuild
+++ b/dev-ruby/unicode-display_width/unicode-display_width-2.1.0.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=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/unindent/Manifest b/dev-ruby/unindent/Manifest
index 7f02879cbe68..ffbc7849bf2c 100644
--- a/dev-ruby/unindent/Manifest
+++ b/dev-ruby/unindent/Manifest
@@ -1,3 +1,3 @@
 DIST unindent-1.0.gem 6144 BLAKE2B 8720a1f6aca7da8cc8659f5a3943e9e56d15f9349efdd622857bbeffc39b04b61beb2b72a9cd337d516db2fbefd7aae02827b6705a81622ca5904dcdcc7575ad SHA512 1bab3352fc8da8b8a3ade8dff2f7c565e36529a79ca68c0a1ca73cdeca93fa507baa9399c6eed4fa020aa74dea6c4260a0242fa8057931a90bc172f138a5e655
-EBUILD unindent-1.0-r1.ebuild 502 BLAKE2B bf303030ae1ba5bd76a76e1b7d781faf9914904f25cfa73230c3b42e0d3a0d9cc14fb40178e2404e0d87988077a14cd322140ca47a9441f3850540beb8a41925 SHA512 685b4c632284c37118f0b16d6dfb5129548ddd24affa36bffc0d594e8f52221583765d05540e27026b30b6fcf4eb87a9c6113116640b3df60edd310052860957
+EBUILD unindent-1.0-r1.ebuild 522 BLAKE2B 09c8203f0ec885c8bcd4fa77d4ceb3b36baf87b06aa4d9217c09f755e6c5ae2c09365ebff55273a4646bbf0c96736d5ebc3f861c0300840e73f6c9c44b6fb6f9 SHA512 3a645c6399d0f88da766b9d2590f3114ab810563d4b5419fef76d70a35ca49f4b9e4ef90485725d562b4c8d9779185056b393428ece06f63c79abe1402946814
 MISC metadata.xml 342 BLAKE2B c102d2e53f466357b5c3cf88b4a380092f64886a80101cd263228cc5ce4e18b47deb3ad89ea3957fe29b351e2f86391751c5d347c06c6f31e0c419ed0918fa3c SHA512 deea2d135f400de9ba5def5963505698a34473d3f5615102fb32cea39a1480b462afbca353e946aa16dc3894bce55bce587538ab5bb97bb5c25c94bc4a480433
diff --git a/dev-ruby/unindent/unindent-1.0-r1.ebuild b/dev-ruby/unindent/unindent-1.0-r1.ebuild
index 77413c78af94..064501bbac12 100644
--- a/dev-ruby/unindent/unindent-1.0-r1.ebuild
+++ b/dev-ruby/unindent/unindent-1.0-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="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -12,7 +12,7 @@ DESCRIPTION="Ruby method to unindent strings"
 HOMEPAGE="https://github.com/mynyml/unindent"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/vagrant_cloud/Manifest b/dev-ruby/vagrant_cloud/Manifest
index 46a3542d0d2f..03da5a63bb84 100644
--- a/dev-ruby/vagrant_cloud/Manifest
+++ b/dev-ruby/vagrant_cloud/Manifest
@@ -3,5 +3,5 @@ DIST vagrant_cloud-3.0.2.tar.gz 34177 BLAKE2B 299014b569deac667429d90b8952f77a83
 DIST vagrant_cloud-3.0.5.tar.gz 34844 BLAKE2B 2624219c470ed62e60056c825dc40611bf1bd2d1e822cc40e1592f8473517df53d814934f4426ef61d9adabbf89112bc1c44b61ee7129c4270e67b468fcf87cb SHA512 e3b138584baa956de30be5b307b7a05a728a9c84e5c4c831d9a703f0367886b82905057c8d6dda5e337b7b4256704d22a60869710e98493da8eea2074df70995
 EBUILD vagrant_cloud-2.0.3-r1.ebuild 811 BLAKE2B 869712f0a86037df81e293b66702eaee26c10214586e0a998e76da959a85763bfe5be20bae6803419353b90a0a6eb4ea8be31e04e71ff57801ea093836ca35df SHA512 1ad8ad24da9f87dd080efdc29db127d3f6c75f95334410f3db2cd351cd6299b8be46e9c7658f193752419770151f066cd0a485b89bbadb989ae0b9d5eddc9c1c
 EBUILD vagrant_cloud-3.0.2.ebuild 920 BLAKE2B baf0ef9263dcdf872aa2978bb62187d68ea1bead04049e94af26237a3f03f9a26c9a6f4b3bd12589092aefb3c81dc63041f615a2eb395160da736bb0cdf35ea3 SHA512 334260a27a1dbcee7acdb49675f7482f1cf134c6d7056b2a007653f7b0126e44ec615b876c1479166ed30b2ed39555f87918f86da4d182c66427b6dffd574df8
-EBUILD vagrant_cloud-3.0.5.ebuild 913 BLAKE2B 741a60ef19e7e18a4e08d88b9026ff897e95a32b01464edefb7e9cd9b384669f9d3d742d5ab8029cf4ea29c66e18105a19b63ddc569f84a9c074da07e2947f66 SHA512 b468e7a26a9ee1da4bd0916cf74e5248cb89c2fb8f02481dc289eaa9512cc4ee0568cc21afa24e845b67466d6b04fe49b5b048542c67ccc504853fd2306eb62c
+EBUILD vagrant_cloud-3.0.5.ebuild 920 BLAKE2B d27b3051697977423a30c7935fbbb8e08f4b0443db52c41b5ef9218a6b5a445907dab8dc26f5bcfbaaed314edaf4e39751a69e7b7f40961bd1d43c904c5a7adc SHA512 5b45d6c02a833b4c64b41e5199dec1a7c0f1ee9f4a72d677b5df87a6e9ba0b7a49b43fbded6c397b18171e70e8247570d482166567aa13682294ed7db54f2e48
 MISC metadata.xml 461 BLAKE2B 8c2cf50a097c308798cc3631fa3bec6f32e3d36d7b9c3c27445a43783a504c9390ea32ac5b1f419e197616728cf419d451490d3e6299ebb85eb6ae6b71542650 SHA512 c26dac7d5ce25b0f73794e9a7aa6dd2492d4b97ced106b2b76edcf4eaf9b83aea37940e918c2b22cb2f8ef019467bd30aaa9d08895aeaacccbbbb37fc28627e1
diff --git a/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5.ebuild b/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5.ebuild
index 2a3a347153c3..ff677829a218 100644
--- a/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5.ebuild
+++ b/dev-ruby/vagrant_cloud/vagrant_cloud-3.0.5.ebuild
@@ -1,9 +1,9 @@
-# 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"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/vcard/Manifest b/dev-ruby/vcard/Manifest
index 1e61966718c7..ce167196ee6b 100644
--- a/dev-ruby/vcard/Manifest
+++ b/dev-ruby/vcard/Manifest
@@ -1,5 +1,4 @@
-DIST vcard-0.2.16.gem 52224 BLAKE2B b8ee48d597e00fad376d632813fba61a22ae5b6b16ce3fc9c7b79839fd2f0d0f87b8bede3d3f6ebd41bb205a222fde540f4d3c46fcef8eb9b5a014ce8abf14da SHA512 33c8183d05b160e65a89747587f174dfa91b299c178c265645d271b54506734e818e3d3ac51a5b20fcddbc489b9ff910e321e5a1160f7b6254bc16faa185634b
 DIST vcard-0.3.0.gem 54272 BLAKE2B ed019b7f771dbe2da574fc059dacdc8eb5b5eca735abe15c2d8aec08b4f91b22c413f317d4f39f100bc78d16bf8e3edf0e0a99d55b8fbdda5b47315bc33d37b1 SHA512 5b54bada881f4d6cce66bb76c15b3594e310659024d163598f857c4c434379c57e07f28873646d0a5a5aecef4313c8fc731313e80df5542e982f333c05802d4d
-EBUILD vcard-0.2.16.ebuild 591 BLAKE2B 0e39e04e8bfd82f67653609e50044cc8bf51a4fcfa95b915d34287b7436e3b9e201a8fb9ca5f9fd198c4ff220db2f0eaa756d5b608cf8de1339ae6879734ea80 SHA512 1d9e39c12713153893dd6273d5cd8f9172c3d8a32ab29505561dcfdb1b3d2957797ff15f0857a6b6bfe9aff581e6a4f6c3687d47fcdcde08d76896d5affffce4
+EBUILD vcard-0.3.0-r1.ebuild 591 BLAKE2B c8db63e6948acec4414f00e547dfff36f951101d016f99321fccd5632f5b104ca389bb2d6622051c270030cbda244f720b1abc48ddb5269941a045bcdea8e87c SHA512 753fc140f2ee260b801d92bafe691c89c29e2b846ed5a310436eef5aa0939ee0ed566cdc6fd94d0e902fe79c639f5f3365c4ac834cf48d5ae9484468691016c1
 EBUILD vcard-0.3.0.ebuild 584 BLAKE2B 88d67fc0a866f92e9659e6a260679fe2f17fa4b1b2bd3cb1803d16879620c0b2ecf0b4b87807371df626bdf7f04b384677935218d92c052c1ed742e44be9ec18 SHA512 0d7e754ddacc0b0022e62a675232f57423547071477fd137676d6a2d9bd701f365fe163a57dd99a9b4ce6c452897fc0253ae1b4db6a1326d8c2b6363b8d9c86d
 MISC metadata.xml 452 BLAKE2B b78826702f0418a8800e83661797271fb5910daaa3b749dcc9490c158c45c621bc330df22df783b726ad9ed1d0f48f493a8bc0be00638b8e7110e08a95734f3f SHA512 2a4ce035d19ff1bebe679b5bc940bb59649514e9d44cf88855c7cdb1147d4bb150a2bf0e30f4db241cfd23dbe6bd666fa12c155ae3d5b6b4febe4a70ff2305dd
diff --git a/dev-ruby/vcard/vcard-0.2.16.ebuild b/dev-ruby/vcard/vcard-0.3.0-r1.ebuild
index eecabdc8883f..b292c1e31a12 100644
--- a/dev-ruby/vcard/vcard-0.2.16.ebuild
+++ b/dev-ruby/vcard/vcard-0.3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 # Avoid the complexity of the "rake" recipe and run testrb-2 manually.
 RUBY_FAKEGEM_RECIPE_TEST=none
diff --git a/dev-ruby/vcr/Manifest b/dev-ruby/vcr/Manifest
index b183035129de..3020a171594d 100644
--- a/dev-ruby/vcr/Manifest
+++ b/dev-ruby/vcr/Manifest
@@ -1,7 +1,9 @@
 DIST vcr-4.0.0.tar.gz 146920 BLAKE2B 19ae33d2f40821d2cfe5c0fc55d5e91e02b8e6ba2bba000c326d993987fd641dd5b4cedd6a8a441f86664ecb67dfe2501d335936af9271fa83aef6dc001b12f2 SHA512 2f98eedd021f7c125fc3f29189190ddc817bb95fc8e8e0ab53e65eaf94c5c0c41f3ca4abf9d829591acdefe97b931943c47129f95c21f2ef590ed500cc6f56f9
 DIST vcr-5.1.0.tar.gz 150438 BLAKE2B 615a0ce570da29be402f97dcba1ba987c611c73cc9ebc561683333c752d57c1c2f0acae78b42164d8c56f71cded150a93566d45c0c84153bdc3dc8bb37199e4e SHA512 5297e46b1ffe31c3559df57f0af158cb8064ba48b83702ea3bf12eca4c7260bcb71d3df7ae645a3cc14817366992458beb4fd9771c1f98a56835dcd69ff107f9
 DIST vcr-6.0.0.tar.gz 153423 BLAKE2B 95f0794af34d4ce21c0ed3b3a77de64300fd3c844919624cd6021c2e74687d3a66b7d4f73b2b040f90774d9cea0305563cdfaab162b4a1df842f2367e72f6209 SHA512 9a19896ca4f5624c6e74772006aea4dfda0527d9ba733ec0d90418c6234fa5684121be1258badcfd647739cb47dbaae556b8c2e2636f309a79ea94e8835de40f
+DIST vcr-6.1.0.tar.gz 153296 BLAKE2B b34fbb88458bca2faef0b7bc801f664eb7b1ed79c09362f0fd1ed25da9d768098721cb45edbf6801cc63d9c78c8d615ef8d468daf5757043cd130de2b7029859 SHA512 62ab8abfe8e0dff391df4e8874bf10315aa58baef1cc28bb60e5fd63a207bb054a3b253dbfc9ad32dfdfe7d832557c262cb0139178fb778b77150def77214a68
 EBUILD vcr-4.0.0.ebuild 757 BLAKE2B ce86dd663d034dcfdd9f8b4a6ffbc1a9f6b58c74df593a47527fa1cebcaff490e6a10b41cc15e9c1a157d7e25dd8fae80ac2a1d706df1bdd6fec03527c036603 SHA512 f55409b5672d06bebccca4eb81b04e169d625db21fd43005c6ec1e50d339bdd37dbe3e5b416a1a11f3345586e9750e4f8fc02ad58205d6c4de6d04f2c2d1d4a1
-EBUILD vcr-5.1.0.ebuild 787 BLAKE2B f9049aa0abc31db486d4d2c3b9ae551a5dbce57589a9874a17976136a6e0653c5d6e2fa3731f45a658a30c8ff5746bd239b002f40d94c50d7738ba0e84e87b44 SHA512 741fe620050fcf66fad5c144b5c863c48efd0ce752a865a70e29fc12e0d7c762fe23a7d9b71b090adc951a9ab58030f052c00a3de7326a701cc6bf107eaceda1
-EBUILD vcr-6.0.0.ebuild 781 BLAKE2B 6a73dfa61abd04694d65357c42e222f307443dcb808bd208f8511f525f13da0e84f7bec6cf084241cd96d768c6c6e46c87d284113788a0d9a9a74ba8b3c31f2f SHA512 7a8bad31843051aa6a67dfa4b220e073a97858b3127c5c495b3dff5c2af8648db894476d902183cc893fe5d808bca7d7a6b66be8037d8853e6a2a2dd53a06638
+EBUILD vcr-5.1.0.ebuild 780 BLAKE2B ee40daa44cadcd4fc1045aa744dfea2aa9da0c882ed516af5123e3d0f1779892375fd134c0b5592cdf9200fea902f1dec8e5417545397ec7fca62811417bc71d SHA512 bdcb20c50b26f81de30067208fa60c31575c97083ba2e4ce5ca6493e4bbacabb46d4571838311b984cec4973b44eb31d0d36de84449de0028e87a9a39c037254
+EBUILD vcr-6.0.0.ebuild 780 BLAKE2B 2d407c697feeab2b539811f874f22c18f0545ddf2876b00ce1baf6accc62f54bd6fffe587e2ac7c71d2a86f3908a56f5dc1e2bb53c5e3926c12717c1a7b04e16 SHA512 a9257d928c39bb5ce6e7af37cc489c7252e267d3daea4bf4aa4309d72f23557fff088ddc1cdaa4be4c439c0fe9c5b2aa3af3120ddeeded7ed680680a85009229
+EBUILD vcr-6.1.0.ebuild 788 BLAKE2B 84dc56103f9a61f82278283fa5bcc46f9c044f6569064de69e4343e7091bae4c91c36d5e207fc0e2c68a24201ea9947da0d99eea0525f0a081a4ebb32ae3ebd0 SHA512 ec970ac7e81ad9b03c80c10632e40dbca15d0ac4d53098de16ff3a379ea08c1232c7e580412d892a3a61b6e1fb94c24b542551244bf69789f79edc64f31c6772
 MISC metadata.xml 435 BLAKE2B 79e71186140ae8aa7f495640d1fc8d4227bb15419296f6d8ea72ef1cf71778e06df69220922c5e5754cb38f4d28b4604e5ddea955929a4b506e9773e68562ed2 SHA512 1d4e7cf1f4795c030ae746014c2a696d302cc9d5ca7d514601848f231cc728b0e186498f82cee1df12d9db9e5628bae90216c802190800d9ef12d6f4a06d46dd
diff --git a/dev-ruby/vcr/vcr-5.1.0.ebuild b/dev-ruby/vcr/vcr-5.1.0.ebuild
index c6e6cd0a24d1..e87e47f815cb 100644
--- a/dev-ruby/vcr/vcr-5.1.0.ebuild
+++ b/dev-ruby/vcr/vcr-5.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md"
 
diff --git a/dev-ruby/vcr/vcr-6.0.0.ebuild b/dev-ruby/vcr/vcr-6.0.0.ebuild
index b87ac1a48830..6f57d8ff35ef 100644
--- a/dev-ruby/vcr/vcr-6.0.0.ebuild
+++ b/dev-ruby/vcr/vcr-6.0.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/vcr/vcr/"
 SRC_URI="https://github.com/vcr/vcr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
 SLOT="$(ver_cut 1)"
 IUSE="json test"
 
diff --git a/dev-ruby/vcr/vcr-6.1.0.ebuild b/dev-ruby/vcr/vcr-6.1.0.ebuild
new file mode 100644
index 000000000000..bd3e418c167c
--- /dev/null
+++ b/dev-ruby/vcr/vcr-6.1.0.ebuild
@@ -0,0 +1,26 @@
+# 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="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md"
+
+RUBY_FAKEGEM_GEMSPEC="vcr.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Records your test suite's HTTP interactions and replay them during test runs"
+HOMEPAGE="https://github.com/vcr/vcr/"
+SRC_URI="https://github.com/vcr/vcr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+SLOT="$(ver_cut 1)"
+IUSE="json test"
+
+# Tests require all supported HTTP libraries to be present, and it is
+# not possible to avoid some of them without very extensive patches.
+RESTRICT="test"
+
+ruby_add_rdepend "json? ( dev-ruby/json )"
diff --git a/dev-ruby/vlad/Manifest b/dev-ruby/vlad/Manifest
index ea35b0716e01..ff6a00a39192 100644
--- a/dev-ruby/vlad/Manifest
+++ b/dev-ruby/vlad/Manifest
@@ -1,3 +1,3 @@
 DIST vlad-2.7.1.gem 29184 BLAKE2B eb35f357d87daaf2903ca880139ac41c1725419fb6f0e3d00e1a31fd24697373c8d4869e31d17e6dc88ce31ecad1a0747ee2ec08a31871b4c44b32dce28424bc SHA512 520ef393fdf63daa348015306003cdd3bd9b8f162b44b31d78c170d1ece466b804226b030640a180a8538c6908c77d80dcfc13078ce295a6c59f1f5b9df9ef13
-EBUILD vlad-2.7.1.ebuild 675 BLAKE2B d1e46f2d90d31b5b650cd2b9b0d430c7d9fa6a45802d4937ed2b454f29840decc78361130ff752233932bf487f21cdc17d37af7f969f4d4a7030923318a0d923 SHA512 a42e70003ce2d8408451388dcb128eeca6746c320556a0ff4b50732be9babc05246acb32e05291b6c55d3a206b5c188c2a41152ec9a5d4134d5efc3f6c6876ce
+EBUILD vlad-2.7.1.ebuild 675 BLAKE2B 0ce9d7ba15d21f76e39c12844483284e9f89dd5a622cfb471cf6ff51b7dd26ce727ba11b93b6ec2003a415d47b2a8c67a9d01a73c10af997120e37eadc235fb5 SHA512 f7b6553c381dd699c8abf53fb5e9cd9953ca527163dca580f2361e8545b2a1bdb8ea0113eaceec44558555eefd6de0d9e7006a13f27a00b78edc815e9838bf19
 MISC metadata.xml 331 BLAKE2B 661624a43915d8fcccf94036b2085e1cf5b45d3a8fded8338e67b5002f06e4efe6b8e26313dcec8a63c69b5fcf79d655401f77f3da527369e890e66e48d7c07e SHA512 e8a7f5a1bc506da374286f878db036c3faa9716f88cd9b73c88d585a98a35fa051749e93555b5bd8a6c2073f3ae77707358c4129d2f4061ee459e563c529fafb
diff --git a/dev-ruby/vlad/vlad-2.7.1.ebuild b/dev-ruby/vlad/vlad-2.7.1.ebuild
index 6b4dfb2f47c8..2f3a13270c3d 100644
--- a/dev-ruby/vlad/vlad-2.7.1.ebuild
+++ b/dev-ruby/vlad/vlad-2.7.1.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="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="considerations.txt History.txt README.txt"
 
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index a559e2a8abcb..8a171fd1c7d3 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,3 +1,3 @@
 DIST webmock-3.14.0.gem 126976 BLAKE2B 20dd463c8b784869d4379aeabf892a6b4602091a4cc01a4002161d88f24781bb2bae1e50bd0ce8077c40aab73a2243835d99551bd04d808ffdf019df071c2b01 SHA512 0c9ea5b29446de7619c45d0fb72ab305bf68150c9d657ddc223d0d258a400dc730e3fe401b46c994a5c8eb450db5ee8f7021fe8d2d6c85bc4723c657799c5ccc
-EBUILD webmock-3.14.0.ebuild 2225 BLAKE2B 033a3a0e7fab4a66212704bb0e7d4e207a46ebe58681aa0610556686f2910fc21c0529c92a0cb74291ff3f270662316ac55b85358523c47dc5046c650f6973fb SHA512 f3e085b83b15c551bc103378d1bf9de02fbdc51d40c9ef6cdbe32d93df644cef5d7767d617a45a681b568b6b7a93482220fd14583155070027b1a6ad28c17990
+EBUILD webmock-3.14.0.ebuild 2237 BLAKE2B 3235f6789907f086c6cf329f4e31ed234e4f149c7b3403c626ae73153c1f3667202ad876fdd53d99563dd9a291ae0d51f10a2ccd094e8ebb1502f5bc1a807275 SHA512 0debf00d28dccaf7d1dfaa64133c0d6ee48066cb100551012631b1f53bf66cba62b96eae003aa66545b87342e534420384f809b300e7ff386863369437fa9365
 MISC metadata.xml 342 BLAKE2B 0f0b9d59bb3519e6da06fe5d57cc9ce3cc1f3a1f516006a3d43a6cd3c416b3b5d9d2955a7800a588010b9672f3a03fb6a74bc62c3ead8b2e0f0b3ce0f5af5456 SHA512 0c4f9ce8deb018a77c7ec77417a22d3b95d0701263acc1ff07081e4e7ef995051ad2eba387962ee06b4bd810db5da7e2294e1ca7bb9a50704f7d7265b8462997
diff --git a/dev-ruby/webmock/webmock-3.14.0.ebuild b/dev-ruby/webmock/webmock-3.14.0.ebuild
index dfaa9b33e9e3..14e65474461e 100644
--- a/dev-ruby/webmock/webmock-3.14.0.ebuild
+++ b/dev-ruby/webmock/webmock-3.14.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/bblimke/webmock"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+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=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/webrick/Manifest b/dev-ruby/webrick/Manifest
index f0d3359f0130..ceafa421c69d 100644
--- a/dev-ruby/webrick/Manifest
+++ b/dev-ruby/webrick/Manifest
@@ -1,4 +1,4 @@
 DIST webrick-1.7.0.tar.gz 114413 BLAKE2B ff0d09a3137edabde37392d4c8a5e1f37d9899c60db8e96e4034ef60626225c0508c6b2797281878bbb7a0c6db16e20bd46a83b61b3de2ed059cb95e80255a38 SHA512 785e8c6af6e2f8ac497bab6d0ad0e9383fa4c4ac8dee6ceee38e20c5e9b631b805ec3c8f5438ebea651ee4113698de1a370ae506927bdc04e512ea6cac433cd1
-EBUILD webrick-1.7.0-r1.ebuild 763 BLAKE2B bb3fa03ae28eb083c36d169c96fd41a78438040a5c6683fbf9451749a9a3fbffe1a423978ca6d0f1883d7230674396f2ced586ce86f4dc4c5ed0c763267c3cd6 SHA512 ced470fb279e3dff50e761d68f4d25e0512364d47613d21f734a93732e719b8cc8a99aedb47f7a55d1f96e438b730ba98ddd366dea6147f8958386add32f193a
+EBUILD webrick-1.7.0-r1.ebuild 770 BLAKE2B 78488e24187be0bc9ed296eda925e371bc4dc3b7a5b02bc41ecce276828d7f51ffc41d0842a624c79a055906b4fe11419c65369a5de9d502fb7d1a19864d7540 SHA512 bf6fe6372db6e91af513bb5b255dba9fab059798a1d3bfe00442aac7c32bd19a5205ffd4a74e10bbb599a0f009c294cd7fb47da52bc5bbd2072640bdf1e6c187
 EBUILD webrick-1.7.0.ebuild 755 BLAKE2B e0ea0a032e26ee51dea80db46f60df4ad19e82a30d0192e69bea26bd2704a496a89e8fbd9b1e197357c852b1423830a9b6a71ccf5cdbdc74fa1dd9d88cf0be32 SHA512 0ddbc1917d25e88e6b61bb3797269e22a076b1d27e5b2e068d6cb6f921146a8efafd264fafdd92bc637eeee5403453a8b2a14a95ffa013a6e49bffe9bd103815
 MISC metadata.xml 339 BLAKE2B 818ee09423c4ed53677cff830ae592234879035757260fa554871e0180d47780056eb8c301678428928a841638059507ea2b170abd758f8c73546fcabd675b49 SHA512 4abab733deab5e4609430f0d51f7634fda1879be7694720e683b0d9972691f41dbfe7fe9e7d252cddb9ac5a449bdf521b0d3b10acdf510e02c3b3a8bad578b71
diff --git a/dev-ruby/webrick/webrick-1.7.0-r1.ebuild b/dev-ruby/webrick/webrick-1.7.0-r1.ebuild
index 16b7d4901641..9c01c9f4e840 100644
--- a/dev-ruby/webrick/webrick-1.7.0-r1.ebuild
+++ b/dev-ruby/webrick/webrick-1.7.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ruby/webrick"
 SRC_URI="https://github.com/ruby/webrick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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"
 
diff --git a/dev-ruby/xmlrpc/Manifest b/dev-ruby/xmlrpc/Manifest
index f32ddff737ed..78a39b7de179 100644
--- a/dev-ruby/xmlrpc/Manifest
+++ b/dev-ruby/xmlrpc/Manifest
@@ -1,3 +1,3 @@
 DIST xmlrpc-0.3.2.tar.gz 34780 BLAKE2B 9aeabd5c2549bd36a28bb56162471e5f822f873e3f976fa101a8fe26af9b0ab72bcceaf7b9bfac5488f315f79708db18bc7c507360aa567d95f136fe807084b5 SHA512 9d594971211d556f19db86e2bd5f948610342dbcee031e58cc83bc28c44bb02c54a8c00c44eb15bd96daafe02859a894193d5e507973a0a1df36251138d4999c
-EBUILD xmlrpc-0.3.2-r1.ebuild 965 BLAKE2B 2416f8591ab044f70ac3ee33e03e5dc3a4ebacac26d89fda1c4fbf02911dac47d8a2f92233ac3c375ef491c351cf603680a45beaa4a4fb009fa90e873fad0d76 SHA512 67ba51b9518a8271fee72c1f197f0d263bab095632a770c88690f98a65eff4a5a90408bab2f16f433c3dd2fa80a030ccf5de0a2b7b64579bc0d6f49e05f38aaa
+EBUILD xmlrpc-0.3.2-r1.ebuild 972 BLAKE2B 692f60042440b7c905f530c054b20fd84f3337dc57c1fbf8744249d0f9589976652684a98d2ac46ef38d9e72b6fc4a6b07baea45ff76d7eaf12a6bd8b0657949 SHA512 7ff725379596537da151174ccbd66536400b9d39546986c222cca4371649af7a46859cf7a3effd9bc976fc0102ca9452f4862779d8d5eca1fb42d92b30970816
 MISC metadata.xml 338 BLAKE2B 71a438aadd85d67a6e64437e330a9a58458c5a5999aeceeb7cc4db5d14472c5572d642f0a127c3b19a0c6a002f56de58f96b8ed9285b80703e9aad146763ddba SHA512 a14b96828c27fd202324dca423fb2f733e6a6a19d9f6c9ab8807bba60a75c75056559b6a11117f850fd9f8de3521d2ca180437f855cf4958a829c44c685fc2dc
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.2-r1.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.2-r1.ebuild
index e92b540b700b..16c6efc21eb8 100644
--- a/dev-ruby/xmlrpc/xmlrpc-0.3.2-r1.ebuild
+++ b/dev-ruby/xmlrpc/xmlrpc-0.3.2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/xmlrpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby"
 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/webrick"
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index 41668fb3aac0..82215ccea7e5 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,5 +1,5 @@
 DIST yard-0.9.26-git.tgz 930901 BLAKE2B 19baaefc54269bbc7eee053b42f2be85644a062cbf55b0fafb63748876aad3a3143767855f4ee7b10a1ae814110a6cf63c01e4055e054aeb31bf8512e793d80d SHA512 0f70a089d5e5ba33e326b0ae0cc84a2cacfc5a3f3080545d5fc5bb324dedbbbf65116cc9412b3496c09b2b6c15514e854a741a1fd7e2ae782804d6e4ac28fcd9
 DIST yard-0.9.27-git.tgz 932022 BLAKE2B 7390e81081c6785cd7174b9ece57dafc27a9762f0751f05bfc222d561c6b6f5a5ff1a757fc24020a6adb2014c3e77696b6e8c054f7f6918120f6db435739b977 SHA512 20f406234bed52eff254c1b1dd0e3dcbc08109e9a285e4e4041c164cd998ae00654d2414e0e442e3a9520afc5cae2c1bd5010dd25fa38ef16ee21f077527aae4
 EBUILD yard-0.9.26.ebuild 2058 BLAKE2B 4950a872e570df40aadad0bf13a59ab99bfe09684dbc8eb5146f0dad2ce9bd7512cdd576abc1e3b7cfd9db512c08b9ed0629bffd828d40c7cb91bfdf561b54a3 SHA512 efba53869ead017865a1f44e904343c3b5878d8e53d1323a1e9bd6e348d4235557ab8fbeaad40ed9b715d76e239dbdd70a394275880e139e2b2e4b48c6e328cd
-EBUILD yard-0.9.27.ebuild 2101 BLAKE2B 6956acc2fd4b44238eaccb955a9e1359774f162f4539259fcfb46d79841070c03e7dc4206a04a9b66f9fce8d3e9c4bf341c2f23d3af96baf594df84e74b78b5e SHA512 19ff65008ae641ff25492cd6ce368ee2d9fcb7c54957846c89417bb01cf1f8e1447a93298c187e9b18c5513880a2153c3bb6105d2252fea4c0b9084c6992fdf8
+EBUILD yard-0.9.27.ebuild 2107 BLAKE2B 310fadf5ef71df24d357e26413cc57de82edabd99da37f74c0eccb26ad4d41bf182ea726ece7313d11d396a6a6c5c3ac533bf5ebb2d69d8b3eaf9951be3504bb SHA512 afe104124991871f3e0be67d8acf79abb9af269ff1f52d6a5f81b0a1b1ec74a563b81f4321af255118584d4b49acc93ed92ea362262f30bad9609cfc31db3228
 MISC metadata.xml 338 BLAKE2B 17efe658faab09d5935ba472a803a1267f7606a44b157f29bcdecc8cea8af90902ae47012fdd4426357a8ceba5526ca24d737be8fe161c34e28e5362ccc94f16 SHA512 d1f45e2202c86b247b1b872ada72fef392d20260bc3ccc78164c26614dc80b8fe05518356248e3e7f15e2c70b29a9c0909bc738267261eb808965bcb0ed4ebc9
diff --git a/dev-ruby/yard/yard-0.9.27.ebuild b/dev-ruby/yard/yard-0.9.27.ebuild
index 7b006c35f664..15fdb9edeb19 100644
--- a/dev-ruby/yard/yard-0.9.27.ebuild
+++ b/dev-ruby/yard/yard-0.9.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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/webrick-1.7*"
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index 20d40a46522e..49d7c2370f8c 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -1,5 +1,5 @@
 DIST zeitwerk-2.4.2.tar.gz 99974 BLAKE2B 5913561057a6d5cd9bfa4eb549770ca18de3aafa1549a40e5315cd1d71a2dec5f865e7bc79f6ab2a098e515a930c5f8c83b85c91d7dbe441fa8dfb08ffdbdb03 SHA512 774cc17a8732afea0a854ea22ec860fa5bca65e8743aa800017c06a251dfdb1d2c5af8e541cb56d22a4202a9faa42707ed2ad395d9472360cf64f46ce9b907f2
 DIST zeitwerk-2.5.4.tar.gz 109202 BLAKE2B 4c1302bdb6ac30afbb23ea06ef2ac2ecea9c8139c36f1b766ec6f62bb6a77faf1efa3f670cb31b5073a6dc36d6a0bd8d66a937d8b84b12438411a7f2df29eeed SHA512 f7a4b88c030b2eeae5ba07c6e01900fa66312a58e5c9da3d13a293d0959d67bbcfb385de5790e1764188752dfc9de161c202b35e0e35ed6e0cca7bbc2c2f6c83
 EBUILD zeitwerk-2.4.2.ebuild 900 BLAKE2B f944c93347913374c6f1d50e4cc48d2c499fd6fce7b10f411795fb5bb2708262fda6ede489ae3c32e6b8aa03f3f933d3f878ffc6e928c491d5ced3c203e87e98 SHA512 99dffffb4ed0dff209f0930224cd63b552ed3a3c8f229976d2887ce0cefd4132851e0aff0bcdbd1d8635c1cd35a255d13ce77824a802ceb217a7b1a62dea3748
-EBUILD zeitwerk-2.5.4.ebuild 902 BLAKE2B ce1c6398222dccd2b9501722ca2c6ffa73bf20f657f04debe53d7788ab4e9221396e278523f0979b366146e9c72c12952434effd5f8e0af948c28715814045ea SHA512 e21c17c3802ba22af9e09eb8752df2d1702cfe7f7150bc409f3addf60a953820be183fe1d9d6f8f60ed5119e59eb2d2cafbd40fcdea06a2dc2e2e363ab3e8f02
+EBUILD zeitwerk-2.5.4.ebuild 915 BLAKE2B d07f14403ae6a30d5920e88da5d1bc9de459b4dc6bbe75b5e9616427f07d207bf5a4f2d15ae9b39192ceff1e2c31d98507af462bc565d9afb8071dd9cf268ad3 SHA512 02d5e9ed4e43cc5890150e3cbc1c9a320319b1e2f06bb1cb5a7a4bbd85b44109424648def0e96167e05a7be70c292768c5dafa2625e4219ecd7297da5fb0031a
 MISC metadata.xml 641 BLAKE2B 27f5d9950eee9945425ab5606b78e7c745345e49dcfc201b55bf52693b3882d44206a82af09134696e694e524202d9c43f642c0854bdcf640356db8f8c84972a SHA512 b744fa895c31a93a5566151b3b3d73308ad41a7b43638ccd9aa00c9fceda495279d32f56e9c68cf44adea06f0e6842e38324c2f20b412e46f05b78c35288869c
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.5.4.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.5.4.ebuild
index 246ee24343a9..4f75e8c49b53 100644
--- a/dev-ruby/zeitwerk/zeitwerk-2.5.4.ebuild
+++ b/dev-ruby/zeitwerk/zeitwerk-2.5.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bundler )"