gentoo resync : 30.06.2019

91 files changed, 669 insertions, 778 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 704d6018a612..877cf9a11ed5 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 975ed7cc6a2f..f3e8de56c798 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -3,5 +3,5 @@ DIST rails-5.1.7.tgz 6146668 BLAKE2B 494a12d79037010333c06d14573474f0d0c1e62ce52
 DIST rails-5.2.3.tgz 8802794 BLAKE2B 786f94bcd9528ffc664c39caef0e7d2d3c15da95497044504082999a435c2a877d73d40b68b5237dc07ae6cf9b8f6f99f12ae68527c5f4005b1a648038e507c0 SHA512 6a41f7564679263b4a16a245d13271b12e97a55cdd77b5ebe63bd86c3a80e4f447b4c0567a4a40ed8e97a2307522f6dad368b1beeb362136bdf1856f6dffeb60
 EBUILD actionpack-4.2.11.1.ebuild 1858 BLAKE2B 92cfe0735197abfb283c49b28887d421166ea56dbded2d6ce84089cd85d10c2d58ff5c53e4576094c6bfe6eda08d495cbb64e8ed5c589a675de1b9406a3d8451 SHA512 35c6071ac1d25db006886699e59bdaeaa64ec31cc70ff5cdaf41fd046d8fe87ff63ef1bb84acfba974420f3844a58fc243568ab8a2fdc201fa2add9d4dbb3981
 EBUILD actionpack-5.1.7.ebuild 1717 BLAKE2B f702eaf4b01db58bf0cce994f4c06110ef5ce41c612c7f6af33b7fb4e20097d21cf902a3b076b0837acb8dcd311536be4bb0be8a47ef93ab7cdf83085f7ba5d7 SHA512 3d81e4ebdab892c38f9405765ab59f7ecb6b2cbf8d482887f515e138cb50d193857afe475cc66dbe52f55e2d6006a75d5074e2877df8089dc03afacc6124e4b3
-EBUILD actionpack-5.2.3.ebuild 1578 BLAKE2B 493d2b13f3cafcca5a4219535b3944e9784155b3f31b694cd4b07f55debbb65951a991b086756e0a2ecb36f839dafc01fce0afae620bc9979c7aa1d6bf888030 SHA512 00183ab995c8ee4764c834618bc020e45c00c549c0de556554970e446707ac80ee3e75bc7ebfde39450c772b10ec0dc90aeaddc3bacc317e599a6a4bd0edff2e
+EBUILD actionpack-5.2.3.ebuild 1577 BLAKE2B 488030d095bb40efcba8f2e7a83e10cc7528d17dc70ac26481016b5aaab7b4c86ffa231fc4e2572f41d7e2960488bd3b3578fbd24ae103460d0a3e954f3e57b9 SHA512 bf3a83d1c6db91e5335f74b61234d5139f880415688abea40963d39184496860b23466cf674954aa3fcae5fb6b68525bf26858d5db0fb1078fca40405428006c
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionpack/actionpack-5.2.3.ebuild b/dev-ruby/actionpack/actionpack-5.2.3.ebuild
index 57afce6e5681..846dab2e85f3 100644
--- a/dev-ruby/actionpack/actionpack-5.2.3.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.2.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 2753f77cce07..b9500fa70680 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -3,5 +3,5 @@ DIST rails-5.1.7.tgz 6146668 BLAKE2B 494a12d79037010333c06d14573474f0d0c1e62ce52
 DIST rails-5.2.3.tgz 8802794 BLAKE2B 786f94bcd9528ffc664c39caef0e7d2d3c15da95497044504082999a435c2a877d73d40b68b5237dc07ae6cf9b8f6f99f12ae68527c5f4005b1a648038e507c0 SHA512 6a41f7564679263b4a16a245d13271b12e97a55cdd77b5ebe63bd86c3a80e4f447b4c0567a4a40ed8e97a2307522f6dad368b1beeb362136bdf1856f6dffeb60
 EBUILD actionview-4.2.11.1.ebuild 1585 BLAKE2B c001b8c56264e3d1969bf8c07c54ae6580cde982b38147c4c15eb1320e4ccd4228f1b554dc80c1f04150d6e14dedd25687e9d3707881532eba44286e9cbfec61 SHA512 c7de03ec6a2865e763be290f1f76cbcee866a20d49f3aaf44ff4f040ac0e5a878ce94083eca8d5817b30908997c25e82b4ccd84569ac770affc30e8f7169c5d8
 EBUILD actionview-5.1.7.ebuild 1877 BLAKE2B 2a1be3acaa314ed7ae85062f0c425b9c1402e8fca365341f76087bbf0a76bcc56102eacd84f8924326f428b99c83d92498a1ed99a2789e8e02162d25216bda61 SHA512 36af5a0630c889fffd2767740075c1d07ab51fc36c169a5fb8dce5e6a9dc3101856b007cfe52448e080cacc814fc938e940ee927b4cd1021db688932af4f40ef
-EBUILD actionview-5.2.3.ebuild 1734 BLAKE2B 07c1b0b1787599ddbd818db23c0cb92bde65b7171d4b5f951fc06b3fe8d4856a2336a6bb565b889890f96bc96a8dee3314b0d5d639b177a444efcedf738fb145 SHA512 360e7fd36a99c0a8d1804b1f6edb597164305551287f55859137469bc5494eadb5fd30a54f755700fe5c384adf0774b30bfdfd314f6040341c59fc3fb154b633
+EBUILD actionview-5.2.3.ebuild 1733 BLAKE2B e63d86214aed2a50ed7e759c615f5ff8e8a89fe070e09227fafbc39af565c537f1f4010d1cccbff57c79dfac89b9bb2128cd6779d17c1b10e17b450a498e5bac SHA512 b91c7cf9893601564fc9ad9ca1f23048a8ec36631ed57a02c1d8850decd583135dea306ad4e8158dc669475f037ff850ad3e454d3fb16b91d4ef78556058738a
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionview/actionview-5.2.3.ebuild b/dev-ruby/actionview/actionview-5.2.3.ebuild
index ae633c7cdb56..edb3803e8f3c 100644
--- a/dev-ruby/actionview/actionview-5.2.3.ebuild
+++ b/dev-ruby/actionview/actionview-5.2.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 7fb98d4d00ec..23b997f16cb6 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -3,5 +3,5 @@ DIST rails-5.1.7.tgz 6146668 BLAKE2B 494a12d79037010333c06d14573474f0d0c1e62ce52
 DIST rails-5.2.3.tgz 8802794 BLAKE2B 786f94bcd9528ffc664c39caef0e7d2d3c15da95497044504082999a435c2a877d73d40b68b5237dc07ae6cf9b8f6f99f12ae68527c5f4005b1a648038e507c0 SHA512 6a41f7564679263b4a16a245d13271b12e97a55cdd77b5ebe63bd86c3a80e4f447b4c0567a4a40ed8e97a2307522f6dad368b1beeb362136bdf1856f6dffeb60
 EBUILD activemodel-4.2.11.1.ebuild 1636 BLAKE2B 670d133746729c900586c4238698548c8aedcc90f670c3d80d20d1841d4123d71f010189ef21673e3575b5d2c1b181eac6c7439571a29aa0d7e881b583ecf3e9 SHA512 2dc483fc464c85303f605d7acfe07775f1fb6242a2e5e7f8f9e659f781a80431f70c8c79dceb15af5c1b6f39fc003a52ebc4cedcc9e1aa4bf6af0ef7526550a9
 EBUILD activemodel-5.1.7.ebuild 1125 BLAKE2B 1f92fd1e19eda6dc3ba38734baad6d9388241825a8e898da6829a4d8e2c01f54d308c68299a5e6f9ed74eab0742cbfd4a6eb08519890bd5930aec4cffaf88aac SHA512 c40da93b518c332a26ede7ebc71bec1104fda3746be11f4b994561a1d6dda3632cf212449bd7952aa2233e44cca1b3d284c5f9221aee71a3775abf0e9f4613ff
-EBUILD activemodel-5.2.3.ebuild 1041 BLAKE2B a830367c50e7c995902420221b1e61e11d5db10d36d56dd02ddbadf574b2912da234e6e541a0fdc13229ae97dd96a3449d7fee9540ef2678624b13cf4efe6854 SHA512 44d2f0df9eef71538574997f40bbb42ffd5785edd8159758d8c360edd99ef2d26412ccc6c79a7930273b9e31a05ecf1b1e249d11395f7ce9c5ee8edcee5200e8
+EBUILD activemodel-5.2.3.ebuild 1040 BLAKE2B f57fa78d010743e04236bc091070ac556dfd161813c6747589e0042e2562ec4b8fbf3b88bcfab7c8c29fd25404357c03f19b7ac4090694db48a4f6c248209cca SHA512 64b2f7f9df07a28bd4a6ac1a82f0f092daddcc7f7278c9b39bb282b13948c2a9943b2efd70dc546ec70a746f1c465dfed688d80d58b0f6abc2c7d7b914f973db
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activemodel/activemodel-5.2.3.ebuild b/dev-ruby/activemodel/activemodel-5.2.3.ebuild
index 025609c0e43d..e243f865b65b 100644
--- a/dev-ruby/activemodel/activemodel-5.2.3.ebuild
+++ b/dev-ruby/activemodel/activemodel-5.2.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 3b116665578e..6d507383b2a0 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -3,5 +3,5 @@ DIST rails-5.1.7.tgz 6146668 BLAKE2B 494a12d79037010333c06d14573474f0d0c1e62ce52
 DIST rails-5.2.3.tgz 8802794 BLAKE2B 786f94bcd9528ffc664c39caef0e7d2d3c15da95497044504082999a435c2a877d73d40b68b5237dc07ae6cf9b8f6f99f12ae68527c5f4005b1a648038e507c0 SHA512 6a41f7564679263b4a16a245d13271b12e97a55cdd77b5ebe63bd86c3a80e4f447b4c0567a4a40ed8e97a2307522f6dad368b1beeb362136bdf1856f6dffeb60
 EBUILD activesupport-4.2.11.1.ebuild 2386 BLAKE2B ae9c03406916c3f16fcd077ef49eea1f10123428af93f1b5e6739a28b1ca741e98b4572fc5643c27b7a8b3efc24bb038f2452df5ea90dc829477affc78a7b0d6 SHA512 b753886b2478c5b54a1800b47096f63ec68489dddb1ca68d72b15f192d6c8a4e345235a76395e6f5c2c3bdd662ea07ba723ac0a025103820afd308a5c9cd18e6
 EBUILD activesupport-5.1.7.ebuild 2317 BLAKE2B b3721cab2f6b57748cfd0cde85564754c360538435201bed5edea0f7fd0cea4c2c7552b0095b3b3d977552dea0a26577c9b10f3097d320382cbdc1e315613832 SHA512 26e052a3ffc4564539f83ce35c73ddb179d314475a1457d4ee1cd3f8b9bfd5aef980452d23ac7375d7f82e138c3624bbc70218d2a2d773b6d9569b6e6ace2b61
-EBUILD activesupport-5.2.3.ebuild 2457 BLAKE2B 59d0cec7513fa28ee6ae807ca40e1001c7393d30f10a071b94833a753b37899dd4d3e80fc5a378a224a0c14a6f56b955656654951f8626ffe0c40b603934386f SHA512 6a176486b6ecca8071a829ce6effffd54483e86a00982dbd923d1bc65fcf1e251a1feb8c782c9e44d5eae29f39d7a0409d1f97ec35568fec12e29840b7dc23c3
+EBUILD activesupport-5.2.3.ebuild 2456 BLAKE2B 19da92a852c754b6b0ecf3bf5ac1f4e895087090c0542cae70287b115ed4c3d511f47cc3d688160fcaa419b1313cfc804a25f4efe6dddfee101ed05f5635bb07 SHA512 a7514744a6becd11541e24cb82bd59f56ebb769d3c0ac342105ce211684f7c8ab77add7bf6f1ba460015fdd1fbc4e386bba4a7a84cafa5972fa98bb7398bfaf0
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activesupport/activesupport-5.2.3.ebuild b/dev-ruby/activesupport/activesupport-5.2.3.ebuild
index de529116b464..bdb4663ae696 100644
--- a/dev-ruby/activesupport/activesupport-5.2.3.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.2.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index b46fddef2bfc..df8db3b822c8 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,21 +1,17 @@
 DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca18ea85a7095d9e58625df6a59a349b60b462c5c4f403a6af955466bc46d82be6cd91724fc2b12cbe15ed74a4c SHA512 3bb994e022593d485a07296193a16cae7b45e96e87dd10b2bd4807ad2bc990801044c0493360598d1626c3e367e8de87e407f65c2c6f42674d5f1b9c0b5c1933
-DIST capybara-3.16.2.gem 328704 BLAKE2B cec9871efe380b57b2dea54824e2032de5bbdc7bb49fbdb8c4f135ba4ae577431e9813a8532f37bff3616820916014a91fd5e558f4f0049a4718fc22e12f953d SHA512 9350fdffa5991aa680337a77ea5422adf0c9cce9c2c42a0e30b7994377cce827c971e4e34c4331b2e2bf7fd3036845416dbaa06ebeb2c6d40c89749fec3240cc
 DIST capybara-3.18.0.gem 331776 BLAKE2B 05d4368f570bbf74a3540fd7d7594cb95c602507f4ddbde437b702b6a280dce5bbf9d0412a1a6ce7888af3a72667e6e3efa7c83d50a8791670121673426c4de2 SHA512 5e9321eb2367bfb48f090868c944bf9920e6bd298e5663e0a820d63946a9cf320e5e3a9b95569779b7e6cdc361dded5ab12a8fce4a0df430c4768d8ce161d02c
-DIST capybara-3.19.1.gem 333312 BLAKE2B ff0ea453066b2b11f417f9ea54af47ed9fb27847a09967a07c97196dda0e76e2c9862bea89c9ef7006bedc0dabe3b6e5cab19fa12f5b2e80f8872ca43b6dfdb0 SHA512 3098748e34ea794b13bfb62fc3a98c3cda8acfe1cfdfc9d816a4cf2c38aff6f1b9f23b4d84ca2cb8f0257a7bf1f5c368dcd40148354661687346ed30dd005b87
 DIST capybara-3.2.1.gem 284672 BLAKE2B 9da8f588049fab74c4e734626e42758cdd4baf555cfc64e7456bfab2cb4d5c90ed6bfc8ada7cc0d6323ef1113169aec70fd4254aa50c003408376ea4afe00a06 SHA512 50af1d4c49c200a4c08901d19b16826499abb8d19de8e059160c509afd555edbe620b6fd5d78f8c286feeb15a72e5a4b241cb1f14151b349fd94cdd3648b64b2
-DIST capybara-3.20.2.gem 344064 BLAKE2B 6b0c8551c2cc88ddd201d416abea25b03c874ac65bc3d7abeda0990e03bed231493310dedd287be1c8961e1d38c7d4d0060698645223167113b86dc650dd6ec0 SHA512 f91902712c5140428260fde24643900c628c75de66752a655584c600c84bd55e9f5153c694c7b286d0c295f18bb459906bf5e68ca636bbabb29f84c4f82031c4
 DIST capybara-3.21.0.gem 345600 BLAKE2B e9a2ea78a9d0a3ec4fad7b61b82a527fdb9b1a5ad3a2bc5a3b294b90c6a6afb0c5ff00056371c1a70ef28d340a048073e713d0eade7db610bc256cf58e8456fd SHA512 e632eb75c13b1c13691fa7b7ee81372adcb205df7942593a7a7a45207068a043591c8cb50dfb1664d1d9206e610ab1107a2a4d3fcfd614be766207ea7a32fcab
 DIST capybara-3.22.0.gem 347648 BLAKE2B f1f50da92f62fc31231564500ae94ed7e5d07f4fcb04b68829dc538097f1bddb313fe9a8384772da24485879bb7c16caaa7dd2f4994d0bb95313fbbd5c79a3de SHA512 b77ad55bb35a3f62057a649e99086c322a3b3832f2c907f7abee46d694c5c189aff9f286590c8ab597bb767e56f3ec51911842146677545b99c44db27ca236c6
 DIST capybara-3.23.0.gem 349184 BLAKE2B 233b83fb88f106de8e25a1aa34d1082664824571eca2a79ad3de3b164e639b68173804bf2e871c3fde7fe2af54d64ee6ade90c4149807e04e844cbf5d61f24dc SHA512 53e0c6223e574960e136e7620d7d00a0e1479f9eb0fb70c7150bc60e20ed009d163dc29f7cee84acad43168cca230465490c9ca64b640fdebe9223ec62b6e4db
 DIST capybara-3.24.0.gem 349696 BLAKE2B 54447fc17169d953c43f31505a9267bebe6d093052cb553efa8eb65bf6e39fbb13fe02cb3b7252c4fe1f0554370266265eb759ad7f4dc5bab9299410e4f07e81 SHA512 32a19471d3f8d13871c40c28671125039b432065ab6ac1b31f38551f9e5c7d52c041ef9a56db853aeddd14d9411dec4e647336f6b78feb45c90a676ccdc606fe
+DIST capybara-3.25.0.gem 351744 BLAKE2B 12e8f483bca814fa826707895a6fc72a3d54df2e03c1175eb4be8e2f83afeda2466d70eab03c7700665d3f94bc7b3b8f85b2d2d6cf8242cad285d9350428cadc SHA512 1be454984862c314f0571ca68ed3858d241dc5f0709d155b1b7accd7fd81a1ab0bf0a5c6537c871989c9abc758d0e7fa5109c8b04be8b620137e129a5da13a68
 EBUILD capybara-2.18.0.ebuild 1552 BLAKE2B 7029dd19a177f4aebc1e78d83f9561ef4f3abdd41b0b8d77426e11bbaffc7865d746d4f3d3e6ed696c4414008648acc707f42e4a716681a2e331acae512ce8a6 SHA512 87dafa1f76c10eb0853eb7c8e3da36ff7c0b522b887c037ab9c3fdf12b29ec20d39a3638c4119225ab097dee44b878ed1ef0aa753d0d83f886c6d4c089a6c931
-EBUILD capybara-3.16.2.ebuild 1605 BLAKE2B 9deecfdc08bd830d3c59787a6ee5e64df2da86ee381093b437df9c75763ca44116a1a2a9ba53e474211f77c6286059b5570ccc6f1573ae07599b17bf993dd7a5 SHA512 7317522977017cbe3d76c3437d860afa8d1ce5cd20682511bea5148391a29cb8efba1540a8567f4b29579c151d551bf4b6fecc1f03080205e432ef619be6be73
 EBUILD capybara-3.18.0.ebuild 1804 BLAKE2B 678dba02ba98f19bf4ef17086d3bab0f8216ba6e89d85ca0377a53a03c3b952443a29bd00d8cb0b85849516663958a315386c059fd4d0e119f4417b9550a9558 SHA512 8a1ab2c59dec10beafb8362ad7a58f5389d385ce98975e427f40cc8b464d095ffda7baeb44fc66a5b7ecdca86f181571d16af0000b74a8fc99b1d99118f22a30
-EBUILD capybara-3.19.1.ebuild 1805 BLAKE2B d0519f603a2ba92da76acf55461156da7a09d3ddfddb914e1328ce210593f1f587948c370f631daf9ff20a3bb094780a53da4c247e3872ff3b2fd84f5a2b1f83 SHA512 ee6e39820bc0031bc86cb905043018950984dc79bcd910d70a6f057ba018d97740ad1806c92f6723d180ec3717e9c12ccb6ba45ee1a1c403a5f8f15ec2a3a756
 EBUILD capybara-3.2.1.ebuild 1552 BLAKE2B 02cb90fc41a6c642bcb8c3efad2428e9d49cd5fe06a43217a4e67b2b9ec957e5038377cd8bfe957605d3f9bbf85765eb42f07a75b8b8534fc142bb6a71af4a03 SHA512 7ad2cdc611be697732243100756b0be1d66da2654c5f65102a9f258298d1220e21683f1eeeb82ac3f2bae0edcc844d94de2a23eae12e9e4235128df8d2df8d56
-EBUILD capybara-3.20.2.ebuild 1826 BLAKE2B fb4e93b36a5aabde81799dfdb42aeff00ae4b5e3133f4033f22e0b46ab3e0fbc029fca8485f3361b0bb1ced40250336063e864bfbeeeda6bb941f0e602829b3f SHA512 e4d8b1713e6e09e936ae0359879eecb6d9d07eca6e6defa86b4ade8c1ff8062d7c0978f234db50c6522326933e5a79217752d4a13f95d726d3fce774b2efb617
 EBUILD capybara-3.21.0.ebuild 1805 BLAKE2B d0519f603a2ba92da76acf55461156da7a09d3ddfddb914e1328ce210593f1f587948c370f631daf9ff20a3bb094780a53da4c247e3872ff3b2fd84f5a2b1f83 SHA512 ee6e39820bc0031bc86cb905043018950984dc79bcd910d70a6f057ba018d97740ad1806c92f6723d180ec3717e9c12ccb6ba45ee1a1c403a5f8f15ec2a3a756
-EBUILD capybara-3.22.0.ebuild 1810 BLAKE2B 8f86264bfa40ebbd169e78ca2fd0324b69d9a46cc52e895790ba11dcfc46eec4557da91a8827ec7cdb0b683fac7f35b8e323b0219ec42d3fcb720f343ecb1616 SHA512 d69eedebe35e30b7773bbfae074b4ea09b75929c8350547e35dcef268e8a94f713c6baff74bb73ebb3b79dd35734acceb967728c725554e7450e0b17a4fdebef
+EBUILD capybara-3.22.0.ebuild 1809 BLAKE2B 4153daa7cc3b142bf1e069b079e110e1d6e1793eb44e42dbda5901a0bf6e6fe3d8585cd88e6af675d343edf4c9121871b27ea356b32b37058d8887df295d86b8 SHA512 501df343b48f379647fe21439c09922b7a52f3c943e97082503b0bb14f19db415bbaa127e33f56267ad916d5ffa471821a0962827b0db058e4c69fe965b4b7c1
 EBUILD capybara-3.23.0.ebuild 1810 BLAKE2B 76b7c0221fb17244acec192dae6d061ff8b4f77f41847cf9f97cd9f82b19726193230ea9ca36c5b88a870e3de10899274214542573a36dd6c3c4c3411cb634cb SHA512 11eb703b46cc0d42678414716856b732e9a5a455deeb124219e45d415dffef379db2a668de5520e80ab934c453628228cff3a28458cd4f305142f1bd57dcd611
 EBUILD capybara-3.24.0.ebuild 1810 BLAKE2B 76b7c0221fb17244acec192dae6d061ff8b4f77f41847cf9f97cd9f82b19726193230ea9ca36c5b88a870e3de10899274214542573a36dd6c3c4c3411cb634cb SHA512 11eb703b46cc0d42678414716856b732e9a5a455deeb124219e45d415dffef379db2a668de5520e80ab934c453628228cff3a28458cd4f305142f1bd57dcd611
+EBUILD capybara-3.25.0.ebuild 1810 BLAKE2B 76b7c0221fb17244acec192dae6d061ff8b4f77f41847cf9f97cd9f82b19726193230ea9ca36c5b88a870e3de10899274214542573a36dd6c3c4c3411cb634cb SHA512 11eb703b46cc0d42678414716856b732e9a5a455deeb124219e45d415dffef379db2a668de5520e80ab934c453628228cff3a28458cd4f305142f1bd57dcd611
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.16.2.ebuild b/dev-ruby/capybara/capybara-3.16.2.ebuild
deleted file mode 100644
index d22b2b7118b6..000000000000
--- a/dev-ruby/capybara/capybara-3.16.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-# Rake tasks are not distributed in the gem.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit virtualx ruby-fakegem
-
-DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
-HOMEPAGE="https://github.com/jnicklas/capybara"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~x86"
-SLOT="3"
-IUSE="test"
-
-DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	>=dev-ruby/launchy-2.4.0
-	>=dev-ruby/selenium-webdriver-3.5:3
-	dev-ruby/sinatra:2
-	www-servers/puma
-)"
-
-ruby_add_rdepend "
-	dev-ruby/addressable
-	>=dev-ruby/mini_mime-0.1.3
-	>=dev-ruby/nokogiri-1.8:0
-	>=dev-ruby/rack-1.6.0:*
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/regexp_parser-1.2:1
-	>=dev-ruby/xpath-3.2:3"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die
-
-	# Avoid window-manager specific tests (sizes are specific for fluxbox)
-	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
-
-	# Avoid spec that requires unpackaged geckodriver
-	sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
-
-	# Avoid test dependency on puma server for now
-	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
-}
diff --git a/dev-ruby/capybara/capybara-3.20.2.ebuild b/dev-ruby/capybara/capybara-3.20.2.ebuild
deleted file mode 100644
index bbbfa3a36f7f..000000000000
--- a/dev-ruby/capybara/capybara-3.20.2.ebuild
+++ /dev/null
@@ -1,62 +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_EXTRADOC="History.md README.md"
-
-# Rake tasks are not distributed in the gem.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit virtualx ruby-fakegem
-
-DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
-HOMEPAGE="https://github.com/jnicklas/capybara"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="3"
-IUSE="test"
-
-DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	>=dev-ruby/launchy-2.4.0
-	>=dev-ruby/selenium-webdriver-3.5:3
-	dev-ruby/sinatra:2
-	www-servers/puma
-)"
-
-ruby_add_rdepend "
-	dev-ruby/addressable
-	>=dev-ruby/mini_mime-0.1.3
-	>=dev-ruby/nokogiri-1.8:0
-	>=dev-ruby/rack-1.6.0:*
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/regexp_parser-1.2:1
-	dev-ruby/uglifier:*
-	>=dev-ruby/xpath-3.2:3"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die
-
-	# Avoid window-manager specific tests (sizes are specific for fluxbox)
-	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
-
-	# Avoid spec that requires unpackaged geckodriver
-	sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
-
-	# Avoid test dependency on puma server for now
-	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
-
-	# Update spec to catch the right error code. This seems to have
-	# changed recently accross ruby versions.
-	sed -i -e '/raise_error/ s/EOFError/Net::ReadTimeout/' spec/server_spec.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
-}
diff --git a/dev-ruby/capybara/capybara-3.22.0.ebuild b/dev-ruby/capybara/capybara-3.22.0.ebuild
index b6b0785652ad..194ae4cd7686 100644
--- a/dev-ruby/capybara/capybara-3.22.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.22.0.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.19.1.ebuild b/dev-ruby/capybara/capybara-3.25.0.ebuild
index 6d4f00d22fbe..00a37d026647 100644
--- a/dev-ruby/capybara/capybara-3.19.1.ebuild
+++ b/dev-ruby/capybara/capybara-3.25.0.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 SLOT="3"
 IUSE="test"
 
@@ -36,7 +36,7 @@ ruby_add_rdepend "
 	>=dev-ruby/nokogiri-1.8:0
 	>=dev-ruby/rack-1.6.0:*
 	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/regexp_parser-1.2:1
+	>=dev-ruby/regexp_parser-1.5:1
 	>=dev-ruby/xpath-3.2:3"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/did_you_mean/Manifest b/dev-ruby/did_you_mean/Manifest
index 7db18db6acc8..080991f6cc72 100644
--- a/dev-ruby/did_you_mean/Manifest
+++ b/dev-ruby/did_you_mean/Manifest
@@ -1,7 +1,7 @@
 DIST did_you_mean-1.1.2.gem 30720 BLAKE2B c1fb841143928854854892e2c7890cb3952329ae3efd50401b43bb4bd327b0564ab2f0fb33a4bd23278e1a3570594f2e13ae6c0cb52ea244ccef392f68e79d09 SHA512 bd1f5eeaf6c527bd6a0ef79555aeee459f9e2fee82215e6f3a47e380535d366eea1f7b199ae99de2736125785c7fd76a1cd6e8bc7cd0599a8d4cc6c5184c85de
 DIST did_you_mean-1.2.1.gem 20992 BLAKE2B e8827b3f6797145c1adf5fae2a681ad8f437c1dfcb746465c4bb0c59f61285c2f2a65d5e31e2a501da812baf52a2f1d78b81c2d74a194d7309778cece56c1752 SHA512 98a71ad3c4fe92efec50575e26723cd3b5c60b25cd24767a7aabdb4e2b343b131fe3677367c78995f07c513d39d47984af80bde0ec2f6aeafcb34be97f134b1b
 DIST did_you_mean-1.3.0.gem 23040 BLAKE2B 2ff2049a9db318151f7a42f00b22452e60b101152d6b170e59aed9804a87658015472cdbf2fb995aea4999cfabf23a09bf09d4ec4f47bdd62193c2e20c7a8a2c SHA512 a2b2bc30d1f87d535e0af765ca53e74ba156cee877f78caefa196e335939748e0ee0512ba4cbdc4ddf4b354715299b9f8593a08f65e97e9f7c83cdba55e354f3
-EBUILD did_you_mean-1.1.2.ebuild 760 BLAKE2B 9190270d1206beb4d77bcfd62e5fffe516bbf2e7e1188faa7616599d18657c39e59503d0d5f5e87506d9cf9c903570adf8a53871d68e7d271a976b3d6f4c8584 SHA512 d5365ab3fa3eb3150f49b5b45996b7965da3b6a40c1380e2d49a759457a382225772c7e321fc1b70ce7cae656bbb66e8bd72ed3323a66e23c85ab688871b819f
-EBUILD did_you_mean-1.2.1.ebuild 625 BLAKE2B 1d1b067f8f160aef0c3ed34a6aa03d10055dbd96387b99eb5e6cd5db3f3f287b1c05a97fc3832fd90fb205ea425cd58acd2b6ee2239655bb806f6bb4f13f2dfe SHA512 0b5001995dd33b7ea70857e7b2b4280df489128477710b58d81d7b1f7054bfe2c3f6abd380940d660150f5df4ebfe8d11568d3c719a2cd0187653065dcd640c7
-EBUILD did_you_mean-1.3.0.ebuild 629 BLAKE2B 16a5cc9f30caeee11c7fa6bb253bdf93314e08b6b742b7dede8c1ec92e90d7ead310abb0d944ed5c2a087342eb3f427aa3dcdfcfeb16333839e766edd1868da6 SHA512 00b3aee958b8ac834b5ed38f5b0bc47ace44bb24f669a9b38a50a533f51495ecd3ae604d46cfcf186d6ab1ee97775c8ac5510360ba656e10a9ec01b578ae52b5
+EBUILD did_you_mean-1.1.2.ebuild 784 BLAKE2B 1e2dd3a20894f1cd22165d8570b308dfaa894b03718935935fa4199c5f75fb401749e18d8570d382f2a0be06db0993fb0c01698e32dffbb9e19c909d534fd1eb SHA512 688ebd98ab036117f4cfb079f625a61acbff5c68d29d22b9f592493c2057988de3ad831a7a0087e4953925967c006fad51e2ea5d6f26d533e6d9169842bb0d8b
+EBUILD did_you_mean-1.2.1.ebuild 646 BLAKE2B 0e207b26bb2a3d1755fcd9e4ca701d1f4afbad3227a7c0cb49ac9beedc459e02af02db605072c11bb3c024adc6e41b99be7e9b5fe796d7c805c1a5eee55c42b1 SHA512 1c01e9a591aae0fb3ec9b9dcc536319cd404b4819355288ec175970cc2eef437e6d8668aa9e6eae8805f7e6e55e1b1d263505e128835a6e0dcc27e0fe290909b
+EBUILD did_you_mean-1.3.0.ebuild 653 BLAKE2B 5dfd92f888bbf7c1cfda2fc1ec31009aeddbe29a918f090076e62c1f44f61fab909f7a3afd1fd5d9d49a372e77d24b9c3bdde477b4f93a5784dfb73c8bafafbb SHA512 23ca01ff8fceeb3c2ade5164908e2da5cc8ad79b825d5673cb21ca992bf5da7d47f713f63c09fe8d08a64472422f72cee101e0950659a0b1459cdf2f03ba32f4
 MISC metadata.xml 345 BLAKE2B b3764e5648286cb66e03f3343a41b460ea2bb24f51e1c25e89e386c2b16769c9b1f88888b1e10b2c2d0a2346659195454e4ee8262aec0d4a9066795759cad053 SHA512 418114238e3e2db16ebcdd3de5213b3bc0f0a45ed719de1be60cb19015966cf39912f38d0858e22aa6330ac2e7fb58a1452e9623e7559c26161d70e0f29e66cb
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.1.2.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.1.2.ebuild
index b7328c4ce375..2b7957f10758 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.1.2.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.1.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
 
 LICENSE="MIT"
 SLOT="2.4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild
index d62fc2030695..d173ac891323 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
 
 LICENSE="MIT"
 SLOT="2.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.3.0.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.3.0.ebuild
index aea6c6973898..aa7778cb36c8 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.3.0.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
 
 LICENSE="MIT"
 SLOT="2.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/dotenv/Manifest b/dev-ruby/dotenv/Manifest
index dc092bc55a9c..1df89fd3f474 100644
--- a/dev-ruby/dotenv/Manifest
+++ b/dev-ruby/dotenv/Manifest
@@ -1,5 +1,9 @@
 DIST dotenv-2.7.1.tar.gz 19248 BLAKE2B ad718a2213ddb87fe137a0de84e460b0c10415903dae239ab92af506072e25d6217a0bf5d94ed622835d91dd22cfde9c84f14555e83efbc0d95ec2301ff64058 SHA512 fac0d58c3d4f6b5eecec4773e670e6d63d76f5623aa9b591181369b5fe2ab1be51f6c44d2362fc86be745f965ea0042b7c9c01450441fdb68ed96c46d7fb963c
 DIST dotenv-2.7.2.tar.gz 19028 BLAKE2B 0119b52ae884f2a129f1c805b1da923872e4bfa4e80eb6b3e49fd875bf803925d372b630981a06ad18e2c20d1094ce8bb317043c7e934fb463b7cf338b16e8f5 SHA512 97c9f499244155fdc245f80167936e9ce30e32fd23dfef81147ee91df4622fa7d454081f5d823116a9472664d12858d5b87897148936da3a69961f459e4183f8
+DIST dotenv-2.7.3.tar.gz 19765 BLAKE2B 65f4171c8304c207ea94bd31ce2b63ae786d4794c538260ee8aa1ad8714fc1736a193febdee1299b62b82066e72be0000dffbff69a272ed94c19922bd6fc15f6 SHA512 0ac46b4c037c4d5a6e9517c7c39a4fc0f52a5a7f153602007196f6929f8be05678186a227046195fabfa4e59e6099d626f436da66041ae30c46ed062c7c5c33a
+DIST dotenv-2.7.4.tar.gz 19800 BLAKE2B 53719e21aecff63016c12b8ed18f0bbf66389abe3b73c4426be1af489833cd8967b3ea4bd3183549c28d2abdc6f2cda33ce31873d8a0cac5c88c8487226ce7c8 SHA512 dd5fbc1cbb44bde938067d37834304a730bee6e2e625784ac3612f3a597c513679d52607d8924ca05939d6093891108aab3ae6eeab55be2f38238b7c2a78aefd
 EBUILD dotenv-2.7.1.ebuild 1007 BLAKE2B ea1e6bdab2393146d01cf83db283410f8f1136854d31691b98af2a2e1d9ed2cafb1bfe03aa851f4c11c1b65f5f3b2e4a5cf90576d117003b1ecd5019e4b08540 SHA512 222ca6bc3007685985d6c4155e4752dc4d3fef77db5b00324f2a29425184ebd1cf98a2af4afb442b517b100895cdfb8033a5334ebdb07de0b1de50337e83fd51
 EBUILD dotenv-2.7.2.ebuild 1014 BLAKE2B 734ba76d3022f5f6693c8aa8bd9244c0ed7f5e50b22641abf54efc1f31159744534f1cb21b98dae4735ca8d4f918dedcaa3a3465913b740e61d41be870cfeb27 SHA512 b600d887bdc56e085b1c85a8c7e90b64bdd8213b0566ce0ded9cbffe0987b8f6b2ba0596b81b7e868b8314e420e91a39b2b37e4b5a62880ae5f7a5eb2ca21eef
+EBUILD dotenv-2.7.3.ebuild 1007 BLAKE2B a1fd34da513219ac25438c6dbd1cdf725c71b40e3631190dbd93ccfc948d174fb828b9a594b2e86608e1a5740fc00b991dbabeeda663be672d6abcadecbeac9d SHA512 93a4031113a98c9b3568cbab86a6eb83bda9585752e8db8e30e6b3cd436f5310f8ed1488a40ce2cd82ff3d2fe1a591ec7959034eda897df4371dbdf9d181089c
+EBUILD dotenv-2.7.4.ebuild 1007 BLAKE2B a1fd34da513219ac25438c6dbd1cdf725c71b40e3631190dbd93ccfc948d174fb828b9a594b2e86608e1a5740fc00b991dbabeeda663be672d6abcadecbeac9d SHA512 93a4031113a98c9b3568cbab86a6eb83bda9585752e8db8e30e6b3cd436f5310f8ed1488a40ce2cd82ff3d2fe1a591ec7959034eda897df4371dbdf9d181089c
 MISC metadata.xml 341 BLAKE2B 4cc2ed329e48853a5939f5f7e41d2b6544d3d7d967563da065633826c3fb9d999815e8604fe4a897606f4ffe7be53f3e87c925120961050ce77f1fa573847f5a SHA512 72e21e93099953f1946b486fa8acdbd0b85ed139ef34d4ad9c7e3e89e2924ec598a662f72210d52efdb4cc2ed676962fc6d50c560b4b9c8a4ec849d75d5be2dc
diff --git a/dev-ruby/dotenv/dotenv-2.7.3.ebuild b/dev-ruby/dotenv/dotenv-2.7.3.ebuild
new file mode 100644
index 000000000000..2485712a4bad
--- /dev/null
+++ b/dev-ruby/dotenv/dotenv-2.7.3.ebuild
@@ -0,0 +1,35 @@
+# 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_EXTRADOC="README.md Changelog.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Loads environment variables from .env into ENV"
+HOMEPAGE="https://github.com/bkeepers/dotenv"
+SRC_URI="https://github.com/bkeepers/dotenv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="2"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/spring dev-ruby/rails )"
+
+all_ruby_prepare() {
+	sed -i -e '/:guard/,/end/ s:^:#:' \
+		-e '5igem "rspec", "~> 3.0"' Gemfile || die
+
+	sed -i -e '/rubocop/ s:^:#:' -e 's/git ls-files/find/' dotenv.gemspec || die
+}
+
+each_ruby_prepare() {
+	sed -i -e "s:ruby -v:${RUBY} -v:g" spec/dotenv/parser_spec.rb || die
+}
diff --git a/dev-ruby/dotenv/dotenv-2.7.4.ebuild b/dev-ruby/dotenv/dotenv-2.7.4.ebuild
new file mode 100644
index 000000000000..2485712a4bad
--- /dev/null
+++ b/dev-ruby/dotenv/dotenv-2.7.4.ebuild
@@ -0,0 +1,35 @@
+# 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_EXTRADOC="README.md Changelog.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Loads environment variables from .env into ENV"
+HOMEPAGE="https://github.com/bkeepers/dotenv"
+SRC_URI="https://github.com/bkeepers/dotenv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="2"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/spring dev-ruby/rails )"
+
+all_ruby_prepare() {
+	sed -i -e '/:guard/,/end/ s:^:#:' \
+		-e '5igem "rspec", "~> 3.0"' Gemfile || die
+
+	sed -i -e '/rubocop/ s:^:#:' -e 's/git ls-files/find/' dotenv.gemspec || die
+}
+
+each_ruby_prepare() {
+	sed -i -e "s:ruby -v:${RUBY} -v:g" spec/dotenv/parser_spec.rb || die
+}
diff --git a/dev-ruby/elasticsearch-api/Manifest b/dev-ruby/elasticsearch-api/Manifest
index dfc953695827..33fe1175ae04 100644
--- a/dev-ruby/elasticsearch-api/Manifest
+++ b/dev-ruby/elasticsearch-api/Manifest
@@ -1,9 +1,7 @@
-DIST elasticsearch-ruby-5.0.5.tar.gz 216692 BLAKE2B 4328b40932d6d0bd3608da517b976136ec2b09a760f1b6e377a680d23515fe6a9c605db84725d0598db3da6eb25dd43b5042c20cc6cc7cac33be9d947c9dbf32 SHA512 dd82ec7794753283d2c08d19d60bcc66655c9b8f2a6620f720f84121c57c9b6dc02de67c4a445a998316523f045e13b744b931bf815b64814ea280cef2cb0806
 DIST elasticsearch-ruby-6.1.0.tar.gz 305518 BLAKE2B c58636ab44d692bd3fcceac7a7ca6b03e4b5ac8c2fc94f5d108d34ad8bab140c3432380612f7066dc8370f891aa178a1766feae2bed0f5a6cef0c15d52774885 SHA512 1067de087864bbc7f5ea4c32df3ee3096b6c2ff39b8cde60a2da135b3dfb4d2e23d101a58ae04410067d0130fa680b7b80b98a1fe596898cfb545e29e83376a2
 DIST elasticsearch-ruby-6.3.0.tar.gz 327308 BLAKE2B c9e5c6b1229dfaa30ecf341de9832c992131c7e3a42253747e1577debc0873b4c6428740c00912affa0cc4e668e0f5b78ac484bec926757ac1a8d50eef1bc996 SHA512 26c36198c66c31c59247d5d63ca817cf7942436b524a3480c69c1860ba3933617c75138521a49e14172d9a6ce6086325d685ab5dba22c99a4767dc85f35eb13a
 DIST elasticsearch-ruby-6.3.1.tar.gz 336484 BLAKE2B b97af0262be1512a5db230f2ad66db52cfdba9c613e4fe89b23b35ae9b038978b043c7202784becdaea7710dbe45c40dfd95a95c5997164ea2f1fcc9c5b363d2 SHA512 184c31ebd6c507ceb11273eac950ab9dd168fcbccdd7b0c1956603a2e5e587eab767c2dec8203e90d919189f6f6e27a11d847ff0c42873d65276139db85dafac
 DIST elasticsearch-ruby-6.8.0.tar.gz 336486 BLAKE2B 5bf9538d3710787939a61b411918f3712a8490ed20df1039613f3828a55758e373e56c6794d597a95c04cf610aba8cea1113982b91cde764c96ee454e59cc7b1 SHA512 d75437b04770cac2ac65fb91f0b18cd3beae0248fa2f148aa820da5272093e5b05d00dc4c82c699d7e31b23d7f06ce7727f74eb5a9b0308264f7139e32774c91
-EBUILD elasticsearch-api-5.0.5.ebuild 1133 BLAKE2B 41cda736b76a0122515158b0816d08dc0f5e6a6416772654dd5ba65657f362036c175f4121def0ea69e5ed6763a393ef92fdbb982fb1b5da6623bf1135628e6c SHA512 799d1b843fd684810f79a835fbd2026ae9e813a1e99f4e5d950398589f0ae9f38a420770bda06c314726e8fc0847bb504d3aed3fa23e2485bd31e2136c4aa55e
 EBUILD elasticsearch-api-6.1.0.ebuild 1161 BLAKE2B 2c0ea526d791f49afcf21492e8400588fd55bc312cca0038fe7e8f609f35670c74ebc0f2e10406d36b8c2e6fe2008e2f493900a17bcea91e56902d0d719becf2 SHA512 f5b8cb948946ae443225975813623a182b78262411b2f463a422e2a87b776e0a6fb81987c48a8e10882e48bc578c31ea14695c87f967046514f06fd6bc3a9756
 EBUILD elasticsearch-api-6.3.0.ebuild 1151 BLAKE2B 2a8a26719aefbad975aeece61c818f65d40a0e75fa66b83ba3a9cb0f8cbcfebbe859ceab4e575a93c6204a6551104fc838c5f59fa1362365e1e6d0d39ffb9a5e SHA512 285503ba3f8406053ab5dc18a26133eb80e298853333b67fe254248e3b2b4c9a8f23f1a5611ce5853c3a653c1252a44d7c1a8329bc8766ce47713ff175088c57
 EBUILD elasticsearch-api-6.3.1.ebuild 1472 BLAKE2B b96b03841c716861d2d039e87a78db37a354742e65fc5414cd782856fb6097793c545a91e99dde39268944b613b858f0a861a2e7d8bf19071262c4a3226f09db SHA512 c6a7ceff3c422f029378acd2afd0066fac6b35ac2edd9efd58fa5896d31d5f1275fc43c2db3a2a012fd4ccba01b483f555b4b477cc8eca37fff9869721811744
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-5.0.5.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-5.0.5.ebuild
deleted file mode 100644
index 2ad92c6dd834..000000000000
--- a/dev-ruby/elasticsearch-api/elasticsearch-api-5.0.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-inherit ruby-fakegem
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch-api module"
-HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
-SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/multi_json
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/ansi
-		dev-ruby/elasticsearch-transport
-		dev-ruby/mocha:1.0
-		dev-ruby/pry
-		dev-ruby/shoulda-context
-	)
-"
-
-# Tests need additional modules (at least 'turn') packaged. Then someone
-# should look into running them and so on.
-RESTRICT="test"
-
-RUBY_S=${MY_P}/${PN}
-
-all_ruby_prepare() {
-	# fix to work without git
-	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
-
-	# remove useless dependencies from Rakefile
-	sed -e '/bundler/d' \
-		-e '/require.*cane/,/end/d' \
-		-i Rakefile || die
-}
diff --git a/dev-ruby/elasticsearch-transport/Manifest b/dev-ruby/elasticsearch-transport/Manifest
index e36466ed3cdb..fc73f85d670f 100644
--- a/dev-ruby/elasticsearch-transport/Manifest
+++ b/dev-ruby/elasticsearch-transport/Manifest
@@ -1,9 +1,7 @@
-DIST elasticsearch-ruby-5.0.5.tar.gz 216692 BLAKE2B 4328b40932d6d0bd3608da517b976136ec2b09a760f1b6e377a680d23515fe6a9c605db84725d0598db3da6eb25dd43b5042c20cc6cc7cac33be9d947c9dbf32 SHA512 dd82ec7794753283d2c08d19d60bcc66655c9b8f2a6620f720f84121c57c9b6dc02de67c4a445a998316523f045e13b744b931bf815b64814ea280cef2cb0806
 DIST elasticsearch-ruby-6.1.0.tar.gz 305518 BLAKE2B c58636ab44d692bd3fcceac7a7ca6b03e4b5ac8c2fc94f5d108d34ad8bab140c3432380612f7066dc8370f891aa178a1766feae2bed0f5a6cef0c15d52774885 SHA512 1067de087864bbc7f5ea4c32df3ee3096b6c2ff39b8cde60a2da135b3dfb4d2e23d101a58ae04410067d0130fa680b7b80b98a1fe596898cfb545e29e83376a2
 DIST elasticsearch-ruby-6.3.0.tar.gz 327308 BLAKE2B c9e5c6b1229dfaa30ecf341de9832c992131c7e3a42253747e1577debc0873b4c6428740c00912affa0cc4e668e0f5b78ac484bec926757ac1a8d50eef1bc996 SHA512 26c36198c66c31c59247d5d63ca817cf7942436b524a3480c69c1860ba3933617c75138521a49e14172d9a6ce6086325d685ab5dba22c99a4767dc85f35eb13a
 DIST elasticsearch-ruby-6.3.1.tar.gz 336484 BLAKE2B b97af0262be1512a5db230f2ad66db52cfdba9c613e4fe89b23b35ae9b038978b043c7202784becdaea7710dbe45c40dfd95a95c5997164ea2f1fcc9c5b363d2 SHA512 184c31ebd6c507ceb11273eac950ab9dd168fcbccdd7b0c1956603a2e5e587eab767c2dec8203e90d919189f6f6e27a11d847ff0c42873d65276139db85dafac
 DIST elasticsearch-ruby-6.8.0.tar.gz 336486 BLAKE2B 5bf9538d3710787939a61b411918f3712a8490ed20df1039613f3828a55758e373e56c6794d597a95c04cf610aba8cea1113982b91cde764c96ee454e59cc7b1 SHA512 d75437b04770cac2ac65fb91f0b18cd3beae0248fa2f148aa820da5272093e5b05d00dc4c82c699d7e31b23d7f06ce7727f74eb5a9b0308264f7139e32774c91
-EBUILD elasticsearch-transport-5.0.5.ebuild 1259 BLAKE2B 47800a95fcfc34d1431ce18379199a6c0b4b08941076a1d9b48a05a6a5af099a6f17925dc16cc19da688a77f0b3f3c70a33eee8538ef8b4573adb4ca1beb7c73 SHA512 3f600001e97a6e0833b637010219eb0fae8e01421380af6b10f6be3afec9cfac8f40ca3d8a5e932b9cee152eff6be9e76e5a7083d30bb6b4335fa2c1829572de
 EBUILD elasticsearch-transport-6.1.0.ebuild 1287 BLAKE2B d96821cd23cde49e90692702e98a98c3119c27d1dfd6794a01dfbfec4a553289b5c12b7a2199ff5089030936d3e591d3a4137d28aed3e86cf21b0ac2812640d6 SHA512 57e1a6024da309130f6820efdc4346a7ebbb213be3d9f958978368a27f387220e3edcdb3c960a6c7fa25737a6fdfffc670db037f9c9a1762a4cc55c30b98f2ba
 EBUILD elasticsearch-transport-6.3.0.ebuild 1277 BLAKE2B fc41e8d8e10dd890e5255fc71e5a035a741e4dce0ad9d44e74406defb548b32ea0c483ea23f602a5e2a6d445ba6e3c3fd2bbb34b9bfe6dd34fe8951d6de3a3f6 SHA512 43cf3dd6986e1f4c6fed1417798abb6154b2e269e3279a75bed776a95039691d989ee63fb0a441a34de4d8f4e906163948ec5adf0dc9c7636258b3d787897ec3
 EBUILD elasticsearch-transport-6.3.1.ebuild 1284 BLAKE2B 3288fafe5b6a4cb14dae4055aac032768baa0b344e73aacc266b2f73e4882fe48b38812d3e870bebfdc6fe4644dcf1decafcd9b45ef91776322c06ee4c6203b1 SHA512 3236272c505ada8a99b2ce70ad5fc1609e83e127f5dcf0393565a0443ec0f335e9be2f7dd6456430e434af517253c6d75ce195570a3f384e04ab290c3ac41a84
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-5.0.5.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-5.0.5.ebuild
deleted file mode 100644
index e27df7cddebb..000000000000
--- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-5.0.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_RECIPE_DOC=rdoc
-
-RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
-
-inherit ruby-fakegem
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
-HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
-SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/faraday
-	dev-ruby/multi_json
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/ansi
-		dev-ruby/mocha:1.0
-		dev-ruby/pry
-		dev-ruby/shoulda-context
-		dev-ruby/curb
-		dev-ruby/patron
-	)
-"
-
-RUBY_S=${MY_P}/${PN}
-
-all_ruby_prepare() {
-	# fix to work without git
-	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
-
-	# remove useless dependencies from Rakefile
-	sed -e '/bundler/d' \
-		-e '/require.*cane/,/end/d' \
-		-i Rakefile || die
-
-	# Tweak test setup to only run unit tests since we don't have a live cluster
-	sed -i -e "s/RUBY_VERSION > '1.9'/false/" \
-		-e '/module Elasticsearch/,$ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/elasticsearch/Manifest b/dev-ruby/elasticsearch/Manifest
index 8d09c7bfa71d..766c9698820f 100644
--- a/dev-ruby/elasticsearch/Manifest
+++ b/dev-ruby/elasticsearch/Manifest
@@ -1,9 +1,7 @@
-DIST elasticsearch-ruby-5.0.5.tar.gz 216692 BLAKE2B 4328b40932d6d0bd3608da517b976136ec2b09a760f1b6e377a680d23515fe6a9c605db84725d0598db3da6eb25dd43b5042c20cc6cc7cac33be9d947c9dbf32 SHA512 dd82ec7794753283d2c08d19d60bcc66655c9b8f2a6620f720f84121c57c9b6dc02de67c4a445a998316523f045e13b744b931bf815b64814ea280cef2cb0806
 DIST elasticsearch-ruby-6.1.0.tar.gz 305518 BLAKE2B c58636ab44d692bd3fcceac7a7ca6b03e4b5ac8c2fc94f5d108d34ad8bab140c3432380612f7066dc8370f891aa178a1766feae2bed0f5a6cef0c15d52774885 SHA512 1067de087864bbc7f5ea4c32df3ee3096b6c2ff39b8cde60a2da135b3dfb4d2e23d101a58ae04410067d0130fa680b7b80b98a1fe596898cfb545e29e83376a2
 DIST elasticsearch-ruby-6.3.0.tar.gz 327308 BLAKE2B c9e5c6b1229dfaa30ecf341de9832c992131c7e3a42253747e1577debc0873b4c6428740c00912affa0cc4e668e0f5b78ac484bec926757ac1a8d50eef1bc996 SHA512 26c36198c66c31c59247d5d63ca817cf7942436b524a3480c69c1860ba3933617c75138521a49e14172d9a6ce6086325d685ab5dba22c99a4767dc85f35eb13a
 DIST elasticsearch-ruby-6.3.1.tar.gz 336484 BLAKE2B b97af0262be1512a5db230f2ad66db52cfdba9c613e4fe89b23b35ae9b038978b043c7202784becdaea7710dbe45c40dfd95a95c5997164ea2f1fcc9c5b363d2 SHA512 184c31ebd6c507ceb11273eac950ab9dd168fcbccdd7b0c1956603a2e5e587eab767c2dec8203e90d919189f6f6e27a11d847ff0c42873d65276139db85dafac
 DIST elasticsearch-ruby-6.8.0.tar.gz 336486 BLAKE2B 5bf9538d3710787939a61b411918f3712a8490ed20df1039613f3828a55758e373e56c6794d597a95c04cf610aba8cea1113982b91cde764c96ee454e59cc7b1 SHA512 d75437b04770cac2ac65fb91f0b18cd3beae0248fa2f148aa820da5272093e5b05d00dc4c82c699d7e31b23d7f06ce7727f74eb5a9b0308264f7139e32774c91
-EBUILD elasticsearch-5.0.5.ebuild 1170 BLAKE2B 22d0fc7196747dd85537cb2a3d868e0a69892c68111f121d171b9cc776246f17914706610c1d456967f099c6a28444f463dccdfc9cc3b87f1c429a061609eadc SHA512 82c3fff22a34b7cef89fce10b4ee9f4dee271fc2cb72d91581fea8970275f7392aeccc70485fc6b5c2b406ead47eb9b66435530e26176210866e7d199a46d6c0
 EBUILD elasticsearch-6.1.0.ebuild 1212 BLAKE2B 48ae9f91f475ce090b78e392d311df4763b433ee80f3c5cc4f20b730c042850aa9cfe9f69ef68f22697f460b73e5eb5769bdbb188c025912152a70b9669f5996 SHA512 911f5178d30323b89c158a5cdbe01eba7f8995aa65a8f74a322012206b570b17b4e0968ac9817fd1c672f292a8db9ac6cda1e45c08dad77824d3617b5f0d08f8
 EBUILD elasticsearch-6.3.0.ebuild 1202 BLAKE2B 3116cf81bb808fff3153f2261d5455e1b798320222f023b70a24c7b35cc4fffdd3282de47c1d7e51373ef484c3e626c388770c311f91a3d40b8ccd6e463faa6b SHA512 9df5c78d491525b87f22fad6bbcac2ec41dcfc7396781619eedc701c3b10cf1fb8be57261d1b35d00abd247eb85a401a3683f58cd9e276792584a86e6998055c
 EBUILD elasticsearch-6.3.1.ebuild 1209 BLAKE2B 1774fc89a0b925b8ea7c9fb971cd439fffa815bdf701fb9584ef409314d0a5cd3dff09ae7730b6ccfa6f5a857f3108f7a8292d3a3b6f75f21eb1af1e74abdf69 SHA512 977c26438353872f490b0ca44c2387e5f3b0a09ada828b70d4779ec648543e8fcaf8465b9f205aca10af22560321efc801317f42a2460b1494cac68017d42299
diff --git a/dev-ruby/elasticsearch/elasticsearch-5.0.5.ebuild b/dev-ruby/elasticsearch/elasticsearch-5.0.5.ebuild
deleted file mode 100644
index 77d7d2221eee..000000000000
--- a/dev-ruby/elasticsearch/elasticsearch-5.0.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-inherit ruby-fakegem
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch module"
-HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
-SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/elasticsearch-api
-	dev-ruby/elasticsearch-transport
-"
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/ansi
-		dev-ruby/elasticsearch-transport
-		dev-ruby/mocha:1.0
-		dev-ruby/pry
-		dev-ruby/shoulda-context
-	)
-"
-
-# Tests need additional modules (at least 'turn') packaged. Then someone
-# should look into running them and so on.
-RESTRICT="test"
-
-RUBY_S=${MY_P}/${PN}
-
-all_ruby_prepare() {
-	# fix to work without git
-	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
-
-	# remove useless dependencies from Rakefile
-	sed -e '/bundler/d' \
-		-e '/require.*cane/,/end/d' \
-		-i Rakefile || die
-}
diff --git a/dev-ruby/equatable/Manifest b/dev-ruby/equatable/Manifest
index 7eeef2e4be1d..753972681107 100644
--- a/dev-ruby/equatable/Manifest
+++ b/dev-ruby/equatable/Manifest
@@ -1,5 +1,7 @@
 DIST equatable-0.5.0.gem 10240 BLAKE2B cbc8b0250cba6a89be0205d585a25a0f9c050cee7e1803a8725259a18b4a9b1ed62771ff9407a7b702c293c55de7c8c3000d5c29f445f230c8acbc0a0f7be384 SHA512 968c5497d3d18ec899b34311965421bd3c53a4d55f56ee7594bab1db3ce320e245890b007b1412ea434fc15ad7be2ec6c345068c4aa3cf74e07c146f76039478
 DIST equatable-0.6.0.gem 10752 BLAKE2B 834c39fcd9a3156261ce16f6a24fa952175509cf75d28cb03b7acdab58948388b5ddad034841c28b2162734d74a54592a35b971f4c05d9c884808530157ba1f5 SHA512 43aa5021a9f3bf0a730e4e5aa45dd0dd3c868d713268617f36c4ed17b66775d7f27bd8bdffe4785a9d44da94e7f49feefa991f50f38c1a34868705aa4a92d4e9
+DIST equatable-0.6.1.gem 10752 BLAKE2B f544d330fd72c12c81757ca1220f209126e9200b0309d7720005c720ad7f89288cb40d3b7bca004f624f162bfebedef8341997e94cdf5f51e6fe86fa2ab0b0e1 SHA512 442a6c9afd31ec2c41f3802703515827cb8d100bea3932c1fadeb036bb96a045883050712f480ebe4f7ea9bda5dab335b0f0d9dcc90a42bf45ce6bcc504fe0d4
 EBUILD equatable-0.5.0.ebuild 460 BLAKE2B 2ea7ea0b8eccd704d937c17c3d95419f6ac862ef8eeefcae2e4ecc4940fe499f18fa7ee80a6997efb916ba1491f43974401a2afb0abd04855fc34e6cc784bf23 SHA512 b2811bcb6ba603e95dc6b65d7671f368a21a2ac9028b647b54a687823ad8f0fd97b17b22a4f978e66dd995627d51bda7b539bc9066b92cf7a7be7d1ed1e89242
 EBUILD equatable-0.6.0.ebuild 522 BLAKE2B 61b741dedbec095dca48e7f6f8a43e03a2a66e84cede6ba3c65c8a7e87413feae2f0703edcedf51a5efecd61627da77ef2d4fe291fc500711399fd9cb8cccdec SHA512 f62e207b3071d5b79a59a4d57556d5a45fd641f25469457af9caad4d5addab619e9c83449c375bf830163e81802d52ca107f6725fade95539564debff1e6741b
+EBUILD equatable-0.6.1.ebuild 522 BLAKE2B 61b741dedbec095dca48e7f6f8a43e03a2a66e84cede6ba3c65c8a7e87413feae2f0703edcedf51a5efecd61627da77ef2d4fe291fc500711399fd9cb8cccdec SHA512 f62e207b3071d5b79a59a4d57556d5a45fd641f25469457af9caad4d5addab619e9c83449c375bf830163e81802d52ca107f6725fade95539564debff1e6741b
 MISC metadata.xml 337 BLAKE2B f320ff62e89cec84137a16e526e5407f2fa1580a410b03bf39ac7158eac56c0cf3fc466e85b88ee604ad7905ab58dc0a8678d162f5a35d64a94af5622e6a0bb1 SHA512 f236bbad502d70c2ad5c8eb7b596ff903b001461d1f59ed2f01d73455a152482a8cbc2b01c1bd88eb80b78864d4caf354a1b797b95410f9868f1a57aea89dfff
diff --git a/dev-ruby/equatable/equatable-0.6.1.ebuild b/dev-ruby/equatable/equatable-0.6.1.ebuild
new file mode 100644
index 000000000000..b5520ce3dab7
--- /dev/null
+++ b/dev-ruby/equatable/equatable-0.6.1.ebuild
@@ -0,0 +1,24 @@
+# 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_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows ruby objects to implement equality comparison and inspection methods"
+HOMEPAGE="https://github.com/piotrmurach/equatable"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	echo "-rspec_helper" > .rspec || die
+}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 27b1de59c2c5..ba466a98d3f4 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -3,11 +3,13 @@ DIST facter-3.12.3.tar.gz 391836 BLAKE2B 60ec23ab9df0d6ca069608c897949be8aaf719b
 DIST facter-3.12.4.tar.gz 392011 BLAKE2B 5e3d7ce65eb6c35cddba70b2b397cdc9c591a6c420a58a04ecddabdc537f0f799c510d14bba436aadbdce9c9932a28b6b36b893526a7727c8017c79827a97b9a SHA512 952bf1ac4c67bfb5170d31bca471c317211523804a14bd39f34b4fd0730586b3764499200b5c816d4b6bd0338482ea8bd83cedc5fe670db38ea6ec144b6e2e94
 DIST facter-3.13.0.tar.gz 391833 BLAKE2B 8fabb2ebb438975564a770657866c6ac8ac77394c4e3cdb635eae78a744a097ef5eabb4307092cd2b9cf12b4db70623b18b3ca1e2c9e1a248825a2bf53b76565 SHA512 f3c39239d7b0708bd98a3e5de5d5623406edf5e60b6321de1d4ec7c8cf903f3ec777640b9301979f2316e90e97e2aa0a80dc71975239dc715aaba61ec7cc37de
 DIST facter-3.13.2.tar.gz 392065 BLAKE2B ae06a1a44de25f55b2eb84483a7abc70433b9437a00724f239a908846148f20bdb3e208d10256e6ddeb7d609ee9eb1c572e14dad84d8640fee147c34cb1bf184 SHA512 c7d1d0958720e0884b06eccf6d7fca64d2c8462c1747bbfbfe5df957ad009c3e930fe5eee80d42c985ea9f59e2b8b7d0a34a194a7e1c713a043bbee9a3b89df3
+DIST facter-3.14.1.tar.gz 393548 BLAKE2B a3f61df9a7a302948fa8579c451b5cdb973a3e8b92109582b1a6046c68e5212b675f9310012409194f933574d004a7a3fbed1dc0e20576a2ee759feadeac54ee SHA512 b3f4cbaffb2c70423fd9d5eca7afdee35f92f3a3445fb78996258471a3dc3881b1797bed5ee90aa66b62b0e9d1b979dbc05b6e169499d4f1a9e61f002118476d
 DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
 EBUILD facter-3.12.3.ebuild 2453 BLAKE2B 84fcaf6ca2106c2f47246bebd12805e4ad7591c81a7714c405e08229acb8cadb54ba5b7886a724836eae739b921ce93a1e13dacd73185dc639962dd05beb38e3 SHA512 cf4880ee52cee45c830b0aee96aec7654e339b0aee5fd16428e3ed2c7e7a4c9d625e0433f61b0954da95a0ddb04011b69ad14cb3bf18fbb4502c268f19409307
 EBUILD facter-3.12.4.ebuild 2453 BLAKE2B 84fcaf6ca2106c2f47246bebd12805e4ad7591c81a7714c405e08229acb8cadb54ba5b7886a724836eae739b921ce93a1e13dacd73185dc639962dd05beb38e3 SHA512 cf4880ee52cee45c830b0aee96aec7654e339b0aee5fd16428e3ed2c7e7a4c9d625e0433f61b0954da95a0ddb04011b69ad14cb3bf18fbb4502c268f19409307
 EBUILD facter-3.13.0.ebuild 2453 BLAKE2B 84fcaf6ca2106c2f47246bebd12805e4ad7591c81a7714c405e08229acb8cadb54ba5b7886a724836eae739b921ce93a1e13dacd73185dc639962dd05beb38e3 SHA512 cf4880ee52cee45c830b0aee96aec7654e339b0aee5fd16428e3ed2c7e7a4c9d625e0433f61b0954da95a0ddb04011b69ad14cb3bf18fbb4502c268f19409307
 EBUILD facter-3.13.2-r1.ebuild 2460 BLAKE2B c61a7e483fd07cfa046ef307d0145be401ba889ed567bba879a54c6514b9441933db6511368f1d50e57819154dcadca5eb9998d31ef38b27eb532ce3f645fc4b SHA512 93a7ab3eec9edf826eb7086e1bbd961dede5a05e241c4a871b6bf452d14a8fb008c0f846bdd83f6b5ea85f9770b3a0bfbbcdd885275e3fd72f91b5b6ff711c67
+EBUILD facter-3.14.1.ebuild 2462 BLAKE2B 70d6b169860091d8949feccd812b6865a1b51013d63282e35e6cd686b9da07bb72685e9b2e128b3ec621147da1b82f22e5f05b127fb4a2c29050cd612458a8c4 SHA512 f320a8e6efc524d83d348d2206a10941c1dd2b6ea878569f24d0a408d5149bec22fa00ed49483822c6a034d5b29ec6d68758c29e0eecb5220637c0acfa2e6df1
 EBUILD facter-3.9.2-r1.ebuild 2105 BLAKE2B e859a3a4218ce492f0af48fcedbd1dad637abff814544e2d224bf1b40f5f7af2a8fd7defa350046671aa1bb47abc0e0114fdeb786735030cdc3b4e4f43d65660 SHA512 ed097468f444fc3c23a8cf9dceae6bd49c33090e7f738c7564f11743652c3085195e427ad10cd9fb76646049f3264264030f957f28fd500c5a637bdb6c838111
 EBUILD facter-9999.ebuild 2418 BLAKE2B 4bf8b77b1b66039da3d4bfa50e8bdf829f5443c7f578043b044f21c716d4103e10f22ccf1c83014f3c4bc7674232ae1df14a7de4eba5e99f5eb9b5da96a39041 SHA512 2709eeaa36352957bc4c958ee4441e6b6004a6d849653f2765b2989a7cb6d4f4e8a8ac904d76d6746954d3ab2b4e8b98e93fcab3fa14600c0e2f7bf26bf093b0
 MISC metadata.xml 539 BLAKE2B 989d6bb49686504b47720be6119802f06f998514c53261bb71cb0082cccbd22361195122c101e319ef985f6d5d39d84bb7a6409d77b4735c26e6b87856770a79 SHA512 92486b6b382d065c39999f271b07a915ac6f80fba225b0c1deee86f73a0143d47e8fd986e2ad6a82ae20a9cdd59ece63b623c6a2ec9d10e178c1fbc54f5381a5
diff --git a/dev-ruby/facter/facter-3.14.1.ebuild b/dev-ruby/facter/facter-3.14.1.ebuild
new file mode 100644
index 000000000000..41229ebb2d20
--- /dev/null
+++ b/dev-ruby/facter/facter-3.14.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+# git-r3 goes after ruby-ng so that it overrides src_unpack properly
+inherit cmake-utils eutils multilib ruby-ng
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="debug test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+BDEPEND="
+	>=sys-devel/gcc-4.8:*
+	dev-cpp/cpp-hocon"
+COMMON_DEPEND="
+	>=dev-libs/leatherman-1.0.0:=
+	dev-libs/openssl:0=
+	sys-apps/util-linux
+	app-emulation/virt-what
+	net-misc/curl
+	>=dev-libs/boost-1.54:=[nls]
+	>=dev-cpp/yaml-cpp-0.5.1
+	!<app-admin/puppet-4.0.0"
+
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${BDEPEND}
+	${COMMON_DEPEND}"
+
+# restore ${S} and override all phases exported by ruby-ng.eclass
+S="${WORKDIR}/${P}"
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	# be explicit about the version of rspec we test with
+	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
+		CMakeLists.txt || die
+	# be more lenient for software versions for tests
+	sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \
+		-e '/rspec/ s/2.11.0/2.11/' \
+		-e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
+	# patches
+	default
+	cmake-utils_src_prepare
+}
+
+each_ruby_configure() {
+	# hack for correct calculation of relative path from facter.rb to
+	# libfacter.so
+	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
+}
+
+src_configure() {
+	ruby-ng_src_configure
+
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
+		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
+	)
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	addpredict /proc/self/oom_score_adj
+	cmake-utils_src_compile
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+each_ruby_install() {
+	doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
+src_install() {
+	cmake-utils_src_install
+	ruby-ng_src_install
+}
diff --git a/dev-ruby/fast_xs/Manifest b/dev-ruby/fast_xs/Manifest
index 09cdb33236e3..aa385e14841b 100644
--- a/dev-ruby/fast_xs/Manifest
+++ b/dev-ruby/fast_xs/Manifest
@@ -1,4 +1,4 @@
 AUX fast_xs-0.8.0+ruby-1.9.patch 1090 BLAKE2B b5b0b2db3e19adc57e85141b893cdfbed8844def9ad39cd7ba5ade46a5ae73201498782c0093e25e075bd6c2577a895715ba82a87cc14327492410558442d194 SHA512 0c4f4b03db6ed70381b9aa7e671038206648a2c88211bb7d015f552e2114015a7cb749678670ee876aa568505ac3df42535f839367cfd1fc52ba6674429940a5
 DIST fast_xs-0.8.0.gem 22016 BLAKE2B b24e65c31623e86ac8ab8b5a442565083bd047e5740aeae74d74e82c09770a8149853ad021ea6c6c036d411e8f299f4a531d78b0b3314ed5bf32d7f8b9fcf697 SHA512 55fc2704fab020f03b1ce138d1631dd5ad73a8601dcd95989a59c7cccb490c70b4e1af59fb8b009bfa0899f2c23feb42cc3068e243cd539ba1cb01a9f7bc573b
-EBUILD fast_xs-0.8.0-r2.ebuild 1306 BLAKE2B de4d28e44d34c69e00f5f694358d95cfabebd8b82cbd4b20214f851572a7c249ab6a89cdf57ce9a13ecba1db8678769b0771a0086135b17c19549513dec2d609 SHA512 c4739f18efd1696aa5f8b7a5f8d7c1f6ef0e528f13e74579adb0b6238419bd4780d9f892aba593091e0e0db31cc1848d104a61e24f6c256d7a4ddf388bf24e8a
+EBUILD fast_xs-0.8.0-r2.ebuild 1330 BLAKE2B ec27fbce49e973cbc8064d8645d88cc158008cf77767f3c472d41fa9f70f9fd8dabdc8753b4832e8b30455418c351ee21f129d26cbf1df7807f7471426203a97 SHA512 5c7b2323ab454873e8c2c252371f7c1482e91edf43ac543ed89b1a57da024afe14d12a72488e9ec4b619c99e5901dbfb9c680b936cc294441ebcd6a630ed279f
 MISC metadata.xml 344 BLAKE2B 606e2ea9e00823abb5e87d45ac41c0ebfe100de30901b120d74b90966d50c525b068796591c3aa7be7a8767f98b2e9d93c2a1b556efc861fa5d6b29b8955c36e SHA512 4c84dc383d13d166f199d39a7a9cea86063392034a467b0aeec29a06c2b70949785662c0bd9b0dc60884cab74455d92f113613519708889f64e11a6d4bbc53fc
diff --git a/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild b/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
index 1f051c86dce3..c8d176efc958 100644
--- a/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
+++ b/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/brianmario/fast_xs"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/rack )"
diff --git a/dev-ruby/filesize/Manifest b/dev-ruby/filesize/Manifest
index c6223a7c63f4..132226c29f7b 100644
--- a/dev-ruby/filesize/Manifest
+++ b/dev-ruby/filesize/Manifest
@@ -1,5 +1,3 @@
-DIST filesize-0.1.1.gem 8192 BLAKE2B cf2edeeb5b0b1954c6a2233dbf43356c639f611ec289b18f73043f17b26b57611c81da1707ee4c6bb0ad65bfafbf9e9212398af184f3eafd53b290d70b80129b SHA512 2c7e94feb2433c9a1c1545e817616a7551f5d02f441b2564d96499b8fea0e47b74843b3d06d959273fc000800eea87bb7bc1c643369a4d724b8ba19b53de6283
 DIST filesize-0.2.0.gem 8192 BLAKE2B dddf9a19712d03bed55d234f89a4d2ec9afb713ea8d2f63ad8cf9c1daf6ee9d8e6a7219dcd7c76b19a548e3d58ed4712b4c953ee1c573706ae010042c81c41d2 SHA512 87d13278e62fc6ff7ef08f9a287951a1ac3f502b69e1c3b9f5579971a2ad167875f4028a1f51f24f3bb54de38f7cb0e735ab3763bf8774ceeda68c8d3f8de42a
-EBUILD filesize-0.1.1.ebuild 474 BLAKE2B 47b009cd38adf8f2915a33ebd0876bae852d6a105702e7546beec1cba547e620f6efd198b07cd5a6de0941a1995fa98983a7e7efaa2bc488ba2889add4f95569 SHA512 2a0002ea38461ff2cad804f9b811dd8e5fe9e773abdbcfb3f133035bae28c071299732bd48ac42c3b84ea23bee6fbe68d07588f13d7942c9351588a297cfb6ea
 EBUILD filesize-0.2.0.ebuild 478 BLAKE2B 9bbe867b65bf39eada1ac2ac4c6b7ac94e5f34cd4a6f287f4017958355c69bf32d4ceaf59c8155973a676d3dadf3493bdd626810561903a82381d50df3eece8e SHA512 afada36cb7cfb252f109a4c3e386dba2642440036182de10ea423bfa57de87d8a61c2909fb17653c5a52ae341293faec1db0d8c5fad1e4afdab5bbbe85aa68a5
 MISC metadata.xml 339 BLAKE2B 2b3c4c1ca6967c5239e5ec31066d83688ed6e39f275a7854a719a43abb5b5b727eaed7871aad811210a3f28c8a9feaeae733e20004312b3b181e8a0c083d49d2 SHA512 c9d62aa7db2c89e1e32501ea24446828019ee082219f74dba9206b3aacf3bf2fa07d1035997ce1209e6e8f10a06b7661d5cc7fa6acd10f80367a6938119f3cdc
diff --git a/dev-ruby/filesize/filesize-0.1.1.ebuild b/dev-ruby/filesize/filesize-0.1.1.ebuild
deleted file mode 100644
index d0230b3fd310..000000000000
--- a/dev-ruby/filesize/filesize-0.1.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="small ruby class for handling filesizes with both the SI and binary prefixes"
-HOMEPAGE="https://github.com/dominikh/filesize"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index a989ecdd0af1..46e7373b34c2 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -4,7 +4,7 @@ DIST haml-5.1.0.tar.gz 125693 BLAKE2B 0a2e9044e7468a93b5fa62adc77131a67e79fe3701
 DIST haml-5.1.1.tar.gz 125902 BLAKE2B b8564dca6a381038dae1b737b6f4a51089b96f618d684f43db6947bc738e06b073aa17241b406ed06fea48fda9c7ec759149829a5727f8da3df21da3cce22318 SHA512 fdc01762280cbece243d1ac1a3c8b6b484e3b01fcb2ff80df591d172ec6aed7240736095aa5a09149049ebb54cf24af32706772a6090c3171c84ccb069d12826
 EBUILD haml-4.0.7-r1.ebuild 1246 BLAKE2B a1879eb558ab35464526fafa41d70172a035c9c0a62642eb06f255160b33f311fd656a9b656b734c489006640845b1622c83e09f5d0af4bfc5e241264d033d54 SHA512 3c0a7b865749cb14df8f4a5e074b17a229287d76da4536211f2795c7fb61ad5a027cfa88309b80c9db7f2726896c7ffcd877b7b136fdcef3f2aa9d964f02c934
 EBUILD haml-4.0.7-r2.ebuild 1276 BLAKE2B 3445708f362dbd6d8d6f63a5552fd30fe933b0111554764f5116d050d090809954901bd2fb83aada132b3ff6d4862226b3a53ca6dd4138855ecaa033b217350b SHA512 6877bef9aa2741465aaedc9feb531aca9f12e986de40fbf200661980c262e6c27fa691980bc8b0c40aca1175da747f4fa0ef7d489a5572f6523b6bcce3a04650
-EBUILD haml-4.0.7-r3.ebuild 1124 BLAKE2B 9c900d645a5837b8ace67948e23020182f81b3531335bedd18a11005612a3aace012904db34c079b1f69e68728afd24c4be3e54d71827e6fa021c687775efd57 SHA512 c7bf5d9c5503454217a4da4a9dd0cc34d048a5ad21b0db7771f48313cb2cb5bb2b9618823f8adb6e95fbf3b56730ab064c67019cb8e86458a644c2ce4a8b8ee3
+EBUILD haml-4.0.7-r3.ebuild 1119 BLAKE2B f532a7e3ea234d450ccd1637fa65041d1dc3ec26cd595d1f6eadfbee955083633d89b6ff6c99a0049b455d79e95bc947c755017f1ce243ab3ab4ff44121a71cf SHA512 b42eb97edf5dd9d3d06f06f11d90243635bf69acd3fa1f5927b2bbb2553e0127ab3d5202911a051608eca5b2be7ad6a92b6a3a47da0593717981b1bd1f6ffb46
 EBUILD haml-5.0.4.ebuild 1613 BLAKE2B 917d8a40a68f551bf7e7c20aa317810c86e81788f8cbc15fe478b6af058c9c536d98c7744a32210bd88c1e249d1550269fafdb11c65fae0c129eb2519ce3dc65 SHA512 439c4eea3f128b9c2282b6c41e0af0426bf3853feebf126f09b752189db722e7a07d2b81b1a57bf8993960e5d833907164725b4f0462dc013aba746bef100764
 EBUILD haml-5.1.0.ebuild 1606 BLAKE2B 8f6e72bd9ce8cfe462a532968bed9c3e75c140700614be4c05173cffff13fbd034f0cd5acb37406a4d110b517c35bc62bb0b3c5dda605a5dd55da5f4b94056f3 SHA512 7d89ca2ff45bb0a9245e9f280a75573221dc7138dfe2b065cf60d5a54030cf14d6a8b91b6f43b679a730b492d4469276bd6838a700c8583a5b287e0f9b14ad85
 EBUILD haml-5.1.1.ebuild 1606 BLAKE2B 8f6e72bd9ce8cfe462a532968bed9c3e75c140700614be4c05173cffff13fbd034f0cd5acb37406a4d110b517c35bc62bb0b3c5dda605a5dd55da5f4b94056f3 SHA512 7d89ca2ff45bb0a9245e9f280a75573221dc7138dfe2b065cf60d5a54030cf14d6a8b91b6f43b679a730b492d4469276bd6838a700c8583a5b287e0f9b14ad85
diff --git a/dev-ruby/haml/haml-4.0.7-r3.ebuild b/dev-ruby/haml/haml-4.0.7-r3.ebuild
index ee0885991add..88b41190b467 100644
--- a/dev-ruby/haml/haml-4.0.7-r3.ebuild
+++ b/dev-ruby/haml/haml-4.0.7-r3.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://haml-lang.com/"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="doc test"
 
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index 97f278e09fc1..9f1f25defea3 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -2,19 +2,9 @@ AUX i18n-0.7.0-frozen-classes.patch 1126 BLAKE2B 4cfaca964ed676d4b35b7e2aadeec36
 DIST i18n-0.7.0.tar.gz 57647 BLAKE2B 50ea36ec616b90a261151cce47c98250e85b25ae75f90eb52ea01e8bb7e0c6288abb9055a4f80a199deb93c9ca66efd1ad568950d3f505206e0ba9ee9cdb8bc6 SHA512 8824feb3fb99bba759963d2ae34555f27b85dbac3d3001168471a27e47fc805e5ffe5c3b4e10d6ca4b2e2524ec16c98260b981ef504f274aab93f912a57d2e14
 DIST i18n-0.9.5.tar.gz 61494 BLAKE2B 2a7bb401d5e75022ba6c40c6ee08809bc8728fe9aa22f308c4d532e6c042df57970b7fbfa574494072d8e5d0e125a01498c1964780d2ad9588b0a57da299a520 SHA512 356ce1290b207ce1b3dbed4d0ae542d027e74c43f453359ebf401755a5a55fd1fd815a2f046a634246e41f54c5360174dac1076be9cb7bf82f893f0dafdbd4bb
 DIST i18n-1.0.1.tar.gz 61536 BLAKE2B d439410004511f90e010beb7ab90029367e9ddb876c2215e101fa9a3385c0420a774586ec626136957dedd66c8c7b3b9ddcc6570e3a7075bbd5a90e3508ddea3 SHA512 1d0e05e04318e31d35d19c1af3b6d3aaef3d45df9b2868b65fef9aa3628c9502c6f8fca4beb52aa8c7c914c46ff159da489bc2ccac69013808459e709358b4ca
-DIST i18n-1.1.1.tar.gz 61797 BLAKE2B 3ba842d195075f02fd46be4e9b69250c93007da0528d88446b662006682130ac31a7d00aaabe6081f2cb1df0b415f1610ae26a3bbeb446029165549f59d87697 SHA512 7fff47ab8aeab3e03546af4c4b7738ccaca2fb3fb7b16e3cb0addd3ec57091c469a95bf4848dd01dbc5f831bee280c4ec15e6d334ce1578e4b3ed27f98077111
-DIST i18n-1.2.0.tar.gz 64271 BLAKE2B 9d8dc9a8187fb69317af6835ac2ee98219f662f6542be5bb96d678ebc63d5a57b33988d1cd435213c9d79cb6886be491c54e8624c481d56a2de91e8ac094a082 SHA512 9952fba2f923ecb76c736356599c9f205ed754283d07ac371ee2016633621187124a102b84d3f9431d8b074e9042377237846c512df431a02e86bd9c50c09c57
-DIST i18n-1.3.0.tar.gz 64414 BLAKE2B 8ef3da9b2513ec7c0c10e04e3096361fac4b874f2591ba6354be09999fe3fe924867a1741eacaf967fbfa263588abbe4bf2daece1635797f3dd8bc489e19e2b5 SHA512 08884f4e415e71794969a87f326edc1bce5d7cba9a43413f8c24a375fd7378dd40e15a7d161021ea4af8d5c6e692595b86da9793e910f99dbe51e166d404491e
-DIST i18n-1.5.2.tar.gz 64086 BLAKE2B 8c50fd40a5d8f103e218bc47d15b1c6a51336c1b9340f474a35c178d84e9d0198151c5643cd6416b4e007c33c02de4d011acb40b1b02d6a238563a0a669c1044 SHA512 438145abed34b27af26dc513d0dc30e32412ace3a057cf14a8bc8cb64734ac531bb0a8b7512372faed995fff8bce7a8dd4e44ee29560704646ab35d46d58db3c
-DIST i18n-1.5.3.tar.gz 64156 BLAKE2B ba8c0806d38677229c87956e771ea646205a44553d5e09ec876f5eac35446f43e61c27f7d2b69aff429891551609b23eb169ee95623f75502a9d3bc1fdbe8b50 SHA512 c10f2fed363d390c4fb8a2792e1d8d6f56b72fd96a36b0a6ab837acbcb10ba313b7bdc6f4887d7096d396d25d8ae306091ead84cc95c94d2da9791c2debb30ac
 DIST i18n-1.6.0.tar.gz 64957 BLAKE2B c74bc8f712939ecf4a8850b047180dd6390494da778567de73a225c40a28dce7a12e63041ca90b3ac0ade9bb88be36e26a00404afe74abb8e0ca686084ac4952 SHA512 653a5368618fb938f5663edb79178ddff24fce1549d5085d5302a40ff82124ce64ffdef6c5626f07731c7cd617665906a741e2581d79c5cc161301b69cf66b0e
 EBUILD i18n-0.7.0-r3.ebuild 1625 BLAKE2B 047cb266a12b698343260e0ff2d2448a95005493672a1e2bad7423c8c69b08c02b596d633864db0fe301c8afb1e82031feee602765bf1c97ee7472e60c72c0f1 SHA512 6427eac2d7f85ebd7d1060d565899a976da63229cf3567b01fdf0357e22b5cc185c6e200b0d2fe219589b031c5377706136dbec7d64c1ba8f5559014f687c91a
 EBUILD i18n-0.9.5-r1.ebuild 1465 BLAKE2B 4a0c8c91473c3ff64da3d1adabac1c6d7d07bdf1e5b4fd9ae4a38b0e69e06f6c0518ac1af41159e511d7391269665187623f08d80ded2fe541774c3c2fee2eb1 SHA512 5ec9410d7f944caae29a0ffd24da13f277a6a08a6dc2d2d8fbdb390dfd3b612bfad94fb62edae952b57348ddfff2ad2f1167aa6e6e1197f530509bfd13d975b8
 EBUILD i18n-1.0.1-r1.ebuild 1500 BLAKE2B ae1e7006df7e28a816aea7265deb8df0789832a216ef0ae9250ecad4820b77ec6d9a3685973365661373c4dd62d37a0e6a8c2e74b3c92918e97441ff60dfc0ea SHA512 3940e1b90a6f389655942b982857371bfa63d32fd8aeef999b7b83dd90e76ad65b1aee86924d678522957dfa17ebf820f71633e883171b6e2beb74c044cb2d35
-EBUILD i18n-1.1.1.ebuild 1439 BLAKE2B 4d045839b7f25f38878b3b5c98d45f8c1e37b2b2fb046ca152378e8b5b622ee0a764e0576ba6cbeb8bf6a35f64760770528fb420f5187effdbc7648e6047aa47 SHA512 4451f13217a20a737191bbd72ef5cb469e749629b66eef875334b8a133d4b6c91f67f4c36b037cbe2529b2ab3032bec04b68e178d6d49388440c29589128aa78
-EBUILD i18n-1.2.0.ebuild 1443 BLAKE2B e6aa3a95957deedb623e02be35b0d4904cef29561472602f1b0f85a7e7b383319889c7f387100b0eca19b7556da86fe2c8d071960a7b5e2fe45d6a437c20d13a SHA512 b05679b5da8b8a2bdd08a6b75c432cd5b6fb9be0b4d63f091b1368133e5cd615cb9025c0a81f21736b91614849e31c3ce8ba3fa2b43ffb4b20fa99fdeb596c76
-EBUILD i18n-1.3.0.ebuild 1443 BLAKE2B e6aa3a95957deedb623e02be35b0d4904cef29561472602f1b0f85a7e7b383319889c7f387100b0eca19b7556da86fe2c8d071960a7b5e2fe45d6a437c20d13a SHA512 b05679b5da8b8a2bdd08a6b75c432cd5b6fb9be0b4d63f091b1368133e5cd615cb9025c0a81f21736b91614849e31c3ce8ba3fa2b43ffb4b20fa99fdeb596c76
-EBUILD i18n-1.5.2.ebuild 1539 BLAKE2B 207a9bec8f7a74103a01350c43a359d5f5127b74723e74466bb35a2682b8aeaac2b0e9cf0d86013a98dbb1639e949c1471daa92f7a4f3e63e2802ff7ebd3aade SHA512 17a25261a24841589c83f1dab871816ef9b572fd50ab923dcebfced55295817b235ab6bf592264c002b19e2794cca4b973d4a3afb9c489a006d3c0ee9783a847
-EBUILD i18n-1.5.3.ebuild 1539 BLAKE2B 207a9bec8f7a74103a01350c43a359d5f5127b74723e74466bb35a2682b8aeaac2b0e9cf0d86013a98dbb1639e949c1471daa92f7a4f3e63e2802ff7ebd3aade SHA512 17a25261a24841589c83f1dab871816ef9b572fd50ab923dcebfced55295817b235ab6bf592264c002b19e2794cca4b973d4a3afb9c489a006d3c0ee9783a847
-EBUILD i18n-1.6.0.ebuild 1546 BLAKE2B 3f176c4ccad5a81b82261ed540e2bfc91a1b6f6a8c98adf131e3cf8fc469b89e8f3ef7fceb3a4761eec025c4896ceb11ac7cc18b22569fa9f02f6815eb4a868d SHA512 984dd31dbdeccadc835e05d697f28943d20a3658aa37fa2cfd62f7b0ef657e13a38b626023441e0b0a261f7e46496701b3f05f95a0fa91b3717fc12eb23d1bf4
+EBUILD i18n-1.6.0.ebuild 1545 BLAKE2B 67ef60ced1658c425b0ee9db6f80e5aef5e0ed84294b4f286235c793abd78f552276b636fb3dabc2f81142226729f8930d307b22957873e07f0c78ddd30cc8cd SHA512 de1abcc30c0ced6fd174d80ff62084b0b5e3ec943e3b92b65e6a0b932e6d86b417c507e2bc3ceea7d75ff65a1fa8792e55405883a597bc3d304f2d3376de3821
 MISC metadata.xml 340 BLAKE2B fd50e1569f22c70ba423cfd181cdfbad5348aed4ffc751ff04d38db0e3c64ec0e3d7501fd134401337337549509f7501a23e36b8a9bdd99a18a374885f8c8596 SHA512 09bf74eefe2371ac635fe302efe1b928e37cf0e1da0979f629085f357bc3e93ea87407781ad172139166f21cb979dbbc7e1bec013f8fe0a760cbbe94ab23ac64
diff --git a/dev-ruby/i18n/i18n-1.1.1.ebuild b/dev-ruby/i18n/i18n-1.1.1.ebuild
deleted file mode 100644
index 0601ded3a6c8..000000000000
--- a/dev-ruby/i18n/i18n-1.1.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-4.2
-	dev-ruby/bundler
-	>=dev-ruby/mocha-0.13
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby25)
-			versions="5.1"
-			;;
-		*ruby23|*ruby24)
-			versions="4.2 5.0 5.1"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.2.0.ebuild b/dev-ruby/i18n/i18n-1.2.0.ebuild
deleted file mode 100644
index f09177361007..000000000000
--- a/dev-ruby/i18n/i18n-1.2.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-4.2
-	dev-ruby/bundler
-	>=dev-ruby/mocha-0.13
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby25)
-			versions="5.1 5.2"
-			;;
-		*ruby23|*ruby24)
-			versions="4.2 5.1 5.2"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.3.0.ebuild b/dev-ruby/i18n/i18n-1.3.0.ebuild
deleted file mode 100644
index f09177361007..000000000000
--- a/dev-ruby/i18n/i18n-1.3.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-4.2
-	dev-ruby/bundler
-	>=dev-ruby/mocha-0.13
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby25)
-			versions="5.1 5.2"
-			;;
-		*ruby23|*ruby24)
-			versions="4.2 5.1 5.2"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.5.2.ebuild b/dev-ruby/i18n/i18n-1.5.2.ebuild
deleted file mode 100644
index c6aacbabf2a5..000000000000
--- a/dev-ruby/i18n/i18n-1.5.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-5.1
-	dev-ruby/bundler
-	>=dev-ruby/mocha-1.7.0
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-
-	# Update old test dependencies
-	sed -i -e 's/12.2.1/12/' -e 's/1.7.0/1.7/' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby26)
-			versions="5.2"
-			;;
-		*ruby23|*ruby24|*ruby25)
-			versions="5.1 5.2"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.5.3.ebuild b/dev-ruby/i18n/i18n-1.5.3.ebuild
deleted file mode 100644
index c6aacbabf2a5..000000000000
--- a/dev-ruby/i18n/i18n-1.5.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-5.1
-	dev-ruby/bundler
-	>=dev-ruby/mocha-1.7.0
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-
-	# Update old test dependencies
-	sed -i -e 's/12.2.1/12/' -e 's/1.7.0/1.7/' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby26)
-			versions="5.2"
-			;;
-		*ruby23|*ruby24|*ruby25)
-			versions="5.1 5.2"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.6.0.ebuild b/dev-ruby/i18n/i18n-1.6.0.ebuild
index 71791fc2bce0..865fb025f66c 100644
--- a/dev-ruby/i18n/i18n-1.6.0.ebuild
+++ b/dev-ruby/i18n/i18n-1.6.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
diff --git a/dev-ruby/instantiator/Manifest b/dev-ruby/instantiator/Manifest
index b90796147a4c..63df5028ef86 100644
--- a/dev-ruby/instantiator/Manifest
+++ b/dev-ruby/instantiator/Manifest
@@ -1,3 +1,3 @@
 DIST instantiator-0.0.7.gem 8192 BLAKE2B c1cc0bf4a3f2aaf9afd522e33fdd2b32d78ca114fc7b113f6ae297e825177827cb6aa5398917d6d05523f912bebf22e43709e53c0dfe4e1a941ebda4350d3098 SHA512 b37a9380d787252244d2b85bb99365f4a4ecdab58f76caf5e59df00b239f4981119eb5c2eb2fe6ddcf810bb0fb43695f8926370a101f4223fa28811953e6731d
-EBUILD instantiator-0.0.7.ebuild 569 BLAKE2B 04c6c85bd99946d9fa3eeb504cca62ea8c11f2e8fe857a8ea7a11e0475ffc39640080841fbd81e74bf426c24cf2103b5b7b3a434c8ce0368edaa6474dd0f86a6 SHA512 f98590d2b857c975403f5aa3541330589bb95101f81c5373de2f55e1065eba014f98bd8067a0d8ff974ecd5dd79db0dc6f31c86483a02589d1517e0974d5746c
+EBUILD instantiator-0.0.7.ebuild 568 BLAKE2B 6025936c30f5149967d37d36ae8815b0a422c30b371ab484c81ea999ee7ca2f6632188a3bb2d9bb465fea1cdde03f46959ca32c17f6d8fde75d8543533c293fb SHA512 16131e94a6aafa77dda471fa43c17b335394e91a7e88cf7a774eb769e2ce2ea8f69f2148b8501914227d1b758bf1a34379061e795dd08664fcd222084084b835
 MISC metadata.xml 350 BLAKE2B 3a675060e310b02ef2d6408b7b7114651555ae65ed76f6311947a7c6b01e18c638775ae71c504892845b5f9fde2bf5560c3e267fa478bc105c3732a2ee821fc8 SHA512 48661d17e8297087c541040534f2c19ef983be797cd9feb5a9e7d80f8bfcfba027e8c2e42d8625a0a0f76bc60247372b2ae0f984b6ae8f635f28bac33156fe1d
diff --git a/dev-ruby/instantiator/instantiator-0.0.7.ebuild b/dev-ruby/instantiator/instantiator-0.0.7.ebuild
index 2d496b0287a4..5170aa5e1bd5 100644
--- a/dev-ruby/instantiator/instantiator-0.0.7.ebuild
+++ b/dev-ruby/instantiator/instantiator-0.0.7.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/floehopper/introspection"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/blankslate:*"
diff --git a/dev-ruby/introspection/Manifest b/dev-ruby/introspection/Manifest
index da4e9b49e021..1d17cecf4d3f 100644
--- a/dev-ruby/introspection/Manifest
+++ b/dev-ruby/introspection/Manifest
@@ -1,3 +1,3 @@
 DIST introspection-0.0.4.gem 9216 BLAKE2B c97279576a60dfd74453d16a6eb0885326dad18748bd182fe3b5c2a73121553cd3ea66690841df6554fd105e50f5f6df075afb94795b94dbd7caf4615ca67764 SHA512 c228827ac9d8a82a104e78daadf038c674cd464bf726fc3bd1efa82e9d9cab37f6ee909f578585e7846378f0b755ed4d60fa119fd699f6c40188ea2de4ac7084
-EBUILD introspection-0.0.4.ebuild 666 BLAKE2B 8a6fdcb89216016fbca3e9a4fca2f4b27745a68c0a227109bd7ce4b0cdfaa171ee44aa42dbbe6a46e670113a0b19560fa9ddf16a33dcaf4c45ac0fa5f468f999 SHA512 934d7e845441b3122e489d514e7268e08f967994bfa8b4f433020aa5e75ee7598540700be561e37c696690b68e55d1a5ebcec6ba2fd58d9717d0abb2c83d4941
+EBUILD introspection-0.0.4.ebuild 665 BLAKE2B ea6489440b52ecc73adf6536699b36711c5847d1c67af95d82fdb9effed30ce57ab1c0d04809e399e9e31c6ef98997597f5f807105c25a56caae94eb999f7af9 SHA512 6ba5fae5dc32e2739c1cb5705f8cfcd60f4e99fd509d8f2973d476d45f6c1f4d2646346a6fa06065b882f74003b15a2ad618e0c67ecb055365f336dc8cee966c
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/introspection/introspection-0.0.4.ebuild b/dev-ruby/introspection/introspection-0.0.4.ebuild
index 580cb2436d00..1747257040d1 100644
--- a/dev-ruby/introspection/introspection-0.0.4.ebuild
+++ b/dev-ruby/introspection/introspection-0.0.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://jamesmead.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/metaclass-0.0.1"
diff --git a/dev-ruby/kpeg/Manifest b/dev-ruby/kpeg/Manifest
index 5e0b19c81c32..5e242c703ee8 100644
--- a/dev-ruby/kpeg/Manifest
+++ b/dev-ruby/kpeg/Manifest
@@ -1,4 +1,4 @@
 AUX kpeg-1.1.0-utf8.patch 450 BLAKE2B 00472188e53b34f8395c33c9510232ad826ce71235b3110807d1a3fc9068684cf367f6a312e6adccbf93fbdbc783d69eb8e14a536365f8c72e1ac6841a364171 SHA512 eb0c3b6d3ba32e3496f7f115804dfbef949dfb34e842886cbcc3c8b49a0bfbb21d1ef3510590e335a2836eca09cd031d9e75a8d601176465c84e5424fceba663
 DIST kpeg-1.1.0.gem 57856 BLAKE2B 6aab84aec59c4962ef39f31a7de89a7bb84f0ae2b64327206fefa8bc243e0dd405db121bfe2f50c72b18933c2f4ce7a47a842c741cbd53db1ad73415d41b95dc SHA512 4ca7007bea74485ceb7c3f53eef1cd2e162fed45872f8f078d5b5d2ffd1ecaa0e8fc65ed6f1b220bf6f4642d455a582cb754cdc6350edf856b33d9908510cb66
-EBUILD kpeg-1.1.0-r1.ebuild 736 BLAKE2B 28d9e900c06eeb4beaa06eb842e566e76d571dc652b29608a9bc51effc72b2fca975c28487c769871993aa4ee62cc1170955518e846920c45f159da83f05d779 SHA512 cd1f922ead9d106ce1295bfaa964ed3d35efe0e751d6dee1e80b862dd20708b085c61baf621b8cc74c176a7d9a36a9f825fc775668cc46e90587dc465eaef005
+EBUILD kpeg-1.1.0-r1.ebuild 760 BLAKE2B 418c0553170e2344e011948237c6c8344e41322489a4e59a90658e9cac431cd1fbb9bf3682abdca860ee20cdade1583e84f97058091373a81ef5a9a087a5b7ec SHA512 92b0d2222c2436cd64014bf6c123ac405af5a0842fbe9f0514460d0cfe08ec662db51e0ae2d8ccabce84ff994f3525336402f9c680ec8beea66717be6b055c0f
 MISC metadata.xml 338 BLAKE2B fc0c3e4cbb7613cd0fb29651974822b31bbc14da28427772026ac068c6d8ca698c4c38073df6a5d06a864ffdca14477d71ca32dd7b4ca4244cfe02e9e052d4c2 SHA512 981524b3599f2a7a812c468763137a4e38b445c87224f91dc12d128025bd42657b62ff1b5fa9797bf437f46b9f9195bb0469431e77646ad5f0cfbe2c6b5e1f21
diff --git a/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild b/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
index 35b00355e7ee..2e7cec56d9ea 100644
--- a/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
+++ b/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/evanphx/kpeg"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 PATCHES=( "${FILESDIR}/${P}-utf8.patch" )
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index df1c1266db2a..14a51f6a38e1 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -6,6 +6,6 @@ DIST mocha-1.9.0.gem 224768 BLAKE2B cbba687669691c4771762fdc87285e1d2a2e9cd4a97f
 EBUILD mocha-0.14.0.ebuild 888 BLAKE2B b03c2e01b8225cfdb5553c7c5d475e92d4e5fad16fd4bad97ac92529d1b779d0c20a989256b8239f4573588636b0891dc08381fb3a79256546da6b8fcbc0c6f6 SHA512 51740cbe68158b599d1aa8a234ea2849a0dee3342ee57005f40eb7f20bc4b584e6234812693bb5be369a81566f41e48b2036e409ba9555f1b7c1d9e5a5c076a3
 EBUILD mocha-1.4.0.ebuild 857 BLAKE2B 61cf42131ae9ddf3c315a0601c064a8e53ecb5552843eb8ac0f62d0b4e9de401f4e76100178964e4dd05c848587c49c4382f47e60a44337d5c129fc1a61099c1 SHA512 8b71a6494d3bc312dd6357138916655e2b6c15861032d83e643fcdbe895295f65086b2152b189f7c85f2484ed9f94a145b2a9fc4213e107c94cb142f5cf9b37c
 EBUILD mocha-1.7.0.ebuild 881 BLAKE2B 6c4a23c2fde8e6ba217d09aeff94837bec6a2b8d2199d7e08e4f98f7ecc87167d2115b3aa42cd1092739e873cd054fc7bbcfef3516d0e26be4fd972e98a6b620 SHA512 eab51b5cb550081d3f2c9077a3a6f3e02372a0d8303c90642a443763a776a748dd17e6508d03b089e98a9e2a113ad5026b5d60d26d826883ae42900948a898bb
-EBUILD mocha-1.8.0.ebuild 867 BLAKE2B d0408ab816c5247ea494db6eb5805b8f91549bfa2e0b679e7dfb72d2f05aef3da4440655e74d8779cc7ba7971d74e63ffd55b5f11c2b7b9f6a32ba9ca74de9aa SHA512 0250982900cf749a1d7f4b4d5451a385fdb4cf75fc35ff31085bd807d00116c980dcbe88c040165c1a28cd2b69e6629e2d8d80e07593677214daaaef97acf0af
+EBUILD mocha-1.8.0.ebuild 866 BLAKE2B 21dac917da92ff5e497e3eba8c1f1503cb27eaac23ed3f6797057f5b4c1afbac8c5dbc726d48d7b4ec049be0e543d0776684b5208b6455e5f0bcb0e04bd0c4bc SHA512 fd0ee2d17317149c1ebb707b9c6caf5b37d6c9301f5fe59aceccf97ce1c429825ff926d72a12b9b2bbcc3c05d9cee675c8d96882f47eb8e5a6b400b7a02d4fd1
 EBUILD mocha-1.9.0.ebuild 868 BLAKE2B bc2926193345e4214bb8ffb267dcd3c1230556f5558114ac676236d64984f11615d02312cf453ea2b2b45197e4490c40acf5a89cc02c7b50dff2a31b8620cb77 SHA512 c1a7a3dba7e5ce31d5f1f0a9b82daa37c4d36d850449773199518ed9eb862317b1cb71fdd08ae1fb682f2e69362e93c8213003f299d87541246ca8513499f55d
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/mocha/mocha-1.8.0.ebuild b/dev-ruby/mocha/mocha-1.8.0.ebuild
index 32eaeda0b592..e5ab9039824e 100644
--- a/dev-ruby/mocha/mocha-1.8.0.ebuild
+++ b/dev-ruby/mocha/mocha-1.8.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://mocha.jamesmead.org/"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/mustache/Manifest b/dev-ruby/mustache/Manifest
index 2fb20a4c9e33..6b269528c117 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.0.gem 42496 BLAKE2B f2bef262238a6e335decf2295d1d55c7865d9e2181f7772d2359bde99441536c4f1b44a103f2ee9be8e6933027ea0241f7027410d9a506732ac8affe9a72ea22 SHA512 5e8daa7cfb6151e86e5d2223a026538194e03331bcd74f15704404795eb8c6c28899f29fa9fe421fe38e026b38ad734fe5574d2a6d4aa1e53ed5a566a8061c61
 EBUILD mustache-1.0.5.ebuild 904 BLAKE2B 60e6c7d5294d24fd7f95ba71e470825c1ff8680c7c16be609c15cb95b068a31a4c4224e121b5d261d03dfd6bf4d19f0a623870213f8308bc76408a05b7c72c2a SHA512 07e215da6a45186bdf0dce95402e5372f65b0afb7ed2ac50c44e6db18c58ea74a597d3aa96dbbbc11b1de6f18740de0216bb14cb266c0cb5777271f0769b45e5
-EBUILD mustache-1.1.0.ebuild 911 BLAKE2B 5b86037cf36efdd3ac403d8210c66dc0184cfce534f03a4ab4f715c87691db7132822749264654b0957cbc1da6382d94bb18fb5bde6ce4373944a0c6ca58f4f5 SHA512 23d54d517c4c44ab42d133db22fc6c4af54102394b74e26c3b0caf3db8ea9d5d73d6cfe4a488f161098c57c751b71881576cbadf5b0448e8f77da0a244bf1b4a
+EBUILD mustache-1.1.0.ebuild 935 BLAKE2B 5a7c5c357cd56bbcbfb5e8958ead395fcb9de0b831091cc24de094a3122980605047e095d8af4349c8b846e85010fa35683856bccbb92ed81f77825ac65667eb SHA512 1d21cc91b9643349685db1c06bfd2328bcd1bdfa11ea1f3e5143046a09d907453c5e43e2cbe65a9e6c18c4d7b35f34dfa526864ed961bfb3c04171e21ae1dd0a
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/mustache/mustache-1.1.0.ebuild b/dev-ruby/mustache/mustache-1.1.0.ebuild
index 8a42ace79b02..dac6491d9dab 100644
--- a/dev-ruby/mustache/mustache-1.1.0.ebuild
+++ b/dev-ruby/mustache/mustache-1.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://mustache.github.com/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( app-text/ronn )"
diff --git a/dev-ruby/net-telnet/Manifest b/dev-ruby/net-telnet/Manifest
index 429171c1e449..f5b8361d3b8c 100644
--- a/dev-ruby/net-telnet/Manifest
+++ b/dev-ruby/net-telnet/Manifest
@@ -1,5 +1,5 @@
 DIST net-telnet-0.1.1.tar.gz 12794 BLAKE2B 5a82e62e47cb9153b17dd6042c7e5c767ae3a9cbe0739ad769aab2fe798c7766819b89bc325f148791ce37a55ae267eb5854142d2fcb7d387fd29c32e118c169 SHA512 769d83bae55826bb99f189d06a8fb8a6d497d6c7687289f5aad2efced6f282484e5f766dc95f0158045b824532cd8f0a674ecc69883018814a009bc29d6fe29d
 DIST net-telnet-0.2.0.tar.gz 13299 BLAKE2B 6b87974281b4e1857a1e05efdfc751a5149f9057598c89b8b288219b95268955ee3f80e21cc787ac767ef3126c9ee23d9b62e29ebcb8c317def703f0e0dc1fe6 SHA512 a4473c42d33c10594c4445c29db73f4d611555710228cce263f7fc273e71140423dcbc2e89eec2a26f35f98de48aa72eca9f44cf0cd4626d702709963ce7b02d
 EBUILD net-telnet-0.1.1-r1.ebuild 956 BLAKE2B c829de45998437168a98607688b9befee910e596c1020128977d20ae856c6e29001169a868697602e1b2b25affd3c78c23a3a4644704aec7e5f7145c7bb49f42 SHA512 e17cae877c189a7817602b01a63950997ba71e902c3e1b0d59b7c175b6b2e948d1cc948480ab4235e5778ebf6b31d274a204e9b0c46c21810de8365371ba164d
-EBUILD net-telnet-0.2.0.ebuild 965 BLAKE2B a1ed9d1ecf94dc0f3c99cbef234ee06b6e230882738f9d0ba5e28e8d2e42f9019f23d88bebb63d127ef5dc5be529a0409886e8f6d035b9c811c970ec2f529622 SHA512 deb5a6581ea49614e2a0a9c337c058710fe090d6ca682cd03b743ee31a4154eb046c122f7b982ab291d1919fa64dd0778003e5ec6b97c9073491700645e16ed4
+EBUILD net-telnet-0.2.0.ebuild 989 BLAKE2B 5dac14e237c897f8799cd92c2e41d7a90c6e3e6f520a9a7393c205aef55c394651abab42f8e2440a397dd6a5b151d30ff02591661c5893662da6907a989b2875 SHA512 86f830187d6a9023efda9e817b2275ce4a7160fb78d803af706eb37016606c7b5715a3b0fb392b82120e5c2aea35116501b26f45616fffe902be886ecabdc214
 MISC metadata.xml 341 BLAKE2B a3489378bdb1735168037d2bf0c8798de575e898bb5a686efc06d1d2c41cb1cc674a387c8b042ee789e1bd4694a1e744759637cb820ee7d820b130a966db9573 SHA512 e536a7ac7e41bab692cde766da2aebc72df4a9392921dfc2b81df82ac128ff85cfd58900ff157046eb316cb927d58fcb48605fb364c7fcf25e82c3ed676e22ea
diff --git a/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild b/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
index 8feb2650110b..1a8bbaedbe75 100644
--- a/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
+++ b/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/net-telnet/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index 6e885a6d676f..bc0d0e3d528b 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -5,5 +5,5 @@ DIST power_assert-1.1.4.tar.gz 17330 BLAKE2B 5d5e22c436c8e25612326e8d33a6ca10e8d
 EBUILD power_assert-1.1.1.ebuild 1325 BLAKE2B 92468a576f9c00deeb732382e0ae8a05eb2ca0017d24be90ff77b2ecb66dd65b9c5e11a32594315348ff0e878eb72468ef91dc663fccec0c4a1a1cc2e81859d8 SHA512 6d4378d2b7adc4df773c71c4ffa94b03921e789f51464ac57dc61b90d86711544fa235ef0715d7050d3d34cd7b9e29b68b908ad37d90deaeb1233d311078d717
 EBUILD power_assert-1.1.2.ebuild 1331 BLAKE2B 5710cf33430a517b532cb28ca1a0917f619901dc498190325dc83c6a6dafabd89542915099cb66a208b123a5150e8df678e379ad174492c2837328f9aef41713 SHA512 4e871fddff5c73cf57f9a0d40b59915ece509a0482c05d8f298cbdc10abe89ab066090d1cd555fb8b641edae504413af2d27b5f6a0690a84c2a04b3f749fba11
 EBUILD power_assert-1.1.3.ebuild 1335 BLAKE2B f96fc620e6eadec4a4b16796ffce73036b926897c7e8cdda603831e05c5a8b2b61ca5e3365f5e541433ba82fa70498301d6c87190cc2260965b9314c01340e72 SHA512 b269121ae9097cf0a3d4fcb1dc546b3789d9f138d36725c89b42605d777ec200f935cc4c9048b3ec315a0a55c5fbeae0fd4964b5b4eb3e7de013867a01b9b975
-EBUILD power_assert-1.1.4.ebuild 1334 BLAKE2B 6b81e505106ad2622e03e871b4fd71b36e783e3e77ec3d03511793d3e14b630c5f5b55227dcb3eb1843a71b850e5f88f4288c2b1057e7bdc780ce56da8c83d49 SHA512 c88a937158546252df5bc1da997acfbe76e9f65b49b400626912ca3404412c8d41966a80e75a65a8f3eb6a235a58fb549a74ac846ef6c51f8218da9bb08ad058
+EBUILD power_assert-1.1.4.ebuild 1345 BLAKE2B b40b23611991d51df5cedd6677ae490311d709d0569d91c9d758daf49f68b53fb93a89ae7705014ace676a34e03b56ea71e75a99207193fc1c30533ef0dcccbf SHA512 5bb8994810478bfe906cbd4bffcf90948230a83a4da03409df6f3345e88be85796b7b31b8f92e081a3f80d7175cd12240e416d10382fba1b4868a8df0a0a084c
 MISC metadata.xml 344 BLAKE2B d878cc041f73fcacc13fc94374eeb102440977f57c47880e9a597af3b4d3b20cd81e8bd0d367cd2abd7799a27b5aaac46611291ffaffb3298bb253d726e23726 SHA512 87e232c55b49880144aa509aaa79413864b3f575df07a559a9f1aa60909d4d8e01d1ce2e86542c847533eda2f233542deb36b1103b56d7c512f2385a6c8eb2fc
diff --git a/dev-ruby/power_assert/power_assert-1.1.4.ebuild b/dev-ruby/power_assert/power_assert-1.1.4.ebuild
index fffecd78e0c7..636377560786 100644
--- a/dev-ruby/power_assert/power_assert-1.1.4.ebuild
+++ b/dev-ruby/power_assert/power_assert-1.1.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/k-tsj/power_assert"
 SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( Ruby BSD-2 )"
 
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index a4a0d2deb5a2..e22d43923e92 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -1,7 +1,11 @@
 DIST public_suffix-3.0.2.gem 95744 BLAKE2B 5c06af572214760f7d2a176e1b6603ea9bf0f45c91633cdead841ef8289b7c9ae7ae5b0400d5248d3df4c3bc81d9bb357de622fb85a9c3a67f4973872bdee94a SHA512 eafab08d0114212798390b4b5e9472fab98c91b38ea836c76254673e48bd068afeeb5ec4a2685bdb030ea78e4e5ea0be10dc3b742ed30352e11ec7a7cc1e7bc2
 DIST public_suffix-3.0.3.gem 96768 BLAKE2B 0ef8da7c32a2a1268d45a03a46f9a7de9da312fae2b2461692b1eefca09075029972ef196ae5c531d85140cc5da4107ff47abb16129b19e995357d04cfd852b4 SHA512 8d80d126bb91162d9228dd515c2e5cee466134493e874c136831eda11293477a035ec05436a16dc0bf720b7b38b15664e8c1d9b5f4f140f4054fc387565ea275
 DIST public_suffix-3.1.0.gem 99328 BLAKE2B 50c5e415bc59edf3a733eed9bfd5e23b5892fc12dd9a0ce624dadc41227b5ed295a6df3a1b48b4dc375ab0e1c3b4411133280df03c9e0a5269e545213873ae8e SHA512 8f47f75bb9c23b1c3655aa3d3f5dab302e47c7c1a95f07bdc40f782b95c15a79c898f632e844cf9c350aafc1a7dffee3890d68dbfff73f43551a2bbb03667a69
+DIST public_suffix-3.1.1.gem 99840 BLAKE2B ef86b7ecb834a855dbb44b8a0f934de3715edb6d67faefd20f99054898b35bfedffd490b60fbe80236905826868611aa96e13766577bb98ab997321cf9c49b39 SHA512 1e266ed7fa224fa94a49a51dae2868bdadb80ca2de660d2cda9a1e146ccad5aaba2cf68d75272e333a4b1a80e47863d388d85d3a86bddf8f649a320e5e700078
+DIST public_suffix-4.0.0.gem 99840 BLAKE2B 198ba6107c9577e20438c9f5eeba33b740d194e491374ea336043e5f731b6cc956323c746ece0665943269d336cdaf1d94d9ca64022c8ada1d28ca00a12fa209 SHA512 ed4eae1e2ca1e7af08317bc82b4dbb7b1f1e4de9889f4e510a9f347b2212010da956ebc53cdc45f08b7f1f805d814a96f7da305f0b85434a0417fb740ab5e410
 EBUILD public_suffix-3.0.2.ebuild 834 BLAKE2B 35f65e5abe8032946dbae78be95f3a11f91380f74e8b7736f025c05fb3b68181e7b8712081a3908ae4460ea2a539428acc92b330de1c65573f2956cbbae72402 SHA512 e574ad1b94f28ccf7d19daf05abaf1ad76760499e262c17249d6de12f6f17917ccc9bb7739c33561d48b73de11fd3f253cea1e228c7a22d5c57b8cb197aa961a
 EBUILD public_suffix-3.0.3.ebuild 833 BLAKE2B 2713eb35bd37ba741ef662270006c25737018922449a89f6e99ab39ac96a8cb4e3eb0c709cc8d74944c9a3c41cfd2763f3001e6d05d5ea1c3bf81085ffeeb4e9 SHA512 a5ddb4b4d9a4177b695fb358115e711c4a73f823028006d77f4427614873f8d72bec6e09ec7843cdaab4c02f5f043317b21cd742141de6c2ee5ce06511c2639c
 EBUILD public_suffix-3.1.0.ebuild 826 BLAKE2B 85c0e285fe0de2d86a3f64bc1327ce00849c5a5618a4635e6aa46a515b344fd4228ae2080d0743cac56e1ec20fafd352194938a3c1ff4c562732472446bca913 SHA512 ab7816066d60dd9501a266ed56c5842af4eb0e2f92127dabb855f9c15b145d67374f1437ff60acbd4be18eb7210a86b4669325bcc927f709950ecdf3e09549e3
+EBUILD public_suffix-3.1.1.ebuild 826 BLAKE2B 85c0e285fe0de2d86a3f64bc1327ce00849c5a5618a4635e6aa46a515b344fd4228ae2080d0743cac56e1ec20fafd352194938a3c1ff4c562732472446bca913 SHA512 ab7816066d60dd9501a266ed56c5842af4eb0e2f92127dabb855f9c15b145d67374f1437ff60acbd4be18eb7210a86b4669325bcc927f709950ecdf3e09549e3
+EBUILD public_suffix-4.0.0.ebuild 826 BLAKE2B 875269a7b44fe924ce940a1e3a35a35efafb87010ab25f0e9d6b86306d65a7ba7ffb09c4fc2f0853c7d1acca9aeec269800d6fbca3ea0e17992bc1d7425c0dd6 SHA512 01079bbec89746c7d64cf9ef0c28ddde5edbd2c3ef38eda0982a2da2020df9530b36fdf6f289e5cac159e74c4e8cfd2dc7229e2560b3e723e8b0f1ad6b9a00bc
 MISC metadata.xml 340 BLAKE2B e5ff0b06a3e6205a270389a1aaec9cb8902fad8e9b815e650b9be53276545b401565d8f7b1167ac415766a809fa2358289811196001e840d9d8641bbe2ff281a SHA512 e5091bcfca152fb1301ce5969cb5ce1e65db3452926c5b75db5afb284e28f44655495663fcce3ba5718b9817d1e3f6db491fe8da96732181926ccd58b36d7f20
diff --git a/dev-ruby/public_suffix/public_suffix-3.1.1.ebuild b/dev-ruby/public_suffix/public_suffix-3.1.1.ebuild
new file mode 100644
index 000000000000..186d9be0920b
--- /dev/null
+++ b/dev-ruby/public_suffix/public_suffix-3.1.1.ebuild
@@ -0,0 +1,30 @@
+# 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_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
+HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+LICENSE="MIT"
+SLOT="3"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/rubocop/I s:^:#:' \
+		-e '/yardoc/,/CLOBBER.include/ s:^:#:' \
+		-e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/reporters/I s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/public_suffix/public_suffix-4.0.0.ebuild b/dev-ruby/public_suffix/public_suffix-4.0.0.ebuild
new file mode 100644
index 000000000000..a04ea04fcd7b
--- /dev/null
+++ b/dev-ruby/public_suffix/public_suffix-4.0.0.ebuild
@@ -0,0 +1,30 @@
+# 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_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
+HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+LICENSE="MIT"
+SLOT="4"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/rubocop/I s:^:#:' \
+		-e '/yardoc/,/CLOBBER.include/ s:^:#:' \
+		-e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/reporters/I s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 76bd2f8a99a3..fc4934649a70 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,5 +1,7 @@
 DIST puppetdb-termini_5.2.7-1xenial_all.deb 20560 BLAKE2B def7bb25badadd2880589d5708e8b9a0f87033977a21ee65fca7b27caf8c3568c66cf7f21123ecd8dd037e29023e65a9393d8b3608ffe0e021f9aad5a8c66755 SHA512 b5a5b4c721a35d95093d9da757f5a2dcfcc232343b6ca6dcf7184a20f9ff305a9c2f04328e17a0e02579d6ee7245c7c9b7e9ba8d22bc8f3bc1c13cf50c784101
 DIST puppetdb-termini_6.3.2-1stretch_all.deb 20662 BLAKE2B 2e7daef3892070d5356ced070544099a546e4887b5654f795e06952862e4c0cb155df200806217fd5376b1bc3fb53107467ca76acec05283d2f25fed7ca7e5ca SHA512 555abacc9de7221df78a8459a76a4c3c8ce3a1bf5e2b6f1d800761eaea650d2a308e6a5054be082cfb9823903fbe049b2dc5f323b8af93693afbb61c8ce6c4be
+DIST puppetdb-termini_6.3.4-1stretch_all.deb 20680 BLAKE2B 41d64eb7a13a0036323b916a70cebdc1d522175e1b6460a0df577b35d57bdfd2eba76784e7af314336d618e7445639e12ec369f243d10b5120ef5006fa21efd3 SHA512 06ce200b4d919d99c28f5361993ca9a641f38d27b1e775db7f1edd10515b75ea131770f3e03a1e3f9d3b32cb8e6f32f6995a6df1e6b3f24d4601585db48a9d8b
 EBUILD puppetdb-termini-5.2.7.ebuild 655 BLAKE2B 1439379709cf6326a1d3510fcd1e82a751308a6e3666aa99c756a9043157cf2ad850c9f1d367eabcea227232709fcc185f0b115479dea5c4b872cba09bf62eec SHA512 5e80114c8e6cdefed8c1daa81c535b8ed3c8e4981953d8e57ad77c19361ca01e565bbe1862ff5ab0607537d50e6c7bb0ac16777fbc9eed01905df51e7559e85a
 EBUILD puppetdb-termini-6.3.2.ebuild 663 BLAKE2B ee7bf569a71860c88a0553ba60a08a57df1650050470c9e42ec6138386d21069c45a828be62c16582a973c30c314a5439903bc682b28a62732486737c079bf7a SHA512 efaa2a0f75daa2a4b7791ecee01c17286f5dd11f606c01187b9081f4793d456abc24dd9d9317804784cfd34e578b5dd524c270831c9a9fcbb6a1df6d07639051
+EBUILD puppetdb-termini-6.3.4.ebuild 665 BLAKE2B 92d4b605fef931841c189603f1db1c9dcf33c674922a1f0106f05310ec7c67ce6e8c06340e9be2c46e4ef2e3c84d96fe8cf5aa77b703bb0396f78000aacd33fa SHA512 c53977ba31eb42260b92d1cb567d50f026f5cc47d7d4a9b13645376232b6f878354ceeb6b71d73da5209bb61256222f94b98441954729d8c4a264fdf8a385004
 MISC metadata.xml 459 BLAKE2B 90810b08bfad84e8e841bb1bbe1a2340f5f4a5b214642cef60a882dc8acf4f502d8e971dc04ab6a614e0437c8321c98c6a7566f0151475adaf8c0daa275c485f SHA512 122359cc00e8fa171933fb808692db59e25a4350a4efb72ca78dc5451e8b96f17fae32a8cd6e532f4c2fbaffc8b7d7bbb1ce141ce1e48d93c928cfb3ba3cfeb5
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.3.4.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.3.4.ebuild
new file mode 100644
index 000000000000..6d51b944dfdb
--- /dev/null
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-6.3.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+inherit unpacker
+
+DESCRIPTION="Library needed to connect puppet to puppetdb"
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch_all.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND+=""
+DEPEND+=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
+	doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
+}
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index b0dcc62c7e48..5a464c69c3bd 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -3,5 +3,5 @@ DIST rails-5.1.7.tgz 6146668 BLAKE2B 494a12d79037010333c06d14573474f0d0c1e62ce52
 DIST rails-5.2.3.tgz 8802794 BLAKE2B 786f94bcd9528ffc664c39caef0e7d2d3c15da95497044504082999a435c2a877d73d40b68b5237dc07ae6cf9b8f6f99f12ae68527c5f4005b1a648038e507c0 SHA512 6a41f7564679263b4a16a245d13271b12e97a55cdd77b5ebe63bd86c3a80e4f447b4c0567a4a40ed8e97a2307522f6dad368b1beeb362136bdf1856f6dffeb60
 EBUILD railties-4.2.11.1.ebuild 1707 BLAKE2B c4ee99a40cbeef43d8ab63134f581c01be1b8c6d27a10dc7368a6ef837c515309712e9e3d37fb153975360cba76e66ebf09dd056d486e9a5948c75c8fa862b7e SHA512 c8a68a17c8cc293bc7259751414f245ace596385c39a77da025ee85c17eb065bbc1528f8b173f132893f61f5c09f91f227452cb6f1343484d967e3d16a533e5e
 EBUILD railties-5.1.7.ebuild 1660 BLAKE2B bed1ab8e8b3b1c5156ae053b72f0c888cf85a0307d0f3a6800cf34acbbfa59cbedbb9d2d1f68e40f8449c8f87088d742b3bd5abb3404de11eaf56bb167b25ca5 SHA512 cda33f5aa0cb200582ec11fa671c303c92c065c57c5f0e202bb5d3446e76a8a254a3dfe7e27d516d68699fa87f27158e79e63b269d61a47168c185c28a19a3b2
-EBUILD railties-5.2.3.ebuild 1653 BLAKE2B 84ec2a844e9db6f6eac5eabe79f1ffbce0a1cd5f3f63c0bd6cccf436f9b1b719a01763ef0030fb2b98e95db8a5650869126cd06a52ae92349e26e68ab7fbfbd3 SHA512 a69bb96847bafcf46607156b68670f2de8ea305f15287cdd09ac45ee01898cf97142c7240463ed2a32152fb797502efa32ea992167d6c1ae05fcdfbd55608cd6
+EBUILD railties-5.2.3.ebuild 1652 BLAKE2B de5e82b9c34953edaf43299181d8b1bd6aad486eb9421fe41cb0979c794dee9dd562c662af426797bea8540ae6042cdda3b3e5834408b97f53fce5b8c26e60d0 SHA512 856bf234affa5517e0db7bdbb92fb2b3f81ad50512f72d862797af429477145dbf4e8fd27cf70c50b2e0ae1e0f5b199f518221723ab4aa16ab91d752ff7afb3b
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/railties/railties-5.2.3.ebuild b/dev-ruby/railties/railties-5.2.3.ebuild
index 1c1cb32c5fa2..a69a3122d75d 100644
--- a/dev-ruby/railties/railties-5.2.3.ebuild
+++ b/dev-ruby/railties/railties-5.2.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/rdiscount/Manifest b/dev-ruby/rdiscount/Manifest
index 4b1620b52143..42475d3c656f 100644
--- a/dev-ruby/rdiscount/Manifest
+++ b/dev-ruby/rdiscount/Manifest
@@ -1,3 +1,3 @@
 DIST rdiscount-2.2.0.1.gem 68096 BLAKE2B 71ea7010116739e8c61aab91c2cc4a86cf679b4ae10221135c0bad854822a9a81969e927ef898c0ebf753811205ad98258c4e7c4b16f9e18a81bb01137a79fc9 SHA512 81a477782b9829ac5e68ab390ef00b7f470bb4bd84e86ce28dd9abbb71aab6fd17b67416078dd7d4e0fc7e0c8eb78250b7a71a2f24d2bd236e861cb445f9feb6
-EBUILD rdiscount-2.2.0.1.ebuild 1101 BLAKE2B f5c26737a7e5acfede69fa99c059eaf069303c1671f0e6c824900ae918def65cf81138d54ddd59d74a38ea14ca94f293803838c63a421b2acdf23c42b7da971f SHA512 626111a916bce27d91365998588f7dff48859228ad7771c92afb3bf90476b4dc72e21ab99ae5b0d21307e8593c0bdb3e4deac55c1925adbf60b20970f50ff036
+EBUILD rdiscount-2.2.0.1.ebuild 1125 BLAKE2B c5ae020a69e04f60bb0f5efe72e971bea2c08785d29c0b5e5235d6ca20d07f1408ef752592f98abe4bf9e0390248f926c229623c3990e6d1b357df2c56fb442f SHA512 c26b95437bc00a8676ea342a5512bc0c49e7dcbf0d5bbc2503d01179477b78c4f9271e8ecc5d9d096878ce7d259ada545e7a123219bab260fc1910a4b7d35474
 MISC metadata.xml 344 BLAKE2B 4afa4c43c02006cc29edbfd9c7792c42aec4aff05203b57a9e727ec6333f3f55c13b8f197f915f8a632d9deb888f5e00f3992fa8df48d7f0969206927a342d0b SHA512 4d2e68c0284b778089ddae07ad5026c296d997afc771a5b3b994464691ac794dee27f1f7bbdbdbe2037565be70d2bc480480a7b93c867dc100dca228b09b7aec
diff --git a/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild b/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild
index 1ad5ee1e4fa8..28e30f07be3a 100644
--- a/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild
+++ b/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/rtomayko/rdiscount"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 1ffbe2980eee..4f36ab588a6f 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,5 +1,5 @@
 DIST rdoc-5.1.0.tar.gz 702376 BLAKE2B 733d77a341ddad10f5b648b6bb492e0f79daa392e2ca371d38236e4c85a1c409699e35dd3f5bc8bc48551b399603bb0a747cb3c5f7f1fbf4765aabffaad575aa SHA512 cd2ed37e8502a3e9093c88c258ac5e39542a23c3dcaedb9b5eb48ce391a694e5b35fbcfd62f01ec6353ac9c40a4b7043b2ff11bbc403d2e03de9a84c52bcefe7
 DIST rdoc-6.1.1.tar.gz 701297 BLAKE2B cd1494303d5bf4f81804e40a43252a589a6fa141316a573c1e321bf2dbd71330fabd547e09f5c84937cc45b3f79e2936d90813c29fc11b4a514a9cb498b9c98d SHA512 01e32d6e7ffcb5c0e138068867e6d995210d0123cb87c2754994be1a5e0aede0e05114746e6bd788fd0b4299e9a005dcfc863ef07000f1f9fcbf6ed11e44947b
 EBUILD rdoc-5.1.0.ebuild 2586 BLAKE2B 6e028069a3beace2f42f292c6fb5bf68cd7fbe1f71842897afae9cf5f971f7b15c10f8c4e6b0fe04aa825c879994edc5a815914ce2b8f196566dc1bdcf6e4709 SHA512 8a50a8f97be6775a3e3f304e7115d567c7f0829eb9fe5e47017286480a7fead26aef314d4173ff42f5380d17bfe21d313e89bedc884815d7774ec373c902cd13
-EBUILD rdoc-6.1.1.ebuild 2657 BLAKE2B 33447d4a5111219c3b569a94aacc64bae4792cd4561ee5c348e36f406b76c0debac5f5b58d643c684131bc0c305fbace409c86722cb9409d1d4ba9c565b43d22 SHA512 39d744b164b32fda92d7f2e5ef41ece1e0d4a0cd8f26bfff9651654b9a56bd04c48d6b4d140d77d530d8aee0640c93888134f3ea2a7c74399515ffa8adc206ac
+EBUILD rdoc-6.1.1.ebuild 2681 BLAKE2B 55938ad000e5a366b401246ad02210524e446a639a90031bd800f6e3f2c4805ce636c46a33805b97be5c4e5f3c3af510d04363c403b478347747229719b65fd8 SHA512 369fb3441915125cc53de593d0440707b51ace4745c83e296007e6d78e9446e1bd4272583503c242432fd4cbf74e5201a083dc8322a6f15b65eb6c735406381b
 MISC metadata.xml 335 BLAKE2B 835d498407155ac5295c70af8a671114c777e5f9371b3d47f9f92a6b102b8e1d58755df0737c34820630464772dc001163e83b5d319707a1c630f4cf2f9ef8de SHA512 3421081016cb99570f9ce9f775097669cd40a709efbbb3c76a20947717bc40d886195a5fda889407d1c436a387c126e07def1eeae01edff53c490ea9c630e992
diff --git a/dev-ruby/rdoc/rdoc-6.1.1.ebuild b/dev-ruby/rdoc/rdoc-6.1.1.ebuild
index 111d431e3e63..eab6ffb64278 100644
--- a/dev-ruby/rdoc/rdoc-6.1.1.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.1.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ruby/rdoc/"
 SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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/rgen/Manifest b/dev-ruby/rgen/Manifest
index e73465d5c2c4..43694a1d212c 100644
--- a/dev-ruby/rgen/Manifest
+++ b/dev-ruby/rgen/Manifest
@@ -1,3 +1,5 @@
 DIST rgen-0.8.3.tar.gz 275845 BLAKE2B 90addb8511646ac1bcfce113b39bc6998704a7e92319b7854c56fb85276adee86b64e847f940769076967090fe62024aa641c6d194c9dd57acecb855eafa8cae SHA512 74f6ed04c49b880bee8c6ed126874f8def43c8ff7a58a8e09743fbd8e255707f6b947b37205c4c35508aec983729fdec228c30e297d7ac6e3bd7f8c2167c63e1
+DIST rgen-0.8.4.tar.gz 277720 BLAKE2B bf7c5f017f056d05464d7f15a4faa8dee41eb857b1ff026be6ea9185d1e4bc2162d0548eb061bf99b2564b61303b4c5204a2db376ff7610ba2c1bbb85cbe9ca4 SHA512 7a1691624a88468674fe3988c3eb098f3c955ab380401cc43f55ab5a84dae81b25d9d19e237b1c9e0251165f298138ca58f9a358124fe4fe8fd233e622d28015
 EBUILD rgen-0.8.3.ebuild 872 BLAKE2B b94097446c7218984e84e3a631781aa064673e0912af70c844cbc09792db3abcfb8e8fdce835835e9bcf3999001ce9feb41d8586d797ec79caf79c7e9d693214 SHA512 8b805bb088c6ce66986537d22829908451242a33fdf5045df3325f2930006970b1179dc5639b89dd21c4fd717d7d63c1e44c0f2535a2be076805592b3b91df4f
+EBUILD rgen-0.8.4.ebuild 798 BLAKE2B 8c406e609b9ce99c52bd37db13e4e10bdbc8770d4d0f530cf48b9eeb2fc5a50e1baadf367e59b136898995d72bd9999dbb1634e9d99b920974d414eb774be9f8 SHA512 d8ffceef809863aa5d31e4889a79e57117635059a450214fb129624a06165591d64e47611953746d7bc0988f0bedcea3c4c6285636db31c1a54a2ba0a58dc483
 MISC metadata.xml 338 BLAKE2B 93ef49d518bff5cbddf74d2d851eadfdc01b79389f77fb002c456c453978d41c5157f545cce8dfa09878f42599daba66d8cfce611f6ebe91496cdb1589309ee5 SHA512 714e42942d30a44542c2c9804e4c5532fb69bedd0c12b9488cf23f64fb58abc80c068c7049e10f793005ae1c6d1c54694dbef0982f2adee03dff58855f41b9b6
diff --git a/dev-ruby/rgen/rgen-0.8.4.ebuild b/dev-ruby/rgen/rgen-0.8.4.ebuild
new file mode 100644
index 000000000000..e9ebe043be52
--- /dev/null
+++ b/dev-ruby/rgen/rgen-0.8.4.ebuild
@@ -0,0 +1,31 @@
+# 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_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+RUBY_FAKEGEM_GEMSPEC="rgen.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby Modelling and Generator Framework"
+HOMEPAGE="https://github.com/mthiede/rgen"
+SRC_URI="https://github.com/mthiede/rgen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/minitest-5.10:5 >=dev-ruby/nokogiri-1.6.8.1 )
+"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e 's/Can not use a Fixnum/Can not use a Integer/' test/metamodel_builder_test.rb || die
+}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index d4793a2675a5..2f18373e54a5 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -3,9 +3,11 @@ DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab6
 DIST rspec-core-3.7.1-git.tgz 376819 BLAKE2B 6747ffd8f2d426718376b51356d8838a7db0d0246ee619e8edef30bd9f7aeeb80bd0488e4fc73b0a00d119074c35055f6b9d0cbbe6160ae78d0727ce9848a710 SHA512 1561d044281c1b8b97cc89033ad991548fa74abbc5f20d3951d3f3de754c581a027f9ccb2bd0107c05e744d3b2804555cf4cf207e72adf365b28fc7ce052dab8
 DIST rspec-core-3.8.0-git.tgz 386022 BLAKE2B e827f006fe9f05f93b741d021bbb108ae3e98cd23f3388c1fdf2a87d8be349c04e91c810cbb7c47cc99ce99a00f62e13eb01a927b8b89d54dfa437ed46b1d24f SHA512 6d3f431a1f9485009f5029bea967f36cb789be8cf33722b36c40df44e12a2284674c6c8af333bfe8ba8825e032576569fd42c92f798988faad732ac3a720c5e6
 DIST rspec-core-3.8.1-git.tgz 387459 BLAKE2B 34888ef32e841633710cf2ec312a2a5006cbe9bb92ad16a646b7c7ef7ebca693db12de4240f4a03bbc01ecc50bc08ee676600b708ba72e1f34ad11d007bf6377 SHA512 fb9d6098e9c43b0fb0b7344521861c6095bee09d3fcaec526bed7b67f21cdff067a4a913f7cf17af9436587a20caab172670058785f138f50103708475057941
+DIST rspec-core-3.8.2-git.tgz 387788 BLAKE2B e6cf93f5cef70f53039b6c22fc875cff58eaff4c0c7d4e75d23dedfbe16081980c6fe575d3082dbe6ed9edc8e81f0cbb9e29618da78af40a94c517a859f9d793 SHA512 2fe88ee3d66ecf134562dfa7b1001f23a1a750640c4f65cdec64d85dd735e0fde9d91479286f8f9c38064746813f41632d12d21b3926724ccd7c9ded50d2a7c8
 EBUILD rspec-core-2.99.2-r2.ebuild 4255 BLAKE2B 8401e514a3ce939d6b00d1102c3689cbde8e7ddb15fa096aa5370223fd80b79fc977d79a6e80c9f63337d4f6b8db161916c84fd5e7ea1cad7aea483ced841a61 SHA512 62c8d07cc8c092efda20e16b51d74af582cec04a6fef68c4871a4a1ecdf78760d8a6cc604b8bf6d62a47825edb4ccda31baf01426bcb23b6469825e3635e660b
 EBUILD rspec-core-3.7.1.ebuild 3407 BLAKE2B a8c53dc5569c0e113f98613eb7dcf207fb46ae04fa70ba9fb6015e0f2706708fb067bbbb5de9e18dc75c85c85c3b07160180693b1d8eaa71ed891f3ca905d24c SHA512 a00c51ab4f307c609cc03fa59c71214d72306e0e462b9ea92f3a84003f9aedaf596917a81a7a42083e6f1aaefec4b7fd85e5ec5801e495413e921694e3ffefd3
 EBUILD rspec-core-3.8.0-r1.ebuild 3232 BLAKE2B 1b650ef76a6175eb36046600a2872446649e93291e54d1059bb329eb362d5dfd731a93bb77f9b94c8586e7f91edfdc34bf6d17649f97666e8d5f0ab122c7f540 SHA512 c390eba0fb002f386acce7b9eb4d25214490e4df3cac9c16ceea239e04c8e634ae3a734e1619c2769cfb1612fa45279b68f29cd2b67cc643a2cb68446d5dc728
 EBUILD rspec-core-3.8.0.ebuild 2968 BLAKE2B f3f8308737d6a1cc643ff39fe39e803f11c133991c269651601881cbb5ee82fe6e998df04c5dee580db41b915b59db6e4936613d3b6ea2287e3a708f2bc85da1 SHA512 2ea428d91d9df0273c4a0c353fcb20249b216ff3a304786e5bb877be1fed4485a3c6a99c74d4ea2d5e174ae87a2b178eb5c1735af41f92210a35f9b508c9260b
 EBUILD rspec-core-3.8.1.ebuild 3180 BLAKE2B 9cc99f454b7f32e443ed6acea094ceae7a18fe50440f870789245fb36e89bbf1d7efd745e4647c12f18a08423f89b51222e3991a86f9dcc89568d4ecb63a4b67 SHA512 1d3ca164bf4523e66448757cfee5a4eeaa1d9b8050943254cb4202fadfbea9a2363ef029867d01384a4921564ba431d540da5bad31c14b61a69b4741b3f6f78d
+EBUILD rspec-core-3.8.2.ebuild 3180 BLAKE2B 9cc99f454b7f32e443ed6acea094ceae7a18fe50440f870789245fb36e89bbf1d7efd745e4647c12f18a08423f89b51222e3991a86f9dcc89568d4ecb63a4b67 SHA512 1d3ca164bf4523e66448757cfee5a4eeaa1d9b8050943254cb4202fadfbea9a2363ef029867d01384a4921564ba431d540da5bad31c14b61a69b4741b3f6f78d
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild b/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild
new file mode 100644
index 000000000000..5103fd0576e3
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild
@@ -0,0 +1,92 @@
+# 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_TEST="none"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="highlight"
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-support-${SUBVERSION}*
+	!!<dev-ruby/rspec-core-2.14.8-r4
+	highlight? ( >=dev-ruby/coderay-1.1.1 )
+"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/coderay-1.1.1
+		dev-ruby/syntax
+		>=dev-ruby/thread_order-1.1.0
+		>=dev-ruby/rspec-expectations-3.8.0:3
+		>=dev-ruby/rspec-mocks-2.99.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Avoid dependency on cucumber since we can't run the features anyway.
+	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+	# Duplicate exe also in bin. We can't change it since internal stuff
+	# also depends on this and fixing that is going to be fragile. This
+	# way we can at least install proper bin scripts.
+	cp -R exe bin || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
+
+	# Avoid aruba dependency so that we don't end up in dependency hell.
+	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/support/aruba_support.rb || die
+	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
+	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
+
+	# Avoid a spec failing due to path issues
+	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
+		spec/rspec/core/configuration_spec.rb || die
+
+	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
+	# dependencies, bug 662328
+	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
+
+	# Avoid a spec depending on specifics on local networks
+	# This fails when localhost resolves to ::1 which may be a 
+	# ruby regression in the drb/acl code.
+	rm -f spec/rspec/core/bisect/server_spec.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}
diff --git a/dev-ruby/ruby_smb/Manifest b/dev-ruby/ruby_smb/Manifest
index 0d734fe10556..f68b57429fda 100644
--- a/dev-ruby/ruby_smb/Manifest
+++ b/dev-ruby/ruby_smb/Manifest
@@ -1,7 +1,9 @@
 DIST ruby_smb-1.0.2.gem 150016 BLAKE2B 4d661a12fee0430be8e071069d8457d4a11f197087bd1cf208f206e705285ea236a445a9396d13868335ef67c4ad7972890ffa22fe2efc3c98ef0d3503474033 SHA512 e8c1314d34e282bb117ea5587b18a41c25315c515cc5141d1a4bc98b423c25ac923e5c8836eda039f201204f82587bfc3d2ee89193277231424b99f512b27a59
 DIST ruby_smb-1.0.3.gem 150016 BLAKE2B 0958a17c1140a543d3065c147a534d5426529fbf1477e3ca2624317a4c21907f08e1e0e0690c72415ba6c0577fd611c255637ea8adc48f1d934b2fab253e5130 SHA512 7649d064618ecb28b828c55ab5184dcf13a989dd0ddcf67e431fcc8147308c649b5a8ce7b826451487eb19a9d1daf0bb22d6d9288a0108a9cc771b364a11be13
 DIST ruby_smb-1.0.5.gem 157184 BLAKE2B 6865e908bf57a5785d6b2523a1dc78a0fb5f63f47103fcf757c28b73228848feb7b2f05ad3286df6a52703a956854aa243fdc6d26c2841abb497b6e09449b38c SHA512 af4bd0cd40f8be0f12b204ded7ef9832de31bdadf4d0ff7f05a4addb1300827ced4f0588131c31638797f1f294230e0c61c4829fd1962043af452d55bbe133ee
+DIST ruby_smb-1.1.0.gem 175104 BLAKE2B ffa4a7b3666f736fd721c8d561c28724709c7db6a2a4075e183a0a931e5df0c8047e428a2537a747eda9482d9023c2ed8fd8157d1b40244615b3818dc0c0bc37 SHA512 038ca625b580ac32455d08c675a5d7319e320944fe3aef6ed7272872fdc6affbbf2bda325897369cb23d4d62e24923a74b13fe392017854c6c5b9889c5e003f6
 EBUILD ruby_smb-1.0.2.ebuild 780 BLAKE2B e1b43811ae1c55325a099454ae50f37ac5768a31035d0fe37f1298ac8615c6cf529116dbc6eb9766c0b422f25dfdbe6ae045aec83313f9a015fa0068bac98061 SHA512 50a71097d7d113e085d7b3badf38ecf97f6e7c5a99d9113067a4e1c486d11d374ca7f980e77f702eb7a310a778500946f9027e79d9381b5cda6963c1db7b1be5
 EBUILD ruby_smb-1.0.3.ebuild 780 BLAKE2B e1b43811ae1c55325a099454ae50f37ac5768a31035d0fe37f1298ac8615c6cf529116dbc6eb9766c0b422f25dfdbe6ae045aec83313f9a015fa0068bac98061 SHA512 50a71097d7d113e085d7b3badf38ecf97f6e7c5a99d9113067a4e1c486d11d374ca7f980e77f702eb7a310a778500946f9027e79d9381b5cda6963c1db7b1be5
 EBUILD ruby_smb-1.0.5.ebuild 784 BLAKE2B 350378e7f768e540de8b0891114ab3b0116f39772ef91845cdbc86dc05b5dbfa308d12044af3d8283861045099921e7e92cc7b6beba590b6f9dbece97d1444f5 SHA512 5e6d91377861ad872612b7bc62c129cfb771f9770b9182243076a9c2a43ae3b401f04080709a564d3c155fa45ffad9c0f15df8b318f045749c90c1a82d77b1d4
+EBUILD ruby_smb-1.1.0.ebuild 777 BLAKE2B 90462dfa39b56cde398160ceb55c824d439db2d1a8489ed056ffe860303db303c77efabdd11b891ecfe5b8db6b331452763e1b695a34292e4e348c3dbca73626 SHA512 2f15f4aa6208b241e77ec02eb8d0e4ffb87c9cf3e7194d88851d3042d8154e7e8de5e73b631e554867c79ecf792755dea493d7d2da7b4241f5118b2db5e9da46
 MISC metadata.xml 327 BLAKE2B 54b35b9e00051b0f0d0d8edc8ef6726c756c3050a3ea51b83213bef2fa8d5f91639819d849fe05db9f27cc8960cba7a100925dadfe4d0b9db685ae2fa05a9081 SHA512 596657669aca98301cccbd30cb719709f4dd36f2c829f9a44f3cc133aa8857f3167f9fbd89791c814e67312369acb92792ea9e230a510ef3dd2aeac64c3c1ab7
diff --git a/dev-ruby/ruby_smb/ruby_smb-1.1.0.ebuild b/dev-ruby/ruby_smb/ruby_smb-1.1.0.ebuild
new file mode 100644
index 000000000000..caa2f415553c
--- /dev/null
+++ b/dev-ruby/ruby_smb/ruby_smb-1.1.0.ebuild
@@ -0,0 +1,30 @@
+# 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_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="pure Ruby implementation of the SMB Protocol Family"
+HOMEPAGE="https://github.com/rapid7/ruby_smb"
+
+LICENSE="BSD"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/bindata:*
+	dev-ruby/rubyntlm
+	dev-ruby/windows_error"
+
+all_ruby_prepare() {
+	sed -i -e '/simple[Cc]ov/d' -e '/coveralls/d' spec/spec_helper.rb
+	sed -i -e '/[Ss]imple[Cc]ov/,/end/d' \
+		-e '/[Cc]overalls/,/end/d' spec/spec_helper.rb
+	sed -i '/TRAVIS/d' spec/spec_helper.rb
+	sed -i -e '1irequire "rubyntlm"; require "time"' spec/spec_helper.rb
+}
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index a12c3c221fae..45a5476f9c51 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -1,7 +1,7 @@
 AUX auto_gem.rb 159 BLAKE2B f5091d3df1318606e623a3bde402bb51b693875ba9504e0a48a911de14d904116d62a99eaed64d0cd5cee28c58f3d003e56c78df5c40025594fd7ad22a1eeb1d SHA512 e42e790013d20335ca5319803518102593408d077f22c95dcb08969c69d3a81e49e47cd002715bf760bfcd9a29304002354d8add42fd2415fb10a0a2a323d64c
 AUX auto_gem.rb.ruby19 509 BLAKE2B 3aeb669d0dc6c6016091375adf8df8f8a2b810d40e11b3142669098d119369c4294c5d4758d1369fb2479ae3766d8e1421daa0076e2da4f66d00f9e0ed6584c1 SHA512 2b8f4ae00fae383357dd1eb1159ecf1689cb5b79e996688ae091a157b9f27e980761ed8a771d9d3b954d325f817972c4d02f4b5d3c8f4307d2cebce7651af666
 AUX conf.d-gem_server 81 BLAKE2B 2019f1b5085a824e1a9e0551a8b224391b1db777f15aea7fa613faa1c7a51f6c0015f92c16a95c0c368ad701c125307c0535ca1029891345476636fe45289fb8 SHA512 71630a0530ec62f4024d9bfc4e6afe1f409f3bcb5d71ee5876d1e190c9e69016571ca8f500fcc7ffea6cbc36a8dab5eef2d0c61f72de99f2776c9137010b9ccd
-AUX gentoo-defaults-3.rb 1692 BLAKE2B a7f20c82b76eb22749cc2e0ec2c9674a0da35d8adc8f12c6b1bd441dd157e04c88168e43471374754b0f0af6b58d854fbd714d3ef5583e973954898cbd4fe57e SHA512 c56f171de57aba6ee268a519f3dda79fbc5a6c16872c76f66b02cbd245680cfc1c21f7a6d97863c96f60fae46ca308eca1453a3d9465dcbfe7ebf0fe0d65feb7
+AUX gentoo-defaults-3.rb 1899 BLAKE2B 5a0d83e40bae62ce76e1caf609cc931aaa6cd40ff41ccdc68f0bdfd9559b8691dbc7293d72715b0555122c8c87e695660e8ebff326a2b2805fbfde8711318e48 SHA512 5da2b92f6ca56ed3fa9e51258f9e5c13883c8da34236b609c0d43ef8b788b97a6d5fb2ede235340d8ed99c0c09b32ff76bb6a3f190d55b5b2e1832f66af0d3cd
 AUX gentoo-defaults.rb 972 BLAKE2B 4353b782296ad04f400fbdbd67dcc2f26b23a9bc4a716d107a8f98c5058676c675eb42e1d5e0a7214cd74df9148d54220c0202189938c45f4000301e52a3a73f SHA512 fd5a33c433041efeefba4bb8d550b8db66f31d4c0966188f07943f4f575ee9e13da6ef6fd66f89a4b3b979c5b310d96e2876407b79aee6ed404ca3027859160c
 AUX init.d-gem_server2 505 BLAKE2B ea5807a1c8ffdaa61bf37315c71d910bbf2bf4b0b4c62e3cef3b76176e9cc1fc39272f59bd46e55e17427f730315e2c691fa3f471c1cbf697073c45c0c7589a2 SHA512 fc2c57f4deebf479a36e69c3507f109abeda9f73b22bb2e617f56e6be0069af075fa6d66708d7324922f3d8bfaa96bd8c71292d9e388e27217cc7687ab4004e1
 DIST rubygems-2.7.10.tgz 863618 BLAKE2B 26a453d2808cbf03caa6f2ef4a829418de58f4ed0c7584935a0ad5fc722d7fbdf9f442261f96fdca4b6975b62608965d2f0053d3046da59771be373bed21154a SHA512 48a18c0f202f463c38cf5dafecfbc7cc39245e63c7a059ef2cefadda478483794a929ea6b7e0ef062dd4423230746f1f09d7bec06a97fe3ceccc3325397a3e71
@@ -10,7 +10,6 @@ DIST rubygems-3.0.3.tgz 904175 BLAKE2B d99de4bdd51779ab214bc4a81f55483341a2c193d
 DIST rubygems-3.0.4.tgz 883664 BLAKE2B d5ec493657c055561aa9c0c09719529857706db197bf266ef4c51e48e6f97c08d85a8923b0c6fd72b3fd6ecb584533ff8ca56515c555e9c5b786b0d99ad2a16e SHA512 887c64226ec0b32d33f2ea331936683406d54dc74d19e658a23521e25ab50aa23534fe9eecaf696154247ad1df1d24c233d8900b9aabc79096eebd6afef3f775
 EBUILD rubygems-2.7.10.ebuild 4594 BLAKE2B 1b448c807fc5e0957637df619d92fd1f93498014df2736e4ae1559cd5acea221a7c7ee7d6f59988e43ab2815295572d785ec35f9780adce0ef16904619e343df SHA512 b8bd564cb2cfb80b8b458356daefcf93ea138666ae16a37a0c0f176fcb7246d09bb24a76c48bff425af69804c796c5a3323ca0dea28af898c8c84706396ab699
 EBUILD rubygems-2.7.9.ebuild 4397 BLAKE2B dfda01f88b60b4c1a3d13ab2a2e136fd95fdf39a588f61e264ff6d125deda5ec45a28a0f653af1ec6cba2c1190cab9a94f90aa726ec04baddfb8e5daa27cfacf SHA512 18b691805bf137759852bbabc75f7d4ffb9cf4aa3d6a91ee79a97abc3aa340761e31b266ac4cba8e72c602221e9406058b7203dc397293922e9e1823ddb3a9bf
-EBUILD rubygems-3.0.3-r1.ebuild 4741 BLAKE2B 0dc9cc369992c68478568ab3056443f96f57d17bae1eaf0c07b641b1c445e4dd08e0f18fc573133a8184d8a1c3929669606e3b48259d43cda1b2d40b93e0b841 SHA512 c971ddcbf8119ddabeb50b08ecf2c7a695285b6bd6bb02bd698fd238cf9409ab24844b491ad520a8a9240c1452dd2cf4690356a5bd3d30e219318d37f6d2be95
 EBUILD rubygems-3.0.3.ebuild 4733 BLAKE2B fa821c214ebda0e0b260b58cf8c4dc7756686277120add9f4b3a361eb0aad996abf24a1b5b3b903b13e17fba6f96af41adf8831f77610df1622cd94681643395 SHA512 b71228239dafdf6fb013fa2ed1ec5c99d538d6171c7c1863df6c6613ed74c0b3e8474c29d7a63f5385a460b952db59534e2abe9f20831afe561264f97777a414
-EBUILD rubygems-3.0.4.ebuild 2588 BLAKE2B a2b3445ecb5dfaa05acff03dc23081c47c8ae505e2e0170ed17d8d302bb2d03108ce88a3bae2efe57b4a5a1ceb88f100be7ab978798b5d175f09da1914e38b70 SHA512 98d31eb3568479113c1a5a9d30c904391841d8401983a4861ddaf06498e878824e6010d0bf6953a7caa9bfa6d79b9491375d5fa9425ae296f0a0e723990c61b3
+EBUILD rubygems-3.0.4-r1.ebuild 2588 BLAKE2B a2b3445ecb5dfaa05acff03dc23081c47c8ae505e2e0170ed17d8d302bb2d03108ce88a3bae2efe57b4a5a1ceb88f100be7ab978798b5d175f09da1914e38b70 SHA512 98d31eb3568479113c1a5a9d30c904391841d8401983a4861ddaf06498e878824e6010d0bf6953a7caa9bfa6d79b9491375d5fa9425ae296f0a0e723990c61b3
 MISC metadata.xml 335 BLAKE2B c86eaf3d37fad025b8f6ca0b03e65b1b472716b4fda4ca4d08b415b29a63405d8e7b2684d309091c90411c5fe809e5129c6e0c0c4e7a982b4aa062ffdd0ca7fb SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e
diff --git a/dev-ruby/rubygems/files/gentoo-defaults-3.rb b/dev-ruby/rubygems/files/gentoo-defaults-3.rb
index b8ad8f1227ce..9d499b73f89d 100644
--- a/dev-ruby/rubygems/files/gentoo-defaults-3.rb
+++ b/dev-ruby/rubygems/files/gentoo-defaults-3.rb
@@ -44,7 +44,13 @@ module Gem
     end
 
     # Set Gentoo defaults for gem commands
