gentoo resync : 24.07.2021

108 files changed, 387 insertions, 659 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 59d1d9edb5c2..44ed7367308b 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/actionpack-xml_parser/Manifest b/dev-ruby/actionpack-xml_parser/Manifest
index d3597c0f2456..cc962c422440 100644
--- a/dev-ruby/actionpack-xml_parser/Manifest
+++ b/dev-ruby/actionpack-xml_parser/Manifest
@@ -1,4 +1,3 @@
 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.ebuild 965 BLAKE2B 2671125c4de6d806e39e4269c9f1b745da007d263b929091502e13956bc9f58fe4700cf014ebbf56093f96c9f1a87e952a810c98c436a6da7b04d8de269bacaa SHA512 281ab37e0a48485ad1d75d7be5e06d18bacde945f0c13f52b8034d9eefc8fa93f65fa7b7fdaa385d99f38a398efaf153c585f5ea0651f31707cfd66b71229522
 MISC metadata.xml 343 BLAKE2B fae09bfee8e2838dae045fb6920229bf6d0d87affced294d61535b221af86767fc95fec8a7f5f87832d1948e50165369751b6450b84b31d0611e72cb0eafba19 SHA512 2e931999edbe73e74146107d2a75df2050649d682fcbba40cb877b742af15de0d0709a3acbee03722eff1bd1ddc3619a3c2a61e976a526f34f1bbc3bb0b87593
diff --git a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1.ebuild b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1.ebuild
deleted file mode 100644
index 48e5bf081edc..000000000000
--- a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-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-5*:* =dev-ruby/railties-5*:*"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" Rakefile test/helper.rb || die
-	sed -i -e '1igem "actionpack", "~>5.2"' 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/builder/Manifest b/dev-ruby/builder/Manifest
index edd8586e8cda..c862b4502328 100644
--- a/dev-ruby/builder/Manifest
+++ b/dev-ruby/builder/Manifest
@@ -1,5 +1,5 @@
 DIST builder-3.2.3.gem 31744 BLAKE2B be970ffd29f146faea5e7a9d76fedb513ce9bde3ed21ed7a44fe7d4a81e3836cecbf62f3f4c19f0b1e333f607b8978d9c707f4af76613592e966cda7e537bd1c SHA512 7869f44bcf40d547846d50ab82234694420b2f38e08037ae671c90a7c3b547f11023f864e70adf82970fdddf7ee811730c17e30ec298bb6d1999f4c0c050fbb8
 DIST builder-3.2.4.gem 32256 BLAKE2B a2768fe25023631d134f062d8e7ff2aa25f6b4db0358bdc0d4baebb33d93673fca66049b8b9c42382bad3494f6e03cefdedc72d71958dff63d43eb7a2a187c75 SHA512 730317ec0a4af33e183283e309e38d47deb08db0ab6bd6dfebdedcebb7470bd383c6c1d32ad674adc43298e0f86930b97c652fff9827ca8890db2d1d68e792f1
 EBUILD builder-3.2.3.ebuild 849 BLAKE2B 9d7bd80ec5701eb1f2fe664e9b80df6ef0ee9319d2fde95f3eda430b714e6ee41ae7ae3108b0e7df02a34123603a5878e79c6645925bd8ebdd2a87116252b869 SHA512 5b764fc76d45cdc3fb799c07209ecead308e1892ca88820d99d120616f826010149f7a08d9c2a16fd94afbfbdd0988c50635b90feef7e70851c52337a6ffde37
-EBUILD builder-3.2.4.ebuild 813 BLAKE2B 918520f9a03bcec9879d9616700dcd7d75ae4bb4f42cc198f29c2e777382fd3b4df827e33d1b247884857d3a52649e060a45b68d035318eb59391c5da21596e5 SHA512 bfb38e0b001097933833ca3f090c8c05daf569acc5bdc2573a640ad130faf52e934a07300d09e850b27eff33e81e3a63bca6e47a929b8da71349ec6184bd07a4
+EBUILD builder-3.2.4.ebuild 816 BLAKE2B 02bd3df41075391dafe023b98bd4ccdb7c9904a9a195a6993e602db68b988ddc9219160b3c38159badd0dd267882b9f287a9bf6628cbd6fcb81e26ad1375af60 SHA512 af678dba4d691f4c10b855206e24aa35a3845a4af01e98da3f77825e303df6bb92a5bc1a99d53d3983f3891fd29869fba7dac8de42c86584840f421d866d9548
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/builder/builder-3.2.4.ebuild b/dev-ruby/builder/builder-3.2.4.ebuild
index 7ab39f402cfa..442787e87876 100644
--- a/dev-ruby/builder/builder-3.2.4.ebuild
+++ b/dev-ruby/builder/builder-3.2.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://onestepback.org/"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-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"
+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=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index ddcf910bed0d..c6c43fec1dcb 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -4,10 +4,12 @@ DIST bundler-2.2.18.gem 390656 BLAKE2B f06d2e08134fa4e3fcee15de648121aa39742fcee
 DIST bundler-2.2.19.gem 390656 BLAKE2B 212e41d2f5f8e9b689265bc0b3294d25c0ffaa681f63b8c4595d72497752b0e01f4477348699e568bb003b812fb447bcdca6e0933d91cde3680425db3608aa01 SHA512 692460145ac7ee72a5093cc1d7ee4cccdf67b6a7da4006019960c212a147553d447f0218dc15d5e3560ff5b901cd90849e40d5d9c66ad6d098be5de6fa649425
 DIST bundler-2.2.20.gem 391168 BLAKE2B dc53699a56187fca399216d02de5a669bf6f78301b9095eef2047d353c9ed8b33a83063d2a2afec35c445de3d37ef66451c848909150a1b9802745f6d53bf724 SHA512 2e5e651c2bcfea91f6bde57ae635b62e28bed3f081afde33f77be9adb040aafbe61b48f3e4cd6555bc65ca156bad19d727084d8bd7ce8da130c25ab8de00e090
 DIST bundler-2.2.21.gem 391168 BLAKE2B abed6993e00c4e0ea6e0b7a19dc2b48dfd110e00ad47cca77c66143c61fe8b95ef3b4964c3b0d8ed74ff2e49ec4e3b44876f5a692ad0c16ad5d5b9a5d56578da SHA512 2905afc06402cf3f07da1c622279963b4aa68d6e91f65fd8542434fcc2f7ac820abdb24422523ce1089a234dbce6189dd7bd60e509da97d385824fde8f85b892
+DIST bundler-2.2.24.gem 391168 BLAKE2B 2b70c476d2f0e400f52bf5d6caf2ad06394c3d7bf0f3abc7dd9c3b62cb6c4a1c8621589d908c39f7f434e4b204fc4c63e4f40a88f8dda55e7ba9ecab9785867c SHA512 ac50c7d2bbcfa0903511fd0b9a56ebc6da67b0bd54da67ff2f23bd8a60a90f384b6b231e8ea45588a10758d889e561ed5a12866d879c8f47fc289f0a7e650f3f
 EBUILD bundler-2.1.4.ebuild 930 BLAKE2B d544c059292750ec7a8b094c0070db97757046fef2f966b929eb28669ff297a4e9012560199d313aa7b0090f60ab7a05746eb0f72feb24f0d9248547ef0bee52 SHA512 59bb513b6dbd329255ff208b1fce606ac1f812672c21e92f7c962b5334dd2d3b124ddc9e0dc2d2b3e70fc1d1a8fa659389cdbcb59edaae145f7d25f6a0aa7420
 EBUILD bundler-2.2.17.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.18.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.19.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.20.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
-EBUILD bundler-2.2.21.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
+EBUILD bundler-2.2.21.ebuild 912 BLAKE2B 4174d8c35153e8ecf844cc7492b9c1680a2ed1baaba0d63f4b120ca516b9962c94bdf6a8b203d7a04704a860c1f24548296fd95c0ba6d0a6d848e5fafe68c7f2 SHA512 2c267c6a6017b2ff21f63b17186479748d5abba28f1291879d998b0e3031f258cfdfb6a752417208a60efeb49dcdd7c0133d090add733e3eaea1722d6718443c
+EBUILD bundler-2.2.24.ebuild 905 BLAKE2B bc9f94a4342ff9431d94c6e85a31d26727d385032caaa57ba9eaadd2ad03fd9f31011e9992499f7c946e3417c46b48695256a4d54c8bef4e9112ada21e9aac5f SHA512 33078fb7351b4384bd3db2006823d1bb4bccbf3f2cba280d3d37e64eedf38f0adbf575cfb0c056d401645e79b2af326626d3b0fb4e2b1b67afc3b122379344b6
 MISC metadata.xml 342 BLAKE2B 9247517894a366c8b67564e015ff966b22eb3df924ec8438d9886ee854d922e376a274e1dcb455e23451febbb1bf4d8f60023e6b7763cd42772749de1bab372c SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e
diff --git a/dev-ruby/bundler/bundler-2.2.21.ebuild b/dev-ruby/bundler/bundler-2.2.21.ebuild
index 8256c6960865..14e7e3032791 100644
--- a/dev-ruby/bundler/bundler-2.2.21.ebuild
+++ b/dev-ruby/bundler/bundler-2.2.21.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 ~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 ~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/bundler/bundler-2.2.24.ebuild b/dev-ruby/bundler/bundler-2.2.24.ebuild
new file mode 100644
index 000000000000..e03102a40889
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.2.24.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+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"
+IUSE="+doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/c21e/Manifest b/dev-ruby/c21e/Manifest
index 1695047d05fd..432fda751cfa 100644
--- a/dev-ruby/c21e/Manifest
+++ b/dev-ruby/c21e/Manifest
@@ -1,3 +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
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/c21e/c21e-2.0.0.ebuild b/dev-ruby/c21e/c21e-2.0.0.ebuild
new file mode 100644
index 000000000000..965c35068fb9
--- /dev/null
+++ b/dev-ruby/c21e/c21e-2.0.0.ebuild
@@ -0,0 +1,19 @@
+# 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_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Run cross-platform executables"
+HOMEPAGE="https://github.com/cucumber/cucumber/blob/master/c21e/ruby"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index a5d0187bf8c7..d747861eea7f 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -1,9 +1,7 @@
 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.13.0.gem 69120 BLAKE2B 394f60d9a3acfef44eacef356908d10d5c7f64010d644fbae988e399b1b8cdd07c1d93b4a6a4894816dc94bcf61180a2bd5f4663b1f014a64ae07ffb82252a90 SHA512 fe7cba9ecfe54d9f8c557dd4e1f8b1ed1269c7aa1e8c687d55fb035b3666ff92ee93895610f0582d139dec56a78c84754208e2aa99d6fc3f4f46c3d45142e2d9
 DIST capistrano-3.16.0.gem 69120 BLAKE2B 3e1c4f639c2d5cd36ae305746f53e68350d5eee39fbd5c5ec828ea5b69f47a3a5f8b4e6f4b65de2e24717f71cf4a9443879fc3d076474ab020e2023372085180 SHA512 ec5aa465065cd115f0a1b7db06b7c68f2034e81feb3b814b730a6aca464756e545fd5c065ea941a3076bb637448e2a0f04aeb56de2578cdf22a6f208d27a2219
 EBUILD capistrano-2.15.5-r2.ebuild 1233 BLAKE2B 224bd9e8f1429a7857c2d00fcd49ce5c4a5938926f718e676687437b15990d2437752f974e3967ad3562d4f49b2da1c57cdc44f60eeaa453f956478e3971edcc SHA512 5c8278e6fa7ccd6fdc8db10478396b6dc00aac73f36d37229d3773a5df43c4b79982390bc44aa7ac0ad7f32280d41f00c2c4b0cc5a045c393ee37062fc9c51cd
-EBUILD capistrano-2.15.5-r3.ebuild 1243 BLAKE2B 3fdd7e2c2b26a39b2f590b82fa5018d2d95276892fe8a7479d790ec5beaf27c864bb4e4e627059bcdb51c8b184dbec15edd0bfb9570d6f56f4cbd04b22913ab5 SHA512 260ad225666f8229de86fc34f3b69414e9235fd44c80933feaafa4ac5dc1f85e3c7eff574c6a0246b2ab525c79b6ad4c0475588373060bbe30897472d59a616e
-EBUILD capistrano-3.13.0.ebuild 925 BLAKE2B 4646005c51f55dacc6142c68f5fa35c6a9b35fd5cacb4f10f5c7d1bf662f2a005d53caa97d7c2d859145f5c0d79ca1a6c2e3d043edecc8a59dfc0a100be07112 SHA512 e5a5475335242113c096e4945ba74b9667d84ce0146f605aca880d4317b770fa1f2ea4773aeb22504cd7be9cdb394f9dacd056f6ed477980d9a9e575acc8561d
+EBUILD capistrano-2.15.5-r3.ebuild 1242 BLAKE2B 844be23d3f0cb937c4abda2aad1789096462a24b3b68c41e0a593809f0eb8c20330a7ce31ee1484e00592a6d7b94752a5b911f278e3080c6b9f10997eede3947 SHA512 3aaedc46b4633aff5a29f178e030d9b55f01189dba8e6019f082694f0aeedf7b11f78c5c9b9c90d346145413a1865c8df59e97ca75a968b6db06040d66035bfe
 EBUILD capistrano-3.16.0.ebuild 925 BLAKE2B bc050c047edfae2e35d848149c247626aab342d588798355d85ec1cb17b60aaa0fc015468a0ad0c1d8264db412e6c963592aabbdef393ff5e0e218efd9e614a2 SHA512 3ec663167b9bab9dfef3cf44ffe55b3ee210d1e8f4bbbfef339211016993183167af5c13b5af13ef3fb987c7b735a629c358d8249f4ae4d4ba6a9070d0fb6215
 MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/capistrano/capistrano-2.15.5-r3.ebuild b/dev-ruby/capistrano/capistrano-2.15.5-r3.ebuild
index 6beebd2f0210..1aa1107403c9 100644
--- a/dev-ruby/capistrano/capistrano-2.15.5-r3.ebuild
+++ b/dev-ruby/capistrano/capistrano-2.15.5-r3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://capistranorb.com/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/capistrano/capistrano-3.13.0.ebuild b/dev-ruby/capistrano/capistrano-3.13.0.ebuild
deleted file mode 100644
index 194a24709889..000000000000
--- a/dev-ruby/capistrano/capistrano-3.13.0.ebuild
+++ /dev/null
@@ -1,37 +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"
-
-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/coffee-rails/Manifest b/dev-ruby/coffee-rails/Manifest
index a1faadfb62b4..5e4495dfa551 100644
--- a/dev-ruby/coffee-rails/Manifest
+++ b/dev-ruby/coffee-rails/Manifest
@@ -1,4 +1,3 @@
 DIST coffee-rails-5.0.0.tar.gz 5892 BLAKE2B 4d3b945ab4b53936bd39599ac7ba8af4d90e6fee073188847dbb157e098f275df5a3a6e91dcf804068b707804047442efc86524935a56cf403b55426466c502c SHA512 f1aac41f8f1f7181e82fbcf8c3007f40116639e4c140f1837be835fdcfa1babc7fc370212a9954ac8398d9a8d20fbd468550cd8b11c31788428769ea7aedf769
 EBUILD coffee-rails-5.0.0-r1.ebuild 1032 BLAKE2B 092c7fe37e77b56e0393a831ec3174086712d1b8875973080cf30436b5801e95353dc446be13c4ce5049709f326e30a984c3d301732c876eb1d2f73439a4cca9 SHA512 da6755f86512573e148c46cba069b2a8bfc25545695e5cace1f3236f8a6f9d2bcef534f3a2bb70a6e5ce953b969a4f19caf03c1b398d5ae2e29a02098d143141
-EBUILD coffee-rails-5.0.0.ebuild 1019 BLAKE2B cfcc0a7673dd733f02f39ad2e05e2091e5cd18d5b54179895b89eef7579f0f194f21524f936661f84c27c525d54b3db49aa4cad2abcd63ed4a31279268599092 SHA512 9f096fd8a2756c4ab0a656daa0f1a9e7c5315b36e3e127c31dd8898301b4f1bde65ad3af5b6ee122bc67b55dcf94cad2f3d058cedeff231455ae2e8ba62806a4
 MISC metadata.xml 344 BLAKE2B 9c10d5783b118d1630cde15f1436110e2e3943f2e25b4f3dfeffbb5c12de30f0439d544e6a6fd522803cfea032b12e5d20565ab0848d8aca1972fdd1e5ceaf2c SHA512 ff265b823397054ca71fdcc18be7b1bf69396f9a7dd5b5b2a051cc0cb862ec03df4f39497043d53ee2c6af607f82f47c97c42196c09114ffb7e1c05d07b36085
