gentoo resync : 08.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
commit: 24fd814c326e282c4321965c31f341dad77e270d (patch)
tree: 033d63b33c21a3209964ab56005bb9bdd523630d /dev-ruby
parent: 129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)
501 files changed, 1883 insertions, 1222 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index eff4614015f0..edddc179b396 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/abstract/Manifest b/dev-ruby/abstract/Manifest
index d0fdd02aeecd..da7066a8d3f2 100644
--- a/dev-ruby/abstract/Manifest
+++ b/dev-ruby/abstract/Manifest
@@ -1,3 +1,3 @@
 DIST abstract-1.0.0.gem 12288 BLAKE2B c61fe73f5a5b765296e4a61acfa14b39468878a442a1ce8689e846089da9a3d6c8f5425a791040865d5aadd435ac78de6f48f809f081ca0883c71f733e4cbe5c SHA512 7c6fffc012baf704a27470fecf44dc97e6ca9f5bf9db47c20f23e59376af1262c4618ad70a70faa446339a79f94bbce04c2f5a6c506bd010c60a0fa5f60f346c
-EBUILD abstract-1.0.0-r3.ebuild 658 BLAKE2B ca5f7e93597ec9e5458078ef3afd60b723def74cbb4e6d24b9340e0dc36eba4198140727009a39340d4ffaadfcc3ca31d99195b09cc4fb234cdc51771899ac69 SHA512 0328d00bfbbd9a73c9c40fb004f5c07e209aae36e8d26f01ebcca4069e00c96fc5fdfaa50c4512f1fb961358c49d3e47e385cee73f5d2579f25afe507386d285
+EBUILD abstract-1.0.0-r3.ebuild 647 BLAKE2B 02da6088d13b66590dff9bb92b63e01f55c82de082bdeae5e4f0bf26511ab2e55111ce8ed51a69cb2987ecbe5194db5104158d98b5a86c56088ac0376e41ae26 SHA512 9bc105003a4573da4305fff0fff7b442381ceb39a833cc2fdfc502a3325a8614ddbc1869550e102a254cf2b0495795f79ecc9e401107f680091e69ed4dc6b608
 MISC metadata.xml 326 BLAKE2B 9d949e43d77128e14b13f83c61b85efa1d766d2b09b33aa10957282273b233bb5f6785b570e08249e3acc3920e3c5327fc834e8973d252519ec0963efdc379f4 SHA512 af7919ed026803725ee33c836a16034b32eade1a09f18ad5f5a506454fcdbbd2cab3cfc0e21c494ad1380795439719f83acbae1c3cc45a3cec6b1e02cebba390
diff --git a/dev-ruby/abstract/abstract-1.0.0-r3.ebuild b/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
index 0806b90da8a0..170c8bcf929e 100644
--- a/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
+++ b/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="https://rubygems.org/gems/abstract"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 each_ruby_test() {
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 6b764e74cbdc..2820259b07f3 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,8 +1,8 @@
 DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
-EBUILD activesupport-5.2.4.3.ebuild 2523 BLAKE2B 7cef7564cbc0c057d76cf74f4dd5382a738ea204f1dadf0367fa70e30f6e8f002e252c446bbd342352e476f98623b534db00734dc4658c68145c51ad1d30b945 SHA512 158df77044882eb0fdbfdf7fb0349d74812187cc668fff6af4f44f7ee2ffbb31e1076569f19125048baec407ef6797b35ac21cdce52325a92d1feff3b0bc7922
-EBUILD activesupport-5.2.4.4.ebuild 2523 BLAKE2B 7cef7564cbc0c057d76cf74f4dd5382a738ea204f1dadf0367fa70e30f6e8f002e252c446bbd342352e476f98623b534db00734dc4658c68145c51ad1d30b945 SHA512 158df77044882eb0fdbfdf7fb0349d74812187cc668fff6af4f44f7ee2ffbb31e1076569f19125048baec407ef6797b35ac21cdce52325a92d1feff3b0bc7922
+EBUILD activesupport-5.2.4.3.ebuild 2512 BLAKE2B 19b04f012ba252ec9887c43703ec8408a3a1c3f17583cf3f3bd6d565f70291b3f3be78b48a5af0f3a74db38959a6eb60a4741ffe0112f14c2c5763d20049a35f SHA512 2db42998c4766c0e017f4031b6fe9ef7eb2d067b885a969eea41eb59ec5a909b40bcbbd9cd0ac065d1ed4c68902bc66f59ab950d11f4ec4603f46b031c1cd09e
+EBUILD activesupport-5.2.4.4.ebuild 2512 BLAKE2B 19b04f012ba252ec9887c43703ec8408a3a1c3f17583cf3f3bd6d565f70291b3f3be78b48a5af0f3a74db38959a6eb60a4741ffe0112f14c2c5763d20049a35f SHA512 2db42998c4766c0e017f4031b6fe9ef7eb2d067b885a969eea41eb59ec5a909b40bcbbd9cd0ac065d1ed4c68902bc66f59ab950d11f4ec4603f46b031c1cd09e
 EBUILD activesupport-6.0.3.4-r1.ebuild 2527 BLAKE2B 27ab01053d5e704b61c7bafcd4dd49df749edea936ebd1911e731684d7115a3bc0b2b7f9232220f7bd34095087f4e469996184b716204c2d53ae42ab13fd7b33 SHA512 618ed158df08cefdc1b5dd634b736beef357c66ef6cffa7286ab18206f53c0b6bd0acb68935927256392fbee52530ff7508b02e717cc6f9026b667003987e6a5
 EBUILD activesupport-6.0.3.4.ebuild 2517 BLAKE2B d138806cbe294858b40360af25615ead52a0ed7f1eadb77ccaf6344f18b8616365f19d1548e5fe5a5748700ad9e75c34123421ebf9d57892331aa0174b8bc9b2 SHA512 30d49e2ab7c3334bdf253d4c9f866937e493d693f43d7a450c2103156baab04a918dcdfee67db159002841db3979f0e9a9ab898ad75eba6e4518a1a629e6b942
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activesupport/activesupport-5.2.4.3.ebuild b/dev-ruby/activesupport/activesupport-5.2.4.3.ebuild
index d3a60061e699..e74656bd99b7 100644
--- a/dev-ruby/activesupport/activesupport-5.2.4.3.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.2.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-5.2.4.4.ebuild b/dev-ruby/activesupport/activesupport-5.2.4.4.ebuild
index d3a60061e699..e74656bd99b7 100644
--- a/dev-ruby/activesupport/activesupport-5.2.4.4.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.2.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/acts_as_list/Manifest b/dev-ruby/acts_as_list/Manifest
index 7470ce6389f9..d996d582ee47 100644
--- a/dev-ruby/acts_as_list/Manifest
+++ b/dev-ruby/acts_as_list/Manifest
@@ -1,3 +1,3 @@
 DIST acts_as_list-1.0.1.gem 39424 BLAKE2B 278705cd57bf3fcf2d1d9e2f4ad8757c9842f768bc36470e5b9a2f52f0d695f4c7bbab71200dde8e1fb099840495ea5a6ad131d1a213b8389dce49e08240eb3a SHA512 15a0cd7e6c89ba6ed218c5e866b15c33ae64f5ed1587de67ec6ea20480fa622ec32f3131e714ff0d5196189a46d5d745ff5de026c451a485ebb735df73ef9ce5
-EBUILD acts_as_list-1.0.1.ebuild 897 BLAKE2B eb10282a70dc66d4dfe17f748d480076ad0a39d83ef4d0033ae35d30be1ec7e96fe092da7069d312d26381a7fdb0847756e10636057e4d3e1f54326c9c21f150 SHA512 61151c7c5a11e5361d30658e1b995ff7f7253278f7cdc5952c143241400d2c832179c0f41a7ca8596bb88f3ef016b054ed720b24a0316860e42cb564a542f38f
+EBUILD acts_as_list-1.0.1.ebuild 886 BLAKE2B 827a9e97f7dbf4b9c8b261ff24dd604556f1f33c2a933eb02995a289b1beb5b127ab67607fd2525bdea4802337094eeb3b0995a649d791acc35b8445fab8eb73 SHA512 966085a372144f1961863ab7f7023f57338405eb26428f64dc66e2ac7fd1ebfe61b23ffe3b639ff39dac7100a27727a9eb3909c13e9c26bc964991ac6052d7e3
 MISC metadata.xml 347 BLAKE2B 11ae895c0930e176c32dcc84c734b89066c53adad8df298faebc5d0a27a7dd408d5c18d91dbd89ff1b4ab825b40253097a516c75a4f267fabf5c84a0d68cc3b1 SHA512 eb41ba6c7f23b2c30522692f730bc0c7e360faa577c0bb25b4c386c09f1274890475a537d1dba9ac214a39e05ff56bae6f5bf7e3eda5de163159961171883085
diff --git a/dev-ruby/acts_as_list/acts_as_list-1.0.1.ebuild b/dev-ruby/acts_as_list/acts_as_list-1.0.1.ebuild
index b9195b5a0852..600bb27fcc37 100644
--- a/dev-ruby/acts_as_list/acts_as_list-1.0.1.ebuild
+++ b/dev-ruby/acts_as_list/acts_as_list-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/swanandp/acts_as_list"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~x86-macos"
+KEYWORDS="~amd64"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/activerecord-4.2:*"
diff --git a/dev-ruby/addressable/Manifest b/dev-ruby/addressable/Manifest
index 5eca36a63c7c..107ef28af20a 100644
--- a/dev-ruby/addressable/Manifest
+++ b/dev-ruby/addressable/Manifest
@@ -1,5 +1,5 @@
 DIST addressable-2.6.0.gem 104448 BLAKE2B 664365962533d31786e2a362b61879fee544867b7aadc2ceb1ae6709374015a7f0f5c0bd32a81c8f2ae711a4ce1a07cd8f84821e74c3b6aa56b7474800567737 SHA512 71aa0ce8b61a07c1d01298dcd29cb2ba73d06ed1578908cae60351214f7d0bc6c9b8b0db7a78044fb1bed258bf00f2f093aa4e2bcb32575f4db2a79ee36b2648
 DIST addressable-2.7.0.gem 104960 BLAKE2B 4bca65d54ef1d3556cf4017ae68082635c0398b6f604eb3edc18da8f8e1e49e38b46485a8716da3c407fe0605dcc9a12c7a95be49a91c4198c2e2b1cab568805 SHA512 4c438bbfa8874fdcf11eef1d1f7cceb1855ea85948daff13615a0af129d35f92cc918f4bd5bbe4cd6ebccc67a86fc582265f915dc39831ec64209de0bdeeb732
-EBUILD addressable-2.6.0.ebuild 1354 BLAKE2B 4f284cf252d2f7458ef8defaa20f769c09a443c7abec3634381754ae13efd6a568ddb819d86a820d49a13158098b68bf4e009f2e33852b5009eb24e504508d70 SHA512 b8e74defe44cde7f177380236f479d7996d2a24224554c810a3f3e4baa35fc7b7eb099b0646e0aa827a6f4aeab0209b3a8983a4f95694a0cc2f4a3a680107883
-EBUILD addressable-2.7.0.ebuild 1321 BLAKE2B 3850fd1b4e3a010d571d36eb5e61b92f9c29f43dbfd1fc2a9090bfd3b2f1ea684b47f78dedc4e547d1940c647072828eb88b224703725ebea91509e05402745f SHA512 4aee99a1f98f23be3afa860862cde501c91bb7dc853f306559d4277e996ce119273c5107574493bcfb08d4aa479be16b2823f2e748bc96f90b9b20acd08a759c
+EBUILD addressable-2.6.0.ebuild 1343 BLAKE2B b225c1f2f7a58272e83b7a6be35aeb220a2f5cc1f94185259179f3ed89356eefc90ec03ba65631c4c676981d841a6f8b7b9782de203b3876a6451f6fb1baf165 SHA512 2305bb1ad32f470d303ab3b702ebb6bcf2056233c997be75be3c802d653e8386bc29d5ff8666dfe477edacb0a2b62bf5a9b3bb0ba44c55e208459197bd6a44b3
+EBUILD addressable-2.7.0.ebuild 1310 BLAKE2B 114064e9ee4b235518ce9e3fa749cce8ade12c78a52f52fb67f0e297b534384e8f89e78df344029adfb425531c6c3429ce1d902a8e667d998c12b7cb354e27a5 SHA512 7d3705bd3f09a315ce4db6c96014443848cb66b1794a17df6ed85a80a75930fa8da0c57a1f7ba755cb8dc3d54314cd057b7147df8f5af61922f1f7d9ac2ca5bc
 MISC metadata.xml 404 BLAKE2B 4362f3592286dd6cffae99340e1b4437af10ab4dbbe44585d3370b0970e7d02a881853329c9412bfc881c3f040995a204b758aead2c34cba4f9df8104f858479 SHA512 c335566562492b85e491233d4f908fe18c2713ed9ac3afe2cb4d9537d71bdfa1a10bf58f1ca9f29e5a695fde9a4ba0ff9b3c57122afe78907cc0b00b5c307351
diff --git a/dev-ruby/addressable/addressable-2.6.0.ebuild b/dev-ruby/addressable/addressable-2.6.0.ebuild
index 30e5d963e463..3915b0e20a59 100644
--- a/dev-ruby/addressable/addressable-2.6.0.ebuild
+++ b/dev-ruby/addressable/addressable-2.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/a
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend ">=dev-ruby/public_suffix-2.0.2:* <dev-ruby/public_suffix-4:*"
diff --git a/dev-ruby/addressable/addressable-2.7.0.ebuild b/dev-ruby/addressable/addressable-2.7.0.ebuild
index fc96cfa57def..f4f234b43412 100644
--- a/dev-ruby/addressable/addressable-2.7.0.ebuild
+++ b/dev-ruby/addressable/addressable-2.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/a
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "|| ( dev-ruby/public_suffix:4 dev-ruby/public_suffix:3 )"
diff --git a/dev-ruby/archive-tar-minitar/Manifest b/dev-ruby/archive-tar-minitar/Manifest
index dfb88965c4c9..143a30f63c5e 100644
--- a/dev-ruby/archive-tar-minitar/Manifest
+++ b/dev-ruby/archive-tar-minitar/Manifest
@@ -1,3 +1,3 @@
 DIST archive-tar-minitar-0.8.tar.gz 33632 BLAKE2B b576c74cfd59893d4c0c935703453551f9a0ca6258bc6a2b1ecb3151a44ff166607931e554c811fffb489b6398123cd9e8e58372a94b303df45d88ef903868ad SHA512 cab4798b98d91a17dd5ce4aed3f6fd166dab61e8c9e3bef3df218944fe1657a9ec9d40a52ab2773430070e50410c401da799469b096dcc2b22d6466da1e50b8d
-EBUILD archive-tar-minitar-0.8.ebuild 856 BLAKE2B 1759149578e570fb78a39acb311e859e9a9d1facd64f2cedc13ee3d798af2dd701cf4ed63b6bdd9e274ac0d95db71269d754e2918cbef56a391d780de7de523c SHA512 43853ae0abb68af5d7d00cbf8a81c7ca8e6a389b465a75440202f799a0a557dc97f7ad4a305a7c9e8ab59e02a87b022f7830238384fdfeb017b572ef0581eec9
+EBUILD archive-tar-minitar-0.8.ebuild 845 BLAKE2B d035426c1db2d5a356a671fd1dd6e1d563a42712f0f020eb73a9780554ffb929779ca1d96ce8b43bcd8f38c7e0e151f7ad588a61dbe0686519a2213849b7d021 SHA512 570eb9a91f5259bd2a2fae48e3d4ab4be28ccdf6998c6b0c6e34eb90ab9396978910541e59911c315fbac931755ecb8f38ade571ffed8c6db6470c2156d50cf4
 MISC metadata.xml 344 BLAKE2B 859b7af9a7a2a07b43cc2625a5ac93a91aa9f16041a1f179654e126ab4f78d347a7816098bb6cc559fc1bc004f27156a06a83581ffdf143d86c15d8fa2a3fbc8 SHA512 fe6d4710ed497c7b81b336533868f760892f8946f766a2749349ffc105e33309abcfd7473bc940ef0cd0cada97965d4cc9504b53a76b9cb9b846c64244e2896c
diff --git a/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.8.ebuild b/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.8.ebuild
index a1f2ed0cbeb5..1bfcc62000fd 100644
--- a/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.8.ebuild
+++ b/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ RUBY_S="minitar-${PV}"
 
 LICENSE="|| ( BSD-2 Ruby )"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
diff --git a/dev-ruby/arel/Manifest b/dev-ruby/arel/Manifest
index 96cbd2e92c78..adecdc4af7ba 100644
--- a/dev-ruby/arel/Manifest
+++ b/dev-ruby/arel/Manifest
@@ -1,3 +1,3 @@
 DIST arel-9.0.0.tar.gz 59065 BLAKE2B c464c8c52d0fa7c5626fdc9254c74db00e4b43f68f38b75972623f28961565cd6764db967158c48e938620636343b15c4be9bb3237f9c7422730b4702450eb6d SHA512 9d2958765058fa8a4f6a8d7d4c9671d92054748eabe5b94796ff5611cdcd6bb24906cc5e813fb21396aaa681e5703d2d4bce8cc9884f2d057042d1b06bf6f0f5
-EBUILD arel-9.0.0.ebuild 938 BLAKE2B 243c37fc37e6d3e482c9699c7758dea3be49844d01f47480fa7132a96e3911043b877dafecd0b5acf37bfc01089c6e0f002ca4c0eb049401706958c548533060 SHA512 9ac09d5b25cdeb63cab1bd006c9d4c485a0dbf0a25042a444f4925e007f68e5805afabde41a2dd78cf94f642f589ba36404e7a64a1d5ab27585b8e5461128fc6
+EBUILD arel-9.0.0.ebuild 927 BLAKE2B 4d4b9739cf65d4b45fa7a45c3ba5b73f56287d499bc13509ae8209058836c448a5711a06d5bd0eda6eeb09f80afb8234128c94b60f2be2960adea9fa3302d6cf SHA512 42cf9a61ae91acd8b798ce8006df0f665fd670c8de121d89ef1e613c2d0f0f388bffa107f18c012710fd7f9e187ef8aed557f8338b0ea28980c04a0428427178
 MISC metadata.xml 336 BLAKE2B 5949c7e1289105e90d6f23022a41875fd2e8381794b9c63a4eed997f29d08957fe65c7ffaee3076ff7d656abc3068977d9092ee71da204e43514d19e63cbb970 SHA512 f1a6feaa1759411e75d8d11887d411e1e99d2c758b8d8eafb13015a710682b525b4c8b2ca196d2d6de0d7335842a74d28657ff578db015710eacbf4450137639
diff --git a/dev-ruby/arel/arel-9.0.0.ebuild b/dev-ruby/arel/arel-9.0.0.ebuild
index 8410f3d403ca..5ebc8d41dbfd 100644
--- a/dev-ruby/arel/arel-9.0.0.ebuild
+++ b/dev-ruby/arel/arel-9.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/rails/arel"
 SRC_URI="https://github.com/rails/arel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1).0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/asciimath/Manifest b/dev-ruby/asciimath/Manifest
index dbb9d1440170..438e38b345e1 100644
--- a/dev-ruby/asciimath/Manifest
+++ b/dev-ruby/asciimath/Manifest
@@ -3,8 +3,10 @@ DIST asciimath-1.0.4.gem 14336 BLAKE2B 84aac2d2b987f72a17288cee6d00197c429e04c21
 DIST asciimath-1.0.9.gem 18944 BLAKE2B 3ccc3f594d7a0d8b6996349d85356179ef3a9052a84f923ad1d0976e42f58670a350473b41d1c4a0c4f70a3cc4687e6adaa7987bd811ef32bd3da41f100f4246 SHA512 32c4f2cb7e9d330c371e9b9abcdf9e31bf44014c5c0b0044589302116b55840a2e1a41ab006d61a2258e4a5c2d4a772dad77f579150fc9bf099a7a4d19c6cd44
 DIST asciimath-2.0.0.gem 57344 BLAKE2B 18cb2ca27a626bbb241768d070c47c981ae1f3a626cd9f476e7511f04f73154a1c3742338d92540bbd78fadbf775f4db7d2558c451fc8a276002fc5adc044ece SHA512 4823e7fa2e3107765d2804d15f5250dc30572099405df988ffe13f17ed584043bb7e48794cabc9b9853997083c57af5f3d73d20223ada95d00f997363130bedd
 DIST asciimath-2.0.1.gem 58880 BLAKE2B 6c17698f6515468c1c0b17408968f492a40a90cbec5184e78da8c9b9c23f2a6887f4d8ed1c99a68ed36489d27187dd73dc6ce992efc3ce144091131e36bc5e40 SHA512 e8c63e5f6035189460ac4975bb0471ffa418ba139ab806ae46badb74c1164d2852aef3aa799a0713a01486cea5c6087add6115ea22908bf3b70d1ab5fe339768
+DIST asciimath-2.0.2.gem 59904 BLAKE2B 2a8d57a606412be75ef047b5af29acb519b05026b12c6b691eab0630190706e00d1d8d65101d4397321191ad6d2c8f9e359e25994dd17302ff2692ebaa025a91 SHA512 53f573a9d7b01eded3c951b42a8353716679c189edd68129c49cdf0a719316f26d39ccf2704ae24c22dd64770bb8337553aa32d4f240bf1e249133ca95d849a8
 EBUILD asciimath-1.0.4.ebuild 529 BLAKE2B c87d2c19bb1830af9b6fdaf0e93f81bbc5a0a1c5fce4104b5968ceec805500e0ca39b38f6133c074f359021df3bfd618c1ccbb1e40149fca158b893b369ec1ec SHA512 4c6c878569389bfbbd90a5bb8102d49bd5d69c74184be0531aa138c14e84f529a09d17cc10f3155d9a8510e8d61da97d854bf361c3ccf49383d44a04c9272830
 EBUILD asciimath-1.0.9.ebuild 463 BLAKE2B b9f363552ecf9a6c429280a4e17de7fb05d19efdf2e8a0e52da36e5112fca5706d9c0fdd575f3865d20f3f849e773059a10e8e8c1219eb7976a5fb613fd8ea93 SHA512 e8d19d6e49b727c75f5df69f68855ac85eb981dc33c353b881137755c16b02d848f5e8d43949aecbf3f70a649a602383e21d1a63c5732b171165fb7f5fc4689f
 EBUILD asciimath-2.0.0.ebuild 517 BLAKE2B 6f6355aaab1dc196c9241a3fa86bb6cef8d7b071ae83ea0489c3fcb914243559463487a694e4f755152c88965c23c86d6d2513546ed2cf94318f59478dccdbfc SHA512 a1c369453fcb0e35afd8f170ea14e2379c1b63e8da99524fcf57058d3c30b0ea13cb8abccfaa95c4cf6de87f704d977fa3842961a9e3a76e82f0f6bb69054321
 EBUILD asciimath-2.0.1.ebuild 510 BLAKE2B b4278881c98f8b22fed5bcaa4fdab2bad20112f78e6268d423fbc08dcfca364e97c40cb7f2cbb245421f33175ad9cea0ff2444245a507d01a25453962167f24c SHA512 10d693d3ca74fd0588ce8f1a8814cc1ae0fc34bc1895935a004211052b7e5215c95f9aefa9e7284fb311d09c83ce5e17174503c2e3ef1f1ee78152f4afd6275f
+EBUILD asciimath-2.0.2.ebuild 510 BLAKE2B bd2f704be03174e98b8e6a7c02af299ab87dc55d3ab89887a988307640a02895ef3c01e2b2710c2e586a55b8546e2e9f340489b68465db38ccf0e94c51d69fde SHA512 f75d76b58d2e47833a2e6c22fba8450c83bd75b3361579d7b5272dd6b73e61cb40edadfcc133951c9da0c40c583580c1feff218a55ac92091895f80d984b02a2
 MISC metadata.xml 344 BLAKE2B 7979667ff10553d0f1c80a34a03bca56057a4dcf856440b9f9bc4ea64aa018da426601b76dff578625481cb51f7384c7716a3aa98670f178c4209ad39a9af9d9 SHA512 606dd415c7a141188cc94a7d56c67d42be1c2420f8ba9ee7a44707b99a6035df1cd8d358de575e12008f0560aa2b87b57b5892c67f3d931aa28c5938373a8075
diff --git a/dev-ruby/asciimath/asciimath-2.0.2.ebuild b/dev-ruby/asciimath/asciimath-2.0.2.ebuild
new file mode 100644
index 000000000000..d242eb5cb1d8
--- /dev/null
+++ b/dev-ruby/asciimath/asciimath-2.0.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby AsciiMath parsing and conversion library"
+HOMEPAGE="https://github.com/pepijnve/asciimath"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
diff --git a/dev-ruby/bacon/Manifest b/dev-ruby/bacon/Manifest
index 7b3239aadfe4..e655ded44af4 100644
--- a/dev-ruby/bacon/Manifest
+++ b/dev-ruby/bacon/Manifest
@@ -1,3 +1,3 @@
 DIST bacon-1.2.0.gem 18432 BLAKE2B 7b5870a4cb2b4340eb16dfde4649049def3f19e9a3202a6040c26fe0b3ad82b04e14d47380f9d08d1a8640e38244e7ca89f897a12b382cbb2cf368e414d5af41 SHA512 ce7a9171be67b872c8a95dbf93a45fd79574796c694769e9c87a35257e85eff98187c8ee76429124ab475e90fc619eebd30e672f3dcd4f8280e139ecc469f907
-EBUILD bacon-1.2.0-r2.ebuild 604 BLAKE2B 500e788af5791a0a4668a6d8c9177a09d62d97c285868bd6dd63eecf186a4133745a44eeb9b2c7d2447443ae577163dc31ebddbba72e9f5b1a97d58ac7f54e47 SHA512 ad19ac3397f20574fead533c8bef0900d6fd3cb956deed15af44942742bc053e66b465ef080d1a2fc50c53abc71efbdd1d57b4ff6f48653dcbd61a8fee04b5af
+EBUILD bacon-1.2.0-r2.ebuild 593 BLAKE2B 9eaa1b4e121ea5cb99f2ee9e9a438d363ad7dd42fa038923903d1004de1f8937d8a4728d6a300b48a2978cd9707c68cec80e26e3f74c559200eef13279671240 SHA512 f83656348ef02c4e04965c21e9e1cc56011c4b995debe4bb1b8983458326d6f987d192e5f98aba3b4fec7b706ce1aa2205c11fc409d3655bf10a3c70ced6fb7f
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/bacon/bacon-1.2.0-r2.ebuild b/dev-ruby/bacon/bacon-1.2.0-r2.ebuild
index 83dcc118da1d..dd4af6274bca 100644
--- a/dev-ruby/bacon/bacon-1.2.0-r2.ebuild
+++ b/dev-ruby/bacon/bacon-1.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="http://chneukirchen.org/repos/bacon"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/bcrypt-ruby/Manifest b/dev-ruby/bcrypt-ruby/Manifest
index 713e13e595df..9b743c9f4579 100644
--- a/dev-ruby/bcrypt-ruby/Manifest
+++ b/dev-ruby/bcrypt-ruby/Manifest
@@ -1,7 +1,7 @@
 DIST bcrypt-3.1.13.gem 54272 BLAKE2B b2a349955a066e39cc50540ff116e70e2bac359c03ddd9dfa35d6a946d15235921cd82feec8b1d76f5f82a3ff9dea288f115dc8e1fae3f24e559a1462e173ccd SHA512 d996f381643a0322d66a1a5dc7d26887baaf48d90ac8f87283bf2aa35f2a0048049e1df10d95283d37f25e3331ca3cb19a9a7c12b95fa1b1a1bdec0e5d8133bf
 DIST bcrypt-3.1.15.gem 54272 BLAKE2B d830131971ffb8a26efd4d7afa8cf6f4a93026fbff3b7132037af0acccbc3a94fab9027a2c26f29e4af0a14038effd935b56aae29df4c1c8aa65bc58453d94ad SHA512 f736b0762116c8c4cc26486ae2d0eb1d25c20577874973b7fab2dc8b5171d6c685a96a8c9d39f8dad1fd1c03f6c6c1b80a6471d2c6fa7ca5f3d1837715052cbc
 DIST bcrypt-3.1.16.gem 54272 BLAKE2B df8e1169df3a67f3eedd90b4fe04224266cd41d1a0dd2866b06372805b5b00aa028c3bb077078ffde3c89a9052497016dc3fe812075d8b6f57d6dd951a6aa806 SHA512 655483d73347c20f3b04a24d625cde05fd8e1da6f022363fbb2df828aea0623cb5b4981d97791301dcd83edc2719a2238d8d377af1558ca2ce4b3c8ade9bd343
-EBUILD bcrypt-ruby-3.1.13.ebuild 1633 BLAKE2B 7869ed2108e35c03f10951ea9de76ca1cf05ced0a859c8e206fd5eb3ad8efdfd26619cd6819808c8a6470e6d9923beead7a2dfdc184b6ba62de2301c872b450f SHA512 9a90fe9372815d82063a3179e5d0a8e3356bb3406f6f5b74667aa41e3116447b701bc19750d5507422baa824c64b95f6d52e3e9437d06753ab56bd97865b958e
-EBUILD bcrypt-ruby-3.1.15.ebuild 1627 BLAKE2B 253db30cbf9743b3dca35f8bfc00365be54045d4f2f8857f00b895b58d6d05200771748465ee545cfc608ae9ffc1d76ef8f6a35a3a4b9185993c8654b2b4ba15 SHA512 9ff92cee8c75452f0211b49f635e4a7cfb85f4a53ca640ea44e708c5c93eed823188d59a46047c079c2db7254d4b32e2f5deb7e6186f8977e0954a1e21b14b71
-EBUILD bcrypt-ruby-3.1.16.ebuild 1627 BLAKE2B 253db30cbf9743b3dca35f8bfc00365be54045d4f2f8857f00b895b58d6d05200771748465ee545cfc608ae9ffc1d76ef8f6a35a3a4b9185993c8654b2b4ba15 SHA512 9ff92cee8c75452f0211b49f635e4a7cfb85f4a53ca640ea44e708c5c93eed823188d59a46047c079c2db7254d4b32e2f5deb7e6186f8977e0954a1e21b14b71
+EBUILD bcrypt-ruby-3.1.13.ebuild 1622 BLAKE2B 2d8bea12834b90c7c72305e7a8be86bf017678cfd54ca0d361f9b4199317b5fa98b1122048a6b0551a4ed9f752c754465006f1f5178309adccaefd6745c1acfc SHA512 9fe9ba2bd7cb56cb9665b43987779dd3e715f0c0ac1e29416bc9556cc7f10aa1559372640680bdb9c2779feb99866632d7cb44632d4df616040014fa67f5bd64
+EBUILD bcrypt-ruby-3.1.15.ebuild 1616 BLAKE2B ffe6304ed15fdf20c5d89d3144f9f585c0288337f0e3c114b32daaecfc981a8c0c453add8056213c604831f60f8b21b5bc32e73891cfa36d65e0957984c7a34a SHA512 317d139330ebe8be64d0c28f1137e581446fb862b7684abd71134e70fadcf27be91f15b985d0837c28591eee2d0010f92b8e1c4246a152ccb4a5bc06a08a3ed2
+EBUILD bcrypt-ruby-3.1.16.ebuild 1616 BLAKE2B ffe6304ed15fdf20c5d89d3144f9f585c0288337f0e3c114b32daaecfc981a8c0c453add8056213c604831f60f8b21b5bc32e73891cfa36d65e0957984c7a34a SHA512 317d139330ebe8be64d0c28f1137e581446fb862b7684abd71134e70fadcf27be91f15b985d0837c28591eee2d0010f92b8e1c4246a152ccb4a5bc06a08a3ed2
 MISC metadata.xml 346 BLAKE2B 635b8241d82a243f102d3ee6ce24c6cb183a9decd70cb02ee8734c85c9796b3dad0206b4e18da86df0e68fdc72a782b0494d682e757631718d0d60ee27b3d67f SHA512 ade206e8719923e0e758268c757100148580fd817bf477beee8df9b9b9f99a50b82b898e555bb6b0fd91239af22b1d7aa320caa1fed5c093a8799e82fac97608
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.13.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.13.ebuild
index 00d3fc952821..27b77ed11a48 100644
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.13.ebuild
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ DESCRIPTION="An easy way to keep your users' passwords secure"
 HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.15.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.15.ebuild
index e65ef60c5088..ef3162f1c053 100644
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.15.ebuild
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ DESCRIPTION="An easy way to keep your users' passwords secure"
 HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16.ebuild
index e65ef60c5088..ef3162f1c053 100644
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16.ebuild
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ DESCRIPTION="An easy way to keep your users' passwords secure"
 HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/bcrypt_pbkdf/Manifest b/dev-ruby/bcrypt_pbkdf/Manifest
index b1cbe3c199b6..4ba440228f5b 100644
--- a/dev-ruby/bcrypt_pbkdf/Manifest
+++ b/dev-ruby/bcrypt_pbkdf/Manifest
@@ -1,5 +1,7 @@
 DIST bcrypt_pbkdf-1.0.0.gem 24576 BLAKE2B 0d5b1d90d57dbae986fcbb92cabb0ea598d6b928dc97026e8d2078f41898e0c143544a004a561c0a392504baa4b845a27f9c1e19c369f6342f7ace9de7f04d3f SHA512 b582407617633f5277cde9251ed1fd2ca408ae8bd19cc73f107d7932bed38061dc0099d3033ff5def1b586507392c33d8c50815fb156322f0dd08fbbe4a8e967
 DIST bcrypt_pbkdf-1.0.1.gem 24576 BLAKE2B 7ccade2b5eeabcdcffe5c53bf8ed2e4163536229b7ccd356e173c0b2a27c720aa5429ea0081d2a3e7e7cfc52613c32a48529233156b56db4bbd48da61bbd9cdf SHA512 7caf65dc48ec9d51dbde7741b0960e2606129f888787db31fe36f3cf103d51f06156e942badb10310faa8ca9dcf8f7f8dd86358431942a6e2097714ae3462dee
+DIST bcrypt_pbkdf-1.1.0.gem 24576 BLAKE2B 4fb9449c23c1a1caefbe7acae630eff9c6ee22b77d1eaed6475400ab2b37186d3f15b867cdad364daaaf27d6b817d6a2a49cfbf567a889264fdd64903f06cf89 SHA512 a7b9f123274a2f93e183be7339149b1df3b185331fdc63af58e342ae4bb734fdcf709214a50922218b837481349948e10ec879f9b8e1a6928b1b7b5617f83be5
 EBUILD bcrypt_pbkdf-1.0.0.ebuild 1091 BLAKE2B 87453b2647c98479ff54e8fc45ed48ae875682134feb4751bc6094d39a452d539e7a1d176818523392d174c00502b559ef625e2a740bba06b841ef55f2c54da7 SHA512 0cdf6de34b390231c2933b2257577c69a18fde6511b8e73ad9e114abda76d596ab6959d018a63829f5944a576291f9907058a5ff4bf51b2fa930438cc9e6dbc4
 EBUILD bcrypt_pbkdf-1.0.1.ebuild 1126 BLAKE2B 1de9596c2f022351f904f89d04a42f6aff409e115360dc8cb7c1890ecf67536d37ca5665de6fc1f89e6020b7f6f8f54da5f3b515f029277a289aa519d47af379 SHA512 b5be2902e3fd7f47e1dc40ef0220e1ecd2c4910d411ecd1e28c318ccfe14f4d95da6248b81a48b68b5ebd942773e71838d885f0045be671b26a8df65796e38d0
+EBUILD bcrypt_pbkdf-1.1.0.ebuild 1095 BLAKE2B 760d16c8ae96e77ec9e1ce10e6920c17d5e7ecb9ab48a880bc1196ced94c6c14d743437da08596ec04b7311116aea09eed80ecc622c4bd39df6c2f79656391dd SHA512 0b4eee7403c01d0ef287906c3373730bcdd2b7a7c7a1920ee5a7c799f151c5d2e3db5aab8d948b1f32825d188900bbb2b4317ba34fa3c95ce445ba3fd4c3433e
 MISC metadata.xml 351 BLAKE2B c94f203ff5c3e7f1b17922c986b5559eefafba479f71868c675bff11099cba93a4d1102f65f5bdff1d1f8cf6ec58d43dfdea33bf9b1301dd22deded3b8e1c758 SHA512 03184605cef97c6fe2390bbf0b4d33d83faf6c05798bea8af352b96f844be84cec02f1845a77f841cc06645ae791cf5c16beeaa1da4967de6ba0c8e1caab04fe
diff --git a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0.ebuild b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0.ebuild
new file mode 100644
index 000000000000..20942ab3e80c
--- /dev/null
+++ b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements bcrypt_pdkfd (a variant of PBKDF2 with bcrypt-based PRF)"
+HOMEPAGE="https://github.com/net-ssh/bcrypt_pbkdf-ruby"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( virtual/ruby-ssl )"
+
+all_ruby_prepare() {
+	# Don't use a ruby-bundled version of libsodium
+	sed -i -e '/rbnacl\/libsodium/ s:^:#:' test/bcrypt_pnkdf/engine_test.rb || die
+
+	# Avoid unneeded rake-compiler dependency
+	sed -e '/extensiontask/ s:^:#:' -e '/ExtensionTask/,/^end/ s:^:#:' \
+		-e '/bundler/ s:^:#:' \
+		-i Rakefile || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/mri extconf.rb || die
+
+	# Some methods may not be inlined on x86 but they are not defined either, bug 629164
+	sed -i -e 's:-Wl,--no-undefined::' ext/mri/Makefile || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/mri
+	cp ext/mri/bcrypt_pbkdf_ext.so lib/ || die
+}
diff --git a/dev-ruby/builder/Manifest b/dev-ruby/builder/Manifest
index 76935c457893..cbb12c6387e8 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 859 BLAKE2B f6e17ddf8e87e96c0caf3f53e5dc94cb569317ee93f07ca10768d66d7fc0d6e3892bcff90e5d383f40634269d899ad7fda4529c9a65dd45d5b341afd91e7bddf SHA512 a619237141d1e9417b4559cdbad84597909336c5de9e81d6138bd008877aec98d821017897eebfb5dfe6a4869735d18e0a88ca76ff955983bbfa0930e70b9ad4
-EBUILD builder-3.2.4.ebuild 824 BLAKE2B 381f993219a422f07acea74a8f50e65ec12fd555be3d2ab2f75cce61235c879c46b340ad121bd0b4df55470c7beaa008981ab6694fcd8fa834963c5208ca2c81 SHA512 a6b5344797335a360e433f3947839bf9c795e98a0a01deed67e9a006d6591e7fe45228d4df2ed943e0229f62dab3c794855d96f24c7a18bd0b3e75222021b03a
+EBUILD builder-3.2.3.ebuild 848 BLAKE2B 39125cf7571c36c487e8626f696ff39ed05d8a378e166dc661c88a7a28fc2415ff3fa2cef4bb59ee8776adaecaadff0c9609ad6a67bd1fe885d5682e2a7db157 SHA512 d19fcf7f42c65110945e39dff20797e6fce1430d3725da5072f5f01bbea2978e318d4e5978956c9a278ffeab4dc462d1de2b4c52944b4cd4e34fa6e5abca87c6
+EBUILD builder-3.2.4.ebuild 813 BLAKE2B 918520f9a03bcec9879d9616700dcd7d75ae4bb4f42cc198f29c2e777382fd3b4df827e33d1b247884857d3a52649e060a45b68d035318eb59391c5da21596e5 SHA512 bfb38e0b001097933833ca3f090c8c05daf569acc5bdc2573a640ad130faf52e934a07300d09e850b27eff33e81e3a63bca6e47a929b8da71349ec6184bd07a4
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/builder/builder-3.2.3.ebuild b/dev-ruby/builder/builder-3.2.3.ebuild
index e180e3539c04..17e483b6c13d 100644
--- a/dev-ruby/builder/builder-3.2.3.ebuild
+++ b/dev-ruby/builder/builder-3.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="http://onestepback.org/"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/builder/builder-3.2.4.ebuild b/dev-ruby/builder/builder-3.2.4.ebuild
index 85f7ebba0940..7ab39f402cfa 100644
--- a/dev-ruby/builder/builder-3.2.4.ebuild
+++ b/dev-ruby/builder/builder-3.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/bundler-audit/Manifest b/dev-ruby/bundler-audit/Manifest
index aab37259b20c..f19363b693a7 100644
--- a/dev-ruby/bundler-audit/Manifest
+++ b/dev-ruby/bundler-audit/Manifest
@@ -1,3 +1,3 @@
 DIST bundler-audit-0.7.0.1.gem 162816 BLAKE2B 2e068531d8edf542ce7bd1d362ac36290c90e87d12a5e861ce269575e7a10f9e8399c256be5f0f9dba145f1c3bdd6e0dfdb78826d4c45f79ae8a280631450564 SHA512 49d0262a03db03eeab95730550c9554453849bb58fcb1d883c85ca021a181b44e7983f21f83d0b14f857d57ea08bfa13b470cd93bcb3695cac31f366a78d8c1a
-EBUILD bundler-audit-0.7.0.1.ebuild 1306 BLAKE2B 3ff4ea311c195f1e003e3df3b4304ea22c3dfdbe0126b2fe796c81606e56508fae737496687afc08400fec7a427c87421e1d4bd18cdffef5e349a7e77cba0549 SHA512 2103031cde27d80c51cbb25bb26d356d701039a0c0b4f335603f1c9a3523ee747f723e2073794886042b6c285f24e33c1f86f7a83f6954fde049b2a9c2443014
+EBUILD bundler-audit-0.7.0.1.ebuild 1295 BLAKE2B d798b51f184a92a11f3f12c7eb766588d2ad398e77329870824b2e0f48b2ea8b86ef9b8fdaccd2f15077d493c50872e773b55c8daa1424ceac9e9fcad9f1a253 SHA512 ca8916456d1e0fe76a2589f407b87cc5e03dd11e9b5ae9b3fe9fada36f6abadf1e10e024e8f769c7e5025f67068f64971230bb51805a6c3decd61a3f71856f2b
 MISC metadata.xml 337 BLAKE2B 349e729ee8aa87d72509ae0358c0d7e3ecfa8ec4d792b0140a95a13ea175203d0b0efe879c375ed5c908e06dd6e1ce846c8a60cdd79096cc6397db606da3c92a SHA512 17b5dd74e3bf812111d8c824d10f537c3e1258b6f5a1065c2d850158945883ba158811979f4ea45e21312a2b1bdeb0ac701f0b54a62ffa27699330ea36103eeb
diff --git a/dev-ruby/bundler-audit/bundler-audit-0.7.0.1.ebuild b/dev-ruby/bundler-audit/bundler-audit-0.7.0.1.ebuild
index 8f28270125c0..b24e51497c53 100644
--- a/dev-ruby/bundler-audit/bundler-audit-0.7.0.1.ebuild
+++ b/dev-ruby/bundler-audit/bundler-audit-0.7.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/rubysec/bundler-audit"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 #tests are trying to download AND have some odd failures
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 46bb9c1cb150..df22085f74d8 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -2,9 +2,9 @@ DIST bundler-1.17.3.gem 364032 BLAKE2B 81e097156a593e4ec85a2353aa6c62143d9aad120
 DIST bundler-2.1.4.gem 396800 BLAKE2B f770bd63255df09a20160369dc64e8923e996fb5ea4c11ee763d9a88e5fba142277ccd677861e3c0494b99a36261d5e7bdfb9c40c2abb76322061542f95b8505 SHA512 6c870061a78e17d97a9219433c7ef8fbf1112de17d0e0f3d8b6db1a518318528e3803184278412aabe65008e93f451ffa59465062856918ef488f9438399eff6
 DIST bundler-2.2.0.gem 400896 BLAKE2B a9d67d052bc6b7b8c09a6dbc249e348209a6a02bb3a43f9dbef29c3dce651974a4c9bde200085632cc7f4fb0957aae42a7cbaae28c8cab91986dacf1f52f1deb SHA512 bbee12a30362d1dfd8a7de4258d6623d08df91a38ba1e869f9a5878871d8fd145221f8eaa99fcb72e0c1404c9c31df37a5a1dbf4a94610cb3381566cc6c45516
 DIST bundler-2.2.3.gem 401408 BLAKE2B 7162444956c65d6684a299c7ce15f64a178dab40867315241eaa3cfcb51b6973a004980abef359c911de06ce2051e5ca98e68e3df388963f40378a6f5fabda62 SHA512 da1f1dfae51cdf3dd6792fc66c33389c113579b8a723fb204ae3b315dcd1d45aed65524469336934d7276be53b026952c944457e326c97b20d4c423dd44321ef
-EBUILD bundler-1.17.3-r1.ebuild 948 BLAKE2B 40c498f2fc6858151b90bbadf70bdbb32a3b9d8ed64e09b388937b67a02ea4d5013843abb9c3f366ca0ac5ac98087b63db50677a32dc0abeaee6d051488bcc31 SHA512 179ea9ccbffdad03770264756278ac3fbd4dc6773bf50e3a5dbb6dbc120519ca0f8d3bbadb7bb5c42738e43f85ac09db1266eaf2d42708473932270f3a06b20c
-EBUILD bundler-1.17.3.ebuild 923 BLAKE2B dee890006e077eeffc983ca29b2de37f337d5c32fc92dfb720f0a225f7431fa2c7e6195b739ec7c028670b26d9b70f7d66fbd9c57e621656d49f2da4d38f80a4 SHA512 647ca0538317fbd7f6401efba0033fb5f9225df5567eac234ddde719131edf074254cbab631f162811a2a0c4742eeabc747b8f6e0bbad6f2fa43f0eb6c24a875
-EBUILD bundler-2.1.4.ebuild 941 BLAKE2B ce63d4da5a5f085a3f85afd80eb504cad821d3b5f7e1226e313a227f1efa8cf2ab544729a1953a5acebc9436ebd246cb2b217539de95ce2aa2c9a007551e8323 SHA512 2e1ecfe549f618f53f3f62148bc7152039857ba2c4feb5cc484e6caeeb9f82a760f8d8c9fc0b92cf419137ca5694a3eeee318e69f2f17396b738ac7bb8fa7b79
-EBUILD bundler-2.2.0.ebuild 942 BLAKE2B 5407089aa3b56c68edf0da0e88f53e29bcec51e1f77a31676c95d5f3399391c770793da638a8d8466c40f33f76329d073d646a8f85fde28d59863f408d2759f9 SHA512 f154a6909bf2ccb32629e6d0e24290edb6ca736a2f885be3e72a8d2d22d10ea58007a3ec75abef522d68ca2dd9b065c198227be54d0bf3c3060723a33bbda6ba
-EBUILD bundler-2.2.3.ebuild 949 BLAKE2B e749c39daaa4b0da7506b8d62796d7eb02bea07f03c579aa5c34047c6a70d50e43f04028ba183edf4bc83402dfd617a8739bfc3e0ebe3fabff6a83b883f70216 SHA512 ae745e831eb48e75a8561e4f1b73e973e1bcc5d9f6a9f2e2299b12bb2b679edfee4d58f3902c8cbdb462eff00f96206a159858cf9e1c1f390f56359e8abd9154
+EBUILD bundler-1.17.3-r1.ebuild 937 BLAKE2B 8ca548e66814bc848ee7e573a9c42d12a606d9f5e51af8625e2da279153e30f43dd22166be2b82ff75707bef6f38dfc085c5be32f04ec2867321dd9a310d6bf9 SHA512 5e17118352330d5add47e1462245aaaa7a938575aea543f9151ec0964fcb0427788a05d835c13defec53dd41c6111ec86358d677e235069be5b29e222dcb05e3
+EBUILD bundler-1.17.3.ebuild 912 BLAKE2B f0ec5223d9461d85eb381a6a7cab0e8eddad44c8b2f99222bd6301b3f64236a1b64ae14cd60152762080780fca44a863a3b97bd1940365791dfafb3a1d88d306 SHA512 48836a1da9702079dc72c11f8f88c5422b1516f7cd427d4d6619e138a18f70a3ceae84957e724c9ead5240588318731bcdfd8da3135cffe657696b7e04c93263
+EBUILD bundler-2.1.4.ebuild 929 BLAKE2B a79ad4ac2dd54ceb6163218b366b45bdaaa8e5b927e232ec6a7cfff0aca675b0b994065c837778619ccf27938d5971990fe3e6357adcfad721910b24a0b4a436 SHA512 c1b5d4cb99131409fd72849a5090366c4ab180ebfbfd9c0416304e0eba18fc502ec51c56120a1545369309c9ebc16b2b4b109760aeb3a1123a2851d85357c91c
+EBUILD bundler-2.2.0.ebuild 931 BLAKE2B 45ea33bc46297106a0cf1cbf84426c45e4b7699126bec073a7312c3b4e7a9cc968c9b008ea0635b2c3fdabc57856b4b7e23285e4bbf65305d5752e685f007c1f SHA512 bf4c48c4944bd02dcbe255a8f23a2df6bd24ceb8ccabbb1bcc8ab8bb36fb656ac2672e570261178576e57fdd75a764ef195f67e7bd1c81d91fbb5046d51044f7
+EBUILD bundler-2.2.3.ebuild 938 BLAKE2B be710cc6084c21afe9b6826249b64d8d3f051cf7e23f104e21b6c79204eb5f56eb9ed8f2ef0d39372ff8cdf010f183bdb1698e6956a249a255bff8297076fbb9 SHA512 453daf930f02fe82539a9f9b7277b93ef1def4512743d2bc16ce56ba738dfdf56ad531427b1ed13c85659dcb8560a96f65e5742087ee0a2eef59aff930449f81
 MISC metadata.xml 342 BLAKE2B 9247517894a366c8b67564e015ff966b22eb3df924ec8438d9886ee854d922e376a274e1dcb455e23451febbb1bf4d8f60023e6b7763cd42772749de1bab372c SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e
diff --git a/dev-ruby/bundler/bundler-1.17.3-r1.ebuild b/dev-ruby/bundler/bundler-1.17.3-r1.ebuild
index 1ec89ad68595..f72fbe8859e8 100644
--- a/dev-ruby/bundler/bundler-1.17.3-r1.ebuild
+++ b/dev-ruby/bundler/bundler-1.17.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ HOMEPAGE="https://github.com/carlhuda/bundler"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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="+doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/bundler/bundler-1.17.3.ebuild b/dev-ruby/bundler/bundler-1.17.3.ebuild
index cd28ebf5f14b..41bb44124a03 100644
--- a/dev-ruby/bundler/bundler-1.17.3.ebuild
+++ b/dev-ruby/bundler/bundler-1.17.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ HOMEPAGE="https://github.com/carlhuda/bundler"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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="+doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/bundler/bundler-2.1.4.ebuild b/dev-ruby/bundler/bundler-2.1.4.ebuild
index 5f7ce6757824..5f123936bd0e 100644
--- a/dev-ruby/bundler/bundler-2.1.4.ebuild
+++ b/dev-ruby/bundler/bundler-2.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,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 ~x86-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="+doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/bundler/bundler-2.2.0.ebuild b/dev-ruby/bundler/bundler-2.2.0.ebuild
index 831e415cdc5f..ab24df09b499 100644
--- a/dev-ruby/bundler/bundler-2.2.0.ebuild
+++ b/dev-ruby/bundler/bundler-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,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 ~x86-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="+doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/bundler/bundler-2.2.3.ebuild b/dev-ruby/bundler/bundler-2.2.3.ebuild
index a3210a7207a8..751a48996017 100644
--- a/dev-ruby/bundler/bundler-2.2.3.ebuild
+++ b/dev-ruby/bundler/bundler-2.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,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 ~x86-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="+doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index d0525778061e..f56ae747d812 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -1,12 +1,12 @@
 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.12.1.gem 69120 BLAKE2B ba465fc3eca0ed8917d7b8d5aba0b43017f8a6de17e2734ed654c66cfca6072e68cb2db7414b19bc2f60901245207d4cff067dc0e7b82554e118d306816eac73 SHA512 cddbf583f57af2961fecacc59249d43c15393c665e9eaaa493553bd29f88f947d73a449bdabfb589db78caee4bdcc706ab3adc021a75893c31c79c7e0ebb2ee3
 DIST capistrano-3.13.0.gem 69120 BLAKE2B 394f60d9a3acfef44eacef356908d10d5c7f64010d644fbae988e399b1b8cdd07c1d93b4a6a4894816dc94bcf61180a2bd5f4663b1f014a64ae07ffb82252a90 SHA512 fe7cba9ecfe54d9f8c557dd4e1f8b1ed1269c7aa1e8c687d55fb035b3666ff92ee93895610f0582d139dec56a78c84754208e2aa99d6fc3f4f46c3d45142e2d9
 DIST capistrano-3.14.0.gem 69120 BLAKE2B e9c503a43cdb5f943c84882cc728cf4004afae194a94de763872c8f20eec80a9b6fc05c723cbab0e5ee41d87cfca8947ea62a28ca1d32e6bd2b86f52d1ea859c SHA512 5f117a6efec1a35a188f1ea57f1738bc41bdf3614b77a61ca2e941480d36d74e392400543948a55c054871beb88563489115bb69fb34bfb9f0c32a371966cd42
 DIST capistrano-3.14.1.gem 69120 BLAKE2B 33e351a98aea540a5903f68be6fbdde8c104be5ca66de707963f0a3b5c3460a086b5656fbc1cf98e37bed1507fb98856821a0633c2b86694112f5d357dfe8186 SHA512 10071c5b2ccadfd41ca321f21731dca8bafcc8efbcbdaf8099c562188d1cf802bc8c3845644c3ba301e4d9954fd8ab2c9022ee734f580a8be55b6dd8918cf11b
-EBUILD capistrano-2.15.5-r2.ebuild 1244 BLAKE2B 64bd844d4324aed957bba6caefdd8737b38add38a70560015b7f6570741003e16f6083dacd0323949a16f5530cfb7b59c53d03d337b4bc3ec3dac523fc10184b SHA512 71204f87c8e23c8eb3a8b92fa055d1fd47ec4eeeb0f746b42393bfb05c00c8a06d5902a1d309b5a0bfb2759908cf08ee35a6a8cd2febc13fbee822295e2e62a3
-EBUILD capistrano-3.12.1.ebuild 925 BLAKE2B 4646005c51f55dacc6142c68f5fa35c6a9b35fd5cacb4f10f5c7d1bf662f2a005d53caa97d7c2d859145f5c0d79ca1a6c2e3d043edecc8a59dfc0a100be07112 SHA512 e5a5475335242113c096e4945ba74b9667d84ce0146f605aca880d4317b770fa1f2ea4773aeb22504cd7be9cdb394f9dacd056f6ed477980d9a9e575acc8561d
+DIST capistrano-3.15.0.gem 69120 BLAKE2B 07887b773b9ec3570d9103a35880fe84b1205ce7a53b15584c98b0ea38e236816d68ccae261e35e4d79b09f7f6fe48d1f4fa9b2daf41350cb119345c7ff597c0 SHA512 087825839239f66f004c2c079a3b1d3553465c2ca4da8bc67e737fcfadf22b618ff70542ba5c255cc47e2047245aa5b57148432a68afcf48dedbe96e0257931c
+EBUILD capistrano-2.15.5-r2.ebuild 1233 BLAKE2B 224bd9e8f1429a7857c2d00fcd49ce5c4a5938926f718e676687437b15990d2437752f974e3967ad3562d4f49b2da1c57cdc44f60eeaa453f956478e3971edcc SHA512 5c8278e6fa7ccd6fdc8db10478396b6dc00aac73f36d37229d3773a5df43c4b79982390bc44aa7ac0ad7f32280d41f00c2c4b0cc5a045c393ee37062fc9c51cd
 EBUILD capistrano-3.13.0.ebuild 925 BLAKE2B 4646005c51f55dacc6142c68f5fa35c6a9b35fd5cacb4f10f5c7d1bf662f2a005d53caa97d7c2d859145f5c0d79ca1a6c2e3d043edecc8a59dfc0a100be07112 SHA512 e5a5475335242113c096e4945ba74b9667d84ce0146f605aca880d4317b770fa1f2ea4773aeb22504cd7be9cdb394f9dacd056f6ed477980d9a9e575acc8561d
 EBUILD capistrano-3.14.0.ebuild 926 BLAKE2B a4d7e28359be35573c458107ba17d05e6470f367dc1c71bcdb5809be0e128ceb6129775850353cb8f7ee0a22d992c9158fa6888aa7a474113e7c58f5e12f6e30 SHA512 4d64494fe679729de181bd24d508f9689a3479e18d726960e87599ccdc4b8b8a89cef120aeea24ed9dbfe3fb1e37fb628a78a614d7ef48045e84fd8cabea8360
 EBUILD capistrano-3.14.1.ebuild 926 BLAKE2B 221720b5ff0b5e60d376cebb57cc5ed8b52f1fa0e1745e32e79160d1d848e8ff0a94ea61cf75e58426e48b5dd45a72eec1e99f733bc8a8bec50ba7ae92c93bf5 SHA512 e510204b30df795c1954d1b645d5f6b7b7708f72af2868659d4ca33b7053240ddcb63c2de163000223ff13f2582b1ef2c65b25d10198c0aa26df8dd919b83e88
+EBUILD capistrano-3.15.0.ebuild 926 BLAKE2B 45f336d61b7a2273384f424ec80b1d299c7d217a2d0aa6397da9300ae952b46cd23783e2784e60a537b669af4c89524ea9b69d59fbf8928a0c954acd863cf3d9 SHA512 e9dff6c2b92578982aad9588b870234fccdd7b51c53aafbfbb8ea3e52b7c5b1c584558cd6a9a19eb992e37c162bc5bca6a6cd54e97caf67d6045d9339f937720
 MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild b/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild
index 27d86dd74199..662b053f032b 100644
--- a/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild
+++ b/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ HOMEPAGE="https://capistranorb.com/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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.12.1.ebuild b/dev-ruby/capistrano/capistrano-3.15.0.ebuild
index 194a24709889..5972f35d3692 100644
--- a/dev-ruby/capistrano/capistrano-3.12.1.ebuild
+++ b/dev-ruby/capistrano/capistrano-3.15.0.ebuild
@@ -1,8 +1,8 @@
-# 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="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://capistranorb.com/"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/chronic/Manifest b/dev-ruby/chronic/Manifest
index ffda7265437c..57c376765031 100644
--- a/dev-ruby/chronic/Manifest
+++ b/dev-ruby/chronic/Manifest
@@ -1,3 +1,3 @@
 DIST chronic-0.10.2.gem 43008 BLAKE2B 669361fb9aa9da9ea71f6b131dbd4d0101f63bdace26b3f1355f2f3bb793e52ec59ef2cd51e71953cbbfc6c1cf7bbcec215a7d9f65dc40099ec717eeac9b527f SHA512 4efaa6453a38e62f15e7286b9b62891fdf2b4363cf8bc0b1078d22ab18863bb65db46ad523801801c76c5b751e52809a769d49743ca9369ddee2be1c526c67be
-EBUILD chronic-0.10.2.ebuild 708 BLAKE2B b1a79ad2e6c088a7c3bbf2fae860356a21afb765b71e0f1f7c2c22cb059c5ef78748a8479e2e92dfd3e63ed51d8288570bfe5feef93307c3c2ba5c2dcab12bfe SHA512 e6279572efafd632124e156fca38b8b7ed5572c9629b80847f06e332d5d7474197507c938b829e686e0ce3eb77b64647bde4e440f509236b00c7b83f17eab75b
+EBUILD chronic-0.10.2.ebuild 697 BLAKE2B 77616cb25379a500bba3ab4fb942748064254071271b73c2b20992b35a641a507f746ee2d7885c1f36ab2fb751615e25b25a3774d165fd89cffb3f8c46025103 SHA512 1069aea8c63786daeb2aa2d8272dfc0e92e11f15c15c3c8a02ead027a50b63a7869bfbde267cb6562fe727a0597996b8a3749e9a48ece0b94ac99e7d23d59399
 MISC metadata.xml 341 BLAKE2B f6fe65162a4fa020399f3df2b49e47d2180007bc6dbacb02630ca624e8178333e499fcd8f174ee87b1fd0afecc4a542bb42d7ad970141bfd3195b8845ca57505 SHA512 08308a85242b516b576944c0a5fe04f9c808f7fdf8e4b534cd446ac17f1915861fab39b2ab92f1cf1693f07197c7fd665586f6b02d61a04bf51bee1fd92b2169
diff --git a/dev-ruby/chronic/chronic-0.10.2.ebuild b/dev-ruby/chronic/chronic-0.10.2.ebuild
index 85c6306b502b..6dc32323c194 100644
--- a/dev-ruby/chronic/chronic-0.10.2.ebuild
+++ b/dev-ruby/chronic/chronic-0.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ DESCRIPTION="Chronic is a natural language date/time parser written in pure Ruby
 HOMEPAGE="https://github.com/mojombo/chronic"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/chunky_png/Manifest b/dev-ruby/chunky_png/Manifest
index fe7ba2c91f5f..8e059d386ad5 100644
--- a/dev-ruby/chunky_png/Manifest
+++ b/dev-ruby/chunky_png/Manifest
@@ -1,11 +1,7 @@
-DIST chunky_png-1.3.11.gem 352768 BLAKE2B a60607830c41921f8e8018b91e459103d0a793a6c3a5491f36399dff0ac83dee09f66173f01e3e8f8f2bcf9fc69b1ffa53a9bc29adda758be75fefec391f7900 SHA512 5935bc7672ef4eb271abe0e2d4b83c2628ecb9d4fc1bb095d28d0f7fd5e13443492bc91b2c9c1de59d8bb669c185cddaeef62d03d3b0df88ecfaaa3c7a2a0ba6
-DIST chunky_png-1.3.12.gem 353792 BLAKE2B dc891b23189ab4ff1f487d1ef3e83ede822261691c77a04d4ec4cb268902a6a3dac0db705644e7cceea6d5d097f520409005ebdf6496f5d3be339f2e0d27b13c SHA512 84325afc3903b3d0b4e4a19ebd9548029e02f68d45896efdcfe6eb23a64360f2c2b3d191c736cc172a11258828bf82687b950f95104cbdae639d00277c37bebf
-DIST chunky_png-1.3.13.gem 353792 BLAKE2B 9804e2baba7816b52f9ba10db0cfc6e4b45db05fa95f3d154163866bc97e6da644f6240f65e3d5ca8b984cd102346d8838986ca7a1441647cbddd168fee3857f SHA512 40596c3a404830571a24b4241b306ecf1600d7d76f6d535805fbf53640890526b941f0cdae0f9873d00858457a65edd6b415a627725cecb0c32b753e42bf1bc2
 DIST chunky_png-1.3.14.gem 363008 BLAKE2B b35dc7523583b2b6b5c42024ab0e29b90c3c2db734d80ae4c6690f34feb8af22eda09b17ef598fd96dab245d86dd20392b7d8ef727be4ee968d39225aa914bcc SHA512 d52aca34f94749dc58c8850f552bacc6354c93bccf041435d4fd1ed81a88e7564840fca191d6b40d56dfa69a74bbe09f7adbed1517e363e4e00884f7c81c4494
 DIST chunky_png-1.3.15.gem 363008 BLAKE2B e94b366aced2214a052f321ea828c7de9df2d9cf91f5a0926a1f17dd258774681db1172a3a04b033cbbae6f3f9bcb114bde3d07f166a6028e523a433926f6e81 SHA512 a53d3ba7b5d879a2f1dc3bccf20c4ba99fd35fa8224b21a4652904de9554ec4776b81186b8b75f5f77c6c1a63543ff1ace91c1723b76c1c4c7155bbc2a819239
-EBUILD chunky_png-1.3.11.ebuild 735 BLAKE2B 0b660745c190b9ad13ef26ec32b2e6b9bb20ae1e51e85578333d12af02df390b6a4b1cde9b959e708459b7d8b003afe8d60c66712fc2eec4c1505eac2f4c70bc SHA512 f9bdb047dc31f980d22103f29b133103de6e9a70663433cc96bcdc52108ffe022daa60fea29330c2638dbae396149f85a822645ed995dfbec3d5e9e4b2f7408c
-EBUILD chunky_png-1.3.12.ebuild 753 BLAKE2B 74682ed8fade797e87c2f3e4c74e162ee839054993f7a6c1a4b759d171c8f28f9b14645cd433700f2ccd3041a673595e3b51ae39cd959d4e06414bdc4e6aae41 SHA512 7f083da715a03d0bf0eca20a987315ff2234def44b3f369ae9fcb4ccc57aeaa5feb6c68a8b5c11f63089a7e75b8da4cb06c028b2156e0a254db49452423d54ab
-EBUILD chunky_png-1.3.13.ebuild 753 BLAKE2B 74682ed8fade797e87c2f3e4c74e162ee839054993f7a6c1a4b759d171c8f28f9b14645cd433700f2ccd3041a673595e3b51ae39cd959d4e06414bdc4e6aae41 SHA512 7f083da715a03d0bf0eca20a987315ff2234def44b3f369ae9fcb4ccc57aeaa5feb6c68a8b5c11f63089a7e75b8da4cb06c028b2156e0a254db49452423d54ab
+DIST chunky_png-1.4.0.gem 363008 BLAKE2B 3fc484985565f223127c43eb1d55137ee9b58fc5ab6f25256dd54efddb817a5ecf78b39754a042fd09b83493cbdfdf02d0b90d150ab90b084f01c9a98aba5a8e SHA512 1276ba527723af973ca00535baab0dd3be8185cfaa77efb28c3b1ef1e949312710a616ca55711923875e54cb9c92b38de71062d2ba68b2314c7b9ce7a9b50b11
 EBUILD chunky_png-1.3.14.ebuild 753 BLAKE2B 74682ed8fade797e87c2f3e4c74e162ee839054993f7a6c1a4b759d171c8f28f9b14645cd433700f2ccd3041a673595e3b51ae39cd959d4e06414bdc4e6aae41 SHA512 7f083da715a03d0bf0eca20a987315ff2234def44b3f369ae9fcb4ccc57aeaa5feb6c68a8b5c11f63089a7e75b8da4cb06c028b2156e0a254db49452423d54ab
 EBUILD chunky_png-1.3.15.ebuild 753 BLAKE2B 74682ed8fade797e87c2f3e4c74e162ee839054993f7a6c1a4b759d171c8f28f9b14645cd433700f2ccd3041a673595e3b51ae39cd959d4e06414bdc4e6aae41 SHA512 7f083da715a03d0bf0eca20a987315ff2234def44b3f369ae9fcb4ccc57aeaa5feb6c68a8b5c11f63089a7e75b8da4cb06c028b2156e0a254db49452423d54ab
+EBUILD chunky_png-1.4.0.ebuild 753 BLAKE2B 384c8b61ab2778fa69c6bccf5271c5111f9d2a934314134ed8f245bfd441e2f578d01d3683b3e27d9af5888416dda52696a4dc5589063b8fa0123f3ef7ed9069 SHA512 6f3c9ed331448b10fbd39444afd5f0d5a0d5de1cb707ed6b29e23e3e6a0f34da3b0295b4682aafec84e1167e69c8be0054f30088fa3b53fee987744b37fcf9ad
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.11.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.11.ebuild
deleted file mode 100644
index 2fbdae333acf..000000000000
--- a/dev-ruby/chunky_png/chunky_png-1.3.11.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="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-
-RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc CHANGELOG.rdoc README.md"
-
-RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure Ruby library that can read and write PNG images"
-HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
-	rm Gemfile* || die
-
-	# Avoid git dependency
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.13.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.13.ebuild
deleted file mode 100644
index 58f7a1ed2e69..000000000000
--- a/dev-ruby/chunky_png/chunky_png-1.3.13.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-
-RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc CHANGELOG.rdoc README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure Ruby library that can read and write PNG images"
-HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
-	rm Gemfile* || die
-
-	# Avoid git dependency
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.12.ebuild b/dev-ruby/chunky_png/chunky_png-1.4.0.ebuild
index 58f7a1ed2e69..e61c91a277aa 100644
--- a/dev-ruby/chunky_png/chunky_png-1.3.12.ebuild
+++ b/dev-ruby/chunky_png/chunky_png-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-ruby/coderay/Manifest b/dev-ruby/coderay/Manifest
index b02b2022cf07..c9ea5cba9f4a 100644
--- a/dev-ruby/coderay/Manifest
+++ b/dev-ruby/coderay/Manifest
@@ -1,5 +1,5 @@
 DIST coderay-1.1.2.tar.gz 220645 BLAKE2B 85405da2b148ae23573abf2c3fcf94a643024756308e83c4cecf0a5edae2fedc4ca7c7bdf8fb5936310f6699ca8f06f91cceb475e00511a54af0a96dd517c234 SHA512 cfce5e9f0a0d988e7920912e064ecbef3b54200a08ca2e07453452edd7f382a1eb9292bc566e069f5d1b784033e816f13d9ddfb39520e8e44a8d1e898aa33591
 DIST coderay-1.1.3.tar.gz 229139 BLAKE2B a900cc5fbac950f66814d9300876d6a273b296d07139297d5344d26c5710d23c37761e5743ef972f523afa20fa663f239c03d9d2ad47232b77e53fe5053736f0 SHA512 a5208965e8dbad53d179fdc1c57df59ba4e13522a1a57c371ccd3f9369408a1c7d878867df48b201a1d590b46ef0f9bada3f3e7810866f17d244b5b370aba3fb
-EBUILD coderay-1.1.2.ebuild 1359 BLAKE2B 4b6cd11c8f98927128753e65f9653ee455f62315bcb5720ad8cf2028f5adac4b207b4d6c97d964c5173888428c792d76ffa01c53c3b4f259d022415a8505536f SHA512 6175b581f764e649614686083421bcf21328a40025575ebb22be29e382fd5f73b3cf9019e4a82fc6515e45fb5d542a2690031b9664f1eed4d0ca136ec3beb45d
-EBUILD coderay-1.1.3-r1.ebuild 1476 BLAKE2B b9e92866486d5f8555e727d556aa0d586d0bc7537d074cc2c424a91f189c911905fb305fb87f77b76aa0afdfbb3696e5eff8f1681e30fcb614e068692d05eccd SHA512 87bb4172a71d1e5b27752d0bfffd994ab01067119202a767a2e8f7be85e6a7f9386db44b3f0c41c1e8841c3ed34c9d2d8856c88013e1c2cd987649c031e7fe84
+EBUILD coderay-1.1.2.ebuild 1348 BLAKE2B e7c43e28b7a76ba163f1888f1f51cca9f5b1ad33e797826f023d250aab270f0ab284a06fb95625e0e26c2e53f4f4174e37161e6061ae36afc1e74d1f72509dae SHA512 4b49f01229efbc326adcccec819ece3fb26e4cc0571e978af149206af6697b9afbd7697c9d3f3ee101f6d79a31808007b7861789bec6f212269dc87006335388
+EBUILD coderay-1.1.3-r1.ebuild 1465 BLAKE2B 068dddb8435b3b67b6a741e36d028a75cf005c035f9d0adf240e8c539b25b47adff6e4ba5768ab87dadb87ea351983d48d824c7942528b5a555c5a1e130d0f98 SHA512 717fb0fd7f4417fd46706e0986d2cc1515a0329fe4a4bade723f1788678df6c1c23b6d3314b192299382bac416a66c57ee7edc0c905a826f653c154dac93e3a2
 MISC metadata.xml 342 BLAKE2B b907829065b996e9bf467150216ce92b7fa4bedef8dbe9b9d79a1ba6831c706c312ce0d1cbb418df6c5b43dad59509c132187637025d4c49e9b29e21fa68a107 SHA512 13f33c6d77b3297dab6c125c2ebc9a1f7584dd5374e7f13d416d5a80ffe04e39ecdddd93de30fceed22e110e1c68e4b853fdd5b6ab5ec4d254c05b17f624ca4f
diff --git a/dev-ruby/coderay/coderay-1.1.2.ebuild b/dev-ruby/coderay/coderay-1.1.2.ebuild
index f84754692b02..c4117e4eed7b 100644
--- a/dev-ruby/coderay/coderay-1.1.2.ebuild
+++ b/dev-ruby/coderay/coderay-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rubychan/coderay/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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=""
 
 # Redcloth is an optional but automagically tested dependency. This
diff --git a/dev-ruby/coderay/coderay-1.1.3-r1.ebuild b/dev-ruby/coderay/coderay-1.1.3-r1.ebuild
index 1cc2fec61d45..d940e89b4842 100644
--- a/dev-ruby/coderay/coderay-1.1.3-r1.ebuild
+++ b/dev-ruby/coderay/coderay-1.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/rubychan/coderay/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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=""
 
 # Redcloth is an optional but automagically tested dependency. This
diff --git a/dev-ruby/concurrent-ruby/Manifest b/dev-ruby/concurrent-ruby/Manifest
index 32dfe065b4a6..ef31f8259054 100644
--- a/dev-ruby/concurrent-ruby/Manifest
+++ b/dev-ruby/concurrent-ruby/Manifest
@@ -1,5 +1,5 @@
 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
-EBUILD concurrent-ruby-1.0.5.ebuild 1237 BLAKE2B 86bbdb65a73230cc7dc9533afa155acc4e6ac9101d30b17cdb717bf7a0e119ca8d0b5c5e809664ae3ef678b1c71093fdd080b73aeeee561ae069c1cb8c803edb SHA512 0cd1728437bcd85695a7c2f9033af06a6298d2bf78ca3a8fb03e5167c07cb0fb8d782e9266c0eaac063d2f0eab981d7f17167c2a9acb9972cb3daab27bda161e
-EBUILD concurrent-ruby-1.1.7.ebuild 1380 BLAKE2B f09b8f295d54f3c102c651bc231025c961177dccc991eb5fd4fb3275f88b8fdbc555ef51fc244b6c9d0f5d6f6c87a4eb25d2e60e4a76ab9fd1e40ef7be10c673 SHA512 0a7ce428b84f030a65c926714ccd5d56b69dfa664eba994b4ec49498ea8a20b159ddcb0c2f47710beae0a4bf7c998c8096eb22a77e419dc3c295b502d7806d9f
+EBUILD concurrent-ruby-1.0.5.ebuild 1226 BLAKE2B 762a7d9f335a9e60bff70d381d38a6531e7a4b97ad53e7918af5ba4665ffa02150341a4373887e1c8135b74198f7f6b640c3112d110e6be2b6208ea81ac06ed7 SHA512 44c99e6b0ad806b44a876e79a9d6b0fbd65b07fe19458e4449365ae98a0a0263e3dee1dad4da610166760c6175a61a4cc5a419060317e9341356bb84fe234be4
+EBUILD concurrent-ruby-1.1.7.ebuild 1369 BLAKE2B f3d176d753b2541004b005f8d2a81b7631f378c48deace0b20fc0e6896e8fa46e8bdd848c22aaa7d53725098045624adc62a9a775dd38721c82f79b3dc42b320 SHA512 8f2d07eb5b42015759d896cab882fff2967ce98f935317b908fc165e7acc479ff295b61cf37e7031333aceeb5e90f717892cd2139e46a3f829db61baa3598001
 MISC metadata.xml 358 BLAKE2B 4af4b67d3a6beab61cb05090b0f0a0a7802af67231fce103d84c2a475f9e65324a511f5a1c8b9df808a929281811de7b5f62a680688dd89c25ad75424bc5f2a8 SHA512 64e69249d1082b41905c309e159ad7eb8045af1c89ecc77cf119ed6014d40e83ca81bfe8938b5eaf5119fe12c02f1b1613ccc885770c897be06769af40dca85f
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
index be852d6dcd6d..fccb2f378072 100644
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.7.4 )"
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.7.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.7.ebuild
index 2b5e4b9e1366..6b34f2682135 100644
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.7.ebuild
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.7.4 )"
diff --git a/dev-ruby/crack/Manifest b/dev-ruby/crack/Manifest
index 2ff81a01fcfc..91c7690397bf 100644
--- a/dev-ruby/crack/Manifest
+++ b/dev-ruby/crack/Manifest
@@ -1,5 +1,5 @@
 DIST crack-0.4.3.gem 574976 BLAKE2B 4b6f23277ec17a516d06e6e6785889996172b3ec077f022d1a52ab4b8e938b2735abbaecc71288b55654ff09a428c33eb944b627cfdc827ea1f4ddc6289461d9 SHA512 c6577bd86fe2e36b2a37693729da9fc35c5d4deb860ac1873265ccb6fb38056fd76d8c17bb4f779b39f4bc13b9db37c1768433f518c17090ccbb0872a103b386
 DIST crack-0.4.4.tar.gz 586633 BLAKE2B 26e2cda6e9447fb3c9fe02092a6e9d6a8097c7bca6a483a3af42aa8ba491b737bc0dc3ae1936ef8ffb5c5d5cbbed3fde69c9641f05b9e3eb3beab87c375f68fd SHA512 3f86c76718a3c2a65ee11b15434035396c2355a8562bdb642432a659b52c3e811e930318e0dc2df3ff06bd53ac14d0694471e425420ae3b7971f5d4f818bba87
-EBUILD crack-0.4.3-r2.ebuild 1061 BLAKE2B e5aec6b5b4029a85473b0123fd4d6d53e5ba4baf933ce9e3ac7226f29b2b4e875721edeb49dce642006e05209c64203111138fdbec21c3feeaef73ad5befe339 SHA512 faa1f612a706a9d83c8506f5f2667f079c19e2a22c980835004fac333322ff06077d67aa494bbc63acb0d57c8944a0dac21694f3e54c5f94ef20ed6ae6206c34
-EBUILD crack-0.4.4.ebuild 1097 BLAKE2B fc66cbb21c73c7601bc0b06f51395732ff4bd4972c4205538616612385f168361c9378b06bc05d17b6301caf4bd46f21bb68c45499ae87475661e86c62f1cffc SHA512 b6cd60463585a193f165f977439f241fe99f007ec2239c48467a999940213112f4e4e324db6311536f56f4412368f11f0b68cafa324ceb61b0e01f71d0a00fb1
+EBUILD crack-0.4.3-r2.ebuild 1050 BLAKE2B 8406da2d2e30471bce4caf53d77c34b9154cd935b2a3ce23d6ef9bded067fc03e7e11404843ff7b216c06fa2cfca801f311eaede86ec5c7604bdb46156bd93d7 SHA512 e97ebfbf3557a6f51af09bd026a77cddef73322622c258798ddd791eacb9e670ac768b0245c507b989e2436246045879eec1b0ebf6dfbd6f94ed3e7a565fbd6d
+EBUILD crack-0.4.4.ebuild 1086 BLAKE2B 0b20706353d62a3504e85731a109daae684c674b740f9d7755855ff2bbe29ee2b6a9c8fb799f9b5de7d1db7326a96e40dbdaa599f13a362827862b5ba6d81480 SHA512 5a506e1beb829a4f2effe3437fc5c678c4f0c1e4e452d24fa42b939d7be784767d687b25603645ac2cf8d9a439a69a62ede88b4f98487d59c844ecccceb77dfe
 MISC metadata.xml 342 BLAKE2B bf1bf4fa826a68ba0c2344619bd3a18ea9f3944f41ee9edda5b0cdebb46d8790a39dd6ef738f996a3c15672a1fe7242c55132eefaf719f21725d9b4372eb4f07 SHA512 2f890aec4b5c1bf8a31bd079d8e0b8e17242e262b7ba2619e5f791da25e2e7510a52086b4103ed257726d0a47e999dd22d0b3c60f8dc77c515f5fc61b122f2a8
diff --git a/dev-ruby/crack/crack-0.4.3-r2.ebuild b/dev-ruby/crack/crack-0.4.3-r2.ebuild
index 3f2a521d18cf..23441eda7a0a 100644
--- a/dev-ruby/crack/crack-0.4.3-r2.ebuild
+++ b/dev-ruby/crack/crack-0.4.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/jnunemaker/crack"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/crack/crack-0.4.4.ebuild b/dev-ruby/crack/crack-0.4.4.ebuild
index ed7b46961a5e..2dc0b364ec52 100644
--- a/dev-ruby/crack/crack-0.4.4.ebuild
+++ b/dev-ruby/crack/crack-0.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/jnunemaker/crack/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/crass/Manifest b/dev-ruby/crass/Manifest
index eee329c827a8..5c1d2a2dd47d 100644
--- a/dev-ruby/crass/Manifest
+++ b/dev-ruby/crass/Manifest
@@ -1,3 +1,3 @@
 DIST crass-1.0.6.tar.gz 89443 BLAKE2B 2721cc6f5419a36c122c63c59804da84791e70d522ee01ff2ff06fed67a74ab187d0b601cd85e031fd33a84315fbc4cd092c14de110053c94ff0e50d4feab5fc SHA512 de98dea48d0cff148b3000d7388256552d1bf5a014ecbc074efc909473bc6edf2cf1db36179aaa4284eb810618dafc346757ac61708c9659045e013e6c6d4e36
-EBUILD crass-1.0.6.ebuild 854 BLAKE2B d653551eebe92f5bd8b1b82458b6ab9f4d9decb60e78d9a50bf5a1bc81e15b25438ff0cc11df03d2b85de344f60f918f03dc6dd45330bfbcd4f182981f5842aa SHA512 318c9cd1880ffa2faa84cb232355f82c3b49b9b9df9d775ef7efdcd2c712c4c39727f1c6ed4249601e683e6edf5b22715c4e09d5e12eac6f78f66388282c3643
+EBUILD crass-1.0.6.ebuild 843 BLAKE2B f0b71d7c607db1f1eb69fba523e6b06c251580dc67ce3e2bd8530cafd83ec92f49e1354cb3281da75cf6e4a37be428eceb5457eec3710bfa42419e22a59ce756 SHA512 7de01dfac4eb3f03e3a48d5b9a8d9111d9c11db5db304f6739e53bfc0bba7d2e55991954752d2dd809838e966e16c69561cb132c571db1bc58d06123a515e6ad
 MISC metadata.xml 338 BLAKE2B 7c67c73b8424d0f83d98cbc7b2c8608ae80829f5f59029a143132b0669a44eefda849bc941a34b143e0dcb3625be05eebe02a4176c219525ee3fa151676766fa SHA512 fd48781e866b789fb7b938ccc47d70a6d84af2afd104aad532d12b81c9235c3fe00c44546d8724d2c98a3e7808b62adbcd50b065e795cc634ae4fcd0eb711247
diff --git a/dev-ruby/crass/crass-1.0.6.ebuild b/dev-ruby/crass/crass-1.0.6.ebuild
index c700c29b7c2e..9e5d9bca791d 100644
--- a/dev-ruby/crass/crass-1.0.6.ebuild
+++ b/dev-ruby/crass/crass-1.0.6.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 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
 
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rgrove/crass/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend ">=dev-ruby/minitest-5.0.8:5"
diff --git a/dev-ruby/cri/Manifest b/dev-ruby/cri/Manifest
index 7b9ec02a7a63..2203c804aacc 100644
--- a/dev-ruby/cri/Manifest
+++ b/dev-ruby/cri/Manifest
@@ -1,3 +1,5 @@
 DIST cri-2.15.10.gem 35328 BLAKE2B fe5618f86300381232f071e552020da6186e1908ded3703e645fc6067080a215cfff8d4f468f522ff801d6608cc7560379db2b18eaefb5509ed0db1eacb9342d SHA512 577ee6ba07f08d46e67420fb2e579647857207a2d88f1782545b28e6f26cd6b93d554c904e00af38d7f87eb0fd476c66552ec6b1469fa268faad1ff5d1ab8f15
+DIST cri-2.15.11.gem 35328 BLAKE2B 774ebbd74ccd8f328d15a65515ed6c350d6bd00c9b757912c37a01aa71b745a3443755b8b59e7a8e6ac07c67f21d69dc4f96f972850e011d7b72d639c471d636 SHA512 a16d35a5e83401dda4e50bbb8a52b8a192e2876a708c516445559599f1e7c007d2f943efc662f43226bfd177356272dc7802fc01c8fdca543d4146bc537cae82
 EBUILD cri-2.15.10.ebuild 714 BLAKE2B 20e3ef38ecd9e55d315a14e2b172865aa4bed0416643fbccff969903960e47f7753041183406bf1433cb020ba1f0dbda875d28aae49902a48b1fab200cb5f3ab SHA512 afdf3dde73d1daac144e75c6c7caf46646c91373bdc72e618e64bff1fd0e1408b580722b86b0b3b769af45e9f29fdade4dce43119cad42eee44797ca945d1dde
+EBUILD cri-2.15.11.ebuild 714 BLAKE2B cc18a0a0440238968c8ea414e71b0d6e06d7a734f392a7ab0d299d2b90c0b04bacfc927ca32099708994b8c410de9c71d4920b13d95fe35d738b6f55f87229ca SHA512 f75af6fac2b947f8f17e5850877121a8c709fe7c784545c33129a54eaee5dc3df36250d11d802f3f809b911850e9fdb22b0f862bbc8bd6eeadfc78b9d20e32cb
 MISC metadata.xml 321 BLAKE2B 2bbd02b4b0f33bb2e3942b93c9af104fcafe960a59b2f109935f5121c2476635f1a3efb9ac092f4f5e6138df0398ea0ca874ee62390d20f3620d442d3502d42d SHA512 8e90f3ffd2b30ff9557e4c11bb31655cbd65498191288c68191f2e5f6d7bbdab6f1c22935f8d45fa95673582d1d0bf776055c0242cee2da27c9d3e71e2851f72
diff --git a/dev-ruby/cri/cri-2.15.11.ebuild b/dev-ruby/cri/cri-2.15.11.ebuild
new file mode 100644
index 000000000000..30eead91442a
--- /dev/null
+++ b/dev-ruby/cri/cri-2.15.11.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cri is a library for building easy-to-use commandline tools"
+HOMEPAGE="https://rubygems.org/gems/cri"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	test? ( dev-ruby/yard dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -e '/coveralls/I s:^:#:' -i test/helper.rb || die
+	sed -i -e '/rubocop/ s:^:#:' \
+		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib -S rake test_unit || die
+}
diff --git a/dev-ruby/daemons/Manifest b/dev-ruby/daemons/Manifest
index 453807024f2a..8e72696ee2f9 100644
--- a/dev-ruby/daemons/Manifest
+++ b/dev-ruby/daemons/Manifest
@@ -1,3 +1,3 @@
 DIST daemons-1.3.1.tar.gz 28805 BLAKE2B 4ddb9cb9a5a6de5ebeac8ac69c2712500f9dd18c9d194efce3152735533a2aef7a4cf0e034e4c1781e5d89c1be18e7e7c119455bafb0bf4d8cec279b1e8f6308 SHA512 ceeeefbf44727a1ee43b651bbc3f8e5ae83c73388d017d240d95624586b91a3b32602464f4a5ff53a854d6cc6fa1dc47e433a665f0ad7f08e440c0a798743d80
-EBUILD daemons-1.3.1.ebuild 826 BLAKE2B c3e46951d9aa0997aeb86b7c52e0b643e5d80f4bc5d137f6c542efe1d963996b3ff4d9300769df64a5bbd0a4b6fcfcd1e9b9cf53cfb6528b9a0b1f8b422596dc SHA512 c005a4d5766eb526d8ac13e139dedca3c9c2bfad2147111f4c8ce4e444fcf3e7d6e69a5ddce0b3801ef6f1342bc5fb0c98da14508027cc92c950b1b5c78d6681
+EBUILD daemons-1.3.1.ebuild 815 BLAKE2B 3498d3d79c05cd822dbcbc21451c87a3ac6ab3d55624caca7aeddb8de56e3f6f0ad003c6eb9dd53e433e1502774ced592c8e4ff71b91dfdfa0bfaedcf9725f3e SHA512 e1de60088d4e7f399aa55b6ee3f53197e3937743e04dd3178fe6bfdb3315a1736b73c0823b6c435f0a5185d450780d2a4de40c90196021515799367b56a0bc66
 MISC metadata.xml 345 BLAKE2B 7e783ce974aa702ba94e5d1d1b17646297e1db1c51d4dad02408e678092afb21647d8a21f0beca7d8e03f4c5271e3f63f643e3d113bd1d89ca927110b9d447f6 SHA512 c6e30f1117d3ebc21e91cf49a6e4952f3cadef673c1a624f9b5cdd4bcf036f1a4d25120799ff72896b2bd38386fe251e72b27028e2a31551716f21bc90217cec
diff --git a/dev-ruby/daemons/daemons-1.3.1.ebuild b/dev-ruby/daemons/daemons-1.3.1.ebuild
index 95e896b457a8..2232851699f9 100644
--- a/dev-ruby/daemons/daemons-1.3.1.ebuild
+++ b/dev-ruby/daemons/daemons-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="examples"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/ddplugin/Manifest b/dev-ruby/ddplugin/Manifest
index ca50732cfdf0..b81e3452932a 100644
--- a/dev-ruby/ddplugin/Manifest
+++ b/dev-ruby/ddplugin/Manifest
@@ -1,3 +1,5 @@
 DIST ddplugin-1.0.2.gem 9728 BLAKE2B eded641a734d4c7182184b9b9cf4a6007b33b25ffde97e1c9efea71d425ee034693e05b8f569d8e9be29f4a315d5306d8a3180b19e835157d49d9d1c82f0d436 SHA512 bc36cd7e5490e3748e65994dc1e2b1cff9aeefcd0b44ad547368491c83509baf2934cc38f9db4035069394b8c2fa9bbea6b35cf96b80ac4126df348e49a93420
+DIST ddplugin-1.0.3.gem 9728 BLAKE2B 8d287a558fe2716c394f96f92824c8b843fbdcb77b5052b8bb4699013222ef0e57c273348007dc61cde4281978570b115551ce51a71077b53f0cc8d7ebda5ea9 SHA512 eef88b52f78f379b6f083da3a6090d9430756e3a9d526202785e6d36121bc4fc3e42238db8146dd4d4a9ede1f5caf5bac047731ed5c1012d637b2723cccfcd00
 EBUILD ddplugin-1.0.2.ebuild 586 BLAKE2B 197dc9c5f82f4038be50225daea996753da7c782536f1a65516faf8ab7ec030b34fcc884c733adc2652d0f3ac6798b47aaa3088d9c0877961892005a0d4f9855 SHA512 fa73862ab24b5922168f954271c685651cb9cc9911c38ba4d45bb200ad1139e3dc0542c6d509d15fb02ebac7c028f4059937041b82aadd3be42b9b6dfe6f882e
+EBUILD ddplugin-1.0.3.ebuild 555 BLAKE2B a9c7a397dcd79fde3d6e28298dcc7562a99a819531657526a4e39d0ea3a228958598a6b4787c5613f2d5295a643f5016019dd96e241bc004adf996fadeed63df SHA512 103c7048698f5ed8dbc439aca1674d676067e5ba028d138cd604b128a5cd3e895d0fc49a3fbeebc3ee79b8cccd9df96cb6fcd4c777ae1867c81ca39ca4e4f5dd
 MISC metadata.xml 343 BLAKE2B 746f50a23d4f0d6bb51139641b0170f42f0317ced63c8aafbcd0792a7e2bb52c16980087602df8ba56921465e045b42681f15e80193c6abfe3f2ab4f6a6367d2 SHA512 14ce3a5ff346c7da07c1d5c4eb91b7a02ad8b77c97921c40ec29cf7ef48e365c6c1c6265164658498ec07ab5a4ab84eb06930d4db0d4af0a40a50f258993f1b3
diff --git a/dev-ruby/ddplugin/ddplugin-1.0.3.ebuild b/dev-ruby/ddplugin/ddplugin-1.0.3.ebuild
new file mode 100644
index 000000000000..346b92612bd9
--- /dev/null
+++ b/dev-ruby/ddplugin/ddplugin-1.0.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides plugin management for Ruby projects"
+HOMEPAGE="https://github.com/ddfreyne/ddplugin/"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/coverall/I s:^:#:' test/helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/did_you_mean/Manifest b/dev-ruby/did_you_mean/Manifest
index 9088710e2b52..6363d265653a 100644
--- a/dev-ruby/did_you_mean/Manifest
+++ b/dev-ruby/did_you_mean/Manifest
@@ -2,8 +2,8 @@ DIST did_you_mean-1.2.1.gem 20992 BLAKE2B e8827b3f6797145c1adf5fae2a681ad8f437c1
 DIST did_you_mean-1.3.1.gem 24576 BLAKE2B 939dc676dd7ba5dc4b64e5796b59e2901b36e5b9e1d4ccdd8809fdd008a82377c6bbd35b8677fa273c2196615ad3b7a09cd3bb57267ba2dd9216f13cd0599aa2 SHA512 14e672540a93bcf89fb41e27cca31190f9c621c5fb669256a26ccd6c1042437a69911b7ee886305b23fa94fcd0979188b423cad88f87b0adbf6c9437ecffc84c
 DIST did_you_mean-1.4.0.gem 33792 BLAKE2B 9052b7ba7028f963595eeb79e668296b48db8659bd07c6e00076efc372f6c64eb3ad81981013bf0ae3c37b942a459146af96fa001ba225ebf1f5486d717a7a55 SHA512 bd8e47e5d0135807d1ec0a5dbf536649cbaca13fd056cefc6f57293b7869608ef92a8cdcbaf4a4c4453738ecbe8a6d8bc450826a8dadb46fc69560ed05a97f2d
 DIST did_you_mean-1.5.0.gem 34304 BLAKE2B deefea833d1fe12733a6b1422e5ae43d0cfa7ff7ddc49665762a83866634ccd0a440e5a3b351cff6d9d308e85de0490d56d7b675d582f090e0e4fb07186c197f SHA512 7fa4cce3fb895bf026788bb5d558f88d4ddb62b7cae1e284969dc4f0570e88871d5f103514da2c9d79399dcf10ffc845a594afc9c676e90cbca4d5a38d74d7f8
-EBUILD did_you_mean-1.2.1.ebuild 664 BLAKE2B 121c4009b2900b0e5238afd321dccc6a175c86ea341dd91f7fbad7cb754468ce1c216b524f3a79ad32a930c1c9c9e667d3912963099936a8c066d877462af68e SHA512 ec1562b01d8c556fa535db0c4beeb381cd9ca8c92c2be5b29be83e8c8bdaf71cd8d737bd174b8acb3592459f766938edd54589de6ecbb00b2945c367c02410b8
-EBUILD did_you_mean-1.3.1.ebuild 673 BLAKE2B 1d6a7b78401a5b16b6854ddc2e0dce5050c3421b1c6b91ae5ffa44621258fc20426e1e4be6fcb0a7afd9e88d971edb5c56eb1576e52163ca8bbcb62428b91720 SHA512 e159c56c9f3e6b3892f214a84ffda3504283bd40063f64e3bf7e1219f0deac79bb117a5287ffd1c37f9f97f28d7400258680e55d9a97009a90a9134add334409
-EBUILD did_you_mean-1.4.0.ebuild 688 BLAKE2B beb196945865195bde6978f1bd92ec5524e4cb4b49464804883255ab0957ab94cb98a7c8affad5f51c2d618172c217de408287872c1de9ed362440d099ec31b6 SHA512 a71d74011e989288f6c665067d1cbe1eded95d81228b95c0b502e62e1e9d86ad9d72cf2feec27ec5f4435ed5f08ac2cc47b0c77cfb4eaecf346759e2778e37a0
-EBUILD did_you_mean-1.5.0.ebuild 695 BLAKE2B b59fe7bbf897e9d62c2bad640edc7c06135577e6b3e022df50fd3823ffebc545f320e4ba88d29ea5909776118c43a6cbe20be603e494a23b7dab8bf6410cc173 SHA512 5af47535e19ab3662bdebba3c0ec2ffa552052b9a9cde15731750c18df77d2eb3c9bf61b4251c42bb853a26d523033e5d1bbb3025e4c918ca4fc4a8bda8ebb58
+EBUILD did_you_mean-1.2.1.ebuild 653 BLAKE2B 63fb15eb450551cfb3a9fd77dd4176bc1b4747317eb323256bd1789efae27475744377f7cfe50756dacf3b66d109abd98839c3aee803dc1f32993154c06ac53c SHA512 1ce7970a3408dc9fefc43596e33e0cbad075cffed793225da0df03033f6d90d94ee7b4ee2103a1860929baaf2fccfb6a7d01ce3b8d68304d7198e017f920bc43
+EBUILD did_you_mean-1.3.1.ebuild 662 BLAKE2B 3883bda20b269918ab5f29944edb3990515fa92d88d2f424cde835eedb2abef59351e964ca448e565379cda95537ad5487a533cf5cd5c03f86878a1e9ef83683 SHA512 92cc1be246c7b3bc39b59f51f209aa84d3578734cd34c7a2690294d3600de749f277a7730a1fcc345a26421aba131e7a70e7dcc36f02e4ff0d0b0aacb113e9e8
+EBUILD did_you_mean-1.4.0.ebuild 677 BLAKE2B b430e3179d9ce3de296396d9373aa5326fa7f580c4a83b00caba0f224a94bc8c0b965b19109cb8d2054ded5deef2c4f747643daa9d0ba1077b7422d9f6d7cd71 SHA512 3f40468d769a9006dce4aba8c0be7084358fba01dc4d148c8c5e112b3913049c0f92ce7953f586f688abc2dd138679c9ca676c9a4eb9b7aacb0cf6f94e630f78
+EBUILD did_you_mean-1.5.0.ebuild 684 BLAKE2B 7bf3abbf2a57e6cd52f5a33002a74d184fd1ec46c2fef3a6bc0fbc48cdac08b4844bea63ab39650e1356728d8efc50e0b4db0501f6eddf0f9e4712fef2ad4d30 SHA512 480c2613442787878fb0faab0fb465c51a162ca075c092b55b494c729de658e3ada4b73ba168b30cc98f1bafb856d9c20c4bd4f9c43e1eaa1d07ccc7d7b25612
 MISC metadata.xml 345 BLAKE2B b3764e5648286cb66e03f3343a41b460ea2bb24f51e1c25e89e386c2b16769c9b1f88888b1e10b2c2d0a2346659195454e4ee8262aec0d4a9066795759cad053 SHA512 418114238e3e2db16ebcdd3de5213b3bc0f0a45ed719de1be60cb19015966cf39912f38d0858e22aa6330ac2e7fb58a1452e9623e7559c26161d70e0f29e66cb
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild
index 1ece0d0efea2..30d3f3b3ac88 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
 
 LICENSE="MIT"
 SLOT="2.5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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=""
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit )"
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild
index 35befc717427..0abd9bcee663 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild
index c7913abf6a0b..ade85b16e6cf 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
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 7a66081868dc..054e887df99f 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
diff --git a/dev-ruby/diff-lcs/Manifest b/dev-ruby/diff-lcs/Manifest
index 3d21ee12e8d9..18f97d244fec 100644
--- a/dev-ruby/diff-lcs/Manifest
+++ b/dev-ruby/diff-lcs/Manifest
@@ -2,8 +2,8 @@ DIST diff-lcs-1.3.gem 46080 BLAKE2B 907536d75c34de86ef28fa044ae785d8ba34c8d1f4d3
 DIST diff-lcs-1.4.1.gem 48128 BLAKE2B edd92f00b858c716787974772858f65d98b1a07ea4e8697eed190d09e2cead7b3f2518ee96521b0cda1cd4b938365705cf969ef2d8cf1333ff843202ea2b6c90 SHA512 d084ee628caafe4b61e66142d57e25dd2c8e9423a5d0d042911a4816ce391528f03ea2c6226d29c953a83e6642d0c3328ea5a22216011f112f64030c6808a7bc
 DIST diff-lcs-1.4.4.gem 50688 BLAKE2B 0b72890b147696425120f2dc71f8d741d993411bd8e76d130d3c12e3b4f451b0812a3cd34b09e653ec7024c616d7ffb4bd1c40303b66ca4a13e26c397d5913b6 SHA512 fcc6c86f392697c4b3690827f7c20d50fe68e367626b85a56446356d7bb21b4020bdb2bc5c2faf4e82807cd9f3049d71c94d166c85a1a4231f0fd9fc032f41c7
 DIST diff-lcs-1.4.gem 48128 BLAKE2B 6ec3259dc366769c4008c6ea6c7e5f1fe75350dc0318c8d45991bb8173274630b3be734fe6375dbb131620d8124faa7c0567e57d299393c3165b0e1c2d29c138 SHA512 a352fdfb89587b38f3e518f76dddd048530501080dba5abb0c37033f44bee65bca12550ea7d6f1edb8a719092538c20d1c58dfe7a6f67ba1d46549608c09feae
-EBUILD diff-lcs-1.3.ebuild 640 BLAKE2B 23662fbd97b47470e9cdaf719107dd9a7ba7a61446b690d41c9e0b951a201f707c4d7236a9d011f677f7f26d6ab2a5b50fbd38d23ee1238e4e4d4c6a0894ddda SHA512 828f45a8adddffb6cd45e496f9fa49eaa360dbf78826c1a2232d61398c957dc4cd84f1b2373c6adbb2a4e759cd78cfe8cef2cb361fd5e5b92a77b80879c90e6b
-EBUILD diff-lcs-1.4.1.ebuild 610 BLAKE2B 11a886ef458a5df3fb76d4c506caae4c0232eaf3509e2006b26e743189ef437a49ecb9949c57dd4d3a3e48c530402468c9daa2a74120ca00311e978e91aba62b SHA512 4078c3811e8dd2d20791c13e3f9cb6f3a58a1ad77c2af59e61e09377e059264e8103554af1e6f4e4797c2dd5075559cdd20bd578e0d3ceee5574ee1a3e610c80
-EBUILD diff-lcs-1.4.4.ebuild 752 BLAKE2B 42f3e9f4606b029229f8e349bf07e2d29848dbea7125b0598e3318c03b29220d87aef06482e49aed7ed286b45b07722422fd2c5c831a8e046b2ed1e8b151adc1 SHA512 b917559d2c9d5ae0d51dbcd4f0a274a89b61e4ecad265eff8bf254dc48c2bc2399696f8a35c30f94ea414e75a2fa9b3c4913cde94f4b52f762019facf10c336f
-EBUILD diff-lcs-1.4.ebuild 610 BLAKE2B 11a886ef458a5df3fb76d4c506caae4c0232eaf3509e2006b26e743189ef437a49ecb9949c57dd4d3a3e48c530402468c9daa2a74120ca00311e978e91aba62b SHA512 4078c3811e8dd2d20791c13e3f9cb6f3a58a1ad77c2af59e61e09377e059264e8103554af1e6f4e4797c2dd5075559cdd20bd578e0d3ceee5574ee1a3e610c80
+EBUILD diff-lcs-1.3.ebuild 629 BLAKE2B ffffd2f50fa7e45268cbae7ed4fad756d590fd652ab72c7ed68f975f22876fe3d1ff8dd2c2bdd47901432515331beea776fdb4170fa7837446a21acf6dddf417 SHA512 7f04ac6d24b441f5f97ad2df70d72d8064031ccc4cba7098426c6b6a994161b6fad777cc76e18a2c6ec9616995b56fd7b689f6022dcc64755369b7ad98d8f114
+EBUILD diff-lcs-1.4.1.ebuild 599 BLAKE2B dc7bb6ac8d252e4b7bdf7f131043041453b9e646ce046ff222fdf013477449e2ad48ac8b8ca6e21f7560f66ff484c365ba60eb9540ca059720bf3d8bfedba911 SHA512 73b53e115fe37da479352dc3a55ec15c569866b518d735f23e8341703c47bc97b0e5436800fb7713d51ce34bdd0684a8f29f11737e1747a00e08cadd5259682a
+EBUILD diff-lcs-1.4.4.ebuild 741 BLAKE2B 878077464ff70360291cb8d6b4d247941b670a00b0b12c0bca2aa019102718c88c5b4d30edd0685ef6f722c1ac4750d1dff668c9c3f01f695c2bb99af46ca43b SHA512 5a7e0f0db85ec2ec60fd1e82e5ee458820b185b2258e2d20f0fccdeff3e0dd331949dc0f56eeaad84b68970629fe8bafecab932dc4f9a714a4c98b471d818f03
+EBUILD diff-lcs-1.4.ebuild 599 BLAKE2B dc7bb6ac8d252e4b7bdf7f131043041453b9e646ce046ff222fdf013477449e2ad48ac8b8ca6e21f7560f66ff484c365ba60eb9540ca059720bf3d8bfedba911 SHA512 73b53e115fe37da479352dc3a55ec15c569866b518d735f23e8341703c47bc97b0e5436800fb7713d51ce34bdd0684a8f29f11737e1747a00e08cadd5259682a
 MISC metadata.xml 345 BLAKE2B 99a21f71cd3b7984131e3b43a14297bdfa3cb4238833deade649c4afb880ce6fca1bf4c3dfbd2fc75f68f42d5b7fcf97b1cc85a416da75490266a8bd57a36846 SHA512 b96c7243c3d4a6a3fb41e63d8dae54dc233e20b98698636d6d7f30f2c00bae3af9a01df68fa9c38aa0baa0b1bb3c267775dd8a5db539db3d8b46c497e85e860b
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
index c1fc0bb0eef7..d419417e5c06 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/halostatue/diff-lcs"
 
 LICENSE="|| ( MIT Ruby GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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=""
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.4.1.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.4.1.ebuild
index 83d94225b6f1..6a5e46f77c88 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.4.1.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/halostatue/diff-lcs"
 
 LICENSE="|| ( MIT Ruby GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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=""
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.4.4.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.4.4.ebuild
index febdfbd54d42..da866ec09d79 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.4.4.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/halostatue/diff-lcs"
 
 LICENSE="|| ( MIT Ruby GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.4.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.4.ebuild
index 83d94225b6f1..6a5e46f77c88 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.4.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/halostatue/diff-lcs"
 
 LICENSE="|| ( MIT Ruby GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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=""
diff --git a/dev-ruby/domain_name/Manifest b/dev-ruby/domain_name/Manifest
index 61f413a7b047..4578ba26f1cc 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 1096 BLAKE2B 424ceca130f51b3bd91f49e9b2c17fa95da5e3045d8327db0cf31759b43f1d2165f6af5c733e9fee7415b673e11956dd6f8beab87583a2c12f419a2e1d9a9396 SHA512 2c8119dc8a99ee828400f7e6581526365b5dd52a8bb4f3dbff70c8a00e1c763dea4bff91f8a5e27911864f821bba510e11b280cf652710ebda73a9bd50e1c6ce
-EBUILD domain_name-0.5.20190701.ebuild 1094 BLAKE2B 4b2670b60aae9b4f833af9ae5b7b07cf904f05d7fca2ef21707676d354e21d2ef4656b5f50e560074b9de27bba329de75b6db96df6854db49ec110ac91badc5c SHA512 20667df28183d622e37b9e728ef8d1a44d2d508161188cf1effc9774fac43225c259a8c48486032fda3c19fdea408d08ffa23deb7b8b4be2ac49599eea710044
+EBUILD domain_name-0.5.20180417.ebuild 1085 BLAKE2B 833a8ffa75628ed055bccdcd1a554c1f1157f22014ca87d788051970c59d3c45ab82869bd6d5f7b94a30ac19b7ba719afcdcf11df13f64e0b2282713e8ffc391 SHA512 87517d67c3a616102f14417c80c0a9a59f00a6694397c020526f13dbf9f0d7009486bc4aea224bcdb80c7c85974f94728b75a41efac708ac5ddfbeb63b5057a2
+EBUILD domain_name-0.5.20190701.ebuild 1083 BLAKE2B d580417335fe5a558bcd352e72f6625579332c3c5e52a861c781e3ec776f1333142c7c47c57656888a4cc760c8600fcd8af46007a456db578526297c2222307d SHA512 3cfe358b1e6021fdffcd6c7c86baeaa398978ae518b29e5eb8d78cf56cab7821bf1fe12f6c463911d2d89ec588dfbd88f03af0e351fc0dc9916890edc5a0fc68
 MISC metadata.xml 346 BLAKE2B e97527fee7fa9d73d77ef7a9e9325c9017fff3a9912fc76c74b76f5c4cf53aac583157ff02ccd5a969882829c1ffc4f35d44cb739497050a59402f88b06de2e5 SHA512 f9b3df47565a7827242a16355e01c450977cc12b7c0cf091590b1f642f5c941e2e3f4f14af66fe2975ffa6f7d53c3385ae2a87ffa666c1c1b7f7356f07c94830
diff --git a/dev-ruby/domain_name/domain_name-0.5.20180417.ebuild b/dev-ruby/domain_name/domain_name-0.5.20180417.ebuild
index 09b7f69a9a01..fdb281a7459f 100644
--- a/dev-ruby/domain_name/domain_name-0.5.20180417.ebuild
+++ b/dev-ruby/domain_name/domain_name-0.5.20180417.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -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-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/domain_name/domain_name-0.5.20190701.ebuild b/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
index 628cf705fc41..2ff60031a44c 100644
--- a/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
+++ b/dev-ruby/domain_name/domain_name-0.5.20190701.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/knu/ruby-domain_name"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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/dotenv/Manifest b/dev-ruby/dotenv/Manifest
index ffd8bcebdf9c..a02d6a66db1c 100644
--- a/dev-ruby/dotenv/Manifest
+++ b/dev-ruby/dotenv/Manifest
@@ -1,3 +1,3 @@
 DIST dotenv-2.7.6.tar.gz 20343 BLAKE2B 5e6eff69a63bd9b6b6fbaa8b07ac3a3b846d8bcc39ac67dcf3bc1a9e152afe8809db1ecb55706de3fa3232e423c02d116c248925d78095b6c1d85af4289e69d2 SHA512 df017be0732d43039497b95aeffc303d9141196862270dc907181a77217cc3c525ffce5a52c7047eb51d69a37cdf51f3f2dfbdceb792c14d352f9416c50891c3
-EBUILD dotenv-2.7.6.ebuild 969 BLAKE2B 16a09327388e53706f454dcc928aaec369616e7ad0478d56bc5c3293489dbe6e19ac2ad3d5c47d58550e27f8db2a7b30a86cdbe9ba8415fb91470b6fb3e680b0 SHA512 648070a45debf724bba7f4bc4496bca3ca7d6522cde7a96b0a9f9cf787b6d16b32f2acfe68ef8453c3650386c360c06f575ff7a4647ac47fd7bd5ba8bd81c74a
+EBUILD dotenv-2.7.6.ebuild 958 BLAKE2B 841b75d7c1be98fb82f84d526d8b1ffbd0b507b90e7b33582b953c1cd9e889a427156edbcf8577d28d0d50da27712c80984d6aff4b547155122bc7b13a5b4847 SHA512 f2da020602f79aad8f4d5ffd464c89e92a42969b8c5fcd534c1a1246e171b33b5511cf903f0cbb39c7fdda86bd8fc3ca867ebe39c3a0b834800312d7362170aa
 MISC metadata.xml 341 BLAKE2B 4cc2ed329e48853a5939f5f7e41d2b6544d3d7d967563da065633826c3fb9d999815e8604fe4a897606f4ffe7be53f3e87c925120961050ce77f1fa573847f5a SHA512 72e21e93099953f1946b486fa8acdbd0b85ed139ef34d4ad9c7e3e89e2924ec598a662f72210d52efdb4cc2ed676962fc6d50c560b4b9c8a4ec849d75d5be2dc
diff --git a/dev-ruby/dotenv/dotenv-2.7.6.ebuild b/dev-ruby/dotenv/dotenv-2.7.6.ebuild
index e1d49acb0480..31eb7242b75a 100644
--- a/dev-ruby/dotenv/dotenv-2.7.6.ebuild
+++ b/dev-ruby/dotenv/dotenv-2.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/bkeepers/dotenv"
 SRC_URI="https://github.com/bkeepers/dotenv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="2"
 IUSE=""
 
diff --git a/dev-ruby/em-websocket/Manifest b/dev-ruby/em-websocket/Manifest
index 8b9b4254eb7b..bcae6789fa54 100644
--- a/dev-ruby/em-websocket/Manifest
+++ b/dev-ruby/em-websocket/Manifest
@@ -1,5 +1,5 @@
 DIST em-websocket-0.5.1.tar.gz 27792 BLAKE2B 5aa8b9b9a1bf7066086c3115358a01054dbd24c3b9e7b454210c653aa25face2230e5504e0fc3a13d4770bcfcdf5d792c1914f173ec8d83d1b97ee7c169636af SHA512 ca2b4e2e4be663a5932fe63ed0efab169fbee9aec50f9780c1ee5df0efa300acb58410b97a22d5d10a2cb9195c2a68f6c71bf4e070ee6d915c6abf4015aa5d94
 DIST em-websocket-0.5.2.tar.gz 29367 BLAKE2B 91d41044e20f1f8277527205e3ee6671de2a1fb9b433c18d5b48a166c7cfa53c6553e32b726326f126981f0e014625075bc918b71e00bd8a6919670c370b6cab SHA512 46df705e2af93082884c7ca521df4f6cf33309c441eb3ba96be609b2cf280e3b72c689810d55279db6dbbc178ed843d64ccdaf9d4b39d52ddac7d84956065b06
-EBUILD em-websocket-0.5.1.ebuild 1230 BLAKE2B 4156b5637f5d5253ce6bdf4f8c45439991d7239d46b181cf7c4227bf2b09968fa78717d8fd675bd6091444bae1a192f373bceed373d166a08d7f4b037d277a7e SHA512 478682fbba3d3f26687d705ff8c11ffdab0b90b6be3014f48aa85929661fb035d46f3d486e231394535ff809a250880f1b31c24dffac5a4772842855ee940b50
-EBUILD em-websocket-0.5.2.ebuild 1154 BLAKE2B 9728f32e0d54df840bf364307e29365ece1f35d8881199186e97ee9a62a841d84ac048618ddab0af75268977df185f267c7d96f1fb5190e180b422829b98b47b SHA512 4819be816f69817390b05c4041a110500f82f518b6c77eed7641555aced63fe78c15e5d534137673e56ddd72ac8f671712eb4c6bc50c382b45c907071d407b65
+EBUILD em-websocket-0.5.1.ebuild 1219 BLAKE2B b8464ae42fd32e389bbcf0eba7ad9a05e282e59539476ca929b7c1aae714c8a9b8df1401f886901a70ad4c58789204f2bddee37bf195b739c9d97592f37995db SHA512 cd2221aa8529d213f468ccd028ae6417e0b36a7df8e6b4814296f91b4f0c62f20d6edc962ba5f82ab3085e91c83ebd3c2143e6d9f1a09755f004e893c052e6cf
+EBUILD em-websocket-0.5.2.ebuild 1143 BLAKE2B 634717168adfcc2fa53f2a009cfdd8982d585b1eb64505ce972e38be87faa7af0617af624910ed1a2f2c65e06a119d93c8f22cc39ca4d55dce9ac973bbe9b5f2 SHA512 ead1b15f00bff35b981e1ffbe29edef22bade03fe782f0317fa91ccff0c4aedd467bf3de1817f2ce0954193c359f54d181d830fed858743c9823472857e81ee2
 MISC metadata.xml 458 BLAKE2B 59015f88eb8e2a4d6d538febe271bc6c9cd6849db0f9a8a11125f6efe9ee15c437603d498412aa23e16f506fa44317314762cf9b4302d938c4bb3913a9e4418d SHA512 ea01b58e2eb6ab8a23418be9140c28f8849382014a12b6aa3910d12a6614361b63d2fdbd31b6c099df38c4223dab330425885af6943ce87b4fecf4edc13b7b68
diff --git a/dev-ruby/em-websocket/em-websocket-0.5.1.ebuild b/dev-ruby/em-websocket/em-websocket-0.5.1.ebuild
index 5cac22098d1f..512289f84e58 100644
--- a/dev-ruby/em-websocket/em-websocket-0.5.1.ebuild
+++ b/dev-ruby/em-websocket/em-websocket-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/igrigorik/em-websocket/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/em-websocket/em-websocket-0.5.2.ebuild b/dev-ruby/em-websocket/em-websocket-0.5.2.ebuild
index b5c36614b5ba..eb230e2b9e03 100644
--- a/dev-ruby/em-websocket/em-websocket-0.5.2.ebuild
+++ b/dev-ruby/em-websocket/em-websocket-0.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/igrigorik/em-websocket/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/erubis/Manifest b/dev-ruby/erubis/Manifest
index 0aee5ce493af..822aef1deaf7 100644
--- a/dev-ruby/erubis/Manifest
+++ b/dev-ruby/erubis/Manifest
@@ -1,3 +1,3 @@
 DIST erubis-2.7.0.gem 173056 BLAKE2B b1059469b5d75dd71be32eabfae0f1715dca11b9c5eb79499a5a8835a4db44e8c2163386af1e4ef9cab8cecf4ae6f2eb57b5105d53d56e5784b06d65398b22fb SHA512 49b08b28656acaf3b0c88fe064bb0d5f79fd08b834d7eba9294217b0893c5a0244ac5dd54de0e52dd17e828a0110e54b29e8c2d75171d527da957917344a0f27
-EBUILD erubis-2.7.0-r2.ebuild 1104 BLAKE2B 892eb1734f4045dab3addcdc94384db9d40633d355c7ce153ef9d5d51b9115a56f7aeabe64e526d5010e75629ee0dfcee32695013f37ce2ea5a78761ac2fd3b9 SHA512 83c570210dc4b11c1ec35c8045f69b035c2e01f2246e17fdbadac31eb8be8f6f9ced15c690eec9d32f27eb2bce817450b57ebee27f14a62e2769571242935edd
+EBUILD erubis-2.7.0-r2.ebuild 1093 BLAKE2B 987a269b2a58579ff5e3b939559c5ccf30e25fc117c219576730454d428510d118335c727bb92180b1b7a43ea26d529d27543ccccfa4729a2b1bc70511bfcac4 SHA512 4e8e796e311b5654f3e5736d6bdb4bd4e2695be5d1dae1290c950953e466de8b0e234001d00b1e49b1aeae13fbe5ccaedc1a7ff76f281bd0390b0eb05f1da91d
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/erubis/erubis-2.7.0-r2.ebuild b/dev-ruby/erubis/erubis-2.7.0-r2.ebuild
index 6470fa4b83f5..5b0a70c6991d 100644
--- a/dev-ruby/erubis/erubis-2.7.0-r2.ebuild
+++ b/dev-ruby/erubis/erubis-2.7.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.kuwata-lab.com/erubis/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # http://rubyforge.org/tracker/index.php?func=detail&aid=29484&group_id=1320&atid=5201
diff --git a/dev-ruby/eventmachine/Manifest b/dev-ruby/eventmachine/Manifest
index a77af8ae75c1..ec8f3940a3d8 100644
--- a/dev-ruby/eventmachine/Manifest
+++ b/dev-ruby/eventmachine/Manifest
@@ -1,3 +1,3 @@
 DIST eventmachine-1.2.7.tar.gz 246402 BLAKE2B 3eee1e5fbb367c03e3d801cb705a0f95b7bbb461885f04820f57421019a3d61eecabe71309981eec35168395eb6d98a8c675bd0fb225497de511f2ce09a5df92 SHA512 768ec084903dce4c737cf564fce7886a3e7e5b7d4a89c2baea3e998130c53dc00488eaa2d8e9b0133d9e4d8fffbde80c3025403881486a7968c2d84425cc1f50
-EBUILD eventmachine-1.2.7.ebuild 2765 BLAKE2B 3c13a8072a1862743d70ed0ab5369b46d7ad0c38edfc2726ce40e676fc5114d849cdf7b97b17d533c0d39e0f181ae4e5c9ab557740a7b8a572c97e8456eb1abc SHA512 4d74459326629e41ac033bdadf0d0e509090e85142d2d2d36c05f9829b7f143774559feea526daec5b782223c4ba6e6373f683c3fd619fc93b1f219edfe8165c
+EBUILD eventmachine-1.2.7.ebuild 2754 BLAKE2B a8ef570a87eabdbad6e6e37fe8c3e0cfb02d62160ea63a34a58f4946541d21ed3f8e2f17d7edb82606fbaa061c94ee1b84001ac32d7202badb266bdf179fff0c SHA512 677e9af923a52d249430b99e3076c410864a6d9ccf13fab329ca6c5a046d9218f92dac9b8725dc34c84145d8b697e8521c8bef77e6cfb407dbec1acd467ddb7e
 MISC metadata.xml 523 BLAKE2B c8c4dc99c1560b2dc7233a194f0892bf86397594daf3896408d080632dda52cae3fef16654e2a35340bc0746befab669071ff9de7707fcbd92583472aa52f73d SHA512 622ac8cdd832ad49db828fefc3c9ab089e1d7e3795e369778591b4f572a647a99d4625fb9a3624189d0521a8daa9d2360bfe01fd905e8d106b83e244d900e509
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild
index 0f254082e774..4a7c7d6f2927 100644
--- a/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild
+++ b/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eventmachine/eventmachine/archive/v${PV}.tar.gz -> $
 
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="${DEPEND}
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index a894e4a51906..6afef6444a2b 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -3,9 +3,9 @@ DIST fakefs-0.20.1.tar.gz 53626 BLAKE2B 013f49b57355943eb6624540be93bc069c95409f
 DIST fakefs-1.2.1.tar.gz 54106 BLAKE2B bd1128871a36dcf8f0137c9ee13c581cddf2ace5a2959e863c66e52dc5b682c75e0f4507c7d939f6725bc1b5a8446e1747d188b98b1cf557c0d1fccd1d3c7040 SHA512 e18d9c1c5ac444f2a9db362dac3c4563f27c4f9b6e6870960e85882ab28dadee53bd56f6933f6317d3128a5ad3862980fa9e2a72cbf7352c58c18a6cee68163f
 DIST fakefs-1.2.2.tar.gz 54072 BLAKE2B 6e1865377c6586fb409f6392b0313e750c1810b9479c120622757f711da55644e8224c8245ce0ac187c6d531a80ae54081add5572b5170f367fdf1d58b4df924 SHA512 4bd0995a1dca27a15da49962b0fddc1daf1e11f88767bcc36e57883ec62e4270d5d6873f52d64859301a5f186e467d368fbfbc0dcabfbfe24bfdff6b6a14389d
 DIST fakefs-1.2.3.tar.gz 54054 BLAKE2B ae8202b7f28d4d1b326e016d96382b7cfaf012fb842d63150bb09b6ddb5de96bb6d548635877d2d057137bbc23c46c30340ebae3641d70d7955f609bb4cc4af2 SHA512 5051a3b81ba5919cdb6cd4a92f4e6af6ed5140afb35247b1775f4602083e23f903c582e038596a3bb27ab3f69128ef3d9fc2635d015fdb23babf21ff200c4692
-EBUILD fakefs-0.19.2.ebuild 1080 BLAKE2B dcb69fe5ff3248f59f3559320e6f6762bc1967d770884ddadf9073f01bd30e383d4f372e4037628717d29f346ae39a78775aff09744683337074170a1d782267 SHA512 ad993b3f98acd2b23f22d29591f3f0c4bc82037e41183cf2990f970e946bc62785349557309a7ef9bd6e63f2c7917d740f335bd1f5da0fff582f7039c8d84d47
-EBUILD fakefs-0.20.1.ebuild 1085 BLAKE2B e0b78ba840658f360c172891347b2609b1ba90e86ef7c711b18c10e8457134e06f87fc5dc22eea79f2c102019ac983651e7ff6d9fe5d74bf3d6d1847eb5d480a SHA512 4dfd3003578b726f089453bf5f08ce514527b587668839f63ae7064e0e8c066a9d7bebcb220c1ab6d20324699c365d93d1dfdd5c11b069158c1d4e005915a1a8
-EBUILD fakefs-1.2.1.ebuild 1159 BLAKE2B b91494fc073529e5ac38d849163d6402cae6e04abb24b7036cd99e00a62def4aec8448e6ec7e1fe4d34133341a003c43e4b82e59f2d40ebe2331bab4116e44c9 SHA512 3e54ee363c15f2bad5f0af29d2f4cb234306613cf0704cbf16922a914ebfea4a0cf57bb45d577071f2973b416486a4e5d2a5bb2fbb569b10d536bc4c97699361
-EBUILD fakefs-1.2.2.ebuild 1161 BLAKE2B f8d0c357c77e4c3b7a9ac72393ad3018cc88de012364716312c4b681d8af009a4699ea75726491572003ea6ce89e4b241a50bf77c9165a446617924c76eaa117 SHA512 f5772ba4a82c9c9093960bad62120ec337632b4cf0eec9d62fea3963b5ba08f04f2e85b10f0b6a8eb8290e8912656a559a32ab6e615b19e54052532b662fa8fe
-EBUILD fakefs-1.2.3.ebuild 1154 BLAKE2B 681a9fe6a0465a1360cc463fb8796078ef6a68615782423db7448511d4f8c763043557d1b3cf4187f812ca97848519b0ea2551777900e06ee814f837278c8a22 SHA512 e21b9e2cb83a355a815f30f653926f1abbe6f6749ad95388c01229834e4cab33695c2486b6fee16388204dfa0dd15dcdd0ac8e3c4877c925ea938de3de3ba533
+EBUILD fakefs-0.19.2.ebuild 1069 BLAKE2B ebd1504e668ab82c0c84f22ea51eca60d010e4f8d1d2b1b12560e5db82542c543a8e035eee894bc8ad8eed968cde5f17a0c672c66dacf1bcf088d0f85bca6399 SHA512 45280ab604d730cca7cca32f5e48f2c88ef6b0756bef4140a7317d5e59efe665172a900688f780182112398d478564f143ce76840ed624b193e7b6824258488f
+EBUILD fakefs-0.20.1.ebuild 1074 BLAKE2B b4edb6cd64d7363d7ae54a0b5ee24b5a290b8c93938ade0462d898752380d0db4af8d0243f472249a5d13b8e46aa9ea62d369b1ce20359666b021a801dc71c46 SHA512 cf9fb6ba157dea8004bdb98fa89969e58703cbf55959c50d82e5eb376e065849ba743a571a73d029f8d4d31af71b868201272f20549606735b42478282158f42
+EBUILD fakefs-1.2.1.ebuild 1148 BLAKE2B dc492a7b2f37c5272d002190d7732a4e0e18be2881c58af4e1a6be2ac1917d73a76044e9d041574b1d019c56f2d8bbfeeda9c922b8c3ac4df6625804cb69adcc SHA512 fb046a13857ce521045449bc92c6da4c2dcc5970f66126cf6fbf27bf44f03a66186babab8dce2db3895290562ec5f3ebef221678dc6e666637c82a5f7db5baf6
+EBUILD fakefs-1.2.2.ebuild 1150 BLAKE2B 187f959209a8b79b4ead78dbafd2d94a09e91b62571e13ccc94e4b561a41ecc5f391e5916826e53f1f78ede3d3523c515af0bf86a5cd93987302ca72ff8d0226 SHA512 581c5562d53d6eef8d89d85f13a63882794ed47bb895982b4160acb814c2a998c5e7d7c1e524041b2f8deb23c5d62d2ed5c5341edec309fe9df15221731461a7
+EBUILD fakefs-1.2.3.ebuild 1143 BLAKE2B e1384a0e014b552e0f05f82055b8155312f52b8ce3a9fa7d8828da9472f6a764c2a22ed4a68cbeec96fa5d076d40f09ec8940de386b6bd45f52411fe3db6e749 SHA512 cfcb1924e15391681cb8f0425588ffd0b3ec2cf7ece1d3fd8ac90f8c6ea588c89d9f1895d326c10e8c078195b8e98bf9cd620e55a9ce9c1c209e1b0f4666e925
 MISC metadata.xml 340 BLAKE2B a31a62212f53154af4d3dce332d30eab8433785cdcb07531f743a5d48f3e7d9dc55580651cdcc765d4dcea5d27e78902624d475f8ae052efc6d9c2eea8b57d0e SHA512 1369c8941ac7aad5dd54222a870a5d173194c4f241093864b25abc1ca97e9f55d8fe928157c11ed63d2281352bbdbf6779cbc00abaac206fd024385ed5eb8478
diff --git a/dev-ruby/fakefs/fakefs-0.19.2.ebuild b/dev-ruby/fakefs/fakefs-0.19.2.ebuild
index 3ee244d8752d..4defcffd034f 100644
--- a/dev-ruby/fakefs/fakefs-0.19.2.ebuild
+++ b/dev-ruby/fakefs/fakefs-0.19.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/fakefs/fakefs-0.20.1.ebuild b/dev-ruby/fakefs/fakefs-0.20.1.ebuild
index 1d2ce9d1a64e..7c11d7213eb3 100644
--- a/dev-ruby/fakefs/fakefs-0.20.1.ebuild
+++ b/dev-ruby/fakefs/fakefs-0.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/fakefs/fakefs-1.2.1.ebuild b/dev-ruby/fakefs/fakefs-1.2.1.ebuild
index 889dc6930bc2..2d80ea9076e5 100644
--- a/dev-ruby/fakefs/fakefs-1.2.1.ebuild
+++ b/dev-ruby/fakefs/fakefs-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/fakefs/fakefs-1.2.2.ebuild b/dev-ruby/fakefs/fakefs-1.2.2.ebuild
index 15757bac85af..a8cd29a621a8 100644
--- a/dev-ruby/fakefs/fakefs-1.2.2.ebuild
+++ b/dev-ruby/fakefs/fakefs-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/fakefs/fakefs-1.2.3.ebuild b/dev-ruby/fakefs/fakefs-1.2.3.ebuild
index 16d45a8ca419..bbdc01afdbcf 100644
--- a/dev-ruby/fakefs/fakefs-1.2.3.ebuild
+++ b/dev-ruby/fakefs/fakefs-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index b4fc0ec4b3d4..fbf722234c16 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -1,7 +1,9 @@
 DIST faraday-0.17.3.tar.gz 76786 BLAKE2B 0706f4386233861564aa1ba5fb8da9ad374a0b553a3f6ccd4ce6509b690f6da3e9f695f90605e0e15b41b6354841943ecc4f5eb826638565687bf62b36f1f456 SHA512 346e93b5d980626a0c460d9010ca09091faf84a1a8f2717c16d345ddc51585ce45959d7fcf41fbd0ba248d38460939544945fa0e81bcb80ab73dfe080182e325
 DIST faraday-1.0.1.tar.gz 835557 BLAKE2B ea5c32f0a93bcc4c4a0a7c55d61578b4e9f0173caed484c0c6424201884b8e81304c0fe07e1c1d6ffdbff41be85bdb494904c2a3b3e19b6c89b58995d9fdbfe7 SHA512 6a2dfd751d013ddc7cb005e262b48120f9a6ae2bb50564082ed5c5e47cfe2b07ee91d7d1b6967813d39b9874c7d5c7daf65ac773dd7afdcae65ed38698b1f496
 DIST faraday-1.1.0.tar.gz 838062 BLAKE2B 6615992046fcd2dd77db8407f8f658f224f690ff36236182174f7aee89ef24ab7789f1711f97b691ac96a9137404362f62c8277e32a0970feca44441ce8da15a SHA512 22f4cd68d409afbb3523713223325a516ec8aa79591b816f8510ab7d3b1e31acefcc2252e8fd23aa99b4a5592c1604c0cc28423f55f1633c331554e3405b11f4
+DIST faraday-1.2.0.tar.gz 840216 BLAKE2B a52d2ddc2a57ba87b28e9143123985df12e118d6a8062b5272e77aa7807d7b2fd770408090c7e406631173eb276efcb973f96efdb17ab0f3ea684acda41b8d34 SHA512 7198e8954ec71bdbdfb58df52c6962ebe05599bf871fcb669f32ee2a5fb094b6934492396a92033e0fa858390f454f0d2daa41616f9e212f260080be016e1ea9
 EBUILD faraday-0.17.3.ebuild 1530 BLAKE2B ed407c60c9138dc038c019689cdf9c2e620082c58c65f6cf08fc8bd9e2aeb728aa804e6545ec9a8059aa117968a61e9b8a300144e17636173318b6889173508a SHA512 2ca22991606aebaf97e281035ad9b1e166017a1cd2e29b43f363badac28cd4be2551bf6a1be0f38e76245f8a76c7e9fd44f8d79cc5f42922fd20190d8eb8719c
 EBUILD faraday-1.0.1.ebuild 2468 BLAKE2B 9ce92343c08047b61d8d29ca8a14a0d6b87b01692ca57501c8f62c5172534a063f3df054976f5b45aadeca19b02df22158e4f1367a063d48e9e56a25601c6769 SHA512 9fb4b89df5631582b76a18a0e04d949b126ed62fbf07dc054ac3ef4a4651c31302eb44584da9c6122d7a2bd7405d171bd735f8cad646bd50b7d6c3f935359924
 EBUILD faraday-1.1.0.ebuild 2220 BLAKE2B 0b306a51c345cc9352cb8e55aac1153ecdb49b345cf5614d0aced904080ca1f86083d748146cb5d92e2b92131a0452feba395e6f62d1a1d423dc5a262efd5c7b SHA512 c747da8118a85b7067ab117c362ffc095e73aa3eade1ace98adfc3be460d475ed661302fb69ba344ec64b9387900c9e13554e3f2726ca355b89aaae901bc3533
+EBUILD faraday-1.2.0.ebuild 2253 BLAKE2B d76547a2abe5b2383c49a91279c78f164b9ad6575226a24503e144badcea45f0e1111b5c201bd36568210ec56c72ceb3af39a38b02e61ed761b1ddc86f8e98c0 SHA512 0063a92f25e1311093146fc83e7e753f85165b9d309e1410b22ac99922bdfe06aec0706d84fc3c609f2170809aa773aa2223f7dc2c4e9aac5fd177d748a2d0ae
 MISC metadata.xml 344 BLAKE2B 818dc9570594eef636f7b37ef9322ea083998a0905c0f9f55e758df3ebfa9e36efe5a42d95a666fc5c613a38b9c3a28d55ef0b3f48573dedf786883957d1adb2 SHA512 10e3c69f600e5be2306aef49c4466e399a52e2db52c8b53b7430bf72d6cb8696a71fdaa3a212eb37d2dad86480ea949447aee3f3e224f020e0629e56b35582e0
diff --git a/dev-ruby/faraday/faraday-1.2.0.ebuild b/dev-ruby/faraday/faraday-1.2.0.ebuild
new file mode 100644
index 000000000000..bcb69750bf40
--- /dev/null
+++ b/dev-ruby/faraday/faraday-1.2.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend "
+	>=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3
+	dev-ruby/ruby2_keywords
+"
+ruby_add_bdepend "test? (
+		>=dev-ruby/test-unit-2.4
+		>=dev-ruby/connection_pool-2.2.2
+		dev-ruby/rack
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
+	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
+	# Avoid loading all lib files since some of them require unpackaged dependencies.
+	sed -e '/[Cc]overall/ s:^:#:' \
+		-e '/lib\/\*\*/ s:^:#:' \
+		-e '/simplecov/ s:^:#:' \
+		-e '/SimpleCov/,/end/ s:^:#:' \
+		-e '/pry/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	sed -e '/git ls-files/ s:^:#:' \
+		-e "s:_relative ': './:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid multipart tests that require an unpackaged dependency
+	# that appears to be no longer maintained.
+	rm -f spec/faraday/request/multipart_spec.rb || die
+	sed -e '/multipart_parser/ s:^:#:' \
+		-i spec/support/helper_methods.rb || die
+
+	# Remove specs for unpackaged adapters
+	rm -f spec/faraday/adapter/{em_http,em_synchrony,excon}_spec.rb || die
+
+	# Make this adapter optional since it comes with a long list of
+	# dependencies.
+	if ! has_version "dev-ruby/typhoeus:1" ; then
+		rm -f  spec/faraday/adapter/typhoeus_spec.rb || die
+	fi
+}
+
+each_ruby_prepare() {
+	# Make sure the test scripts use the right ruby interpreter
+	sed -i -e 's:ruby:'${RUBY}':' script/* || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true each_fakegem_test
+
+	# Sleep some time to allow the sinatra test server to die
+	einfo "Waiting for test server to stop"
+	sleep 10
+}
diff --git a/dev-ruby/fcgi/Manifest b/dev-ruby/fcgi/Manifest
index ec9c3aa2b8c5..3b5c1b4b0b53 100644
--- a/dev-ruby/fcgi/Manifest
+++ b/dev-ruby/fcgi/Manifest
@@ -1,3 +1,3 @@
 DIST fcgi-0.9.2.1.gem 15872 BLAKE2B 1f3a9cfa79f06a655bbe3ecd36be8b650f7c1f856f84f82502c87c06f43ee9c91eed75e5441c65a635c700b8c682745f631e3268701555268eb3a1568347573f SHA512 1ffdd429ce4f2bbac771b7ac2368a5194015a7327b8b43b803914257edc174235573df6bb41a53fb71db0bf179fc24ce2392b244b5b55563d67e045c47da8579
-EBUILD fcgi-0.9.2.1-r1.ebuild 732 BLAKE2B d92691682e8a9da2774bd7efc84be90a9484ee7e1c88e5b97159222c6e45be1cf1431cd5e5670d8baaf777c15ec55ca2ab130f262c16344ddb53008aaead2e75 SHA512 b4862d29e4959e79bb5ee8ceefe6bb5e6e4845ea977b14059840d739e1acccc68c49c635abf55b94099a36bd33d0c55414deae704fc14bbd78a3d4b2289b9a03
+EBUILD fcgi-0.9.2.1-r1.ebuild 721 BLAKE2B 9ec489ebd24c658a2bba3a93cf98cbe4985ca1d43b1f08a18fd71a8c10af3da1928a204a0ebbd5ab895b2e52ba7567d859161c878e4c80b275ba3c9840392609 SHA512 22f71ea89d962a05dfaeebcd14af61a84c8784c19013f8b197bf411abef4e1cf664e21f355014a9957d08a29461e2d9fd09fc51bf6f7be8a1881f5f866821712
 MISC metadata.xml 347 BLAKE2B be2e5312191991db7af9e245a07250e10b0c1920e5eb7992a138fe201ab62a5bdec42c1f740c9e1a2c4920c8e7c2311b65e24e9a2d0dbbafffb3dd54beeb3212 SHA512 121248020ecab7831fd87ef528e334ed5d02b1145abf298e83192242fc96c0de018d12f2502ed991d89c3078bfb8f983409e68ecc6122e389215566ac6964ace
diff --git a/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild b/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild
index 65ed81f9c6a9..f37923f2cd25 100644
--- a/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild
+++ b/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ inherit multilib ruby-fakegem
 DESCRIPTION="FastCGI library for Ruby"
 HOMEPAGE="https://github.com/alphallc/ruby-fcgi-ng"
 
-KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 LICENSE="Ruby"
 
 DEPEND+=" dev-libs/fcgi"
diff --git a/dev-ruby/ffi-compiler/Manifest b/dev-ruby/ffi-compiler/Manifest
index 3921645eecda..0455a53ca0de 100644
--- a/dev-ruby/ffi-compiler/Manifest
+++ b/dev-ruby/ffi-compiler/Manifest
@@ -1,3 +1,3 @@
 DIST ffi-compiler-1.0.1.gem 18432 BLAKE2B 9832d9836a0b55d3099085b53e0c8e15cc5ae79cfadadea942603ef8595b5fa4d781b5f031f0592b2688acb1416acffa9e525e3cbc004c2c51aaaea12a722706 SHA512 7a13625ab1c5748d05ec93d68708dd9435ec92dcd0c823109c44173fdaf8710aec5f5b4fb11966475f10ae91401c7ca3c620f9d36bb9ca665114e1ed70f4edd0
-EBUILD ffi-compiler-1.0.1.ebuild 432 BLAKE2B dc40ebe88c3a177cee43810ac500663506530bdb8f99f51bb6e3f16619416acce09a82b91b3cf441fb18a11df1e7f76a172844e6a30267cb9c089c6bc5f9b1a0 SHA512 348be32503202c5784d1746729878f27a03c01cc90d82d2a5aa18ce08ea4742589c6f8e8867bf7987aaaaf3c850d0a47955a452ec83c643122d78252d576976b
+EBUILD ffi-compiler-1.0.1.ebuild 438 BLAKE2B 80ac8c83be20cb3095dee9e1dbfcdc99a7136fb97fb0e194d0638bf23b3837cc5b45abba19aeeff73a11086c0a10d2ae93796d890876547b8a44bde81abe4750 SHA512 e0a07aed8850a0f94bdd8434806e3f5b5df2c4428b7106d0f46ecef1b895fbd19de1c295d5289a311699abee8fef9b4d6af6d8cfd6a4f6f5368b097ef5f97111
 MISC metadata.xml 257 BLAKE2B 6339b8ae3ef779011f34940b5af7faca341317790ee6752ad73cb83db463ddad10b25cacf16f73ce6d0fde976d916e2838e6209bdedfbe5ef6da285be302203d SHA512 d86ea11e509e5d031f82c4bb476a5974b85d812abe415e95799bdf34a308ade95e2f1cf35f6af84ae5acd0f67996b150c02712b75ab4f5a1ff4eef0ffb046d7e
diff --git a/dev-ruby/ffi-compiler/ffi-compiler-1.0.1.ebuild b/dev-ruby/ffi-compiler/ffi-compiler-1.0.1.ebuild
index c819e1a03700..e5e861c01ef9 100644
--- a/dev-ruby/ffi-compiler/ffi-compiler-1.0.1.ebuild
+++ b/dev-ruby/ffi-compiler/ffi-compiler-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ffi/ffi/wiki"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~hppa"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/rake >=dev-ruby/ffi-1.0.0"
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index d598b7c33422..01371ffd9bce 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -2,8 +2,8 @@ DIST ffi-git-1.11.3.tgz 157081 BLAKE2B 57459d3aba7f54daf9c4d94993a083166efe5c37f
 DIST ffi-git-1.12.2.tgz 158344 BLAKE2B 903825d7a6d77e26be47ec7e7991253e1ba58b0f0049fd812f8c26dee6eb31c17388dd5f23270e84cf53c02ab3a73c79ecca870814e14993496d1ca0e99a5390 SHA512 2590ff3fd704334fe00de10ec5e08184c350feac36418e08680def0b4742c488f8168fa82759317e93cc3d7969af366254aeb157c84d07565e1804ba1678d119
 DIST ffi-git-1.13.1.tgz 161660 BLAKE2B b8a6c3f4b9bbd94378ab2adbf40c0bbf56883e34c6a1c12b9e1496069b8a4935b04012820699260f9cffd47efd78d7aa2d08e71a5bff9de740aa96ad11f499eb SHA512 f0077518c9ced54881e40a0047440edb4e40ba0ba89fc814a489bcbaf52e08e9a773e28f453f579162439e247151b994936695fe0b1ed5fb429d9bfd85b845ef
 DIST ffi-git-1.14.1.tgz 165025 BLAKE2B 020b3954ac08fc9fe077cc9116b21e40de8458eb79cc6ae1664d638c8a36df1e919cf6a603332f9513167b3f8d8bc342f04c2c1ee60fc9197d75de74fd69ca2e SHA512 8f3e97aa3fc3e5c404864d56b62d568ca464db741c1e526f971df4d96e61ebb8ce5899ecc207ba3d094efeaacd20633a250f2f072392a7369b179166bb780712
-EBUILD ffi-1.11.3.ebuild 1525 BLAKE2B 7c3dd8129f3cb30624d34415f180c7bbc62ce3df7912e122e933f48a0070ee36363b7b63f786e538f5a601ef14052f0884f51b6408809176ef4ce8216f873560 SHA512 ce485cb3b8dce947778aba34b3f084a2bf9bb1bbe63e6f8b6022f681d0f2c41e9a85d27d467ba106c02ac399c47327c17e9de9414902ecd8283bd91e155920da
-EBUILD ffi-1.12.2.ebuild 1539 BLAKE2B 417662c134bbc1a5267b48d3e71a552dd6df8e4b9f9558ef282da0e8581bc9631c04ccaecd3c89e793d16eb60993bff27733502ad08868359b3b53940095fa29 SHA512 3efca3a6191afdcf168bfade149f22330a3c34ba07455f2d92ab477bf4f4252e893064faeaaef077a50e3912f315708808f74899bc885e72d05a9651f263090c
-EBUILD ffi-1.13.1.ebuild 1539 BLAKE2B 417662c134bbc1a5267b48d3e71a552dd6df8e4b9f9558ef282da0e8581bc9631c04ccaecd3c89e793d16eb60993bff27733502ad08868359b3b53940095fa29 SHA512 3efca3a6191afdcf168bfade149f22330a3c34ba07455f2d92ab477bf4f4252e893064faeaaef077a50e3912f315708808f74899bc885e72d05a9651f263090c
-EBUILD ffi-1.14.1.ebuild 1652 BLAKE2B 951f888aae33a7756557f95e71f0c83d71c859515f7fdb2076d8caff5f5e5093680e238ebd4a442226a326a582cfae2a88614730a62f9758addf32769c5e1e17 SHA512 8ef4ce5f9b0ee309e17444510075a1b628409de3a17f6c3d92deb7443f9e2190fdc8f2c28c82cf11cc966ff48e58a552ba705b6d080976b84437f80d77061969
+EBUILD ffi-1.11.3.ebuild 1514 BLAKE2B e9f0371a43b379abe302818e5cf837022f049bd66396554fe90abbf36754a8ae350733ea258df8a90e07165db6af5b250867396c3995202555ed6561f2f9a575 SHA512 f4e8db2b0a3e73d050178bfd92a5227ad74575e3f3ba6eed5f6be25fc33651adad54e8b6527532e713136a065e2385ef574b3e010dc5c08c930082e88ea32798
+EBUILD ffi-1.12.2.ebuild 1528 BLAKE2B 1d7207005ec67b4a0a2378a3652a439c9b19f7371c14b41aac973abf4d3aaf496ee146748df74e0734cff355a9cfcfa15724f7301fa23ca5936930fcbf3e9361 SHA512 c8bb83a35f41ecea01465b129194c16ea1d93b3fbc67147fb0cd297f6d5a6600342cd6f18543bd454a706121e15b3e770b2a4f16dce75d1333ce23a06949fdd1
+EBUILD ffi-1.13.1.ebuild 1528 BLAKE2B 1d7207005ec67b4a0a2378a3652a439c9b19f7371c14b41aac973abf4d3aaf496ee146748df74e0734cff355a9cfcfa15724f7301fa23ca5936930fcbf3e9361 SHA512 c8bb83a35f41ecea01465b129194c16ea1d93b3fbc67147fb0cd297f6d5a6600342cd6f18543bd454a706121e15b3e770b2a4f16dce75d1333ce23a06949fdd1
+EBUILD ffi-1.14.1.ebuild 1641 BLAKE2B 56bed9dc915a805e160af30e7f883d9cf30660937768ccfefbe38abc1f04934b98af1a90c05095855a8463f21f24a30953c8ef55e5a6311ee9463d447205e242 SHA512 8592be06dccc1b8c1464997dee29dfab2b6f3268f7ed5904d4fba10a239a3b4c3c368f46f84376fa023f37b243c2bed3111df8b75c5852b2f8cbd121cde092d5
 MISC metadata.xml 333 BLAKE2B ccc40c1a86563165c3d6aba6bb40012dc02d86f836a5e050dafc34298c9b08aaa676be33e7c2ce5bf6acd36cdd8250328150383652ac5a1515c2832969c481ae SHA512 9105a49b39afce8695d4c8e7082690ca25806cf08ad6b6b9528343e1bfc72097369ab2868b3eebde55c6cd70d0baae1f085b4ad3468a9c5621d97dd8def76173
diff --git a/dev-ruby/ffi/ffi-1.11.3.ebuild b/dev-ruby/ffi/ffi-1.11.3.ebuild
index 2997217694c6..1961e20d6fcf 100644
--- a/dev-ruby/ffi/ffi-1.11.3.ebuild
+++ b/dev-ruby/ffi/ffi-1.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND+=" dev-libs/libffi:0="
 DEPEND+=" dev-libs/libffi"
diff --git a/dev-ruby/ffi/ffi-1.12.2.ebuild b/dev-ruby/ffi/ffi-1.12.2.ebuild
index 54f91d863ceb..a1ce25ed437d 100644
--- a/dev-ruby/ffi/ffi-1.12.2.ebuild
+++ b/dev-ruby/ffi/ffi-1.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND+=" dev-libs/libffi:0="
 DEPEND+=" dev-libs/libffi"
diff --git a/dev-ruby/ffi/ffi-1.13.1.ebuild b/dev-ruby/ffi/ffi-1.13.1.ebuild
index 54f91d863ceb..a1ce25ed437d 100644
--- a/dev-ruby/ffi/ffi-1.13.1.ebuild
+++ b/dev-ruby/ffi/ffi-1.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND+=" dev-libs/libffi:0="
 DEPEND+=" dev-libs/libffi"
diff --git a/dev-ruby/ffi/ffi-1.14.1.ebuild b/dev-ruby/ffi/ffi-1.14.1.ebuild
index 35721544e2ea..76dc45456e47 100644
--- a/dev-ruby/ffi/ffi-1.14.1.ebuild
+++ b/dev-ruby/ffi/ffi-1.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND+=" dev-libs/libffi:0="
 DEPEND+=" dev-libs/libffi"
diff --git a/dev-ruby/flexmock/Manifest b/dev-ruby/flexmock/Manifest
index e232684f5e20..4b9ed00fa301 100644
--- a/dev-ruby/flexmock/Manifest
+++ b/dev-ruby/flexmock/Manifest
@@ -1,3 +1,3 @@
 DIST flexmock-2.3.6.tar.gz 91601 BLAKE2B f2888891820f13f4a9812ffdfe042ccd266b0b5166fa538aba96e2c865ba55d3689d077e73fb9aa238455e90b8ea97aa60f8649c08823a753b6af8c0f550cbed SHA512 0fcc25c1a83ba1e2aed91eed98242592dfc1a69d57c033fbd363383962b16d6e72011d62a906ae8bf076801a3d5e8e8501bdb9f6ca3750c9615dfe8b9b0bdbbc
-EBUILD flexmock-2.3.6.ebuild 1038 BLAKE2B 722a69c5e761bf9806877e052f416c0b0a19b8fd79cbfb229dd747f47c48b5229218a5e277d581bb04726a940fe4358e47edcae17a65e60241f796351ed02fd6 SHA512 ebaa7c34e4f9b5f3069a086061759e641b157347948034d1dadfa0afaf4a8b9783fa7f9a4d8443fe50b1d709e99297de5ebd6369e7ffdc6003b93ecbaddae238
+EBUILD flexmock-2.3.6.ebuild 1027 BLAKE2B f77dae841d04b1f2e914434e7613463d51b2385449301d1d9e40b1c10d7f5076402a9161f6a0b850a308fbce197a81111885e043625434b84d2e40d898a89029 SHA512 aa3b72f472af2ca47f6c03d360c5dbbf9478d80381874f04ea2b71f2f9dfe9a0ff6619d088c427b1a074b8a59720ad0a59f4d175f2274d0ed0cf090365e2fa8a
 MISC metadata.xml 345 BLAKE2B 1782a57c8d0985b347df100c0a17af257b39703311cabab5e44d4b6e1dc4661d377fef4143af9608f9f662a736be6bbcd45bb4db5b037057a67d707d25bccfe8 SHA512 0d6d03c67eaa94d37cea2c2c58ce4a11eee74b361fae4cfbeeca5d24b13dc5871481aa01b7a81d193136133ae56599495fd75a223e8975c037c1ae81591690c5
diff --git a/dev-ruby/flexmock/flexmock-2.3.6.ebuild b/dev-ruby/flexmock/flexmock-2.3.6.ebuild
index 8e27864e9f76..e5a0cab2284e 100644
--- a/dev-ruby/flexmock/flexmock-2.3.6.ebuild
+++ b/dev-ruby/flexmock/flexmock-2.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/doudou/flexmock/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="flexmock"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/fuubar/Manifest b/dev-ruby/fuubar/Manifest
index 5d8d1deaaa4a..144fa0fa2201 100644
--- a/dev-ruby/fuubar/Manifest
+++ b/dev-ruby/fuubar/Manifest
@@ -1,5 +1,5 @@
 DIST fuubar-2.5.0.tar.gz 32763 BLAKE2B 841f85cc867a8215e00f720f2ffc25aaa5444ee6536cd17663b789d7a947e957987f3b60659828d310c0fd816abfedd9c7ef90effe37b6f847ac119a41f134a1 SHA512 c0ad302516a7eb7df2b574c038068298aece8bc1606adcb81c53bba1f0315a774dd65f5c742586ef2b7f188bc01ea94e0c5a3eb8b3c5f225ad76027340165453
 DIST fuubar-2.5.1.tar.gz 39138 BLAKE2B e36c5a4ca67b9c2cfd6775f554ebf1c027f9b1f24b36cfb1e3c062a07034eee472ff06f750755e7aba9e0b1f4a3704be213b44c9d9cf5c6b50cc1cf24b84c572 SHA512 d3b200690a483f131faeaa0e6164ab4103584324b02a928be1c8845f14984e3695d8cd1cf3b9edf945acbd9876dca879029c04b9d76b0ace4b7d1883c73ca924
-EBUILD fuubar-2.5.0-r1.ebuild 854 BLAKE2B f3512f03631666e524a72a77fd3ae839b98e7c36d2b720d8fa995a0548a487ef65589deda27daa7d9f9212a7d3d2e964aca76ff2d10d28de22f656663b068d02 SHA512 bb236747270251877baab7cafbaed179d6f11d173d68abada06eee0d4d40c3f634162ff79541f4afcdb10b200e51dcd0cd74c46e5aef620989d8b92794fa0adb
-EBUILD fuubar-2.5.1.ebuild 848 BLAKE2B 0849bc63ad14c59f393815d8c4a895274ab2eb83b73d04820cd21c8a240e68a0e8ef55fb22376b3c0a04791d8770203f0ce58aafe69286cf10ac02d72e68a6a6 SHA512 8d092c6b158179d17635682d13aa2aebda86d252a993c029e4f3ca7de0c1b2057763659dafc89702377e617d10b52190d646f7828e11cd201342578be408e764
+EBUILD fuubar-2.5.0-r1.ebuild 843 BLAKE2B e9cfc05768ab6510913fd076e754c438ca3cdd517b551875ead8dbefb9788b36266aa4d8590e7c0f2bcf6c63349f043b42ab0e0cc8a6e8e2ca715a1dc5af52e5 SHA512 1cd707ddf643a2f4c1e4833b39e1bc23b37bc2f112754e579ad0441c74a3577e6d739270bc7d48829aa3d68917c7b02bd185a95eb25a2dc9709a7f855d94612c
+EBUILD fuubar-2.5.1.ebuild 837 BLAKE2B a28bcfde2a7378cea2a6abe50e9b459616a7e423e28ba438a8346e64a48e54089a411233215f0a379ff1021fb83dfdf690ee5f0b4539ceb3fb4ccd833f924ec6 SHA512 9c834f6c4177372fac22954c3ab184f68e2a9d2a226c0cf5a232e81405872ff99a63dde33115e609d58222ab726e7da2827062e498616a721ea2afd2eb3e68c5
 MISC metadata.xml 349 BLAKE2B a394e14e59c6aff0211e2b84c89f5d12b862cf44d604c6dec72d80ac8b52c6ad2333069fb04fd257d0d761283bd4aa041ff716f34576f46e455d075ce2ea2fab SHA512 0c974aa96afd7eab91e27ea72859e709fd5d8691055a06b57e2267e2ee36904b3f4b92b1b0d24659015f303017298cbb4373f225471a6350551d3d85574930f7
diff --git a/dev-ruby/fuubar/fuubar-2.5.0-r1.ebuild b/dev-ruby/fuubar/fuubar-2.5.0-r1.ebuild
index c1bf1e743cc7..43b7fdc1a74b 100644
--- a/dev-ruby/fuubar/fuubar-2.5.0-r1.ebuild
+++ b/dev-ruby/fuubar/fuubar-2.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/thekompanee/fuubar/archive/releases/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="${PN}-releases-v${PV}"
diff --git a/dev-ruby/fuubar/fuubar-2.5.1.ebuild b/dev-ruby/fuubar/fuubar-2.5.1.ebuild
index 4ef0e4e545d0..3964f4230a61 100644
--- a/dev-ruby/fuubar/fuubar-2.5.1.ebuild
+++ b/dev-ruby/fuubar/fuubar-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/thekompanee/fuubar/archive/releases/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="${PN}-releases-v${PV}"
diff --git a/dev-ruby/gruff/Manifest b/dev-ruby/gruff/Manifest
index 57a46421e4a9..2229d3126445 100644
--- a/dev-ruby/gruff/Manifest
+++ b/dev-ruby/gruff/Manifest
@@ -1,5 +1,5 @@
 DIST gruff-0.7.0.gem 318464 BLAKE2B bcc51f524089f53b89778143b444c70d4e168983edda247cdb4c9c84c288450154ce6e5234bbf7a0a8ae7251df611333c8bb411a8fd3765ccc5fe9650c3efc38 SHA512 b9842213ab3da7b4eccf8bd06e18d62aea14a6a15d7c45ebe7e51a76acd456ce140f094a9419d4c0bd1774e7d203bea49f9c39aca36c75d744f2732bcde9f688
 DIST gruff-0.8.0.tar.gz 24712264 BLAKE2B 836ea41e8c7a91ec09ef5356e4f021f99381be4ba437bd043ac628a31ad02f1846cfcf182c2ee038ff90918386413cc9d213d9958412c2bd0c89b1ee2d5c481d SHA512 867fdf50c41bf0e1040ef954c00bced11df0c3d382333aef42f6325a30a950f2ab04e0a5beedf1ab5c3cb23d1682b56d2a398d8afc8d7aa665980ddac4e6cdcb
-EBUILD gruff-0.7.0-r2.ebuild 1459 BLAKE2B 15d39112ef127c9f0c135dab0f000fad1ea6cb13fb4a25a117814c08e6000f1434a263dda50ad88b61794e82f5e58d80ba6066c19aab91036e2f9704305685d0 SHA512 3ab43cce5ac564c275b75dd3109ae1538dd505ae634e93d1a1b23daadcde4c41268f73716ee09a1671ae9c3913f5c2e9c69abca210279054c44bd2cceb657a4b
-EBUILD gruff-0.8.0.ebuild 1427 BLAKE2B df65f08ae1216a5eb831a5a9595042683428aa1e7b6d8fd1965cacf9ca99ae645eff1eacee88102b0b77a5ebe72385d7cd44408ac8430682e5c69a56802f7170 SHA512 34e18876511182db433f954f97d53516aecd2de829070e7fde2b50845c9af36f67ecc0835aa2e3cf514be553665752b80911ecffaf0374a8902fe2dfae81da6c
+EBUILD gruff-0.7.0-r2.ebuild 1448 BLAKE2B a177b6d58f8fb977308f86fa0372919d90cbff9be96d1a1ffcb362c1faad11aa0d423d7894ed8aab312bdd22f6dac58506401de873ffa18de704111fdb08092e SHA512 4790cde6289b55df95aa2ea410c7aff604b45b5056d1251c130e87939d0a06f6ba2c15c808c1920246fd5af6af5559a903e569a12c5858a2476bb155aafbfee6
+EBUILD gruff-0.8.0.ebuild 1416 BLAKE2B e77119bba425b5ecc75e1adf342f10e41487fb012a94fca1e8bab5bfce2d55f682756cb9acceccf3e04ca4941ceb096ec298777d9bfa12437ad4047d8a160bec SHA512 97c2e62b99ce63e11355fa7e94f530d909b31342360b91a93ac4c8d8ec01b57607535b404c8b1781608bcf46b958c43119bfc2974b6edc6f6ba299e941725748
 MISC metadata.xml 340 BLAKE2B e3adfc25e09939c98ba4a4323afd0babccd4b0c11ea712e93a454ea4d3074f12a895d674735f8209598336a1d62ea61d6d00c8956a47cccd583857c36f261ab7 SHA512 1136e2805ed73f18bba2c981e2788fa635face71a9b1b384e3dc20680afd4fb354f33ac099077568f7fa1f3510e1c46771f663341153ae64ef961508243c16d6
diff --git a/dev-ruby/gruff/gruff-0.7.0-r2.ebuild b/dev-ruby/gruff/gruff-0.7.0-r2.ebuild
index 6fc4274809e7..48e23f53ccc6 100644
--- a/dev-ruby/gruff/gruff-0.7.0-r2.ebuild
+++ b/dev-ruby/gruff/gruff-0.7.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/topfunky/gruff"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-macos"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # imagemagick is an indirect dependency through rmagick. However, for
diff --git a/dev-ruby/gruff/gruff-0.8.0.ebuild b/dev-ruby/gruff/gruff-0.8.0.ebuild
index a65092a0b85c..08f719941e4b 100644
--- a/dev-ruby/gruff/gruff-0.8.0.ebuild
+++ b/dev-ruby/gruff/gruff-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # imagemagick is an indirect dependency through rmagick. However, for
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index 85c9378a7767..0d10da6f1b62 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,3 +1,3 @@
 DIST haml-5.1.2.tar.gz 126059 BLAKE2B 5d805f29c28d0f6355f7b79e5724ec1639a808cfae75c26633edddcc82d964a48dbc1654b780fb706529ca22abcaba953a1af6f483386c336035c079a719e585 SHA512 405976de297bfdbd6f010442d940205c404f057a54cd7162feb400b1831af3e4e60fd05a637a2f480204428512ca7dd66c02aca22b0006d6d515c06968eb08a3
-EBUILD haml-5.1.2.ebuild 1676 BLAKE2B 56947043cad3e5982f62a0ab2d1f3f56bc8d7f1bec09364cf18e9996979f3143c7734550f8ef2d6bc21a1f79901eaf072bf3385cfb312f484c110b6c9698067d SHA512 bad9ea4fcad2f56c5d717707ae61ba696d4d8fd35a5d04ae948e4291b5cf2a45e62aa63e3419e382cd4278c85400e2b07767c25a22246ebdb2aeb5ec1e9aa9e2
+EBUILD haml-5.1.2.ebuild 1665 BLAKE2B 7c556530f3f0025a063044f9b6ddddd995c2cb66c8fc9bf8006e2acfbaff162063d70444f477f951e87568ff0acc1655d439f521d5937e65b8ff2bab17e7a58d SHA512 7840f679c227db74c26c0df4a6eda77108d6929d0a24f0a482a39a925efe9754b693f51bdad283357ede548bd9886fd071ebbc1d0e76f2b446e521874fa619e4
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/haml/haml-5.1.2.ebuild b/dev-ruby/haml/haml-5.1.2.ebuild
index 30815f8c9ac1..0d3672e4848a 100644
--- a/dev-ruby/haml/haml-5.1.2.ebuild
+++ b/dev-ruby/haml/haml-5.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="doc test"
 
diff --git a/dev-ruby/hashdiff/Manifest b/dev-ruby/hashdiff/Manifest
index 020f1b0b8efc..bcc8adc3edab 100644
--- a/dev-ruby/hashdiff/Manifest
+++ b/dev-ruby/hashdiff/Manifest
@@ -1,5 +1,5 @@
 DIST hashdiff-1.0.0.gem 19968 BLAKE2B c27da71ad9bfba1e967e3c67804c591b880eb8af905d736d5e25c7f732256ab980855fbede619bb935ff29e99d9247b50f4c1790f415bb232b127de7177a9e23 SHA512 39aa1513f6a03ed79ee3f6c26491b914df2527d5dede6b15362e02550751a13fbddc341c0b39ed8c55afb8cf0e7927d528c22f309e54422bfe4dc64229ad9a6f
 DIST hashdiff-1.0.1.gem 20480 BLAKE2B 9f9723bd4e3547422b185df07d314699d0381ce6526be31c821f2d213f0721f077560567c830256a3bb2873b37a2616213113257e993fc364cd72a416b77cf10 SHA512 fa6e7ad88373038341473de25b7df5e146744efb8b5613fb4da41630498e68de585e2a8d66ba86d577ded574464948234f51e662a9caa6e695c3d6a2c3b85059
-EBUILD hashdiff-1.0.0.ebuild 669 BLAKE2B 10c652ba37a4532a8c637c67085a19d6c82a855f1bab49ce450bd2d244633400104c68a55f6b9aa54f98ad52608739b97adbeb086bb36be77b1e0b3ca2811c12 SHA512 5a8547efc0408f7f6b910eaac7bfc8c154e8dcff723e8c73c0d231b693ee43901626780bcf5892c86fd811d4ecaf689dac51910f3bdfa1098a44ce1f4c5451d4
-EBUILD hashdiff-1.0.1.ebuild 645 BLAKE2B 03272526675cd2a9ef97b1ed9d72e10d616bcb92b7b6d5faf52e6ef02ad440195ef9d22c98becf4b11b133d5fb17e84da9626d711a0f31b5a1f86ef01c3694bb SHA512 defc3837390635b6701f21bff02cd97b574596d4a5b92d04f23cd665d6236fcb19eb9d08a8415d66142f1fb10dcf7c2f24183355cd20dda78565b6caa1d5537f
+EBUILD hashdiff-1.0.0.ebuild 658 BLAKE2B dd5eadf23bf4c9cfe33da5f39ee11c3596fe40625736d3352a504b75ba917fc3f7e83791502c4b1e287227e901d7920dff0040ac939a3c504ae2dc4ffa30b28a SHA512 f4446784a8e5370ecf4b1793b7fe53099d835ade5f8eef49654a3a820d9a4516a24e6e6dbdc54b754f1ba0fc6ba58eb73137936d7a1488992b39c2699641ac20
+EBUILD hashdiff-1.0.1.ebuild 634 BLAKE2B 9fbf3dcf57c01ad252371930622944c90da1ff7438edac612a25b25cfff75c30d33e19efe568d0cbc8c4679ec24df2270733cc68437943db2a7279df3052fc55 SHA512 66706947debc5ffe8cd4ee0cf4f4e9ca57e0d8dcdb63876aae7064ad72cdd06eeaebbfddac598b0812aeadfa64ef3c219aefd07cb64ddb7f6d77c6eb80ca2833
 MISC metadata.xml 345 BLAKE2B 32c55c352e09a4cee12f02ca321e7581b56faf759bd3cf95afc684633c7324bd10c19fb832a1d7cb3e96787721eae0f0bd85428fccead003ba72fca53882ba65 SHA512 f241e4bd08fb29d4a2538d5b548597c5869c0bdf332e3453e55c625093bde7c52b35e7a7bcd691b9f5b2bf2cd1c90ef244d23e343cf7800f9fda4de73f6a4cbd
diff --git a/dev-ruby/hashdiff/hashdiff-1.0.0.ebuild b/dev-ruby/hashdiff/hashdiff-1.0.0.ebuild
index d98a67f955e3..2b62e4d741b8 100644
--- a/dev-ruby/hashdiff/hashdiff-1.0.0.ebuild
+++ b/dev-ruby/hashdiff/hashdiff-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/liufengyun/hashdiff"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild b/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild
index 266af44e1a96..74127fee8a77 100644
--- a/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild
+++ b/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/liufengyun/hashdiff"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest
index 44851cdd5365..7cb78a24992b 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -3,8 +3,8 @@ DIST hashie-3.6.0.gem 74752 BLAKE2B b689843d30001dd7eaa09d62ab908d60e76128df6605
 DIST hashie-4.0.0.tar.gz 82096 BLAKE2B d2fa4f208e4bb08a15c7c14208fef368ea5653e556045378ead94b7002250a798637fede4f8438238111946a4393794828f88d19b7f8c733500d745a361049cf SHA512 b26b80a0b981fa534d17b20a7a2dfad82487950f94bf38d62129aa7af4de7875e1fd9519fae30c13d16a92e041033fe6f80978fd30014a571503650ee73ca549
 DIST hashie-4.1.0.tar.gz 86972 BLAKE2B 33979037db67f8a7f20ae85e3db6e8b5415b9b2659a5961e2c2a97e3197fef1500cedd8557af314baf8395a9790e8a457633ecade944c198c295f7f13847afa5 SHA512 f2a36ee812e39d679390647514ff894d4170b61ece6d37ef42f1203212d80d2dee63b4af162d81ded451a53c058746f26fc16810db4c748cce9ca6635a300a4b
 EBUILD hashie-2.1.2-r1.ebuild 736 BLAKE2B d54f1f1d5cf059d17af6bbd20c229cb8cf28cc2cd2a62a4ee6e42200f76c16393e0b1f2927fec47c485a5e144211dd8ed9ee790c73dee30fa93ab865b79bb084 SHA512 650393587f133232d8bc304fd1783d19c8eb6f9baab5e5efb3b3619b957f69dab9b46c90d8c7622519a2b3ba3e06c4496c2074079dedad14a768a36789acc1fb
-EBUILD hashie-3.6.0.ebuild 1286 BLAKE2B a7c43fbdad7d52bf2ab56e1f4eccac9c894eb3da2b932ec6e3f6af0c75ed9338e473c05a242acb32a32fd607057ea7aaf99b2b8f696cb795e3224bdca231aeb4 SHA512 96c3c718ebf37a8b99178e052936ad6c78fd7f3fb7581c35f6653ae36d8d8be0f122da3ea509e2f17289827909203fc52376d26a80297b397d07b432a4e72bd5
-EBUILD hashie-4.0.0.ebuild 1411 BLAKE2B c6b1723aaae76f7265e3e18ae5ebc3e5e00be1ce8e2378c881092d415aa64a6f75c6cde0daa3c3051210b5f1813014e99310ecfc77ac9f47237705817820340b SHA512 e12e0593a6ea70686708687323966a8f536bea783c7262c6696af67ce12e1e242a9e7825c44e23921f8995a3c1cfd53a92cefb3fcf470353c2ef66617d0b3860
-EBUILD hashie-4.1.0-r1.ebuild 1434 BLAKE2B d9b3f9ee64b4b956d6224803f0d77f704d954c7fa2e86c915486afdcde2debc1f0d369da7f0e2bd4b870219b895702d11755a34ee58c9b5fb516b869c4458fb4 SHA512 231181de5fcd5eff3061dbe0e9fce63bc1cc7cfb101040f4e59bad9f6a33e3275027ee48adb9cb090bb7686ef12c313f05444fa4d48b433852947d4e92a48854
-EBUILD hashie-4.1.0.ebuild 1427 BLAKE2B a24c92707fcca20b13cd200dc262ad5898fb220d85a7104400849b47408978ef7335dfe0eb87d593ef30b7866930c0f4f9987b7946812b515ec05c90c4eeaa2d SHA512 773bb1d904af1ef1b1df27d59871c006320587f34639ffc606f15c705c0e537dcf7731a4edfbdfb5090e1e07ad4819440f9aad5f0b1b79743ecd565d400d22e7
+EBUILD hashie-3.6.0.ebuild 1275 BLAKE2B e2538ece27eef72965fefcb90a7ff9100fbd891c8b91d2e643179cbf2f6bab6d5ed6260875541009f78ae81e814226c4d61e3b1aca2772da84453bb76b9fba46 SHA512 358dbcbe31730582578ed9f7f2cb852577f7605440b564714b672d934d6ee904abef3c325fbbb20f55119b29fe8da3e130c0a3f9b1cafe5a50e80b8b93789f28
+EBUILD hashie-4.0.0.ebuild 1400 BLAKE2B 0fd64036760e158fc0d67750a1dd94010bca727e454fa6b585e3644e6949db5d897b1a1bc97a65f9648413dfab122bedb155d429588737100b15d66cbf9b5158 SHA512 8238a45c6eb083ee594460b81cc5e5d0df5c883dfdfacb761d104b7708a01cf4ec5a2f8c49d7aaed46c235cd4350a8ed88bd79170f1bce22818901b2ae5cd014
+EBUILD hashie-4.1.0-r1.ebuild 1423 BLAKE2B dc4f910fd0a74a62606a3be071b96ab0b24c9bf960f69c33b61be779f47dd5c8fc3b9d73758ebe6f670f280029e07b91a5cc54cfd7f242650bd5dcc1eb7a76b3 SHA512 1cbf44f2fe3560c74bcf83ea74432fc3a8d2175662ce008acaf66a810eb79ee3c9b6812c705d0c7e775357b52b5fc911fabe54003227a0417d1045205750f14c
+EBUILD hashie-4.1.0.ebuild 1416 BLAKE2B 733864ac0a789d00a5765d5a343c799d590590540391a23fb00bf4da86c03c8f3ed5ac948d59594a7e988f71fac3e4a7762defeabd7ba161b35f383529aa2bdd SHA512 6d592c81cc03b77a7bd7203ed2b86bfd66a853c506935775c015c0905ec8e144955c8142db0f39d5a23d92116cca2f4c63db75ecc5bbad8aa243209e4287aab3
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/hashie/hashie-3.6.0.ebuild b/dev-ruby/hashie/hashie-3.6.0.ebuild
index 17c082536848..2e718a17eb12 100644
--- a/dev-ruby/hashie/hashie-3.6.0.ebuild
+++ b/dev-ruby/hashie/hashie-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/activesupport )"
diff --git a/dev-ruby/hashie/hashie-4.0.0.ebuild b/dev-ruby/hashie/hashie-4.0.0.ebuild
index 7bd5eb8b8875..a8504eb97b28 100644
--- a/dev-ruby/hashie/hashie-4.0.0.ebuild
+++ b/dev-ruby/hashie/hashie-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/intridea/hashie/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/activesupport )"
diff --git a/dev-ruby/hashie/hashie-4.1.0-r1.ebuild b/dev-ruby/hashie/hashie-4.1.0-r1.ebuild
index 45813a6672e2..2cd22ebcc43c 100644
--- a/dev-ruby/hashie/hashie-4.1.0-r1.ebuild
+++ b/dev-ruby/hashie/hashie-4.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/intridea/hashie/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/activesupport )"
diff --git a/dev-ruby/hashie/hashie-4.1.0.ebuild b/dev-ruby/hashie/hashie-4.1.0.ebuild
index 1bab83ccdada..c434f9247e03 100644
--- a/dev-ruby/hashie/hashie-4.1.0.ebuild
+++ b/dev-ruby/hashie/hashie-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/intridea/hashie/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/activesupport )"
diff --git a/dev-ruby/heredoc_unindent/Manifest b/dev-ruby/heredoc_unindent/Manifest
index 628a2db9b40a..c3c0eb81d902 100644
--- a/dev-ruby/heredoc_unindent/Manifest
+++ b/dev-ruby/heredoc_unindent/Manifest
@@ -1,3 +1,3 @@
 DIST heredoc_unindent-1.2.0.gem 10240 BLAKE2B 2d29e85e03b4da87277e82ad3c7f85f8c4f4063651a5e1aa9931ae257c8e3416b6feb6403ee158b2fb6bd4bb0b6fcf00a09bf688b3ba3acc76b5000639a7c248 SHA512 a975ffdc2ae3716a7fb90145270df03d6f3d45d42d3fca3125044a2b960a9c8ffc74a7fb0e315b6021cb6ce535b08207a40351573ed89c27fe0c8e196ea02c76
-EBUILD heredoc_unindent-1.2.0.ebuild 811 BLAKE2B 13b8fcf4d73e2cc38eed99f9d612861fb9e9df2b9937d18ea139ea4c211ba377d201e7f9a66cbd3d2314fe9129b6f8036afaea55f944b2c9c8b95199983d30c5 SHA512 b8753681deeba21bfb90c4c9d243d87180e230289d374ef9e22e9fda013410aca728782c5d5032a065d46843911c457ba46821b0a1eda6285ed9d74e3dd4e4b7
+EBUILD heredoc_unindent-1.2.0.ebuild 800 BLAKE2B b63b7487ac61219ac5acbf03f5a15a038f6654c546f819875746e2b4adb78857dc795b38bf0e5da67a1cb29abdf1e0146659e28484a271d070045600a25fadef SHA512 f1ec2cee4df88367d3b7cf2917f569edc9161af43a51006a43ec6e1aef4dd402ed09789a8fecef1281173e7cdd21fc50bfd489e8f07d728d1a41c7f0ea2538fb
 MISC metadata.xml 355 BLAKE2B d6f3b21bb4e87e3eba58668a666a27da2fba665c0c96595b438564fca3fc691be1f8a5335175295617a18b3a77ec0966db5d9304de89859af6bdafc301379739 SHA512 bf551d4c3b25ce65b832a8d23fa0d333a79fff8b0681e975cb237367f0470fde3ee8a37f3df81d292915ece3a0bea6246de190880889d0f739870e106ec36978
diff --git a/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0.ebuild b/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0.ebuild
index a6ce6d1ae7a5..138d28ea8327 100644
--- a/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0.ebuild
+++ b/dev-ruby/heredoc_unindent/heredoc_unindent-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/adrianomitre/heredoc_unindent"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
diff --git a/dev-ruby/highline/Manifest b/dev-ruby/highline/Manifest
index f256fb747d3a..f51e0f782426 100644
--- a/dev-ruby/highline/Manifest
+++ b/dev-ruby/highline/Manifest
@@ -1,3 +1,3 @@
 DIST highline-2.0.3.tar.gz 234205 BLAKE2B 4748c3ad8a15e551162ab9f2eb6e176297d833d13e6f5db7898f99c71f25e8a2a01057b0438c5d30b56a66333bbba0da1a435cfa07db97f2ffc5e301157618ef SHA512 f432c8836040bcfb147a84efa2dd3feee7f3f6e03eafbf4232e9457aeef8cb9ca83fcf854d3b261f59a166666abc3f2c8fc0f1279a7efeb07dea8a13be22ebde
-EBUILD highline-2.0.3.ebuild 1060 BLAKE2B fd3cca61d00bafed1e57356246299a1afb84d7b48e12daf208c710fd17781ddcd6710989a52c0e6abdea99a07fb492fcfae80602e33d8b97b5e401c0bba9bc13 SHA512 519b9d6c22074c3d4a0c15e567ee83f6700371c09273569126ea81e3dd96b00d8a2f1250a6a109aba951ab6625de5db7fa4007637a15d701122a1b07e58987a9
+EBUILD highline-2.0.3.ebuild 1049 BLAKE2B 5b1164128b7b7795e191f006122a9d7b6ea95a6b6b2a7fff366243e81a41d9153e97f41c07ff00755bcd25f220db536830336e3f18dcc8b36ef2cc453a2dcc07 SHA512 c698539ba2e2c5294f66f3fb28bf4624cb13f13b7c390a1dd9646b97b60bbbe1f67d2173c8b39c08e5949846e4a189db902b8e1a788c2cb3578f74957f6d8248
 MISC metadata.xml 339 BLAKE2B 58671f84213ed36194c80df5fdac1618917b26161ddf8a8829980f5ce7e7aa242c84d17aaef0be655a36ccdad24d93714ccd6875fc073ab537c2186e33da5e8a SHA512 723488f3e201d857ceffdbc6779199469aea1d3d21a391c5bd5ab9402388e6c32e4964491a609d7065d0684a256811be04f2df20b3db745d83c4cb8bd769a945
diff --git a/dev-ruby/highline/highline-2.0.3.ebuild b/dev-ruby/highline/highline-2.0.3.ebuild
index 61b6a65d964a..f1e1f8a949f6 100644
--- a/dev-ruby/highline/highline-2.0.3.ebuild
+++ b/dev-ruby/highline/highline-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/JEG2/highline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 IUSE=""
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 all_ruby_prepare() {
 	# fix up gemspec file not to call git
diff --git a/dev-ruby/hitimes/Manifest b/dev-ruby/hitimes/Manifest
index d4bd4410c498..868d4bfe5c66 100644
--- a/dev-ruby/hitimes/Manifest
+++ b/dev-ruby/hitimes/Manifest
@@ -1,3 +1,3 @@
 DIST hitimes-2.0.0.gem 27136 BLAKE2B e2bab57b70d63f3b2bbe29584b7051f6c829f7957da483fd83b38ffee4d5f6a8c1af16c2ee8aa71d56ee71160e7df87a46e420d70d0430e514ead6576453fc7e SHA512 06f1c17d9914054bc17244f1a22761c98f7409cb401136e582deec18bbee07358b339ddd49ddfbc01cf9eb46bf84fbf5e2dccd6c77eb36e98c357e99687e8201
-EBUILD hitimes-2.0.0.ebuild 736 BLAKE2B a02d92cb5690eb7b69731cb00b01029ee3b89f197a23a5022cf851518bd791a4ed36580c554d6c39612c95dd96da0b3da83465d3855d6b091e1e07c01de2d64e SHA512 aa482d5bfdd84d9d2bf1abecd69858ce7b14c780b486bda663b26d657408e28fb4d109b1403bc419254b0230cd435c91c6337349e4810d4ae4d68b5c787e8459
+EBUILD hitimes-2.0.0.ebuild 725 BLAKE2B 3a32a488d2d63c88e53e58c84122a17484c2df9833920fe29e4e7eb7eae97640f6716feae65e8e2cf048d1dbe5bdcbfe6b0cd0354af298db05522e291c53196d SHA512 5544921f385e687019e96db03184e39828ce30342fab10cb3796290e1d2fed5b3caba201222e148ed93520b93c1eed9c2b82396f1151f5ea7b1d54d670f5609c
 MISC metadata.xml 349 BLAKE2B 270455dbd5303a2527a2d62a00ed7d1a935fe84e0a556492315b109ad8270572c98d126e4ca17022f3cdc712c20fd5e22fed1f0cb1a21d489f9eb77a1835ac7d SHA512 7fecd87e7396d57d383d2e3055676ab89f9328121a625dc27ecb4a8faff1fb4d7b8d90547f0caf9f7767dff9d48c99185419e1d26dba906e448040b943a3742a
diff --git a/dev-ruby/hitimes/hitimes-2.0.0.ebuild b/dev-ruby/hitimes/hitimes-2.0.0.ebuild
index 7f8fa544c064..8130c8f8343a 100644
--- a/dev-ruby/hitimes/hitimes-2.0.0.ebuild
+++ b/dev-ruby/hitimes/hitimes-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/copiousfreetime/hitimes"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/hoe/Manifest b/dev-ruby/hoe/Manifest
index 2f35f12643e3..63106e704fb0 100644
--- a/dev-ruby/hoe/Manifest
+++ b/dev-ruby/hoe/Manifest
@@ -1,3 +1,3 @@
 DIST hoe-3.21.0.gem 193024 BLAKE2B 2ff65edc6e0aebc93ebc8f3e628261ac3fabec4034b8e7b1bb3c38ab45c8b4641267a8c46c851ad69425c08782553c628574ae0a1417257cf64ba05a86de08f3 SHA512 39da93520bdb4efcbc58af58562ff8abbdecf45f92071ddb31f68ac799eb6f704431cea3d699aa039ba3a5217dc9b0f2d87f8b553d62860c34cb63803b625754
-EBUILD hoe-3.21.0.ebuild 1477 BLAKE2B 2c4e68468c59d23dcba0a4142feea16d12c7ddc021a2410b03dc2742126f8268143047fa0634c3e3e20606efe3bd1128d8cfcc66521b99ee4b58dcf85e3e73f6 SHA512 407385b02d50fbaa025f7e4edc10b2f3728332d1f26fdc6348f5df82f13bfead6f7d2940f855ac901925fddbde25f43979c338f10861454bc963373c9a40bd13
+EBUILD hoe-3.21.0.ebuild 1466 BLAKE2B 71d8239fa721f5118038c44291695ea537a53d436adea714522cb57d81686609bfd5c3d7b9b707ed345b9ce5f7b495837f63a5863001faa8722bd2855d69e2e8 SHA512 5fc5fd8009608e5fc7ba702b5260512df7b85a88cf86ae7ba0dc218e5eb760178ebd0d8ea471d9dfba12b675eb475000ed272108b2e36f52fed712159529b8bd
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/hoe/hoe-3.21.0.ebuild b/dev-ruby/hoe/hoe-3.21.0.ebuild
index 0a8f5049ecd3..441b335771a4 100644
--- a/dev-ruby/hoe/hoe-3.21.0.ebuild
+++ b/dev-ruby/hoe/hoe-3.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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"
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/hpricot/Manifest b/dev-ruby/hpricot/Manifest
index 5700ed8109da..791c5b97865d 100644
--- a/dev-ruby/hpricot/Manifest
+++ b/dev-ruby/hpricot/Manifest
@@ -1,4 +1,4 @@
 AUX hpricot-0.8.6-fast_xs.patch 650 BLAKE2B 5ad93195325fa1e26c2d207fefec83c8e01bbcbfdf933e6925a10bcf74a56c94b8517c7000a3c1aecff091b4d5d1cb3c29c9c899af7a5a5f5f0a17b1967118da SHA512 cbb1aa6138ec98e2eac9bcad8d06ed7c435a8ca503e062776576cfdddb944b294b270dd30e2c2924441ea527445df149e7ce34d085652ca6f184c4e66d209b8d
 DIST hpricot-0.8.6.gem 293888 BLAKE2B 5c054c6fcd5c3365dbf44f3c502bc4c1c3885f4aa43fd1fd15365aea19600ef0ef48157c39ef1709386bda0bc3fb6bba6d98862e8e28bdb5c173429969ef5ab9 SHA512 f0ea9168ae79d099cdb751dd5a205e0896dfb229759e499fff833e94209d1497aa97becb285176dcbcc1fee19bc11913ca3ac0d7a467067e5d837c1eb6e310ad
-EBUILD hpricot-0.8.6-r5.ebuild 1668 BLAKE2B 0709cba1b8c98b8d19d8136696e4f7459f2bcfd28dda0f31ea40bc93a2c2e927a6495d188221b2f269228324e6e2b4d3f4570e63d2c7b9876ebf1a39e0e34568 SHA512 7b6547b53494f8189282c969eefa542d1bcca1347358956ab3263492111113e51a0c9c933ea072d6117e673e4a377283d39146b641af51bbe605b76d774538d5
+EBUILD hpricot-0.8.6-r5.ebuild 1657 BLAKE2B 63bcfbabf090d1fce820bd6dfabe29e723f81bdae54cd47bf15390abf1488203dbbf1079b70c67f5fb5cefcb11858f681bd46a5a5b249315fa18e0378c379f23 SHA512 d6a1ed0d49e28d49490f03a7ee9881fb9cd1a4ba9079f544e620959d0781a0fc4cc46a98e6a87611fa90718e48ff1d4c88c5ad195be62738681a0a21f590c0b5
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
index 0f056d62fd83..427600a8ca0f 100644
--- a/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
+++ b/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.github.com/hpricot/hpricot"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "dev-ruby/rake
diff --git a/dev-ruby/htmlentities/Manifest b/dev-ruby/htmlentities/Manifest
index 9ba8459fc171..fc3ce97d9694 100644
--- a/dev-ruby/htmlentities/Manifest
+++ b/dev-ruby/htmlentities/Manifest
@@ -1,3 +1,3 @@
 DIST htmlentities-4.3.4.gem 31744 BLAKE2B 519f84a05ab8fa5cc2e7994785606b6d66a70169af7acdd9f5e2a71d08e06a29d93587175f7e13608bf2a05a21a7597cb435653282c2485aa07d89cbfb83d9f5 SHA512 0163d6c014ffebb4ee9bdb15d32884c8d6af60681f240d3f0177811d37647776b8f8fd0aa4f1c7559403f36a5538ce8da6926bc16cc8105bd6eed5c180db700b
-EBUILD htmlentities-4.3.4.ebuild 555 BLAKE2B 74cba4e3e16581d8b8512680eca81ed35fdc9e256bb1305cea921f52054293b8a93ddefb801f5fc867f2d31d1c0a45605411b378ec82bf116002b2fa2342228b SHA512 a24116930f79f75c641a6a27c1627404c64fcd5671fcac3c57b18d0e9ccab35a660c45f34ee811aded1e4b6928cc24890c34ba3ac6edd69b42863984975ddd6d
+EBUILD htmlentities-4.3.4.ebuild 544 BLAKE2B 3a0266e980fdfbc247af3be8133b016caaae4b2397816ef3819a9e361bdd76ac0225af43ab8f7ce7c7e30a1870e48f38239d9bec8eab29a49de3d75bfe46a250 SHA512 b5c0b8a666d88b9becca840d204e84acf3e6ecf5c963f822c2405a8ba0ccf221bd32986f0f5736f25ef03e94ad2810b2a4c87b8804f984e87b88e457c7fb88e4
 MISC metadata.xml 351 BLAKE2B 270b91c22dbd5efffd574e0bfec5c90a07cbd1ad210d32817fd33863d14eed264bf45aabf008e7671343f4cb0ddcd0f5c3715bb37bcc7e5dce97eda80f8e3a82 SHA512 083e92aa92936ce5ca90881146d8999ad6685e7e024b192e61fb0dea24aa29ccf34786a73b7984dd7c8859555f8012fc9c6d40f902dae39bb0aab61565fac55d
diff --git a/dev-ruby/htmlentities/htmlentities-4.3.4.ebuild b/dev-ruby/htmlentities/htmlentities-4.3.4.ebuild
index 5a0fe5319db3..15d7cbebe9b7 100644
--- a/dev-ruby/htmlentities/htmlentities-4.3.4.ebuild
+++ b/dev-ruby/htmlentities/htmlentities-4.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/threedaymonk/htmlentities"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-macos"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 each_ruby_test() {
diff --git a/dev-ruby/httpclient/Manifest b/dev-ruby/httpclient/Manifest
index 8bb71070d424..b403a8003eb4 100644
--- a/dev-ruby/httpclient/Manifest
+++ b/dev-ruby/httpclient/Manifest
@@ -1,3 +1,3 @@
 DIST httpclient-2.8.3.tgz 464624 BLAKE2B ce8ed523a24acce219027a4f1985caf2b4dae29bdba038ca2397e5f4d4b36c90b35cedfb62faa7faf426c3ce8589906df7832968c81b64bc9100eff6f4fe9745 SHA512 b65b5adb97af069d7ff6b6f4cccd6a42c6d9c88b797e9495768fe1f36a6bd93defe50190edc201de5e39c4e306ba0bd17a8ff2f8eba4d636dacafa06c172967d
-EBUILD httpclient-2.8.3.ebuild 1980 BLAKE2B edd346e19619764f1730c186f85e507c8a993d51930a9f60b6c953c670edd878f51b1514bb613e5abebe4fcc36c6db144b50d7e79956dcfd1a91a376253969c7 SHA512 d7a78a59963b2051a47102f739993a295f095dbebe85bd5eab04a960a0861edc1036ac836e57832fee2e3ad695db9da3f66374fc016a1c9650c12eaa1e88d2f9
+EBUILD httpclient-2.8.3.ebuild 1969 BLAKE2B abb0da2b4338c47829d642a1a10e4c84b6093c890f5f2718bf264492dd73cc3623790a4ec109468dce9b3de2aa3fe8ff4d45719e92e70a1ca7194549a3310961 SHA512 bc84b1da002d33a060fe8348842e5bf2d2dd0cf728e03bbfb6a129d83a70232744cc6024a10d7a85405606457153a4bae0ad8c788db152ebc22b80c59d3a3aaa
 MISC metadata.xml 341 BLAKE2B 09a632c45802b3044056e60f69c99f2829bd710728ae4014de53ef83dc1e273a6e751a1d84e08195319ea207e8b62f11a1d055c96f6f161483a00746d6103cd4 SHA512 04d6c137c27403e7512feab47cd105f6cef456af315ec05b5204022eb9a8b7eda358f3ef4a19ff457770b3898c6395055880f5a162477f15d0948b148c902288
diff --git a/dev-ruby/httpclient/httpclient-2.8.3.ebuild b/dev-ruby/httpclient/httpclient-2.8.3.ebuild
index 6ab31bcbc8d4..f5e7bf53b506 100644
--- a/dev-ruby/httpclient/httpclient-2.8.3.ebuild
+++ b/dev-ruby/httpclient/httpclient-2.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/nahi/httpclient/archive/v${PV}.tar.gz -> ${P}.tgz"
 LICENSE="Ruby"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+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 "virtual/ruby-ssl"
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index f2534fdf8e1e..fe6654053b55 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -3,8 +3,12 @@ DIST i18n-0.7.0.tar.gz 57647 BLAKE2B 50ea36ec616b90a261151cce47c98250e85b25ae75f
 DIST i18n-1.7.1.tar.gz 66346 BLAKE2B 4fc0ba1130e2a1c5c9c603ff06ab076ef2d9ee57e968bce8dca4f2c5ee70079af5e38e69700f4df65101c141ef3b38e2cabd478dbeb274b17504f4f818fae161 SHA512 bc6c3587f084bb582a22647eb27ac53ccfbedbf8fe16f2a5605221f8033cbb920a557b5c7fe8247d407630ae5d245db55484a4da9396f519b705878371672e99
 DIST i18n-1.8.2.tar.gz 66623 BLAKE2B 2bc2a6174ae9b6a3342d925d29501e9cf959bf78f683a446330ab40064f39bbba5a715acf6b3baa2a1250308823880f9f91ec09aed03686f3d5bcbc314ef5807 SHA512 20cc06ab63c1e4343a49e2d979399dd599dc14e9a0faed260874d2c44419ca9b7262eb95b9949ed5cf0439b79854f5d810fe1731823b625449065666102340d3
 DIST i18n-1.8.5.tar.gz 67840 BLAKE2B 977bfd086c83f86a47413a5d332f09ee521fc269f4e333721ee8bf71334cff001975fe3a31fc84e600b34d0037050e00afd5f59db5a51b566d8648fec50de016 SHA512 0fd51cdc059c17b1581d187f39149bec1de4bcb06e6c9867f084fce26a8d6a6570b0058689cc30ff7ae14ea562b64ecdaf10ab3d4d2fbe246717583ca20100be
-EBUILD i18n-0.7.0-r3.ebuild 1625 BLAKE2B 047cb266a12b698343260e0ff2d2448a95005493672a1e2bad7423c8c69b08c02b596d633864db0fe301c8afb1e82031feee602765bf1c97ee7472e60c72c0f1 SHA512 6427eac2d7f85ebd7d1060d565899a976da63229cf3567b01fdf0357e22b5cc185c6e200b0d2fe219589b031c5377706136dbec7d64c1ba8f5559014f687c91a
-EBUILD i18n-1.7.1.ebuild 1523 BLAKE2B 7b24be876aedd1d5dfeb970f4a407c8aac2099bf521c4ba648e86d6bf1b3adb69405c0d22c34cde7cced16923938d65c0e1f724e98ec56332a6469a2d2c37306 SHA512 61ea946437e2a930ed644be7c84417420e2334819244295deda685440cb5c3dee02becc3f43e5bdef82c29531b8458f7a0baa210e7d4f0051a99795f19c7304e
-EBUILD i18n-1.8.2.ebuild 1524 BLAKE2B 2609711dedf31dff84450a9e28ef7e6a341b4880d96a6320245a7375d340ae33cb126f55c3b0ed9472eb279fd8c24e96774e3d7e69af9d9352559825e1994721 SHA512 0c24dcd977f4344202e53ebd991ab9de6d00247b85d8d56c2a72959bba8a22ebe3c313ed93627dabd6dd8c6de0eb078bcf02b24f71892b5664593c3e17d63d8b
-EBUILD i18n-1.8.5.ebuild 1565 BLAKE2B fe82f1001a5c6a8ce74de7b50eed8e4bd8291cbf3999096ee567702ec9436bb386f22a81ab565bd922e8adefd947454e1263d0727b852c74d8498df9fcd0ce23 SHA512 3a2c1e3876241ef0e793de794ea059b507ab1a6f8829d6c452a7bcd5ef5e4da115ce5cd3748c9194b3dcdc735e98b1f59b997969d3ab174e93b49ba9fa58b61d
+DIST i18n-1.8.6.tar.gz 67932 BLAKE2B 779bbfb042777abd44d157c2bc8d716afbd3b1a20da3252007eae1c455cf38b1480f6e7e0d3a8407d239139d22cc50b9a6c472943f00fddacc8e48e4800ed10c SHA512 74088250e84390267dfe1eef84235e1dfc8546fa64bd49ddb76a46b363ebc260d4c18354cee6cdefc1ef79360a1e9186096e900dabba19f61cdb948f1ec6287f
+DIST i18n-1.8.7.tar.gz 67999 BLAKE2B eb0ec1bc8ae1fca99756b197f8a91b9fd7b72ea9b781b1958085ea4caaf93f0e1af0c6b70508669958b74859093d941a8e58a10be40a4ca3530db2e18a43da4d SHA512 bfb12cb1565e3eff597639199d807cc3a468cc29d1afe48a4448ea7e100fe9684c6bb1ddfc9cd258c64efb809f7bebd077fca390e16058f468511f430ace7468
+EBUILD i18n-0.7.0-r3.ebuild 1611 BLAKE2B 1484a92ad9f46fd5ce3c2a98370ce8b66c8752b0482d1a67f411240a0fe1adf9a12af121ac7a5fef1792f791929525c504ce377b8bca89993da4d68a1c26603f SHA512 991a21901760e6c88503b8f144a6cb14af57de2d2ef90856177ea3b0535635c2a6c7573def25cab1c56283e28b0bc8a4706822ff727e4dc1d876eb2eb5fa62e1
+EBUILD i18n-1.7.1.ebuild 1512 BLAKE2B a07476ace177e5bbee177b169920c6bef85d90f82502e9696bb8099f03eb5f745e1bd2e7c07cb41a650e08ea51afe739bcdea24860b675a1dedbcae6c4fc92bb SHA512 1cf2fae5715fb454b73b73304548ed7d9c170b395122236db6bec52deceb2b5db8792c56dc3bfe14eab96330fcdcbea97a83594dde865b62c79a359760d4d0fd
+EBUILD i18n-1.8.2.ebuild 1513 BLAKE2B 4bda6c55e2331a18543ba8cd36cae81e5a1c82b86caf710937f2b64825083c52465a55163a7c0651a6731b010f97759dc4eb6f4d3625ede766f96f6ab101fd0a SHA512 fca0eed032c5a97b6909785c4dd611e8a252809ede2432465033ede1da00673d3630054bf5917a68cfdab0c7000523ebd56b619ee56d2343556fcb657b240fc5
+EBUILD i18n-1.8.5.ebuild 1554 BLAKE2B 01ea2c6fd2cec8c6e34a81e377138445eeff6fd3c658dea1f48f1fdc101fe5dc0c0064496753da5a918af47fb626eb8006f1d1120261303a65ce38ddbc34d00c SHA512 d0ca2c9fef218f5a97e065b66789fac5d8da8a8b4fb6e30e68b0c7dd30971e8dab3c03d6170b2af1756591ca1eaa3e454c79c9c1493f37d2066e43d7ff21f467
+EBUILD i18n-1.8.6.ebuild 1555 BLAKE2B 59a324fa7eb34034b4439797c6c65446eb2e25f095fe70727bbc9c00535f7afc1fc6412b2afa77b212f1f9ac385aa16c1f715543441dc68d3a8577ba0487ddd2 SHA512 08172d79e8bb9f1f87dfa46bc19835677ee5c02a0fbd14660bd9e7fd0687081fe200444fcbda2b6f006cacc2627c982ef7c8f2bc01bf271f5f1e808005550d72
+EBUILD i18n-1.8.7.ebuild 1555 BLAKE2B 59a324fa7eb34034b4439797c6c65446eb2e25f095fe70727bbc9c00535f7afc1fc6412b2afa77b212f1f9ac385aa16c1f715543441dc68d3a8577ba0487ddd2 SHA512 08172d79e8bb9f1f87dfa46bc19835677ee5c02a0fbd14660bd9e7fd0687081fe200444fcbda2b6f006cacc2627c982ef7c8f2bc01bf271f5f1e808005550d72
 MISC metadata.xml 340 BLAKE2B fd50e1569f22c70ba423cfd181cdfbad5348aed4ffc751ff04d38db0e3c64ec0e3d7501fd134401337337549509f7501a23e36b8a9bdd99a18a374885f8c8596 SHA512 09bf74eefe2371ac635fe302efe1b928e37cf0e1da0979f629085f357bc3e93ea87407781ad172139166f21cb979dbbc7e1bec013f8fe0a760cbbe94ab23ac64
diff --git a/dev-ruby/i18n/i18n-0.7.0-r3.ebuild b/dev-ruby/i18n/i18n-0.7.0-r3.ebuild
index 20e503e260bf..b595e4109ce2 100644
--- a/dev-ruby/i18n/i18n-0.7.0-r3.ebuild
+++ b/dev-ruby/i18n/i18n-0.7.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_PATCHES=( ${P}-frozen-classes.patch )
diff --git a/dev-ruby/i18n/i18n-1.7.1.ebuild b/dev-ruby/i18n/i18n-1.7.1.ebuild
index 66c5c406233c..615079ffaaf5 100644
--- a/dev-ruby/i18n/i18n-1.7.1.ebuild
+++ b/dev-ruby/i18n/i18n-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
diff --git a/dev-ruby/i18n/i18n-1.8.2.ebuild b/dev-ruby/i18n/i18n-1.8.2.ebuild
index 2b0bdc5573d6..43810f7b107c 100644
--- a/dev-ruby/i18n/i18n-1.8.2.ebuild
+++ b/dev-ruby/i18n/i18n-1.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
diff --git a/dev-ruby/i18n/i18n-1.8.5.ebuild b/dev-ruby/i18n/i18n-1.8.5.ebuild
index f25448dde879..384f922459ba 100644
--- a/dev-ruby/i18n/i18n-1.8.5.ebuild
+++ b/dev-ruby/i18n/i18n-1.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
diff --git a/dev-ruby/i18n/i18n-1.8.6.ebuild b/dev-ruby/i18n/i18n-1.8.6.ebuild
new file mode 100644
index 000000000000..b4f94ae7c427
--- /dev/null
+++ b/dev-ruby/i18n/i18n-1.8.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add Internationalization support to your Ruby application"
+HOMEPAGE="http://rails-i18n.org/"
+SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/activesupport-5.1
+	dev-ruby/bundler
+	>=dev-ruby/mocha-1.7.0
+	dev-ruby/test_declarative )"
+
+all_ruby_prepare() {
+	rm -f gemfiles/*.lock || die
+
+	# Remove optional unpackaged oj gem
+	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
+
+	# Update old test dependencies
+	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' gemfiles/* || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby27)
+			versions="6.0"
+			;;
+		*ruby26)
+			versions="5.2 6.0"
+			;;
+		*ruby25)
+			versions="5.2 6.0"
+			;;
+		*ruby24)
+			versions="5.2"
+			;;
+	esac
+
+	for version in ${versions} ; do
+		if has_version "dev-ruby/activesupport:${version}" ; then
+			einfo "Running tests with activesupport ${version}"
+			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
+		fi
+	done
+}
diff --git a/dev-ruby/i18n/i18n-1.8.7.ebuild b/dev-ruby/i18n/i18n-1.8.7.ebuild
new file mode 100644
index 000000000000..b4f94ae7c427
--- /dev/null
+++ b/dev-ruby/i18n/i18n-1.8.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add Internationalization support to your Ruby application"
+HOMEPAGE="http://rails-i18n.org/"
+SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/activesupport-5.1
+	dev-ruby/bundler
+	>=dev-ruby/mocha-1.7.0
+	dev-ruby/test_declarative )"
+
+all_ruby_prepare() {
+	rm -f gemfiles/*.lock || die
+
+	# Remove optional unpackaged oj gem
+	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
+
+	# Update old test dependencies
+	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' gemfiles/* || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby27)
+			versions="6.0"
+			;;
+		*ruby26)
+			versions="5.2 6.0"
+			;;
+		*ruby25)
+			versions="5.2 6.0"
+			;;
+		*ruby24)
+			versions="5.2"
+			;;
+	esac
+
+	for version in ${versions} ; do
+		if has_version "dev-ruby/activesupport:${version}" ; then
+			einfo "Running tests with activesupport ${version}"
+			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
+		fi
+	done
+}
diff --git a/dev-ruby/iobuffer/Manifest b/dev-ruby/iobuffer/Manifest
index aa6ae9f40414..a2eb01874852 100644
--- a/dev-ruby/iobuffer/Manifest
+++ b/dev-ruby/iobuffer/Manifest
@@ -1,3 +1,3 @@
 DIST iobuffer-git-1.1.2.tgz 9286 BLAKE2B 8e5a1fc5b33bfd40ba561c27259079c5511b7cba8b0a55bf120b1c6dcf5552cc0adcf6e08aa8f8cda083aba1013a7f690c20268908760e50ca6bc63a02ae020e SHA512 cec67ac42b3966c144fc61c8fa1a36f166d0a892ec4ebb2f6e0fc218eac5fd7bfb803973b05ae52ff05b04eb86caae0cfee4cc1430e876e58157b5bdc41723c7
-EBUILD iobuffer-1.1.2-r3.ebuild 935 BLAKE2B fbf9d8e24cf22931140afde159c083664fb0284a0d20c567ec09c2ad507ed1f844610b2a340661cf557fbd95a20b357bfabb999832fc584c280f364c196fd1fa SHA512 b34d56c68c1617d36a4831b7ebd74a11b29e4d3ca6f95c4f4d1992151a076b831c7c8d0b39fb759d6614cbd79b3dd2c6db94808fc3eda2ebeabfc7f6e1bb6132
+EBUILD iobuffer-1.1.2-r3.ebuild 924 BLAKE2B 292f32e12e3cb126448ee8d598227775909141bcb2e9d782805ca320ac938d07e878f49846ca6f2437f126e227107435200153cf38ee3c1c509b0f1d08836ff0 SHA512 9dcfdc697e98803c26c06a653fcd314fba2e6efeeea6c3739f4f2a7ca408f00e2140337096326c23f9a5411c3dde823592cb74b0d2e8cbe3ba9da13b46c1c779
 MISC metadata.xml 343 BLAKE2B 51e97a0c05cb72583d5bf370939a36d0e5b263f3cfb5bea00545260992d6f216ea15fae876a767d7f91c4732b930cad86c0bca8d95d435c7209763c3d8b0307e SHA512 2dd75710c00d7a9984d85393bf831ac8de6e891799f9d0b7414f87f7d89e6b0e149e25b1061ddc92f7a3d941691b5b7d6edaee4f0ea168d36e9d0ef5d25aa606
diff --git a/dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild b/dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild
index 273ffb3940b0..bffbee494074 100644
--- a/dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild
+++ b/dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/tarcieri/iobuffer"
 SRC_URI="https://github.com/${GITHUB_USER}/iobuffer/tarball/v${PV} -> ${PN}-git-${PV}.tgz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 2f9683867dac..a12233997c90 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,7 +1,7 @@
 DIST json-2.3.0.gem 114176 BLAKE2B 329f1305a0cae3d44c74cc7475c7340e86b8447d5e4ffdd5854620669ee4ef5bba0ed7dbc617b0beffb7bfd8b3d79d46ce26feef37685413a4a5a9c230d0ce0c SHA512 9086a64b664f2d774439c0c9f10c2c1cd897684050eb60f8e3ad9256e0b9541deec3bd22fab0bdcf66e3d5bc795720c6923d514b6edb824c9962fc22f162b332
 DIST json-2.3.1.gem 118784 BLAKE2B 6852f5d1733fd5d596b44d095c37d11a129b02fc61dc81afa90aef3623eefdb5515f6755dce42f055954baf2ac45e87620940ccd7c2c839501945923dbe62d18 SHA512 a9a0c54ac1faacc412ad708b630c8bad8c6f99db6862e8fc80c46207f0f0972433fbfe51d0c93a5d91b91c59b1fef5ad8e64e36cc49e32b3e51ff390a380a2a9
 DIST json-2.5.1.tar.gz 131183 BLAKE2B 2ccdf5921ef476b66cb1dbf72cc01763636c82b0eb5d0a5cfc029e14177c7c6766464e7852b11c2424db401f5b931cb64c01d3952929236c9979378a7928ea59 SHA512 4df7ec9b86692376e89c2019c2c1ab3ae9af28fb4742864acc6f985c0551fc10795742cc1124d6435e820617c00d4c5f4aa6c83b21d2fff43ed05cd9d0a89087
-EBUILD json-2.3.0.ebuild 2020 BLAKE2B eb3915640c81bb455c1df8a00ed17ece7ae080640e51f8e3e44ba23290e9d42c53afd08ce5558b572aa21ce9775027011cb5f88381e6b540e9994ff9889918d8 SHA512 b224e1f4aaeedb6eb85240981b248c4ba0a2af10e89189213907f94a654be49314ec7bfc94a318d331443294ffdc1aee6c1e7562d7114a24579e2d8823942c2c
-EBUILD json-2.3.1.ebuild 2022 BLAKE2B 1b0906ba33e33ec5d8753bddb4f3984ef2c7bd6266eb5db204a41ccf59ae69e12cf67ed720e0478ca9294c4888f001ced378fa699c22c6957acca26d6ff28427 SHA512 60f1ca0da544ec4023a10ce4c391d3b5fb7ecdd3811d5ac2b1e6c569f575f1afc3f4b5841ad24625795c82ace5991776b1277a9e28a1b109e2a3f8f68baaf269
-EBUILD json-2.5.1.ebuild 2006 BLAKE2B 5ace3214a6f18fdb09f121fee9c9c546ca9cbf632c09ce50b2090a907f39222b9ccf991d85719ca137664bb16a2733c240f127ae23bcddbbaed42e12ae715b04 SHA512 3cb51163aa8692f0a8783bffd70d54d3fa77897a3662c4eb6025e86b488b1fef209224c7b6a7fa473b2bb2b1c34ae0306bb5224de8e4fbbd630b0468e18c22e3
+EBUILD json-2.3.0.ebuild 2009 BLAKE2B d36aea49d26a9560c3dc178143932411969c63fe353f13230357e18a10103e04c61d657483059f62df79d9ca0bad8c8c8f5063bc96ae701b7722b006b18fa249 SHA512 552c9cc17d79bc8b16b6e6eb2c4d6d6bb561a8f200c3706faecbd0b43715f60ed63e52bbc8ee915a88328fba5db2bc5afe3443bea4e90d693c34638ab5227f20
+EBUILD json-2.3.1.ebuild 2011 BLAKE2B c84cc2365edb9c5d5bdbe10e685633bd6686d2010b251bae57cb1b0eb03ffe1f2836dee1d3709d0f28d34c5f92ef46aac6b88603e1420baa05cc961b30fd4771 SHA512 2365221d5f20d97fec7f091ceaa4b5629f3caf8fc1e2f2000cae41815c13ea889fe0ad8430e17605d737576cc95bf98c4a2415cc753be9ba6220d3d92f31f419
+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.3.0.ebuild b/dev-ruby/json/json-2.3.0.ebuild
index faf3e07c3ac4..4d4ad773d37b 100644
--- a/dev-ruby/json/json-2.3.0.ebuild
+++ b/dev-ruby/json/json-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
 HOMEPAGE="https://github.com/flori/json"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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"
 SLOT="2"
 IUSE=""
 
diff --git a/dev-ruby/json/json-2.3.1.ebuild b/dev-ruby/json/json-2.3.1.ebuild
index c7cfd6fdef93..a71902f0775f 100644
--- a/dev-ruby/json/json-2.3.1.ebuild
+++ b/dev-ruby/json/json-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
 HOMEPAGE="https://github.com/flori/json"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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"
 SLOT="2"
 IUSE=""
 
diff --git a/dev-ruby/json/json-2.5.1.ebuild b/dev-ruby/json/json-2.5.1.ebuild
index 5fae8444682d..ad69f8dec5de 100644
--- a/dev-ruby/json/json-2.5.1.ebuild
+++ b/dev-ruby/json/json-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,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 ~x86-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"
 SLOT="2"
 IUSE=""
 
diff --git a/dev-ruby/kpeg/Manifest b/dev-ruby/kpeg/Manifest
index 5000ab3ee502..7631c785d2a8 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 730 BLAKE2B 974b5637cefb19423884f1dd90ba45afc17eff878b0b0fbe8dac6ba1520f87294446713529fb54b19ab626ffdb7e163c80cef79df3e743e2891539ee4d7ea757 SHA512 1b1399cd37b4d105e8d05459014a7e7ab6076982b88cc362ad536b7f24285a20896add6d9585089fb7da2910dcb978c635e4daba179be0debee90724bb89f116
+EBUILD kpeg-1.1.0-r1.ebuild 719 BLAKE2B 6503f1c208d886638631407b8709aaa5155bc84c8f4283bb7d77f9686c5eee7ea1c3a424aa0ca07ce4be661673b5b2fd0d0c5d24ca3193fbb7564f205258a83c SHA512 7ff617f70306ab80042e6676c787ab1d8fd1c9a8f862cfb56799fcda5bc65211ae5ed3d24ee0f6cffe46056ef9d622bee3485e5eb6888c9658c669cca229e598
 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 e693c46995fc..dc613adee85f 100644
--- a/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
+++ b/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~x86-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="test"
 
 PATCHES=( "${FILESDIR}/${P}-utf8.patch" )
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index 391104b6d9d4..ebec7d6ba66d 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -1,13 +1,9 @@
 DIST listen-1.3.1-git.tgz 35521 BLAKE2B 6b93daff2b3ba221d0c0f196c67353963e983610dd9deb3409c8ad270f7221d50e9eefee826c16c51ac0361cf7f5da727db216b1bd92a02077b0bee580fa368c SHA512 4676d030a3e676249a221cf4a136ce69651009ce5855821924be184460e404e4f33026627c9d524156a89344c826b48a690a249f1059493d7d214b922381bdd0
 DIST listen-3.2.1.tar.gz 51030 BLAKE2B 1c7df3910c856c472f42417d51449f04d56635f0c77dbc6eb7a30d25042482f4efc7bbfa2d74609aa9f8d4ae134f53dc675b621efe35c2cc6faed8780d7128c8 SHA512 24cd67b926589401123dfce1a344a6d1ab1d0f9435b9646b7f638deebc0f683b77df70064537f84538eaf800beca4c67fd7c02e40d955fac92866b8ce1eeb769
-DIST listen-3.3.0.tar.gz 53387 BLAKE2B 4e68e0789fde26c43bdeaba3742d1e3ca6f573441ed0b71f54ca85712c39727cb5dc4975b06a6ce52ac2e7049588442a787c7deaada7e162076af5a514884f1f SHA512 c3a4df6293429962c6412b16c7bbabe0244e1296a6bd5516397699f8770793cb7f7dfac78f74593183c2312eb8832f4ab7a650ee29722c7e4e1493faace1b726
-DIST listen-3.3.1.tar.gz 53470 BLAKE2B 6dfe8074883cbced8f7b707414309428b16e755e6652106cb0525dbee0a7596ae1b57b22e8dca665294d9a23de6776738ecb527ea8467fa6c0ff5a04ecdd04f6 SHA512 fbdd743eecd7be5431e7a698d8a00b17f0889975292b1eb798ab8fbddf997aaeb296ee13f846481bc68fbcd512e91f65296792829557a1d420a422717bf1e8a5
-DIST listen-3.3.2.tar.gz 52911 BLAKE2B c9a086a37def00b6d48477a3ebac9735ceb4dd08c122555e45223dc60a382d313de0aadc86c853f1c6f3b91d82a7f5dfb5b2bacfa19fd7768ef6aced8ae0e4d0 SHA512 9f9f04138c836872370fca766fda0f8305c953ab2ee06790112692d5c19529b0c16b9cccd492003778972aca700dbdcfcb111b23f22c2c3ba5252dbeebb21e07
 DIST listen-3.3.3.tar.gz 52994 BLAKE2B 95831a65a75cae28b767696bbe5969cd7115657fa56e01701f3b17d5bd727a053cbac16928d8c7c2a19ad24ea3c99afdadd1e9ebbae0a66d03a511ded7d32734 SHA512 73ad762086e7961e45f1245e5aa32c738824736b7d373c31565832c3acf25f91cbc9c25d7bdffb27cf953cb2b2bb37adfddcc6888f3a1b317f70cba75c2ce67c
+DIST listen-3.4.0.tar.gz 55390 BLAKE2B 44f0319a19cbac9535b585380c95a4c538a19f9b66a837ccb78ede4d2e8d2c49d0c78ff21913a8de959de43dfb62f4e5489ce70b06e0d5c47e19be81e42fa8dc SHA512 b247c6ec907141549943fd1eae4075c18efb653dbb666bd8b71876c4bd96ae637d4634746815ef1f35335414ff833479fbb2a5a997df994d16bb42b21775b5a2
 EBUILD listen-1.3.1-r4.ebuild 972 BLAKE2B c8062f42d923c5dfc3b352bd14c96a5afc6d79b1b4756a3fc0e6792f89179e454bcdbba2d2697433b33180c0edbbb503a81a1b252109ea8a3cc1b7c7d302c8f8 SHA512 31c83048aee128b6e90303e7eea9f8fc16faa0814db329283a58adb9dcac275efb1586814a5ce999f0525fe7829130dcf8bd2fdfb32e5efaf197517400bfe444
 EBUILD listen-3.2.1.ebuild 1208 BLAKE2B fe6653f617c1f0caf4c4cb39ab27977acd22af42ac1ecbdd03be705918050d4b973eb6410a1eb1e484a2ba90c51c2c9ca6d18e0d259d160c911e41d7916e680e SHA512 6c54b1af911554bd2c91e94ee7b6e005715fffa9b31594a270c7b49f819bd38e427b9fd376c2d027bf97400d67bc49688487166de0597a47185cbafddb1e1549
-EBUILD listen-3.3.0.ebuild 1202 BLAKE2B 3cc3d6fbcceb441f1686b9e63068ff7a023037a8bdf3a3fc9d7c3dda0f62946f35d8d5a2349a2c7931f41f7f12ddcf568dd3ff1bcca7cb28e435eb4608be95b9 SHA512 a26d23061fe17642f5f85173bf4e97daa912dde4bf100ee8f12268975326dcca07599534101b7f24e0f66034108eea4f53b7afe4d1d386e0f3e88e0d0ff4b8de
-EBUILD listen-3.3.1.ebuild 1202 BLAKE2B 3cc3d6fbcceb441f1686b9e63068ff7a023037a8bdf3a3fc9d7c3dda0f62946f35d8d5a2349a2c7931f41f7f12ddcf568dd3ff1bcca7cb28e435eb4608be95b9 SHA512 a26d23061fe17642f5f85173bf4e97daa912dde4bf100ee8f12268975326dcca07599534101b7f24e0f66034108eea4f53b7afe4d1d386e0f3e88e0d0ff4b8de
-EBUILD listen-3.3.2.ebuild 1202 BLAKE2B 3cc3d6fbcceb441f1686b9e63068ff7a023037a8bdf3a3fc9d7c3dda0f62946f35d8d5a2349a2c7931f41f7f12ddcf568dd3ff1bcca7cb28e435eb4608be95b9 SHA512 a26d23061fe17642f5f85173bf4e97daa912dde4bf100ee8f12268975326dcca07599534101b7f24e0f66034108eea4f53b7afe4d1d386e0f3e88e0d0ff4b8de
-EBUILD listen-3.3.3.ebuild 1202 BLAKE2B 3cc3d6fbcceb441f1686b9e63068ff7a023037a8bdf3a3fc9d7c3dda0f62946f35d8d5a2349a2c7931f41f7f12ddcf568dd3ff1bcca7cb28e435eb4608be95b9 SHA512 a26d23061fe17642f5f85173bf4e97daa912dde4bf100ee8f12268975326dcca07599534101b7f24e0f66034108eea4f53b7afe4d1d386e0f3e88e0d0ff4b8de
+EBUILD listen-3.3.3.ebuild 1201 BLAKE2B 5db4e313fc8bc0a67e5ba7a2b8a14330ed78e02ea82989981c64ef3398e30d9f12b555eda9e11cceb242302daff8252b6f2772a843ffb8f3f3147ddc2bdfb1ef SHA512 2715c9493641cff9f1d980cc298b7ce85d8b6e27d776c7461e273e85a8327a57ebfd81ff522bdfac1b8dade7fb47c161a0dd7cead9fc08965bcdcebeb65c4c0d
+EBUILD listen-3.4.0.ebuild 1202 BLAKE2B 437f65eb29fee061d5dbb34179cec9e7058d1af8d2963e0ae9a3a9c66a68985402d1559fa0f8c387889f9bdaadf561a3b8d472c00d5ba74e1dc6a76c1d6ac81d SHA512 d50f8bf4946406d636ef0a2432bfe2b6569ccb59c69ec5da132147c4047ce5428672e9089188a70b64745c3765e5c1a516934a9d2b0a447ba75af795e2c2071f
 MISC metadata.xml 338 BLAKE2B aa66734c1150c6a7b21e1c018d4303311955fb6e1eadcdfe16c3ca514b3aad663e4c16399a75b091e614ed87a86b6958577771e040700e01590447d33bd77dab SHA512 f4035107afc1bcbab797e116a0f39e49c9a4034f838878ad448efea9eba8d2fbc4db074db73871550a42c175c9e36a220877d2ed50580828c3180fcc50913288
diff --git a/dev-ruby/listen/listen-3.3.1.ebuild b/dev-ruby/listen/listen-3.3.1.ebuild
deleted file mode 100644
index 7120fbcdf848..000000000000
--- a/dev-ruby/listen/listen-3.3.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_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/listen/listen-3.3.2.ebuild b/dev-ruby/listen/listen-3.3.2.ebuild
deleted file mode 100644
index 7120fbcdf848..000000000000
--- a/dev-ruby/listen/listen-3.3.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_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/listen/listen-3.3.3.ebuild b/dev-ruby/listen/listen-3.3.3.ebuild
index 7120fbcdf848..5b598d3c025b 100644
--- a/dev-ruby/listen/listen-3.3.3.ebuild
+++ b/dev-ruby/listen/listen-3.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/guard/listen"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 # Block on other packages trying to install a /usr/bin/listen
diff --git a/dev-ruby/listen/listen-3.3.0.ebuild b/dev-ruby/listen/listen-3.4.0.ebuild
index 7120fbcdf848..ee04d1c2272e 100644
--- a/dev-ruby/listen/listen-3.3.0.ebuild
+++ b/dev-ruby/listen/listen-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-ruby/locale/Manifest b/dev-ruby/locale/Manifest
index 13ac086fc798..14ee626226bd 100644
--- a/dev-ruby/locale/Manifest
+++ b/dev-ruby/locale/Manifest
@@ -1,3 +1,3 @@
 DIST locale-2.1.3-git.tgz 99648 BLAKE2B e395a442f674c73ed03d0d4d55d875c796add076132964ce2abb457d5d6e2ed8643395f283728735bbbf1ffee8b03549e882e5c66f6a589106a0a36f5b9e4ff1 SHA512 77877f15914dbee5ca83155f8cb84815296b4e2e4205218c9926e0265b40940cbdbe68fb048870ce4f53a6caeeb593813a2e16e8c130a19e44a28cb67c82fe25
-EBUILD locale-2.1.3.ebuild 1095 BLAKE2B 552290df2e5d6a31fb1290205032563744a615db86e77accc60726db5b857eba04ef40255b33094221b5dae8904ceefd7e3fe3bb4b37b21815b4f1d7f53317aa SHA512 e7ea8b6e7a323c4576f9f44c36825b3c4592dac3e536f9972602564ed5875541f5cb49ad55c11feb8aac96c14b44d30a3308ad16108cab89ee6b68ae65d4abc9
+EBUILD locale-2.1.3.ebuild 1084 BLAKE2B 4efd40fdba78937fd40e5e4743dfda5caf1b5c20d814faf7426469e56dd92aa7cf0a37e206560b9ec4e6ff6931f72f87ef070ec0e3275b77fd2c6537c5b4996b SHA512 b4a56b1dd3ddc4dd883ce5619321bff63d12432a7d66285cd76bd23c6fbc682018e42e4c85d9215d87ee2ffd5603c702fb2eccbe36b82f45b01ec96b93e3cdad
 MISC metadata.xml 345 BLAKE2B c2f8101d9e2cd59540e4e95827ac5fa503b0f76bec78ba5a73031b3b966ed1e3153a05aadad5dd563db931881ff3597d1cfb74e113eba53470da11de29eaa809 SHA512 1da3655a6dd1df21971ff6ef41e3fce230f17379bb936ca8a03d1fec427a6904fec717884fd4551d23a493fcec85beb1a9107907c01faadb63b02db8efa0d5af
diff --git a/dev-ruby/locale/locale-2.1.3.ebuild b/dev-ruby/locale/locale-2.1.3.ebuild
index 4641822c37e2..ac76ddca104b 100644
--- a/dev-ruby/locale/locale-2.1.3.ebuild
+++ b/dev-ruby/locale/locale-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/ruby-gettext/locale"
 LICENSE="|| ( Ruby GPL-2 )"
 SRC_URI="https://github.com/ruby-gettext/locale/archive/${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/mab/Manifest b/dev-ruby/mab/Manifest
index 296c30b9107a..fe933240d918 100644
--- a/dev-ruby/mab/Manifest
+++ b/dev-ruby/mab/Manifest
@@ -1,3 +1,3 @@
 DIST mab-0.0.3.gem 25088 BLAKE2B 70d250f0fde8a2b7cc8bd50836b8a95b9c0d3e4c738ab2698781c685de508ee58465ce2710ef1fdc63316bfd4db9e16b1951f0d04a9db2a7b9ec0e237bd1c416 SHA512 0761a8de59243356981555ac5000cd98a0413f75bd9eb84848f8efd77be1895a44cf3b90f1182193f90c63a256ebe4a179e8f94a992a30f30ccaf4183b8d4c67
-EBUILD mab-0.0.3.ebuild 584 BLAKE2B eb25e1e9ebf233f1c8674e4fdfb5137ea5f300dc48e9087936bbce92ef2c0da00b5b488aa01c8990089eac509915ef69cee6219cd6ce015d56b0f27ea4013a77 SHA512 acc3b4ba4d49d9cd4ae58ee1c0bf263afe9cbbc48cd8ca774d2a054e11f45c6a4fa3aa2bb35b85b44d48ea59ac36cb0e5c94088afa80f1089214c9d938723eb8
+EBUILD mab-0.0.3.ebuild 573 BLAKE2B c042d8ec7ea0b0b24fd1749d353e03f778446493bc2c4e5e01a0cd50e03fb0bd4e71901e4589f10b4abc7e6890601e61416e08bca549be4e056f7d87b286d4ae SHA512 35f973d05a03dfebfd064c9000b51e984bbd94a4790525e092979df4d98935c642ae03b4eb05fd64fa5d680c6430109aafb4ec1d44cd838cf8e24c9bf3f51d5b
 MISC metadata.xml 337 BLAKE2B 65d4aea77f54f888fc65d68815c6eba286e79571a6bde73d96cc20cfc220383e2604cbfe2f2ed21c7a95ff029aefff585b5651210632b32e5fa37d27a5adf65b SHA512 41b676005fd23abfa8809dd03a0b3beb994f0831e1b9a9a6afac7d1feb6462f04da0a9ae5a0f3a32d9ede7b8598330d96bada693850355ed1b29ebe64c7a292e
diff --git a/dev-ruby/mab/mab-0.0.3.ebuild b/dev-ruby/mab/mab-0.0.3.ebuild
index 2c6f119cdd8c..4379705a46da 100644
--- a/dev-ruby/mab/mab-0.0.3.ebuild
+++ b/dev-ruby/mab/mab-0.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/camping/mab"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 IUSE="test"
 
diff --git a/dev-ruby/mail/Manifest b/dev-ruby/mail/Manifest
index 92563473b42c..aaadacd38462 100644
--- a/dev-ruby/mail/Manifest
+++ b/dev-ruby/mail/Manifest
@@ -1,3 +1,3 @@
 DIST mail-2.7.1-git.tar.gz 625251 BLAKE2B c1efbb259042155e983c1971fe9821eb0dd850089bd04cb0c74513f6f17dabf8ecc3155d9e5846ae657383f522872323f8fba37d51fba4318ac682d18a6d4c50 SHA512 17c601c86715135331f750048339a11a67a17f34486dbafa3ba7e9af9970d60927a2fa95c72a398418548df1fdf5addb2ed3afe9da7dff1f0bd949438726be1b
-EBUILD mail-2.7.1.ebuild 915 BLAKE2B 3c4734dff75ebbcd84609056536a5eb1d251cbdd518376f77a19d8218b3542fab6f37fc84680f8b9c8593526eba48df302fccc86be262837eed820ef5f025197 SHA512 7b9d08e487bbbce74f31beee2a5943d3b9d8b4d7bd5545857df5163ef7a5d98ce42bc689eb8ea18d1cc2fd17fcd06e697ed8d3970fe1e9a309dc723dcf328fa1
+EBUILD mail-2.7.1.ebuild 904 BLAKE2B 379b56b701fa0a0cb2aa9f690eafe914245e3cde8b29607425b5c352401514f0b1b4f55cd5a669d6c95a0c188e0ba2ad85b86310728b152c91568dca22cf4917 SHA512 cf3e5f7dfd4a3382def661c6819980a33abcfdad8e21cabdb9a68e955e28d97d7bec898b68fc77ac9a2c46ccc10aa1156ff5f41f0ca0f78c5eccc6fcb6e21e5b
 MISC metadata.xml 336 BLAKE2B 05720c141d8870f2d762c280717a98dd07ff1d6d3679ab777e69669542b257e1cda8dc845b780d221699b8fcece77fe75f9b5226ee8ecce772bd51af22d7dd68 SHA512 0952e9c85bcf07cc1adc299d0812259156410f487f2b10a77a29f7871128fa35595b605579f85b0868179f60b978585ed27cdc069608094f7fe186b5e15ae1b1
diff --git a/dev-ruby/mail/mail-2.7.1.ebuild b/dev-ruby/mail/mail-2.7.1.ebuild
index e1fa979df837..8e17aa55074e 100644
--- a/dev-ruby/mail/mail-2.7.1.ebuild
+++ b/dev-ruby/mail/mail-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${GITHUB_USER}/mail/archive/${PV}.tar.gz -> ${P}-git
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/mini_mime-0.1.1"
diff --git a/dev-ruby/maruku/Manifest b/dev-ruby/maruku/Manifest
index 6a0a58b81349..2495ebba1ef4 100644
--- a/dev-ruby/maruku/Manifest
+++ b/dev-ruby/maruku/Manifest
@@ -1,3 +1,3 @@
 DIST maruku-0.7.3.gem 140288 BLAKE2B 31da6bf63272a2e5a77aa6f3cdc1462f0039751424bd0888d69f2f2660534cab8868238cbde37d184c2ddbe50b76dbfa5305a450fc27b9995f74284a1f962724 SHA512 efef3eea7451e32c06c0820834cb98eb5424f6837b2e66e44482679d73d958e1e2c59e790a3e5ba26e0c91ece0a5c17f91877a7797d9a15a73b5344b0d444507
-EBUILD maruku-0.7.3.ebuild 1275 BLAKE2B 41d9ad07562bfaaafc4f09a69649f2dcb776777ee0a9bad23797589f9c84f20d338b93215d54b72d5106edd5b5facf3858a36616bfaccbf9c935bb2cb2ddc86d SHA512 959e7b0a4381752e6d585f13604e6029581c53717742dcd9c5ee335ffd02391e2fe692edd3216927b3daa6ea9a62c68c0f0775328dbf89930965f66b128ae689
+EBUILD maruku-0.7.3.ebuild 1264 BLAKE2B bf3342984948db6ee528a97c19fbeca2252e61d5ac83114d5fbdda32d63ad70e771ee7f2c4f7f4fb9570c780d38ef7ccd61774b27bcd94815f679888c1bf59e7 SHA512 1c41c626f676d6883eb258960282ac44312b2f2c2f9350a0d1c6470e5939ed7149ea434c8b412079660356d113c124b18ed6a8b47b5c1047bd2bfe544aa9c1f3
 MISC metadata.xml 454 BLAKE2B 543ededb4beb16959617c700295d7c7517c3969b482ee0e0ea71cab8c412ba09480b4503024dc23d1f419c9bc621a66cc23a589d240577554a36a712f4d1892e SHA512 b58d0a08843b11dd0ce0fc68d347f16aa2e6fd6530a3f7a54ece40c6076cc64544857081d9ff889a816ac545e68973f709c168378fdd756bca286e4b874a2084
diff --git a/dev-ruby/maruku/maruku-0.7.3.ebuild b/dev-ruby/maruku/maruku-0.7.3.ebuild
index fc978fd6a987..3c2e34c59774 100644
--- a/dev-ruby/maruku/maruku-0.7.3.ebuild
+++ b/dev-ruby/maruku/maruku-0.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/bhollis/maruku"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight test"
 
 ruby_add_bdepend "test? ( dev-ruby/nokogiri-diff dev-ruby/syntax )"
diff --git a/dev-ruby/maxitest/Manifest b/dev-ruby/maxitest/Manifest
index 488e530160ae..dd80cf72021d 100644
--- a/dev-ruby/maxitest/Manifest
+++ b/dev-ruby/maxitest/Manifest
@@ -1,5 +1,5 @@
 DIST maxitest-3.5.0.tar.gz 61982 BLAKE2B 2098e0b1c2f77ea535d78e5165ba9289a8470ce5c883a0994b03b822cdcba2a6d90077940a3d483505579fc7c89f347f0d492196b28fe8292406e5d6975c6241 SHA512 1a2557cea0ac70d3fd9b487157e5b6943dfd5cdf8b953731041d495049a9c58be84110e831cc57171ded3d5540ce5a3cd3c68e97f7767e30b04e933849202f40
 DIST maxitest-3.6.0.tar.gz 62261 BLAKE2B 4863b5892997ea7019d5dc65d1adf7febd7934e743276423b1fa8b1d81f3ec5d1deadbe57890e0af525a91ae371ab4c499be031b9a6875e5fc6f64d2e7c2cfad SHA512 41e816d21769382af598ebd64f918437a5816308fd9a9695a88ed97d05e7b41085b2a6f8343ffea50bc7016562857f09057591c2698e920a6bfbd5536edc283f
-EBUILD maxitest-3.5.0.ebuild 1267 BLAKE2B e8704bec77e593699a98763a0772e21a55ca7e0c12289f115a9c1277b0fdfde2361531a0b577315f7dd6bd408b6e44a220028a7d17ea17241010b5abd048c225 SHA512 74c7f96975ebc36991a206866609703f0b10a6c2ca28ca878d073537365b00c60f2a91dcce8e62751d38481d200998b820a20861423495b5730fc6971492fe93
-EBUILD maxitest-3.6.0.ebuild 1449 BLAKE2B 3e3e7fdd3743f89093938848d2b6cad0f441cc7280ac0475c81c80420137c45b2dd8cac4b0a66801b2b36e11349d083c78e0037703444d2dcaeee357cdc982d0 SHA512 63a11cdcc5af9657c14d3969d8bfafe4d844b9cadf83c89db5b8bd9cd5698eb6573f39dcc18898f94dfdf42819cdb18ab468774166ac2c2c6e28e5eadfcc94d7
+EBUILD maxitest-3.5.0.ebuild 1256 BLAKE2B 0304e5d045c0d97de6f8b1fe02d5d4ec4fd01891cf64c573e8dce4f87a0a339507f9482ab3b9f16357c4647077cf6002309e07c8f53ffe320f0379c48ea36b29 SHA512 789c4399be32d7b5a8a281ae19077905c807be68b168e1d663d01847c98ddaf651edd09003dfe65ca2c7b15ed446a61937e0711e5c9e0ab6022c1d13f1d00158
+EBUILD maxitest-3.6.0.ebuild 1438 BLAKE2B fa81881d717e94e4e930e75c8fcfaf4753ff997966c61a2d79e0cd2ab4f2304c90c5e9581e54db3987b62cf217c0c1ece93ac9cb9a844101a699ea8d5283ad1c SHA512 4f2888e30afe8c1d959a340133cbe1fbbd92e59e072d370a2368d3950b903b16f0aeb6b356ff5f4db9d1835258a2eacf28a5478b65f50af835f8167581502003
 MISC metadata.xml 332 BLAKE2B cdef4488ce14b1d8addc2b3f23fa74aa64022d4ed2dfea7a84c85122e357806dd3a466ec2f4fb0fd486373055a78ae579c0f68c90a22b8940499e1ae29c29ded SHA512 ad86da72b8bc8895b0e09bc9e435eefec9ca1738e8b34aceaa959b2431b35c2732c704bd68a02d02c3c88912c20395f8601e2d42ec26f5d15c064893c0ceff0e
diff --git a/dev-ruby/maxitest/maxitest-3.5.0.ebuild b/dev-ruby/maxitest/maxitest-3.5.0.ebuild
index 31ace0fe6630..23c274fbfaee 100644
--- a/dev-ruby/maxitest/maxitest-3.5.0.ebuild
+++ b/dev-ruby/maxitest/maxitest-3.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "<dev-ruby/minitest-5.14:5"
diff --git a/dev-ruby/maxitest/maxitest-3.6.0.ebuild b/dev-ruby/maxitest/maxitest-3.6.0.ebuild
index 71ac82f24f2d..11398bba91fb 100644
--- a/dev-ruby/maxitest/maxitest-3.6.0.ebuild
+++ b/dev-ruby/maxitest/maxitest-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "<dev-ruby/minitest-5.14:5"
diff --git a/dev-ruby/mechanize/Manifest b/dev-ruby/mechanize/Manifest
index 3c68276b39e3..7bd98bc0fd71 100644
--- a/dev-ruby/mechanize/Manifest
+++ b/dev-ruby/mechanize/Manifest
@@ -1,3 +1,3 @@
 DIST mechanize-2.7.6.gem 138752 BLAKE2B be4e8f53c3ad88ae5aac867f836a20b5bcd47aa61db07e2dfb7e2d0c72d368ddfa620411fdddd5c2a408eeceb3c4c1ed3a15f6086ec846cda3a3c3808977309d SHA512 e89eb75af169ba198e5a82ffe4ce3c0962bc3fb6793f88bc735b647b7816d0c78d8968c43d213071e017e7f836ab91ed0c546c9eb986647355a1d38b1ba18138
-EBUILD mechanize-2.7.6.ebuild 952 BLAKE2B 99be00c91bd3d5e0a33c2515d778058912ae512ebf679eb0783ebe92771d7ef78786c7000e9b905ee404dca66790c1468a73bd13869c55c7cdfbb75b343e3542 SHA512 3db0f6ce475505449e8af539419768919c026acae61cc7b673ac7376a42b856d7ca6d6bf9665049cbbde086a97e65043617f0c9b2d2134a0735d77cff10d943e
+EBUILD mechanize-2.7.6.ebuild 941 BLAKE2B ed0159649eaaef2b4b5876ad2e74b001e1b50e705bcc544a50498e8334fa3312e828726b935b5c90e56e99ecf4f7292243709fd296b8bd8a8000e88ec2afe39e SHA512 6c966eeb10966a4b9ace5b43cade913be1c2b00bfeef864d3a55fb6c240029c3440801a12f6fb958083acdf379bc2cd685e27ce518470394ea703fd7966a7d40
 MISC metadata.xml 349 BLAKE2B 9d63a73c5a28fb2fcef06d4c7b8da3b24d108534b999e76d0d1df86bdfe615e53248deae3d9450824c700a0740b75d0f7c897c8a8c9e5b4339021e30edab51de SHA512 1bc38bd045fa219ec2c86bd942055c0188561fee4ec5e7e6ba4ad2268f653fdeaac40122ed0605af7d47f8dfceb0781d65aeb68bf2fd62e3b8ae5a939f61076a
diff --git a/dev-ruby/mechanize/mechanize-2.7.6.ebuild b/dev-ruby/mechanize/mechanize-2.7.6.ebuild
index b8d12cfab949..18c4d3918f68 100644
--- a/dev-ruby/mechanize/mechanize-2.7.6.ebuild
+++ b/dev-ruby/mechanize/mechanize-2.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/sparklemotion/mechanize"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend ">=dev-ruby/hoe-3.7
diff --git a/dev-ruby/metaclass/Manifest b/dev-ruby/metaclass/Manifest
index a6178300b107..44f19846a6a6 100644
--- a/dev-ruby/metaclass/Manifest
+++ b/dev-ruby/metaclass/Manifest
@@ -1,4 +1,4 @@
 DIST metaclass-0.0.4.tar.gz 2482 BLAKE2B f4993bbe61b0f4bd1b060f9e8b5ea0a6f6666e5012b31b1d5913c1bf31aec94f344b88f35e76c9ec9d442604550b7765a20f0683beaae0025ee64f1212237f35 SHA512 5f41fe3db9c682ab6ab01c737c8531d2b4c2fdbc0f35f8fc9f40ce09a84ddf0d442c17caa1c3e87bb2c5e4703556c5d50fd9f72434b89e03d163db375046f0a4
-EBUILD metaclass-0.0.4-r1.ebuild 858 BLAKE2B 037e99f1f1ac40b38717145455e4e25759c5073fbaa93be2b3f24486eebd4a7712164898101f3b62ad5c984647edf5e58d91264fbb82692696d647106743c052 SHA512 38be6f8a555dd3ee908c3f7e96f3143cbe542ecfa445c124f6f2db8823f4edf0ab0057d4f6ead872045081215727397b9d5d707e8516fccfb9fd28b27c45e542
-EBUILD metaclass-0.0.4.ebuild 727 BLAKE2B 10e288284abf5611d0cbf5b3b5ba62ccb239ec19547702841e9edad69b23bc247bb581a16603b2dcdc94c9e779dfce3c4adf941a4261d5af5ced53e1e5cb95b4 SHA512 0b0cef9c7e60a5835c483862f63be669f4985fa4576f9c9c98fb173d0b45b4838c1308c2404e5d3b1dc67d6490e19f4c574d99ccdc7ddfa7b3ba89fe8f66434d
+EBUILD metaclass-0.0.4-r1.ebuild 847 BLAKE2B 636d08550a91b18a38d3d164f2ada6520d930291d6e31bb6773a4354f78022b1e3488ed9d3a04568822e33fb12fe6edc5eb279c3625690f36551ecfcd9af39e0 SHA512 7a6db10bd117e8c56f2d313c6a7b48fc5f11a946c0d74df230f0b047b16b7969f54784ce1c8572da557cce01ccdb898f22cbc79139d9bd5c72c7b89459f44f56
+EBUILD metaclass-0.0.4.ebuild 716 BLAKE2B 8a3bb4e5fbae28f02b73010dfa118b043f890c98ab15c5940c77a0812a33808b04a0a72275e27b9f7db4a2c953b5a7cbaa1565bed188d63d8a6b4f19b714495e SHA512 e971379e543fdde526093aa3f2281cec22a937ac581686f0d85c577281e47c9c56f8a8e6c52d70a081b3a31a850bede607df019ad1b87483c6c8055d2aa05355
 MISC metadata.xml 346 BLAKE2B 90c4ea7a6dee6842bf19100dc0394e11bcf36407bc123bbefe176d00c3a4ec0001f453b47a828dc26c4f933b8fc279a29868b8a09026abd27429cbec733a32bc SHA512 4cf92e374453ad5661bea2ed7cc6f23a93dff90542bb349e88717962ad06c48f8d88b3b5489a0f333f9a5f204097309b063cfddea74d6bb09ea13f8f60817b3c
diff --git a/dev-ruby/metaclass/metaclass-0.0.4-r1.ebuild b/dev-ruby/metaclass/metaclass-0.0.4-r1.ebuild
index 7f92a7a53e09..7b320e1cd14c 100644
--- a/dev-ruby/metaclass/metaclass-0.0.4-r1.ebuild
+++ b/dev-ruby/metaclass/metaclass-0.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/floehopper/metaclass"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/metaclass/metaclass-0.0.4.ebuild b/dev-ruby/metaclass/metaclass-0.0.4.ebuild
index 41ecf240b7f2..310e742c8f51 100644
--- a/dev-ruby/metaclass/metaclass-0.0.4.ebuild
+++ b/dev-ruby/metaclass/metaclass-0.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/floehopper/metaclass"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/metaid/Manifest b/dev-ruby/metaid/Manifest
index a3c786a73a1e..e89265772abe 100644
--- a/dev-ruby/metaid/Manifest
+++ b/dev-ruby/metaid/Manifest
@@ -1,3 +1,3 @@
 DIST metaid-1.0.gem 3072 BLAKE2B 56a316b1cd56d918e6feedfe7f5a946415ed32d1f2ff9d43ccc31f9ecd8d80755492a52c1ce5aa1e71b8fcb33a8edbe316eee000d18757e22ff0eeb684bea08c SHA512 3c841a759568b9273b1e8addbe58a23df643e93a9d1f24a75a5686e26b7f16de1ab0573fd9f5032451ef813ab29c0801442a8bc74df94fc1d58f09062569ba33
-EBUILD metaid-1.0-r3.ebuild 455 BLAKE2B ea008c03afd590e5d58d5830708a478e1615f02645b14c54c9c81073f72737623d73dc6472f756cfbccf0b6a920b1779b9dbe382036d5201dd10728fe1409865 SHA512 dbbec89b9a9f743c85dde129c5cc61778d063dc37fe744ef0dc336b0f0b8272edcd93660107dc314408384d6ddbf3e4be8728f46487ee262e56410c19786cd47
+EBUILD metaid-1.0-r3.ebuild 444 BLAKE2B fbb870c64536546ec2516a774af34e3e2b53fcbce06be2cf9ea2fbd8b8b52fb88884b32e787cdc7b87a6f7e81410ba092f4a1440c721ca98726b7a0462af5387 SHA512 08139dc36c6684243533f24fcae0360c3ac46584dc204c8485a6fb78b04431d4f37d380df3038e031bf90c2fbb3c5630deb16b5d47fe837e92fde9cc8758f2e9
 MISC metadata.xml 324 BLAKE2B 015a12d37b040c5081a47bffc3a16a9656ef6c8f796bf0479d4e848806d4fe9fdd1c3b65d6342828e9c9ee939c310930fc3d2d137349a951967e911257f064c2 SHA512 16bfeb23347b5cf905934e59ef0e8dc54afe5cfff7e5f360701c6bdf87621e6cecf3a181ced5ef543580586b326d22a0cf717af237d5c141077fc4c28a2ea0d2
diff --git a/dev-ruby/metaid/metaid-1.0-r3.ebuild b/dev-ruby/metaid/metaid-1.0-r3.ebuild
index cfe20ec327da..0e5850cbb410 100644
--- a/dev-ruby/metaid/metaid-1.0-r3.ebuild
+++ b/dev-ruby/metaid/metaid-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,5 +16,5 @@ HOMEPAGE="https://rubygems.org/gems/metaid"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
diff --git a/dev-ruby/mime-types-data/Manifest b/dev-ruby/mime-types-data/Manifest
index 8e86a53366d1..4d3789ff82fe 100644
--- a/dev-ruby/mime-types-data/Manifest
+++ b/dev-ruby/mime-types-data/Manifest
@@ -2,8 +2,8 @@ DIST mime-types-data-3.2019.1009.gem 160768 BLAKE2B c03348c8fb03d6398ca542679789
 DIST mime-types-data-3.2020.0425.gem 163840 BLAKE2B f9139aaac4bde42391efb1d1227cb55560d7fac1240ae240074c7895b252a87e0cc2ff4e17c691089749c20957690f13f451e2d6a3bed5f7e9b34bdc33af9cee SHA512 b32aeed2cc8943db3ba3275c704279c43f31bed70631eae11c258244804b8080f0ea2da3705d7ab7e0f5934a8d1eca0c4b64e40eac520102991109106a3c507c
 DIST mime-types-data-3.2020.0512.gem 164352 BLAKE2B 6884cb029386dbcc3ee433dbe13baba99bc67f1ae409aef5f698731ce141b00c44221b667c2efd3d3b949d5ecaa0b4f0a3ad5a5fe5ddc99e309cf4a925db8e0d SHA512 019e45ed63ec86ef3eb4784a1526d4f163daaec676786b21c345bb8e1c57b26444ac7ee11fb25ffa9bbc687a60ae98d1cbc5d9ef60b446f50c5896a30299bd71
 DIST mime-types-data-3.2020.1104.gem 166400 BLAKE2B c657b27508a61865027b33a5184b963f7335878dadfda2b836723e1bcb782fccf4372490fa2f6405e0632681aa26ee04a65e16efd0df953995bae7517f76d77a SHA512 674e43205b17aefb3f9d2bd79110165c287631197002604ff0efaca0aa638a0e51a3b9a78bba2a7845d31183cd3810e4f2477ceb1788c1b614e2a5058f565f6e
-EBUILD mime-types-data-3.2019.1009.ebuild 624 BLAKE2B f7d784fa168b9adad93af0f040e47cddb9e146da341e944e1212353737419657c79f4e0dbfbc9bf31e8723c2f2937ebb8785d3ee69b268be3ede5f70e369cce0 SHA512 2ea61463ce0ebec58f5f32bc5b7be2ba932dea4eaa5386e03cca8d1e3a2720fad3d15106adde3aada08b02fab103553a80a6e14b38a2b755de0de70ded69bf72
-EBUILD mime-types-data-3.2020.0425.ebuild 625 BLAKE2B 29a87f9920fa8f686522552b2726e87caaf3b57429ee4d1302bea32f52d2d82603f2364dc142a86c4db4a2a05f7126aa1a07461ef453e430abc37c255fe317b9 SHA512 b86ef144d2bcb1f798f86790f6748abdd25caed0a89f8f01fba4d40011d1d527ec32e0bbb7d5e469b5286a10941d0079a34028edd4424f44c398dc2bd960d518
-EBUILD mime-types-data-3.2020.0512.ebuild 631 BLAKE2B 786855a25b92f0d3a98aeab5d37f03062b17592533656f3673dee461acafb93afa0e085f99c399649c5e0f84f2f6a01f8d921ffc2a5b38be80a2b61a14ea3875 SHA512 93bf811f17d04c02a6ac03eddaedce56e1ff159a0ccb0df6c62d056577d2c4661b266a30a1845864912b6e1fe4a0c7e6e174068a5660d77a2e0a76213d6eb4e7
-EBUILD mime-types-data-3.2020.1104.ebuild 625 BLAKE2B 4d18fa4ab1c3952c3d150413680ba11b535caf8053b094fa187bd2543f55da2836e8c8cf6027c5c6d7e9d143d772c65303f4c353d00f247f9f2e11d060bda076 SHA512 abf751bed663bfabf9487f173d419f22cf0d669f68d9b21823a6ed891fd68a1c2c4c5bb4be063fe5b59ff9a9232ecc083c4c4fa7296b6c66636e0869cac3c693
+EBUILD mime-types-data-3.2019.1009.ebuild 613 BLAKE2B c3cc81c116a24b69489c04350c0074eacab48dbf1e91ac1c86095db1086d9a1ecc79a3c7972d7e793b25e0bb56d3cc7864d9b8711f4a61482deb565dc854f815 SHA512 5b6fa4a6fdb2475f86295c98f4779558f81b6c5ff5333a89e93234a7f0f739a48102614a976a016e882269b49821ad9ac39af5898ea6098594823316ee9d2ecd
+EBUILD mime-types-data-3.2020.0425.ebuild 614 BLAKE2B e0576968b45355eae82a5c043f7166e0e6719bce2e46a71040af244a7c0ef7f49ce2fe692ad4f3c2b073e95a27b0badb8975da0670af681c1954eb62fcbee8aa SHA512 189d234091f5ce64891edd50b9fe5532da9b5188c5630b196e5747d7586fb709e81191a21ce49d313ffc4da87452e00a586d2982dfa1a6e2b8ae3677c7a741da
+EBUILD mime-types-data-3.2020.0512.ebuild 620 BLAKE2B e426367954031a30f20788ca9427bb2479e671ea73e6575c72b6c5ef6fa62a3a924161830afc61e24e6d124aa361bf8892f7c914b0442dafaf1c4ceacfdff64f SHA512 0c5a7f3222bdc871e818c63368c6e55063d45c03120e2a6229ac8a765bc197d116e789ce5cb41229a41bf1618ae810d44c152af02279b6fcc2ac53f6be491225
+EBUILD mime-types-data-3.2020.1104.ebuild 614 BLAKE2B fd86f58e43bf13a85066d6f48dfee571aae0186efc206502c617e482ea2554e61bf027b4bd3681823f11b11672c0a5848171f02c0bb05ba7ace4dd7e4af59604 SHA512 0189b9b304f4f93cc328cbaf5bd198208ef09a6b38bbf93e3b2641ccec57cad2e09cad7a3afcbcd66f9cf49cc77855c724ad9d9f9fb1a4bc875364050385742d
 MISC metadata.xml 352 BLAKE2B 31923bc222e1b0230ff1b03dff06215d199c9f0de7c7def0a0acfa7e6d74088efad1934704aa817ac91a8ed7d8a6287c059ae72d925fb83b2a15226b9a2f7dd8 SHA512 b994c7733a66987a405c5e03c34cc1c5c33a102d6121843147b846b2c6c0eb5eba2e5bfb6b8bdc27c39adfdeaadb1f5a525de3667ee7b22f9362b8539f42ec44
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2019.1009.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2019.1009.ebuild
index 0cf2b502e748..1b04554247c4 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2019.1009.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2019.1009.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2020.0425.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2020.0425.ebuild
index ba9714b220ff..6036dba1349c 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2020.0425.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2020.0425.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2020.0512.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2020.0512.ebuild
index 578674e92947..db9afb873d1f 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2020.0512.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2020.0512.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2020.1104.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2020.1104.ebuild
index ad485ceae4de..fb1fa15a5848 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2020.1104.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2020.1104.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/mime-types/Manifest b/dev-ruby/mime-types/Manifest
index 81f867c82876..604e6f38e713 100644
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@@ -1,5 +1,5 @@
 DIST mime-types-2.99.2.gem 149504 BLAKE2B d2088d606b0210a8607d351ce7b7e3b7f25c3d518eaa3cb32ccfbf56a16eea104c908614f315317cece175003261d240f43bbf203619b54da35702abb94be8ce SHA512 46b3add451c3a6879f0f5df5f1e09c41d78d5a5b3872c2fcae7c8b097008cb04a9f5606360af9cc9880d7d659fe2dad19a118e6dfca1774ec3f5a5b852e31720
 DIST mime-types-3.3.1.gem 36352 BLAKE2B 66b97cc51d157d445d05823a3059efb6684a59d6b976945df77beb6497979a83d3ada4832cc36a42b6fad2353d1b5f2d7d1271a7947a0264978f30b857c0c7c3 SHA512 48646c5d3cc1b65ad0418bd765c86102d5dd7d0196f1b2b4b92acd350d6927e0c0fec3d30d04bf8b073d342f56b38663dee791f2c87f82b5743c6508265692ec
-EBUILD mime-types-2.99.2.ebuild 965 BLAKE2B 2504ad61677ea2cfe7782765ddf9a378cd70f607b3932934bc29154c60f873af0be86278011af3781fbd11a0cf1c44e323aa32317f77f152a0ad7e4d877f504a SHA512 406a7033040b14f52806ac21892f033393677b0f0ff054e8f419fafac1ac8d834777303f8d13282f3ef55a5be9b3a35bdbba281c29ce0fd2a1fc289cd0e43cb6
+EBUILD mime-types-2.99.2.ebuild 954 BLAKE2B f7b0ef6ce92e3ec23fa286d55e645864ee517a13deda8ad78b94addcbffd61f1ad9887a87ca912882b8e03b3336f08d0e4e4617e50808bad3fad2881f86655f3 SHA512 cff676037784df55c8da8e171d3efbc0c6a16567b1b52f938c45964cf8e7e1ff50cbcc098c90434e0468cb3a82e24c3ecc6612e9125ff86105140a69cf27d147
 EBUILD mime-types-3.3.1.ebuild 877 BLAKE2B 74caebe75eaaf61c08f1aa60a41f543e0cf2018aa40b261d0a5aa3c5dc30fbf4faf9daa8b132aaf3f534590b901daaac25c2f27f8bd82750c33a7d0d0b43a693 SHA512 b9e24113658f8c91d51db093c893e8a55dca01246619f5328a1572d526db70f6cae7a6cf2d6bf5ca723e12d57d379a8d4a706288bbdd04ed4b6bd5c318cd4f17
 MISC metadata.xml 352 BLAKE2B 6edd7bc99a1f3c2522e87695e078800275b4e9301597961b8e9ba3b920f7b75c92c8133860be4642995d2501e9bcc6f8f7cdbf611d85aa8ea23dfeda9353011c SHA512 01ae71ee2d991c0669ce4f9ac252f8edcdbe1df3f2510e5497f9a0fd0bcc1dc10a10259dc1b3dd14b73edd58895911d363b6a60105b619033a2bf09f987f4b5b
diff --git a/dev-ruby/mime-types/mime-types-2.99.2.ebuild b/dev-ruby/mime-types/mime-types-2.99.2.ebuild
index 134417b761c6..18c9f0f62edb 100644
--- a/dev-ruby/mime-types/mime-types-2.99.2.ebuild
+++ b/dev-ruby/mime-types/mime-types-2.99.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
 
 LICENSE="MIT Artistic GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
diff --git a/dev-ruby/mini_mime/Manifest b/dev-ruby/mini_mime/Manifest
index 6391589d58d5..dc84e13c7f53 100644
--- a/dev-ruby/mini_mime/Manifest
+++ b/dev-ruby/mini_mime/Manifest
@@ -1,5 +1,5 @@
 DIST mini_mime-1.0.1.tar.gz 31329 BLAKE2B 970927c8bb2d00f2e0b71cbca9aa954f732eb9d46d2e9b35a6b042ade88aaea993b40023a189b4ce1515b2b476d123945b4ec2d3fef05d4444f3e1a0f492df65 SHA512 2002ed95fe49bf71a95987f35e25e9086a5365e6eff9f7cf8a33a742cbbbd31e5020fbcd0d35b31e7dc61c0e82390a03e5241f4e5a88e9f7d7a2d3020c0ea9ee
 DIST mini_mime-1.0.2.tar.gz 31971 BLAKE2B b2783f9376d5299ba77d1cab0326f706cc671a96aac58e8c65879f9180cf3f1f359eba1b8ed4028c775728d4d633d6e8cce06acee90cfe9b60cde2e53f9a2360 SHA512 644eefdc9277642b8b94ce8071826ec993f7da1a5bc8903bd17ece05a374f286014d05b5765ec5a5f7f0fa9252b56d3bdd03109a3702075f6e8ccb68a4cef98d
-EBUILD mini_mime-1.0.1.ebuild 1042 BLAKE2B a8c8ed6cf1934e44184b2bd11d3a6ad2f225672a7dff71f909f31b26ff29d48d7a3c023719a5661cb62161d740d2da1fda46d35d061cf160461ddd619ee70916 SHA512 fa4ea8907fe76abd68f16d2943dc3a4acc5dd962e2814375256206db32a969018f6cc0ef7ae0b0fc21dc6a2e84421499185ca53e1887e3f12aeae3329fa5ada3
-EBUILD mini_mime-1.0.2.ebuild 1088 BLAKE2B dd71db89dc9922c92bb1fceed60466e96cf5bcd1e15ee022a8b908548d2a2e4e9e32673864f2ae73c4512b0f2405756e5659c508d4cad376ae6bc6eb19c4480f SHA512 3722f367fc7aed415724f238a03523f0045d95277cb9bf76be133f78e6a7f27c7dded60bb6d09922ff6862b6b7b1d9e815bcaade98a396287f7e20488f29d843
+EBUILD mini_mime-1.0.1.ebuild 1031 BLAKE2B 4f7f03979dfaaeb108ec9ca53b90857ea88c61b70a9c7248be27bf5da70863f553b146cc4191050f5598b0693c7328241acdb006da72dba5af0b2daeec7c2f12 SHA512 95b5bed74230855a4240c8759d2ebe50f6d155448a8f3dfe2238be365540edd116b152ba9e9d4ec95e9f24c740ae4676d4a9f3e0fc0c58830c43bc54c6536b95
+EBUILD mini_mime-1.0.2.ebuild 1077 BLAKE2B 6f6ec51242db5f9e14d6663b16421275b03cedbba2ceb04f0f3d545dda84d1f513e038f0d6ea57426296a386ac77a7bec7474075f2bacce834dc44b3dfda20cf SHA512 f6e479187e701a423759981b78bffca1739ee2646fc72fd775bdd4bc76d6cb88af7001d440ab3c5cd0d8e95333fe06d22a37ebfbdc4bd483c979d1f4463aba81
 MISC metadata.xml 345 BLAKE2B fc6de1be1e40f5e450d784f3e2e2be6f0339687cf728fd6b63bf6f4fd1927200f3a5262a2fca9bfa5a33310cfffdab9fbb817ea40072dfcecffc963b5193107e SHA512 bbffbfd689e60f39f73d5117f6327b250a917446edc6d0dc14cb43a5fbb00dbeaf6ebd92c090f3e7b2168dfc0c409c58be287acad9243a420bd5bbde64f80c43
diff --git a/dev-ruby/mini_mime/mini_mime-1.0.1.ebuild b/dev-ruby/mini_mime/mini_mime-1.0.1.ebuild
index a75bebae5da0..975210c97be0 100644
--- a/dev-ruby/mini_mime/mini_mime-1.0.1.ebuild
+++ b/dev-ruby/mini_mime/mini_mime-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/mini_mime/mini_mime-1.0.2.ebuild b/dev-ruby/mini_mime/mini_mime-1.0.2.ebuild
index 19c490f512df..6002d47e5e1b 100644
--- a/dev-ruby/mini_mime/mini_mime-1.0.2.ebuild
+++ b/dev-ruby/mini_mime/mini_mime-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/minitar/Manifest b/dev-ruby/minitar/Manifest
index 9dae1716a17c..20cfbf898f26 100644
--- a/dev-ruby/minitar/Manifest
+++ b/dev-ruby/minitar/Manifest
@@ -1,3 +1,3 @@
 DIST minitar-0.9.tar.gz 33873 BLAKE2B 6d285c181510c96f173d850a9411da8a214459da14895e2d186ce712387d390c8ac95e27e4e768005540fdfb7463f32206085a72faf4de6b24c31cb732234260 SHA512 e3aaf0e664a985704cf9dccb72250ea2a7ebb2db9b6120590fb8d5525fe2717e0a90b3020f461ae0c4dfb19dc8728b4eeb6ba2e24ab75d12fbd7f5d98b269c79
-EBUILD minitar-0.9.ebuild 876 BLAKE2B 6a60dd96ec8fef8c6c9a3857c26d7bb03a67400fdbc6eb6a42b9fd921fbb0277a0aee259fb1c5b2907b7ae7d5d288ea8775a4c4680ff61641ca24b519939bee6 SHA512 8c371766530d1897371cda5556a40f41df68e921f162c2f9e962a9b634d12d20fe9ec405637893e6a7073fe15b7203d837bf6fc8b517786a8035a4c8b0221288
+EBUILD minitar-0.9.ebuild 865 BLAKE2B b1cd32ab4e779fc2f2d36b53a50007d3de1ce42aecd407d5a42c9e7ca52b7b86c9a69ecd17f6d244c70252c08fe25ad7dea1d16fb48c80fcedcac86db04dd3f4 SHA512 b374a2d485b62825c2241888da2074ba6cf1314bf2ae9210a46c5e6769e30b990f3e9f40d3d2255a732a70fb46eeebf65aae2b6f1ba252ca0b9dec391c903bee
 MISC metadata.xml 344 BLAKE2B 859b7af9a7a2a07b43cc2625a5ac93a91aa9f16041a1f179654e126ab4f78d347a7816098bb6cc559fc1bc004f27156a06a83581ffdf143d86c15d8fa2a3fbc8 SHA512 fe6d4710ed497c7b81b336533868f760892f8946f766a2749349ffc105e33309abcfd7473bc940ef0cd0cada97965d4cc9504b53a76b9cb9b846c64244e2896c
diff --git a/dev-ruby/minitar/minitar-0.9.ebuild b/dev-ruby/minitar/minitar-0.9.ebuild
index dacb83e5e871..87f05eba8ec6 100644
--- a/dev-ruby/minitar/minitar-0.9.ebuild
+++ b/dev-ruby/minitar/minitar-0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ RUBY_S="minitar-${PV}"
 
 LICENSE="|| ( BSD-2 Ruby )"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
diff --git a/dev-ruby/minitest-bonus-assertions/Manifest b/dev-ruby/minitest-bonus-assertions/Manifest
index 113e94509e41..b39d96d5c866 100644
--- a/dev-ruby/minitest-bonus-assertions/Manifest
+++ b/dev-ruby/minitest-bonus-assertions/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-bonus-assertions-3.0.gem 13824 BLAKE2B 415f8b48875b8335ded9fc21b5430b575d3d104179066de19aa58d1602da7ff9994c8ceb49b1cf34fd4c8553c76999bf1b638d2c44761af84d510ca1e276cec1 SHA512 8b07e5d3be7cf68be53b06f6b545445efd9021ff5423bb67c4b0e8e40aa004d75f34eef3fc23ebe83bceaaa064c57a5ac1b9969a28f48203a6ae4c34092c5621
-EBUILD minitest-bonus-assertions-3.0.ebuild 857 BLAKE2B 80bd9c6981ecd71ae3920cba46a17a83e18255b8da978cf8f13d4e5ce7178fbe6091ea492ed4d125f5a4c3edc95151a396bf6cff4013ed92b0c40ade3cfd751b SHA512 69e0e9c14d2b796aff9c085f6a24b016780f5d00c7d3657ed21bd73ef90001573685a9d822adaeeb864e17fb9dc673667bb4988072c7f494a36880fd5696157b
+EBUILD minitest-bonus-assertions-3.0.ebuild 846 BLAKE2B dfc1e69788e12e01bddf68bdf1eb141910a44e5138db82f1151856306961b182bbc623ab791fd409c7c4366b214b17d468a249b2857153e13d697456085c7bf8 SHA512 bf0058400ce0d284e62785e80ffb03a352923d0234eb2ddfc15e49a377251fd3314833baa9f09ccadebab4a24ffb557de8a43912bd85d31f71f81fb1af1184dc
 MISC metadata.xml 362 BLAKE2B 95200bd3aaad44ff65f068e52fada9744ce88f2f07fa11c4da2ccd1b02f769255b42dfed8ac92dee531a8c736439cf9806e3ce68153d6197e484178a252a083e SHA512 271ca99c64e529107a901b00168c4b8f2039d7410166b6e2fa75be591bb889d30d693c345161c71b4484d188683328b4656eac3859ec90900fde35c31be14018
diff --git a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild
index 7257bffbf4e0..8542f91ae89e 100644
--- a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild
+++ b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/halostatue/minitest-bonus-assertions"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/minitest-pretty_diff )"
diff --git a/dev-ruby/minitest-pretty_diff/Manifest b/dev-ruby/minitest-pretty_diff/Manifest
index dc021e919dc1..ef330f286b7b 100644
--- a/dev-ruby/minitest-pretty_diff/Manifest
+++ b/dev-ruby/minitest-pretty_diff/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-pretty_diff-0.1.gem 4608 BLAKE2B 4002f4f2df03885a0c1f13c5561bbf48ccd707f44af44f4e91d4f6337a31791754b3e38160f088abb7aee8ec6d9abb6734d3305dec808033697611864559efa1 SHA512 e04cbbdb9cd12f2b60824dc0e20f5f3ee3e97b6cf3c8b290da941f26af120fd8eb47e33cb501380954ebfd84db817095f2f8a205ea8ee2095868befd443172b6
-EBUILD minitest-pretty_diff-0.1.ebuild 677 BLAKE2B 922e50721cfb5674785c1f949d2ac2e1aaef1d19ef6ea906cc4920c1a0ab02b0496ae10e617be94ee66a31360d388a9474720b335e3a95499cef375a536788fa SHA512 13b3bdffaf262b8b0aa2af7882004868b66447262e205ec55a0c46cc516efd87fdab5c2a27caebda580074ed27be1af31e580d1583a181fa0f3d4460eef2aa59
+EBUILD minitest-pretty_diff-0.1.ebuild 666 BLAKE2B bbb218d4b6c16949ad76ff6844440ef1c57e31601b7b168ed7fc5ea722b3e2315ef96fccd6aa277e34cb5e965996abc523333fc3376701dbeee1143cfa7a78dd SHA512 353a933a435bb24292898e1d356381c5072fd6091bfe65f50783225beec8e4120d2cda6bf6853198066cfb9d269c64734d7512f084baed79a1cc933c27f15258
 MISC metadata.xml 354 BLAKE2B 2e5c062ea73990a1eaf3b5f4bd4f4cd1171e4590f0065dee618eeb46e796d75d8c6c9f7a54f7fbc384a8c4ea8a3d3c9071a48a1483b5cda277177430d06d9a5f SHA512 88eab741974382c3cc5fa28e639b0c5d8cc5f74d9e6135348e9ad663ada2ff2b882dfdc99472bf47586db537fcc1c05939b2c7bca6ddfaece511c58ef810348a
diff --git a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1.ebuild b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1.ebuild
index 0bd09279ae20..14d4bd1ef878 100644
--- a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1.ebuild
+++ b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/adammck/minitest-pretty_diff"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 each_ruby_test() {
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index 15c346ae4cc3..d6c93ace5923 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -5,11 +5,13 @@ DIST minitest-5.13.0.gem 83968 BLAKE2B 90f2bc20328a5522a51bcfee94d69e6fd03189190
 DIST minitest-5.14.0.gem 84992 BLAKE2B 3bf733ae992e83af862773b6b76997b7a3262290c8239fe2871e9d55bfdd0a9c921a88965167a693794e064fcc2efdf9f6c111075f59921c55669fca1a8ada27 SHA512 4d65cbc96fe96bd79fd1dce36ce3b72d8e01efc12dcfeb6264075bb36430110f1c8fb519e0885e3449379fb5237cbdf7e24803ef49034e46ddf1d3a24c56b45f
 DIST minitest-5.14.1.gem 84992 BLAKE2B 1bc258ea21ff887381ce9d13ea08f07d6242bf1daa8e65063ac9bfa41c5a9363d0c7e25356d803e780814fcc62c54b9f62e76c7db8e0666f19dbb52bd94e171d SHA512 57a205ce8f71a494d9d8b0343cbc39f8d3ee22f33145b53b6b0bebebc0a2ed542eba3e1df91bf115be0910f0c2e65d5c24be6b595f13e6ccbbe417e06c54ffce
 DIST minitest-5.14.2.gem 84992 BLAKE2B 2cca1cbbd7588d2bd77458008a0dce0dcf34e9e68fa0ab7eaa79a72515c3d2399030db61905e84835596dea5e854a4a0708096f3b401ca8fb61c3da0823a8ad5 SHA512 c1cdb87824382233d4ae0570346a6888ecdf0dddbd5fbc9bc136e1c8ed9e1ce57d08d5994f57ba1eee99a38e48a04a10a32288d34ce10ca4ecdfa15587cf602e
-EBUILD minitest-4.7.5-r2.ebuild 866 BLAKE2B d61d303233bfc0d24ee2a3b08cd0677f5a402eda683f85a654af5eea2300da8794a66eb7792636ad3a05debd460323907aa18b2c54bf1a8adb2c4a27c9dcb79a SHA512 af4c5d8b4f8a8a90c50391c70323a8f97d6c02fe95aeeb66d4e33c7af40ed9a1e3b15af78bd875ee924f903a0d71cf12c305ffc2bc4a1e098b85878e25a1e62c
-EBUILD minitest-5.11.3.ebuild 762 BLAKE2B e92e5a2875266c3fda5d729bade8a3c12b9dfd7f0789e66d103bef7e6a97bee26701f9d1593a9f1c7fbca382a782af788c08f9970bbf04a77d54e821949904a9 SHA512 c4eb8675e5b1d748dfc402ae67a29fa9f4eba3447b4b3b6023fd71e30f9902aa93bce874c48bb257e4f6b6c97007cba80ea7c0dbbd684ec81eecb65d9c63dcb9
-EBUILD minitest-5.12.2.ebuild 732 BLAKE2B ed24c7520c7590528e79dfe4b360ecdc1afb09223cefe4154883aef6ca2d221cf5740fe680e8c033acb4f4c2cdea657968e6ff83e0ef119b95531f8af1ab237f SHA512 9d1b66245cb42280fb3d5bb7d5564e26e7e69c8cf9d3a26e1b05350fd749a16b1e5b0e231a49f31c1f81c41f86a7c4ebb8c72fa7fa43f68241c891ba436e8fda
-EBUILD minitest-5.13.0.ebuild 739 BLAKE2B 1e9be46f61be5f5173fa9f4b02e6542a60d460f5885197ece20b727d4ac433ef6c989c96b93317aceb4b74aea50537646fbbd39a4ee36a45b8856f4ed4dd7efe SHA512 974b443f7f15637265f4f49fbbfef16305aae6fd9e9f7a249dff019e2184e26f7ae53c38a7da2d6f55c8f94a05069e044d0c85f80ee1b72d19175ba344610610
-EBUILD minitest-5.14.0.ebuild 739 BLAKE2B 1e9be46f61be5f5173fa9f4b02e6542a60d460f5885197ece20b727d4ac433ef6c989c96b93317aceb4b74aea50537646fbbd39a4ee36a45b8856f4ed4dd7efe SHA512 974b443f7f15637265f4f49fbbfef16305aae6fd9e9f7a249dff019e2184e26f7ae53c38a7da2d6f55c8f94a05069e044d0c85f80ee1b72d19175ba344610610
-EBUILD minitest-5.14.1.ebuild 739 BLAKE2B 1e9be46f61be5f5173fa9f4b02e6542a60d460f5885197ece20b727d4ac433ef6c989c96b93317aceb4b74aea50537646fbbd39a4ee36a45b8856f4ed4dd7efe SHA512 974b443f7f15637265f4f49fbbfef16305aae6fd9e9f7a249dff019e2184e26f7ae53c38a7da2d6f55c8f94a05069e044d0c85f80ee1b72d19175ba344610610
-EBUILD minitest-5.14.2.ebuild 739 BLAKE2B 3ff5c41cd96f387af8db3a28f16c26a48427b9051f9980ad9a4a9278f9e47b3bd331c44a41f8e0f8d4d884e3f0d84c69a1c4e9a2c36d0257dbe8f8c24942c1b5 SHA512 b7d69bc61069369132b47da3a7d31b19e33e7d3277b5ab5c3c8c1a8c3e8290e73ca0b02ef75eb3295c46c83543d105e221a1636f3853d26faeca349690debb30
+DIST minitest-5.14.3.gem 84992 BLAKE2B baad3e8198bcee1b2748f81a7ea822785423c2bfb07130397b2c21993c686aa6edf58811cd58c4c9685b63b8a7373948a0aa2eacb6b02383399847edbad5deaa SHA512 2aadb99c5eac8d29c78865f8ce3fae51f11c2e1dd17157b6d0c6684733a3b870146df16fd26626c6f9c56806422e1e2457208afa1c69238a2bdaa4a859c23645
+EBUILD minitest-4.7.5-r2.ebuild 855 BLAKE2B be819c08a86dad67f4f72be519b5ea978658ae98087c1171879db92656649ccde4755a29a50f4f05816d5c41476f316032102bcb2062e7bbf4378f1369da042b SHA512 326d2ddbc4fc143ef9086ac0582ec76e5ae2739a31b3c80ba5e420682f1b1d2f082f94adb12971450f3df8b9007afd62d8320561dbb40f476373f67421235fcf
+EBUILD minitest-5.11.3.ebuild 751 BLAKE2B 07e8bd48258eaafa3810e7122695024910d50ea4a8ab529fd8a3fd2cdc3a027af48f4807bc95c242988ba56d7daaacfe770614c32a8196b63445326d0b18f0d2 SHA512 692ca391bbfc7927d31a9e663b584cffbaedcaa27774bc7eaed4fd0080c1314f98e90fcfd547df462882d9e5935b502a7deb99992041fffe1227b6c0f2cb25b3
+EBUILD minitest-5.12.2.ebuild 721 BLAKE2B bf109a1758943ee0f8f4d7d876ea27dcdda8ff21fe81cb6a5fdc621e0ad83dd3aa44f9fdbd2e2f16d22bb745100fc433deac24c2227358ae669985e653536157 SHA512 44802ee3cdcb312fbe791f9cbcc9d205186fcc4e3c8a05bd7572cb52714d0ebef26d6cb317740a8db9ede5e6c6fc4abf2c970eba2a003370e2a82eaa601c60d9
+EBUILD minitest-5.13.0.ebuild 728 BLAKE2B 2fa50d6a799270116cb7a2a27132b74d7116e3295017a17df7d8da7e8069b156b64c6a6270048ee8c417af4c34da49992ae3590a2001a7aab3ffe9f58109b26e SHA512 4458ac2dfaf0ebf2bbc7a1e6fd18bf7841e5871e1e769f82b27e612e53a9a313524d486602fd7423935226844c2cdf71947a0374fe28ddf3be65dd128dcbd018
+EBUILD minitest-5.14.0.ebuild 728 BLAKE2B 2fa50d6a799270116cb7a2a27132b74d7116e3295017a17df7d8da7e8069b156b64c6a6270048ee8c417af4c34da49992ae3590a2001a7aab3ffe9f58109b26e SHA512 4458ac2dfaf0ebf2bbc7a1e6fd18bf7841e5871e1e769f82b27e612e53a9a313524d486602fd7423935226844c2cdf71947a0374fe28ddf3be65dd128dcbd018
+EBUILD minitest-5.14.1.ebuild 728 BLAKE2B 2fa50d6a799270116cb7a2a27132b74d7116e3295017a17df7d8da7e8069b156b64c6a6270048ee8c417af4c34da49992ae3590a2001a7aab3ffe9f58109b26e SHA512 4458ac2dfaf0ebf2bbc7a1e6fd18bf7841e5871e1e769f82b27e612e53a9a313524d486602fd7423935226844c2cdf71947a0374fe28ddf3be65dd128dcbd018
+EBUILD minitest-5.14.2.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
+EBUILD minitest-5.14.3.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
 MISC metadata.xml 344 BLAKE2B a719762acb7e752051fc25d212f40e610a1a00644f8a09a4122bd874ec15af826d9360697b8d63d68fafd6596a8ea34439540894d8b8b9606baf5ddd4573d152 SHA512 48a43ffed154ec65035a6e84ec7e7e9ec222698b4dd56a81b6ca84844d9835c087fd7972d38ecc40fdba7f74acfeb2004bd1084d2cd123ffd09906e644c59e00
diff --git a/dev-ruby/minitest/minitest-4.7.5-r2.ebuild b/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
index 98508643022c..d4ec4b2f1b43 100644
--- a/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
+++ b/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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"
 
 each_ruby_prepare() {
diff --git a/dev-ruby/minitest/minitest-5.11.3.ebuild b/dev-ruby/minitest/minitest-5.11.3.ebuild
index 918c1db21242..a6496139cb03 100644
--- a/dev-ruby/minitest/minitest-5.11.3.ebuild
+++ b/dev-ruby/minitest/minitest-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,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 ~x86-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"
 
 each_ruby_test() {
diff --git a/dev-ruby/minitest/minitest-5.12.2.ebuild b/dev-ruby/minitest/minitest-5.12.2.ebuild
index 3a0a1e201aa4..0a5415abf2a4 100644
--- a/dev-ruby/minitest/minitest-5.12.2.ebuild
+++ b/dev-ruby/minitest/minitest-5.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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"
 
 each_ruby_test() {
diff --git a/dev-ruby/minitest/minitest-5.13.0.ebuild b/dev-ruby/minitest/minitest-5.13.0.ebuild
index 59e6973c806c..2e7cac7c3ae8 100644
--- a/dev-ruby/minitest/minitest-5.13.0.ebuild
+++ b/dev-ruby/minitest/minitest-5.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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"
 
 each_ruby_test() {
diff --git a/dev-ruby/minitest/minitest-5.14.0.ebuild b/dev-ruby/minitest/minitest-5.14.0.ebuild
index 59e6973c806c..2e7cac7c3ae8 100644
--- a/dev-ruby/minitest/minitest-5.14.0.ebuild
+++ b/dev-ruby/minitest/minitest-5.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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"
 
 each_ruby_test() {
diff --git a/dev-ruby/minitest/minitest-5.14.1.ebuild b/dev-ruby/minitest/minitest-5.14.1.ebuild
index 59e6973c806c..2e7cac7c3ae8 100644
--- a/dev-ruby/minitest/minitest-5.14.1.ebuild
+++ b/dev-ruby/minitest/minitest-5.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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"
 
 each_ruby_test() {
diff --git a/dev-ruby/minitest/minitest-5.14.2.ebuild b/dev-ruby/minitest/minitest-5.14.2.ebuild
index fd1467ddaee5..414bf91afda4 100644
--- a/dev-ruby/minitest/minitest-5.14.2.ebuild
+++ b/dev-ruby/minitest/minitest-5.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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"
 
 each_ruby_test() {
diff --git a/dev-ruby/minitest/minitest-5.14.3.ebuild b/dev-ruby/minitest/minitest-5.14.3.ebuild
new file mode 100644
index 000000000000..414bf91afda4
--- /dev/null
+++ b/dev-ruby/minitest/minitest-5.14.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
+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"
+IUSE="doc test"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index ae771dc94e01..c74d3508b70e 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -1,9 +1,11 @@
 DIST mocha-0.14.0.gem 82944 BLAKE2B 50a066e2f5007df08a7f76785fd4c2b12327b4969c11324a0574c707bea3219d51edb9ab40635378c16b46ad826ec7eff42434a27cd61113a6f40251fa2e6930 SHA512 918e45f2ee761c7dc399c7958e4d406f9e186c90f479fd01a421aa542944b47e9b2c5e938f4fc5292a7da345726447b2d47dc5f417e114201f8a4d9893c4d461
 DIST mocha-1.10.2.gem 240128 BLAKE2B 50c638a729cf7e11b982f60b3e511166ca896d67167e8c4ae1c8bdb87fed11c9feef21046f84701f93131e1399320635eeb73a8f08adc1f38a4b36e2134cc690 SHA512 efcfaa266f8e6ac84598f69078855f9a36aaea1f5f6bb2b6759ed17577c390bd60c52b0e09de3c2099cc72e6731099f55b647cea158a4b3996d290c79d006670
 DIST mocha-1.11.2.gem 242688 BLAKE2B 60df172257e8767fd3b48e3716cd31cb69ec6f10cc74908bee2e0dfd2d042550b10c7ffc8d2dcf05853c96cf2745fae776bdc9abcd6728f5a4f3fb349d997bec SHA512 8408d7b4c4d979caebabb75b1b870e6473fb0a5abe6055bdf7b4c4679b92c963138ec9a2947e60b9741a2cb50ea7ddfe949544dc4b0bdac22242b2a7eb5fd54d
+DIST mocha-1.12.0.tar.gz 244820 BLAKE2B efc4b40509cef44d976b1556e4977258f1b37a314e37f492943fcac955c681d17008a1db30f963d7a6adcb788b1832439e0585899c99ed8f2ece69c887952e91 SHA512 969a6cd48d925845004dffa12f8a9dad155d3bf24b974957e9921a2e13dc67985f01080017ef9e82dacfd4bf87533774f3f5d15226923bdf50f8b90e95e1730f
 DIST mocha-1.8.0.gem 223744 BLAKE2B 625f38d6ec53cbf549cbace873172b8511f2e6a2ccb5d7fd4133c3d9a67a8e5d55626fead7a70de363c8564b687530d3e0515ed7fc167a65091d9e17d89dde47 SHA512 b0abd6234f34dfd92d44019001e97914dff80ece5fbe2b53ccc91192f99f06a79f9c96cdb136b2a389a1a1b7038076fce688d8d8ee8645538d3c58f73e345fe4
 EBUILD mocha-0.14.0.ebuild 885 BLAKE2B 7bdb2eaddd983c06460cac0320e6ab2f4ef3ceeb76f0e64a5b4db3f61d9338f50628d946294667a47a53b1d28e23710af1e7ff4e6efdd0d32526418ad5600b84 SHA512 d3c0ff9fa348c19cedcc4aee99ecefda3a1db963b9be5067dac4d31d074e08288f8c03455220b00f7f6d65ccf1a1573c3fa629fb4cd3373dbc238bdb890eac70
 EBUILD mocha-1.10.2.ebuild 786 BLAKE2B 6b30a8ff71632be937cbd0b6cd4300ba3313eb49d5ba980721349a7c0f85f3e3b803b69da63c05487cf2a7c682a1e9844070c0181438a60b89375c6de9f54d42 SHA512 6ae0eca663ed3c2054c258604166a56bfe2466bbafde758722f0c51393790459fdcbed2015ecef94745c53a5cd18e53b2bdf89a43b663cd5b46610ee4f0a80fa
 EBUILD mocha-1.11.2.ebuild 793 BLAKE2B 9ac48088e0140794d0cacec7d33254750e12fdf0786933dadd7358da1dfd48dfe308659fb4185e7600c2b5200652fad5b7125ff51a7c3d6913d1f55392815e62 SHA512 c5764b88fc5434681ca0126d171778c58bd4ccc0f6963e6cf2f009a82654e9d856db564363322349156c6288e563c184dab0fe54ad5a8358850473438130f547
+EBUILD mocha-1.12.0.ebuild 985 BLAKE2B 2cd0b117bb6aa760e12c627fe29fa5b488aa91f62b60e9599cd1ef0659d03bd4d125ded6bf723b43eee749b3bd53a11dd791a77214bfecf5471761abf448acc1 SHA512 2e9a52a5e5486d2ed1d1f6a585d5706f616a1b301b536c420a12e5fb28adc6232cc06ddf62876b8b7a8ca9b16920b468f52090df352c22bff64f6658ba96e6a5
 EBUILD mocha-1.8.0.ebuild 862 BLAKE2B 5de8d30303f52c1d13add741dad6d80b279cebab848d9371c2f60cdedd766ea5ae49fa50508bc6395b32990113c134617b2faa44040ac990611391d54b58c678 SHA512 b94cc3498d028871591e6b84c0b3d037c058c0eeb6cbea04a1d70a8d157215fa9bc62194bf2d11fa1e5d2a57e2e848b32fd0ba0b6e737895b4f46cc9388fd124
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/mocha/mocha-1.12.0.ebuild b/dev-ruby/mocha/mocha-1.12.0.ebuild
new file mode 100644
index 000000000000..576fc5e03d82
--- /dev/null
+++ b/dev-ruby/mocha/mocha-1.12.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test:units test:acceptance"
+
+RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
+
+RUBY_FAKEGEM_GEMSPEC="mocha.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
+HOMEPAGE="https://mocha.jamesmead.org/"
+SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
+
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	export MOCHA_NO_DOCS=true
+	each_fakegem_test
+}
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index 00778ab099ae..c6c2728a8870 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,5 +1,5 @@
 DIST multi_json-1.14.1.tar.gz 24713 BLAKE2B 188d0fa3bf7a46a6cf4a5aa1d613523b4da3dee5061a5288146d1a367835b255f103dec265da9a218dd6dd21ecb38a7ce35d16a758ac7754b440f52c25f0b703 SHA512 19e2b6704a8ed39b8714da449c8961e740198772718ddba3d3b651f71f2b7d8c2c198d9cc16fe290f1df7b1e54d029c01147fdc431a8d2763944a4de802b89d9
 DIST multi_json-1.15.0.tar.gz 24932 BLAKE2B c99c5c6b152c91dedc38fd24f8697f918064c603bfd72c55213f3ac8afd14d3c0ba31b7c3fb91c9998fcc8a5386f41a6983c53b40119558b99194ba58c06cc91 SHA512 55c873e45cdc59e75823aa031eb6d792cb9dc744b13a682fc279a8375b925db7a984256d61aa5454795a59722794a774a0ed5b6bf518db253152f4af67f46dea
-EBUILD multi_json-1.14.1.ebuild 1967 BLAKE2B 20b40ce152a90a7d5a0d70c29e18a6a81c2bcbf9a30f0b0f6ab045ecfdc0f7afc19d95f63be2601d8ea3abe44211b59e707f4842db11927f1f21ae3790bba3dc SHA512 ca8d00813f96754d5e3f0d85d7cf0195e335bd2794dc2ccb30cf2cb321e40c0861b6dd47a25335ca8407d1ec3372939a908ac3eca6eda89193f861f1dd912ea4
-EBUILD multi_json-1.15.0.ebuild 1968 BLAKE2B 641843d31c77760261e556a6e8277ca1c64e1400027eeb0ceb2a3243f3f99d5eb4a397637154aee891a40aa4bfdae801343be39b77af82f928756d1a2ac96227 SHA512 ff7a796705cb587ecc1ecb9f2bccbb6f974cdf4f9c01cd54900891e2ffa5ff58d816df4a9457733ef877303317a4b9537f85dfc26639e7a6dc785ce0903fd2a2
+EBUILD multi_json-1.14.1.ebuild 1956 BLAKE2B d517d2287fb035f6de164513ff9c2cda386cf567711bdf2b0978ddef887b6b6f4783ac53c5acc18bf50d2709038acac2ef18ada040ebd9a93a7036233582a4e7 SHA512 639ff15bf3842710d39d6c55edcbffbc303b784b4c238e2a98c9c4a3e1824524a616c4e381979be982a218d42514e313a1bd37f29164455f53f997454f45b408
+EBUILD multi_json-1.15.0.ebuild 1957 BLAKE2B 364d94f09dd7909e05afab5df5beb4b0e3f60844dde573e9f62ff5f49f306a76964ae3ffe49a27c9cc3dbddabfb1d0f6542ecc77f119e205bb40962fcf74e19a SHA512 7570dcc3ff8c43651794f537df6aff23151e4b02f47123b0e580a726715cd47cf5b3ad2d3ee457be5f4039f8889fcc4d2c4c33e2e04864115849421dfa78ffbd
 MISC metadata.xml 345 BLAKE2B 7d7684a1546dcc97e934f1a7df4484b568c5e8043dcfd0493e03124fa9f96959de5dccb78d22b1ff51ebc39b5fbec8b9a1dfd24531d676b8982b1f1dbd5097d0 SHA512 5fe7f117806d67e0d295bfcbdd07d4bbe8d3c3875e07cc3d276f2aee81b89f2e90174cbf4264d647384817fe0e8c81c2f2c9d9d67e3f78b46c3c194001bcace9
diff --git a/dev-ruby/multi_json/multi_json-1.14.1.ebuild b/dev-ruby/multi_json/multi_json-1.14.1.ebuild
index 37cfcb5dbdd8..35719d69df26 100644
--- a/dev-ruby/multi_json/multi_json-1.14.1.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ DESCRIPTION="A gem to provide swappable JSON backends"
 HOMEPAGE="https://github.com/intridea/multi_json"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="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"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/multi_json/multi_json-1.15.0.ebuild b/dev-ruby/multi_json/multi_json-1.15.0.ebuild
index 88d2b50255e2..405e6f5ef364 100644
--- a/dev-ruby/multi_json/multi_json-1.15.0.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ DESCRIPTION="A gem to provide swappable JSON backends"
 HOMEPAGE="https://github.com/intridea/multi_json"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~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"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/nenv/Manifest b/dev-ruby/nenv/Manifest
index 29187c9ad395..2b1be6ee1166 100644
--- a/dev-ruby/nenv/Manifest
+++ b/dev-ruby/nenv/Manifest
@@ -1,3 +1,3 @@
 DIST nenv-0.3.0.tar.gz 9773 BLAKE2B e3b53fd60ec89e8c068f47321880189750311192b33658ef61120390f4254a3194a8afc3c67acc0e9a2601f64e93cbe02f004c1c345f378f0f80fca3b3a9e778 SHA512 f0a50d7c78573802849b383351f3d099e55c67b935933bc00d55b752c1af944a4b7a8054b2cd41b238b192587f5bcca5de9d5c577764502300d571446de24228
-EBUILD nenv-0.3.0.ebuild 672 BLAKE2B 5246db63f0f0447c44352fbe30e672356d174e4c3f24ec2ecf4de51169f4480fe5f43bcb70e87e34791b4c10ba76befb8bac918c0c1223f8e3969beab94e24f7 SHA512 937db08ad95d6d11f7f8e0ef15b968784cb36aeea41dd6b07a9cd52658209ae22e1d04d3b4caecec5c05f042fe48037ba5a9a4b67e00cc2523aee54c1474aaa1
+EBUILD nenv-0.3.0.ebuild 661 BLAKE2B b30ae45a7e8f37584f69bf2ed57d6076624a9835f49b58a8e6fab05acc05d29a0c01dc876b9bdbadde9711d01816a3b05d2f10ea50bf5e263254d372f83ee226 SHA512 ba43eee2741b207eca71ea1aabf9ec4aa2fe441cea83dbb9679fe93dca7ca6e0eb0683b78c1ddc5ba812b775c4d52368f4282b149d8cc51fff29792849c90544
 MISC metadata.xml 333 BLAKE2B 0351956feec9471995daa30673bc189441a7b89449915909aabc270089117ed9149a390f05262d09465d602fb7dbd31dd40ba3b30f4340c68cb9340ca7f9ec1d SHA512 84633eb2251bd7e09096d8adbced6c2d351e1d47ec1ce0c57fb953565b33c515896e4c0fe4828d3ea530e6f8ce44d5d5b8d54c5cb0d0d4777c29ac480309bf72
diff --git a/dev-ruby/nenv/nenv-0.3.0.ebuild b/dev-ruby/nenv/nenv-0.3.0.ebuild
index a077706046ab..58a655f5cd1b 100644
--- a/dev-ruby/nenv/nenv-0.3.0.ebuild
+++ b/dev-ruby/nenv/nenv-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/e2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/net-http-digest_auth/Manifest b/dev-ruby/net-http-digest_auth/Manifest
index a9cf5e0577f0..9eb5f14076b3 100644
--- a/dev-ruby/net-http-digest_auth/Manifest
+++ b/dev-ruby/net-http-digest_auth/Manifest
@@ -1,3 +1,3 @@
 DIST net-http-digest_auth-1.4.1.gem 13824 BLAKE2B 537688c7d83408052d3d5d16d625a51434dbdc452cf36ec5738917b862eab305a85d3f3933d79d878356a76ae698d6eded24249b70e507b2d7131d71b5dcc482 SHA512 db62d49815a96cabde5836b00a1df58d6277f9efafae78e27296b1e2f4410ea613aed2181f8e39f08af5bbf6f5f758d682e1250d0afd4fe8243fb0d5c7fe78b7
-EBUILD net-http-digest_auth-1.4.1.ebuild 684 BLAKE2B 94d94749b795babaea2ba6c3d8e620eb635c919810842678cd9addabe3a753676da80a22fa5aa84ebbda03fe5a7b3943935fca40328d8f48ad3bf1cede0f161a SHA512 7f822f2c410e298006c66953daf2147643d42e4cb931468decf45812ed38a066f5c86caa323573291dfc14332cf686ee14fdeca1272a230867ae5e6c56e76fe1
+EBUILD net-http-digest_auth-1.4.1.ebuild 673 BLAKE2B 034c2119310dbdfd8c74ab733d2a2692b784f77aada78897d8141a910639dc32bf9a77bba20f981b4a796badb4e32e954cc07f595232cd9677b7bdf23026a841 SHA512 99106817736e93f6e8c0661039667e8f6b9783685f34a8d6facec51f9bbb18808c7a76ce9f9b297279ed0c43ce8b1ced697d6876c470317d5f8686b60711b67a
 MISC metadata.xml 354 BLAKE2B 912fe468f23b89ed8692e3978fd9de52071db9870ca8dce72c595bc2058bbbc36fd5913c07c54c816d8633e6ac013d02f73b67f8d29e38dd6265fd1ec537ef88 SHA512 d7ddea8f222b8d515bc33b627acb53d18c54ecd8a1fdf44e5d1c51f0ef633d63e607cd9dccf36cdd94fda819a27785235b43152ddfb94fff615c884013a3f53b
diff --git a/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild
index b4d408878fe9..fa7c2dd90474 100644
--- a/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild
+++ b/dev-ruby/net-http-digest_auth/net-http-digest_auth-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/drbrain/net-http-digest_auth"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/net-http-persistent/Manifest b/dev-ruby/net-http-persistent/Manifest
index 463af06b4b41..5031e508e568 100644
--- a/dev-ruby/net-http-persistent/Manifest
+++ b/dev-ruby/net-http-persistent/Manifest
@@ -1,7 +1,7 @@
 DIST net-http-persistent-3.0.0.gem 30208 BLAKE2B 2bbd87d66e65081c76bc9cddaeb38f3ffd8a92b5b64f7717f77c7a927e2032fa732c2e82e220a75a63ddc10dfaa6a0f24e4fa7e0964e2ebd3d0729127f1fb452 SHA512 a601d3abde43b196406e3cdd6b704796ed70db67dfb67c9b510e0164ce7355cc925cac37fbf4c5889f41b069890ba2e2c15440fb40294ed21891fd08d9f87894
 DIST net-http-persistent-3.1.0.gem 31744 BLAKE2B fdd9c36ab5216c1cd1fe358207a689276e109845ac374ea16011469b6cb2b165115e78e701cce98c280e7f878c23d8016e75cac4508c7e579209012671b64101 SHA512 65b5afc4ad0729ec14b642e0e36363cecfff3dc25b26308d632866e93fed3eccfb83ce85da78f631553c6a1fe3ee834fcbc9d3681c85db6387463abbc30e60fa
 DIST net-http-persistent-4.0.0.gem 30720 BLAKE2B 5955cd60c86ae74c1f9d3415bf0257542718fc83d2b82cbc6ce31b5013edd1c0c3202757ccaf23a33c70d90fcb04e6bdfd2cdddfb82a45733ae3d15a5c526301 SHA512 eccc6cacfdd1dfb99bd0dcb7fe1c13cb1c21eae0104357156888bd0a5b2ee0b0d8ed5687860670c2dc54ccc1cfc7a090592bee160458427f44c255c1b99938d2
-EBUILD net-http-persistent-3.0.0.ebuild 885 BLAKE2B 44e3fe84a567f1dbdbe72738316ca31f31f4cdf64a48cff8e16c745549f145cd92b1c9ea6bac1b80181c7b8ef266c59a9ab1701b8d2a5e7c7b7838c2ee50bb3f SHA512 62bbe74815653f897ceb91d99cc98c2e7c43367e849ecee37fee1869f7c8c115e85f11eb2c69f285a1c836d7ce71a217d283ff52cf1cce9feeed0730fbd9080a
-EBUILD net-http-persistent-3.1.0.ebuild 880 BLAKE2B 0a22d2cffc8a8b7e3349470ee5fbf5eeb22f9e6b1232e404344cf32952cf3bf993a6bda9e2e37d259becb071b492f85e60c55132532ba29bf1d0c00e465009c6 SHA512 c001678930a387e7f8435f89cc00d8235d4573eec50f6b84a44b0509f348bb9363778b6b027b16d3f6a66998cd5f8719f18903b588b2f6d7fc6bc5f8e982165d
-EBUILD net-http-persistent-4.0.0.ebuild 866 BLAKE2B d899e435510b67424d3274efe3bf1a0dd197c4f7e6293478f975169822e37fb5bd0014bd9b6de966c9f98ad75956e0e3fc45d6e46c1d717aeede014c0d43ab43 SHA512 4f84d15aa9af0f9aea9de299738024f5f06f8d9cf35a863232f4cc2e9355790f2e2cc1d553c1d42febc3ea61f4d51f64ac2900ae40888c089d734a578e0a68d6
+EBUILD net-http-persistent-3.0.0.ebuild 874 BLAKE2B a3015ff9e4532090626746a238b180ea045c34fd882edbd8fbcc30d7969d65e78ff1dcd24160ae812531b5851b62f86e3fe9bb3a7650d22614b07016a4828b79 SHA512 9d18e19de760d5a2a3eafcd362f7f5f6fff3768d74b7bedc981f17fd015e3b229d5cb15ba0fe198f898816cd6f2117569f19f0708a00f8b32f53512addfe4213
+EBUILD net-http-persistent-3.1.0.ebuild 869 BLAKE2B cbeffa90d3d6359123326301449f942954e254fa6517588a1ff588a0ef4a54b0faa6c0e40bd516b6f9903e3f2ea94811ed52159fcbe660ae2fd6c80c8acf8eca SHA512 72eab46c783f89be648fe0860ac49c12c32834d6300065335a276f756f3bfa541b7980b34a7e7b704d6d983dfc9b18bd7b93bc1a38a8acea7a5390d41789f315
+EBUILD net-http-persistent-4.0.0.ebuild 855 BLAKE2B 7ffed8c7fe63f3d2018fc69e4c5e3c7b23f1a3a5902d0033352ab9b0b90e205ec1ebbdff050da1a5bc10b17e454ce8436a89d878fec1e75a2241732714d37881 SHA512 47aa38d2cd60879e4beadf084c133c7223a32165316b29da0ec1e893796cd153c90b954ff1b3304d539453107d103ba6df819deb6605bf1a7f59fe6bd9aca355
 MISC metadata.xml 353 BLAKE2B 9c2503aa880a368eb25787d0020bba032b96ad047823434e630864c5569985cddc59fb8cfe458ce2ec7a278759f98c677d0413c70d65f20bf2b11df7c1114c0b SHA512 acff0618bb97cf903d61bf4149537876ba57037cf93c033f7a7c2165682d52216229f5d52166e648e313c7066c25bf3cd70925b5791ac8f77f4c43180555d420
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild
index d4c2f3f92f4a..1a3b0067b692 100644
--- a/dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild
+++ b/dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/drbrain/net-http-persistent"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend ">=dev-ruby/connection_pool-2.2:0"
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-3.1.0.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-3.1.0.ebuild
index 1b1b9ea53192..62081ec9a120 100644
--- a/dev-ruby/net-http-persistent/net-http-persistent-3.1.0.ebuild
+++ b/dev-ruby/net-http-persistent/net-http-persistent-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/drbrain/net-http-persistent"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend ">=dev-ruby/connection_pool-2.2:0"
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-4.0.0.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-4.0.0.ebuild
index 6aaaac32ee1a..7fd3e977522e 100644
--- a/dev-ruby/net-http-persistent/net-http-persistent-4.0.0.ebuild
+++ b/dev-ruby/net-http-persistent/net-http-persistent-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/drbrain/net-http-persistent"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend ">=dev-ruby/connection_pool-2.2:0"
diff --git a/dev-ruby/net-scp/Manifest b/dev-ruby/net-scp/Manifest
index afd18697f5ac..c713ca383544 100644
--- a/dev-ruby/net-scp/Manifest
+++ b/dev-ruby/net-scp/Manifest
@@ -7,6 +7,6 @@ AUX net-scp-1.2.1-raise-correct-errors-net-ssh-4.0-compat.patch 1230 BLAKE2B 52d
 AUX net-scp-1.2.1-raise-correct-errors.patch 3046 BLAKE2B aa0e36edfdc85c944d3ba34d351abe93a7ade694e81240c47956b5767ac6491b954755ea05de27dfaaefa7ea1d628c632aeaaef6061f8017e9b2c114d923382b SHA512 0ff40b546aff5d0bec7245325d5e076de06f719512e51aadfd2f3b66f727c97164629e37b85fc0073eb7134cee3de43b4a0287e965012758c5fd997eebf9ec6e
 DIST net-scp-1.2.1.gem 32768 BLAKE2B 67abf0b66aa6e8f28bdfa314a20f594eedafc5aeaf5d0ae8884cb7e27203699a791623968da98aaebda1630d47bf5859cc3e38875fe17dc8c7ce7926b50848a5 SHA512 64645a4517d6e408e3acfdb24576c8ded3b6ff981035ca10a2e081f9e3ab093f97b4848da4acca03ade364483766677e31296d09a31db4c81eb40123fc966829
 DIST net-scp-3.0.0.tar.gz 27947 BLAKE2B 78a1100b7602b9c09c8f06228b6e564fce15133c6cf8c9816613cb56b1d3805d9393700eb66c3710e482771e4116beae393c12ad12963b85428e21e7cf105218 SHA512 6d68b75124ccd2d387983f6d66a8b0e040132ba17d942631c806e899dff757ffae7a031a27ea0988166bf56e803c1a6175199845a848b92c7064388564e0ac79
-EBUILD net-scp-1.2.1-r1.ebuild 1049 BLAKE2B 4fc89439a3aee87f978af30430f3647745cb6e07ff23de29509bb1c946a2a2dde9ceda0631db9ef87f73f448874b2ace4209dbeff742a50860f8ce4747e88c73 SHA512 6c6451ac9388c5dd229c66d6360bee5aa8d5187c9b1ff25251be391aeef28028ea96dabc2d14e9ebb5ec46a28b4cee8d2021edb0fd5af47d7d401cdd114b66b4
-EBUILD net-scp-3.0.0.ebuild 1059 BLAKE2B 2c66a545770c1d42256c642ea2571f521419a16a1a8c49d6b9c38fc4dd7302ce716c06003db43cb1ccac883bc83ff8dc09473b063beee03553cdb8e5dad63410 SHA512 8fd94ca329feed6e295d74e35371f3d5a3bf848886ca63ce3257ea862a9de8a0c66a5baf2d529b7b2cd0aa39a97ca0a26876f79c2baf123675e8dc62de9f2526
+EBUILD net-scp-1.2.1-r1.ebuild 1038 BLAKE2B 8527d93d1277916e051b9319b9c818da3b7ceb53fc11a27b6e2f7fcfe6875a82432701b28fd39cca81fb071989256bd435782694e1c794263e66693911e44ca9 SHA512 b7da6175d52b6b09be0c195ff36f00375c70e1b21183cfc722c354f3c61cc2ea72859c86db571a4fec26f91865dc52c9960c83ee734aab8faad2fb871e286d57
+EBUILD net-scp-3.0.0.ebuild 1048 BLAKE2B 210f5639c389ae7c98b82792f462979634dcb5d281f75d9248ebb6f180988d403a08e1dfdb74d1de00dcb29eba4fe4062733d3eb60af8b515ad60e0e85203ca8 SHA512 31385f4b6b3430e80414104356203705c22c5bc4a37877442f55740f102f5e6abcb36374ab3005dd81709e21e5d107380336a5077be89bc4b912341b348f4a7a
 MISC metadata.xml 341 BLAKE2B aec6f820a216a818e7f6a82ffe48f73a01cc662d9a5e10a5dee98885f564560644e377158ccd5c4cb6e914205fa5aa6753aaf5dcd52e1849437955553f3c268c SHA512 bbb71a6668f329ca9b1f5636aa71720a8234a7683fe374b2fde4113ff56d3a5c2242bcba7e3023090a7955870715e0040d990326942def6d3be7e31d5f07d39c
diff --git a/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild b/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild
index d55e7f25496d..41f8579205bc 100644
--- a/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild
+++ b/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/net-ssh/net-scp"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_PATCHES=(
diff --git a/dev-ruby/net-scp/net-scp-3.0.0.ebuild b/dev-ruby/net-scp/net-scp-3.0.0.ebuild
index b1666cda478e..52a62fb0ecc0 100644
--- a/dev-ruby/net-scp/net-scp-3.0.0.ebuild
+++ b/dev-ruby/net-scp/net-scp-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/net-ssh/net-scp/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/net-sftp/Manifest b/dev-ruby/net-sftp/Manifest
index 100a3760c4e1..8a8b85a5f60b 100644
--- a/dev-ruby/net-sftp/Manifest
+++ b/dev-ruby/net-sftp/Manifest
@@ -1,3 +1,3 @@
 DIST net-sftp-3.0.0.tar.gz 63542 BLAKE2B e09e209aa0d102a6da7611cabf49970c9a4e572d51946d5dc0688879db97c92e8a39713dd0011a4234391ff0ab685a978c491917c041f7d10a8f092fde5c876a SHA512 c28411cfa8522dec893fe7a1588a16bb761a9d7692c81c453d9a9ad817988637614c6afd754db8547e845a16062882e2b7e95974b889631676f092d9e84b83e7
-EBUILD net-sftp-3.0.0.ebuild 829 BLAKE2B 6eb91a452747e78a68c4b3cb27fc1e3fe3aff7403acb68eada666fe40d91202c7d266337a8c4b1655aed2304f177414de1c6674143a50dc6bf8588cef4c165a2 SHA512 da479b4ba05ef64da244581341e13d1160c0fa6e6e60d38b2b982f3f58d6942603aa007c93a36b61bdcf5bfefcad8625f09b3e19530dfbbf93c786795e4409bc
+EBUILD net-sftp-3.0.0.ebuild 818 BLAKE2B 4a22bb69a0d326dd5bbde469469cacc6c148c258d48a462fc7bcf705ad0e3bf9f432bac34ebee95684dd049978cb5552f90bb82baf919bd5f2ea3902a52774a8 SHA512 2e993e1993afb16db5e75671b69ddc298a45deb34eef713feaf0981eea1de1fa1271b7933c30bb852f8e50ded2011476a3818ac796177aea4b7ff8894023a880
 MISC metadata.xml 342 BLAKE2B b52478d886842e044705cc42c177577f111b2c01140b58d322107ecaf20bc1b5db9763ec0f0e67397118515690f452b51c1e14dcf6bada17d7c5f18889571b07 SHA512 3ece29fffeee2912d0bc06514adca69c2bdfa95bd88173d4f42cf0aee00944adc71bfaec6df543f0c1fc1717b7a808459f30894977154f7acce289dfb491f6d9
diff --git a/dev-ruby/net-sftp/net-sftp-3.0.0.ebuild b/dev-ruby/net-sftp/net-sftp-3.0.0.ebuild
index 784229f0b9e3..f5d048eeb007 100644
--- a/dev-ruby/net-sftp/net-sftp-3.0.0.ebuild
+++ b/dev-ruby/net-sftp/net-sftp-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/net-ssh/net-sftp/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "|| ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 )"
diff --git a/dev-ruby/net-telnet/Manifest b/dev-ruby/net-telnet/Manifest
index a8c65570e558..5077bb58de09 100644
--- a/dev-ruby/net-telnet/Manifest
+++ b/dev-ruby/net-telnet/Manifest
@@ -1,5 +1,5 @@
 DIST net-telnet-0.1.1.tar.gz 12794 BLAKE2B 5a82e62e47cb9153b17dd6042c7e5c767ae3a9cbe0739ad769aab2fe798c7766819b89bc325f148791ce37a55ae267eb5854142d2fcb7d387fd29c32e118c169 SHA512 769d83bae55826bb99f189d06a8fb8a6d497d6c7687289f5aad2efced6f282484e5f766dc95f0158045b824532cd8f0a674ecc69883018814a009bc29d6fe29d
 DIST net-telnet-0.2.0.tar.gz 13299 BLAKE2B 6b87974281b4e1857a1e05efdfc751a5149f9057598c89b8b288219b95268955ee3f80e21cc787ac767ef3126c9ee23d9b62e29ebcb8c317def703f0e0dc1fe6 SHA512 a4473c42d33c10594c4445c29db73f4d611555710228cce263f7fc273e71140423dcbc2e89eec2a26f35f98de48aa72eca9f44cf0cd4626d702709963ce7b02d
-EBUILD net-telnet-0.1.1-r1.ebuild 936 BLAKE2B 41029eb1acea3e68a96deae0087b89d9d55f6775348699962bef4a61406cbd527eff90c32376a20ac896213bcfecbac73cfe41cd43a2e20d0812469d059ed22d SHA512 13f7f3be9bafc045c90f4ee1826725afef8d22dfb5343b864deaa8309da277d90ddeecc72081879e685a027d04f26678c06e26248efbf9e6377d08dcb7597408
-EBUILD net-telnet-0.2.0.ebuild 960 BLAKE2B 09ce0bb5d248fd562bb9f64fe9ebd93c6b46e006790ef965ad6cbfbb9e7027d7084b3b975ebcbb2c596f24fd94fb4698a31f5a4e45acc3a7d1426cf2c38529e1 SHA512 a9bb84fd0a06351ae6343ffa39e3909ccde7c8dfb31d268c3091ece14f803eab5308195302c66f4e8dd4119876ec1d28cdff1f2160084196ee8f09243658a3df
+EBUILD net-telnet-0.1.1-r1.ebuild 925 BLAKE2B 2da7c2ce18f86402c4b882caaabf7c0a96ee5f792d5252d3323deddab49c6b49d7c31d50003b9e978083f96346db5278c9bdc004bdde8408e73da47e3fdc594b SHA512 20371e04bed89d61a5464642be9005f122405bdbda798f6891f94682d3cc3bb04c5207b72c023054ee3a8e4bff6b4591e19aab9a8d1a888af5e277892fc8c685
+EBUILD net-telnet-0.2.0.ebuild 949 BLAKE2B 4b3e46a38f01e4621d3e06223f6b3e1227a6c05e4a136e9e27b098ca12b8a7d737d4ee9fbc2da83d7c5580ad33d8dac12ee644612099e55ef543ff071f494860 SHA512 6e3f3f0bd2f1f9fd088afde908eac78e7e778486dd62c245c2e6a697909950ffee01ddb1f7002d7a19de08b141b350ce13cbea55f2c63d60490974cf624ca406
 MISC metadata.xml 341 BLAKE2B a3489378bdb1735168037d2bf0c8798de575e898bb5a686efc06d1d2c41cb1cc674a387c8b042ee789e1bd4694a1e744759637cb820ee7d820b130a966db9573 SHA512 e536a7ac7e41bab692cde766da2aebc72df4a9392921dfc2b81df82ac128ff85cfd58900ff157046eb316cb927d58fcb48605fb364c7fcf25e82c3ed676e22ea
diff --git a/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild b/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild
index 6d18f771b6cf..af033e0f8fe6 100644
--- a/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild
+++ b/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~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/net-telnet/net-telnet-0.2.0.ebuild b/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
index 5f6c8af750fa..c35a376da1da 100644
--- a/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
+++ b/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~x86-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="test"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/nio4r/Manifest b/dev-ruby/nio4r/Manifest
index 6a1d949dc66a..29b959893e00 100644
--- a/dev-ruby/nio4r/Manifest
+++ b/dev-ruby/nio4r/Manifest
@@ -1,7 +1,7 @@
 DIST nio4r-2.5.2.gem 110592 BLAKE2B b632322d0706f97a30601e7135daad9ee5a66e57ff7dea1eb0b8365e45f896e7b8a7c228c4eb781d2f44ea047eb028549bc172b68a0540d041ad83bd79d25075 SHA512 3db567c9994e9186749e37c3ebc07f744e7a82c1163d44222475cf491f945745c6c070f4a0a8c77e331921147cc1f5f7bfffd86cb3455d5864280c4e4945b295
 DIST nio4r-2.5.3.gem 110592 BLAKE2B 8a22839a2431f3128832733ef1f814e2743939e3128c689c1ccfea7537ac92c497545182525a8305ba9348092b897a22c4d21044cca695f17d95c08dc17b1f77 SHA512 dad68688faacf110f08e3252222fed7696e557944c56dadf47a1fb037c5627ab88fa82e70c2e28f802f81ed6c93e38bf85daf28dc42a51f40e455558609b0b58
 DIST nio4r-2.5.4.gem 110080 BLAKE2B 9aaed6cd4d74cf6ff3fed114d7c0c9162afb646aa6eadf294e0a6710dfca1e6b4ccf1eb8850c8704f3792eb6695034612813db08fbf74814556455db6ab48b4a SHA512 f7e383516ac6b55fd49339280e624a4c35f9cd2d31915b3d117189506522d967fc53a43cde75e8601f3fe0530e1322aeaa8c94a09289ddbefb2afd8d067341ec
-EBUILD nio4r-2.5.2.ebuild 1095 BLAKE2B 39fb353b75619c4497fa355e7faa3bb4d1b4612ac3c90111c235ae7846a0242587e45070292b1a102a99b136f80d9e50ea4a9ca2d36b6ff66c69cb2baf8d3305 SHA512 d81fdf5f2b56bd4e8a28dd4e78fd42fc5f9d4ec2e5fccc01a438ae946c60482bdba2d8f18076f54839bccbf1c472951fcfaf841978b0d3e0de844e922f7aae85
-EBUILD nio4r-2.5.3.ebuild 1113 BLAKE2B 710563c5b3d6985788c0faf7df8aaade5e799a0d1e2ab0b83ff8dd238f747f22d141c0fc7306846187855a83b892eb3b9da40de8a8efd2622cca15f313583c1a SHA512 31350b10dd12d9db510e5c1451a5e8c1744e39e6f71995f8210e50e25d662f12aceaef226aa94b1bbdef0e85160d07dc2b8a7bda6eea2212c43714b63916b0ce
-EBUILD nio4r-2.5.4.ebuild 1113 BLAKE2B 710563c5b3d6985788c0faf7df8aaade5e799a0d1e2ab0b83ff8dd238f747f22d141c0fc7306846187855a83b892eb3b9da40de8a8efd2622cca15f313583c1a SHA512 31350b10dd12d9db510e5c1451a5e8c1744e39e6f71995f8210e50e25d662f12aceaef226aa94b1bbdef0e85160d07dc2b8a7bda6eea2212c43714b63916b0ce
+EBUILD nio4r-2.5.2.ebuild 1084 BLAKE2B b546e288776ca59e06e81de390f686f409c902badda553e91af55f7bf3c4b9682aa6680bfe6e77d96937445a0dd0e1f29c7bdd8f169f4ccebe77211d9a8391e5 SHA512 2192ef724bf170a326b898d2d153f0a523288e6b5540be897635ce4ac98b2af15319102011a9e7db7df7aefd34b034242e676ee1e046b175005f81d26005dd10
+EBUILD nio4r-2.5.3.ebuild 1102 BLAKE2B 4c8dd275a790a6d4c4e11cf06a08e709bd04bab18b433056ebe7b4791a63561a04e588217ec8890f766644d4ab96c900551bf84516012357233dd0fc2a27b666 SHA512 8a9f9c0ba5630da19552a841ce4968cccc09a1ae6c22cb463a7c76f292964417b242e30a053297df2b205756790e812834898dc2146b42c355fff60596213f55
+EBUILD nio4r-2.5.4.ebuild 1102 BLAKE2B 4c8dd275a790a6d4c4e11cf06a08e709bd04bab18b433056ebe7b4791a63561a04e588217ec8890f766644d4ab96c900551bf84516012357233dd0fc2a27b666 SHA512 8a9f9c0ba5630da19552a841ce4968cccc09a1ae6c22cb463a7c76f292964417b242e30a053297df2b205756790e812834898dc2146b42c355fff60596213f55
 MISC metadata.xml 341 BLAKE2B 97c99a0ec8181c92b543ec63b8d1a40c8cbf88905afe02e6f13fa5e8906755bafadf426b7845f2e9bb0c1244168796d661a44e5138eca44068b142a39d3ad4d4 SHA512 8ba86bd5b9b9823cca53bdf18023db7385332c31fcaade177d394a36d60b892fcc632fc91b60addb77fbe907130682b435ab6103a33c71f2ad172b345e6f389f
diff --git a/dev-ruby/nio4r/nio4r-2.5.2.ebuild b/dev-ruby/nio4r/nio4r-2.5.2.ebuild
index 44567a91f631..788b747233d3 100644
--- a/dev-ruby/nio4r/nio4r-2.5.2.ebuild
+++ b/dev-ruby/nio4r/nio4r-2.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/socketry/nio4r"
 
 LICENSE="MIT || ( BSD GPL-2 )"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Note that nio4r bundles a patched copy of libev, and without these
diff --git a/dev-ruby/nio4r/nio4r-2.5.3.ebuild b/dev-ruby/nio4r/nio4r-2.5.3.ebuild
index cf30cac81ab1..635dfac5b373 100644
--- a/dev-ruby/nio4r/nio4r-2.5.3.ebuild
+++ b/dev-ruby/nio4r/nio4r-2.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/socketry/nio4r"
 
 LICENSE="MIT || ( BSD GPL-2 )"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Note that nio4r bundles a patched copy of libev, and without these
diff --git a/dev-ruby/nio4r/nio4r-2.5.4.ebuild b/dev-ruby/nio4r/nio4r-2.5.4.ebuild
index cf30cac81ab1..635dfac5b373 100644
--- a/dev-ruby/nio4r/nio4r-2.5.4.ebuild
+++ b/dev-ruby/nio4r/nio4r-2.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/socketry/nio4r"
 
 LICENSE="MIT || ( BSD GPL-2 )"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Note that nio4r bundles a patched copy of libev, and without these
diff --git a/dev-ruby/nokogiri-diff/Manifest b/dev-ruby/nokogiri-diff/Manifest
index fd516f2f90c3..67dbb6fc673e 100644
--- a/dev-ruby/nokogiri-diff/Manifest
+++ b/dev-ruby/nokogiri-diff/Manifest
@@ -1,3 +1,3 @@
 DIST nokogiri-diff-0.2.0.gem 8704 BLAKE2B e1df47db2e6e7fcd29eb229245cb9a9a7b31fded319a6fe28d04722f457f0ea7bc19e13ee49b2233f3c072eedf3c83c7e38cd8b19d5ecbc4937f709a9f4cf3a7 SHA512 9b2b6f266c9c7d01153c345567086b4cd1092a5984e6867ea81d15e00467936f296fd5e2c3ab7dc18e44d1dd2af022d250234fb4311a9be80fd3ca32b3d201ca
-EBUILD nokogiri-diff-0.2.0-r2.ebuild 661 BLAKE2B b29bfe3b1a58d781c05b6655e4e5ad84aefed5bf222455dbc575bd7aab34c810959cac911f0d2e30ab14feada5239799712db1e31c95e2916c7afd8cdcf60c5c SHA512 e19e0602f3f7469e631b51aa0875ed4507d51e2f833ca4d6af3bf84d2615e821e616f953e5b5e1f675dc7f213bd0614deed85559e99322999ae95c970991d849
+EBUILD nokogiri-diff-0.2.0-r2.ebuild 650 BLAKE2B f5a07b0f056f412909f8daecfc5d9ac7a4e587db3b9d28f34facc6b99b1dba8ad56561621f69acb010f9c63ff1a6998978429e5a7ad6003ec907d57fa0aa0d43 SHA512 7711b918d30bce76e90745a572d35413b2f50ccf62aa8aad558de9a344f19edb1524ab39b3a932453e4de69629508ffd719fa14eb97f7c3eb4d6f7aef333836f
 MISC metadata.xml 350 BLAKE2B 9c24289e33dec214608deb733950e5eb9e5c382fb2333b63d3553f93e0cebc0028f3427fc07f39086e2cbbcdd2dbfeb704a0f01c75d19b57d922e9931ed012e2 SHA512 191219269e4b972ea2f1be612b29580cff0bd2a19a45bda36444194027ee365036b09b825c1c522f57d93a998ad8b6b268c3a7ba1c57d74c0087f4feda466d56
diff --git a/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild b/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild
index 131ac5bb39c7..672d787a66e8 100644
--- a/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild
+++ b/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ DESCRIPTION="Calculate the differences between two XML/HTML documents"
 HOMEPAGE="https://github.com/postmodern/nokogiri-diff"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index bd5e79481316..e3570fc087c1 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,5 +1,7 @@
 DIST nokogiri-1.10.10-git.tgz 5793723 BLAKE2B 13829f6cc31c2b81462fdf306222ff27830d80aeea922ce4c3adceee4ce7486c0571ab76b3f07b14f1767af7b433af9e0eb83d02f8bcea989fa7e96c9cc743f3 SHA512 2d0bf09af417f0f5e7b07b9f2c555ce04e22d69ce73b484906d8a35745f90d6467824d0d56d8dadc53f020c56a7806e7152cd6347e47596e79ddaaadea1ff65a
-DIST nokogiri-1.10.4-git.tgz 5792963 BLAKE2B 80223c7bda39c56ced8e98d1d9f6858907f2814eb2d9f28d13c9f26fe29ae7f057e5a19765a3b304ffc4f9edd3dd0f77b99d5a673923ce95a8f02135aa9882ca SHA512 c27877297d432b9a9baf3e0639600d6ca5b382a87ff0dc1efb5d9bb3c79aaa31a589a4491f938283e4f9d35e8d29b6f88a60e27a5d4c81e7b491e100f8d06a9d
-EBUILD nokogiri-1.10.10.ebuild 2724 BLAKE2B 3ca0017ca9547eae727f3cf635134fcd05cb04ac37d6fa9aa008768d9150d672d268be7876a064ea402fb29ad3e81478dccf15a91ba7841e7531fe9a0902c784 SHA512 e0ac866ea6af1ce4e5fceaaef622775d08ba3b7ca1f426fc5bc7e4288aa926a8fc4ea37c937b6cacf8a1fd9b848be8e199dc00ee0301ef9c17e8bbcd6b4a84f4
-EBUILD nokogiri-1.10.4.ebuild 2706 BLAKE2B 57312616690026427357109556a536329fdd3582e16cbbf63c1215814d4c0076b024382b19a0c4bf40d919ccc0c08fb4fc3d885efff065f993685c6461be0272 SHA512 622538342ba9d60a85e1c00cf0e69e3ea1dfe2d49b83c389edba75018d33ed9c4cfcbdd7db322607c67357fe4974c4b7b8d0f3b73c6f4d883c1164ead50ec31a
+DIST nokogiri-1.11.0-git.tgz 5834946 BLAKE2B 3d54b8a998d56c66d97b7376031aebb0951df7f99c684e67537107a5e7fd0cb76b40c5351b8c46831eaf1427724e302d29a0a9b24bf806f64c541f2c30d54f66 SHA512 2cc5642d28e5a83023d0d3e031875dfbcde176995ed458be13bbe560f01552fee0424093bd7bd881c08a698f545874389d92581e987466bbf57f13deefe1e8a4
+DIST nokogiri-1.11.1-git.tgz 5835648 BLAKE2B e8c84fe72063ac3d764ea71fe469a8f7d0499487e523563e0ab737e69e06279b112c666aa254e0075740b27690ba96162a5c6e39f125b58360fbb5720104935d SHA512 47974f05b6788f2e04ef9ed7d0fc33790cdadbd258408e0242a14521cc996b6d42878b5bba3334b4bde2970dbadda0cde93a00e30fcddd100401186a90617502
+EBUILD nokogiri-1.10.10.ebuild 2713 BLAKE2B 57dedd5488570432b5202d72ea9427ce220fa3303f4899ec04802969cef5e2b151fd0f97f6fdb912f5fb1ad876ebc5c4a66f0b84e7cc2eee573d4ce24da217a6 SHA512 fa8c7d4e2dc79676837763c9b114fa9d4fc53b387dc94293fde7902b3506d99fca95ea7c8699caa284a8eb8b49bb46bc7a8e6e8d6b7eef32caeeac1ced927b2f
+EBUILD nokogiri-1.11.0.ebuild 2822 BLAKE2B a458e3fb58fdf6140e5eb9840209027679df6d46ba6cb88d369c2602674d187cf8b1a77060439625bebdaee1250058b44033a7f985e66cafee265aa12e294096 SHA512 384d3a0a78754158683795631e1a86edb4f43379c9e346d8b059de48deffa7338fe3107b76d787caea79a8fd3db7a65e62c808b706327669ad58b539e994baa4
+EBUILD nokogiri-1.11.1.ebuild 2822 BLAKE2B a458e3fb58fdf6140e5eb9840209027679df6d46ba6cb88d369c2602674d187cf8b1a77060439625bebdaee1250058b44033a7f985e66cafee265aa12e294096 SHA512 384d3a0a78754158683795631e1a86edb4f43379c9e346d8b059de48deffa7338fe3107b76d787caea79a8fd3db7a65e62c808b706327669ad58b539e994baa4
 MISC metadata.xml 348 BLAKE2B 343ce4d884b8ae636991396c8d2eb1c59bec6db00204eec79bc070ce4b61505b1290ee393e2311e2fd3976e66993c9ba51878767c0d28ff8767786039b97fd7c SHA512 94d5836e5bca783420a76f15d70e3fd29515bc7b9152410d11ba0a01d778530e0d87c4954d118313f8afc340260a12157748db94342b4f12fc5e2756c1f2ff34
diff --git a/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild b/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild
index 0941351c90c4..259d53fadc8d 100644
--- a/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.0.ebuild
index 3fb1a2238289..f0d3e1a26ed3 100644
--- a/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.11.0.ebuild
@@ -1,39 +1,42 @@
-# 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 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md STANDARD_RESPONSES.md"
 
 RUBY_FAKEGEM_EXTRAINSTALL="ext"
 
-inherit ruby-fakegem eutils multilib
+RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
+
+inherit ruby-fakegem multilib
 
 DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
 HOMEPAGE="https://www.nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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"
 SLOT="0"
 IUSE=""
 
 RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.9:=
-	>=dev-libs/libxslt-1.1.33
+	>=dev-libs/libxml2-2.9.10:=
+	>=dev-libs/libxslt-1.1.34
 	virtual/libiconv"
 DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.9
-	>=dev-libs/libxslt-1.1.33
+	>=dev-libs/libxml2-2.9.10
+	>=dev-libs/libxslt-1.1.34
 	virtual/libiconv"
 
+ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
+
 ruby_add_bdepend "
 	>=dev-ruby/pkg-config-1.1.7
 	>=dev-ruby/rexical-1.0.7
 	dev-ruby/rdoc
-	dev-ruby/racc
 	test? ( dev-ruby/minitest )"
 
 all_ruby_prepare() {
@@ -47,7 +50,9 @@ all_ruby_prepare() {
 	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
 	sed -i -e '/cross_config_options/d' Rakefile || die
 
-	sed -i -e '/simplecov/,/^end/ s:^:#:' test/helper.rb || die
+	sed -e '/simplecov/,/^end/ s:^:#:' \
+		-e '/reporters/I s:^:#:' \
+		-i test/helper.rb || die
 }
 
 each_ruby_configure() {
@@ -76,7 +81,7 @@ each_ruby_compile() {
 	emake -Cext/${PN} \
 		V=1 \
 		CFLAGS="${CFLAGS} -fPIC" \
-		archflag="${LDFLAGS}"
+		archflag="${LDFLAGS}" || die "make extension failed"
 	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
 }
 
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.1.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.1.ebuild
new file mode 100644
index 000000000000..f0d3e1a26ed3
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.11.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md STANDARD_RESPONSES.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="ext"
+
+RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
+
+inherit ruby-fakegem multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+HOMEPAGE="https://www.nokogiri.org/"
+LICENSE="MIT"
+SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	>=dev-libs/libxml2-2.9.10:=
+	>=dev-libs/libxslt-1.1.34
+	virtual/libiconv"
+DEPEND="${DEPEND}
+	>=dev-libs/libxml2-2.9.10
+	>=dev-libs/libxslt-1.1.34
+	virtual/libiconv"
+
+ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
+
+ruby_add_bdepend "
+	>=dev-ruby/pkg-config-1.1.7
+	>=dev-ruby/rexical-1.0.7
+	dev-ruby/rdoc
+	test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		-e '/license/ s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+
+	sed -e '/simplecov/,/^end/ s:^:#:' \
+		-e '/reporters/I s:^:#:' \
+		-i test/helper.rb || die
+}
+
+each_ruby_configure() {
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+		${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
+}
+
+each_ruby_install() {
+	# Clean up "ext" directory before installing it. nokogumbo expects
+	# the header files and shared object to be in ext.
+	rm -rf ext/java ext/nokogiri/*.o ext/nokogiri/{mkmf.log,Makefile} || die
+
+	each_fakegem_install
+}
diff --git a/dev-ruby/nokogumbo/Manifest b/dev-ruby/nokogumbo/Manifest
index 644f3a2a3f83..b6e877296103 100644
--- a/dev-ruby/nokogumbo/Manifest
+++ b/dev-ruby/nokogumbo/Manifest
@@ -1,7 +1,7 @@
 DIST nokogumbo-2.0.2.tar.gz 295558 BLAKE2B ce52794eb3359ad34234d8f5faad4aff7c197326f6449a09a2264cb1a3d920886377f805e055980224644223d31a6621300c583a04f48ce8a8abe275b2614470 SHA512 fd115e072d2763ff63c46dc6f6117bb841b2c2ac28df0180d44a581a2a46f0b7b90ec17ae1b629e3e7c2f8a2cade53031cc118c8a946bbfb7e9e8600efefd67c
 DIST nokogumbo-2.0.3.tar.gz 297394 BLAKE2B f1afcf516c5c47b15c8404e8c218af1f2ca0bce022fefacb39842527be7be38cbaf9d2fe0572afd8d9c1893a82428b903ccb8d4506043f766305d4d43aaf066b SHA512 b44af7394f0b2c7159b34ead2aa15e39cd08348c1e3d7c4d9a2830c0920ae1a0d22ff9ac32db8fa1bd69c8ce55bc4a32069572944b53ef0d743f8a40560bcb47
 DIST nokogumbo-2.0.4.tar.gz 297809 BLAKE2B f55a08417fe46b9cb4e89ea032deab7f4ec8d4c4d377ca87fadfacf12f86fbea6c61de087e88d5de4ab29656276b014b1619ea7d83dae86aac671306ac0b989b SHA512 188ae188bd33969b7282230e18808e52363075723cef21d268af7ad1cfb2a0a93a8cc595297f467a32f475a47249f316836ea40c587f337f35ea57bd60d0699d
-EBUILD nokogumbo-2.0.2.ebuild 1313 BLAKE2B 04c8964173737ea1618c7b13b196b5571438e3520cdb9c9025e23b79621bfabdb72349282426d9ebab2b5726c35a0a9768379240cd3609fbf737c7a06e62f388 SHA512 1ec8d25f9955da8d3eb849d9308504700a8d2d6b92e065a18f659164c149c4d0d91b42f43f56c0a8f43ae9fdee08a37b59e08805405cac1f60365036c93e9207
-EBUILD nokogumbo-2.0.3.ebuild 1306 BLAKE2B d9089f43ee28b13b4bfa374c58609bab1df7df9fc2e14d8e6eb372c5e61102aad1bb4f989df80e23cf603697f067ff0d60bc90ac5fdd4bbe946a132a148b26c5 SHA512 fffb9620200f009ac055e3c0d3437402c2e34f59b10078b9679b11530faae71b3f583bc33309809ad3aa7d4cd980a6617555c14de31943c91bede62b5e330ccc
-EBUILD nokogumbo-2.0.4.ebuild 1306 BLAKE2B d9089f43ee28b13b4bfa374c58609bab1df7df9fc2e14d8e6eb372c5e61102aad1bb4f989df80e23cf603697f067ff0d60bc90ac5fdd4bbe946a132a148b26c5 SHA512 fffb9620200f009ac055e3c0d3437402c2e34f59b10078b9679b11530faae71b3f583bc33309809ad3aa7d4cd980a6617555c14de31943c91bede62b5e330ccc
+EBUILD nokogumbo-2.0.2.ebuild 1302 BLAKE2B 3b8e4fcb5c8c657153231f37ad723fa02dac6e87b5db2976ed69316a47967592672f16f3e1f33fb552723da73a10b934baa18a713c6e5cadc984e108009ccbe3 SHA512 2f71da7dafb5edc1fd94b70b55e5b369dcac4742ae0bc0783c6b56608d5abc099016fd83c159fc1ad16e46056f73f712eab577ebbf9c0a956945bbf8d6ffe08c
+EBUILD nokogumbo-2.0.3.ebuild 1295 BLAKE2B b28e4b608924a083a6284043307f225f3fb4e9eb539fa58b12e1b20970e45e07abd9d310aea4620ebd2b85c5afab4c025ff6c5b3bd7c5fe947b491ed28f4cf1c SHA512 b6d408d4ba17fa5cc5d0bd9e3371bb1b7eebbb6647bad35df234435cd5e72150eed4db99820feb484deb0e095a0112f072a2e68cc28534be6cc4e914dac4cd13
+EBUILD nokogumbo-2.0.4.ebuild 1295 BLAKE2B b28e4b608924a083a6284043307f225f3fb4e9eb539fa58b12e1b20970e45e07abd9d310aea4620ebd2b85c5afab4c025ff6c5b3bd7c5fe947b491ed28f4cf1c SHA512 b6d408d4ba17fa5cc5d0bd9e3371bb1b7eebbb6647bad35df234435cd5e72150eed4db99820feb484deb0e095a0112f072a2e68cc28534be6cc4e914dac4cd13
 MISC metadata.xml 341 BLAKE2B 56d3bff8ec2e7b01a76edaba7633edf4388b00976deab109ef3e34112f35878bfa81de9a32a2aacfdef5f3919fb0210a6c824c4d1242686eccaa7237f783b176 SHA512 652bff94a0b5050f6d8dffbc1dd2b0008202c9f6fd19aa44a148a53c7ed9cc78b8ed64ca4c548f60643b58954f1e344bea0a5b9fc28cd381daf2987ccbf6c149
diff --git a/dev-ruby/nokogumbo/nokogumbo-2.0.2.ebuild b/dev-ruby/nokogumbo/nokogumbo-2.0.2.ebuild
index 519795425f82..7e3261abe766 100644
--- a/dev-ruby/nokogumbo/nokogumbo-2.0.2.ebuild
+++ b/dev-ruby/nokogumbo/nokogumbo-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rubys/nokogumbo/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Contains a bundled and patched version of dev-libs/gumbo.
diff --git a/dev-ruby/nokogumbo/nokogumbo-2.0.3.ebuild b/dev-ruby/nokogumbo/nokogumbo-2.0.3.ebuild
index 43462c380e47..993d79849023 100644
--- a/dev-ruby/nokogumbo/nokogumbo-2.0.3.ebuild
+++ b/dev-ruby/nokogumbo/nokogumbo-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rubys/nokogumbo/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Contains a bundled and patched version of dev-libs/gumbo.
diff --git a/dev-ruby/nokogumbo/nokogumbo-2.0.4.ebuild b/dev-ruby/nokogumbo/nokogumbo-2.0.4.ebuild
index 43462c380e47..993d79849023 100644
--- a/dev-ruby/nokogumbo/nokogumbo-2.0.4.ebuild
+++ b/dev-ruby/nokogumbo/nokogumbo-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rubys/nokogumbo/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Contains a bundled and patched version of dev-libs/gumbo.
diff --git a/dev-ruby/ntlm-http/Manifest b/dev-ruby/ntlm-http/Manifest
index 59ebcccc15af..3fdbf5250418 100644
--- a/dev-ruby/ntlm-http/Manifest
+++ b/dev-ruby/ntlm-http/Manifest
@@ -1,4 +1,4 @@
 AUX ntlm-http-0.1.1+ruby-1.9.patch 657 BLAKE2B 179668ac8377cb16485f934027dcec83faf2ad790f45b0382facc3fd25eb957a501099b346b1f9a7d1a90d96e96566cbd6307fd3868bb5702945a88da75785be SHA512 c1cf26169cfb7eb8e5759b143f49dd7eaa124cb9e22314e0d2d36c3128080e2dd85b84386ed219cd35e3022e1ba36926dff6ee603400362d8ad59bb627f3080a
 DIST ntlm-http-0.1.1.gem 13824 BLAKE2B 179baff2b4b00306b15aa42bad3e91bb41bdc6070ad2eb4681075474839dafea06c54ef7b3fb9f997951ad7b4ddcfa78caf5345b35e5944366b60f27bea63530 SHA512 1d2868582a194fb3a3dcb48a7dfb031014e51a93d57afb83aaef98be8e57789506b71e6440770ca7bc48979d9dd730f398d01d554d6d0575ff01046a227c7669
-EBUILD ntlm-http-0.1.1-r2.ebuild 874 BLAKE2B 6803d7cd255c5b463f521031c9529dd38e91ef58645b81f064080c414d15e63cd3cbdf639de99095af51456715a7df7aabb95a56755285817b716bed29199aff SHA512 95f7137df7a6fea8c2d148d19ac111906bda721047b1a26d71d9173342538669ee56c2740f486e35b3b65a5cb631846f387466c717ec9bf2aad6c4bf9dadcff4
+EBUILD ntlm-http-0.1.1-r2.ebuild 863 BLAKE2B 38201ba2956e561d7ba53dc065cbbe71ef136696712749e9ab4b7175c152dad3ce99f5ce9a25b19835703d6dadd98788146bf93cfc5ceff03001dd7cb05d45fe SHA512 11b42cf12cd45958a1068004588b83389e9f334bea1ba7fb5e840dbc6ed63bd4dcb8536f84eddd467caaf7700571b1fb8ed63f913bbff8251731bbb51d9548e7
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild b/dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild
index bd4158cdc1ad..3626fb0277fc 100644
--- a/dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild
+++ b/dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.mindflowsolutions.net/"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
diff --git a/dev-ruby/oauth/Manifest b/dev-ruby/oauth/Manifest
index 1740f7e0f7d4..6353db24c7a0 100644
--- a/dev-ruby/oauth/Manifest
+++ b/dev-ruby/oauth/Manifest
@@ -1,3 +1,3 @@
 DIST oauth-0.5.4.tar.gz 59141 BLAKE2B 1e588d411795b7c5b4ae5b7b3c9928b69aaa005bef858137759757e9f06d6de144408e4dba33d7fbf82a3f2586238a71b85b89c681f5d633453dfe0da954a2fb SHA512 f114f80255944934a276d0f9556ed37e4a0a72b221269cf7792f2c3a5a1504c5ec726fd5b7437b1102c648a6cf451a1c83de4689f53d30ea8c6a1d62662de535
-EBUILD oauth-0.5.4.ebuild 1065 BLAKE2B a7080a8aa0d73659c9d017249c7f3ba96b184d48087f89e94940722ea5d613b253b832a5b049f75d70580cf2dc9c6f9ff59e820dbbb63b5a3fd9705173d76c81 SHA512 435e170ae18e6291ccf8ac6dd866e6af75c9f68ad1bb4e9dc5c1a2367345dadf260b9ba2ce79b9eaa892c4b3eb536747116978c39144e616a4c404deda78aa58
+EBUILD oauth-0.5.4.ebuild 1054 BLAKE2B 0171f7c346a4aa6a1d71cfdad59223accde4e560d60d185c5e8accc78ab583395a88dcd94f26c0a937ad92d4fd3fc1222c01cd042740b91c99ec9eb6eb9e73b6 SHA512 cbf832f21e6676dfb2a0584bdc2d4e59e1594becb178babb9b4abf866fe348f20b86d9576584404b00f10fbe1943efb10acb80ea11070351700489c406ce94c4
 MISC metadata.xml 335 BLAKE2B 57f59b76960a57baa7a46f505fa812b1f3417ea7f026272eb513139014e245cf7f34c286a677b6b91e7bd293c28da283dca118e32f76338758bf4a2247c01a32 SHA512 a740b8de21545f432e6e1d4b72a588bd1332bca643f017d8cffa84ae76f6a3d4514e3734f24f80954b7691034411b46463581291ae405a1026b90d93d991cb96
diff --git a/dev-ruby/oauth/oauth-0.5.4.ebuild b/dev-ruby/oauth/oauth-0.5.4.ebuild
index 59a71726716a..f8e8976472f6 100644
--- a/dev-ruby/oauth/oauth-0.5.4.ebuild
+++ b/dev-ruby/oauth/oauth-0.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ RUBY_S="${PN}-ruby-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index f9fde34156ea..42d7f0b3132b 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1,5 +1,7 @@
 DIST octokit-4.18.0.tar.gz 3091587 BLAKE2B b48ccfa35f53b686e61a0f79c09bf20f063843c98f75a0896e71739a33cf9b770c8b5e5c27cda2c8a25ca6255cfa7c4e389b372ca269d4c46b499abf1838a4ad SHA512 e749afc4303f987b502f8c79ff60e33c6f49ff84d25f16cdb3d9165c7089912570a7b77af3716341cd5216e5c8e3534a805e4347081ec7765a4e4f54fc432ce3
 DIST octokit-4.19.0.tar.gz 3121443 BLAKE2B d0ac2daa9409d982d5428dd7fe1414c1707e860d7c3ec6534fb962c38786955ceaeb0f1cb33a8636c18a216fb4e2b8ac2777f7ef8b7ccd433b6d4597d686ffb5 SHA512 bd4171423c84d082cb3c5dea4bfa1bba9584964b8e328d88235a8ecfd084e1188367afdf54b5097049427600451edd72dc3663bca50ff761a44ddbcb001d0a99
+DIST octokit-4.20.0.tar.gz 3127939 BLAKE2B 30b251c95cf664ea83d23473ecbd5d1652586a567775253afa3f0c954490a6381c86da40cdc3761c8c43b17c850dfe9ba80f3814e946f1f3a008be81dd3c002a SHA512 180a4846052dc223b4d5444acc7af7d78151ac941687c75e6853c119ce75d9383fa5ec1ffc7ede97a6ee6d5780ef27030f2132761484099f634be6a3c4a9d7b6
 EBUILD octokit-4.18.0-r1.ebuild 937 BLAKE2B e0fd6ba0cee38c22e4e520b83cec1ae4f35c90cc9bee3064e0e954f5c01f9bfe97a90c3a7981878796f240cec15086291ccf53bd7751d344418e173f0395ffaa SHA512 3ea459d955bec294bc05535b004dee8fa929e43187c3ff1304eab82861fec30eb9a9f5dcfe8a1d4dd93185069680633c9208b565e45fb74b35a0023097320b6f
 EBUILD octokit-4.19.0.ebuild 957 BLAKE2B 70cfb54a1995d2290c61014fd3f99217b393cb5dd0cb861d24ed9fba7cfa3ee9f0c494b290798c296cb86e06c029b71ba551fdfbd5ab69beb5312937466935e3 SHA512 7493b5b9373eb32cdb3cf6b325e528a5be3404de489e0eea8008feaaf54d10455a059448c775e6e678577e87d0962fa2f5f1f5cf2bffd0059cf154aa4fd215be
+EBUILD octokit-4.20.0.ebuild 957 BLAKE2B b169190ad17a4776809c3b6dc12b986a0ec879d1b0cb69af9dca55d0537a2ffb7a29973d322d8361a92f1fa27deacd32d1c17bac420e5bf372a18db9ea3af89c SHA512 043bd27a6420c8077a99b4557291c1df21c0171b00eab9bc2cfaa4cc69c27d3bd40944129883907b644b128ae0b9f1412c5c5030383a61112a9328f2f5399dda
 MISC metadata.xml 344 BLAKE2B a2013bc4988a44c7d4b2e9dd6005d30390a7fdaf39f37a4adf8b539825b43f5d0eec457dae147b782f90f15d77fa5f485a6bada65be086f67b7350603945cf64 SHA512 3866d3979a8749d780367b56ae524d8f78286d2174602452ba272d26a4fb49cbbe8945183e4a64e70400b758fba4fc6bf88bcdf24908e474a378b628a1263457
diff --git a/dev-ruby/octokit/octokit-4.20.0.ebuild b/dev-ruby/octokit/octokit-4.20.0.ebuild
new file mode 100644
index 000000000000..fcc88dfcc4e6
--- /dev/null
+++ b/dev-ruby/octokit/octokit-4.20.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby toolkit for the Github API"
+HOMEPAGE="https://github.com/octokit/octokit.rb"
+SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RUBY_S=octokit.rb-${PV}
+
+ruby_add_rdepend "
+	>=dev-ruby/faraday-0.9
+	=dev-ruby/sawyer-0.8*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/jwt
+	dev-ruby/mime-types
+	>=dev-ruby/netrc-0.7.7
+	>=dev-ruby/rbnacl-7.1.1:6
+	dev-ruby/vcr:3[json]
+	dev-ruby/webmock:3 )"
+
+all_ruby_prepare() {
+	sed -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' \
+		-e '/pry/ s:^:#:' \
+		-i spec/helper.rb || die
+}
diff --git a/dev-ruby/optimist/Manifest b/dev-ruby/optimist/Manifest
index 52a797648c6e..82743052123c 100644
--- a/dev-ruby/optimist/Manifest
+++ b/dev-ruby/optimist/Manifest
@@ -1,3 +1,3 @@
 DIST optimist-3.0.1.gem 30208 BLAKE2B 66778029b9e2ac2eb38beaab5cb73a4fe58b123c401fdfc00d924073a6dd97dca05bbf8ab3a88e47ca5f94ed920a583196d901c6a2a4962e93c8a2ef905173ba SHA512 209fbb355a7ba75208cef314ccaa188955463551d1c914f10409cac189375b5be40fbcdf0d88a5ce825c527bca7138528fafd6f37cf73f5e68f3b453f3ef8485
-EBUILD optimist-3.0.1.ebuild 727 BLAKE2B dee24eef9bf601701e708cef0d8849cca228fe4a946830a454c0fbdd03894cd8d9c0bf3dc467f7a02760e923ead6d5269b02941b5b3ab3d0ca3ee0fabfc9430b SHA512 db6ae6e92810a614efff55b212fdb5369920fe9a1bfb25d708c6e68329644f28e4771508bdd273e712d368ac56f8ae100c557c5745623d4953ed4e4b77d6ba18
+EBUILD optimist-3.0.1.ebuild 716 BLAKE2B 1d1ed6d9320b69acf3f529a43c0a3503a1759391720514bfa4db2e2184cee4f647848c5b8ec87defaa6d9a1dbf45234855c303448359fa5308e0fbfd88efe442 SHA512 f8b343a05863f7d4de8e346d1132230cd3b2b49cf052f3fb59aca80386f1861c11ee0fed673391510539eef37b2492d85858d64b200bea3e01cf50863b149caa
 MISC metadata.xml 615 BLAKE2B a53d6689cb0a71ffe1bcd34437e4213114da2c79857404d084e55079125d8890d758b77f889dd9223b15f75b0cb286ae6b675d70938d901078d90072bc7fce20 SHA512 b0cedf05cb559e4673164d64d39a3523dae4bb27b33b1114bcc98da5ed550a752dae52f0882f66fd0d3a4cad1bab9619de6b3dea3148518eacb3046fa4022863
diff --git a/dev-ruby/optimist/optimist-3.0.1.ebuild b/dev-ruby/optimist/optimist-3.0.1.ebuild
index c4bc22804cd4..8d92031c97e1 100644
--- a/dev-ruby/optimist/optimist-3.0.1.ebuild
+++ b/dev-ruby/optimist/optimist-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ DESCRIPTION="A commandline option parser for Ruby that just gets out of your way
 HOMEPAGE="https://manageiq.github.io/optimist/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="3"
 IUSE=""
 
diff --git a/dev-ruby/patron/Manifest b/dev-ruby/patron/Manifest
index 39c4109f3362..9852a3111eb9 100644
--- a/dev-ruby/patron/Manifest
+++ b/dev-ruby/patron/Manifest
@@ -1,5 +1,5 @@
 DIST patron-0.13.1.gem 64512 BLAKE2B 14f691cb0fd1c863a1ef634ba8aee94751095138e940f13bf09860e9e0061872fe14fa33416f59f82d4adc53963721d653936a3f058b27654ea7593d6068d0b7 SHA512 7b082ff7442c2635c38b37132cd61f6cd18d4792d41cbf3bed1201fb7371b75bb628a295f4e3dd173c23e086d3c1f54f0217df3f7d1a30c1031fcca86269e1e7
 DIST patron-0.13.3.gem 65024 BLAKE2B 87aa69aab49978d14a80ed9e09d74d7853da3512875cc3aecd3f387d1523b85c84625b57a5826e5f5f999cec4feaae58c1aaae96582144a5c9dc537c9d5a4224 SHA512 afbbbd9570e338a5d1b97b4ebeda76ac95a22c29d908629723d345a47400183c2ccee67ebcaf5b6f9ecb032eb3b847e70ec9eebff75b33045a3665c215abfbd0
-EBUILD patron-0.13.1-r1.ebuild 1250 BLAKE2B ed6fe6a7f5be66a4aa9c2212225d1283a0798c6de787fcfd59a853630b82c1bea3ca7a0f98641b01e6c193a0d6326d991d92f66813c69d9728bef4013e9e052c SHA512 90f5e7269dd0e93cace60443f3f399f3ae0f5141c93a039ba276389ba931c94675981a13b5e17bb481e642563ecb91876da3f87d1aa885d57d01128f88ec5292
-EBUILD patron-0.13.3.ebuild 1266 BLAKE2B 1e52062b36b47b638d46714134b19e4b62a8516c37b35fb4e25a92980d7b5a01fc32594ee29c4aee9b7715a916b25c1b4d32a631a010711a67fa4f8f5dbe9ea3 SHA512 f56bede69e6dddc20386661ff1fca28dde8b7fa5470adc1f412885d61a3c0b039d83c59d082ecaf06c0222bcd5c90d10f2dab5841c1244c933113ae1662e6e38
+EBUILD patron-0.13.1-r1.ebuild 1239 BLAKE2B 613bcfaf54076838f6a7d291844e45dcfac06b734f541fbe997bc035e24704ea87078336f5347e97fce5ce372bff059bdf3d8f166172accf93abea87b466fdfa SHA512 12dd83689bd12377f3a7c985be9d10a44eaa08f5cef2425cf747551e8312165f40a3c619a1e3c0edfb3bd8fae46db711ee06a6924a38b9ff777de75f0d49b171
+EBUILD patron-0.13.3.ebuild 1255 BLAKE2B 54f0f577fccaab0a4d488f5f394e59ab036eca9a30d387d1c6754f18ca07ff9928e7c631732a800b2384213695fecbc02f7f570fb6dea918092344453617c490 SHA512 2d1a6722f3e9382e440f9630f304a77e07efc67779b977075ad78a34e365c02d03b04aa92419b89d4c2f7d3705b20d3444b2471735c7eeada96ef0e5ade130ad
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/patron/patron-0.13.1-r1.ebuild b/dev-ruby/patron/patron-0.13.1-r1.ebuild
index f80cf6aa85ad..8564423a8572 100644
--- a/dev-ruby/patron/patron-0.13.1-r1.ebuild
+++ b/dev-ruby/patron/patron-0.13.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="https://toland.github.com/patron/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND+=" net-misc/curl"
diff --git a/dev-ruby/patron/patron-0.13.3.ebuild b/dev-ruby/patron/patron-0.13.3.ebuild
index 5ab39b36bb23..cb42adae716b 100644
--- a/dev-ruby/patron/patron-0.13.3.ebuild
+++ b/dev-ruby/patron/patron-0.13.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="https://toland.github.com/patron/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND+=" net-misc/curl"
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index fe352dcdc9b1..18c86e1e8c19 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -1,6 +1,6 @@
 AUX postgresql10-tests.patch 1747 BLAKE2B e0a992461221f31cca1f39453e077a1d04d3f436e0eba3b683ed42092d266a8edb8a46e61933ac41e94ead483bac325833f1c21bfc57cf7ebb160f046d80e1f6 SHA512 89a7937b0791307366fbc97549d48cb7bdf92b66895b1de7dd554a040ad6a08b4af69709bf1318df95cdaf9824415d76b5f6be98be48995b75909fbfeefb6295
 DIST pg-0.21.0.gem 214016 BLAKE2B 9e27646cd85bc97dedfb980f4851b19a1ef2aad17f6a5c60726c1683642af5c4cf87d518b300fb4c894e1580f808f8af6158b57f1ac25971c1fc55818abee6f4 SHA512 590a8c34487d2cf030082cfff87b2cc83b636df06a931e394acfb098ecb5728e793d777f125b036ee9953bbd21ec5facf91c932930acccb507d3394f2fc4cc5b
 DIST pg-1.2.2.gem 196608 BLAKE2B 068be98d190cb4074cc89bdb5b376322f323950909f7a6fddc8669a3ff0f85eef9f512bd2ec7121707e9ea077b2b428f698e84f2118c76e34f5def75ca303fca SHA512 5c7cc90afb75a66e80cfc34c4875cf22b005aa0a27e78db6f71d1829f870c6409b73326a9925f79c0d642e93ea51d1f84c7383323fea44b7488e83deb7754951
-EBUILD pg-0.21.0.ebuild 1679 BLAKE2B 42b714786b8680e1d66d1257250a480646ef5d5a499e4b2af29e71965330dda48e31b773b3e1e6a57b0b451fcad3cb80e04ce29a35d9015733bc681c03c43de5 SHA512 878d85ad760e9803bc845b80875d7e7c8a8ac2db95127a9d85e5281aa168b59e8a34fa11db3d889d0c0593f39092dfe050752d68c5cb28bd89e66f078e7d3f15
-EBUILD pg-1.2.2.ebuild 1606 BLAKE2B 368a6703f80efcc2e97890170f001fca3b6d9aa94561cf51a5aad224d3f1caf4fc02f00b6384ecef3a0627a852ca4a942c075fbe83d8f2b384bc88bed8c84b3d SHA512 3f11966d74d6e493d3920f27e361c257dfb3beb0ff07707f45fa21545b84b5a4943f7411ca28ea8f2b9afe5bd95d7e26edd7428e1ad600d5ff8b9120bd9885ce
+EBUILD pg-0.21.0.ebuild 1668 BLAKE2B f0ee08a6207cb8e9ceb5dbc2cfb70030fab6e5b9fd1b293b99f401807fc55759e76411a2d30e0f5966b9d24c56a05e3e5db66861f90d1db08993828afc47dad6 SHA512 bd5a27376d319aee0cdd7e49ce46fff883f26769b11bd58f14cda9211c3e6915c31becce8fcd38d33f3f27027228a68b1bea6c48b66feb69dbd2c1291fe2ad94
+EBUILD pg-1.2.2.ebuild 1595 BLAKE2B f3dcdc64b69e3e8da9a9981ff97c72ebf9f58044e43be2283cceb70e45a70f349970f003d12ec469827170192c441044e92547e9ae0bd8959fc9cd34fc6d1aa1 SHA512 b90c98ddd7ee4de299f7bfad52955e76a54cd615218c8e86ed1cb20e98731cdbee20e0f8cc3b8faa125969233f3b974803f38085feece6c0cd125cf04261835d
 MISC metadata.xml 337 BLAKE2B 1ecaa6a65230c424031ecd8a3e462240e10caedc1107b6818bf866cd0c698a5f534d450a467031755d80a242a84e55a5e29a48a480c1b55387597765ae0f4b1f SHA512 9e38510b1ad726a3867df6b39f26f887f65dda5e60a46f0f867c65d5759a534c7adb6ffd072882437cd3a6f7fc1ebdf91c79def51a93f4360427e6f14aa3455a
diff --git a/dev-ruby/pg/pg-0.21.0.ebuild b/dev-ruby/pg/pg-0.21.0.ebuild
index 85f79ed57e94..99553f10c3f5 100644
--- a/dev-ruby/pg/pg-0.21.0.ebuild
+++ b/dev-ruby/pg/pg-0.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/ged/ruby-pg"
 
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND+=" dev-db/postgresql:*"
diff --git a/dev-ruby/pg/pg-1.2.2.ebuild b/dev-ruby/pg/pg-1.2.2.ebuild
index a2573c401e79..accf547a30ff 100644
--- a/dev-ruby/pg/pg-1.2.2.ebuild
+++ b/dev-ruby/pg/pg-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ged/ruby-pg"
 
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND+=" dev-db/postgresql:*"
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 2785b816b80c..42be8f649636 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -1,7 +1,9 @@
 DIST pkg-config-1.4.1.gem 22016 BLAKE2B efac610221b288bb669a3783c0e70af3951478147896315c53af2186912b60045096c0ba01a0a59ce09897a2e4e747d28a091b947281fe7f6dd6f85cea31aae7 SHA512 72d61466c1ea53a5eda66a8e8f8106fef0269fefdd349ac83959a34bb8f36796bd3e9c7fbcbad5763d2fca015c65436f9d410724e27b6d1c495e3957d26757a6
 DIST pkg-config-1.4.2.gem 22016 BLAKE2B fb8f32c811f856d11653fc0450e5615d83dea07f07f712b4914edfdca1e35f9b2da7d04578c9f28a1562cb0a405e54f6429cfac792ca2f86710d18c30a75be71 SHA512 f727f416860b08e87390c60800333bab7b0d6238fe1f93bc12b92ec67ca75c5c9ad128332a54a0b895dbf49944a50619e3bf40c49efcc7e73811d51714ae3d66
 DIST pkg-config-1.4.3.gem 22016 BLAKE2B a23bfee3790a03d4224efe16439b1c43a6174336b567d7c84d429e848035f7c77d96340e677a7f75e3cef415f236cc1d09cc0f75bee5d8769e9490bc2fc5f4c8 SHA512 4952636442d585b555d048666937e568f237789329ed6110475efe149d607f4b1946ce1b616574a91de7e4c17ef9cc5cc3b4bb2867a7dc08344183a41303f42d
+DIST pkg-config-1.4.4.gem 22016 BLAKE2B 6514405160fdfaa2be0938cb976ae779b964fdf54f0c49f6480ca09d3877459cf88af1f7b17519ee511d24c9b9bdc21087091b3050fcb252487d880f330a7beb SHA512 bb355e2183c9077d0e940d768b7eb12dff2b31fa518b1d28be751c52ecbbb16a99b326c7d6953501056074156faef9f30682dc82c3350da00f80f9a55d491550
 EBUILD pkg-config-1.4.1.ebuild 782 BLAKE2B e2ba8b0981bfbd85b1451a912d0589fdf518612514dc58805bbfe9a446bb7a34ef45d8ef0d2b86dd1f67526d938ca526d9c1e88aaf6cf0785de6a0987585dbd2 SHA512 4ca32118847ce4c0d63218f323c53d1a2d86bc10caeacbfd623cb77ed22afbac7bc1dae47269858eb08a1c1cd2c248057fd6a12705c9d657ccb1a0b237196880
 EBUILD pkg-config-1.4.2.ebuild 782 BLAKE2B c98e5b89f526daed4e5f6df0b5fbf74ecbe22d7c60177d43c11ff271aaed89f44f5b161946ce59995840c7eb31b72c656d13cbe900417c2937e9b3642d036698 SHA512 cda391497ad497d1ad7d20a9f731aaca1af862ae34ff1b063d26dea6aed75a497f69d44ce7a2b255a8abc7e49d909e2628a51e3672dd6c5fd10ebb4f08911975
 EBUILD pkg-config-1.4.3.ebuild 789 BLAKE2B bbd800055fab6aeaf9330028be5c028d5ba213b60b334f816651b6a79248ea72503a7c9f2a54d93cffb0ccfc88b0dbbae604731f80f3218fdd322db6d2876a35 SHA512 7ce7ae53ba76ebc321b14a02041fafdab819bff40bef5acdec81e411ecefb19ef082b3bd2fc68fc8a21b0405033b0ee37ce71f75bd2869961588cd12c2b42576
+EBUILD pkg-config-1.4.4.ebuild 643 BLAKE2B 33bce683f9945c9e6c439a99ba790990ca0488de65ce251381d2d57eef8a778840cc1b62ce8129d5703bd0c143339f579d6b32e6d56e3493968ef80b8a3deb1a SHA512 f41236d2d64280d629c4131c0d5c4877eb675d2f4e2ac2c4eabd9bf9a91dbedd7c4f756068fb5dc2be74c8028ecfd618f029e22bf6e7dee69355f8b780d55335
 MISC metadata.xml 424 BLAKE2B f3283c73952daca20d85a5421afb67150aae553faa03d653686718ca5216c1a65ab5983fb669cc34003902b0a969275bd22e4d1765f3896c7e25bee301323f42 SHA512 40e700a309e3678157d9da4ef18e8f0178e23aa192949ac06acd6f8026d0d53d4f79c199aaf59e0e27dba17925f44a97ad901e0774c6b70583b24b09254eb8d5
diff --git a/dev-ruby/pkg-config/pkg-config-1.4.4.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.4.ebuild
new file mode 100644
index 000000000000..6ad94f426799
--- /dev/null
+++ b/dev-ruby/pkg-config/pkg-config-1.4.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pkg-config implementation by Ruby"
+HOMEPAGE="https://github.com/rcairo/pkg-config"
+LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+# this is used for testing
+DEPEND+=" test? ( x11-libs/cairo )"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib test/test-pkg-config.rb || die
+}
diff --git a/dev-ruby/plist/Manifest b/dev-ruby/plist/Manifest
index 08b0a459b9b4..792268b69e39 100644
--- a/dev-ruby/plist/Manifest
+++ b/dev-ruby/plist/Manifest
@@ -1,3 +1,5 @@
 DIST plist-3.5.0.tar.gz 36650 BLAKE2B 8f93f8ef2fdedd9da50c4bdf9c473d3b199cd828909ea1572b761bc4e8d0508e997a60737ea21c7fa96764787ecefd41aa0b0046f94d3f89de796a746a794e21 SHA512 b1c9ccd66db1e0d1ebef3931f6db0f57ace2a1bb417885da48e9658c66af28997b6675a8050db78fe0083f05afc91e1313cb823d79553288d7c0c4a3a9762920
-EBUILD plist-3.5.0.ebuild 788 BLAKE2B f3895c1422dfff905a9d4df151a6c875c6911e3b3fbad4c24f3592610c9c74ba0db47255499d350f85e02cafa32f514404d436c6aed2b873b8230e01c155ded0 SHA512 eaf3e4ab4b04f107074c54080d7b07f60d8ec1a05c0e39cc0434c6eecab2d68c5e535a36ad63c35b0e9b98de5e6b50fd14e0d812c2126cbe63db7723d5d8b91d
+DIST plist-3.6.0.tar.gz 37311 BLAKE2B dd9bd1a7cf62974fb4b51744ab826ab65e6e02030073ec3b60b3d420982b65ceb3b1c1bb50e0f38fb68e25c366b17e7885cf5053418338ea05c324afad2df5b7 SHA512 d5991d944d8f02cacecdbdf9834379f34fd915eb3cf252aa1923e8d49a3b17c72ae07fbd53f1cfe9d0c14147729f4736838e4cea3fc286a90280bcc3de4b7fd1
+EBUILD plist-3.5.0.ebuild 777 BLAKE2B 1c7c3ada11258d96905ea5d8d31e842bbb01441423f156042e882eaeae08f09c8ea776b56bebe908ac71fdaa7bd18e025194f16f0ed92e19a2988660c442c4c6 SHA512 75634873f83b47bb9c63e8fbc0aeadb6df0a0020a686c690765c60ac68513f4c6c38c740a25c13153c34e486d18d33349dcf3f9ba654dc5f9efa3f9f72bbf099
+EBUILD plist-3.6.0.ebuild 746 BLAKE2B c0204067aece20845f245239e90bbba318c3452b66dcde88828fff9b03e846f869f846d5e5eb34392b381c5b8706e725b9844c6714912fad9265ea57f75fa5c2 SHA512 f296f72409811833eec558c609202cf4762fefed79315b0ae24765c2fcfe05579d9fa9b7d21915d003804faac789f9ac051888147e89de7a692b8fd566dd2c40
 MISC metadata.xml 330 BLAKE2B 0be0bc0db0a0b4ac8ce4b11ef9c0b67b13238e4336280a2bdeee8317f58e4a97a78fa63b75cf1aa01b00d0c69bf3b53950f68c22a04dcac35b63097041ccdb7a SHA512 9b26476dd91dbe33c4ceeac8a49208718f177262c94d272b8c79cb49806892d21a815cfd379ce38182d00c9e542df2ca1131d6bec4523d694f5582a80c52d337
diff --git a/dev-ruby/plist/plist-3.5.0.ebuild b/dev-ruby/plist/plist-3.5.0.ebuild
index b07ffde2a478..eb0ca18ca57f 100644
--- a/dev-ruby/plist/plist-3.5.0.ebuild
+++ b/dev-ruby/plist/plist-3.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/patsplat/plist/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/plist/plist-3.6.0.ebuild b/dev-ruby/plist/plist-3.6.0.ebuild
new file mode 100644
index 000000000000..3d6bd85d776b
--- /dev/null
+++ b/dev-ruby/plist/plist-3.6.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library to manipulate Property List files, also known as plists"
+HOMEPAGE="https://github.com/patsplat/plist"
+SRC_URI="https://github.com/patsplat/plist/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/polyglot/Manifest b/dev-ruby/polyglot/Manifest
index f72302bdbfc1..b0015af9d56b 100644
--- a/dev-ruby/polyglot/Manifest
+++ b/dev-ruby/polyglot/Manifest
@@ -1,3 +1,3 @@
 DIST polyglot-0.3.5.gem 8192 BLAKE2B c9f78c05109345e09aa0d0c899e551e67ce7bf191ef00bf169cb05c9860ab538e303fa177c6aec8ac9944bd3ad4263fbf0819af0fa190e989caad1c75c1e5377 SHA512 405790c8edf5a98010334a62f7efeddd60f6dcff91ad5ff599579be3201a7e1b359787da59523a612fed5ccf8385116865316fa8872f0350e33dc078410a54cf
-EBUILD polyglot-0.3.5.ebuild 571 BLAKE2B 900bb6be2aef0050d8c83c821e022a7f178608a3298d276551e6e2336f4ff8ffc9baf991cfca059d1027825b84319fa5510a22629b60895bfb5b86ca3e9db286 SHA512 1ea632e2cea42768f013048fce94d366b71c7513d1caa34126aebff3c6355bb54a5bec15ea69cd8b5c943368d2b9789000142c38f1b12b3287967e2e49a814ec
+EBUILD polyglot-0.3.5.ebuild 560 BLAKE2B e6a37ef53bfcf9d1dbd4745f258833c3132057ecbfc9cfd18f4592f1b1cf238717a234463fead54af956a099140ac33278b5eebe33958da50971bf75ad1d4820 SHA512 45ae32d06a35e03fcac2cac3f21e6c51de7dfbe82731456cdf28f1ce300cc9ce413370d3f5393966a75997dcd98c78857b051ccb02aa7ee89cb871ce59f22ffa
 MISC metadata.xml 475 BLAKE2B 64c33e4ace7dd9a38c5048af6505b118a4c9b883833f9c701423201f418b5d2d21f955d7d584555cc7b350dc0f0d861472acca063a794b73d7443378e2a7f2ea SHA512 94e0a25efd37c4e396d86ecf8eae9233edaaca6796190e4d12c7a88922606cae6a9fee0d69bee6ef8d3909f2e18ef5d2c80d6334b06a6febf1fdcab5d5313fe2
diff --git a/dev-ruby/polyglot/polyglot-0.3.5.ebuild b/dev-ruby/polyglot/polyglot-0.3.5.ebuild
index 3f1076e95df3..bfdd3790570f 100644
--- a/dev-ruby/polyglot/polyglot-0.3.5.ebuild
+++ b/dev-ruby/polyglot/polyglot-0.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,6 @@ DESCRIPTION="Polyglot provides support for fully-custom DSLs"
 HOMEPAGE="http://polyglot.rubyforge.org/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~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/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index 65eddb5f2acd..cf6c94e645ce 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -2,8 +2,8 @@ DIST power_assert-1.1.5.tar.gz 17326 BLAKE2B bd5e0627b681ccebc546a8b95170a3fe20b
 DIST power_assert-1.1.6.tar.gz 17331 BLAKE2B 1165f092f7a6dea45c8f12d61e2ea77d30091e1a450cadceddaaf709f9e3dc6d805489780021d978ebfbe5dda15e302f0cbebc7a03e247d2e654fcd0eafd149a SHA512 e2a42fe3c4dd5f51315d4076310971b2678605d448730855c53664f638b7e8b8926776d006be1c40ddaff59d5715838f601c5ed86635cd8a1bbb214e147b0ada
 DIST power_assert-1.1.7.tar.gz 17361 BLAKE2B 54fe379af9231a1794534f0199bb587418ea6d0960f7ae5cfc3a9c484c692e08254b5bd7220120559cc1b9e6f1b85c73d0e8e58c115731faea72d70180a94336 SHA512 bc6649bf17f41f7c84611eb334b73b43a0b7c3892a46acb82ae7b43dcf43b7a556ad617a6806ce1d354796bc694cea9eef7cc47b1928102f1822a03e01160a35
 DIST power_assert-1.2.0.tar.gz 17358 BLAKE2B 8b75b34f5d80f8f52370816b916e3bc3a60493b8f52a910346c51c70770e0645566b8b7c3dd551d8bb1f1cbdac5dfcebe043457bd025d819e3782e75e41e0f16 SHA512 2f001f6223fc3fb586c7b0457f775379040e11eb83b5bdda51c02b2b24e531aecd6e12e6ec80bf9407a768ab1a10b0a6b4c8f1a92ca69ea702faf56202bb635c
-EBUILD power_assert-1.1.5.ebuild 1422 BLAKE2B 46c2357d75018b11dac52c83df1c93e2c6cdf833eaac84d2e25fbcacc37595624c617488d7bcb192e80668d5a2ee24ce4657adea17a2e5fdbef05d17b6629863 SHA512 1f1c54b44cec1ab56720517bfefdc12143ecac570e4b056657843c34232b95f1985a0b62bf94aadce360b4f49813fce0c45d2dd807611150599abf7a762b4b21
-EBUILD power_assert-1.1.6.ebuild 1431 BLAKE2B 5bb8b4ba65a8faef7020c78e022851654379fee905113a7d520b07a4ff96c3fba2475eb83acc56dca897a0eb2e35dbd3cd9dbb593c3e6851628643ee9a594d81 SHA512 aed2418b0268b784e973b6ae950f3c0035eade8eabd65434fe9d2b05e2bc8f2bb2e0f3f6ac2de312f8f0737ca429a232cf0e188654cf702082a7b690ec87b816
-EBUILD power_assert-1.1.7.ebuild 1431 BLAKE2B 5bb8b4ba65a8faef7020c78e022851654379fee905113a7d520b07a4ff96c3fba2475eb83acc56dca897a0eb2e35dbd3cd9dbb593c3e6851628643ee9a594d81 SHA512 aed2418b0268b784e973b6ae950f3c0035eade8eabd65434fe9d2b05e2bc8f2bb2e0f3f6ac2de312f8f0737ca429a232cf0e188654cf702082a7b690ec87b816
-EBUILD power_assert-1.2.0.ebuild 1429 BLAKE2B 517fd51e912bb208f4076dd8d714d03d488a1a6bd1ed728fb9472de7c73c35265692d1f981268820858e5cf08acad11c0ccf93928a134ebc3153cf60bb4a79a5 SHA512 172814fb55051044304d38d9e1de849e9a978bbba7b1543f14257bc42db2b7660fe0f5c16122e5d83e18b5523c5c7aaecfa101e86b48a652e11770abf948e69b
+EBUILD power_assert-1.1.5.ebuild 1411 BLAKE2B 78a8625e6b7a12c3da784d3055844ff3f6f33e6ef5ff72f9468dbd2e6ae55fee237722f07153ce2cdea3d0017e0669e97785959b93df480f47769b2f8ae26034 SHA512 7083f1c05d866416e7f215acaae24ee8ce7b7ef4b3570139e326aec5f68b248c375266fc9e965028521d99b06d046c0cbdaf4c8d263f300c1ad218bec675c3c3
+EBUILD power_assert-1.1.6.ebuild 1420 BLAKE2B 1064ba29ae2ba017ce13b7da5188b40121cba718e5e7fef30d9e0fc27173a8a4820309d608f3f69f2905f80e7b6f2f86fdde0b039c68a17482a5cc62e04731e3 SHA512 99ec836a53a313f4195248613847180dccc7ad952bef0b84a3d8cc865afa470b11b165303766bd3eecf751f86a3b6be8ce7e591a1f17058c1ea72db6d4eb43d1
+EBUILD power_assert-1.1.7.ebuild 1420 BLAKE2B 1064ba29ae2ba017ce13b7da5188b40121cba718e5e7fef30d9e0fc27173a8a4820309d608f3f69f2905f80e7b6f2f86fdde0b039c68a17482a5cc62e04731e3 SHA512 99ec836a53a313f4195248613847180dccc7ad952bef0b84a3d8cc865afa470b11b165303766bd3eecf751f86a3b6be8ce7e591a1f17058c1ea72db6d4eb43d1
+EBUILD power_assert-1.2.0.ebuild 1418 BLAKE2B 718d355df9a75002823eb6ef8ae10dc4ddff649c314be77db00252a34a7f5daf95a5979195f2fc3e8d7b28ff3af86ce4bf9b2e5d5faf2484ce3eec325a7843fa SHA512 fb221535b77d9e84daf56cfbbbbe5bc9d05d0ca93c68d2d9bc6b2a09023f7eed2df7cce5221c5c9f50b687f97d29b78f079b5ace1cbe17ada16b6bf8507362f5
 MISC metadata.xml 343 BLAKE2B 207ac229bb41b7ab904b4d6e69ac07d36375964057ec90c69cc6d0be5dd90a5bf27b995b5daaa1802246aa7342db9bc904c1ee872b7b2faaa495318ab030537c SHA512 2c8420b8b06271c1bedadef4e94842e6fb80d49eae669f6ae62678c769a7b3af29af42dbb4660c6bd328b54a522902c5bad49e81fe0fe47d2bd3c1d9f89a7d4c
diff --git a/dev-ruby/power_assert/power_assert-1.1.5.ebuild b/dev-ruby/power_assert/power_assert-1.1.5.ebuild
index 506b6ecbcb88..912787352b39 100644
--- a/dev-ruby/power_assert/power_assert-1.1.5.ebuild
+++ b/dev-ruby/power_assert/power_assert-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/k-tsj/power_assert"
 SRC_URI="https://github.com/k-tsj/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 ~x86-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"
 
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/power_assert/power_assert-1.1.6.ebuild b/dev-ruby/power_assert/power_assert-1.1.6.ebuild
index 81d2fdce4fa9..fd0952887d23 100644
--- a/dev-ruby/power_assert/power_assert-1.1.6.ebuild
+++ b/dev-ruby/power_assert/power_assert-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/k-tsj/power_assert"
 SRC_URI="https://github.com/k-tsj/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 ~x86-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"
 
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/power_assert/power_assert-1.1.7.ebuild b/dev-ruby/power_assert/power_assert-1.1.7.ebuild
index 81d2fdce4fa9..fd0952887d23 100644
--- a/dev-ruby/power_assert/power_assert-1.1.7.ebuild
+++ b/dev-ruby/power_assert/power_assert-1.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/k-tsj/power_assert"
 SRC_URI="https://github.com/k-tsj/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 ~x86-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"
 
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/power_assert/power_assert-1.2.0.ebuild b/dev-ruby/power_assert/power_assert-1.2.0.ebuild
index 932378bcc5a8..18a85b535c72 100644
--- a/dev-ruby/power_assert/power_assert-1.2.0.ebuild
+++ b/dev-ruby/power_assert/power_assert-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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"
 
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index aeebab78f194..9c248b5db320 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -1,7 +1,7 @@
 DIST public_suffix-3.1.1.gem 99840 BLAKE2B ef86b7ecb834a855dbb44b8a0f934de3715edb6d67faefd20f99054898b35bfedffd490b60fbe80236905826868611aa96e13766577bb98ab997321cf9c49b39 SHA512 1e266ed7fa224fa94a49a51dae2868bdadb80ca2de660d2cda9a1e146ccad5aaba2cf68d75272e333a4b1a80e47863d388d85d3a86bddf8f649a320e5e700078
 DIST public_suffix-4.0.5.gem 106496 BLAKE2B 1b581b2d08e78b156d70f25d1af66f825f7e1e332049311001f4d20982222fea463e4eb79ae12152c51269ee42c883cd966f479225f26c01b8e7a70f870d5ddf SHA512 5de30466e27d853c498f210dbe168c52d0e5efab5b6388c88de5667e40dee151041d6a1a9203780230dfa03bd2fb920a50b1301d05d12a31f4d31f8352218821
 DIST public_suffix-4.0.6.gem 108032 BLAKE2B 4cbb10ddd924daf11d97a54d18550961f46c0951dd3dc1f23740ee7500fd8e796e78fd6421a7418a49350a69eca7d6456a09810be317ad4619ef3d3e7f71ff69 SHA512 a756c0f8f9cee2d12bd1730280108b72befa362defda12e5f6d7af6d68c40e31478c337b3eb7e7407feff9531082051d18928861003c7ba29679b4048da3b4b1
-EBUILD public_suffix-3.1.1.ebuild 831 BLAKE2B 968e319d13936e42e934d505804b591c04326570af9c782bee4f69f95d11b0dcd5851bf499998e5beff5f00b57ccfaf2e890257ec82d0154847abad72adb2a28 SHA512 17f9bdf7fc3b2e7a4a2f120de1edde11160529cabb3037e793b3161c7b0b26da38526c2b63307fe7f9303998edb8ca8e40adf3bb7883fcaec7771ac2a5d64075
-EBUILD public_suffix-4.0.5.ebuild 820 BLAKE2B 37a13eff7a950424858cf7daea0f614369326cae62fdbd80f14d0b314ec1641d4263b9f414ce9f31b929d67f771e372b63cfdeb0307ec35c628e2b9b46b20c9a SHA512 6f328162c2a0f96c9e7a57ecabf7ee28ef82a7fca9331b9e94c92ec8b5f49d627a298a98f08aa10dc6294e71d1932d2d968aeeda6912c7d31033ba0e426c4cd1
-EBUILD public_suffix-4.0.6.ebuild 817 BLAKE2B 3b795664ca3374e3fe235d440717a1b6660dfd90eeff0b4025ff0c8b5f8a7a47bb4335400f9b9fef9d21aef66a8bd8d161cd5e2a71e2f8968105932474438580 SHA512 9767ff0daeb65c7d8726a907cb8c0eea7d52064a9d75b7583b3b5d24962a697556365a908c7b15b8ba8a823867440ec644b2970db558d78f4d97092c03d541ce
+EBUILD public_suffix-3.1.1.ebuild 820 BLAKE2B 70dd9a387b0a5d5882d0615c3d11f5dee05a2732bc7cb6150a2532a64b08973f8d19574e772a81102dc810843b1c3d490c1cc32f5b20e2b28aa55c144a8828ca SHA512 6cc6b9562322dbec04c08d788ff8ad341997b84691d9e81d1c40916dcc6eb22667aa3587ddf6d53c7222864633c328900c57fe0d775cb6c7b238c000115fa7ef
+EBUILD public_suffix-4.0.5.ebuild 809 BLAKE2B eee66cbd7b89bbc1157e54a6a4531f3df7cd0bead94108f1d2d6c610aabd739f7765de946887100ea883840bd20f0b2d328fad52492e907c324ebab71b38ebe7 SHA512 ecb60e099f6b8e279c05722ea72ad01b88decacc45e01c8a0c0ba58541daafafc4d3f6f385adf4cfd642a45e9759a00e625d2c5a127b07ed658476ca09b5904d
+EBUILD public_suffix-4.0.6.ebuild 806 BLAKE2B e95f551a3864db64e27039eb0e018b9006c41aced2fae0ff3d6c59f3d3ca4a9f1a76a00816f3e0114071e6542ae97c7673c7e70d7a213e7a28566378c24d2e91 SHA512 4f5209a328eb96de9865d7ec23f0b4a7c8f5ca0d21ca2eefd54760d60b5ffa8644473473d53ceff327dedde23d073ea3798ceddaefc8e5df02db7d21a9418476
 MISC metadata.xml 340 BLAKE2B e5ff0b06a3e6205a270389a1aaec9cb8902fad8e9b815e650b9be53276545b401565d8f7b1167ac415766a809fa2358289811196001e840d9d8641bbe2ff281a SHA512 e5091bcfca152fb1301ce5969cb5ce1e65db3452926c5b75db5afb284e28f44655495663fcce3ba5718b9817d1e3f6db491fe8da96732181926ccd58b36d7f20
diff --git a/dev-ruby/public_suffix/public_suffix-3.1.1.ebuild b/dev-ruby/public_suffix/public_suffix-3.1.1.ebuild
index db54adffc030..09f675c8a2ce 100644
--- a/dev-ruby/public_suffix/public_suffix-3.1.1.ebuild
+++ b/dev-ruby/public_suffix/public_suffix-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ inherit ruby-fakegem
 DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
 HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="3"
 IUSE=""
diff --git a/dev-ruby/public_suffix/public_suffix-4.0.5.ebuild b/dev-ruby/public_suffix/public_suffix-4.0.5.ebuild
index 67e0089c6b13..6316ee92a91a 100644
--- a/dev-ruby/public_suffix/public_suffix-4.0.5.ebuild
+++ b/dev-ruby/public_suffix/public_suffix-4.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ inherit ruby-fakegem
 DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
 HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
 IUSE=""
diff --git a/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild b/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild
index e7114d519365..6cb5a2a8d933 100644
--- a/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild
+++ b/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ inherit ruby-fakegem
 DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
 HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
 IUSE=""
diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index d5ae0decf7e3..7620dd57b88d 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -1,7 +1,7 @@
 DIST racc-1.4.14.gem 116224 BLAKE2B 67abd0e9bed46d7c589c62426943c8594d3b119328cd08576247727b11beb9e32ea45c54d0aadefc26691972fc40aad1b009c55bcd90a5b89aaf37e37a1097c1 SHA512 7401ad1722c92101c24f881226e44bd8b21033c7bae8b13cbf329f9b426c312ce61d14ce584b4f94d6863b77f30d6ebccf26f9fca2de724f8e0659f0e2d2173f
 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 1834 BLAKE2B db2b7502c1b78849f4a869a59e57a03aa77c6822b71655c983034a36c6e7aec1a1838ca08d0458870e305b0c5082348936f0055be8fbc06cff511a8069cdabeb SHA512 3b73e83f9441a3fc7f6974c2bbf7fed996bada375f8c73ae48c18492191a9725f65927eaaf7c601ece330c2e3cfe50d608e399120edab7cd079733f3e22165ce
-EBUILD racc-1.4.16-r1.ebuild 1940 BLAKE2B e7b94991196922c0db8e15ca7d54d9bee6a3d429c16c4a5e8a2a9ced4a2b5794e26e7b46f5ecb60ea090b0dd398f4e3eea070fa8e1c80a7be9e9b4ffa0c49517 SHA512 aa517d186b326cedfb265f994fd2d47087a9af0ef3c800df30a94c11891538a9c67f4714b91ad4f320e25e701bf2ee65be214d276f93c8bdfbce3ac5080512ac
-EBUILD racc-1.5.2.ebuild 2012 BLAKE2B 717d4a7e448eb778cfa5efea6c67250525c3cce2d3b05a255e8dc4f7d38707d3bbaf3b2fd5559f8ee049d768cf8624dbf4c123b8fc3ef104fffd041b0bbbf63e SHA512 178f1d218259608564dadf79370e1479263278281e38f018d861cac52c6f8d4c65d1e45c6955607c49d5408ed779e5abf35c2be5dd9fdf5974eaa8a12ac30edf
+EBUILD racc-1.4.14.ebuild 1823 BLAKE2B 009cb9df7a173f3b4d3ba4e96bd5cc3cd5a8ef964aa6b6f371a788e88615357f76389cc8669cc7f26e2afb5b3c41acac00f752dccbcedcfa3d1db30ec94c1d4c SHA512 9be18964a3978ee19f91e02778b163788efc352d29a04c9ad130e52018b80917f52f668191ca098b62b2edaf5de58b76c38aa70fcd8591608e286d8f499a12ba
+EBUILD racc-1.4.16-r1.ebuild 1929 BLAKE2B d8614223b4136613ce7d6182b702b45ec7bb37e59c942aab0fba33abb3c7fa7fe0232665e50f7d04891373a50b6139f01862f869d14790f13359aeb35eb85a86 SHA512 3b239f1132a2806d32cd35e66f7e15aa7b2c1b8744e945708c3a27825646f10bd6002985cfe7524d7f0b3ceb3c2349f28eeae7f562d81ff681676f75cc846d93
+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.14.ebuild b/dev-ruby/racc/racc-1.4.14.ebuild
index 4688ee338444..4a515f7c8d3e 100644
--- a/dev-ruby/racc/racc-1.4.14.ebuild
+++ b/dev-ruby/racc/racc-1.4.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/tenderlove/racc"
 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 ~x86-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.4.16-r1.ebuild b/dev-ruby/racc/racc-1.4.16-r1.ebuild
index c3dff6698030..0d675db63956 100644
--- a/dev-ruby/racc/racc-1.4.16-r1.ebuild
+++ b/dev-ruby/racc/racc-1.4.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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.ebuild b/dev-ruby/racc/racc-1.5.2.ebuild
index f4a4b873b916..1d3aadcec5a1 100644
--- a/dev-ruby/racc/racc-1.5.2.ebuild
+++ b/dev-ruby/racc/racc-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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/rack-cache/Manifest b/dev-ruby/rack-cache/Manifest
index f25271363885..c40b5fb27eef 100644
--- a/dev-ruby/rack-cache/Manifest
+++ b/dev-ruby/rack-cache/Manifest
@@ -1,5 +1,5 @@
 DIST rack-cache-1.12.0.tar.gz 262794 BLAKE2B 63668875cbfba5a6012f43fcfb504e99e357301b8c4b26bfd007b6d22fd9cd3d2f40b096505f9b9523c49ca2a7c980fa15c95187284a339604ca8acadfad374b SHA512 67101c2fec86db94d177c4cc476a17e5bda51d222ac8530fe6cdef8fb196b3b7ffe301003abbc14430c4f4068da0627ffcdd498fd79faebd190571bfbaec3ab5
 DIST rack-cache-1.12.1.tar.gz 262878 BLAKE2B c287c547496f0c4659f16cf45aa4c562cfccc5d6ba9e71a10a6507346797bba7d9d1e287ef1fe3d8c6bb6e8ef148d6c24d90e92db1ae53ea2f7d1ee91e3fd148 SHA512 f850facb28f302db819b6d67fd86e0dd18ae8f5d132044582bbcd6792b287c7d4a29219a47e708b5047fb373b5857632597d9743b4ba530b1258d29924ca4cf9
-EBUILD rack-cache-1.12.0.ebuild 1334 BLAKE2B 2fdbfa9133453e93cac38deec79e8d1e643aaecad397ba1f13bd5970fa24b7783fc8ac538380f74a30fcf55b50516ee67ba731bb68c95e4d9a247f9fdbb5984c SHA512 b89335d58516e0de9d78a41dd159b8ffd3f05b09f6e2aab37ba7b18ffcc9901004da7c5c2fc41b13c2a2f9680ed34c14cdc713845d68991ffd86aff538a005e5
-EBUILD rack-cache-1.12.1.ebuild 1328 BLAKE2B 9652f7f134282abf824dcd8e8b8d3de3360a26b8f0a9787a510890b2fc695a150182633019033391524ef92a0229da1004bb1191d561386d8edb25cec9dd8640 SHA512 888e72e374944ca85d9d1685c01c1b3d2c88e5489b4a120de4c8e6182f003c2b61bd77d87ab08917d72a10251b0bd76f7313d42efa192d3a1ce12264e60967b9
+EBUILD rack-cache-1.12.0.ebuild 1323 BLAKE2B ff939775fc834b00f29263e132517aed7ed4b3c4d057998a7c0d88fdb8fa86f51dfd805bc37a98f6e0e0cb31337324ef3f23a7a4e9254c29980a4c033ff8ba7a SHA512 ea49ce160cdf8da409fa5b53a2b03b4cdebfdec6ef204d025aeed7d4860259267d00c9e289c6876975d8f8bd63cfe6ee95b5377d06058ce9ec7b6b3c5f90d0a8
+EBUILD rack-cache-1.12.1.ebuild 1317 BLAKE2B 3aaa88226504143c303a92a63efc07f079da07cb2056523992d2b02b72376a5f7f9f82c590bd4445a3a7c467e83f17594ba5a12d24847ea495b201499ab1269d SHA512 c1c5aa66726190f34d1515328ed39034aaadb8ff497bb9063d25a8f1521ff200229ab5bb558683291f6819be06beb5127c2ff66d23b63252b6a49e3559cd6886
 MISC metadata.xml 335 BLAKE2B d6f5130ac567d01cf6c3d831149be70ffc68d04d1b115473e6e8a550f392dd82341d72d9ba813dfd33cfa4bb5453ead5506ae75ae6f80cb9f47623e631e7c997 SHA512 3763e8653d06f4f62a253bd075ff31273fdc39edafdd74838c8fe65bee42a9bdfede99c01f236218baf496b910f5aef722ee3d5ff39d26c901e30df1406ecfa0
diff --git a/dev-ruby/rack-cache/rack-cache-1.12.0.ebuild b/dev-ruby/rack-cache/rack-cache-1.12.0.ebuild
index a0a9f7707fbc..11a1c3fdfaa1 100644
--- a/dev-ruby/rack-cache/rack-cache-1.12.0.ebuild
+++ b/dev-ruby/rack-cache/rack-cache-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="1.2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/rack:*"
diff --git a/dev-ruby/rack-cache/rack-cache-1.12.1.ebuild b/dev-ruby/rack-cache/rack-cache-1.12.1.ebuild
index dfad5edb6bdb..096eef9e410a 100644
--- a/dev-ruby/rack-cache/rack-cache-1.12.1.ebuild
+++ b/dev-ruby/rack-cache/rack-cache-1.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="1.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/rack:*"
diff --git a/dev-ruby/rack-protection/Manifest b/dev-ruby/rack-protection/Manifest
index 6631b33d6179..d488192e34b4 100644
--- a/dev-ruby/rack-protection/Manifest
+++ b/dev-ruby/rack-protection/Manifest
@@ -1,3 +1,3 @@
 DIST rack-protection-2.1.0.gem 17408 BLAKE2B e4804273d346c76e9e7348bfa9575f16c9d415da9db4e8677782aed70fa613b6f322c82808707734276b8db60fce9d87fbbaac807c1b8df7f6bf1960c76ae244 SHA512 965388584a2cae9065ccc0d041bbd40951f22420f05e657586d710f87ae8f854a0be32c3274b9373f96b5f8eb19354d371e3bce9b2df83c013abfea99f16bded
-EBUILD rack-protection-2.1.0.ebuild 729 BLAKE2B 4133f99c0d3d56af1fd80342cdcb05311366e701143a8d7e2f6cf6ad7b1f031dcc2814e8f14e4fccb4d465b42a03502cf1c83b1c8b255fb67947b7745a7fb031 SHA512 0c59e7bd27235660a0f2d13f4e6011ff78ed3e5f9de159a52a5269e76f0af1ca13fb64e8172c035a2291c8fedbb06bdd4656283e45398c016c1a9574fa47af7d
+EBUILD rack-protection-2.1.0.ebuild 718 BLAKE2B fb3603129df95c11c499d7cc56960c2da500da197b0080e4e0faabb0cae5a7aa80d888c1d9f10c17b8761a61b557e50c68f8508d630365d35dd05d435c372c68 SHA512 e67fb4ebe3d88f90cf4b0bea33b98f852dd2af9045ca7aadf85bf7166667b6dafa4e4fdbc58dc5d09857eb7dc82c0a412e6d815d391908c8e6940faebce7ec05
 MISC metadata.xml 488 BLAKE2B 1db94e175d1248a334fa9ff0b5936d0281a1ee2ef69974cc33ba65e19de9ae043e98599a52f5cc55d3e1ca3e5bef3e223cab7f3be0ad9b561b05d81da8c09687 SHA512 ad0122f6e0dde2c02a1af8b8e81a5aebb1a13e0f56dd8f222d6f051da55015a89db0430efa6c1e6b5e193a94ba69d0244498d7cc14f0212f8032393a7f5988b8
diff --git a/dev-ruby/rack-protection/rack-protection-2.1.0.ebuild b/dev-ruby/rack-protection/rack-protection-2.1.0.ebuild
index 4d19468eb3a7..35febe98e552 100644
--- a/dev-ruby/rack-protection/rack-protection-2.1.0.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/rkh/rack-protection"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/rack:*"
diff --git a/dev-ruby/rack-ssl/Manifest b/dev-ruby/rack-ssl/Manifest
index 53223b885339..b79f4f606644 100644
--- a/dev-ruby/rack-ssl/Manifest
+++ b/dev-ruby/rack-ssl/Manifest
@@ -1,3 +1,3 @@
 DIST rack-ssl-1.4.1-git.tgz 3238 BLAKE2B 7861fff6dd7b15505e008d150a515dee6749767b3e2056553baa85e3696f4c9fb63a5a0d03b99588ee09d79163c0463763824a9bb53fdc86f857f9c472c9fb2e SHA512 700a2cbc848be8e410186e6af709c5d7a8bae65ada02b405711dc60f8c6e1fe4fb00c3acc55ddc76a1d79e9468ba8f92d0350c983d5c1b83e4cee2b91aa68f23
-EBUILD rack-ssl-1.4.1.ebuild 729 BLAKE2B e1115f3a70724bdf35dee4e3317d45eaec7e83560f5f0ab4911443769647c43f9605080127e4aee88615631f2ef41607c3edcb2717019d657f23e9376036bc3c SHA512 161f2bd21e83d5085a32371898150e61f798a49bc7a3d88d4c9380ed505dde3c8a4d0b49118d304ebf7364f2491c46ddae16724b2a0cbdd286a203268fb89944
+EBUILD rack-ssl-1.4.1.ebuild 718 BLAKE2B c760b6f77d65dcb82f6b456c3305b64f3cdbb8e2afd6c7b02f050a5cc8789d655387add6eb3376218f8181ef3d5b35e393e5d576f91f14098a81fbba23b17f70 SHA512 95c140229b59e71388185a649ca7f90ed893608b10a2b185cc59b2c99628a26dca7cfbb994455ec22f9aa175e4bc4a98b8aa49488a0245936cc1e53fc0c31001
 MISC metadata.xml 482 BLAKE2B 67ca7d55352609b11359b8d39359e3b79158dbbbddbbdf44b202d807204dbc60c71bbdc0af20ed275563ce4f7c00adc4c892f32a2daa7592b368c196c483ea5a SHA512 53f23a19165373ecc6883bdb632db201f38e21d968f787e7345db51b2c145d49dca0d005551e6e7d5699c97af1e16563b7e5f6fce239d82c4235e6e19b0d5659
diff --git a/dev-ruby/rack-ssl/rack-ssl-1.4.1.ebuild b/dev-ruby/rack-ssl/rack-ssl-1.4.1.ebuild
index e1d1e540836d..6ef788b468c2 100644
--- a/dev-ruby/rack-ssl/rack-ssl-1.4.1.ebuild
+++ b/dev-ruby/rack-ssl/rack-ssl-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/josh/rack-ssl/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index b236c167294d..12dbb5dad3ff 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,7 +1,7 @@
 DIST rack-2.0.9.gem 256512 BLAKE2B 7da7b239e5679a2f6d19626cbaf8b4ec02a7ce7ffd086732925963ac6fe0397f180548c6065abdbe8d55de802583d7dd09de38da0d4d695559456d852d2b3d4c SHA512 5b56d1aa7bcca11c631f8205605e71f9c661ec9ea7694a16f32f6fdb493cf015d184f924fdf342abebacfbb185e367c9e6dd1288ffe9dabaf4e6566b8853a191
 DIST rack-2.1.4.tar.gz 251772 BLAKE2B 9dbd1ac1dade5935a3819b8c23e492b3e637ed2fc99a95ad0592d40501ea4171433ac4bba08a6031cd77521f4ae0f430ea60394c51b7c5f25cd9e82b72067ba8 SHA512 ce36902125171d2c9baffdd85a171237b9262a47115f043ce96486fb60fcd77826ae28d9416c43a3549db657a3da1c7be45f14842e4b343517f23dab82abd81a
 DIST rack-2.2.3.tar.gz 278045 BLAKE2B 2182ab6ee2ca0e40bd131dc96cf15d7e1015570a0702c2419e50da9eae6afedc0f1543a2fdc1fb32022a65788ab486b7add688c8bf201ad46a3d101b6e625a8b SHA512 0daefd1fd7d1c83a5aaf0e8a3c0d734f805f6718c3f2d20673e78242f10fa99c24f8e8d480cb7f0ee299d96a4b691e4a19c967785de946dc863e9b78e0c3ac53
-EBUILD rack-2.0.9.ebuild 1449 BLAKE2B d9462a4fb6d7c0811b49c776fd0778b79986e229789047d750ef1dceb62470750d3099d55bde1af758300b1b8f973081e184d2587d1521258d9e94da0af75869 SHA512 f4c6734000355a69552b6446d85475a505d00195a1eee31780435ffdb543dd87fe575da36cca9d74198f0f1b4d105f50a18a5430b66754f3434677a6a3bce65a
+EBUILD rack-2.0.9.ebuild 1438 BLAKE2B b29c0c5519c06473a257d10735a19eb0bdc93e4bdc35409eac79dae3aba4f2bd39ed7512794a21cb742b4f98bf977cc60c404a5635e9fc0d00d2e7e3a4c46e5a SHA512 1d0ad3e8ffbd0616938ac7e9bd737d2dc0888e92bb0b1c2ff1dc39d60d518beb88ea47acd561e56200118305d4e9e7a143d54654ce33db2ff1d58de1bce28f10
 EBUILD rack-2.1.4.ebuild 1698 BLAKE2B 19566995b14950f7d79dc361a5170ec56df9b7a8900c658de03e5f47e3344355e96733dac9113a90245545f4c7cc3d053db1ee7877acf2750c858ce17eeb6546 SHA512 f7af118477ae7fce8fccb8c25258f6357cc7159e548f1dce89f35041c6a5172eee018f425d480b0d2511859b68973f786d3963fa74e660b2ea8d5bb6cec53be8
 EBUILD rack-2.2.3.ebuild 1490 BLAKE2B d4f44da51d95db72d57f468f9daade4d77878eed8da95d96368aafd624809c7764a745627fedfac731659de03a4c3dbe5a9a4de065a68f23ee546250a8de2cbc SHA512 76e828ae0f393e3b5581613ffcfa049c5dbd796a3c33119ea30e701cd1b60c6a2f7169fa6fdfc80b39efd6220cb70e8230c54e6480751a9c9e651901ae915985
 MISC metadata.xml 391 BLAKE2B 5ed2f863a5fd68cf57f25afc2c2efa63df1eb25c4e01087130f70edbbd1b79c655ff7455b73ecdd31e083cd35381331fceef52856f946d24fc3d313705fbaef3 SHA512 7ffff4c4cc64855b0c95e2364fa9cfd1e3b06946155cc8244444f5f4e450abda8d8387aabddc224b94a55ff3d5e42391970e5541923e5aae24f408113a65a5c7
diff --git a/dev-ruby/rack/rack-2.0.9.ebuild b/dev-ruby/rack/rack-2.0.9.ebuild
index b4e91fa37f5e..61f526b24039 100644
--- a/dev-ruby/rack/rack-2.0.9.ebuild
+++ b/dev-ruby/rack/rack-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://rack.github.com/"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rake-compiler/Manifest b/dev-ruby/rake-compiler/Manifest
index 096036fb0a66..d22b9cb9db2a 100644
--- a/dev-ruby/rake-compiler/Manifest
+++ b/dev-ruby/rake-compiler/Manifest
@@ -1,5 +1,5 @@
 DIST rake-compiler-1.1.0.tar.gz 34819 BLAKE2B ec4fec1eb92031f9f6b378b190c4e8a2f2627623afd6fb11922f71a93431de94bce640863deea2aab05656612533ee2b110f295f87590b48500583af71b08dae SHA512 77338776506df66c2e99e9b1b82dc4d54cc4e7c8fdb1f8b7b6d7507b9f9cb0718839e5139e9c0cb6295259e819dc8a011101e2427cdd387b568b639889321d60
 DIST rake-compiler-1.1.1.tar.gz 34692 BLAKE2B c6862f24ec57c25fdeb7faeeda9eb96cb64ac972c852a81b77ec9b35d21018a5647089cd38d80b03a79e2c07d3f9af42bbaf9998457ad3beed27c8285c23689f SHA512 e9cf9752e48eae912657a34d2f86a2b41f7d57620c6e43b1fa6fb8e5715336b2fdf99bf20a4851889e8b9b7b2e834421c13e108c538abdc3cec968952345361d
-EBUILD rake-compiler-1.1.0.ebuild 1475 BLAKE2B 7bb5a1fa35c32f9764ed434444c0143eda418856100e5aec2bbd54a79af9db88abf092080197c8b0c6e31315184e9ad24641607dd3b1d40103a6cc09c03ea135 SHA512 25ac756511f204ddcc845021d9e66a7eb0d7c58e6ada35b4ebb51143e37dbe3fc0b3967be643d6547bcc459411e3cddcd85b328f3a7ba6549f369705b70ac0be
-EBUILD rake-compiler-1.1.1.ebuild 1458 BLAKE2B a09694059f53ba269df39e4e5f46c09a094810b2c10e943859bfac25cb9ac160ffd879957ce9c535c6f8c355ae61d96d098e8683a03a1e0fc91ffdcec89253ef SHA512 5a70c77be4075ee4ed11b7cb2d89ccb05ff1c9d2678f50d2c1019969315df0c57e79b89e2024c25383a62891675bfbfa1222926c878bd174d725d8c116d4bf74
+EBUILD rake-compiler-1.1.0.ebuild 1464 BLAKE2B 9e21460bbc0bb3ab6513f6cfb8658ed89ee9acf56be05978b5b8d86fcbaec82690d7a9b2ad1a7c47bbb4a7000cbf699a0fa072cb929016c675d260abbb9e9169 SHA512 4cee0780659d23af7a1dd8aa96003dc7ca1bfd675d7257b9ac894c796a75737dab6f47cafa98b7e49440136674540171c491b4d3f8967f4217a0f62a82368260
+EBUILD rake-compiler-1.1.1.ebuild 1447 BLAKE2B c6fc8bf4cb6e9141e40fe83765b4908a78dd9f45dcafc71091ef4ba795434f2e4f5ea01b25383190c8f7e3775301df6f5b0b6fcf7186150b46e249cfa5cc5038 SHA512 d42a12e1eab23babbf2a9d9546489ce8ccc8ffad97fb6a9bf17c4d5e7bda05349581c7c0ad9665a1cac0e355f067f554b75ca46f0e496bc6c8cbc395f285d23c
 MISC metadata.xml 350 BLAKE2B 35df0cbf74d904e36dc5b5f34c31a41bf9659942415655f635a112d01e98833babfd42640d5155392f5563fd1756b104671348c077e8a62a2d6efaa68389a3f3 SHA512 2f027e154015dbb7a0535356a313b2f4bada336f6c1549aea9db77f57b43ed7ff19408e3ba507010d50e0953f5f6fd51d9bec956653725e1e087d94a6ae3eb83
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild
index d1c395fb3750..32e9c65e37f7 100644
--- a/dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ LICENSE="MIT"
 
 SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild
index 87dee3f74ea7..9fe226e1b917 100644
--- a/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ LICENSE="MIT"
 
 SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest
index 8dda4da04429..d2a5b937bf2d 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -3,8 +3,8 @@ DIST rake-12.3.3.tar.gz 122233 BLAKE2B e6c913b833092ef5d4203265bb5daf725bfc34ff3
 DIST rake-13.0.0.tar.gz 122378 BLAKE2B 996990f061a2604bf031926670043773b029d03e092513be3566763b04474d88b9bd05c085f25fc9d66b26a55e191b45fa34dc4aa215376703ad28750d71a6b1 SHA512 56038199fedd952994459967173d298afb13ae7fe9d7873dfe18cd4030b37f841ff74c944835843379cd66da96a6d1ee8c38294203f9d8e514c4331d65f5db79
 DIST rake-13.0.1.tar.gz 122821 BLAKE2B 698e92d32d4bedf523bc81636f4183ccb11da1f467d116f7ff4978e121bddc41b66160798e2c0a2b00aa8f79171a81df7e214e556adeb386bdb00a72a18b82b7 SHA512 50d82b3a9bbe194467c7669000ed9dd8e55fbb22307fbc7180aff6ab77095108a2519b3095965ad08b52cc984d0384016d7b166676f2e97394409a069d01545f
 DIST rake-13.0.3.tar.gz 122825 BLAKE2B a36cc6d8e5f560bc502455a756b89d763899e71b711ba6b11d17fd86a460b4cb3ac47705645d4ccbaef9b6d8964cdc5d4d535b4470582cb3658016a399f78d58 SHA512 aff09bbfa58620cd6902e6679ae3f54d90424bfac40c7ad6efcc590a1c9624ae7a0c5597b8b05b378d90e422285c41d781485b9aebe1819c0c2eaf5f2624afa2
-EBUILD rake-12.3.3.ebuild 1273 BLAKE2B b8e49a52aa0523c6291475b3a68a9eda929c93027015508574182c4e11902640773433924433c70e91af14e9effda342496e54c1b18005eec5d86fab1ab39c16 SHA512 d71fb35360d100e2383591090e802f0d356efd6f7837605115e77f805dd63f74fac537d1e68bffcb39719fef3484f6dcd9efcb10f9a0f52de886fe8f78bbbd56
-EBUILD rake-13.0.0.ebuild 1451 BLAKE2B 3a7b966220acbbdf4d360cd1500d4be0c3e32adffe6bdef9904d5a4d7b0f1b95b046a4374d6ca31bb9ae64609d0ac1dcb278ef1880c0255c8e97069207c8ebd5 SHA512 e3aa7b73f4d6fc1cf70253c6c9b5e1c5b0b1b6b3a7b95d20ac53dc1b41cc00fcd9536e422881af930c677ab6a45e834b13af28e3f44fbff0a34adfec2eea31cc
-EBUILD rake-13.0.1.ebuild 1458 BLAKE2B c9c52352af3e0a9fe6629f0362e4e7243cf01f1cf4c890ed8f69e4183a8e60fbd6201b92a4219ed734d3f03ff9b4163e13ba83ef3c26b020f83a78d9bb03bb1d SHA512 24f8f205dd065fb93e3449ca369084fb159b79aecfd16eb3bb226d7195e83270e4523230eb128cb69f0559e3f1e1f2e0c4266f0099800ec7b16ebb82d55376dc
-EBUILD rake-13.0.3.ebuild 1458 BLAKE2B 7009c40bea41c7e164c1598e0d03baf3ae84c040dd60720e28fea508f99d48d6319bfcc73a2aa802e857b74f25ccc1a0a10c36c509665d118ebf17901a1e0128 SHA512 0d77b8d6b189e2f9a713eacdbf5968e393aa506c34262bbfce2766817b3ed71939deb8253a5ba16782b6fad4d2ba2d486738be429db7d3a46d662cb98eac1d79
+EBUILD rake-12.3.3.ebuild 1262 BLAKE2B 1d6dcd738a78d78cc1594ada8d551dea2d365e14f9f62a9d2fc8fb5c6e34ca8cf7c6f3e302ea9786d40772b4f6d7eb677e2ddbfa20a40bb3f19443ef9d0be8c0 SHA512 a38c5335b4363d37553d52afa7e01c53569e0c2d8e53023ad215d46886be7150a7600718a32ed0b6fbc7894c4a79f53924ec7d3273e7d7eb69b86e7fefa3e400
+EBUILD rake-13.0.0.ebuild 1440 BLAKE2B 3cd568481985f897a051329b02fbd011327cb0b0b18f3c8e5c6bdcc29732d00403e191f5cf09affadfd0f41b062aa36b4039554506e2681b012df12fe9794096 SHA512 2130e165851c685a59be81b45511ff689296e76d8bacb3dbb504bc35fc461dcc2cec76f5055d9889c4a6c08d82229d84a495e61d9df0aa73cd6fbd26f6d95e9b
+EBUILD rake-13.0.1.ebuild 1447 BLAKE2B 877bb61e85fb6eaf829142fd0f68176c1ab9bc947d2bd0da4b6d6c7f21cd48afd0cc307cc44e322c5693892ddf4593ca736f5e45b9e0766e766f13550ae3ef3f SHA512 54be8b3e195f8960844b38ae3171b50ad73ee71a8903e24e2eda6df2a7b49a523d1c67543e892dd42d2caf424381ab5e4930a75e2140af81dc6a152c8b5b8bcc
+EBUILD rake-13.0.3.ebuild 1447 BLAKE2B 20142be6848ce363e150b6d3b36611e99077794de5ee4ac7e22667e70245252ea5ae2c44243f1146405971ef31fbc74ae119e22e006e89e1d1c4bee894565db5 SHA512 7e6d6b6e16de8ebfab69c887d65751aff7c5902a3975bd99882ee060a0697391c58edd1c073d799aeec8fe0481d6e19bbad70b2116bb1ca67e6bc27e30a60158
 MISC metadata.xml 341 BLAKE2B 4f6fce5484dd3adf4b7025f95d26ecd9f2f435d2b5e5774cb3f6ea2ea07727d4d76ef640eb039aafe67e5597b70d22258d0f8f939471af2057f0f933250098e6 SHA512 56fc95931062163036dde73847a796fd5802ff4bcb8a8e72686847537d0f38c9d15e0ec83bd06c2f86ce92952e9fbaa0e90eb4633d7afc460adbc0c9676e0040
diff --git a/dev-ruby/rake/rake-12.3.3.ebuild b/dev-ruby/rake/rake-12.3.3.ebuild
index 76d37bc59884..9644d17d3af1 100644
--- a/dev-ruby/rake/rake-12.3.3.ebuild
+++ b/dev-ruby/rake/rake-12.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,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 ~x86-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"
 
 DEPEND+=" app-arch/gzip"
diff --git a/dev-ruby/rake/rake-13.0.0.ebuild b/dev-ruby/rake/rake-13.0.0.ebuild
index 63f41130f753..7b475131353c 100644
--- a/dev-ruby/rake/rake-13.0.0.ebuild
+++ b/dev-ruby/rake/rake-13.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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"
 
 DEPEND+=" app-arch/gzip"
diff --git a/dev-ruby/rake/rake-13.0.1.ebuild b/dev-ruby/rake/rake-13.0.1.ebuild
index 29b51e304464..e6e0aa0764c2 100644
--- a/dev-ruby/rake/rake-13.0.1.ebuild
+++ b/dev-ruby/rake/rake-13.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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"
 
 DEPEND+=" app-arch/gzip"
diff --git a/dev-ruby/rake/rake-13.0.3.ebuild b/dev-ruby/rake/rake-13.0.3.ebuild
index f4f4bbd23a56..349412196d23 100644
--- a/dev-ruby/rake/rake-13.0.3.ebuild
+++ b/dev-ruby/rake/rake-13.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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"
 
 DEPEND+=" app-arch/gzip"
diff --git a/dev-ruby/rb-inotify/Manifest b/dev-ruby/rb-inotify/Manifest
index 57742428dfc3..a46218765a07 100644
--- a/dev-ruby/rb-inotify/Manifest
+++ b/dev-ruby/rb-inotify/Manifest
@@ -1,5 +1,5 @@
 DIST rb-inotify-0.10.0.gem 15872 BLAKE2B 52647ff17994287810efa9c04bc9553b101c42cdd27cf42d530565127dfce104a589ad729d7019409079731577d327221ec3423fa7a5f746aefa3d817b93d898 SHA512 16aa7fb21e5ed713335e583299cfc72676e3ef66de3d349f74a14885b88020b79e031839b193dc140036a0b6539a45ef3a0c3c6027a7211508d388137d22a13b
 DIST rb-inotify-0.10.1.gem 15872 BLAKE2B 1ddf4fe8de7cdd348e007ac29ab7b41667092439f9b70eeae49d7e917351c73512e43a7ccf6679af1c9225b19efadb6a1581f63e1958d2a31d61f2bce5a13664 SHA512 7831a6228f2d6363e634b8d6b4a12206f19b96098e5dfba1d27b1e994a7284a5cb58cd0299d861a6ff275fc8248c0e68faaaf786d6222ad68f3e6b43ccea29ec
-EBUILD rb-inotify-0.10.0.ebuild 1033 BLAKE2B 3b789ff43ad90659ac7c09e50061104cba720828250e939ab499ba4d6bf641f7e0a97046431b91d86e2cce21633028446acbeeb268fcff67d9e61573e05f8476 SHA512 009a9282ce4e480834c1ba818ec074f5edc16d679781bc9d3a6615e6b7addaf7b4c4143b5fd42cd13118e398028445f2623d0b9cf57c69d9b5041ced4df15691
-EBUILD rb-inotify-0.10.1.ebuild 1009 BLAKE2B a6600eb46d95b05304150795a7ab466ebe7f7a0d12002faae2713a204fa712406f76c2fc7279aa26af4775654a7415a20fc8662bfcf89e630bc2d0021179ff16 SHA512 bac5275e4fd719e551944d8b196a3d4d1c7bae0429037b178cbb33f1995e035b26534bddceee26366b324fe2f449269546bb03d47361bb8223bfdf9f30a462f5
+EBUILD rb-inotify-0.10.0.ebuild 1022 BLAKE2B 33d6137fe2260e512f2011e3a8e9a66c8cba92d0256ae897fe08601fa89681fe5f399d9c9f0d95a4f2b04e183d5860a309bc81172d8afe21bda4a5c1a06bf60a SHA512 54a8293a827b9c1ab73d26f4296839d8fa1a79c647ef807ab21e56daccc27baa5dad13b0a68fe3d6c42912ec6431ccbdc8bc1bd6e843d4023084a1f43761c283
+EBUILD rb-inotify-0.10.1.ebuild 998 BLAKE2B d754ff118debeadbba84f8ec6889d551869368e94e7dbd04ba483054a15e27ea0ecfff6bd5f688f5a223124f714547a45fbb6aa1667eced52414a1fa2e7ad742 SHA512 279a31cb7c613ce3d644c8e5b690509dbd02148e3e740f08868041685c58b87e68ef80c256f5abc25d9f7531e3443031e2302a2bd7ddbfd2b5c3655c1ce53e50
 MISC metadata.xml 341 BLAKE2B 9b7d043d113a1bfd0bb07588615f04762e5d4334763055dcf818969aa98c543c19b1e1005d3f8e0ad5d6c0dfed342b3ee8f2bfd9a49eb133b34f5cafd6f7f91d SHA512 0449efdf61caad416c9b68e1b5de20c46d29a8961f462dd7f1971e3723b8b0b3567507cc99cfeb2151e0c8c14caa28947dc23906281b20771251b3b47823b4a4
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild
index bdd47515e002..6c2c605ed656 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/nex3/rb-inotify"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-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=""
 
 ruby_add_rdepend "dev-ruby/ffi"
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
index df065cbbbae1..ad9de98bdef9 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/nex3/rb-inotify"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-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=""
 
 ruby_add_rdepend "dev-ruby/ffi"
diff --git a/dev-ruby/rbs/Manifest b/dev-ruby/rbs/Manifest
index 89c26e0fc1d0..7553beeab064 100644
--- a/dev-ruby/rbs/Manifest
+++ b/dev-ruby/rbs/Manifest
@@ -1,3 +1,3 @@
 DIST rbs-1.0.0.tar.gz 497065 BLAKE2B 3cd0d583f3048e11c70882c783766ed4bcd5e464562900d4528da2218a7fcc773be8b36eb79a517314cba0db8360d6b9312531fd07b618d70575c7aef54d0efc SHA512 512e8abd883403697fde537844c99a0780e9f8d1dc59ff827c0372274573967981735065b670afed50c13ca87c6abc44bc6cf47caa9cdc6e6c117c6d0907c405
-EBUILD rbs-1.0.0.ebuild 1094 BLAKE2B 67b72566be12350df524234a404d38ab77fb39cda0bfb291cc7d43dee570616bb9d707d6c6ba1c7b3c6de342bbac6171e384c3fb1c1bc1653d7466c58775b820 SHA512 2ea54d347b020e71884888ec6d3583952c635eb2d781d5cba178443ac646ac71e50908b9a0b7e007113ceec370b9f63e98fbb723dffc0ee6cfbb26789156b976
+EBUILD rbs-1.0.0.ebuild 1083 BLAKE2B 9ce2d41a1f2ddbe8c1b4c012c985cd1bf1254ae8048ffb3d7100d928e896c9f4242b2180170223d7b3ac3365a1b32ddfcb04d7338686a98acb84662137664482 SHA512 a0177e009dfebf89c85cb50f3bbaf22a17012947ee53ea9c95d0ee0dc9b021030ccfe638a75724f21cc647beaf2b0a6a4c44454dbff547c8ce1d7f7d60ce1165
 MISC metadata.xml 334 BLAKE2B 06663250439d029482e4050e769ba2e5bdf9813dcb9244e06a260247d0275b9a172f0cf06dff21bc81d4eeb2eee2bcb73a11fbd3b9cede4abc7d4edacc6d0d5c SHA512 2e1b1fb38bdf7b589cfc2b448cdcbf7786179b92d391a7db698a1fa8ffc6b7a3f6f7f52356ba76cd367314bc6596a735a17743f06d3141fb817abb4aa63b1cf4
diff --git a/dev-ruby/rbs/rbs-1.0.0.ebuild b/dev-ruby/rbs/rbs-1.0.0.ebuild
index 33292f43e0bc..f5fb2dd22c4a 100644
--- a/dev-ruby/rbs/rbs-1.0.0.ebuild
+++ b/dev-ruby/rbs/rbs-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/rchardet/Manifest b/dev-ruby/rchardet/Manifest
index 5e16a0d86128..8b8526176f1d 100644
--- a/dev-ruby/rchardet/Manifest
+++ b/dev-ruby/rchardet/Manifest
@@ -1,3 +1,3 @@
 DIST rchardet-1.8.0.tar.gz 1903004 BLAKE2B d5860bc17f3a9dae9d6194156f1707e833ec0c440992c7b933b2e4eaca6bbc01f9964bcd7eb1dd054ff633124b863a0b797103297d6d2ff75e6d13040aa0813c SHA512 419eac7d4d4fb4a9cbe102199b5767d826f968943da9dfbfd029d03603bede596fb59d9747e590447b6848ae42c733dd0efdea57140e03d92bdcbac317dd0c6f
-EBUILD rchardet-1.8.0.ebuild 721 BLAKE2B e43bd69df1208478df5cfa37b6fbe805a62b430de0258a7ff27fe00312c7864933c7a389b1a2c28e7c95db1a04f8c58c16fb2cf21dac3f4b2672e099b04885ec SHA512 1f60e2313d6436b734f6b56d155077e189cad27a5b1d6a4973354756235490d90c46f109d6d04d918b7d4ee62fd158b16c18c83b5ed6b00c051864a929e4bcfd
+EBUILD rchardet-1.8.0.ebuild 721 BLAKE2B 8bc5e826eb7e12d52f32eedddc00a0ddefd14a854042e1795c1beb532f6bd3ce9b78dc46533d7697ae1019cc2ba5d5bd6189b0252082f1acc1f3bf4860f49de7 SHA512 95737bc6f7fb65337d3d878c4bcf7aa4df28b38d8cd53d6c1bf46621a0155d677daff203ba18bdd254347c67221bc0bc463412e1da10ccd6f400cbbbe7b7dda9
 MISC metadata.xml 343 BLAKE2B 5cf818b69331fe1517731f8dd2540d96cf28f4bcc4596ab4ba971f82982c493cb93e2186c4dd905ae33c037934fcaeb01a8ba1351e103a5688be00bcc79e701c SHA512 46306e4cc45c6b17af1c36d49d952934f7bdccb462baa74404c3514bd9f2d0835c97c44d0afcb4227a5f025caa5f8bccf7b900f873503c4cb58a041d2f69ce7f
diff --git a/dev-ruby/rchardet/rchardet-1.8.0.ebuild b/dev-ruby/rchardet/rchardet-1.8.0.ebuild
index d682c26fddd3..a5d21dd0fdfd 100644
--- a/dev-ruby/rchardet/rchardet-1.8.0.ebuild
+++ b/dev-ruby/rchardet/rchardet-1.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-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 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="Readme.md"
 
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 4c93dba8087d..6fe93616701a 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,7 +1,7 @@
 DIST rdoc-6.1.2.tar.gz 667607 BLAKE2B 4857bcf5f72d93fe4e9ea89acfda9ae82afd61a7ff501d2eea529330d2b8a63d7cc775490648fcff5000ee60417123244518f56a31593af8efccae8f925b21d9 SHA512 a54e36adf9f98117f0b5ae4490a0ab1ce12d9b1de5b7c61ffa326b36ef13885bb8f18147f3548f95a285b15470faba14965bc87088fa3ce584928d8ee396689f
 DIST rdoc-6.2.0.tar.gz 668152 BLAKE2B 9c92b27c427d6229778aba54ce7f12fe883fd3e40151f518f3d023d4f6dd10d4f1f6d05c8d6bcdce80d1ac81ab25cd99ccbe9479a4fcd950b895e14d4fdc4b83 SHA512 15352889833436c0a243e4f79c4ae8113fa3b8c222950baf1fcd272773a7a17198c2cd91a50c92e225c282a37ec743a38d8e9ca4dffe0b66c39d56412fe56ca2
 DIST rdoc-6.3.0.tar.gz 670538 BLAKE2B a7eda5d588c0089e36ee4197940e762e378de24b45435f8d9fa9ef9292b5d2f50d7b48ed40764794c4a20e8b159ab6f2e0d86a9289c0706744eeec7a016e05e6 SHA512 7e5da42905416d12acf6528b5725ea9fccb7b50bb1ed95c03975d16cc2ad22c58f48c3f14b4f118deb978649cec184b98ccef915a5cb4b0321e0114438f75745
-EBUILD rdoc-6.1.2.ebuild 2646 BLAKE2B aac4b1066c1bce0565f2213e9aa60ab515ced6c6c56bfbf6e665a47b59af4528a764deb80aa5faed36388287c55bd7def614715e8c577b2e9218be60d37c6dcc SHA512 1db7296eec273e831964b533c377bdd1e50e18862a9df99e13fb3465babd67cd5e513d77fc1aec4dab805496aeecdd223513ea6f7dbda6ad8a6a4975488851c7
-EBUILD rdoc-6.2.0.ebuild 2682 BLAKE2B b5e7baa7d3f9b65d3eeb346c2761c08ec8868f02f7d87a7d1ec31a9b6f3a431eb4b7db2c9379ea235267dcdb51be56be967376b95599155ab27fa28fe0b22bca SHA512 f293162e07ed2f9e9130f64a22a4f39fb83ea84040b9b7dd141b3807fd1fcefc32377534c7c48478a90e950d4c70fd748d61a9d592adabb276b19ec9b2387fa4
-EBUILD rdoc-6.3.0.ebuild 2682 BLAKE2B 674c4bf6309b08608f28ce7fa7dc6337977c0cffbab76818f027b563126360e1ed589a7ebd7b2a4999a526b2dbf04087523765a09ae2733b32dcff8fa31b0887 SHA512 9cb81a41fcc90825ea60aca33d5a7270ad473f2e1c4cd58b8b5f80ce1d6d6530554be8184fb9d7847b94da8b764cebbc6ca31b3ec5ab2db5d1bd2b044694f37a
+EBUILD rdoc-6.1.2.ebuild 2635 BLAKE2B cffa14dc839b9f4c65c214aee4f6cb4dd9898a88a8f2c6cd3a5e973f6f2e3eda83b219e5148b0d36cae42bb23ee8bcaa9c63aa11ee4e648317467a2f3a239232 SHA512 a951d4b56622bf77b7d03d8bceadddd054d1894543effd22aaca6c0f3c39f24eb973e72b90ee1f81d833b04c0b1c6ed5e10d9c7c4bebe0b649279e84f84de485
+EBUILD rdoc-6.2.0.ebuild 2671 BLAKE2B 9cc8cab8754a6bbbb7dbf9ed895c2c121318c706f5a835fd7dc4914a282a81344d09cd49d241294723cab97edcd87ef44ed3effdeb8463a23f6159c8eaabea15 SHA512 eae8875f7f2e4ddaefd8bef638e3a5d75b0f9d95eafdfff8e3cdddc18083e6ef693b7411971b090f3ee71f879042746f7687bf42b64d3c983a3a1adfc3f3ef87
+EBUILD rdoc-6.3.0.ebuild 2671 BLAKE2B 2d9f41f99b60bb989064d99e172793674310c732b603a57e4bbe081194efaeda6829cc65e2edff330520ee2e3791a650c48161d81c750a34589bebc7937e0b68 SHA512 e5817665513852fdbe44ba30d73cc6bfe953f76abddadb8ca3e609fe7918530b86e268baeed69004354f129957226d79ae05a4d06a5e1ac4cbc853f3c2a85bb7
 MISC metadata.xml 335 BLAKE2B 835d498407155ac5295c70af8a671114c777e5f9371b3d47f9f92a6b102b8e1d58755df0737c34820630464772dc001163e83b5d319707a1c630f4cf2f9ef8de SHA512 3421081016cb99570f9ce9f775097669cd40a709efbbb3c76a20947717bc40d886195a5fda889407d1c436a387c126e07def1eeae01edff53c490ea9c630e992
diff --git a/dev-ruby/rdoc/rdoc-6.1.2.ebuild b/dev-ruby/rdoc/rdoc-6.1.2.ebuild
index 2afc0c8057e7..d8d39f4353b2 100644
--- a/dev-ruby/rdoc/rdoc-6.1.2.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,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 ~x86-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"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-ruby/rdoc/rdoc-6.2.0.ebuild b/dev-ruby/rdoc/rdoc-6.2.0.ebuild
index 2be09233e2b8..ac40c6318c03 100644
--- a/dev-ruby/rdoc/rdoc-6.2.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,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 ~x86-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"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-ruby/rdoc/rdoc-6.3.0.ebuild b/dev-ruby/rdoc/rdoc-6.3.0.ebuild
index 8f43cf6a5883..f0b0e0194173 100644
--- a/dev-ruby/rdoc/rdoc-6.3.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,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 ~x86-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"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-ruby/recog/Manifest b/dev-ruby/recog/Manifest
index f24c413284c4..3baf41925ed0 100644
--- a/dev-ruby/recog/Manifest
+++ b/dev-ruby/recog/Manifest
@@ -1,9 +1,7 @@
 DIST recog-2.3.14.gem 331776 BLAKE2B 62aad2cf8252c24cd7adc456a022555f05924e501fd5f2fafeb87c2587e049ee41a501602bc1b5d97370a69a6b98f1ae77df22bfb7ae2c9e80b38b5e0a1518df SHA512 1154ca3d610fe8f554a15846b49f978d3798c9a43893c40d58c8421e8012c0823368d374ecadd351fc1479037c898966dc2dba9debb4c46ce6b743c7782a848f
 DIST recog-2.3.15.gem 332800 BLAKE2B 4a6360f72d5ee48e066a30abf875fba18e8dcdcba6d36bf8d8de28b36405870819a1b91edee1a5877b1ddda99a25918419bf42bdd4851c7d814a2acf558439d3 SHA512 a26f722da886be22332330a9b0407ec28431ca900b43d6cb7c6fe65938a026a51d54f90cb264652fb8a70352f5e548a7ed013a4b136a7a21df4a9987b36faf0e
-DIST recog-2.3.6.gem 266752 BLAKE2B ec11be53a79f83b174c12f44d90c4085e02ae10fb49744ee6c5d655e4be32414fa158f6a11b2d73786c00447f8ebf3f40aecd422f14886a72eb59f1519a65f63 SHA512 b4731092884de9dcf961122bf0cd5b4ed2fe8b9fc7ecdbd144d0813cbad52895ab4b3c0b7069a7f7e7a80bcf236cfd1c8c0d594d2caa65a76cca60e362009b43
-DIST recog-2.3.7.gem 276480 BLAKE2B 227b5ee13245a8c3f47b9aae1a3a15133669bf2d0438f6c693da6496243b915e036ee922f0db3bbfa605b38803c4bd1cae472b8494f74d7dc73b2d476cc164b0 SHA512 184ed1bbd661899d66f51675f2c5e62804b24b75426ad064c1fff8d5e3f2e083cdbd48c5482beedbaebc355f0fcff3e29d1406d7bbc31c55a17fa467adf7c280
+DIST recog-2.3.18.gem 331776 BLAKE2B 8a44b13c73e4487fc41c00b34d907fc91b6c3b9bfcf29a7366e3462a946db51e9ae8cefb09d47890c8bb71fed6b6277f117f96b5a6f7e611c8583873049ec4ad SHA512 023486b1812c7e90f1eab6f6b49733c77207b725f82adc71d0d79eafad07a13cb368b5d02c23d8f00341cbe94d77ac1b590430f0c891ab7095643af1a1772ba0
 EBUILD recog-2.3.14.ebuild 781 BLAKE2B 491ff32a9898c4e49a9538f6b748276391d57a050cda369386d1b890afcbce515044a4dea8d276a36c4f6e31923fa5aaef2fa8503b735df92d4a4ae5f79565be SHA512 3b600044289bd0523684974660fd072e304df6aa4e3de777b62172da4dc4b0c737ddd707e89286879bda83fa6cdd62e238cc28c49cf371fcbd13c5396349d40b
 EBUILD recog-2.3.15.ebuild 781 BLAKE2B 491ff32a9898c4e49a9538f6b748276391d57a050cda369386d1b890afcbce515044a4dea8d276a36c4f6e31923fa5aaef2fa8503b735df92d4a4ae5f79565be SHA512 3b600044289bd0523684974660fd072e304df6aa4e3de777b62172da4dc4b0c737ddd707e89286879bda83fa6cdd62e238cc28c49cf371fcbd13c5396349d40b
-EBUILD recog-2.3.6.ebuild 779 BLAKE2B dd2b02b306c18b6f15988de6782069b006ec90434adb8e20e304eebf63bf35d94edfa57d233c6dd58e653b2c9771953a1ed345185f9bd6456645fc7ce4b3d3a2 SHA512 2f173a35948cc68d497787501bfe60e8fe9ebf69e7ec558be13563dbc6b00cdf398d0c09ba408668e2c1f992c7a3fc6f258d8415fa764ed467228fbecee9d305
-EBUILD recog-2.3.7.ebuild 786 BLAKE2B 5fd7e5d4070af67ee769f066c1cb476f1ed2702890c3194e4c09d16868f960a489bbe5a144b894283b488ec46a36bc208321c61967c5950f086b3051f60cb880 SHA512 c4e517d65bd0eefbdf4dff4f67f63401baea31638c98e975ed9acd677e6901418b95353d5b4d44ee4541db153c4e1153361bdc08d59aebdeb7c64e30861f3e50
+EBUILD recog-2.3.18.ebuild 743 BLAKE2B bf211180aa7a2651db6f923e41c91dd0ee8bdd4eabd9c2485fa06f694c3bc2b4d01a13bbb44d8f4e565f46e504480de6f5a566e8b89cb21cbb57744cebf05a28 SHA512 fbf11002303a746fd65b14375441804cc5b87f9c4c30f1e53ee7c1c62ff0fe6b44c4365b7824bdb713d31e1e25d8260495f5661f5b2bbef3779271e5a6e7f94f
 MISC metadata.xml 334 BLAKE2B bccb589153c4961a76c8bbd83ace97d4295b5c6a3b66ede325156940c8d0a1119bfaa838caa5d1e7ffb1363e4a3cbe8d2899fc2430b051dab63b11709f16d190 SHA512 cb416ad148d55b439a260d17b6f014075031a7b60cbf686b75e2b34f4d7bf82a8f0001c84f0dcbd9506a855a64dd20902965a0744cdd9fa06f6391929d5245fa
diff --git a/dev-ruby/recog/recog-2.3.6.ebuild b/dev-ruby/recog/recog-2.3.18.ebuild
index c000a7c6eb5c..18077246bb19 100644
--- a/dev-ruby/recog/recog-2.3.6.ebuild
+++ b/dev-ruby/recog/recog-2.3.18.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 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="ruby25 ruby26 ruby27"
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -21,14 +21,14 @@ IUSE=""
 ruby_add_rdepend "dev-ruby/nokogiri"
 
 ruby_add_bdepend "test? (
-	dev-ruby/regexp_parser:0
+	dev-ruby/regexp_parser
 	dev-ruby/rspec:3
-	dev-util/aruba
+	dev-util/aruba:1
 	dev-util/cucumber
 )"
 
 all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' -e '1igem "regexp_parser", "~>0.2"' spec/spec_helper.rb || die
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/recog/recog-2.3.7.ebuild b/dev-ruby/recog/recog-2.3.7.ebuild
deleted file mode 100644
index c3a8e9db148c..000000000000
--- a/dev-ruby/recog/recog-2.3.7.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 ruby27"
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="xml"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pattern recognition for hosts, services, and content"
-HOMEPAGE="https://github.com/rapid7/recog"
-
-LICENSE="BSD-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/nokogiri"
-
-ruby_add_bdepend "test? (
-	dev-ruby/regexp_parser:0
-	dev-ruby/rspec:3
-	dev-util/aruba
-	dev-util/cucumber
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' -e '1igem "regexp_parser", "~>0.2"' spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	ruby-ng_cucumber
-}
diff --git a/dev-ruby/redcloth/Manifest b/dev-ruby/redcloth/Manifest
index b4919951954e..503e88bb95fe 100644
--- a/dev-ruby/redcloth/Manifest
+++ b/dev-ruby/redcloth/Manifest
@@ -1,4 +1,4 @@
 AUX redcloth-4.3.2-load-documents.patch 988 BLAKE2B 75e2a385abaf14caef523ae418e87b000900c93d3afe4491300335dd9d5a26fef28a34b3318fada0625e91cafba42a82fb05a2d8acfd6c5afcff4e8ac491890f SHA512 cce18ba0c30d6820020d71dd032d1b193976eaa103ca7bb294a7b1cfb0e61b82aa31e0d8bd8b8d9305e8c087a4109563897a7cd77ec9c020b453c8dc97d48003
 DIST RedCloth-4.3.2.tar.gz 91880 BLAKE2B 0feac1ec59e23fcff39e2fdf9beff896be7949764e53a5a834c5f4e7d18813dc59bf354103d4fab82a709341a0f1b6919bbd3a463fd601564888672dbe73d343 SHA512 377fef21e646beb1658a4b8b8d0228e9730c6c8f33075a14137afcf80e8d37501ede8c05b720d0dfb36a680017f4dedd01565fe9b326ae06ead77afee6f122ca
-EBUILD redcloth-4.3.2-r1.ebuild 1514 BLAKE2B 1785102c37e2775ed506826672c75f6713ba5b20f763773edbdf0d6d7a84f4a40030515ce981d356bf40688e04b16fe260daa9c160e8840834c3a6ab46b7de46 SHA512 9dc4d08b282c1f3f4cf7f5737ed2bbcf1000837ffd0194f61bc9363ef01026aff2f03ff5357e44ed092b4d6f8338c3a8e321a52a8b6607402fd3f63a6ff7858d
+EBUILD redcloth-4.3.2-r1.ebuild 1503 BLAKE2B 9c347450a57a184e67388e4c29e661e13aac23060972dfa43a9894d52f1938cf2ae7395be21caf33f3507fb4e8ee639c3ffee3c2a5ae5c3e9106a64184d09090 SHA512 8628c0aa015983329502b2b71ea4325990b562feeaf2f8e62c7f6e015508380229f908dd8c6014be542af371557dc63008ef030e2c037e633701a4837146a6cb
 MISC metadata.xml 342 BLAKE2B f28d0e6234cfbeb3d398315b38e8dcc614b32aed150b047e61e7d99b2f6083abbabc36515de2cd2aa4d451dd3372dfc15018c1d8ad02cf64ff8e87b147a441da SHA512 7a6f73a77cda62ea21a2d2fdfcf0bf848ffdd90e7272e0b06aef67a8147e5a6ae14e871d216750ce20d12e18823d3e3d36e60a99972019fde7195a2350480791
diff --git a/dev-ruby/redcloth/redcloth-4.3.2-r1.ebuild b/dev-ruby/redcloth/redcloth-4.3.2-r1.ebuild
index 6e39855df745..bea03847125b 100644
--- a/dev-ruby/redcloth/redcloth-4.3.2-r1.ebuild
+++ b/dev-ruby/redcloth/redcloth-4.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ SRC_URI="https://github.com/${GITHUB_USER}/redcloth/archive/v${PV}.tar.gz -> ${R
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index 055527807951..6f4a504e09c5 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -2,8 +2,10 @@ DIST regexp_parser-0.5.0.tar.gz 80554 BLAKE2B 7890e6850e3ffbb927c5e72430ab29e6ae
 DIST regexp_parser-1.7.1.tar.gz 83865 BLAKE2B 1aab4f5c4d399ee48951a9fa9f24fef14073ca5267ec29e5011880274d2749a7a3d1f5cb2a6a5107d5c848537367e1f725a6de9bb9af8803ccc8ccedaac415eb SHA512 fda810bc18039484725df5c6092b3d1b31f398e337cbace253cfdfa934274902f2dcb4e64c4fd0bb24379c79ea2976383313c1a5cd4ad246ecb7eabfd1a47d64
 DIST regexp_parser-1.8.2.tar.gz 85592 BLAKE2B 55333dbf59606d1f203c84cc3e712ddba9551be492745f2a0ce9ca8ba56e9a6eb1aee0c9d3d5079114c65747746f6ef4df3cbbf5a917562f413ca3426fd16efc SHA512 8192ee4334d2da13af5552eccd4fed82b24ed57489e3e0d8d083e8cf72e52fa185c2e007e9adf1ec6e59b0cf4e4055eb8def28d5cc94cc7a9ab7981d14f8e727
 DIST regexp_parser-2.0.0.tar.gz 85985 BLAKE2B 6d206de85e85cd5f3f472f6b2cba49bc03aa43fc246af145188c2ebfe3da1c23e0b8b5d307d8902662abcd220b3c7a439825ada2012a09fdfffd9c390865a0d3 SHA512 a896f81988c8fb8074e05abe6c9723a314b147ac2098d11324842b79a8b74ae3a8237ef1ec0f80cadc223c13b06fa0ba231013ffdcd00710381e5c2fc7ebf175
+DIST regexp_parser-2.0.3.tar.gz 86862 BLAKE2B 261703b7f005d234bbb2be655b6f9974e9f160b36af9082339653f469b9a18cffd39e04878a0a007c09252be747928bcd04e59af1c5572bc3f627495432bcc3d SHA512 0df0c6a023b26c48570ec5761af4bc90ab78afeae4f6f6864529102b826301b11b8a2cbfa7dbdd4b18221be7450ccd0d69c603a4cdd800c0b68fd6e5cc3c0eff
 EBUILD regexp_parser-0.5.0.ebuild 878 BLAKE2B 065940af48ce7c93836019f0a9325e04db4e0ff31f0e9af6a13a637e86ced811bb38cd9c70b971e244df857e1d40b2ed2049fc0321a82141c43478822cac8b04 SHA512 c91492b8ea59137258d941e79659f1f511621c0d7da8af6e6c13aefa39f5473c2881e0893b68a56b428ce8da9a135e20371e4d5e0c6d5fc6996e6a77af5c22e6
 EBUILD regexp_parser-1.7.1.ebuild 876 BLAKE2B 82bacee65732f0f87c38e5f0e6044efb35e628f512de34a1dc55e866ebef3e947c0289c5aaa168fc136b5042e2e8e2af9aa23a77e5acccba5c8899ebd41ad5b6 SHA512 eec1e3db2f3bb6463ca114977281a0f50d5360eb8953e986f7f99a8b7694d817aeefe073e88f23bac4f7fef4eec2be516f457c4fa4d60b2c33dc6bb8d5ae1403
 EBUILD regexp_parser-1.8.2.ebuild 888 BLAKE2B 5908b7be2be373462cd50b9445e1b111490dc0291dd4b050c2e0015ab6c77ee845b5b8dc0e34c4b223737e983a259dfa46a5c43cc0b10f825f8bb170e5e3168b SHA512 6ae591ed9ffa40bb8440cd05cec581a9a5126a2fe85768a0805d2c2e5b152aef482426a18836d2076e5cef313ce96484c686ab982ddaeb7f2a6f038ff55498d5
 EBUILD regexp_parser-2.0.0.ebuild 888 BLAKE2B f4c4432751aeba693e2d7ef3769b96fdea6ec480a0fb7d0393770cd9c98c32181cbcc12c0dc185e7996f1e4cffc4ceba47123d1246d123456a420316f58e3752 SHA512 18364c915f58475c0ae9175a928d3c033211048ecb33ef0787f5ba3e10416fb619722cd37280f74610ebe49b8c382ef524bebf37a8a9184f3dcf791829a5f708
+EBUILD regexp_parser-2.0.3.ebuild 900 BLAKE2B f565c500647465eb66745b750f0ed2213b8b25f7966baf7b0cf6101ab80a5713baa7a35cfd7bd1536246c938e078f6f5fe6fa0a7d75e40fcdd5e56cf445411bc SHA512 f9ca3cc108e5b5c31e13c99468aa5ff0003fcdaa4841351e35581b73defb13c7df04c6ad85921084339e9c09ad82901534d00b416e84cd7237cdef53b9aa1f83
 MISC metadata.xml 345 BLAKE2B 1b8ad1173966e2528e85b076052a92f378eccb6bc3159a69de1a276dea6e65c3b2e83db43d65ab9cd357fa58ee0af3cde2485b0926002cb74e0fe1d54cef375c SHA512 aeac372e6213e9b018782fb640fe6d88b3d86d8f5d02b8511f69980df204dd82d45443c371e81527fc6c34b2c1684ff04b3a7789808b884644c348139b4999ff
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.0.3.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.0.3.ebuild
new file mode 100644
index 000000000000..f159a54f45da
--- /dev/null
+++ b/dev-ruby/regexp_parser/regexp_parser-2.0.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test:full"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
+HOMEPAGE="https://github.com/ammar/regexp_parser"
+SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "dev-ruby/rake
+	test? ( dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake ragel:rb || die
+}
diff --git a/dev-ruby/rexical/Manifest b/dev-ruby/rexical/Manifest
index 331f80362dba..560e233b0c0b 100644
--- a/dev-ruby/rexical/Manifest
+++ b/dev-ruby/rexical/Manifest
@@ -1,3 +1,3 @@
 DIST rexical-1.0.7.gem 22016 BLAKE2B aaadf4131fbc4958a6a17be02b970070e511dcb031fd6432fb62fb841eff36b4d5c41d8f8f295aed4ac376c49e736e5d795166f71957578c6cbe14fd6cea26be SHA512 f71c86bd9764e65ebe0c66acd5446b5da7a1b38aae9d33367d70bfa253eb53c178634ce90c883c5459622219670d4d32f375b216c3023a3109329d6930dec1fc
-EBUILD rexical-1.0.7.ebuild 1027 BLAKE2B b23a1bd4e5cef85bc89386063b757f941c1b4931965adbb4e804b96f6c277db037fbb81b8376c14a8817d1bbb6c146ab7a85ab99078957be37c5af191eebfcaa SHA512 d81d29600bafb47452ba4f2bf229ad8c446cbf42d3f83b061edf89d4b17928715f536336b30d2a5afbaadbc5090172bc312c0881a9b3fe64e7a19db701444481
+EBUILD rexical-1.0.7.ebuild 1016 BLAKE2B 9db586bece4f320cb59c3934e04fbf5f6f74e5b123ad4d115c6e841af4f42511c4ec913ff8d2bde3db4b7830b18c284045a288afe358bfa820fcbac5490d2e8a SHA512 53ba26cde10f46b75e54c7b3bdd8b8d86e695a97e66d1c21b9cde3654f0cecfb3a530ed2d22a901027d0e0993b62021b15e0fd420b9c434e5a9d07ce44983b77
 MISC metadata.xml 344 BLAKE2B 308f72345dd9f7ce808e53f6b3883102b7c5b51d41ff822d28888d684abb4efdce86e24fbbb2d6ba46342c85e23189fa619343c467689a13b62382a5ea024d2b SHA512 96c6b9e4f3ca4aad95e01087158bbcd9a159569d7ccfc90365732e4ee6b9772506521c7e4706043897ffceccc98236077abf570efac9f0ddb24ef56efa65176a
diff --git a/dev-ruby/rexical/rexical-1.0.7.ebuild b/dev-ruby/rexical/rexical-1.0.7.ebuild
index eabab3a31190..3c4560ebf4bf 100644
--- a/dev-ruby/rexical/rexical-1.0.7.ebuild
+++ b/dev-ruby/rexical/rexical-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ DESCRIPTION="Rexical is a lexical scanner generator"
 HOMEPAGE="https://github.com/tenderlove/rexical/tree/master"
 LICENSE="LGPL-2" # plus exception
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rexml/Manifest b/dev-ruby/rexml/Manifest
index f3af72bb9f3d..c982cdd8d2ef 100644
--- a/dev-ruby/rexml/Manifest
+++ b/dev-ruby/rexml/Manifest
@@ -1,3 +1,3 @@
 DIST rexml-3.2.4.tar.gz 474955 BLAKE2B f0b9a2003b6dc2b90fbab9bac1b035ebeb89c57dbe9bd50514352a8bbb790593ba5eaf77a9c898de033b5721281a06be2fb4996fe2e5810191df015ede3e44d9 SHA512 8fb52814a93dac8e5e963b7e0686f63fa6c1a88f6842a4e401bde76acb2d85b874ed6243439921bb0cebf53a5b97e0b096424d736409240aa9a5224e617ee88c
-EBUILD rexml-3.2.4.ebuild 781 BLAKE2B d84d6337b6220fc2c40aac5b9933e784aa38f7b814768c44b1e49c169935be28ffe43ba4eaf9ee0c11b662d0895ac7f158dd88a1e901c34a8011549ccec1e2d3 SHA512 0cd8e2cdc50176c89d86d01d50794553f85be918432efaa5394cb3ea8e8c3a41f466d69ca5dcce551bf70e0aa3d11c7d8165c417d74b8287f1f6b6ea4700dc0d
+EBUILD rexml-3.2.4.ebuild 770 BLAKE2B 66ee78a570bd4edac6e283ceb71c1841c5fa512b5c8b8ed227a6d681f7f2d756ed611ed84e7a38674473506ab19b4146c5d6617de6b88d37f482618b0fd3de34 SHA512 c9f7af803a5d963bbb65b9c9191090880da99ea39d17a2f82a8c75e622f75d29b23d3a49e8dc839743acdfcb82d2c22158580bd37a90dc054aaa12a6b7368f54
 MISC metadata.xml 257 BLAKE2B 6339b8ae3ef779011f34940b5af7faca341317790ee6752ad73cb83db463ddad10b25cacf16f73ce6d0fde976d916e2838e6209bdedfbe5ef6da285be302203d SHA512 d86ea11e509e5d031f82c4bb476a5974b85d812abe415e95799bdf34a308ade95e2f1cf35f6af84ae5acd0f67996b150c02712b75ab4f5a1ff4eef0ffb046d7e
diff --git a/dev-ruby/rexml/rexml-3.2.4.ebuild b/dev-ruby/rexml/rexml-3.2.4.ebuild
index 9d8d6f36219e..b3070720e902 100644
--- a/dev-ruby/rexml/rexml-3.2.4.ebuild
+++ b/dev-ruby/rexml/rexml-3.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,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 ~x86-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"
 SLOT="3"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index a4bf2198ed2a..9555bf5aa687 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,7 +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
-EBUILD rmagick-3.2.0.ebuild 1582 BLAKE2B 2444e14e907adab5658013115801d453787186933c20b80dad6e25e439d4dbebc2d8579bee13f20d54f0105ebb7be8611df471803c0cb0616e5c7a90ed71c390 SHA512 a1410cac8299dd2debc536aa821b45f62c0db4cefc1dbbef044083c68f5db13753b628823cd2e68f0d177bd0e63841578e1511efe16e96dce037ec06c4dc12f4
-EBUILD rmagick-4.1.1.ebuild 1811 BLAKE2B 47500f1d99dd0a063fcbdf136e0c1f22a35d653950d8bbd5da04357673c0e38ef6d96bfeb9e2e4e26d90a67a2ea5830040b8ef73e2b9e84faebbdb63776884f9 SHA512 9d7533a06af94eef5cd1b48a637dc685c73441bd5c469a2fdd0eb8921d42c7a140716c3e8b5028111a8d9fba114ab889587f1ac35a8fbbb5415a86dcde92c593
-EBUILD rmagick-4.1.2.ebuild 1826 BLAKE2B fa9d799597b5df2b3e961f5d13af93ff225ec2d5169507a8218f88defd0c58d0fe8e4ac753aaa4975104f6359dadc30ad51afed2b385c49bd459615589961227 SHA512 8bfcc4668a1cf4fbaa340c82f6ab3ce86d51ae8644722a4eac972ea73289271704c84bf9ca098d799b4985de54f61e1643ae7293f7741bdfe687bbcdbbe2bee2
+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
 MISC metadata.xml 341 BLAKE2B 537583fa385971de2e8ae510c7d32f11bf7644b3aac908b482833d26a2d92060255c2f15afd229c6c50207e969cbd5857705850440949788a6fac7329f26c757 SHA512 84bb956a38056526fd173c3f4aa972ea121712c15111a35e19e1f27b0cc797ebda4550ada88a46de7e66e058a66bb92d2e715d646068779843133a66d7523683
diff --git a/dev-ruby/rmagick/rmagick-3.2.0.ebuild b/dev-ruby/rmagick/rmagick-3.2.0.ebuild
index 0fc91a2a4dad..678c613e08ba 100644
--- a/dev-ruby/rmagick/rmagick-3.2.0.ebuild
+++ b/dev-ruby/rmagick/rmagick-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/gemhome/rmagick"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-macos"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE="doc"
 
 RDEPEND+=" >=media-gfx/imagemagick-6.9.0:= =media-gfx/imagemagick-6*"
diff --git a/dev-ruby/rmagick/rmagick-4.1.1.ebuild b/dev-ruby/rmagick/rmagick-4.1.1.ebuild
index 60b8e1d95093..5bf68fa87169 100644
--- a/dev-ruby/rmagick/rmagick-4.1.1.ebuild
+++ b/dev-ruby/rmagick/rmagick-4.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ RUBY_S="rmagick-${MY_PV}"
 
 LICENSE="Artistic"
 SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-macos"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 RDEPEND+=" >=media-gfx/imagemagick-6.9.0:="
diff --git a/dev-ruby/rmagick/rmagick-4.1.2.ebuild b/dev-ruby/rmagick/rmagick-4.1.2.ebuild
index 476f721de9cd..0efd8df2af44 100644
--- a/dev-ruby/rmagick/rmagick-4.1.2.ebuild
+++ b/dev-ruby/rmagick/rmagick-4.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ RUBY_S="rmagick-${MY_PV}"
 
 LICENSE="Artistic"
 SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-macos"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 RDEPEND+=" >=media-gfx/imagemagick-6.9.0:="
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index caa827b5e716..1c19d6057062 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -1,15 +1,11 @@
 DIST rouge-3.19.0.tar.gz 919603 BLAKE2B 53cffee53d8c6bd8e27dc0278f9ef8e9bff2a01d568d2342847ce0afe71ec72a8394f6e9184f575e38abad7893c61a4553ca73c8072bdcdb91f347ffe63a65e5 SHA512 4a59e5bebfb0c58be82bcc23e7a9906d9ff5cba8a636b47b94be00194ab0ab6cfae4d584586ee037e160245630abada889aa85332398289a214b7a493a8e825d
-DIST rouge-3.20.0.tar.gz 938340 BLAKE2B dcb61527f023e34be5c2fdc362f74b64be24cc26e32f88ce7122ab7fbbee5c44f5a29c5c1d8fb5e721ede2df0119cbb2c00b5e178d1462967c54a6d062ae2e53 SHA512 3eaee2d98c5cb252d783c5bae365de4c400d980917a59b943d6fe93490c48e9d36e51b7d92acf468c10e702c942074f1525fa7e1c81c7c37d9b0927e9d4f332b
-DIST rouge-3.21.0.tar.gz 945455 BLAKE2B f783bc6750bfc3b463bf63374127be28676428a13335c24b331f8ae327afc85d961c7f06319cfd6f80f31accd3ef874a780e7dd77816d9ff863ae491506f5fb2 SHA512 c71dfceae7902f8c4a02288053baa8d1285ac0570bcf754743bfae045a1d5fca177a13843aa223ded822bc95007d049187b363f4dd8f022336e6325919d2787c
-DIST rouge-3.22.0.tar.gz 943288 BLAKE2B 9daa8166e05002a633ce6a99a794173148336f3f755f2c672879cffe177d1fda1b37723ed540d3bf8613725bab965213257043a4b7dfaa619650568c946378ba SHA512 83032099a0d540e77a25bd79c94481cb7f39c4a33e9b30f9f74d738ee0781ffc0c9bfbf9b90400d4833975df8a857231bed0739678153d08c716fe7e2cd3f8a8
 DIST rouge-3.23.0.tar.gz 947011 BLAKE2B 2b9f35859d54aa616e2b30c468466f1e6e9b8300004e306e9fcf5e1ca3c7814c2966e4286ed2bcbe4236a6926c10c00491d671acd7c2c5a52f37b35155530427 SHA512 5babaeec803cc9e3346a82d8599ca305b2dca6bf1e3104741b2cfc2ce25561f03e1f5b96f006af782a50245c35de2944ce51e339c6bbdf076a95779c8a3a32fb
 DIST rouge-3.24.0.tar.gz 954216 BLAKE2B 6813c0ee4bb6af664b684cf12662e1d0bec916f18aaea1f1d3a081a18fe7dd534298d6432e42c0798b437bddcd305a40fafa8eced4142215d094b8e1c94b5b17 SHA512 5823e5907f1b3303b928e88dbad2d95e91846be32e242b8a291ad90108aaae1ac6b8d397a47d3fc4c047a26e260e9b8d45866d0627e0a98f955ff46556ca1908
 DIST rouge-3.25.0.tar.gz 955146 BLAKE2B a0e2fb513f3ab251d13c0777bb4620c4b447436a5906c7a0600b3b3652de952ca14a014f59408776cf2dda8f42b835748f1513ce637bee0cb6298392acc0ec3f SHA512 3e50d2655a7a58374a798b6718753cdf73b6edd434d954f11746278073478281dd9df246e6d9524f5c23deaf5b43c9bbe8c750160e356c8ee6ffa9b795c2b2f4
+DIST rouge-3.26.0.tar.gz 971871 BLAKE2B 9739c229788d615f4875caf5d38c91ca30b4fe5703c577b2e7aa5d54bd625f33e998ee887d375d357e72c9f05ac9a284b88ce7902c6fae422e8196098a993259 SHA512 bd6006b11924b3705dc142922878dc87af25ceed8a153ad9691ad2595144ae1f3f909574799002601928e985a6650fe4c8d93e05a1e8e26bdb10e9b2f9a28765
 EBUILD rouge-3.19.0.ebuild 970 BLAKE2B a5a5fca185c436833cfc31d8ba1d7acf897c274a961a54d350a188cf82a03234cd15ffdcb889c74fe213cab2f68a93a3f6384a4f2e2929aa6158f348c8c5b8fe SHA512 d9fc5b0e2d57578347450e7ba6d88a445f0d84f8ee2a8b975daab510c1398df5314c225f33d216a970699f70b2633b5cb49eb562793619ab73beae2cb8b7d5c7
-EBUILD rouge-3.20.0.ebuild 975 BLAKE2B f4047fe67e2f67878339557a3a3d2876793828b5e6931cd73064348f9f85bfe1bd56a50de4da7eb1db5cd5d51a4315e635c180e23c2c6975930f184759ed59e5 SHA512 f3559e9d6fe08b095fc13c0dcf27a59a2118a900ce258120479d0ca5cab01020d4323881e67aea25a84a3e1a134def2e1be883e5d4c5f4f609c743807dda2bfb
-EBUILD rouge-3.21.0.ebuild 968 BLAKE2B f714fac60256678764f27c1bab8ad4f86ddac1384a93ff7c0da2248edae46282b2c79ab168dff6855205f24933088249e5b71926da467cc1f388edeeee87e3c7 SHA512 fc547adf5c97e162b7a0920320f0c0e3197d381e0348466836d1a12c6415151f1207afecf0451abcca43a800ae80f15c78b4683f95106c3ea6db57b52b195244
-EBUILD rouge-3.22.0.ebuild 968 BLAKE2B f714fac60256678764f27c1bab8ad4f86ddac1384a93ff7c0da2248edae46282b2c79ab168dff6855205f24933088249e5b71926da467cc1f388edeeee87e3c7 SHA512 fc547adf5c97e162b7a0920320f0c0e3197d381e0348466836d1a12c6415151f1207afecf0451abcca43a800ae80f15c78b4683f95106c3ea6db57b52b195244
 EBUILD rouge-3.23.0.ebuild 968 BLAKE2B f714fac60256678764f27c1bab8ad4f86ddac1384a93ff7c0da2248edae46282b2c79ab168dff6855205f24933088249e5b71926da467cc1f388edeeee87e3c7 SHA512 fc547adf5c97e162b7a0920320f0c0e3197d381e0348466836d1a12c6415151f1207afecf0451abcca43a800ae80f15c78b4683f95106c3ea6db57b52b195244
 EBUILD rouge-3.24.0.ebuild 968 BLAKE2B f714fac60256678764f27c1bab8ad4f86ddac1384a93ff7c0da2248edae46282b2c79ab168dff6855205f24933088249e5b71926da467cc1f388edeeee87e3c7 SHA512 fc547adf5c97e162b7a0920320f0c0e3197d381e0348466836d1a12c6415151f1207afecf0451abcca43a800ae80f15c78b4683f95106c3ea6db57b52b195244
 EBUILD rouge-3.25.0.ebuild 968 BLAKE2B f714fac60256678764f27c1bab8ad4f86ddac1384a93ff7c0da2248edae46282b2c79ab168dff6855205f24933088249e5b71926da467cc1f388edeeee87e3c7 SHA512 fc547adf5c97e162b7a0920320f0c0e3197d381e0348466836d1a12c6415151f1207afecf0451abcca43a800ae80f15c78b4683f95106c3ea6db57b52b195244
+EBUILD rouge-3.26.0.ebuild 968 BLAKE2B 8b40b7ab7ff0a479ce1be07c2f13fea239c68a049e2d0299eac636361d2fcd02e21deace2fec2bca849c03cb7c0f646afa7438a7bcb243ae7540001d99a150b8 SHA512 1036c3fbbb696beb42be0a62abaf86a425253dac563015ea0ae0bb78a4cc547a6fbc96a40b8c308fc228001ccbbfbf41208c9538a7492c06ef2377a2d9f4e7b9
 MISC metadata.xml 337 BLAKE2B 0b11fe43cebeee93ba1543bf3784c624a91373b066b90485698e9f58ad95d2d4ae077fa5d18d097deb5d8678877b915a9df7154899169d35345fc8fc52bb1c44 SHA512 2517857c1be612b98601b4f92e3e20f3e404902faed1965f8e2e0573820ed6dfc12de25a292bc5f5971b498e310cdfe4a3a5aa13f46354f5139c53ae6a53b876
diff --git a/dev-ruby/rouge/rouge-3.20.0.ebuild b/dev-ruby/rouge/rouge-3.20.0.ebuild
deleted file mode 100644
index 1ce32a97ce3b..000000000000
--- a/dev-ruby/rouge/rouge-3.20.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
-HOMEPAGE="https://github.com/jneen/rouge"
-SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
-	test? ( dev-ruby/minitest-power_assert )
-	dev-ruby/yard
-"
-
-ruby_add_rdepend "dev-ruby/redcarpet"
-
-all_ruby_prepare() {
-	rm -f tasks/{check/style,update/changelog}.rake || die
-
-	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
-	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
-}
diff --git a/dev-ruby/rouge/rouge-3.22.0.ebuild b/dev-ruby/rouge/rouge-3.22.0.ebuild
deleted file mode 100644
index 7e43cc39b023..000000000000
--- a/dev-ruby/rouge/rouge-3.22.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
-HOMEPAGE="https://github.com/jneen/rouge"
-SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
-	test? ( dev-ruby/minitest-power_assert )
-	dev-ruby/yard
-"
-
-ruby_add_rdepend "dev-ruby/redcarpet"
-
-all_ruby_prepare() {
-	rm -f tasks/{check/style,update/changelog}.rake || die
-
-	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
-	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
-}
diff --git a/dev-ruby/rouge/rouge-3.21.0.ebuild b/dev-ruby/rouge/rouge-3.26.0.ebuild
index 7e43cc39b023..09b8e1223bae 100644
--- a/dev-ruby/rouge/rouge-3.21.0.ebuild
+++ b/dev-ruby/rouge/rouge-3.26.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-ruby/rr/Manifest b/dev-ruby/rr/Manifest
index 4e5ba7d4cbda..cc2d622fdd49 100644
--- a/dev-ruby/rr/Manifest
+++ b/dev-ruby/rr/Manifest
@@ -1,3 +1,3 @@
 DIST rr-1.2.1.tar.gz 137497 BLAKE2B 3db6751d15e54da6ee6777fb7d383c1bfea2e68482dda03ceda9a70f66382cf9aa7c39f27fca9f0ce92b19858b5324bdbb5811809b3ae146e213bb03ddca0772 SHA512 df2d05ff732908da55878cb89cb7d1c4442a18c19f71940244f5bd7dc55632467a1824f55d7fade4b5122486a61277090d7ad05df9f99098030c21aa45b36dd2
-EBUILD rr-1.2.1.ebuild 1105 BLAKE2B 9b90fcf988b0b3ddd86de20692d15e63c13e605e664353ee32f6e965486ca7361e653afeb7311fa764a66c35ac4808cf87cc0dd7aabd0fe6cdffaa01e2072dfd SHA512 2fddd9d29c718446ea2b76bf268309e709bba8c71f9e87cb634cbd853077be5e4d66137c60b98eb0ef34e4a8ce48b68c893d574ee28e1891427788d42b9b767e
+EBUILD rr-1.2.1.ebuild 1094 BLAKE2B 49caf7ccb853a9545414c8bd7dc82a7fa0ac3124b5f3e9029cc8b7428df9a53b278495fb0ea2458df358853881ed010ad0826e1c76230c46891aa93057670241 SHA512 26d86571134dfe9e89746f3f65907d6ffff218d6790e6aa1205c705765098ec6b8f22e8b6d6b1196ade5d955b30a715be901bf5abae5bba451db99ebfc986358
 MISC metadata.xml 331 BLAKE2B bb2b9b8afc411541f4cbc3f3ae7034761b8424dc81bcfce4c47d945a974a13c1519c2b46968dee270bc76beeca6902fc42cb0f8ac1ba3d944d96e4146993094c SHA512 3a7b57e7e43fad3270e91950256d20839fa2a4a2d7e7c8a9b82ca9e5bb72bd465427925b7994ece2f882c37b8ba5984bf8949ebe28c3bb0875c8af6cba3cec39
diff --git a/dev-ruby/rr/rr-1.2.1.ebuild b/dev-ruby/rr/rr-1.2.1.ebuild
index 6a6fcb3eb238..0b07ec53e58d 100644
--- a/dev-ruby/rr/rr-1.2.1.ebuild
+++ b/dev-ruby/rr/rr-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/rrdtool-bindings/Manifest b/dev-ruby/rrdtool-bindings/Manifest
index 18b85775e60a..ccff58027a9a 100644
--- a/dev-ruby/rrdtool-bindings/Manifest
+++ b/dev-ruby/rrdtool-bindings/Manifest
@@ -1,4 +1,4 @@
 AUX rrdtool-bindings-1.4.8-graph-ruby.patch 1857 BLAKE2B 4a36c4dee4e755bd39851c5c333fddacdddb53324017290f15345687b577caf9efb41d97ce55cc0bcd57554746e1a90d9a2d9fd92c0acd48b405eb02957e491c SHA512 1803247c9949a6d28d7027242604b5d61bc9da38ff22ff9d6302ca69743e49328372b4e51554c868b19a459c4341fa6d1291d09d62ea6a414a81d4558a7ef66d
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
-EBUILD rrdtool-bindings-1.7.2.ebuild 1388 BLAKE2B 66d6a7c5c92a2c75cd62c3126e3224cc9b4841bb47228728d4d8de3efd719eb7f7b8a11167c9b42dd7c74561495b5c088e1f633654ae4767ac623c2e99c05d3e SHA512 029692ddf3e6fbfc6e744c87030a16676dc630162bcd765983a7434011a54bbfb080d8e39417ce58f7dc0f546f20d2c797776a8952e0360c0815ae48f0848746
+EBUILD rrdtool-bindings-1.7.2.ebuild 1377 BLAKE2B a64e59a53acd7df20f6116be98fc91b38526c487cad5e4783c0d4a676e9fa7a34fb0a684d9245ea85060cf3db2083abdfef3832f069b72dc7676ee4f618f7823 SHA512 300a310d1dbf9b9275bd41f6f14c10949531d0bbc9c97add9f7130f2d1b4d21c3fe4e2c12fd8f8de6b9babbc78c16c2a8c8834f2e915e9e15984b981ad947070
 MISC metadata.xml 463 BLAKE2B edb3b1f3703163a7f6c28ea7d16a79158d108721a2a775e30967885fb6b7b31d6074585951cc5b1c7b640c88b0694b95f0aaf62b71df43a8d6d6a0d6f78e07c9 SHA512 60732861cde4604b50875b6bbba205f232a52c4d91e6e21bce49a46bcef824bc542140e73b07ce4c18518a366ff8c9bd34569895741b0ac292124f43b0f02aa1
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
index 8bdf154cb92b..a0573e9e4751 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ RUBY_S="$MY_P"/bindings/ruby
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="graph test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( graph )"
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 0308acf98230..af72c3eb7bc0 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -4,10 +4,10 @@ DIST rspec-core-3.10.1-git.tgz 398302 BLAKE2B 3ecd2a93b77435ef44dd7e52e2987155f7
 DIST rspec-core-3.8.2-git.tgz 387788 BLAKE2B e6cf93f5cef70f53039b6c22fc875cff58eaff4c0c7d4e75d23dedfbe16081980c6fe575d3082dbe6ed9edc8e81f0cbb9e29618da78af40a94c517a859f9d793 SHA512 2fe88ee3d66ecf134562dfa7b1001f23a1a750640c4f65cdec64d85dd735e0fde9d91479286f8f9c38064746813f41632d12d21b3926724ccd7c9ded50d2a7c8
 DIST rspec-core-3.9.1-git.tgz 392102 BLAKE2B e41d4d930201e854015b486eb97e32f356027a837930f061f6282215a0d7e80db99c30c8b537d10f9359380512b46a03fe10ec382f5403704cdc7f0c1796aeed SHA512 2da714ebf35e78be789758857efbebc69548df7a11fff8bcd74a854b61485ef726cf0cec781e27a97d20f4eac0010aad50656b6074248c94b1833d4cb267189a
 DIST rspec-core-3.9.3-git.tgz 396080 BLAKE2B ea52a33586dc32af49a72950c7dbf24eef52a74891b2d7004ec4c5083e2e6d63c602f5033fba3a8ec1dfe6e8da349208b468a79b4e16aa5150d2fc8e93055c0e SHA512 f821ae3017c0fd9ac7f3ced0e81d0ebc54f2c17261f426c58a46c0bf1debb20efca7acc4b751b671e160de72ce5790f897bcb55d5d276fab228a4ea8d388a046
-EBUILD rspec-core-2.99.2-r2.ebuild 5110 BLAKE2B adaee93665370025453e8bf14b7c31f42067c38bb773695371615e1d421e28dd4e17819b9240e507f000d422b0ac53d8ab76f794ae1da23590f0490802ff4a0d SHA512 878e10a0211f0971e0e35fecadf9cf703900c79713af9bd912ddf66f5ca737ef499256f773b0d0ae4d678ffbdca4d85ac7a215d8067f8db901b056e6dc6e49c9
-EBUILD rspec-core-3.10.0.ebuild 3133 BLAKE2B af9964b0d3eb76d9b040d28925734c5dc7eda3d4fdc190f6f64e1b53804a5abaf7591f10711004597e17a7e6c991f8e134585c7e302ac5ef9ffb6707ac27ca6d SHA512 2c386596c35a3867efd8728d9c2eb510bd475ad59c0ad8b50c2db4b6d4136b18779563dd5473fb459730db58fbb76a8f3948f3a57cb5905ecb1573e31a8d7993
-EBUILD rspec-core-3.10.1.ebuild 3133 BLAKE2B af9964b0d3eb76d9b040d28925734c5dc7eda3d4fdc190f6f64e1b53804a5abaf7591f10711004597e17a7e6c991f8e134585c7e302ac5ef9ffb6707ac27ca6d SHA512 2c386596c35a3867efd8728d9c2eb510bd475ad59c0ad8b50c2db4b6d4136b18779563dd5473fb459730db58fbb76a8f3948f3a57cb5905ecb1573e31a8d7993
-EBUILD rspec-core-3.8.2.ebuild 3165 BLAKE2B 22ace0c23d093ec4519e44c4ddffcce975d1225ce795a163687da00522cce80c5dc3e483ba5c3ecb0425a75ce9d4e0388e84802b0cdccd9655133f2be0739577 SHA512 c660265d681316a1934d22734f649b79a117d475152c1f9f7b30caa64509ccb033b2227eb3bbbc284c604ec9d2a556c797fa2222e06b9ca18a145c62129a12bf
-EBUILD rspec-core-3.9.1.ebuild 3140 BLAKE2B 7186b1ac3e19965f302019ddf96e0d9c4c3b30e2a2612008222f5de0fdff5afeaafaaacec5332498b6a4517fffeafdaa89ea43f1579329009d7077f14ec411b6 SHA512 5adbc381c649a8551f1c659d8f0debd2f181ad88d7fd3be6636c0fd489e0d5cd31895dd68c3c9ca157bddd971ca3ced24b669acdea1fd7ecf8b64e0cedef91c1
-EBUILD rspec-core-3.9.3.ebuild 3140 BLAKE2B 7186b1ac3e19965f302019ddf96e0d9c4c3b30e2a2612008222f5de0fdff5afeaafaaacec5332498b6a4517fffeafdaa89ea43f1579329009d7077f14ec411b6 SHA512 5adbc381c649a8551f1c659d8f0debd2f181ad88d7fd3be6636c0fd489e0d5cd31895dd68c3c9ca157bddd971ca3ced24b669acdea1fd7ecf8b64e0cedef91c1
+EBUILD rspec-core-2.99.2-r2.ebuild 5099 BLAKE2B 110fd632f3b1630b73eb41e876bad1817580fb36ba39726838a6e65039ae93c45f62e4ffc3bf263ce36c1904fd0c3401e29e3644ab44118a244316755f645421 SHA512 5f4f15f61efa55c4f3b250d9c39dbe2d2b5a7f4fa84d14c79cbfaf49dbd62503f1d219f221a6b337cc6b22cf62ffecef68bb1c5ad6147eec282e72588a80ab37
+EBUILD rspec-core-3.10.0.ebuild 3122 BLAKE2B 58bd8badcbb0964abb5423e670851cc5ef92a3a5fa9d6447d3e3aa956ed68663ceedad163cdee1b444d38c430951e13e3e1d8c36e602997b0f6b5390c6d9ddcd SHA512 6f3733d2bb0d380179660affa708431db24eee41d1893efcfde3e05ba7ebcda304aa1ddd96f34b4ce979e167e4dafc91e8545b01180f55718ba022f3c2b0a8b8
+EBUILD rspec-core-3.10.1.ebuild 3122 BLAKE2B 58bd8badcbb0964abb5423e670851cc5ef92a3a5fa9d6447d3e3aa956ed68663ceedad163cdee1b444d38c430951e13e3e1d8c36e602997b0f6b5390c6d9ddcd SHA512 6f3733d2bb0d380179660affa708431db24eee41d1893efcfde3e05ba7ebcda304aa1ddd96f34b4ce979e167e4dafc91e8545b01180f55718ba022f3c2b0a8b8
+EBUILD rspec-core-3.8.2.ebuild 3154 BLAKE2B 18a751083c7e36cf7fef603b15c948ea70a6db4c480cfcd199e09dbe98ba7a9050235d1b9881365ed66855ed1d5899d8743f48bde7510aadb0d5d8107de1768a SHA512 a3a55302597ed4059ebc648fd21d708c8681c8ac5601cd32cefa8f629ce16925a3b1c10d3681776b902d1d924632e92b88b9929d9bcaabb71203d0686cd31007
+EBUILD rspec-core-3.9.1.ebuild 3129 BLAKE2B 685f8ea50718637f1407d5d982340fe5bd80aa860e73c5c4b8bdfbe9540d73109a456921769a5f4dda64f59b2d6bbf3789d7a95e62b337a5b3c8c7045d740173 SHA512 79131c570ca03eaff7aa94a4d6cae829954792e041411db08dbfeeff7b5d08cf766d663f46bd798a46f55e738cf2f0055d2faaf50238baecc1d5c420f068fb62
+EBUILD rspec-core-3.9.3.ebuild 3129 BLAKE2B 685f8ea50718637f1407d5d982340fe5bd80aa860e73c5c4b8bdfbe9540d73109a456921769a5f4dda64f59b2d6bbf3789d7a95e62b337a5b3c8c7045d740173 SHA512 79131c570ca03eaff7aa94a4d6cae829954792e041411db08dbfeeff7b5d08cf766d663f46bd798a46f55e738cf2f0055d2faaf50238baecc1d5c420f068fb62
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
index 36789d43706c..ec0a17977dff 100644
--- a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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? (
diff --git a/dev-ruby/rspec-core/rspec-core-3.10.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.10.0.ebuild
index 937c6cffe645..540f58d9c7a9 100644
--- a/dev-ruby/rspec-core/rspec-core-3.10.0.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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-core/rspec-core-3.10.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
index 937c6cffe645..540f58d9c7a9 100644
--- a/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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-core/rspec-core-3.8.2.ebuild b/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild
index e72306ca4831..800ee70f12d3 100644
--- a/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,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 ~x86-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-core/rspec-core-3.9.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.9.1.ebuild
index 837a456d2180..da92ce03633b 100644
--- a/dev-ruby/rspec-core/rspec-core-3.9.1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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-core/rspec-core-3.9.3.ebuild b/dev-ruby/rspec-core/rspec-core-3.9.3.ebuild
index 837a456d2180..da92ce03633b 100644
--- a/dev-ruby/rspec-core/rspec-core-3.9.3.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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 1b5219827a63..67a49115d94b 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -5,11 +5,11 @@ DIST rspec-expectations-3.8.4-git.tgz 200149 BLAKE2B 45fe4cdc4b032bb773ef0e7d3e9
 DIST rspec-expectations-3.8.6-git.tgz 200343 BLAKE2B 9d668216c18716344e8c249086bcbf2b70e7c1a5a0d1f3a5328fe03752ef4ace6f5029219314016a4bb00ef482f440702a2adb7d9fe49392b5b1c6ec15f6a2e5 SHA512 9ded8de53127f63f2117f5ef64b6608b643586be498d8df24909366ce159a8bb95c9d8771633b777897f3e4ad3c9a12e3dfe62b2310513320b3d9656d24a120a
 DIST rspec-expectations-3.9.1-git.tgz 203727 BLAKE2B 47db054658bdec43c252fd5ac155e7ca794d60ecf8c8b0d3c8e072cf05629153c9778ad618619e5cde5400c95a85c1520f2b9fc3824699af33805fa187549115 SHA512 23a453a46c3eb3bd3f2a39f48f62f05832cf559b570ba0e09235dd6299687254491bab50f5502fefe69dbdeefa09e9d8c5568bc77d0b6b658bb469e197e67572
 DIST rspec-expectations-3.9.4-git.tgz 206297 BLAKE2B c5dbebcf7b411c9cb5cd815dc06fb6f455e82181856661110f803b25f3910975f0676f3cf154e93fe771849363593e104e0f2dd298dfd3d8b1dd96a6ff991547 SHA512 bd025b89751b5b8d3c6bd61a90386fc05ca371e04247d93b29334bbb3eceb84bacea3f3846c20f08dbf53f174992b2dc0fe9f2bc449c4591188b5e428b1d8003
-EBUILD rspec-expectations-2.99.2.ebuild 1634 BLAKE2B 70d1c9f8d95705761ec41266ce378a36f7cba54048b78ae4c69e4fb865b813af5d322204cede942b1e37ac3159beb4d8df0b865fd3d72916aa24e2368306efb9 SHA512 011b89105ebec5f8faf41cf6f0fcb8d3b80bd515fad44eb42757d2c9e8d0b8557624651e87cef66a4b2a4dc52a89b66fded956b6719fcf0dffd48d0f1a8be142
-EBUILD rspec-expectations-3.10.0.ebuild 1315 BLAKE2B 2dcb0785709b13d2da0dc23384685a073887e42348a918e257293959b7258cfa0a77d88160d3e3fa92e3491a071ac631a9d79f9f056a45f8756e3358ecd275fe SHA512 a6c2eeef1b4b27efa5797a6a54e0154cdf02b2afbd1da6944ccdbe3b600285b07e349bdbef21b27b15a8e6fad67efb51a5faf35229fd8895740a1b80c8aabba5
-EBUILD rspec-expectations-3.10.1.ebuild 1315 BLAKE2B 2dcb0785709b13d2da0dc23384685a073887e42348a918e257293959b7258cfa0a77d88160d3e3fa92e3491a071ac631a9d79f9f056a45f8756e3358ecd275fe SHA512 a6c2eeef1b4b27efa5797a6a54e0154cdf02b2afbd1da6944ccdbe3b600285b07e349bdbef21b27b15a8e6fad67efb51a5faf35229fd8895740a1b80c8aabba5
-EBUILD rspec-expectations-3.8.4.ebuild 1310 BLAKE2B 60db27750dfb05ebf6e957efc689d30fa5f0d11c267bd93a3ccde00ff7a19d4d00c66ada0a97c99025de7d9278d3d7bc5ffdc0661f4f8e797979aefd77d2f00f SHA512 530953416c0da07e996697ad6761e5eed0b5f2c243e2439b1fc5bae97cb61cad79c3edd75ee959d63168e66c555fe8bba95b24bcb186c9b421e38c961de994fc
-EBUILD rspec-expectations-3.8.6.ebuild 1314 BLAKE2B 8323d2265e2713fd683e50640f755f16bdfadddbbe91da15f0606d70bfdc68ab02b70198cf11a7dbb10959e0ffc81971a4833746787eda05496f531465f913c7 SHA512 08439866220487e6ebeaf4a6972aabe5e741795ab72bec1fc690c3ebf7706caedb1fc754fa85dd8c6992ae53adb28563aeb4845980a110670e4f09fc393eae60
-EBUILD rspec-expectations-3.9.1.ebuild 1321 BLAKE2B e65dec8543cd9a8ce5764f6ca3377959893088aef5ecc45dbe04e1893d41ef2af1205ae9fb1a89b279907727c6fa2c3358f8b2d267b41cf3e92512ea123cdf24 SHA512 78744bbff53064ae7601e99e9c70a670ded059e5be306002e444c6cc9240e9a0a287d507d8c629099ec3edf2224785b4da371a99add2aab34f8026cacad3b544
-EBUILD rspec-expectations-3.9.4.ebuild 1314 BLAKE2B 98058887522e4633b0be3bebdadf629b08e349340835008bdfefa2357412dba009e3553258efe853a5495dc544be4ad0bdeb9333ce3defb5f36be89d065a1d0f SHA512 cbdb3f1020b253b3a52df6312d9f0b53521b0ffe3b858cb6f03a29b7c842e99d2d83a95f713a6146146f410be332577ccf8a00a36d4711c9be01681cefe3fda6
+EBUILD rspec-expectations-2.99.2.ebuild 1623 BLAKE2B 01a190b296cc4dccb178114c105ad33bb266278cf87b63354a4450a03c667e085bcfaca61aee8fcb8926406f45d33cd429b02a750623e885e315c39d772fa831 SHA512 9d4fba250dab08c2405370a0dfd5b56abb37a6bfa48406d19c127a651cd360483206e496664b6566de5baeee733d9a1047926d9078c5f2a32b3dacbb57dd45c2
+EBUILD rspec-expectations-3.10.0.ebuild 1304 BLAKE2B ad2aabe0ea5dc817aa69e8de604a4cc3ec8d0f796d44769ee652bf468f9dad38902a2da949f09970e8c393e211c247c1a6a8132ab4e5ec318af2fb572cd8eff7 SHA512 ca0c3b67e5418123b152a46e33cafdb6e79ff76c14c4f7bf802fd172e3468c5b1cf8c291effdec7d11e324897016fa8a09008da135bc67f5acae85946b5f146e
+EBUILD rspec-expectations-3.10.1.ebuild 1304 BLAKE2B ad2aabe0ea5dc817aa69e8de604a4cc3ec8d0f796d44769ee652bf468f9dad38902a2da949f09970e8c393e211c247c1a6a8132ab4e5ec318af2fb572cd8eff7 SHA512 ca0c3b67e5418123b152a46e33cafdb6e79ff76c14c4f7bf802fd172e3468c5b1cf8c291effdec7d11e324897016fa8a09008da135bc67f5acae85946b5f146e
+EBUILD rspec-expectations-3.8.4.ebuild 1299 BLAKE2B 2d152af47e6fbccc9211ed3c1669e68e73f70c79306af5258967686b29706c6c748b441fee855880463015abb18ffaa771c7f535614dc3dd8789e0db22eec785 SHA512 c11432c627555f53566662313080dccd7e8ddc3f3ab316b3a815e93c215eb39c5c2ac0b6ff73bd01683b6e1b6a44e4070df8f59db5ab767eae848c710835dbd7
+EBUILD rspec-expectations-3.8.6.ebuild 1303 BLAKE2B 2c40484e29ab7a72beff3861fa6ab65716d4699de5dad11d3502ab85a1aec89161804baf427a711a1a650c4e789236811cc032d253b6478d304b7b331c2a82f1 SHA512 921ec7cb34858a17d79d8bf5ff9dc34c5fea372e9f8dd3d2ef4be6136c57d9a26f2b36ad8c338bb640ad82ba8f06553715499c4bbd8fd9d1c61fa083ab8de66b
+EBUILD rspec-expectations-3.9.1.ebuild 1310 BLAKE2B 28f1cad1c59e68d28ff5ee321c2e40f6e43464d24fd44822dc6d1d495edc12913b3f34a4e411304c38a3ae49a07e688f833d6acea17ba00f2ec82ddbcc1577cd SHA512 ed9d66416e749783f908890d56e6c503446883a6b573c864892395b8b9966fb5ecba5c2c8b9fbc6f2b15c386c077c2b97f04989f9c2a8254f8def36a3067da88
+EBUILD rspec-expectations-3.9.4.ebuild 1303 BLAKE2B f540a213e8c94c12fd4a663858c977869f4b8e4f87c7531d0230da49d655d5b3a2395071bc6c35089929c067dcad1304bf58a887ae63a58062655a35f5df3afa SHA512 415310cf665b405393e02ae31628cee9184c259d4f7b5cafad653232a5c962074e1ca51c61f6e9fea817dbaeddc1ddd8af82e1a9a4df6306fc4b40db1144e496
 MISC metadata.xml 350 BLAKE2B bd2aeaa98f6f5cdbdce70c0dd6eed61eee36323502021664e10356e0e558eb9fbf09f9b056944aaf13859c0f4f29603c5523584e4b823a9218fefb2824edcff6 SHA512 c0cbdb181bc5981daa6dea5ecb445cedbda6d6430218aad98a39b2db67074169305f3cba419fb1e24d79900be311619337a5421b75e0da6d2838a0ccb7de45b1
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
index 1147bb6d1d93..de9d0481b977 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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_rdepend ">=dev-ruby/diff-lcs-1.1.3"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.10.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.10.0.ebuild
index 51856b64738b..84439fd818ed 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.10.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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-expectations/rspec-expectations-3.10.1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
index 51856b64738b..84439fd818ed 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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-expectations/rspec-expectations-3.8.4.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild
index 30946ccf64d5..5ac4ce629b00 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~x86-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-expectations/rspec-expectations-3.8.6.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.8.6.ebuild
index 5ccca9620ada..37d5b78b6648 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.8.6.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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-expectations/rspec-expectations-3.9.1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.9.1.ebuild
index 2df69af6404d..8e7b7dbf84dc 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.9.1.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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-expectations/rspec-expectations-3.9.4.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.9.4.ebuild
index eff2dd3e6147..b1c99b29bae3 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.9.4.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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 16e1b1c3ace3..cf17fd6b0c81 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -1,11 +1,13 @@
 DIST rspec-mocks-2.99.2-git.tgz 101731 BLAKE2B 27ae180381d427b642c53c351e7b53602caba4252ddf5393949d940be8474110eb0697901afaaa878cd8d368f081c6644c0fcbce86d9d14b9f93f48c027ae808 SHA512 dd3b9394d56de8d3089db7777cda1e1a5bbdc46486876a99a8a83b602b84ba0320913d8e8dabe5e0367645eb01b943607b93e67d87cc26e380c8db6e048e4e0d
 DIST rspec-mocks-3.10.0-git.tgz 193499 BLAKE2B 9bddac80a299e2fc8f549bf4beb2bd3fa5dea21486df7dda9112b008334014284330965881207fedf4b6bea09c25f36b8b2e15ac7bbc6cb244f3504942673d0c SHA512 a2bf76a59b74b89891e4032519fe83ae49a662d3508ecbd9919e6a76d13f0a736063e7215bfda21a3aa58cd88e69fd5eea2a4cbf998a06ee0c192c3d5650995a
+DIST rspec-mocks-3.10.1-git.tgz 194945 BLAKE2B 7e61c88bde222d7bbe7e4d10b42ad9505469184bb16bb6c693ac2f5fd153ab8293046ca60813e5b604f011e1acc140b3883afce631ea442f90579fd8652fa79f SHA512 48eeb2f3a2dac666683016b2e3698a4c793a485b8f264ed2ffbb6f948d6f804ab1cebc66cec1e76c5b538517be50b6f424d92e53c1a0c86905307f1cdf114abf
 DIST rspec-mocks-3.8.1-git.tgz 191543 BLAKE2B dae8b22a011a3563eb65d1709006169bf5dcf310749cb858f4ff20c7b82e7675a616fc427136fe5e0edeef1db0b42a1d0af1c5623eed35807e84dc355131c8cc SHA512 ec71c4b815beef315f8db329bd2b0e60cdbb1fa37939c624799c1589d94dd28f74b3d1a4c0b9025bc98a809f80d625315458351fe7dec8291bad20e79beecca8
 DIST rspec-mocks-3.8.2-git.tgz 191807 BLAKE2B 9ec44fcaad9fe1e9d75cfb84253e52411b7083070de5dbb19bcdf7c518eb2439e6493e979daf814df7b31bab8bbe72821d42eb797ab88d95e051a700b63d93b5 SHA512 42b9b952386ce862a1cc19116991ae6b4633d551db057babe2e4aa6553acb6eafbb05b98df8a5c6cb362a00025ac3ce0f43f3c4e4ea63343c8bf0dad769a3aed
 DIST rspec-mocks-3.9.1-git.tgz 192772 BLAKE2B abcc8fc82648993e6a407a8c4ac4f5b146b821e1e842c1dd2b95824d8468aac0ea796438d77e376c897675f66bd2bc9024da8fa5ccaf60139ea296b388d542cd SHA512 f804783fca4cf2258e83f82515cd5881ceae0bdd3aedb452a1db901e01de5dbca1d2bdef0ac0828a4bd23a1de58d127a42150c8c204219bca39ea7072619098f
-EBUILD rspec-mocks-2.99.2.ebuild 1520 BLAKE2B e2902866af600f2995525d2be28d5355c76ae6f682744da3cc5410b9abd8fd6997d3a6a88b14d10a68e0e63e0ed1c2c0bb27ef9c7dce52f2fcc61a90ba31f4cb SHA512 2e81ecb72c1ceae2cc1e310aee13c6ad2ced5b67cb9f19561f25043ea01537c35bc1bf7339e7495b1831b25bc48ad27a70cc7aacef357d3952a274610e76e411
-EBUILD rspec-mocks-3.10.0.ebuild 1446 BLAKE2B 0c318546b4a544dca6974cd063b25e0261d1772fa1adadd6b5979d4717197c3196dfff7afa2eb0e18931e92ad298faee3a9839731ec1da3d64a974be51c60f0c SHA512 bcc0d29d58bce35834811ae92c15ebdd55f156287aac152ecb15a7e5aeac900768af58645b4e2e61b62abab40a8bf1bc8a130c86a03a6dc8f512f813adf5fbc7
-EBUILD rspec-mocks-3.8.1.ebuild 1334 BLAKE2B ddee627e90d8e049e476796989787d416830de35f44c1118c7494a327dd50f686abc47489408bc215f493ac88e6fea87887a9c86ff5c76e0fae462721f221e8d SHA512 e927ac12abcc5cbcbdd6829e6301509d7ef74f0e6e661fdd425fe4bc7a245bda861317f71bcee24106a72cb5106507723f1899b05793ab4a2cf5e47865325652
-EBUILD rspec-mocks-3.8.2.ebuild 1377 BLAKE2B cd7d102c1bc6c615d06c7a41d4ba81a46fb28ae03f8ec7501b8e5c3d5e31cd66b3c151c12def7c0e942d16e62d6bf2ca4035b828482620134f000280dbfc6511 SHA512 60aafb15f57a0d64689eb411cd2588eebaf163e760fdcfd3e73c51216ec6de58a534059d566f00b1ab609453f16cf8babee4ad1a0ee5abf45131a6e0efb31f1f
-EBUILD rspec-mocks-3.9.1.ebuild 1453 BLAKE2B ac64aea4d0322a83eb2377cf7f55083bd4a7b32939ab726f70531fcd54970124120bdc22b2865171e50231888941304c4ffe65345d6d2af16553ddc99aca3042 SHA512 a2bbfe9e5579214b4e635c035add5c29e4102314cde48c7ef9b86df59257dbb22636d918c7d4bae259a2070a2a1666a5d5ba5459d260c4a32762ee7f269e7376
+EBUILD rspec-mocks-2.99.2.ebuild 1509 BLAKE2B e3ccde747f2f4332247f8bb49e0d0acbea5372e1bbc06dba73d51080269d8935c1b9f2f6a74810e9f2ae6277ca67f8b21c149b22f917455136a98e4d904f21ca SHA512 acfc0df5921458ae89d8168902180273f1bf060196ffeb6d4e345ea2e85d3b2b4d865cbd646b4bfaed6898dd52668e2c6ad699a129f99d84852ea3ff76b20a0c
+EBUILD rspec-mocks-3.10.0.ebuild 1435 BLAKE2B 6cff4a15f91e0f6b0e52f15a2b55afba66a4b85672e517bb3fa30ff4c282c7204be194b8bb73a879b0fb70088c11659ac60344d3826fcfd54b94bc20ac302595 SHA512 09b34aed37d5bbd8080a51d69e6f6101e529d28cf1ee4079e768779ff31a25bdaf102f6c5db0bba65f6484eb8d4a04f6a4082d791cd8c509f7f557183cc865d2
+EBUILD rspec-mocks-3.10.1.ebuild 1435 BLAKE2B 6cff4a15f91e0f6b0e52f15a2b55afba66a4b85672e517bb3fa30ff4c282c7204be194b8bb73a879b0fb70088c11659ac60344d3826fcfd54b94bc20ac302595 SHA512 09b34aed37d5bbd8080a51d69e6f6101e529d28cf1ee4079e768779ff31a25bdaf102f6c5db0bba65f6484eb8d4a04f6a4082d791cd8c509f7f557183cc865d2
+EBUILD rspec-mocks-3.8.1.ebuild 1323 BLAKE2B 3c0e52c22d6ebcb1cec7568c4e1acdf5511a027bafcc6108e92f83984ac84e8092344244be5348a0d0382ef73bad67288b00cf4ece92cc2bd3ee44be0ea5a8dd SHA512 b4972655e538067025c8cf6e2bc2066802585e8d6d7e1d2f0f8843ea6ef3c4dc19f1a600e75eda51fb872f32c6d119605e4518cae098df66873194c58ac65b88
+EBUILD rspec-mocks-3.8.2.ebuild 1366 BLAKE2B 0cdc605e786cb06766d8669b464c426b216aeda9b68bbc5a7c998c6169206ba0a07bffba618f690e251e54ea0bf2f5cf844d321f21b7f7f598143a22c5bcf733 SHA512 21422cb8a959b03728f4d609e8c82324806a530f1d53baaea9f0bd23936142930e92535c2e30714e43201f9efb286a87a17a2570f8996352808ba12aa9dad5b1
+EBUILD rspec-mocks-3.9.1.ebuild 1442 BLAKE2B 3fc39f6bb2a8e8c28b0d237545a7f57480bfb8dfb0bc67bf5b6a70fc65814a98ef2d2ccfdc2608b1b0d7e620dd364cebf633c2a2ed1ec202164c7e5a03907e24 SHA512 905181091e236106392dbd8f467f1b29ca76cda02685341a511fdf8e4ec1d19d7268e8a2d4e7aa9d861e6dd88be84414044518729bec64179ad861186b7d61c5
 MISC metadata.xml 343 BLAKE2B 87ebb52b322f698e5242c517ca646e64b3a9a33c6b76d968847b2224b4dd683a9eaae5d03470efe775d350c65e3bfbe16547d4b4b99e2744379fbb7c76cc5680 SHA512 c7956e0175d9fdbfd423140f3c757d4c9e1deb6089577f60d11111a93fde6a7c056dcbac8620c30c8c02693297402aa2f0710e43f60abc0878a51bcb8c624667
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
index bc833e5fb181..c426fb6338be 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 "
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.10.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.10.0.ebuild
index 222b056a4786..adff253329a5 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.10.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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/rspec-mocks-3.10.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.10.1.ebuild
new file mode 100644
index 000000000000..adff253329a5
--- /dev/null
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.10.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+#RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-mocks"
+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"
+IUSE=""
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
+	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-core-3.3.0:3
+		>=dev-ruby/rspec-expectations-2.99.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm Gemfile || die
+
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	rm .rspec || die
+
+	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
+
+	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild
index 049d06363fe8..983af7e1811a 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,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 ~x86-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/rspec-mocks-3.8.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.8.2.ebuild
index 7d89e8e63bd7..fe35820547d5 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.8.2.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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/rspec-mocks-3.9.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.9.1.ebuild
index c7d10ede541e..b79df0369d4a 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.9.1.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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-retry/Manifest b/dev-ruby/rspec-retry/Manifest
index e2183b0e36c1..ac06684666d5 100644
--- a/dev-ruby/rspec-retry/Manifest
+++ b/dev-ruby/rspec-retry/Manifest
@@ -1,3 +1,3 @@
 DIST rspec-retry-0.6.2.gem 14336 BLAKE2B f619f075c13f054dd73f893a37d2da644e4a77b2cdecef886b8fb2b8616b5c89b9aebb8506b94319e0873fd798c0361a8defeae9e651c1a17b9d2f7b26364134 SHA512 a14874f6589c78a00baf9d50d2415bd5533559457de313a5b56be77f4e226d8885f7e976bd6926b8be669f44ec672a6b16dbcf4dff26c26ca8eac64a25fd1b5b
-EBUILD rspec-retry-0.6.2.ebuild 660 BLAKE2B 64e58faa2589c3f5df3887ce4891994c6c24ec4e44a566f3a6e8f6d665f9d46f97e1c40d8133a7edce342d978c96f6d5a973ec6cb0fe8f0711447e750a48c6a1 SHA512 8965e3c818d1841ba182c80da7a05f16acd87a0c62f1895e3b04a44177c62091cc82b3ea64408dc40db2d36bd9da8513ed573bb9afdc843245da155f2fd12a1a
+EBUILD rspec-retry-0.6.2.ebuild 649 BLAKE2B d2136de9a0b1144dd61575e2b44d33b56d63ea8187878cb50a05031554a1814a3e2381a63bbb73bdf6474864cbb2fbbcd259cc15a146a779fac7fdec0744fdb9 SHA512 ed25e2a63e6b6adc296a49aea3787929eb101eb81cef4f080b4aa46f55e02ea62ff3f1460d67c9d995f50984c47572bdc9e7d0f92696648f0a2a03e37e691580
 MISC metadata.xml 346 BLAKE2B 630a1e9e6398ff312f8536ec7e6d92b2a3bd8022c1ddca424474b43266440352ef63ea6d114c3eb21428e82ea5179810cbcf12b3c29b6f2603d038ec40ffb86e SHA512 a1d92ed8bb1d5619f8005859d7ed204016faf918885b98b56963ab9cc1e0607fa451227d25a5dc9efc88bc0de26039ca5ec4e0d3931c8fc32edbfe553912c23b
diff --git a/dev-ruby/rspec-retry/rspec-retry-0.6.2.ebuild b/dev-ruby/rspec-retry/rspec-retry-0.6.2.ebuild
index e3a4ee31a774..208de818d0a7 100644
--- a/dev-ruby/rspec-retry/rspec-retry-0.6.2.ebuild
+++ b/dev-ruby/rspec-retry/rspec-retry-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ IUSE=""
 SLOT="0"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 ruby_add_rdepend ">=dev-ruby/rspec-core-3.3:3"
 
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index c51bd0142f02..763589a99118 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -6,12 +6,12 @@ DIST rspec-support-3.9.0-git.tgz 69705 BLAKE2B 96d5cea9c63e6ec2acdbbfc4b7253acc2
 DIST rspec-support-3.9.1-git.tgz 70196 BLAKE2B 1edf8e64f6121cb5ed9f543c6ee1aac54f53dfa33e25caf278803a3284414e6d0aba69d1d137e0b80b482e798148ec865feb6e3ab0e9e5d86d13c9aa3754fe75 SHA512 d8267117c9e785766860d781d1e6190714f0d3bb378bf19def213d0807cdfa706f90ef54ff24e8e71ea1e14c6bfa175879250525d3baa7282d997bdc2aa13a0d
 DIST rspec-support-3.9.2-git.tgz 70021 BLAKE2B 410464836d322545a05277cda5cd5cca8b9d2dcb4bf4299850e089d7a169d05aa630395a7c6fc42dffa29d7c6739bcfbf734fa8b0bb69d15b03243534c8da67f SHA512 436a3400a354012b06f471a339386667ed4854814b780f9c21d71182b001b3b4ab45ade578b56e4f2dec81325de5d88baa783f7e56b27bb215cfdc58448b10f1
 DIST rspec-support-3.9.4-git.tgz 72490 BLAKE2B 03c3ba8316a2c6a79faf68db87adf193b684b82119dd9c5b67f2954f3ce72cf03e3e16898e2f5d57d76aef37bb8fb08ab8dacf8aaef6d1445a8257e2be14afe5 SHA512 95be2e03c37117d6bc132ce466779a8ac3c4fedadfb2a6dabb1fa11601aae908e341c87436dd526bbc8b02040b23200c95bd113d0475405afdb4acd099c67403
-EBUILD rspec-support-3.10.0.ebuild 1769 BLAKE2B ffca214fdb61fbcff4327c0398e4e2d5727a7511da3ed27c1b7d13a3fcab3a313132a3f2915db50bf93c995db07f14aa7b368843ff02f6d2f61901c75ac4cd80 SHA512 745d2b0afa47608becbcac57eeb20b4a660ab225d50fb531b45223e6e62d681a9a2c144b3b756e91b7a956f088b5a998fc94fa143c511c52ef4d1df8a043bfb7
-EBUILD rspec-support-3.10.1.ebuild 1769 BLAKE2B ffca214fdb61fbcff4327c0398e4e2d5727a7511da3ed27c1b7d13a3fcab3a313132a3f2915db50bf93c995db07f14aa7b368843ff02f6d2f61901c75ac4cd80 SHA512 745d2b0afa47608becbcac57eeb20b4a660ab225d50fb531b45223e6e62d681a9a2c144b3b756e91b7a956f088b5a998fc94fa143c511c52ef4d1df8a043bfb7
-EBUILD rspec-support-3.8.2.ebuild 1573 BLAKE2B 364a558e61d24d6c6e6be8e6a0f586daa5cecd703bbce6b7f9f6ac5bfb2b80b7adc20946c7a1cc59e755c9d22cc9c3c1f6969c4dc63388baff8d5bbb70e5222e SHA512 e1c0222078c3ab732222d23d45e8fc75938aac079f3bbb0e02c6ccc49ea04eb344ac88121fb51fc752294a17e2e326a9a0166a4d248936cc090fac6678b6cdbc
-EBUILD rspec-support-3.8.3.ebuild 1551 BLAKE2B 350867421421533e97e5b7ae3547d698fb71744ec5112a9e7a45532812a16a7c6bb46d8c03f20916249b98d64af607e652a0427d1f0e9fec3fd7521b82b7eb7c SHA512 03c3eb8c6832db34b293529003127d27ce722bcdaa8bc9e9cf49d40d2c28ad358d10c06443750bd0d8774dcd6992a1584061356ddf7c41dd342e0e58aa85924b
-EBUILD rspec-support-3.9.0.ebuild 1551 BLAKE2B 350867421421533e97e5b7ae3547d698fb71744ec5112a9e7a45532812a16a7c6bb46d8c03f20916249b98d64af607e652a0427d1f0e9fec3fd7521b82b7eb7c SHA512 03c3eb8c6832db34b293529003127d27ce722bcdaa8bc9e9cf49d40d2c28ad358d10c06443750bd0d8774dcd6992a1584061356ddf7c41dd342e0e58aa85924b
-EBUILD rspec-support-3.9.1.ebuild 1551 BLAKE2B 350867421421533e97e5b7ae3547d698fb71744ec5112a9e7a45532812a16a7c6bb46d8c03f20916249b98d64af607e652a0427d1f0e9fec3fd7521b82b7eb7c SHA512 03c3eb8c6832db34b293529003127d27ce722bcdaa8bc9e9cf49d40d2c28ad358d10c06443750bd0d8774dcd6992a1584061356ddf7c41dd342e0e58aa85924b
-EBUILD rspec-support-3.9.2.ebuild 1712 BLAKE2B 27a447f54c51b617727aeda7164e96d3a506796c62795a19e767b2e5bdb9c137a6dd0c4036a6dcf7b39a221f6266ba782b7b6f19a64a9821c0ac1fc0b1cf9a89 SHA512 7d1cff7a840de7c500b55adf44e40a44e5b7b76d47360f8312fe76b3278ad1bcb26df8e7ed297fef86be33dd6224d03a2072f94d82d566515e56c3f6527ebdaa
-EBUILD rspec-support-3.9.4.ebuild 1769 BLAKE2B ffca214fdb61fbcff4327c0398e4e2d5727a7511da3ed27c1b7d13a3fcab3a313132a3f2915db50bf93c995db07f14aa7b368843ff02f6d2f61901c75ac4cd80 SHA512 745d2b0afa47608becbcac57eeb20b4a660ab225d50fb531b45223e6e62d681a9a2c144b3b756e91b7a956f088b5a998fc94fa143c511c52ef4d1df8a043bfb7
+EBUILD rspec-support-3.10.0.ebuild 1758 BLAKE2B 315cac626244c7ea99ade12401af0f8f808fea0262c671b1c36ef83e7c130b6bf82531cf09dbb46080b47faf3caeaf35ac24a77f8e36bb94c43cd56ed849f878 SHA512 9cbb32f50462e79f5cb6903683a732214ef2d337a88004143cb016042a5bba5332482c1586077407d29ea07d40f0ba9d4ab102f023ef631c12c5c55d6bf909bb
+EBUILD rspec-support-3.10.1.ebuild 1758 BLAKE2B 315cac626244c7ea99ade12401af0f8f808fea0262c671b1c36ef83e7c130b6bf82531cf09dbb46080b47faf3caeaf35ac24a77f8e36bb94c43cd56ed849f878 SHA512 9cbb32f50462e79f5cb6903683a732214ef2d337a88004143cb016042a5bba5332482c1586077407d29ea07d40f0ba9d4ab102f023ef631c12c5c55d6bf909bb
+EBUILD rspec-support-3.8.2.ebuild 1562 BLAKE2B f937ddd8e24d2c6207b1c4e96871d64d3c638c609364eb39f652f5036661f860d7c5038998ca6c6d9bea292d93c917aac4af099ab3519ac0d437580ab9a1fe77 SHA512 c53557a26f755767ce56ce3c041370845a282a3440b82e242e06c444ad971b3f7d6b21a4f3e7335f05e7fd44242e7289e4600a10c0c51d495b81f4fc4f48a468
+EBUILD rspec-support-3.8.3.ebuild 1540 BLAKE2B ee0b161150293923d5c1b068cfc6a27d46e99544902b2c8e582f4a7a63b85a94ec146e821a2706ec857e1b853f847ca2abf2e48a7f9b882ad5d428dc2cf97bc2 SHA512 cc2e2141826574d15a10b30604432d99de74ab5f639bf126b7690c35f14e378c1db7297bb055842f970b363980f7a111436dd65db2ece4845ce18f739614bcce
+EBUILD rspec-support-3.9.0.ebuild 1540 BLAKE2B ee0b161150293923d5c1b068cfc6a27d46e99544902b2c8e582f4a7a63b85a94ec146e821a2706ec857e1b853f847ca2abf2e48a7f9b882ad5d428dc2cf97bc2 SHA512 cc2e2141826574d15a10b30604432d99de74ab5f639bf126b7690c35f14e378c1db7297bb055842f970b363980f7a111436dd65db2ece4845ce18f739614bcce
+EBUILD rspec-support-3.9.1.ebuild 1540 BLAKE2B ee0b161150293923d5c1b068cfc6a27d46e99544902b2c8e582f4a7a63b85a94ec146e821a2706ec857e1b853f847ca2abf2e48a7f9b882ad5d428dc2cf97bc2 SHA512 cc2e2141826574d15a10b30604432d99de74ab5f639bf126b7690c35f14e378c1db7297bb055842f970b363980f7a111436dd65db2ece4845ce18f739614bcce
+EBUILD rspec-support-3.9.2.ebuild 1701 BLAKE2B 3c3e4caf9d03642d48f3ad41db681caa7f035e81874ab0839991a7cafc089b8f5881d069b852bfb6e2121ec4d3474d9f728e643f3d414d94afa9e57881e4812a SHA512 1d82297a1fd689805322ecc9ab43876cd7dcae5018ede1b685b5710c6142625a7184e426e41b851604c811eb4c40e441b5ba5d67fda2bf90659804196fb72e05
+EBUILD rspec-support-3.9.4.ebuild 1758 BLAKE2B 315cac626244c7ea99ade12401af0f8f808fea0262c671b1c36ef83e7c130b6bf82531cf09dbb46080b47faf3caeaf35ac24a77f8e36bb94c43cd56ed849f878 SHA512 9cbb32f50462e79f5cb6903683a732214ef2d337a88004143cb016042a5bba5332482c1586077407d29ea07d40f0ba9d4ab102f023ef631c12c5c55d6bf909bb
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.10.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.10.0.ebuild
index ae05db178ec0..6b2a13cb99da 100644
--- a/dev-ruby/rspec-support/rspec-support-3.10.0.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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-support/rspec-support-3.10.1.ebuild b/dev-ruby/rspec-support/rspec-support-3.10.1.ebuild
index ae05db178ec0..6b2a13cb99da 100644
--- a/dev-ruby/rspec-support/rspec-support-3.10.1.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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-support/rspec-support-3.8.2.ebuild b/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild
index 2f7d780b966d..f23b0bb0f0b0 100644
--- a/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~x86-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.8.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rspec-support/rspec-support-3.8.3.ebuild b/dev-ruby/rspec-support/rspec-support-3.8.3.ebuild
index ea10d2ded460..e941c51e7378 100644
--- a/dev-ruby/rspec-support/rspec-support-3.8.3.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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.8.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rspec-support/rspec-support-3.9.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.9.0.ebuild
index ea10d2ded460..e941c51e7378 100644
--- a/dev-ruby/rspec-support/rspec-support-3.9.0.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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.8.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rspec-support/rspec-support-3.9.1.ebuild b/dev-ruby/rspec-support/rspec-support-3.9.1.ebuild
index ea10d2ded460..e941c51e7378 100644
--- a/dev-ruby/rspec-support/rspec-support-3.9.1.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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.8.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rspec-support/rspec-support-3.9.2.ebuild b/dev-ruby/rspec-support/rspec-support-3.9.2.ebuild
index 36a174b55d35..592e2b508da5 100644
--- a/dev-ruby/rspec-support/rspec-support-3.9.2.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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.8.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rspec-support/rspec-support-3.9.4.ebuild b/dev-ruby/rspec-support/rspec-support-3.9.4.ebuild
index ae05db178ec0..6b2a13cb99da 100644
--- a/dev-ruby/rspec-support/rspec-support-3.9.4.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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 889b2a57c3a4..694cdbeaedfc 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -2,7 +2,7 @@ DIST rspec-2.99.0.gem 5632 BLAKE2B eba837aeebcb0d65dc18a644fd935f241a67039988854
 DIST rspec-3.10.0.gem 10752 BLAKE2B e0af9c31a5263b0656341be7432e1597afa56af9bfc5e6d21f1daa7553e5bd3daf2b383a7e1a5b6f761a5880540020e7accd8d4eb6cca6e57d616dcc41690970 SHA512 dd1a3a1c7c73ae9c053e071d7851780d8cf61e92ddba24072b9f2c00a342ed08c81090332ba2eaf7ab96adac3fc723685996195e5cc584e15de57ff02a4455ec
 DIST rspec-3.8.0.gem 10752 BLAKE2B 14b1710fb64fb2ab46d59ac692ceb95dbe7f5e2f5c54e4f97170bd99c2b0d32e1977250f69160ab191367c8016663ecf5cd4e0c89941ff12c727ed52e6118551 SHA512 aa3ecee499240a26866797c00461c7e63915bb84a9a29afce75bd4e7864027588bafde05b108aa7b6d988c1a123265587db807567a8e0f3d03527b0f2d8329ba
 DIST rspec-3.9.0.gem 10752 BLAKE2B 212cebbae9e71b8a090757ec4b9902f20043eaf95b079a409247990e1fca4236e13d0e9a3bd9b9eacfbc2d2aaab19583452dbe08b298ca69a85e20f0163741c2 SHA512 a7dbb22f01d842a41b54c375d32d94c77a7b964d1ea5b1971e7c228dfd5dbfcfe03c007d687781addb93f819dde8de664dda307c266137fdd0a07dab96f96fad
-EBUILD rspec-2.99.0.ebuild 784 BLAKE2B 326cb0cf90e78752efa69efb401fcf1cb9fea5b87aad25514df2b2c0d751e6a6e821e2d78e7acb272cff3800a912f962b6a77e45a64a27940dae5db36fec4da7 SHA512 42bb63e3b7437eb8deaa934b16661fb0f517120c2d26980e9ad51180b04edb4ae5e77d8fb1e10270047af0dc36ffc50dffbee46100886d600a9a2deefd65e36a
+EBUILD rspec-2.99.0.ebuild 773 BLAKE2B 067f26e5ef22454ff96e5aadae27b4d9598a391de7b6227de5e975457358c0a6b964f6c522458c276591509944a2ae0c1eef92518cc4d34d2117669ada3563f6 SHA512 dd33f7beddab9f948e906c719ef30c893724a0b39abd7a9fe89c1679104ec18985e6fba0213a12b1f3b3e4023969ab0c9d19c8712fb74aaa1be0d7f57003e45d
 EBUILD rspec-3.10.0.ebuild 616 BLAKE2B 2467430dd31b904227caaacbc3c2dc9580c18f0439ff5768cc5b91b16024496b3525afdb2d13e3c66d056001ef339dbf23ad6ee3dd8f6d75080d6dfe8b13d22e SHA512 b833cf5160c6e8a74746c7db8d42c7350b011e8b0c66147979da3494c73df6f785bf28dc6616c7fce1b68945cf90be77d5380964d53a4dd30138e63325bc50aa
 EBUILD rspec-3.8.0.ebuild 650 BLAKE2B a3c4d42393d1c8f4f62bb17f49db1ac7fe98a0752d91c08cffb9ea9e83607aa9ee079878695eac1f44f21db2e4337d4885da4dcb74ae8012960d164a9b7696a7 SHA512 773c29d24dba5e15c6a714e10b2bf99940f1b1385b63752c1945f1c4e64373add6cd0dddcfde84228d531ede9bb15594b10d99837ecbf4e13ece70f8182d0f3a
 EBUILD rspec-3.9.0.ebuild 623 BLAKE2B d9cee551e060edb33a2d1d0c9f98aa821a893caa8430a96b9a78078dbae921472dbf6f018dfdecc06d91cd4c572465c1f24988882be53f549336727da6b6c972 SHA512 b9fba855fd3905fdde16601ac798b7b0663e4d46bd7947655820f4aa9b35b48b43cfb938b1146eeccb663cfd9386eb2dda06ba21e98791eb9e9c96f01d06f9c6
diff --git a/dev-ruby/rspec/rspec-2.99.0.ebuild b/dev-ruby/rspec/rspec-2.99.0.ebuild
index e807b190f4f5..c26736c20d34 100644
--- a/dev-ruby/rspec/rspec-2.99.0.ebuild
+++ b/dev-ruby/rspec/rspec-2.99.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ HOMEPAGE="http://rspec.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspectacular/Manifest b/dev-ruby/rspectacular/Manifest
index c53b185bdbc0..5090e60dd7af 100644
--- a/dev-ruby/rspectacular/Manifest
+++ b/dev-ruby/rspectacular/Manifest
@@ -1,4 +1,4 @@
 DIST rspectacular-0.70.8.gem 16896 BLAKE2B daf9b75be33ccf1b7d60a7aaa540b391578b7f841bb1999c52e566caf8000049d7b2180f372084be18bf4cf367f6c59dba422f187505e42ee6bd66e9431ed11c SHA512 6f048a7781bd672049c10687eede3e2218436ea396438e09814c9239cb07396df25f4b88ab78b98f91c66457c4aceaaf1a1b8aadbff748715a881cadff8dd2e1
-EBUILD rspectacular-0.70.8-r1.ebuild 632 BLAKE2B a9dee4b19d9ebc24bd2b6c3346130250209535930000df662a017c85087039530dc789304f7b68ad4724bdf0964c362245046b355185d6adc56c404747426d9b SHA512 4f98bb3941d8108735f81f53a11e74031f2b93aca310cd47db77991d9e8592a5cb7c87b0f649a83571199114a208367adfd5fdc2e9bf62b9f9dd91dbdee87248
-EBUILD rspectacular-0.70.8.ebuild 626 BLAKE2B 7b0f63dae46fe047f61f4ac07b767eb4ca8c09b340bb9c94d5ebad23ddd198ada5367e89a587df1303abfefb3c506c17a76e0198264699324ead3b00e8f1fda5 SHA512 52a6271893be934673418e6e1b64bfe742b7addf08ad3ad15f3a6fc6ba895d2eea3eafa4acdd1a1c7f5c40de4e7cbfe76ec82f60f4b5beecbc3127355edcf17b
+EBUILD rspectacular-0.70.8-r1.ebuild 621 BLAKE2B 91d9c0f815ed5b2e2b3831c6ffaf452ed945901945df21754fb5283bff60220ee68f54f2068562e98945d28143a97e2828a7cda22f48aa51f6ff548fb3eb77e1 SHA512 0c6676165f6fc19281a292fc2ba862c586313bef997b9cf782e268c89dd6854d6978c454513d1c9b85efe3fdde535d5754e59d7f18231d07ebcb14ca45673458
+EBUILD rspectacular-0.70.8.ebuild 615 BLAKE2B 2bfef25a844f1087a2447f140af439a825bd5cd80635cc626e7babc6d22edbe1062117e16a334e97701f871903f3ab5b34744ccd4aab3ecc163a8b75910206f9 SHA512 14e5979fb905d9144446a6edfe91e26b99ed0afd956baaf6edce190ef0a4d92e983e9a4f7f7737f4f017d61137328f89e14c6aebdce9f82d56f5607681da199b
 MISC metadata.xml 350 BLAKE2B 478dd5a6b615f4a0ca0217d2fd4daca21b8421cc34c61d4c4356788ed059edf68a0c9b747076060415d7e9a62e17008560f44da4d0909d3f68c50ea77f5629ab SHA512 78e3ba17336c86b92811af99283d12b0bc191a2f06d907d0c792aedc17d5a39d81d00acb4b884f074103cbca587c3961dace871fc82e4a9a3fc6a9190c48b75d
diff --git a/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild b/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
index 8d2c24a82dc3..7e58d39819f4 100644
--- a/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
+++ b/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/thekompanee/rspectacular"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rspec-3.1:3 dev-ruby/fuubar:2 dev-ruby/shoulda-matchers:3"
diff --git a/dev-ruby/rspectacular/rspectacular-0.70.8.ebuild b/dev-ruby/rspectacular/rspectacular-0.70.8.ebuild
index 7c8c2f6d0ba5..a7aa8bcaf9e9 100644
--- a/dev-ruby/rspectacular/rspectacular-0.70.8.ebuild
+++ b/dev-ruby/rspectacular/rspectacular-0.70.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/thekompanee/rspectacular"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rspec-3.1:3 dev-ruby/fuubar:2 dev-ruby/shoulda-matchers:3"
diff --git a/dev-ruby/rss/Manifest b/dev-ruby/rss/Manifest
index efb63719752c..bc0b60f2cb98 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 737 BLAKE2B e72da867abdd1b2c709c7e3ce813fe4cc7103f1e1f5f687baa421f907d426d3f8ec980f6418393067e697e73684b0accd908093c4c76d70946e0c35e477a3923 SHA512 66732e2761814ede59e8ee68bb4b199787634b6856a37d4d8312b93bd62232d74b352109b0e7dde17cc1cf565d38c927d3bfadf3c7264a65c1cd27915b3a8ffb
+EBUILD rss-0.2.9.ebuild 726 BLAKE2B 7c247c7f14677eed7010c77a7aaf328e8160ebc26a79649de8da26b4110c1ce800eb3f149c5500f85b983f9c83c2f3f3c44b25fbfbcd135bf939c86cd75b15c7 SHA512 c021f2828985eb3476af3e9289e971d60472734f8e68f72b945e4249c83075793f7e3d3bea31d19a53406acee07a4cce52d7cc02a7940f905e36133fff1c3a55
 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 76de49246db3..524b324b7c47 100644
--- a/dev-ruby/rss/rss-0.2.9.ebuild
+++ b/dev-ruby/rss/rss-0.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/ruby-filemagic/Manifest b/dev-ruby/ruby-filemagic/Manifest
index a91f320dac68..757ad51fd773 100644
--- a/dev-ruby/ruby-filemagic/Manifest
+++ b/dev-ruby/ruby-filemagic/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-filemagic-0.7.2.gem 19456 BLAKE2B 5008fb27a5b6bbd93522c72381b1c74788e544e6120f3c44f4a594b360ee783d4e92e73ef584a8e56c1776a5e5e824d6fa603df135b6e1779fa460c19c3bb4a7 SHA512 b68324dfb0cd2e55cd200696fabe87c0aa68a11922789ae40abc999db7d200810cffa2c414c07bc96e2fee54aab775f01752f951b3a3273289594201ca547494
-EBUILD ruby-filemagic-0.7.2.ebuild 1213 BLAKE2B 4179b1b7b551e2d032b20508658a3b02de908e428bf760de2525e1ab305d2e20e220c1fe40de2f2e55932604c8f95f91c8be7ba10bcb151a1586058b59a4777e SHA512 d789ea6cd2b586b9f69907c1d07e9b8ac1ae97d0a1897f483fc7f3d0ceab2e957223e2d41726ee82e606f37565f9d092631c20142e8e37b22d835111f9d641dd
+EBUILD ruby-filemagic-0.7.2.ebuild 1202 BLAKE2B bc0672c9dae1c52eba22bc26a703a8b1e0e3502b6d2b7a1eaf1a372123e5c905541e72838d8f08c8a8727ed67ea3ca4c6bf6032092ffcb0d593a8b71bab841ff SHA512 2c9282f328ac077e1a89f7f4ba4ca97fae213e4514deab75338baa9789b46a0a92c55d669c9c0ddc0c8dce67a9e10442464403fc0c57722a15b2d0b55ebac019
 MISC metadata.xml 342 BLAKE2B c67bdb6db6b7c0bb8c22318ed4acf6549438b8858e8a86a79eb7e24cd341368667f75865f7005e45f99fcb7130893b9a7b644515c8a191d696cc34354d539cf8 SHA512 b8c757666516b70af299ab11ac170b1d8055f8a7f82e551768cbed0be44713ea858718992da9e3b58276ba01c8a3a73e0c19ff554546e092b98401da486264f9
diff --git a/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.2.ebuild b/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.2.ebuild
index 3423c96dd0e3..e2a30f471bfb 100644
--- a/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.2.ebuild
+++ b/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/blackwinter/ruby-filemagic"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="${DEPEND} sys-apps/file test? ( >=sys-apps/file-5.30 )"
diff --git a/dev-ruby/ruby-ldap/Manifest b/dev-ruby/ruby-ldap/Manifest
index 0e3b6cb38a87..caddf9b548a3 100644
--- a/dev-ruby/ruby-ldap/Manifest
+++ b/dev-ruby/ruby-ldap/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-ldap-0.9.20.gem 67072 BLAKE2B 626a35ab764dacfb37c727d867e1d435222730a3e7ea745ee4e7ec051ce3a822cc5a1230b463bc12f4a2390db667ed3b61deceb9842c014f64cdf43a26d285f9 SHA512 4f4902e7eaf4fe0cd421d58c73ce4e625d61ee20ef02363d3cf5754c66237e0f378ac433b234c2b86d5f5284ae03b7ae6c46d3575c512487bc1a931d021c9517
-EBUILD ruby-ldap-0.9.20.ebuild 1082 BLAKE2B 8d08067033c6b640f584e8161257b03d28273bb6164c1949af8c754fd9b88c86230f7d8441e032ea5390bc01cf0bb241d92f159c799d8f15e8ccf0aad04ec6c2 SHA512 7ce6e566a3f5fa4e993736b72bc81d7f5beea80520686446dfbef7a9938176ecef1eb3fc37141ec43d9818bf350a5c452fc5487cfbcaf8fd4d1d6eb20cf10a51
+EBUILD ruby-ldap-0.9.20.ebuild 1071 BLAKE2B a7406a767e3d06032ce2277607ddc056e35c6f3b21dc89584771782b78bdee5c1c532586d6e0be0ed3317aa349ed0cc7fcfa470987437f32797f904cfe45806c SHA512 fd81c272b7b6c6264e8c274875ef53ad18f104714bf079709b8cdf59a7bb10ed0dc6f20d67e2c8b439183c7d1acc401e8955f3be8d72020fc6d34869c34f1e26
 MISC metadata.xml 390 BLAKE2B c6e77e29563ead438259a5643f24d5f9d69a3049e0e3a427ee44561f08c72ab2bf8c427a735606ca7a160d0f623538d12ed3d0020e2e817935152f956f70793f SHA512 55f9b63787f86238cf1f6a465e2eea49496be45c0e80fd0175b73434b93f7ce495c46b081833b5f3d7ff3322c1de31c86ba524f3327630908e424b0346dc02b2
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild
index 565b8910eadd..6c6eb0f71947 100644
--- a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild
+++ b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ DESCRIPTION="A Ruby interface to some LDAP libraries"
 HOMEPAGE="https://github.com/bearded/ruby-ldap"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86 ~x86-macos"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86"
 IUSE="ssl"
 DEPEND=">=net-nds/openldap-2
 	dev-libs/cyrus-sasl
diff --git a/dev-ruby/ruby-oembed/Manifest b/dev-ruby/ruby-oembed/Manifest
index 4b1445da2a5f..5be258f82b62 100644
--- a/dev-ruby/ruby-oembed/Manifest
+++ b/dev-ruby/ruby-oembed/Manifest
@@ -1,7 +1,9 @@
 DIST ruby-oembed-0.13.1.gem 4509184 BLAKE2B 212cdb606a1155349c23c1c06f25fedbcc2436dc22a52c8f405b63e27457881617b41d79db15e92e5caac8094c7a9ea912f1b16d994448f5296d3c6117062f17 SHA512 d87f65f1d76d485488c81d4fa2b2df5580a03104a16e3af5e65e6987f4652b3f5652ebcb0a79eab882ef0e5cc9c7b35537032a849de7b848b609f13ca3b83dd8
 DIST ruby-oembed-0.14.0.gem 4510208 BLAKE2B c27df5f0cb48e64b754ecbf526dbb82efff66401ca28a9a45243c5e78397a114203a1a997545055fe2ef45c49bfcdc2005540af9b35b97b8f278e8a173211218 SHA512 101a9f8a35bfa5cd5fb7ecab1f8ee8b616286d6d880506c936ec20fb1749bc6c4ed7c61ebd9ea2247017567ca7e885dc9d83b38f3c55ed9e97a1b7cbe7e53d29
 DIST ruby-oembed-0.14.1.gem 4511232 BLAKE2B 7cb0bdd437c774dd87f4b4ca5234239a52b53cd1720eac6dc8cea75b792fdb55e4cb51c17e96498a4f62ce6b7cc078b7d92085b1ac59223bf8328209b6a071c4 SHA512 8cb9d74ece3879e8c1889df276f99173a35876f2e45b0786e698588ee3f4cc6a63195e0e42501fb3ccc9cee75dd3aeb4558a396a03cf9c4e215a2cf7baebaf2f
+DIST ruby-oembed-0.15.0.gem 4528640 BLAKE2B 3bfb6f6b7b23d82b89adad5b329072d050a5ff5dbf475f7443734c6a0cb70ad8c5a5d8cdc391e81a8a150d448454e3cfa8302a23c55a39cab8898c5d0fc53fa9 SHA512 9a97f292298ec0b030435ec4d63456b9eb6547de9cbe7b56cecc390cd8a5c374aca4aff2da4de3189cb0a75c6e1b0884c1fdf9c69d729d5a5436ed6e94d3fd2d
 EBUILD ruby-oembed-0.13.1.ebuild 795 BLAKE2B 35cf25fb62924a8f66d2296490e51499c7066e73d2b802b142712876822d91a9f4995c40828718429891a7bf25738690559081ec6dd03b1dc862589857228955 SHA512 d9f831c5f7030f153a9263d7cbdc75acc26f90b24a1b108b168a315e2c392536d506f20c7e3a1c3f526f656f236028fb88b755b479d5272fdc7f56f63e0e5847
 EBUILD ruby-oembed-0.14.0.ebuild 788 BLAKE2B 8f8cbd67da65b1e0dd1bf5a9f9c23a9880aab28d20ec1aa8336329b869a66d4460eecf960ccb983de08bb71c304eec93971228d37058c645c20c767246494aca SHA512 96c0f8e2d7e39e85e5287abf80807f20b3d6830fb076b2778c1d4e87bd712d060ef4b3a433ab44a2f57980df2a4f1a4e634d227c1622e1e756ec7f7c64d032b8
 EBUILD ruby-oembed-0.14.1.ebuild 788 BLAKE2B 8f8cbd67da65b1e0dd1bf5a9f9c23a9880aab28d20ec1aa8336329b869a66d4460eecf960ccb983de08bb71c304eec93971228d37058c645c20c767246494aca SHA512 96c0f8e2d7e39e85e5287abf80807f20b3d6830fb076b2778c1d4e87bd712d060ef4b3a433ab44a2f57980df2a4f1a4e634d227c1622e1e756ec7f7c64d032b8
+EBUILD ruby-oembed-0.15.0.ebuild 788 BLAKE2B 6e73f3581385bb0c31fd07840384c2f667244d407a8924fe42f3b2552caee1117c58da1397bdd0df719eb5a111ed38e4cf2eac4c1042937a4c22046ffacb6184 SHA512 dcea11996e1cd5003078b4ce8ca5b617edb4693b897167e8275fd5b93ab0c2e6bed9390e458800b926c60dd565eae395d6dcf0586072990f603a27c3411a6d0a
 MISC metadata.xml 345 BLAKE2B 575c6ff6aaa60be02f4afbaa5b6855e9e0a8e24992c7ae7db0f3f23856403c3f223a4e6c861550a96b967585bc0f7aaf937b2a98c6fad69fd6ab69466e98613c SHA512 e0c3ea7c1c5057b74e8b03b5d314050ee21f8a235dafb981888ebec4d8cf866d13723ac1dd6a96a685380f9b30e61c513e1f83328c778a524ecb52f9adee8e03
diff --git a/dev-ruby/ruby-oembed/ruby-oembed-0.15.0.ebuild b/dev-ruby/ruby-oembed/ruby-oembed-0.15.0.ebuild
new file mode 100644
index 000000000000..5372f0a42526
--- /dev/null
+++ b/dev-ruby/ruby-oembed/ruby-oembed-0.15.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An oEmbed consumer library written in Ruby."
+HOMEPAGE="https://github.com/judofyr/ruby-oembed"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test?
+	(
+		dev-ruby/json
+		dev-ruby/vcr:5
+		dev-ruby/xml-simple
+		dev-ruby/nokogiri
+		dev-ruby/webmock:3
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler but keep vcr version requirement
+	rm -f Gemfile || die
+	sed -i -e '1igem "vcr", "~> 5.0"' spec/spec_helper.rb || die
+
+	# Avoid development dependencies
+	sed -i -e '/coverall/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/ruby-openid/Manifest b/dev-ruby/ruby-openid/Manifest
index 48d1810141c4..23ae55a5ccde 100644
--- a/dev-ruby/ruby-openid/Manifest
+++ b/dev-ruby/ruby-openid/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-openid-2.9.2.tar.gz 514882 BLAKE2B 496b257087617537fc413931820fc721f026d9e7826d1684c85250d29d295ef031f834af31449e3448386f714c45a7db802d46531ca207fec099e2e2e80b9780 SHA512 5f4b696952d457ecbb99c6e2bc4b5c04557e8ed8d7653259eaf89a151ef43e62edc1936a28ac9e0d5a2c253379010d6c6a820be4bf2caa90bfcbf4689695d075
-EBUILD ruby-openid-2.9.2.ebuild 719 BLAKE2B 0ea76bc4aa7b2fe46c9c6eac01eb5641b9d9e05925a2029842404049ea2b0922f2c0dc211091ab000bd81b9f546620dda32241d5f776e81af45c70916389ce83 SHA512 1a57b0cacf6f83977c4ca81e0246c2538c9dc38f4e3bf6c32ca9e590fc3365abe171b4c7dcfbb919bd42a8102c11a1ed2f0cb5f033c048c7518d8a0c028406c7
+EBUILD ruby-openid-2.9.2.ebuild 708 BLAKE2B 0e9a75e3362d57885f066d833b74632cfa13cd8c1e37f209086ef48f8169a81f2ccbce1f81730d8d40cc81a54bae3ea60441341f3e52e2e0d5d8f46e213c0d10 SHA512 dede4e84bb40ed3db712281843e861d3ae3b2ac7c506979d95d165a254d9cb7ef4a361f3066cc288349198f2ced98e61488f5006fcf92b1aac5fc76a03a521f7
 MISC metadata.xml 344 BLAKE2B 37b1f5b85c7ce7bd3a4dc857b273bfdb420f051561c4908bd5ae894244a507c9931a38218ed0adf594cf3fc8e9015c27fcaa7454770fdc8ad46ba25ee399abf1 SHA512 e8d22b48aae2c08373d0dcd4320334c50ffecae7b2a2b04144e5ad3f52ded0cf44eb1921e30baf8576bfef533a8267b5e6606381d6c11d36b125b04d4a4a8a25
diff --git a/dev-ruby/ruby-openid/ruby-openid-2.9.2.ebuild b/dev-ruby/ruby-openid/ruby-openid-2.9.2.ebuild
index 947e273e4a45..4d4607ffb29b 100644
--- a/dev-ruby/ruby-openid/ruby-openid-2.9.2.ebuild
+++ b/dev-ruby/ruby-openid/ruby-openid-2.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/openid/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-macos"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="test"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/ruby-progressbar/Manifest b/dev-ruby/ruby-progressbar/Manifest
index 71855b2c10ac..cb894db620d2 100644
--- a/dev-ruby/ruby-progressbar/Manifest
+++ b/dev-ruby/ruby-progressbar/Manifest
@@ -1,4 +1,5 @@
 DIST ruby-progressbar-1.10.1.tar.gz 53416 BLAKE2B ee435291cd55558843ab05254c01a6148711aee54a5ce80d7b03902e32fd8735fda2e3686794f3f2c8a62c7ca26d90df4d63b48c8d947a471279c35131c49898 SHA512 6cbd791833a1638949c7283b5c475164b44ec8a5d4c7eb417d741da5c9cda9e777481a785f112be7fd1c3714668ad58cbf9aa39eecb61d1022fb3bb35ddb6203
-EBUILD ruby-progressbar-1.10.1-r1.ebuild 1035 BLAKE2B b688bd6cc079f202478218f2438231f5e88e53d6b77ab5f5865a7a55516fc1fef2283f4e41f71943843f5b651b8f08ffc0b3f541da9b85d3cc89cbef68f4cd3f SHA512 6e149fd0038dc6a33a5361822e56d8696d9dc45364652d1697358779ab0082e59c0ae37375869130b6f29ad234dd66fe1dd6931e1ce91d6279b0b8061930f59c
-EBUILD ruby-progressbar-1.10.1.ebuild 1029 BLAKE2B 24093411f6bdcf8e8cd93761d889682edcd462d898b558b656a4536f0420f3c89f14c67ce118f64511cd930fe378cca809a872a785274794eada2a07afe1cdb6 SHA512 82a8e0d8e9b0641a832d4b2a1f77d73e88178580729fc897b5c6cb69b140eacee5c862980575cf97cb1e8f647902e9870d0bb06ada04f7a84d1d077656cc1a74
+DIST ruby-progressbar-1.11.0.tar.gz 61341 BLAKE2B 558de9d15f6c3eafb0a9ef0b39db279727651c8f86234f3ffad1faac7e9ab7f6bdef6662fadb2132bf10d70bcac9412801a695e0bb3afa5879a48dd363920734 SHA512 5a5c8a6af410746ef601821ec171933d781d32bfb7cb5f67f9cf877824a399941c11be69bb74380941f2271f6f5139928599881441f88860a71f8b7f7b55d4b4
+EBUILD ruby-progressbar-1.10.1-r1.ebuild 1024 BLAKE2B 839f170ae5d2bb9c498349437333c77f68b284216cd3fc64b7dc766e7a45c5732ac8226b2e26a812441980d80a66054353bec101cc92e67f831f0875166ddfca SHA512 1ea55a8c70a65e7d8348ae5a9a0d3c83c4c21e46321f475cb3dd90059bac9b30bc31444c511cf7c8bee03b2af5de0f8aef9270817c323ba44e4507677c090249
+EBUILD ruby-progressbar-1.11.0.ebuild 907 BLAKE2B 15bf1f4811ba47369d85924dbfe477c4a3fe67e8973c91d11ed079df974b3030b75a9561b8b37371d1de0d541892e171e732aa3c5cfaf13cc5c556772c3fe9d3 SHA512 9248c8bbfa8f1aaae726d01eb1efa0811c370071064966acd5240da9ba4831ca3e78f14839e3ba7b6bac93784cb12e7fa05c2447da557f6ab85ebebbb80d5f66
 MISC metadata.xml 352 BLAKE2B a36b436c51b56ed96a170c6edaff16655ff0d3b42f2cc6b13e67c252f89e2d56c47ce0c69fd693acc9ddab9a755a5fbf5d72e360f2e6a16bc0117148eb7a25ef SHA512 a572b7825c4e778c503bfa3bb1b82d4d91c28285578c614a8a0c62bdf1967f307645c92f0101a4898baa0ebeac9a26455e459b2440db6989593c0cc4472df616
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild
index bf18d30bc5b7..beddeb9f6974 100644
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ RUBY_S="ruby-progressbar-releases-v${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="test"
 
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.11.0.ebuild
index 0910ef551afc..b81bafce2104 100644
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1.ebuild
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.11.0.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
 RUBY_FAKEGEM_BINWRAP=""
 
+RUBY_FAKEGEM_GEMSPEC="ruby-progressbar.gemspec"
+
 inherit ruby-fakegem
 
 DESCRIPTION="A Text Progress Bar Library for Ruby"
@@ -21,7 +22,7 @@ RUBY_S="ruby-progressbar-releases-v${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="test"
 
@@ -30,6 +31,4 @@ ruby_add_bdepend "test? ( dev-ruby/rspectacular dev-ruby/timecop )"
 all_ruby_prepare() {
 	sed -i -e '/warning_filter/ s:^:#:' \
 		spec/spec_helper.rb || die
-	# Avoid ruby24 syntax for an unneeded check
-	sed -i -e '/^return/ s:^:#:' spec/ruby-progressbar/refinements/enumerator_spec.rb || die
 }
diff --git a/dev-ruby/ruby-termios/Manifest b/dev-ruby/ruby-termios/Manifest
index 54d9f3ada1c7..497d61085ae5 100644
--- a/dev-ruby/ruby-termios/Manifest
+++ b/dev-ruby/ruby-termios/Manifest
@@ -1,5 +1,5 @@
 DIST ruby-termios-1.0.2.gem 17408 BLAKE2B f85877dc3c9beb5c8d20e044ef7dfde6a12d540157228c1fdff365f3b662f8c84b9e7460ede985f0d402ec76a1d248fa41d336ac7bd9333222543c6d01748c83 SHA512 e32e899e917eb04e382a02484accf9fea0369de8c1942b445e48e71e9c836305e2d54221c9a044d27ede44a7d5c14f976a8ffda79f79f71b5a121474e759f45d
 DIST ruby-termios-1.1.0.gem 17408 BLAKE2B df85f46693c17ca05736fecb2dcbddafc3831ae04cdb56e13782242e4161d04e6c095d04927eebe1959843d6f6da95f0433309018a7cee2bd42407560c2c99f9 SHA512 dc98e6d7e304fa76b4139dd88f8c6955e6f4e09ca48d5611813fac941564c93165945c24dc0d7f7f84d7cd959512d006d73f042b57fcb1dde2743ffbb3cc9b41
-EBUILD ruby-termios-1.0.2-r1.ebuild 725 BLAKE2B b85e1fcfc66ee3775b8c3785338142144a169da8c23e76f2cf9edee3c9a38d8484f4066096822f04285a73f3e0f73b639485b42f1360ba7ce753d9eb097d06f9 SHA512 19669765a46bbade129c976634d196869f9d40c71f0ff11d98103f147d78f7fdc761005c074360511e0633b576891d09651ce5cb483fcba48b11b3b094079851
-EBUILD ruby-termios-1.1.0.ebuild 689 BLAKE2B ac70a85bb99bea92e0b569ae199b61b1b419b9ea5b55852e34e65e306e9ad0431298b2c0e13fa825600e224b9f3757def2058303d92ee2ad207d5bd08c8bd8c8 SHA512 4abc5218c4b4effdcd77cec98f6d294be69125d54be3089f4d619d8d948b6083f90ea5dbd1ca5ffcfca50713b34f36c341377a65fa973de062600d108784bbf2
+EBUILD ruby-termios-1.0.2-r1.ebuild 714 BLAKE2B f78225c1cd37eb85b35c751147aab4c9558e3d5223ac4df17c7a114a76367cef4134143e723c38b564f9dbb444400a6f9af54b5f0461e9845c01b50685f58a6e SHA512 a78c625aabee9d4cf8e4fa757d72dcac3ea72fbf531c7046b12e3a5a6d4dbcfc9831656e3400394134c7053c5f550f81fc9b9af2597b1c2a0dfce8d533936f1d
+EBUILD ruby-termios-1.1.0.ebuild 678 BLAKE2B c9194bfd1ec717fbcc078fe0b92e858d3d887dbbc7d02d58de90db3ddd4ea0cb88d4fa5554ce116aae623ba4adbccb6de945bda47c8e983a61fe3cc3bb177cb7 SHA512 a2035f3e8e2632eb4636f6637e012a9e03c109fabfb374db02dd9a190fcc3fb611ef84804c7b17b57369db0090f97079a97a43c00aadc36142bb6cd36f619f34
 MISC metadata.xml 344 BLAKE2B bea737f016d7562c237c3cd1da976866362b52c33fed4f356becc724318f0d73129d6d67cb1202658495cd3ca337625f218cf3739dcdb19fab7fbf7df87df8bc SHA512 3c6d07c1fb48f63b2e3b11eaa84b24b6f57e1b7ad4146327950c294e0d49521a7dce7cb63c99bd0641c7b330d64b6c85d91ba6feb150282f35902fce8602806c
diff --git a/dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild b/dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild
index 6a6e1cc0f2e2..fb619d33b6c1 100644
--- a/dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild
+++ b/dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ DESCRIPTION="A Ruby interface to termios"
 HOMEPAGE="http://arika.org/ruby/termios"
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ~ppc x86 ~x86-macos"
+KEYWORDS="amd64 ~hppa ~mips ~ppc x86"
 IUSE=""
 
 each_ruby_configure() {
diff --git a/dev-ruby/ruby-termios/ruby-termios-1.1.0.ebuild b/dev-ruby/ruby-termios/ruby-termios-1.1.0.ebuild
index 9fe950499df7..42d7f2be2bb2 100644
--- a/dev-ruby/ruby-termios/ruby-termios-1.1.0.ebuild
+++ b/dev-ruby/ruby-termios/ruby-termios-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ DESCRIPTION="A Ruby interface to termios"
 HOMEPAGE="http://arika.org/ruby/termios"
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86 ~x86-macos"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
 IUSE=""
 
 each_ruby_configure() {
diff --git a/dev-ruby/ruby2ruby/Manifest b/dev-ruby/ruby2ruby/Manifest
index 63a452ef65ba..882e103b50b1 100644
--- a/dev-ruby/ruby2ruby/Manifest
+++ b/dev-ruby/ruby2ruby/Manifest
@@ -1,5 +1,5 @@
 DIST ruby2ruby-2.4.2.gem 26624 BLAKE2B c7ad5c63829bf03cc166d42f2ae67b47790b4652b1973367881a4c242866acffabf6783cc3296ca7ea91ff3e9967f703852be6c4bcb53dfaaff0f822b50747db SHA512 ae8a34a77d48a97d29bd0ea9e2653e6189666564e971b985e7a459a562f8f03fdff4ec8775a2184cef578249aebbc8a050b57613b63d3c09b7a84aec5f727a7c
 DIST ruby2ruby-2.4.4.gem 26624 BLAKE2B d330cd65513218a96c9e35fe2b69d859fa103ad6dd1b8e8a671bddb9732f99cd65540b404632e671ababbe5842ed2be34a29c2b1fb3bc4c43935f5a7a0735d9e SHA512 51728d702d2142e9a7599fe53c2b58906cd386be429fe97590f850df8cf461c046c67a99fc7b7e277551013b78e35d21609c8125fb568ef90270d146a685c04d
-EBUILD ruby2ruby-2.4.2.ebuild 916 BLAKE2B 25ed57a88a71f2baac41efaa9c301ceaa6817fdb165d9aacd354c387316de7b574c66546f2641d18ccfa27117cf98a7e56b656801fd1df120f17fa2e566c5d04 SHA512 9ae7dcb37892d2be2db9b67ee6cf186404cda87f73a153934f897a60261240465731ce5709792cc95f6150da979d79acd8cc55ebe89d97670c2c88c04cc022d7
-EBUILD ruby2ruby-2.4.4.ebuild 855 BLAKE2B 561b5961aa8287a154e16382155f964747344129f10db787c0835324a8f600d09d4f7e4a7df7db3ad153684126865c2720581b8455f037bd68e24f308632a2a2 SHA512 d3f6e3ea0b0fcf5cb82e874e7d9b45a35def69be4120c88c137e45146656b9a0168e8dab3c636efe5ee95bc35399cdf6c6fd7a143030aeaea6ca581d692ac52e
+EBUILD ruby2ruby-2.4.2.ebuild 905 BLAKE2B 6aa8c2bd67e98b8a4a79c6f69b6bf8f1c74ef2621f47cda31c866f2eec78000fdfabfa7cf0b6d3af4f0f0dc7626a21c2fb7604f09a7d5663b171f9d604266e8d SHA512 9dcbe595914611ef49a3c314c7e588022993875ed9683da4c81ae8c8939b9ee7624b044efba232c3a7e8a76afc01b06cf527a3042796c4bc15f989cde0f0593e
+EBUILD ruby2ruby-2.4.4.ebuild 844 BLAKE2B 0a1bad818c3d0e9c81d1646cc9f3aa93b1ad3093c00a88849ede63f72a580faecc999cbb87048244c63d9de627ca6c493f51ec9631f6502d120c602d2f02c5eb SHA512 4b8ff0973d0999ecc2b4df3fe4e15747cd68f1800c1752a666ea27d691eaf1d03f168870c3dd2f250bc7168f7c035ed1bc2d1d76cebf8e410086496ff2718f11
 MISC metadata.xml 345 BLAKE2B ad97abb4ce420cd1a798b019724f408bf5e8f04116ea72d8de35cb220b028d1e31d9b1380b625dd478e110edbc5100d38fa7ca10ee336d131338f2ba148ed284 SHA512 160d20c5eca00fc8d0cf3145e26d1a89ac158d5d7b826cf1161255c2b895986e7629215d330277d2e3bd8b08c106c4e8725f8d1d8aa3566cdc9e66a3e8cf37c1
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.4.2.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.4.2.ebuild
index 12ed83331102..a3ed54e91309 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.4.2.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
index d44f10f3af2e..ad7aa9bec7e2 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index 6b5c11281fb8..6455e610ca36 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -1,7 +1,7 @@
 DIST ruby_parser-3.13.1.gem 445952 BLAKE2B 7df7bbfe3f7f700747d32bd5c66d94fdd7c57974e622969958dda39f4dc8656a4211378ba51c4b8e8eefafebf82e550ab73a775530eab06ff6419a3dee7f8f7b SHA512 90c8b68245168c7df4ec8d0e6c62d9723d759945823768645614fe085f375c6811a15c35334c485cb59f32f6adb1aa0a06e7df043b09a48ef4e6102d93562b1b
 DIST ruby_parser-3.14.2.gem 466432 BLAKE2B 2694888b5b705733468eaf074f7f059814e2a230d1ec7390ef6b093c717534bfc6648a00240fd07d0f108ee1dcdc9f81b121a0ff0446d4ebf75fa5bf87006fa0 SHA512 65b8977fff322d4ecdbb8da1276d76318f08a13a25d8cf8429ba5ca7097c2b58c03431d60b05eec6cb62be316cf9b1efc753b86e8b67e076fd413d2324bc6655
 DIST ruby_parser-3.15.0.gem 527360 BLAKE2B c27b98052c0850df8decf123a471fbe541190b611b6abc803bd868749ab2c020d15935264d607ee617b8e75df44871b2985bd11bf17062051a172df935fedcd9 SHA512 f4d64a7f86d94a324b47f9354b8962a5b96d62ac41b6fedae602b0c3782bf2871ec3d0131770d886c5f58de188a7ed71fa3c31c548f53b75ff04474962b442ee
-EBUILD ruby_parser-3.13.1.ebuild 1142 BLAKE2B 7593208e1916f588e8dc783246c05391c7fccdb36181bc13fda1348b1980922f089faa0203bb9ee65e3e3ec2cc5d47e51ac4ae079920ef35e4206464a5a00b7d SHA512 fd37038c96ef95c895732b5bac1818a7bb3a40d48b5b05a91f21f7070696756bf377ae0c8bc44efa33a42031bd0b2e8f3b5492e08bfa603c8227793ab0451093
-EBUILD ruby_parser-3.14.2.ebuild 1078 BLAKE2B a2ea6ade7ee69b462a2ecc2a5752abfe7fedc470e726c80f5cd961b14c157e31efea0fca6ce5d273a0f0edd6dec603bb8c84c0bd812aa16c333900bda46a7b4a SHA512 8b9676cc4ac711878ba5a4bef2124816342f33092bcad431aeb72c449d8a7c704f90a62a5efe4f5d9b93b5b037cef88c3a2945efc87344451a3b69f7c9d4f443
-EBUILD ruby_parser-3.15.0.ebuild 1073 BLAKE2B e14966a3c65135e7ce2ed79fdf979057fff99c98e407a4d012be22e2991dd0cb03d7c74acc57cd1d9162642fe8c91a4db6b08981e16031cb69f177f6946b4a62 SHA512 a3eb8ade3971a29369474cd79ae23d8716140440c14cf5d19618d5062e9c51cab1ae420755323290d1483e3bda1ae6787c81998cb3bf6ee1712b74d18118971a
+EBUILD ruby_parser-3.13.1.ebuild 1131 BLAKE2B 7cad57830383143309aaf2bce365574250b0d30f20b6910b75809f6574c2737b31eae55a48c76c4d3d61466bbce84a9f65a8418389e47213d4950f81bbc27fb2 SHA512 2d091d9513a4c4fe56a533503adb25722c3278fa8df3cd8d403e0a25b872ec5e7c5ed78384ee6c4d1bc91199e24d7607888a4b794db49773a4bc9c7a193fe5b0
+EBUILD ruby_parser-3.14.2.ebuild 1067 BLAKE2B 75ab55434aef8bf6d53b49948b9050b7cd43f9b1b2f6ec816f28937d17fcdc40742e153b020b03120847f5d6359f251fd9f51ece19ff1f8c6ee7fa75826aeb6e SHA512 f8a847213cc83752ed30bfddccb4d709ce9444591d787901921279a198b4b5c57afbde22527027cb51ac2a13a5c5b50d1731ede3991672b791476aed8636a281
+EBUILD ruby_parser-3.15.0.ebuild 1062 BLAKE2B 3257dc721852aa236a7150fe9e89d7bc00cfad1fc0f5085c79fb47bf6e014440f831505b58786187014b40398d12bb4aa8a63ddb643213986e8a9c75093e95e2 SHA512 98b0f594469af0fa26676ec2db600cbeabc8f7192ea0521351dc22bf27e753558740fe4781e303afc40a96941d641a5bfe17a09e6a2ed2482a9016ee27d16149
 MISC metadata.xml 347 BLAKE2B 58585950079ff918b98a50b41060c516e4640d3d9e382bdd659ad6b17c1f0e138782cc7e94085cfae35faca53445beef7ce645113a49a47d42e912246ce8dd6b SHA512 ff141bbed5bdb7f610f87c5f8040889784f9a3a1f7a2f5802d0ee52a2a3d660d7ef2e8e3cc37af9c8b549433447f1d523b4864a6175efab755a3009c99c59632
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.13.1.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.13.1.ebuild
index 64df93ee4422..124977ed9bef 100644
--- a/dev-ruby/ruby_parser/ruby_parser-3.13.1.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby_parser"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
index f6345ab20e2d..e1478efd9d0c 100644
--- a/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby_parser"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4"
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.15.0.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.15.0.ebuild
index 6bee651f029d..c4f4e0bedb22 100644
--- a/dev-ruby/ruby_parser/ruby_parser-3.15.0.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby_parser"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4"
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index bee218e3b4cb..2aaebbb35c86 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -14,13 +14,15 @@ DIST rubygems-3.1.4.tgz 997835 BLAKE2B 21b8060f28e2228b7400533fa1d9fa1ae8bcaff3e
 DIST rubygems-3.1.5.tgz 995812 BLAKE2B 43471515e4da8a6fe47a419f67f26efc9855334d44338eff9008cc0bc62e1477498f3e04044fa41d5f45ec0f132ca55dccb420f031b9e4945f3299c8618e2b94 SHA512 0eb2c4d18dc9304142d7d06badfd6bc1a72ba67c3b8a70f608dd127d0f7b016bc004af8dae67897685d43ddf87e468668bc89cec00b969da2f2dd67bee61a261
 DIST rubygems-3.2.0.tgz 982282 BLAKE2B 2895cee1d2bc4e59073cc1e3e96a7958d079da5d7a7d2eed392e6bd2fac457a738518f30365d5601511998997f578b3ce9ed65c5e41cdc80138d0ebb07df3548 SHA512 a3d0b9a577a88d8fa27d3bbdfd4bb78e419549c579dc1add4f80e4abd017cc64c441eb7ad260705cbae672937c07fdc0c76f8751bd942fea5a97953f01052f28
 DIST rubygems-3.2.3.tgz 984126 BLAKE2B 3a1447738333cc27be3bbc30080b2e39be7557d9dbd9949fea21b0e6ca7c4ef3f062b5a2cd4c8004150f9dc548fe3c8e2cb174854c2d4ed7115f377662673398 SHA512 2910739e3bf3fbfdb98e71bfe97d5761ff6a6910e72004af4c3c3c050df80160c704318c62501b7283086ca3c2342cc9c8bb2ed406d5c582cb0f9d989c841c32
-EBUILD rubygems-2.7.10.ebuild 4523 BLAKE2B a93a70350e32efe702f346e26416eb7043700e5f2ba437889463f1a2af0218c2eb3fdf2687fd10b834f9413ce2e8b9588eb94042ee33d18b577c680d410796ed SHA512 2ebbe7993a7492c54e85eda668bf9349270ec4fa57a7ec8e90597a8e2a3ea955ad925e21b01352c386e29f95e77df015fac9258a16b9d7823b7629bf2e4410ed
-EBUILD rubygems-2.7.11.ebuild 4532 BLAKE2B 0eb44d4e5c10c6942096ecd224fc49dead8b525f2c7c3eaa83c498e89609063fb70135dea822b4e4d6995f9a53ba736b41f68a7c5980c2a4bf6720b311a05313 SHA512 44792bf7cace9cefda52aba5381164d9fdeb8b750dd30629d3f679b124188b8da7ace3f151d3c8b0aa38fc75919a73c9b2d18579ddd5ade7a15ebef6128292c2
-EBUILD rubygems-3.0.3.ebuild 4657 BLAKE2B d9e420f4f03dc09d68fefebbfd535624e11a8c123f95fea95fbf5466ad6738977582eed9fd581ad3a5541ac74c9bfe2479a247d57410b8fb273f67fa92e9a218 SHA512 9f533aa3433562bc45acdffc01aff82dd017a76be8c2fe32e377f2dcb65276cf97212eeedc3f99d6c16a6fc15471adaad7c6e599524505b7a6e0f7df0f6203ff
-EBUILD rubygems-3.0.8.ebuild 2654 BLAKE2B b60639ca7ebc7f1f2523c59c6431be637599376e3a52798316dfb539f8f2bf53a7077d92e48d82bbb2190c73dc2d24f6113c9aa418e9e9768c00ba108c090c8f SHA512 e44d8b97cfc1d75ebd77f2628649aad2f333e8237ed428b6956e0c6194bd8e8a5549f1767dab1e9193c526f6688c22f25fe00e427a77d325192ce52b7a822244
-EBUILD rubygems-3.0.9.ebuild 2654 BLAKE2B b60639ca7ebc7f1f2523c59c6431be637599376e3a52798316dfb539f8f2bf53a7077d92e48d82bbb2190c73dc2d24f6113c9aa418e9e9768c00ba108c090c8f SHA512 e44d8b97cfc1d75ebd77f2628649aad2f333e8237ed428b6956e0c6194bd8e8a5549f1767dab1e9193c526f6688c22f25fe00e427a77d325192ce52b7a822244
-EBUILD rubygems-3.1.4.ebuild 2858 BLAKE2B 13ff4a3b1e75550a6592acef079f20b8ab8a4e764a5b94240b45efe602066b5ce6fddcd491047f3630bbea7bf4274e7c4b1aeb181c0c92d5a7fa18b9cb76a804 SHA512 d128c1ad94f51d509afc98a1ce74d65106c4bf0eeeb7209f684c8a584123d24cf07de52022c54debba9bb456057b448c628216f049313bb448460bdf9f9fc31a
-EBUILD rubygems-3.1.5.ebuild 2858 BLAKE2B 13ff4a3b1e75550a6592acef079f20b8ab8a4e764a5b94240b45efe602066b5ce6fddcd491047f3630bbea7bf4274e7c4b1aeb181c0c92d5a7fa18b9cb76a804 SHA512 d128c1ad94f51d509afc98a1ce74d65106c4bf0eeeb7209f684c8a584123d24cf07de52022c54debba9bb456057b448c628216f049313bb448460bdf9f9fc31a
-EBUILD rubygems-3.2.0.ebuild 2873 BLAKE2B 3b406923e67e760e76c23fe66d1849707203e61240af7e2043f8e0b4edbd6e8a777f13c196f3f343994af4cf87368d8e49fd0a43cfb00530c535dcfcb7038917 SHA512 15acb161fee9423e2dcb4a109d9125aa461e157ab2aed4225d16b1116b9f8e5fac21c022e08567e7a69dc36f49a422cbb852fbf2070736ab5489414b42dc2b5d
-EBUILD rubygems-3.2.3.ebuild 3002 BLAKE2B c720767d83fce6345737d2c37c5b2cc0f099f6294c9a3303f06f619d86654b9be1e4da41ebefe3f3aad92f7770cf5b6ee37abb8c0f7f7c70127b201f144b39a2 SHA512 4950c011624e66d2fca9828768595c622beb8973b1aae8d4b302d926df6191d095e942c5e55e0b213618352cdd36e6d621c3c591053f9687ec22140cd8d9f13a
+DIST rubygems-3.2.4.tgz 982062 BLAKE2B d74479b4798ccaf03a8940a6f76dc8f5fa28226ce29062b48e725ea47033a4f0a8d5e36df96aec97cff0b0a4eef8beb8ff14e6ac4df4596f170111e89c26841d SHA512 18f4cc79eb3ed5a48b760a6b7a1b4283d8ff7c929f712152eab6a7a389dcc9a969ec77891ee518c033546cef6584865beef4f8f33ea06172eea3ce4e172c1531
+EBUILD rubygems-2.7.10.ebuild 4512 BLAKE2B bce66fda261d27daa57b853de1b1605003c6557de15e3471ae9d426f16990da292e19cd48f0dc29bc09c2652adf521b93fa6a059dd1a6967fac692bde4d084d2 SHA512 9cf064646d60eee8037ffde0a059af6d408cfec13cde5715f8f172012e3f9c402a46139781f7e99c18a80d1fc9f81fd7519b3f7c19bbade22adf7c277b11b949
+EBUILD rubygems-2.7.11.ebuild 4521 BLAKE2B 8b28842aed8ac1c6387fe52b2639b5afc42c70c9f2222d9567068f173140ffcc51534899e0e0d0ac132e6a1e395126838e0a7b82a17c8ff5c09829a2fc02a017 SHA512 e9dc2072951259dfe568eead50b32aa6bd28515e66926a18568f85d330b05d2d900399ac3a506254fbca9f4dea49064a5d517e4e4de9e7c60929477ffb953d42
+EBUILD rubygems-3.0.3.ebuild 4646 BLAKE2B 42f400a5286dea3ff7aa5f3739f7d259ba56bb147d8fdcc5644ec583d0ea98fc7337bc3e9def844a293d09a8bb9745184822b09f7d7c6dc71ec0689e3bf44166 SHA512 4d86e443da752f2422437e9426cbdd32cf32db2ddc7bc36a20f382c4756c9251c96e79e581b93ba2764bece593c95a0c79b7a1063c2c202aec4afd58f0840752
+EBUILD rubygems-3.0.8.ebuild 2643 BLAKE2B 4ba7b0541dd7032553cbd858c6095bd495bcc5db6a3c345caa850105aa8e0542313ea364998c540287596ff9f8d1bbd393de1831eb8a4e16cccf527116fe4522 SHA512 a0e4ec4805705249a211ec3164845090ac35a21b9a4b7b1b3643905c0f03870ad72ab0db9bd0beb7506388a887e6d41100b45c38b2a17d65f0006b54f588529a
+EBUILD rubygems-3.0.9.ebuild 2643 BLAKE2B 4ba7b0541dd7032553cbd858c6095bd495bcc5db6a3c345caa850105aa8e0542313ea364998c540287596ff9f8d1bbd393de1831eb8a4e16cccf527116fe4522 SHA512 a0e4ec4805705249a211ec3164845090ac35a21b9a4b7b1b3643905c0f03870ad72ab0db9bd0beb7506388a887e6d41100b45c38b2a17d65f0006b54f588529a
+EBUILD rubygems-3.1.4.ebuild 2847 BLAKE2B 661f1e1035c989668cb24642cab1cc444af53595b77ace9e9977a502316deb71b5f5d61521b4480390d8fed1066ca3d0ccd920b21c98251020d50645235ee1b0 SHA512 30aeb16df265eb4e627600071b5057d1e831fa2af1a005db6da2c741385bc6646f4eeea809c0c879f068b7d48b61642f3e4abd50812cf170dbc787fa5c1da328
+EBUILD rubygems-3.1.5.ebuild 2847 BLAKE2B 661f1e1035c989668cb24642cab1cc444af53595b77ace9e9977a502316deb71b5f5d61521b4480390d8fed1066ca3d0ccd920b21c98251020d50645235ee1b0 SHA512 30aeb16df265eb4e627600071b5057d1e831fa2af1a005db6da2c741385bc6646f4eeea809c0c879f068b7d48b61642f3e4abd50812cf170dbc787fa5c1da328
+EBUILD rubygems-3.2.0.ebuild 2862 BLAKE2B 596b1e5deeabbc17e332a4bae8fbfaab3aa8b9b305ed7b35f832deb1ffcff7d75730f3f62de7d7f8fe71eb4e1e8e24e934263d6dea15337456589769193805d3 SHA512 134ed46a51cd42e8b1ffd9a24ec82ce3770696294242a772e034bf5cbc0085a346aeaf619582f802caac893a5e1a76cb7eb82776d09c82eab022323a4ce690de
+EBUILD rubygems-3.2.3.ebuild 2991 BLAKE2B edeeff882bab641104a4084de04be99c8452de8f003268501cacc9db5a414d2ccef08265d9dc6a3d6600dd0a4a7d71da2b8fd26e41ccaeafe1b135e8b70c2298 SHA512 bbfddc97de271cb9fb950d8fb28cda6ff183f91a2cde3af220781bb22b2aa5ab5111314aa96970f9f7d995451f54da4a6b0f892036ca28e38b30bc9665d73982
+EBUILD rubygems-3.2.4.ebuild 2992 BLAKE2B 798fa78b7d11faa943e9ee03c6d1c832355e06774e3ff94f3e99c902719b865b0d19f74fe021b93de032dc72fe6e9667c2b83c64af70555b9ea1723f00011e2e SHA512 b70c68ecdb8a12bf49631b97fc5decc31a57b8de1fb1685f0dd9892ffdadc769cf4bad93b67678af106e5b2132ba18421d955c9302576c4b58e2324770e298b9
 MISC metadata.xml 335 BLAKE2B c86eaf3d37fad025b8f6ca0b03e65b1b472716b4fda4ca4d08b415b29a63405d8e7b2684d309091c90411c5fe809e5129c6e0c0c4e7a982b4aa062ffdd0ca7fb SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e
diff --git a/dev-ruby/rubygems/rubygems-2.7.10.ebuild b/dev-ruby/rubygems/rubygems-2.7.10.ebuild
index 1f2029347947..8b1737eed5b0 100644
--- a/dev-ruby/rubygems/rubygems-2.7.10.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.7.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~x86-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"
 SLOT="0"
 IUSE="server test"
 RESTRICT="!test? ( test )"
diff --git a/dev-ruby/rubygems/rubygems-2.7.11.ebuild b/dev-ruby/rubygems/rubygems-2.7.11.ebuild
index 76142cd3b513..55bc2fbdab09 100644
--- a/dev-ruby/rubygems/rubygems-2.7.11.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.7.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~x86-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"
 SLOT="0"
 IUSE="server test"
 RESTRICT="!test? ( test )"
diff --git a/dev-ruby/rubygems/rubygems-3.0.3.ebuild b/dev-ruby/rubygems/rubygems-3.0.3.ebuild
index e113d2a359a0..ab3a8fd1f2eb 100644
--- a/dev-ruby/rubygems/rubygems-3.0.3.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~x86-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"
 SLOT="0"
 IUSE="server test"
 RESTRICT="!test? ( test )"
diff --git a/dev-ruby/rubygems/rubygems-3.0.8.ebuild b/dev-ruby/rubygems/rubygems-3.0.8.ebuild
index 239ef3fa3eff..2fe717cbbd54 100644
--- a/dev-ruby/rubygems/rubygems-3.0.8.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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"
 SLOT="0"
 IUSE="server test"
 RESTRICT="!test? ( test )"
diff --git a/dev-ruby/rubygems/rubygems-3.0.9.ebuild b/dev-ruby/rubygems/rubygems-3.0.9.ebuild
index 239ef3fa3eff..2fe717cbbd54 100644
--- a/dev-ruby/rubygems/rubygems-3.0.9.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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"
 SLOT="0"
 IUSE="server test"
 RESTRICT="!test? ( test )"
diff --git a/dev-ruby/rubygems/rubygems-3.1.4.ebuild b/dev-ruby/rubygems/rubygems-3.1.4.ebuild
index 83d91f198951..9601cea1f6a7 100644
--- a/dev-ruby/rubygems/rubygems-3.1.4.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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"
 SLOT="0"
 IUSE="server test"
 RESTRICT="!test? ( test )"
diff --git a/dev-ruby/rubygems/rubygems-3.1.5.ebuild b/dev-ruby/rubygems/rubygems-3.1.5.ebuild
index 83d91f198951..9601cea1f6a7 100644
--- a/dev-ruby/rubygems/rubygems-3.1.5.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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"
 SLOT="0"
 IUSE="server test"
 RESTRICT="!test? ( test )"
diff --git a/dev-ruby/rubygems/rubygems-3.2.0.ebuild b/dev-ruby/rubygems/rubygems-3.2.0.ebuild
index 000adfc00ba2..e8fa4ebb9a12 100644
--- a/dev-ruby/rubygems/rubygems-3.2.0.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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"
 SLOT="0"
 IUSE="server test"
 RESTRICT="!test? ( test )"
diff --git a/dev-ruby/rubygems/rubygems-3.2.3.ebuild b/dev-ruby/rubygems/rubygems-3.2.3.ebuild
index 46bac42fc63e..eaed40975717 100644
--- a/dev-ruby/rubygems/rubygems-3.2.3.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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"
 SLOT="0"
 IUSE="server test"
 RESTRICT="!test? ( test )"
diff --git a/dev-ruby/rubygems/rubygems-3.2.4.ebuild b/dev-ruby/rubygems/rubygems-3.2.4.ebuild
new file mode 100644
index 000000000000..7b3fb4d23fdc
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.2.4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+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"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		dev-ruby/minitest:5
+		dev-ruby/rake
+		dev-ruby/rdoc
+		dev-ruby/webrick
+	)"
+
+all_ruby_prepare() {
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults-4.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	# Avoid test that won't work as json is also installed as plain ruby code
+	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/askip "gentoo"' test/rubygems/test_require.rb || die
+
+	# Avoid test that requires additional utility scripts
+	rm -f test/test_changelog_generator.rb || die
+
+	# Update manifest after changing files to avoid a test failure
+	if use test; then
+		rake update_manifest || die
+	fi
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+	dodoc CHANGELOG.md README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(25|26|...)"
+	ewarn
+}
diff --git a/dev-ruby/safe_yaml/Manifest b/dev-ruby/safe_yaml/Manifest
index 28d21bd6baa3..3cbfa0c6823c 100644
--- a/dev-ruby/safe_yaml/Manifest
+++ b/dev-ruby/safe_yaml/Manifest
@@ -1,4 +1,4 @@
 DIST safe_yaml-1.0.5.gem 30720 BLAKE2B affbf5331cf290c3e7932f53da9b0f488730ae9138f0b28eb1e8e0323c7056635ed73bcadebd52f725895030a153dab13e243d997e84004f5bfac82e82dcebe2 SHA512 d9c8d9c28c3c8708f97cb0545f58152af81056f5e79147424dd7bf625f8e533440d1ed41d6abe2faf84578754823a1215ba28772c2e8593bfcfc397d647187b9
-EBUILD safe_yaml-1.0.5-r1.ebuild 925 BLAKE2B e384a15ddff6a52a5c773671ecd610ba187b377283e0e53c29fcd7d02602086b12537f6fc1f10bb7106d2caccadac06655d4e1fcabf54f637a756ebe7f328e21 SHA512 7e8369c983c97dd72c570051863894e3c267d25b694e39dab6d94b2bebc363f7e6010d4e9435be36b8020abcbf51464cebdb5e2fc775d1bdeb5e3e302237e1b6
-EBUILD safe_yaml-1.0.5.ebuild 973 BLAKE2B 303c3dc8274372f9b07a6e429a226f483d73ccd2cc98b7d0620b5e0d35a88306f20291f816a44dfba9c2e197fa6513c6f300b89a982bcc7d25d4e0e1cb1a32e7 SHA512 292d98bb674678c7db89dad16eb1dadd776717cf8949bab8ce060ed9342f72fe06590a37ae7afd5e556833d6926bc2c41a1ca3f750185fd01596db91e573c2a5
+EBUILD safe_yaml-1.0.5-r1.ebuild 914 BLAKE2B 4cb1f223d6efba3876da098db8806085392bcb0c6cab1aba9f71908fdbf2069da3c3d3507c37f2e6b8d0f77175eb4abb287a1409aac7798e18d3ac3b4d780b58 SHA512 43d3f7e2931fcd36b285b1829f687eda1c31a7273db3204caf5cb801e073445f10dd5be0d2fe75bdb200d81d8074666936eec5ad246b75ca6645075940078309
+EBUILD safe_yaml-1.0.5.ebuild 962 BLAKE2B 2c567ca3e55e46f8a378f25948a7f7282451193545310835ef4c648851528d622a1cbf8f3f1ce9958575a35799fdf09f4b69cb0bd12ef060ae09e2c61f0adbc4 SHA512 d5d5405de7ddb5e1d7b76040e207ab7865d5ddbbf629023a549d7c5839322a17d194376ed91bd4386a71ebabc80d9dbd03a9a8ceb9a69f744a2f05dbb286b991
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild b/dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild
index ea0cd393ddd8..46e1bd32dd31 100644
--- a/dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild
+++ b/dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://dtao.github.com/safe_yaml"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/hashie
diff --git a/dev-ruby/safe_yaml/safe_yaml-1.0.5.ebuild b/dev-ruby/safe_yaml/safe_yaml-1.0.5.ebuild
index cb26c6118e1b..b94009c285c2 100644
--- a/dev-ruby/safe_yaml/safe_yaml-1.0.5.ebuild
+++ b/dev-ruby/safe_yaml/safe_yaml-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ HOMEPAGE="https://dtao.github.com/safe_yaml"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/hashie
diff --git a/dev-ruby/sanitize/Manifest b/dev-ruby/sanitize/Manifest
index 3db7f7b47c01..ce38f2d761d3 100644
--- a/dev-ruby/sanitize/Manifest
+++ b/dev-ruby/sanitize/Manifest
@@ -1,3 +1,5 @@
 DIST sanitize-5.2.1.tar.gz 1352785 BLAKE2B 2742085ac296869b8be36cf803f999475032c147d94aa0fba77fb83b8305470baf144f4c68fc5711871779f327c9bf1ba8b3b817f3777a04fb0b9c726318ee1d SHA512 3384d01db244f9f7feeb67bf2fae5773a85f512411bd761db6a71ab3fb690fac33c0caae848e5a4df6f202be7dd7cc52f8bac4c82bef447d20dbc70a586ed82f
-EBUILD sanitize-5.2.1.ebuild 848 BLAKE2B 53f02a0a0f4296d62d207179da23ba4df51cf54a82fb30e5efaa8b1759642b348ddce384c6e78bda2652501266ae014fa86ffcaa88e38848fece974e5f3e267c SHA512 4cafdc8038e57bb0bc1b1f1954a7ec17a7a241a26e06c262eea8c04854ce80bef07d47ddb574733514f0d94c85e841e34033a3b350cf7368e1f2e1df16502cf3
+DIST sanitize-5.2.2.tar.gz 1352903 BLAKE2B 8ebe57b6de733556015e38ddca0a2ed69e4bb8a22d5f3e812f7e346f4822df15e0554b4a74d195fd812c45397ecc03543ce7024e9052b4d0045d56fc3c02f64d SHA512 9a2e7d265799fdb7e02256bd9050ede7ae73c6088064bc79fec6c94f3d35871ff427c2b59f0e3ed122e091ae36b996413080f7fdcefe85f740c1825a70abedcf
+EBUILD sanitize-5.2.1.ebuild 837 BLAKE2B 8fca5c6e6760f10ba5e5d5bb54d15657123b9ac946a214bb560bdca089bd1ed48650df2285dbd7b4f7270a416ecfd69dd81d9cbdb1cc2d0015623657cefa5346 SHA512 61c6cc7f500c39b528fffd9cf5ad011d34a21bf08ab2a3401823d22045c8f828aa5d66483f9b187b6eb49b12829b0ac0363fe1ca0364e974d22d501eaad69f28
+EBUILD sanitize-5.2.2.ebuild 837 BLAKE2B 8fca5c6e6760f10ba5e5d5bb54d15657123b9ac946a214bb560bdca089bd1ed48650df2285dbd7b4f7270a416ecfd69dd81d9cbdb1cc2d0015623657cefa5346 SHA512 61c6cc7f500c39b528fffd9cf5ad011d34a21bf08ab2a3401823d22045c8f828aa5d66483f9b187b6eb49b12829b0ac0363fe1ca0364e974d22d501eaad69f28
 MISC metadata.xml 341 BLAKE2B 8081029c35d5a56ed5a3399ecb63510e737a664e97a4eb363108b85fe75860cb8b171e8da497d669cb0491199bdbe94408570cb811a8c86d6d38541a0f65cbe4 SHA512 870423593eeb0219f2fa0b6bbb55a4a19063f5cf3d19d9c0bb352aec5632b3e5f5e717e7c6004413497a981091042d54bc092e2c029a511aa0c37e95d435996a
diff --git a/dev-ruby/sanitize/sanitize-5.2.1.ebuild b/dev-ruby/sanitize/sanitize-5.2.1.ebuild
index 37517b331d8d..71a7a8914abf 100644
--- a/dev-ruby/sanitize/sanitize-5.2.1.ebuild
+++ b/dev-ruby/sanitize/sanitize-5.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rgrove/sanitize/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/sanitize/sanitize-5.2.2.ebuild b/dev-ruby/sanitize/sanitize-5.2.2.ebuild
new file mode 100644
index 000000000000..71a7a8914abf
--- /dev/null
+++ b/dev-ruby/sanitize/sanitize-5.2.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Sanitize is a whitelist-based HTML sanitizer"
+HOMEPAGE="https://github.com/rgrove/sanitize"
+SRC_URI="https://github.com/rgrove/sanitize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/crass-1.0.2 =dev-ruby/crass-1.0*
+	>=dev-ruby/nokogiri-1.8.0
+	dev-ruby/nokogumbo:2"
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_sanitize.rb || die
+}
diff --git a/dev-ruby/session/Manifest b/dev-ruby/session/Manifest
index 6eb37280b8d5..e644c94bb1ed 100644
--- a/dev-ruby/session/Manifest
+++ b/dev-ruby/session/Manifest
@@ -1,3 +1,3 @@
 DIST session-3.2.0.gem 18432 BLAKE2B b50ff6f52dd0226cdfbe07ea434ac35fc19d695ab474d2c240ce3a6ab707da1d03db5006d68594de6a75ff356154a1ba5ab06fe17a766d3e4154fd11d3abe4b9 SHA512 57c0676fb4a4254e86dbe68e36309c8eb85515dd659de73a87e1ae2e8e5dc7f979192ef665135e75182c26e2a5c847d61daf855639772da7c66af888ed0dc91a
-EBUILD session-3.2.0.ebuild 1176 BLAKE2B e3b3f3dd40be82353ad563f38cc63bde4295fca59fe5fdbe064985a79bfb379eb800b5a75d755847c4a37231f615dfbaf0ce0745061345aba87232e8b5306647 SHA512 06134d4dcb067bb90a6d90e20450e4e9b00ed05987255de4fd0f8b127db361621dbf59a0c787e5dc7d43966215408dbfcb8e4937cb8badfa705e8906360ce395
+EBUILD session-3.2.0.ebuild 1165 BLAKE2B 6e529b2f08c855d09a4437904062ae76383a55e6363c524d2509cd7b5829420586d705df5e4c24199aa5738af928214fde6f048ce8ef56c4ed76312af5920e87 SHA512 281f3f9953490a63b0fcb2f4858e579c83fcc7648ab87467fe3224a516ff8f47e4beed0c948eb14d5b2339687d12d45ac73f35155cf1edff756919c3a2da18cc
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/session/session-3.2.0.ebuild b/dev-ruby/session/session-3.2.0.ebuild
index bd76d7209144..821e134141b9 100644
--- a/dev-ruby/session/session-3.2.0.ebuild
+++ b/dev-ruby/session/session-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ HOMEPAGE="http://codeforpeople.com/lib/ruby/session/"
 # by author.
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND+=" test? ( sys-apps/coreutils )"
diff --git a/dev-ruby/settingslogic/Manifest b/dev-ruby/settingslogic/Manifest
index 74b181f75539..fe06bdfa3530 100644
--- a/dev-ruby/settingslogic/Manifest
+++ b/dev-ruby/settingslogic/Manifest
@@ -1,3 +1,3 @@
 DIST settingslogic-2.0.9.gem 10752 BLAKE2B 7910ab9a4e61c92d5b23a34e9ba58ad89bbf71b7aaf8c2e679eab3e517ea38553d83d05a32a13151c9deaa36d0e6ae44a6afd1b13cfe452a69c668e07fa618b8 SHA512 e9229231815c8d80b7539724cda78c0cfd17bcf8423d0bc2643b3ce2a046e8014f3b398c5314b095aef480a0c7de16e0c93a6592fe8eabfea4ae94742f3dab57
-EBUILD settingslogic-2.0.9.ebuild 559 BLAKE2B ebaa847ec1a5d83cb642c7cbf69f2ecd0982e0c2ba9d2c9f972bbaf6ed32044dc341b0e09eefe88765ae41505110173b669fb97b7bdf12df2f582ebcc1c9d8dc SHA512 9364096836b4e77613879b83dd816bb6d479735ed6f5c137bad7c66ce321fc54a3e200a67476f54e60ba138bd4677f2cfb09c5341737090f142bda0c8b4b8ddc
+EBUILD settingslogic-2.0.9.ebuild 548 BLAKE2B cf75a54f050bc8cc05bcf5d5aabc495500e36b0eca6eed0820a1408b6aaae9451ad8bc8663614092b0ef0ff1f4fce7e3bb39feb8ff28226abc3f18dfebc54c87 SHA512 03c3f2935d6c65c02f429a4b87ca4cba74516719768203bd2a8857a200496a581aeffa6e3490e0bbc2777d86b0955e3f63cc1fe344f8a04f546fde14d2dde79c
 MISC metadata.xml 351 BLAKE2B 1d230c1933d7957f9503184dbfbca34d36f3cbb9fa7baf42a07bf3676c99598a559ac73989119a624f73f716d1e0fc0870498fccf7b3f1ae00691a95bbe1c268 SHA512 0bde6675cd9dd78f4b964e9cb669b4c6307ff9c0e4eb87af48794585b159f48c2be073b70e27b1f79c065521e7985b4d29322803996698c9d495735ab4f5a301
diff --git a/dev-ruby/settingslogic/settingslogic-2.0.9.ebuild b/dev-ruby/settingslogic/settingslogic-2.0.9.ebuild
index 80b9e861fb3a..ecba1776ac01 100644
--- a/dev-ruby/settingslogic/settingslogic-2.0.9.ebuild
+++ b/dev-ruby/settingslogic/settingslogic-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ DESCRIPTION="A simple configuration / settings solution that uses an ERB enabled
 HOMEPAGE="https://github.com/binarylogic/settingslogic"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~x86 ~x86-macos"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest
index 80b140c7fa42..de19d70dab19 100644
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@@ -1,7 +1,7 @@
 DIST sexp_processor-4.12.0.gem 54784 BLAKE2B bdbb349a85fbd1c7750db3dcd22d9b792eb17605d5157c969d083a8fca404b1af3db1e2bfdcf76a6b7f392043996d246686dfa73117b9efacec529896d5a8e35 SHA512 d1e1ae7cf13b0b8c2e6786aad1bdeda25697d88abec86fc9415bb76d4e9e98097d2fecf16ceddbc80d1d447064bfa73beec5eaa5270ef38ce224c4bdbcdede3a
 DIST sexp_processor-4.15.0.gem 56320 BLAKE2B 8624b7fe28f4aa9447f42cf4f8c5b424088ca2c1628f3e785f746ceb60725449812205dc657ea856c5bead616ac18d689330315fdb44e92447ee3a89740557d1 SHA512 f7877ca59191ab39848c6d3b0cf9625c2e1c180784cd757c00a7cea67aa6eee5549ab5630641f4044c875a1aaadc89b8237f8adadc961ed86c5379cb72db33c3
 DIST sexp_processor-4.15.1.gem 56320 BLAKE2B 1f75dd7dbe39b3684ffcbfb607c961e9406ec16373ad24ccdf37d4bd8369a240b8fdfc16f6e7437dda06605c26b2f4b507a14bcf680b91e12bd7827539f54e53 SHA512 e2ae9f5e8f61c1a703f14c692cd171ceb9acda5839417589051ffcb818584ff65a6a86279f3d6f2b9ad8c97ce842d946b57be810e5887effd4c606b6fdf1d984
-EBUILD sexp_processor-4.12.0.ebuild 790 BLAKE2B 8f6aa7d33b950a2f9d216e593c5054ae308601e6433a64afe55df326bfdbe64307c25667a32d57b4104a6541dc4b6352fb2a3ecc86a0c11aeb08033f501b0b07 SHA512 252c66b043c18377d173915815b36bf7fefa9eb896d642b66df6f9055a8dc81e2601700c2822baf51f0e4d37376d22893e99c374af536b1a14f105fab8481e9a
-EBUILD sexp_processor-4.15.0.ebuild 752 BLAKE2B 27c7f33c7037fbac19db11ac92aaf119aa45880cb773e51b97198930b0db3ba62b0b205c3205be73ab412953171fcf64c828d4b31700f880c354558c40852916 SHA512 e87209ed20ddf74d1add96738d39e7aa665df255e71608549d01504f1e70ba3e8d7ed77953f1b2c07ca22a6aad14a90cc9114f1d124ff6918d6e212c1140a98c
-EBUILD sexp_processor-4.15.1.ebuild 754 BLAKE2B cd27bfa6b69694a31bd53bb91eca78d3ce4936209f43ad2a41ce9cbe38ef798cf65d3ce5dcecfa26121be900ad1e7a3925ce6313f5b64693d73efad5146f8717 SHA512 3161bc6bb013fd69074005ead4f6b70e7b0fe2c47043f048b4ea09f584e37e248027f8d5c8aa2a2a88396a602b80ac375f111a0105b6cbd2a1b968a8f45b52ab
+EBUILD sexp_processor-4.12.0.ebuild 779 BLAKE2B bf9f65a16c5a2491a413b28c701928409c9f93f2b34752e39a234940367a15eba51ebb1af4b974bebef7f0b65bf0b93119efafad87b74a9cbf92891a1dee2442 SHA512 1849c262148893fca744ff8c8874735b2dcc421a577b572b9d83493a6bee7b8db4c09ea2cf8d8c32bd2226435de206ed88307141d6a5f8950b2387ca5a313b2a
+EBUILD sexp_processor-4.15.0.ebuild 741 BLAKE2B ec8d3e01c498991cf2b2f3c40d5563df1604382daf0005ebeb627ab909a47f23f61a32c31a4e4c1dfa29e492d82044dbe99a3189ce3c43a81c4c1fb337e34ddf SHA512 e5278d94c67cf8a6c8a8188ca423076492abf59c0629d9bbccb85a6662924f800877f88ae85bf4027e96f22adbc9bd818880a0159355bcd45da99d8ee60202f3
+EBUILD sexp_processor-4.15.1.ebuild 743 BLAKE2B cb9fe8637c72871ddc0ec565ffbbb141c9418024335b2fc3ee2f7a67fff395e618c4583033973b986af796063c09b90309acc0e0805ea662e90be18ed1fc6314 SHA512 66d650a6d3be101fb1b5523c0d65b3484bc3388a9a968cfb9c287d6f0e55ef2a006df93c1ccfcbf76f94c996963ee92e43d121049a218eab503b1c790626e57d
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.12.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.12.0.ebuild
index df2427df5b91..444ab14c3dca 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.12.0.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~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 "
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
index 73fd7694f767..862809482e71 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~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 "
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.15.1.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.15.1.ebuild
index 19ab7bf0b4c2..c51e7b761f5e 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.15.1.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~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 "
diff --git a/dev-ruby/shorturl/Manifest b/dev-ruby/shorturl/Manifest
index 9150c574c300..5fe9263122b5 100644
--- a/dev-ruby/shorturl/Manifest
+++ b/dev-ruby/shorturl/Manifest
@@ -1,3 +1,3 @@
 DIST shorturl-1.0.0.gem 10752 BLAKE2B 6d6605dded6584510abaf09168cdb2fbe7bfeac804b2da9e1c80a9a17fcfdd7d594948394838a8490e6d1c186fb166aeebc81ade40bf352db44073816dfc4625 SHA512 d2323107449a5a66065dc225fbec101a653cf4bc1c719f18e7e5d78c89aafc8c4863aace08ed2a007e33c72f6986ea56a0307e856fb4bbf4c213206155d22312
-EBUILD shorturl-1.0.0-r2.ebuild 896 BLAKE2B e99f4249948a1fe4b4fdee0200af7440d3850afa09ecc06b8efde95d1cb7a78b6fe377b12bad77db300c8927a8ec86634e688c87832e7beebe1dfb97414b8eee SHA512 c4f4d67e1c80acea4f9f14f35e7f00b0c9103f08436a9bb795e440c5580be34eee64622b7e03c4428b6941c3cac169cdde951dcc29a284da91cc86aea12074cc
+EBUILD shorturl-1.0.0-r2.ebuild 885 BLAKE2B f5b933ad74e98569fdd0b3f1e9246db5f2b533004a8e984133deee1b8cbb5cafe70930f51dc7f7344268f4079f973756c9097ec5947c262c2b6ed48f72f7c4da SHA512 518858639f3b6bd7d923546cff483d9a18bff14b1722112f1d5989439a6f22b0d85ce31b6db377dbdb3052b7cb06eef7367747e4fcb2ac7087ac724e3be96cc9
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild b/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
index acbf89602a12..d6d67b4e529f 100644
--- a/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
+++ b/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/robbyrussell/shorturl/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-macos"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 # All tests require network connectivity.
diff --git a/dev-ruby/shoulda/Manifest b/dev-ruby/shoulda/Manifest
index 286d4f89cc3e..7953b602a518 100644
--- a/dev-ruby/shoulda/Manifest
+++ b/dev-ruby/shoulda/Manifest
@@ -1,6 +1,6 @@
 DIST shoulda-2.11.3.tar.gz 145068 BLAKE2B 5e6d9b78b255612ec18c78076f9c4d45265a3e02a8fd56a127ea8f235e3b344005942c4b6e53014e6328206501c178ce76e1554a9d995ba0de04f5afefe4a0f7 SHA512 0b347c4a8be177b5806364114c25dc786ca2ac95a11c93a723dbc9ea1f6d8ae62df7fb420a52d477cd1e10e8d894074072a040eef36ee8a43440e5256c8427e4
 DIST shoulda-3.6.0.tar.gz 22691 BLAKE2B 798b88e208355b0325b9e8b48f66687ad2702e1b5fc058d45504648fe7c7760b018eaf3d1c7bd45c68656c7bbba8fccc9b74d72003ee0b78ac53a277567609bb SHA512 10f7c6801eaabafa08eb2bc9c4d2a96237d4494aee7d40e5db8cf9c1abd8cccfe86aa21b0e68e2ec42cf222d285cdbec11ed2fdd804ffb8bd65ffd2efa3e72ac
-EBUILD shoulda-2.11.3-r2.ebuild 885 BLAKE2B e328360c581b75de7ad1be16e3924f838690586da281c4c94291271a7598dfa2c77708f4ee05d621c56cd9d0b8d763e6351dbd884750a480b92686d2e85f787a SHA512 b42c2f7fd00d5edcf4d57e6d0bb7ab3a2e288ad66cdc32ffec30a48bdc1e3a268d9702dc3e27b722fa85d6f7bc03ead03c5611f57adf4a9c03b2e0a55ef45574
+EBUILD shoulda-2.11.3-r2.ebuild 874 BLAKE2B 2441a2b6a261de6de5fa10a17f92dd22bead3ffaf6b75204b6607821dfdfbff876dee36dcf40c89bffbfe84194ba5525698ef533856d433f0d1c17165b25fc1e SHA512 afe6e330b0e5deb1453e64891fc42243cd9f0285adf300f588d1936b4a991757190d9a03c4b02cb7b5fc5b914495689cf7c3061ffee7dec543b2e7d5670d4426
 EBUILD shoulda-3.6.0-r1.ebuild 924 BLAKE2B b0e4344f4255760b5ce637eb53e58af37d08e772218c77fceaafcf4f81195467cc1733ff9380f36b86d2d900378d54da046f0e1196ae6237ea5ea6fee4901fee SHA512 1a14864d13555c3631653bbf87fb5d77195e8b7c7532c889ff916a0f187c05a28f2e35ad13ab3c794bf8005a42b96e7f900195ee001b59284698f26370e8f7b4
 EBUILD shoulda-3.6.0.ebuild 931 BLAKE2B 02504a8fbb249eb1899083362eec53048d6b1a994da86cb5cd215480c3c663277db56eb0e37db4b41c74f7729d1037675869c4e4756e4728027734bdcfafd6f2 SHA512 7e6bddcfaa0eb3228022d1025f133fd04f14040286108d6db25447f206fd1376ed713c2a5529550dc7bf785795d9d95a34cc8e47380d2fddd845df6c91198f89
 MISC metadata.xml 344 BLAKE2B 4f4a9e5d5bc1e6a6a10552ef0285ca16024cdd9bc838a25397b23de1f873a3ca87194d0912f8d0a0c24158d4f10fdb92fcecb15f246e96dc12a95e56604770fd SHA512 b4fa8d5ce8421c5541cdaf288da9a8589ea6f4682470b376921e987d5a5344352afc2f20edbdf1f54ac46fe658f46c4863ec4dc5dc8eebe1c3223a15c72f450d
diff --git a/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild b/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
index 1a21cd1506ee..2629e41c1005 100644
--- a/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
+++ b/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ RUBY_S="thoughtbot-${PN}-*"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # tests seem to be quite broken :( They require working version of
diff --git a/dev-ruby/sparklines/Manifest b/dev-ruby/sparklines/Manifest
index ba5b24319bb9..01d56cf42af6 100644
--- a/dev-ruby/sparklines/Manifest
+++ b/dev-ruby/sparklines/Manifest
@@ -1,3 +1,3 @@
 DIST sparklines-0.5.2.gem 150016 BLAKE2B 408a8a5348e0bb3a331087066dfccbb42a58f68b839b7ba24b7577e50d5ad8f9c33c8befc60ae4577d2f8b5b809e52d13c5e11f61021a1d3eafff4d5c1fb2a32 SHA512 2666db1c2f4dd97cad10fd6b9b2fc938ab6b2e619b968f93b86090db4a77cc356cb97bd5ec01582804412c214226ed99cc0f65196e2a26ea1a395b29288cc715
-EBUILD sparklines-0.5.2-r6.ebuild 807 BLAKE2B 443c414b2e7225d827b28bc11fca12e967e7eab495d0aaa38b24ba0944994e3c0c236d398cec4edfc47df5725cd6b277cb73416574bbfe49a91805b4877703ff SHA512 b2278ab8fa766805d1a57412514df244301ffa395b5d1193babc35229de9eec6b49106fc162755930ffbde459fce6d238c7092a686f9a8fa6f62e15ae8623cd2
+EBUILD sparklines-0.5.2-r6.ebuild 796 BLAKE2B 50948627f9cb9ceeccdddae7121fe582634b4aa335b324d042538d89b7ed59cfacf75c6f9ba2b1b1ae9e43f7d28f4a005d9c663cefb36d1dcc6b7a1d7e18531e SHA512 15c2edb7081925efd98a99265885d0a46c07776cda2482022df673806214eb024da42171217b4fc4af67738163b40470a1cb0b4abd5e644055fa3f30645edbe6
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild b/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild
index e54ab7d476c9..3b037fc8c8d3 100644
--- a/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild
+++ b/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="http://sparklines.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-macos"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND+="test? ( media-gfx/imagemagick[png] )"
diff --git a/dev-ruby/spring/Manifest b/dev-ruby/spring/Manifest
index 63112a0abae1..ed84ed043ea5 100644
--- a/dev-ruby/spring/Manifest
+++ b/dev-ruby/spring/Manifest
@@ -1,5 +1,5 @@
 DIST spring-2.1.0.tar.gz 43499 BLAKE2B 0736706638b0b8c76d244d5cc18b17730f807e6c87384c7823a71d9878a55337de8ab07ce1c75fc0ce0eaf3798df31d1c38f9c3fdac7cc4eedb84e1cab4eb27f SHA512 9c396cc55228f3afcc291f51418621071991d965312068dac88a940281d5df42239275a7da2f6a16801086b89e05477fa474705020060b1c4051baddf1305b05
 DIST spring-2.1.1.tar.gz 44000 BLAKE2B b7a5855b4a53852ccf82c14e82c134e61bc17a26e20bbf3597259763bbe81a545d3299d5490302681ca616ed1b7f4d42d522134b87d8a40588aa4904f8b650b2 SHA512 44c8619253567d2f506c9652ac28da5933517113dc38e8eb5a8b58fcc7d28ff0192cc98a655579767972649f5cead63cff0c7aa909046b41cfc1d37780e0ee77
-EBUILD spring-2.1.0.ebuild 848 BLAKE2B 0c03149a87aa3b3726782e105722d4b993d3da3711a0ab130e28af92a6db1c1ba3b9078db514987a2e2fc58ab1d0e2310859c5e957a27f0711057ec8e1a1395c SHA512 3cfbbf53b538429cb8cb67eb687d8bde497b7c4ab0efac257f55e1a7b2ae2486947e4fbefb6933c8e1bfad8fa82a5cd0d80f484a2090c6ef98350fa32413ac8a
-EBUILD spring-2.1.1.ebuild 880 BLAKE2B 3efd315d8252b0c1bec79a5686dcdba7c07c2b2d32e9504a3e691536bc92ae7f870d6059fc9b607d5156f3f4702e6bdc5913479a33b9ea7b31850f867fd0ef6c SHA512 ac6611ec6aa3808beae809adb83c79c6e789158dfa754de73a91f50108b415b23159b552f509f1ef39d77a2519e0e8ec065af525dbbaa5145fb743c89471ee0d
+EBUILD spring-2.1.0.ebuild 837 BLAKE2B 3b0a207250e65da3cb3ab0e3c09b40f74fc69e2cd074e40807390b4f59bbc49b78a20263070a2bd4c8d8783f0e81d8777e1a6aee369141174fc76f49aa4113a4 SHA512 ba215886a78558a262313d7f9187cded228f099369fd98454dc60dea506d77fdd78eb49922512df33b88839f7627e567b4244bc0f30ed06e149345184c0bf43e
+EBUILD spring-2.1.1.ebuild 869 BLAKE2B 7a0d602b377c996c61140f7a390d9a586e16d5c8caccbdf99112100424e29ac09fee9097c4d83a0da09be636e7aa02b496c77801df67e0fd8a57819815019d52 SHA512 46236ce9fbe91fe72405053acb8bd4383f39eb6a51768cce89639e79728274a685250d334e7b4ea6f55e8b172f7652b87331e2401815fd798662a054b76d9451
 MISC metadata.xml 338 BLAKE2B 6800daa1cad935214edb5051dac7470efb061ef6fc0ad534b8e52d024ffc8474fe3a04a329de4394b7ce673a9e8bae71aee52fee2fc4def484c287085ae51c5b SHA512 ed274c75491299ebefa755f0776c8895c7640101c22652f92defadb839d0a476a0e00ad407d1769a62f20d56da532f750bf639e7f5d75831c50f2957c17cc9c8
diff --git a/dev-ruby/spring/spring-2.1.0.ebuild b/dev-ruby/spring/spring-2.1.0.ebuild
index 8557e90c7002..e05aac895e87 100644
--- a/dev-ruby/spring/spring-2.1.0.ebuild
+++ b/dev-ruby/spring/spring-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 
diff --git a/dev-ruby/spring/spring-2.1.1.ebuild b/dev-ruby/spring/spring-2.1.1.ebuild
index 425e21159622..14f70134dea2 100644
--- a/dev-ruby/spring/spring-2.1.1.ebuild
+++ b/dev-ruby/spring/spring-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 
diff --git a/dev-ruby/sprockets/Manifest b/dev-ruby/sprockets/Manifest
index 0f5389c50f3d..3ac75761e979 100644
--- a/dev-ruby/sprockets/Manifest
+++ b/dev-ruby/sprockets/Manifest
@@ -1,5 +1,5 @@
 DIST sprockets-3.7.2-git.tgz 369053 BLAKE2B 3c40de921d82b2f5c71e3ecaa114576293946352415da1195e60cdda6363066a6be05474eb7842ab1122e29fa6c19fd2f7a38fb0a7cf9972de0640eeb29d03f0 SHA512 bc7d79ba696a072644852b7a3a73ce086d297662309deb1d00318ad453f50ac6e494e6489632cb282795de2f334700155cfd21cc80be638dc471a3215422591f
 DIST sprockets-4.0.2-git.tgz 418502 BLAKE2B 0ae8d0e47708967a4208af852f21baf9d00c4216660b081170d7f68631ee1129fb78341e6012664fc519a0f330fac23203e314c1831d7031af50844e6b91c1f0 SHA512 f733b96c78be6466b63999aa7dc900af653a5b35f6482d84c41edf47f22b093231003f8874eee2ab31e2a2cfb7049a8109a314b51a0ef36ba30d5f6e8bd81f66
-EBUILD sprockets-3.7.2.ebuild 1675 BLAKE2B 36180c428f4ee893002a66975786e5272afaa5a2ae2cda2f9a7e3638c2ff7f1d91de6945ec019e8a19c6e17a13b5fae89e6362b059687891bf0f262f399021a0 SHA512 ae01d81cd524421fe388ff7429f189927259882145a249d6182e322904f47020ed7b825e5a1f7d41dfc1d5d9a2d9b4c62d81a574c041e82c262855fd855d21e1
-EBUILD sprockets-4.0.2.ebuild 2078 BLAKE2B 1ca11a8cd90686f405269dcb8b16adfa8d6b08d0b57b960cea82753fd59ac3934e58a0f8d10f242d2f79216653ac4ef81a0c64cf92c27863c965b66064cf154e SHA512 c279b6036120acaf1f9fdf0d53766ddb6d2aad33704d56202b5ff02a805c86fb4da24d1ca9abc8ae98428cc8b13dae6de64c16f65acd180004f3a3f0aa13539b
+EBUILD sprockets-3.7.2.ebuild 1664 BLAKE2B 8281c517276e6e2535700784ffce12701b799fe2870b429fbba995155272da13bd97e310487c57636c036601694ddb2c731f95bdd2cc60ce548264593d2650a1 SHA512 e7abb4c060749720a0e1c6052118a2433d564aff59a9dc36c0ec5f61d3dad784186a08921f1637998150e5b4af9396a9d74c868ec42949deee952ae8dd5d3d45
+EBUILD sprockets-4.0.2.ebuild 2067 BLAKE2B 47949a678b8c533c4e6f06ba4a1b55186e1a8c1afbbf15a2d98cb990b5823b532e229da5baae04958cb34f277884754c7864250a94fb1772514b410bec9ccea4 SHA512 7981dc0a0ae138af2e0b609f1c401ca901a8f6a8a564635abbe88e0d9f06255f8786f9fcfe8614ed157919838ef545fbb720283025ba260d59cc1c93414bcb2f
 MISC metadata.xml 341 BLAKE2B b649927de729737d95d006cd0f45484827a9628ca6cdf92589986b371059bc424f9888a5c727396b7aabc0326e94cbbbf0cc49d60c8e4c8ff09f44dafdae89df SHA512 4339a35e1af44e24e5b447c3a331e79609c0ece1b9a1a54a1e23a3c40eca5d4f0b3d788e965f102115565c45a9aaf3c59d8b1997c61bf584d1c3545f1e9fd55a
diff --git a/dev-ruby/sprockets/sprockets-3.7.2.ebuild b/dev-ruby/sprockets/sprockets-3.7.2.ebuild
index 95a5974a995a..842fe75b2a81 100644
--- a/dev-ruby/sprockets/sprockets-3.7.2.ebuild
+++ b/dev-ruby/sprockets/sprockets-3.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tg
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 
diff --git a/dev-ruby/sprockets/sprockets-4.0.2.ebuild b/dev-ruby/sprockets/sprockets-4.0.2.ebuild
index 353b8f2e76e1..cbef97b50292 100644
--- a/dev-ruby/sprockets/sprockets-4.0.2.ebuild
+++ b/dev-ruby/sprockets/sprockets-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tg
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 
diff --git a/dev-ruby/sqlite3/Manifest b/dev-ruby/sqlite3/Manifest
index d1869dda6dbb..d3d2a17e947b 100644
--- a/dev-ruby/sqlite3/Manifest
+++ b/dev-ruby/sqlite3/Manifest
@@ -1,7 +1,7 @@
 DIST sqlite3-1.3.13.gem 64512 BLAKE2B a36e3161e44004a0510297d16bf491df3dc29434432208ad231f5e46ddecb4607add417e105f5ae8472a768f80efef3f74b703b2a441396b4c9b6c9ff90bf31e SHA512 5d3eab7c788cc62c497de179919054324e53595294ec3a9df2a10d23151a406ee9a88f1c3ac945777f138e78cec61018c388b023456b873131d678a6788a505f
 DIST sqlite3-1.4.1.gem 70144 BLAKE2B 5a850296c804223cfe7673f72a1e303fb80c49569f23ab57be9a26acacbe95945382db1b1fd22bb432c974ddcf7c28abd913912823c2e8477d2eda165dbafe0d SHA512 33f87af2e962459cad07f2f07c9d6dffb59551c4e5371e47446f10f5314a05da495598ef5f90f896f876f9a59bd2e90b5bb3fdfb6efb95966ff51bb578f81a80
 DIST sqlite3-1.4.2.gem 70656 BLAKE2B ef7fa7667fd080a6f175bcfbd1fe8dfba00d3fdf1214cc3d776f0576dc29386b627db8d6c0dd06f07ab65fff877a6803a6dcacefd4fbc5bb0f7d2149e355c88d SHA512 c4630dd2fa13914e2fcc70092c35568103f61f976958b439fe205abdfcff61702ca176d10bea40ff0cfea3169644cdb9146b7be94dff883cad3b753e84629545
-EBUILD sqlite3-1.3.13.ebuild 2383 BLAKE2B 4b165023d58340f3a8b55450b26793a7426597acf1d3a4b62eac6cbb7dfbdb41dfae3a7a6465556b22bce30fae9135de867a216d467cf28875fb0d0443636aad SHA512 820914bfc8d1880dd1136093781a5611f15831bea05fc153b257b6e4d20c71856eea1d4dba503034267efbe679e44c3a44c1bf4bd03c91cd79c214ad6eb91ae9
-EBUILD sqlite3-1.4.1.ebuild 2427 BLAKE2B 97ded9a4fb69c93126fef5e0cba64156c268a0a1d25e7fa0c298f7e97bbd64581fddb99e4abb2fdc7f79f71b3c16d61f84bfc5ce0b2fe9b1fd5744a9189c4785 SHA512 ef7b230c3b3a89d0948bbee5392031d0462bdf38445c1a0d89a715e85c139bd389268471f86e4c1685eb1cee36296a624253ee8dbe7b378afe3abc034f0940af
-EBUILD sqlite3-1.4.2.ebuild 2434 BLAKE2B efe6b0d30ad3cc9e2f775e6556b9a241ef2674df8374bece5b76179c99df5600715563a3c7173b1a6f576e48265c0c46acb220a9401120870a88f8ed6053d01c SHA512 9738a76e42d1ca889adad5ae677cf08089e05b416100308946c328587d5e8156b43022f8f77282b66085e9ac02649c8ea903df5dbbe5d14ec6ec914b74431acd
+EBUILD sqlite3-1.3.13.ebuild 2372 BLAKE2B c969f8887e11fe903c30b8bf7e716650230f7a4774b6aab307daf92b5a5fb8ac526da0f945ab1fd0c53cd9fd7511b97be0d7d33b82ff4d458a8f3fff4af8e124 SHA512 5e4a39c994205f96ca75057dbf49107068c5dcf96e8d47d06e2e00c1b4347448372a7bcb164ad2be1a8a1d24277abd9e6fd505e67759cccc9b8a1c3a624f86b5
+EBUILD sqlite3-1.4.1.ebuild 2416 BLAKE2B 1f305a2aa53bbe7d3d893a533c8b885792246f19e96d701a8cc120665ee317ff410b5377e3a52ccda7889413f55460c112145571bff2c42009c19564412794d0 SHA512 7249cacead74dfccb257b55af218f68ebd776072476f97040d15af34a70011b2cfa0d3b15a1643b97833de59ebb79260f0b97bfae4ed29f3c6a7a5bc7dadb6c5
+EBUILD sqlite3-1.4.2.ebuild 2423 BLAKE2B 151e031e16c6f8cb9efa0736e37046328f1e87d6e02935c396546ef5189b95192e0e743af7a6527c0b3c3cf95118e4c79af6790812e8695fcb15b64b086d1cce SHA512 2f66a0e104dc9200ee56fe40340e86da7d015f242ded48131173fd3a873b7bf73e702e00fed784b92cfba4a60f32c1d7eeba310cfcab080fe39484f7f65f1981
 MISC metadata.xml 342 BLAKE2B 1f46148873c3913fc0beee10dfd433f84a477f2f5ba8b7a8bc97e4cac6765d3c07829dabef7e697791cb42902184fbf034c5701a433717c1516c725c0b5b48e9 SHA512 3272f121743335cd749a606648660e8650664fec4f02aa6499c8f5ebcf0ff727de28619d800fc5cbda350f3076e81dfbd1993ec825cd4ca43163e160813b3f77
diff --git a/dev-ruby/sqlite3/sqlite3-1.3.13.ebuild b/dev-ruby/sqlite3/sqlite3-1.3.13.ebuild
index ae595f27816d..edea742b5e7c 100644
--- a/dev-ruby/sqlite3/sqlite3-1.3.13.ebuild
+++ b/dev-ruby/sqlite3/sqlite3-1.3.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ DESCRIPTION="An extension library to access a SQLite database from Ruby"
 HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
 LICENSE="BSD"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/sqlite3/sqlite3-1.4.1.ebuild b/dev-ruby/sqlite3/sqlite3-1.4.1.ebuild
index a44e030dcc1b..49934f388235 100644
--- a/dev-ruby/sqlite3/sqlite3-1.4.1.ebuild
+++ b/dev-ruby/sqlite3/sqlite3-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ DESCRIPTION="An extension library to access a SQLite database from Ruby"
 HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
 LICENSE="BSD"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/sqlite3/sqlite3-1.4.2.ebuild b/dev-ruby/sqlite3/sqlite3-1.4.2.ebuild
index 2b9f78f2a591..66e8bee8d65b 100644
--- a/dev-ruby/sqlite3/sqlite3-1.4.2.ebuild
+++ b/dev-ruby/sqlite3/sqlite3-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ DESCRIPTION="An extension library to access a SQLite database from Ruby"
 HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
 LICENSE="BSD"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/syntax/Manifest b/dev-ruby/syntax/Manifest
index fe4f4f085ebf..e82fd6a4939a 100644
--- a/dev-ruby/syntax/Manifest
+++ b/dev-ruby/syntax/Manifest
@@ -1,3 +1,3 @@
 DIST syntax-1.2.2.tar.gz 41485 BLAKE2B 09a1fc9a4172ec8e6a748981a966c891038fe43303360a3e5f2302aa0fb370b1098c7fd7b8a1fc2f022365ac8491b3e9f9146f940dffc772fb68fa8be5245986 SHA512 a3be7ac736d6c77833aa532f17485c076d34e66c40426c9c6be2dbbde87b2adb7154c9b3bed3439cc12577dffc01c8148e0870a0d02b3a02ffbf9fb1d651433b
-EBUILD syntax-1.2.2.ebuild 890 BLAKE2B dcf1546ebd14fc182610c7af8259a3d8cba680aa1b18ad6c6971122bdda2f3ec0684056a52b554120d070da0662ee7466e65705011a6cc32597f11729b10a2bd SHA512 a69343320bd05691a8eddc71abb07682806ab6626ce1f1345fec908dc67e6d424323f016250fd991381762a830a881b65fe56f038196dd8dbc172794ed284190
+EBUILD syntax-1.2.2.ebuild 879 BLAKE2B caf390279a34fc722c8807c8253d5265d2831786ee6c4eb7845c1285e54086d22e5f4b81d85dbb6c39cd6e7a04aeb17ce63d2f336268611fb334eebda6d0a9e6 SHA512 fce1d1328025e5c960e035d84544b0557c95f4e6c0006cbe93346b80f59058923e4f2eb55a668e0a1bc221ee684282ef3b963ed53d05bc2b5f09e43499c34210
 MISC metadata.xml 339 BLAKE2B 007757aafebca384bbe340c653875cdfa7c36a40d0fcc948f28f2a1eae85265100d30442f1bc05af9b4286f88f969d54bcf001ad9156aa0bd3dbbbf999a3f129 SHA512 d3d2406f489b687ceb61d99a66ec5e0a4539491277a5c2b5006e03414d14fbd5a25d7de00d2983ab629a1c8efb3e4999681734d07df9ef67f6a01c6abe3f0608
diff --git a/dev-ruby/syntax/syntax-1.2.2.ebuild b/dev-ruby/syntax/syntax-1.2.2.ebuild
index 8f543768ad04..b2ff8d8d6f9f 100644
--- a/dev-ruby/syntax/syntax-1.2.2.ebuild
+++ b/dev-ruby/syntax/syntax-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/dblock/syntax/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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="test doc"
 
 ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/tdiff/Manifest b/dev-ruby/tdiff/Manifest
index cf88f0f070cf..08e14a15ae09 100644
--- a/dev-ruby/tdiff/Manifest
+++ b/dev-ruby/tdiff/Manifest
@@ -1,3 +1,3 @@
 DIST tdiff-0.3.4.gem 10240 BLAKE2B fe764eaf70303670602758bba903202bb468c419e96909561c4d420a86b9237c9af4640947e9dbc27eaca7b7210e26236da20d41f03d3e8acd0556a23205a924 SHA512 2db5c9707a8654fb36b02c7fbdf2317da08c633c0d3768f0f76693ffffd1b2b44e5f4309ae97df944c3bf9f25b596fd3ae19cb88b20435c0f9e50989d22ece40
-EBUILD tdiff-0.3.4.ebuild 591 BLAKE2B d493f161dfb306f76e37bbdba7d4e74a88d49dfa0b045f2072723c64d14fce5ee9a277a68010545d72772b1a9fdedb1006d9a7b79bf59ee4ab9d0946c416ca4f SHA512 746facc223f8be9b2cfa6a1ab127554c56a840ebaea01a97edbe5fe7f9b2e62733ab8acc1913229a79942d97638257b064ec3de0dc331bdcff0dd02504c86908
+EBUILD tdiff-0.3.4.ebuild 580 BLAKE2B 3ba8f1cf19fdd2cb7490771dfd1e988db1d1e005d484fde7e2648460c42513d838ee542c779e4fe08bd11c2a07eb61fa198fdc7dcd1498578063536cbabedd3c SHA512 a046d5078e826169a9ae99a2a094343bc9ad5f0a2495b835612ab972eb3569ed23e7c1c0b12d761f2c41812c539f969f9adbba4007b7ade51fa1fed94b2b85fc
 MISC metadata.xml 342 BLAKE2B 58a84e55bd616d2031be360592c5e32fc734355379c59f76680acfba0727072817d3e7398ff849a50fa908c048c033fc668d008a8d68749be46198f2c6ca0a3d SHA512 c3d93ca88cfee5e58b40fa4f7538883d507ca4f84fa79b529080fed0c67ac23f83cc51524391796e8997b137ffd7c24890eeba7a13d788f24f382253965fd184
diff --git a/dev-ruby/tdiff/tdiff-0.3.4.ebuild b/dev-ruby/tdiff/tdiff-0.3.4.ebuild
index 247d4f18ee65..b90c0bc1487d 100644
--- a/dev-ruby/tdiff/tdiff-0.3.4.ebuild
+++ b/dev-ruby/tdiff/tdiff-0.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,6 @@ DESCRIPTION="Calculates the differences between two tree-like structures"
 HOMEPAGE="https://github.com/postmodern/tdiff"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/term-ansicolor/Manifest b/dev-ruby/term-ansicolor/Manifest
index 11815d462b0c..209af0a5df5c 100644
--- a/dev-ruby/term-ansicolor/Manifest
+++ b/dev-ruby/term-ansicolor/Manifest
@@ -1,3 +1,3 @@
 DIST term-ansicolor-1.7.1.gem 44544 BLAKE2B 2c2c2de0a18d1f9a975901f8a7005f740ac81a609c43705d8c184deb26dc9010876deeca411488c787132a3d8b78339c75b0776f3c9bba1ff71efa23ce3671a6 SHA512 d49f8825c31accfaa58a2f34ed5fbdaf503d4b47c23f07c52cc82bbf6cce457bd9371e197da1ec36dc83e32b95e9ea9a349922d9759a827923456ea46f81ff50
-EBUILD term-ansicolor-1.7.1.ebuild 892 BLAKE2B be650520c19fd7660fdc5303f74740988045218e5153dd97335794b3d240fc69e04cb82bbfda6ea825eed8391aa750b00a9a8d96461ef1265ded6aa38c2e6bc4 SHA512 636e792fff13c132c5ba3f1bbb46fc74c4cf369f0931ee1666ff0f0bf57ce1a9ed3ea92364c6b105b6926fe2da6449ffb8b927a7018bb5714539d89a43088509
+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.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.7.1.ebuild
index 30378b78faae..3a436cf0c600 100644
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.7.1.ebuild
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ DESCRIPTION="Small Ruby library that colors strings using ANSI escape sequences"
 HOMEPAGE="https://flori.github.io/term-ansicolor/"
 LICENSE="GPL-2"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index 6de1ea040905..9c285e9e66f5 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -7,11 +7,11 @@ DIST test-unit-3.3.6.gem 133120 BLAKE2B bbe79ee41f1e25b49099eb00c8c72dcdafd1b7cb
 DIST test-unit-3.3.7.gem 121856 BLAKE2B 507c9c538e89156d620b229e0144258def17975d41fa569178bb0c47761d5afdfd6cc8a99e3255e72df7a3eeeb65358faf1ed81571c12242559990762a09f69c SHA512 42419c947433330f06d68a26dc2c5e8309658d75aac44f6e391e02085eae1819937fa3ba86e86231dfca91e8de86252b7bc79dc5ffa1e1fb8b0f0ec9074a0056
 DIST test-unit-3.3.8.gem 121856 BLAKE2B f47ef205c566fc404d7ffb9380502ae18224c395f65e3ab663472ec4874d0e77b0cb13a5ba80525965ff340c3941168773d6ceca6891036a8ec57bfcaa4ffbd8 SHA512 fba6a7ab4c87c07950498a372a21f888d87f1e1b0e5b49deb97aab4e2815fb85b979aa8afc6e8a6c4a9ad648371f1d9de968958350d0ecab10dfdd2bc0a2c112
 DIST test-unit-3.3.9.gem 121856 BLAKE2B f8ac1568aabc7d53c79715c6b141d3f2be0782e35dda36fc6184e7b7bbae419e883b94f163333e4e1a186c07f55cef181a2d86d4531e3968667e8c5fcfe8e36c SHA512 8e2a1516d33811793aacbf0b31b9609b43437ea6800cfe6c97b1c96395a8eea7c42f2788dd86b6decfda184a27e5818646bbe313d39ce3799a0869f62a0c4c32
-EBUILD test-unit-3.3.3.ebuild 914 BLAKE2B 936f61f48a0e7834cbb578fd0cc2baf81fb4e763fe6f537772407f0944f584ce1cd39b8d343b02fde8c0464fd8874fa688d1deb9ee509a648ebdd38393897079 SHA512 68ce6de330ce5153359b1a5c20ee2f664475dd106720497e24107c91fd27c9de138319c2945b6a2079283d63f05639ad8dc30976a3d40904c85d6274fd222699
-EBUILD test-unit-3.3.4.ebuild 892 BLAKE2B 0467f49d5f710767ca3aea95bf9f3cde4de629e9af0aa4e560e091526cba6351e4758b92a2037edf1a83c560608774b9fc5845e351c6195dcaa3e9610d36eb75 SHA512 f57bc411e36ef2a1c4c6898464b652b0630740a6ba6e40313804f433b81dce32df5ed162f281eec90201e96aef267878a479ebc26a4702082d21624639d77c7e
-EBUILD test-unit-3.3.5.ebuild 892 BLAKE2B 0467f49d5f710767ca3aea95bf9f3cde4de629e9af0aa4e560e091526cba6351e4758b92a2037edf1a83c560608774b9fc5845e351c6195dcaa3e9610d36eb75 SHA512 f57bc411e36ef2a1c4c6898464b652b0630740a6ba6e40313804f433b81dce32df5ed162f281eec90201e96aef267878a479ebc26a4702082d21624639d77c7e
-EBUILD test-unit-3.3.6.ebuild 892 BLAKE2B 0467f49d5f710767ca3aea95bf9f3cde4de629e9af0aa4e560e091526cba6351e4758b92a2037edf1a83c560608774b9fc5845e351c6195dcaa3e9610d36eb75 SHA512 f57bc411e36ef2a1c4c6898464b652b0630740a6ba6e40313804f433b81dce32df5ed162f281eec90201e96aef267878a479ebc26a4702082d21624639d77c7e
-EBUILD test-unit-3.3.7.ebuild 885 BLAKE2B 52b0447dbee3e138c21b56b52c7e7d96dd9574ec01317febf81b5828bed9d25fa74811bbb69564874b8d27dfed85d4aacc1723ee66ef2f289ac98abc5b6c33c3 SHA512 653dbd3768de27e10a5cff789965868101996e1571036772e3a524d694452d87141a187214ac5e4fd4e1e83d0c4f39d0e550b703bd6496ef476b3168f9dc3ca6
-EBUILD test-unit-3.3.8.ebuild 892 BLAKE2B 9dcdb206f74a412706a5a5d67ff9a78cba4b5038bda9593800a05e49e86c12d070856eb69057fd598d7238529a947dcac131fd76247a85df65c39d1edbac86d9 SHA512 4afe6e36fa94a90c5398b813a671226c680a5bb3697ffdc2bb53fd7f6fd52cef3f65b0fc688c1b31480ca5f146ab15c40097ada39544509100cc1005f884ea19
-EBUILD test-unit-3.3.9.ebuild 892 BLAKE2B 9dcdb206f74a412706a5a5d67ff9a78cba4b5038bda9593800a05e49e86c12d070856eb69057fd598d7238529a947dcac131fd76247a85df65c39d1edbac86d9 SHA512 4afe6e36fa94a90c5398b813a671226c680a5bb3697ffdc2bb53fd7f6fd52cef3f65b0fc688c1b31480ca5f146ab15c40097ada39544509100cc1005f884ea19
+EBUILD test-unit-3.3.3.ebuild 903 BLAKE2B d9ef0634df035eeeb4c6c7f9d8270c1eb17273ec48df197ca8d19c7199200596c76795cb7cc9981bf7ae95e639be3f13dd7c452a6213eca515ca75f1ca0d1458 SHA512 e62f58e28b139f207004db0013cf135e6eee866c98be949278dea9cf749a5f381f9729318bfb52c6d8bb756153e72d20956a200a91b0265bd172133a6051362e
+EBUILD test-unit-3.3.4.ebuild 881 BLAKE2B f6d0f83df498b880e1a6e6e147a6ca3a75da903f0d4306630970423873ca763e86aa57d8c87f370be67acbc84172232fdff5ad3378b87334b8c08b03f5023df5 SHA512 0437403fc66c65d355bad0f37745fdd406f1c20de347a6c45a037c68e8651ea2ac003b114d4913c60cc37758cb4340245fbdf5da740f5a0f2c76bb9f54adb8f4
+EBUILD test-unit-3.3.5.ebuild 881 BLAKE2B f6d0f83df498b880e1a6e6e147a6ca3a75da903f0d4306630970423873ca763e86aa57d8c87f370be67acbc84172232fdff5ad3378b87334b8c08b03f5023df5 SHA512 0437403fc66c65d355bad0f37745fdd406f1c20de347a6c45a037c68e8651ea2ac003b114d4913c60cc37758cb4340245fbdf5da740f5a0f2c76bb9f54adb8f4
+EBUILD test-unit-3.3.6.ebuild 881 BLAKE2B f6d0f83df498b880e1a6e6e147a6ca3a75da903f0d4306630970423873ca763e86aa57d8c87f370be67acbc84172232fdff5ad3378b87334b8c08b03f5023df5 SHA512 0437403fc66c65d355bad0f37745fdd406f1c20de347a6c45a037c68e8651ea2ac003b114d4913c60cc37758cb4340245fbdf5da740f5a0f2c76bb9f54adb8f4
+EBUILD test-unit-3.3.7.ebuild 874 BLAKE2B 15fee01d1015bae7196d2e0d022520337845b4f4f6fa001ed5bb7cc2ac2c74f5c187447f0ecea8bc139f8a020f9605bbd28cf80f0d6970eae7dbfd982de6df15 SHA512 272febdcb0cf394379e5b7062ea7bc24a51933574a18a47f1c83d9bbcf7c1d9438a5f47a61f3e7c87baa4dc7eb6364e1ec49b0da322b5be348110ff2010eec37
+EBUILD test-unit-3.3.8.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
+EBUILD test-unit-3.3.9.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
 MISC metadata.xml 337 BLAKE2B 0a43a0dc135bad049718f93d6347df3e9b610845ab2e59201f998c2523a6a67769a5591b678093eea2b18276972cf2cfe633892ab3b86acf0ecce357a31cd236 SHA512 82719d56184698a8bd8e03c0c71f2071eb2bd7d7394093b908a69c031c73ae5634ce3739e371b9d57723b78e7a154f26f6d48f270adb8ca0d89b88fdf13ce3be
diff --git a/dev-ruby/test-unit/test-unit-3.3.3.ebuild b/dev-ruby/test-unit/test-unit-3.3.3.ebuild
index 64335dda8dbc..bc1ea80fd21c 100644
--- a/dev-ruby/test-unit/test-unit-3.3.3.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,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 ~x86-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 "dev-ruby/power_assert"
diff --git a/dev-ruby/test-unit/test-unit-3.3.4.ebuild b/dev-ruby/test-unit/test-unit-3.3.4.ebuild
index 6d5415956121..dee64c2972ae 100644
--- a/dev-ruby/test-unit/test-unit-3.3.4.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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 "dev-ruby/power_assert"
diff --git a/dev-ruby/test-unit/test-unit-3.3.5.ebuild b/dev-ruby/test-unit/test-unit-3.3.5.ebuild
index 6d5415956121..dee64c2972ae 100644
--- a/dev-ruby/test-unit/test-unit-3.3.5.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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 "dev-ruby/power_assert"
diff --git a/dev-ruby/test-unit/test-unit-3.3.6.ebuild b/dev-ruby/test-unit/test-unit-3.3.6.ebuild
index 6d5415956121..dee64c2972ae 100644
--- a/dev-ruby/test-unit/test-unit-3.3.6.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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 "dev-ruby/power_assert"
diff --git a/dev-ruby/test-unit/test-unit-3.3.7.ebuild b/dev-ruby/test-unit/test-unit-3.3.7.ebuild
index b77e6df078c2..53b7f9bf38ce 100644
--- a/dev-ruby/test-unit/test-unit-3.3.7.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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 "dev-ruby/power_assert"
diff --git a/dev-ruby/test-unit/test-unit-3.3.8.ebuild b/dev-ruby/test-unit/test-unit-3.3.8.ebuild
index d77a19177a4d..805bffe784ad 100644
--- a/dev-ruby/test-unit/test-unit-3.3.8.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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 "dev-ruby/power_assert"
diff --git a/dev-ruby/test-unit/test-unit-3.3.9.ebuild b/dev-ruby/test-unit/test-unit-3.3.9.ebuild
index d77a19177a4d..805bffe784ad 100644
--- a/dev-ruby/test-unit/test-unit-3.3.9.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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 "dev-ruby/power_assert"
diff --git a/dev-ruby/test_declarative/Manifest b/dev-ruby/test_declarative/Manifest
index 3b6fd1c6cc31..ce693994b145 100644
--- a/dev-ruby/test_declarative/Manifest
+++ b/dev-ruby/test_declarative/Manifest
@@ -1,3 +1,3 @@
 DIST test_declarative-0.0.6.tgz 3586 BLAKE2B de8e4b011de9ce0773e2c76887d6cf7d888c2f799a07e6dda024b301594edc37ccf2c386c366c0a13d81a1f0697fe7be92932db7d66e5ed482d529fac4b9ce78 SHA512 f147fef7f3ac912c7b1cb2826cfc7cb5abf4cba92ea4f7accc2b1ba3a4f0775bff5ae06e80370144b7b1e7d03e2f3129e268c5d7056ee2aca9d77047a1b5a1c3
-EBUILD test_declarative-0.0.6.ebuild 1010 BLAKE2B c7fd83ff07a61f47a916185718a6e6a16c752867cb8c8aa5d63fe16b80cce7f985987e122f95977a8a7305ca7243f2df59d167f9a67e6c70d2efd1a07515bf8b SHA512 fa0e9c133a7eb0fc49325cfcccdf0681fa45862fabc9fa61e1bc064d5d1db8c864bb12d75a2d926e98b793b4ca43e36bc152d6f9ead2660c2335ffa853aed19a
+EBUILD test_declarative-0.0.6.ebuild 1010 BLAKE2B 9da4d6388cd4f85f39819f1131f9f921e7a7207247ea3a4b67b07e29a2a77e0052a55492e628b7c7fe56f3ae5d64f073a99690c6e7a0e88c1428b24a7284532b SHA512 0ba9c586b51e6f1d529358ad82a68fd4ee303cb5450b163d92bd8e46e04206e7c14aa25d7ca08799993acd4268fdebc015f32fb5fa1460817e104b74764da591
 MISC metadata.xml 352 BLAKE2B 16e19458cea4c942f4676b8a345f5f4bcdd56bf265cc1408c4cc46210530cc12798b8f30065c054f7ca03b308d545d1aa41e682818aaaaca94912c2c47fb64b6 SHA512 dd27572c54207401b8dbcac74242521733d31f6c7e3822b1ecb4809047a067a58cc8bd654f146d10e3f7c9e01c130d56af039c9c91da298942a6fce02c994a12
diff --git a/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild b/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild
index a534ca0a8ed0..2df24fd0a223 100644
--- a/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild
+++ b/dev-ruby/test_declarative/test_declarative-0.0.6.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=5
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/text-hyphen/Manifest b/dev-ruby/text-hyphen/Manifest
index 10b787be8f01..8b28ad8c1b59 100644
--- a/dev-ruby/text-hyphen/Manifest
+++ b/dev-ruby/text-hyphen/Manifest
@@ -1,3 +1,3 @@
 DIST text-hyphen-1.4.1.gem 751616 BLAKE2B 4a6d6a9b430c2dee2a486dde9f49405b98bc32fe8f96448c0cbe8d55f416c4e4e9bef5ae3adb57576dee6fa285680fc57b958cb279786872c8d95282cbf72e73 SHA512 4a6667aff01e56afce79302f46d0afdbf9c965ad80dbf9a7266a213143e6b6bc2cb00092d26900286bf72a700e47be6b0860cfdf87fa2856477db02261f9ef3d
-EBUILD text-hyphen-1.4.1-r2.ebuild 727 BLAKE2B d92331f5a135a5f2112d360a2068a7c57369ba63ebf337f15565572b325793744b4c7fde35453ea466e06fffe7a08f833779742c92e36f9d0b360f27c5b201eb SHA512 b3357b1cf82c0ead2c49109d87ccbac545ce0226d01c447c23d9f296e5104a999cfe95e8ccee316a6cd5f7348ec15b6f9b912e16b6a72f08c974e98a0c48070c
+EBUILD text-hyphen-1.4.1-r2.ebuild 716 BLAKE2B e99e0c9d2cdd60ef4b21e00807717fce22d81d775c3fcf287f37a9e751dfcdb9382ebf6633e36317be5cc9d19214aeeff922a0eb44a7ec9c2518a3536a547769 SHA512 05ead91f69341923de9634d7c9625ca8a93a347b859572b86112eb3948feb1617b74148263e2ccd17f8ad428dc2333c11072addac83cb45f69a4634605dadc16
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r2.ebuild b/dev-ruby/text-hyphen/text-hyphen-1.4.1-r2.ebuild
index 774393ecc49b..9a64b25e6fc0 100644
--- a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r2.ebuild
+++ b/dev-ruby/text-hyphen/text-hyphen-1.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="http://rubyforge.org/projects/text-format"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/textpow/Manifest b/dev-ruby/textpow/Manifest
index 8287fe7bacb2..af3cf27a26e6 100644
--- a/dev-ruby/textpow/Manifest
+++ b/dev-ruby/textpow/Manifest
@@ -1,3 +1,3 @@
 DIST textpow-1.4.0.tar.gz 386724 BLAKE2B d2fb051810cdbe26caafae62d402ba257a644ceeb5975b1bce8858e8359026bbeac7795b264c84462cc6bd02b5a110eba70338d955ba793cec8abdf194089217 SHA512 134b38e277118cf626e3e3643e447d7c7914dc89dba527682c4d6318a0d3b96edb81a68ac5e039158058de371ab9a326088cb119069c55032de7c2f1dadffdcc
-EBUILD textpow-1.4.0.ebuild 705 BLAKE2B a101b8fb051daf7b5a20b28e1eb8794c2fb007f173d567850d9369506e27049bd05530857e2414641b73acaa6e4cbefcb1e2eb7e32bf73d5050cb1036ec033a7 SHA512 f6d60fe0dd6c38646de95684c9f50ce9a4806eacdaab943bd22ea74d4650e3fa99adb7895be569080e93a000516c4c2f31eecfb3c97bba5e35e8a5a29624ce38
+EBUILD textpow-1.4.0.ebuild 694 BLAKE2B ffdb7b854477b946ac89e3eb86afcbe76d33929cfe550579dc30afe28e4ae8a9b4f841dab9146dac1b410a22f1db8a25874b5531901471b9027fb05b03c3cc18 SHA512 dde6e22d6a500b5840b206c738d7ab6df12239dcae97ba8424293329b4c07dc81c9bdf0f42ca360a105d890258e7cd168b8a1c24f6c78964c725d10b390fa18b
 MISC metadata.xml 341 BLAKE2B 383fdb5f393623dcb98c457af70169f516cb868d8baa65ba26d3bdc4a7c8b863f15aa131a93edbecfb5ad1a402618286eae5364ea30d5972ceb530c7d5bfcd1e SHA512 63752ac0e90d7b5b58d10ab67633b84c62515a7f9e5f106e40fbcb1daf3ee7a8669fe156504017964eca39827f8542c1519643519ad85dce69ad83f71b306c8d
diff --git a/dev-ruby/textpow/textpow-1.4.0.ebuild b/dev-ruby/textpow/textpow-1.4.0.ebuild
index 15a0eaefc67a..42a516cf0db0 100644
--- a/dev-ruby/textpow/textpow-1.4.0.ebuild
+++ b/dev-ruby/textpow/textpow-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ HOMEPAGE="http://textpow.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/plist-3.0.1"
diff --git a/dev-ruby/thread_order/Manifest b/dev-ruby/thread_order/Manifest
index 0b3d87f159ca..2f863e969e2c 100644
--- a/dev-ruby/thread_order/Manifest
+++ b/dev-ruby/thread_order/Manifest
@@ -1,3 +1,3 @@
 DIST thread_order-1.1.1.gem 10752 BLAKE2B 2d4677fa1f58cad02697d7946ec57080622deea6853b24d176cd3d77d857275d0f7b97a8701620e4afc7c4658de51a889b72fd7755c8edae03e00bf9b9b560ab SHA512 6c6ab86f7d0472d503107a7c58f84f24948e9418b00ad0076be40ac667f97f1cac78b1cc23692e73e37e2b3ebe1e2ea96c1b95c08d97984944860522d278ef25
-EBUILD thread_order-1.1.1.ebuild 815 BLAKE2B bc14c421eb08db8341b43681b400c4333e3f9c80449e9fb00289b722d0421339e934a0ad9d2b0a1370546fed22b153319ba995a7a37de33c199aa81d007bb6a8 SHA512 d860d27870bcbb5f7693d8dd72b49735eeef542d0f906dcc97dd9e8cbc90f4626923f09072f73bc736ae8ba3eab6ae5e4ad4883a2b470239f97456c5e2ec8961
+EBUILD thread_order-1.1.1.ebuild 804 BLAKE2B c7b09f40af56bc60c1d227c42fd1957645f85c7f415c20ca63f41680092cd9b2f93fa228e356e5e979b84d305bc427ee5854256dedafb5d7e74ddc1c66f6e523 SHA512 32bf7d3f17d011a1ee79cc42f49ea9f8992dfe9ec05fc2c0338343fdace43352ec67f28f2128f5d319e908004cae8b9f2110888a2c8fb280229ec2b9e3268d37
 MISC metadata.xml 348 BLAKE2B 7921753d82a3bf12a78fd7e3d648800083c61fa6297bdb5a415cc7275ac01d14f1ea1ac6b4c470463b30b728f6867a8402f6d0536f439b6caccb6052c423253a SHA512 63fbdf51c3331bbc7294d04f9e2d397791abdbcfb3f193d28824cab257f19db0685f1ea696791f82fa56b3ae76b03dff65d558d0b884d0b8c07d375dadc4a38a
diff --git a/dev-ruby/thread_order/thread_order-1.1.1.ebuild b/dev-ruby/thread_order/thread_order-1.1.1.ebuild
index 460776a5719c..8a9c1c211769 100644
--- a/dev-ruby/thread_order/thread_order-1.1.1.ebuild
+++ b/dev-ruby/thread_order/thread_order-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/JoshCheek/thread_order"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/thread_safe/Manifest b/dev-ruby/thread_safe/Manifest
index c6b30bbed802..798ed5ec3567 100644
--- a/dev-ruby/thread_safe/Manifest
+++ b/dev-ruby/thread_safe/Manifest
@@ -1,3 +1,3 @@
 DIST thread_safe-0.3.6.gem 120832 BLAKE2B 0e3a1aec1d34119dc1f673acdc3d2e18b8c5f970bf79726e4729a806a52ce6ab265fd713972065011e8a04cf2776dda871d3d747eec77b0e94235de776d0cb2d SHA512 a11808576392c068e1cb31faad706be2b1bbfa4837c655c2ab1d5a235b62b25ece62065de6b65bd25496fa827ed89eb0796b90467107df255825e01316ff1805
-EBUILD thread_safe-0.3.6.ebuild 1083 BLAKE2B 8d420062cbf5412d7f6103621ee2f52b4b42843e7bc08cb93649ec18b61ac6ef5c6b5d43d12bd35dffc76833886d02af01d58ce0fad38c565aa906821cc620d2 SHA512 11196de3ed527a66676f2a9b29c320986c2fe944ad02286eb8a87f396f2f5b18cd83b47fe1ff9d094fa795818086be1ad7b4d46d938e35ca9981384fd347af5a
+EBUILD thread_safe-0.3.6.ebuild 1072 BLAKE2B c7410102cbf480e9b7d825349d0ffef547cd1d5c41e5fe8bde4441f33597826b66b605c47a9897d00204d8cc05f9b410370d02ed5287e945f9cf3bcfe18ecc8a SHA512 9458fb5986557b5989f0406dd107039730d555b84bd975f2596209b3bbaa865da1ca98b0d4a915fa3d72b5135ba462b76a46112e67ec2950bb1ac33e67c86fa6
 MISC metadata.xml 354 BLAKE2B 00b77e62b42483c496a99390ca3e024b0d26e0a3f40275299401aa9f587e8bd3e5495522ab91a00c5a785f61759493ca0bcaf7f2a7ea71adb1c7790e669e7e4a SHA512 07164e076aa4dd3def9a69d2690b5044359562184040f63a2f09476771eddcd77d2723179c91173f877b99a23c9e24d2b6e959482ae83458c4d71cd099c1ab01
diff --git a/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild b/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild
index 5cea0f0febbe..c9a2e03f3517 100644
--- a/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild
+++ b/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/ruby-concurrency/thread_safe"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-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=""
 
 # Higher atomic dependency since earlier versions crash on ruby20 while
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index cde05be0763a..d9c1350b483c 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -1,5 +1,5 @@
 DIST tilt-2.0.10.tar.gz 51446 BLAKE2B de5c12dcf22994f182ae163a82c3060f1d0d8b4bc2a4495f28c9befc954b4949b9d2ae6aed42e3a9c35fb68825844881d9f15b2b68d949236e5396083ff199a3 SHA512 4a36c55347e307ea0c842aad3da72cebe98bcf8a0421040cfce7a43540d1746e736ce92b7ce7492a5cfc184372842c3ac7a006f3650b4c9420d5825ec005b4ef
 DIST tilt-2.0.9.gem 55296 BLAKE2B dd181295d2317ef591e9b89a0a4cf29680a05403c89c33680f563459ebbfc675bfaef14c864f8c8834103fc2ea069b33dc928f2b804d911eec21b09427f7c619 SHA512 522b2b40ca1eefc7df66cb421c66734699a2ffb1e7d1797181c2718f7ca018d3376c1a2b3617b5d3549115af69108db4c3c4632e2682329d5baf24bfdae92b42
-EBUILD tilt-2.0.10.ebuild 1613 BLAKE2B ab55bdc9be0434a2d27d1d73b58e2f0ac0cc654d9a3d616362bc1c33b2aaf2ff7fbd7c589e937a08417ebb738008aaa84553a7e18ea67f63774cb948ad03580a SHA512 16b1b7cf32bce0510082705e2e6abfc9d080e55ca9d1b47ee2553f9085424e250ee13e07d08a59f17ccc2ec217af316d4474d0c4e701c9159f54057dfa9839c2
-EBUILD tilt-2.0.9.ebuild 1382 BLAKE2B a99654c850763fdac83c330df2e1eb7e86631ba6d40e54020230911e4a99c317b2dee93c3657a18aad4e399f9d7c98aa9d68249f35cc516b4111ed823f41e807 SHA512 1c4a798add449a0f18257f72539f1defd05239f6460e72f3dd95ac887edf2ab72a1ea4814fb8abeaee9777a241413b82bf6161b1ec83e8611716ef51aa40d0f0
+EBUILD tilt-2.0.10.ebuild 1602 BLAKE2B 092f6cb854eb83b4eb02696e006b5d184d2eebe05510b0fd37ee4bb6b3f50d18cc39ad8deeeeb87e55a7c6346b849d091fcbc3812479521a33cd069ae3c54c0d SHA512 314e3c7393b810f7b1c9ae3a88b4dc4ce8f4fc8ba04fac8dc7d8028fb94f6c8a7faedae1f99e20fe25fa4feee273c6a50a35da2cbdd0874716aa4fc8ca73a497
+EBUILD tilt-2.0.9.ebuild 1371 BLAKE2B c6379824518eb5a02a475f72de978c7b93f5f90647bc57a09fc30728cf024315c4e8dfa1db75d35819afe260980569b6b4c081cd61c451b845f384628f9f61ae SHA512 96b2076d651ea2f24d41fdb7ea73bda07718c03a62197d46f73a5cd897edd8bcdba28f473ac78e8e52b4784823d8c3b078f5236a905bd02de9068593f6157463
 MISC metadata.xml 339 BLAKE2B d8712c61994758c250248bbd14842a7b64d7808008e3d18fac9330bdc03dcbc6e721ffbb2cb813dea148036bcc40a60c4d8b1588b937a02712eb65c312ddb2db SHA512 f9ee61c88fa51f3fed6864d91c8f77bdcb492befce86f260a49faf141d6c11fc4563e57e1b35511571ec02a41cdb8f2111bb7ee76474d1bc65d81bbace15b730
diff --git a/dev-ruby/tilt/tilt-2.0.10.ebuild b/dev-ruby/tilt/tilt-2.0.10.ebuild
index eebbc946617e..41217293ad33 100644
--- a/dev-ruby/tilt/tilt-2.0.10.ebuild
+++ b/dev-ruby/tilt/tilt-2.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rtomayko/tilt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Block on some of the potential test dependencies. These dependencies
diff --git a/dev-ruby/tilt/tilt-2.0.9.ebuild b/dev-ruby/tilt/tilt-2.0.9.ebuild
index 038ceb3d55ea..76abbec81e89 100644
--- a/dev-ruby/tilt/tilt-2.0.9.ebuild
+++ b/dev-ruby/tilt/tilt-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rtomayko/tilt"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Block on some of the potential test dependencies. These dependencies
diff --git a/dev-ruby/timers/Manifest b/dev-ruby/timers/Manifest
index d41192dff8d0..359e8ffb4efa 100644
--- a/dev-ruby/timers/Manifest
+++ b/dev-ruby/timers/Manifest
@@ -1,5 +1,5 @@
 DIST timers-4.3.0.gem 14848 BLAKE2B b6dfa758b8b16fbc2a28da08df05ade4551d398cfcf1ce09cc080dac4ac6adda4e741a9c5dc89d71594fbc81e5b55303556b012b03bd836ab1f63f0565acafc4 SHA512 6783424cf79f7f36292198621f93e17540e93011146c3a33b1b14a118c31a508352e56e479e3df8d9692c6f95b366561f27b374611851e88ad3fb6bbd1606037
 DIST timers-4.3.2.tar.gz 10741 BLAKE2B 2f04c012f161c3af53103e5c5f05da53f089b2db2b356cb271f3ad318c2b66d78a2275665b27fb718dfeab7e8f76993637153eae193616f84f3da1c3db42680d SHA512 306669da275e26f2902c05c94fd94caf15a37dafa6dc5ec16b3780091dea72ed6c2ff41d05139244ff1191f5630d3ffbab2718e04be67f784643386ca456f450
-EBUILD timers-4.3.0.ebuild 930 BLAKE2B c6828e4f7aea7bd94ad41a536a9bf6357fefe6481f342cf524928f545ec6e609bc0ce5ce07e351c3b7c28cedf6c5b8f02078f68a4e8f467dd6a20e467a00da32 SHA512 a4343340b6ae719cc2de7a200a0eb405d957b8e3488666857bc0bc3ab54401be33aadcb38ce11bc6e000444a0e7e6bf17bd7932a71a778f2c70cfd536e7bcebc
-EBUILD timers-4.3.2.ebuild 1005 BLAKE2B f4dfe7b76492a7818cebaeff353aef8b367730a733ad0dea05ee093d7d92579875067628aca6b290b3823d017499259a8088cf282cc8322791e11aedca77d7fe SHA512 9a30e812f992c3494a2d8723320a1a8a9400bd067d50143a58937468a1141af72a8722a0a7e048fa8e412033ead52b28c0ddfe2a4fbba5cb6110910f3fad6760
+EBUILD timers-4.3.0.ebuild 919 BLAKE2B 42cfe85814a5cf7c41fe7dea4364c0cdf0ee50ced3a6f971468b6658a4a56a6dd02411aa2deee9f9f5956ac03695cdfdc77c89d65a16274fbf21df1ddfad74c7 SHA512 84a69c49e403633e94c70711c87377189379c94e62da1fb7a700ca743913f3fd9292b5bdfed8b016b880514b8d5479ef79eeebd37592fd785da665eccf725da2
+EBUILD timers-4.3.2.ebuild 994 BLAKE2B 9d61e89a9a9122d377e21a94b384333597a396e5d30d35c63da2c9ab129c3000b02f874d9d589cf68d31c140a354ad07ac39f64393c33407fa0f658f573d49ac SHA512 53311694a85c03106eab363c9729e0729bf084531f9bb6e878a70e1277ea5d7e9cee110f052b3414ef7ce98ffef9b443363c9d10e99fd80e459980758085df07
 MISC metadata.xml 341 BLAKE2B dfe2c9228e7b666d6b7acb9d9f0cdaa70263a6d5960ecbb144699e62c94ded1b613a8d22f82e5125f6a2e954901a65da57bd432823d922d17164e273b809d8a9 SHA512 b863e101e06e7a8827cd6166688dbfdf77c5bc84203294d0ab63315fe5b5b03fe1898d02b9f219bbbb3f3cddd3d5185c34d9e4079bd993631cc849eae9ac9be1
diff --git a/dev-ruby/timers/timers-4.3.0.ebuild b/dev-ruby/timers/timers-4.3.0.ebuild
index 20d6276706bd..7d21bb818d26 100644
--- a/dev-ruby/timers/timers-4.3.0.ebuild
+++ b/dev-ruby/timers/timers-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/tarcieri/timers"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/timers/timers-4.3.2.ebuild b/dev-ruby/timers/timers-4.3.2.ebuild
index 33868f0c914d..fe52c2bb6f01 100644
--- a/dev-ruby/timers/timers-4.3.2.ebuild
+++ b/dev-ruby/timers/timers-4.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/tarcieri/timers/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/tomlrb/Manifest b/dev-ruby/tomlrb/Manifest
index 23cacc3c12e0..4f65755521a0 100644
--- a/dev-ruby/tomlrb/Manifest
+++ b/dev-ruby/tomlrb/Manifest
@@ -1,5 +1,7 @@
 DIST tomlrb-1.2.8.tar.gz 15897 BLAKE2B 536eaf3a2cb2b7e54e91aac28032b95900f53c0c9b10fb48129bd963e0efab1711848cefeb20c5df3bb5ea367dc375188db57b79990daf3e62f8b781477ea30e SHA512 a6f8a7ae5db02a8efca8ae75fc1a680d26016d221ec238e4f5ecd59bead4efff7cfe14f541a0be17ea6790699aeb7621d9a4d1b7e38a40828f8f66424fc9fb94
 DIST tomlrb-2.0.0.tar.gz 21466 BLAKE2B 9af9654b3c4338bdac210bce776107777b1b117307cbc8a5466e963c0e93f8e560644925623466b2a2b420fb27976dbdb665a76b753ce06920bed862affd1b71 SHA512 8f8fce4fd70b5dde51e42b0a678ef68883e0c0819f26d647745577e38b761f08d128317d392ad1c905cabf485fb8c7092866aca01fd23ed1056bf94d2d7f77fe
+DIST tomlrb-2.0.1.tar.gz 21386 BLAKE2B a9f50d800f7e55c6e6e69fe0a68d1ac843d4aa3b1b68e50c86eb03209c2dd9239f2780fb03152a8638198bf8474593f815025106935a4d81befb5e342f9451f9 SHA512 9690b5689d37cc4634e65a906b1c0bb3692afa96fd92e2dd0d487f2f16dacc64e992e114822edcff270b3ddb8bacd2c6e20e2d12112cd8641c5190ea6ee4e4db
 EBUILD tomlrb-1.2.8.ebuild 631 BLAKE2B ae1d34905e9652014656876580119e2f5ad9e3ec8c44d23f2ddf8540e32d811cd2d7d73d2ed47caa7cb7bd85e7c9da6e2676d6882535c87d0e28768cbe8da3b6 SHA512 c27f38713f2f4328c04a5c702779f6d4479b2a66e518975c746076d896f47ea738ba3158ae4657048cab93d5907962ac0137574704874c9c01d2b04730ec4ab5
 EBUILD tomlrb-2.0.0.ebuild 643 BLAKE2B 85b86346079f79e213daea9b45ae3243ad830e83084680aa763026dd807185f9b31cb5249c359b8c93b2a67ac66bff2a6ce1910209e57a0b5b4221cc86602853 SHA512 372b7d32d1a37ccde7394e28a9e2d2aa25db876e7a3a7214ab99464fb9a8eaf0b27917ce8860cb22ff63040014a659a181d8e4077b323bcec12a860444bc3eb7
+EBUILD tomlrb-2.0.1.ebuild 650 BLAKE2B 3ea56fac59410e24774252404adab23682743cc8f120ba73dfaf6e4ed534e4583393e424d0edce2b2b1f5d6d2f3812debb57dd85aac2b1d8fb0b7c80402dba09 SHA512 8a127d5b749793910b9a2a93bf124bc4bb9a003bb9cf512552ef52bcbc56da08e3a85de8d6a619c71182c9bc513bc10a2981fae61a01512554090ac6ec568690
 MISC metadata.xml 341 BLAKE2B c6a4acddf424e345fc8c0b852b8be8ebf595948ff538a2b6367aed370499c9b4caa963c3f077189c7cc10946bc32e71cf3cb8e4fe9ea7a274f888cb47880cf7d SHA512 3316b67122f7447128fb5aabb66af7f0fd1d7d3d896d8e27708c345297d41aee16383c6012ca3c6b3eb8e2ec78a6343b68cd082ab2db4fb54a5b09d10a39a3b2
diff --git a/dev-ruby/tomlrb/tomlrb-2.0.1.ebuild b/dev-ruby/tomlrb/tomlrb-2.0.1.ebuild
new file mode 100644
index 000000000000..74ba70c9f65d
--- /dev/null
+++ b/dev-ruby/tomlrb/tomlrb-2.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="tomlrb.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A racc based toml parser"
+HOMEPAGE="https://github.com/fbernier/tomlrb/"
+SRC_URI="https://github.com/fbernier/tomlrb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/reporters/I s:^:#:' test/minitest_helper.rb || die
+}
diff --git a/dev-ruby/treetop/Manifest b/dev-ruby/treetop/Manifest
index aeb4b60a1344..3a476e391169 100644
--- a/dev-ruby/treetop/Manifest
+++ b/dev-ruby/treetop/Manifest
@@ -1,5 +1,5 @@
 DIST treetop-1.6.10.gem 92160 BLAKE2B ff3b6f0a92bcd2ad279c186e3a3eea72aa8243a89d4a1382df6322d73a19b79bede6c9f5c443644a5011b755a673bc9592f964cf61ab68fdd9f2da2dfcc0be94 SHA512 adff1cf93d1ea071be948437e3fd2800c2e892d1dac49d4571a89336773e012007abb1b4e15f0a86031077c46a6667f8fca8e22920e5c29186e0c3227b4d82ee
 DIST treetop-1.6.11.tar.gz 103827 BLAKE2B ccc73373f2e44a95b872ae9f2f32f090363b218eb139d65a4e72c5595d99d5cc3ea7071527f0954aa6b63bc8d5562b0e932ecadec3de962269b3031d1f449b6c SHA512 649310b5c69bb963fc04a597d7aad6bb45deec34c3a46a193ee16203a07aff1d221732b6c7343d68fc772be44522db5f445a45e64bee5ac385ac2eb70abde14a
-EBUILD treetop-1.6.10.ebuild 802 BLAKE2B e5a6087d4d7bb3de132a56dd9fc3d74089e8d538d97d6c5cb5448255a95aa27984432698545116980c251400eb2f1a4dacaf0bb3783ce5d1075e9bb02b6b594f SHA512 c01501a52588565c5995ea037cef72d1bd5c18d3773bdbab36a0d88a9adea7079a3b8b6ce7a5765856521b5779dd2928ff1c0f21b22b243aa69c5699c14bccbd
-EBUILD treetop-1.6.11.ebuild 978 BLAKE2B e2133d9614ad8d3cfbdcae48cf0fafb1b1da5c10bd4d6f909482c556b4181ab2ff3b470437dbcab9b98aa2960676fd40bb8df1523454249ca9c97cd1cc6b56a9 SHA512 5c583afab79ef192bff579c22bfeaf3fca7a519e6a20e62e87ca089d1584e467622aa66d7d9b4bd18147dca1c13f7f75e08be7900d3675896b2521e9d9cbb5ce
+EBUILD treetop-1.6.10.ebuild 791 BLAKE2B 7ef5ac54c2a0dc68c4252ee29a09c0f39373ac05c7a1809696693edc410be8474b13e72f8d06724148d090ad2ffdca187ffec950e0b95f0549532c2775ea071e SHA512 384f777d7f63e480d07636ec62d1b844d1a2b174da966be303b54ac29ff5c09e9c135f8996a0d31f55bd5027afb8e6c2901447a4b981bb3fceda223a3f1dd9f5
+EBUILD treetop-1.6.11.ebuild 967 BLAKE2B 35709d362f9ce9205e113f1b7005b030a4541f9d2504cefc43e629668dd8b3d2d82f9fc32c6d030c468749f6420054ad0582d5eeac94e743fb4fb570fc0fc075 SHA512 c62034ea6a71f7039d4456a0f14f234c43a1b380dbdc16ded50b2cf9d3978b4898a2e0152e9afa954354b18ca60ca0e3f26c85e18478881f96ed645b907281ee
 MISC metadata.xml 341 BLAKE2B 56ec962d821e9e80edb0a650e3f65f9cdfc8ef0bc866a378cfc285b4bc83b9f705f6cb33e54b53fdb25d0b9e96622c382fb972540fffab4e0a2ac9199212edda SHA512 7bbdf48696d2aa4cdfecc5ab84251ef9225ff2ed0dfa9fb1cd2a827b2da3f74e684642423546b0e9e8f182ff155c0963632e1194de284470854e53dce2a2e45b
diff --git a/dev-ruby/treetop/treetop-1.6.10.ebuild b/dev-ruby/treetop/treetop-1.6.10.ebuild
index 076b0dc7f933..2b94320d71b8 100644
--- a/dev-ruby/treetop/treetop-1.6.10.ebuild
+++ b/dev-ruby/treetop/treetop-1.6.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ DESCRIPTION="Treetop is a language for describing languages"
 HOMEPAGE="https://github.com/cjheath/treetop"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~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/treetop/treetop-1.6.11.ebuild b/dev-ruby/treetop/treetop-1.6.11.ebuild
index f07ad2d31c01..ada40f418c14 100644
--- a/dev-ruby/treetop/treetop-1.6.11.ebuild
+++ b/dev-ruby/treetop/treetop-1.6.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/cjheath/treetop"
 SRC_URI="https://github.com/cjheath/treetop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~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/trollop/Manifest b/dev-ruby/trollop/Manifest
index e74b11b7173e..97209e1056f9 100644
--- a/dev-ruby/trollop/Manifest
+++ b/dev-ruby/trollop/Manifest
@@ -1,5 +1,5 @@
 DIST trollop-2.1.3.gem 30208 BLAKE2B a5fd19679821c55459cf7792f3ec26b8580732e84107f7a3519dcbcf1729ce48567ca2d35346b3e27d3083a3b6cae160ded8c18a118cb04a7a6e60c82bd91e78 SHA512 4d172c6d75f40edb36c353d2e32afce10b012f02927772fa201256126f88c62adce39400225434a80fd678e1cad703e3d3f32cdeddd150287a44ff81a2fca819
 DIST trollop-2.9.10.gem 29696 BLAKE2B f69b1ab8ce166f9fe6198e177266ee86e38f3bed4c3a55529705aedc4518cc04a48b9bee4463887fc4ac1cd04cad98d35c298265ad1433ced11e0ff5bc1f50ce SHA512 21a0db09d480353ff846a1311b118e0b0db4ca13a559dd1749c1478eff7080dd04e5308dbf1807215eadb68e276c991970b23357e9a3497acb9f705f7f77253c
-EBUILD trollop-2.1.3.ebuild 735 BLAKE2B 90e39fd42fb986dbc6cdaf01535d720861873844d56dd72523ea1b6c02041c8fd4f2f30f995f66db6f463f1f09ce549826a0495769b36a4983ec89e24873b35a SHA512 3b657696a077e19b966148b06218aafafc7b62de7166588ac3a6fbbe4f98e4771d08e9fe447c4dff496b3e7c5be94a1fda4d9e6438e6041e37f31c7834400121
-EBUILD trollop-2.9.10.ebuild 705 BLAKE2B 5b223e863c1403d528445d8b0da47756d967465463e11a6ea81beaa46360c478b069670c743a9226ac3ff1cd14602e8bbbde9dde3fa8b596627bc404750cd371 SHA512 8c8061c05b6eea7afa76c48bec6b1e68738a1aaf997848a8377ed1da057f21375a044fec9381325fc51ee97c1a17516f33332cb3114152ed731f0e14c4bdfe36
+EBUILD trollop-2.1.3.ebuild 724 BLAKE2B 86f630a652aa6cfbac5cd5e0369802fef91f4a0b2796b0c087857a8468c8bf82a8171c45043c1b6ce8ac75f03605296b611289eed1541b04b13b163e198ac379 SHA512 468deeb6528d1e5dbb3e0a53c97dfd07c51a119ce554c9fbae55c88c3437f808397fc316c49d2a3df1b313dd8d3a79c2ce863dc593815fe5fd7d6ba9f5467a42
+EBUILD trollop-2.9.10.ebuild 694 BLAKE2B f3346382e526dca7a74d12e0988aa8d8d17ee07bdd6ae792e666d82abdb26614e3a3c5b5e599c786db04c5fe8cf0b89f5f21f03f4e9695e081a38b98266595a3 SHA512 7d4311d92d9c933ef1612f5519b4acec5b3d5d40df80dff9db24eaaf20e723c728883e035edcef7fa1192023ca1a5a6212b7021f569e3d950ab6483c72e33641
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/trollop/trollop-2.1.3.ebuild b/dev-ruby/trollop/trollop-2.1.3.ebuild
index 0418fcc96901..6c9feae95958 100644
--- a/dev-ruby/trollop/trollop-2.1.3.ebuild
+++ b/dev-ruby/trollop/trollop-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ DESCRIPTION="Trollop is a commandline option parser for Ruby"
 HOMEPAGE="https://manageiq.github.io/trollop/"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="2"
 IUSE=""
 
diff --git a/dev-ruby/trollop/trollop-2.9.10.ebuild b/dev-ruby/trollop/trollop-2.9.10.ebuild
index 5a12cb710493..c822e14eb510 100644
--- a/dev-ruby/trollop/trollop-2.9.10.ebuild
+++ b/dev-ruby/trollop/trollop-2.9.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ DESCRIPTION="Trollop is a commandline option parser for Ruby"
 HOMEPAGE="https://manageiq.github.io/trollop/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="2"
 IUSE=""
 
diff --git a/dev-ruby/typeprof/Manifest b/dev-ruby/typeprof/Manifest
index 54cc9edc5fbb..3cea5f1cb88c 100644
--- a/dev-ruby/typeprof/Manifest
+++ b/dev-ruby/typeprof/Manifest
@@ -1,3 +1,3 @@
 DIST typeprof-0.11.0.tar.gz 496673 BLAKE2B 215bd738a4a4b9e7de78943a944fd63dd4f166f215a493cdc89270e0452453683d3fdd1f71ccc05f4399f61e120248a73ed9b77b5b24ed4aa8b54e97d9e0073d SHA512 cc64bd805c57a16c275ba5622df08ff30fd64ae82b18e29fb30e03d17a6ca0e889c03696c745597bfec6444290f1f33020c4bd9c49a02fc3053add33e3e60084
-EBUILD typeprof-0.11.0.ebuild 950 BLAKE2B 34b26b92c34cb16712bdf7245e137addae635b903348b7ae10e9f4f3ed6d14c95ba0bc641e76eae9d97583888e26d8a143df48337bed08121839625366cd1c17 SHA512 556c2bbaf1bba98b93ef39aeff517aa758629fc1420d10ebf35c37d2c8d2206b4e1e7788d560b5b7e6bcc37a70af691a44200159de9e70b7d3acdb841b54e4d3
+EBUILD typeprof-0.11.0.ebuild 939 BLAKE2B ac7b27b3b598a3800d56d93d959d4579f7a861adfa7f472651267db0184b9c38f6839220a739aedfe079437c7bc0fe2f7e909c89fd5c4c4f9e65ce5aca4158dc SHA512 db5acedf0051b6607584ce5290b695e6cfef8ebf564adacc12201cf39e0b87b72bc395686a0e3bf73bd1217ed5494439138e2d3ee5f4871fd3df8abc09331742
 MISC metadata.xml 339 BLAKE2B ca2bb0c0a59ddafbf4c57b268985a52e02a15089f6784cab9dfa3aa6645275c51df7a95288d2464e357a2a1f9a53735e9e9fdc13195a7383eba5d821d89baa2a SHA512 79d803bea464c53a176d07b5bb9bba5d434b1f24a97e8091fd85fb36a842abe93cb0adf82ccbdbd1ef7adafab3210f4bcf80a79c99b0a792869360f7e47e6b70
diff --git a/dev-ruby/typeprof/typeprof-0.11.0.ebuild b/dev-ruby/typeprof/typeprof-0.11.0.ebuild
index 6dcae41638d8..620e94ea93ee 100644
--- a/dev-ruby/typeprof/typeprof-0.11.0.ebuild
+++ b/dev-ruby/typeprof/typeprof-0.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/tzinfo/Manifest b/dev-ruby/tzinfo/Manifest
index 9edeb2fb7e7a..56796ee48ca6 100644
--- a/dev-ruby/tzinfo/Manifest
+++ b/dev-ruby/tzinfo/Manifest
@@ -4,10 +4,10 @@ DIST tzinfo-1.2.8.gem 166400 BLAKE2B 67f116171a6cfd2680c5eeac3cf7a034b446e973f26
 DIST tzinfo-2.0.2.tar.gz 213501 BLAKE2B 7886ba84257b85104073445d0948fd5f58985fa0f5f85c1ec15978c6f497fffb9bd997a0bae1313d697115c487c069dda1b7e5dd4ec2c7580951d0a8ddf8d623 SHA512 a0c71dd9299e84bd71a91858ba8c12a0ba00c625219da1172d5cd1dfd35318ce8a83e59f45489c2ed5161761e1c39834ba63dbfa189acb100ba37ceae842668d
 DIST tzinfo-2.0.3.tar.gz 223942 BLAKE2B 975c2278ba86c7aaf11cb870b12fa41a9fb3eb8b8b87628bcb0b09f54d7f2490b2d9864dd411f646f20c3760ed0949a8ee4266c28a6b0607927e9807743a9f13 SHA512 c9e94af668217226533d2810b647cc7a0d0a553177ab9c4102e5676fa21d4384e833c887f5cb3f9c00cf738763dcd39b25d991483641426c407237938e076adf
 DIST tzinfo-2.0.4.tar.gz 224673 BLAKE2B 0c7ef231767b6fc00cf95b3e1c2037894b14dfe832eaedb3f4b7c60a884ab6f7121243af5b62acf47d02da28395e7390f968421a3a3a2d731deb079e9fc51bfa SHA512 5b2ec73f737009ba21dac7dbb9504235fdef14dc45a6450e1218ba9e53dd29735ab4fa6c2854271916cc5c0244e09ae7ab19467408b72b9b82ca238e14d3fa4f
-EBUILD tzinfo-1.2.5.ebuild 1062 BLAKE2B b1368ba23bd2e4eb2003eadb11fb4697c0349eaba076169929ba8acff26e12295c3e9fc501b8db9877c1a46707f4dbf34ffb8cd2077ec9a18509ef943b79df9d SHA512 615494ec0f377c5ab47992fc2cd660933aff560b7b9b3ac36137fe6f7d134df7503409994a654596285fc12fc3fbb3edde6e21247a6d24ec3fbcbad00853a8e1
-EBUILD tzinfo-1.2.7.ebuild 1041 BLAKE2B ff9248b33054054ad5a24df6df40456ee4c47f985dfb2450e10117c612fc1680a0523021a71e41da676d8161257a0c4f6dd7b88108eaac9163a3ff8835d93e4d SHA512 909f0fe46a327691056eefefc5ee0a40f360e308eedf14336c57c0980b381325dffc5a26f8f5418864e3e7e5def53154a473560a79a83c753e10306dfa8e076e
-EBUILD tzinfo-1.2.8.ebuild 1034 BLAKE2B f2057fb51267ed0884ca73e288d8f51710f13a3fe2d51b9a64f8a6172d50cb0d3ebd0da2ba3830ffacda63db7e72ea77e69e38353485b2908fb312734f611bd2 SHA512 7df0b6b03ba279768f1c36e0ca57029e5fe7d28754c1cd470ae4595a16647852b3399f9f3fb6fb2cfdf9c74bc7bbd237d7cc4dcdccc81fa1e107210f5ca0ec6d
-EBUILD tzinfo-2.0.2.ebuild 1436 BLAKE2B 46069296c733f7968826499a3f03155ac027185e9961993ec49ab20e3d79b74c694a2f7a5b005285a6a4c18cd1aaec6f12a1d172a21679290a6956b053b7d446 SHA512 cdc9d83064ea1929179081f6849e1c857e9ce5db2209ff7b5c6c9faf6415b0d7f8cf754e0f205baa422e20af44b02b9e44e29bedd827f59bc4fe8f642bcc6b2b
-EBUILD tzinfo-2.0.3.ebuild 1429 BLAKE2B 3d67d2dfba06ecb16f5ccfa9eb58e74bc4eba774dee00fec47e512c29f7c8e8e8e0d00ca3a50555f2dba9c2284fff18827cb3766b11fcb8789d1a05528f8edd7 SHA512 a6dfec51ef0fdcf46e1904698cd3acaea952cf56e6f179cfa8b862c84be641cea807ba33f4eda1df6b78407c8b95f52d9d9ee7e635fddc9a31dc4525de2ceade
-EBUILD tzinfo-2.0.4.ebuild 1429 BLAKE2B 3d67d2dfba06ecb16f5ccfa9eb58e74bc4eba774dee00fec47e512c29f7c8e8e8e0d00ca3a50555f2dba9c2284fff18827cb3766b11fcb8789d1a05528f8edd7 SHA512 a6dfec51ef0fdcf46e1904698cd3acaea952cf56e6f179cfa8b862c84be641cea807ba33f4eda1df6b78407c8b95f52d9d9ee7e635fddc9a31dc4525de2ceade
+EBUILD tzinfo-1.2.5.ebuild 1051 BLAKE2B 1aebe08a8a828f4a2de3ef3d3d8fd96d0427741207659219a8fbb0e630629fc377ef25c12cfd54a8975946003fc260160773cfe7c999334e68aa725e1f5a7d2a SHA512 89c21fc54b9ca7b12a7f8e7d4e3a1a9285a44666b621231194296693288ef2f9cad72bcf7b13a617c85bdcac2f45d14c1a382698ea8e61a7b3f840d0989c6d39
+EBUILD tzinfo-1.2.7.ebuild 1030 BLAKE2B d90b21887564c14bb95c3367ab374299ad167119b58796a0504a1ca5cd075d1cce46847e7bf366cba03e066604f07d93a30642cacebe36fa669146c94b6df7dd SHA512 3747929ed565c22083cf75fc82cb1f5df58136f342df05d7bca0f13ffaaaf9c63cc3fe5e43bafefbf6d0138ac8c611961b96250ad1f30621535ac3a8766a1727
+EBUILD tzinfo-1.2.8.ebuild 1023 BLAKE2B 3c7a9d1b003d817659cd17e32d6ccfab73b576369606b7e786eabbdf41df3c59c61db766d6a5ca2e790bd6779678b06543994b3488d994ed047153480ca108a2 SHA512 2cf403232ec92ca991e6440e1f9b110d20e7ec354d0a4ac93e535b091d8cb2efaaaa18483942c8c1c06f0fcaaae026201887508a6ea64b8c08e932fd6be6fa4f
+EBUILD tzinfo-2.0.2.ebuild 1425 BLAKE2B 7aeb10b7a8053cb37b6b073d963daa058577d9d31943149569612c17bf78dd171488b9d6bc9ec994010fcd2046dfa40f58cd27d9e049d2ae224e0cba3d2dd9a0 SHA512 2a4b4f2bb0612d322d6c1820a13caac6a5725d4609b86e77d9ad498a272e30c08c9b17a1e042d9dba4cffc8062fd9a840649d8d585d8bf2fb79654c7784c5184
+EBUILD tzinfo-2.0.3.ebuild 1418 BLAKE2B 3267bc8cc7d76e7f1a132b4fc104039427a3a7c59310dc16075ef9fdae69368966bf047cb78ebf9c9afea88d9fba8c50bd4f6c579681bc5b4f7253d0b00f5506 SHA512 68b677e38eaa3d102e0febd1acda4fef376d75798acb5af89ca1a4dd55d9e219d4dcf0ddefea643de9c447343ccd5a4ec2a8ab1232fd8a2eb5be70515b16767a
+EBUILD tzinfo-2.0.4.ebuild 1418 BLAKE2B 3267bc8cc7d76e7f1a132b4fc104039427a3a7c59310dc16075ef9fdae69368966bf047cb78ebf9c9afea88d9fba8c50bd4f6c579681bc5b4f7253d0b00f5506 SHA512 68b677e38eaa3d102e0febd1acda4fef376d75798acb5af89ca1a4dd55d9e219d4dcf0ddefea643de9c447343ccd5a4ec2a8ab1232fd8a2eb5be70515b16767a
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.5.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.5.ebuild
index 9d6cfc232fb7..69092df7377e 100644
--- a/dev-ruby/tzinfo/tzinfo-1.2.5.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-1.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ HOMEPAGE="https://tzinfo.github.io/"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/timezone-data"
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.7.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.7.ebuild
index 61bd4fe80efe..fa4dfc2dd0ad 100644
--- a/dev-ruby/tzinfo/tzinfo-1.2.7.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-1.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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-1.2.8.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild
index 516750d24591..a45b6afdaa73 100644
--- a/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-1.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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.2.ebuild b/dev-ruby/tzinfo/tzinfo-2.0.2.ebuild
index a0ab789f483c..a4afd6bd1f77 100644
--- a/dev-ruby/tzinfo/tzinfo-2.0.2.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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.3.ebuild b/dev-ruby/tzinfo/tzinfo-2.0.3.ebuild
index f95e0c59ce27..755cd034b199 100644
--- a/dev-ruby/tzinfo/tzinfo-2.0.3.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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 f95e0c59ce27..755cd034b199 100644
--- a/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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/ultraviolet/Manifest b/dev-ruby/ultraviolet/Manifest
index ddf05710b7c1..dfd195eb81b9 100644
--- a/dev-ruby/ultraviolet/Manifest
+++ b/dev-ruby/ultraviolet/Manifest
@@ -1,3 +1,3 @@
 DIST ultraviolet-1.0.1.gem 46592 BLAKE2B 2dd9b69bafdb83c321eee2c4fed9a39782959893993bdd27d3c1ab8337ac1f9a68d8cf7cddbef12404041d541d183f0bd205a4c36ee4978a2c0a631d0df3fbce SHA512 f974f95743b56d7424c8ac96867c56f4d849247ba552bd09ba8893ca6520758ff2132ac46a42f22b8547732bd148531d177a7d38522fad1dfb86d54ffbb29861
-EBUILD ultraviolet-1.0.1.ebuild 706 BLAKE2B b8f94548418da69c3376b16a0103c729e451b8d6da44ad8ae327f7572328713bfa099cc9cfebd8fe03e04c0c4d76864e551620c8aebb007d87fe5e27982fd18d SHA512 ea480e5a81161c5d49e32a7a3c778b0057db4c8f0e511693b5950ee55d909d79cc040abf0478b0e75bf820da681c1889cddebad938c053e38e9f47cab9c50049
+EBUILD ultraviolet-1.0.1.ebuild 695 BLAKE2B 44b745ee8a8355ce7c6a7a925f664d863fd0b93bdb959fb967f39d929a66c34eda33e937a9b6d86ed258e616ffdb83e2977b7ede14e034ee994daa611fbb57b3 SHA512 b4312d8add4fa39e4250cef979e10afa1130c6acf79a8e57a36d28f61661ad4761b432d8b9a51f46499b389257e1b43c5ec92d7579bf621bae61fbc4f4ea663d
 MISC metadata.xml 345 BLAKE2B 72aef81c1274db29f1898e20cf4a298d017000f8cc2842be7066fad3600feb955faaa0a0f8361fefd931395a252ffaf43bcfc0761074a1a8ddc6ce150ca26c36 SHA512 3cf569bd61e3369a5b1ebfe5c45d01df67316bdf5aaf429514f68f89e2aa526a6bb7460a970b906c8845c3f04d25d35151d986ee72e3f9509791340576539391
diff --git a/dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild b/dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild
index 388c85ac1ee2..202f8f346d5b 100644
--- a/dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild
+++ b/dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/grosser/ultraviolet"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend ">=dev-ruby/textpow-1.3.0"
diff --git a/dev-ruby/unf/Manifest b/dev-ruby/unf/Manifest
index dd4d3fadea9f..1fefbb2b05d4 100644
--- a/dev-ruby/unf/Manifest
+++ b/dev-ruby/unf/Manifest
@@ -1,3 +1,3 @@
 DIST unf-0.1.4.gem 120320 BLAKE2B ab339ce957a1d3251d14944ccb4f68a9c7271f0f918f20b57c70824ded730fa18abb5078312d9820e7ef056163b5f1340c1cf72974b6c255279dcf572fb3e87a SHA512 a4784afa8b852497f758d1b6cdcf095eb9e5397a36c97b1f22b53cf8077cfedbf83fdcda36f359acf59ba61f1ab8b706ddd31d097afbc98a40d2dbd0f934292b
-EBUILD unf-0.1.4.ebuild 1179 BLAKE2B 31457ae75cd8526fedd0e3c94f7f24b321e646da485bccd1ceb46a98b9a57b27da0c3865780714dbfa01f990841f0ce4fc0beb07d8fabd9c30d96a948ca2f463 SHA512 eaa7c637efe8d0bbeb26f5d7dcea10037c35242e0be6e7908dd930c6a7aa41a7137302ad9e6584fec0817d310cfced01af617ccdc0ff6ae55d7181e8d961cceb
+EBUILD unf-0.1.4.ebuild 1168 BLAKE2B 88c4a3a64b117e0ca32845ae6de32f0be82ea63e461fd807be105ff809bd56b982eee250f7109cf529e6f8e94a3d5df7e73bd47c92779f5b7e4ed46cc4ff655f SHA512 639c4a754e29688b9d9b11160c19a84403df3a07196a21fb06cadeceb7e93c744e8f541b1264fe5f34425d6a381bd61d0ea0f95b1546ac5edcd544df9661d119
 MISC metadata.xml 338 BLAKE2B bb58c8e1fade253376d76c2d310ad6455b8495185859dc74605cc8455f7f738eedf03b2a7a092d0db4e9ac06f04e885ae154d06e599fe8720ad50c191e61d37d SHA512 a3be34f62ed4475626a8b984fb80cc1f502798913eedcce341951640e27ff408c0c915848b40c7ab692940e6696a37769389657cc6c996f161c0f75f42f75683
diff --git a/dev-ruby/unf/unf-0.1.4.ebuild b/dev-ruby/unf/unf-0.1.4.ebuild
index fefa703c70a0..99f5bc5c6a55 100644
--- a/dev-ruby/unf/unf-0.1.4.ebuild
+++ b/dev-ruby/unf/unf-0.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/knu/ruby-unf"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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_ext"
diff --git a/dev-ruby/unf_ext/Manifest b/dev-ruby/unf_ext/Manifest
index 6b9fb06359e9..23ee200d5321 100644
--- a/dev-ruby/unf_ext/Manifest
+++ b/dev-ruby/unf_ext/Manifest
@@ -1,7 +1,7 @@
 DIST unf_ext-0.0.7.5.gem 398848 BLAKE2B 3c7b2a6765360f59b7b921155bb6532981c8b31fd1fcebf1adc1e113da2404fa752ef95bb385155de1a6025d51f4564e52b497c5396624a0a5e99357fff88662 SHA512 5d60740172034253fec9659bec49e60f639e93d8f147582e26a012712ec2e5fca30674efc52695def0c3cd145c5ddd93a56a6d0f854ab04e7fc81544e6aede16
 DIST unf_ext-0.0.7.6.gem 399360 BLAKE2B a805d991580ced26400194bb45d4e4ab395e4936e8416a9469443c12015ca231c6277fd5d2112c346085a5fe9756786cc18626578f0d5ed0d68544043699fa41 SHA512 c6b6bc797015875b0a3422dc1e9656eae6c42d2263fd6e73ba41a1789ac1ffe927f81d5d9874973fd8d9bd9486494efa725b081e553954121588818d454db7f2
 DIST unf_ext-0.0.7.7.gem 399360 BLAKE2B 040800c9598fb544d434e8d3336a7aa8aac2440a3386a520220252aa970c715462fcf242985527b23618dabb291db346d23afd02282f735df1fdb657e021be9d SHA512 7dc75f071be4d4f3cd44f64a26c5f63f01494f79f3585eea3b307c3e8133b17b1007c4b36915f7254e516ae7a62268be8f3e4b250dcec7a9a083b5a66582887d
-EBUILD unf_ext-0.0.7.5.ebuild 1005 BLAKE2B 35bd247b7d6cfe38a75383c259c777cf31a4a56d7dad335d8a8e8b91b8a87370b73f672e322f90f2285242ee391560ab33d2af3e25ecc3a858971c0927aa82c4 SHA512 3f25e1a76b8bbb1d18f811febc8ff47c7f7f8f599cb00e4ccd02cd0c00b0196d10923883b1cd2b7f74941f27ca298a6140bb1aa568f927255edeb3836d83b2d6
-EBUILD unf_ext-0.0.7.6.ebuild 1010 BLAKE2B e53fda842c2249bfa6c6243ad75cb777c50be9f11420d960ef7de2516b1647a7aeb34ecaee6afba7097ae432fcaf14219f3fc923805bebdcfd449a257c3fe328 SHA512 163dbacb2393a4341b260f273d79877caef62f67564d0f70dd400a9c05a0165fa19adc91b3e0289549f18518caed6c7750a0a12156a9b85cdbaecac4f295a6c2
-EBUILD unf_ext-0.0.7.7.ebuild 979 BLAKE2B 29ce7bc8cd56a326ccaafcd4348514b3ed8cc1da4684dc521ed6bf944419ff36c0b15948727c8ca52e89f36094e012716f2e111883e02f137d4a8260c80083f7 SHA512 ad497872265054efff842f01043837c2d6d689d070729a053f1e12e7d9758d1281ebc1682481e6f2cd32bad7c01093b4dd822ebea4983d974c8847d03ca6af11
+EBUILD unf_ext-0.0.7.5.ebuild 994 BLAKE2B b658df9d3ec2768561b36cee351c6b95a5e3d517d42d0ff602710b92eb47020bfcfa07523e2da3554deb98a258955f9ef9f246730446fc229b58243968357173 SHA512 cb4bbae8d085346b975f23924d91ca5f09c644234db1a30ccb34e06dd76dc9dc03d2827ea73663a5d8150eadf701a63986b95bd7fd9262c0a4f2cd81b7d14be3
+EBUILD unf_ext-0.0.7.6.ebuild 999 BLAKE2B 835e36429a40f5e131ed360a132f806803af67c2d5adb9e129b5f4b58fbc0ebae19c160c7be8a48c1b9b8205bf4d2d273464b0cfc2b50464e8d4e828b487820c SHA512 1495e04859d8397aed54c2d850554064dc8df694da4991965beabaca980fbaae60232bed7227b241e6aca1b2db7295bd68433d408bca9534329845ebfca5d1c6
+EBUILD unf_ext-0.0.7.7.ebuild 968 BLAKE2B 15367ac6659abe67a95ef1c3389f85b94efabbc158a6aadf10635499bd3cf8377c152051bb97ae9ff226016e657d77dcff19a5f1c8edae3cb6852cd9e8a70c7e SHA512 a040a56b4e13c991052974381ab016ed0df071304f0888b1ae2fb3a3ccdd86d26dc4193b646d89327a2183a95da011c02cc98ec8f7a72e9fb9ef73bf305ae42a
 MISC metadata.xml 383 BLAKE2B 8932387497c84133ae5fd8bf9e12f740b768ac4cfdda11f3cd97c0f1752318cc5988d5be87db518865732d3c0ca4ef1854e22ec8600d6a6edb8f49f25d4febc4 SHA512 4d7e6c2058a2cfe457bd149b3fe6d0a5754b414aa4c5588312daa025f1ac9a49224fedde60a8340562702c81431df381df106b9772d1f4c0113189ace801461a
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.7.5.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.7.5.ebuild
index 154080cccb2e..1f622cafef37 100644
--- a/dev-ruby/unf_ext/unf_ext-0.0.7.5.ebuild
+++ b/dev-ruby/unf_ext/unf_ext-0.0.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,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-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/unf_ext/unf_ext-0.0.7.6.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.7.6.ebuild
index bbfda56775a5..6b28b0fb2283 100644
--- a/dev-ruby/unf_ext/unf_ext-0.0.7.6.ebuild
+++ b/dev-ruby/unf_ext/unf_ext-0.0.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,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-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/unf_ext/unf_ext-0.0.7.7.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.7.7.ebuild
index e0449ed49d25..b4a6960da79a 100644
--- a/dev-ruby/unf_ext/unf_ext-0.0.7.7.ebuild
+++ b/dev-ruby/unf_ext/unf_ext-0.0.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,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-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/uuidtools/Manifest b/dev-ruby/uuidtools/Manifest
index c35270d117b8..ce10fd020b98 100644
--- a/dev-ruby/uuidtools/Manifest
+++ b/dev-ruby/uuidtools/Manifest
@@ -1,5 +1,5 @@
 DIST uuidtools-2.1.5.gem 25600 BLAKE2B 8219d559d92d86e7a87b97d4eda9454b6c203f89beb4a74ff619f51470d339c4063b1982ffb6f8acd5b9c206ac7d0dc537e968b1744a030a4f6cd629a358fc7a SHA512 c56e6329e48638bd5049d348beedec7fadb9ee7a133a5013ddd41ae98baa8213d8944903059729c9ca4f38b24d9b565b5653332685982337a4233f11d4865ac0
 DIST uuidtools-2.2.0.gem 27136 BLAKE2B 1760c3fcb193901a552b8d32acddd67a0737b95a79bde47854c11a3a6378b008b0e17339ac2e95157329314f35612adc9355068eaef90f93f4d1976fdd430182 SHA512 17f15e8816fd17d31e1296522d9c68b8da71211556c3284770197b06a6fe01f9038c1e6c6e5e8272b4290cfb23b48914a27717c4705fba17e5d9848257664360
-EBUILD uuidtools-2.1.5-r1.ebuild 1072 BLAKE2B 9d2ecff3dda258ee63637452f0ccca368ab276efa53ca086c1bdc011938f549244808b289ea086a2870cd0ce9defe36bea4a92127881b2025555a16aff5b7197 SHA512 3ce9e2e9f9ed089252fa867bd162c7abc6709184a35d1535723e9fb7fc5c0e12b184073a1eaf87dc9e75904751c9f271378758e1437a95913792178674f0e72c
-EBUILD uuidtools-2.2.0.ebuild 1067 BLAKE2B 768304ffcc7d90e9139d3fcfaae1a7e316a7628e65baf098150f9a48514a89f0a76a12543f821f38140922923133d245913a22a516792b15493ba18baff1d65f SHA512 6059207da70ac299b3dd5a76a49b79aef10fc620c95f1ea9a8e02b249a63f563e4be7448eb33aa9f663b9736a687d9b37d01b036ab504cfa5a069d4dee991021
+EBUILD uuidtools-2.1.5-r1.ebuild 1061 BLAKE2B 2169d594b43626c5fc18a00930861c6d4b6789cfb38c15f5fa6016c9dd23ca0cff76909433d908cf11bccc14f4e6b9e3aef81ce29d9407923b2306f2ed0545bf SHA512 191cd5cc2360b101cb0a4bacb043ebc555f905c8ff0598402db2f5e3814b291949037b0f7f4f8276c1856ad5a4a9af1126fbf887e9c1162cd0e6d89e67295fea
+EBUILD uuidtools-2.2.0.ebuild 1056 BLAKE2B 9e4f755c05730774bc12fd6610645117bb2fc413b58f94ca135194ba899a31a3e532dc6fc8cb799491cec8ece3cfc0cfc068c596c3f922f1ec4ecd8d0f8fbce5 SHA512 5d2afa71f2d50a25e22243c0c0050665eaddf5350f760d80aaa74d29551060e9ce6743af87c4db9cb0ecea4170476d7ff54ed15019a6f30ba9bf00528217075d
 MISC metadata.xml 539 BLAKE2B 5a99e5c959879b57b6b604bd90b1e7c91fbee2608653e4a6b6cb135012f5c964a1b07ff90f9f8702c99a639df9a143c308722df4c0bcd1e8beea2259d3e9fc39 SHA512 6f697164bc069b62ade929d31fda162c1d25e33fedc1135985cad7bdc80d256db169aa8ee3f2293a9dc56667a1e1d4f75834ca1d4b3c3310e3b26ed85079f09e
diff --git a/dev-ruby/uuidtools/uuidtools-2.1.5-r1.ebuild b/dev-ruby/uuidtools/uuidtools-2.1.5-r1.ebuild
index 7295bc532a73..19dc2e3780c5 100644
--- a/dev-ruby/uuidtools/uuidtools-2.1.5-r1.ebuild
+++ b/dev-ruby/uuidtools/uuidtools-2.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/sporkmonger/uuidtools"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-macos"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 ruby_add_bdepend "doc? ( dev-ruby/yard )"
diff --git a/dev-ruby/uuidtools/uuidtools-2.2.0.ebuild b/dev-ruby/uuidtools/uuidtools-2.2.0.ebuild
index c6ce5fcee73f..e8c48b65a05d 100644
--- a/dev-ruby/uuidtools/uuidtools-2.2.0.ebuild
+++ b/dev-ruby/uuidtools/uuidtools-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/sporkmonger/uuidtools"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 ruby_add_bdepend "doc? ( dev-ruby/yard )"
diff --git a/dev-ruby/vlad/Manifest b/dev-ruby/vlad/Manifest
index 92e1e0d4424c..2444ddf78649 100644
--- a/dev-ruby/vlad/Manifest
+++ b/dev-ruby/vlad/Manifest
@@ -1,3 +1,5 @@
 DIST vlad-2.7.0.gem 29184 BLAKE2B 5eda039d0d618950089ce743cde95c011edd476573058064d3c20b55bca9ce598ddafb352902fc48d9f4d7dbd0cf3a26b6c39acdf5d592a35654aeb8d62fcfb4 SHA512 088739f975e7b9b218b76518a690a7a1fbc534dbc169a704b769a8e99bc5efe0c915012d65a35590fb8f1a27caff4d7c7eaae325431a28ffa973afb25d5890fb
+DIST vlad-2.7.1.gem 29184 BLAKE2B eb35f357d87daaf2903ca880139ac41c1725419fb6f0e3d00e1a31fd24697373c8d4869e31d17e6dc88ce31ecad1a0747ee2ec08a31871b4c44b32dce28424bc SHA512 520ef393fdf63daa348015306003cdd3bd9b8f162b44b31d78c170d1ece466b804226b030640a180a8538c6908c77d80dcfc13078ce295a6c59f1f5b9df9ef13
 EBUILD vlad-2.7.0.ebuild 713 BLAKE2B 3f8c3675bdec38a18a637ad4c3593524230abf7ffd889bab54d57cfa70dfbe010a33eecb9caf28c7209ee33728a784729bbce89d521676f59d90eb446fe4858a SHA512 69f35eb8a6d8b57e2fab20ccfc02bf099bae19ba5ae9b67b00cdb729d2b871752ce7ed24735bbe298fa2209e710fd9c3898278fc505a13a479ab409926da2f7d
+EBUILD vlad-2.7.1.ebuild 675 BLAKE2B d1e46f2d90d31b5b650cd2b9b0d430c7d9fa6a45802d4937ed2b454f29840decc78361130ff752233932bf487f21cdc17d37af7f969f4d4a7030923318a0d923 SHA512 a42e70003ce2d8408451388dcb128eeca6746c320556a0ff4b50732be9babc05246acb32e05291b6c55d3a206b5c188c2a41152ec9a5d4134d5efc3f6c6876ce
 MISC metadata.xml 330 BLAKE2B abe60e4d34ba6020fd10c6662ea0a077627367580a1510ca6a2521b35eb94bf734f45f14811706c50887451a6384bdac1371f6da5387fef3bfa4f177b2f48c9a SHA512 8d69491dc1b3055579ce08cb43cc3c75920e6cd9e45c174f23aefe4cd0e7a3db2e8671fcbc3730130dae0c8ae39c4f7318bebf59e13346b9b47eab8f792da255
diff --git a/dev-ruby/vlad/vlad-2.7.1.ebuild b/dev-ruby/vlad/vlad-2.7.1.ebuild
new file mode 100644
index 000000000000..6b4dfb2f47c8
--- /dev/null
+++ b/dev-ruby/vlad/vlad-2.7.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="considerations.txt History.txt README.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pragmatic application deployment automation, without mercy"
+HOMEPAGE="https://github.com/seattlerb/vlad"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_bdepend ">=dev-ruby/hoe-3.13
+	test? ( >=dev-ruby/minitest-5.7 )"
+ruby_add_rdepend ">=dev-ruby/rake-remote_task-2.3"
+
+all_ruby_prepare() {
+	# Keep Isolate from managing the dependencies.
+	sed -i -e '/isolate/ s:^:#:' -e '/rubyforge/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index b8dcc9459fa0..ed7b5c991fc6 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -3,9 +3,9 @@ DIST webmock-3.7.6.gem 122368 BLAKE2B 9bc40971f1eec96d88217544acc67b7abfe6c0815a
 DIST webmock-3.8.1.gem 122368 BLAKE2B ba956c72f20e2c21cea90b107ef445e42a6995fdb31f9af65c3b561e9e1fbb9fbd299db009a1d83ddfdb473ce030d40aadf6633e23afbd072ee3b4debf7e0be2 SHA512 b1137fabb000469ee88fdd5521756f368463ee49988d5d89b51fa8352362ff249a4849159504834933e5e1248ed9b6791d254528b3cdea461fc9e8e5d92a334c
 DIST webmock-3.8.2.gem 122880 BLAKE2B 0cd10f391377749c6420d08434c8e66230612c50bdff86b4dfd098690c006426e241c32bf716e2f8b9ee6c0ce6488d1975b54f3e4cd85cc14d6c7f0880f65701 SHA512 ae6bdda341bea804257d9f9b57d17a65a25d030ee2f5a9b7fff125a5f7881a34584c6b5d26a1e6dd5a49bba56ad5b6e731defecd109e19a5144df4caf90561d4
 DIST webmock-3.8.3.gem 122880 BLAKE2B 66371028294f3b15172d718e0fa9402ad6ed1bf7beedb0c62621ad31758d25e401af9cd982a6f29cd1161a7e4d7954f6f9df22ab2e0c44c970a0edca3c0f1304 SHA512 6c845c4ed0c82ba4bb1f32d0d87a87eb945c54e159317aa14e2238b497d38282b7e81542e78c0d68d4b8d4a08e46137de84503829b7381e6d945e45474ebb507
-EBUILD webmock-3.11.0.ebuild 2076 BLAKE2B e0d14119501cc0472d662e52ce6ee0927af6226c49b565bab22e9cd7b1f61cc3345a59d432c3656776ada815ca36f7a04e5293b11032d8c61612a4a4b6d11213 SHA512 f3b251a898ff8ea6719126bd9f0f92aac54bd7b7957b2f4b995102b928252ee1363d57c6fd8a1f275906340d46f3cb0455a3b7a2c1f9f5da714f00c0bc357e49
-EBUILD webmock-3.7.6.ebuild 2070 BLAKE2B b4f563812263abafd1b423cd721397c6995c443b04690b8eb2185d5d43bf3215d1986ebfddc5d372eaae9826a3e5d099418078d03cadcd075f4ac93f61b25bf8 SHA512 ad6dfcc4b637df478a294f0915199b02b71381445a11a7b63fe5a01e98ce57b8883bfa679f62c1abc625636e36b2aba1088f3e9ab0e22b471c33d038d2efc21f
-EBUILD webmock-3.8.1.ebuild 2071 BLAKE2B c1344b73dcd9db0e7f6bcc0414e7936d69c16036fbcad709c8b28cfa6634f201fa7efc80d0545c02b81a1dc1ea6c405367371d3cf59b8dae66d9ca96c3478c52 SHA512 e10c709f08079c668096bdcc317c85d6fb80f655502fc33e003bdd30b8a4190b0621925ab0700f5abf610575dbcce6c60825fe0a64ff0f3df3e259318825d4c4
-EBUILD webmock-3.8.2.ebuild 2071 BLAKE2B c1344b73dcd9db0e7f6bcc0414e7936d69c16036fbcad709c8b28cfa6634f201fa7efc80d0545c02b81a1dc1ea6c405367371d3cf59b8dae66d9ca96c3478c52 SHA512 e10c709f08079c668096bdcc317c85d6fb80f655502fc33e003bdd30b8a4190b0621925ab0700f5abf610575dbcce6c60825fe0a64ff0f3df3e259318825d4c4
-EBUILD webmock-3.8.3.ebuild 2077 BLAKE2B 7812a2cffd6223fe857c511920c0f50f53d5884b66991fce0422573352ae3e009b0c05e32040de6850ef79dc36809c9b71a0b3b23ab9a107d40f097acbad668e SHA512 cad05cc74c602571f1963b87e57dfd59c5a8ae812b6fc6e89a4c43f0402aa2678215c65d425f3b63da04144012431bb8d51d68dc82de748efbb15402bdfc1ec3
+EBUILD webmock-3.11.0.ebuild 2065 BLAKE2B 4e57a1a85b7d559719b0d21d72c7971e30765b7bb289f93991a6a5c6b87b8a03f6004099395ccf1b3b1cf19096f76bcb5f0a3edb417b057b874aa870beba60e1 SHA512 3fd8316bea269e5898db3beb2a57bcf5b15c6647f60ca448e5f5da91b511224118c9ba2c7bf83b9fdd60dba34db1a121d7a63b8cf0694bf53e3ea1484403fbe8
+EBUILD webmock-3.7.6.ebuild 2059 BLAKE2B 21417ac451a0b70df72a05a8848c8ddf7a2f0f939eb498a5d71f91dd3f2bcd065f15d3ea8ed047c64b70c421562b337054a5388d96d497f52a1b684b58417ca9 SHA512 6b94a52934ada134df94b263fd8fdc9a3ea1388c742a11c2eee24e011fce9f99e86436745d56a646a0e3fb925006f7048a889e2cf82b47ebe39b2d505763b897
+EBUILD webmock-3.8.1.ebuild 2060 BLAKE2B 4faf298c68b96ae1e2eea9389a7af6133af3eee570e001cf7c0e9a36225a023d02769770ca39b827adfec687138ea3c478ac59d50f2ba29566bef89be11fb37f SHA512 f0bccdf423fe1ffe0dafff3d1c418b477e36ee1cdc2094238b5e2b5ff098c171c52c31d92fbf5300dc878da62b8b465cfc00a1f8300c7b8a787f2e4639a52ca0
+EBUILD webmock-3.8.2.ebuild 2060 BLAKE2B 4faf298c68b96ae1e2eea9389a7af6133af3eee570e001cf7c0e9a36225a023d02769770ca39b827adfec687138ea3c478ac59d50f2ba29566bef89be11fb37f SHA512 f0bccdf423fe1ffe0dafff3d1c418b477e36ee1cdc2094238b5e2b5ff098c171c52c31d92fbf5300dc878da62b8b465cfc00a1f8300c7b8a787f2e4639a52ca0
+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.11.0.ebuild b/dev-ruby/webmock/webmock-3.11.0.ebuild
index b19c68e80241..d220117eb5cf 100644
--- a/dev-ruby/webmock/webmock-3.11.0.ebuild
+++ b/dev-ruby/webmock/webmock-3.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ 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 ~x86-macos ~x64-solaris ~x86-solaris"
+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 "
diff --git a/dev-ruby/webmock/webmock-3.7.6.ebuild b/dev-ruby/webmock/webmock-3.7.6.ebuild
index 21a23c1b14e7..9b5de91f5c61 100644
--- a/dev-ruby/webmock/webmock-3.7.6.ebuild
+++ b/dev-ruby/webmock/webmock-3.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/bblimke/webmock"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~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"
diff --git a/dev-ruby/webmock/webmock-3.8.1.ebuild b/dev-ruby/webmock/webmock-3.8.1.ebuild
index 0273386c2d46..7b97e611140d 100644
--- a/dev-ruby/webmock/webmock-3.8.1.ebuild
+++ b/dev-ruby/webmock/webmock-3.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/bblimke/webmock"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~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"
diff --git a/dev-ruby/webmock/webmock-3.8.2.ebuild b/dev-ruby/webmock/webmock-3.8.2.ebuild
index 0273386c2d46..7b97e611140d 100644
--- a/dev-ruby/webmock/webmock-3.8.2.ebuild
+++ b/dev-ruby/webmock/webmock-3.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/bblimke/webmock"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~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"
diff --git a/dev-ruby/webmock/webmock-3.8.3.ebuild b/dev-ruby/webmock/webmock-3.8.3.ebuild
index 76e4e7d85086..282df8949275 100644
--- a/dev-ruby/webmock/webmock-3.8.3.ebuild
+++ b/dev-ruby/webmock/webmock-3.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ 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 ~x86-macos ~x64-solaris ~x86-solaris"
+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"
diff --git a/dev-ruby/webrick/Manifest b/dev-ruby/webrick/Manifest
index cf6044dad706..540253910a9c 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 767 BLAKE2B 1a6dab5bb52cff85ba146801cdc8cf874f073107c4ba84e7d8a450798f7ecc26d295ff70b492744d3d45ea7364260f2b09874974cb2389080a113fe5c328a812 SHA512 1940ef7153e25d469d5a67f49f4cf3f6353b830f7ea8d2d78bd7c5d0103124a0d679ae923bb0567e53984b00b8752ff4a06ddacf54bcd7eb964d953977089cb8
+EBUILD webrick-1.7.0.ebuild 756 BLAKE2B 85213f1fbb0b9c1ff5ba3651e632dfe73820a4d7fe72d745d01f86558572aaa05b12ccb38e313a765dd426bdd84ba81da67d11b571f59cbe42e191ef167875ac SHA512 10572aa1562a9329f7b78e6d075f4d3f8a86f80b893223c78790bee2d090344f934bcebe3b167f7842053d5df1803ce50295fba0158e572f9081e1d677878ef3
 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 9e7c443adcab..142568be9001 100644
--- a/dev-ruby/webrick/webrick-1.7.0.ebuild
+++ b/dev-ruby/webrick/webrick-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/webrobots/Manifest b/dev-ruby/webrobots/Manifest
index cea5faf3e1c3..93c8b340153b 100644
--- a/dev-ruby/webrobots/Manifest
+++ b/dev-ruby/webrobots/Manifest
@@ -1,3 +1,3 @@
 DIST webrobots-0.1.2.gem 24064 BLAKE2B e77c7b83b16faa7c6d65f6133a5e2231a4e270d8463251c2e6a91a5bd1f11af431d4bca4f11bf40e2e84829c1b8256a39d048a371ce4a062af6bba9dafe25c49 SHA512 8b2a27a1758e613bced16b59a2b1708f468921388882d7ea483c7b6cbb5173fa24032f4db271734820225c5e90d3f30d07c5fb682d0d807c637f535ef7256097
-EBUILD webrobots-0.1.2-r1.ebuild 958 BLAKE2B f1c2af4b5f3805021ae4fff9bd0808ad46041147476df0e6a849d364bd5b7d69ac3a527b59c461b2cc1185d64fe33ea8972f283e410a5053cc1ab97598c98e9d SHA512 9a8ffeb9a3b72baa30bbbd0d1cd2e427c72295aa2ea50e26db53595ab8b8791693f08bbf9028cd43723a1c9b6b79a53e3d461d9b68bde59ec922f45abe99cd38
+EBUILD webrobots-0.1.2-r1.ebuild 947 BLAKE2B c250be6eeb9011cfb3c3d51f1bb441b5cb68da78e414d1501cbab79a08ede2a320223a17162e37ced814118030d750354e366554675064d61a4b05196db50952 SHA512 c31c9bae02cf589bb86e205967dd2cb84526ff880ac596668d68ca289ca8a30df206172ac8941e025b27949b7b1f025248c2c168269a496299a06bb348eacb2b
 MISC metadata.xml 380 BLAKE2B 9be818846cc0906eb21d32c72ed1c129d65e10133d8303535c65b942ec24dfba85f422186b754d42dedc9a0a0cb5bd7c28b9099f17543b007f012aec123fbb90 SHA512 0c68a9a014ac9459f1ed9639517189109e50cd101e8bc7c21ed2a3631e22ee7a7fc31c7f4518463170a63d710cb4b1e03a1bffa1275ca8e6629afe89cfa31b44
diff --git a/dev-ruby/webrobots/webrobots-0.1.2-r1.ebuild b/dev-ruby/webrobots/webrobots-0.1.2-r1.ebuild
index c24d5f4d202a..251bfeabb860 100644
--- a/dev-ruby/webrobots/webrobots-0.1.2-r1.ebuild
+++ b/dev-ruby/webrobots/webrobots-0.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/knu/webrobots"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/nokogiri-1.4.4"
diff --git a/dev-ruby/will_paginate/Manifest b/dev-ruby/will_paginate/Manifest
index ef9fae77c523..3b52e8c974e9 100644
--- a/dev-ruby/will_paginate/Manifest
+++ b/dev-ruby/will_paginate/Manifest
@@ -1,3 +1,3 @@
 DIST will_paginate-3.3.0.gem 37888 BLAKE2B f1d2178086c7b7efc0ef46d8cccd64f3c0ed54427c3d499e88f7ba4fc3d1eef086060b3dd7e365cddf16558721c500652d0cc252e18618a9f5dbc01ff9ba2f04 SHA512 2114683e16642e4d06523ba69d26438a7111687f73d3ab89bfcf7a413ce5ea68cb076c4f887f34efcd9c6d5525260e9367a5b502ccde5658f3e21f7f0dba12ab
-EBUILD will_paginate-3.3.0.ebuild 608 BLAKE2B 6382cef8f5b0971ce2cf84c2ce8a4b09591783ba7d97c9247209a7bdb941fbc2543b640880611d16e17e41298b1a4173631b5acdb113794cfaf02757027b7af1 SHA512 418afd3fb32810124852114c21bb9780753bd680708dff6b9b519e7364ffa4ea61274ea2be47d2d41806592a38b87bb9f4c3040ec7ac1de3b547c04997a4ab53
+EBUILD will_paginate-3.3.0.ebuild 597 BLAKE2B 4a64b27ee10f05dc4f5c2fae0c453630d8618ec5d489530983e9ba6b4be178e2d8afce00e30a1440ab1b2dc866880ea78351c2da8a53b6c9ff33ea272eedf068 SHA512 509d889b9887fb89d7714fc08f501ca87bf634a2daccabcdb906e197182d5840b351c413c0681b9a8e11762dc925fdd015c83c2592b69aaa31b6467230b52395
 MISC metadata.xml 346 BLAKE2B 859514393fc9d9ac988a812dbb5fc126a269616351c6d8fc32c6ec0f25d685c835f4c1d27ce818807bb330fdc50839b81e6f63d0eb4d77d8f6a95f2da3d849af SHA512 2e061bf277b39327fb84988df2dd9cf548c87dc0bdc51e63b47aeb816c099a4a7fa5b95fc1f3ba35e15c7499d897770397c6f6f2f4d3c1b03733f16f1d0556d3
diff --git a/dev-ruby/will_paginate/will_paginate-3.3.0.ebuild b/dev-ruby/will_paginate/will_paginate-3.3.0.ebuild
index 3a5f5a7925e8..2195f9149eb2 100644
--- a/dev-ruby/will_paginate/will_paginate-3.3.0.ebuild
+++ b/dev-ruby/will_paginate/will_paginate-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/mislav/will_paginate/"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~x86-macos"
+KEYWORDS="~amd64"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/xmlrpc/Manifest b/dev-ruby/xmlrpc/Manifest
index f021d5d3fe9a..adb3835052df 100644
--- a/dev-ruby/xmlrpc/Manifest
+++ b/dev-ruby/xmlrpc/Manifest
@@ -1,5 +1,5 @@
 DIST xmlrpc-0.3.0.tar.gz 34157 BLAKE2B 862bff09fdd7febfd85ef4fde77a913b77f20024692b1475994b93b394d587f1b2139c82ed7159cc756bd1757ee2fee55f103866c52d4297d8a38be70c066c22 SHA512 370b2fe2ed9ca37fbbc2e85d08328450671019a2dc0c2a31ecf8fc8af95105ccf1b8f728307a5d9cf5f4dbcd93ccfb2f66244b441c0aea1cd1aaca2e820dfe31
 DIST xmlrpc-0.3.1.tar.gz 34720 BLAKE2B 452640d82bd93568a3d36235a1f86f4d2be85b47022d269131daac4e12e759bf1129fc46293f3f4408cefeacad87214d1e34da1b3e3421638e5609659afb7586 SHA512 df47968288592aba4093b8c4d19ea86d6171c1f2cb10ab7b9a03fccc8ed65a9aec35908d831a281970e75becc7feff7242f9fc3ca5b64a54ffb56a717bccbdf3
-EBUILD xmlrpc-0.3.0.ebuild 962 BLAKE2B 9249e6c87e76c5904f5237c63c6ec3f46531ac3f051de2f5b66c559062ac4d5f1803f018cc8f36e4163f84099169ac4b84f862a16c889a98a58eec09f0516871 SHA512 5f4d98b14693000f08c88cc3c86b1351a3704c641da32d537a3319c3427d345492adb4e7aa8e3cd68b053e02f018e0e2f2ea9ffa86f38a10dfef06b7c3f9957b
-EBUILD xmlrpc-0.3.1.ebuild 933 BLAKE2B f6117577717dc1f1bf37357158a189eaa4beda51e5890a3c996d6623d91d99633b66da9927a38eb0ece4160e82c9cdee1e169b2231ed9e90115df5ae38d2247f SHA512 c97c48d284a5e98de67be47409cba27a9e9cebbbc17174a6c2fa264598d7bd4a0d8986d3ac11a67a819d87855125aab98749c8f65032d73e697d9c26a62a4795
+EBUILD xmlrpc-0.3.0.ebuild 951 BLAKE2B 3fafe401c49335d0a96dc806a297a0db5d64f7f9efdba8430b50b4ebb1fd52471bbd66ef0cd43934540fab343be0dae06f6b8ed30d7828956d2fad8fe6284581 SHA512 3b4c4d8700c52b0cbf46bc3d099c76eca9cc9bf85bcf2a41f1f73fadfcbed0e63ff10a14f96d89d12521548885261f6aeb049163b86dbdd481d174561116a08c
+EBUILD xmlrpc-0.3.1.ebuild 922 BLAKE2B b902641c965a750d20770924be81f08e415d23b41ab41bb01318538898f083f6af692a3bc7fcf1d6c3e26ecf35eafd3803192caa5d307b09e0f184ec7008e8a4 SHA512 356462d336d8994a1e7ea6139da9631d054a6a619b73608fe6c2ba6e2ac8259d0c9fe10791c786dca8316e7fd43611223637c6295da4edd4f113598385de8f11
 MISC metadata.xml 337 BLAKE2B e45e1b70e063e5f33759c32c987c2afee3283a31fddf4eec4a44c317f65a68926a84af12c5ab9a72e5315033593105dc95d1919fce3de684593755078246ef71 SHA512 94f995e14666100fd2f0e569f01bfcc86cfa319c213f0fb99e7fe104bc9b731dbd06e4e35cb76d94b126b296e1a5b916b4940c59f251a899781357f587f9be14
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
index c447a8b6d47f..a0ed76280cb2 100644
--- a/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
+++ b/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,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 ~x86-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="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit )"
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.1.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.1.ebuild
index 583a976a94e5..3b5aca22d381 100644
--- a/dev-ruby/xmlrpc/xmlrpc-0.3.1.ebuild
+++ b/dev-ruby/xmlrpc/xmlrpc-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit )"
diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index 966dcc7f41a6..4a5553af1c50 100644
--- a/dev-ruby/yajl-ruby/Manifest
+++ b/dev-ruby/yajl-ruby/Manifest
@@ -1,3 +1,3 @@
 DIST yajl-ruby-1.4.1.gem 557056 BLAKE2B ade1c18bff1d95a733a1981f7898f1ebaecaed6e9a0354af2a6b4d0190a37e613830f77d5e57178b622c32e2d8688aaa11a7edd543c17a30a16f9045d21ea4aa SHA512 24cd82380658d784bbf0a7a16d4048125cc5a856b0e0b4d3bdec29a550a9131d3959f9a75eba0d18d5db8d0a23158fb7ef6ea6f60d221a7bc3d8efc437d52df5
-EBUILD yajl-ruby-1.4.1.ebuild 1234 BLAKE2B 6914f3182f22113f2187baf20520448b0717bdbd1d2b1c108a5b48d889c18c085da65e1690aff1bc67005ed22c7616d424569b04b095c255c9d36c32ebf3109c SHA512 62d691a59c0e35363d51f142963ea48f801b89022dfc97d32a84ad8a9a509ddc11126e55ccd0589708fa7c8967a598e5040bfd361ab2c1a955d5c9136cdcc72f
+EBUILD yajl-ruby-1.4.1.ebuild 1223 BLAKE2B ff15fd1b7c564ac028d59c385d7426278362d09914ec8b6a8a43923c3ceb7810cdc5c812c0da823e96fdc589eedc44b473f1ffbafaa080312fbed4ea8430156b SHA512 335b2c295c35dfe6d92914ad71cd0c731f7bb38fc37c6c2f574cd7dd16c95832584c90af846470f49c2bd89dee960635008ad7ef9584d729816b7fbad88020d0
 MISC metadata.xml 346 BLAKE2B 2fff8cc633fbc47874a3e5a9e567ef430dcdd4de90343c35f599b15a85e0601a5d4b3c5b650e3971dab90cd90f382505000b40092e57d05fdaf86536a02106ff SHA512 54921a3e3df293d819d020aa6671e7e33f9031b83d375d6f8423fd844cf757c20c2e6cafc9d5a8f2670e10bd286b4e29067a8d7176e7acafd3474578134a2aae
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
index 1a7be9cd00bd..55bd34c534a1 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/yajl-ruby"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="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=""
 
 RDEPEND="${RDEPEND} dev-libs/yajl"
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index f9449b120bc7..63330fdb1d1d 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,7 +1,7 @@
 DIST yard-0.9.20-git.tgz 921130 BLAKE2B 37b1b2524147a1a8cb36c3835cce4e7666e2c8d3d5c187eb402000fb251df64111c4f104957ac9d28bd0e8d9328eb1d97571337ae54479626dcaab3cf07625a6 SHA512 b7e035a3598c8ef32fcbaae57254c0fb0cba875606b434571da2ef754f3171b5c42a4b3a45bd4bf41bce368f6fb7e448567f601a9cab5fbdae695bbec1b73608
 DIST yard-0.9.25-git.tgz 930253 BLAKE2B 35531a7e90ab99bad8d236ea4774a8aebc50eff5d78f60e2dfea8edb2af965dc60e8c02f8a1f95166e80d6f1ce21aca051b92b2511b88a7d87d2cc90e58bcd17 SHA512 855bf05ce45a965d534191b036831ec1cedc848e21196ed93cc7984d744328d9d5ba39664b4539a707a1556984990360cd27e085b830501ac8d72c6cebb3e689
 DIST yard-0.9.26-git.tgz 930901 BLAKE2B 19baaefc54269bbc7eee053b42f2be85644a062cbf55b0fafb63748876aad3a3143767855f4ee7b10a1ae814110a6cf63c01e4055e054aeb31bf8512e793d80d SHA512 0f70a089d5e5ba33e326b0ae0cc84a2cacfc5a3f3080545d5fc5bb324dedbbbf65116cc9412b3496c09b2b6c15514e854a741a1fd7e2ae782804d6e4ac28fcd9
-EBUILD yard-0.9.20.ebuild 1777 BLAKE2B 95781d05b6b42f22027c5494cd6ad909a2f580e8ad13b4cccc5b42e20eb2e278f00c0c65e727cdfef73f2459c6b9c086f390f3c360a4bcad149b920b7c88a051 SHA512 db14445f362c68eabf02c00b9370febb38e9d30ba6167832e4a36bb8422c81622871af6878c86c52263fd30436f9041bd02d0ebe56c59542be47ed901479ff33
-EBUILD yard-0.9.25.ebuild 2069 BLAKE2B d3561aa9c61c9be966f138fc40ed408c1f503a26f6c8adc82788beaf3084f7489b7618c108088d7b5941dc09e6d32749712c321634273f2717597bef07c9dd5f SHA512 fa6d2f1012983738c1886cecab4390d8900584549b46b92967e0d9b68c90a5df0abca10856b3a4b9991ba955a1bcf3496fb544b85fc2a5a9fe50d160f7afd0e4
-EBUILD yard-0.9.26.ebuild 2062 BLAKE2B b36c92edc910299ae765d955c1ee9d2ffde4ac0f9a404d6126f9b8fefbc62f0d45c2dd72bc78d05dfc32947447e3480e7dabb1b245175f0e3183918bc648c29e SHA512 2200a0d5290ff258b9ea814e6e52bf29b56add1aaee72a2f7a45033289d2956ef08c66c4368ee3798c90ee459cb45647730a96fe98eb85ef02dd6f399744d562
+EBUILD yard-0.9.20.ebuild 1766 BLAKE2B c8b561e62e689e9dd828cbbd4674a317ce50dddbfd63a82766eabd315ed4a1c8c7ab80f6a84ef77dd2181c164c9419d62ec491a94dedb7eaa6a4a66bc0a25e8b SHA512 9554cd54d05877dd5e3197127e463c01dd01f578a5d92249d2adaf27bba34a8627075a7ed3af229ab28c473b5144959b519d2006dfc034318d00d2e28e73b37e
+EBUILD yard-0.9.25.ebuild 2058 BLAKE2B 7eb00d3fd28282d032dc9ce57b2fe9e27d0ddafb348a6a0d8e1d42e68187aac69943c4e1a4a8892e7a47cff0ac7a10bf3d71ad71d1cbb8ccfa0a009f4d44c6a9 SHA512 a8f2500b60dcbca8af237e84c29f230cbaeaf59a60d47b0a342a35a595618cab64c8656db7fe5ec7b9bfc9225b97dd8d8ba6bb23af83383a0111b241766749f4
+EBUILD yard-0.9.26.ebuild 2051 BLAKE2B f8bc46d22cd14f1aa406a3f2ace04b819e986636789ccfe2a81bc6440c0e54f2a9e2540ea7b15b70ebdfbf6cd3078f5812cc189f24710fc752a5f226b31210ad SHA512 fe6bb65010f6f7ddb0444dbcee36dd4df65b1dbc262680dd5b1923fa6122ffa15c6a87d2a25a3dbaff72ba2c2ba200cbc74b662c5afcab5b7c477d7905a7cc09
 MISC metadata.xml 337 BLAKE2B 1aedede1271d1f9a566743dd25b1fd9961e429b78bb5f9f36bd6ea66f631f376a273d7a094fba7121d099f3a4a3f0e7738753078e2a1a554cfe6cf32acc6e2b6 SHA512 0de30cc9c4a9d08649f141cb6df0ee9c05703831603c77a0605f0bf8e2f49b8324a782d092aaa690581e23d6d948fda9781b98770a3ba89ed6bfc0de351c11bb
diff --git a/dev-ruby/yard/yard-0.9.20.ebuild b/dev-ruby/yard/yard-0.9.20.ebuild
index b477b38a5db1..d4172bc16665 100644
--- a/dev-ruby/yard/yard-0.9.20.ebuild
+++ b/dev-ruby/yard/yard-0.9.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
diff --git a/dev-ruby/yard/yard-0.9.25.ebuild b/dev-ruby/yard/yard-0.9.25.ebuild
index c80862906ffb..1b7e9b1340db 100644
--- a/dev-ruby/yard/yard-0.9.25.ebuild
+++ b/dev-ruby/yard/yard-0.9.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
diff --git a/dev-ruby/yard/yard-0.9.26.ebuild b/dev-ruby/yard/yard-0.9.26.ebuild
index 2650101cbad8..576c13ef1b92 100644
--- a/dev-ruby/yard/yard-0.9.26.ebuild
+++ b/dev-ruby/yard/yard-0.9.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
diff --git a/dev-ruby/zentest/Manifest b/dev-ruby/zentest/Manifest
index 9d3276fee47f..ebfa6853de4c 100644
--- a/dev-ruby/zentest/Manifest
+++ b/dev-ruby/zentest/Manifest
@@ -1,3 +1,3 @@
 DIST ZenTest-4.12.0.gem 48128 BLAKE2B 32d2d5cdd95b8355b31ce81957cad823c1d5209f0c24cbdf920fe1276d952df4995484af7e576e498273c01fbfb70eb5ed99271405977820f68cd8feac08d388 SHA512 cbce7059ed48fba1a265c9a4360d032492cbc3a67131480e11bc06c1cc7fadcd82139231f16c5ff4fd2a9b771a574f834a71eae21392ee5fdbf335366748150c
-EBUILD zentest-4.12.0.ebuild 808 BLAKE2B 866c8fe439fadf95815df52559f67c95a65ae0a1ce3e46690f1d6dc45b0d7156b636f57c829e2aaeabad15ebd8044ab86c4e213c71cca10743e622b90c1f2972 SHA512 07e1500065de80fc4ba42afddb789ebbf4580a4c56e805c01085bc061f3cf5efcf884244007cfe9aa355a2bac036323fe85edd6ead3a780eb6cff2580c63b341
+EBUILD zentest-4.12.0.ebuild 797 BLAKE2B 26bea891652c5a4ac59a12be901aa1faf26b601430b5fc64588457ca58a1910e341638816d0f9b2325e5d4f5f2f78f9d910f49fab5d30f0713b0b6677ea6368f SHA512 9b0a53d894bce2a60cca7a3cf3c78a95ecae2cc96ef6b11f955fa7966ae4e31593affcf444bc69433c34849a3da89b9be068ac48a26ce6dcfdab3de8afadfcd0
 MISC metadata.xml 333 BLAKE2B cf1ac3fbb6994dc96110bdb974b726f53fdfe34db473f272ba78ede47b65e26350b807bf291c65f8a8bcf9e12fc3366e431ca32a277d9ac38cf9d4ed7ea46e62 SHA512 d02fdcc6c8ef63d22d0df77a6c7c82ac1d629d29685e6fc653c70079d56fb1b28574bfc7c372a5298dd4a3e20061aecc705d6824c569ce0f99e3dea464f04fcb
diff --git a/dev-ruby/zentest/zentest-4.12.0.ebuild b/dev-ruby/zentest/zentest-4.12.0.ebuild
index 70da21bb3a5f..0abbf91d3938 100644
--- a/dev-ruby/zentest/zentest-4.12.0.ebuild
+++ b/dev-ruby/zentest/zentest-4.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::R
 HOMEPAGE="https://github.com/seattlerb/zentest"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
commit	24fd814c326e282c4321965c31f341dad77e270d (patch)
tree	033d63b33c21a3209964ab56005bb9bdd523630d /dev-ruby
parent	129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)