gentoo resync : 29.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-29 11:38:31 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-29 11:38:31 +0100
commit: 90c88731bd036e5698b281fbc0a5f3aa4c9983ac (patch)
tree: 83fc5facb6b12be510a37bc3d241cc63e965b13a /dev-ruby
parent: feb0daf81d888e9160f9f94502de09b66f2a63fd (diff)
67 files changed, 267 insertions, 196 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index c518840bdeb0..75e2ac0f631f 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
index 716dc76c9669..919a33c94500 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -1,5 +1,5 @@
 DIST asciidoctor-1.5.8.tar.gz 583484 BLAKE2B f0c654c5e43a0ed061dbf80eb382fac1ea393870c7c2530649a5a41f1a5bd5e72ffb11e8ad8dd2925510e18f4528079ae532b623e6e7f38a119565df01139f58 SHA512 3f767cdf945361d81b0a89137fb1e77377cbb4171da790027cbb9cd8cf1deb03f24a8ec780b427b7bce34538e851a44682515fbaccf8558d61e22356b9d216dd
 DIST asciidoctor-2.0.10.tar.gz 613180 BLAKE2B 46125c85276eb0c7cf4404ca04d854449233e2cd14e24687aed9f95eb64ceb6ebac3d3ed73918679b9a5b047e41d82d02383d0e08acd0df5cc9bc216f14c79a3 SHA512 9ef908081569188d9903c7a7619fe0b50197f6f0cc922c4070e116bcd3f988a55da87443e84b6e260aabcc653a804fcaf29b96a722ab36f7ebb27ec11eb7ddbe
 EBUILD asciidoctor-1.5.8.ebuild 960 BLAKE2B 9d86a4941af51a7000636ca77cb49a00586a9887137db078fa3e042ffe780b844cf2d7b1c8b591104cd741d219a72acf42572d7d1bf05aded09f969a8f29bb41 SHA512 7bd9c94f4f5067fc7538aca45d631897ec6f8d682077c8a105e47d2bd870b4a72abec6bb22f6197fcb285c6e974aaa82d156bca6cf4d7f2c5166ea3c7aa73da3
-EBUILD asciidoctor-2.0.10.ebuild 981 BLAKE2B 29b52eeedc2d3d663186a421915dbb4679de1fd974457c0df55fb878b6dcc1ad188051eb2377454c05563c2c6c8c22b72ec5e8756cc77ad85990e08db9be4329 SHA512 32251d550bcfc4daa8944904053c070662e0f9ea1750b8a4f6da4331eb8e366827642752427de9f5e4ea31ef9bc45a941ab62e1d0bf7c7ee5542d6823a406ed4
+EBUILD asciidoctor-2.0.10.ebuild 981 BLAKE2B 3fe164d46e60b6ff44f233b04d0d5157c69671093cfa970b531ea17d978707bfbf65593e77fdb0ce13547e367749f38f323ff9863443d3f1b16e9d55477a9a77 SHA512 dd122276dc5bdae342ebbd06440bad0226a167c6089b16f28fe06102c27e14f9b3fc4dcae2c095871d95c01ad03076aede4ed850abfe9c25b484047c198d8d19
 MISC metadata.xml 349 BLAKE2B 65a3f6dbbe523d1017d78e939c291e40edc3429d06ff16bd0f8150f3879e2b0840619653115be43c876d1cfeea8e95a3e29fea7447b18bc28bb0218ac03f11c1 SHA512 e3ed6253349df933eb4656c972f1a6cc71567c27a721195abceac0d28bfbc991cbda8772f661021c3cf954d2a917730bad54982e319655a204b6b30c1c67c6d1
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
index 5f8e594c9af4..dc8549057553 100644
--- a/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
@@ -26,12 +26,12 @@ ruby_add_bdepend "test? (
 	dev-ruby/rspec-expectations:*
 	dev-ruby/asciimath
 	dev-ruby/coderay
+	dev-ruby/concurrent-ruby
 	dev-ruby/erubis
 	dev-ruby/haml
 	dev-ruby/nokogiri
 	dev-ruby/rouge
 	dev-ruby/slim
-	dev-ruby/thread_safe
 	dev-ruby/tilt )"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/asciimath/Manifest b/dev-ruby/asciimath/Manifest
index dd11a239a3b0..96dbbd5d6483 100644
--- a/dev-ruby/asciimath/Manifest
+++ b/dev-ruby/asciimath/Manifest
@@ -3,6 +3,6 @@ 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
 EBUILD asciimath-1.0.4.ebuild 528 BLAKE2B 8f70ad1757f87729558831e9028f1d0534e0826aec3c87075338ece924dfdf13703057a8af6e98d38fecd29331673ea73eb4991dac6e9f85cf762c81b6730671 SHA512 04b3ef6e9a4c04c26e706c42ca8f9b25936f14f5dc682e4ac160f88035ab4e624b49eb8fcaf926fcb14bb7ecefb52fc634e782b2a2aeac6e097bca84a2e80d28
-EBUILD asciimath-1.0.9.ebuild 468 BLAKE2B 9cc93e15871738768a7758ea11e854bc1d00e17b812a046a8141c6f1e0d80b374ba98f6f5d151e5fd525fd60213b83ad41f4be76044a05482af6b4446324ce8f SHA512 28c38a53cb5dca7868e1a4bd5e3fc7c488e3f4c57fb7f15f06dac8d91c7703baeec2f7d4b9865c274a919d86a4a13e5eaeefae3751d3c94c40feee229adbf7bb
+EBUILD asciimath-1.0.9.ebuild 464 BLAKE2B ecb15cdb05aeef8fb9462f43e190986094ec591d51800a7343f28fbabf0ea910113bdfdee551b7a263a59e7487fa2bc7bfff9d4cf42ba8d016e33b8ebf18f0d4 SHA512 58ad31a73b15cbdb38f9b2fd74a08fad8db43d9337cfd1f8e1cc6adc73145941a8698d2dc94fb014682799e2a421ab925323c752d8be818c978d438a18ad572f
 EBUILD asciimath-2.0.0.ebuild 469 BLAKE2B 095aa4fb87bcb0f3d0be0a1843279c7a6606ad2780b8dd93a52816836197a91c549260f7cec682ca10309b1a8ca003d0bdd544828a77221d6df0cddd8098aa8c SHA512 cdab7e4b133f0c90f2c1bf37af3004ca03a8db870d48c1d73bf876361f33a6fefdc7d85b86514a096a5b67e841239f65999c05207e950ea9a92dd0121777f903
 MISC metadata.xml 344 BLAKE2B 7979667ff10553d0f1c80a34a03bca56057a4dcf856440b9f9bc4ea64aa018da426601b76dff578625481cb51f7384c7716a3aa98670f178c4209ad39a9af9d9 SHA512 606dd415c7a141188cc94a7d56c67d42be1c2420f8ba9ee7a44707b99a6035df1cd8d358de575e12008f0560aa2b87b57b5892c67f3d931aa28c5938373a8075
diff --git a/dev-ruby/asciimath/asciimath-1.0.9.ebuild b/dev-ruby/asciimath/asciimath-1.0.9.ebuild
index ad6d1f8bd2ab..988d1c7f49e3 100644
--- a/dev-ruby/asciimath/asciimath-1.0.9.ebuild
+++ b/dev-ruby/asciimath/asciimath-1.0.9.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/pepijnve/asciimath"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE=""
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index 5403f00513d2..fd8d9bc0334a 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -1,15 +1,15 @@
 DIST autoprefixer-rails-7.2.6.gem 196608 BLAKE2B 0f9224fbf765877b1b7414c68fc39a6587514d27fb5290e1a623db8dcdcbf6f668b66ddd0133906a97e63e877b8201168a45520a9919dc756021d5a7cffc0d38 SHA512 37b3f245291711f92ab9e264491637e753afb95e52f9fd4e2bda6655cd781b2d031934f3379cabdd5589bdf57b780d0727f2fff1cdf7887ca4cc323d23023396
 DIST autoprefixer-rails-8.6.5.gem 208896 BLAKE2B 50e8b8ef3fec9a0bb8d68afa8950989dbf84b58b79b8822e83bf22873c5172c2c514643c31dca88cfec49bd585563eb9b201c621d3ab6707ed0d49c6cd4c8fc8 SHA512 fddabc4d745ad1b4282622a52ab4e36c377eccec85c4e80b3e8d633ffcc2d1613f4fee9e9f2356c85d251e44b0010418029bb278894987119689435ac885e982
 DIST autoprefixer-rails-9.6.5.gem 221184 BLAKE2B 0a8d3dcd87cf4ad54252110bd60e86ab19563e614158575cb596aeaeab1d87946412625ce4bab4d8fc71d27abef1646822867aae19759b74445733f57ea076d5 SHA512 489e37e411fc86632d612b0d102955fd29b2654ba5bed3b648d89676e9d90aafb38139ea0d3f027fd9b23aff683c3f15979434d25c71d46560c3e1a1f1b4bc20
-DIST autoprefixer-rails-9.7.3.gem 222208 BLAKE2B cd091364f3089ece63dbfa13fad58c3e21b3275ebc845df543429f2952770a64221f4bda60567a37c3f4ee6031653856e4cda7d4cf4d24b3c08819c603f8db60 SHA512 08a78e4145f3d05c37c76d6ed137a2cb1951e36f4b36b9425f4429afb28e6eb2fb6a19e164189fad18f03e5d3540d02698f1466e95593f08ec4d064cbb21fd0a
-DIST autoprefixer-rails-9.7.4.gem 222720 BLAKE2B 6613552129f1a94a3d9acbef9f3b282b396d966706cf9321ba4b7ae31aa1054c3d589b1620862f21dd8a49f46a255b9d45e3e3155b4855ca42cad8a1d6079b46 SHA512 f0c8a4b0baed3024da732f47f2f836a1783cbe87c552d61f2a5d36f32a93ddc42e4dc987c826c6438ffdb0f61411d4ead37a001d6653a620f2ce110dbdbbdf3f
 DIST autoprefixer-rails-9.7.6.gem 226304 BLAKE2B 51481173acc0200e7287e8f448fa99f56f7548cf5df142705f6e4143f42bc079ab2c4d4459d4cbe62417b9f873b9e32d64a96ce61e0e8cdd7501203a33c0dae7 SHA512 4855843d270536607a705ab7a1fcb20fade8270ee957de3150b3892cf81442fecb5d501f07276761aba76c44edef15235d0f68e91ae76d2fe09dfa16179faa7c
 DIST autoprefixer-rails-9.8.1.gem 225280 BLAKE2B 8c6fac92414ba153fdeb974b5e82a9550bd2f18c00af1813984e5cc2b239ab961d597fe66dc8d7a160564f06597da5ac5415c77d73db3d6cfd966dc4cb94ab93 SHA512 5f9d514170551e0c657e5116e76745411d396a02815f44cd2bd0b6c45d7c85cca7af6705ecaa98f4ef069c9d68a941dc9b728d837e9158e56dd9aa9110043bad
+DIST autoprefixer-rails-9.8.2.gem 225280 BLAKE2B 50ba378c775c9781cc2fe5ac4e10cdb29848613a17f1f78811518dc1f58abee9176843a412703505d2ccf15c9dae6025c07f9a60b323db2878cc44e51f6be281 SHA512 6ab2d6106654a41095610dbf3eb383772eaf4c4e56e8790d8207ce2b9e218f276be00a011c6976c1b7b555f691366082d9a1fbeb53dae66e3599e67b2c3cb245
+DIST autoprefixer-rails-9.8.4.gem 224768 BLAKE2B 9d0d4691355c9d92e9e7f960549b40e19b10cf5024e7b23b6c36d99d6c48911237b289f191d0ecddf3e0cc2c12313f27ef5c4db047f5c6f6877c196b6bf75171 SHA512 3680da201cf4eb18eaeeeb8a9bc46af372f8aef035689525cf8354c362df23d329befa05c293d534d88eabedd984c510cf5b6753faba3184a6533a1a88cdbc5c
 EBUILD autoprefixer-rails-7.2.6.ebuild 827 BLAKE2B fd6aef469bd1e07f5100e88ebe523da96383c721dfc2bee9b7babb7d11f3d710bbb6debf4cf9cd57702f81150c8b7c7ef9a0f3de4efc1e6325240fd1bf2e4bf0 SHA512 f17f3e58a7cf0a8d960d683d3cdc6ddae7065ce7d28d3284b45b169210a068a9ec0dafcee100fcbda098aab73c809f455908df069ba72e5536b95aa1ddac7ace
 EBUILD autoprefixer-rails-8.6.5.ebuild 827 BLAKE2B 4bce491c80db4a8eb1d77467167c3c290c0af5311f4395424f5f0c4e2b30e1474fed1746c3dc5127413d48b9e7031f8e782f7b5d1a1987550747c3900d8954cd SHA512 8bd8a32ceb04e688ec4d149a67b98905b2ec975684f3fb2fe3dddcc4ff0d8a04e7556b41a3a804a6b1dd2d4c46d4b5ab45c6ed45f300c7171bf2335f73d42768
 EBUILD autoprefixer-rails-9.6.5.ebuild 889 BLAKE2B 85643bd01e0a4db78f304d55c7b75181e51258b83219073e17142c86ef025d746d9e34b6781adeb5a869fd4ab4643c1a039769ddbdf2ec45c8015a8ffc5d1bdf SHA512 dba75647eac0f7e41a6a20bb359fb137b982bd28a680c85c4240356005b4508613e4364d56b31e1db9a3f373809e9e84065184656086569b02f49815e118cee1
-EBUILD autoprefixer-rails-9.7.3.ebuild 889 BLAKE2B 85643bd01e0a4db78f304d55c7b75181e51258b83219073e17142c86ef025d746d9e34b6781adeb5a869fd4ab4643c1a039769ddbdf2ec45c8015a8ffc5d1bdf SHA512 dba75647eac0f7e41a6a20bb359fb137b982bd28a680c85c4240356005b4508613e4364d56b31e1db9a3f373809e9e84065184656086569b02f49815e118cee1
-EBUILD autoprefixer-rails-9.7.4.ebuild 889 BLAKE2B 3cf4bdf82de374a642587706e0c5ad4e6a4377592aa9d7eebe2f65daf65cf9ee1be4003adf1a3f9e8c549ed8a197bd2c30b27a2dc06e96ea4964a8e4cdc24af8 SHA512 e20ae08a2aa90c06045e77c4cc7a14776060f0e51a511aaf493d68a9d3fb02a5fd0980fa7d4d3f0bb4de36dc77aca0e83d9cc3ada663f04e9eb480d3e2db1224
 EBUILD autoprefixer-rails-9.7.6.ebuild 953 BLAKE2B 1df137ed718f8b17482bff93516285cabfb6f33a3af779a63fd8def74142d8c0b6dd50b5b7055ff20602104aa3ea10ef6f4fb83575c4950f40d7b256b5190422 SHA512 25ff7903940f546bbee37fd8588b1028191e3139e73da70df85e5f7977d0f029f659e23da06eea08c6d96d5cfbab15776a935cb63b1f09b1d69659b205ecad9e
 EBUILD autoprefixer-rails-9.8.1.ebuild 946 BLAKE2B f2c0e16792f3419aaecab7b112b21321c7c7640895fbcf9f5710f56807ff8828e4a2545617b5d4affbf20b77b18138276f592506175575b7f975e3a06574d415 SHA512 bbe425f71a781271fda28d0907fbe328d2d7672fb1c0f878b12c1efe4f28c0065d831bbe509ecc298391b7d1735c98cbad87a49ef09bc8f92a7a8e572ecc4731
+EBUILD autoprefixer-rails-9.8.2.ebuild 946 BLAKE2B f2c0e16792f3419aaecab7b112b21321c7c7640895fbcf9f5710f56807ff8828e4a2545617b5d4affbf20b77b18138276f592506175575b7f975e3a06574d415 SHA512 bbe425f71a781271fda28d0907fbe328d2d7672fb1c0f878b12c1efe4f28c0065d831bbe509ecc298391b7d1735c98cbad87a49ef09bc8f92a7a8e572ecc4731
+EBUILD autoprefixer-rails-9.8.4.ebuild 946 BLAKE2B f2c0e16792f3419aaecab7b112b21321c7c7640895fbcf9f5710f56807ff8828e4a2545617b5d4affbf20b77b18138276f592506175575b7f975e3a06574d415 SHA512 bbe425f71a781271fda28d0907fbe328d2d7672fb1c0f878b12c1efe4f28c0065d831bbe509ecc298391b7d1735c98cbad87a49ef09bc8f92a7a8e572ecc4731
 MISC metadata.xml 347 BLAKE2B 71b067345809944df1e70cdcaa44e44ae416d0c4ff80975aa796b8217170825e6be32a15d2549f464d9a65e8aa9ff1b2e9496989e66bce29d3dad672742495ec SHA512 b0985f41e9463a6c5bdbda0d5a84cc76cb6090614fa07395705b3207e0cd4fadbe9b1bb18fb7382f3c8bd00663db1232fd7107f6757bd20cfca0a0df99928426
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.7.4.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.2.ebuild
index 2abda327ffb8..bc06b1290578 100644
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.7.4.ebuild
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -33,5 +33,6 @@ all_ruby_prepare() {
 	sed -i -e "/Bundler/,+3d" \
 		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
 	sed -i -e '/standard/ s:^:#:' autoprefixer-rails.gemspec || die
+	sed -i -e '1igem "tzinfo", "~>1.0"' spec/spec_helper.rb || die
 	rm -f spec/rails_spec.rb || die
 }
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.7.3.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.4.ebuild
index 8c312ceb78ee..bc06b1290578 100644
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.7.3.ebuild
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -33,5 +33,6 @@ all_ruby_prepare() {
 	sed -i -e "/Bundler/,+3d" \
 		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
 	sed -i -e '/standard/ s:^:#:' autoprefixer-rails.gemspec || die
+	sed -i -e '1igem "tzinfo", "~>1.0"' spec/spec_helper.rb || die
 	rm -f spec/rails_spec.rb || die
 }
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index 2a0385887a41..87d7305fa111 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -1,13 +1,9 @@
 DIST backports-3.15.0.gem 152064 BLAKE2B a2c2a1f35ab6f682be23a5189bafec563a2d028ed5f0e0a4880ad85e09ac7af1085a601323ec3459c5be87a5271c6c3e47b6e80005c50e3084d4ac1dc9f2fd35 SHA512 4eb1f928c37596971fa274d838ab991bce462a7f571cb68501fc81e579693528e93536c25e4b64d93f4f0edfd313c8aacd8af014bb5c586cc182867e78f614d5
-DIST backports-3.16.0.gem 154624 BLAKE2B a35adb965c3f9f42fab5fe80fa1ca20a59511e9b265da28bef059e3477fa6a291c86e3b16f837e1f2d2f7e36e6660be29a9fc02713c3f46ad36767dd87baa1f9 SHA512 500386a74162e6c66e606c705dd26296f56118460f300005f0db44025f49bb8f516805921f23e17d0959056a2a8fc320b5ad4c514dd9c22ef811f6325113ae8a
 DIST backports-3.16.1{P}.tar.gz 156181 BLAKE2B c7cc842fb9bf8fcc7b55c8a572cc7a01a63008ad20f63142f339d24d7bf04202f4def2f03261d23d6c41c8c3bd0af8fce76a323e25585b6874c1428eb2a9ef90 SHA512 d907d729dd37ebfb175f8274078664fc4eee51de773cd0871b8bec9a8808052fbdea8571f0a402b1a6ca88ca7cd7b6b9984f66799abf92f300f1f8bc7b8f3f9b
-DIST backports-3.17.0{P}.tar.gz 158065 BLAKE2B 33df81f32aa36b8039e021dbbf9ebd265a73cc5f74069472773ccf8f71d9378820671055c8130282a95ee8a5b32d3fe13a04394fb8f9b4c01c38f13582447063 SHA512 4acea191916bb067856c42665c10fad52a275193fc5cd04cb73bc5ce7967033d055acbf682f5e7abc8058fafd5150fb8154495a964d09664bf1ffcf91dd154c8
-DIST backports-3.17.1{P}.tar.gz 158209 BLAKE2B caecc782c7949d2b6408a31c3d5f7e1599c49a0593761c2e75fc8181b28db42797fc10ea8149e6f6d3d60c6561bedea536b80b271ba4243c9cf933414e8aca71 SHA512 87cd790099c5265bbb3d6f91fd40429f65b97c4dcdd5126c2a8c4376efac047883271e447ecc3512999c2470b291258b1d45600fe55ad687d4eab8ab12cca37a
 DIST backports-3.17.2{P}.tar.gz 158235 BLAKE2B bc761ee147adec209f2dcc3ff95e8ba82b8388c58b3b6aeb11c4f294ebf8aed74ca8bea54833df5adf32b2fd65ec01b621d2e8422d344fe9e1fa228542cb6118 SHA512 2194dd0e89c111f02d161ebc60827fb0276ad32c9e611156687a0f83604db2b25bdec626d7671a7a6fd7ce1395dc818a3735e63a2c165f41a0dd37ff37487d4e
+DIST backports-3.18.1{P}.tar.gz 158453 BLAKE2B a50efaea7a97d25dd760a8fb592c664c011818933b346b959611d02592e2d7fda46fe16a805290340bd5323397f33ee4d613b9698b70a29714e5429a2d320783 SHA512 38a057d5eeaab45cea4d7a8dd9ec8d0e98c5efdf18056576574733387d84a4ec8388f4797c527e240ef0bc026dc730c7eebfcabd42e1111b2d5727b9cbca4016
 EBUILD backports-3.15.0.ebuild 666 BLAKE2B 582f77e0126ad733ec009687eef69942ec75f90bdae8be08cc460af4e28ef5f4e36d9ac16ab2edff4c1d632488a87e81645642b5c9c74405bebb9c0ca2fd688a SHA512 b61462d7b91475e48927a0c816c02c51d66876400225703ead490e73bfe5d4915da2a9b381f6947dbfb0931f3012c03df9b03f0dcae41ef64649a59b3a44dab9
-EBUILD backports-3.16.0.ebuild 623 BLAKE2B eae1b090445de4aa9d97da1975cf789739c9d8753549a3726c175caf1cf90f6012375e2ff4edf877fe924e0529b24c3f1f41438530dbbf121db72e4d45b203ab SHA512 81f78b10bf6d43d466c10a386e0e4291d84b384116bf67913347b12ab44026784ade8941f9584127883e6a93664fa152241fadbdaba3376a5bcb212cf4378811
 EBUILD backports-3.16.1.ebuild 752 BLAKE2B 5d8c699e1d0e589c3d7bea246a9b64fa2212a1c614a1c078d9c9f1efa7af79f584ea6ff3c20e1555991c4ada640f15bae70c0818fee54eb5c3b9b284f8bf8f08 SHA512 00c4e1cbccd845f5312581cde1bd443070fa579aa8966e7f36d743df610432e5a70f85d147be51aa03e1b418edef4f513c3651ceabffb11dac2120254265643f
-EBUILD backports-3.17.0.ebuild 800 BLAKE2B c6afee4193e95b9dd3d834d8e4fc7e64d6490d02d74303e625ac62caa77171d659bfaf23d73b14109d7a1123b1623d7468ae2c8df1af16c5d44c799fb738c034 SHA512 3548c93050d88b3622456d41bb9196298d62e51e4d618bcaad511d5658b8964345374e68caecf168ede3b290a343ce8571a5125288bf17cecf8b06b7c27d9505
-EBUILD backports-3.17.1.ebuild 800 BLAKE2B c6afee4193e95b9dd3d834d8e4fc7e64d6490d02d74303e625ac62caa77171d659bfaf23d73b14109d7a1123b1623d7468ae2c8df1af16c5d44c799fb738c034 SHA512 3548c93050d88b3622456d41bb9196298d62e51e4d618bcaad511d5658b8964345374e68caecf168ede3b290a343ce8571a5125288bf17cecf8b06b7c27d9505
 EBUILD backports-3.17.2.ebuild 800 BLAKE2B c6afee4193e95b9dd3d834d8e4fc7e64d6490d02d74303e625ac62caa77171d659bfaf23d73b14109d7a1123b1623d7468ae2c8df1af16c5d44c799fb738c034 SHA512 3548c93050d88b3622456d41bb9196298d62e51e4d618bcaad511d5658b8964345374e68caecf168ede3b290a343ce8571a5125288bf17cecf8b06b7c27d9505
+EBUILD backports-3.18.1.ebuild 793 BLAKE2B c44bf9a13dfbce3d8713b93edeadefc69407bf7f0575ef5629bb9401fccb82dab893ce806daaebe3b4c703a3680aa202a88cca8466ef75a9b55d1f98a0112d33 SHA512 60444bf27bbabc3ea8bf28ae0c54d6dce880933e58d386fee988f5dab15885ad401919a554d103d1577aa938cf58f66ce0d144dec11304301ec382130c56c738
 MISC metadata.xml 335 BLAKE2B 23e6e33c417bb055592549fdd07fd02a2d97b613095e42248f501ee6ea71e3d4b2a2e25796060d3448900ba0d2fe66d0c44307be97b89834711ed153751126c3 SHA512 2850da756cf7d97e70667e06587ab9a37869e4a77417c12386edff4ab09d380641a4573a7ecaa6eec5809fe85106ca53844b4b25fbeb6cef8e451fef2803ae19
diff --git a/dev-ruby/backports/backports-3.16.0.ebuild b/dev-ruby/backports/backports-3.16.0.ebuild
deleted file mode 100644
index fea2b86091ce..000000000000
--- a/dev-ruby/backports/backports-3.16.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_TASK_TEST="test"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Backports of Ruby features for older Ruby"
-HOMEPAGE="https://github.com/marcandre/backports"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid activesupport test that no longer works in Rails 5. This also avoids
-	# a dependency on activesupport
-	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
-}
diff --git a/dev-ruby/backports/backports-3.17.0.ebuild b/dev-ruby/backports/backports-3.17.0.ebuild
deleted file mode 100644
index 10f3947595ba..000000000000
--- a/dev-ruby/backports/backports-3.17.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Backports of Ruby features for older Ruby"
-HOMEPAGE="https://github.com/marcandre/backports"
-SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> $P{P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid activesupport test that no longer works in Rails 5. This also avoids
-	# a dependency on activesupport
-	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
-
-	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/backports/backports-3.17.1.ebuild b/dev-ruby/backports/backports-3.18.1.ebuild
index 10f3947595ba..c1798ee2c098 100644
--- a/dev-ruby/backports/backports-3.17.1.ebuild
+++ b/dev-ruby/backports/backports-3.18.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
 RUBY_FAKEGEM_TASK_TEST="test"
 
 RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 3a3cd1d7328b..e4594355406f 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,13 +1,13 @@
 DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca18ea85a7095d9e58625df6a59a349b60b462c5c4f403a6af955466bc46d82be6cd91724fc2b12cbe15ed74a4c SHA512 3bb994e022593d485a07296193a16cae7b45e96e87dd10b2bd4807ad2bc990801044c0493360598d1626c3e367e8de87e407f65c2c6f42674d5f1b9c0b5c1933
-DIST capybara-3.30.0.gem 360448 BLAKE2B c20173448903f96facdba007b81b43d74500a0e8ab1e15b9bef938df426ff8098a1fb54a3791d92d0342b594d609ca48b9d8c1f67a758d8164fbab2f5dad3bd6 SHA512 f10943a8f10c0a058d0737fd15814d4ff6e50dd4df2627d20f4646c13bb52dcd0e1042193525252d0009e637c52118ce030968e4451f823076e59b7fcd4cb90c
 DIST capybara-3.31.0.gem 363520 BLAKE2B 246a199d89f5120bd1be7b36b5aee5bd4143ee5d1c8953cc2e65e805c234d902c5d898f873c562b8457c6e09af507cf81ddc178bcb617f2730b5db1f9ddd97c8 SHA512 920dbd331eff5300cfa575689f7c62f502cea5782ad58eff168ffc274f2622a95869a7ab90e53fc010bc7f5c0847caa5dcf69cb74eecc2a82f0f449c11be3edb
 DIST capybara-3.32.0.gem 365056 BLAKE2B 13fa531ffef6be5711b3f88f7b40dc409c9e404a3815ced121e1b87d2a7aee7b1ac22b7c44673c2d14a79a0eae18a45e5f20b022625594c24ce8a30a4779b061 SHA512 930149822605a744ad3b802d27f9419542683b4d11322f4c71f25613b8c1a3653adf5b598710e2961a82a1d0181ae6c182473d19044456991af378601e4ae89b
 DIST capybara-3.32.1.gem 365056 BLAKE2B f866c90cfbaaf57387286436e877dfdd2c6b1cf4a581931c416656c6b687ab69c1a4cc1f70eb43faf306950bc1f4fd9e5b6e4741118bf7eb239a477f08851851 SHA512 20486897ccd282e1a73f26b94dbc89837527b253976b317df55b319174aa9eeaa499f1ff153aee1b463b93edca5f7f2886d01edabb7358262e57736111d758e6
 DIST capybara-3.32.2.gem 365056 BLAKE2B c193f188aec6089aabafb5d09cb540f914d8c257d3faafa0d59f674069a39c29a3750c80bb269bf2d010cc7608aec1699c7d75d96c7c85c201aaa0f99adddf83 SHA512 b1b21615b5f87012a71a7901a4f9bb9cda61f1a455299d4ad05b05e0281985a6c158a1549864e551c2ca4b97e921139b35843a1d23efc45557647328c0d1c2a3
+DIST capybara-3.33.0.gem 366592 BLAKE2B fb64b301051011aa82194480bb79a33d06345cbe250fd7a32d54cb32038651f8598e860269c67efc58a87410a213f07e8f7107b725bd6286ebb93e7fd6ff125a SHA512 b169a12f330fdc016dbba6c7478cf52a51006499197bba67e6953f36929099212e209d2803511ca623b7e2b1fc0288fad1975fd426047c95680309145abb9977
 EBUILD capybara-2.18.0.ebuild 1529 BLAKE2B 2c82eac2f07da03522e3d5cf719171ca3b81dc08b516ee37a9dcde586d5257fce47e8ca2c0a82de966ee79c19ce84772035e89efc1e28f97f240e54e64e75e50 SHA512 8c02414c863ea3a380821c127c3b8175f1a38ccf7a19abfdb493d702acce171e915bc76cac2ea94acaf1649647386bd78af1c80272fb6294246462c3c42a5d5d
-EBUILD capybara-3.30.0.ebuild 1782 BLAKE2B 98d775d959579d73277b3b53d72128b0d866af84a16da3b48e1c1e7aa512191dae70a1b1d6a205136a9f7502d79afc02655cdae858135cedb76816b21ecd3a72 SHA512 c50c6ec8d2a9d48107940084e266bd6f599c3fe1f8c41f4305fe218ec68940e5c4e430572434ee7ebb35325e2b3c51b507b37fb62dbcdebe242f1841735b4762
 EBUILD capybara-3.31.0.ebuild 1789 BLAKE2B 0144d4405f871d24f715b1ee0e8e6797b37178939ad921f64d83e033256aa8228900ace9df68358e1d1222ff0ae7adcae830e8cd9e8b6d4a5f521224c618ed71 SHA512 502598533960c4d2fb06e8bec9859067246321ea625c1961c7ef115c44664b3f9b533cedb6c630c9c7dd5093cf873e0d16ea80d3d2d704db950e22bd9a980601
 EBUILD capybara-3.32.0.ebuild 1790 BLAKE2B af90ef0b0042e3a0697337c24531debe853a05e167439ef8baa9ca4090f2834fcd54103ed9c9e1462b5b758e3e8dd38d6b4a6839c6a5b2786321b2025a76cfd2 SHA512 6d2926ea5491a5426d3730ab74946d0162b5a6e357868320606cd4e7015e216bd974446562d5407ca7911d5078855d6bbeb961a861b9438ecccdc42ca6af207d
 EBUILD capybara-3.32.1.ebuild 1790 BLAKE2B af90ef0b0042e3a0697337c24531debe853a05e167439ef8baa9ca4090f2834fcd54103ed9c9e1462b5b758e3e8dd38d6b4a6839c6a5b2786321b2025a76cfd2 SHA512 6d2926ea5491a5426d3730ab74946d0162b5a6e357868320606cd4e7015e216bd974446562d5407ca7911d5078855d6bbeb961a861b9438ecccdc42ca6af207d
 EBUILD capybara-3.32.2.ebuild 1790 BLAKE2B af90ef0b0042e3a0697337c24531debe853a05e167439ef8baa9ca4090f2834fcd54103ed9c9e1462b5b758e3e8dd38d6b4a6839c6a5b2786321b2025a76cfd2 SHA512 6d2926ea5491a5426d3730ab74946d0162b5a6e357868320606cd4e7015e216bd974446562d5407ca7911d5078855d6bbeb961a861b9438ecccdc42ca6af207d
+EBUILD capybara-3.33.0.ebuild 1783 BLAKE2B c9be1ebcbae6b2141e9c0f967d92284c736c57046a30eee07705567e16aa065033ee307ad722aafe07bbe8080e9bb56636f16b0596d8b7a03c48dfc4a091bb0e SHA512 83c5ba82043668977392824b28125859ccaf75fef8cd4dcf829cb163c09b3f5e7603def865ba66dcd2a5a88b7016146e819ab6df58316df11269f463bb95c92c
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.30.0.ebuild b/dev-ruby/capybara/capybara-3.33.0.ebuild
index 38b2db211d8a..b0688ebe995b 100644
--- a/dev-ruby/capybara/capybara-3.30.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.33.0.ebuild
@@ -2,7 +2,7 @@
 # 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_EXTRADOC="History.md README.md"
 
@@ -15,7 +15,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/childprocess/Manifest b/dev-ruby/childprocess/Manifest
index 678b7ead3db7..7be5eb70b522 100644
--- a/dev-ruby/childprocess/Manifest
+++ b/dev-ruby/childprocess/Manifest
@@ -8,5 +8,5 @@ EBUILD childprocess-0.9.0.ebuild 962 BLAKE2B d26c87e9845aa51baccebd6476f0aca6165
 EBUILD childprocess-1.0.1-r1.ebuild 1018 BLAKE2B bca39ddffc883a6f65d8c2c6eb3c096fd06a9f51b9bd450ed409ec3d238fc279a8456ececd874b75889f854495b16467c7476dfbd7161f2cd0a0a65219825226 SHA512 c80e6f854cac8db0e43113a407289a99634e7331fce0e7dd21d61bcec2b3d691ec16b0e1eac3c75fda2ac11c9a5546bbfe0b2a1ee1324ef9fb3fab07ae48e1d8
 EBUILD childprocess-2.0.0.ebuild 970 BLAKE2B b6e7dba15d68ea2ec47f833a00984b2956547ed5a58239b6f286051a2c07388b7d004b7387a0c2c24cfc799fd8755534721eb88d19e9e412b31f9928554e5a93 SHA512 03d8ec9f71dcfba4a1ec28393b4bdf9b32d71a20e0b546e9bb2fcd034589530f20b678a5bb63e71c4f662593b8315435f7fa869a26e4e152c82fb03bb7305e92
 EBUILD childprocess-3.0.0.ebuild 938 BLAKE2B 8c8b9eb9507f6bbcb8a0d8acc0d2866589382fe6c4844289fcb4e9312cbe7ed706387e69b93fbdbae4fecca1766ae59270bd1c4e8a7cd3ce3be66dd70f97b3ee SHA512 68764a79057da9084357a4e1bc67d0e450a0d8626a2aa7d55de7e9d34fa222fba8674564b0a2c4f5de841d9dec846b9ca27aa30c4142e2c15158e982e56df51e
-EBUILD childprocess-4.0.0.ebuild 939 BLAKE2B edc0f32e7177e5f7d1f07bf9f226b5f02e173ebcbf8483126e682e10e748a9c9413dbf6369f3e2ec5f98dae34ebd5ba183df3865b889360e3611af8dd68991d9 SHA512 b16a37346a3c8db72bfe847c8e1cf9d60c8d31ceac554c10b93a400dcdc24ff2fe41c6d38017c61899c0caed9695ded4b69e056c0fcb0fb90f010973c828fa23
+EBUILD childprocess-4.0.0.ebuild 1026 BLAKE2B a88e2d0058601472a79381f840474559736d335b85604df6f34d1a137e865a5c91ce5668a32b638547dde480a843fcbeca16a326e5acc49f22370a3abc34b7ca SHA512 2b463bfc64c98447978eddd7c448f20bd0a441c65764501a631c4a9d8b258229de334e71bac013fd9529035ac4d9cdac56250abdaf50375f623268d128b3abb0
 MISC metadata.xml 344 BLAKE2B 3cbaf9e4992ca3e9fa2283451433e35247418e190a6447453848988e305a4f04583a3ee563149774c347dbd6bac2ebb0451c19fba1d5447162707783c02ff6b9 SHA512 2995953d3ac4c6cc924859dcc2910bd303262f86d5771368956cb0a3d26db031302547154bd98cdcf189aad39e132020c0c22510c65c7830f528cbf2265d871a
diff --git a/dev-ruby/childprocess/childprocess-4.0.0.ebuild b/dev-ruby/childprocess/childprocess-4.0.0.ebuild
index 79eebd325338..f5e6313be959 100644
--- a/dev-ruby/childprocess/childprocess-4.0.0.ebuild
+++ b/dev-ruby/childprocess/childprocess-4.0.0.ebuild
@@ -32,7 +32,8 @@ all_ruby_prepare() {
 }
 
 each_ruby_prepare() {
-	sed -i -e "s:'ruby':'"${RUBY}"':" spec/childprocess_spec.rb || die
+	sed -i -e "s:'ruby':'"${RUBY}"':" spec/childprocess_spec.rb spec/spec_helper.rb || die
+	sed -i -e '/system/ s:ruby:'${RUBY}':' spec/spec_helper.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/diff-lcs/Manifest b/dev-ruby/diff-lcs/Manifest
index 8d79840a051a..af99e58a423a 100644
--- a/dev-ruby/diff-lcs/Manifest
+++ b/dev-ruby/diff-lcs/Manifest
@@ -1,3 +1,7 @@
 DIST diff-lcs-1.3.gem 46080 BLAKE2B 907536d75c34de86ef28fa044ae785d8ba34c8d1f4d38964f08ef80c14a4fb6176504a39c2e074fb58fc5456214555461a18ae42dc04f371d85dd335b1cbc3dc SHA512 b82de390d22e0c1337ddca923621b1cc842f583a93953ef07a303b428fe3a389f8a4a1a63617a58136c8d6215aff025a3bbec2a2f618e9ea81f471964f93b078
+DIST diff-lcs-1.4.1.gem 48128 BLAKE2B edd92f00b858c716787974772858f65d98b1a07ea4e8697eed190d09e2cead7b3f2518ee96521b0cda1cd4b938365705cf969ef2d8cf1333ff843202ea2b6c90 SHA512 d084ee628caafe4b61e66142d57e25dd2c8e9423a5d0d042911a4816ce391528f03ea2c6226d29c953a83e6642d0c3328ea5a22216011f112f64030c6808a7bc
+DIST diff-lcs-1.4.gem 48128 BLAKE2B 6ec3259dc366769c4008c6ea6c7e5f1fe75350dc0318c8d45991bb8173274630b3be734fe6375dbb131620d8124faa7c0567e57d299393c3165b0e1c2d29c138 SHA512 a352fdfb89587b38f3e518f76dddd048530501080dba5abb0c37033f44bee65bca12550ea7d6f1edb8a719092538c20d1c58dfe7a6f67ba1d46549608c09feae
 EBUILD diff-lcs-1.3.ebuild 640 BLAKE2B 802b2653e9789014d27eab658fb2e1857a5de107a9df5c1fba293b3ba2bbb5449106a9d5de14611f39490edbf9f283c8123de5cad42913a50fc33eb3412988d1 SHA512 6af2510987d3d6f4e5a8f7135ed35713acb08628b046538588aba4f201de74bee84b1b46ac4fd2a1cb6c2feac8e634593fcc0a9530ee269b54557379911b093b
+EBUILD diff-lcs-1.4.1.ebuild 610 BLAKE2B 11a886ef458a5df3fb76d4c506caae4c0232eaf3509e2006b26e743189ef437a49ecb9949c57dd4d3a3e48c530402468c9daa2a74120ca00311e978e91aba62b SHA512 4078c3811e8dd2d20791c13e3f9cb6f3a58a1ad77c2af59e61e09377e059264e8103554af1e6f4e4797c2dd5075559cdd20bd578e0d3ceee5574ee1a3e610c80
+EBUILD diff-lcs-1.4.ebuild 610 BLAKE2B 11a886ef458a5df3fb76d4c506caae4c0232eaf3509e2006b26e743189ef437a49ecb9949c57dd4d3a3e48c530402468c9daa2a74120ca00311e978e91aba62b SHA512 4078c3811e8dd2d20791c13e3f9cb6f3a58a1ad77c2af59e61e09377e059264e8103554af1e6f4e4797c2dd5075559cdd20bd578e0d3ceee5574ee1a3e610c80
 MISC metadata.xml 345 BLAKE2B 99a21f71cd3b7984131e3b43a14297bdfa3cb4238833deade649c4afb880ce6fca1bf4c3dfbd2fc75f68f42d5b7fcf97b1cc85a416da75490266a8bd57a36846 SHA512 b96c7243c3d4a6a3fb41e63d8dae54dc233e20b98698636d6d7f30f2c00bae3af9a01df68fa9c38aa0baa0b1bb3c267775dd8a5db539db3d8b46c497e85e860b
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.4.1.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.4.1.ebuild
new file mode 100644
index 000000000000..83d94225b6f1
--- /dev/null
+++ b/dev-ruby/diff-lcs/diff-lcs-1.4.1.ebuild
@@ -0,0 +1,19 @@
+# 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_EXTRADOC="README.rdoc History.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Use the McIlroy-Hunt LCS algorithm to compute differences"
+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"
+IUSE=""
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.4.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.4.ebuild
new file mode 100644
index 000000000000..83d94225b6f1
--- /dev/null
+++ b/dev-ruby/diff-lcs/diff-lcs-1.4.ebuild
@@ -0,0 +1,19 @@
+# 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_EXTRADOC="README.rdoc History.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Use the McIlroy-Hunt LCS algorithm to compute differences"
+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"
+IUSE=""
diff --git a/dev-ruby/faker/Manifest b/dev-ruby/faker/Manifest
index 344aaa3a61a5..5ac44be169f0 100644
--- a/dev-ruby/faker/Manifest
+++ b/dev-ruby/faker/Manifest
@@ -1,7 +1,9 @@
 DIST faker-1.9.6.tar.gz 1833392 BLAKE2B 826ee480515873d1e250147e5c3749e222b1273a00fd4ae0a2a28dca91c5981290c8540602d89d406e91d98a0f5dbc6fc4a54ab6d7d2b716a4d4957ab32254dc SHA512 1ea0c4194603b5eaec0f4abc2460fb39cb9de97179d7699c3cb37673731ebf8bf03d20fb422911d4725d4308691d4c92a82f5a661e034381cc04066ddcc955bc
 DIST faker-2.11.0.tar.gz 1033369 BLAKE2B 51677346980bd5070a145b1d8dd11a6426cf9da5c407e030d9722ed8ccc4ed1a0a8b2d5534c96b50fbe79e84fe71e4268f3228c223dc61fe4c74cda0de18a790 SHA512 9adc03cdef0714656738d354d787a99cb9fcc85718847db7b183b02f38d550ff86d65c8e6ed13be3c839cc64f36f3e95ff25dd5d2f8f45c7207dbe5735238e0a
 DIST faker-2.12.0.tar.gz 1100460 BLAKE2B 8be31911c9612d7433433121344a1fbfc735740898cb4fa7115a9ec33d22f610e5eca9ace3369da7f6e107478493e7b732a74650a233171ebb8b306f3e2d872e SHA512 7adc89cc3ba7e4d802d5f96199e21a6ed1dc9f0144d2da5a9a5adb705097d1acf4830c7ff0ce733fb9b0ddc11fba0290cade9f791824db5ab737b3facd93f93d
+DIST faker-2.13.0.tar.gz 1129212 BLAKE2B 358a959a600d5638681bbad20b05618cd2d67857de120a4ff6d8d6c3c723d1efd24ebfa617e3d2090862e111271bd3c12ac3f3f340e8eda6811760c1de31f642 SHA512 700a3d4d6f9019bd7c7e61ed770c6eb2e9dede6e4af9e3a06ca1858a2eebdd67491b94a41396ba1ab4940f0f7fd00f2203db78f5267adb08360b95823c633131
 EBUILD faker-1.9.6-r1.ebuild 720 BLAKE2B 19d8387ce2fe15cf1fff88f00219e630526321f37645f5011920c68056646c55c5f983f9f3bb8c291a4a90ee6503e118d4c6758a93f39cc78c881c46f4e0ae67 SHA512 50c6bffef40a9ff278234abc58cf4ab71e187dbbc9b48631f547ad6d40637150ca2dc040f5d3208126e1aba09fff97cc8a499437777b7113ba5be934510fcb10
 EBUILD faker-2.11.0.ebuild 799 BLAKE2B 3cb0a41f26666e42f9afcbb64b533cbb80c5624d5b04447f6c8136500f65968097c2476f6da5a13e1579dd463c4ee387f8482dc62c9a76fa67616cc0377a91a5 SHA512 cb773add5e5a637eb2a27e98b5229bdf4380f8c9ff2ac9d6061b1cbcc896331b458aa11c17c925749b5a4bad9aaec5b291f9dc121d9a68cfa3ccc6150d9b944b
 EBUILD faker-2.12.0.ebuild 801 BLAKE2B 609e08547e03c49ac7d62e9d5240aa3d8d8640d00d85ce44e1e6d22b3f5cdd73b0f1a43e7b4010ec608c53d4001ae94e169c4cd98497b271b9d7dbe6619bf21e SHA512 a65527c7764100b86d8399f0caa3b882139ffc4981cee878b20bd3e15e3b12f20fb4b11013f2da6e5a66310eb010f524dadda30193b8711bae03268f9cd283f6
+EBUILD faker-2.13.0.ebuild 794 BLAKE2B bf8cbf0dc5a7992dd7bf20b2352783abbd1d23e71e7ad710641473820fca5ea3e8828f132edefcac7b1c0d992230bc4da6166c0c29386214324fd90af4d0f1d3 SHA512 a953537117984f3169944b80a4707901a654f46f64240f94bda20676de0927ce2be8946412c27dd8599c6d59f49df88e0d6f919decb870bce69fff50e1182a1f
 MISC metadata.xml 452 BLAKE2B 70c3af75cc74dd28d3af9df670a4f2f0d898c702a5d5421d46e598ad14c380e288cec076d2a3aaa08e85a198b12daa2d69249feccffe24f07d6d73fea1010fcc SHA512 1c525fb78b733e6301acad7092799dcbba462c471cf3719f5634069a83c67bbb27a705c2ec6a27b8d431842efebef3209d7ca4167f8dda7e6439b1c0cda09eea
diff --git a/dev-ruby/faker/faker-2.13.0.ebuild b/dev-ruby/faker/faker-2.13.0.ebuild
new file mode 100644
index 000000000000..e02e94be8040
--- /dev/null
+++ b/dev-ruby/faker/faker-2.13.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
+HOMEPAGE="https://github.com/stympy/faker"
+SRC_URI="https://github.com/stympy/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/i18n-1.6:1 !!<dev-ruby/faker-1.9.6-r1"
+
+ruby_add_bdepend "test? ( dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|rubocop\)/I s:^:#:' Rakefile || die
+	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/gh/Manifest b/dev-ruby/gh/Manifest
index 6c4bbf353958..4de82a7c06fa 100644
--- a/dev-ruby/gh/Manifest
+++ b/dev-ruby/gh/Manifest
@@ -1,5 +1,7 @@
 DIST gh-0.16.0.tar.gz 129499 BLAKE2B 6dea86bcaa8191b2eb19daed487d80e5b55adadccb1c063320b44e742895cad1956e06a917ff35659834b4cf541892d3cd0b432f03783b4b860cf4c7136c7c49 SHA512 141a432b8d5f43feea6cc86be504e35b5133590466f1a28c5ba60a208cde9d3cc1a6f19702757e132e4255220e1161f6dc9621ec18a789d963738b9801e52da1
 DIST gh-0.17.0.tar.gz 129494 BLAKE2B c7c777fb1f0f417c62c9ec0598716302c2cb0a6870ff9534cabf03baea33e73581cac9bbe1f803d23adeb16b15e5af06e4dcc61ab2300846b6c5c227ddf7aaea SHA512 b655552180dd48a9de05d925d9795278ba8f293d03e07fc0675aae9bcef264f45a840b37cc855718c1118c31964625775b1156facf52781e99255bb16e7895a1
+DIST gh-0.18.0.tar.gz 129730 BLAKE2B e4e9a3b158daf83f8a0f0a809eff87e169c7a0a23120b9ae002d0fee4be166d3e6a09ef85ed61b35148d4285dc358a8d616e09c71403b85293574f3bfbbf922c SHA512 a265d25984d4c40340d4e80ce615f2f291f5636725e7dcdc181e3351d00fe8c3355148f206807180041f20db7f09bf94f5d279ceb25ea12ec19215640fff7839
 EBUILD gh-0.16.0.ebuild 918 BLAKE2B 86306322fd2d9bd7df7c1eb2b01f06c140a235abbc01cc0075102e715e861b03822469e68cf120199617046ddfe3150dd5c346780be7d79b7f170f6f3d1f3d96 SHA512 41818e1f35626458e009b2728930e8c8cf12b380e5ceef46213b387b2f5831d25a3527c02e43b2e74005bcf6f2a15aa7ba7d503400bbb04eb8284185e6d8c9fd
 EBUILD gh-0.17.0.ebuild 912 BLAKE2B c6281e196cecedd284e61033de159a5b290bc97c6545dbd7a62dbf3202e8018e8d64604e07e360c42030fbac2dd59d14af275f7107e2bd4ef842a358a35144c6 SHA512 160debae74829ae66e9078b38fc256d50a8443f67fe30ee963fcc0b50c2b1cc8bb00e57f57352d9929007655c9253640a712749276bf6697289a0b8a5266d0d9
+EBUILD gh-0.18.0.ebuild 876 BLAKE2B 64cb4d3a134ead6ab2cb0c47b5017abd027e6fa90fc4fb99210fb8be10fa0dcb8ba579538e9ce181516f89aba6d6180b5b1000d9a013bd5ba1e6c490239836fe SHA512 c23991505c548bc715726a5de7b88dee6950342cb716d37d33eeaecd865b558b6f2d0ddd71ba826af73d3e1c22945b1ed3202f74f5c5478f7d9c488ea957b473
 MISC metadata.xml 328 BLAKE2B ffcac2532a59009124144d5a974ab68f58c35954d76523766184eadaa5ba9602d891c433f40e830cac3d5acc8ea80fe516b5ce69df6e2240454e5ec1d9f198a2 SHA512 827f41487bb4442546ace9b648b2153e910f4e38a9d3edb1d2c231add2ea537c6318da7c5f0b4ee48f016c7c0bc62fba36cf4745fb96f9ad90890b97049d9d29
diff --git a/dev-ruby/gh/gh-0.18.0.ebuild b/dev-ruby/gh/gh-0.18.0.ebuild
new file mode 100644
index 000000000000..8bdd3083a66c
--- /dev/null
+++ b/dev-ruby/gh/gh-0.18.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="gh.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="multi-layer client for the github api v3"
+HOMEPAGE="https://github.com/travis-ci/gh"
+SRC_URI="https://github.com/travis-ci/gh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "
+	dev-ruby/webmock
+"
+
+ruby_add_rdepend "
+	dev-ruby/activesupport:5.2
+	>=dev-ruby/addressable-2.4.0:0
+	dev-ruby/faraday:1
+	dev-ruby/faraday_middleware:1
+	>dev-ruby/multi_json-1.0
+	dev-ruby/net-http-pipeline
+	>=dev-ruby/net-http-persistent-2.9:*
+"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/net-http-persistent/ s/~> 2.9/>= 2.9/' \
+		-e 's/git ls-files/find/' \
+		"${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/dev-ruby/hoe/Manifest b/dev-ruby/hoe/Manifest
index 26f8eb634d7a..c9c82a4c1d53 100644
--- a/dev-ruby/hoe/Manifest
+++ b/dev-ruby/hoe/Manifest
@@ -1,5 +1,5 @@
 DIST hoe-3.16.0.gem 188416 BLAKE2B 48383c46512a359a269ca3475ec701b1443e0ef71b31d1ca1604de391ed4df6b0ad27dd1c5f6ed04751047d211f2c6299245361cf131e2418f224324ac9934c3 SHA512 66cefb5a24906e19bbf0c82c8539d6d101b84d0dc1d3ce1910e4117357639489968271e76e86bd3c432b9ef7e3b24a78294c06210cbef280860f7dac18100606
 DIST hoe-3.21.0.gem 193024 BLAKE2B 2ff65edc6e0aebc93ebc8f3e628261ac3fabec4034b8e7b1bb3c38ab45c8b4641267a8c46c851ad69425c08782553c628574ae0a1417257cf64ba05a86de08f3 SHA512 39da93520bdb4efcbc58af58562ff8abbdecf45f92071ddb31f68ac799eb6f704431cea3d699aa039ba3a5217dc9b0f2d87f8b553d62860c34cb63803b625754
 EBUILD hoe-3.16.0.ebuild 1486 BLAKE2B ef4749acf7b18cd10b8fdb37596f6f77cbfec6e4ec9d68780c4464391fda1f189330f0523bb1f26d3d1f3477bc80f6c67d5d2f44311f42c0d1cae2381df15985 SHA512 b306fc188c6fd21bd4860309a944d73a84d9db49c2fda484b8f895435dabad91ccbec593389e52ff815c36d805cbc48b97fdef6f0bf98cdd0eaa6153c33eed1a
-EBUILD hoe-3.21.0.ebuild 1483 BLAKE2B de43fad438aa992d995576e4881377d8f62aaeba96b54b377f23b9ac19e9db935d572d50423ea152f16e04825a1a4ffe7cddaa07a550c0a7fe7c5400e8608a0f SHA512 fd14abfc35e86a0d1479b792f0a625258e8138203e48e47c29ed5904bed2a160359b65ff062cce8cff1ad537381a2a8b830217112c328dbeb122a324de9ffe4b
+EBUILD hoe-3.21.0.ebuild 1478 BLAKE2B c16df76306a7555b17af895f8f7bf8ec47f277bb09f23e404fcd4be03c9810f260dbfc918a46b17394116bc8e8c3c29c926c341d23b4b3110ad312922cd18c67 SHA512 7a9a177b0b609f7b6a00fa1332cebee297b43ef42d583ccc823d7da1faaf26666d8a2801e3e8af6cfeb30bd1a17a5cabac94162ea1c951766d9417d0c93eda31
 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 3843c843f735..2c6c7b46276e 100644
--- a/dev-ruby/hoe/hoe-3.21.0.ebuild
+++ b/dev-ruby/hoe/hoe-3.21.0.ebuild
@@ -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 ~x86-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/lumberjack/Manifest b/dev-ruby/lumberjack/Manifest
index a3f8c7d239e8..81bc78bc9067 100644
--- a/dev-ruby/lumberjack/Manifest
+++ b/dev-ruby/lumberjack/Manifest
@@ -1,3 +1,5 @@
 DIST lumberjack-1.0.13.gem 26624 BLAKE2B 16e911d832425d0adf8ee1bd18435733c5451b705c48493dd80e5e8f6b07cb462be2686dcce7a8c46b799fb8a4fa1a82d4d9c06e675cd6e7a990d93140cea395 SHA512 e9e9c65bdeb42de51ad27b70c86d36c5e63e8d73c3568661d52619ca9eeab36cf6aede5e6cd6ab8e8d30446c0b0e7a9702f696e03e06d8b7a73e1c028953eef4
+DIST lumberjack-1.2.6.tar.gz 39474 BLAKE2B 2885a143afd4793ee78b0e8d849a677fbeae94c99bda0821f759b174f68d7c1de5e6e59ef2dc68f99e41c24c6228787098571276b2aef208cd1aecbd17afdea7 SHA512 d8b5a098c9a14fd5d4acc7fae5801a07fdb1927e456c90a666dae8107ee12cad20d34f0b9cf69f2d661fe07af11def74cd1d529c88e17df213754178492de44c
 EBUILD lumberjack-1.0.13.ebuild 490 BLAKE2B 4f960adbf78cf85621bd4b4e9b87c53a1d0a067bdb1b78eef88e1e8fe658338ed49f9837bb4eea1de0f3963d348a432c41ea7ebcd09e331c30c3ae1604bb2e57 SHA512 1cde4cb7d972656a39333a56bd81fab0e93303a80b87f48a3fdf5bbe51a2a366f3e9d8727538255055d054d55290be8dd39048749665112ac6439555c200a64a
+EBUILD lumberjack-1.2.6.ebuild 682 BLAKE2B cbc6a8075f767c6440593d562c39c1ecbebbcfe6c494a4faa40617820602c6e77eba7949a59db5997526c8d71ef3551d8658edeb5072c09696153ef4a037634d SHA512 e025670f600add0847240f0d382c32af2cdcc4ac31daa814bd849b4b116b92e28e22f6253ac1c2ed6e174e21f1e10d262fb8e67fbb9db520875954107a372e5c
 MISC metadata.xml 344 BLAKE2B 7e45c518c60301bd5f6124f1e3dd9efc6025f889e905e39738414e307cbc91408fbdd6d64b9cc186edaa5d87c4292f0581f4b3ee4d06a3784b30a7f3236d3dcd SHA512 7bcfe06a1c5aedd0ff84769299b67bb8fdb41f59f0eee95f7b39c05d1419b1b669083e46db61d04732937f38fa0735b9bd1bef86df1e36fafddb8ed038a4cb7e
diff --git a/dev-ruby/lumberjack/lumberjack-1.2.6.ebuild b/dev-ruby/lumberjack/lumberjack-1.2.6.ebuild
new file mode 100644
index 000000000000..941c0d361977
--- /dev/null
+++ b/dev-ruby/lumberjack/lumberjack-1.2.6.ebuild
@@ -0,0 +1,27 @@
+# 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_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="lumberjack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple, powerful, and very fast logging utility"
+HOMEPAGE="https://github.com/bdurand/lumberjack"
+SRC_URI="https://github.com/bdurand/lumberjack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.8 )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/maildir/Manifest b/dev-ruby/maildir/Manifest
index 9da04547704e..6ac09a38dea8 100644
--- a/dev-ruby/maildir/Manifest
+++ b/dev-ruby/maildir/Manifest
@@ -1,5 +1,7 @@
 DIST maildir-2.2.1.gem 15360 BLAKE2B d3ea037ba38e83bc7b21bde9ccb2296fc922c3f657a73ad3637faf708cfa16ac75c2e6535714ba18b00aafc5a94265c56f6e086d25de5810c0a0112d6c876e1f SHA512 4c366333c802bbe0cbd19e6abaef1fa31ad84596518d24ddcc33aa3afe39890896d107bc864c68787c90c3a38115979f6a4fe8b442aecaead39306122d560f18
 DIST maildir-2.2.2.gem 15360 BLAKE2B 3e926057b4a625b95879a8ac91fbc5d0ae002ae7f4658c1a9b7a997a5071f30d05ff8e59df405139b0e3a0a060286c61112ca07671ae5e443b6eb2b2f0b33983 SHA512 90f4896cef297262d2bfafa9a2ec155d83f405114b80df8015cf0c6a5450e1b28807d073cf48b2ff03309bf2b7d50a77138cb524826cfb2c429b3c606e02c093
+DIST maildir-2.2.3.gem 15360 BLAKE2B 915abb1ee50a4151f22e0de4e92ff42d3f06b059478f6a4193866714e170cc88740a714bef54a530d3b85bf318c7f46dda6f42b48b7ceadf09c55eea31f5f5c2 SHA512 5dea021c49711f744429c6e5ea78bbb10e3aae1338f780107a1784f6ae8d3c598f9d17b8e0fa555dde4058041dbc7905d62f9d49375d6c4b822a7e88ca065a77
 EBUILD maildir-2.2.1-r1.ebuild 965 BLAKE2B ea320d6fcc95eb96158636d164bf2f51d9708057ccfc93bc1cd049b2095a5d4815d5b0a33760e6f767c45df35d5d4d2cd6ebfeb8e8c101ca363f106d768f5a75 SHA512 3a13e2d446a361cf86e28ab283c7c9ed651e0a3950cbc3d0ba8f9d23b45772380dee7d0679d39d0d1b870316da0eff8203e5ca8daa31ad8beaa7b34ddcdddfdf
 EBUILD maildir-2.2.2.ebuild 1003 BLAKE2B bebc2c9aaff3b3c458654215a5ec565786bffcc69a7a65802953ea56f0da94b9a3fd25d2c8eae8caaf29098857a3564787c3ba74069b333d7972f9192992cc1b SHA512 17be1f9d41365dbec7c98de06b0ac0dd1b8c372a86968c527e295489d413485de8d8f5b9669497828e4f425cc141af7baabb3ac889074ba484638a987796068e
+EBUILD maildir-2.2.3.ebuild 926 BLAKE2B 3f557b8b00e000a1e538f41ac687a2f35391e358636e0c227f5476f566ac9129e4056f68f2dc7ddb4a92b748640d283df0bfa70c553ae76b5bcd625bb7fa8a36 SHA512 55807ce5ff81dc0c76fc60ea3eb54f5c4b727ee618b5c973d458618f01b9f77939d4bda6502d55e31915a887e84b5033f4f1c9fa5b6e7a0e257227a9385bce66
 MISC metadata.xml 341 BLAKE2B 6081100c628ae44a08e012674babbb174a563ffc3c9239bb4dc117e372af60d23a68f8666b4f79c2a17c0270a8df39efc0106a07bacf600b76b5d85dfe9facc3 SHA512 68ef596ba601b4886488bf164b786fc0deaca4a10441ac164bd6eef0502c12e380ca27215f6599660467fafcfc3b6183fb7ae0dd847888aa8919437896e6119b
diff --git a/dev-ruby/maildir/maildir-2.2.3.ebuild b/dev-ruby/maildir/maildir-2.2.3.ebuild
new file mode 100644
index 000000000000..5e034bb678bd
--- /dev/null
+++ b/dev-ruby/maildir/maildir-2.2.3.ebuild
@@ -0,0 +1,31 @@
+# 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_EXTRAINSTALL="README.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for reading and writing arbitrary messages in DJB's maildir format"
+HOMEPAGE="https://github.com/ktheory/maildir"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="2"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/fakefs-0.3.2 dev-ruby/mail dev-ruby/shoulda-context dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile test/helper.rb || die
+	sed -i -e 's/shoulda/shoulda-context/' test/helper.rb || die
+
+	# Avoid tests that appear to need activesupport for .blank? support
+	sed -i -e '/add and remove flags/,/^    end/ s:^:#:' test/test_message.rb || die
+	sed -i -e '/be removed from flag list/,/^    end/ s:^:#:' test/test_maildir.rb || die
+}
diff --git a/dev-ruby/minitest-power_assert/Manifest b/dev-ruby/minitest-power_assert/Manifest
index d98f0def3a9a..150007ccc35c 100644
--- a/dev-ruby/minitest-power_assert/Manifest
+++ b/dev-ruby/minitest-power_assert/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-power_assert-0.3.1.gem 8192 BLAKE2B d5b9a862d19776d673fb510d2cc52b6741ac20c9b286228a672e49f681d37d2d2c3517253c70b5d1a8d8dc08ca2ac35f8105717edb74a28b6a2ed8667d94a9c3 SHA512 178c70dbe0db2b2248fa83437241d80c7054bf51e21afce74c61bc178907b98ae5b691e0cb644d5754a497d4944520e1ebf7727f1d7f286b4aa28b4560a54cbc
-EBUILD minitest-power_assert-0.3.1.ebuild 529 BLAKE2B 43c4a787b2b0b1266f84bf91b8485fd3baa801c967e0f2aa7b3b09d727d39b1479af0bdeaf999d69854ed1f63b3457c9960d43280e39db0b3420a776e68e99c7 SHA512 1885b07837b6122884bdd3a6af3f3164e0eff98ad97eb3a1930388be3fe43c7a6b87c70c049e5c55350a4116e962371a22cb2a7433b8dde5c73ca2120b16f313
+EBUILD minitest-power_assert-0.3.1.ebuild 525 BLAKE2B 9c349e7bb2e04d4dfb5815bd92daaba5e3fdd37bc0aa859bcd1c99c1cb4aedccd93bbf489308ac53db5aeeada36344d6980a286ef8ee638148356dfae99b1aac SHA512 dc2c0293d2ca1ae7c0778a752ff438304b9aa430084dbfefd95457a1a43ec97c19baa547fde18c693f9ddf31213332ff8cf0d6a87d5303daa1bd085ff9b9e6b8
 MISC metadata.xml 352 BLAKE2B 602e40e72ddfc6763f110238ecd49ae67cf566e86a996e64514e4d0302e88e287faabf52cc27bbdd50dbc92b996d06b66e8eacca2f75e318c8fb98ebd08d28ba SHA512 bee51a932b3efd1dc3a3df1d6572f83ad7011b0947f9bdbbd42b5e5ec222bd642c27f235fe3646a903597e678f0894d6c8bfe1aefce1a3e3e9e42ecb53b5ab36
diff --git a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
index 08bfda66df0c..3e67847d11de 100644
--- a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
+++ b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/hsbt/minitest-power_assert"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/multi_xml/Manifest b/dev-ruby/multi_xml/Manifest
index a1fbb11daccf..8e022dd87aae 100644
--- a/dev-ruby/multi_xml/Manifest
+++ b/dev-ruby/multi_xml/Manifest
@@ -1,4 +1,4 @@
 AUX multi_xml-0.6.0-ox24.patch 866 BLAKE2B 366aa40e831d76b4dfd6516d0b80599c70e0b0c2cd804c2f8f96b82a1582c933e931153f81f27bba8176bbe3ee8f6c4517468b58bd8bc7b380fe6c6257cb953b SHA512 f054a4bba4990f1ff8d6236ed2a99b97182b96c343b749e18c90c63faef10ea25d8f40ca0dd92e58aac8924d0cee15915b3ae2ebe5a6e6c024ea6d4b38b5e05a
 DIST multi_xml-0.6.0.tar.gz 16571 BLAKE2B 1492eab7782823915167ebdb529b6d4699b31f3b66c48eee5acf7857dc25caae62b63a0da10a0bd862ade22865432bc6c4290a3f6ff8e99a889fcf09b56f6b7f SHA512 67e280d838ba07373a6ad5cbe4658b32655102906d8e0ed5429d21220475c21e07ea2ec0d2729df4d30a1bf7d0a5e6ff2d4482342098873135cb12e18c53194a
-EBUILD multi_xml-0.6.0-r1.ebuild 931 BLAKE2B 8300e5288bc1ff371037af51061413bbc3156e54f2738b1b6f01169c44b2ae476c0196778b806db81c68ae288f09ae0f424d81c4d369065111321f8f03d55634 SHA512 75530dc3af310a084eac071f7537c82ba9ce0d92b57ce076a83ae11281ee21f788525bcac2981bbb5c45d2ab94e20b751df447074f07ee63fbeef4c22de86a7f
+EBUILD multi_xml-0.6.0-r1.ebuild 966 BLAKE2B c5e47a049141247dbe3e93a922487cc011424d23a0e4b287d0d353740788a1b4589ce23b488a6568959f20b9a3da9c8e67547ac62990d348fd95f11c12188dd4 SHA512 8f04748d8d74ba669677a4b0ee30b037a9e13f70bf8569bfc988065c9ae6a7669bd19ef550bb28ea07086b224d5b088ab13799e9bd5da2855fb2d573e05d51ef
 MISC metadata.xml 332 BLAKE2B fc83aa0e31b636d7abd190715ebdb0e7b205444f571344bbddd7d9b130d7ea566c38ce12caf4429b54db3415181f229ba5e012408596b6dff701f34e7e5b3a6f SHA512 53ff80596848fb984f23e66f1eae8bbe9e844de4760fbea929405d6515a250a710dc9a05f61cc7bf84afb069b2bc52a7304a1c15fa1a109bc7d6494fb5e1ef93
diff --git a/dev-ruby/multi_xml/multi_xml-0.6.0-r1.ebuild b/dev-ruby/multi_xml/multi_xml-0.6.0-r1.ebuild
index daa192d2ecfb..d73279c77376 100644
--- a/dev-ruby/multi_xml/multi_xml-0.6.0-r1.ebuild
+++ b/dev-ruby/multi_xml/multi_xml-0.6.0-r1.ebuild
@@ -31,7 +31,10 @@ all_ruby_prepare() {
 	eapply "${FILESDIR}/${P}-ox24.patch"
 
 	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/helper.rb || die
-	sed -i -e '/bundler/I s:^:#:' -e '/yardstick/,/end/ s:^:#:' Rakefile || die
+	sed -e '/bundler/I s:^:#:' \
+		-e '/yardstick/,/end/ s:^:#:' \
+		-e '/rubocop/I s:^:#:' \
+		-i Rakefile || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/mustache/Manifest b/dev-ruby/mustache/Manifest
index 363251e2264b..1b08981cd58f 100644
--- a/dev-ruby/mustache/Manifest
+++ b/dev-ruby/mustache/Manifest
@@ -1,5 +1,5 @@
 DIST mustache-1.0.5.gem 41984 BLAKE2B c063af6c9464884114b55c30df6c6cb2685b0394aa9280f006b6c35cd0681c8776edddccd1a33de75e291a2e1992477c1d70f6cb1c603e800b08be5b989a9ca0 SHA512 d9b2c55d758bd4e317732307b513e2a079b04ec7a1203233834fd08a3a32f7b1bf8283d207af2f7082a8c4847f9c5955a557f19bad9b08a1dee2f32417eca190
 DIST mustache-1.1.1.gem 42496 BLAKE2B bd1becb1c296abf03cdd6c7d5a6f29b71dc6328c126dbb27420872088b3b6988ac56d91c13f669cca94932f23f4290277d9ca6597ff842ff226e092c2532dccb SHA512 91a18a374a0348317d0801d6784fedd0782d7a08f128d3ab7050e631b34e45cecd49c4b1e2a9e17204f70bf169c107a92a1e210532bd3faa98edf8b1b5e8e43c
 EBUILD mustache-1.0.5.ebuild 880 BLAKE2B 3900c31778270f31adf59785138725ba225c2d04af90abf8ccebb4019789c38010e3baee9afd1b4ebbe24162846c2e7423de81272f1f85bb82208afac524a923 SHA512 87ac6cafca9586f7966b4b5a57d39a1edd1ce40d6b5bce04ef0be3c877858673331cfc7e4990f844b5671fb0cba999428050f0a7a4827c0948dd95aa30a6f741
-EBUILD mustache-1.1.1.ebuild 904 BLAKE2B ddbf4e025e270bb6087027eaf26d807aa8cda065e1b2d1a8be6f1865be99ef0ba819f6e098142dca50c4cc60f7b6644de4aa560618dfb465a8f278fbca951a11 SHA512 a09f0085ea8d3ed714b276ed61690199523ac1200ca9e20c3cc85a73bd71f6ddd030c1738128f0f86a11e48803fc7d44767100740d4d55afb4283f0150654195
+EBUILD mustache-1.1.1.ebuild 899 BLAKE2B 8cbc40da227a450d20d0a5cd453b4adbbfe45955858d3766a2b686de90466ea429307bfc5d7308886b80d99840380f97d2863f593bce7ced48cdcc5b20b988cd SHA512 c0cc645fb6359a5a3425746be4f4d949e97df3fc03ba086472e78ce886ee6d1d176cae3306e61d0994d7c8c57151471d4d6696e0cb7b7690911aa76123cca467
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/mustache/mustache-1.1.1.ebuild b/dev-ruby/mustache/mustache-1.1.1.ebuild
index 5e9c7ef9faba..12424c6fe07f 100644
--- a/dev-ruby/mustache/mustache-1.1.1.ebuild
+++ b/dev-ruby/mustache/mustache-1.1.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://mustache.github.com/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( app-text/ronn )"
diff --git a/dev-ruby/neovim-ruby-client/Manifest b/dev-ruby/neovim-ruby-client/Manifest
index d4933aa8a958..930d88519158 100644
--- a/dev-ruby/neovim-ruby-client/Manifest
+++ b/dev-ruby/neovim-ruby-client/Manifest
@@ -1,3 +1,3 @@
 DIST neovim-0.8.1.gem 43520 BLAKE2B 0b7401c1dfb1675725dbf50c45626d88b1a5932ccd4836e8a33974b8e71e44bafa10bf1a43e51b7f42e2702facec776cbcef3093c5cf86e500a5e94be9486b08 SHA512 2d56cd56c0817491622f9a4beee4cdc9244e9fd6a4a6b78d69b51f160b1a24395730f153800279b7fdebc99d61c55e3b8944d4b16c1028cfbf5d8c95308d0f53
 EBUILD neovim-ruby-client-0.8.1-r1.ebuild 894 BLAKE2B 30c318169345d750764cb546d3cd50e47bb005c2f6eecfaec64cfca2d6636c6158e284e7f329411cdd2c283f4785bf158b2f7c1e228e8eb37dd92b36b8e3e854 SHA512 0dfb217d3f99081be176a5b603cf073918ade6ab25775d52fbfebb2b862c4e08d97edb2ec0599f31c24654acc9d5ccf9aac5c8a7dac8e126082b657cd85fdd85
-MISC metadata.xml 469 BLAKE2B fd47786e5ede3d43dea030acb9327e101b34998eda45b0a88ee6073c8aaac316d9608bb650f382e75bb7150990733a39bc6d24171f2ba2c32e7a76838ee47004 SHA512 a1b032f8a56a7d849538c6517c516e2c6ec80b625f1404519bcede7726f6bd461f2e21e043a559beaf301e1e843f16de6ffd0efb792e449ac3921c72fdb828b2
+MISC metadata.xml 347 BLAKE2B 874c0ad5d49519c775bb2181aeb742ae08fa3c6e4b63de6975602ecfb3e03a8901b9a8f3eb0247152a82fe7101ed72911051ed94921672ddd47a4d5e823f9f6e SHA512 3ce78ce24378f88bdb189cc74a539f410be61e99a7c7dcbc011e0fb8f1a2e862a7a65b160f5dff73bf04009278dc77484e7ea39670ed68209a3a1ba1b8b0ae51
diff --git a/dev-ruby/neovim-ruby-client/metadata.xml b/dev-ruby/neovim-ruby-client/metadata.xml
index 60964a1230fe..fac91d927f18 100644
--- a/dev-ruby/neovim-ruby-client/metadata.xml
+++ b/dev-ruby/neovim-ruby-client/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>tranquility@gentoo.org</email>
-    <name>Ole Reifschneider</name>
-  </maintainer>
   <maintainer type="project">
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
diff --git a/dev-ruby/net-sftp/Manifest b/dev-ruby/net-sftp/Manifest
index 52ff3a9b74cf..e0e5937193e5 100644
--- a/dev-ruby/net-sftp/Manifest
+++ b/dev-ruby/net-sftp/Manifest
@@ -1,7 +1,6 @@
 AUX net-sftp-2.1.2-net-ssh-4.patch 1628 BLAKE2B 1dc8caef775ca06c80f485732acdceeedc10aaa96e33c1c6c59ce5e1596a71a229aecb06092b3a265288ae46469d1c72b4a0de8ec3d50cba5fe0947158c3181e SHA512 dc4e99f13e32698bbcfe1b07e2ec4baa1ed9beec5bc3816c016f26b053f7134bb9646dc538a0d03f2f3bda4d8d51d9742a5be54dfc6f9340cf2861e296492855
 DIST net-sftp-2.1.2.gem 67584 BLAKE2B 6b8e15f42c7a18f8c9aa7118e5822281eda6505c34697282cc9c52375ea0e4042f3045f41c2e9a15b8fd20f02946bfe6f3ad557aa5859a8e54e4c0ae8bd1d53d SHA512 126a9537a4ac45150096db4d46ad19e0d8a1833fef3733a1b66ff01463c0d109415f0ef807706ff88be8c5c1395bbd4620e529f06e3c9f746a4ed6ec2cb7d18d
 DIST net-sftp-3.0.0.tar.gz 63542 BLAKE2B e09e209aa0d102a6da7611cabf49970c9a4e572d51946d5dc0688879db97c92e8a39713dd0011a4234391ff0ab685a978c491917c041f7d10a8f092fde5c876a SHA512 c28411cfa8522dec893fe7a1588a16bb761a9d7692c81c453d9a9ad817988637614c6afd754db8547e845a16062882e2b7e95974b889631676f092d9e84b83e7
-EBUILD net-sftp-2.1.2-r2.ebuild 581 BLAKE2B 245f088a1cdc169ee22d77c3528fd198ee92ab230c77fde7aeea6ef0909d2792be36545ee428ddc5ffb4469cd88a57129c94d48557e87f5011928515ccc6a026 SHA512 c2ba65891c5cc82556c5d08de5d32da771c06734285cf32671ab549acef378b9a1702220a85c64ef51851d7d0e88f6c286665bf2fa1f3e4002e4c351abbf2751
 EBUILD net-sftp-2.1.2-r4.ebuild 583 BLAKE2B 805645d80ea7d4e3e06ca3ddb57ac144f8dbb333bc7cfdbd1c8e6a1db760ec53a3526c73fb2ba84bfd420d50e2615b70d2d8c11977d5a7623d8f44cc6fcbd76f SHA512 123341bbb0bdd4c85530b479ef602fd4b8bbe77cb91e3b5780643cbbab1a367c0590a31be3c41f614ada76a7a262d8cecbba7af18ae1f86df10f64e05e132f5f
-EBUILD net-sftp-3.0.0.ebuild 833 BLAKE2B 82a36d550546e8f3293fb6ac6231f498e112dfb380a92777a28cd43a4b7347503827ad279865673dda9d8083c1ab9aab1bd43641102fdb9194e87de8db3c990f SHA512 d4d883685c8f8cd0d338457b62bb77679b3eaeab5a8d967a895ce0d35162c2f773b3351393f1807a9c679133e7214de80dfeef1492f7aca7324c64b1874c059b
+EBUILD net-sftp-3.0.0.ebuild 829 BLAKE2B 6eb91a452747e78a68c4b3cb27fc1e3fe3aff7403acb68eada666fe40d91202c7d266337a8c4b1655aed2304f177414de1c6674143a50dc6bf8588cef4c165a2 SHA512 da479b4ba05ef64da244581341e13d1160c0fa6e6e60d38b2b982f3f58d6942603aa007c93a36b61bdcf5bfefcad8625f09b3e19530dfbbf93c786795e4409bc
 MISC metadata.xml 342 BLAKE2B b52478d886842e044705cc42c177577f111b2c01140b58d322107ecaf20bc1b5db9763ec0f0e67397118515690f452b51c1e14dcf6bada17d7c5f18889571b07 SHA512 3ece29fffeee2912d0bc06514adca69c2bdfa95bd88173d4f42cf0aee00944adc71bfaec6df543f0c1fc1717b7a808459f30894977154f7acce289dfb491f6d9
diff --git a/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild b/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild
deleted file mode 100644
index 99deb87ee5c4..000000000000
--- a/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SFTP in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-sftp"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_PATCHES=( "${FILESDIR}/${P}-net-ssh-4.patch" )
-
-ruby_add_rdepend "dev-ruby/net-ssh:4"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/mocha-0.13
-	)"
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 062730234f59..784229f0b9e3 100644
--- a/dev-ruby/net-sftp/net-sftp-3.0.0.ebuild
+++ b/dev-ruby/net-sftp/net-sftp-3.0.0.ebuild
@@ -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 ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "|| ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 )"
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index 8f2c569133c6..d2961163fab4 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1,6 +1,6 @@
 DIST octokit-4.17.0.tar.gz 3090364 BLAKE2B 42545bdaca8ecbbc3a3e78e70d535c634f20741651d41dfec254dd68254acbc82a992c93314b871d6bae7b4ca8321339b888fe7b5b7349fe9b48dbf6904f4524 SHA512 da6a90e77991d17697424da22c9481027f23f5ecb52e294748fe62c3a7c228412a276a01e6816b201e597b73f271b83e70c4d86ff9ea40c0204dae5c30df929a
 DIST octokit-4.18.0.tar.gz 3091587 BLAKE2B b48ccfa35f53b686e61a0f79c09bf20f063843c98f75a0896e71739a33cf9b770c8b5e5c27cda2c8a25ca6255cfa7c4e389b372ca269d4c46b499abf1838a4ad SHA512 e749afc4303f987b502f8c79ff60e33c6f49ff84d25f16cdb3d9165c7089912570a7b77af3716341cd5216e5c8e3534a805e4347081ec7765a4e4f54fc432ce3
 EBUILD octokit-4.17.0.ebuild 892 BLAKE2B 1d6b9c1f92a4e1c36c9bd7ad061b8b27bf06d4e8718d53f2fb0e7c7067b05de8c15da808a9249ec1e182468013eeccf54ba0c9d2020e2df394af932fabfaa897 SHA512 d8d8f441ddd10af5be514ab2add237dd29c78c3410fa499212bfa4b1e3c9a6ac0388d284c22b2041a227ea9aeb0b21483dc0f73ac34650ad35d269f310567950
-EBUILD octokit-4.18.0-r1.ebuild 926 BLAKE2B 57d6d75d183e2a451b361f99096cce94f19d19526381bbf03b4310966af43510fc670c659e9826557eeda143922887c70b37bdafaf2c54b396b89f2e8c964e8c SHA512 13ea7f71fbad7a4aa1e1940c51562914ec2c37a82afadde9fe58ef86a2d09edf42f0ca0d316ac2d3ce29932c3861878c7b46b5db5ea40467913cd3d2c044976c
+EBUILD octokit-4.18.0-r1.ebuild 932 BLAKE2B 6ef3040c27ac06c24042e13eea67ef3bf3adc4527822dbb1454e79519245cea8ec520f071c2c4c73a925b72a1b4af84e85083cc2aee105740ebc8565b6119494 SHA512 8a29e13202aba540a829d30cf28706b5b33947331ef418b1fd93c7c0b982e244f6e7541d5d970b850364f538f5f8c5d782341258a35100bd1f8bc0b803b2d0cd
 EBUILD octokit-4.18.0.ebuild 916 BLAKE2B f31fe1ecb2508b059ade36e017a53e3d4e62f126a14a30fe69939160f49c93d54c4c15b30027f51132bbbc0cccf0d4814500c49a017faebcf4069c15a9b62a03 SHA512 e87ef4c75d0150b41f38e58ef979d229c0d68181c6c8352f16c69f99b8196f11219e1b74bcaeeb35e6599a238261038359ec5f346963e7ccd8d634176b9dd9a8
 MISC metadata.xml 344 BLAKE2B a2013bc4988a44c7d4b2e9dd6005d30390a7fdaf39f37a4adf8b539825b43f5d0eec457dae147b782f90f15d77fa5f485a6bada65be086f67b7350603945cf64 SHA512 3866d3979a8749d780367b56ae524d8f78286d2174602452ba272d26a4fb49cbbe8945183e4a64e70400b758fba4fc6bf88bcdf24908e474a378b628a1263457
diff --git a/dev-ruby/octokit/octokit-4.18.0-r1.ebuild b/dev-ruby/octokit/octokit-4.18.0-r1.ebuild
index 0b3ff206b168..6749ed154883 100644
--- a/dev-ruby/octokit/octokit-4.18.0-r1.ebuild
+++ b/dev-ruby/octokit/octokit-4.18.0-r1.ebuild
@@ -31,7 +31,7 @@ ruby_add_bdepend "test? (
 	dev-ruby/jwt
 	dev-ruby/mime-types
 	>=dev-ruby/netrc-0.7.7
-	dev-ruby/vcr:3
+	dev-ruby/vcr:3[json]
 	dev-ruby/webmock:3 )"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 1c5598dd3a49..3db552957af9 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -1,5 +1,5 @@
 DIST pkg-config-1.2.8.gem 20480 BLAKE2B cc11b5eff30f0f5e1a91e64902931ed540da108fd326fe731b71527c9c4310f55e9002617e1baae4f71a4b705b20cf10f6fa112f8ef56971e82868145d372a47 SHA512 d83a599a48c7d404946054c6846b6cfd9fce2a264c288519a6eccd9787f05d45397dd46300bf97c80700921456318154ea6d44ba32cd159803471073c2a2b065
 DIST pkg-config-1.4.1.gem 22016 BLAKE2B efac610221b288bb669a3783c0e70af3951478147896315c53af2186912b60045096c0ba01a0a59ce09897a2e4e747d28a091b947281fe7f6dd6f85cea31aae7 SHA512 72d61466c1ea53a5eda66a8e8f8106fef0269fefdd349ac83959a34bb8f36796bd3e9c7fbcbad5763d2fca015c65436f9d410724e27b6d1c495e3957d26757a6
 EBUILD pkg-config-1.2.8.ebuild 808 BLAKE2B e966ce51b3bf4b5504b76194a6f75d293d50ac23d1c3538ecac2b37261074b798ec3eb6b2d2af73d87b2925f8be35f979373113b673d1c2a917a59ecf213d214 SHA512 2d5631b30ce63bb2273be43b50f0de5cf23f0a6a1f26ba13fc250118b37643a3bb6269155a02d498da6e4cae898829c27b8a2a2ab94e909d9a6c6d7c99df4194
-EBUILD pkg-config-1.4.1.ebuild 788 BLAKE2B 91a5f8b508dfe362661c2280b6d92c3d77ce08c350ca52b00d51174dfb063c7c516025c56cff59f4dcc0d710f6e4ae4442723684fa565349d2018102391ad60e SHA512 a8e9ecfbf33000ebb841cfc884149e9aed6be49455179941c892fc648d3401748d3103246b6c02d46986642bf672099e05857817770f770db61466faa750cbbe
+EBUILD pkg-config-1.4.1.ebuild 783 BLAKE2B f70ab15fb078095ebfed75d591ab2212329f21280f7414a03970905b9486e112d40510cd5f479902b6f6a643bfe3d04309a9dfd1bff07e434f2f4ce3d890d9ca SHA512 82d3f877607775ebcaa5c48b9e70ab09d98fb93c445d306b332c1321f4098f8ed4ffa47ed742b5fcbe0ff000df0dd085e51adfdc2490f4dd903cb6a4684a5282
 MISC metadata.xml 424 BLAKE2B f3283c73952daca20d85a5421afb67150aae553faa03d653686718ca5216c1a65ab5983fb669cc34003902b0a969275bd22e4d1765f3896c7e25bee301323f42 SHA512 40e700a309e3678157d9da4ef18e8f0178e23aa192949ac06acd6f8026d0d53d4f79c199aaf59e0e27dba17925f44a97ad901e0774c6b70583b24b09254eb8d5
diff --git a/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild
index 5eeff83b178f..2c1c5782020a 100644
--- a/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild
+++ b/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A pkg-config implementation by Ruby"
 HOMEPAGE="https://github.com/rcairo/pkg-config"
 LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/rake-compiler/Manifest b/dev-ruby/rake-compiler/Manifest
index e45392a67c78..70e8247d6f07 100644
--- a/dev-ruby/rake-compiler/Manifest
+++ b/dev-ruby/rake-compiler/Manifest
@@ -1,5 +1,5 @@
 DIST rake-compiler-1.0.7.tar.gz 33444 BLAKE2B c3a92206d4d7defdf21295aaf094f704596962a3ee79c3517ea1058732e1f9f378b5f14bbe3b9652572564d11c566e26014e187dcdb488409bf95ea9a52e0a7c SHA512 fa901f5cc48891f07bd8d9a27cf4e745e87d5a667dbee0c9f4b43f9564fdfe3067b9c658f10ea8bcacd32ea7320a542ef0fca9373147057472f5572a4a4c5268
 DIST rake-compiler-1.1.0.tar.gz 34819 BLAKE2B ec4fec1eb92031f9f6b378b190c4e8a2f2627623afd6fb11922f71a93431de94bce640863deea2aab05656612533ee2b110f295f87590b48500583af71b08dae SHA512 77338776506df66c2e99e9b1b82dc4d54cc4e7c8fdb1f8b7b6d7507b9f9cb0718839e5139e9c0cb6295259e819dc8a011101e2427cdd387b568b639889321d60
 EBUILD rake-compiler-1.0.7.ebuild 1423 BLAKE2B c5893a5d99de366b4c86d631dd553b20caa3e4f3086a8e802039933dd2021ef6f7bfaad4acfb13e80262d16dca69006fcdfdc27c88212e2e8b5df60f19c44cc7 SHA512 fc0aa2f699b832f152719b4748ea17d1ce9ba51d1a7549b3fcda6523047430385d26fddf1f6db3a21ed12dc46d73c7c19131c1ce1b7ab089449ddf2bad853380
-EBUILD rake-compiler-1.1.0.ebuild 1480 BLAKE2B a3e034d4803993fd49bdd965a7bf1894d82079023af33193833a0b0329831feba0d6fa10201453ebe04692906364e9b2a0ea054685a7b2c41aa8c9c4786d54c8 SHA512 06968902a28412efe2ef124de8387dddfce273088a8902617929e19893ae59331d23f5df7e2872c9f2ca6b6e4f627b291811890dd77e5561f227ba05738c54ee
+EBUILD rake-compiler-1.1.0.ebuild 1475 BLAKE2B 7bb5a1fa35c32f9764ed434444c0143eda418856100e5aec2bbd54a79af9db88abf092080197c8b0c6e31315184e9ad24641607dd3b1d40103a6cc09c03ea135 SHA512 25ac756511f204ddcc845021d9e66a7eb0d7c58e6ada35b4ebb51143e37dbe3fc0b3967be643d6547bcc459411e3cddcd85b328f3a7ba6549f369705b70ac0be
 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 a25e0df32ec4..d1c395fb3750 100644
--- a/dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild
@@ -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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index 1d626331ee9b..d2ebc41597fe 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -2,6 +2,6 @@ DIST rouge-3.18.0.tar.gz 882486 BLAKE2B aca9f22b84a168423cf66189a29ba51611854e03
 DIST rouge-3.19.0.tar.gz 919603 BLAKE2B 53cffee53d8c6bd8e27dc0278f9ef8e9bff2a01d568d2342847ce0afe71ec72a8394f6e9184f575e38abad7893c61a4553ca73c8072bdcdb91f347ffe63a65e5 SHA512 4a59e5bebfb0c58be82bcc23e7a9906d9ff5cba8a636b47b94be00194ab0ab6cfae4d584586ee037e160245630abada889aa85332398289a214b7a493a8e825d
 DIST rouge-3.20.0.tar.gz 938340 BLAKE2B dcb61527f023e34be5c2fdc362f74b64be24cc26e32f88ce7122ab7fbbee5c44f5a29c5c1d8fb5e721ede2df0119cbb2c00b5e178d1462967c54a6d062ae2e53 SHA512 3eaee2d98c5cb252d783c5bae365de4c400d980917a59b943d6fe93490c48e9d36e51b7d92acf468c10e702c942074f1525fa7e1c81c7c37d9b0927e9d4f332b
 EBUILD rouge-3.18.0.ebuild 975 BLAKE2B f4047fe67e2f67878339557a3a3d2876793828b5e6931cd73064348f9f85bfe1bd56a50de4da7eb1db5cd5d51a4315e635c180e23c2c6975930f184759ed59e5 SHA512 f3559e9d6fe08b095fc13c0dcf27a59a2118a900ce258120479d0ca5cab01020d4323881e67aea25a84a3e1a134def2e1be883e5d4c5f4f609c743807dda2bfb
-EBUILD rouge-3.19.0.ebuild 975 BLAKE2B f4047fe67e2f67878339557a3a3d2876793828b5e6931cd73064348f9f85bfe1bd56a50de4da7eb1db5cd5d51a4315e635c180e23c2c6975930f184759ed59e5 SHA512 f3559e9d6fe08b095fc13c0dcf27a59a2118a900ce258120479d0ca5cab01020d4323881e67aea25a84a3e1a134def2e1be883e5d4c5f4f609c743807dda2bfb
+EBUILD rouge-3.19.0.ebuild 971 BLAKE2B 08e80a66dd9ea50b2e5e2f4f09a28fc40b5827b6a9783bcc50642442c15b6e0c1b3d2d0665828c1ab54c2cc4e56cb991f9c7ec1d1bc7f766a62c5e2784bf0930 SHA512 cbe03cc2f1d779dae389556c693be00d812b6bc5ccc1384d9f2d7fb72f0d3a9fa9297e3da274485e46a46b4b64558045c13108ff248c16e289b5878b9be8a9ac
 EBUILD rouge-3.20.0.ebuild 975 BLAKE2B f4047fe67e2f67878339557a3a3d2876793828b5e6931cd73064348f9f85bfe1bd56a50de4da7eb1db5cd5d51a4315e635c180e23c2c6975930f184759ed59e5 SHA512 f3559e9d6fe08b095fc13c0dcf27a59a2118a900ce258120479d0ca5cab01020d4323881e67aea25a84a3e1a134def2e1be883e5d4c5f4f609c743807dda2bfb
 MISC metadata.xml 337 BLAKE2B 0b11fe43cebeee93ba1543bf3784c624a91373b066b90485698e9f58ad95d2d4ae077fa5d18d097deb5d8678877b915a9df7154899169d35345fc8fc52bb1c44 SHA512 2517857c1be612b98601b4f92e3e20f3e404902faed1965f8e2e0573820ed6dfc12de25a292bc5f5971b498e310cdfe4a3a5aa13f46354f5139c53ae6a53b876
diff --git a/dev-ruby/rouge/rouge-3.19.0.ebuild b/dev-ruby/rouge/rouge-3.19.0.ebuild
index 1ce32a97ce3b..0e51302dab05 100644
--- a/dev-ruby/rouge/rouge-3.19.0.ebuild
+++ b/dev-ruby/rouge/rouge-3.19.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
diff --git a/dev-ruby/rrdtool-bindings/Manifest b/dev-ruby/rrdtool-bindings/Manifest
index 3a7e9b225fed..e95ced7e00ba 100644
--- a/dev-ruby/rrdtool-bindings/Manifest
+++ b/dev-ruby/rrdtool-bindings/Manifest
@@ -3,6 +3,6 @@ DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3e
 DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3066bb32e981b3254e41c53e29529698da5ef73f8365391180c76d15808d1d727a0834b8025893b01c3b9af8f46 SHA512 ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
 EBUILD rrdtool-bindings-1.6.0.ebuild 1367 BLAKE2B 3455abcee11a899fa33f558abe25e91658537e5a62afa1b50500bed126baf1d1f3f28542ae60ad2105a199565b0186453eea73d804ae50015e88b2210ab449ad SHA512 5e3215de973ca0445d5342eb54f81fe775dbbee389f725c43e04eb90926462cda1263d9f6125caab6a6af835108a2ec0676de1a01d66f36cd1e3bc55e07c8590
-EBUILD rrdtool-bindings-1.7.1-r1.ebuild 1377 BLAKE2B 724c142c37c860dc9023413ec8211e5cc3ee04116b584f3308d7fb9022370d8e20c6f4b2405583bc870a02ba21a634a2df9063e97e8cabca05a1d6956377fb4c SHA512 73c1e893f15c0ccafa287f0bce3c55a34452c442a2c82b16d2c1cabd803ccaf76d2d781cb97105c98253fb5426cc281316d4436f98aa4cfe484e2f32d715a9a5
-EBUILD rrdtool-bindings-1.7.2.ebuild 1391 BLAKE2B d35018b84058aea7e24e8309350fca2edd47b068b76500e1812054146019cfadbaeaa2a629730347fafcf06a6dcb9037f013a2988b83cfd35d15fa42ad8abffa SHA512 7561f712d3c49f2f669cc37a3d6f55df596d3526bab749f0f56202c5661a6885b14b05e43acc1c3ed3c83da3103e75d4df504269a227131dc27a587695711dd2
+EBUILD rrdtool-bindings-1.7.1-r1.ebuild 1381 BLAKE2B 3b3c799c16670c1aa030a38297418c72b7a7400870dcbaf3b21612e11aac4d1fa3588e199d62ec9f60def083d498dca278e22305762fa6daaa4eeab00fd769ff SHA512 da3f5306267fbe335c6dc74f7a49e6e187af0c040a0d78dc9f7e3e8fcb13be50bd607b8bcb3027e022bdca4103449baf1e5e119e48fec7f458933e29dc9bc3dd
+EBUILD rrdtool-bindings-1.7.2.ebuild 1393 BLAKE2B cafbe36ab4b3a0533d5bcfd77ad398e0aa5327735aa4af0dc8bf5cf94d1a2ba6b65863804c1350643a145c96531b3a320d6369753ad36b03e4c661fca6910db5 SHA512 a8a4a2706d5d6a5f934c73d698b33bccee00d133c70b3beffdb56adf7180b1fe0da2c84f5d8865b51da82ea5b0ba256b8cf99e62794470781c5a6c3ce1226817
 MISC metadata.xml 463 BLAKE2B edb3b1f3703163a7f6c28ea7d16a79158d108721a2a775e30967885fb6b7b31d6074585951cc5b1c7b640c88b0694b95f0aaf62b71df43a8d6d6a0d6f78e07c9 SHA512 60732861cde4604b50875b6bbba205f232a52c4d91e6e21bce49a46bcef824bc542140e73b07ce4c18518a366ff8c9bd34569895741b0ac292124f43b0f02aa1
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild
index 371902f19a89..b9c82b87c592 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 "
 
 all_ruby_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch
+	eapply -p3 "${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch
 }
 
 each_ruby_configure() {
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 b054ce03e312..ddafe5b470cc 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
@@ -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-macos ~x86-solaris"
 IUSE="graph test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( graph )"
@@ -32,7 +32,7 @@ DEPEND="
 "
 
 all_ruby_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch
+	eapply -p3 "${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch
 }
 
 each_ruby_configure() {
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 7bae1fb3065a..202b6fb66e99 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -7,5 +7,5 @@ EBUILD rspec-support-3.8.2.ebuild 1573 BLAKE2B 7e6dbaa451c95769b89830bb5abbd54a5
 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 1558 BLAKE2B 8963485bc4f58f917ac018bd85de56c4657d691946e94c7102bf7271c86d762d5f6b76647389268bcc9adcc4ba8877973358a296a024042fe43e13ef1fcd1363 SHA512 9542286978940ea0571aaa7528fe0eb4da279e11ae1e177a8758b12b88b5f0190be882a0599b33d40488753d822abd648aad39a1c4ec16c34cd7032325a63f25
+EBUILD rspec-support-3.9.2.ebuild 1712 BLAKE2B 27a447f54c51b617727aeda7164e96d3a506796c62795a19e767b2e5bdb9c137a6dd0c4036a6dcf7b39a221f6266ba782b7b6f19a64a9821c0ac1fc0b1cf9a89 SHA512 7d1cff7a840de7c500b55adf44e40a44e5b7b76d47360f8312fe76b3278ad1bcb26df8e7ed297fef86be33dd6224d03a2072f94d82d566515e56c3f6527ebdaa
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
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 b0f14e38d54d..36a174b55d35 100644
--- a/dev-ruby/rspec-support/rspec-support-3.9.2.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.9.2.ebuild
@@ -40,3 +40,8 @@ all_ruby_prepare() {
 	# should be fixed upstream in next version
 	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
 }
+
+each_ruby_prepare() {
+	# Use the ruby version being tested
+	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
+}
diff --git a/dev-ruby/rubyzip/Manifest b/dev-ruby/rubyzip/Manifest
index 68b64140fddb..2843e858dd8f 100644
--- a/dev-ruby/rubyzip/Manifest
+++ b/dev-ruby/rubyzip/Manifest
@@ -1,7 +1,7 @@
 DIST rubyzip-1.3.0-git.tgz 156664 BLAKE2B 2bde6515ddc71da32fc2d2819770857f7dde8605718c868f73edb8493f7db5ce66a7115d09933ffc6a06ac0979ab07e8cbdcd47984707688b7a5db43394847bc SHA512 5a764725d1f6a797f710581dbe07bd7971f0a8a5b0ffb7fc9b1a627c32e6e342ff54e2ad39e74e294dd283b8cbf358ed2dc40857f6f656007adff80d4769b9f4
 DIST rubyzip-2.2.0-git.tgz 224109 BLAKE2B b1d879d04c4bd23f32f82260d386a0b0ff8bb4c1af705a4eca9fc279b4095551edad27e2187aa146b9c76f183df2687fc03dd7c6d62c2dde6d70c9137226316c SHA512 c10f3574c7948ae29ed665de69f79d714e146bda27a634c3bfdf7210240b535c6a9fba43fff0228fd85afd262ca56d25002393eda90237d8da1034edda62e2a7
 DIST rubyzip-2.3.0-git.tgz 225336 BLAKE2B 24b00e02c26881953c843761d38b8bf3a9a5a04da6cafa73bea6abdeea345a71a31241a557ff3c182df274210a970f17b3e866657153784df6b03cdf472681f6 SHA512 da9c446aa1a3c457decdaedb387f4030f84a2b1c1c3ca14a0e8588103f95cf893812e7a146362c083aba478828ccda4b127cd0b80fa2fa09022e06ad041506bf
-EBUILD rubyzip-1.3.0.ebuild 1207 BLAKE2B 5cd0462d17c48315be824d69984034ee736f68e0bd6a2d0a747d9645ba8bc8471e303e7f6d104fa4b12295c8abdbf35a9f76bd3f8d75b006dded27ba9fbbf8b2 SHA512 c8d6865c2aa049270291ff3ecc932a253ccf31117684698763a46e808230c9f3bcc2189c19bc4d694ace280cb84ab15fffc01b5d5761ed47ccf5e101bb80c41a
+EBUILD rubyzip-1.3.0.ebuild 1313 BLAKE2B f8776fbf25aae9ce16d14165c6392fdc24b820fb853d7f1f49bcad7dc7509328b8d1901a3ae2123e754af02e6a3dc1103cf41a153e6365064745808cc91ea2d3 SHA512 67bffc08d7ad6f8ab3af7bd9c1782d217a1bb9d841bd83dde30f0a69c7ced712466f6f47a5b1bd79c8e13c9b9a821e18127e17a3ddca4f59dc4066db0211159d
 EBUILD rubyzip-2.2.0.ebuild 1230 BLAKE2B 3b67eab314531caccf03ae0b6f347edeb67ad8fd21e617b64a17b38345beefba1634c04524a4d0a2ed29708f020265bca9b1e1015bff400d6f1beead932cfee5 SHA512 dda84818e3ee920eb3a68366e7e7861d296f7628397bf6073fd8ee36ec874c8b0f9d01daa62715ce9a013fc7ad1d906a83bc3f09b49f3a4afcb69d51b616dc87
-EBUILD rubyzip-2.3.0.ebuild 1275 BLAKE2B 0edb69c38171523afb61fdadfbd4af00b9be46b80ac3ef6101e0d8c32e5cff6d697633d71d5a84c823b73384cd3647d9385d31b91c19fc098b9a2fb329a13cd0 SHA512 2fdb196e89db283ff1a3d7deb3fc796837984bf20b54315efb35d1caba2b20e30c39f38f50a5825ac6314c0900a7833716e01f56ad4d3007809fb897ba21e316
+EBUILD rubyzip-2.3.0.ebuild 1383 BLAKE2B 24bbef1e0407c2ae84d50c2a517435674ac4afa6d35dc0134cb2cab02777a1635105e9c9b2841a71f3584744ac23c387ac43eafbfe386b3dba9261f09c2636d8 SHA512 7755d00156f154ddb8bdd85f905fa38dda36346159d9163902d928ce17e49909a5bfae7400c1fa6c138ca7bf90e0d4af596eb1b1eb68505e54d112345231d3fc
 MISC metadata.xml 341 BLAKE2B 2e04f2f0e3ee64a4d476ca38f166efc94dad160850cd08b42ed54e68a275ec1d26b76a751bf9a347da5f9c8851575a8a58b9021f91acd1a733be536f947e6743 SHA512 7928d7e4a5dcaeb924d44348981910cf0024939f6f169a00df46fcd80cc933b56e91423e8919ef7a74f03e4bc1eda7b7f8a8bc6e954f6195989c1a9eb574cf3f
diff --git a/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild b/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
index cc2a60650cc9..6d2228025de4 100644
--- a/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tg
 
 LICENSE="Ruby"
 SLOT="1"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=""
@@ -46,4 +46,7 @@ all_ruby_prepare() {
 
 	# Add missing requires
 	sed -i -e '1irequire "forwardable"; require "pathname"' test/input_stream_test.rb || die
+
+	# Fix broken test that uses native endian
+	sed -i -e '/pack/ s/LLS/VVv/' test/file_extract_test.rb || die
 }
diff --git a/dev-ruby/rubyzip/rubyzip-2.3.0.ebuild b/dev-ruby/rubyzip/rubyzip-2.3.0.ebuild
index 16bec97ba963..f7274c64078d 100644
--- a/dev-ruby/rubyzip/rubyzip-2.3.0.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-2.3.0.ebuild
@@ -48,4 +48,7 @@ all_ruby_prepare() {
 
 	# Add missing requires
 	sed -i -e '1irequire "forwardable"; require "pathname"' test/input_stream_test.rb || die
+
+	# Fix broken test that uses native endian
+	sed -i -e '/pack/ s/LLS/VVv/' test/file_extract_test.rb || die
 }
diff --git a/dev-ruby/tdiff/Manifest b/dev-ruby/tdiff/Manifest
index 5849892e320f..89cf17df81de 100644
--- a/dev-ruby/tdiff/Manifest
+++ b/dev-ruby/tdiff/Manifest
@@ -1,5 +1,3 @@
-DIST tdiff-0.3.3.gem 9216 BLAKE2B 1171d354c4fa14e0f6813976ce82e44e24ef94089f090c2eec31767e032a143904f627df7634d3faae4d18f5591991fde77b26e0da7c37a6346d6487d881eec5 SHA512 18c8ee9025eedfbf78c24280bc318736e13d840a2be8b05257697d2c4de29831ed6a361ecd553fc1bcdf7961483fd0712ecb76dc3681a9549f4d3f7a18bc3d8d
 DIST tdiff-0.3.4.gem 10240 BLAKE2B fe764eaf70303670602758bba903202bb468c419e96909561c4d420a86b9237c9af4640947e9dbc27eaca7b7210e26236da20d41f03d3e8acd0556a23205a924 SHA512 2db5c9707a8654fb36b02c7fbdf2317da08c633c0d3768f0f76693ffffd1b2b44e5f4309ae97df944c3bf9f25b596fd3ae19cb88b20435c0f9e50989d22ece40
-EBUILD tdiff-0.3.3-r1.ebuild 594 BLAKE2B a0b35754c14be508eb4b1b5f0752c6e59ded074c20d8f17d58b9fb4ed5993dc6fbdca6700a97eded1d6f88120fba1f5035e188d2b7a752fed9ab6ff1d8a08eb5 SHA512 face3da40af10d74e407e9d4a14ce8ae1e69364eaf289527d66230ff3baeddd941baa29381bdf662d0f01aa08f519a0e64e7b92179c6d051325b54744b5377bb
-EBUILD tdiff-0.3.4.ebuild 596 BLAKE2B d368f8871d1d00022a1cfca695a2afb09ad0ad4ecc7c038afabbb617c1f5c7c2ad3cca40ba4a2a604d7c58b32871f3cf671936f033ac157f8e348ab1ffb02ca4 SHA512 97129b8ed5983e8e682eba8dee8c8f70dc44f6290376bd78e16ac795b3dcaccf035ebc0d523c7760ce0e84edf94f570080d42cf131dfc188c3f75b6ad55cc515
+EBUILD tdiff-0.3.4.ebuild 592 BLAKE2B e71a39eb950afa15b8ddaffbe164aae920d9973e9683c571f2f276ff8b7f1487da19e834f7201ae3f28a937fdea158355cc30065ebc46b501d03ebe35b7bb5ab SHA512 fcd7de7e572680047cf1eafff6da19f0ac2f116a2be0f41df9927fe1d0d4ee90dfb5f2ee098989bccd4b464e4843c5be4f6b6a3cb658658904dbd49a6d83213c
 MISC metadata.xml 342 BLAKE2B 58a84e55bd616d2031be360592c5e32fc734355379c59f76680acfba0727072817d3e7398ff849a50fa908c048c033fc668d008a8d68749be46198f2c6ca0a3d SHA512 c3d93ca88cfee5e58b40fa4f7538883d507ca4f84fa79b529080fed0c67ac23f83cc51524391796e8997b137ffd7c24890eeba7a13d788f24f382253965fd184
diff --git a/dev-ruby/tdiff/tdiff-0.3.3-r1.ebuild b/dev-ruby/tdiff/tdiff-0.3.3-r1.ebuild
deleted file mode 100644
index 3b0e4600b3eb..000000000000
--- a/dev-ruby/tdiff/tdiff-0.3.3-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Calculates the differences between two tree-like structures"
-HOMEPAGE="https://github.com/postmodern/tdiff"
-LICENSE="MIT"
-
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
diff --git a/dev-ruby/tdiff/tdiff-0.3.4.ebuild b/dev-ruby/tdiff/tdiff-0.3.4.ebuild
index af6135ff0db8..f75642c4a62b 100644
--- a/dev-ruby/tdiff/tdiff-0.3.4.ebuild
+++ b/dev-ruby/tdiff/tdiff-0.3.4.ebuild
@@ -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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/tokyocabinet/Manifest b/dev-ruby/tokyocabinet/Manifest
index f8983f1fa059..26111cdf5d1d 100644
--- a/dev-ruby/tokyocabinet/Manifest
+++ b/dev-ruby/tokyocabinet/Manifest
@@ -1,3 +1,3 @@
 DIST tokyocabinet-1.32.0.gem 18944 BLAKE2B d55ebba43bfb904dfe2b18bc0c22e92b30ced4cdbda8025f7e4d9088da03a2c8486f210473bd05be13fa8d8448830a8f11fc9dc9c34b9803514fd8fc5cce984c SHA512 274a72e166bfb776b66379f587a141c8d0407dec7aa17bcd2e1ce2a401784f52433e72bc356140f69dcca651351edb22d5c9da6fec09b1b1fcfd53cb5af666f3
-EBUILD tokyocabinet-1.32.0.ebuild 579 BLAKE2B e2ececf36438cb95e026c3c9b00f605d0ba07f04048e6c212696d84d35a24945bcc7acf9e2f8a938922df14981d359a308307d34d959483647a4779131b3d14d SHA512 05b71562332cf315d7f391a7d2e5a1c4d0debb3f9395cc14950745b916f87bae3500b71fe160736766f84c1cd6b2f653ab6d38a3cb5a6a7bbeab090445458081
+EBUILD tokyocabinet-1.32.0.ebuild 580 BLAKE2B c43caab9fa42cab9ed885d237221747deee82aa13c59aaee8d28d2e338d2e833b1daf0d5c81818f8530aabd272e718bcc068321614fc8de6294b3b6ff8f4078d SHA512 36a1ed6f99439c68dd35b754ae6d1c46320db0ceb62a8ab01a537aa0de78416bd7e4c9cb2cc8c138f36b8e0871145ee7ea22c2d94235c03b7a136b1dd83377fd
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild
index 7861daae85fa..cff54aa3f694 100644
--- a/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild
+++ b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_TASK_TEST=""
 inherit ruby-fakegem
 
 DESCRIPTION="Ruby bindings for Tokyo Cabinet"
-HOMEPAGE="http://fallabs.com/tokyocabinet/"
+HOMEPAGE="https://fallabs.com/tokyocabinet/"
 LICENSE="GPL-2"
 
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/dev-ruby/vcr/Manifest b/dev-ruby/vcr/Manifest
index 01fe17bb1fd0..6d4a5df4819d 100644
--- a/dev-ruby/vcr/Manifest
+++ b/dev-ruby/vcr/Manifest
@@ -1,9 +1,7 @@
 DIST vcr-4.0.0.tar.gz 146920 BLAKE2B 19ae33d2f40821d2cfe5c0fc55d5e91e02b8e6ba2bba000c326d993987fd641dd5b4cedd6a8a441f86664ecb67dfe2501d335936af9271fa83aef6dc001b12f2 SHA512 2f98eedd021f7c125fc3f29189190ddc817bb95fc8e8e0ab53e65eaf94c5c0c41f3ca4abf9d829591acdefe97b931943c47129f95c21f2ef590ed500cc6f56f9
-DIST vcr-5.0.0.tar.gz 147602 BLAKE2B 031c9a70c9483b496ed3cda1c65138d214c257392aa5f9157135b0fd4c33d35dd6143afc0e775c5061bb823d936d1bdaa084eaf0024e87747e6101b582d8bd1e SHA512 88e4d82f1c5b3d48c89a75324a256c66858740d2889a4d86851ebb3a303745829e42f20b20d4cbc18d7b0510eb0b229a770bb6209be93dbb8c8b0be84bf5f645
 DIST vcr-5.1.0.tar.gz 150438 BLAKE2B 615a0ce570da29be402f97dcba1ba987c611c73cc9ebc561683333c752d57c1c2f0acae78b42164d8c56f71cded150a93566d45c0c84153bdc3dc8bb37199e4e SHA512 5297e46b1ffe31c3559df57f0af158cb8064ba48b83702ea3bf12eca4c7260bcb71d3df7ae645a3cc14817366992458beb4fd9771c1f98a56835dcd69ff107f9
 DIST vcr-6.0.0.tar.gz 153423 BLAKE2B 95f0794af34d4ce21c0ed3b3a77de64300fd3c844919624cd6021c2e74687d3a66b7d4f73b2b040f90774d9cea0305563cdfaab162b4a1df842f2367e72f6209 SHA512 9a19896ca4f5624c6e74772006aea4dfda0527d9ba733ec0d90418c6234fa5684121be1258badcfd647739cb47dbaae556b8c2e2636f309a79ea94e8835de40f
-EBUILD vcr-4.0.0.ebuild 709 BLAKE2B 360617e1a7aff37a255ea03f0af132648408024cbabf3737d85930124c304191824046d0290bedcadffd06cc48d0317165868e4dd970699eca76a70e7b0d9985 SHA512 e8424a267dc567b63e3d9d9da1214b3dcbf03ad3992f5e17dd8bae7436f70a8b0c5781455dee1832dd3cba67aca243fef7fb5159617ee245652ed8eb93e3d216
-EBUILD vcr-5.0.0.ebuild 703 BLAKE2B 46bf583f4250d89f7c4f8a189c7640fd8f5618ca9f5bb90964fd424dfd69977c561213aaf6417dca4f9c3a5a05f352ff854d0d5a5a9be02383016d780a6cf81c SHA512 ece96b85a4582222de655644e7031647149b6a21a907741ee80f139001352c36cb3ef1551256fd3602cf4982ed15347ee34e0f1e2ebf75bf4f45d843f5dd7245
-EBUILD vcr-5.1.0.ebuild 732 BLAKE2B 215ff9e86dd92891f4cb4d036c8d648bea16e8db53ff21927bdd696e466bffe37fb23939da819ef774e2a42d67e6f54c8dce81124cf9156950d5b9804eb27812 SHA512 d6bda4a9ecfff4963ccba5f78cd11a0298aab9521d3e23949b3f259498d23bf51b24c49361f95e931265e45bd7c68c21b97ccee4fc9140ee576daa59911923d0
-EBUILD vcr-6.0.0.ebuild 732 BLAKE2B 215ff9e86dd92891f4cb4d036c8d648bea16e8db53ff21927bdd696e466bffe37fb23939da819ef774e2a42d67e6f54c8dce81124cf9156950d5b9804eb27812 SHA512 d6bda4a9ecfff4963ccba5f78cd11a0298aab9521d3e23949b3f259498d23bf51b24c49361f95e931265e45bd7c68c21b97ccee4fc9140ee576daa59911923d0
-MISC metadata.xml 342 BLAKE2B 2e7bb825d3f1a6977404c0617c22057a8a0a487ce88c5cb46853b65987ac23d083bd9f1201e74a63a75e32c34862d836446a6fa2d6dd7da48cc33b7905fd18b2 SHA512 1fa01257b99e6ac0b535da28a6b30da72ee4ed4493b9b28427298216ef23a0d43417a5be745af3b10323fb86df38fc34942f0314fcf82d77b0e89e1f277a3431
+EBUILD vcr-4.0.0.ebuild 757 BLAKE2B 8311272847a0835c40add69aa2fbb9e7786d9897f1686d66d1bf823bf3ba47a1f9e95d566d9702828558b3be482ffcca44eee00ad583ee004bc53f26882c5c7c SHA512 ef3a7fe2bd5414a76ca389b1ad92e5601f47b0bac238a88984bf80c784f6e82c358c3a388827f7d8e637e24c86f00f46e0dbb7376b961a4c347f46221a998111
+EBUILD vcr-5.1.0.ebuild 787 BLAKE2B f9049aa0abc31db486d4d2c3b9ae551a5dbce57589a9874a17976136a6e0653c5d6e2fa3731f45a658a30c8ff5746bd239b002f40d94c50d7738ba0e84e87b44 SHA512 741fe620050fcf66fad5c144b5c863c48efd0ce752a865a70e29fc12e0d7c762fe23a7d9b71b090adc951a9ab58030f052c00a3de7326a701cc6bf107eaceda1
+EBUILD vcr-6.0.0.ebuild 781 BLAKE2B 2c32768fe421a77ca440ab62471451dde222261003b7eb250efcb17c4aab54fb63009389ad3008c321b62fb8f56008e30aa669c066509ad8fa27c19bf04e7b0d SHA512 e60f4a38a42723bcc2705fefddef1b80d302dae70877b92ef0ffbc30bb4a6227b33cb6b2c2a8764c206139049ac8e0bf55929123632e3640cf8505883f5cc53e
+MISC metadata.xml 434 BLAKE2B 1ca0dd18418173c3d463b6de56119e3ca95bfa7916c1e3a9b54b9d6137a60e00379e1d0ef2e02f2bfd444714c6b801b334b135e8631ffc2d547f6566198a0ab5 SHA512 d49cebc771dd4a5e0074576cc16c75a2893e2e55ab80ca15b15ef9f5c89c120e2e2815624c47153e9bf87aca8c28feb072ef72c23c7a47eda42b7659e047f3cc
diff --git a/dev-ruby/vcr/metadata.xml b/dev-ruby/vcr/metadata.xml
index 3e7ac4fc6b7b..588668ce56b8 100644
--- a/dev-ruby/vcr/metadata.xml
+++ b/dev-ruby/vcr/metadata.xml
@@ -8,4 +8,7 @@
   <upstream>
     <remote-id type="github">myronmarston/vcr</remote-id>
   </upstream>
+  <use>
+    <flag name="json">Add support for casettes serialized with JSON</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-ruby/vcr/vcr-4.0.0.ebuild b/dev-ruby/vcr/vcr-4.0.0.ebuild
index cae5212ae316..096a7318138b 100644
--- a/dev-ruby/vcr/vcr-4.0.0.ebuild
+++ b/dev-ruby/vcr/vcr-4.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md"
@@ -16,8 +16,10 @@ LICENSE="MIT"
 
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 SLOT="3"
-IUSE="test"
+IUSE="json test"
 
 # Tests require all supported HTTP libraries to be present, and it is
 # not possible to avoid some of them without very extensive patches.
 RESTRICT="test"
+
+ruby_add_rdepend "json? ( dev-ruby/multi_json )"
diff --git a/dev-ruby/vcr/vcr-5.0.0.ebuild b/dev-ruby/vcr/vcr-5.0.0.ebuild
deleted file mode 100644
index ecf35311d517..000000000000
--- a/dev-ruby/vcr/vcr-5.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Records your test suite's HTTP interactions and replay them during test runs"
-HOMEPAGE="https://github.com/vcr/vcr/"
-SRC_URI="https://github.com/vcr/vcr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-SLOT="5"
-IUSE="test"
-
-# Tests require all supported HTTP libraries to be present, and it is
-# not possible to avoid some of them without very extensive patches.
-RESTRICT="test"
diff --git a/dev-ruby/vcr/vcr-5.1.0.ebuild b/dev-ruby/vcr/vcr-5.1.0.ebuild
index ca4669a2923a..c6e6cd0a24d1 100644
--- a/dev-ruby/vcr/vcr-5.1.0.ebuild
+++ b/dev-ruby/vcr/vcr-5.1.0.ebuild
@@ -17,8 +17,10 @@ LICENSE="MIT"
 
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 SLOT="$(ver_cut 1)"
-IUSE="test"
+IUSE="json test"
 
 # Tests require all supported HTTP libraries to be present, and it is
 # not possible to avoid some of them without very extensive patches.
 RESTRICT="test"
+
+ruby_add_rdepend "json? ( dev-ruby/multi_json )"
diff --git a/dev-ruby/vcr/vcr-6.0.0.ebuild b/dev-ruby/vcr/vcr-6.0.0.ebuild
index ca4669a2923a..9df479fba6a9 100644
--- a/dev-ruby/vcr/vcr-6.0.0.ebuild
+++ b/dev-ruby/vcr/vcr-6.0.0.ebuild
@@ -17,8 +17,10 @@ LICENSE="MIT"
 
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 SLOT="$(ver_cut 1)"
-IUSE="test"
+IUSE="json test"
 
 # Tests require all supported HTTP libraries to be present, and it is
 # not possible to avoid some of them without very extensive patches.
 RESTRICT="test"
+
+ruby_add_rdepend "json? ( dev-ruby/json )"
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-29 11:38:31 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-29 11:38:31 +0100
commit	90c88731bd036e5698b281fbc0a5f3aa4c9983ac (patch)
tree	83fc5facb6b12be510a37bc3d241cc63e965b13a /dev-ruby
parent	feb0daf81d888e9160f9f94502de09b66f2a63fd (diff)