-    undef :operating_system_defaults
+    begin
+      undef :operating_system_defaults
+    rescue NameError
+      # Avoid either runtime errors or redefinition warnings since
+      # this method is not present in all rubygem versions distributed
+      # with dev-lang/ruby.
+    end
     def operating_system_defaults
       {
         'install' => "--install-dir #{install_dir}",
diff --git a/dev-ruby/rubygems/rubygems-3.0.3-r1.ebuild b/dev-ruby/rubygems/rubygems-3.0.3-r1.ebuild
deleted file mode 100644
index 8c6d1f49acfb..000000000000
--- a/dev-ruby/rubygems/rubygems-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,120 +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"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="https://rubygems.org/"
-LICENSE="GPL-2 || ( Ruby MIT )"
-
-SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="server test"
-
-PDEPEND="server? ( =dev-ruby/builder-3* )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/json
-		dev-ruby/minitest:5
-		dev-ruby/rdoc
-	)"
-
-all_ruby_prepare() {
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults-3.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	sed -i -e '/assert_self_install_permissions/,/^  end/ s/^.*RUBY_INSTALL_NAME.*//' test/rubygems/test_gem.rb || die
-
-	# Skip tests for default gems that all fail
-#	sed -i -e '/test_default_gems_use_full_paths/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-#	sed -i -e '/test_execute_ignore_default_gem_verbose/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
-#	sed -i -e '/test_execute_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
-#	sed -i -e '/test_execute_\(default_details\|show_default_gems\)/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
-#	sed -i -e '/test_execute_all/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
-#	sed -i -e '/\(test_default_gem\|test_check_executable_overwrite\|test_require_works_after_cleanup\)/,/^  end/ s:^:#:' \
-#		test/rubygems/test_{gem_installer,require}.rb || die
-#	sed -i -e '/test_\(load_default_gem\|default_spec_stub\|self_stubs\)/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
-#	sed -i -e '/test_uninstall_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
-#	rm -f test/rubygems/test_gem_indexer.rb || die
-#	sed -i -e '/test_\(require_when_gem_defined\|realworld_default_gem\)/,/^  end/ s:^:#:' test/rubygems/test_require.rb || die
-#	rm -f test/rubygems/test_gem_commands_setup_command.rb || die
-
-	# Avoid tests playing tricks with ruby engine that don't seem to
-	# work for us.
-	rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
-
-	# Avoid test requiring network access
-	sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
-
-	# Avoid test requiring file system permission changes
-	sed -i -e '/test_traverse_parents_does_not_crash_on_permissions_error/,/^  end/ s:^:#:' test/rubygems/test_gem_util.rb || die
-
-	# Avoid uninvestigated test failure in favor of security release
-	sed -i -e '/test_self_install_permissions_with_format_executable/askip "uninvestigated failure"' test/rubygems/test_gem.rb || die
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
-			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
-
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
-}
-
-all_ruby_install() {
-	dodoc History.txt README.md
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(23|24|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-3.0.4.ebuild b/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild
index 34c2df4ae1b0..34c2df4ae1b0 100644
--- a/dev-ruby/rubygems/rubygems-3.0.4.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild
diff --git a/dev-ruby/slop/Manifest b/dev-ruby/slop/Manifest
index 9b2a504dbbcb..6429496a92e5 100644
--- a/dev-ruby/slop/Manifest
+++ b/dev-ruby/slop/Manifest
@@ -1,3 +1,5 @@
 DIST slop-4.6.2.tgz 15750 BLAKE2B a31c8ec895e534be7fe77eb09909c2210d298c1a89099080af816b9e06a5ee2358aef223b1ce0669f9d40cc91c04ce55e8ebb6d506a4bec35fb1fd9b93c0017d SHA512 352d7e5bbbe9ae4c324d1561f953fe28c1c99078bdef27f1be45453e60b34e0191e94d8952ec0a8cee7d689c6ba910616c9515747e81a8378fa825cb2139bfc7
+DIST slop-4.7.0.tgz 16367 BLAKE2B ad128b803876184cddaca5fdc4c8a1c2d20a0deab46cfcc9521cec88dbc777ee849a8bda8b0257281fdcb614a1e710e25b683f9a5f7d97d34ad78e3a1479a88f SHA512 3cbf1c7e2a7f2baf01e533b10f29cb52060dab2d03f69ba345b63cc0aa9d4cdebf1d18eff26177bfbac11bf55fd1167605dcc86d030fed0568fa132de33d1f37
 EBUILD slop-4.6.2.ebuild 635 BLAKE2B b1b4573bf58078650383164ce5823f3db2516ccd0883464f1704f055729b6c8efcd15d72a7c94f661f492fcc65380ab320adfd9a1a3e47628439bd706b21adb9 SHA512 29c726c01afd53335a23f3ddead72cf1243a52ce23597c1176d1ab9d6a9d3a679c6398cdad837cd82a90736f898e3949ab71cd0159ab1715e2db789fdf0891de
+EBUILD slop-4.7.0.ebuild 628 BLAKE2B 7a8be65483e62b83de733de381e14f8deaa685153533c7bee1e873e4f4df8330b4666db9d276105b4f8e44fc68ff45eaa4c85568024dc1a34ac1069d1bda3f39 SHA512 f0251e32680d22f7cbd5745d371f874cef4ac7ce14a1730f6062e339e1bb632d5185b39f145902d27e740a482026598d7f6c12c6bf176150d63e36b05d9e4a8f
 MISC metadata.xml 337 BLAKE2B 257bf07d00a3f336c737c4135fae690b12a7b383de865d09fca95667efdfc4d66adcb55343b064c1fefa190f1f7c21c7b3f18ecde8d73e9d7632209ee8adc720 SHA512 2036c518a80c08e41ddec04f397959241a28fdbec0071c98120bbe2fade6e69ef67b1aa46191099520dced091d5aa0d16ae1484d831061c0681315cb0fa3b35a
diff --git a/dev-ruby/slop/slop-4.7.0.ebuild b/dev-ruby/slop/slop-4.7.0.ebuild
new file mode 100644
index 000000000000..9ca73f9366d6
--- /dev/null
+++ b/dev-ruby/slop/slop-4.7.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple option parser with an easy to remember syntax and friendly API"
+HOMEPAGE="https://github.com/injekt/slop"
+SRC_URI="https://github.com/injekt/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' slop.gemspec || die
+}
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index 1d20d9c93bdc..cf8514005fd6 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -7,5 +7,5 @@ DIST test-unit-3.3.3.gem 133120 BLAKE2B 37fc200b121e84046d1ee483277fc1274dc3bbcd
 EBUILD test-unit-3.2.7.ebuild 934 BLAKE2B d5df96a454145a503ae3f297d8d5e415b5df237b8f0055acbdf00ebd2c257fe0b8bde0b2d5879fe9eeb565d0282765e4059d240ae2b0998df79f1f11af9c958f SHA512 1d30f3f653d8c2222710c69fda43e137abfe422d22e883cd38c304d64b0542a36c61b757d31e360f0d5a7410d305c8c866d16f66f16b977076cafdaaaddcacc9
 EBUILD test-unit-3.3.1.ebuild 944 BLAKE2B fa24887a35c21fc805a3f101190be1f4d3b30da8a4bf5ecd44350a63d28f7c8b81d95ab33241437eaeb7223a4a7a4c6222f8d3828ecb40d1216460e06d984434 SHA512 0ce0771892c81facd7ce37a1cb154a98d601d1fde25420d102d9235c42a4f48fe4fa9b3c10e45c860f8a0ce6f986019904746f9021a139f0b811fd75e9121a2a
 EBUILD test-unit-3.3.2.ebuild 943 BLAKE2B 99adbd4cf5e6cf06d2c1af8c019ee93a7ec06ff4a7513fb559b78101a18dbdea989774e5c21e44fb10d4e80742be7c2084b1e6a309a3783f460d8701cba61ef3 SHA512 c12a2457d4f14998a30cf335c56bedb24c75ff4abaf8bd4d011f2359e144c8c57d8655a112ae51dc75d81ff9fc7345fca02586aec1af33e1deb07f11f45d1c73
-EBUILD test-unit-3.3.3.ebuild 944 BLAKE2B fa24887a35c21fc805a3f101190be1f4d3b30da8a4bf5ecd44350a63d28f7c8b81d95ab33241437eaeb7223a4a7a4c6222f8d3828ecb40d1216460e06d984434 SHA512 0ce0771892c81facd7ce37a1cb154a98d601d1fde25420d102d9235c42a4f48fe4fa9b3c10e45c860f8a0ce6f986019904746f9021a139f0b811fd75e9121a2a
+EBUILD test-unit-3.3.3.ebuild 955 BLAKE2B 838d57bb3f608236421d350ef8c97ff6516a01b55013f689740ded7f4853787145a4986a7996a4e9c661b9cb35970de95becf1a4a052abe5bd25ff48bec9874b SHA512 55c0677489c5cdead02a8c39500ed5f022bb2ad819fc4149ff7b6511c99c0d38c18014baa6a8388b845f40a1fcacffc13dfe9f516ef16c69339d51d745c518f9
 MISC metadata.xml 491 BLAKE2B 9bef2b6085dbc82d562f091ae4e136cb7aa0817369b257f77bad4aca6faba4074d4dc70134999f81ea612f70f98c072414e1a92878d349e940df8ad0811304e1 SHA512 ef28e88bb4b269eeaf05f0bb512a6cdd73750247b60c2b4ba6c5b2abdb7b2e946c07bb42e7d6416f30f864378c3fa51b86455be2d3ea4467936602d5742a66b6
diff --git a/dev-ruby/test-unit/test-unit-3.3.3.ebuild b/dev-ruby/test-unit/test-unit-3.3.3.ebuild
index da020d3b86e0..45fa46d7a4a2 100644
--- a/dev-ruby/test-unit/test-unit-3.3.3.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.3.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://rubygems.org/gems/test-unit"
 
 LICENSE="|| ( Ruby GPL-2 ) PSF-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/vcr/Manifest b/dev-ruby/vcr/Manifest
index 683000156bfd..18f91bbd4737 100644
--- a/dev-ruby/vcr/Manifest
+++ b/dev-ruby/vcr/Manifest
@@ -1,7 +1,9 @@
 DIST vcr-1.11.3.gem 87552 BLAKE2B 296651072c30cbba3bf329a9cf2d5eb743f8250fe250ee2794883de2ce7b99e6b4dba06f868bec3b78d7ae8fbea0624f628ebfa48239b36bc0413e3c55339168 SHA512 0d62b0699e42484a4ba385a2ec653881183b44d85fd46ffc1ea693ebb746b225566cdb2799cdb60235c24adecd7575e0f20d743968326eeeb5b24fbd3232354a
 DIST vcr-2.9.3.gem 152576 BLAKE2B 130f5c5eddc2324d3c64df894fd2614fa81dc5ddfe12677c5042ef3206ac5e97cbe8f5286bc4782c2d4cafd0544839fd2a58b001ff0e75baf55feb163609e6f2 SHA512 2d71a84439fb92393641d211372b476bb2b55c70dff8c8f17a4af9fcb3e8f9104e1da860cfeafc8ceea9499023c7f6206124dee36ee9690188cc444bab61b2a7
 DIST vcr-4.0.0.tar.gz 146920 BLAKE2B 19ae33d2f40821d2cfe5c0fc55d5e91e02b8e6ba2bba000c326d993987fd641dd5b4cedd6a8a441f86664ecb67dfe2501d335936af9271fa83aef6dc001b12f2 SHA512 2f98eedd021f7c125fc3f29189190ddc817bb95fc8e8e0ab53e65eaf94c5c0c41f3ca4abf9d829591acdefe97b931943c47129f95c21f2ef590ed500cc6f56f9
+DIST vcr-5.0.0.tar.gz 147602 BLAKE2B 031c9a70c9483b496ed3cda1c65138d214c257392aa5f9157135b0fd4c33d35dd6143afc0e775c5061bb823d936d1bdaa084eaf0024e87747e6101b582d8bd1e SHA512 88e4d82f1c5b3d48c89a75324a256c66858740d2889a4d86851ebb3a303745829e42f20b20d4cbc18d7b0510eb0b229a770bb6209be93dbb8c8b0be84bf5f645
 EBUILD vcr-1.11.3.ebuild 616 BLAKE2B 43e01aefa94e61ac8dcbcf7a8d09a69accac5d03528de23a2d0b6b73e2f5e015da18439fe3d4ed4fb777e31a57a93fcd69f08d5d40c2abc3d6f85fa42fcd4694 SHA512 124cb0aa340da7f76522502030eb3449da6bd013d641c23b455775f2f54f58fcfa10342d4b6edabe0d522e8447d402009d0215f20ffa9e79763f1234c2876bec
 EBUILD vcr-2.9.3.ebuild 631 BLAKE2B 15bcde636a07ecc0725c6582b31896512ea37ebce07b0fe2b02fd7b30ddd9e8d2b5e9463857394eae7675a2107cc74957fd5fb0b719f5b669f0c09a491065e6f SHA512 b648d60625ce195d6e3e95b58c1becdc81cf8144148c0cb0d1f01f95b533aef22516a1eacd3b9eb5cccb83137c0d1011a87303503c218741275f58f1a9fc4b1b
 EBUILD vcr-4.0.0.ebuild 709 BLAKE2B 360617e1a7aff37a255ea03f0af132648408024cbabf3737d85930124c304191824046d0290bedcadffd06cc48d0317165868e4dd970699eca76a70e7b0d9985 SHA512 e8424a267dc567b63e3d9d9da1214b3dcbf03ad3992f5e17dd8bae7436f70a8b0c5781455dee1832dd3cba67aca243fef7fb5159617ee245652ed8eb93e3d216
+EBUILD vcr-5.0.0.ebuild 703 BLAKE2B 46bf583f4250d89f7c4f8a189c7640fd8f5618ca9f5bb90964fd424dfd69977c561213aaf6417dca4f9c3a5a05f352ff854d0d5a5a9be02383016d780a6cf81c SHA512 ece96b85a4582222de655644e7031647149b6a21a907741ee80f139001352c36cb3ef1551256fd3602cf4982ed15347ee34e0f1e2ebf75bf4f45d843f5dd7245
 MISC metadata.xml 342 BLAKE2B 2e7bb825d3f1a6977404c0617c22057a8a0a487ce88c5cb46853b65987ac23d083bd9f1201e74a63a75e32c34862d836446a6fa2d6dd7da48cc33b7905fd18b2 SHA512 1fa01257b99e6ac0b535da28a6b30da72ee4ed4493b9b28427298216ef23a0d43417a5be745af3b10323fb86df38fc34942f0314fcf82d77b0e89e1f277a3431
diff --git a/dev-ruby/vcr/vcr-5.0.0.ebuild b/dev-ruby/vcr/vcr-5.0.0.ebuild
new file mode 100644
index 000000000000..ecf35311d517
--- /dev/null
+++ b/dev-ruby/vcr/vcr-5.0.0.ebuild
@@ -0,0 +1,23 @@
+# 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/xmlrpc/Manifest b/dev-ruby/xmlrpc/Manifest
index db3036e4427f..3223e69f24bf 100644
--- a/dev-ruby/xmlrpc/Manifest
+++ b/dev-ruby/xmlrpc/Manifest
@@ -1,3 +1,3 @@
 DIST xmlrpc-0.3.0.tar.gz 34157 BLAKE2B 862bff09fdd7febfd85ef4fde77a913b77f20024692b1475994b93b394d587f1b2139c82ed7159cc756bd1757ee2fee55f103866c52d4297d8a38be70c066c22 SHA512 370b2fe2ed9ca37fbbc2e85d08328450671019a2dc0c2a31ecf8fc8af95105ccf1b8f728307a5d9cf5f4dbcd93ccfb2f66244b441c0aea1cd1aaca2e820dfe31
-EBUILD xmlrpc-0.3.0.ebuild 968 BLAKE2B 1b74cac22d721ad941b148f4e99830aadeb6abc4ed97820fe010df32dceab1dca9dde20d5cceaed8179e71244ea7c5f88a5fdc21d7652484de6d2f57f21107ef SHA512 e4e5bc5ebbfa1c441da457a32152133b7764de8a860f215a83402b8f4bf185e1f833030e9c77bd8de7508abf38f32b6724ed06c4dc834138561c3727510067a0
+EBUILD xmlrpc-0.3.0.ebuild 992 BLAKE2B 404c6c6552f17bb6d86352b850b4b2ba04ad29612557d43e2ac284447fd77d8a66d45024da843e82bf15e6fe15426d5461c73b99933af82cfb0855d521ef1e4f SHA512 de109069e79e54d37a82969b2791598a5f713dbd7da5b288e7f5049a0f98d6ba478ea831fd46bf5d8157ce95f85b7d76490f10e0a29237144a217317faad3104
 MISC metadata.xml 337 BLAKE2B e45e1b70e063e5f33759c32c987c2afee3283a31fddf4eec4a44c317f65a68926a84af12c5ab9a72e5315033593105dc95d1919fce3de684593755078246ef71 SHA512 94f995e14666100fd2f0e569f01bfcc86cfa319c213f0fb99e7fe104bc9b731dbd06e4e35cb76d94b126b296e1a5b916b4940c59f251a899781357f587f9be14
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
index 15ee011a619d..9ecbdd985be0 100644
--- a/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
+++ b/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/xmlrpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit )"
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index c3beeb3f7337..735ca5ede467 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,7 +1,9 @@
 DIST yard-0.9.11-git.tgz 916355 BLAKE2B e9f27fe129cf93c51dbf83f4a7d5745d385252ba63c90f85223f2e9436c22a55aaba296f263072069d39e4beaca3e0830775a8be121c64cdc2a15afd3539a73f SHA512 375a4878e61888cf73aaa06e9300195ae48b9898d8cd639fa796a067e5fa0b89d6ef62d327a388ee83953e80177515f4d8c070042188e3a1e597f48b82b3a72e
 DIST yard-0.9.18-git.tgz 919755 BLAKE2B ff0f53234880f1cd2d6ba312542ac560aa7a8cb1864a1bc123f855f2183bc1b5d55316e041e33d57aac18c4784575a1e196fe2113de6280d91a0bb69ade236f5 SHA512 754b2344c630642e191c037ec136976dd812c83051803cf10c4c810d267d405ba609dd5d194fafe4b55c0b123573aeae0139e3994cfacc94560a6ffddd5c6c4f
 DIST yard-0.9.19-git.tgz 920950 BLAKE2B 1f6e6dcde4bb364620256fb48d06d94631f1f1b1e914a187cbce72906731ab7319f818655f20fd4b4d1e43a0864004d2b8e20026feb87189c7261483d1d111d1 SHA512 1656e3b8382a04d48efab7b8f1fd8949691da382cc7d1b7ee3838d6ae3d5372b1668b7e454d6fd3394cb8b152ea4a3c048fadc4c05c0271acb80a052d9f8bd3f
+DIST yard-0.9.20-git.tgz 921130 BLAKE2B 37b1b2524147a1a8cb36c3835cce4e7666e2c8d3d5c187eb402000fb251df64111c4f104957ac9d28bd0e8d9328eb1d97571337ae54479626dcaab3cf07625a6 SHA512 b7e035a3598c8ef32fcbaae57254c0fb0cba875606b434571da2ef754f3171b5c42a4b3a45bd4bf41bce368f6fb7e448567f601a9cab5fbdae695bbec1b73608
 EBUILD yard-0.9.11.ebuild 1464 BLAKE2B 0e4ee9f923c5a7fdfa905a50fe8a69b2273795c19e4c0665d015807e283b8cfee92ce936dcc1d08ca2d5c3c1001452ccc7d2e4b9fb1b9097e008de723db048d2 SHA512 0eb51531a2c15800b4af27f4174abd3fe161448f7d275e63673ccd4e6787fdbfd18ab50563b454495e7707d68df90281c3e7b97f82be977095c41ac9ec74dbdc
 EBUILD yard-0.9.18.ebuild 1751 BLAKE2B ccefd0fceda8a2016b161f1c6fae569c19cf8a4c9397c214aa293e3266ee27bc30eaa508f5598997455e0f79c94eed2ed2e465b5d4c00a04dbe48d7f4348b77f SHA512 d4224658f9b23df50b47324bd1c3b02d51154deb9096fc1d408e1382b63d290d2493a11a01699354cf6015fb4f0c699e4efb1adb8c733b9b70b838b815442b68
 EBUILD yard-0.9.19.ebuild 1826 BLAKE2B a55aaa61bbfce41f45214d0cc0e04085cd133004ce6a92ddb6e7b46f8f5b658e093c79c37cff24f069a7839d3a789fddc72bc4ea898f7d3746f2f7c1aa31b38b SHA512 f870e3e54d19d9ff3db152b62664b35d497cb4a4048a0b1961ec4ccc0edf78a816c86e5cdd59c8167f6f2e0ed5b05906caf0242357b91918abd10082c20efbb0
+EBUILD yard-0.9.20.ebuild 1816 BLAKE2B b9d77089273a1a37b9eb06a54a9fdc4a25def27e19d8851d4ec666d1b7e2725621b56e8622fb2aff3bfac384bc9feb7b791124b8adcb83a5d335d3685becd48b SHA512 1e7be0cdfd05d0d9d30a27e387ea64d7b3a39f35e529e72630415ea80aa39366ef0cc21e499974fb7b9d7b9dbfcb0cb78a86ca9d1d89f9b96b99f048e6cf9a73
 MISC metadata.xml 337 BLAKE2B 1aedede1271d1f9a566743dd25b1fd9961e429b78bb5f9f36bd6ea66f631f376a273d7a094fba7121d099f3a4a3f0e7738753078e2a1a554cfe6cf32acc6e2b6 SHA512 0de30cc9c4a9d08649f141cb6df0ee9c05703831603c77a0605f0bf8e2f49b8324a782d092aaa690581e23d6d948fda9781b98770a3ba89ed6bfc0de351c11bb
diff --git a/dev-ruby/yard/yard-0.9.20.ebuild b/dev-ruby/yard/yard-0.9.20.ebuild
new file mode 100644
index 000000000000..b7016cdfee49
--- /dev/null
+++ b/dev-ruby/yard/yard-0.9.20.ebuild
@@ -0,0 +1,51 @@
+# 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_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_DOCDIR="doc docs"
+
+RUBY_FAKEGEM_EXTRAINSTALL="templates"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Documentation generation tool for the Ruby programming language"
+HOMEPAGE="https://yardoc.org/"
+
+# The gem lakes the gemspec file needed to pass tests.
+SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
+
+ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
+
+	sed -i -e '/samus/I s:^:#:' Rakefile || die
+
+	# Avoid specs that make assumptions on load ordering that are not
+	# true for us. This may be related to how we install in Gentoo. This
+	# also drops a test requirement on dev-ruby/rack.
+	rm -f spec/cli/server_spec.rb || die
+
+	# Avoid specs that only work with bundler
+	sed -i -e '/#initialize/,/^  end/ s:^:#:' spec/cli/yri_spec.rb || die
+
+	# Avoid redcarpet-specific spec that is not optional
+	sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die
+
+	# Avoid asciidoc-specific spec that is not optional
+	sed -i -e '/\(AsciiDoc specific\|AsciiDoc header\)/askip "skipping asciidoc test"' spec/templates/helpers/html_helper_spec.rb || die
+}
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index ef5d78b12309..13ea86c31cde 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -2,8 +2,10 @@ DIST zeitwerk-1.4.3.tar.gz 84202 BLAKE2B 8e14790f4a5b5122efacbe89a0d1ede5c993356
 DIST zeitwerk-2.1.0.tar.gz 86684 BLAKE2B 88227fc490a5837131472746b998885e6a3ee0d2b0fdd928bbf16f03ec2dc2f17bd5721d828a33050fa8bc9f280af26fa3abb423e818519779126179e27343ed SHA512 78ca4621f1a9a632e529ecf329ed70a177e87440f285d93191cbc58a152ea0b23a74362981e61f8ebe58f76e26161f5923ca304c80aa4ab1ac72495667b85bcc
 DIST zeitwerk-2.1.5.tar.gz 89234 BLAKE2B 2da03d3e92ebc8e5ffe2a3ce742790b205c3f20002b06eb77224d80311cde7634941bfce3fe358925deca9e1fd8b4d61abf7629f1056bb5533efe378c6004281 SHA512 fa724e2893b830e28e3d74bb6df5f45ac45c233ff4c36908b7743ed9ae925e715c0b1b4912ba2a9ef433415d228a721b8c30316e6a1abe36315674bf9484bf6c
 DIST zeitwerk-2.1.6.tar.gz 89939 BLAKE2B f6385800904ff2f5eb74712324997ba73718d88600aafc083c9820441056dbcea1e042a764587aa26b3a115cd8b531b72b65933b2dcc272a25d85e3f9e7b50f9 SHA512 7e38c98c1dd34c5f87ba77bc1e984933f3bd7da44edf5e822ecd3aadf2d87f352bce1f59aec62f7f605f1e334ac5ed3f596b1c5795596f8b7d7431b9e2c0f71e
+DIST zeitwerk-2.1.8.tar.gz 90774 BLAKE2B b42c56937b5f9709ce05125ab9358012f4132a49f23a3a56f464aed0c20ba7582e77e7d6cb65d2607d75eed089140827efcec14a2ffe8dd1adb3ead3c10fc882 SHA512 14db7e467b45536cb796f7dae4ca96e8167be023a562cc723843b1a63586ec6678ed23cb3307c3389ce5dba099c70dbdd257d23f5ce649af676aea795fa36243
 EBUILD zeitwerk-1.4.3.ebuild 830 BLAKE2B 7b8d3fa7f20752b2e0caf92e9e63ed1f50ad4e759092d20da1e9d1f4cb8389fba1160b533e21d0b46773152224e2cf69e54488357918353c1fc4bfad6843ba74 SHA512 98529f550a67c791df72a0126a9aaf10d11f1ea427540b4551fa02ad0b4a4ff11c6de51fc25b3d95037cda90896528fcce2634960d931a22f48d0e0481be5004
 EBUILD zeitwerk-2.1.0.ebuild 830 BLAKE2B ba7c5aace8be32a1d330a19c4e0b4458d0f3cdda769e89f8b290f76ed1f57bc2c962ab97012307572525a6ebe6b330dee772eef745264bef7e9a4ecb805e234b SHA512 9ab9e0f901b70ee27dc3a0af1cb70f0ac3160fae9bbbae76f82e928ba84c35c4901679ad685cbc753860152eed33207285f740bcf35a1483bd58e222aa185527
 EBUILD zeitwerk-2.1.5.ebuild 830 BLAKE2B ba7c5aace8be32a1d330a19c4e0b4458d0f3cdda769e89f8b290f76ed1f57bc2c962ab97012307572525a6ebe6b330dee772eef745264bef7e9a4ecb805e234b SHA512 9ab9e0f901b70ee27dc3a0af1cb70f0ac3160fae9bbbae76f82e928ba84c35c4901679ad685cbc753860152eed33207285f740bcf35a1483bd58e222aa185527
 EBUILD zeitwerk-2.1.6.ebuild 830 BLAKE2B ba7c5aace8be32a1d330a19c4e0b4458d0f3cdda769e89f8b290f76ed1f57bc2c962ab97012307572525a6ebe6b330dee772eef745264bef7e9a4ecb805e234b SHA512 9ab9e0f901b70ee27dc3a0af1cb70f0ac3160fae9bbbae76f82e928ba84c35c4901679ad685cbc753860152eed33207285f740bcf35a1483bd58e222aa185527
+EBUILD zeitwerk-2.1.8.ebuild 830 BLAKE2B ba7c5aace8be32a1d330a19c4e0b4458d0f3cdda769e89f8b290f76ed1f57bc2c962ab97012307572525a6ebe6b330dee772eef745264bef7e9a4ecb805e234b SHA512 9ab9e0f901b70ee27dc3a0af1cb70f0ac3160fae9bbbae76f82e928ba84c35c4901679ad685cbc753860152eed33207285f740bcf35a1483bd58e222aa185527
 MISC metadata.xml 640 BLAKE2B cdf101dca54d96dc5ce6713aecadb42050e945341cb19ff14088a258384259e5dc4d1668e2a8b161d787d21f79cd8a7c8cbdb47c10997e6ecc3b2ce7ec41497c SHA512 50b6eacea9ea202e3ff44b18046b5db26c5d4ed381664af46f9fecfdedcd69cb470fcc35010a747a21dbaebe1a8360b2f37d43aa22fbba31666704cdd9f39a48
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.1.8.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.1.8.ebuild
new file mode 100644
index 000000000000..e3f56d54a1b1
--- /dev/null
+++ b/dev-ruby/zeitwerk/zeitwerk-2.1.8.ebuild
@@ -0,0 +1,34 @@
+# 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_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Efficient and thread-safe code loader for Ruby"
+HOMEPAGE="https://github.com/fxn/zeitwerk"
+SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	sed -i -e '/\(focus\|reporters\|Reporters\)/ s:^:#:' Gemfile test/test_helper.rb || die
+
+	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}