diff --git a/dev-ruby/coffee-rails/coffee-rails-5.0.0.ebuild b/dev-ruby/coffee-rails/coffee-rails-5.0.0.ebuild
deleted file mode 100644
index 2dc0ad63009c..000000000000
--- a/dev-ruby/coffee-rails/coffee-rails-5.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Coffee Script adapter for the Rails asset pipeline"
-HOMEPAGE="https://github.com/rails/coffee-rails"
-SRC_URI="https://github.com/rails/coffee-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/coffee-script-2.2.0
-	>dev-ruby/railties-5.2:*"
-
-ruby_add_bdepend "test? ( dev-ruby/sprockets-rails )"
-
-all_ruby_prepare() {
-	# Avoid dependency on git and bundler.
-	sed -i -e 's/git ls-files/echo/' \
-		-e '/bundler/I s:^:#:' Rakefile || die
-
-	# Make sure a consistent rails version is loaded.
-	sed -i -e '4igem "railties"' -e '/bundler/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/concurrent-ruby/Manifest b/dev-ruby/concurrent-ruby/Manifest
index 55a66bcb77d4..b5bbd3fc0fc6 100644
--- a/dev-ruby/concurrent-ruby/Manifest
+++ b/dev-ruby/concurrent-ruby/Manifest
@@ -1,7 +1,9 @@
 DIST concurrent-ruby-1.0.5.tar.gz 1307802 BLAKE2B 2eee2afdd33e2609608e9389847de380eb895c2193746b1190ea96ca8bb67eaccd8d141bc2071006afbd971f078e5b6452d1e62624892c0fce2c12b8ac9fa28b SHA512 fdf7324b56bb37b4a79dc89882354e452ee838a097f522fb906c20a06856303cfbbae16f2500255cbfb4bba33ee1b3b3ee8facf3d0156e976add64209e349da6
 DIST concurrent-ruby-1.1.7.tar.gz 4370284 BLAKE2B ea9120fa6c0c58d758c71d54a7a1371a2a94987141343be92e5d8150167d774b513003bc945b7a54dbae8ef1f15b371f6ec28e6e84828d653fdad5b6b58c63e1 SHA512 2af2f1236850666ef56f6024db3b094051de88bb0495b902f5be9471ded733e998b2845aacba2ff8b166d5097fccd597203502ce58766017cb67c529c2840d29
 DIST concurrent-ruby-1.1.8.tar.gz 4921836 BLAKE2B 1a58be0790af7708c58f6542b9bcf09b4f853bd180412f44cc6d18f2c058647384f2bc03f9828664c289eeabfd0721c866a143da4e4b4650d11058a2de7fdb16 SHA512 79b326721107abb972124d5e2cac32a348475d8408079747cca6a624df790c3662a8a460a9d1f0d6aceb4b4dc04fadcdc94777b58cec73d82350b3464f70b679
+DIST concurrent-ruby-1.1.9.tar.gz 4923746 BLAKE2B 2bfea989db31f17c69ee479091135516e2aeef7ac74234ccea91b2e4b3626395683a7b2ebba1d13cb527903d3d83c51e873bdb859f0ff1983062fea4fa90a1e4 SHA512 243fc20795bcd7399bdf77a9b0db9b0bccb1b05edacf4fbc8f5515f59502300b4033a2a59bfb6adea9befdb20759c9f58bbf0e7744e934c85738085bef714ea6
 EBUILD concurrent-ruby-1.0.5.ebuild 1226 BLAKE2B 762a7d9f335a9e60bff70d381d38a6531e7a4b97ad53e7918af5ba4665ffa02150341a4373887e1c8135b74198f7f6b640c3112d110e6be2b6208ea81ac06ed7 SHA512 44c99e6b0ad806b44a876e79a9d6b0fbd65b07fe19458e4449365ae98a0a0263e3dee1dad4da610166760c6175a61a4cc5a419060317e9341356bb84fe234be4
 EBUILD concurrent-ruby-1.1.7.ebuild 1369 BLAKE2B f3d176d753b2541004b005f8d2a81b7631f378c48deace0b20fc0e6896e8fa46e8bdd848c22aaa7d53725098045624adc62a9a775dd38721c82f79b3dc42b320 SHA512 8f2d07eb5b42015759d896cab882fff2967ce98f935317b908fc165e7acc479ff295b61cf37e7031333aceeb5e90f717892cd2139e46a3f829db61baa3598001
 EBUILD concurrent-ruby-1.1.8.ebuild 1376 BLAKE2B 51e7e41057544477ffe7ac5543c2a24dfa976918c21c7ac304e9c45982e1287f6742df4b20e5e0a96777e6388e5f3bcc8da022ca222157fb70e8ea2ad9bf4b4c SHA512 4f1f400ca2f86afd8d27eeeac7a40d98062d91a984964d2e7112d7696d43d02908727b24e545dd7dec401b310eacf2cac15d2b9e5e61936c889848025ca77254
+EBUILD concurrent-ruby-1.1.9.ebuild 1369 BLAKE2B e736b51e6e758346bb47d82c3dc2c3d63eb2eeaed09aaa3f777024458331677bdf71bb5c3c66f71e9cc33cf1d8763d7fb821c76d69ba427d12b624e9edaa864e SHA512 c615517e4e98525a028925cb04bbcd82f6da0050d767cd13df0a37ab944bafc4832d16db2ef3f669aff86ead4891d82a4b76e9554191c67235fa818eae6ed2e8
 MISC metadata.xml 358 BLAKE2B 4af4b67d3a6beab61cb05090b0f0a0a7802af67231fce103d84c2a475f9e65324a511f5a1c8b9df808a929281811de7b5f62a680688dd89c25ad75424bc5f2a8 SHA512 64e69249d1082b41905c309e159ad7eb8045af1c89ecc77cf119ed6014d40e83ca81bfe8938b5eaf5119fe12c02f1b1613ccc885770c897be06769af40dca85f
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.9.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.9.ebuild
new file mode 100644
index 000000000000..0b5dc7e3e608
--- /dev/null
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.9.ebuild
@@ -0,0 +1,38 @@
+# 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_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Modern concurrency tools including agents, futures, promises, thread pools, more"
+HOMEPAGE="https://github.com/ruby-concurrency/concurrent-ruby"
+SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+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"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.7.4 )"
+
+all_ruby_prepare() {
+	# Remove edge files as defined in support/file_map.rb
+	rm -rf spec/concurrent/{actor,cancellation,channel,edge,lazy_register,promises,throttle}* || die
+	rm -r spec/concurrent/executor/wrapping_executor_spec.rb || die
+	sed -i -e '/concurrent-edge/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e 's:lib-edge:lib/concurrent-ruby:' .rspec || die
+	sed -i -e 's:../../../::' spec/concurrent/executor/executor_quits.rb || die
+
+	# Remove specs for the ext gem
+	rm -rf spec/concurrent/atomic || die
+
+	sed -i 's/git ls-files/find . -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/date_validator/Manifest b/dev-ruby/date_validator/Manifest
index 38bbf705f3fa..645053576af1 100644
--- a/dev-ruby/date_validator/Manifest
+++ b/dev-ruby/date_validator/Manifest
@@ -1,5 +1,7 @@
 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 1075 BLAKE2B 79a1b1b05b92fc24485e3ebd853489e74575f4c87ea1cb19796402438e9599c3d6ede48f7ed02c29e20ecf68969c3cfdc94197c88cfa37df6073ac16499b0fb5 SHA512 5f814cb6d97e294d3fc32c4980fd8496c23665c222773b2eeabf329de558cadf719f83fcd225500dce6aa1c4cb49e999b7c9f0c46a3e4dbbaa4440f28b09ed69
 MISC metadata.xml 349 BLAKE2B 4b120116447656e42f1247065f08006f19da25e019491f904eafeb12ce35bb012f2c0330d8ff219f7c2ac72e4c0423b93a2a3ffee36da1de08454c6306856722 SHA512 67be0f0ac5cc6bae9b3d76a371bcceefc5c32c4a384a02f7f13a0fa1da950ff864a106430922a3aad2d8b5522a216ad6d93eba949ba1bd76f37926abc40fd6c8
diff --git a/dev-ruby/date_validator/date_validator-0.12.0.ebuild b/dev-ruby/date_validator/date_validator-0.12.0.ebuild
new file mode 100644
index 000000000000..31f9e00f8e98
--- /dev/null
+++ b/dev-ruby/date_validator/date_validator-0.12.0.ebuild
@@ -0,0 +1,50 @@
+# 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_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:*
+	>=dev-ruby/activesupport-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/did_you_mean/Manifest b/dev-ruby/did_you_mean/Manifest
index 008f8be44f59..f4609e775a29 100644
--- a/dev-ruby/did_you_mean/Manifest
+++ b/dev-ruby/did_you_mean/Manifest
@@ -5,5 +5,5 @@ DIST did_you_mean-1.5.0.gem 34304 BLAKE2B deefea833d1fe12733a6b1422e5ae43d0cfa7f
 EBUILD did_you_mean-1.2.1.ebuild 654 BLAKE2B 10c32d22dd810f1b31670fa83421136e2c00d865abd3229181951737587ce47e7d3df774b7ea24d2da6f705452565ba13ba48c8003afe831325a192c49b43553 SHA512 ce3a72256075206d39f1b909127d48e3e67a9d39e0a19cfbbc58eff052eb4d180fbab1bf85a2242e76f400511f3cf972c11339dc88c92697b5bb9df1e3481de8
 EBUILD did_you_mean-1.3.1.ebuild 662 BLAKE2B 3883bda20b269918ab5f29944edb3990515fa92d88d2f424cde835eedb2abef59351e964ca448e565379cda95537ad5487a533cf5cd5c03f86878a1e9ef83683 SHA512 92cc1be246c7b3bc39b59f51f209aa84d3578734cd34c7a2690294d3600de749f277a7730a1fcc345a26421aba131e7a70e7dcc36f02e4ff0d0b0aacb113e9e8
 EBUILD did_you_mean-1.4.0.ebuild 671 BLAKE2B fd3fdc75cc871aff0a6a79333478b812c9a4267a205a2a5a989b1268cb580e25f329670bd1013a4a0281eefcd0052992b510eba23d8fd0246690b46830ce0db1 SHA512 41e79222761387ffdde89cb974ff43dbcaa2a3360ba6afd8a84218874bf95fb9dc2f101a7029dc159d9d56fa43c43b25b6d73ba5e390343517f626d4abc16bc9
-EBUILD did_you_mean-1.5.0.ebuild 684 BLAKE2B 7bf3abbf2a57e6cd52f5a33002a74d184fd1ec46c2fef3a6bc0fbc48cdac08b4844bea63ab39650e1356728d8efc50e0b4db0501f6eddf0f9e4712fef2ad4d30 SHA512 480c2613442787878fb0faab0fb465c51a162ca075c092b55b494c729de658e3ada4b73ba168b30cc98f1bafb856d9c20c4bd4f9c43e1eaa1d07ccc7d7b25612
+EBUILD did_you_mean-1.5.0.ebuild 691 BLAKE2B cce861947b4e1ae7a3a99ad21590ca07bfd6d0a4a67cbcc4390f47692fac04c63da34250e260ef4dfdc5d91d54d23ac73a65aa69efce9947d0f743721e242672 SHA512 50c333eb63aa54ec4e5cf4afa0eb3bf7db6792d3ab607bb7dae5e258e4dcdbbfac25fda84e26be342ae8a6a43e3ea263f4baf2ab998d47e43b1f4b2f77ef9386
 MISC metadata.xml 345 BLAKE2B b3764e5648286cb66e03f3343a41b460ea2bb24f51e1c25e89e386c2b16769c9b1f88888b1e10b2c2d0a2346659195454e4ee8262aec0d4a9066795759cad053 SHA512 418114238e3e2db16ebcdd3de5213b3bc0f0a45ed719de1be60cb19015966cf39912f38d0858e22aa6330ac2e7fb58a1452e9623e7559c26161d70e0f29e66cb
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.5.0.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.5.0.ebuild
index 054e887df99f..39f5de037118 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.5.0.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.5.0.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 ~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"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
diff --git a/dev-ruby/dnsruby/Manifest b/dev-ruby/dnsruby/Manifest
index 351d0497c866..52075acccfa6 100644
--- a/dev-ruby/dnsruby/Manifest
+++ b/dev-ruby/dnsruby/Manifest
@@ -1,5 +1,5 @@
 DIST dnsruby-1.61.3.gem 259584 BLAKE2B 578d6f2b693de5007d4d15350a4fc6cb948f9e16ee9b0bb511e6b6dc92cf828d30e645522b834a6d42af5dd94b85f0675332b2363e0c2ba3b97c9b35b73bd82f SHA512 4cdf6d83c39c3209873e9bbd15ba33f851f3fb878cf746de98cf615b0f547dfc5af8b4be7d505f87f581755ff73de079b6ea3f6f8c5a11074c1c46d5bc9e8c07
 DIST dnsruby-1.61.7.gem 261632 BLAKE2B 28accc37bc8ca99ca348acea3ead30079f72deeff39d31b323344b758b874fca23f65ea7b6f8f8c780d74de491875b0e4a11354af14b5064cf7aa329a7a94a4f SHA512 454378b7eca03483533ca1c1e01a86361c20ce88971ecc6adc72e11bb9ef03709ea1332d2549eefc1c41ed13d5a752b1a7f76e2117ffc9076776663ab6e02d1f
 EBUILD dnsruby-1.61.3.ebuild 846 BLAKE2B 83d74ee2270400ce80dab80080347ac666fa93e7e09daedcde22c11454feae702f2fcfbd70d9eeed7a5c47152e5dae16d431165cc5c334ed7e4b8a500433bb69 SHA512 9296d7e6206d0d3fd93ea534be6a9514744067c2b05c1ea957ef15ec9de2fe0d2966dcf570f9ba4a028a5cd8497e27bc9e3bab22b2b8c55e720890e4178000d7
-EBUILD dnsruby-1.61.7.ebuild 834 BLAKE2B 483e110ce967a16382d22af8124952ec3c1dad7f20dcca920b0333cf3b8066672d96408b93b116684de514697d489c90d9b6c53237050c8fcf82d69b9fb01b87 SHA512 c9afc4137c0ffd57e928797bba362a7b0c13778b6149416033bbb04c61a0305f4f0cfb6b15631249d966c73212927ee364d6f5fba76522cce5a884c89c7687bc
+EBUILD dnsruby-1.61.7.ebuild 839 BLAKE2B 3327168be71319baa6c6397aa6e1cab35c3fe123f6361331ea0cf818bd3e6e21846f8fe3692cc918d6a200b33e1eadb533da69a9ec3b9945e3fd7faf56c3ee99 SHA512 dadb080f7f6366d88b9ec67a3f9330854a908989b5d13d60ac58f5d5ac3f1c941b16720ffb8981b8b402150d9ccb578ae20d8776f0269dc3a6f34b3125b647e4
 MISC metadata.xml 413 BLAKE2B afeb40e610311f15b7a95117ea91507e9cfcc0e26903cab7e58f0af5dfce580dd782e96338a8a6a7573cb3ac12497541c2c3284fac9f35b045d5a26608c5506f SHA512 4badb70d7bfddbd8d242d1b400672691ccf737a329e365321dc403dff791669417ba0b0df62efd1ad1c5946e11a7756b22a2790b171e3629d2d30ebfefc5c0f9
diff --git a/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild b/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild
index 17cf8f6cfbec..93a08659a392 100644
--- a/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild
+++ b/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild
@@ -13,7 +13,7 @@ inherit ruby-fakegem
 DESCRIPTION="A pure Ruby DNS client library"
 HOMEPAGE="https://github.com/alexdalitz/dnsruby"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/domain_name/Manifest b/dev-ruby/domain_name/Manifest
index 4578ba26f1cc..50bd2314e0dc 100644
--- a/dev-ruby/domain_name/Manifest
+++ b/dev-ruby/domain_name/Manifest
@@ -1,5 +1,5 @@
 DIST domain_name-0.5.20180417.gem 124928 BLAKE2B 56c8852c09dfabc2291a08d89b4dbb6c9c9c3aecce40fab2a176e2183ebd7b793a6677256f417b0c9cb6cd61680a738038ee2d14e4d15d9ab5a952d666014d27 SHA512 e960aa4445e19ff3e71825d94f85519ec9b1600dab64d139bf21208aec6fe1dc279e9fda6c64fd518ab22783464ba9a4d43f20ceb7699daede981cbf7d5e1876
 DIST domain_name-0.5.20190701.gem 131072 BLAKE2B 86ee60824d9480e71535312fb72c192f3d88326c72539b833132872ff15298842f09bac612e9c3d8b87a3ef6a60459b14e777105613fd76da79757d6a30abcbc SHA512 445f0e8a377bb700f8a3b926970f4351d28759e237947d6c755afff52726141c6b821b43b2a761d4d0d6237969304ef749404a5f383f69710b04803410dc70aa
 EBUILD domain_name-0.5.20180417.ebuild 1085 BLAKE2B 833a8ffa75628ed055bccdcd1a554c1f1157f22014ca87d788051970c59d3c45ab82869bd6d5f7b94a30ac19b7ba719afcdcf11df13f64e0b2282713e8ffc391 SHA512 87517d67c3a616102f14417c80c0a9a59f00a6694397c020526f13dbf9f0d7009486bc4aea224bcdb80c7c85974f94728b75a41efac708ac5ddfbeb63b5057a2
-EBUILD domain_name-0.5.20190701.ebuild 1083 BLAKE2B d580417335fe5a558bcd352e72f6625579332c3c5e52a861c781e3ec776f1333142c7c47c57656888a4cc760c8600fcd8af46007a456db578526297c2222307d SHA512 3cfe358b1e6021fdffcd6c7c86baeaa398978ae518b29e5eb8d78cf56cab7821bf1fe12f6c463911d2d89ec588dfbd88f03af0e351fc0dc9916890edc5a0fc68
+EBUILD domain_name-0.5.20190701.ebuild 1080 BLAKE2B 020faeed5e8d645195b1d3116b04948eb45164b8d5a5ace37f3d16a1b10b30fbf3fc187fe543a154a154b257313ec5a4aa17e50f347ba1404f04fa26e8fe34b7 SHA512 fab4de576a80ba1475fe5c1d6771ccf0b1d9dbaf4471dc71b89f5bf902840db04f98f4198ab545e28b07ca773a46e2689ff1503793e6e0046f67985f134acac4
 MISC metadata.xml 346 BLAKE2B e97527fee7fa9d73d77ef7a9e9325c9017fff3a9912fc76c74b76f5c4cf53aac583157ff02ccd5a969882829c1ffc4f35d44cb739497050a59402f88b06de2e5 SHA512 f9b3df47565a7827242a16355e01c450977cc12b7c0cf091590b1f642f5c941e2e3f4f14af66fe2975ffa6f7d53c3385ae2a87ffa666c1c1b7f7356f07c94830
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 2ff60031a44c..10b318c2f29f 100644
--- a/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
+++ b/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/knu/ruby-domain_name"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 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/elasticsearch-api/Manifest b/dev-ruby/elasticsearch-api/Manifest
index a6323beb4e72..b001bbf08ae9 100644
--- a/dev-ruby/elasticsearch-api/Manifest
+++ b/dev-ruby/elasticsearch-api/Manifest
@@ -1,7 +1,5 @@
-DIST elasticsearch-ruby-6.8.0.tar.gz 336486 BLAKE2B 5bf9538d3710787939a61b411918f3712a8490ed20df1039613f3828a55758e373e56c6794d597a95c04cf610aba8cea1113982b91cde764c96ee454e59cc7b1 SHA512 d75437b04770cac2ac65fb91f0b18cd3beae0248fa2f148aa820da5272093e5b05d00dc4c82c699d7e31b23d7f06ce7727f74eb5a9b0308264f7139e32774c91
 DIST elasticsearch-ruby-6.8.1.tar.gz 336746 BLAKE2B b7e7f039c1605ca808f57ee2ecb5fd346672d89b1b1cc8eb2d30c8bfcab9d7283f082d9852f0f186a36298dadae98f6951cdbd6a0f401568640f7de006976b0c SHA512 01ab96c92ff04818e29dbab34d73865c1f2adc816670e1fbdfe29a545eb224ff2c6368d7e0f90264c71db76a4f369626ed2e0a4ed3401adf749e0cac41d1f41d
-DIST elasticsearch-ruby-6.8.2.tar.gz 343982 BLAKE2B 84878d08919d5a533943bf8a8b092f0ac74b6e1f160d822a9bbe079cb80d3dbfcc09619c1bcb25e0ad6015acfce383895e41ff9e6300a119c3a7ff53b22f0564 SHA512 c76ea7878726e7145a8c6b8759a916678da0d764620c15b77c3add08ec5d42147d0ff69a0e48ff2f8a4cceb39e7047afcd002862487d00752f84062d9df79874
-EBUILD elasticsearch-api-6.8.0.ebuild 1472 BLAKE2B b96b03841c716861d2d039e87a78db37a354742e65fc5414cd782856fb6097793c545a91e99dde39268944b613b858f0a861a2e7d8bf19071262c4a3226f09db SHA512 c6a7ceff3c422f029378acd2afd0066fac6b35ac2edd9efd58fa5896d31d5f1275fc43c2db3a2a012fd4ccba01b483f555b4b477cc8eca37fff9869721811744
+DIST elasticsearch-ruby-6.8.3.tar.gz 345447 BLAKE2B 6f10b4345d098b36c5b4d8e90e8745b10313de0df1f5bd9285e72f891a871bff8569318d5bd15ab5cca0ada722042affb6bd20ddb68117eb689eadc0c2a16706 SHA512 3001760ff49bf72ba9ac5e11f3338e320c828bfb245d45535325f422e438b693d1ae7a4f73ab766386a76282eca435849c670f3ad98e9431b80b402e97268f83
 EBUILD elasticsearch-api-6.8.1.ebuild 1462 BLAKE2B 625c06f2e263292c4907b06f908829047460bccfd7ab4b1e7639c49c2cb821c893fde21c32ac8699ce3672486c2c9b245de5428704bbccb80832f0ec1f90bcbd SHA512 71850eafc5466f9f13a903b89e129f3d395a1b25355086abc1eb5c8a57f65ecafd5020c53c57ba287318f7a03cc2567f5ff4cb17ce766aa31136e51c75f14ac4
-EBUILD elasticsearch-api-6.8.2.ebuild 1504 BLAKE2B 4c1f50b07a78efb3384503dc975e6d0b604e76b7ad2385a402a6c8c794ca7d7e84b444acfb4e061b9c3f8860515a78d209deabd2608b5fdd11ca46d4273a6294 SHA512 9f1949109070edfe3fc6d0ed96d8a359040057083f5a8a3913d73184edf2c1572bba1a7020ee25aff8d24756a5505c462a978872f5c34c6e99b33593aed16976
+EBUILD elasticsearch-api-6.8.3.ebuild 1532 BLAKE2B 92aba41640caae5faefbf8392435d84c007f3f33c67c34daac0c4cb925fe4854d265d7159c403270626f3c7ede8460c32f3e5bc61287767021e2867d574dd4b1 SHA512 0ac1f18c34bc33a59ea3042c965f045c9946dc9555362afa7f4e4a1306969b9c532f4d53e0563d4135d962f2aa9a3f87fe53f4a161cc317c1bf06114706a77df
 MISC metadata.xml 216 BLAKE2B 8493bd6b16f9f2e33b12278ca7e8e9d31ea3e37a3f44876ac1dce534a2a57429dc689cf94d836e3aacd95cc119886ae88cbd2e1bf42e3d5b6523c4bed02beaac SHA512 a36b2fe6a545d22835082cab8d9f5138be3ba418c74cb5939216cd809466fcc002e30f2a9abaac8ec0990a1246332fae70a75eb7093371e222a79d405a07da6c
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.0.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.0.ebuild
deleted file mode 100644
index 4dbb938a449e..000000000000
--- a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
-
-inherit ruby-fakegem eapi7-ver
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch-api module"
-HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
-SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/multi_json
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/ansi
-		dev-ruby/elasticsearch-transport
-		dev-ruby/mocha:1.0
-		dev-ruby/pry
-		dev-ruby/shoulda-context
-	)
-"
-
-RUBY_S=${MY_P}/${PN}
-
-all_ruby_prepare() {
-	# fix to work without git
-	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
-
-	# remove useless dependencies from Rakefile
-	sed -e '/bundler/d' \
-		-e '/require.*cane/,/end/d' \
-		-i Rakefile || die
-
-	sed -i -e '/config.formatter/ s/documentation/progress/' spec/spec_helper.rb || die
-
-	# Avoid tests that require unpackaged jbuilder and jsonify
-	sed -i -e '/\(pry-nav\|jbuilder\|jsonify\)/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
-
-	sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' spec/elasticsearch/api/utils_spec.rb || die
-}
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.2.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.3.ebuild
index 8b9a274812c2..95e0821f2261 100644
--- a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.2.ebuild
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby26 ruby27"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 RUBY_FAKEGEM_TASK_DOC=doc
 
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
 SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
+SLOT="$(ver_cut 1-3)"
 KEYWORDS="~amd64"
 IUSE=""
 
@@ -51,6 +51,7 @@ all_ruby_prepare() {
 	# Avoid tests that require unpackaged jbuilder and jsonify
 	sed -e '/\(pry-nav\|jbuilder\|jsonify\)/ s:^:#:' \
 		-e '/RspecJunitFormatter/ s:^:#:' \
+		-e '/ansi/arequire "patron"' \
 		-i spec/spec_helper.rb || die
 	rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
 
diff --git a/dev-ruby/elasticsearch-extensions/Manifest b/dev-ruby/elasticsearch-extensions/Manifest
new file mode 100644
index 000000000000..2f132678d422
--- /dev/null
+++ b/dev-ruby/elasticsearch-extensions/Manifest
@@ -0,0 +1,3 @@
+DIST elasticsearch-ruby-0.0.33.tar.gz 1305021 BLAKE2B 5fce0ba8276451863519aa14bccd619a9ed4ad68220928e2f04a1349aaaefeda1027d28d3b130ab593f5643cf8af82a4bd0aeb19f79a0c9c8419a89dd70ea8a9 SHA512 db39555d418ae06f4bbcb7dd5b2c71e9c5523fa434e5acc9d6761e3d90ed64d0f282ffa3720ee4a702aade00e20bdc33935ed462910178d4cc609296970cd325
+EBUILD elasticsearch-extensions-0.0.33.ebuild 1119 BLAKE2B f476891cbe5bd7cee316d7bf5acf6c7bd3fb2aa5b27eedec9d140ef7dc061d4e3794a2d7c97adf10936844ec3ae45654e5fde31be5a27ecb92398ae9e0da5f0b SHA512 5c651bfe30105a90cb2cbdc76d600cbfd5a88dbb6e219e866f876c67298698d4fff67969febcc34984cb2ef82a3c6447eb30024679bac5108ab9c9069c4c9a5e
+MISC metadata.xml 216 BLAKE2B 8493bd6b16f9f2e33b12278ca7e8e9d31ea3e37a3f44876ac1dce534a2a57429dc689cf94d836e3aacd95cc119886ae88cbd2e1bf42e3d5b6523c4bed02beaac SHA512 a36b2fe6a545d22835082cab8d9f5138be3ba418c74cb5939216cd809466fcc002e30f2a9abaac8ec0990a1246332fae70a75eb7093371e222a79d405a07da6c
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.2.ebuild b/dev-ruby/elasticsearch-extensions/elasticsearch-extensions-0.0.33.ebuild
index 1d13774e21d5..b6b127aa4e8c 100644
--- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.2.ebuild
+++ b/dev-ruby/elasticsearch-extensions/elasticsearch-extensions-0.0.33.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby26 ruby27"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
 RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
 inherit ruby-fakegem
 
 MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
+DESCRIPTION="Ruby integrations for ES, elasticsearch-extensions module"
 HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
 SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 
@@ -21,13 +21,12 @@ KEYWORDS="~amd64"
 IUSE=""
 
 ruby_add_rdepend "
-	dev-ruby/faraday:1
-	dev-ruby/multi_json
+	dev-ruby/ansi
+	dev-ruby/elasticsearch
 "
 ruby_add_bdepend "
 	doc? ( dev-ruby/yard )
 	test? (
-		dev-ruby/ansi
 		dev-ruby/mocha:1.0
 		dev-ruby/pry
 		dev-ruby/rspec:3
@@ -41,14 +40,13 @@ RUBY_S=${MY_P}/${PN}
 
 all_ruby_prepare() {
 	# fix to work without git
-	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+	sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
 
 	# remove useless dependencies from Rakefile
 	sed -e '/bundler/d' \
 		-e '/require.*cane/,/end/d' \
 		-i Rakefile || die
 
-	# Tweak test setup to only run unit tests since we don't have a live cluster
-	sed -i -e "s/RUBY_VERSION > '1.9'/false/" \
-		-e '/module Elasticsearch/,$ s:^:#:' test/test_helper.rb || die
+	sed -e '/reporters/I s:^:#:' \
+		-i test/test_helper.rb || die
 }
diff --git a/dev-ruby/elasticsearch-extensions/metadata.xml b/dev-ruby/elasticsearch-extensions/metadata.xml
new file mode 100644
index 000000000000..1fa2ebe487b1
--- /dev/null
+++ b/dev-ruby/elasticsearch-extensions/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-ruby/elasticsearch-transport/Manifest b/dev-ruby/elasticsearch-transport/Manifest
index f9294d8162aa..6ab0f3606902 100644
--- a/dev-ruby/elasticsearch-transport/Manifest
+++ b/dev-ruby/elasticsearch-transport/Manifest
@@ -1,9 +1,5 @@
-DIST elasticsearch-ruby-6.8.0.tar.gz 336486 BLAKE2B 5bf9538d3710787939a61b411918f3712a8490ed20df1039613f3828a55758e373e56c6794d597a95c04cf610aba8cea1113982b91cde764c96ee454e59cc7b1 SHA512 d75437b04770cac2ac65fb91f0b18cd3beae0248fa2f148aa820da5272093e5b05d00dc4c82c699d7e31b23d7f06ce7727f74eb5a9b0308264f7139e32774c91
 DIST elasticsearch-ruby-6.8.1.tar.gz 336746 BLAKE2B b7e7f039c1605ca808f57ee2ecb5fd346672d89b1b1cc8eb2d30c8bfcab9d7283f082d9852f0f186a36298dadae98f6951cdbd6a0f401568640f7de006976b0c SHA512 01ab96c92ff04818e29dbab34d73865c1f2adc816670e1fbdfe29a545eb224ff2c6368d7e0f90264c71db76a4f369626ed2e0a4ed3401adf749e0cac41d1f41d
-DIST elasticsearch-ruby-6.8.2.tar.gz 343982 BLAKE2B 84878d08919d5a533943bf8a8b092f0ac74b6e1f160d822a9bbe079cb80d3dbfcc09619c1bcb25e0ad6015acfce383895e41ff9e6300a119c3a7ff53b22f0564 SHA512 c76ea7878726e7145a8c6b8759a916678da0d764620c15b77c3add08ec5d42147d0ff69a0e48ff2f8a4cceb39e7047afcd002862487d00752f84062d9df79874
 DIST elasticsearch-ruby-6.8.3.tar.gz 345447 BLAKE2B 6f10b4345d098b36c5b4d8e90e8745b10313de0df1f5bd9285e72f891a871bff8569318d5bd15ab5cca0ada722042affb6bd20ddb68117eb689eadc0c2a16706 SHA512 3001760ff49bf72ba9ac5e11f3338e320c828bfb245d45535325f422e438b693d1ae7a4f73ab766386a76282eca435849c670f3ad98e9431b80b402e97268f83
-EBUILD elasticsearch-transport-6.8.0.ebuild 1286 BLAKE2B 74253518166d3899889640fd67d32b3a9851b85d04e8bfbda7cbe5219bd623f0d33b43497843dd487edcc47228df4ead1e05e192d8719f170eff5afd5bd5f03a SHA512 e897ff95b6406ae36bbea0b2d092c9de8990310aaecec94a97fad17cea20b9e953b294ef1f46ab237461f4789fc9b32f2ff0eca29a9a338d8db4e085317a5a41
 EBUILD elasticsearch-transport-6.8.1.ebuild 1245 BLAKE2B de79ad2d371cdc49172d4aa835048c11b462c5f7faec0e3512890b6ea36865b15289e46a5b0bff61ab9bf0fb1080d6333ff3c58f15558940112898903bebe4ea SHA512 72c619d7be6141257c7e91f6c436cdd349e0abdced71e93a05a143246ad56f0003a0ed876e53aaceba5b8b3c049cb82c4daf80261b867cd6cb44822f9d3e620b
-EBUILD elasticsearch-transport-6.8.2.ebuild 1266 BLAKE2B cd158092fb761a3a7e02917c62a9e75ae207142d04cb40d3377b48a28cdbf3e96fe05c9a46884bb4d52502b77e7c6dfecef1f68ed1261ea2ddbbcaf35feb4ef0 SHA512 ad6021417629213db68bcfdfcbf7773de1ddf07e49fcbae26ffa8df46a0505c335964f8da53ffeee8e5bde8d78c79821f31272df4b393dc1b66813646d52061e
-EBUILD elasticsearch-transport-6.8.3.ebuild 1259 BLAKE2B 8fb30418fe87bbb201b381a180767a80e0675507aea6c4bb69c0a5962a39f6d5de0926effd2bd647a241229fa5be9b5e447b0fc77fbe70c7cc316ef67b859ba2 SHA512 b9f1f1801ba6054480f03d1ab410249d2132e620320637582c118e740184909ff11da1ca256244da27b9a2aa238f4285148fb7d0462d766c8991c3768af2042f
+EBUILD elasticsearch-transport-6.8.3.ebuild 1261 BLAKE2B 8ae7304f830a5c562aed7e42a2fccc8759a70326e686e85f5c49eff00771a9b52e2ebb1e5b9ad01c5770663b7a5f98cf9cb7bdeb12ae744e0c17e529bf358075 SHA512 455635ed089b2a76a1ecdecb3f8a9f8846cd02dbcab6ac86cb135fd2aca68f627401a6f0215fecedab5135b0e7e918719a97365b3901ee5e0bb8d4b68b466215
 MISC metadata.xml 216 BLAKE2B 8493bd6b16f9f2e33b12278ca7e8e9d31ea3e37a3f44876ac1dce534a2a57429dc689cf94d836e3aacd95cc119886ae88cbd2e1bf42e3d5b6523c4bed02beaac SHA512 a36b2fe6a545d22835082cab8d9f5138be3ba418c74cb5939216cd809466fcc002e30f2a9abaac8ec0990a1246332fae70a75eb7093371e222a79d405a07da6c
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild
deleted file mode 100644
index 792e50aa53ea..000000000000
--- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild
+++ /dev/null
@@ -1,54 +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"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_RECIPE_DOC=rdoc
-
-RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
-
-inherit ruby-fakegem eapi7-ver
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
-HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
-SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/faraday:*
-	dev-ruby/multi_json
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/ansi
-		dev-ruby/mocha:1.0
-		dev-ruby/pry
-		dev-ruby/shoulda-context
-		dev-ruby/curb
-		dev-ruby/patron
-	)
-"
-
-RUBY_S=${MY_P}/${PN}
-
-all_ruby_prepare() {
-	# fix to work without git
-	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
-
-	# remove useless dependencies from Rakefile
-	sed -e '/bundler/d' \
-		-e '/require.*cane/,/end/d' \
-		-i Rakefile || die
-
-	# Tweak test setup to only run unit tests since we don't have a live cluster
-	sed -i -e "s/RUBY_VERSION > '1.9'/false/" \
-		-e '/module Elasticsearch/,$ s:^:#:' test/test_helper.rb || die
-}
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 9e3d3dfb4e1c..59e8b4b1615a 100644
--- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
 SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
+SLOT="$(ver_cut 1-3)"
 KEYWORDS="~amd64"
 IUSE=""
 
diff --git a/dev-ruby/elasticsearch/Manifest b/dev-ruby/elasticsearch/Manifest
index 91f476118ce4..a026091d6bd0 100644
--- a/dev-ruby/elasticsearch/Manifest
+++ b/dev-ruby/elasticsearch/Manifest
@@ -1,7 +1,5 @@
-DIST elasticsearch-ruby-6.8.0.tar.gz 336486 BLAKE2B 5bf9538d3710787939a61b411918f3712a8490ed20df1039613f3828a55758e373e56c6794d597a95c04cf610aba8cea1113982b91cde764c96ee454e59cc7b1 SHA512 d75437b04770cac2ac65fb91f0b18cd3beae0248fa2f148aa820da5272093e5b05d00dc4c82c699d7e31b23d7f06ce7727f74eb5a9b0308264f7139e32774c91
 DIST elasticsearch-ruby-6.8.1.tar.gz 336746 BLAKE2B b7e7f039c1605ca808f57ee2ecb5fd346672d89b1b1cc8eb2d30c8bfcab9d7283f082d9852f0f186a36298dadae98f6951cdbd6a0f401568640f7de006976b0c SHA512 01ab96c92ff04818e29dbab34d73865c1f2adc816670e1fbdfe29a545eb224ff2c6368d7e0f90264c71db76a4f369626ed2e0a4ed3401adf749e0cac41d1f41d
-DIST elasticsearch-ruby-6.8.2.tar.gz 343982 BLAKE2B 84878d08919d5a533943bf8a8b092f0ac74b6e1f160d822a9bbe079cb80d3dbfcc09619c1bcb25e0ad6015acfce383895e41ff9e6300a119c3a7ff53b22f0564 SHA512 c76ea7878726e7145a8c6b8759a916678da0d764620c15b77c3add08ec5d42147d0ff69a0e48ff2f8a4cceb39e7047afcd002862487d00752f84062d9df79874
-EBUILD elasticsearch-6.8.0.ebuild 1209 BLAKE2B 1774fc89a0b925b8ea7c9fb971cd439fffa815bdf701fb9584ef409314d0a5cd3dff09ae7730b6ccfa6f5a857f3108f7a8292d3a3b6f75f21eb1af1e74abdf69 SHA512 977c26438353872f490b0ca44c2387e5f3b0a09ada828b70d4779ec648543e8fcaf8465b9f205aca10af22560321efc801317f42a2460b1494cac68017d42299
+DIST elasticsearch-ruby-6.8.3.tar.gz 345447 BLAKE2B 6f10b4345d098b36c5b4d8e90e8745b10313de0df1f5bd9285e72f891a871bff8569318d5bd15ab5cca0ada722042affb6bd20ddb68117eb689eadc0c2a16706 SHA512 3001760ff49bf72ba9ac5e11f3338e320c828bfb245d45535325f422e438b693d1ae7a4f73ab766386a76282eca435849c670f3ad98e9431b80b402e97268f83
 EBUILD elasticsearch-6.8.1.ebuild 1199 BLAKE2B db6f862c79624d37bcd5e1287aa55b5c631c102619722073200790f72aa9a7688f24786fcd191286f0976b6e6c5a7979ba7f2c236e5347c09e1ae26ffe3f9efd SHA512 c1eb39f656292888e241e9b4abf406edc88f5d4a3a9ea24ea180c5b11f3bc97bc8689482bb39ea5f0695f3301073817ebb9fc84f27b0feb428353e409b58879d
-EBUILD elasticsearch-6.8.2.ebuild 1199 BLAKE2B db6f862c79624d37bcd5e1287aa55b5c631c102619722073200790f72aa9a7688f24786fcd191286f0976b6e6c5a7979ba7f2c236e5347c09e1ae26ffe3f9efd SHA512 c1eb39f656292888e241e9b4abf406edc88f5d4a3a9ea24ea180c5b11f3bc97bc8689482bb39ea5f0695f3301073817ebb9fc84f27b0feb428353e409b58879d
+EBUILD elasticsearch-6.8.3.ebuild 1194 BLAKE2B 82806cc673d6cfff39bacf9f041dcb98b7ef9f7fbfe8f2315155e2273449fcfd58bdac220ce0e6902aa8d04a29213e39f5636365742894f10435a92a83a08c23 SHA512 a44b2d9dab3cf873494c7930b8c7665750b8839528f5f3207fb11e9401073374b929afdf786a2f35c89ed8ffc7907a65fe302c2600fc99f54c91fbf30ea974c1
 MISC metadata.xml 216 BLAKE2B 8493bd6b16f9f2e33b12278ca7e8e9d31ea3e37a3f44876ac1dce534a2a57429dc689cf94d836e3aacd95cc119886ae88cbd2e1bf42e3d5b6523c4bed02beaac SHA512 a36b2fe6a545d22835082cab8d9f5138be3ba418c74cb5939216cd809466fcc002e30f2a9abaac8ec0990a1246332fae70a75eb7093371e222a79d405a07da6c
diff --git a/dev-ruby/elasticsearch/elasticsearch-6.8.0.ebuild b/dev-ruby/elasticsearch/elasticsearch-6.8.0.ebuild
deleted file mode 100644
index a56db80f2fb5..000000000000
--- a/dev-ruby/elasticsearch/elasticsearch-6.8.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-inherit ruby-fakegem eapi7-ver
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch module"
-HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
-SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/elasticsearch-api-${PV}
-	~dev-ruby/elasticsearch-transport-${PV}
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/ansi
-		dev-ruby/elasticsearch-transport
-		dev-ruby/mocha:1.0
-		dev-ruby/pry
-		dev-ruby/shoulda-context
-	)
-"
-
-# Tests need additional modules (at least 'turn') packaged. Then someone
-# should look into running them and so on.
-RESTRICT="test"
-
-RUBY_S=${MY_P}/${PN}
-
-all_ruby_prepare() {
-	# fix to work without git
-	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
-
-	# remove useless dependencies from Rakefile
-	sed -e '/bundler/d' \
-		-e '/require.*cane/,/end/d' \
-		-i Rakefile || die
-}
diff --git a/dev-ruby/elasticsearch/elasticsearch-6.8.2.ebuild b/dev-ruby/elasticsearch/elasticsearch-6.8.3.ebuild
index be432279d0dc..a5542e7c2894 100644
--- a/dev-ruby/elasticsearch/elasticsearch-6.8.2.ebuild
+++ b/dev-ruby/elasticsearch/elasticsearch-6.8.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby26 ruby27"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 RUBY_FAKEGEM_TASK_DOC=doc
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
 SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
+SLOT="$(ver_cut 1-3)"
 KEYWORDS="~amd64"
 IUSE=""
 
diff --git a/dev-ruby/httparty/Manifest b/dev-ruby/httparty/Manifest
index 479619c3c97c..42d7553c7c69 100644
--- a/dev-ruby/httparty/Manifest
+++ b/dev-ruby/httparty/Manifest
@@ -1,5 +1,3 @@
-DIST httparty-0.17.3.tar.gz 97444 BLAKE2B 773e40fc35ca44cd3b14a30e7a7ea5783c0c158cdb8488b34ffa36af5a572d5f6eef697cab147c5be1448906c35071284947ba598409be35af54a20846f4d98c SHA512 c06aa4456c692e2a32f8e44b2316d46f664c4e2c8efb370607796f6801d96e989a54e61bdf125cff679b8c5f5abb1557b87aef48d8f3a392c1942ac4821db84d
 DIST httparty-0.18.1.tar.gz 97813 BLAKE2B 3192ad5f1e8c292456710529f4e1595ea5b70ae4ad61695d6d0b036872d40b2afbc0c958ffb25b0c1222ba8004593d20c4d3954c530d6c836e915b87150d954a SHA512 fca9de534199fbf6a058c39c3ebe28587c34df2bffee313a0e05204258fb6b6b6643bd0a28deca9d0b42de21c90c54dab058124349e4774489578fb23e8bacf5
-EBUILD httparty-0.17.3.ebuild 1652 BLAKE2B f22b76a26c3f2239daa9f7e9fc83ea04bb38bb2585b32136e3838883af771e01f8b3cce075883e3f361d0596a1b3a12aee5d99eec92cbd5a641f85acad34f33d SHA512 cdd87ab32eb7ddd4ee31671b18278b7d686d9375e666b10e71f5c036d1bddc9b36b55341937c1ade07098663f5ce64d705d4e67faec39c8c18d3a349485a609b
 EBUILD httparty-0.18.1.ebuild 1843 BLAKE2B aa21a61e27231d4b4326463aa0b996947e0d711b40a83b9de78b6920f60a0c4bf397e2f54b7ecf87f0ffbb2e9a021e4ee15eaff259bcd421aa2372870e156d0a SHA512 732404c9aa489e7cc6da4991141ce927ca8ca2f227eeaa1e0343d79051670e235a0309d1fdd15b4d290d68feb995e6576c4ff53ebca126f724ad37dfacace0a0
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/httparty/httparty-0.17.3.ebuild b/dev-ruby/httparty/httparty-0.17.3.ebuild
deleted file mode 100644
index 568d1d507061..000000000000
--- a/dev-ruby/httparty/httparty-0.17.3.ebuild
+++ /dev/null
@@ -1,57 +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"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="httparty.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Makes http fun! Also, makes consuming restful web services dead easy"
-HOMEPAGE="https://jnunemaker.github.com/httparty"
-SRC_URI="https://github.com/jnunemaker/httparty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend 'dev-ruby/mime-types:3 >=dev-ruby/multi_xml-0.5.2'
-
-ruby_add_bdepend 'test? ( dev-ruby/webmock )'
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files \?-\?-\?/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove bundler
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
-
-	# Avoid test dependency on cucumber. We can't run the features since
-	# they depend on mongrel which is no longer packaged.
-	sed -i -e '/cucumber/I s:^:#:' Rakefile || die
-
-	# Avoid test dependency on simplecov
-	sed -i -e '/simplecov/I s:^:#:' \
-		-e '1i require "cgi"; require "delegate"' spec/spec_helper.rb || die
-
-	# Avoid test that works standalone but fails in the suite
-	sed -i -e '/calls block given to perform with each redirect/,/^        end/ s:^:#:' spec/httparty/request_spec.rb
-
-	# Avoid test that is not fully compatible with newer multi_xml
-	sed -i -e '/should be able parse response type xml automatically/askip "multi_xml"' spec/httparty_spec.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 57fe79219c99..14d5c793e423 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -3,6 +3,6 @@ DIST json-2.3.1.gem 118784 BLAKE2B 6852f5d1733fd5d596b44d095c37d11a129b02fc61dc8
 DIST json-2.5.1.tar.gz 131183 BLAKE2B 2ccdf5921ef476b66cb1dbf72cc01763636c82b0eb5d0a5cfc029e14177c7c6766464e7852b11c2424db401f5b931cb64c01d3952929236c9979378a7928ea59 SHA512 4df7ec9b86692376e89c2019c2c1ab3ae9af28fb4742864acc6f985c0551fc10795742cc1124d6435e820617c00d4c5f4aa6c83b21d2fff43ed05cd9d0a89087
 EBUILD json-2.3.0.ebuild 2010 BLAKE2B 6ef2f9402a1ba2e54467f832f1b133c298c16c3664433ea459d0f8bc7d28141eeb9ac1ed11d9b8263fe469c8837b1849ed3859be23d5f44b7fbdf32a79a14abb SHA512 b45f896a497fbdd248152abe45a56b1b81c36a043db82e5d93661432bf6fe9061aaefe378c08e2e160a2d9c87510627aba66920f7e75405bc0b0c505c1fd8c7e
 EBUILD json-2.3.1.ebuild 2011 BLAKE2B c84cc2365edb9c5d5bdbe10e685633bd6686d2010b251bae57cb1b0eb03ffe1f2836dee1d3709d0f28d34c5f92ef46aac6b88603e1420baa05cc961b30fd4771 SHA512 2365221d5f20d97fec7f091ceaa4b5629f3caf8fc1e2f2000cae41815c13ea889fe0ad8430e17605d737576cc95bf98c4a2415cc753be9ba6220d3d92f31f419
-EBUILD json-2.5.1-r1.ebuild 1943 BLAKE2B 8b8d2e04bd4d491ddd3bee215c6843412029f03c856755733d07991af3afc5dab4bfa37816bd46e3c5ced33381cf172b90258bfd1565ab1ab8eedba85637f0f6 SHA512 29d35ed79592bd409ea5eb63078ae6a8704b0724174fe9377ae4793b06f56b661378268fd1a13dbe7b3d90558f693e6cf8c652dd15ee3e6a9343a10db92ec6bc
+EBUILD json-2.5.1-r1.ebuild 1950 BLAKE2B 9fda187e857a00ee7b04258a4a2cc30b28678b1658de9ccac5859d7edd59d0fecff9368d7125e26675c9e25928284740f9c59e638bb4ace1afd0557e70cf5311 SHA512 41ebb8bc69c7c97a6ff2cdbe9ffb553956d7e3451ec1dc2b70c33328403690ae607c4ca8ac48c05fd07e2a16b95aa9534aa672cfce54f92b69f0d3f32cbbc4e6
 EBUILD json-2.5.1.ebuild 1995 BLAKE2B 74ca3a0ad79c798925abb2ccf15d0f57284ad7e3c2909b3680695f75cffe8326a7f15ca1673edb6c78a261da946692f21b54a263c1ce778656d1b90aacdca05f SHA512 1905491e97d2672b588e0ed8bc45a89eea6e0798121d3626f81a440dd4447a324b085f1d13b1baed51be7a6fea15bae71387cc0f82bf7ef9e426e342aaf423b1
 MISC metadata.xml 336 BLAKE2B e1094160e19b252f7b3233dbd2006c889c0a02aa4b04063caeb7ded80bb2f08a2c4bc31cfb7bdc17398b8d1b8c3fc9f3600eafad9920fe0355c807d3899f794f SHA512 8b4fa7ef9b753bbf1206b1f8a796d3f3b8e3f9ca07906a2e01dbcc8c69d4cb5e5cb26c395d0676b4dedd70fb910cf0abd3be83d3c94f0b90aee87ea6fda12877
diff --git a/dev-ruby/json/json-2.5.1-r1.ebuild b/dev-ruby/json/json-2.5.1-r1.ebuild
index ee4ed3bbb0f4..96cfc9286d23 100644
--- a/dev-ruby/json/json-2.5.1-r1.ebuild
+++ b/dev-ruby/json/json-2.5.1-r1.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 ~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="2"
 IUSE=""
 
diff --git a/dev-ruby/kpeg/Manifest b/dev-ruby/kpeg/Manifest
index 15eb03148872..ab8472d7850a 100644
--- a/dev-ruby/kpeg/Manifest
+++ b/dev-ruby/kpeg/Manifest
@@ -1,4 +1,4 @@
 AUX kpeg-1.1.0-utf8.patch 450 BLAKE2B 00472188e53b34f8395c33c9510232ad826ce71235b3110807d1a3fc9068684cf367f6a312e6adccbf93fbdbc783d69eb8e14a536365f8c72e1ac6841a364171 SHA512 eb0c3b6d3ba32e3496f7f115804dfbef949dfb34e842886cbcc3c8b49a0bfbb21d1ef3510590e335a2836eca09cd031d9e75a8d601176465c84e5424fceba663
 DIST kpeg-1.1.0.gem 57856 BLAKE2B 6aab84aec59c4962ef39f31a7de89a7bb84f0ae2b64327206fefa8bc243e0dd405db121bfe2f50c72b18933c2f4ce7a47a842c741cbd53db1ad73415d41b95dc SHA512 4ca7007bea74485ceb7c3f53eef1cd2e162fed45872f8f078d5b5d2ffd1ecaa0e8fc65ed6f1b220bf6f4642d455a582cb754cdc6350edf856b33d9908510cb66
-EBUILD kpeg-1.1.0-r1.ebuild 720 BLAKE2B 02aff0c6e41fd1e503fc33e334a0564d434d7e72309a5f499521e0e010ed948908f1954ee2dfbea6082b59b06e69e8f877ee3cfc31948ca3df70bbb4af2c8402 SHA512 ac4b0a7fcbbec0c41b80ba83fa3e4e26e0bd61da7524f4d1f7c11f5fa050b2438a53ee42f6c840ec6a75a763d6fdd7243c535f88dad668abe013820229766972
+EBUILD kpeg-1.1.0-r1.ebuild 727 BLAKE2B 0ffba3628bb74b9477789e47d091d96095903826b35351ef2e27d3c8d203938de758794947a266aab4ed486c48f2dcedb3f3ea4d9bb94d9d1de6ae40f3b083d5 SHA512 fb1f23a55bbbf40438e103b2977a1649bcd24ead55837ce739c758b93873b556ffd17a5c0343a470c72aa192bc6b8c4c11587fca24c5840985caf8d56cf95dcd
 MISC metadata.xml 338 BLAKE2B fc0c3e4cbb7613cd0fb29651974822b31bbc14da28427772026ac068c6d8ca698c4c38073df6a5d06a864ffdca14477d71ca32dd7b4ca4244cfe02e9e052d4c2 SHA512 981524b3599f2a7a812c468763137a4e38b445c87224f91dc12d128025bd42657b62ff1b5fa9797bf437f46b9f9195bb0469431e77646ad5f0cfbe2c6b5e1f21
diff --git a/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild b/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
index 229517189a1e..9dd6a8adb34d 100644
--- a/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
+++ b/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/evanphx/kpeg"
 
 LICENSE="MIT"
 SLOT="1"
-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"
+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="test"
 
 PATCHES=( "${FILESDIR}/${P}-utf8.patch" )
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index 8d966f1f170a..fb67eb41d939 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -1,7 +1,9 @@
 DIST listen-1.3.1-git.tgz 35521 BLAKE2B 6b93daff2b3ba221d0c0f196c67353963e983610dd9deb3409c8ad270f7221d50e9eefee826c16c51ac0361cf7f5da727db216b1bd92a02077b0bee580fa368c SHA512 4676d030a3e676249a221cf4a136ce69651009ce5855821924be184460e404e4f33026627c9d524156a89344c826b48a690a249f1059493d7d214b922381bdd0
 DIST listen-3.3.3.tar.gz 52994 BLAKE2B 95831a65a75cae28b767696bbe5969cd7115657fa56e01701f3b17d5bd727a053cbac16928d8c7c2a19ad24ea3c99afdadd1e9ebbae0a66d03a511ded7d32734 SHA512 73ad762086e7961e45f1245e5aa32c738824736b7d373c31565832c3acf25f91cbc9c25d7bdffb27cf953cb2b2bb37adfddcc6888f3a1b317f70cba75c2ce67c
 DIST listen-3.5.1.tar.gz 56236 BLAKE2B e74186532d5aa9fa7488d0734867d7ec7218036b10769667b8818d057af4d8a973204ce68f687fa508d5d2ed879b0ba6287c3b93fb05eaedfc63a8dc251523b9 SHA512 d7475e295b5123c5a8f166891e866de60379f28d61ab0610774bdf499bcf0859807ea2abb31fd6e708c106f926282376aec94ce268e6709884a63852e820ae74
+DIST listen-3.6.0.tar.gz 56134 BLAKE2B 6826426c5e46fa10145148d545ebdda278af080c4ddda8b055189a9aec91c26302c991ba69199d2616ae171ac85cb0ec6cef657980e6b984bc09513adabf3d16 SHA512 32b93ee98333657f8dfcaa8e5c9aa291d5413ddfadac3c3ff34edd2a2273e119922dee71825d6b06a6e86951deb96a676a8b9cdd98431fd21c55557a154702ee
 EBUILD listen-1.3.1-r4.ebuild 972 BLAKE2B c8062f42d923c5dfc3b352bd14c96a5afc6d79b1b4756a3fc0e6792f89179e454bcdbba2d2697433b33180c0edbbb503a81a1b252109ea8a3cc1b7c7d302c8f8 SHA512 31c83048aee128b6e90303e7eea9f8fc16faa0814db329283a58adb9dcac275efb1586814a5ce999f0525fe7829130dcf8bd2fdfb32e5efaf197517400bfe444
 EBUILD listen-3.3.3.ebuild 1201 BLAKE2B 5db4e313fc8bc0a67e5ba7a2b8a14330ed78e02ea82989981c64ef3398e30d9f12b555eda9e11cceb242302daff8252b6f2772a843ffb8f3f3147ddc2bdfb1ef SHA512 2715c9493641cff9f1d980cc298b7ce85d8b6e27d776c7461e273e85a8327a57ebfd81ff522bdfac1b8dade7fb47c161a0dd7cead9fc08965bcdcebeb65c4c0d
 EBUILD listen-3.5.1.ebuild 1208 BLAKE2B efc9f7ccc344a4272fa0879b6de1652b88041fc2bea9f8b174dfe3bc3daa11fcf773792bb9c55df41f997cc516c4574efce310a592e8519fd0092e5b84c594f9 SHA512 1788a9eaef1d08d9a5c2f09e3e0285daf0f603feeefd6c04db54992d55a2a52e82cfb5d73e7a11380512b295be187ec70d1615a79b0a22884feeed599ab30e19
+EBUILD listen-3.6.0.ebuild 1202 BLAKE2B a1645e77dc86ed485abeada0b52e2876ec7b14ba8bbce9c6bdddfca2c22d65a9ed980f7fafe30fa4312da5c3f56de45e8a760eb5933b48d055dec96378308bf7 SHA512 c0ca51bfac9dcd1270a0f3ae2b6d722bec329675270821717d8283b353c2712ea614e1f988361426ea1b70f95c798a85bd00a716be1f3fcac2a1b3cb348fa4ac
 MISC metadata.xml 338 BLAKE2B aa66734c1150c6a7b21e1c018d4303311955fb6e1eadcdfe16c3ca514b3aad663e4c16399a75b091e614ed87a86b6958577771e040700e01590447d33bd77dab SHA512 f4035107afc1bcbab797e116a0f39e49c9a4034f838878ad448efea9eba8d2fbc4db074db73871550a42c175c9e36a220877d2ed50580828c3180fcc50913288
diff --git a/dev-ruby/listen/listen-3.6.0.ebuild b/dev-ruby/listen/listen-3.6.0.ebuild
new file mode 100644
index 000000000000..5d10bd2e1352
--- /dev/null
+++ b/dev-ruby/listen/listen-3.6.0.ebuild
@@ -0,0 +1,47 @@
+# 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_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Listens to file modifications and notifies you about the changes"
+HOMEPAGE="https://github.com/guard/listen"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+# Block on other packages trying to install a /usr/bin/listen
+RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
+
+ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
+
+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/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/middleware/Manifest b/dev-ruby/middleware/Manifest
index e5021f17d36b..9574178fba67 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 632 BLAKE2B 19a2e3771c010a047dd112402a519a73b33fcf390e6b034ac330aee8874967ff53dc1116ddfcb08daa7e54530a0ce39ef77b20809f7e53b6fdf6449ae4498a2f SHA512 a27d87b99010eb5bb56778d43eb4a25c06bd2f0af207ef66285c84d96e674c31409c450f23c6383f3a79faeca2e9ac6f934ce06b0e40d4a579e9fe15a707dc72
+EBUILD middleware-0.1.0.ebuild 639 BLAKE2B 16122179a6cc58a8dc83a00b3be28389ad16afc7cdc26cc7c9df8a03f76c6e0b8e299b5cef825316be30e4031c33519e2be2ee154090d9d25d7509c390fad83d SHA512 e752c70738b4b0ebb0b25cd6f831ffcd5bdbf8812fed30b643bb46789fd8f9711d90c7358fbb15d3e959cd462a8e4962b58f40c37d6734ec0c5b7074b24cfcc5
 MISC metadata.xml 257 BLAKE2B 6339b8ae3ef779011f34940b5af7faca341317790ee6752ad73cb83db463ddad10b25cacf16f73ce6d0fde976d916e2838e6209bdedfbe5ef6da285be302203d SHA512 d86ea11e509e5d031f82c4bb476a5974b85d812abe415e95799bdf34a308ade95e2f1cf35f6af84ae5acd0f67996b150c02712b75ab4f5a1ff4eef0ffb046d7e
diff --git a/dev-ruby/middleware/middleware-0.1.0.ebuild b/dev-ruby/middleware/middleware-0.1.0.ebuild
index a2f671910072..61f4e0ac2f36 100644
--- a/dev-ruby/middleware/middleware-0.1.0.ebuild
+++ b/dev-ruby/middleware/middleware-0.1.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Generalized implementation of the middleware abstraction for Ruby"
 HOMEPAGE="https://github.com/mitchellh/middleware"
 LICENSE="MIT"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~sparc"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index eeb9ca5633bb..4405f9f01f8f 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -7,5 +7,5 @@ EBUILD minitest-4.7.5-r2.ebuild 856 BLAKE2B 037aea7db96dd5a1527932f4ecd421ba48d0
 EBUILD minitest-5.11.3.ebuild 752 BLAKE2B 48915acc329f6639fc20abef18e420a51d3d76087e642cc8a58c55caf5a5f134d7690ecc60702890f598dc51eb8208092d179c2f2d1934e1231e8d1f1789a17a SHA512 7b44b8c01f1327d50acb399260575cac827ebfa3ddd463b582fafdd8197957d1225f9ca3a00355bf94b3930f0d10a95ece0f9747857cb011ae55a34f9f8c5c72
 EBUILD minitest-5.13.0.ebuild 722 BLAKE2B a3b9099d4311141eee35672a80e7a6f404b8c0b8fcee6cc9cf7aac4c71a01430bf8ffa7e36401d2a1c29ffebe6439b5257b88bd912dfc811cd314229511d6fc8 SHA512 9539c436c2ae5a3402329417ef6c9ba2079fa1d0d6631baf4fe36d71bd49ab52dbebde080847a2e142a2d22b7cc5342a39b65ec865f5c243fe5fd7fb8fda5f45
 EBUILD minitest-5.14.3.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
-EBUILD minitest-5.14.4.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
+EBUILD minitest-5.14.4.ebuild 735 BLAKE2B 22766653091e002fa662a279753ed8ebe22283ccab1156c7ddb503864f41251e1e83270f00dc5efb0496ffe0165b37add6318ae65cc04b2fb0ae2746aa8ebef2 SHA512 9fc9d5bcc391cdf6995995bfec88f39e91e23838edc4c041f17ff1accf667dd5a34ce91c36b0fed0a05f98713612fcfb4a600a45c3d857e981013d4dba43d74b
 MISC metadata.xml 344 BLAKE2B a719762acb7e752051fc25d212f40e610a1a00644f8a09a4122bd874ec15af826d9360697b8d63d68fafd6596a8ea34439540894d8b8b9606baf5ddd4573d152 SHA512 48a43ffed154ec65035a6e84ec7e7e9ec222698b4dd56a81b6ca84844d9835c087fd7972d38ecc40fdba7f74acfeb2004bd1084d2cd123ffd09906e644c59e00
diff --git a/dev-ruby/minitest/minitest-5.14.4.ebuild b/dev-ruby/minitest/minitest-5.14.4.ebuild
index 414bf91afda4..e11aea35842d 100644
--- a/dev-ruby/minitest/minitest-5.14.4.ebuild
+++ b/dev-ruby/minitest/minitest-5.14.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-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"
+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"
 
 each_ruby_test() {
diff --git a/dev-ruby/net-telnet/Manifest b/dev-ruby/net-telnet/Manifest
index a19b6b80606c..aebb5e598cb5 100644
--- a/dev-ruby/net-telnet/Manifest
+++ b/dev-ruby/net-telnet/Manifest
@@ -1,3 +1,3 @@
 DIST net-telnet-0.2.0.tar.gz 13299 BLAKE2B 6b87974281b4e1857a1e05efdfc751a5149f9057598c89b8b288219b95268955ee3f80e21cc787ac767ef3126c9ee23d9b62e29ebcb8c317def703f0e0dc1fe6 SHA512 a4473c42d33c10594c4445c29db73f4d611555710228cce263f7fc273e71140423dcbc2e89eec2a26f35f98de48aa72eca9f44cf0cd4626d702709963ce7b02d
-EBUILD net-telnet-0.2.0.ebuild 949 BLAKE2B 4b3e46a38f01e4621d3e06223f6b3e1227a6c05e4a136e9e27b098ca12b8a7d737d4ee9fbc2da83d7c5580ad33d8dac12ee644612099e55ef543ff071f494860 SHA512 6e3f3f0bd2f1f9fd088afde908eac78e7e778486dd62c245c2e6a697909950ffee01ddb1f7002d7a19de08b141b350ce13cbea55f2c63d60490974cf624ca406
+EBUILD net-telnet-0.2.0.ebuild 956 BLAKE2B 60aa4eb2b4278c9dcb83217f1bd47c7c0924ce21b45092f27579e9bb4b7258fd3c3c683f199a3627e7fb159a132eb350e7274416c7d6a5e23b203df9cec4fc9b SHA512 f27adc1c97108669ed91cc14c3e4249548f86a18bf4aa40d77bba69495305f4cfc245179efcd8d46d023f4b2adb4598fb38fcdbbafc9b7652b88118fba292ef9
 MISC metadata.xml 341 BLAKE2B a3489378bdb1735168037d2bf0c8798de575e898bb5a686efc06d1d2c41cb1cc674a387c8b042ee789e1bd4694a1e744759637cb820ee7d820b130a966db9573 SHA512 e536a7ac7e41bab692cde766da2aebc72df4a9392921dfc2b81df82ac128ff85cfd58900ff157046eb316cb927d58fcb48605fb364c7fcf25e82c3ed676e22ea
diff --git a/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild b/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
index c35a376da1da..cabf9da5cc46 100644
--- a/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
+++ b/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
@@ -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 ~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"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index 9746ca320693..904c00fdaff2 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -5,5 +5,5 @@ DIST power_assert-2.0.0.tar.gz 16994 BLAKE2B 5106e77566100274000c55af1bd2ff9aaf0
 EBUILD power_assert-1.1.5.ebuild 1412 BLAKE2B bfcc18a05ad28ce098e70a7d936b336630a1135cf781e36c8d533502cf1e55610b579c32b52354736d8de18a583a3d29cf0efb397764d74bf1ad8094230a6259 SHA512 c2fe441390ca188dcc1be729f558e8ceba61d4b2f2d820e2f29b06d55d72abedc293d839c782aab017231d692047cffe0a0924256efdd9b7bc41fc1d9ee88972
 EBUILD power_assert-1.1.7.ebuild 1414 BLAKE2B 9ab68f3657d538615b19676ba1680c51f788ed93896350fcbb5838a48856b6a072ceeda9aa82df00f2ca1ec02feb695042efa1951210bce5d37290d86e3573b7 SHA512 1a06eea79172c3615fb1f968fa976a804831bdda55fcaae94a4c2d842ea74d8d1238987646ba868a89540b5ca7fe398d60146e55a8e7ce49eb4feb3e0ce18ea7
 EBUILD power_assert-1.2.0.ebuild 1418 BLAKE2B 718d355df9a75002823eb6ef8ae10dc4ddff649c314be77db00252a34a7f5daf95a5979195f2fc3e8d7b28ff3af86ce4bf9b2e5d5faf2484ce3eec325a7843fa SHA512 fb221535b77d9e84daf56cfbbbbe5bc9d05d0ca93c68d2d9bc6b2a09023f7eed2df7cce5221c5c9f50b687f97d29b78f079b5ace1cbe17ada16b6bf8507362f5
-EBUILD power_assert-2.0.0.ebuild 1416 BLAKE2B 5542aee8023b5e64fc666b509d767945d13683c5bc439b5abef0950310c7d87b686c6e5fe48f79c473662c9a83eed9552206e513e4fee3075c172885a259f4fe SHA512 720bc07e6c6dd0aaa5441eb68ddc4afd66c1c5a2bcbea1715955473f3dfde554f739aff9fd2222cc3da3107fd463ec0282fc5ad4924d8fe14bd7feeb9f73a1d5
+EBUILD power_assert-2.0.0.ebuild 1423 BLAKE2B b7d1caae6dc82831297e1c9835026b190a5aa4e6e9c3f5a166a934f98d97842987985859d95ec66c876a6882583535ed02756b1efd6ce1b06c46abb9e2a73f2d SHA512 eca5293de390a9efd26e01439019c966213f40a53f2770159f52574dc4176d33f73475097181f3c3c2cf4526f530c79bd8ec8b365ea4acd8a50aafb19b135dcd
 MISC metadata.xml 343 BLAKE2B 207ac229bb41b7ab904b4d6e69ac07d36375964057ec90c69cc6d0be5dd90a5bf27b995b5daaa1802246aa7342db9bc904c1ee872b7b2faaa495318ab030537c SHA512 2c8420b8b06271c1bedadef4e94842e6fb80d49eae669f6ae62678c769a7b3af29af42dbb4660c6bd328b54a522902c5bad49e81fe0fe47d2bd3c1d9f89a7d4c
diff --git a/dev-ruby/power_assert/power_assert-2.0.0.ebuild b/dev-ruby/power_assert/power_assert-2.0.0.ebuild
index c44044ae7943..cdd3a84795ff 100644
--- a/dev-ruby/power_assert/power_assert-2.0.0.ebuild
+++ b/dev-ruby/power_assert/power_assert-2.0.0.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 ~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="0"
 IUSE=""
diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index fcac56fbabde..62f9f96fea5e 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -2,7 +2,7 @@ DIST racc-1.4.14.gem 116224 BLAKE2B 67abd0e9bed46d7c589c62426943c8594d3b119328cd
 DIST racc-1.4.16.tar.gz 451711 BLAKE2B d3bcb72a69df255d5468054541c281bf7bd3225eb3ba1997fccd6dcd219d3a8890e3df7b43fe106ffa3fc63a8d8079cab83e7096b0737f5bbacf816b7c3bbfb2 SHA512 7cdf6a62449e8f39984a8b27706045e509828a93a72d112b22a4c467184a63ee23b4b2048ef7017846053fb2ff4021aa43d96a6147fa271257df584ab3d66f38
 DIST racc-1.5.2.tar.gz 434903 BLAKE2B cfbaa09c1b2e233e82228075cf979c54688e51e702cade072d42b2952100b74a53e536d904cbbf15cb04ffc74018b48e5b27a5773adf6240614c815250d47119 SHA512 73c68dd75fa35727fd93a76886dd77afbb7032271e535c6e885a4ede6822052a93a610dec8a1f84daf24903c749b30a185831ec96d651588db2a2524f3dcd477
 EBUILD racc-1.4.14.ebuild 1824 BLAKE2B 1707d38bb941dcfa20e737da4281c9d588830aee6a25c23698ee25cd83831e4c187e181e60c5942e30d4016f9b864354b0c7045bb3bf3811785547d37185c5a8 SHA512 8ff0842b29957a15d063bf7496127d24777af11881b307aa88fd9250345f90d59cd1e749cec8d44e7ffd46e02ccf120d142318deb446d199b75e850150bb95cc
-EBUILD racc-1.4.16-r1.ebuild 1929 BLAKE2B d8614223b4136613ce7d6182b702b45ec7bb37e59c942aab0fba33abb3c7fa7fe0232665e50f7d04891373a50b6139f01862f869d14790f13359aeb35eb85a86 SHA512 3b239f1132a2806d32cd35e66f7e15aa7b2c1b8744e945708c3a27825646f10bd6002985cfe7524d7f0b3ceb3c2349f28eeae7f562d81ff681676f75cc846d93
-EBUILD racc-1.5.2-r1.ebuild 1735 BLAKE2B e911a30772a13a744c312738d687ae8b9698d21d12e9e1123011a602e9c1d9d29877d52878596a622f902b2c69f5e9647946866a804832bffbaa2192b48d6174 SHA512 ec5dd0716975a9ca685a6042e3c3da67a02c8552d688b9c96fec9a88003a7d684b44e8be977c9219f818125f20d39581e6f9073b6cd08c7ddef40a12d1105f92
+EBUILD racc-1.4.16-r1.ebuild 1925 BLAKE2B 3a794b9bb23481a2fbdcf11e36574e0ba2f74bcb49c461583e2be7534a7900de83935ae53d99e13928460f2e3730d825920d729f2007b3d1a7bcee893d68c203 SHA512 dcf1ee7d75203d2e4f47d6faa815701bb2c14696eb7507363992d6d91e5cd16adf8e196e8d7a894e1a1baa13133ce18f26ccc51f4e2dc76ebe68659780450d96
+EBUILD racc-1.5.2-r1.ebuild 1742 BLAKE2B a770ba3bd89dd17eb51246b612bf7928f7740db981e9165d82a49a9a8bf42d1a7c0e8b1d0f7564802130f73407de7190b5eb353c4b5076529a4c48416f27b01f SHA512 97f772ca30602aae276256a3e18f15acc7e64a8467c6d2e1b412bd3ec6b735d515931b35b09d99e22324736d5c64debbb3acf602ecf4d70a2ecdaa56e677ec69
 EBUILD racc-1.5.2.ebuild 2001 BLAKE2B f9c86a3ee7065e818e7dd6d1f865b1c6450e77d786946d6f58cbf87d07c4c413e9838a5183bacf9ab9576392b803add944d8ba92da20cf9915e0bb58fa9f1067 SHA512 9e9aaae14b6171189122c8616450a246a7969b35cb8f1ae7fec1bba22bdb332ac5cb180a77636a069077c7fc03497694fb67e45cba0cfb0eaa5a49e3fee7de26
 MISC metadata.xml 331 BLAKE2B 67dac6bbbf2927c5fa694a0de98635c952eab8ceffa913aac7762c88625957b83f7bbeb22dbab5adb445b306e7bb5efed458e23b9a2c8137e65c36b4d12744fa SHA512 cf609ee98391504a83037f2fb2601b7b4f5dcb3ce58be9dfb895b8b961ed54e19d9782979cf24f1c1187087c1a8482e755d24abec089187870dd6361f17559b1
diff --git a/dev-ruby/racc/racc-1.4.16-r1.ebuild b/dev-ruby/racc/racc-1.4.16-r1.ebuild
index 0d675db63956..945fc5bb2747 100644
--- a/dev-ruby/racc/racc-1.4.16-r1.ebuild
+++ b/dev-ruby/racc/racc-1.4.16-r1.ebuild
@@ -19,7 +19,7 @@ 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 ~mips ~ppc ~ppc64 ~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 ~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"
diff --git a/dev-ruby/racc/racc-1.5.2-r1.ebuild b/dev-ruby/racc/racc-1.5.2-r1.ebuild
index 2609e8b6c2d1..08e9adde6cb4 100644
--- a/dev-ruby/racc/racc-1.5.2-r1.ebuild
+++ b/dev-ruby/racc/racc-1.5.2-r1.ebuild
@@ -22,7 +22,7 @@ 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 ~mips ~ppc ~ppc64 ~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"
 IUSE="doc test"
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest
index a5046d6f2658..72b3f594e3b4 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -7,5 +7,5 @@ EBUILD rake-12.3.3.ebuild 1263 BLAKE2B a866e416a95844a8769325352c83f439e6cd9eb72
 EBUILD rake-13.0.3-r1.ebuild 1449 BLAKE2B 85c2bf25d97ad075d5c394bf1604a83b98b51814fd3d5913665b980d65f4fbdf720d51cb48912d4e317d3c0c193f09ef27f09656462d3e2f3a33cc2560b45f51 SHA512 57c55d44d2037dc6dd498656628b156d9bc9e7a0d8bcac41a6f098896510904cc0b1ff25ab7d116beed25e914c90177888187468bc94437bddb902f6ca617ede
 EBUILD rake-13.0.3.ebuild 1447 BLAKE2B 20142be6848ce363e150b6d3b36611e99077794de5ee4ac7e22667e70245252ea5ae2c44243f1146405971ef31fbc74ae119e22e006e89e1d1c4bee894565db5 SHA512 7e6d6b6e16de8ebfab69c887d65751aff7c5902a3975bd99882ee060a0697391c58edd1c073d799aeec8fe0481d6e19bbad70b2116bb1ca67e6bc27e30a60158
 EBUILD rake-13.0.4.ebuild 1488 BLAKE2B 81506dd9027bf056da28aa18840319ce3502057ae76552bb5ab465929c9d9c7da0da84ef1f4fe61e22069667dbfda47a9081b370573f3d7ed9351cc8558234f8 SHA512 45f5cffd067f5c2b4d6429dfa18e17fa4ee9a10459260c9780f31eb66c8960fdc6c0655ebcb443959e9aed21cfea9dd7d73c3a5b2dd2e94e64d8a228338a0c97
-EBUILD rake-13.0.6.ebuild 1488 BLAKE2B 81506dd9027bf056da28aa18840319ce3502057ae76552bb5ab465929c9d9c7da0da84ef1f4fe61e22069667dbfda47a9081b370573f3d7ed9351cc8558234f8 SHA512 45f5cffd067f5c2b4d6429dfa18e17fa4ee9a10459260c9780f31eb66c8960fdc6c0655ebcb443959e9aed21cfea9dd7d73c3a5b2dd2e94e64d8a228338a0c97
+EBUILD rake-13.0.6.ebuild 1495 BLAKE2B a2ac9cd9bc02871fbcd730ff671ef1de072c6f07673f3d6346dfd6531673f3c95fb8c06ecca72956069d3fff3cc6f35b4b9c5d9cbd0e999ddce854b68d4f6948 SHA512 3097bc7c795bee111cd8bf15a8a7e2dfb687dcfc87d35c07576e2479185f331b6e6c681f1622665fc08655a14df4d29ce23a5be18da11f12d68aab04cf68af06
 MISC metadata.xml 341 BLAKE2B 4f6fce5484dd3adf4b7025f95d26ecd9f2f435d2b5e5774cb3f6ea2ea07727d4d76ef640eb039aafe67e5597b70d22258d0f8f939471af2057f0f933250098e6 SHA512 56fc95931062163036dde73847a796fd5802ff4bcb8a8e72686847537d0f38c9d15e0ec83bd06c2f86ce92952e9fbaa0e90eb4633d7afc460adbc0c9676e0040
diff --git a/dev-ruby/rake/rake-13.0.6.ebuild b/dev-ruby/rake/rake-13.0.6.ebuild
index 0ac434efec60..c238697d984c 100644
--- a/dev-ruby/rake/rake-13.0.6.ebuild
+++ b/dev-ruby/rake/rake-13.0.6.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 ~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"
 IUSE="doc"
 
 DEPEND+=" app-arch/gzip"
diff --git a/dev-ruby/rbs/Manifest b/dev-ruby/rbs/Manifest
index 2f0bb6b5857a..dab00b64f001 100644
--- a/dev-ruby/rbs/Manifest
+++ b/dev-ruby/rbs/Manifest
@@ -1,9 +1,7 @@
-DIST rbs-1.0.6.tar.gz 519090 BLAKE2B 1614320b8f77fcf4880cec6b7e4dc5fcb6b73f59410aa4dc51fb61b2868313acb242dc5a572c6cb96d9a819bade4b1d3aee2196189ea3fcc84d718ebbe9ff1d7 SHA512 a63c5781e6f73e998ea10c1a821d4f33388387caf6cd8e1ea607a9cd009d3f793e59c93b140e2539291a6b1d50b6ac40be7b484a8de0594f0ccff8a2db1e8425
 DIST rbs-1.1.1.tar.gz 547506 BLAKE2B 5bfb64214d4fe0d19ec1c633b3f42567d2615fb0ed34ec78dd3defa3d185adbeab71ad523285d2877babcac4bb61ed2ec60eba80871cd4c631a2017f49768488 SHA512 f31894c1a52679241ef04f03d1aff545f9cc53a460d8933b7064b8403bbd6ef46fbfcdbda00189b158770389bba38b3978ad7d5dd0e7e0594540841e237adfc2
-DIST rbs-1.2.0.tar.gz 560408 BLAKE2B f1f1491018897ca445bb1e49d6d8965af7bc8f19657130fd1f6233bb2d63cac9ecdffba8e41232d2152a6db3007f597a62b7a1cce6c1cf9b2b794b8550b45de9 SHA512 877341ecbe9764431de95c431aa757533c21ba3b51b625a5b1d74d9b76be4c32829f64859befe252162e5dc40ddb1d30ea569e0d7a1e739777f7c8143389dfe9
 DIST rbs-1.2.1.tar.gz 560668 BLAKE2B 25cd2c232a26527e7693d8fe80f0aea08c1d261bbff0d1cd9d20d5d6e06423d3b06e86bdd0ebfdfaf3224307dab683588959f23306fc48953ea2a96fd93b0176 SHA512 8c2e791cf751581720238a6fce347dd03378c42e5d7eb1495c191677bd443ec6294d082e22f589d28ad63ab2f4c98575f1619bad7e31e72af98914695eab2d86
-EBUILD rbs-1.0.6.ebuild 1179 BLAKE2B 9ade58dc806c870b471fb5632946f3810383077649e032254ed170cc955afe8ea5dae28a9c89ce6771777854435e2a6d690f9b5b197cef088361992cfe46432c SHA512 f9c8c3cda17eaf589757498fd345a58f25a7d5646675799b3de4dc5911e84fa32d5ee9721417c72378ff955c2578de53f3fb1e9779a5168db4a3f4a4cbbb7e65
+DIST rbs-1.3.1.tar.gz 632463 BLAKE2B c222430bfa14fa7380cab393448b54e4596fe3984a1d31caf5a41bcd75cfd0a795813b4278ab89d5453cb5f4d090122ebb217cd336c03b31063acf4f4e303b7b SHA512 691ee6466172189e52ec949d361ccf66b82e8343efed5ec36673a4588b8de78e11f03b98c93c90a3c655819a29d56bb502f20fedd40a0515da3acc1aae126f27
 EBUILD rbs-1.1.1.ebuild 1179 BLAKE2B 9ade58dc806c870b471fb5632946f3810383077649e032254ed170cc955afe8ea5dae28a9c89ce6771777854435e2a6d690f9b5b197cef088361992cfe46432c SHA512 f9c8c3cda17eaf589757498fd345a58f25a7d5646675799b3de4dc5911e84fa32d5ee9721417c72378ff955c2578de53f3fb1e9779a5168db4a3f4a4cbbb7e65
-EBUILD rbs-1.2.0.ebuild 1181 BLAKE2B 25f78efd7c8b626fd3440cd438b0d50b69780506c3230cf0e307d55855438511c5ee89efd5a6ba7098fe3682b4373726aae81e3c66c3fa15acff692410455088 SHA512 5eb3c4e31348e760d3386edcbc89f209505ca2e42a9821629dbb420402b0d9c7e86926f9aae8d5e2b2012b3212be72b42ad234259153ad54e82255b24fa603bc
-EBUILD rbs-1.2.1.ebuild 1181 BLAKE2B 25f78efd7c8b626fd3440cd438b0d50b69780506c3230cf0e307d55855438511c5ee89efd5a6ba7098fe3682b4373726aae81e3c66c3fa15acff692410455088 SHA512 5eb3c4e31348e760d3386edcbc89f209505ca2e42a9821629dbb420402b0d9c7e86926f9aae8d5e2b2012b3212be72b42ad234259153ad54e82255b24fa603bc
+EBUILD rbs-1.2.1.ebuild 1188 BLAKE2B e6eb0b7b25631b6d65779d737381764d6a856d5aaf2369f695fd8d2330eb3f4f5edd67d5dc0becf79581b768f68df19c7420b5bb00cc12e7aa766b8d4f88036e SHA512 21a63c61d4078bbffbed89086551f649398609e1b655f8afc8ab78641a7a0dd978b9dfc37867e2d58ad42606549e90e6d68185ff5e6b4d8059175aec3bb77b30
+EBUILD rbs-1.3.1.ebuild 1188 BLAKE2B 9c309c9befa8e76e809c4aae1dc2f2e574293bc1ad273eafca746328fa185f25d4c566ec590e634422f9d7617fa9a28af622f790e2c8e6cada2f75891de75a09 SHA512 3a896d5c0a9723c5009a9271d7125f052660a52a2ba450721133d7546b3c00d8f5697d28191c6bc4aa4db1558f09f5593972d7ec663d6b44d5235021c1f70248
 MISC metadata.xml 334 BLAKE2B 06663250439d029482e4050e769ba2e5bdf9813dcb9244e06a260247d0275b9a172f0cf06dff21bc81d4eeb2eee2bcb73a11fbd3b9cede4abc7d4edacc6d0d5c SHA512 2e1b1fb38bdf7b589cfc2b448cdcbf7786179b92d391a7db698a1fa8ffc6b7a3f6f7f52356ba76cd367314bc6596a735a17743f06d3141fb817abb4aa63b1cf4
diff --git a/dev-ruby/rbs/rbs-1.0.6.ebuild b/dev-ruby/rbs/rbs-1.0.6.ebuild
deleted file mode 100644
index 74d2c248f835..000000000000
--- a/dev-ruby/rbs/rbs-1.0.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
-
-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 ~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/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid JSON schema validation tests due to a large dependency stack
-	# that would be needed.
-	rm -f test/rbs/schema_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/rbs/rbs-1.2.1.ebuild b/dev-ruby/rbs/rbs-1.2.1.ebuild
index 900ed36a1e92..6602e2b93a34 100644
--- a/dev-ruby/rbs/rbs-1.2.1.ebuild
+++ b/dev-ruby/rbs/rbs-1.2.1.ebuild
@@ -19,7 +19,7 @@ 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 ~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="0"
 IUSE="test"
 
diff --git a/dev-ruby/rbs/rbs-1.2.0.ebuild b/dev-ruby/rbs/rbs-1.3.1.ebuild
index 900ed36a1e92..6b1c5644770c 100644
--- a/dev-ruby/rbs/rbs-1.2.0.ebuild
+++ b/dev-ruby/rbs/rbs-1.3.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -19,7 +19,7 @@ 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 ~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="0"
 IUSE="test"
 
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 249157db7e55..816fd5da29fa 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,5 +1,5 @@
 DIST rdoc-6.1.2.tar.gz 667607 BLAKE2B 4857bcf5f72d93fe4e9ea89acfda9ae82afd61a7ff501d2eea529330d2b8a63d7cc775490648fcff5000ee60417123244518f56a31593af8efccae8f925b21d9 SHA512 a54e36adf9f98117f0b5ae4490a0ab1ce12d9b1de5b7c61ffa326b36ef13885bb8f18147f3548f95a285b15470faba14965bc87088fa3ce584928d8ee396689f
 DIST rdoc-6.3.2.tar.gz 675963 BLAKE2B 1ac931ddf0af700f2460e415a6e8c505c9a3c0f2d65b5c25928285144181d925747dad0224f014abdc1680df9130df74ba82750a2cb1d02b042c0bcd63d22e6a SHA512 1bd8eaa6c1e5cc40492b1d6e461d831cfc05bf368c982f3266b63ea4984c10de40523f9e2106b1beebd96933a2006cb81c3daa26ee0196d99d1ed6da5b72a78f
 EBUILD rdoc-6.1.2.ebuild 2636 BLAKE2B b7e269de9371299b8c7580e928e48f250a417120553d1f3520ec0a6e590d3bd55679e0fbbaa2a7e9de2890ed7c4bd7e58b70ceaffb4df5daea47e255b5feb4b9 SHA512 8ba41314f28de3f789fc4f527092ea2d97115b198a99ff1c38edb6ab6b2ca62ad3f0b71cd435335fd7589481d90e2c2fc133d72b096a91ac0bc15b2d52d3c15b
-EBUILD rdoc-6.3.2.ebuild 2729 BLAKE2B 30f2f991e8bcf192aa431b491e78b4ab818046ecef646b87882fd828fae43b8126abeee6572b2bb63edef4295feca35360b51a16b6ee7545f19322f82e604479 SHA512 422a59699e874e6083255123d2ae6a230b800a50bb14562e968feb0169735631023299e5d15d8e49d7952a0726ba6a3e884d70564691edf874a6f25b29000c73
+EBUILD rdoc-6.3.2.ebuild 2736 BLAKE2B a5a7ad25a416922eecfbd27ce9fe7da6e4e4a8d64077c5033b2cfe440ad25c2d78bcbe9434dcfaa192373f33fe1382fc840351d5494d6ff5d90970fb2703a762 SHA512 4a4ce242605f822b9d99ec612d5c33ef4afaf55cdeae3305a04231a9bd64c2d05fbd8bc1431cd418696775cd9063903ebf7758e82a0f82547a16cf09b83114c5
 MISC metadata.xml 335 BLAKE2B 835d498407155ac5295c70af8a671114c777e5f9371b3d47f9f92a6b102b8e1d58755df0737c34820630464772dc001163e83b5d319707a1c630f4cf2f9ef8de SHA512 3421081016cb99570f9ce9f775097669cd40a709efbbb3c76a20947717bc40d886195a5fda889407d1c436a387c126e07def1eeae01edff53c490ea9c630e992
diff --git a/dev-ruby/rdoc/rdoc-6.3.2.ebuild b/dev-ruby/rdoc/rdoc-6.3.2.ebuild
index 94a5b480ad32..87fc9755ff0f 100644
--- a/dev-ruby/rdoc/rdoc-6.3.2.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.3.2.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 ~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="0"
 IUSE="doc"
 
diff --git a/dev-ruby/rexml/Manifest b/dev-ruby/rexml/Manifest
index 8fb323538184..53d0173499b6 100644
--- a/dev-ruby/rexml/Manifest
+++ b/dev-ruby/rexml/Manifest
@@ -1,3 +1,3 @@
 DIST rexml-3.2.5.tar.gz 447881 BLAKE2B 4b922d51f9331ae17c2deaf3c617fbb6130b111ec0fe27892e524b89f298c3b962e64ab276b71213f3482c0a480b52cf71b3866aacc45fd6de82589baff81354 SHA512 9c62b789988b407bf4b02906768300b256734bfa342ef6b3551428ba2c1792b7e7e5a5480251d7df52318a5e5155757ab1377c0cc8d1d7c33278f33e367a5ca5
-EBUILD rexml-3.2.5.ebuild 872 BLAKE2B 7979f3121f821d5bd5cbb7ca41589d9edc1b9a1c89656c72ee050c197530a864dc357aa1592400e0103ea2e18238872c26a5af156bb76c0f2505c589d519cd7e SHA512 3d9f0d877372f204b0da689f0269e377134da87fe048471778ac0a58488798ddbbb05f86193e5075ca7776cd2d4fcf5bd577ddacf66ac54d4b525104c765fd2e
+EBUILD rexml-3.2.5.ebuild 879 BLAKE2B d6757afe42842f3b6017ead14d5687705e91f15eb2b4df343f98d0415e2159c2fcbdf34d3856d89ce393383bdb371bdd39b9b4db10b968594f6d56b05dcb37cb SHA512 9f1c01ecc7a344f2e554db9539cd84a093c0d8bc8592d0584fbec695e8813b62c04d01f581f1fc4a6887ca1a4940635b720384f6bbce3ca509069f28520d6156
 MISC metadata.xml 257 BLAKE2B 6339b8ae3ef779011f34940b5af7faca341317790ee6752ad73cb83db463ddad10b25cacf16f73ce6d0fde976d916e2838e6209bdedfbe5ef6da285be302203d SHA512 d86ea11e509e5d031f82c4bb476a5974b85d812abe415e95799bdf34a308ade95e2f1cf35f6af84ae5acd0f67996b150c02712b75ab4f5a1ff4eef0ffb046d7e
diff --git a/dev-ruby/rexml/rexml-3.2.5.ebuild b/dev-ruby/rexml/rexml-3.2.5.ebuild
index 88aceef6cd49..50e13ee6d580 100644
--- a/dev-ruby/rexml/rexml-3.2.5.ebuild
+++ b/dev-ruby/rexml/rexml-3.2.5.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 ~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="3"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index c137fa639151..b05e3f186f16 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,9 +1,7 @@
 DIST rmagick-3.2.0.gem 1950208 BLAKE2B 5d4255fec8fcfb8ec2f6f361fd54a3371935dbae323918b2fe1aea47645f160024a8dd16582acf5c930639a50f702b2062e475d231c3bb0acc0bd83ac9ea00ed SHA512 f6f15b013699da5c61e83ecf4ca16d64e7e2f447dc721c7db55cad6b880f9805eb8bdcbf70aef3e30a82f38bbab8ca093d8c6d2ce761cde4f47209e3f99a9f16
-DIST rmagick-4.1.1.tar.gz 1978761 BLAKE2B 489d355237379b7efb5e1d82b71cb2e6f8607cd644933c4d1d1116f464604262388aaf8534ed322c6b44291aadc3abb75e1bca94110c01fcde228b6fd9bb9ab4 SHA512 08d5a730281e7aa44fa955c8af06649efc77702dbc979f5de34f2f3b39798d494a0df8860a25746d89256c7ecaeaa140e4e5d5cd60017ed4412075a790976a5e
 DIST rmagick-4.1.2.tar.gz 1978867 BLAKE2B f89aadb3d0dc5274376c2fef335cbcef3bdfec3fa9aa2f9e0d1982c9d2b5568689a427c3b2f7536c0585316c0f53ca7111c3da30f8136df4c878782668830847 SHA512 671ce8ef0d2387d6f0091a7a7a79a5ee9a5c5cd9340f5d29b4a35227c2293eae5e0e5c9ef16a83dc24ed0cb59cc7258427f8880484f7bb49dfaccb00d280e2b4
 DIST rmagick-4.2.2.tar.gz 1984143 BLAKE2B 8b8119a0002c48f3a289f72d4bbea6ac86cbecb287b34ddc14ca126fd2d951a34aefa39d68603dc4c9de674d346e47ef9e3b2c8ed96a5bc081373a4184a3ec40 SHA512 0a6a30a631786ea310d2c8add297abd527588be755d021143d6c64fbb597006aefef859c374604f8d26b0f8b1f6cd8a5f1cdd6489772ee713c71681f3980c7fd
 EBUILD rmagick-3.2.0.ebuild 1571 BLAKE2B 64042d8dca87fbb45cbbda5027238f514e3b318e8411bbc5533d69c1f363a29929059a3ece5feaae36addc9e2da64ea18329315a6b9dd2ccf3fc2c4d1b8818dd SHA512 bae5e087c94971cb2e5c5b1e60e72fbbfde68e134166d1ecd8b2f75deb61d2adcba6a43bc345f8395cc699c798e68ebc5b6d9402fc18ba9a4ba768de7551a5e7
-EBUILD rmagick-4.1.1.ebuild 1800 BLAKE2B eac789a51637261d6f46e3a04fffd3cb44cbc1a9d047c52720e2567905947ef91e23c381191134350c73f7684bc79615d064b54df1c219ca12f23fc5c0531da0 SHA512 5414a49a468403137b17f313b4d5823b4c69b7af2a13c048371aeea15578854c23e705834d771c9d0948467d70a585f025586079bcb60c5f953e8eb139ec582c
 EBUILD rmagick-4.1.2.ebuild 1815 BLAKE2B 28b551d3619913b9a89e3b3185f19959d82ad4f1536befbded1c96afed760aed4c52b9095fcfad8d7a2c2e73dc54246211358fcff459d9096996c8b04cdb65bb SHA512 8d3eb2320c6f37bc65dfdbbf2b19498132e85024544728ed0a9915db12a950bf21505bed98d6f75488e13dcfd0bcb9e42563bf0fe7e5bfff5b431f08f35b06d8
 EBUILD rmagick-4.2.2.ebuild 1848 BLAKE2B da2ae7c6045f67c2c40359cdf747e11fb5952a49dbbd1db4daaaebbbf950b69a235a76b4d6d375124fcac8859c83201048b160c64fed9aa0f7b2577b815222b5 SHA512 1960e449264a4a01412b749cb6bbb00c2a331286bccb52624163ba7076c98ac3cf1c3d11ce928095f1aee8fb4a5f898931d565cf932719ce3da6af7bcc5c47a7
 MISC metadata.xml 341 BLAKE2B 537583fa385971de2e8ae510c7d32f11bf7644b3aac908b482833d26a2d92060255c2f15afd229c6c50207e969cbd5857705850440949788a6fac7329f26c757 SHA512 84bb956a38056526fd173c3f4aa972ea121712c15111a35e19e1f27b0cc797ebda4550ada88a46de7e66e058a66bb92d2e715d646068779843133a66d7523683
diff --git a/dev-ruby/rmagick/rmagick-4.1.1.ebuild b/dev-ruby/rmagick/rmagick-4.1.1.ebuild
deleted file mode 100644
index 5bf68fa87169..000000000000
--- a/dev-ruby/rmagick/rmagick-4.1.1.ebuild
+++ /dev/null
@@ -1,67 +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_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rmagick.gemspec"
-
-MY_PV=RMagick_${PV//\./-}
-
-inherit multilib 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+=" >=media-gfx/imagemagick-6.9.0:=[jpeg]"
-
-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
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/RMagick extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -Cext/RMagick V=1
-	cp ext/RMagick/RMagick2$(get_modname) lib/ || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-
-	if use doc ; then
-		docinto .
-		dodoc -r doc
-	fi
-}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 5173cc8e45d8..b386e584d0ed 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -2,6 +2,6 @@ DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab6
 DIST rspec-core-3.10.1-git.tgz 398302 BLAKE2B 3ecd2a93b77435ef44dd7e52e2987155f71de3b04376dfbfc9c831ce075b4105f6a23a210f8508784b66c46f1126c188a3bd0548cc4f24060373b9c7e0b79101 SHA512 2d134e742e36cfaac0a52fa7ebd949391cfe58419956536a65fa3aefa2c7f3638fe19f7324ca3e0d2642cc5a9d33de11b09bd571844f1cfae9c077e5f27563d5
 DIST rspec-core-3.9.3-git.tgz 396080 BLAKE2B ea52a33586dc32af49a72950c7dbf24eef52a74891b2d7004ec4c5083e2e6d63c602f5033fba3a8ec1dfe6e8da349208b468a79b4e16aa5150d2fc8e93055c0e SHA512 f821ae3017c0fd9ac7f3ced0e81d0ebc54f2c17261f426c58a46c0bf1debb20efca7acc4b751b671e160de72ce5790f897bcb55d5d276fab228a4ea8d388a046
 EBUILD rspec-core-2.99.2-r2.ebuild 5100 BLAKE2B 44d2904b5aa3f222fad677c0ac53a5f46602e2fc5505b57f1e4b0d8c68bf8222b506d9cf0c1403a4e05292fbbba6eb658cec5727e48e4c79b6bb4af338d8d370 SHA512 6feaa484ecc73472c5f5909b82d9570fcd617c5eecd08e70037fc96f1695fb801f21baa12dc4224c79f54f615a0afb0b53c06d7758e215e08c2c34f034a7367b
-EBUILD rspec-core-3.10.1.ebuild 3125 BLAKE2B 5ac35a42af2becc7e67ad6d6ce8ca021e01b8e5a468679cc902a3adf96f62ca68e251c6f856f7497e3745e52ecd9269f11443af45c9bd0f45efab4f732e9d0de SHA512 38823ba7b97764a20681b3d4d5bea66dd12c6a196e50a85141efa6ed4f77b222b094fc7364818868f1430d5f133a498c45be94b4f1685c031b8fd65525013403
+EBUILD rspec-core-3.10.1.ebuild 3123 BLAKE2B e3b71067f8cd09b4bb239d3e7ca54b82d0a601ff9e3d041461e75dc15a1e977269e26c7a5092a2fe1d7b6e631f17b747ca390b322a9f9b4fe0476c14a26c891f SHA512 a4a2ec451fc9d8c9ee39ef51b121c4cd1e1a99a70f6561d3a41bcc9b261200644a95689e55fde522ca55a512421d2c73d31343744d843cffce2e35a65bfb96bf
 EBUILD rspec-core-3.9.3.ebuild 3122 BLAKE2B c8dcd45114eeb2f4acf1aea3934f9daa173ff57899cb234586f7e720508953d960bbc5d8bee29695140f4177660f0ab4081639a5b274d747b7b0f6b4a7530053 SHA512 6050a529b3c922a832403288731ac2b4ded5719693d735e5e6650c62b3a7a8a22a3091d2f66376b23a51538c2c36a61f7b638a0f5f6c701a58e4ac071a8eb076
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
index b05bc9ce2287..6c6820a447be 100644
--- a/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.10.1.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 ~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 ppc ppc64 ~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 2c8456519bb3..1f2261af6e8a 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -2,6 +2,6 @@ DIST rspec-expectations-2.99.2-git.tgz 106884 BLAKE2B 5b31c8681306d5c688f62fc3fc
 DIST rspec-expectations-3.10.1-git.tgz 212281 BLAKE2B a1872a7f71c198db1662eca48bcb34c054f05c16193395962cb47a7fa230c2f0f83bedee302a0ab6a81380a361640177ac3370d8829faa6bd362c07e3a551e5e SHA512 35999542bf70ff04a472e50434abb8815cac8bf10b680da458f5e0e6ee290a1a6356a22cc12f0a8a6310cf282bb6cd99f922fcc63a0cf1e252b167e451bcf7d4
 DIST rspec-expectations-3.9.4-git.tgz 206297 BLAKE2B c5dbebcf7b411c9cb5cd815dc06fb6f455e82181856661110f803b25f3910975f0676f3cf154e93fe771849363593e104e0f2dd298dfd3d8b1dd96a6ff991547 SHA512 bd025b89751b5b8d3c6bd61a90386fc05ca371e04247d93b29334bbb3eceb84bacea3f3846c20f08dbf53f174992b2dc0fe9f2bc449c4591188b5e428b1d8003
 EBUILD rspec-expectations-2.99.2.ebuild 1624 BLAKE2B 4cbf18eee1c7b553b3fa9fb96e7c08f9f46bdb681dae046f8305e1af545746bbf77331412b0b4acffd522425c43c2d773524e4e29a8d8f68364f95f9e52c3166 SHA512 3f7a1635a4f8bae6a87f9523b42a1cd55c8e48ae2e580d7cd7066da60d6fe98c1a449263cc8e593e451bd5f2eb245065548faf1d540021ebc83ff90eba614b8b
-EBUILD rspec-expectations-3.10.1.ebuild 1306 BLAKE2B 28372eebcca6d06e0c486c3fa243e058532e7a42f3479be047d159bbca79a2bda41974b417eb349014ec65146ccdc7d069f8b6bae8c50eb9ff5d04cc6b4b63fa SHA512 389c64ca000315648ee7d9db9d3129bdedf5b3446bdbc11486e2e4a6dbf8f196ff352837e5725e41b1c9bd801d17774b456410c76fa50992692c449d0ded1cf3
+EBUILD rspec-expectations-3.10.1.ebuild 1304 BLAKE2B e5ce9e9664d9535b3dc3f24d1493b2574754430af41bbaaaf65281a95948ccfe4f0a4eff26e688a06bb17d179c932d6311a102dc0ab367319b8f429a9f2bdf72 SHA512 0715ef7cfe98ce0acec7864836bf0a79d300a17a5d084f766ed549388cd17abc08863d2e41c9e06808a3f0f4dadee0764b86c0bd3b3c5bb7a682132336f76f0d
 EBUILD rspec-expectations-3.9.4.ebuild 1296 BLAKE2B 17662e721fd6dedf56a32fe1d93828a0585dea6e8e43a546f552ef8dc173f3db2bc42492c82d25c263dae964f1af6436147f53cf0a9b1518ecb82ed41edaf9f2 SHA512 847676fecf6abcaee6801ecd477cc86fac1de5c5bf98c2af411200ae5005dc5598a2ee2e1de8679f0e7a9d420be97360421557cc40afa9f1734d0ce69cfd5dcc
 MISC metadata.xml 350 BLAKE2B bd2aeaa98f6f5cdbdce70c0dd6eed61eee36323502021664e10356e0e558eb9fbf09f9b056944aaf13859c0f4f29603c5523584e4b823a9218fefb2824edcff6 SHA512 c0cbdb181bc5981daa6dea5ecb445cedbda6d6430218aad98a39b2db67074169305f3cba419fb1e24d79900be311619337a5421b75e0da6d2838a0ccb7de45b1
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
index 7f73a66c60bf..0372144c60f7 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.10.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 ~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 ppc ppc64 ~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-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 584b4a4266c3..e3a18e0c244f 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -2,6 +2,6 @@ DIST rspec-mocks-2.99.2-git.tgz 101731 BLAKE2B 27ae180381d427b642c53c351e7b53602
 DIST rspec-mocks-3.10.2-git.tgz 196040 BLAKE2B 8e975dc8480d4709f650ff27c517104714156c551b8b9ec04681132bd92be80bdb11867730f462e7fb6b672430246a0a11404dec5638b5350b57d81a8eac2e57 SHA512 ab11fa77c5f9e3bec2003dc8825d9582dcbffa08a36818bd9cdbe2dfd357113de3712c818deafc165530f9e4d2683ec06e54d37c37aeb820ae3cd592f76cf2cb
 DIST rspec-mocks-3.9.1-git.tgz 192772 BLAKE2B abcc8fc82648993e6a407a8c4ac4f5b146b821e1e842c1dd2b95824d8468aac0ea796438d77e376c897675f66bd2bc9024da8fa5ccaf60139ea296b388d542cd SHA512 f804783fca4cf2258e83f82515cd5881ceae0bdd3aedb452a1db901e01de5dbca1d2bdef0ac0828a4bd23a1de58d127a42150c8c204219bca39ea7072619098f
 EBUILD rspec-mocks-2.99.2.ebuild 1510 BLAKE2B 73e9ab4e1931b72fc900af16ca022a6ce1b2c053e32904b5b07f4023e3347c3e9974e6e834c0688b3feefae0720bad1000526b2702779ab19f4aeaae468b9052 SHA512 057e150cdbe87559c945285ba98ab615fbd900e538b48aeeb73847563cdf9e0b05fe287cbcbb0ed687c644df5cd085c68d078ac02b2182f998392fef04ccd56b
-EBUILD rspec-mocks-3.10.2.ebuild 1437 BLAKE2B f4b39b710accdf9294a3cc292b1f2350056dc420c49121028cf63efd832633294a798ba7d78a27c3fb1b2bf1c154db4af1873f9f0f7063088a4635074d896981 SHA512 181e57bcff9ea21884ee889b894f2a6d0bcc7b08e3d6412fb5bbc28048d62c6eb00288edb404d62a355fb2a627f8bef0f2bdab52b30b2e5bc6a5323a87f894c6
+EBUILD rspec-mocks-3.10.2.ebuild 1435 BLAKE2B 0175a12eced10895ff2794e76c7864c6c0e73f24910e37e5a1b8fd0f86e4e82cb1db8aa5ee89ab18c3bf22f61a758e0dff89acfc03c0e5ec40cc8b545578b8ac SHA512 b4a6e9753e2b307f2ae00ce26d2d2fb4101e2edea7bd78b437653780e941c1fea655e19baa08c3ddb9c28bc93ff7ee3e9e86ae4e1620c408e729a34ad488eac8
 EBUILD rspec-mocks-3.9.1.ebuild 1435 BLAKE2B 82814e4352a4fad72c57ff163fcfc10ef08ac94b3048b3b96fa5c5a42e0d2612a8328365b5aa8002e8ef97c3fdc85d592eb9faf6c2d90a3b0a4b0c7c2f11479c SHA512 a5b411e0173fa229e6e754335911807c10768311508d8a2f8c0decff12c422cc6185290c9d2a5b9e94c9b510c8e739ae7a6e6c5957bcf9d1becbf0c56beaa90c
 MISC metadata.xml 343 BLAKE2B 87ebb52b322f698e5242c517ca646e64b3a9a33c6b76d968847b2224b4dd683a9eaae5d03470efe775d350c65e3bfbe16547d4b4b99e2744379fbb7c76cc5680 SHA512 c7956e0175d9fdbfd423140f3c757d4c9e1deb6089577f60d11111a93fde6a7c056dcbac8620c30c8c02693297402aa2f0710e43f60abc0878a51bcb8c624667
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild
index d631739fbd92..ca8efabf8ae5 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.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 ~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 ppc ppc64 ~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 e2c6e2c97dc6..66e5ce3f2cc1 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,10 +1,8 @@
 DIST rspec-rails-3.9.1.tar.gz 143459 BLAKE2B 87a691df63a438b15b5726a802632c16373c784cc66216c1b099ed7e36e0916fdfe7ca1fb964904678b779b8fa90f0659971c4af00f9ca3a1071adf2216466bd SHA512 247acda67672ea3fa0641ea36d6209c8876597c63180979713db257e02cb4282b122af4cc0aa540dae984acdb16afdc4359012360b951f0599710fe422cdccac
-DIST rspec-rails-4.0.1.tar.gz 153383 BLAKE2B b2591fe27e992df11404f792e7efe1e18fa023e0b4b7c076f7ffc86e83228a013f06206c687167966413641aea654f57f0d1c0a057ecdfd9c1579fd38d08fcfd SHA512 97b06a8696181fb0209e376780860935f1c22cd9a2ae5977efd45217ab74e6cc0260687bb2ccd22f28cf69f2a73ded43c51ac8d43d0d0b6b0bd0fb3e547d920b
 DIST rspec-rails-4.0.2.tar.gz 153760 BLAKE2B ba609fe316a27c21f140df41b63916cb9a70e77302e3dbe1fa565024e85504e63d4f7bd575117f91f9762bdadf5b462acadefdde1d36a6a731227fa2e2cd5ed7 SHA512 4b4567ba896a80fd487ddcca466d23d6b9e634354f8b70d0146ddbf0c119628406ba8aad4e16bce577e63cc4d3d476c270c4c2f1ad1956bde7529f318b717cf9
 DIST rspec-rails-4.1.2.tar.gz 156296 BLAKE2B ca454065c8fb318148e745162514b9f21aaf6050ae72981d12a23b838bc7d985350c8abd60a36c07cb5c8c8bd80dd7b97b0dcb9ab6f5fb30ec4a6d99aaf189d4 SHA512 c0555d3b0d1ea91c9460981216cb0e4d1999e712daf18e5270aa20daee9667e3e669c918204e863bea0b6a97a63a79cdb1cd261d396743fdfbcc41109211ce89
 DIST rspec-rails-5.0.1.tar.gz 156435 BLAKE2B e32016bdaf50fc4dccb0700320738aa0ef59e5fb7a3e351f68a1b9ad6d86be07850aa473166b0aee037f9dd2f21935c41c4ec502849ac5eeaf08ec602093d81a SHA512 65b212870524397a922dd7fc6a796c50b56d454378785b1ff36eb9e0fa9e08291bff0360a7e56710322a7edb33b800e55b9f46bacb92b3a65f53489307c57149
 EBUILD rspec-rails-3.9.1.ebuild 1511 BLAKE2B c7b77b6d1e9ec550b58e829db92d7746a45709c07a39c5af021188f0ac39ecfdcdd4425125f4f41b2da4d93622beaaaad2133e49a5457a4b46f9d287e4de4d97 SHA512 1a8f965898cf9a073b18d456834dd4c02bb25f68b53f7d818a354be2ae531b1b5d1f3c5cff1a044fa9b6953648d6907014f0ba5b2fcd81082c36a4dbe78d8421
-EBUILD rspec-rails-4.0.1.ebuild 1367 BLAKE2B dd40fa8fe0db77774cbed7425290f70ec91834b72651d1ed6bef4917aa82872b16466be9093afa97d153249238babce110fbd3ab9ec5379a450a0a151ff5d556 SHA512 ee6d372407018a1b9688d5e14277adcec37e0d70e2a76f035d80b7a8df3d513c2214915d5e7361fcddc75d22b73e5d02751fed1eb108e58b15dcac7d4e7da2be
 EBUILD rspec-rails-4.0.2.ebuild 1368 BLAKE2B dc977da2d3b56afa37dd6f4d1385e1ccccb0612eab23376fcc87274601787d789cdef33fe5c10db6cc3a739a2784b093e219118b4228e9ab5b5f23ddb4c2b148 SHA512 6136754bd318992589ec3c988bddbaa767b9c0ea55df2ab133806d51091fbcae8530d00ba2ccb2cd6dc42ada46b0a8c8c1c4a05c99e3b5eb8a4e86295c6e3aef
 EBUILD rspec-rails-4.1.2.ebuild 1555 BLAKE2B d97b1683244bf2bf54c19148dd5aae18eb673a79f5b3e95d33adf0636758c92200a2034b6ff070785d129ff7b5537d190321308577713c0521d4475bbd95ba01 SHA512 d7e405df0f5949eecfbd5f3c67bc440b7cbe446c11ddc2db0b93d7c7c29d0e8baf49de69052c134e47bebc2b4affaf6a9c6a6c4668491397f9f1b4177810cd5d
 EBUILD rspec-rails-5.0.1.ebuild 1628 BLAKE2B 19a274bb361718dc4ae3bcb900a32ad9ff43bdac8756e2a9daacccd102e2d96ecbd0bb9550c561dd4255bc3027c23b04ac2f62d76cf52cfb2307ca80e1cf5d28 SHA512 dab4ea66388a1f7ff63f32f454c09a07191e5da24f73c43aebdfe4fd155ed85cc29d3689985013fb61fb6c6e776f36c494afdb44e4d93e7b9fa512ea0ec96af1
diff --git a/dev-ruby/rspec-rails/rspec-rails-4.0.1.ebuild b/dev-ruby/rspec-rails/rspec-rails-4.0.1.ebuild
deleted file mode 100644
index 56a11789674a..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-4.0.1.ebuild
+++ /dev/null
@@ -1,54 +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"
-
-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-4.2:*
-	>=dev-ruby/actionpack-4.2:*
-	>=dev-ruby/railties-4.2:*
-	>=dev-ruby/rspec-3.9: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.2
-	~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
-
-	# Fix gemspec.
-	sed -e 's/git ls-files --/find/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 7da1f55384cf..7f447ff4301c 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,5 +1,5 @@
 DIST rspec-support-3.10.2-git.tgz 74812 BLAKE2B e6c7e768d0df05fa5e77055efcc69699192928a35029264300faccf500b1ce7367e74e9c2ae0f7f8f0a5e755692ac83b982d0a3dab3da3ab697ad2c5766aa30d SHA512 bd1fb5d737dfdbb7399d766854f0b173dad89675bac580cf65c5d42ab6cd04ad1773e7cfa875dfa4c6fac14f4ccbd6b48813bae5de26c931c804962d29b014be
 DIST rspec-support-3.9.4-git.tgz 72490 BLAKE2B 03c3ba8316a2c6a79faf68db87adf193b684b82119dd9c5b67f2954f3ce72cf03e3e16898e2f5d57d76aef37bb8fb08ab8dacf8aaef6d1445a8257e2be14afe5 SHA512 95be2e03c37117d6bc132ce466779a8ac3c4fedadfb2a6dabb1fa11601aae908e341c87436dd526bbc8b02040b23200c95bd113d0475405afdb4acd099c67403
-EBUILD rspec-support-3.10.2.ebuild 1760 BLAKE2B 68becc13b331d184866ac26c08e6860408f6e1e7e33dfadb3065c5c6b4a2f39ff6763fee5fdc3f15e40c59f84fb9dcad389928d476df169a4d1359b04a446efe SHA512 1d71453c4e900a03a61093e7bbe217eda35ea299e95c0e4472f02d07bfe93d7ee45c0c5386d4d53027d07c2b5cdf7f567ad61de2e4f1e4e661fe622a49350f24
+EBUILD rspec-support-3.10.2.ebuild 1758 BLAKE2B 7d85cdc4ae2e3164dd4e98dd18148aa3f0c86c9366b1a877e3b8be80dfc4b52dbb424d43a3f836fda6436b808908b793cfddc31a6c259d7c0b724913a8864f71 SHA512 6956fb199f908439ba3aebc0046f36eaa20bfa778452a76a8f761ef1d17eac56b0905d94292b02bef7ee944ee79efd864b06c4376f4ad68e52ba6b9727864cd8
 EBUILD rspec-support-3.9.4.ebuild 1751 BLAKE2B a68477e2a7e7deb6af3b4d4ff1a31cb3810b1e545ccdb309f73b9665527f14952caf2471b4f04da4174da930c25da66a348c804c80b214ce0a889f93d87fdc54 SHA512 ef906eb462681dfc4d95458228a9f796af4ccf59cba157392492601382a4eefe629bccee1f7d6359c877c159de40e31ca604395973f08cf700843b7604ae15b2
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild b/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
index cf0d5e801ecb..03f785d0b401 100644
--- a/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.10.2.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 ~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 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/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 7505b0be86f0..52868cd9b415 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -2,6 +2,6 @@ DIST rspec-2.99.0.gem 5632 BLAKE2B eba837aeebcb0d65dc18a644fd935f241a67039988854
 DIST rspec-3.10.0.gem 10752 BLAKE2B e0af9c31a5263b0656341be7432e1597afa56af9bfc5e6d21f1daa7553e5bd3daf2b383a7e1a5b6f761a5880540020e7accd8d4eb6cca6e57d616dcc41690970 SHA512 dd1a3a1c7c73ae9c053e071d7851780d8cf61e92ddba24072b9f2c00a342ed08c81090332ba2eaf7ab96adac3fc723685996195e5cc584e15de57ff02a4455ec
 DIST rspec-3.9.0.gem 10752 BLAKE2B 212cebbae9e71b8a090757ec4b9902f20043eaf95b079a409247990e1fca4236e13d0e9a3bd9b9eacfbc2d2aaab19583452dbe08b298ca69a85e20f0163741c2 SHA512 a7dbb22f01d842a41b54c375d32d94c77a7b964d1ea5b1971e7c228dfd5dbfcfe03c007d687781addb93f819dde8de664dda307c266137fdd0a07dab96f96fad
 EBUILD rspec-2.99.0.ebuild 774 BLAKE2B 7063d9c2312d4609dee333c73b6c4f60f7762d27efc93cfc18f305aae582e55144635a6c7bd0178a4a86d02010cd932552c3fb801df1c31af46ea542c5d5de98 SHA512 481067515fd46d721fb2de15150e34b5d1652fd725e9af505a1ec3b074c100cdb5bc0996d305c9fa010dabbac2545c2980ad748cce101bd92aa56bf561fce104
-EBUILD rspec-3.10.0.ebuild 619 BLAKE2B f4b8ebe12cde5ce7067e005570423763c5a79eb48e157dd8e6f0eb2ddd5f0df17c2f90a88479fb15c5d49c454e3d05ac81fad881c64227e15cfd9bdff90207d8 SHA512 3de4884a68a191d55e78889b00e1d525dfbf94e25bc9adddfb6e5c4d5dbc90e2ea4049ea2fc57c5f87de29b9fc131e10317a85cfe4b6408aefe705bb2569605d
+EBUILD rspec-3.10.0.ebuild 617 BLAKE2B 58609176ea6440751f5289841bc7a1d90b5060637b2c87191b1449c4564240dd506fa35ce949658ba4aa4a9047d9f9bc7489fde4faf7410c7ad1649ec4bde8ee SHA512 398f55c35d40295c6426dd0ad93d1702b64f40f2e9192f9b6801f345148c7597cbcf6e741d100851685cf224e8efaab1501f9b0183d459adffb44f4a9bdc15f7
 EBUILD rspec-3.9.0.ebuild 616 BLAKE2B 5ee7420b2f39d491dd42555ffd63047cbfb40d598b39912210b37a09bc0e7f7ba633a2e4f3d53ebdc3e6658bd1fc869cdb08cb85b033bb8d18fb4814439924fc SHA512 6654d32e2f13da07e83513131653defd0717f63563c30e631e68bbb5d2ddb5dc00649b19002d94dfd5071a6af56c0234f595f4b53705929ea61e936cb615c8b0
 MISC metadata.xml 337 BLAKE2B fd99a128031819f061bb4b2fea336d7b14b26b7a986d782d8a4e2b9b9b7ce4c703242ef724cc9bdd98cf0219973dfcfca2a2eb7979b446f879d2f337b566985f SHA512 0a9165edcea2906fb370afa35ef77b74a4b833539959e8f28194e4d02ab7685f23dd16f04ea7e18873d10bf607236972610c49cf61ed97e5df7b4796ec9a66be
diff --git a/dev-ruby/rspec/rspec-3.10.0.ebuild b/dev-ruby/rspec/rspec-3.10.0.ebuild
index 3fd3135389d8..4a03c0dc3421 100644
--- a/dev-ruby/rspec/rspec-3.10.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.10.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rss/Manifest b/dev-ruby/rss/Manifest
index bc0b60f2cb98..9f849398dbf2 100644
--- a/dev-ruby/rss/Manifest
+++ b/dev-ruby/rss/Manifest
@@ -1,3 +1,3 @@
 DIST rss-0.2.9.gem 106496 BLAKE2B 4b8b4b8fc59f05b7ed513294a809b0961dcd0c8b94cbfff3cbb09102a9ad056063c4b2a5d00b30e2eebc76701b10c3b28125ba2daf49fb420c5ff37a47dd600b SHA512 24d983ae2ee8570c3e433675f9cdacd1c35d6160beb28689a0f8cf446b6b465147bef68dab644a85cb089870d6a9fb2df85cbaed12ed4d6a6fb2d07b12c6ca3f
-EBUILD rss-0.2.9.ebuild 726 BLAKE2B 7c247c7f14677eed7010c77a7aaf328e8160ebc26a79649de8da26b4110c1ce800eb3f149c5500f85b983f9c83c2f3f3c44b25fbfbcd135bf939c86cd75b15c7 SHA512 c021f2828985eb3476af3e9289e971d60472734f8e68f72b945e4249c83075793f7e3d3bea31d19a53406acee07a4cce52d7cc02a7940f905e36133fff1c3a55
+EBUILD rss-0.2.9.ebuild 733 BLAKE2B d305be4724790dbfa3db7c53f882e496b2e4e7ddb9f736f5a074405d9526a34e074a1dcdaeeff2fb4f9a424b5b0b0645c43cd960ddc7e01a25c26e2049e31b82 SHA512 d1cd3cf76814e76541981894255cbaf4c1f845dfd718adea796b0a52148c27e7ddf37d7ed1ad1072734de36411292710ee669f3a76a601716524fabe85a39ccf
 MISC metadata.xml 334 BLAKE2B faa6cfa109984ab609194cb0a789b45ab89968c3b4e96d32b9bb4210df06780b9bb17d79e9a996de2189e747642b9ffac6858280a38c2fe26e683cec6a008686 SHA512 b857ee7cfa2668de8f7ab897213a8f569aff396668644313b565f43d684fe93c6281486b1c2ff99026744aec4031a378f39d706d22d0f80560bacf8d1b83719c
diff --git a/dev-ruby/rss/rss-0.2.9.ebuild b/dev-ruby/rss/rss-0.2.9.ebuild
index 524b324b7c47..82dab485b7b5 100644
--- a/dev-ruby/rss/rss-0.2.9.ebuild
+++ b/dev-ruby/rss/rss-0.2.9.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Family of libraries that support various formats of XML feeds."
 HOMEPAGE="https://github.com/ruby/rss"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~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="0"
 IUSE="test"
 
diff --git a/dev-ruby/ruby2ruby/Manifest b/dev-ruby/ruby2ruby/Manifest
index 2cb364fc70d3..2681cc70329e 100644
--- a/dev-ruby/ruby2ruby/Manifest
+++ b/dev-ruby/ruby2ruby/Manifest
@@ -1,3 +1,3 @@
 DIST ruby2ruby-2.4.4.gem 26624 BLAKE2B d330cd65513218a96c9e35fe2b69d859fa103ad6dd1b8e8a671bddb9732f99cd65540b404632e671ababbe5842ed2be34a29c2b1fb3bc4c43935f5a7a0735d9e SHA512 51728d702d2142e9a7599fe53c2b58906cd386be429fe97590f850df8cf461c046c67a99fc7b7e277551013b78e35d21609c8125fb568ef90270d146a685c04d
-EBUILD ruby2ruby-2.4.4.ebuild 844 BLAKE2B 0a1bad818c3d0e9c81d1646cc9f3aa93b1ad3093c00a88849ede63f72a580faecc999cbb87048244c63d9de627ca6c493f51ec9631f6502d120c602d2f02c5eb SHA512 4b8ff0973d0999ecc2b4df3fe4e15747cd68f1800c1752a666ea27d691eaf1d03f168870c3dd2f250bc7168f7c035ed1bc2d1d76cebf8e410086496ff2718f11
+EBUILD ruby2ruby-2.4.4.ebuild 844 BLAKE2B 64bf78664622e40e948ab0f46a67c9c8a62ac8c3bed7db4de66e67ca57dd40393ace7e669659de2192cc16e918847991ad87fe767fcff901f1f60ede9d341a1c SHA512 a2bebbf5e0003a74322a760cb0ea09e0c76a4c663cc4897d465c3a188df3d045e9f1f68bfbdffa8af42ab53b797315fbe8e1107a95c1b80ec3ad3a50deac2d0b
 MISC metadata.xml 345 BLAKE2B ad97abb4ce420cd1a798b019724f408bf5e8f04116ea72d8de35cb220b028d1e31d9b1380b625dd478e110edbc5100d38fa7ca10ee336d131338f2ba148ed284 SHA512 160d20c5eca00fc8d0cf3145e26d1a89ac158d5d7b826cf1161255c2b895986e7629215d330277d2e3bd8b08c106c4e8725f8d1d8aa3566cdc9e66a3e8cf37c1
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
index ad7aa9bec7e2..4b2a0c2e01ad 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
 
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 4aa2f5f58746..771868597158 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -20,5 +20,5 @@ EBUILD rubygems-3.0.9.ebuild 2635 BLAKE2B 45c6fa75ffd962eebe61fa8fca8a7867dd0cac
 EBUILD rubygems-3.1.6.ebuild 2847 BLAKE2B 661f1e1035c989668cb24642cab1cc444af53595b77ace9e9977a502316deb71b5f5d61521b4480390d8fed1066ca3d0ccd920b21c98251020d50645235ee1b0 SHA512 30aeb16df265eb4e627600071b5057d1e831fa2af1a005db6da2c741385bc6646f4eeea809c0c879f068b7d48b61642f3e4abd50812cf170dbc787fa5c1da328
 EBUILD rubygems-3.2.11.ebuild 3147 BLAKE2B 665c7552d0999b82d851b3c1a38ccf582c3d981e6dc28b19c04f1035d48b771454610772cec750b675f6ed0e0dcb728a7f0f07fe637efb158fa8951847774d28 SHA512 6facf0eb322be5de42e30aea3a32f4d9e0b94b5cec0646c6f8108b991d92212045dd711804b70b7d050f4bb001e134f6afc525d40b7ff83ad8e0b826f9de0358
 EBUILD rubygems-3.2.13.ebuild 3147 BLAKE2B 665c7552d0999b82d851b3c1a38ccf582c3d981e6dc28b19c04f1035d48b771454610772cec750b675f6ed0e0dcb728a7f0f07fe637efb158fa8951847774d28 SHA512 6facf0eb322be5de42e30aea3a32f4d9e0b94b5cec0646c6f8108b991d92212045dd711804b70b7d050f4bb001e134f6afc525d40b7ff83ad8e0b826f9de0358
-EBUILD rubygems-3.2.14.ebuild 3147 BLAKE2B 665c7552d0999b82d851b3c1a38ccf582c3d981e6dc28b19c04f1035d48b771454610772cec750b675f6ed0e0dcb728a7f0f07fe637efb158fa8951847774d28 SHA512 6facf0eb322be5de42e30aea3a32f4d9e0b94b5cec0646c6f8108b991d92212045dd711804b70b7d050f4bb001e134f6afc525d40b7ff83ad8e0b826f9de0358
+EBUILD rubygems-3.2.14.ebuild 3154 BLAKE2B 12e440bb8a187063330c58307299c10119258238741af575582fa13e15802266e0fbec31f1b07ba9736b785925f622ac56e0a13034c9f89faca59083d84fbf09 SHA512 ab894afb51c0114f355b7189739c34de8e0718c08fad6566dc48ea6e8e7f648958da55e71d5e8efc4a09cb40aa9915705a9fe61cef0f483d02a26c96c89b3ad7
 MISC metadata.xml 335 BLAKE2B c86eaf3d37fad025b8f6ca0b03e65b1b472716b4fda4ca4d08b415b29a63405d8e7b2684d309091c90411c5fe809e5129c6e0c0c4e7a982b4aa062ffdd0ca7fb SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e
diff --git a/dev-ruby/rubygems/rubygems-3.2.14.ebuild b/dev-ruby/rubygems/rubygems-3.2.14.ebuild
index e97a3f747765..647e0f26cabb 100644
--- a/dev-ruby/rubygems/rubygems-3.2.14.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.2.14.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2 || ( Ruby MIT )"
 
 SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
 
-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"
+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="server test"
 RESTRICT="!test? ( test )"
diff --git a/dev-ruby/semantic_puppet/Manifest b/dev-ruby/semantic_puppet/Manifest
index fa1feacd3c62..3555edcdc552 100644
--- a/dev-ruby/semantic_puppet/Manifest
+++ b/dev-ruby/semantic_puppet/Manifest
@@ -1,5 +1,7 @@
 DIST semantic_puppet-1.0.2.gem 31744 BLAKE2B fd80225f799f55fe668c712cec20ad57163c3829ce70f49a30e7b73037883ea1960be0ea8f510e147c30254b7527e64f323fd7f9edb30f934762088ed997a241 SHA512 b059d8c7b13ae96dfe012318e7c6ee483cc09986d5d065c8422167a27a14d8e99433229c90388a7ff9ee425a0f5b6a6a6d5bc55f8b81901490afd8039ea86480
 DIST semantic_puppet-1.0.3.gem 32256 BLAKE2B bbde7e40e2d7361b09906974b451a33a2698dcc33db1ab3c790968318b21f4c72d2ce775eb56c331b0509666972cde2e5a1db64580eb6e558d604ff025e389d0 SHA512 bdca6793a064d37d15010551c579f61837b1095025d84469ed8893d4bbed4372cde005ed452460a8d771c8e4bf842283628f2c613295bab0af3834cdc163f7ba
+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 482 BLAKE2B 4df9360b9302780fa2353281f8f2b7c8a90b9674820bc1e9e771bd7ea909ac8570e76acd76f325edf15314d8f1baf8b3803b7a18493a07ad3ed9e42ecd536bb1 SHA512 ebb87ba54b16f58ce0a63a99f1fd8babc29633b3e89b7666b3f780622a180a52c5855560140cb39d69823bf69c6be3063b0f2b19e6807a93dda5dafe91ea9395
 MISC metadata.xml 453 BLAKE2B 04500569e8aa9cf4f1e775f0a963db272a82ea8cb4bc33cac1e8c12a6199542e40bb379e3036d8e18e0ac040e78ccc1379d96b6d25f84f52062268d291693bbf SHA512 18ff722caef29f1aae91072feec01611995b7d3c6c4bb30c262007cd8e6731ddf7e94a9bc767f3a1910f28eb4d4d02fc82a531e2434c442757da77bf3e6cfffc
diff --git a/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild b/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild
new file mode 100644
index 000000000000..b1454420a1f8
--- /dev/null
+++ b/dev-ruby/semantic_puppet/semantic_puppet-1.0.4.ebuild
@@ -0,0 +1,19 @@
+# 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_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library of tools for working with Semantic Versions and module dependencies"
+HOMEPAGE="https://github.com/puppetlabs/semantic_puppet"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
diff --git a/dev-ruby/simpleidn/Manifest b/dev-ruby/simpleidn/Manifest
index 63682b9d9fe7..92d1a2edb3d8 100644
--- a/dev-ruby/simpleidn/Manifest
+++ b/dev-ruby/simpleidn/Manifest
@@ -1,3 +1,3 @@
 DIST simpleidn-0.2.1.tar.gz 204644 BLAKE2B 4c7f82af2ddaa753c8df91f80776b2b00d3a8a8dfda95c9012ebc3e5eea6503fbb0f20a7f79f8c624612e433b0e61cec79bc6a147ef6a04d418cbff72c31c867 SHA512 20a81ea5bca503b167cd2183f762993454a5f7fe082639b70234521f8cb9e4533b1f5f22dfcac18108c90a461185b13fea55f6197ab4c5996116ac359adf5033
-EBUILD simpleidn-0.2.1.ebuild 821 BLAKE2B accedc61cf51d4a33129ec15d93395d3c66637ae8b260f0ef78b66c2db5283826ba7aa8d716580a7fd4b4ad7f173ad056ee8d2a8c16a05b0d7f508f4f4e2860f SHA512 2f02c2009c17a1e04b461479f52bf2865bf5d1d9a10decd186c0c6033efcc4591edb40b735569ad8b3ea05bcd7d29b49e41495ff7dbc5711b7c9fd1cc11132a2
+EBUILD simpleidn-0.2.1.ebuild 826 BLAKE2B 4a1a2a4d970a3b8b2167bb0a6486b31eccec4fa1657d607ceba846a7532619fc78d3281e948031b32d7d295956164363c6ebc690480e3c62e327e450e957e2ae SHA512 d2d424ba6277b6f78568ffc0ac7d3cb5d98d3ee4d619cca73b9145dda63ca969823afbd1bc0154851a420ea058978c73d0142614a3d22bff07fb4294d61de37a
 MISC metadata.xml 332 BLAKE2B 78418b3ccf476ca37796b952dabf3d685564fa862fbf17662bcea1cc05c847de1760b145d272a0cadf7ba66431e2c2c382c84bc5cd84a9b332e179676bf2fb69 SHA512 82b171110796fea6ff5c7bd2489f7794dbf506526100452ae58e889849d15aa08e24f77b6e6cac414bbef8f050c03e842c16fe109326b3adc9c096d5eebc0990
diff --git a/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild b/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild
index f446bb84e2af..5b3359f39dd6 100644
--- a/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild
+++ b/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="Allows easy conversion from punycode ACE to unicode UTF-8 strings a
 HOMEPAGE="https://github.com/mmriis/simpleidn"
 SRC_URI="https://github.com/mmriis/simpleidn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/term-ansicolor/Manifest b/dev-ruby/term-ansicolor/Manifest
index 209af0a5df5c..6603ce698343 100644
--- a/dev-ruby/term-ansicolor/Manifest
+++ b/dev-ruby/term-ansicolor/Manifest
@@ -1,3 +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.ebuild 881 BLAKE2B 61750474d28ab6ec06820649b6f35ad7051313bd2e675fc96a7296072cfb375d1ca1bb7fd6dddf870780aa2df9febb87d7d21b2283c8f405679b5f16d155cf0a SHA512 5ddc4eb19f69d42c9bb57473b945ef7053779a100f2b2b89864dce25ff98259a350caf0b76a8d9825252eda50e6ba4807fca9fbb77517a24288091e8693f1b99
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
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
new file mode 100644
index 000000000000..9bc6f621f421
--- /dev/null
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.7.1-r1.ebuild
@@ -0,0 +1,33 @@
+# 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_RECIPE_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_GEMSPEC="term-ansicolor.gemspec"
+
+inherit ruby-fakegem
+
+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"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/tins-1.0"
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:tests -e 'Dir["tests/*_test.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index b61343443368..024eff5da323 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -11,5 +11,5 @@ EBUILD test-unit-3.3.9.ebuild 875 BLAKE2B 058537c3ba43bc70be921613ad746bab15e183
 EBUILD test-unit-3.4.0.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
 EBUILD test-unit-3.4.1.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
 EBUILD test-unit-3.4.2.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
-EBUILD test-unit-3.4.4.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
+EBUILD test-unit-3.4.4.ebuild 888 BLAKE2B 3718d27da7b490d46aea6b7e30c45a4471c00e6e059d6d9baa98eeb96dd8f3e5c605ed24ba60aac83639bc998f241237a94bb1740d475a35fea262001503ff1e SHA512 2b0f6e819f6f20eb49e9c235f4799d61573bb130f53de53bad79f9b9e1f2ca3c76599ca98836a5a180c5822a55f8681434d2a9f470697c47906902b3230d3564
 MISC metadata.xml 337 BLAKE2B 0a43a0dc135bad049718f93d6347df3e9b610845ab2e59201f998c2523a6a67769a5591b678093eea2b18276972cf2cfe633892ab3b86acf0ecce357a31cd236 SHA512 82719d56184698a8bd8e03c0c71f2071eb2bd7d7394093b908a69c031c73ae5634ce3739e371b9d57723b78e7a154f26f6d48f270adb8ca0d89b88fdf13ce3be
diff --git a/dev-ruby/test-unit/test-unit-3.4.4.ebuild b/dev-ruby/test-unit/test-unit-3.4.4.ebuild
index 805bffe784ad..5d882fd99648 100644
--- a/dev-ruby/test-unit/test-unit-3.4.4.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.4.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://rubygems.org/gems/test-unit"
 
 LICENSE="|| ( Ruby GPL-2 ) PSF-2"
 SLOT="2"
-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"
+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"
diff --git a/dev-ruby/typeprof/Manifest b/dev-ruby/typeprof/Manifest
index 07868c95d124..4eb213c1af3a 100644
--- a/dev-ruby/typeprof/Manifest
+++ b/dev-ruby/typeprof/Manifest
@@ -2,8 +2,10 @@ DIST typeprof-0.11.0.tar.gz 496673 BLAKE2B 215bd738a4a4b9e7de78943a944fd63dd4f16
 DIST typeprof-0.12.0.tar.gz 497398 BLAKE2B 149d382c5598ce3cfa023133095190e00e083ac445019c4aedf59d66005db93241dacd9c724f2b62e64d02aa3d7f4a58a3fa4546256c872030687574112c7333 SHA512 a28bc10ce19f7a3afe940cb01fd443c89a87497be2be0b03d92684581c4ffdc061e8e5119652116884e4cf0e5c0ea7d9a73c0f8be2a666d6bbe71e81bada323b
 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.0.tar.gz 500851 BLAKE2B 7865e4f3ccde48c6c7b7d9b0e136cdd301ea018d92627eb92b8a0def5239d52f343d8b071304e09fc458b7c08c00e83a080b69c42e643d96b569e4fc6312db7a SHA512 8b2d5cf59fe4a3d80898e48eca62dab4807fb953260ee686516d7fa5d31141e29d0f01ddfa8192d8d65c6acd152be130c1cca12dd9e8794850f905b550154ac6
 EBUILD typeprof-0.11.0.ebuild 939 BLAKE2B ac7b27b3b598a3800d56d93d959d4579f7a861adfa7f472651267db0184b9c38f6839220a739aedfe079437c7bc0fe2f7e909c89fd5c4c4f9e65ce5aca4158dc SHA512 db5acedf0051b6607584ce5290b695e6cfef8ebf564adacc12201cf39e0b87b72bc395686a0e3bf73bd1217ed5494439138e2d3ee5f4871fd3df8abc09331742
 EBUILD typeprof-0.12.0.ebuild 939 BLAKE2B ac7b27b3b598a3800d56d93d959d4579f7a861adfa7f472651267db0184b9c38f6839220a739aedfe079437c7bc0fe2f7e909c89fd5c4c4f9e65ce5aca4158dc SHA512 db5acedf0051b6607584ce5290b695e6cfef8ebf564adacc12201cf39e0b87b72bc395686a0e3bf73bd1217ed5494439138e2d3ee5f4871fd3df8abc09331742
 EBUILD typeprof-0.13.0.ebuild 978 BLAKE2B b94c723691165ef6576b3f71aedc48e47873b605fae9ec5e8c9258e37ae077500475f087db9cab0c98856593915fdb02a8d630445c6371e9671c88a4a7ac0340 SHA512 53fd39c4503faaa9093716fa22788723adcb416d321bcbd0aa143f5f6c57568c26502850365561a12a5cb2377ea07adf9f55b4e7570d6ef2b88de2bc204bd27a
-EBUILD typeprof-0.14.1.ebuild 978 BLAKE2B a6e0b3b2079fe5af5af4cc32c25f527ced0f06952df201792a5a1f2de732e756fd32d34aee32be810c55c992309d06b69e2d4d1c485d378534e07c45fbc828c5 SHA512 31fe8db29d2345915bbe56a497566348fae3dc5da54da0938871813fe31adfcd0ac88e648acd3cd76b303eb396422059e1ddb462b7b231fb1e8354b44daf24b4
+EBUILD typeprof-0.14.1.ebuild 985 BLAKE2B 1ee3bd59bc7dfa525e9a217de535aed36bb2755f5acec9f89243ab0854047c6f081f6004e7ac2cb47758b8c4de447338f0c60eec096deea264845be187383cd5 SHA512 79974e703b2ba9315e7ff960d403f605b3f955ac7970f072a200f0ccda3630d83bd9c78ee6d252b898db1bbb286a1d26e156bab524448edd899def7b0fc317ab
+EBUILD typeprof-0.15.0.ebuild 985 BLAKE2B 9953eb127d328f709ea14b150e2f59fa0e728ba82a3eca9e43ed5299140efa1bca9453e75ecf525f488d86a5ac6e554d54896d080b9725e50cc4c7e052ab23fa SHA512 9ee2f341ec5352d2b6f0433d4dbf12ecc2408917955937c5a1bdcec6b557e8a341d18772b71d05edf39a1d4b9abc23d1f22c45bcd65163ae58ef58b7bb4842d7
 MISC metadata.xml 339 BLAKE2B ca2bb0c0a59ddafbf4c57b268985a52e02a15089f6784cab9dfa3aa6645275c51df7a95288d2464e357a2a1f9a53735e9e9fdc13195a7383eba5d821d89baa2a SHA512 79d803bea464c53a176d07b5bb9bba5d434b1f24a97e8091fd85fb36a842abe93cb0adf82ccbdbd1ef7adafab3210f4bcf80a79c99b0a792869360f7e47e6b70
diff --git a/dev-ruby/typeprof/typeprof-0.14.1.ebuild b/dev-ruby/typeprof/typeprof-0.14.1.ebuild
index 0ab491fba016..54c0c82ba183 100644
--- a/dev-ruby/typeprof/typeprof-0.14.1.ebuild
+++ b/dev-ruby/typeprof/typeprof-0.14.1.ebuild
@@ -18,7 +18,7 @@ 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"
+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"
 
diff --git a/dev-ruby/typeprof/typeprof-0.15.0.ebuild b/dev-ruby/typeprof/typeprof-0.15.0.ebuild
new file mode 100644
index 000000000000..ac6c1869b325
--- /dev/null
+++ b/dev-ruby/typeprof/typeprof-0.15.0.ebuild
@@ -0,0 +1,32 @@
+# 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 5308fa12c2fa..32247610c674 100644
--- a/dev-ruby/tzinfo/Manifest
+++ b/dev-ruby/tzinfo/Manifest
@@ -2,6 +2,6 @@ DIST tzinfo-1.2.5.gem 153600 BLAKE2B 3df5625c61eabf94bb457381ac7d0cdebd5b55da3bb
 DIST tzinfo-1.2.8.gem 166400 BLAKE2B 67f116171a6cfd2680c5eeac3cf7a034b446e973f2658052a70fff8d0571bfae03ee212b26d277c6b5050943f6117b5d8ce7c2ce5c5ab6891a1b8e9212bf7ded SHA512 5573b252d91a77b1e1ace2d2ccf48f7dd9bfb79b8b0b15ba2e8757e5fdcb9cbc044abdcf82beacffa284fc57ded2b579feccc393331f0f5a680e5f5c6275b62a
 DIST tzinfo-2.0.4.tar.gz 224673 BLAKE2B 0c7ef231767b6fc00cf95b3e1c2037894b14dfe832eaedb3f4b7c60a884ab6f7121243af5b62acf47d02da28395e7390f968421a3a3a2d731deb079e9fc51bfa SHA512 5b2ec73f737009ba21dac7dbb9504235fdef14dc45a6450e1218ba9e53dd29735ab4fa6c2854271916cc5c0244e09ae7ab19467408b72b9b82ca238e14d3fa4f
 EBUILD tzinfo-1.2.5.ebuild 1051 BLAKE2B 1aebe08a8a828f4a2de3ef3d3d8fd96d0427741207659219a8fbb0e630629fc377ef25c12cfd54a8975946003fc260160773cfe7c999334e68aa725e1f5a7d2a SHA512 89c21fc54b9ca7b12a7f8e7d4e3a1a9285a44666b621231194296693288ef2f9cad72bcf7b13a617c85bdcac2f45d14c1a382698ea8e61a7b3f840d0989c6d39
-EBUILD tzinfo-1.2.8.ebuild 1023 BLAKE2B 3c7a9d1b003d817659cd17e32d6ccfab73b576369606b7e786eabbdf41df3c59c61db766d6a5ca2e790bd6779678b06543994b3488d994ed047153480ca108a2 SHA512 2cf403232ec92ca991e6440e1f9b110d20e7ec354d0a4ac93e535b091d8cb2efaaaa18483942c8c1c06f0fcaaae026201887508a6ea64b8c08e932fd6be6fa4f
-EBUILD tzinfo-2.0.4.ebuild 1425 BLAKE2B 08b1cc9420c12a6ce87caa0db3a186da7e2faa91c9bc6fd1097ed4072a87622e21b8225a400bdd5b4d909fc866d79e4679f624b2fc3fa19a0589fef1a4126d1c SHA512 0df2d8e0f1286dd3b2335a233827cf98c66d092fc86db08058e4ca51d931ef475d61278b82f2bc1ab24293f7d1c581c94059042c31aa313ae49ebe5bc7acf156
+EBUILD tzinfo-1.2.8.ebuild 1021 BLAKE2B bf4ae323f458082e67f70991a24c166fa9aaeeafacd6b298ebe0035b1301f6064be9af5f367132b79ebf3d45f18a66839eaee46c213f2e77e0faeb03b7aa8246 SHA512 7feb29bd530d927b3fe63ba0aa63caaa403dd9e1e106186bb7d1d9096beab7484fa7f90860ba9c9cb0fda31a66ec489efb61f313dbb346da1de1a28829e0f142
+EBUILD tzinfo-2.0.4.ebuild 1423 BLAKE2B 4111153c511b854e9b61489c60177c5d627b1bc9cf67d279a4a9c7afe52d54fac6f381f2cedd0d1f80db88a836383dbe7c11d82c1f8ee1c7b7b824a19b57055b SHA512 7b041a1c36b41082af9d82764f595320aec7aa5d33f6909cd560a04a027ec1b919309e9ccc61e2a9fe83307c8f0860692bab3757911cca8011ce2d63552571e2
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild
index a45b6afdaa73..d6ad4d055d5a 100644
--- a/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild
@@ -16,7 +16,7 @@ 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"
+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"
diff --git a/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild b/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
index 0647fdee7b7a..59b0a6ac89ba 100644
--- a/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
@@ -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 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
diff --git a/dev-ruby/unf_ext/Manifest b/dev-ruby/unf_ext/Manifest
index 4352ffcca540..c1d990345a0a 100644
--- a/dev-ruby/unf_ext/Manifest
+++ b/dev-ruby/unf_ext/Manifest
@@ -1,5 +1,5 @@
 DIST unf_ext-0.0.7.5.gem 398848 BLAKE2B 3c7b2a6765360f59b7b921155bb6532981c8b31fd1fcebf1adc1e113da2404fa752ef95bb385155de1a6025d51f4564e52b497c5396624a0a5e99357fff88662 SHA512 5d60740172034253fec9659bec49e60f639e93d8f147582e26a012712ec2e5fca30674efc52695def0c3cd145c5ddd93a56a6d0f854ab04e7fc81544e6aede16
 DIST unf_ext-0.0.7.7.gem 399360 BLAKE2B 040800c9598fb544d434e8d3336a7aa8aac2440a3386a520220252aa970c715462fcf242985527b23618dabb291db346d23afd02282f735df1fdb657e021be9d SHA512 7dc75f071be4d4f3cd44f64a26c5f63f01494f79f3585eea3b307c3e8133b17b1007c4b36915f7254e516ae7a62268be8f3e4b250dcec7a9a083b5a66582887d
 EBUILD unf_ext-0.0.7.5.ebuild 994 BLAKE2B b658df9d3ec2768561b36cee351c6b95a5e3d517d42d0ff602710b92eb47020bfcfa07523e2da3554deb98a258955f9ef9f246730446fc229b58243968357173 SHA512 cb4bbae8d085346b975f23924d91ca5f09c644234db1a30ccb34e06dd76dc9dc03d2827ea73663a5d8150eadf701a63986b95bd7fd9262c0a4f2cd81b7d14be3
-EBUILD unf_ext-0.0.7.7-r1.ebuild 809 BLAKE2B bb21b550a306ae8a195be8b6e7d100140ff0925dbb8e87534dc2aabfbd39a8dc4b71eba5458148d17882d853d76c629d2249c1f84470f76bd4a8b64b5832c3b9 SHA512 3dd6775f3acbbdfdb5aa7ae926f094d7c72b6656c644ec87e09d5b9711b105ae035d3d56661e9ec9b0010b26d7132f8b76985ddf68d513152f5ed3c4c87e8713
+EBUILD unf_ext-0.0.7.7-r1.ebuild 806 BLAKE2B cbaeb4717d3499033406748390d878b14c3eb60d0a32045774d30c9379e88305b341ce357b2b700a9637f8cff12ee1144951a2e798d0a07b240e8c8b0c02bcb1 SHA512 56cfa8780d6bbc30afb2f1de6bb6fe2c17a22bebe40600f5c7fda5274541e773f00eccf10b0e89521e5e56cab48d60eab5c9310a9ae371450143b9adfc5be454
 MISC metadata.xml 383 BLAKE2B 96615ab1e6b21672cd9b121a3d70bb20630897823e9cf901575c9d646d01d98826c7813fd5d468874574596a4b56479b37e8331f98c51aab496765da2a4213e5 SHA512 c37dfb0021af1d08192825188761b1c1266a8fe85b0d81700fb769d49ec75b01dc0160a6498fa9e2a0cc392d910a86613f7585af7f143c2dc5ba020580c42399
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.7.7-r1.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.7.7-r1.ebuild
index 75f86896daed..8da5ec5885e0 100644
--- a/dev-ruby/unf_ext/unf_ext-0.0.7.7-r1.ebuild
+++ b/dev-ruby/unf_ext/unf_ext-0.0.7.7-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/knu/ruby-unf_ext"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index 75dedd52dd04..98311bc85d70 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,7 +1,5 @@
 DIST webmock-3.11.3.gem 125952 BLAKE2B 664253079457cdf400be869b9e61092b12872282057540e42e6fb73a5fbaa38666757f7f8bd336e4f5c45ea1ec52f9af4b444ba67ae24db62a75b5c18636ae08 SHA512 80fd2139126e1e9d6907dfe93021d77179ae6c31cc2a63eb3ee47c011c2a48f18bb84ac08322da8def014f2293564f5669eb41037edbe72ffccfefb7ea281739
 DIST webmock-3.13.0.gem 127488 BLAKE2B d92deda505469fc7fc5adbf0f7a90a462b03999c0affb79bf67523667af30f582b44b10f554c93a1c98e224edf1f8a5a700fc17c3624a962a68d8e61df84127f SHA512 de7c3d8e079f409db53b316238ce37a80db8eeb257e00c8b3f162e5b4f98c4a383108e6cb21be8b71db34295fdb2354502e9b7457741a935572d9afcb75b30c3
-DIST webmock-3.8.3.gem 122880 BLAKE2B 66371028294f3b15172d718e0fa9402ad6ed1bf7beedb0c62621ad31758d25e401af9cd982a6f29cd1161a7e4d7954f6f9df22ab2e0c44c970a0edca3c0f1304 SHA512 6c845c4ed0c82ba4bb1f32d0d87a87eb945c54e159317aa14e2238b497d38282b7e81542e78c0d68d4b8d4a08e46137de84503829b7381e6d945e45474ebb507
 EBUILD webmock-3.11.3.ebuild 2220 BLAKE2B 4fa059c167e4fe9f53faae3c12ca5bda38d2b91b77409ea3606527ecd7ab49e34d10f0ea81f7b59fac23d7e0e5bb9fa42f93b12676c4578809290330093a72c3 SHA512 90cd3d70911853b5759b3d681090d979a3dc5c8a9a377569134c2a9ee58e0b6d1537b3b3766afef320745fbe8fb9f00d98691aa6275a9193de0d783d8a0a4e72
 EBUILD webmock-3.13.0.ebuild 2221 BLAKE2B b5426673d3d7a104adaa980026361e59a43befc5a89ce4c09eff1b6f9415789952b50e625543db2015d7321fca570804911924fee5e00fbc714bd6741f748a4c SHA512 43b599a71cc5b1286031a69e81ed6f3f8c07b8fd22d93c81df9e32b068fde91f525c9305365e7c89a8e0c890e1e60edbde9d5e4d70d507ea6359fb95994533bd
-EBUILD webmock-3.8.3.ebuild 2066 BLAKE2B 032b384a4dafd98a1925c0a1582b4698f51f3ed15c0480ac3f6e683492571f869896cdddb8f4f536f84f5cb2b6f0cea89bdcdf1602d9bd40044c60c69a8629ca SHA512 b4f4055fc24416151b55fdd9ee07701ee3562ff03c6dc4f49080417a66539db1b66386721ca7601bc2eae0a30a666a3e52167a3f8d093f9c24a255a94d0c7199
 MISC metadata.xml 341 BLAKE2B 75a7b957f0aa060ff3c632620c1b8eac9344b37566c9205bdfaff70fdcbc8cd391dc7296317bde0e8ce1e1ea3cb7540446267112eac00571beda686f5a592130 SHA512 66c55ee845168bbdd2b792d90cfbe116a09ff3bc00861164e82b68355ed585e87b58b7c0ab21da37dd984b680ea4841e7a2cd0c8bea1a081b1adb4c5b9885b73
diff --git a/dev-ruby/webmock/webmock-3.8.3.ebuild b/dev-ruby/webmock/webmock-3.8.3.ebuild
deleted file mode 100644
index 282df8949275..000000000000
--- a/dev-ruby/webmock/webmock-3.8.3.ebuild
+++ /dev/null
@@ -1,61 +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"
-
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
-HOMEPAGE="https://github.com/bblimke/webmock"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 >=dev-ruby/hashdiff-0.4.0:0"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/rspec:3
-	>=dev-ruby/test-unit-3.0.0
-	dev-ruby/rack
-	>=dev-ruby/httpclient-2.8.0
-	|| ( dev-ruby/http:4 dev-ruby/http:3 ) )"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
-
-	# There is now optional support for curb and typhoeus which we don't
-	# have in Gentoo yet. em_http_request is available in Gentoo but its
-	# version is too old. patron's latest version is not compatible.
-	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\)/d' spec/spec_helper.rb || die
-	rm spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client}/* || die
-
-	# Avoid httpclient specs that require network access, most likely
-	# because mocking does not fully work.
-	sed -i -e '/httpclient streams response/,/^  end/ s:^:#:' \
-		-e '/are detected when manually specifying Authorization header/,/^    end/ s:^:#:' \
-		spec/acceptance/httpclient/httpclient_spec.rb
-
-	# Avoid specs that require network access
-	sed -i -e '/when request is not stubbed/,/^      end/ s:^:#:' spec/acceptance/shared/callbacks.rb
-}
-
-each_ruby_test() {
-	${RUBY} -S rake test NO_CONNECTION=true || die
-	${RUBY} -S rspec-3 spec || die
-
-	einfo "Delay to allow the test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/webrick/Manifest b/dev-ruby/webrick/Manifest
index 97027be35a3a..d31f701e8e6b 100644
--- a/dev-ruby/webrick/Manifest
+++ b/dev-ruby/webrick/Manifest
@@ -1,3 +1,3 @@
 DIST webrick-1.7.0.tar.gz 114413 BLAKE2B ff0d09a3137edabde37392d4c8a5e1f37d9899c60db8e96e4034ef60626225c0508c6b2797281878bbb7a0c6db16e20bd46a83b61b3de2ed059cb95e80255a38 SHA512 785e8c6af6e2f8ac497bab6d0ad0e9383fa4c4ac8dee6ceee38e20c5e9b631b805ec3c8f5438ebea651ee4113698de1a370ae506927bdc04e512ea6cac433cd1
-EBUILD webrick-1.7.0.ebuild 755 BLAKE2B 1de1d17bc607601982dfa1e0be148a66577e69cc689b5d5c8d4af7014f6d0854fb7ddad5812cf98247a5f481b23c4964affa2477ef57c89b65caa4237f36f874 SHA512 d1c7b8f1e667780c18cb4200042d955156cb2e1c10925c3c4a68a1e0d65e7059555b26198a766c8a77929b1751ae0bfa1031ffaea98d26a7791cb3a84167fac8
+EBUILD webrick-1.7.0.ebuild 762 BLAKE2B 397e5d38527a4ef0fbcd4b26847fa4440ba46507843effd50080d24681d10c7c25a0abbc65e259eff661cf3773cca065f1a0f928cd57ae5f93ea7379941025b1 SHA512 5b103c4865586435f636d2cfcdea93eb2858074b82043e9cddea6354b6686f74a3afb26a37438480bd3eea46bd9466695cd64d481ecd6a4af4490b811c47a239
 MISC metadata.xml 338 BLAKE2B 70e4f4b9ea621374729cc2fd646216c39f4d8f1e3e5d58411daffe4f7a03e19a815c021c6de445d19b1ff6165c347ec7447cd61ece07b464956198de7d512df3 SHA512 5c58d1a1c9a3c13e0be8299f17aabe5ea7038139eee231d53f892c73d8dfd6549f0ce762a2494fc9617e59bc0617bec01a742989bc03506f0a7408e691ad8166
diff --git a/dev-ruby/webrick/webrick-1.7.0.ebuild b/dev-ruby/webrick/webrick-1.7.0.ebuild
index 5a90a1379b5c..142c4339db93 100644
--- a/dev-ruby/webrick/webrick-1.7.0.ebuild
+++ b/dev-ruby/webrick/webrick-1.7.0.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 ~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="0"
 IUSE="test"
 
diff --git a/dev-ruby/xmlrpc/Manifest b/dev-ruby/xmlrpc/Manifest
index 83d3cd38c499..543ec36a9384 100644
--- a/dev-ruby/xmlrpc/Manifest
+++ b/dev-ruby/xmlrpc/Manifest
@@ -3,5 +3,5 @@ DIST xmlrpc-0.3.1.tar.gz 34720 BLAKE2B 452640d82bd93568a3d36235a1f86f4d2be85b470
 DIST xmlrpc-0.3.2.tar.gz 34780 BLAKE2B 9aeabd5c2549bd36a28bb56162471e5f822f873e3f976fa101a8fe26af9b0ab72bcceaf7b9bfac5488f315f79708db18bc7c507360aa567d95f136fe807084b5 SHA512 9d594971211d556f19db86e2bd5f948610342dbcee031e58cc83bc28c44bb02c54a8c00c44eb15bd96daafe02859a894193d5e507973a0a1df36251138d4999c
 EBUILD xmlrpc-0.3.0.ebuild 952 BLAKE2B dcb23f5f7cc72761644256e00b4f1ceedf6bbf28574fb82a3839dc602554ab448da49771485681bbb913def3c571e8cdf4757db3a84c2ac608de59f3f7ffee59 SHA512 394593ec1e7fa9e503565de9ea64289d0d6b96bbc2fd8264e941642fb698a7388d53b5466d4697b0f7a5aa5daa57535b9b73579ad13251f547cdf864bea8fa1d
 EBUILD xmlrpc-0.3.1.ebuild 922 BLAKE2B b902641c965a750d20770924be81f08e415d23b41ab41bb01318538898f083f6af692a3bc7fcf1d6c3e26ecf35eafd3803192caa5d307b09e0f184ec7008e8a4 SHA512 356462d336d8994a1e7ea6139da9631d054a6a619b73608fe6c2ba6e2ac8259d0c9fe10791c786dca8316e7fd43611223637c6295da4edd4f113598385de8f11
-EBUILD xmlrpc-0.3.2.ebuild 929 BLAKE2B 09836e4c83ae4c7fe5131e3607990b1e4a94f3c9d04f6df361b6dab726d264e733a4f91fe85b80e3ad57c28c69ffb560fdf746917bc1624157bb53ff2e90f5dc SHA512 a56fbca5004ded2be730406d814ece148b975e397b3f42ebf2018ffa34a09f5b8a02aaf860508d964dd93653eae4f0ba35fe4f4f15e4fb890750d2788da2962e
+EBUILD xmlrpc-0.3.2.ebuild 936 BLAKE2B db9e3117a0b84476f2c7833722cd5c9a9e0edca3ef3850f29ee71f94a9d9793532f84b75c7f4acaba25a76215e958495d54270c2e31719f5f1ee7f2d82daeda3 SHA512 12ea35f526efaa9f382deb1cf6a4cf10c42075b1be34b30745840eebd3721e3175e5b5b4c7f9e71a1f9782e2fab0dc00ce852a20ea22a526a9f832ce25e6a895
 MISC metadata.xml 337 BLAKE2B e45e1b70e063e5f33759c32c987c2afee3283a31fddf4eec4a44c317f65a68926a84af12c5ab9a72e5315033593105dc95d1919fce3de684593755078246ef71 SHA512 94f995e14666100fd2f0e569f01bfcc86cfa319c213f0fb99e7fe104bc9b731dbd06e4e35cb76d94b126b296e1a5b916b4940c59f251a899781357f587f9be14
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.2.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.2.ebuild
index 902854a7d964..0451f271de91 100644
--- a/dev-ruby/xmlrpc/xmlrpc-0.3.2.ebuild
+++ b/dev-ruby/xmlrpc/xmlrpc-0.3.2.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 ~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"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit )"