gentoo resync : 04.08.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-08-04 08:53:53 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-08-04 08:53:53 +0100
commit: e3872864be25f7421015bef2732fa57c0c9fb726 (patch)
tree: 9cb29a544215119b5c5538e37211b994ce1c87ae /dev-ruby
parent: 480486b52ea64765faf696c88b2c6a26a5a454d4 (diff)
172 files changed, 1144 insertions, 928 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 7e4fc0e7b8ef..072363e50565 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/airbrussh/Manifest b/dev-ruby/airbrussh/Manifest
index 518a7df8b26e..2d01b4a3205e 100644
--- a/dev-ruby/airbrussh/Manifest
+++ b/dev-ruby/airbrussh/Manifest
@@ -1,3 +1,3 @@
 DIST airbrussh-1.3.0.tar.gz 1451304 BLAKE2B fc7fb26606efbd2591d707bff43c9bb9d1e712d4338e6151c7d5bada99f555f0dd1fe3e2c925a2e4c9bc9d0aedf9d63adfacfba77f84c07a174a2997e873db58 SHA512 e7c22f21673f11b124ac0082cfec19dc12764f52058857248619bf41841e6b10b2c402d9c17a2db76b459ec5cd1f464d2c2ef78fcf0a202ea2287653980bf10b
-EBUILD airbrussh-1.3.0.ebuild 901 BLAKE2B 176a887d33a16c828cc321a65964e465efc146d7f3caf522dfe5040d602d94d461dcc3e922918f0f81dc8307ba1ae4e55dcf34f1ea4c5ae950c1ffd8e5fa402a SHA512 539b1493cecfac821a6711e6acd6669a5ddf21d3e002ca4a93ac7a87669a1763a4b79908f239f851db4bbe3a529c631ec8051106ea26f357ac5c59bdec5dbda4
+EBUILD airbrussh-1.3.0.ebuild 901 BLAKE2B 9e23bac7593147ec543845ec2540fb0db7089db3249a55ac54af27b10f5928dd826adc9600329d9f44825d9466e7853f0ea662ecce54ccf4689f0ea814b43009 SHA512 ecb5f376a0bce1e71d7b459882ed5d5d633e2113521b628481b1f7645a83ead5230691f5747d89a280e4142a8effc4fedd61265cad60c7fc43a59fa38326e477
 MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/airbrussh/airbrussh-1.3.0.ebuild b/dev-ruby/airbrussh/airbrussh-1.3.0.ebuild
index e91485fe7340..377f79834d97 100644
--- a/dev-ruby/airbrussh/airbrussh-1.3.0.ebuild
+++ b/dev-ruby/airbrussh/airbrussh-1.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
index 72bfd6b54af2..e56a980d0e85 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -1,5 +1,5 @@
 DIST asciidoctor-1.5.5.tar.gz 543437 BLAKE2B ff3530825a495ee222634aa871f828069fd5c1ec1ab3c4513f7b0e74af3c4a78ee4ab0f0764f8d7dc698484d2acb962dc4fa8ae6a2c7f6c365c08a65a3044afa SHA512 6a95c2e48314a1f44d6398d83c490231baeb4ebea8d8c0e0ef361c884251fe054d48afceccadfb6c34947946920731e0194fc3e398b8dd8b8b320ea9d37f1f66
 DIST asciidoctor-1.5.7.1.tar.gz 565182 BLAKE2B c697ea1b371a9ec26ec3277e043275ed3672bad104d34553aa442723797df3cc4e5a48447f806dba53fb3a142760f514bff74b189058260f621c8b63f8ad02b1 SHA512 4819aef93fb301e5378871935370fe37671446ecdedf76853cc0c19a6a5f3f0e2debbf2afb8ba7287f866fb57903abdfe6d845e1ccf24dda4347ec9c92624c3d
 EBUILD asciidoctor-1.5.5-r1.ebuild 942 BLAKE2B 154f852f7422e2751ff609f3dfb3e8a5dcb62eb346a89d4f3a51fd8afe1a9a0d326fd412ed90bbe5bc160c26a0da025d276476a6805059a1fd5381d9bb8f0409 SHA512 13ad9922e3c2d33b800b4c2e3d3dc519c8db6a50df5204061509be75f8a7c33ecb788bcccbfef21f81315f407db1b33caf84490dd634ecc4c4fff61570cf32d4
-EBUILD asciidoctor-1.5.7.1.ebuild 958 BLAKE2B 3366671f6f5f38c071d9d028f3f4b41335b08754a8406f308f539a01c72352bf94870f631c40c25c814f25b0054cd1682975457a15f5204d90f798fa3c2fb1c8 SHA512 795b7921c26379e9fd13642216df4e120c0e3d95a14264a6e4c56cd82a50384154854132f15b304367b8019f28f52cf5207b86b5a71e84806c081573c7f0187f
+EBUILD asciidoctor-1.5.7.1.ebuild 957 BLAKE2B 864dd4382d42d1cf35cb5988b412cab82a323f331aa3dd2ecd971561ce8ef213aed0fac25c5fa72d76cd4a2d225ce234ec98306b6ad11db23979d1f7f6012960 SHA512 744830a88825bec64e95b2215229d31f27bc5277f9663d1fb7284069a6f9a164c5bfcb32a32d073e1162b927fa8d9779c37017be5be5d1b780844dcfe429483f
 MISC metadata.xml 349 BLAKE2B 65a3f6dbbe523d1017d78e939c291e40edc3429d06ff16bd0f8150f3879e2b0840619653115be43c876d1cfeea8e95a3e29fea7447b18bc28bb0218ac03f11c1 SHA512 e3ed6253349df933eb4656c972f1a6cc71567c27a721195abceac0d28bfbc991cbda8772f661021c3cf954d2a917730bad54982e319655a204b6b30c1c67c6d1
diff --git a/dev-ruby/asciidoctor/asciidoctor-1.5.7.1.ebuild b/dev-ruby/asciidoctor/asciidoctor-1.5.7.1.ebuild
index f810a893369c..04ccac392de9 100644
--- a/dev-ruby/asciidoctor/asciidoctor-1.5.7.1.ebuild
+++ b/dev-ruby/asciidoctor/asciidoctor-1.5.7.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~ppc ppc64 x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/asciimath/Manifest b/dev-ruby/asciimath/Manifest
index 9b0e74bb3ccf..47422403a645 100644
--- a/dev-ruby/asciimath/Manifest
+++ b/dev-ruby/asciimath/Manifest
@@ -1,4 +1,6 @@
 AUX asciimath-1.0.4-backslashes.patch 1246 BLAKE2B b34cfc0ac9fc57780ce24e6aec242c19bb667b254c95eb306093d94dd0b1d8554e23911e74ba1f595622dc2533af0d9002108a2fcb502acb38ebc0a1d71c41b0 SHA512 3c5ea019fc0d1c71b156dc9a6263211cb1bd3c69c4b9c390f1c3d10a4504e281e7cacaca68efa7daeae6af1327931ff99124c8c498eab9a8a04d6313ea1260d7
 DIST asciimath-1.0.4.gem 14336 BLAKE2B 84aac2d2b987f72a17288cee6d00197c429e04c216fad62ecd23b5f3eebe9590ead519df86cdaf99246dcfee4c18bab67176a0d47a1b864de6e44bdb4b90b70c SHA512 e99e6f869dda3e0236392039e6dccf5912b095e32ee7acbfb4684a5d723d05f4d3c9961554d5beab2a3d703b1ef50c45ed15c0dbda2179ab35d3b1b6b8759b49
+DIST asciimath-1.0.5.gem 17920 BLAKE2B 119a4c8639a3fa1d67ba745a988fa2c3e5bb1290c2fa5237e9ee4f4945e1ac57cd3789a7131ef1d95ef1f30c3155820187a358d842e3e27788854f70bed89c42 SHA512 7353d052b80825ea5944de7fed67acc02eedbc78c112e1252d49993eb454f59180076b75d92f259c0c1c51bd63436c4aa9b6eefa2e8e6cf70b1de4ab941b43dc
 EBUILD asciimath-1.0.4.ebuild 532 BLAKE2B bfbcb5e1e5913beb328aebbd24cfbff7878e8020c284c9486adc39c0ac26a23a61baec00ad40de4308a3d4f48ff7e7ffdef52d3a19a7ae9095759e9dbdbe04b3 SHA512 ad5633bc2670e4f824c309f316df11f6b6c1b5a63a9ed81f444789e86d69f5adbe28754d032ea3442a113284cd4b5905ad79089f30c174a14a26f64002a494d6
+EBUILD asciimath-1.0.5.ebuild 538 BLAKE2B d10fab4ecbe6dc13e07d5e170f40feb3bf19ef5d70abff187a38ce662b0575e8f1058e29f242f9c576adebec0bf23b9839d6bb2d8d3b65234c8ed8436043c2c5 SHA512 a7846d336be425006dab8be82ae5f1d3aae62b5cead1abfe98ff0e6ce9337b73d3d5b9b63e6b9e3734cdb48236ce8710780dfb32bf298910856642f7f494a576
 MISC metadata.xml 344 BLAKE2B 7979667ff10553d0f1c80a34a03bca56057a4dcf856440b9f9bc4ea64aa018da426601b76dff578625481cb51f7384c7716a3aa98670f178c4209ad39a9af9d9 SHA512 606dd415c7a141188cc94a7d56c67d42be1c2420f8ba9ee7a44707b99a6035df1cd8d358de575e12008f0560aa2b87b57b5892c67f3d931aa28c5938373a8075
diff --git a/dev-ruby/asciimath/asciimath-1.0.5.ebuild b/dev-ruby/asciimath/asciimath-1.0.5.ebuild
new file mode 100644
index 000000000000..0b13ddc6d202
--- /dev/null
+++ b/dev-ruby/asciimath/asciimath-1.0.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby AsciiMath parsing and conversion library"
+HOMEPAGE="https://github.com/pepijnve/asciimath"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+#RUBY_PATCHES=( ${P}-backslashes.patch )
diff --git a/dev-ruby/atomic/Manifest b/dev-ruby/atomic/Manifest
index a54034fc3de1..de184358304a 100644
--- a/dev-ruby/atomic/Manifest
+++ b/dev-ruby/atomic/Manifest
@@ -2,6 +2,6 @@ DIST atomic-1.1.100.gem 17920 BLAKE2B 47c96c49a572a6d6705b952e419e1a07f3b06de4e0
 DIST atomic-1.1.101.gem 17920 BLAKE2B 50f4efc215293e931380b6307231279b3c5ca055aa8082fee8575963a68b3d54262449bf45fb1a514dab18f53a1dd9e0467a0f7ac67dea7a45fcce09155721dd SHA512 59c82fa5ec984b7ecd97964ea075ea327511fd4e71cc5ac72d3fb573b777c9fb289f462d022ea1e0256b38dc369c9f7fa7a61b7af877bd06ec94252237111e8d
 DIST atomic-1.1.99.gem 17920 BLAKE2B 814406dc3e38a3ec882eb47e20e6153da9f68c4dd6ba3bc3d3869c0542754ba38678512872b25379b12d902ad6f740b1da974680867d492d2c4620091c5a32c9 SHA512 9c7762f6c32d11b2c5b45be68954ca12c753d2b4683167158a037ce791d72b13d940beef5bf6dd445c8b12e358c62d2a9f43a609fb3b7c7357fea4f66316063c
 EBUILD atomic-1.1.100.ebuild 772 BLAKE2B 20b30483123fe5e082f7f6e373e40b04693a5d4f232f956e186559c7fde98d9793ef8b6e293b924e324cc7a0c5370f16c767e056249681b1f75d9a7dfb7a79dd SHA512 7bd017d22401a6c9f5b56943bd9cb5fcb2e175d1f7d4bbb6ac997347c9bad88eba9e587a82d3f48b40030d1680fb47aa5ca763dedffe50b7a7c64362422330a7
-EBUILD atomic-1.1.101.ebuild 760 BLAKE2B 52e09ad11910b8d8810ff494109424412c791d64ace59623aecbe14b5ce34a012952d3bfecc07c7eb74d63cec2b13fb5068194cd8261ba748a7170e353edf963 SHA512 8a85606f8d9855b34cab062c7d658cd9338bab6846bc0a88d885e8db36e1f277aaa0739e9d42ab99a65b6e4e8d128c74dd09575a213682b9cfc0f2489b4f5295
+EBUILD atomic-1.1.101.ebuild 759 BLAKE2B 5f193c3e7baaad5b96b6db0ac81021a8fa3d782939e340e15f452266c75ab7d38207bf94949889d691e6d2dba6f9d2350c34306067533e67c42a620e56fa7af7 SHA512 c1bbbcfa0aab2fb49a685191680d5923b93e2385b168d3a62dac9a26022c547602c69e82ddf9fd0d64399a905ffa3699246aeffcfddf9be1cc2becdafb875b71
 EBUILD atomic-1.1.99.ebuild 769 BLAKE2B 72539198e33799e07965a974e4e96afe6494e749380fa0fd3b9f34b4eae5bbf440b001087c58fc11c9dc222f3427e639e1bbf4afece065f8521fb3577e7d3b51 SHA512 6e33377ff01b28431bdac42ab33a879ef4bb894ede658e4525439dd32031f1594d4b719cf170a35ac153837fe47f083a116a5eecf911352a8c96ca73043f7e2d
 MISC metadata.xml 345 BLAKE2B 64598e451aa2d3e6225aed11977f43d379ad3d26c0f6366dfee9651544e3c4d565a342d61fd1a2f0d176a5cd0e5f97ad1ae5c1150d97a24ff3472e49eb30d446 SHA512 2fc1039a507f87fab12c537d790d538c6e9abada720edcf9de3748e5d81674f4803221ec940a7f3abc6b12f7c9ec009a2960d88e00b45caf2216a23263e03f8f
diff --git a/dev-ruby/atomic/atomic-1.1.101.ebuild b/dev-ruby/atomic/atomic-1.1.101.ebuild
index a7c394c0b3f9..29991cd53744 100644
--- a/dev-ruby/atomic/atomic-1.1.101.ebuild
+++ b/dev-ruby/atomic/atomic-1.1.101.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/headius/ruby-atomic"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/bcrypt_pbkdf/Manifest b/dev-ruby/bcrypt_pbkdf/Manifest
index be873ef83686..10c02eb97fc2 100644
--- a/dev-ruby/bcrypt_pbkdf/Manifest
+++ b/dev-ruby/bcrypt_pbkdf/Manifest
@@ -1,3 +1,3 @@
 DIST bcrypt_pbkdf-1.0.0.gem 24576 BLAKE2B 0d5b1d90d57dbae986fcbb92cabb0ea598d6b928dc97026e8d2078f41898e0c143544a004a561c0a392504baa4b845a27f9c1e19c369f6342f7ace9de7f04d3f SHA512 b582407617633f5277cde9251ed1fd2ca408ae8bd19cc73f107d7932bed38061dc0099d3033ff5def1b586507392c33d8c50815fb156322f0dd08fbbe4a8e967
-EBUILD bcrypt_pbkdf-1.0.0.ebuild 1083 BLAKE2B 26985143bb3eec894d8b0661c637cf3379f7a981cf37e68c24a3be95b95d7ad3d2ec2458bf504f85cb378667406df350cfd83965304c10d26357be66ce768456 SHA512 2cf64562f088d731fa74e59a9bf59f74b3133f747fb8bc6dc2602c39f6a1d045e14f1f7029bd711ddcf0cd4573434fcd79af945f4a3f3ff797499e0d372316b2
+EBUILD bcrypt_pbkdf-1.0.0.ebuild 1082 BLAKE2B 9ed220be8cfb2ce989444f58449a852d66c48b102d7d18b1310e26a5f6025e3d8d8a55b2082b6da55af068cf724969929214b50476d984e40bdc7433f917670c SHA512 b73d77ea15fa14b130fc16f76fe3cb5c644333011af668a0b59c5567042b799fa4d7a0a2f818d4c293896794118f73b5b69b87799956e78728809ba82f56b180
 MISC metadata.xml 351 BLAKE2B c94f203ff5c3e7f1b17922c986b5559eefafba479f71868c675bff11099cba93a4d1102f65f5bdff1d1f8cf6ec58d43dfdea33bf9b1301dd22deded3b8e1c758 SHA512 03184605cef97c6fe2390bbf0b4d33d83faf6c05798bea8af352b96f844be84cec02f1845a77f841cc06645ae791cf5c16beeaa1da4967de6ba0c8e1caab04fe
diff --git a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.0.ebuild b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.0.ebuild
index 9e52946a4e27..5cb9a22043f0 100644
--- a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.0.ebuild
+++ b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/net-ssh/bcrypt_pbkdf-ruby"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/rbnacl )"
diff --git a/dev-ruby/builder/Manifest b/dev-ruby/builder/Manifest
index 1381e8205b78..ddb14d01c311 100644
--- a/dev-ruby/builder/Manifest
+++ b/dev-ruby/builder/Manifest
@@ -1,5 +1,3 @@
-DIST builder-3.2.2.gem 31744 BLAKE2B 12d01b4f214cd0f3133c0af309435229f60f4d81876e48860c52b9032241b13ad2a1a02ea584ac6294406b3bbe937b9101d57b77ff60faa1b7ea24c7754f10d8 SHA512 785c0b5ea6682b590d3b92544910cac2d26d1b4906f0b0b502913c6c95365e173178ac1ec74d1dd0afe9b9fe6aac4d7f2ed712bf444682a029b86cdcd1787afa
 DIST builder-3.2.3.gem 31744 BLAKE2B be970ffd29f146faea5e7a9d76fedb513ce9bde3ed21ed7a44fe7d4a81e3836cecbf62f3f4c19f0b1e333f607b8978d9c707f4af76613592e966cda7e537bd1c SHA512 7869f44bcf40d547846d50ab82234694420b2f38e08037ae671c90a7c3b547f11023f864e70adf82970fdddf7ee811730c17e30ec298bb6d1999f4c0c050fbb8
-EBUILD builder-3.2.2-r1.ebuild 853 BLAKE2B 12203238f4543ff30a66975683d5a5d8332e605a3cf771dadf5f58ebe187e011dc192e584650e675c54410b4c4490c0325e72bd7b7f16ede47243c661fd41e9c SHA512 70e51f743beed10893e63c65355792ac9fdb5d3b156d304202e53435c7f9d20d6537bb2b729ea762968cbaeca3bcdb55e7b7a1536d69c7579d477f4f2888333f
-EBUILD builder-3.2.3.ebuild 895 BLAKE2B 728290334c6e8a0b637a93eb29bf15d425b09b97fafe0b2b64541d7c4ad9d6c2c9082a7ff46507853be26ae88b692a77acc23f10f7e876f4e1f8e09363d2875d SHA512 9aaf57d3e8e40e9646231ed1975eb3f12f569a447bf9bfb6c175b94e81aa3f667d14a43f7ef9f921900367d0c050cc75b862b8acddaf66e99eb4f741945265d4
+EBUILD builder-3.2.3.ebuild 894 BLAKE2B c5bf4ca58139fe6cc3660707688a233283539e358ef055b2f5b47659cfa0320c61a869cfc82abc237268c543064d4430ae3a99a2408af970c5922e547c81244a SHA512 5c33498b22d5dd62c2879d5419dffdd206476bfa11d0ebbc86f7aa7e143fbc796daaed0867344a707a2092669e7cde7552371ee79fc0fd06be3be335c7fa2c63
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/builder/builder-3.2.2-r1.ebuild b/dev-ruby/builder/builder-3.2.2-r1.ebuild
deleted file mode 100644
index 0e163bb687ed..000000000000
--- a/dev-ruby/builder/builder-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST="test_all"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGES"
-
-inherit ruby-fakegem eutils versionator
-
-DESCRIPTION="A builder to facilitate programatic generation of XML markup"
-HOMEPAGE="http://rubyforge.org/projects/builder/"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 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=""
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/rdoc\.template .*jamis/d' \
-		Rakefile || die
-
-	rm rakelib/* || die
-}
diff --git a/dev-ruby/builder/builder-3.2.3.ebuild b/dev-ruby/builder/builder-3.2.3.ebuild
index d8509b0f62ad..5a1f97cac8f7 100644
--- a/dev-ruby/builder/builder-3.2.3.ebuild
+++ b/dev-ruby/builder/builder-3.2.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://onestepback.org/"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 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=""
 
 ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 6ec8d903d3bb..70049ebeb4a2 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -1,9 +1,7 @@
-DIST bundler-1.12.5.tar.gz 371552 BLAKE2B 0aca136308d9c393c945037dc18f7b8e7563017933aa5ef3cf14b50e095c200b82046a9d8cb00641e16507d588fe2aec8da59b22fc063bb4ecfb55b36627e981 SHA512 d42b2a10b97ab9724b9f3c6d1493a46ac212a918acc556ae90faed63b128190fd365cc0ba8c9ed9db30fc285e5c4d4183ddb698eee9a8607e9e40e860e78518d
 DIST bundler-1.16.1.gem 349696 BLAKE2B 6057aed2e3bffdfa7f3ea8489c4ae79d9241b7b300fd35c4a2c14899ff306183165d1554be793a1856d9fd1c696161161049519fc8915800c68c60a9a5b116d8 SHA512 2cca87aa17b61df98ef98a648a7d7cfe0529015f1278e8cb2298bb12544157933d723bd666d945bcdbaceacbf97a092a3848e2a587bd01cffa73c662d37d4834
 DIST bundler-1.16.2.gem 352768 BLAKE2B 4ba3729d314aec33a4ce6738a54774d4772714913d132493a8bfd719b53c05e9beb498835c01fb1904336d80fb3bd9466f71cc8e5bd1e34491f7e1f38b7bf9bb SHA512 998708b0eec5cdf7ab89b415a0a5173275b221b46e7151c0f05cb49f64a902a0fb0d77f831c60afe55ac4cafe6f4229d082d3f6c38ec13767add7979853f9221
 DIST bundler-1.16.3.gem 353792 BLAKE2B 5a36cd3e3a7fed39ea1de8d7bcd27a2f7758e4fd67bcfdbcc877a44c491624b45736e9aa122a14d792f2ff11605d226cdfb5a70c2d6cdadb5e0e4e36d597c96c SHA512 bc6b911a5ad2911c35be1ce4e28d42b7762cfc950bc060cca1527b66f78c5f125ed5524d1fc161f68053f00997742c6354549712be0a49c72877ab32ccbbefe6
-EBUILD bundler-1.12.5.ebuild 2231 BLAKE2B a9d9fa0fd10df02af01ac5b8aecbe1507dcfa0d17db1393aacd5a85dab329313098b95ba6d5eb60614afe85d0fcd6cb8c0a054b8c098961342cde5ddf9b742de SHA512 ef0ca3ab2bf4cfd199926553f3b3d35096c91e3f6b8d32fa70414e2a4bb4a7f60f921e26d7d462e5deb512beb31f1fb74e76b2c8c34898aa87543a52950477ef
-EBUILD bundler-1.16.1.ebuild 954 BLAKE2B 1eccfd49dc3216195408d82ccdd1d11e84acc673e0b8aca219f1939f6e7d109193c41ec9068d617e108eea0b5433d2724092107c8b1c465d9f6957824a9377ea SHA512 51381084a359ac00bc68ac3ea4cf909baad11f05b05f4ffdb6342adf5efee3a4512b4c03906a574199f0848ec707699d97242babec40c0cef81fcd3c3ba8d172
+EBUILD bundler-1.16.1.ebuild 953 BLAKE2B 5244bb0fdc2c0bf5cf5ea33ed4d632b7ad8f831d23506b5572f2344c3babc67e0eafe3f9d3af200e7494a7d98488dbef09c58de45fae5d8ddbe84905d4c7a81f SHA512 86a458781879e76e48d769001e42304dd846a8ea595c92dfeb5d8d984c85294873dc47622de9d4aca27d56e1884f83760150eda18cf52a2684b746f7ab957782
 EBUILD bundler-1.16.2.ebuild 963 BLAKE2B 4ba5577bfb001e257ad44a04e3c7e920f6e809177d2f0f0d6557ea4ed5df1955f009323900e3eb9b7fc03bcb333ad197b80e892a0c58bacfed366c606f0fcc67 SHA512 d08f8706fc972839979d1ecacb8ea2436eda09c9585fb664d150a7251cba665553a7d7641adf545628e7557f5e2b3342287287bbb21106856be078fb12f20021
 EBUILD bundler-1.16.3.ebuild 956 BLAKE2B 16a90a9a7d14d861369b7b0f0f2c3dfaa59bc04e96ee3833aecbcee6070f58ec524758a61bcce3d93690f6ab70579de519bd90d6b816bb0bc93b3773de464cc2 SHA512 aba431908bdaccc5d70c76e0bf1209148c4679ec9eca1073025b89d3c0fb630def82147f7c76f35c0a1a81bdf0017888db7fc3f171adbefe808de8c4091957cf
 MISC metadata.xml 342 BLAKE2B 9247517894a366c8b67564e015ff966b22eb3df924ec8438d9886ee854d922e376a274e1dcb455e23451febbb1bf4d8f60023e6b7763cd42772749de1bab372c SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e
diff --git a/dev-ruby/bundler/bundler-1.12.5.ebuild b/dev-ruby/bundler/bundler-1.12.5.ebuild
deleted file mode 100644
index fd6677e7e4cd..000000000000
--- a/dev-ruby/bundler/bundler-1.12.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-# No documentation task
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md ISSUES.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
-SRC_URI="https://github.com/carlhuda/bundler/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm 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="doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-ruby_add_bdepend "doc? ( app-text/ronn )"
-
-# ruby_add_bdepend "test? ( app-text/ronn )"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. All tests should still
-# pass with network access.
-RESTRICT="test"
-
-RDEPEND+=" dev-vcs/git"
-
-all_ruby_prepare() {
-	# Bundler only supports running the specs from git:
-	# https://github.com/carlhuda/bundler/issues/issue/738
-	sed -i -e '/when Bundler is bundled/,/^  end/ s:^:#:' spec/runtime/setup_spec.rb || die
-
-	# Fails randomly and no clear cause can be found. Might be related
-	# to bug 346357. This was broken in previous releases without a
-	# failing spec, so patch out this spec for now since it is not a
-	# regression.
-	sed -i -e '/works when you bundle exec bundle/,/^  end/ s:^:#:' spec/install/deploy_spec.rb || die
-
-	# Remove unneeded git dependency from gemspec, which we need to use
-	# for bug 491826
-	sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid specs that are not compatible with all rspec versions.
-	sed -e '/has no malformed whitespace/,/^  end/ s:^:#:' \
-		-e '/uses double-quotes consistently/,/^  end/ s:^:#:' \
-		-i spec/quality_spec.rb || die
-
-	# Avoid spec failing with git 2.0.
-	sed -i -e '/on releasing/,/^        end/ s:^:#:' spec/bundler/gem_helper_spec.rb || die
-}
-
-each_ruby_compile() {
-	if use doc ; then
-		${RUBY} -S rake man:build || die
-	fi
-}
diff --git a/dev-ruby/bundler/bundler-1.16.1.ebuild b/dev-ruby/bundler/bundler-1.16.1.ebuild
index 63ab31ff3ca8..229a0da3ee33 100644
--- a/dev-ruby/bundler/bundler-1.16.1.ebuild
+++ b/dev-ruby/bundler/bundler-1.16.1.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://github.com/carlhuda/bundler"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 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 virtual/rubygems
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index b9838007f0c6..fc5ea9a13e43 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -2,7 +2,9 @@ AUX capistrano-2.15.5-sudo-cleanup.patch 656 BLAKE2B 06c0d83cf2b20337d7692ca3286
 DIST capistrano-2.15.5.gem 132096 BLAKE2B bbaa6bd482cf9bbe7aa01540aa5dab3f32401ffa1476d9057bb8ad420194f1ab2c32d8e744d7c982ebece5c4b5369133dc8378b7adf54c78732f9cb249db2a9e SHA512 10168080c7481ec6fc6f918ac90a3b1ce8f2b36f77411375e33cc915b02d5196ab061ac47e767edd724c82cffd1c2ad0a23ba1f0519cf1f2aae5b429167b19ff
 DIST capistrano-3.10.1.gem 77824 BLAKE2B 548c86c0740703a5b0b92890806411221ea7a9942776d88fc999ce998e3cf5842d809e293d05111ce44cb849719900c7335c43d3795d7147688d48d53a19a133 SHA512 6f3f11498d26c426da740873022767ded44e1be1aeadddd01772d1a5c43dcf2589d5cf2279625470e2e2733d60d3ec865a39640ad4a14b2ef9a64b3da2da579b
 DIST capistrano-3.10.2.gem 78336 BLAKE2B 782cf09f810fd91f4878e126c12d57d19b75c1ccdf3dfee7b2078904743bf51047d1f948e64e6c41460fdaf0a3a9e5a2b646bd6a797f8ce97bc29fab9ca9c533 SHA512 a7eadcd0b949baab2d6ad09c2243f71ec803f85b5c3cf455068d3b0889be30d0f6bbee4ef0bdf90b9c7ec6c3e01886d350fd8a70824366383f7dcc49f0a8c92e
+DIST capistrano-3.11.0.gem 78336 BLAKE2B f4e3ac2c796aae12ca575e1b5f1e42d993ad13580d790c3cc392322c40486121d8dbd7bf0f0fa75c3ee59396c0dd91164b2112d30b4270b302a9f1556fe866bb SHA512 d8b635de223a0574c17dff6fdfe4007741f823e24f376cc22129b709d40792d02965b72465aeeb54560f22522dafe255f094bde9a23aa259bca9d4933585e212
 EBUILD capistrano-2.15.5-r2.ebuild 1246 BLAKE2B 68b68c43b731400c28bf0882f10f244bcff22c5c866688e4541426944c3ed3674e89cd4115b04a72ee8fd3a3eca0e189b7ff7fcc47dee3fd9c253441b9764c8e SHA512 40ed9abea01fdd7633de6a1adde01a85a45a429c823e592e000a6f209a126ebedb429c0e41fbcd4cf611ed26abec010e3336a7ba68edb81fd83b98c969cc73b1
 EBUILD capistrano-3.10.1.ebuild 1175 BLAKE2B 0d2b3411fb577ab260e2fbd7c8a69dba1f6314e21f254fb02b7119f640ad79fd1a3078aa88d855be050d89883f027a7306d05f6851a7c5ff7ccd54fed60a3a8c SHA512 4fd4323826ca08915b3443fe147c200d2ff81f16566afef94beced1fa02f4e45dad3c21ea254a5b490dac0b02339eb32291b0939ba8d58b923e57765d578afab
 EBUILD capistrano-3.10.2.ebuild 1175 BLAKE2B 0d2b3411fb577ab260e2fbd7c8a69dba1f6314e21f254fb02b7119f640ad79fd1a3078aa88d855be050d89883f027a7306d05f6851a7c5ff7ccd54fed60a3a8c SHA512 4fd4323826ca08915b3443fe147c200d2ff81f16566afef94beced1fa02f4e45dad3c21ea254a5b490dac0b02339eb32291b0939ba8d58b923e57765d578afab
+EBUILD capistrano-3.11.0.ebuild 957 BLAKE2B b762efff89bb8c34e5833db04db7c9618f7189411f8954df0dd679084ab1a279676ee3f6451a032576da954cead25a9db2ab4cf9aadf2753ff03f96997969e40 SHA512 7cbfc7e9bc0a3e20710d9d7d097bef038bc49046bea415126a285383187055316ecea8083f525b9d6b603a93a73f16923a83d7f99da25f6ab0cf7d7becaecdcd
 MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/capistrano/capistrano-3.11.0.ebuild b/dev-ruby/capistrano/capistrano-3.11.0.ebuild
new file mode 100644
index 000000000000..9e9844d807ec
--- /dev/null
+++ b/dev-ruby/capistrano/capistrano-3.11.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A distributed application deployment system"
+HOMEPAGE="https://capistranorb.com/"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/airbrussh-1.0.0
+	>=dev-ruby/sshkit-1.9:0
+	>=dev-ruby/rake-10.0.0
+	dev-ruby/i18n:*
+	!!<dev-ruby/capistrano-2.15.5-r2"
+ruby_add_bdepend "
+	test? (	dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	# Avoid specs that depend on capistrano already being installed
+	rm -f spec/lib/capistrano/doctor/gems_doctor_spec.rb || die
+
+	# Avoid specs that require a TTY
+	sed -i -e '/asking for a variable/,/^  end/ s:^:#:' spec/integration/dsl_spec.rb || die
+	rm -f spec/lib/capistrano/configuration/question_spec.rb || die
+}
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 92329ce4878b..3bd95a7b595c 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -3,9 +3,11 @@ DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca1
 DIST capybara-3.1.1.gem 282112 BLAKE2B 82740933a34bc80ff4901fdf538b9d48d3ae8b5d9c906f462a964104ee1312a74697528f1803eeead0a250823baaedb1f2d4839053b26e4a9ed0fccbc224a137 SHA512 955918a004f11af93caecf964738108edd31ebfb239d6af752bc48ac74b754320014b997d01b8cd12bec5aeef27c88b6737cf7d0ba7dfdb4ce983939ae534546
 DIST capybara-3.2.1.gem 284672 BLAKE2B 9da8f588049fab74c4e734626e42758cdd4baf555cfc64e7456bfab2cb4d5c90ed6bfc8ada7cc0d6323ef1113169aec70fd4254aa50c003408376ea4afe00a06 SHA512 50af1d4c49c200a4c08901d19b16826499abb8d19de8e059160c509afd555edbe620b6fd5d78f8c286feeb15a72e5a4b241cb1f14151b349fd94cdd3648b64b2
 DIST capybara-3.4.1.gem 292352 BLAKE2B baf07378ec9c932ca4fac4b9ce465b76704c5b17cea73db01d584dbf7076b2c6defe0170a0575691f6af5dcda2d8f97bd16a3901d36c8a9db63c72491fbfc962 SHA512 abd969af564a9b8a827493674d51e2cabbb57c47795ede260498f99600da0da9bf00c97e64ccd07cfdb1b630135714191f232f166e08856a4cb9fdff6c47fe1a
+DIST capybara-3.4.2.gem 292864 BLAKE2B f04bef4540df60eaaeab2cdf59577962493da34adae1abcb4fc23101244a522fa2bc80ad86ba906368a98e68d6918877a073be1e0068b4eb2ba44e0d060b40cd SHA512 e9415ce626a1391d9a0af944d9afaa536d98b6d44bb19d288e3b71399effa2fa8ffeef72a0fb2d786a3267f6809943f499f50f88f95c24552888db24888867e5
 EBUILD capybara-2.16.1.ebuild 1509 BLAKE2B 8ff52d1240388337ea4eefc688caeddcb53f0c589ffc50d2cddfec130e6702b5ae3bee7ae8ca0dfd8c672867ecfb0347aa37e6961f3dbf185145600e493e0276 SHA512 2b9160aa85c4ac67c1756b385e3bd98951b83e114ea390d0c0243ddae60dfc0a56ad1126a841768c1956641be68c76b935f633509791aa1c07ddc1172cc66987
 EBUILD capybara-2.18.0.ebuild 1525 BLAKE2B 17327933169f1c330a0f0580b8dfd00be4ae39e0fa94d62e172d6621a8a91189925acfca3730685ed80573e6eb456f731d8072fb1adb2653b6b646714a89bc5b SHA512 a6347a7b9014e3ca1bdeee9eed2a9e22d866dd831041e700086b00c4245d254ea3107c82b019f7550faa273777430898c571c837ac4202cdb2cfdf15068edd47
 EBUILD capybara-3.1.1.ebuild 1512 BLAKE2B d8c1dc1208dd7c7aedeb2f48ccaeb190dac1451e60feba70bd2cce2b3e7425f1179716e02792ecaf27b9301c560821d8bc322d2c56a5a92c3032f94303c5e268 SHA512 9f96398cd632b4b2aa5386d84c19bffc3c22cd416178e516a755412c9ecb75287dc089d88925354a6f6d1bae5d5109b4c0831b3b6edf3615deed6253aeb595bb
 EBUILD capybara-3.2.1.ebuild 1518 BLAKE2B af598a905b37db7eb77511372ace937bff702c2aa116afcdf4bb2d32bd99489e95a61ca442c8cf5c8174fe7f0021fb7aadb6fda65b2dd7ab41a1d8829bd3099f SHA512 9bcf03fa1561b95257a319825c5ae165914fac5ad4993e028f51d9b3d70bebc7e51203f30cf70d2a9b66a61a4b30dfe85d79037a5f19c3e61997f0e3f41f5372
-EBUILD capybara-3.4.1.ebuild 1497 BLAKE2B d6e23247a1af0d26fbc832e9747f14c9efb963c65ccf8dceea02d1d5b01a639757543af1cda60464cdd7a5adf639057fabfb8ac198e3d7939fb9d51d6afbc4f2 SHA512 93888436e322a879a1effd6f3e56ff5ddac73f7d73860cb6021fec5869ebdcca744359f90b6c833de63e2d63ceaa48dc1801b9fd3cc4e93c8f5b605031f9db88
+EBUILD capybara-3.4.1.ebuild 1502 BLAKE2B 8aa63d3d3d39207e1884b05ba051ebabc8a5d65b472bbb57db356a7482efb91e3adb20ed7f7f06db3f609d50b456a0f1bad8b36d53880682742039b04826d9aa SHA512 9b5a5c6d9e8362eaf76aae52065706ea8192e59ead7acefe282023295f46c0d89d8548f955286bd3e240c8d20e39e1e0123c81d1054c91a37bade11f74d7f4c1
+EBUILD capybara-3.4.2.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.4.1.ebuild b/dev-ruby/capybara/capybara-3.4.1.ebuild
index 27821bfea232..e0cae11e9d06 100644
--- a/dev-ruby/capybara/capybara-3.4.1.ebuild
+++ b/dev-ruby/capybara/capybara-3.4.1.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"
+KEYWORDS="~amd64 ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.4.2.ebuild b/dev-ruby/capybara/capybara-3.4.2.ebuild
new file mode 100644
index 000000000000..da6c2de9e770
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.4.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 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 )"
+
+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/xpath-3.1:3"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' 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/childprocess/Manifest b/dev-ruby/childprocess/Manifest
index c7d673b0c480..cf36ae70f5d0 100644
--- a/dev-ruby/childprocess/Manifest
+++ b/dev-ruby/childprocess/Manifest
@@ -3,5 +3,5 @@ DIST childprocess-0.8.0.gem 32768 BLAKE2B c473da69bd38bda1e28e6adbac7b11597b05ea
 DIST childprocess-0.9.0.gem 32768 BLAKE2B cb836c2cc3f9d6bda1db88aec8692499dae2a325611dcdfae482fd6a7bbf065612f0efbe140c08447566b8759ce125968a153d6df38889403d98bc94fe397d7b SHA512 5a788556e14491b0801b8a533d8d8eebba726af6417c8c6c7146738fcae2f92e9faa090312e77d974852003f5a4d155d5307b0c9d1ff1d18173ad653d21f63d8
 EBUILD childprocess-0.6.3.ebuild 859 BLAKE2B 035d58cbcaccde7a7031adf1cce7874aff5de2e7c5ed3cd9eee1299bd9adefdc656cc5bcb711ed80931492906bf6a45606e3fea77b7eb1d616b3d56ced534156 SHA512 6477a2f5c1def70a61bdb6217a66e7c01d539c87432e4e201fd3676b609724307dfdd95ecdfc255b79bce53d93737e0397669da5909f00b73c26f89028a9a52e
 EBUILD childprocess-0.8.0.ebuild 975 BLAKE2B ea1902170503fa521ec6fb176c56d8a1054076eba8cb5378d47b3d917ac7022e6889c22337606985f19212b15e6bc0dc0e8f2414a6dd00fcaea206838bec119f SHA512 e3200509ca42c07c6869ba859cf66aecb77433e37ea1631f2a87d9d5ec5fe4dd4b8d28d4629fce0d1b924fc790d08df32e3a80823b789263e972fede3e9e8505
-EBUILD childprocess-0.9.0.ebuild 973 BLAKE2B f6d28c90a8e3d52346d4244d2ba2ca462a88eaee07dcabd884b206a82fc74ac7c82b0f362a2330a04fd0ec0dd9a2953cca0818d0e5c5984915333e8c64be6053 SHA512 628e5b81cd7931d6bc93ae4ec770c3aa6e6208c1fa06645b6a4ad3fa3e6879e6c064de5717ba8a3e958204550f85a6285543b6daeded5199c06eb65cefd9a688
+EBUILD childprocess-0.9.0.ebuild 972 BLAKE2B bd7413162e557bc795e30527c37c2d1e0da992ccca458a74de1d18d8a460e20c7bc66195d8958b569b1e00739d33910d51b717523e88cd8144872de196348c0f SHA512 2289dbc236452d9349bc199c08e032d5d023f3fb21032c9695145e4945ebaae18ef3dfd95722fc98a0ba6ca4cba910c157cbbc92e33f9f771c8828266829ff92
 MISC metadata.xml 344 BLAKE2B 3cbaf9e4992ca3e9fa2283451433e35247418e190a6447453848988e305a4f04583a3ee563149774c347dbd6bac2ebb0451c19fba1d5447162707783c02ff6b9 SHA512 2995953d3ac4c6cc924859dcc2910bd303262f86d5771368956cb0a3d26db031302547154bd98cdcf189aad39e132020c0c22510c65c7830f528cbf2265d871a
diff --git a/dev-ruby/childprocess/childprocess-0.9.0.ebuild b/dev-ruby/childprocess/childprocess-0.9.0.ebuild
index 29dae5674550..a7dfd71bd524 100644
--- a/dev-ruby/childprocess/childprocess-0.9.0.ebuild
+++ b/dev-ruby/childprocess/childprocess-0.9.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/jarib/childprocess"
 
 LICENSE="MIT"
 SLOT="2"
-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/ffi-1.0.11"
diff --git a/dev-ruby/commander/Manifest b/dev-ruby/commander/Manifest
index 6ea6583b7340..121fdb84b4c3 100644
--- a/dev-ruby/commander/Manifest
+++ b/dev-ruby/commander/Manifest
@@ -1,7 +1,5 @@
-DIST commander-4.4.3.gem 36352 BLAKE2B 4849e3940762c2686258938590aad28292ff6d5c4cda0e14caf688b5d0177b1061318cc185071991e667f38efb132b9b4ea7bb9646731c18a30014b9f8d49b13 SHA512 9831ab6983359ebd112223f72991d09a79c04488d578973430920c399249b5071678b86190f9bc63f0303f479336a332b8e83e4f4ac9322e9630fa4d3863d4a5
-DIST commander-4.4.4.gem 36864 BLAKE2B 66a391c3d25ecc79308b9da8010c8d3a8b26902a72e7e96558a9c2690f6a8735093c9a218097b52610d8dc49316c0469e47e05539a3b01beb9310894ce313bde SHA512 d4b7912f03f9c78c6bd5b63221b334391b0788a579d2dd20b389c6a34024ad7b5057631426e48befc9d5c02f35921cb31b530b38cee93817f2383dac113f2b82
 DIST commander-4.4.5.gem 36864 BLAKE2B c4bfcfdd01c09bafa98497aac028054e910e077b38a23f0aa46898d6153560d41d6ccf0e36f46c2702cbd480da892195b7d28840448fb7f8d64ecb6c6e3b1962 SHA512 d2ed3abe7c054054a8442a76bd006684d26908d9ce92a7314d7acffc21dbc16e46144927dc795a69eb195ae04b8d84fa7bc6601c7f682ee188fcbc93ed5a9be2
-EBUILD commander-4.4.3.ebuild 622 BLAKE2B b1e369d3d96008856640d984f0a91548494c2780de51e07280d22f2dd46f498f4adbf691deca17e5b3fd89f9307354205acb592dbcdb049b084cedb3edb9408d SHA512 614cee7b18dd6d885d3dafea2e78c2353575a7f754143d933e918369fd6d40317108e730a6e783bf069f19086ea2344583ca33e62d4bfbb8fd82a63b508e5595
-EBUILD commander-4.4.4.ebuild 615 BLAKE2B b6a4606f6d23bb137843f791c6611bbc5311e318d344c9f15cc7602001afee1fa3bbc1d9a007dc28926cfbc27f2c55d08ce34e14a87ee29a882cf74f9090313b SHA512 223808451dd2a1353329cf8347458d8b458d0ee5082f9c38e87eb09a79c0b3f72490f964571c908f7d00b760dd38864b6fd5062763831459407bb093bd2da6d8
+DIST commander-4.4.6.gem 36864 BLAKE2B 83e2390a482cc085b6af6cc78cbd28679e14ac09279495e1cf00c6aa55b04789501291e1547121b5223177631feead69aa789600ad660be52f22651490ef1278 SHA512 697fcbd7b1b8fe0d5f3c5f492b8d1dbd4fd4233ecef3f214797a8fbf9fd102f75f77fceb486d6386db51df0e6afa281518e522c161eba01d017c2c0532d9ac4d
 EBUILD commander-4.4.5.ebuild 615 BLAKE2B 469cb266239f3eee9d7ad0a65a5bcceb081218344c1b3f66d507894fb7b84d5b19027e49d6063651578de31b71c7c121ae5b33e56033ef83a92c4c814d6f9031 SHA512 f68a0748e8bd8f9bd20354dbe21c2dc07191d2854515f439a0abd15243cca4d598b6934cfc9e355361d80045f18969a32641bb1c339152bf3e87087553a804d6
+EBUILD commander-4.4.6.ebuild 593 BLAKE2B 921ec56296e67406aacb6f07dd0f4e1263203ace577380e6107b2276e5d06059cbc4e15d6dd53b7ee282031066bee7622e357ce8f28ebdd0a2c993b57875358e SHA512 b987ccc029f027a112bb9c6ea262ac94a454e7837e1502dd37c6d0d710eeafcbe2b385a008e960c9b68c026865d133bd69cf8bdd10f8f9551405374248e79a96
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/commander/commander-4.4.3.ebuild b/dev-ruby/commander/commander-4.4.3.ebuild
deleted file mode 100644
index 01035888ab9b..000000000000
--- a/dev-ruby/commander/commander-4.4.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The complete solution for Ruby command-line executables"
-HOMEPAGE="https://visionmedia.github.com/commander/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/highline-1.7.2 =dev-ruby/highline-1.7*"
-
-all_ruby_prepare() {
-	sed -i -e "/simplecov/,/end/ s:^:#:" spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/commander/commander-4.4.4.ebuild b/dev-ruby/commander/commander-4.4.6.ebuild
index 403705bb3b20..73c8c572cacf 100644
--- a/dev-ruby/commander/commander-4.4.4.ebuild
+++ b/dev-ruby/commander/commander-4.4.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/highline-1.7.2 =dev-ruby/highline-1.7*"
+ruby_add_rdepend ">=dev-ruby/highline-1.7.2:0"
 
 all_ruby_prepare() {
 	sed -i -e "/simplecov/,/end/ s:^:#:" spec/spec_helper.rb || die
diff --git a/dev-ruby/cri/Manifest b/dev-ruby/cri/Manifest
index 7a10419a83dc..ae4f1d5ca837 100644
--- a/dev-ruby/cri/Manifest
+++ b/dev-ruby/cri/Manifest
@@ -1,5 +1,7 @@
 DIST cri-2.10.1.gem 28672 BLAKE2B fe6f78ec193298605995e00242a4f615159192b66900c111fa58252aea63c3a5515a0e7a9d7c5a1a0878a2e9c70a77023ee60be4d7b6c780d5f2d1300641e109 SHA512 f71cdd00613b226f916c9f45f9e8ce3a7c0c68bdb547de6df8b9457c018627c18ce978a13c971e0ef2cd24ec985f815df0389d0ddabd463eef93d5e2147e6101
+DIST cri-2.11.0.gem 29184 BLAKE2B cd6df24e9c50be519e8d8cba06c7f747dab98c758a70de1f3ff7c3570a3f62b1b7d7769347d0922cc39d9588dd1d061a71b02c0de47a4182184eec8072720ae8 SHA512 ceb87803fc90a394effd3ba445ccb44a2bfc3700e44910766144074ef82b019cd5ddaffad93ce7e7b3446f94735736a4e53f5916924a33460b96afd7aea427b7
 DIST cri-2.7.1.gem 25088 BLAKE2B 20317d886401d6d5f034c27396cad2fdaf322246c319ef3cadc3e38169dbc00c83771fdb2d564efd0ca386b916a0bc2d8cf283742ccd18ca390e491a84f5e31f SHA512 37d641390dc83550c254b3c48018f7f2c53f73161807c299cb78ef84b8625e5f00cd8c877ac464ece5c6623d7118872c45648ed56c2bd5f53ae62cd66b8e24d1
 EBUILD cri-2.10.1.ebuild 772 BLAKE2B ce43c4c23ea400229c826bd18c7baa6a68f0749eb3507e927ccf79d89da6f9e9cc491e45e694c930d1fa78d64cb7560d282edf86424994c5adfbd6f7909e942a SHA512 1974af8955cb30a496a14066fab05a7ee499045e17fa6642d9e97904b6bd2700c5b06e7b81b882039a03cd03bc13bf5da9f61510beb40638f686d65e045254a4
+EBUILD cri-2.11.0.ebuild 770 BLAKE2B a281b6c5524b3dac245dc5a892d4fa278d275ea12af194332800627832484016b5090e3b0cc6da82bc0a27e3fa85211d6704dbba0f9d2a2a055b2bf28745ee25 SHA512 a33ab9b67b71b48e61196ea591909fc9de4ab537dbb05f8e2740db4c7905f7ec5074dce2d8698d0b390fa8374f88a4c9a83ef0e96371d46ad9ac38de202bbf1e
 EBUILD cri-2.7.1.ebuild 772 BLAKE2B 3e09c46b3ec082da544c48c2a4c6a024ec45c83547bb3558a5b26c0399818a1fd9ee602155aeaea5e7a408fe4d3abc1294f03bd1d3d14af437a77ba125651e48 SHA512 29b1e00f40376ec04affde1d366437fb65bddab170bc6f4b66c3a4f42c560bd2970b923a2cfa17e62620170695c1929e6958b1f0da966e87280ada6c08b80ee8
 MISC metadata.xml 321 BLAKE2B 2bbd02b4b0f33bb2e3942b93c9af104fcafe960a59b2f109935f5121c2476635f1a3efb9ac092f4f5e6138df0398ea0ca874ee62390d20f3620d442d3502d42d SHA512 8e90f3ffd2b30ff9557e4c11bb31655cbd65498191288c68191f2e5f6d7bbdab6f1c22935f8d45fa95673582d1d0bf776055c0242cee2da27c9d3e71e2851f72
diff --git a/dev-ruby/cri/cri-2.11.0.ebuild b/dev-ruby/cri/cri-2.11.0.ebuild
new file mode 100644
index 000000000000..30952c0fb573
--- /dev/null
+++ b/dev-ruby/cri/cri-2.11.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cri is a library for building easy-to-use commandline tools"
+HOMEPAGE="https://rubygems.org/gems/cri"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/colored-1.2"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	test? ( dev-ruby/yard dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -e '/coveralls/I s:^:#:' -i test/helper.rb || die
+	sed -i -e '/rubocop/ s:^:#:' \
+		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib -S rake test_unit || die
+}
diff --git a/dev-ruby/deep_merge/Manifest b/dev-ruby/deep_merge/Manifest
index f4f39756cc19..78efba3e48db 100644
--- a/dev-ruby/deep_merge/Manifest
+++ b/dev-ruby/deep_merge/Manifest
@@ -1,5 +1,3 @@
-DIST deep_merge-1.0.1.gem 12800 BLAKE2B cab2876000518e2000d8f507bef3cf954d642631e1b625953b409558aea7b0f06695352008fa6c1112da7b9eaaa18d16d8bc96375cb84e2c3924a32b7d0e57e0 SHA512 2796d30a3d279864717bc535913909169dd49c698dee6cf64ad785f42ecfcb72f2fd90083baf890299fec452265553f5767d5719f5c3c4c100b85e33ad45006f
 DIST deep_merge-1.2.1.gem 14336 BLAKE2B c122eddaf63fd885f82b292ea7d1f2b6a9a9dd50731e77b856fd02284634a699b7897a12c1856732c77b4d8ffc9f6efe06f792f42d53236a521279bff13b6dce SHA512 ef93e0c4c6a8f389338ea30b2b53271f089b0b8275adf6fc74e7d15a2faf32d62a1b297af9d31c42cb5d816066428c8407a82d874fad14d64384098fc3c5c70c
-EBUILD deep_merge-1.0.1.ebuild 523 BLAKE2B 0661e64c923a3b389c03f18ea38abeb78bb8bb4356da4af7bbebb82f2b8b217de78f3e0741cfbd8f1707f57e25ad9ccd9c6217dd501a3e4fe2753b130a45612c SHA512 e464d7b06ee2a3ea7c3e4bf32d5e8d8f39a88b830e92aed05a5363b94a1f85dd7968df220715627205c8225cb93f55bf0d0a5eff23545949bcfd29ea664bc471
-EBUILD deep_merge-1.2.1.ebuild 536 BLAKE2B 67763a84ffdfc6e44197727f510bdaf107cdc1dcbcf6de57873a59577b45b485803823e1bb5667a7d1433009811f88c8d9f9ab4e2d10a2954cd9e4fc67a4f941 SHA512 11dcf5c44d96b5f5deea4a4fafbc9216edf3f2a50e8dd598aea77a9486d23d558cc7ad478fd4a1a1e97f9b4855fcb97ae467fede50436fe4d2ff6ac81576b015
+EBUILD deep_merge-1.2.1.ebuild 535 BLAKE2B aa6997ea9f8a809f8ff351f65b89a2189b2860d5f0deeebdbce26fd92495c8d78c46cf2c4337d09f6c9ebc3650dd63c4f94184a52246192bef7821e62ad46a75 SHA512 32e6cf283d791d28a4e8b9dc4c4d7f531f5b6f450ebf26f428a2eabb850918e74cdfd1cb60a23f81b2d919d6ab67f59881952c607686e9350a244f700702dce6
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/deep_merge/deep_merge-1.0.1.ebuild b/dev-ruby/deep_merge/deep_merge-1.0.1.ebuild
deleted file mode 100644
index c2724c5e3984..000000000000
--- a/dev-ruby/deep_merge/deep_merge-1.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple set of utility functions for Hash"
-HOMEPAGE="http://trac.misuse.org/science/wiki/DeepMerge"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
-IUSE=""
-
-each_ruby_test() {
-	${RUBY} -I lib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild b/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild
index 8e95f7c88fcc..fe20ab9121e5 100644
--- a/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild
+++ b/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://trac.misuse.org/science/wiki/DeepMerge"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86"
 IUSE=""
 
 each_ruby_test() {
diff --git a/dev-ruby/dependor/Manifest b/dev-ruby/dependor/Manifest
index 0a03b3d32c5e..be35683e3827 100644
--- a/dev-ruby/dependor/Manifest
+++ b/dev-ruby/dependor/Manifest
@@ -1,3 +1,3 @@
 DIST dependor-1.0.1.gem 12288 BLAKE2B 728cb4a1ec8e2b7d8e770dc7c2b997f8a474963530cd2b3e8209babacf16aad8f69f1fab64aa1e932b477922c6eef8c3c46073421966285204a49c00f3a3bab5 SHA512 4233a270d8fc956a530008121fcb0110c2c66f77f51aa98a5db75b857c83f80f90b8e8ae67d098aa2363c21deaf1dbbba146c09b83fe6fa8004832249acea9e7
-EBUILD dependor-1.0.1.ebuild 536 BLAKE2B ad28a338dec095ec0018def142faa5b40591dcf8a85e45c0032a5145883ccbeb083f619ca104ada6ead5744fe5194623d4df924ecb25521fdfbc495b4b4df56a SHA512 6ca8b52b6be6980c8f0f36e82f90fa23a4dd0be3800bf91955f0d9d2e596670e6239042162262325de9d514d92634d373caccc1755944f769afc27388463c53d
+EBUILD dependor-1.0.1.ebuild 529 BLAKE2B cd37319f58f086b655a244e80f38d3bb2dad3b839006510f99fbcd96cacdb39118439699c5dbd763292c8a712cf8fa9d89e87e771135e164f834f8de675a8ba0 SHA512 0f818517aa3649fea17e191d3fd10c31a565feecc3fddb79ee1d91294333594d1797f0e25ae86e65f84d84efa808ff7dd55998a92a9f50fb08f4a7a08f91eb2d
 MISC metadata.xml 340 BLAKE2B f38ec97fe405d08a56d1bcf0d8dc75aa737f89286840227cf0ea4ace72917422053b6b38e77b3247007ba3d43f382ad8996a808441a67c318e73056f8a36fc60 SHA512 e72f7b76a686fc3f33bcb4dfee0a1cec00e8402616b096085666fe2231be3d0e2ea63606a993e9f52c8c1a765fff75a64078c5d5bc924558935450620cc53b08
diff --git a/dev-ruby/dependor/dependor-1.0.1.ebuild b/dev-ruby/dependor/dependor-1.0.1.ebuild
index 6c1132b1d898..8db15f9a92ba 100644
--- a/dev-ruby/dependor/dependor-1.0.1.ebuild
+++ b/dev-ruby/dependor/dependor-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/descendants_tracker/Manifest b/dev-ruby/descendants_tracker/Manifest
index 9e4d88bc8761..84c0c5240019 100644
--- a/dev-ruby/descendants_tracker/Manifest
+++ b/dev-ruby/descendants_tracker/Manifest
@@ -1,3 +1,3 @@
 DIST descendants_tracker-0.0.4.gem 11264 BLAKE2B 65557a3e4859eb589ee468611f6d29b97ea96897711ce8fcb70c8da6d54849eb4e84fc999db4def4b6e6d5a56a84724b7319e47aee5ef739b23763b1c74f9dc5 SHA512 e079b0ba9b14056707780f1752297c22e81c144fcc7903bc0ef4aa5ad8f343628f493d6d87cc1d5c61cbf8f69066914210eb407b5492aa414949ad799f9a9b69
-EBUILD descendants_tracker-0.0.4.ebuild 825 BLAKE2B 03a867a35b19453cb727921dd35c790827624bb2bf936ad8ff29739b2716aa3c5467b024b94a2b11e134dfd461021ebc60e0efc150db60b1d2e346e2802d5c0e SHA512 30a1ad8e6df783afc8a641a994806dfdc39e3beb29e1818b08e74503ce00a8920d2fd2915c18b3023fd4a46122cffa09abd6e00a944ae98672c91bd89940cb18
+EBUILD descendants_tracker-0.0.4.ebuild 818 BLAKE2B 128748bda76001ccaec73344ef8b488491ccb741025a9ca3827ffa625867464398c585b023f91e837e41b32584e7bf67ac7361e0e2781bd9b44652ecbd48072a SHA512 806ae679d6758a179c48e614d8d2f121b46261e954ea0f89a9d6949952e4ce3db991100ef937fe7e79c4decb624b89e3d8f34fd5bd5c2152bddfb68c3e7f49b1
 MISC metadata.xml 351 BLAKE2B 1521e431c6671bb825ccd66682710315955ba90d0d7c854b37dfac81ce9c17d807fb8ce3bf9965daba8fa6dc89b27918ec3281da5530d4376e91f29a63de7239 SHA512 bf241e554862ffbef6e3cc7f139de9176ad445248948e692df4e7d2c0ec9e18718bf3dbc5b39adb79b2bc8e92cba551a6edee25ffda77cc1113fe27b6906911d
diff --git a/dev-ruby/descendants_tracker/descendants_tracker-0.0.4.ebuild b/dev-ruby/descendants_tracker/descendants_tracker-0.0.4.ebuild
index 4950ff03ff18..3503a00e4270 100644
--- a/dev-ruby/descendants_tracker/descendants_tracker-0.0.4.ebuild
+++ b/dev-ruby/descendants_tracker/descendants_tracker-0.0.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
diff --git a/dev-ruby/elasticsearch-api/Manifest b/dev-ruby/elasticsearch-api/Manifest
index 9541cb4fbd03..2a1bf71c5b6a 100644
--- a/dev-ruby/elasticsearch-api/Manifest
+++ b/dev-ruby/elasticsearch-api/Manifest
@@ -1,5 +1,7 @@
 DIST elasticsearch-ruby-5.0.4.tar.gz 213565 BLAKE2B 479e79964e5e5fd6ab2774e95957100eaa157a64c5e7aa069f7aeefc771f9e749ba35f866ef33dfc4e7839e11f67dd7792a742f0c8dbf8d893ed25b098e78367 SHA512 aaa4b1a41de62128cc3cc3fe174fd7f95e6153f25f1640dbd0cde5858e77924e85bd78e2869968c498b3f2f007215504aaee322df954ae44b0a64dacc396d217
 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
 EBUILD elasticsearch-api-5.0.4.ebuild 1140 BLAKE2B ff1cd7d1f718869bfcfc44c4936fce7da7aaaab4e6546177e2e431179a7105f68a0ac5faf2c412df21674a9dd1af8733eb26558b967b5b74b91c91b37c51de03 SHA512 83145115ca1c7965b25174d97d9605b87a5fcf028bde18d19ad42758f6834f3a15071bd8edc92b81ba3f16f5a0c971cb6dfd6034e5ad94117048c8e03d3da645
 EBUILD elasticsearch-api-5.0.5.ebuild 1133 BLAKE2B 41cda736b76a0122515158b0816d08dc0f5e6a6416772654dd5ba65657f362036c175f4121def0ea69e5ed6763a393ef92fdbb982fb1b5da6623bf1135628e6c SHA512 799d1b843fd684810f79a835fbd2026ae9e813a1e99f4e5d950398589f0ae9f38a420770bda06c314726e8fc0847bb504d3aed3fa23e2485bd31e2136c4aa55e
+EBUILD elasticsearch-api-6.1.0.ebuild 1161 BLAKE2B 2c0ea526d791f49afcf21492e8400588fd55bc312cca0038fe7e8f609f35670c74ebc0f2e10406d36b8c2e6fe2008e2f493900a17bcea91e56902d0d719becf2 SHA512 f5b8cb948946ae443225975813623a182b78262411b2f463a422e2a87b776e0a6fb81987c48a8e10882e48bc578c31ea14695c87f967046514f06fd6bc3a9756
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-6.1.0.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-6.1.0.ebuild
new file mode 100644
index 000000000000..3cfa06e9494e
--- /dev/null
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-6.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+inherit ruby-fakegem eapi7-ver
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-api module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+# 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 4e5ca52592c0..2232363f65cf 100644
--- a/dev-ruby/elasticsearch-transport/Manifest
+++ b/dev-ruby/elasticsearch-transport/Manifest
@@ -1,5 +1,7 @@
 DIST elasticsearch-ruby-5.0.4.tar.gz 213565 BLAKE2B 479e79964e5e5fd6ab2774e95957100eaa157a64c5e7aa069f7aeefc771f9e749ba35f866ef33dfc4e7839e11f67dd7792a742f0c8dbf8d893ed25b098e78367 SHA512 aaa4b1a41de62128cc3cc3fe174fd7f95e6153f25f1640dbd0cde5858e77924e85bd78e2869968c498b3f2f007215504aaee322df954ae44b0a64dacc396d217
 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
 EBUILD elasticsearch-transport-5.0.4.ebuild 1129 BLAKE2B 71f1750ae738877dc46203efba2b3e9273d0e035927f42f17153e58806531ef4a5d0e5c8df4d7883bc2e4b5567a9e81f8a7e3afa6985365174e79bfcdfb3cbb9 SHA512 0ed4dd9a9893186cc3bcde5d8f6a16e0158c76c47619018d596e308397f287518dce71d03bdbac9f1e2209306bc46dae854cdf4daa27922217aa5ba36b929e31
 EBUILD elasticsearch-transport-5.0.5.ebuild 1259 BLAKE2B 47800a95fcfc34d1431ce18379199a6c0b4b08941076a1d9b48a05a6a5af099a6f17925dc16cc19da688a77f0b3f3c70a33eee8538ef8b4573adb4ca1beb7c73 SHA512 3f600001e97a6e0833b637010219eb0fae8e01421380af6b10f6be3afec9cfac8f40ca3d8a5e932b9cee152eff6be9e76e5a7083d30bb6b4335fa2c1829572de
+EBUILD elasticsearch-transport-6.1.0.ebuild 1287 BLAKE2B d96821cd23cde49e90692702e98a98c3119c27d1dfd6794a01dfbfec4a553289b5c12b7a2199ff5089030936d3e591d3a4137d28aed3e86cf21b0ac2812640d6 SHA512 57e1a6024da309130f6820efdc4346a7ebbb213be3d9f958978368a27f387220e3edcdb3c960a6c7fa25737a6fdfffc670db037f9c9a1762a4cc55c30b98f2ba
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.1.0.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.1.0.ebuild
new file mode 100644
index 000000000000..0e94cd06b5c2
--- /dev/null
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.1.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC=rdoc
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem eapi7-ver
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/faraday
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+		dev-ruby/curb
+		dev-ruby/patron
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	# Tweak test setup to only run unit tests since we don't have a live cluster
+	sed -i -e "s/RUBY_VERSION > '1.9'/false/" \
+		-e '/module Elasticsearch/,$ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/elasticsearch/Manifest b/dev-ruby/elasticsearch/Manifest
index d6af4361571e..44a7b89dcded 100644
--- a/dev-ruby/elasticsearch/Manifest
+++ b/dev-ruby/elasticsearch/Manifest
@@ -1,5 +1,7 @@
 DIST elasticsearch-ruby-5.0.4.tar.gz 213565 BLAKE2B 479e79964e5e5fd6ab2774e95957100eaa157a64c5e7aa069f7aeefc771f9e749ba35f866ef33dfc4e7839e11f67dd7792a742f0c8dbf8d893ed25b098e78367 SHA512 aaa4b1a41de62128cc3cc3fe174fd7f95e6153f25f1640dbd0cde5858e77924e85bd78e2869968c498b3f2f007215504aaee322df954ae44b0a64dacc396d217
 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
 EBUILD elasticsearch-5.0.4.ebuild 1177 BLAKE2B 3f60333df1beaafbcd23652c4d75335d48811c9e00326b303ec133ddb5b546c49dfb5926d4fb04b4fd09ea6c18381277c6e025fa04a1033a895773682c8db93b SHA512 1481cd35b95c2298b340ee841fc41f03720ae5072ba09baa8a85db1c587719fef8855108ac296e02e611f135508de5b6497bc19417f4d3951334d2584e0ba00e
 EBUILD elasticsearch-5.0.5.ebuild 1170 BLAKE2B 22d0fc7196747dd85537cb2a3d868e0a69892c68111f121d171b9cc776246f17914706610c1d456967f099c6a28444f463dccdfc9cc3b87f1c429a061609eadc SHA512 82c3fff22a34b7cef89fce10b4ee9f4dee271fc2cb72d91581fea8970275f7392aeccc70485fc6b5c2b406ead47eb9b66435530e26176210866e7d199a46d6c0
+EBUILD elasticsearch-6.1.0.ebuild 1212 BLAKE2B 48ae9f91f475ce090b78e392d311df4763b433ee80f3c5cc4f20b730c042850aa9cfe9f69ef68f22697f460b73e5eb5769bdbb188c025912152a70b9669f5996 SHA512 911f5178d30323b89c158a5cdbe01eba7f8995aa65a8f74a322012206b570b17b4e0968ac9817fd1c672f292a8db9ac6cda1e45c08dad77824d3617b5f0d08f8
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-ruby/elasticsearch/elasticsearch-6.1.0.ebuild b/dev-ruby/elasticsearch/elasticsearch-6.1.0.ebuild
new file mode 100644
index 000000000000..158473118ec9
--- /dev/null
+++ b/dev-ruby/elasticsearch/elasticsearch-6.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_DOC=doc
+
+inherit ruby-fakegem eapi7-ver
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	~dev-ruby/elasticsearch-api-${PV}
+	~dev-ruby/elasticsearch-transport-${PV}
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/elasticsearch-transport
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/shoulda-context
+	)
+"
+
+# Tests need additional modules (at least 'turn') packaged. Then someone
+# should look into running them and so on.
+RESTRICT="test"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+}
diff --git a/dev-ruby/execjs/Manifest b/dev-ruby/execjs/Manifest
index 358dc4872a7f..3d53e6b02ee2 100644
--- a/dev-ruby/execjs/Manifest
+++ b/dev-ruby/execjs/Manifest
@@ -1,5 +1,5 @@
 DIST execjs-2.6.0.tar.gz 423437 BLAKE2B 9b7594a47cc463e28c959bb4f21819be64083ea174c2dc61e656f3cc882ee4abceb4199fa47ee9b410035326327ca2a4636be054b7321d9aba6dd2929d490636 SHA512 9740feceb3f9eae59aaa3697bd8f2fa1bb606cac4868b107bea4b3e9a7fe7fcdcfa387d852f0c267635163fc70eaba60a0ba241421434b26e1f94421b80ad468
 DIST execjs-2.7.0.tar.gz 425361 BLAKE2B 8dd3bb5557a6993667abfa6c424cbea6377c1ea7b3928b9b60a6ba084f1df8a109d10d1a616c9d302e1b98a2031ece9e710d7dd933791cbfb3eaa48e45b9a595 SHA512 9627f466e8a363404c940b29227d08a8ad067b53383989a3d8f4f902e8c050c0e81facdbdafbb660c41f7c8dc2fbdd3bd357ca708e612af4d223b5412c6c1fb7
 EBUILD execjs-2.6.0.ebuild 1161 BLAKE2B 0d3c8a52c055a3e024ac41ec9609b304184893f3a84b7d788dab54ea02251d232e0c890124901ac5e72a24b06e4790ea9d9424a0b1d76f6cd3bc8c3f410a2aa2 SHA512 bf29b773af7b9ababc95c55d9a998407c871cfd351f902ab6af6dcc0199a3b30acdc1049345f4968bfab79af35f7fd3c739fc0f421925bc5ff07570a983eb7de
-EBUILD execjs-2.7.0.ebuild 1169 BLAKE2B da680e4efb29973c8f19178dc8153f3b8b4152b817ad3ab9c1747cbb6555113b700d29e6a69c83739213829119f48083f12d22e1aa28178060ca73ac1080dd0c SHA512 da202bc866f97093d55f426d32052e7b9ba9c9ebe5ce7b4b52e50fe8603981576a5f8ae0cd8169c442293d80a219d3dcac223bc645b12c21995828f0bede8dc9
+EBUILD execjs-2.7.0.ebuild 1168 BLAKE2B 5e9b233eaa8f317a61565a89903f6d14a91b02965d81cb458d2586f3b788320c82b5be9d1b11ea6ffe56ed1531c7024c217164cb4305fc3938f294701529c7c1 SHA512 90378fe036dc70f8f7e316e01b4d88d7bc2f4c340529365478a7ce396b59b06b7d0dd6c0d5f5ddb10ee5418f8781462abbed47285d30dfbad4643781ea6a9d19
 MISC metadata.xml 338 BLAKE2B deb976ed7b368fddcb7e6b7b553ff8fc748f90c61d23f84cc251e7154f6f5f5c79c7d3d962dd2bc8061df7be36dc719ffb2c247c759e6fc7e4e4ff211eba6e16 SHA512 34e46d203d186a98cb50f83fc6508457a8ec536920b9640b7c0ce2f6f00e96643f1265c750a0f8555e57eb14ac1d19f0487bbe6e7fe5afe0870d8ecb162e2f27
diff --git a/dev-ruby/execjs/execjs-2.7.0.ebuild b/dev-ruby/execjs/execjs-2.7.0.ebuild
index 7cbdde6fd375..be4e765acb02 100644
--- a/dev-ruby/execjs/execjs-2.7.0.ebuild
+++ b/dev-ruby/execjs/execjs-2.7.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos"
 
 IUSE="test"
 
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 3ff131f6e9d8..16ad30e1aea9 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -7,7 +7,7 @@ DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43
 EBUILD facter-2.4.6.ebuild 1899 BLAKE2B a8e0d7c7a83c42150219a300d4a1a512913deee5d66e3a28a4f285a27d731cfa1937bb4d0d9bd8c80e133f2956ecf17690f5a94d66b385507a4f3740a425872f SHA512 0f4a589cb04567a42181bf366e51f6224d792c63bc2b38d2db3653688844e2cb611223fe148a6ff015d8dd734695214afc33ec0812e1707ac629344a691a396e
 EBUILD facter-3.11.1.ebuild 2851 BLAKE2B f7195a19a256dca9b6c1ca5aede6001421411869b4b4c1e9dd02ca91a9e73a6a4efeacbc2809bda46977f5ba2ea4b8efc6d52ecbd5a09b2fb44addfc2ff369b5 SHA512 fb1d8480fe94d452b49560093151be5ee068ab6b8a7f2fe7d90a1d07aaea0b0becd35d435189a7dbe9b9eff60ab2d82d703d700668951c562774f55dc12d375e
 EBUILD facter-3.11.2.ebuild 2752 BLAKE2B 6759e761e7152705a9fae260d626b78c32119553b63e37d19186b20d2afd8efa3a1b92286117f0c10486ecb818086e01352bdfedddd33b37e576cc9c90f731b2 SHA512 d9558badde687ae24b9150e36ccf7ee557463ba996c9654b87ccca5fa8ce44dbb38925282aa3af41aaa366b126a805d8cad42c2dd7d771ccb03d4b85ead17b63
-EBUILD facter-3.11.3.ebuild 2754 BLAKE2B 0b0a66a4ee65c54baac05172ec2d35ecd31d7252797631458004d0055dab3dfcb0f1a1103cec9b40e2d8de465672efdc1aa3f69e7856de2d05fa335099e2ea8f SHA512 21993d6b5dd6227e1b862abba394b15473ca02f14b8a14e133d08a50ad5b1f6a09291225bbe4e49144d9c6d25e4ae50177aad0a624533f83b20c6f93c1db665a
+EBUILD facter-3.11.3-r1.ebuild 2420 BLAKE2B 08c571937a6069cdbad57b9a70236c6dbb8c58c85f6d820e7c310e005452b468bf5932c65fbb13ed4d3eb957814820bfee13727eb6e8d6fe119da2711463157e SHA512 13865deccd523a37cbc49950da7a9b614841dee503ff099733f4562216617ed1754850635156e05dbc20fd6add9fe37b60167a5315f5c4be2c30211cecdb5257
 EBUILD facter-3.9.2.ebuild 2106 BLAKE2B efcbbd0cfe6a71b1b1a08bbc1f7abe4b94845c9e13192deae811466211ab2ba533ae10732a4d72635609b9cb419051b7c4a39f248e9b06f7ec751cd893d28852 SHA512 5cfb67a3db8d288302f21bf0092c05ce19b40c8a2f00b4b9b63e3e02cd7d1af3dd20670b744520cb42db2b2ccd52e9153d86c0e1db7a36c4c7854c70d79149dc
-EBUILD facter-9999.ebuild 2761 BLAKE2B 45a04ae914f400f4b80fa0f51fed999d08344ca58005040f7930f2fa7c4092329fdf4557a9babc81ebde788731844cd8299af704dda71a22521a14515f7c6c73 SHA512 58190ff28a512818b79e49c92525c61898a29ce3ce8f8b9b884489ca0f08ae980d906164a45d5a60fef9bc3a8f38ef88882474243188f250ab57043079845f16
+EBUILD facter-9999.ebuild 2372 BLAKE2B e3b4f77d6d012fc24893ad870f3f96b6d297aa9874277230721ba74f996ede3a1cdc38f11164593a253e56ab52a539756e88952cacce7eb04a8229722935d338 SHA512 3bbf988e93de0fa9f338b4b3fb3c586bdbb9052c07eafbe54723de98d9daca8dcc103bbddc766e752b323d88ffec0bbe67fa4d1becdfa6174eb97310edee8193
 MISC metadata.xml 854 BLAKE2B 51b94622bf8ce34658bf34bf266effc445fdbee52fb22e70c9a645c36b7ac28db73793f185b2dfa791d8459a56ea66eccc6a3f4da56db4fe4ee171ee607366ea SHA512 27e7e17a15ad80544fb121b050f0f5c39d3e27a53ade89063a894569472618b29649b5a737011b8d6597594d9bc94a49cf52c9df857d577a098d6c770b4a9639
diff --git a/dev-ruby/facter/facter-3.11.3.ebuild b/dev-ruby/facter/facter-3.11.3-r1.ebuild
index 6210613630d9..683775e7668d 100644
--- a/dev-ruby/facter/facter-3.11.3.ebuild
+++ b/dev-ruby/facter/facter-3.11.3-r1.ebuild
@@ -17,18 +17,16 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
 	EGIT_BRANCH="master"
-	S="${S}/${P}"
 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"
-	S="${S}/all/${P}"
 fi
 
 BDEPEND="
 	>=sys-devel/gcc-4.8:*
 	dev-cpp/cpp-hocon"
-CDEPEND="
+COMMON_DEPEND="
 	>=dev-libs/leatherman-1.0.0:=
 	dev-libs/openssl:*
 	sys-apps/util-linux
@@ -40,23 +38,29 @@ CDEPEND="
 
 ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
 
-RDEPEND="${CDEPEND}"
+RDEPEND="${COMMON_DEPEND}"
 DEPEND="${BDEPEND}
-	${CDEPEND}"
+	${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() {
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
-	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
-	# make it support multilib
-	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
-	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
-	# make the require work
-	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
-	# be explicit about the version of rspec we test with and use the
-	# correct lib directory for tests
+	# be explicit about the version of rspec we test with
 	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
-		-e '/libfacter.*specs/ s/lib64/lib/' CMakeLists.txt || die
+		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/' \
@@ -66,12 +70,19 @@ src_prepare() {
 	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
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
+		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
+		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
 	)
 	if use debug; then
 		mycmakeargs+=(
@@ -85,21 +96,15 @@ src_compile() {
 	cmake-utils_src_compile
 }
 
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
 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
-
-	# need a variable file in env.d :(
-	diropts -m0755
-	dodir /etc/env.d
-	echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir"
-	fperms 0644 /etc/env.d/00facterdir
 }
diff --git a/dev-ruby/facter/facter-9999.ebuild b/dev-ruby/facter/facter-9999.ebuild
index 4500cc443e23..d99f0e0675cc 100644
--- a/dev-ruby/facter/facter-9999.ebuild
+++ b/dev-ruby/facter/facter-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 # git-r3 goes after ruby-ng so that it overrides src_unpack properly
 inherit cmake-utils eutils multilib ruby-ng
@@ -17,18 +17,16 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
 	EGIT_BRANCH="master"
-	S="${S}/${P}"
 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"
-	S="${S}/all/${P}"
 fi
 
 BDEPEND="
 	>=sys-devel/gcc-4.8:*
 	dev-cpp/cpp-hocon"
-CDEPEND="
+COMMON_DEPEND="
 	>=dev-libs/leatherman-1.0.0:=
 	dev-libs/openssl:*
 	sys-apps/util-linux
@@ -40,23 +38,29 @@ CDEPEND="
 
 ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
 
-RDEPEND="${CDEPEND}"
+RDEPEND="${COMMON_DEPEND}"
 DEPEND="${BDEPEND}
-	${CDEPEND}"
+	${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() {
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
-	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
-	# make it support multilib
-	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
-	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
-	# make the require work
-	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
-	# be explicit about the version of rspec we test with and use the
-	# correct lib directory for tests
+	# be explicit about the version of rspec we test with
 	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
-		-e '/libfacter.*specs/ s/lib64/lib/' CMakeLists.txt || die
+		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/' \
@@ -66,12 +70,18 @@ src_prepare() {
 	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
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
+		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
 	)
 	if use debug; then
 		mycmakeargs+=(
@@ -85,21 +95,15 @@ src_compile() {
 	cmake-utils_src_compile
 }
 
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
 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
-
-	# need a variable file in env.d :(
-	diropts -m0755
-	dodir /etc/env.d
-	echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir"
-	fperms 0644 /etc/env.d/00facterdir
 }
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index 55984a2287f7..79cf18d2c417 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -1,12 +1,8 @@
 DIST fakefs-0.11.3.tar.gz 44888 BLAKE2B 498dbcbe12389f27b6c6776425910f91ccc45ff85db1fa59e4fef8635dc9923294dbc979df2d10846d1435e81ee6d622190d3195399a4778d00bd4446edd2571 SHA512 9c9e18337d3c461fe4b5a4e6ede17cd840959147e66a57eb61fa203d8ba95d5655885d3e5b776ecb3a1cee93488dc711d1b2bd28df23bc131195e311229c329d
-DIST fakefs-0.13.3.tar.gz 46019 BLAKE2B 2ff858106a4d5b4f6859b806cc1aa54a08917ecf2d8794fc20ff372cc94f1817ffac3e070c1c2d96a2f145fd2d471399792b42a45c24ee61c309b5f8d0ee18e1 SHA512 c3cd74fd5914d75a4cd3b0edc661b70398c8970ab100e7103831c2d2b686a9f61036549cb21f53610eeb2416d1a49dc0e0a16e7c439c504d65b41a05c31dfad3
-DIST fakefs-0.14.0.tar.gz 44808 BLAKE2B 9957e95e5d8c6188da0cfa9160067b27485b9222a4f6342b2901a769b437ffcf4322e6ea377ac80ec95fd59ec56c5a48d3012e5c50b49a9fa8085c5c7b0fdd20 SHA512 8afc29bdff38232bf86de37771653b3f519f21e3c148afe7376d6df86cb303452f06a430f359f0df80a9f01aa9d697b24018e6b55a185e649c82e81d43274739
 DIST fakefs-0.14.2.tar.gz 44978 BLAKE2B 6cf17d70c1c65ff5dd17c00d2a2f61860aa2d499365906e8a056d182a2402af08c33b1d4608ed2ea2749a49966eb3142195b5d29b014e41a176e793bd8223e97 SHA512 bfe33f0849a8e72bae6c3b4cdd05485c6ea807f2048decfcda84055fa601c85fcb6ebe0db9de81d9ec77c5040e58335be7109779bd765da73a405541903049e1
 DIST fakefs-0.15.0.tar.gz 46331 BLAKE2B 5994921c2696a48ea0541a2a49fc9e372a52ef585a7a48ad4c15303d8f817dbb95411d0efcfb93334ffaac876e349a41cb7330d073f019bb09d60e22f6bf5f1a SHA512 49602cb3dce3b0bd2950e77aed515bcb71dd453bf658c8f15f218abec7fe595aa62969495d46974d983bd52a19d6d19bd2986ad8a6e9b45e370c37259c9f32fb
 DIST fakefs-0.17.0.tar.gz 48156 BLAKE2B 0d05def00b527fb0d510ea73d6c39ac9025f5d2e79b04055ef4e7c9250152f9c7a339f2566765da5a406c3c0c561252a70d44da13fdf3b042e58e60275e7465f SHA512 3e63a439a2d9e3898c50453e062808110128d5bcae148d90751e72a2a1ba528e00e4cf1511b4cef3c3fb37b8dcfca038289bef35eaeccc1f766aeb2984530203
 EBUILD fakefs-0.11.3.ebuild 1098 BLAKE2B d31a81a83d641186b7780447a291fab0812191766b5a6600ded1e365d3ffe1807df11ab4bb557d60782532a67cf13b05c5b892fcc8fadbe536eaf3cb9c3a6047 SHA512 52832e5b6530397c423f3ebfa64c7fb9b60e52acc9e5d84aec735a784130ecc75a604ded3cba48979c4e511624e90bbff8d9e3dea9df9dbde84a0bbb8c40f53b
-EBUILD fakefs-0.13.3.ebuild 1111 BLAKE2B b1662f69aba52dbc1867e019631029a0e589e54ce3c253285e081342d77d3a6dd8a11e43c2f8a368c9fbbbdbd7ef1efe8f960a07b1d08aaffe01c92862201e01 SHA512 5131fbb7fe77ab2678b183e5492c38d96f3742eeebe7fdf7aa1a1ab09ceb5748446cc12aea77bf75361c40e1aa7e43214d9a571167db598750d15fe32945dad2
-EBUILD fakefs-0.14.0.ebuild 1104 BLAKE2B 5c672ea370bd900215722582fcde3fe53a9318a2a59e6ee555ff887d89ae8bb8f46b99e7ee0d2d960b3171f6113c57d8ceecc2adef89d32a65f75af8880a8de7 SHA512 486e8c96c9ba5099b280990c5d0860e7513fbf40dd1dae361eb760443bb82220a432096077da3eba7baac9d98b5d8f5db8252956a25119d3b47df9b2b0c97f08
 EBUILD fakefs-0.14.2.ebuild 1104 BLAKE2B 5c672ea370bd900215722582fcde3fe53a9318a2a59e6ee555ff887d89ae8bb8f46b99e7ee0d2d960b3171f6113c57d8ceecc2adef89d32a65f75af8880a8de7 SHA512 486e8c96c9ba5099b280990c5d0860e7513fbf40dd1dae361eb760443bb82220a432096077da3eba7baac9d98b5d8f5db8252956a25119d3b47df9b2b0c97f08
 EBUILD fakefs-0.15.0.ebuild 1104 BLAKE2B 5c672ea370bd900215722582fcde3fe53a9318a2a59e6ee555ff887d89ae8bb8f46b99e7ee0d2d960b3171f6113c57d8ceecc2adef89d32a65f75af8880a8de7 SHA512 486e8c96c9ba5099b280990c5d0860e7513fbf40dd1dae361eb760443bb82220a432096077da3eba7baac9d98b5d8f5db8252956a25119d3b47df9b2b0c97f08
 EBUILD fakefs-0.17.0.ebuild 1104 BLAKE2B 5c672ea370bd900215722582fcde3fe53a9318a2a59e6ee555ff887d89ae8bb8f46b99e7ee0d2d960b3171f6113c57d8ceecc2adef89d32a65f75af8880a8de7 SHA512 486e8c96c9ba5099b280990c5d0860e7513fbf40dd1dae361eb760443bb82220a432096077da3eba7baac9d98b5d8f5db8252956a25119d3b47df9b2b0c97f08
diff --git a/dev-ruby/fakefs/fakefs-0.13.3.ebuild b/dev-ruby/fakefs/fakefs-0.13.3.ebuild
deleted file mode 100644
index a24e8fc8295d..000000000000
--- a/dev-ruby/fakefs/fakefs-0.13.3.ebuild
+++ /dev/null
@@ -1,43 +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 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="A fake filesystem. Use it in your tests"
-HOMEPAGE="https://github.com/defunkt/fakefs"
-SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-3.1:3
-		>=dev-ruby/minitest-5.5
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-
-	# Avoid unneeded minitest-rg dependency.
-	sed -i -e '1igem "minitest", "~>5.5"' \
-		-e '/bundler/ s:^:#:' \
-		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/fakefs/fakefs-0.14.0.ebuild b/dev-ruby/fakefs/fakefs-0.14.0.ebuild
deleted file mode 100644
index 0190df166417..000000000000
--- a/dev-ruby/fakefs/fakefs-0.14.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="A fake filesystem. Use it in your tests"
-HOMEPAGE="https://github.com/defunkt/fakefs"
-SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-3.1:3
-		>=dev-ruby/minitest-5.5
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-
-	# Avoid unneeded minitest-rg dependency.
-	sed -i -e '1igem "minitest", "~>5.5"' \
-		-e '/bundler/ s:^:#:' \
-		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/ffaker/Manifest b/dev-ruby/ffaker/Manifest
index 55b1488b6f50..d9ea8c0ed7a4 100644
--- a/dev-ruby/ffaker/Manifest
+++ b/dev-ruby/ffaker/Manifest
@@ -1,9 +1,5 @@
-DIST ffaker-2.6.0.gem 400384 BLAKE2B 1c6a0c620069a4ec822dc1426e9953a59c1c5c9ff765321e461935d1389fbf4ab5e03239d37f954cc150a59eb94603949b5e4cdb79cfcaabe653df96e4d7154f SHA512 65cd6ae364f8c250c748368ef6b124b4f2a691b56e757544f0a117c6f67288713416068b51297ae68a3f25ad3fa28c5544edd623824870e1cfa824d839bdc1e9
-DIST ffaker-2.7.0.gem 402944 BLAKE2B f0696b1bcd4da7058e93852b1f943267800282c0ea75014468d86fb0bfef5ddff12f0f6da1f05a29aab0c71158529a91a00b980187279276d3acb3c617aa1bd8 SHA512 426de5d4774e603b17ef60f4a759624920d803f98f817d962cf372ec5b6ab946e99f4793ee709e2a252f1d2ed071de38f00a06c9e97dcbdd667bf7325a2374ee
-DIST ffaker-2.8.0.gem 411648 BLAKE2B 84723aeae1ad3be8ecb526a6ed2d3ec2e807d29fafdc9f1a39c3c59eea9d9ec4d696d7b5733f4b1cc939676721caca5b614ab81a152130d3e3b12629e2480cc0 SHA512 c27f393f46014eda844c8a176a698db66f90f7c6b2931b3884f446774ea1ce9058dd7eacda8271c93d335fe6a8a0a130c580d86229c15fff0b9ec53a52db0edd
+DIST ffaker-2.10.0.gem 421376 BLAKE2B 30976c0bee8862623c923b3797bd6de31b803643191d55ee2a6ef101a92f43acf6e300991de43641f2564ac82d046fcb7e53ca8b9cecae4c6b339e43f020cc1a SHA512 cb54d995f39877eea0844395e52158ea898f1d3fb17af0b01261f8b359d50ffd5d7b94fba0400e7103543a96670a00b3e5a9c072bc46f7221d390ab81e6ac507
 DIST ffaker-2.9.0.gem 413184 BLAKE2B a48977b2749b60db18d046a0df0b65c1790a4fba5920faaaf6ef93be31cc7defd375379e2e46bbe2b4d2bae8b29f7cace4ecf09fba7d80a6cfacd724edd60564 SHA512 dff411a4d8864817dacb0498ce73a9b350d4e03aa771edb5b69c5e749ba4565dbd24d09215a7397e4567a9cd3ce2baae9b8e4e21cd8db127257364395e481364
-EBUILD ffaker-2.6.0.ebuild 465 BLAKE2B 3831db75d7da471f0e88aaca867e307d956444bbdcaa84984afa088610f7bd84376651c490a64adf212822ff3ab48011c5344be7235850354ee104fcee33ece7 SHA512 1df8ecd5f9fda52eee8beeef8e0a2cc2b37a35bb97bdb56e57c46b748a8a1e1ea5420a1672f6e8b3f100b5b268bb0c9a948743b095f6ff15108033b763060003
-EBUILD ffaker-2.7.0.ebuild 465 BLAKE2B 3831db75d7da471f0e88aaca867e307d956444bbdcaa84984afa088610f7bd84376651c490a64adf212822ff3ab48011c5344be7235850354ee104fcee33ece7 SHA512 1df8ecd5f9fda52eee8beeef8e0a2cc2b37a35bb97bdb56e57c46b748a8a1e1ea5420a1672f6e8b3f100b5b268bb0c9a948743b095f6ff15108033b763060003
-EBUILD ffaker-2.8.0.ebuild 472 BLAKE2B 65064f58d2b8111b153e74f1a8f7b95567d9fafb4f5521b7de196582751e29da939b08e288800ffd4cc441c48d8f7ef5c3e82d9f65af18c7e02715bee4b2c803 SHA512 0680564ca5a656128df8a9dee0d5e23a085157b605598f6ccf154c6f4592649d030573da563da7402746b1be82f2d402d3705b554b35f5b43f3d743f85a9f341
+EBUILD ffaker-2.10.0.ebuild 465 BLAKE2B c63aae50880eea7798ac936f1967a770407454379fd654681ee63baadfd912796105fc58b863a9ba2e8142648ff3abc233b99e6fef38f3d158c58fb77cb4ad14 SHA512 ff26dfece749cebca0d0fcdd68df8af774847d5893f239040307c19cf7c55b59e9c3ab07e362a1847bb438a75c5c8811566e23ba9125ae54ff7c15db5ea8ba3e
 EBUILD ffaker-2.9.0.ebuild 472 BLAKE2B 65064f58d2b8111b153e74f1a8f7b95567d9fafb4f5521b7de196582751e29da939b08e288800ffd4cc441c48d8f7ef5c3e82d9f65af18c7e02715bee4b2c803 SHA512 0680564ca5a656128df8a9dee0d5e23a085157b605598f6ccf154c6f4592649d030573da563da7402746b1be82f2d402d3705b554b35f5b43f3d743f85a9f341
 MISC metadata.xml 344 BLAKE2B 35517e20c0036d8a175e81240ba0ea29799e0a00ddcc7dbb3b71822c4bd1d2ab64795a967dda9b2c9d207c18ffa090aab11dcfc6fe910e74b60f20413f65c001 SHA512 24ac57014a8aecdcc405060fc2e5f7ad3017cf07d022c55988bf7386bb50a79158dcf88f64e27141a4c44542f60c6d0e3b82d94f99dea71213cf6b914e717ada
diff --git a/dev-ruby/ffaker/ffaker-2.8.0.ebuild b/dev-ruby/ffaker/ffaker-2.10.0.ebuild
index df9f13df83a4..f75776637ed8 100644
--- a/dev-ruby/ffaker/ffaker-2.8.0.ebuild
+++ b/dev-ruby/ffaker/ffaker-2.10.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/ffaker/ffaker-2.6.0.ebuild b/dev-ruby/ffaker/ffaker-2.6.0.ebuild
deleted file mode 100644
index b2f16478d60b..000000000000
--- a/dev-ruby/ffaker/ffaker-2.6.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Faster Faker, generates dummy data"
-HOMEPAGE="https://github.com/emmanueloga/ffaker"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
diff --git a/dev-ruby/ffaker/ffaker-2.7.0.ebuild b/dev-ruby/ffaker/ffaker-2.7.0.ebuild
deleted file mode 100644
index b2f16478d60b..000000000000
--- a/dev-ruby/ffaker/ffaker-2.7.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Faster Faker, generates dummy data"
-HOMEPAGE="https://github.com/emmanueloga/ffaker"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
diff --git a/dev-ruby/filesize/Manifest b/dev-ruby/filesize/Manifest
index 7da4ee59a6a2..ce47e395c8a7 100644
--- a/dev-ruby/filesize/Manifest
+++ b/dev-ruby/filesize/Manifest
@@ -1,3 +1,3 @@
 DIST filesize-0.1.1.gem 8192 BLAKE2B cf2edeeb5b0b1954c6a2233dbf43356c639f611ec289b18f73043f17b26b57611c81da1707ee4c6bb0ad65bfafbf9e9212398af184f3eafd53b290d70b80129b SHA512 2c7e94feb2433c9a1c1545e817616a7551f5d02f441b2564d96499b8fea0e47b74843b3d06d959273fc000800eea87bb7bc1c643369a4d724b8ba19b53de6283
-EBUILD filesize-0.1.1.ebuild 469 BLAKE2B ecdfdf42127f31ec4823b123ff338b7ba98d7c9f92ca9071d77e9c14d3d53e66f1c6c82a965a1afa11e85cb151f80e92e0a2c121ba1717147d18ff7a49355fdc SHA512 e233f99fb2324e049cd4c1584724c924575fca53eec873a2b48ed00cd057f115de3625f57de5e56de1078f49f1f1bebb42e24cefe7e6a94b4df732514fc54357
+EBUILD filesize-0.1.1.ebuild 474 BLAKE2B 47b009cd38adf8f2915a33ebd0876bae852d6a105702e7546beec1cba547e620f6efd198b07cd5a6de0941a1995fa98983a7e7efaa2bc488ba2889add4f95569 SHA512 2a0002ea38461ff2cad804f9b811dd8e5fe9e773abdbcfb3f133035bae28c071299732bd48ac42c3b84ea23bee6fbe68d07588f13d7942c9351588a297cfb6ea
 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
index 553f32950945..d0230b3fd310 100644
--- a/dev-ruby/filesize/filesize-0.1.1.ebuild
+++ b/dev-ruby/filesize/filesize-0.1.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/dominikh/filesize"
 
 LICENSE="MIT"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
diff --git a/dev-ruby/fivemat/Manifest b/dev-ruby/fivemat/Manifest
index 485b46d85517..ca585353eb30 100644
--- a/dev-ruby/fivemat/Manifest
+++ b/dev-ruby/fivemat/Manifest
@@ -1,5 +1,7 @@
 DIST fivemat-1.3.5.gem 9728 BLAKE2B bd95cbac081e32df6c03a89d2533d20f8e892a575e1cea3679c3599a233c6097ecd03d4e804ca78be9d32de49759f3b03407f643ac14eeb5cf31e12e2bcb97ae SHA512 c19f30708cc2fe3cba045333eab7409049013f04f273606fe27cfc90eadbe68feba4b1e2c6a0d7a2183e637805c2fb8921a7ffd6d895dc746efabebad6189a7b
 DIST fivemat-1.3.6.gem 9728 BLAKE2B 002470ba61b6eb51a9e1e2020b8d3e60d6f4824549032fe7da7b31c3b67f9995a61c4bd59a1c2fe777b72ffd9ddcff568efa91ca6d07651eedcf6935455205f7 SHA512 b3cdaed761c0d955621c1bb7de691a552e0f49588a132235515cf02e39e27344d868b57b53752c027a4231a5bbca7b5957f30d5e77359f606031526d92eee1fc
+DIST fivemat-1.3.7.gem 10240 BLAKE2B 624eabf458130792e6dd06667fe67f578005630e164a4ce30871204d792c5b562c1ad0fcf2470915bed877b60b3db341887735a3330cfeae181bee6775775295 SHA512 b380bef69756d0214325ee6f3f608062d63d8dd7603aac7b9af1abdf406687971cb4914634e9c807ca73819bafd8e99c5cec0a29f461a1ef3f861676bee86ddf
 EBUILD fivemat-1.3.5.ebuild 508 BLAKE2B 1dc5839edd9483a3ec7769a9e9126014cf06c74d8b6c30da3b7c2009eb080c977a1cf7ac6f9e45fe3f9524ab60eb0d0cafa526b975487c8f11e54030e05ef9d8 SHA512 7137ed94caa07a9fe1e00096534a2163a4d07db43e7bd1067f47dd419c2c819ea2f3f4218f47e2fd1dbd06b813fd1c4a25ec4c00942b3343540c609af908e5d8
 EBUILD fivemat-1.3.6.ebuild 501 BLAKE2B 19921ce56cf907b932fd68f7ecf81b621cb60d104999dc68c4b180664123ee945e49dc45d54bcba6d972d9dfb13817ae52259268da9f691e1a98caec6a54c331 SHA512 bfcbd1d993e5197538b3eaa746aeae63693dd9504963bb66bc8f3ab8c9181e8762ddcf3292b73c1cc67fa16be2d371bab1fa41e006db9310bc3ab94f96e4400c
+EBUILD fivemat-1.3.7.ebuild 501 BLAKE2B 3c751e303336c0313cd47109ef7a6274f828d38ec1262b1d99317672ae4d1b1039cc3defe2d32140bf9d80c2ba416ab42507eed3f5faf0a875a9837bc8ac0bac SHA512 a91e18be122263b878ecd70c8fa9e13550b9faffe02e196cd3573925c43ad8312ed7ca7b2cbbf5d10a7b1f1a154af50856b1f695152e63438ef6fd21f82417b2
 MISC metadata.xml 453 BLAKE2B d5b612779d204d4d7a8ed8a81b18e462806aece4f6f5211247c4a2f3a88733dceff699a777298bb07a0ffe4a406b4eec8102b5373ac7ffabefedee9acec1b2ae SHA512 7549f9ec77dfea3eb0c8044fd8c81ea4b1bd268f22fb8bff02d6a41202b94f567adf2af89f4eb7f102eda5fe40a35b82b15ed89c18c0b12e3a607e8b1c55f5e0
diff --git a/dev-ruby/fivemat/fivemat-1.3.7.ebuild b/dev-ruby/fivemat/fivemat-1.3.7.ebuild
new file mode 100644
index 000000000000..98295b14f6fa
--- /dev/null
+++ b/dev-ruby/fivemat/fivemat-1.3.7.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# Package does not contain tests
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="MiniTest/RSpec/Cucumber formatter that gives each test file its own line of dots"
+HOMEPAGE="https://github.com/tpope/fivemat"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/dev-ruby/fuubar/Manifest b/dev-ruby/fuubar/Manifest
index 123ab42c2758..0c019f8e8e45 100644
--- a/dev-ruby/fuubar/Manifest
+++ b/dev-ruby/fuubar/Manifest
@@ -1,3 +1,5 @@
 DIST fuubar-2.3.1.gem 13824 BLAKE2B ad7c0de7dd75b6164045bab69cb8be12999828edbbe12157cdfcc9188cacf03a3528731d85918cd205e8659739f177908b3a635adf0f722bcdf78dfb6eb2c10d SHA512 e83b5474b6805f03e3a81e9b25d97e3a3819d7d3972c7f164dc4dc09bc163eb86457a3cfe5fd53df336f821846e5fd63739fe05c30200537c22aa329215c1900
+DIST fuubar-2.3.2.tar.gz 30383 BLAKE2B 4e43dcb5621bee74f0401573217e29d17f6f537dbfc86b2c23764f77224072b3efd15adacb9281681b4d16410db6cb2020918a42ee59132a1772b9c2bf3f43df SHA512 93e812f944153f3c4d147195777374584440ca779a5d45436052386a380308f471f6ba22906d823d4e9e2bad6bb72550d2a5eb7dc1535572e14866e9f05f6370
 EBUILD fuubar-2.3.1.ebuild 714 BLAKE2B ccd1af19462c8502d0d05d4d99823234da3b3c38ca54a39cbb3c85678cf8b6731abe00cd5621114f530a1c0c89ff7dc40296588e9dc8acf429d05ed9bb630fcb SHA512 1ad2ef5ae32d9248768f3d9701a8ac96ec0fb40aa9ae468a0cf67a322442f2ad083803c856e4e02edb0c47194b1ad4f22c19b2b485a2d618919c02ff99408add
+EBUILD fuubar-2.3.2.ebuild 835 BLAKE2B d7a3cd25c8fb86a05492710398a587c7da3956535bbbb683c5ee980eac408fa2b8e38f1a09280d40857dd9a2501f275ca6d48172faed5e837ea743f0a8d4035d SHA512 5142598fbfa036a3e68320c30fe56d4b5569493b7863f44debc685fe0cee6421b68d965226309baae84103a3ccc9d36eaa6acc343577c6bebbbb9e5a1c69d8f5
 MISC metadata.xml 349 BLAKE2B a394e14e59c6aff0211e2b84c89f5d12b862cf44d604c6dec72d80ac8b52c6ad2333069fb04fd257d0d761283bd4aa041ff716f34576f46e455d075ce2ea2fab SHA512 0c974aa96afd7eab91e27ea72859e709fd5d8691055a06b57e2267e2ee36904b3f4b92b1b0d24659015f303017298cbb4373f225471a6350551d3d85574930f7
diff --git a/dev-ruby/fuubar/fuubar-2.3.2.ebuild b/dev-ruby/fuubar/fuubar-2.3.2.ebuild
new file mode 100644
index 000000000000..b5070829cb2a
--- /dev/null
+++ b/dev-ruby/fuubar/fuubar-2.3.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Instafailing RSpec progress bar formatter"
+HOMEPAGE="https://github.com/thekompanee/fuubar"
+SRC_URI="https://github.com/thekompanee/fuubar/archive/releases/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="${PN}-releases-v${PV}"
+
+ruby_add_rdepend "dev-ruby/rspec:3 >=dev-ruby/ruby-progressbar-1.4"
+
+each_ruby_test() {
+	export CI=true
+	each_fakegem_test
+}
diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest
index 1f016452c1f0..f679c291aa0d 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -1,7 +1,3 @@
-DIST hiera-3.2.2.gem 40448 BLAKE2B a94bebb0e3549a3bde83ef80db8c13af8bfb6dbf0f9f3efc244ddf211fed47c7f763e033c348d3a0fd20ad04c3de009b4d37fee0da080a77c4eac2a1439b8751 SHA512 5a341c47305592421945fee3ab3fbc2c39f3f847d1c45d9b6dc8cc90da8057c25b32abf127b667fc00071c1fa7809034a5dd1e640c49f4ba6c2ab3e5718753b1
-DIST hiera-3.4.2.gem 41472 BLAKE2B d4b1fd0432a4b8fffbf9e55118e93578226fd270ec11da4b999d1e1b7edc32fda70d7a7b84c016034d8028ae51d55d5076dc51780b10ff59af52077ddda6224d SHA512 33045e395fa06467ae61f42eeab5b48b76a03274243db52dff7dbf8a08052b8cd2e0dd609d6a13317efab485408c7351cc2553ba2e5a767afa09a8a21735852f
 DIST hiera-3.4.3.gem 40960 BLAKE2B a4747c6096065c1272bd3099893d27c53b5e869be16643fbd59fa0eead692e3bd082fcbf82463614336d00c3068244bd632fd6c3a87ba520566a8643f674bfc4 SHA512 126e626b9c9020f2b8565aaff35f30b35c73785120425d186c97186c5bdfafc4831216250f78fd33ffd5e1dde49646b262887747c0d73442a252c391329959e2
-EBUILD hiera-3.2.2.ebuild 524 BLAKE2B 80e61786e65ee7f36d805af077e9b54c955dd5bae1660bbe6824850983ecb57179c948abfe507d4008c735ee48c53d008d3929a83b6a85b97044ae97beb3f3ec SHA512 0b6924461538401784f18907ec22a83d6bd6557d490fd66b1b414631224762d09f42ccb8bd1175e31b7ffc690998ee66d25b30de275764c18c064ff5be8436dd
-EBUILD hiera-3.4.2.ebuild 533 BLAKE2B 3a61bb5b4ce9e8c26c18e78a957acbc52596b34601fdda16bc2596ad09c16dbb3f8480ff5ced1ad01194850181f54db5e79f00ddacd000111a9f58d3850e1f7c SHA512 2b953ff892acd01638bf891d4462a0cbb551010d1f77b2f642aea647c01d46de2944b5075b71790e21ad1aa5f94448e22dc97ec71a6173f1ff850af7df53cf64
-EBUILD hiera-3.4.3.ebuild 544 BLAKE2B 6d533824170154f6b0a8862c2824b952d8e3823d109f8e71d403e87b77381589788d4f80b0bb920fc55f25f067a6d9ba48cd9b78e79cdc4d95a7126f164d6b3a SHA512 db8f917b45ae45eb7d809b121a0c8d2aa51320c8b0dd1387fee65d7d23267a638261d558484aaf4445df19a1c169021dcee25a82985a00135f9cbe61b91717fd
+EBUILD hiera-3.4.3.ebuild 543 BLAKE2B 121f9fd758d74c0dfea47e5154778da04e759237fc8574e91429a16212f098a5f56d0798ab385f47d5c1ce96548fc28d5fb59610ff0043ec314700759e49fb3f SHA512 96805f69a7bfcc72e4b05e01d3a3eb835349dbe3fcdef6cdd06e1f9c1b2ae0c08b3c9119c93af8691b736b44e6e13a6d5c064d6099e7b3b5ec6afc886f07351d
 MISC metadata.xml 441 BLAKE2B 45d0b18035001279a7fc0b362aa00ab9bea5282f35a2237bb72e84893d8a9ff4b575e43928d48aa9906def18e3fe1bdfb121e5411c46af7117b529f136224796 SHA512 795fc49e90529600ad3a950440f33c9dc60aee0f6ad134b682d8c8e80452f015fd2de5af77ed6ad58830e61b1ab7944dcb81629d75d4b09927e218f33aa948ae
diff --git a/dev-ruby/hiera/hiera-3.2.2.ebuild b/dev-ruby/hiera/hiera-3.2.2.ebuild
deleted file mode 100644
index 5004cab72e13..000000000000
--- a/dev-ruby/hiera/hiera-3.2.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple pluggable Hierarchical Database"
-HOMEPAGE="https://docs.puppet.com/hiera/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 hppa ppc x86"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-ruby_add_rdepend "dev-ruby/deep_merge"
diff --git a/dev-ruby/hiera/hiera-3.4.2.ebuild b/dev-ruby/hiera/hiera-3.4.2.ebuild
deleted file mode 100644
index f754d7e4accd..000000000000
--- a/dev-ruby/hiera/hiera-3.4.2.ebuild
+++ /dev/null
@@ -1,25 +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_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple pluggable Hierarchical Database"
-HOMEPAGE="https://docs.puppet.com/hiera/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-ruby_add_rdepend "dev-ruby/deep_merge"
diff --git a/dev-ruby/hiera/hiera-3.4.3.ebuild b/dev-ruby/hiera/hiera-3.4.3.ebuild
index 9792f761cf2c..4680abd1799a 100644
--- a/dev-ruby/hiera/hiera-3.4.3.ebuild
+++ b/dev-ruby/hiera/hiera-3.4.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://docs.puppet.com/hiera/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm hppa ppc ~ppc64 ~sparc x86"
 
 ruby_add_bdepend "test? ( dev-ruby/mocha )"
 
diff --git a/dev-ruby/hoe-seattlerb/Manifest b/dev-ruby/hoe-seattlerb/Manifest
index b7e4f1ab6565..5e1bd7edb56a 100644
--- a/dev-ruby/hoe-seattlerb/Manifest
+++ b/dev-ruby/hoe-seattlerb/Manifest
@@ -1,5 +1,3 @@
-DIST hoe-seattlerb-1.3.4.gem 14336 BLAKE2B b53cb91cfba8d0e53290c40c29812163b99b81ee110818f1460f1aa155be27940199e38b32a9b65261dc00cf6db2a9991ac4323a851afb1383a9907a01899d79 SHA512 5e968611f3826fcea8f1a896b1883e07d5cf8d02bb20d0de2d8c7bacc0538163b5996d0a2f41dc8f892c4629bfc9e2630f14b374d73fa0b13daa2ca5de3433cc
 DIST hoe-seattlerb-1.3.5.gem 14336 BLAKE2B 76dd4e82e4b3ceee897d484e2bbf596414bfbe50d998f2f3833e6be63dacbec4d4d1014b14d9504cbf9615736f584ea3c083c8f5b15609f400264ce5cb31856b SHA512 a5cdb38114e22e07824749e721ad7ff85724c04d8ca1c66996ca86fc9ec150a3b0b7b3bc83511932af0c4acd7e9b581d6b1583eda60160bf7ed91021ab803d0f
-EBUILD hoe-seattlerb-1.3.4.ebuild 775 BLAKE2B 85fa5cb8bf5481b33c588522a62ad57d898a272dc8b7f24abca03c8fb7a389f5b2fe5a98495219b08b1f507ca408838d07fe302aa317ef0fa9b091a4dfa0e275 SHA512 712af42765bb7a7bd5a1187fcf578e730b14d8a467ef38dd42e28bb6da98aceec79c247e9db97425a80ee1a4a29b38da24dd4235785793c4de4c36b78b996d12
-EBUILD hoe-seattlerb-1.3.5.ebuild 781 BLAKE2B 6c1ec42df74923033b7d95fe13e063e3b65e0ce9c338f0c0246f1b2c0db2698ee45bba9c0516692c9f4a57b941a06fe1bd2df0ce715f38e147517643fbdd1857 SHA512 a9049456b43b8276a7668b3bc9a7b8b7d6f43a91cad651a83a543d020689cc6d55ff74962f31d4e37ac4a437dbee58b498da1292f666730be58aa0f743a3af72
+EBUILD hoe-seattlerb-1.3.5.ebuild 780 BLAKE2B d7a21b6606a82ec83f8f85a6957c8ebd495b80f4cc726aa9ff528dc24bcedc0deb171b2b7cb3fa4b87168a5d21c6564f3809f680a00a57c72ed72ac29be5251c SHA512 acb882a93eb9550d2b0787758469ec642e1e2a885c234f430cf3cbe1767a1b0a9c3ba4f88282316f60d3a7df750678bd80fcb9d318be4a6025462e83ea3ba8a4
 MISC metadata.xml 339 BLAKE2B dfe565b89582b66fb99b6c9e50c9ca3efc0eeeb4a2c2cecd5e103f2d9526fde1a6e591c240cc83163d55c2973adb9482dc8c91ec3cea5a8f67848aa0bcdf5e4c SHA512 2e0d6992a3e11200d4373727efa7ea4c1a1eb1e1cc2a1023b0d0b651769580d2405378c4560e498ee5f52f7350fee443a443247ccedef5178be40f014f44cd20
diff --git a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.4.ebuild b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.4.ebuild
deleted file mode 100644
index 593c555c872c..000000000000
--- a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-# no tests present
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hoe plugins providing tasks used by seattle.rb"
-HOMEPAGE="http://seattlerb.rubyforge.org/hoe-seattlerb"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm 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=""
-
-all_ruby_prepare() {
-	# Not a real fix, but otherwise USE="doc" breaks and defaulte license is MIT
-	sed -i -e "/license/d" Rakefile || die
-}
diff --git a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild
index 3927e35a4414..00c822fc71a9 100644
--- a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild
+++ b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/seattlerb/hoe-seattlerb"
 
 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"
+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=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index 6e2b72d3e3b2..68189439def5 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -8,7 +8,7 @@ DIST i18n-1.0.0.tar.gz 61451 BLAKE2B d054c69725b3eadf68a885b0d153a808e853ed9bd7e
 DIST i18n-1.0.1.tar.gz 61536 BLAKE2B d439410004511f90e010beb7ab90029367e9ddb876c2215e101fa9a3385c0420a774586ec626136957dedd66c8c7b3b9ddcc6570e3a7075bbd5a90e3508ddea3 SHA512 1d0e05e04318e31d35d19c1af3b6d3aaef3d45df9b2868b65fef9aa3628c9502c6f8fca4beb52aa8c7c914c46ff159da489bc2ccac69013808459e709358b4ca
 EBUILD i18n-0.6.11-r1.ebuild 1325 BLAKE2B 6f0fdfe1af9f5c11e36f6f4d5090854f9b61752059053b143f58f63dde4eb160d79b36c71900b83cde941ae69bb2d777af999fedbe1d48b39846c11681aca5ce SHA512 0497dbca374d5afd9e7064335457fca6fdc8daf2d20bc550bc04603748f3818e9d44799ac510004afc304ecfc1774053d8928d9352da62e5d4197081791010fc
 EBUILD i18n-0.7.0-r2.ebuild 1514 BLAKE2B a027548d166ca6bd176d3cf2c7728fb0b6a22445ac22cf9e6e628a1d77f65d6c5f7262149cfdf6f22b83aa2c7a0fdfbc30d948466adc5885a2eeb58c1cce7360 SHA512 fe0eaaeda79550bd120e08fc6adf0a17d6e437e2682578dbd7dad08145e4188b37ea7f0a590d27a3548fc6b2e2989210957e39b94fe2f570234f5d7c06bfeff8
-EBUILD i18n-0.7.0-r3.ebuild 1626 BLAKE2B 7fcab35adf06965fe66b4201ca797a5774f6ca33f099bc8c50ce3f0358c25c2c04ede379a9acb9159b89c594c55a076d942929a0034787a9e0eb0b8bc35af89a SHA512 78e35f21ff8ff6c22eafc250dd685ad74c5974820018546327f9f85006c5e20c0bbb24054a0de1b67f34d190a77f59fa7ebf79b40518d2926ead38ddb989e799
+EBUILD i18n-0.7.0-r3.ebuild 1625 BLAKE2B 047cb266a12b698343260e0ff2d2448a95005493672a1e2bad7423c8c69b08c02b596d633864db0fe301c8afb1e82031feee602765bf1c97ee7472e60c72c0f1 SHA512 6427eac2d7f85ebd7d1060d565899a976da63229cf3567b01fdf0357e22b5cc185c6e200b0d2fe219589b031c5377706136dbec7d64c1ba8f5559014f687c91a
 EBUILD i18n-0.8.6.ebuild 1350 BLAKE2B ccc38b18a766f850c3dbc7bc092b805ac15d9b7505e8443d5e39269d4f6e800d75dc09921ecd8123644b43f377573431e87aa58f5ba3624a177efddbefd6a2ba SHA512 6466ad5af282db56c980b065378ce87ad3a6495079d2f0436cdfaf1e77bfb3fc8ed120bc0eefec55d27dbeced6ac1ccb687b53fd02aebe107cb131e8a9f1ae37
 EBUILD i18n-0.9.1.ebuild 1393 BLAKE2B bfd42402e4c243c86285c6ee40019454595a17b38a338b1f7bf5794e23aa275c3b6ce7a5109f878490b6ac9690852a58977644f9b2f14b81f368df3d381495d5 SHA512 ed277f52680d78f7f790c2008bdd1a65c7c326c2d3ca265348c492f89275c1e90880605af61c641aef02e12cb50d971bd8bf3694bedd395929405115675a559b
 EBUILD i18n-0.9.5-r1.ebuild 1466 BLAKE2B 4fa4e7bd038ec1edb85e3c8fa5d97c29e263727fb0f2a89c68858bf8e8e1d0903a883f29e1eddf26f2444cba486a9fe761d96740bf64a52ea47e0c23760be844 SHA512 03e9185d1ba538e167f11805935f4e17ff0f381a81ccfa289d19fd37bcd38d8892db89ebe99699031d957b275ebe7a02fd6e89bc21f9a08f2ab2c2fb3ef43bf5
diff --git a/dev-ruby/i18n/i18n-0.7.0-r3.ebuild b/dev-ruby/i18n/i18n-0.7.0-r3.ebuild
index 2ae419ff1097..20e503e260bf 100644
--- a/dev-ruby/i18n/i18n-0.7.0-r3.ebuild
+++ b/dev-ruby/i18n/i18n-0.7.0-r3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_PATCHES=( ${P}-frozen-classes.patch )
diff --git a/dev-ruby/inflecto/Manifest b/dev-ruby/inflecto/Manifest
index 4558fcd9d467..5c74e33a1aca 100644
--- a/dev-ruby/inflecto/Manifest
+++ b/dev-ruby/inflecto/Manifest
@@ -1,3 +1,3 @@
 DIST inflecto-0.0.2.gem 16384 BLAKE2B 08c23177c02459cd37f14dc39a838d587df775aa0ade13c9c0fc93749cc669534837f865ddff85cdc5f304d0c8582b28284d35b2061eae96469783137472b617 SHA512 dbd1aa3a199365aa301d2570894e347e4f4fe6202924d6337b936ce3e5ed934e7e5c57c6c4ade42d6e0ffa43c574f3ac530ec6dccc6ad8d16b6ff96e4d057628
-EBUILD inflecto-0.0.2.ebuild 411 BLAKE2B e879ee889c72dba8964904690fc94ebb392aa46d7166622d40d18225d4e0becb5dd7eed7494ea1936d320ec55038df084fc9403bd4df1e2eb17114c89e9fb9a8 SHA512 495a895999de67f20f033107c697d8e4d39f85b2b2f0c967af598903a73b2f09c6ce5d04e3647a23e652b09cabf3666c647db16681382d9cc0086014cdb0f14d
+EBUILD inflecto-0.0.2.ebuild 411 BLAKE2B a454376ef3defbde534908d0d856875d340b4c4d557e42c4e1dde86a16f862aca8c6dc6dcc41a1adc033b2fd3e3b9538d3d1209ccbb6014f81153c3e6d11942d SHA512 ad185e7771c0b67b65438ccb5bab7949169956c3f1f0b1c0600519677f2a999927c0b76414b8716bcaf7dc7585ed4ac9e485495c6b31fda775335a29746bb510
 MISC metadata.xml 338 BLAKE2B 1c56398d57ca5047e80b990650c03994827a0b4fcbf984eb773940712289587a59ee8a6a6bde53ee0332b0c68ce468496fc041732b650808ca7465668376bb16 SHA512 a5ae77a07fd66b3295dd15cbe10ab9a64bfe953b1ecbcc920c5e97c196de2b920f3c4f35d68b9d42f8cae7161933a54093c92c9435f02bef1a5a6af13b71510a
diff --git a/dev-ruby/inflecto/inflecto-0.0.2.ebuild b/dev-ruby/inflecto/inflecto-0.0.2.ebuild
index ef3e62cccfe3..2d86a211619d 100644
--- a/dev-ruby/inflecto/inflecto-0.0.2.ebuild
+++ b/dev-ruby/inflecto/inflecto-0.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/instantiator/Manifest b/dev-ruby/instantiator/Manifest
index d0038a75be61..b4e7ce9d1aa4 100644
--- a/dev-ruby/instantiator/Manifest
+++ b/dev-ruby/instantiator/Manifest
@@ -1,5 +1,5 @@
 DIST instantiator-0.0.6.gem 6144 BLAKE2B 6add4d12cce98be209ac3d1073c17163c10c6c015eb40c9d8efcf3c4521e56c736618d11c4a06f52a0d16ffdf2b6815fb6e04ce823fc79febf997dec30aa1904 SHA512 0d24c804dd048c071e5ddd021a1adcb907eb642df16ce841fdca2efdfd5604f73d065ad4496cf6d63bdff73e7488391d7226bdc0d918d2813502ca3d4fc615a1
 DIST instantiator-0.0.7.gem 8192 BLAKE2B c1cc0bf4a3f2aaf9afd522e33fdd2b32d78ca114fc7b113f6ae297e825177827cb6aa5398917d6d05523f912bebf22e43709e53c0dfe4e1a941ebda4350d3098 SHA512 b37a9380d787252244d2b85bb99365f4a4ecdab58f76caf5e59df00b239f4981119eb5c2eb2fe6ddcf810bb0fb43695f8926370a101f4223fa28811953e6731d
 EBUILD instantiator-0.0.6.ebuild 572 BLAKE2B fa02578109dd6b75d2b729c55d1c5b1210b9e1467fb1460326177889b7e40f68e36dc7c09dc77469e3893ce9d160c09ec7e35adfde71a8d0f0ce1f5674f38f94 SHA512 e93542390c4e270377f28d9fa59a33d21396f3137128d23ffe909035e8adb6933e84342a1d8efe9c99703e26be1daf0e29c6ad1b63cdae0ed30ea6d7e7625284
-EBUILD instantiator-0.0.7.ebuild 567 BLAKE2B 1cfd7311dd0f302254625ec9390d15e308e8397406a0d9320ad6fcc9b7829ebfac4237a0608c715bc57019aaba7e36661b80827b83cc70f706f676bdfc8433b4 SHA512 3ec6d4549724dc46b712ef3e560624b014a3f4d90c9efcdd9976f4d11853093346a7f1d8e2a7530da28cb9380d2aa5ca1273e76e34a5d8947a0ce3bb4239bf55
+EBUILD instantiator-0.0.7.ebuild 566 BLAKE2B 9d093c564a29df43474a47e73344a9c2e0e512132c94ee4a32b2a34899071d816c16acc98a61754023e5fe65cd9ad7af2c4413ed2192b17589364ddfa7030bce SHA512 5a73c39175d57b81c3906d83c0fb130a286638793d5e286dbf7dad493261df6eacbe4879c6139f047791ae4543ab4bb9a64983f9677f1a7061df59dff21b8ca1
 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 e9b004c8f8fb..113b508844ab 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 aaf7e0691ba5..32aa566674e0 100644
--- a/dev-ruby/introspection/Manifest
+++ b/dev-ruby/introspection/Manifest
@@ -1,5 +1,5 @@
 DIST introspection-0.0.3.gem 9216 BLAKE2B ecc019bdace30aaf0a1357fbdaf56f19722b9ada0e61b335ffadf1ceac3340a664245d177a8ffe9caace9cab1b81d203578f8b914165309be17b6d6734966055 SHA512 423722f402a8a5cb5f415c498cf754a2b5084b0a89ada48b982a97e3951d9af4bcd675d5dc4a2eacdd0673bf08facaba845e767e3e248e0a8ec922eddbc53c37
 DIST introspection-0.0.4.gem 9216 BLAKE2B c97279576a60dfd74453d16a6eb0885326dad18748bd182fe3b5c2a73121553cd3ea66690841df6554fd105e50f5f6df075afb94795b94dbd7caf4615ca67764 SHA512 c228827ac9d8a82a104e78daadf038c674cd464bf726fc3bd1efa82e9d9cab37f6ee909f578585e7846378f0b755ed4d60fa119fd699f6c40188ea2de4ac7084
 EBUILD introspection-0.0.3.ebuild 642 BLAKE2B fe9e420e8a8741735cbc5db7a39c5c624fc173675153ef56dc603147a33d3f0eeda65435fcdfdaef7ee33042f8c294c0cce0436087203b2c4ed751c852551fe0 SHA512 d0725e51a36ae20b5649c5c61e76457734a71c8512017336751a275a624c23a1b537dae60a6c7b509d8458e35205f6f1d1ef0d1860e54181f9789e6e4958a6bf
-EBUILD introspection-0.0.4.ebuild 671 BLAKE2B 26cc2e77805c8a4a4299da9288f01f0957a2870144beb79a4877fff19f45d5e31065ece3db747b85394a765e5004187facfc724553359b89b541cd2d62c71682 SHA512 403fcb81ec1aa8f77d6d9b57834b6cfc307c56bccce100f8b690a0c6189b3a668f79f0c172c7623e56cb2ac0c8a5a852363836cfc72c68631e348c918b7d636d
+EBUILD introspection-0.0.4.ebuild 670 BLAKE2B 7bc257a8ef2aefc8391a3a8dafe6a5c56f39f3bbf8dec89ee5f9c26f7dda3b17befd78f619f8206b8c62cca53704626e36cab8972148b2d125a35aecf56a16b0 SHA512 73d6ed4900fbb66c532fa11dbb391aa87005fcd9d3a0cbbfdaa9d5f9169cfec4f2f33d811c5f68c88784ebca4a969d1b163e450b624164cc51a3ece35fe16b34
 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 02cedee13c23..3cf0c087661b 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/jwt/Manifest b/dev-ruby/jwt/Manifest
index 21e335a63f46..7fe0adc0bb92 100644
--- a/dev-ruby/jwt/Manifest
+++ b/dev-ruby/jwt/Manifest
@@ -1,7 +1,5 @@
 DIST jwt-1.5.6.tar.gz 28586 BLAKE2B d1fa2e735cf93126866c7a5eca14d63ee2646a66b9759fa59ec3191544efb2e0f502c7474e41a1b0d494ed8d692462db64efd718b8c6fa8acb4fcd9b58ab1c32 SHA512 f112bb815ef1af1f77d082574f5157f33469c2caba88716aa16b20dc48d279f8579730f75db81aa31480d6edd5deaa110adbaf3f52372b0397d5822a964a759e
-DIST jwt-2.0.0.tar.gz 32205 BLAKE2B ba356abd8bc37e819576485e381eb6025324ca3a8872a6d64d0e2a2ff51dd11a804fa904384c47d58b6dee46331fa7f6ca19feb042d3e65de30583211ff7af17 SHA512 d194e06df17edfbde49d9ae6caad5e220f602ce722ae4361a5118024e08dcaddccc71a8fbac99e75ce3b19033e6368825914eed3e91e402b2cf208ebaabf23a5
 DIST jwt-2.1.0.tar.gz 34188 BLAKE2B 0022dbb76cd8570aee84b6590f24639320977ae8d6d5fa53ef1d260da12bc732f9fdc01d59f6c994dc36642a7b67786b607ae76aca8044b7d5f5c60dc300966a SHA512 ad65b6ddd5fb7f33efe0036103f8f7482fd35090b8545219141e8885298fb4809d2386fd6e986c9bca0f85c823c9d4a6500785c0c5964db22d023a99c603ec47
-EBUILD jwt-1.5.6.ebuild 685 BLAKE2B 72297638f6ed157022ff8641580c70f0ff2940c72205c198ff1b2426a03589192cc30c10fcbc24b94a732b38373b211349ebd661fe8dad14261dd1bbc3e72407 SHA512 288f368d08d0cd5b0ad16bf8b56adfcc6bbbf9855b010b3b689ba6a73201e44ae705ec4011931e75f6cd28ababefdf70d9aba95afc25257b4361ed2cfd8a3758
-EBUILD jwt-2.0.0.ebuild 704 BLAKE2B b5a38857feb0937b404f27ee5cb129296f21ebe0eb3dfb8245a1f9db02bc4cc8dfe0be9b63187f46e54dcd117c3e78a3d4aaaff6f0283e554be4fd9e083c99d9 SHA512 c188ff6ee4f31b696b5b070ae98ad57e495b2703d31debbb23cc1e2380f08771410ee885c4006586939ea442abe9b1bd1386804ccc298a23d5e6193125db7390
+EBUILD jwt-1.5.6.ebuild 678 BLAKE2B f799859c28ebb2daab33604f350df13bca00e98cf911b2e996000bd10d4b313374536d1e4340cd7e2b28f025d18e7b209559b353066793f5e6f762f8542488ac SHA512 715f7b2cc586536480a9f84889eb999844c448adff10fc55df610f8d1ecc1aade26435f3c0fa66eecbaebf3069f351dc6c2a0f900e2382d44533ba4c33d7a7e9
 EBUILD jwt-2.1.0.ebuild 697 BLAKE2B 08ed7a552c448fae5cea2d7e1884c7a529b1465d7d5ed7ff5cac202ec75b4eeb51b144ce6ec37a2a1437d9064405e6816c318a4d04197343fefecc3f6eb2df9b SHA512 afc15982690429471a9cd46789c8eed0875e88b99945e1dea44b2982e836cdc2180d50b95766b091465d7587b2a1a16204e469201f7cb77d67b546b30a246710
 MISC metadata.xml 338 BLAKE2B 685874339b4dce29aaee7a4ff92e7df63ebced85bf94bd9011e0f4b6e1ba3fafc0fa0e701bf25fa8c1dec357ebf27f373742d45b12320ff28a496405982860f2 SHA512 700a3cfc122774c85bb6047a68539139d53dd6abe814b20bad12fb65233280e9aeba45bce0551920b0de550adb2744f4ee7e2eb0ba39e98efeea7a23c63e4428
diff --git a/dev-ruby/jwt/jwt-1.5.6.ebuild b/dev-ruby/jwt/jwt-1.5.6.ebuild
index 36ebaade1ca3..2169431e738d 100644
--- a/dev-ruby/jwt/jwt-1.5.6.ebuild
+++ b/dev-ruby/jwt/jwt-1.5.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/jwt/jwt-2.0.0.ebuild b/dev-ruby/jwt/jwt-2.0.0.ebuild
deleted file mode 100644
index db473eb2b1f3..000000000000
--- a/dev-ruby/jwt/jwt-2.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 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"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
-HOMEPAGE="https://github.com/jwt/ruby-jwt"
-SRC_URI="https://github.com/jwt/ruby-jwt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="ruby-jwt-${PV}"
-
-all_ruby_prepare() {
-	sed -i -e "/simplecov/ s:^:#:" \
-		-e '/^SimpleCov.configure/,/^end/ s:^:#:' \
-		-e '/codeclimate/I s:^:#:' \
-		-e '/codacy/I s:^:#:' \
-		spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/maruku/Manifest b/dev-ruby/maruku/Manifest
index a78335b544b9..67fbbdad824b 100644
--- a/dev-ruby/maruku/Manifest
+++ b/dev-ruby/maruku/Manifest
@@ -1,5 +1,5 @@
 DIST maruku-0.7.2.gem 142336 BLAKE2B 54b65ae0db7d7b6f97521408b056ce520382fb9fa5ec8c9c74806ac31ec9f2dbe7af3a366fa962147d47c28e58289839b62c515d5b767481b9e13a2b3140a96a SHA512 45eaec7ba721499acbfed97cac4eddfe50c2200a70394e06dc6dd4c6c642b0c58d126c48dabfc4b9697423dd99ecf8691e223125a44d59a382a76e051f2af622
 DIST maruku-0.7.3.gem 140288 BLAKE2B 31da6bf63272a2e5a77aa6f3cdc1462f0039751424bd0888d69f2f2660534cab8868238cbde37d184c2ddbe50b76dbfa5305a450fc27b9995f74284a1f962724 SHA512 efef3eea7451e32c06c0820834cb98eb5424f6837b2e66e44482679d73d958e1e2c59e790a3e5ba26e0c91ece0a5c17f91877a7797d9a15a73b5344b0d444507
 EBUILD maruku-0.7.2-r1.ebuild 1242 BLAKE2B 9a68041c9ae854021b70b4bdb91801d95e71e23bb270f163fccc9d560e3c3a8210b07a7fd148fc993937499cff3c5a636e6b903e8fc9a475529090b60fc3d412 SHA512 f129257e9206c59112dcc28aa4b6b95118b43b63ea732eec7294745a0fc376cee8627e9ee42c38e80025c9cbd5f2d883e98dd70c4faab179c4667a3c0e2b7c6b
-EBUILD maruku-0.7.3.ebuild 1258 BLAKE2B 0864918b72e8f123c9277d78454526c12ad9aa4aeb63b6e79efb5d74d454afbe52f5dc08780eb9c7646659a2c7edbd18d17b0e017a5e540ae61e987bfb0f46e4 SHA512 2c25cc6941caa6d8aeee193b63424e18bd1a442ef268c5383637699c35249d2cee6ea769ec3f92a56e6071af20193d2cb9afd0327fd31e78b640f011e28df23f
+EBUILD maruku-0.7.3.ebuild 1257 BLAKE2B 7d200e1dc88b7c0c6d6d529668ddf90253b8829273142817b725b6acc471ea7885c691f700c6a943a4121d795e0eb9920f4109b2045de581e2f45bfb05b26e8f SHA512 45ea220ccb51f47c354acf59612cc13c23c66b11ef7c78e97a7f8c9438eb0919d6aa016ccbedbe28f084c3a43025ccea8fb98e6d2ed7d14ed679ff3469da312c
 MISC metadata.xml 454 BLAKE2B 543ededb4beb16959617c700295d7c7517c3969b482ee0e0ea71cab8c412ba09480b4503024dc23d1f419c9bc621a66cc23a589d240577554a36a712f4d1892e SHA512 b58d0a08843b11dd0ce0fc68d347f16aa2e6fd6530a3f7a54ece40c6076cc64544857081d9ff889a816ac545e68973f709c168378fdd756bca286e4b874a2084
diff --git a/dev-ruby/maruku/maruku-0.7.3.ebuild b/dev-ruby/maruku/maruku-0.7.3.ebuild
index f58ea3aa540e..16b4fd060f75 100644
--- a/dev-ruby/maruku/maruku-0.7.3.ebuild
+++ b/dev-ruby/maruku/maruku-0.7.3.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/bhollis/maruku"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight test"
 
 ruby_add_bdepend "test? ( dev-ruby/nokogiri-diff )"
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index 7510c7bab416..f643f76e75fc 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -2,10 +2,8 @@ DIST minitest-4.7.5.gem 57856 BLAKE2B d0ecb0a0693c35ebbda52e9c755b72f07e38d6ccc2
 DIST minitest-5.10.3.gem 76288 BLAKE2B 2c4fa5bca17e8a6270923225cd91fa9b6374d2a00b278906faf4e3ead0baf5fb1572a3c75322befc35ad0016d86f49c905e7de0283b07c60585c4c0348d69701 SHA512 6a3b1c86471fd7bb6ca078de9f253aeb9533f8da027998c34cd7fb8165a1d3bb565c1f8df958bb0eef6b7e22658894175c5f54f475585f2c05bb667e812b7aa3
 DIST minitest-5.11.3.gem 79360 BLAKE2B c348957e094bd91e88c6dace522b8e88c37ec435d58b4f6f8c8b458cfd26b789cb00cd43fa9d515112a8f3c9a736756d59c46f4117d1c1948d08cab0a5eed6aa SHA512 387537aff51f8e8f9cc2feddadf6813d11f0ba623ae3d5929d7b7a88e180b60c961dfa1d2ba0f3a4ad7d2c1af250245376fa62b23f68c8b57812c7e86efba0c7
 DIST minitest-5.3.3.gem 67072 BLAKE2B 58511cd3cf5e8cadc78427a4818f973aa59873cd35bf553874cfa3e785a6c3d427d3c8b7e5f5f915842ca2b4b2ce594f847873536b49b8860cbfb3812dd58908 SHA512 e1ea2cea5b61231b3074aea1dfb15b104a4e8a6b361d274194b6876401c29f839be618eb7c0448a42bc51ce57f0c2fcd84a72d1b0e0ba034ec5ffe6fbf2ae509
-DIST minitest-5.9.1.gem 73216 BLAKE2B 553143159ddc688ee0961a1714aded658dea3b6d5823bfa1555e96d25506eed2a789ad0b31939da1947e3e1d21fa9b4a9f59f3b429354283baa8c28fcda1a444 SHA512 4b02ea62297ad5be8bbc8d541405b0d73668ec7fe0f78318fb85fcc35321d934285df13aac2f3e5c4f9cb303b2689bca36a13bf1f8359486f9c66d4ca2fc6e72
 EBUILD minitest-4.7.5-r2.ebuild 951 BLAKE2B 378b2e1f8b34403503cac08066cf9b1bd17cabf18960356ac67986def2416f774f8a7f5f7b44ef7c2d9dc1c293fc5a2f6412e36c9ae507466dc4881dc8f04df1 SHA512 76b836e2e763bc224add765ece794d0c23f986c2b136fd3d762f5165134518a213f2f7477031be6f03e349bfaa329f38ad5e6700bb453f3ba3e5e95c1caf7a82
-EBUILD minitest-5.10.3.ebuild 798 BLAKE2B c1ff2976a8bbaf6b83876126c42d49038c919f72559053e72b50c4d85faa63558e1d07f541fd1229d5f8f9cf3f26bb03373d4b78bce161b09c92f7ca77676772 SHA512 92ef85f3efc8e01473b64609af78454a1a7a7ab6f984b281b9257ed88d4562a2f1ac081ef39b5c6f1b8287fc1b43923baddbc6ee570dcc9377c8f100b27deda6
+EBUILD minitest-5.10.3.ebuild 797 BLAKE2B 8864cc1d3fc7c79ccbc66447efe00bc4d28035290380748729ca2dcb151efcca93de466c533c3f7379a6823fa0317fda45618a2e10d5523c2b61985e9a5f50bb SHA512 8788bb20c4910461e5b9fe17365484e468c7105d27482b37e176986129efa7cb448b663bd332ad025cb5e7f5c3192164bb7485a307dff215fd220661d8b7e032
 EBUILD minitest-5.11.3.ebuild 806 BLAKE2B 396d4f18c587cdfee04ba8092487f3e8f593bb994a4490827750e943f888b02a713ed34c0ee32488ceea6d77a682627032b3b1637d99bcab38a377881241ee8f SHA512 bbfa20031a7580e63616d78bbd2bbae0137b5478216e151f9d977aaf77ec797c74c3a3fcd318cd440849872665d16e89cd5112607691f0e92e38e7525a94d65e
 EBUILD minitest-5.3.3-r1.ebuild 817 BLAKE2B a2173c0cb66ae8fbce47f13b0afd04f78ffff56c246670462f7cee90a73b6f26435c4489f3dcc4a35bcacba892a752c8681341ad896425565890c21b2c162737 SHA512 b96a9b0b391626ec3579314fb4d5e4d2635a8b78bdc3acec904519c78c87b633e5ed015fed19f7bba04a47adb7d2808495354e7ae378847c88cd4fcff3d84c53
-EBUILD minitest-5.9.1.ebuild 797 BLAKE2B 3b9cd0b577f21c21ec180ad7e48a3dc73b585ca319a396fcf4fd98131c4309a3eb38856c53792a4a1895c3355feac2414803be081fe5f122ef825f17e9a4b7fb SHA512 ee2593712316571c86e9c6f3564c449af05126b2a58db37c1827fa532e63beb2887563d70b6e38036541e4ba0a28130bdb016c2f99975d570ef966ac4740438c
 MISC metadata.xml 344 BLAKE2B a719762acb7e752051fc25d212f40e610a1a00644f8a09a4122bd874ec15af826d9360697b8d63d68fafd6596a8ea34439540894d8b8b9606baf5ddd4573d152 SHA512 48a43ffed154ec65035a6e84ec7e7e9ec222698b4dd56a81b6ca84844d9835c087fd7972d38ecc40fdba7f74acfeb2004bd1084d2cd123ffd09906e644c59e00
diff --git a/dev-ruby/minitest/minitest-5.10.3.ebuild b/dev-ruby/minitest/minitest-5.10.3.ebuild
index a085d55aba4d..df56d0f9c18c 100644
--- a/dev-ruby/minitest/minitest-5.10.3.ebuild
+++ b/dev-ruby/minitest/minitest-5.10.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-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"
+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"
 
 each_ruby_test() {
diff --git a/dev-ruby/minitest/minitest-5.9.1.ebuild b/dev-ruby/minitest/minitest-5.9.1.ebuild
deleted file mode 100644
index a28e39d5bd01..000000000000
--- a/dev-ruby/minitest/minitest-5.9.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
-HOMEPAGE="https://github.com/seattlerb/minitest"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="alpha amd64 arm ~arm64 hppa 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"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
-}
diff --git a/dev-ruby/mixlib-shellout/Manifest b/dev-ruby/mixlib-shellout/Manifest
index 26786c1438c9..b25a540343c8 100644
--- a/dev-ruby/mixlib-shellout/Manifest
+++ b/dev-ruby/mixlib-shellout/Manifest
@@ -1,3 +1,5 @@
 DIST mixlib-shellout-2.3.2.tar.gz 35828 BLAKE2B 8fa665a0be90da481d2e83aeb0bbfe35be6086cad25cfff5f079f0aa53926318961d2192da3477e4a4cd728e57752f32652579d544f562d81941a3d357c5bb5a SHA512 72f4979d1c444b1f097ecfd4767a2989e60398e84a78106b80077b664bc01d6fc68022cec26172f1e7c0384dd3fc4f64c723ad3a2882db7284dbadacc7cf24c9
+DIST mixlib-shellout-2.4.0.tar.gz 36249 BLAKE2B cf2da1936a95ace0d2f847c05e299834ea0fcb00ec47e6caeeb5b8e0e96d76b69ba9a43ce9846079ca707e4877c0a2bcde35a67a4d4f27e79192d2b88a97a653 SHA512 fccd70854449303aa107eeba0d7d58b5a0ff5db8aaeb52e49121340aefdeb25fe205f3a8cc80299e24c72ec99f89988c559ca72086610d39c6847b2208e95d57
 EBUILD mixlib-shellout-2.3.2.ebuild 704 BLAKE2B b14580e6ad10a522475542cdc2f185b82ffeb20f36012b35a04a048678dc3ca9f4fedde9946fdcb67a412c706632a813d7bdec594614c3be04cb00e9adc429a8 SHA512 9fa00797118c24474e0052210ab603bd5b3d9c89829427793c10a38bd8cb4523c271be35dbe681c4f9610eab797404bbcf8502768473d791a73d4beccf93cf14
+EBUILD mixlib-shellout-2.4.0.ebuild 697 BLAKE2B f559b755c81e4104705897fb5acee2ac22c84951790d41a34c1a2b4d66d881cd9f98359387686ebb8e6a39f402aa925f874490ec0dd39287a7b41a7e1f00aefb SHA512 50e3074f7f767ab17e423c90c5f2dc762c88254044eb2b2e64f66e510b31302085f48a0c74e85691c54d1b164da530fc7c4f292fb9d15e1215efdc79e060c427
 MISC metadata.xml 349 BLAKE2B bbf03da0b10552936f124a0d5ef0fc3513b2a381f2101a4f6088cdaf1a1287a6580bbac4247729c725562cfb2181bc4d1e744b1e07a6d8871b334e85d5f55269 SHA512 895846614036d27c1ca678c47d46302985645d1079c16910dfccb1a4077554422c6f08555d3fe3275c6463734d869f160ac1265dc06854db512001e8b05b32c7
diff --git a/dev-ruby/mixlib-shellout/mixlib-shellout-2.4.0.ebuild b/dev-ruby/mixlib-shellout/mixlib-shellout-2.4.0.ebuild
new file mode 100644
index 000000000000..6c6bcd0d579e
--- /dev/null
+++ b/dev-ruby/mixlib-shellout/mixlib-shellout-2.4.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRA_DOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Run external commands on Unix or Windows"
+HOMEPAGE="https://github.com/opscode/mixlib-shellout"
+SRC_URI="https://github.com/opscode/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+each_ruby_prepare() {
+	# Make sure we actually use the right interpreter for testing
+	sed -i -e "/ruby_eval/ s:ruby :${RUBY} :" spec/mixlib/shellout_spec.rb || die
+}
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index dd7c42fef44f..581cf6d2ca49 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -3,9 +3,11 @@ DIST mocha-0.14.0.gem 82944 BLAKE2B 50a066e2f5007df08a7f76785fd4c2b12327b4969c11
 DIST mocha-1.1.0.gem 87552 BLAKE2B b09721474520b57472bc54eece8ea27f0172e49ffbf43802854c111632673d05f35931150fe83cf83862471b606c70e8667327f491d280f3cc3d059e752ff0b2 SHA512 5a07c8364ae649a6be821c4b61c349d79e1dbf1e574ed95b07848f5dae3a2860e2f2e06499fc15b8352ec2146f273cc40ee8e65e670214f0f0669b6eedf698bb
 DIST mocha-1.4.0.gem 92672 BLAKE2B 8b8640038da40f2577431630ffbc773f5a9474a3a872a5f6c26d53b41d2827da59f32f6c7abab78cbf491bb6d58cabe0834e4b1706869cedd1e72f116817537a SHA512 54953d815cddf52deccdddcebc9a9880fa2f14cab9f4ee1e164bfa3afe095d56b409312149341d1bf84fb336ed23512e7acce371135f8a2a1bb16f1de7acff1d
 DIST mocha-1.5.0.gem 93184 BLAKE2B fe29eab462db2283449587324fa7c607c84bdc6cf8106c8714de29ac2ec8aa9352ed0ebe60a5f8ad05e8ed9a1256f534c352b17f9519de79490a548468afeb57 SHA512 dd4e37f2d3e65fbaafb9bad345419a042682c5db33ee1787b65db1d0889418463d32c87deeddd2b953e0024ea55a5a36b816712e94b4ca740a6163c6ee51dc85
+DIST mocha-1.6.0.gem 94720 BLAKE2B 57836aed4a5c0dc4c2c9e9c32d5c0dcceb4e65d6987e79c2085de295bb742b8f709ca828cbc9558e261317a637af7f14f8160058bb067c2102bc7d708bdc4d90 SHA512 7269df7796aa124c79256914fc2dd2cadaa6f2f0fbb9f5bbf48b71fabaa1d87c3f9c6a086f8f8c5fd43ba31e482d164cee1ec344a289e5824b124ac5d27de50c
 EBUILD mocha-0.10.5-r2.ebuild 1189 BLAKE2B e2f7ad7e9a1427076462906dd1a56dbca10d2de77aa5092a2249301319ed29b6fac9f563f5549dcdbafb82d1d062c1d25a9f25813f8006a24f75639551cea219 SHA512 6e2e346028954787b176dc3de5188c852cfa0231bc442b902059d014780011b52bf7d079b63e826d3da76efc87669b2cc74df9a983ad45417f153bbaa7e67bf3
 EBUILD mocha-0.14.0.ebuild 891 BLAKE2B b985c2344c88447f1ea966e5ba5d979acfb23bf754565476709b8ae2c46400d3f7beb86f6feaf05d8ce21d3e5577702bdc86c6ea762b5799e461f3822f0217c5 SHA512 d6020b9bd76a59d65d517a5abb52bf1502f05528255905c4d7ab29c544399f03efbc0365ac2ffb9b2801be579892f3e434242738487cf1d1c7cfcf5f861ad8d9
 EBUILD mocha-1.1.0.ebuild 853 BLAKE2B 1e239f2abd34221cee9af37f775c07ed22285c3db09695e6a175a86bbbec786046e80efdaa490959144ca5e5853ffd40faae3e1743991de9df1636da153314f5 SHA512 a1f48fa4bb83754b1d6af4e5d50ed63c404c6b1e788a4d83ec2c190813b72916d73de541ad97cedf14073444aeb4bdf4174411be1fa6aa66eaf28b124b9a67ab
-EBUILD mocha-1.4.0.ebuild 862 BLAKE2B 14e7b0832e8550fbe1ca39c15cfca1c5dd484e3c51fada45285b0d1b94e4e2f3edd0f1f228344f5f1353a388b0d706410de94341a824232530e2d09c01e1a71a SHA512 b55bf4fbbda81f9f9b36f4871b501b5fc31923db41025f1bbc41bfeb527b6e4634d4e495b4a1096defaa6a7c30226307fee1b9812a1c25ec510231f2148b202c
+EBUILD mocha-1.4.0.ebuild 861 BLAKE2B 577b11e5c25898995a4c746eafd1ee94759441a4a8a587294bc4e6dcaa47e124e880cbfc111cac87090d92a6158830245c41bb0e1d76fec24bdfebab1d472a53 SHA512 8a5b83231eb7e8d1a77eb4257121ef157b86c7fd08801d97f6ff483e03735f0179ce51e73a74b8ea232f037bcb711143cb663779358a616c89cba7bf608bb156
 EBUILD mocha-1.5.0.ebuild 868 BLAKE2B a3f08dcec677979fc2fc3daeaa93e15ccf712b6d9e72959ce5f6f5fec7bbb0ff3fa40fcdca9214f9b8df64c8cce6e3bb14cd9eb0a9fbe9ba9ec6232288c498d5 SHA512 2140cabf3e252fbdf6a15817130c5876ab4bab69a79097af5de290ff36d9381616e3e995a9e21867c36d95d2afce788f3e417d20370655fddb29fe1a2057cdc8
+EBUILD mocha-1.6.0.ebuild 861 BLAKE2B 0b13752935b297a680adf8554cd03d043cbb2d981e495a3657bf2b32dc48562270bec4942dc71c3fba3e34f368f8b87c8e95897d986adc42ae822b3bedbba58a SHA512 73daa47410d4144d686a8c1723645867f96658f5c609b44f24b73884e1591b541fc60482cd84da2edfb5fc0086e63623f5cedfef37f187f7f007c32b96f8b188
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/mocha/mocha-1.4.0.ebuild b/dev-ruby/mocha/mocha-1.4.0.ebuild
index e34a7ae12d24..81512470babd 100644
--- a/dev-ruby/mocha/mocha-1.4.0.ebuild
+++ b/dev-ruby/mocha/mocha-1.4.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://gofreerange.com/mocha/docs/"
 
 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/mocha/mocha-1.6.0.ebuild b/dev-ruby/mocha/mocha-1.6.0.ebuild
new file mode 100644
index 000000000000..7522eb9038e2
--- /dev/null
+++ b/dev-ruby/mocha/mocha-1.6.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
+HOMEPAGE="http://gofreerange.com/mocha/docs/"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
+
+ruby_add_rdepend "=dev-ruby/metaclass-0.0*"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
+}
+
+each_ruby_test() {
+	export MOCHA_NO_DOCS=true
+	each_fakegem_test
+}
diff --git a/dev-ruby/mustache/Manifest b/dev-ruby/mustache/Manifest
index fd2d268f341a..450d39d42cb5 100644
--- a/dev-ruby/mustache/Manifest
+++ b/dev-ruby/mustache/Manifest
@@ -1,5 +1,3 @@
-DIST mustache-1.0.2.gem 40960 BLAKE2B 8e4daf455b4af2b20dd322f0fa358b18c8742c08aae872ccd4c0cf87a898b800a04535aeeec3f0924ce5afbef4b4aea5867949b779d3fd6f57efb5ee828cbeeb SHA512 4bc50bf67317e9815b125c25cd94b6c6943b4c7cdeeae3118d29b002279386f00f73a38bfcba9072253cd389634c44a8da9aba775989ab235a444796e4634450
 DIST mustache-1.0.5.gem 41984 BLAKE2B c063af6c9464884114b55c30df6c6cb2685b0394aa9280f006b6c35cd0681c8776edddccd1a33de75e291a2e1992477c1d70f6cb1c603e800b08be5b989a9ca0 SHA512 d9b2c55d758bd4e317732307b513e2a079b04ec7a1203233834fd08a3a32f7b1bf8283d207af2f7082a8c4847f9c5955a557f19bad9b08a1dee2f32417eca190
-EBUILD mustache-1.0.2.ebuild 911 BLAKE2B 2fe78cc4857de02b0177684a2d551f9ca3b76952d9eb9b8b0ee5816cc86595dcc84cb4c878f1be9c2d1c016d7276e5e094fbdd19dacd9d294fdb430b280ef66c SHA512 9f8887f899f2c404d747ce6b752839173788ab669aff80f1c076fd46cfee0558a94f5dd630364809370ee44af62870052bc3171d68994ba28ccce106cd99b545
-EBUILD mustache-1.0.5.ebuild 905 BLAKE2B 7ca3399dbe30ce53dc04dcd237783ae0644504c84305327539f00d6547232296ffa2e7479578a736ad3240a3b16c2e01c82dc751d33301238804a0de6b80fb55 SHA512 1d51fafa9f4b0dd3ec6c644b5386d23e99ccd5cdee15f490ea09c26f678a8c509cc45371ec96999575b25b7d6d6f77124cb296fe9141f8f87d50435b195787fd
+EBUILD mustache-1.0.5.ebuild 904 BLAKE2B 60e6c7d5294d24fd7f95ba71e470825c1ff8680c7c16be609c15cb95b068a31a4c4224e121b5d261d03dfd6bf4d19f0a623870213f8308bc76408a05b7c72c2a SHA512 07e215da6a45186bdf0dce95402e5372f65b0afb7ed2ac50c44e6db18c58ea74a597d3aa96dbbbc11b1de6f18740de0216bb14cb266c0cb5777271f0769b45e5
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/mustache/mustache-1.0.2.ebuild b/dev-ruby/mustache/mustache-1.0.2.ebuild
deleted file mode 100644
index b997810ccb13..000000000000
--- a/dev-ruby/mustache/mustache-1.0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC="man:build"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Mustache is a framework-agnostic way to render logic-free views"
-HOMEPAGE="https://mustache.github.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-ruby_add_bdepend "doc? ( app-text/ronn )"
-
-all_ruby_prepare() {
-	# Fix rake deprecation
-	sed -i -e 's:rake/rdoctask:rdoc/task:' Rakefile || die
-
-	# Avoid code climate dependency.
-	sed -i -e '/codeclimate/I s:^:#:' test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e "Dir['test/*.rb'].each{|f| require f}" || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/mustache.1 man/mustache.5
-}
diff --git a/dev-ruby/mustache/mustache-1.0.5.ebuild b/dev-ruby/mustache/mustache-1.0.5.ebuild
index 7577f7845135..a22b041c9db5 100644
--- a/dev-ruby/mustache/mustache-1.0.5.ebuild
+++ b/dev-ruby/mustache/mustache-1.0.5.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 ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( app-text/ronn )"
diff --git a/dev-ruby/mustermann/Manifest b/dev-ruby/mustermann/Manifest
index f44786fc9c7e..6eabfefab460 100644
--- a/dev-ruby/mustermann/Manifest
+++ b/dev-ruby/mustermann/Manifest
@@ -1,3 +1,3 @@
 DIST mustermann-1.0.2.gem 51712 BLAKE2B dedfd8c4f5a2819ffbf3a7f5462e656d7e50e28e773abbd391bf01c984eb0a25274ee1c5080da0ec5c2f9ac88294be4975ab4310502dd83ac74010443ac582a6 SHA512 89f27ebdcb6df3eac82159b77d6fb6b87fe3c0409e14975abbbca01675eb84c6b49c52ccf75ffa779ff0b476b904834eb349ecb416324e6c61a360d583aa16dc
-EBUILD mustermann-1.0.2.ebuild 515 BLAKE2B d6718cddb55bb96f5f03befea1cdb3f05cd6a2f8fa0b0bcc6ac0c944e75ab8cbbd5dd07b24227274976991cee5fc228fd0a1a8a3baefe91fece5e74334d9184d SHA512 2a9a0835b83dceb6a9fa6373da7d4cf17731fdee029907634909b63d418eef9256aa1015dd72f9bd9bd7eeba24c8ad26b7a4fe034355c799b578574cf9d3d44f
+EBUILD mustermann-1.0.2.ebuild 527 BLAKE2B a37a927827b74fa9e8b71053c8c9d2ea40066b79f06c9f4da647d7754d394a0cf1b299fce2c826485aae4a42302a6e0e1e095295d4a78839c6725080cab9e750 SHA512 0c10bdc8fc07946d1e2e3df1a5166ce4e409bc258be696c0ddc44ce3d338e17ef3dce58681e1e33cb3914830b005c5f30e877c9a4aca2afeb31c96b0685f32f7
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/mustermann/mustermann-1.0.2.ebuild b/dev-ruby/mustermann/mustermann-1.0.2.ebuild
index 40bc5f8920fd..f46ecaa20c88 100644
--- a/dev-ruby/mustermann/mustermann-1.0.2.ebuild
+++ b/dev-ruby/mustermann/mustermann-1.0.2.ebuild
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/sinatra/mustermann"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
diff --git a/dev-ruby/mysql2/Manifest b/dev-ruby/mysql2/Manifest
index c69ce39f2274..521191426bbc 100644
--- a/dev-ruby/mysql2/Manifest
+++ b/dev-ruby/mysql2/Manifest
@@ -1,11 +1,11 @@
 DIST mysql2-0.3.21.gem 52736 BLAKE2B e0fe0d16c0816b7f849581d6ce0c657f64f2881ab28bced780be82e8017a5ded24cffc3641f2f386f5664cbc5e9ac4c6be4fab9cff818dc5910970968d7458a4 SHA512 782b7c13b4956ff9cb66b14701546b8da69ba5dbae8a7fbab6b8a083c7f3c2a15e590fe075f41d4ab85a68bf68963204fc2ab0f4a4f768ce41c822af1063317c
 DIST mysql2-0.4.10.gem 97792 BLAKE2B 4978a3fbc8e516e47907d73276b244e614248c031db7c0b7d76d20f1f845be11f7187795d3a989629ff849e2e1bd0454fd56bc7be6b692d9840838861bafdb4c SHA512 1f9c8eb1b120cfc940b3aa26b2dff54735ccdf54fd6e6745e347179d29803b4a4d1f3b80a86f92dd534089f625ffcd6055458f27aaefebe58f8332890a842b43
-DIST mysql2-0.5.0.gem 98816 BLAKE2B df99ea39a1a6e080ccbae3f79a17234507f0396438519564f758a3ab75b50729d70ee5586c1945876818321aa4d529c3802264b56deff0a47382b7d8b23b798b SHA512 d7026fd4e69558bb8150bb9f4053143cecf2af39c94db2d8b708b8ab936b20b3051844eb79e893c2c5880774b24c62d77444f258195887f4eb95ea558dd7e410
 DIST mysql2-0.5.1.gem 99328 BLAKE2B 1ed8d9688a78ee30f3f7b7a71317cbe92b39e2a1b6f9db710a328a4b9542ffcff4be9051c5fa440bbb93c1af56742755e4b70bbff895695102c126293b7d7ad7 SHA512 dd1934e4f8aa8a97b70dbe0f1436496892a155fa188930321e776d57ec72ec34f95f2665ad5db671fdba99304e279aa8a045dbc6126ab50d8cc2d84838bc145b
 DIST mysql2-0.5.2.gem 99328 BLAKE2B 0f1a0d4657e5933e14d445ceefc6ff605a8b07bc01686dd0a67e018c45857a92d25914e4f0aae1116ed1479583636cdbca2aaeb127b856b38052264d579991bf SHA512 6013b0c862f24f0c20b22c50a17390a7a22390e661d0f1afb613177febfbf854f63aea9bc9aa8defc9521896144fbc035a8e16b135abb47384453a23dfd99566
 EBUILD mysql2-0.3.21.ebuild 878 BLAKE2B bca3c425b169f6ddeaf900476c2c8ad1dfa1c6faebeace43dc69765c5668d52ca9fa2efcd09d0fab2abbe679d7a59c9db8180226476fe9abc065a54a83180ba8 SHA512 44b798edf111cf335bcb7a489f8c854392c07fdd3ea3e96b7cb81bc6f00489a785a40833edbdea2ba8d0cfad6389211e0d1e5131ff58260f17c629530a62ef11
+EBUILD mysql2-0.4.10-r1.ebuild 1100 BLAKE2B 3faf6d4b910ece292fefffa0518b7809ba665ceb55ce5a4b4b1b08193dc9320a68c36362939153e62e310ab34996ad528da9f587163200cbea2ce8689cbfe149 SHA512 14e0835ffd137e26cb7157a380932a99359fd7003f8e314f2b846d559a47e25966f129440bf64ad735d2773d8044044f4382dbee89c8dfad6ee55611577a032f
 EBUILD mysql2-0.4.10.ebuild 871 BLAKE2B 80eaa8d0541ab2ab4a2483e8779eb0ae3d6b9929be09b64f389d51dbaf13f2b98301dec8e41cec48d26c0a06375d2e1592c848cd57b252ad5351166b48228200 SHA512 f385ef153b9c0cef750687eb9bd772c0044c88cf85c60f359dbabfeec9b92be59c60503b9acb0d76e86efc25e878dbb5815ed1648fec9f44a5d9b1ca304fec4c
-EBUILD mysql2-0.5.0.ebuild 871 BLAKE2B b99de7c0d899f18b2e830d87ea5d77c87f02b2e426991d127bb56fd7b60ebb1b8446cc15c4c0ca72c7e5da93a51f3b073f766756cb49ea886af99a9c6e19b8f9 SHA512 a193c8d5e8895e75ee5a57ba55a11cd8d6d30aec0982c22ed593202e3bee9d6110b49be900a53787442f22e5df5b4c9ecf0c3515c29427df983aefea40f42cc5
 EBUILD mysql2-0.5.1.ebuild 871 BLAKE2B b99de7c0d899f18b2e830d87ea5d77c87f02b2e426991d127bb56fd7b60ebb1b8446cc15c4c0ca72c7e5da93a51f3b073f766756cb49ea886af99a9c6e19b8f9 SHA512 a193c8d5e8895e75ee5a57ba55a11cd8d6d30aec0982c22ed593202e3bee9d6110b49be900a53787442f22e5df5b4c9ecf0c3515c29427df983aefea40f42cc5
+EBUILD mysql2-0.5.2-r1.ebuild 1102 BLAKE2B 32b20e40969d6ef5f448c6250a382360811ad695a078819a021362dd91746bb1e9c650df64229790dd0a10c3826bab893c3f8fc368505508ea225d196bac5488 SHA512 becb37f9a6f0ad589485b8939f1092f90dd5723f251985f2efe1e82c5134c5a48c9fe87386e727d99cbd24994bebf27d390793a9d8c2003860ef3d28602a5097
 EBUILD mysql2-0.5.2.ebuild 864 BLAKE2B 0b11d1fbbf05babce69c0b7ffbaa363a97b8e5961c844de072cb83185b3824e51ce78a2adfe003e9cbd5563d151839ea428f60b2eee80636897051a297b45123 SHA512 c03098a3bcd4b9a73a45ddfb922af6caac8535bb6430091db5cfe2100e4f4a1c0af6e0e4c3979ddbc885f5c9e7c50c0aa9f54b7aaab24defe86bd3f731ef1413
-MISC metadata.xml 343 BLAKE2B bf8e16e6c78aa725f0741afe277ecff850b36195bfdde74fd12ca635ee73d79fedd7169a9b538c5fe30bc6baa20af480504246f7ef2605ceb71c3f912e40f978 SHA512 85af4758bf547b6dd927391d7bc68e23df8fb7997a02bae7b9ac3ff05bb14421f5f25cfb9f908a1483875966d576c358f7926fd91df228e02a5784d729353ad1
+MISC metadata.xml 413 BLAKE2B 1fdeec661490aaea22676fa4af618fd6458c8bf67c61ea0233f1c68629e89cfdb5f8c29572b9d75c4dc010b1a774b0c703fb6ef4cce1e3e1649452ac0e0aac75 SHA512 1e2e76b14e8c3b44693f0a1d9f83d8b1c95f4eb65490c914fc925fafcfda58fab2764c8b54a87a8e347d53ddb8ce9ce6ca2a08564c97bddae0d0cba0719dfb73
diff --git a/dev-ruby/mysql2/metadata.xml b/dev-ruby/mysql2/metadata.xml
index 91fbcba571b0..9ee135bb6b8f 100644
--- a/dev-ruby/mysql2/metadata.xml
+++ b/dev-ruby/mysql2/metadata.xml
@@ -8,4 +8,7 @@
   <upstream>
     <remote-id type="github">brianmario/mysql2</remote-id>
   </upstream>
+  <use>
+    <flag name="mariadb">Use mariadb bindings</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild b/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
new file mode 100644
index 000000000000..bdeffdfd19b9
--- /dev/null
+++ b/dev-ruby/mysql2/mysql2-0.4.10-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# Tests require a live MySQL database but should all pass.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
+HOMEPAGE="https://github.com/brianmario/mysql2"
+
+LICENSE="MIT"
+SLOT="0.4"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+IUSE="mysql mariadb"
+REQUIRED_USE="^^ ( mariadb mysql )"
+
+MDEPEND="mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c )"
+DEPEND="${DEPEND} ${MDEPEND}"
+RDEPEND="${RDEPEND} ${MDEPEND}"
+
+each_ruby_configure() {
+	local config
+	if use mysql ; then
+		config="${EPREFIX}/usr/bin/mysql_config"
+	fi
+	if use mariadb ; then
+		config="${EPREFIX}/usr/bin/mariadb_config"
+	fi
+
+	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config=${config} || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/mysql2
+	cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
+}
diff --git a/dev-ruby/mysql2/mysql2-0.5.0.ebuild b/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild
index c72134dcd7ca..a0b5b7bc3cc9 100644
--- a/dev-ruby/mysql2/mysql2-0.5.0.ebuild
+++ b/dev-ruby/mysql2/mysql2-0.5.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 # Tests require a live MySQL database but should all pass.
 RUBY_FAKEGEM_TASK_TEST=""
@@ -18,14 +18,24 @@ HOMEPAGE="https://github.com/brianmario/mysql2"
 
 LICENSE="MIT"
 SLOT="0.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+IUSE="mysql mariadb"
+REQUIRED_USE="^^ ( mariadb mysql )"
 
-DEPEND="${DEPEND} virtual/libmysqlclient"
-RDEPEND="${RDEPEND} virtual/libmysqlclient:="
+MDEPEND="mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c )"
+DEPEND="${DEPEND} ${MDEPEND}"
+RDEPEND="${RDEPEND} ${MDEPEND}"
 
 each_ruby_configure() {
-	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || die
+	local config
+	if use mysql ; then
+		config="${EPREFIX}/usr/bin/mysql_config"
+	fi
+	if use mariadb ; then
+		config="${EPREFIX}/usr/bin/mariadb_config"
+	fi
+
+	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config="${config}" || die
 }
 
 each_ruby_compile() {
diff --git a/dev-ruby/net-scp/Manifest b/dev-ruby/net-scp/Manifest
index dbc0a499a805..9ab3bc0a8fae 100644
--- a/dev-ruby/net-scp/Manifest
+++ b/dev-ruby/net-scp/Manifest
@@ -5,8 +5,6 @@ AUX net-scp-1.2.1-fix-download_test_3.patch 559 BLAKE2B 94ac112439548e66a9d1cb2a
 AUX net-scp-1.2.1-fix-upload_tests.patch 562 BLAKE2B d6f6aaad4dca5c54158219f1a36bd20b5225280c36b90095b6f7d37ecf789465fd348c4a96bc8f5e298f40f4fcaacf224b0d680a62eed901101976293947a24c SHA512 9cbdafe10d985e7fec3368e344df526e51179db8fe24e172d367fe506de8c733c05fee8ca90e9d6d9d91b900fb056cc245146a4b4e7eaa8ad5021db6992994bd
 AUX net-scp-1.2.1-raise-correct-errors-net-ssh-4.0-compat.patch 1230 BLAKE2B 52d3657f71b06a5561e44e8d408127fefc83bf1e05097f835522719bdab0bec1139fa3332fa55d23d386ae4528318f8cded62222a8ddf39dfe216369e510839c SHA512 45b93d1a197776ee6afde01292e9b87d24d66685a72fc5311fbd504ca429f0cfb14fb9fc1f21dd9092024de17e78e26d71e8928448bdeed279eba14393949c26
 AUX net-scp-1.2.1-raise-correct-errors.patch 3046 BLAKE2B aa0e36edfdc85c944d3ba34d351abe93a7ade694e81240c47956b5767ac6491b954755ea05de27dfaaefa7ea1d628c632aeaaef6061f8017e9b2c114d923382b SHA512 0ff40b546aff5d0bec7245325d5e076de06f719512e51aadfd2f3b66f727c97164629e37b85fc0073eb7134cee3de43b4a0287e965012758c5fd997eebf9ec6e
-DIST net-scp-1.1.2.gem 32256 BLAKE2B f855903ce626b370d9fedd9bf7ec4a39898fd2188b09b7dd7d537c92ec21e5f2ff25cfa06af934fecf9aa99e95924d8c3ba9acc8aacf87fe07a1f37a372f862b SHA512 5ba49a994a816b54aee32b5c3e708bed69fc22d7e688f60e93a1e2d29d086ed17f3685ea819d5db23a27abf8ba64fbd418204e1a1702fb0d2702607016febc09
 DIST net-scp-1.2.1.gem 32768 BLAKE2B 67abf0b66aa6e8f28bdfa314a20f594eedafc5aeaf5d0ae8884cb7e27203699a791623968da98aaebda1630d47bf5859cc3e38875fe17dc8c7ce7926b50848a5 SHA512 64645a4517d6e408e3acfdb24576c8ded3b6ff981035ca10a2e081f9e3ab093f97b4848da4acca03ade364483766677e31296d09a31db4c81eb40123fc966829
-EBUILD net-scp-1.1.2-r1.ebuild 713 BLAKE2B 773b45ca7b3693804b11aba0a7affc3d87af112d9520103dc867994e4cf42c5696ae816caaaef6f7a7fc7d0316d692f64c29ab04d69b1b652db6fe641ae1e811 SHA512 684a857564e9c34ccd91586b5824c3d123b7f259892af320f693eaa72dd7cf09a41cf16547fc0b3d64c7ddfa84315334dfa03dda50f26c0ce8af3f85ac4c3d18
-EBUILD net-scp-1.2.1-r1.ebuild 1064 BLAKE2B 58cf422c2598d0aaac3991578e6990e6929f7d84af8e1e502fe01efc6a742059213234ad2f2aef80ab5045d3be1e584a75062f25f485d3c81ccc1bafb7c38478 SHA512 b766fd29fcddd1f1eef69d23d4884cfbba3b8c94080c83be30fe39eb895d86d7ba06317a1e61c0f8420174cccca7f0e8b9ad7caab27dab781cb0287d796c51ba
+EBUILD net-scp-1.2.1-r1.ebuild 1063 BLAKE2B 9a341e1ab52100e8b6ff4b82eff07271a69a9fd4ceb030345eab6259e5961d145fce0c192d2ce7c16ed90ce540be1279c8b1257f6626223de18e41d25591589c SHA512 379c28820b7f70021f537efd30c145b1fb456e2052840f8d08568140c43fe44c91b5c0ca559e16d14ae575d86d94b751de72eaf5a57cb54040fc04cee66b456a
 MISC metadata.xml 341 BLAKE2B aec6f820a216a818e7f6a82ffe48f73a01cc662d9a5e10a5dee98885f564560644e377158ccd5c4cb6e914205fa5aa6753aaf5dcd52e1849437955553f3c268c SHA512 bbb71a6668f329ca9b1f5636aa71720a8234a7683fe374b2fde4113ff56d3a5c2242bcba7e3023090a7955870715e0040d990326942def6d3be7e31d5f07d39c
diff --git a/dev-ruby/net-scp/net-scp-1.1.2-r1.ebuild b/dev-ruby/net-scp/net-scp-1.1.2-r1.ebuild
deleted file mode 100644
index 0e46b2e17837..000000000000
--- a/dev-ruby/net-scp/net-scp-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby implementation of the SCP client protocol"
-HOMEPAGE="http://net-ssh.rubyforge.org/scp"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	doc? ( >=dev-ruby/net-ssh-2.6.5 )
-	test? (
-		dev-ruby/mocha
-	)"
-
-ruby_add_rdepend ">=dev-ruby/net-ssh-2.6.5"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/test_all.rb || die
-}
diff --git a/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild b/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild
index 312e76dc2f1a..e3c0bb9e4c6a 100644
--- a/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild
+++ b/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/net-ssh/net-scp"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_PATCHES=(
diff --git a/dev-ruby/net-ssh-gateway/Manifest b/dev-ruby/net-ssh-gateway/Manifest
index 6e199f03f41c..0d3e50e9d516 100644
--- a/dev-ruby/net-ssh-gateway/Manifest
+++ b/dev-ruby/net-ssh-gateway/Manifest
@@ -1,7 +1,5 @@
-DIST net-ssh-gateway-1.2.0.gem 23552 BLAKE2B 9eb12c34b3c0980a9bc2058ab68b0511f9697a827904644595deb89e21ac2b10ded3c68c7d5ba5422fd61ef867d583d79c2c0061d544e66afce0eff8553df7c1 SHA512 d387e7ab709628c79cb0c01d0428a8e7e1beddfbdd14c58b7aaff6de11f4a8a8b2cb2026de95977de830855fbed610c276a52f18469da3b4f11b51885e251f60
 DIST net-ssh-gateway-1.3.0.tar.gz 7735 BLAKE2B bcf9b96e35377e8650e8c40fb28d248fc60f7c47e69657c324f58bf8f001f5d10400b983bcbe9529185b74de45a9f3e3f62e2bd14da46b6e4b1bf94f38dcf99a SHA512 6cac1b28fba648aa333824c056cf8183fedc82f45f7f380eceac7aa5a4e8c3d3ec0870915aa058b0500514cdc364d75045050e2f8fa6f0ddaf799b88ba2e57a9
 DIST net-ssh-gateway-2.0.0.tar.gz 7825 BLAKE2B 05ade5aac288ee634aea37acfc68c9781e8178bf0ef92abafac13858a86ff952a2b30b6f92dc08f3856d9dd02a9795e0b93c15543b932070b9ec3f6a50c03e52 SHA512 6595c2a2a25ca9bffb942497be984773c10746f34e1dbba3d72503cef3c88e5bb50bdc8713c246aa6e38272540fb0ced66a3909bc02df96f511b0dc9fc50d735
-EBUILD net-ssh-gateway-1.2.0-r1.ebuild 792 BLAKE2B 39f09f89025f9553ab988ebb36f8b02ded31e90e2fed363e65a7f3c3a0326cb933970f5349ef3293318ffb15ab5b5f78295ad6556953fba4530694c11489f3b2 SHA512 83726836f3f068ef1df4b291ec0968126edbc549d2a3f8d6554e96f5582a16531c4818a5bd19acbd8ad339439444a845ebbf0544e3b0476a99f774e0a826ab11
-EBUILD net-ssh-gateway-1.3.0.ebuild 841 BLAKE2B ff40dcf5a089d637a07c4436b07bbd7dfdb8826229a620eb56dc09f99ae9537aad95ff923a9e6a368607f937a06bb63911aa954e1a201165e93ca46ab17ccc45 SHA512 9c51faf97276dccb79f98df0051eb2f4d687f3f4eeaccfb74f1882437b97fe184137a29bd76e10aa9f79bf58e4ffa154aa9ebedc0048958583d0f1b65c026198
+EBUILD net-ssh-gateway-1.3.0.ebuild 840 BLAKE2B efee02d9a6ebd856ef3daad37bb300ffd991f39acbb70ad5628532859adb81d4f1a5f6379d28b591a6ef4780a043f23d7a687ef521fe3f62aacb69bdcd1cf1ab SHA512 ff93ade218f0b19264b93fcb93baed581c2d727a9e02bc56f306adff4861ba993631c6ee605720e64adb36946ee897510dea3f57ae89fd27e94fc43f78088c3c
 EBUILD net-ssh-gateway-2.0.0.ebuild 752 BLAKE2B 7e15cbcfb357094628a8eb203925679687532b0e96e91f915a4366b27912fdf2c50b16cbcd73373cb9520eb04a8d56e3bb04fdb38f93c3f912fb26417bd99bb7 SHA512 e4dcde9b7b3907f21885c916600f686b7388cd30b7a5ba0f4663f5a01d6597c8dfb5d85645b4a0bed6c84cade81851fc3e06b654e06248a5d8e3cfed7a22797b
 MISC metadata.xml 331 BLAKE2B 1c926dbb5b9903bf35a96b839b8564de448a527cac952fa91c5df4c0df4f825eefc7a6bc1cac6c7da39a3127a2a0245b5e3b7d780009c3069bd72723f74c291e SHA512 a5ba1172a48f9aff250cb3cb9c6315a0ffd12595704a2bd5788ef59e73b9efc606d8d944ecc0f1346340a4a9e1caee2c6a1c30581d5d6a78bc26c751d4c6cf7e
diff --git a/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.2.0-r1.ebuild b/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.2.0-r1.ebuild
deleted file mode 100644
index 7701eec59b15..000000000000
--- a/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple library to assist in enabling tunneled Net::SSH connections"
-HOMEPAGE="https://github.com/net-ssh/net-scp"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "dev-ruby/test-unit:2
-	<dev-ruby/mocha-1"
-
-ruby_add_rdepend ">=dev-ruby/net-ssh-2.6.5"
-
-all_ruby_prepare() {
-	sed -i -e "1igem 'mocha', '~>0.10'" test/gateway_test.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB=lib ruby-ng_testrb-2 test/*
-}
diff --git a/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.3.0.ebuild b/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.3.0.ebuild
index 76a4b19f2e30..0c8f2eed600f 100644
--- a/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.3.0.ebuild
+++ b/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/net-ssh/net-ssh-gateway/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "dev-ruby/minitest:5
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index b6319367db0a..e45998fd8f0a 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -1,5 +1,5 @@
 DIST net-ssh-git-2.10.0.tgz 172885 BLAKE2B 6b5c9928191fe40afe289fc2639d12e56160522c85553cba13393347c8ef02bbe6206dbefc23b65c04980cf9761b2b40a364d8e3e13e4073950736cf53fbf480 SHA512 f66db6465667baf0c253868cc15aab3261675a8c15ca4b244c3cd587ae5e8b7a273959b97d5fc498ff1b19e1f06f51ea571573d243366a59ef56faf41c2ae347
 DIST net-ssh-git-4.2.0.tgz 197417 BLAKE2B 5714185d9b83d3010e6b9baa07ac541e9227379cbfecc3a506d870d8d9fa528f59b605df4ff02ae6bfc16893bfb22734395096a77fcbe19fb939ecc1a343a9b5 SHA512 0a3609590d797a8cb4732e8cf743606a4919f57475b6eb2447a3db0c28f1bd405804fdc47a4062e503acdd4b785a1de9794a6db433cabb884105166eff6a8c5b
 EBUILD net-ssh-2.10.0.ebuild 858 BLAKE2B c2780b2cdb45c313638ef427dbdfd588e121449df679d5f1b7423dc489964681cb440dd7e1b54bd5cc131eb9f40e8dae05095b82a3a73edb1dda884bec2dad3a SHA512 7b5630727ba7547c4a6f86e89547270064b77ec874eff574bb724ec8347994e3e4f38e01d1f981da67b187942e7cf648c09681d6a046b0a4a27fa623f2381087
-EBUILD net-ssh-4.2.0.ebuild 1103 BLAKE2B dc9fcdbfaa2981422e54186d065a7beea532fae698fb5a071e910405a6b9a195322cff7a6af0085d9ceb3d4cff0b55869676925125e0df189d4da5463382aaa8 SHA512 1e0525a708142728fc71029e084ac95a5c06ac49aedc447b426fb2727b78aa8e515c075897587137a5153c8989cf80b037d503a02016ba0db00a3bc100dce7fa
+EBUILD net-ssh-4.2.0.ebuild 1102 BLAKE2B 323e79278e37c7ebb2c8620b9edbb5cca0c6a8dd6211d8c7bd6de0533f5d137b59fdaddd525ff431f6cf11d424c3e820212983af2ce330319a7694fdf29bfc05 SHA512 509757362c9077df31219435c98036ed0f731268d5a351d0c46bc1b5142587c0dde339777e0534005bf41cc0cbf62666a6f3d833b4711e07af8aa2cdd6497d04
 MISC metadata.xml 460 BLAKE2B fcbb901a6f9f2c80489e28346a21ea7cf5dcf7eed49c72dcf8cad079fdb2f52969d03b619d4535206c078c9d2d3a6c0492b035919eef89b3eec8207ea7e3ecb6 SHA512 9e66fd4626a890ca908b35e1cba4b5712ceef882fd6dd1f72ef20e6b07ca0b32cd3fd92d84cd0816c38cbc1d3d76152fccdd1e90d901b3d0f8b096b3274b8cf4
diff --git a/dev-ruby/net-ssh/net-ssh-4.2.0.ebuild b/dev-ruby/net-ssh/net-ssh-4.2.0.ebuild
index 89e2cbe7b45f..5a6dcfee99b8 100644
--- a/dev-ruby/net-ssh/net-ssh-4.2.0.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-4.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${P
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="sodium test"
 
 ruby_add_rdepend "virtual/ruby-ssl sodium? ( dev-ruby/rbnacl:4 dev-ruby/bcrypt_pbkdf )"
diff --git a/dev-ruby/net-telnet/Manifest b/dev-ruby/net-telnet/Manifest
index c618f442eddd..b43841b424f7 100644
--- a/dev-ruby/net-telnet/Manifest
+++ b/dev-ruby/net-telnet/Manifest
@@ -1,3 +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 960 BLAKE2B 589033c2974b4710c7463e604ea6524e5097a1334a83808e33c156f5a65cd71ece1c160905135d4fa2d1c1ea65292c73b5b11c7421607e246ba3d1828878feb1 SHA512 b3c7fcb47a85a9911e39d30dc24be48fc12e50a45fa9ebe4efcb44b2709445bbd1641e6bcd8605dfe916bda3db754dc66fa78086702af9be87272904ac8e1063
+EBUILD net-telnet-0.2.0.ebuild 962 BLAKE2B ca47545c09e9685f936d0512b1c7d20939e1c905d2b478a2b1c4abdf4a2a83c480b10ac891080349ebbf209bede232e67330e3ba2ab15df9e62730a0f22d08cd SHA512 ac341e8c264b6a65f4158a53f21e5c59dd6391e6150f50a74d00542ab964b001b2022399870980fd242cc362cfb763c713ca23c9666d13935a8c27f6bad9f2e7
 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
new file mode 100644
index 000000000000..6ce7ad83e9e5
--- /dev/null
+++ b/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+# Don't install the binaries since they don't seem to be intended for
+# general use and they have very generic names leading to collisions,
+# e.g. bug 571186
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides telnet client functionality"
+HOMEPAGE="https://github.com/ruby/net-telnet"
+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"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/oauth2/Manifest b/dev-ruby/oauth2/Manifest
index b8d200a42195..75fbd442fd6a 100644
--- a/dev-ruby/oauth2/Manifest
+++ b/dev-ruby/oauth2/Manifest
@@ -1,3 +1,5 @@
 DIST oauth2-1.4.0.tar.gz 21299 BLAKE2B 1fe4640b374450279e556477c23972030d3aecac4c96e9174e57458deaccfbfa012e3bb66fe3db5e845a4004b91b763dab6f68b885ed7c1ddb2710cda29a8486 SHA512 2db67cba2403be8ea5d6f88f9818f295c29c08201f8ea5876c55cffe2fa926be465a11061654adffd77d13da9c7e56353ece7e4595cd9501acdcfeb58573b300
+EBUILD oauth2-1.4.0-r1.ebuild 1213 BLAKE2B 0b368de907181b41fd0c1216de3fa4f4c6fbce26992930730ceffa29874d737a217f8cabff23e70bbb4fd59a51337c325cefb655b4c350c0869e11fc15f04b78 SHA512 b03a27b6f9cf23bb31b24b0b1c70b9db980809774de90bad08373c8bcc5b588e5ec882f73be5a50605ea3b6e208d04804ffeb0bbe169dde1ceafde1f6fb73150
+EBUILD oauth2-1.4.0-r2.ebuild 1393 BLAKE2B 8d85f689841ea25380c6c22cf8aa2b0abadb615e6df260980901790ea77718f11c28055a47863593f4b13f163d2afa15aa0cd6098c896a946f16f6f22b0822aa SHA512 9b68eedf5b6305ec3c87d441c24a43ea0129afc57bfc7547a0a493ccce0e4ff51052a41811b1f5eef946e8683aae8c32002d1a8bf1bf4bccbeda25397ca9a507
 EBUILD oauth2-1.4.0.ebuild 1113 BLAKE2B ef45c62600507cff11b8240c3dba97ce041eeaf419f902a4727cbb74406fb45013fd230d391572e95d926f457d42a9b0c2f809b828bab081302f314ba241c8da SHA512 eb64a82c52fb1df3bbd4ff98a0147a06339119f57540cb62514faad47a28963e79fa37941b668f5f353b6c5461c02e0a827044edec19c471d6f8b1c1c032c255
 MISC metadata.xml 341 BLAKE2B e2896d1d266992c01ed373b489cf71b9c4a7a5f57a2af37899ff63793dad41b9213eee0fd94f269735f630815819f0a08e51e8739b89a7e251b60c2f6894e26c SHA512 33c5be74161557ae3e5888730256536cd02baac6c26913add84d8ce90854c4a3bb57c31fec1287bf560268c681ea3acf2119f2fea3162dd07e3962ee34d74f9e
diff --git a/dev-ruby/oauth2/oauth2-1.4.0-r1.ebuild b/dev-ruby/oauth2/oauth2-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..d79d21c90151
--- /dev/null
+++ b/dev-ruby/oauth2/oauth2-1.4.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_TASK_DOC="doc:rdoc"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
+HOMEPAGE="https://github.com/intridea/oauth2"
+SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-0.15
+	>=dev-ruby/jwt-1.0 =dev-ruby/jwt-1*
+	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
+	>=dev-ruby/multi_xml-0.5:0
+	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/faraday/ s/0.13/0.15/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/simplecov/,/^  end/ s:^:#:' \
+		-e '1irequire "uri"' spec/helper.rb || die
+
+	sed -i -e '/yardstick/,/^end/ s:^:#:' \
+		-e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	CI=true ${RUBY} -S rspec-3 spec || die
+}
diff --git a/dev-ruby/oauth2/oauth2-1.4.0-r2.ebuild b/dev-ruby/oauth2/oauth2-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..283663a9010b
--- /dev/null
+++ b/dev-ruby/oauth2/oauth2-1.4.0-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_TASK_DOC="doc:rdoc"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
+HOMEPAGE="https://github.com/intridea/oauth2"
+SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-0.16
+	>=dev-ruby/jwt-1.0 =dev-ruby/jwt-1*
+	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
+	>=dev-ruby/multi_xml-0.5:0
+	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/faraday/ s/0.13/0.16/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/simplecov/,/^  end/ s:^:#:' \
+		-e '1irequire "uri"' spec/helper.rb || die
+
+	sed -i -e '/yardstick/,/^end/ s:^:#:' \
+		-e '/bundler/I s:^:#:' Rakefile || die
+
+	# Avoid spec that is too fragile in relation to ENV
+	sed -i -e '/outputs to $stdout when OAUTH_DEBUG=true/a skip "fragile ENV stubbing"' spec/oauth2/client_spec.rb || die
+}
+
+each_ruby_test() {
+	CI=true ${RUBY} -S rspec-3 spec || die
+}
diff --git a/dev-ruby/pcaprub/Manifest b/dev-ruby/pcaprub/Manifest
index 3f876fa073bc..b452bb7b3b59 100644
--- a/dev-ruby/pcaprub/Manifest
+++ b/dev-ruby/pcaprub/Manifest
@@ -1,3 +1,5 @@
 DIST pcaprub-0.12.4.gem 36864 BLAKE2B c2e86624431cc758059a997ebae716adb1d7de74ba62a375787608f6c68f7b85a614ec5859e251724475e1b68e8e90108f408a2e833f896461a95bda04d4d9ad SHA512 707221429dcdf95eba24076589054dd022ba8a479148c3ec8ce9667016225ee64bed13d3fdf8ebd46027244feec8e77a484c67f040d0439bfa44d9212997645b
+DIST pcaprub-0.13.0.gem 36864 BLAKE2B 0a0ca07da261de2e8bd7aaa131bbda9f6ee3cd5eb5fa214c552179c707d20345bcedc8db5d49590e69c41220e69f93a6d9f0b1c1b6f768c25ab648d50dead388 SHA512 6099996cca317194582a50ac89769d11ba802a9658c67f707e342b3c345bcaab26fba5ca2dc245a39eeb01f9ff6fdde1ae64a3a1ee4dd0e5243bae2ebed37e5f
 EBUILD pcaprub-0.12.4.ebuild 775 BLAKE2B bce93ad392b6bc13a498bb927b0f27a45f20fd952d7f762074d5730bd9dd6a3dafa301bbd74652e193de92348f125a1741b12114b01b9a6b2a36a54a6a4dedfe SHA512 aa620e625f70ad17d7354f1a953d413b7c349d58255b74bed08dad41f5d2e19830ad640040827915c204bf3bd8708743ac838f9f029964a5e2c7d740bd506fb9
+EBUILD pcaprub-0.13.0.ebuild 746 BLAKE2B 1b7c088e342a4707d9c9f6dbe9b072ab7c04797bbd8d91ec9b30a99502909cebf9a482aaca4be9f62a7d1eef81de94c6e414a1b26eb05d2e0e95923d7db185f7 SHA512 730846f532300cf61383a9ab30d5d14c198ee02c5755223e1d0aff7bd1834112d3ed995b4007a909162646c0a01594a7a697be2e3450e4cbb30e21e00097259c
 MISC metadata.xml 433 BLAKE2B 2782f98bbd93dcc77f98585870e85b8031ec65f752050a382d3fcb637f57ba330bf40b592dd5494792977d555373abd316209df45263d8b2d411c9a4fd4271cd SHA512 0e1abd6609263bc8770684a59646ffdfedffcb5b14a4d2e160b3edeb44ce89154b58ad14e6c830e63ca39cf6799261c40182040d570d422cf4e6bd9732a30eec
diff --git a/dev-ruby/pcaprub/pcaprub-0.13.0.ebuild b/dev-ruby/pcaprub/pcaprub-0.13.0.ebuild
new file mode 100644
index 000000000000..d85148c26b66
--- /dev/null
+++ b/dev-ruby/pcaprub/pcaprub-0.13.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="FAQ.rdoc README.rdoc USAGE.rdoc"
+
+inherit multilib ruby-fakegem eapi7-ver
+
+DESCRIPTION="Libpcap bindings for ruby compat"
+HOMEPAGE="https://rubygems.org/gems/pcaprub"
+
+LICENSE="LGPL-2.1"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND+="net-libs/libpcap"
+RDEPEND+="net-libs/libpcap"
+
+# Tests require live access to a network device as root.
+RESTRICT="test"
+
+each_ruby_configure() {
+	${RUBY} -Cext/pcaprub_c extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -C ext/pcaprub_c V=1
+	cp ext/pcaprub_c/pcaprub_c$(get_modname) lib || die
+}
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index fe9c7dca5553..cd3f78bc8cb5 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -3,6 +3,6 @@ DIST pg-0.18.4.gem 219648 BLAKE2B f6b957551b0b537dda5551bc8974f5bd2f8a4ee4ecf482
 DIST pg-0.21.0.gem 214016 BLAKE2B 9e27646cd85bc97dedfb980f4851b19a1ef2aad17f6a5c60726c1683642af5c4cf87d518b300fb4c894e1580f808f8af6158b57f1ac25971c1fc55818abee6f4 SHA512 590a8c34487d2cf030082cfff87b2cc83b636df06a931e394acfb098ecb5728e793d777f125b036ee9953bbd21ec5facf91c932930acccb507d3394f2fc4cc5b
 DIST pg-1.0.0.gem 213504 BLAKE2B eecaa632c7903f89c503ad92ccff058bbc6c2c80cbf83d656eeb9a5b919b84bb270671ad4e0fa08f55be1bcfc69eb8e13b815c37c601d300de503383f1ba5908 SHA512 1cac025ab8a95b4429534b98377eedeb1e3f8b2c4a859363c4174d477577caf39557b002cde4e745189fa9a29e9181ff9d564d822f15ff5c4f03f7389b0d0398
 EBUILD pg-0.18.4-r1.ebuild 1799 BLAKE2B 10a47c3c1a31f3c4c343d70e08be471d8e9dc4c7b8f4dd334324c0a3d568523553b07e8e29a20383583b6662db41c706cb55d3d36d632ad2866664d79c50508c SHA512 9bfe8233130cef910421d985ac0f432464613862116194124c0c1f3d214ddb9f56effa4fa8b19c522610f0460342ed4fb0b9571181d66d513f8440c01523b4bb
-EBUILD pg-0.21.0.ebuild 1705 BLAKE2B 4bd2da2760f0db193ed2b055c0b61511b010c62eed1e5aca03f166eee33006bb1459b35a243821e233883c98b1afa6cbd303e8ced293d9e8378687c7166e5a01 SHA512 04bf8259e5c1d6c59b18b6bdaaf8630915c22d9a6b2d7f394f5ddddae565b13f28a2ff6658c94ee8239983fb7c96048dcc97ad343e0829d8b2e9f97e5ef44ab8
+EBUILD pg-0.21.0.ebuild 1704 BLAKE2B d77c9188b4139e9596764bc68f388f65e4d1790b9f2847bc57fd1cecfc8ee92285efad93cd27224798dac92636a72d6090a7185af229501f8cd10438c007e2a3 SHA512 32131ef3251bccc66836f41cd5c64dd44c7b6342ec2ae5ea2f8029c6b6967fe9e910ead0437edf3127db96105861561ce0d64f9ccdaff933fa7c2416692ac304
 EBUILD pg-1.0.0.ebuild 1655 BLAKE2B 6427e234010712acd305575b7f08db4740547349823a2661984bcd058e38f461dc0ba4f33f728354108925d31384f9bd503394ad3457acdb3039b64bfd8e8b77 SHA512 277f349b3da11836fca7ddcd2d3961b1c83dcc099bc5c06b3af4fea2352585aae9f25330c3e3507f781800ec3d989bacd9316913dbfa4b578371cc2c596fb10e
 MISC metadata.xml 340 BLAKE2B 8ef2673e4dafd5495e2385e4216ae715d3334c170e81f45f823f8ef6942533ad088115e6f8e3c75b35e2af28cbbf1e3446cfb8b2eb084df7b9a3adc6c869c183 SHA512 76be8c407457ed3f1a8e2caaf5a10949a830d4033d8d18e88830f37d2b62d4ff9675367f123364041ca88f5af972d4d7152c1f2832a5c891b516a83f989e1598
diff --git a/dev-ruby/pg/pg-0.21.0.ebuild b/dev-ruby/pg/pg-0.21.0.ebuild
index 0121b1f24c8d..bfe07cb527f7 100644
--- a/dev-ruby/pg/pg-0.21.0.ebuild
+++ b/dev-ruby/pg/pg-0.21.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://bitbucket.org/ged/ruby-pg/"
 
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND+=" dev-db/postgresql:*"
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index 714d4ef7d249..400492b94565 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -1,9 +1,7 @@
-DIST power_assert-0.3.1.gem 14336 BLAKE2B d29f8ffb84c1322610e1bfc819a599828a386abe2a21bf60d8e5a397dafbad52885c20899a78f713d39aedde992ac180138ed7fbd96ebf48d9bad753a51f0097 SHA512 0523c9c2f45ae60e93b491bed8ae3ff3bd83cfdf8c23d784ce19f87a52d90b94095d3e5ca38fbc2e4917a8895309194e06ec519099b69096bef69a4d9466da64
 DIST power_assert-1.1.1.tar.gz 16799 BLAKE2B df5f688d4242373f1a5de95fcbcdd63d23a14314a890a32839ba88494d04a09ad6b9c1dedea23f43d53cb708b3e5eee8d0a2307be16a1c11cf3cbf22ea254344 SHA512 a33429bf918c71a5b75e56940d46dfd05ed3c87f909d6f09ebf2d8b2cd43a3c5c37b5ac13c334383f1b3f52817ecd4ccf68cd649c53bebdfbc464a18c88b702c
 DIST power_assert-1.1.2.tar.gz 17140 BLAKE2B a690365b60ff1dbcb9eb70807b4c9c772e7f809190f1fa7dfef449ff01656bc31bd59f0d291ff158bdac1e2accaf376a45fc1dd480fd864fe84ba1ab4baf3743 SHA512 716edf1e2885e2e4d760f9b09aa97be1eee353f4f50297d0009ebc9fa3e16599ae094b78911915f20d295a6232d6c14844f43bf843b25e90f7c76bfa1d7776fc
 DIST power_assert-1.1.3.tar.gz 17169 BLAKE2B 05e916cafafc6c90abd9fec30d4439bc4b02cb83267c37528c018eb367a402cd42aefdd050b388d3bc1735f0320109b0c1a078db3718c0d3b2a033c32536c441 SHA512 8612e08c3e30ddfccc6be30f2df101ddcee0d2338b9438fb44e922115c683b31f41b699ca998e088488da94eb5d80da360429fb2ba374c31a9b57a60ebc8c732
-EBUILD power_assert-0.3.1.ebuild 792 BLAKE2B 04dc6541c2f8ef2055d8c48190e39dd4caefb01a15bfdbdb9a390615bce66454e9cc2a1c277759f7d0d1fb7de6192dd56b93fa37b3cf0866dbb77f089aea0b7d SHA512 c455df2723fcb267cd3780ccc8b8d86569beeac449688740edf619215a4b2957271a58b697c10e198080a976ce3400de988a71d033dff9fa041de551f022464d
-EBUILD power_assert-1.1.1.ebuild 1330 BLAKE2B 593868ddf8feb8c7e1d6580bf4b57a6a5cb030cff78a4ecf0563fe6a306e27c321c8fc499cb06525655b0a4a1cb75fa0cc63a0913a978b0ad71837db801dc6cd SHA512 d29eedd3a9fde68c7d4bf024eefe92623f196eadc9f79fe4ccd95c75dab7c8910cbf2a2c16e518d34902634194f10f27d00f727b26b6af7195d851098cb5e742
+EBUILD power_assert-1.1.1.ebuild 1329 BLAKE2B 9c14978a326fd633111fc485577e09cdeabf18e08795e41dc76efc0fcf405356184269c3a8f57effad87cd151acb24238731a94c23fbee9219ed1ab93ea9a9cc SHA512 91e1b5b0070e15a9235a3a0f022400e96a84ace1e4473549199ab3760382ed647ffbb95be00a50c73245644a9f846a258b912f8e10f6f811421fdc312934d769
 EBUILD power_assert-1.1.2.ebuild 1331 BLAKE2B 5710cf33430a517b532cb28ca1a0917f619901dc498190325dc83c6a6dafabd89542915099cb66a208b123a5150e8df678e379ad174492c2837328f9aef41713 SHA512 4e871fddff5c73cf57f9a0d40b59915ece509a0482c05d8f298cbdc10abe89ab066090d1cd555fb8b641edae504413af2d27b5f6a0690a84c2a04b3f749fba11
 EBUILD power_assert-1.1.3.ebuild 1331 BLAKE2B 5710cf33430a517b532cb28ca1a0917f619901dc498190325dc83c6a6dafabd89542915099cb66a208b123a5150e8df678e379ad174492c2837328f9aef41713 SHA512 4e871fddff5c73cf57f9a0d40b59915ece509a0482c05d8f298cbdc10abe89ab066090d1cd555fb8b641edae504413af2d27b5f6a0690a84c2a04b3f749fba11
 MISC metadata.xml 344 BLAKE2B d878cc041f73fcacc13fc94374eeb102440977f57c47880e9a597af3b4d3b20cd81e8bd0d367cd2abd7799a27b5aaac46611291ffaffb3298bb253d726e23726 SHA512 87e232c55b49880144aa509aaa79413864b3f575df07a559a9f1aa60909d4d8e01d1ce2e86542c847533eda2f233542deb36b1103b56d7c512f2385a6c8eb2fc
diff --git a/dev-ruby/power_assert/power_assert-0.3.1.ebuild b/dev-ruby/power_assert/power_assert-0.3.1.ebuild
deleted file mode 100644
index 28c73e067aab..000000000000
--- a/dev-ruby/power_assert/power_assert-0.3.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shows each value of variables and method calls in the expression"
-HOMEPAGE="https://github.com/k-tsj/power_assert"
-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"
-
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' Rakefile || die
-	sed -i -e '1igem "test-unit"' test/helper.rb || die
-}
diff --git a/dev-ruby/power_assert/power_assert-1.1.1.ebuild b/dev-ruby/power_assert/power_assert-1.1.1.ebuild
index a0e684d05442..73bae537c4cf 100644
--- a/dev-ruby/power_assert/power_assert-1.1.1.ebuild
+++ b/dev-ruby/power_assert/power_assert-1.1.1.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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/pundit/Manifest b/dev-ruby/pundit/Manifest
index ac2c1775386d..75d71c5953b4 100644
--- a/dev-ruby/pundit/Manifest
+++ b/dev-ruby/pundit/Manifest
@@ -1,3 +1,5 @@
 DIST pundit-1.1.0.gem 22016 BLAKE2B 912f359cb4530c4f65622c3a7bee48a7d84757e4c8327398dbb4e4e170a35f4811c018224aac752b6c2ae54bc93e65b5e0b46f0bb191da57355b55ea0e8d0eaa SHA512 ea7e8ef9e4b280f451810ba193dc5b27a75ecfb050eed674246034ebb687e8302aee8826c022090553b643b41c85adec4d3234f545ab2a59ececa461fe4e4b3a
+DIST pundit-2.0.0.gem 25088 BLAKE2B 8fc4e0d40a56fa05f04b7a79e33039d08987a0df3b150f77c7428cdc10fb847477f1a04e7cd7772c86063d3095904202207e11e87a01766bc643e7befaee9957 SHA512 e6b37896e107a14fe40380a3a4e00f90fe7ef4f62bab252b4cb8b9854e5cba062d0d9680f9c9cb224384dc186f9ff3d5acca367d93a1cea297d63b422da689eb
 EBUILD pundit-1.1.0.ebuild 641 BLAKE2B b1f8b9547eb2ec66ebc01ea235b974d70305c8b7424179287a3b007a98f14bdf3c23ba5427c0f41d9d604b030ac50f63ae179c1958d8d44d39afc0552b5e9e93 SHA512 ed6cdac782cc6ad1a4f07213aaa2ad7918c02938db584fd8786632164af4ddafc938196892f56095e305a0eabd351f61bda53fc9b7626ea6e43a54d27a2aba56
+EBUILD pundit-2.0.0.ebuild 641 BLAKE2B d9535a7cf3f7b9652ebcb4b8fb1028e8289f16d79e717461e05ae994003ed11542b20fb6fa86843a905cf82dd17449a2c2dd1a64c1807fd6b2efb435b273b30b SHA512 5f5501b2185543dc0522e1e500b8f29a0d1131895aad68195991cd11e5c4ab018f831009d1cfeef514fdba946e63135df82d62d3f2da52ac8386014f9fb256a5
 MISC metadata.xml 376 BLAKE2B 2cd1d4cac40c14c7228ed06fba336f89c6b3e5f5111cc59187ecf3a050a08cd0e77c9b1c5d805374deebcad84f835e52f052dd751481e17c84b59d6dbdac08b2 SHA512 3f0ec90029dbed0d31321b37f959b6a099e73d4d0604bddd2a1fdcf4509a36252cbf0b591aaef793392dad4125440cfdbe807a213200075310223c44c485ec9b
diff --git a/dev-ruby/pundit/pundit-2.0.0.ebuild b/dev-ruby/pundit/pundit-2.0.0.ebuild
new file mode 100644
index 000000000000..f26d3265c8b5
--- /dev/null
+++ b/dev-ruby/pundit/pundit-2.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Object oriented authorization for Rails applications"
+HOMEPAGE="https://github.com/elabs/pundit https://rubygems.org/gems/pundit"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0:*"
+
+ruby_add_bdepend "test? ( >=dev-ruby/actionpack-3.0.0
+	>=dev-ruby/activemodel-3.0.0 )"
+
+all_ruby_prepare() {
+	sed -i -e "/pry/d" spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rack-test/Manifest b/dev-ruby/rack-test/Manifest
index 1f639a4c4979..845a13455873 100644
--- a/dev-ruby/rack-test/Manifest
+++ b/dev-ruby/rack-test/Manifest
@@ -2,8 +2,10 @@ DIST rack-test-0.6.3.gem 23552 BLAKE2B d494f7fa3d2f7ed6fc6d33e507c44599061342582
 DIST rack-test-0.7.1.tar.gz 24492 BLAKE2B 594fa05287399425557f579c871accdd268c463e77bef3e86f2141f5c5d824abc2a245a636390e0957cafb2db86a5483f9de2f13571b5c44a506f93122fcd2f0 SHA512 2b202d1f485fa2aa927d2c599e0b3bde08f5d93b6e8a36ccee5b5e064acfd0979154de8db8639bfb78f3ab038b006305379389889239dbee13020b72f060a8db
 DIST rack-test-0.8.3.tar.gz 24842 BLAKE2B ea02ce5e5a460c43b0299e3b6e3412efb1be8991ee14f924e7b2b8fb995917aad1cd809240a6389226b0a6f356ba94534082637aa7ad7f4ac4c93b86277dcf23 SHA512 ae2afd43e8b6643acdc7b4988df7dea5a5f00231df92127841aa52cb89c0a1891e13e5d6f321acbd95ce86b7372b340f0f863f01e500ae7643699c27077b767c
 DIST rack-test-1.0.0.tar.gz 26188 BLAKE2B e1df3e0d0e9cb8757bc898a2780a45f808921638a01a9ade0c8ac3233745992fbec1780ca36d4595e5a89bf124dcec0fc74fc33e9b22c46723e851aa371a73b8 SHA512 e654a10359b771607eb5295f574ac4a7b42afafc9a85c65e87a54559db1b5221b6e4b5ace18db05acfec1f381caa93c4b3be1912c3f08fbb74861d6053a2d242
+DIST rack-test-1.1.0.tar.gz 27035 BLAKE2B 640de2303850662c3b6a8fc17f2344223c9928b48abde6d1b251a634689793158f35498c4736e4e2d069efa921d37bc32da92a7e17c0761a6f6111b345b54c1a SHA512 36d947d9b13d33ee8322e5b9d18fe8266787ccb7703f1fafadc040123e34dd44e98e7faf8b6dd816e51ed167065b2ffe79e9bcee74564dc324ba2b7dba76f82a
 EBUILD rack-test-0.6.3.ebuild 959 BLAKE2B 97f7f0ba6f376e50991dadf70c745069b295c03e0a2f139307b089d4287e9c2419d2c0e26f22b746c102efb229df4287c35db85e8020df69f8e9e5e067047fdc SHA512 732544b35298ca4b7a5124ef0ecb55a1df59ec39a4b7a60285f31744c2005156bb26243ee17bab495bd1d5887e652295bd0e6d348e05d79f128685b7e045056e
 EBUILD rack-test-0.7.1.ebuild 1059 BLAKE2B 9d13171c4cc3a4f5d991223278d96d194929b8af8dcf3208e624cbf20240cd5147f601beac94a8fbd4f5c1eb2c852b277b085296efbfba7fd24ef7e1bfc9d344 SHA512 f3e08c4654026b85322107f60a21197ff07cc4c67a498e03478f4a168e82fd58bd014fe5f0a176d30c0fbbbeac9033b9b992c4f9c5f6b470a36878bcd12a559c
 EBUILD rack-test-0.8.3-r1.ebuild 1150 BLAKE2B a243633049097f3d7ddb3054a4fe752d3a394dd32350e53de8889fedc158de5ebbd1e9bbcf016a683a6d4636e37a71f277b59f8aff3b8da6fbf85d8fc6455c23 SHA512 4d8d31998f3c42a2c2fe64fcbc1a2c328e0f0b068b5caa75c9a736f1eb2b991fe81ad98ac49d21f09edb97ec51f58d9a78b165bbd6fa1738ee189f152b0841b0
 EBUILD rack-test-1.0.0.ebuild 1143 BLAKE2B 6c2349179b80a907b79dbc7664b3ce7490da9f4a857aaf70a25dcfcc679c702d3cb84f0b2d56d29b6f7d33abd9210dfd77fd5719c28e972495f3a65588a9ace0 SHA512 bad849eee444b4f21b42f85e5d2b8a1bd94d9d42ff1ffc9ae9fe48368f1313e52850bac164e667af57905c44d59a7fbd0dd7e3a2f49702585d5193abbe238708
+EBUILD rack-test-1.1.0.ebuild 872 BLAKE2B a16df31208bd41a126fc3e77753e4419ce6026546c295a45d8f527aaeafdb6f7c0de652a4890f52e699eedc55042251651422e4c2771f2a81faa659aa239ea4f SHA512 f6deb22571261156d141dfee7b6a23c3a5fc85fd2de9ad33f2ba5dc06b952036fc0521d42d388aba734b46ccbd6e8afc82fac6cbd04198f773087ccbdea09f15
 MISC metadata.xml 343 BLAKE2B 3d64a9d71f8ea0b1af70404e282f27ba4028ccada49dd94cc54f3517a939749d1d98cf1e08c85ce1e4481971b007f88dd40b7bb9609b4879cfcceb55519f97fa SHA512 8f9aa1b7be720aa89aff9ada3782e3b7098edd7181203d78a56fd6576ff3d2cfb812557158a30353eabff9084f6cd148222f4d7cd39b7cf0073c4f9da0aacd0d
diff --git a/dev-ruby/rack-test/rack-test-1.1.0.ebuild b/dev-ruby/rack-test/rack-test-1.1.0.ebuild
new file mode 100644
index 000000000000..54410497e145
--- /dev/null
+++ b/dev-ruby/rack-test/rack-test-1.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rack::Test is a small, simple testing API for Rack apps"
+HOMEPAGE="https://github.com/rack-test/rack-test"
+SRC_URI="https://github.com/rack-test/rack-test/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rack-1.0:* <dev-ruby/rack-3:*"
+ruby_add_bdepend "
+	test? ( dev-ruby/sinatra:2 dev-ruby/rack:2.0 )"
+
+all_ruby_prepare() {
+	rm Gemfile* || die
+	sed -i -e '/bundler/d' -e '/[Cc]ode[Cc]limate/d' -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rbnacl/Manifest b/dev-ruby/rbnacl/Manifest
index b7975f90c718..ddf8ed2975b3 100644
--- a/dev-ruby/rbnacl/Manifest
+++ b/dev-ruby/rbnacl/Manifest
@@ -1,6 +1,6 @@
 AUX rbnacl-buffer-size.patch 765 BLAKE2B 0865380f35748adeddda7a9a880df0c1be81994a965ecd40505e9f47f39c7d2a55876080007e28204e388f5a09396d28275d2cf9547536523c7d2fc5f6e035d1 SHA512 da9dd16452b1449f3d862d940b518bf4b99726195ee0ccd0bf3633299b6d9f44120b9b638b77243f7a1c30802d79e6467d2673eb7987cbe38091033aecda283b
 DIST rbnacl-4.0.2.gem 220160 BLAKE2B a4a3a7b0346bdc3d0e1930bf9b1c6c05182456837c53c8a56f5d8eec831df8768589affb00450088c4ccc3de37f474a359e9ea362655ea66ada63467936abcbe SHA512 d13d36e4248d5e40bb5d9496e08823438d312c16d14e3068be89a62dd7f80ec7f99fa5995752b183656b6ae863af77645b16ce45d05a74ad0dfbd4a93c8854d4
 DIST rbnacl-5.0.0.gem 221184 BLAKE2B f64a754c478c57af901432e9cef335d9f01c1acadcd9d860dacca2ed5d59bdb71f3a431488357b57cbe7af61cf03b50b95ab5421a9ac59f63242a0ddd693e373 SHA512 d6c0c90587beae9f5086c442f4b7b9f430d527576307c5a5cdc5532b231245e5615434a001b3a4b47d1fb7d7148a167d77f12e7b4f5bd1c25c7ce5d361eb42f6
-EBUILD rbnacl-4.0.2-r1.ebuild 793 BLAKE2B 8ccb1d4e86ad54f5236ce5e552efcf2632e7142d8bc36f83547c930c739a6d882198f46858183a063bb54b8f8aa7586e22bb8a1249963fb369afe48b232da759 SHA512 d2bfdcb7df8a062c08c1d7940fda61acc9b08c35062a11edef2ce410fc8b09f2a77d4206bddde690e68231cf044bfa3e6e9009fdbb359613c080bb9ca646cd61
+EBUILD rbnacl-4.0.2-r1.ebuild 792 BLAKE2B e86f2cca917610c8b439cbbce784c332d3ab996010fd56d38084aa69c0c9a5e6243e03a303c40ba859e4f92fc17b221031e18869bc1bf802c5b0d8c8f946ae8c SHA512 58cdeec680428171dd2dd1aa685c17e19fb90b3aa300f155abec54a1c9d48982269022e5fe20594d6c2ce6c04ac1443f71e89f99ed14677e2c22b6b73aa0afb2
 EBUILD rbnacl-5.0.0-r1.ebuild 796 BLAKE2B dd40acec7061c975e4a6720b8166a1340536ed158e6ebab1fa3bcbc431d62843113ddb8ebe75812be74a03f6f34bc4858729930f7e4241af5abb1f96a74cd7b0 SHA512 6e3e13beb35f521bc101c09d8a96f9a8ed1ce7cbac54b24ae27cad0bd8a72c168fbb3deb84eb5d0a715e2ea82721f28b3daec3a459be6fac0cfb009beda13323
 MISC metadata.xml 345 BLAKE2B 9b2e901225c95717838370d1de17dea5619d4485d7856050d55abd8bd05eeadbf012ce47b160d367e0027d2e42abfdf4eed15c598d0a8062713a00894495cd88 SHA512 e18502485ad21a5e5cb71be6f2980657a40b08618b50147f50daba44e1f87f009f796e1df046bef94c05bb9305e1bf9dd1a81df33c7fdacc8c2974dd18cd309e
diff --git a/dev-ruby/rbnacl/rbnacl-4.0.2-r1.ebuild b/dev-ruby/rbnacl/rbnacl-4.0.2-r1.ebuild
index b62445566fca..362512caff83 100644
--- a/dev-ruby/rbnacl/rbnacl-4.0.2-r1.ebuild
+++ b/dev-ruby/rbnacl/rbnacl-4.0.2-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/cryptosphere/rbnacl"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND+=" dev-libs/libsodium"
diff --git a/dev-ruby/rbst/Manifest b/dev-ruby/rbst/Manifest
index 41da48d040f2..432b37d7db1e 100644
--- a/dev-ruby/rbst/Manifest
+++ b/dev-ruby/rbst/Manifest
@@ -1,3 +1,3 @@
 DIST rbst-0.5.1.tar.gz 14039 BLAKE2B 7399e92f98c650842464ea9240775ad776ec8d574c578d8da764778bbe8050be429e2521df82b3b04a0bf9cd18bef4f114890d54ef8d6f34c797f0f2f2e35bc2 SHA512 a7fffc1ccf495c1858d6d9fadd38a4d6a2c27a2da8eda8dad038f4ab881f4521223a35f97d4018d25b32c2621132a623040ba930494b36e1385356ecb87fecdc
-EBUILD rbst-0.5.1.ebuild 1130 BLAKE2B b515b1b6b55bb3c92f9f96f8d90472005de9c04527b1e0d83bc1b69f318e77c1f70ed884588ea146738026631bdb05d287aac4b3c9a62af0460cbe3d831d8ea8 SHA512 15a0f5f20b8ad16f593317f8e43ceaa8e0d9d06fe383a6000a8ff7b41a622bb5fb4c2ef3925064116a4109e497e1f2a8d3b11ec295a936396cadf533931376b1
+EBUILD rbst-0.5.1.ebuild 1162 BLAKE2B c6a7a848d0e28af6bc2fcf02cdcc083e10df4064c18d59a8b909e03124d0c3d9342bc4cb5f976b790597351fa7bb22a76681fefc712e4bbe6302e3fbe6428861 SHA512 a0c99ed97a85b110836a6114a4c035c51e090a0f26a2a22c63198fb40dc12b5677d85e7895222c9dba7c04006e5a4ef48ee5d0fe0c11da88d596d58ec2e0a6c4
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-ruby/rbst/rbst-0.5.1.ebuild b/dev-ruby/rbst/rbst-0.5.1.ebuild
index 47d5cfc57ee1..845a17891ac9 100644
--- a/dev-ruby/rbst/rbst-0.5.1.ebuild
+++ b/dev-ruby/rbst/rbst-0.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_NAME="RbST"
@@ -20,9 +20,10 @@ KEYWORDS="~amd64"
 IUSE="test"
 
 RDEPEND="dev-python/docutils"
-DEPEND="
+DEPEND="test? ( ${RDEPEND} )"
+
+ruby_add_bdepend "
 	test? (
-		${RDEPEND}
 		>=dev-ruby/mocha-1.1.0:1.0
 		>=dev-ruby/shoulda-3.5.0:3
 		>=dev-ruby/test-unit-3.0.9:2
diff --git a/dev-ruby/rdiscount/Manifest b/dev-ruby/rdiscount/Manifest
index 4ea3803b07a0..d90e7e08c9ae 100644
--- a/dev-ruby/rdiscount/Manifest
+++ b/dev-ruby/rdiscount/Manifest
@@ -1,5 +1,3 @@
-DIST rdiscount-2.1.8.gem 67072 BLAKE2B c5295e9e78763f65815aaeaad01e6a5f5cafe2df66466d2f0fc31930db96403819ab3b27883b8a94a50f0d470059014fc39a5e24f62f8ec22cbe88f9bfabcdeb SHA512 a5d674a02514cb37d7e3a73bcc9131b434f624115e03f1ef5cef3ec4a378bb961966ef20daf93279b40715dcd19a0b79ccc43405fbe4523ac298f3255dca83f3
 DIST rdiscount-2.2.0.1.gem 68096 BLAKE2B 71ea7010116739e8c61aab91c2cc4a86cf679b4ae10221135c0bad854822a9a81969e927ef898c0ebf753811205ad98258c4e7c4b16f9e18a81bb01137a79fc9 SHA512 81a477782b9829ac5e68ab390ef00b7f470bb4bd84e86ce28dd9abbb71aab6fd17b67416078dd7d4e0fc7e0c8eb78250b7a71a2f24d2bd236e861cb445f9feb6
-EBUILD rdiscount-2.1.8.ebuild 1084 BLAKE2B f0bf0f2409c72156c4a05bb00eebd35727069273d9aab4b4b904294513f769cb8e41f0021783f17a4fb9cca4ed56a78cdc11662110064a0811da44ff48f4146a SHA512 dd39e67d04e9a243960d83fb2eaddb68407abead11d22ff56246232374a5dbcb31a955689d93e681c7bad43f3b4b40c0fc103193d3c205098393f547d17f3c44
-EBUILD rdiscount-2.2.0.1.ebuild 1105 BLAKE2B 30090e280289d0b6f2398d8f798d12677e2b0243f183b575765492b753b7273f1acc195f524abc0b5a9903f3df611f2b064ca9c5aecd651425bde1240e34a2f1 SHA512 1dbf6e389e201b5a4d382c0b33a91d63b83f41f907c4d9d1cbd5528796bed146e938976e2f42d53b840d11b3c0549ef33cb1925175378218a5deac7eb2084fcd
+EBUILD rdiscount-2.2.0.1.ebuild 1104 BLAKE2B 1d5285c56ee94e4a1ee36b1f2e7e1aa8f137957fe4563cdbc2d3c48eb8e4585c0d3e605a73e5e552fd16bf1c79892bb38579c39f68567c37a78a30810e9e1bcb SHA512 8eeaf65f51a4a1529b41e01fdef66a3d81d237d085b6076867bde04886f0f4d81b82c5c12e9976a8dcdd788df6583a3edaa8868c520e316f02e6101222feb7d3
 MISC metadata.xml 344 BLAKE2B 4afa4c43c02006cc29edbfd9c7792c42aec4aff05203b57a9e727ec6333f3f55c13b8f197f915f8a632d9deb888f5e00f3992fa8df48d7f0969206927a342d0b SHA512 4d2e68c0284b778089ddae07ad5026c296d997afc771a5b3b994464691ac794dee27f1f7bbdbdbe2037565be70d2bc480480a7b93c867dc100dca228b09b7aec
diff --git a/dev-ruby/rdiscount/rdiscount-2.1.8.ebuild b/dev-ruby/rdiscount/rdiscount-2.1.8.ebuild
deleted file mode 100644
index 0454d99cbc0d..000000000000
--- a/dev-ruby/rdiscount/rdiscount-2.1.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-
-RUBY_FAKEGEM_TASK_DOC="doc man"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Implementation of John Gruber's Markdown"
-HOMEPAGE="https://github.com/rtomayko/rdiscount"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos"
-IUSE=""
-
-all_ruby_prepare() {
-	# Hanna is broken for us and therefore we don't have it in portage.
-	sed -i -e 's/hanna/rdoc/' Rakefile || die
-
-	# Remove rule that will force a rebuild when running tests.
-	sed -i -e "/task 'test:unit' => \[:build\]/d" Rakefile || die
-
-	# Provide RUBY variable no longer provided by rake.
-	sed -i -e "1 iRUBY=${RUBY}" Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext || die
-	cp ext/*$(get_modname) lib/ || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/rdiscount.1
-}
diff --git a/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild b/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild
index 16e8b75736f6..2f391e54f489 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 ~x64-macos ~x64-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index d7347bc792ea..7ec7a664a638 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -1,7 +1,9 @@
 DIST regexp_parser-0.4.13.tar.gz 81658 BLAKE2B 008b5c2ab7b08a23c18f165de2028fab7b42660644dedc467edc5b36065ccebdd80aac0612a37efc59248d2c7116746de41beca964a5c92800c23d33faf98ac0 SHA512 f6996b4c0be7f387657fed7a8fd505dd9dd3a15dcd09e12be0bcaf0bdf2321dc6a15a731e7062b76dc40e953b207340747f1429cc7e621dc0b1caa58154ba841
 DIST regexp_parser-0.4.5.tar.gz 77819 BLAKE2B c25bd61c226903783822ccd71aa8f6ba6a610c6aadedab91d5eb19754b066d2dfc741895cd5ea1f8b101bbf990858a3ecde9020503783a18c7b52bdd3783da68 SHA512 03248616b163bb9c82f3e9be7c0ca30b1d6cee7b1e38b2e9f2386017752544983786e37e26cad2c00a79e3cfedc08672c1b334234f8642c4c67e6ecb35f54af9
 DIST regexp_parser-0.4.9.tar.gz 80496 BLAKE2B bf9f5e16e3cd02902ce86091e3f6519e17ed97852218bcea4fff340f89638ad30fd1be4be25282233bc1d5e7936c818bf73e344f5c5de2a6c4229969835191f1 SHA512 e5fdab4bfc4a98c96a5d8bb6ba0cb10982111b4329626439a4fdf687cb641caf693096c455db48ff1d5fbc0de9b4fa88bc10ed86111fce4f3fb2245c54073a7d
+DIST regexp_parser-0.5.0.tar.gz 80554 BLAKE2B 7890e6850e3ffbb927c5e72430ab29e6aeec4f8684eb56f4153414aca62702faa57f48887618e84b1d087e2ba366ec9d6b2e92200cc34472b7bbb5a8b0043415 SHA512 0d1c43fda01077b9b3d9c28ce9cb01772f10817e42d9c0ff28e6ea5cd059ad4869b940498c6a4e77d4fc6acb6ac0aba293ae67dd012650cdb58989b90868be16
 EBUILD regexp_parser-0.4.13.ebuild 874 BLAKE2B 3b5f06c9ecbaf5f8cf271834c4faa3838d30364619cfe3794c4bb1ac00e6495b06918dd54d451d3bf1a6edd0d358eb96c48b3cb647750e4e4a63ce42a971d4ee SHA512 ce7521f4dd924ac5ae9c8af6b2e8f72d34162c63d0b99e35f440c771bb74279a78fddcd21a597405c94ac10bcf0f311b253585753667e4e7da7a0bfd7096b975
 EBUILD regexp_parser-0.4.5.ebuild 874 BLAKE2B c14f54730468dce88ac0a3c9c6045805ad055792e44ba4ea4f11b106f0d5ecb44e408c427a9d2e4afbd456e7401ca1bbc9068d42aa4116141ae91b4d76b94f30 SHA512 48de13dcebc05f91f6ff823e72471e336cde4030dc7a1af88a4231e093b974bb822f7c71247aad4a1e326cbe1dea9c86c27fe930e56dac25294a2145c90d2c07
 EBUILD regexp_parser-0.4.9.ebuild 881 BLAKE2B d0217fd9011fb94215bc25ef7aa0011ad76260d94d3b479399c0b42be5898055512300d889960038153ec264dc7c2c3718ebcad1849f2197deecec49e39c0758 SHA512 7c08fe08138cf26053bc02785c0ff255756120a0a12d659b0eb2d8fe8ddccc14a6e11aa7c2425538c55c773788d5db0f0ad1fde5a820686ec335e17b71d3b1c9
+EBUILD regexp_parser-0.5.0.ebuild 874 BLAKE2B 3b5f06c9ecbaf5f8cf271834c4faa3838d30364619cfe3794c4bb1ac00e6495b06918dd54d451d3bf1a6edd0d358eb96c48b3cb647750e4e4a63ce42a971d4ee SHA512 ce7521f4dd924ac5ae9c8af6b2e8f72d34162c63d0b99e35f440c771bb74279a78fddcd21a597405c94ac10bcf0f311b253585753667e4e7da7a0bfd7096b975
 MISC metadata.xml 345 BLAKE2B 1b8ad1173966e2528e85b076052a92f378eccb6bc3159a69de1a276dea6e65c3b2e83db43d65ab9cd357fa58ee0af3cde2485b0926002cb74e0fe1d54cef375c SHA512 aeac372e6213e9b018782fb640fe6d88b3d86d8f5d02b8511f69980df204dd82d45443c371e81527fc6c34b2c1684ff04b3a7789808b884644c348139b4999ff
diff --git a/dev-ruby/regexp_parser/regexp_parser-0.5.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-0.5.0.ebuild
new file mode 100644
index 000000000000..e9781606fb8f
--- /dev/null
+++ b/dev-ruby/regexp_parser/regexp_parser-0.5.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
+HOMEPAGE="https://github.com/ammar/regexp_parser"
+SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+	sed -i -e '1irequire "delegate"' test/support/warning_extractor.rb || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake ragel:rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib bin/test || die
+}
diff --git a/dev-ruby/rex-socket/Manifest b/dev-ruby/rex-socket/Manifest
index 9fed8bc47e30..e83db4306c67 100644
--- a/dev-ruby/rex-socket/Manifest
+++ b/dev-ruby/rex-socket/Manifest
@@ -1,3 +1,5 @@
 DIST rex-socket-0.1.14.gem 40960 BLAKE2B c2d0c4b77ff779fbc4414ef356b10e7c73a1a851571579ca0b9cfd70064b537dc8ccbc578db99276dc6fc3146ddf8830ffbdbb20d92e73952e7696043c826831 SHA512 19e0d1e3cd9abb55772bf125b5e78fd79231ddcce4d7a7444cf665f57af492377abddc2bd8b72390c870e9da65cc8f2cafce114166e06a86ecf35b9fd0868e29
+DIST rex-socket-0.1.15.gem 40960 BLAKE2B c452a0e8f95d3a5e2820d55e25d077aa594c9eba4982a953d4312bac4d5d32bdfec8dfc6b2a1f77ce9cbaaa60d7c3f0f5eb9da7407c131c89cf1eaffd4dca03c SHA512 edcc01e5c1235abc41a5579b56a04cdcb34710d24225fa9e925ecd91555429071eed281591df1a97cb8db035d63aae0c7a86aa93dc96289f42d1a56241b95fbb
 EBUILD rex-socket-0.1.14.ebuild 465 BLAKE2B eb451cca321ec65d3dbbeecaf71c63d92785ddda748c26444b92ce349ece7d8a3b9225926dbe3d8a7ecc0ed9c77ae57e5ef14bf3d53e69900d0f537c7f83443c SHA512 d681cd99bf487e81db258cb8761ea5798ef63a0bce60975bf553c854340535ba5563b9eba20b29dd295c1763897f6e8b0a9e529658c6aa7ddb7bd451e768e048
+EBUILD rex-socket-0.1.15.ebuild 465 BLAKE2B eb451cca321ec65d3dbbeecaf71c63d92785ddda748c26444b92ce349ece7d8a3b9225926dbe3d8a7ecc0ed9c77ae57e5ef14bf3d53e69900d0f537c7f83443c SHA512 d681cd99bf487e81db258cb8761ea5798ef63a0bce60975bf553c854340535ba5563b9eba20b29dd295c1763897f6e8b0a9e529658c6aa7ddb7bd451e768e048
 MISC metadata.xml 389 BLAKE2B 544f3d8d83c609027ede420284a2872d974dff70a2da51590de644432807e6d4e5f0f466d6928ef4f519d5537f368e70149db370bf4051c85980cfc25d34b6a4 SHA512 d2b55e0366bd178ca9117f1768f939af7a8967b8f02244bed2839b69f4f5ef8a8d6f13b1d6014c8f2ef20dff7c9def63592c80c2b934b172103ace300b441a15
diff --git a/dev-ruby/rex-socket/rex-socket-0.1.15.ebuild b/dev-ruby/rex-socket/rex-socket-0.1.15.ebuild
new file mode 100644
index 000000000000..56ddb0e1417c
--- /dev/null
+++ b/dev-ruby/rex-socket/rex-socket-0.1.15.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby Exploitation (Rex) Socket Abstraction Library"
+HOMEPAGE="https://rubygems.org/gems/rex-socket"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_bdepend "dev-ruby/rex-core"
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 649f4df103d8..3e2f8ab924ef 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -4,6 +4,6 @@ DIST rspec-core-3.6.0-git.tgz 375590 BLAKE2B e8b4987ea3d5cc3a403eaec98243e4c4be6
 DIST rspec-core-3.7.1-git.tgz 376819 BLAKE2B 6747ffd8f2d426718376b51356d8838a7db0d0246ee619e8edef30bd9f7aeeb80bd0488e4fc73b0a00d119074c35055f6b9d0cbbe6160ae78d0727ce9848a710 SHA512 1561d044281c1b8b97cc89033ad991548fa74abbc5f20d3951d3f3de754c581a027f9ccb2bd0107c05e744d3b2804555cf4cf207e72adf365b28fc7ce052dab8
 EBUILD rspec-core-2.99.2-r2.ebuild 3518 BLAKE2B 017a60ccb0ac017b08c4d97903a5bd59921fd0c0bc3b4322059d856bfee6eba2c026242bfda1e2083b043c190ad9160c6122ad62350b07aa0a486afbbb3089b6 SHA512 7b22027fa5ae71e80f071c4fc7cf3fa0e291ec42e06e0c07bcd0e94ab2782aa2dd79d4cba709751077b7c19cb0c5bc7a346c2c424cf9ffbbb62ed486776b6888
 EBUILD rspec-core-3.5.4.ebuild 3096 BLAKE2B 0dd38520f3c03ff53f1d4de2ad6add6df77e8f55719eea1e7282fe4411e254afe0b51b06a2b7a7263b7a77c5caa7ec0cfd773444c6edf9846d06c98ba68a959b SHA512 2b5c663071b496f4925624d74ab18a870bb1ac64089164f8fae9216a00999465073de08741db7aec0fed85a2beb3e94808abb423dfcd9e44ff094f402317aacc
-EBUILD rspec-core-3.6.0.ebuild 3181 BLAKE2B fd32fb6c11b0cadb9ebb047db880a4101ac266ddb4805f22a947546228ee1b8ee6a596a905ea4d7755f04ee09199ead85bc1a575784c7383caa445b9ecc5e58c SHA512 a8a4c8c1c6767db0ef8798666487b6c17e64218f32c6267f10532e23ae662ceceb1f50d8b9bb5c1e889327bab6c95b007577ddbadb2336e6a09abee8d33a68cf
-EBUILD rspec-core-3.7.1.ebuild 3185 BLAKE2B 5a4e8a629a70b01a5aa516bcd9e9ed2f710b1d8114f19b8d35ba8a187af77d738b202f18096147b6cde84945c253e9e474ef3a35ccdaf8f826b4de49860c4d4a SHA512 53ad4a20ca22fb63fdfedb6bc2e8e95c5f8c8f1b2749cb3e30d8c60ab5cabb2048fd6242770c9c398675389bf8e0d3fb1ed7398047e1ca238d469514ffe8e3b8
+EBUILD rspec-core-3.6.0.ebuild 3408 BLAKE2B a8dc00749465067e68999303bb1f936065096bcacb9488f3523c740c08e837ad0be3acf9a827ae068519de5dc3e505b10d167d18e08a49c9a398c7a71d03605e SHA512 7453b7e3f93b2a5b2c5a94fa70312892be87b803305bbf5414c7e259c7899a519cdf1b47de7ea7bbcaff8270ff0eabd0634e826b4cb20505f5cb18ac59a7c76b
+EBUILD rspec-core-3.7.1.ebuild 3414 BLAKE2B 2fea004e794166c2c7cbca481c0d25c1865018fea73edb99ad3ea4c775e46b12d9d33794e14c651ff3ef96a69265c25f6dc6d281819627b591351f453cf378e0 SHA512 5f1a8d0f5e517c2ccc3e0269e34519e614afdad64d3a2491f9335dd4989c317f95b32f503d8fd0e298308e352845592154e9ae8fd0f4fe9f5c0177fad6b2dc63
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild
index 6c4ff090e3f7..f003ed1ca4d2 100644
--- a/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 
 SUBVERSION="$(get_version_component_range 1-2)"
@@ -71,6 +71,10 @@ all_ruby_prepare() {
 	sed -i -e '/be_highlighted/,/end/ s/32/33/' \
 		-e '/highlights core RSpec keyword-like methods/,/^      end/ s:^:#:' \
 		spec/rspec/core/formatters/syntax_highlighter_spec.rb || die
+
+	# Avoid a spec that depens 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
 }
 
 each_ruby_prepare() {
diff --git a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild
index 2d053a7ba98a..78b1560ac9ae 100644
--- a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild
@@ -71,6 +71,10 @@ all_ruby_prepare() {
 	sed -i -e '/be_highlighted/,/end/ s/32/33/' \
 		-e '/highlights core RSpec keyword-like methods/,/^      end/ s:^:#:' \
 		spec/rspec/core/formatters/syntax_highlighter_spec.rb || die
+
+	# Avoid a spec that depens 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
 }
 
 each_ruby_prepare() {
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 605a95a47fb0..c567a094cca4 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -5,6 +5,6 @@ DIST rspec-expectations-3.6.0-git.tgz 193897 BLAKE2B f3fc2b06a317e77838e2d483416
 DIST rspec-expectations-3.7.0-git.tgz 194071 BLAKE2B 67c8db15c43cc1141b19c6eb99390eaaf2535ec03f0fdc7b05576daa463d252f56ff251d40f5771726ee6451d57eef206c893f2593b01d413b5d96cdf21f0daf SHA512 bdd3222089299e9bfdd6f17a2b8af81d5e695290a3ce976630d586d51ff2df5baf76a3887b8adb31294bd6623ba85f8c2a4a31ac520046515aeeb81fa3a1bd5a
 EBUILD rspec-expectations-2.99.2.ebuild 1696 BLAKE2B c613aa21e9d76decaf26954bf8be2357a12dc92960ab966ac587883a91d023a79d5c9fd4e8e00ffdec9a647cf2483e2aeda03c3a851e2a43dcf5bb340caa7ec2 SHA512 54646cef1a0b856616797a8c11ae5bc684b3c3d9db2999f2a3e6e78b2254ae7efcbc22a924fa069d4b560c407a4cf010d4db3bfeb10851febb90d23d7f032ef4
 EBUILD rspec-expectations-3.5.0.ebuild 1322 BLAKE2B 79d4a73c87e4e93e1c165255ee391915c7b2252fcc7ed308994c170ce4f8e3a163a7df0ca59ef24952b53130dc5d0884dcfab319739d0cb1c026a7d26dfe86f1 SHA512 5a56eadd7f68b0b57eb153e5e14bdb2f2d653bad26d84a266dd3d2d34ffa8a2e9a97df5292fcb35cbadab5cec5e86fb6cbbe18c7810c7f1d976019c0dbcaf1b7
-EBUILD rspec-expectations-3.6.0.ebuild 1334 BLAKE2B 58775139ed1c50b818c430132809120ee97998e4159d4c9daaa0c42922bad3ff2fdc7bca1d334040eb040fd9d768b2ba3d3df2d6783f6cc366bcb608353739a9 SHA512 26aceadb2008665f0a164c08f90bbc50b1a2fcfe8a5a3ddb15df16bac1a5aea6e37a11766ea3215afcb1656818177ff56fccc239780024181248b29eadc7bd5a
+EBUILD rspec-expectations-3.6.0.ebuild 1332 BLAKE2B 1b4630caefc66ed48b2401186b7c514b2f2a8abe2222d9332b3d05e067e55b9b3d5526fdaf541bf84a469cff86c76f2dcadcedba1312d69e5e555ad651e8865a SHA512 d5225b85ec5b30602b1a8d9e0d25af1c65613afcd3ed8259fe99a2571f42814c022a05ddbe3f3bc7ae237183f450f1854c7b6d2f84a26055865a015bdf3371f2
 EBUILD rspec-expectations-3.7.0.ebuild 1376 BLAKE2B 1c49478e03eb5037247f7e624787302ba6827527f403b7edaa02497e315a367492a6bc3c4a8ac267cd6932c7b8477f7d8ab9d347c685c233df8a6042ed825551 SHA512 3a534370174f697e10bd4bc593564154539ac4e562c4fc9188c3ba032e4b17022d997e27f9b2e4f8258a4eb3f90b6d4df9c1ea31bf8ea5196da9e2757049132d
 MISC metadata.xml 350 BLAKE2B bd2aeaa98f6f5cdbdce70c0dd6eed61eee36323502021664e10356e0e558eb9fbf09f9b056944aaf13859c0f4f29603c5523584e4b823a9218fefb2824edcff6 SHA512 c0cbdb181bc5981daa6dea5ecb445cedbda6d6430218aad98a39b2db67074169305f3cba419fb1e24d79900be311619337a5421b75e0da6d2838a0ccb7de45b1
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild
index 3f5216d2afe5..e7e12fffdb27 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index d014112c1eb4..90115c0e31f6 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -6,6 +6,6 @@ DIST rspec-mocks-3.6.0-git.tgz 189000 BLAKE2B d8fcc25983eeeafdba69bce80bccac2ff9
 DIST rspec-mocks-3.7.0-git.tgz 189170 BLAKE2B a0a622ac593660c673cd80b3f3caddd2ac389000f42a7ed1745e1fcfd28d1986e61e83c265d736f3ad0649531973719bc9c5f6ab07e289cb2da89c4482e64184 SHA512 8673726571ccf8a901281e44faeb25ffcb59579dc380138f0557cd9310192cd340081e5e8ad65ae281777727b502cca2f6877134b0fb48f2e0ea40b133002aff
 EBUILD rspec-mocks-2.99.2.ebuild 1532 BLAKE2B b8cf9d6afcc3f38d304daf6abd0610f4fad1e21f1985a01c906e476a35f50f129175fbe7e457509a7eb65f6a09cbca301deb84c9c70abfec23b48016e52d0356 SHA512 98dadc99f3a3bd894ccca1d2763526acb9754646e5b13fc471672d86a96efc10921742f626ef1090d6285faaf6e7f047abdeaee3217d681e7f4583b19ca774f5
 EBUILD rspec-mocks-3.5.0.ebuild 1346 BLAKE2B 1799d6cba41bcc4cc28e1e1778020c52fafc6a16b7515f72cf31e7bb347007ab3a96c88aa71f121e31e3785fb63518324df72b90e6a0ac464727db2d3338e0b8 SHA512 40cae4ee52db2cfc0274c6961f32f654e9f09291c3a9410756f3dca4a1d42b32e0bf54cd8a83164b7f06cc57ba410aaef478390019e0d1d0b7a0630884cb2a48
-EBUILD rspec-mocks-3.6.0.ebuild 1358 BLAKE2B 1303653f34f4f4cfc093d887996f56e86d270d606f56fca2b225a9bfa1155f8ea00b6ed17d4c9d1c5ffdcdd9bc26012b6144ee850c8fedcdb9e710e00e7b34fb SHA512 d10450c4b0ff2243c3c23f8306ed38a8f877e3a1478fae6c1deb82d8cdcea9f52457aadddf103d7b07e049a79483abde1e713cb886e78eefab91427b2e979729
+EBUILD rspec-mocks-3.6.0.ebuild 1356 BLAKE2B 8044d89b4d5d102f995c5c60485d4bc0537997fdae87aebd80fc5a63fc37617a751e882a5219b5c0866798c35a126bae706541de3cdce46d032338b97d5f8170 SHA512 41d2e89579bdb0ee062581e9aa37ad1c3223e3b665948f5377e6fdb66372123f29736851dc03d405fa90cb6b2641586df50de7e4c152439e27994839875851bc
 EBUILD rspec-mocks-3.7.0.ebuild 1436 BLAKE2B f25095d08605676528048e7f28c3e5f91872d1f49f3075b147cf01edad4d212c0e09da4eeab6e1554220a015d4e1bd67596d44e93240971372fdff84ac16e639 SHA512 99818678324074efd4a4f2f8132dc4cad1de97dc19fc05d4e967362b47111b98375601835e03deec41bd024b626aaafaf7b42aca7966117c11b9a1ccf3f50ad5
 MISC metadata.xml 343 BLAKE2B 87ebb52b322f698e5242c517ca646e64b3a9a33c6b76d968847b2224b4dd683a9eaae5d03470efe775d350c65e3bfbe16547d4b4b99e2744379fbb7c76cc5680 SHA512 c7956e0175d9fdbfd423140f3c757d4c9e1deb6089577f60d11111a93fde6a7c056dcbac8620c30c8c02693297402aa2f0710e43f60abc0878a51bcb8c624667
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild
index 1c003371c059..538a10dbfd05 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 1e73a3ef590d..97e89e6e92bc 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -3,7 +3,7 @@ DIST rspec-support-3.6.0-git.tgz 64987 BLAKE2B 9337da63047a1b33e8534a74a6dd40042
 DIST rspec-support-3.7.0-git.tgz 65675 BLAKE2B abc204f641014b16cbb433c10b5d5953c8fb1f94491bec359febb627ce1864776ab59e0b706ca908d00c79e75d8c95dc5c8673937c4bb24a2c7c90e6ec5f4e7e SHA512 a4a3fc705d4c31d760777513f86d8b0ca4c9e540b0a6f4b6d1152676f252e1276fedebe7cd259f0dbbb60b447cc179eea194f3a3e5bb023907923cbf16fc8033
 DIST rspec-support-3.7.1-git.tgz 65831 BLAKE2B 8595c496bc8d13e36fdfd4a8be8e055db4ac1e85af63f99158d191c9ef9e0a6ba0a2972ad7661a63eeda959e2969139a99ded71219777fd493544b711b6fea53 SHA512 a5760d696048897d76c665a756474bbb1a1995891e577c989cf68a205644c8608c538bf3d87c558428e2c412e02d3552d47567a0679cd4f8793c06f43eccf459
 EBUILD rspec-support-3.5.0.ebuild 1327 BLAKE2B 0573e7a4db15827ecb994b4f3cb1597b781e8e5faa9b6cbc1ab65ea6940b943f3cfa495d378e72b939472ec0481e014d69a222464aa8e7cb117877e620acf4ca SHA512 4d9e61775a435d1cd2af88e98257b13f21584368903cf3c941b29adcd265f49e5d840268d378fda884c30d7532e16975c7bdb009870abe96181e02a216978db5
-EBUILD rspec-support-3.6.0.ebuild 1346 BLAKE2B 556ea79762c786f6cb9fb8988d55e634fa596fa5a1163de613e190d986fe0d2d8ee928161ab306d6df83ddb0d5c613c494f9c367e65979511c937c61274e5f29 SHA512 4600a8f8baa8f5d267fc499b1f88664addd8617cea3568c4770a6a658a040a8dbcd48f1cc27ac4ed5527a891bbc16a139db9d89ec01b4f19e8b2a4b6b35c9758
+EBUILD rspec-support-3.6.0.ebuild 1344 BLAKE2B 2d1c0f196b5066e1834d89542082d4afd5f1f2de2539af27c9c54d2918dd840c94fcc20901f15b1cd8841b7c8bca0b621512ba33ed40b8ea27569ed3431cda6c SHA512 9cc9f2d0317dd7ab9c183ef91d8d2eb6de0e57d64507c6044cc80c46a190401f74a13729a6da4bb411392480d69fc2a600e4fbdf1b43a927cbd3c69d53e338dd
 EBUILD rspec-support-3.7.0.ebuild 1336 BLAKE2B 69fa85e41eb65bbeee3a4e3781d239d6fa489660f1aa8dc0326d4adb989ca8640ab11cea76730d2d707950e91f3616441720ba4c43d54a425c40e4b27fa0380a SHA512 143f1f5e7462a9cd2f61e690cce3bf6d228db73f3adcc9343032c8c88eb112831d993bac92a52571d0b2ca0ff1056c58a3d8c136a6cc1a2205c5aebd5885a1d0
 EBUILD rspec-support-3.7.1.ebuild 1343 BLAKE2B 951484a84844e5042cda10591933a2857b756ed93e45fa54adbd11f31bb8aec6c60748050f8a95034de08c83815a01be065b25a28d6c723c0a0b7436a88fa95f SHA512 d1afec7a788a72076737aea3cce0a4ca0ad0ee1f22d28936343c2ada2185db20ddc65f792e0bad5623fee5118c24455a074bae9ed8b35b84a137d7ce11cab48d
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild
index 14e8867ee253..ca8aa7410417 100644
--- a/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.6.0:3 dev-ruby/thread_order )"
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 7f9032e62fcd..9f7c771f7eb4 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -4,6 +4,6 @@ DIST rspec-3.6.0.gem 10240 BLAKE2B 334fb89dcc8926b264999dcdae231916dcf9c45515192
 DIST rspec-3.7.0.gem 10752 BLAKE2B a0e15d557b0d9089a886d04c917feda80c7a8e5eb70a50f4635947689215c0c560d313a6728ccea751697ead97c01fa1e3b7217f202ad18d4ddecf62c4dfa4ab SHA512 5c10a878e9697030783c987ee9a6244b36cf85a2a3fb8c28bf9771900a3259da4f19c7f159180b5ff9140ab715b38b5d90cd5e0014ac1862f478c32a95e7edfd
 EBUILD rspec-2.99.0.ebuild 796 BLAKE2B 1f7e76cf83dabe36056c164d335150f56d9a666b389d02e5878ff15464fb50084053f8a4feb545bb314aecafcdaf54d417d94bece5154854e539768e063889cc SHA512 85040ba6e2d27ef48d167ce1365e8301812dcfd1917d5bc84d2509a5fe51fcb2d44c007834fd0fb6e77843f5263122c6f1f045649a9e18b091e3300b63545163
 EBUILD rspec-3.5.0.ebuild 667 BLAKE2B 3df4ec8bc0263ff263cc1d938f614d62d1a27c45f3e1a8eb3fcc5dd1c3455dc8dfd026d9a3104813157c9f8fc29964962fbdf9a7b46d6c5acfaa6ad288dafdf2 SHA512 e10338a61d1af33eae298f1a663c93199b2d871cc2de1a2fc93299657d813b2137dc34f81027314f68de5f80fda2670cee851978f437ddeba1c9156cbeec9de1
-EBUILD rspec-3.6.0.ebuild 679 BLAKE2B 894317bf6972d77d3e3b3145b0f3adacaef5b91e45e066527f42af9cd7186ca78c2b9c462518a3e1a5f2473e2543d2026447ea4fc1a1a0e2ff8bd7059c9f1c59 SHA512 663dc4faa7e587dfccc6d86cee3a25d684a1b8a555440d2d7e21462516d72d17dd64a813b94c3cb33b20ed902661fb40fa9c64d9b484192f8c300d65ffd86274
+EBUILD rspec-3.6.0.ebuild 677 BLAKE2B 15be2f8f16772f7d6601ed6bffa8972da7cb1e20e466e46a9f0c12837f3696e6cbc3a5135402e7ad99f7793c98bab416747262a14d32d865c7eec1ed20a67b23 SHA512 a0946f4aec87f860a282ce7dde23bd55c605e67e14d5e5de2dc3b97afa05c9304a908bf4215ab9a006190cefe2d170b001b15c8bcf65647654403baf19114dad
 EBUILD rspec-3.7.0.ebuild 676 BLAKE2B d7297f23018396e07c9480fb1c70b939a2205a78f4644ee8ad88d272df9307d6efe20d9ba836262cc6c7c2c531af272e4fbffc3e57d2c3de6ea080eb781672ad SHA512 1dfd1ffd741ea3d48104f64e12dd9ff262e98818152cc2a68dec46f8234247e57b2cd7b812553e5c0529d8cd4b8943650e911ef9a7d3685750cbbc615997cdc3
 MISC metadata.xml 337 BLAKE2B fd99a128031819f061bb4b2fea336d7b14b26b7a986d782d8a4e2b9b9b7ce4c703242ef724cc9bdd98cf0219973dfcfca2a2eb7979b446f879d2f337b566985f SHA512 0a9165edcea2906fb370afa35ef77b74a4b833539959e8f28194e4d02ab7685f23dd16f04ea7e18873d10bf607236972610c49cf61ed97e5df7b4796ec9a66be
diff --git a/dev-ruby/rspec/rspec-3.6.0.ebuild b/dev-ruby/rspec/rspec-3.6.0.ebuild
index 044dc4e38041..d0f4617a67df 100644
--- a/dev-ruby/rspec/rspec-3.6.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.6.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index 164db9e2af29..91461ac497cc 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,5 +1,3 @@
-DIST gettext-3.2.2.gem 283648 BLAKE2B d9095e11f3f92ac37f84aad9059e5740af07186caad963b6cbd6081329031122ed2acf402565b5e8bf7c6f51b18d045fab09e6d390effe2f0d7d66981f253efd SHA512 c6806a4f2b9c8519cccdf7651b3482e5938015323648cb1b82acd0632d88ea5c7cdabd925eecb2d4e17d0d396126d4e2ebaac26241c3c7b4f61e187cd4b3133f
 DIST gettext-3.2.9.gem 285696 BLAKE2B a7bc40b2102f5b937d5f0e407dbaa23ead1da59eb9284c10a249c59548d0e2ad5fcd56b8855439893d2d31b57e0109bb6a9d5cc2d24075f5e360dc16b9291137 SHA512 21496c38cfc16a2b280f30bb94ff4560007eaa7f02c2341cb26aca2969a663c0863cdb650b4eadfd262d8585111dfb572e2ebc66a7a879045de50bf9da80a501
-EBUILD ruby-gettext-3.2.2.ebuild 1655 BLAKE2B 7116c8fbe19549b5ff575f328994e768dcd2ee8b4677a7a5229157fe0e16f63b9f0b27171e4e8256a2ddf79afe7c4b1f51d2b5f15ba2abe6cfef59dcc8fc5c14 SHA512 826549c1ab3f856631b2ef339c920810f5644c31b64103e1668ec0d36ff0f88ed6b1de0654602a25c2df74c06444cfa6183515cde2eb54a80dfabd2f46816222
-EBUILD ruby-gettext-3.2.9.ebuild 1665 BLAKE2B fd56d40eadf9cf6c26449c35f381638a1f87632a99383e96b76fa52fa1ffcc49a4aef0f2073a0aab1f2718e02fbb76ed93ca9f32f514eb884047d8febeee879b SHA512 4457b870dc31a1d2e102ce633fd0a7efd41a28021a7da877465b06af583f974cfcc5e9f5a737be7f2a98a652e8e5ecdb486b20b24e783d252b91e004b725020e
+EBUILD ruby-gettext-3.2.9.ebuild 1663 BLAKE2B f01f8f4924d0e107644daffb4c02427c5c00865633ea8eca8c20ce9be16404f97b3fc7950b3d859bf5bc1523fafd00d32282d34a8ebe40eba272821dbdd9de30 SHA512 161d6bae4afeaeb672199d454e6e7310e114c88004750656246b1f1bc54e119b68d47fe6bc9bda379081783cb7b02dd13ce68be0e6cf9000f4457003b828b10e
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.2.2.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.2.2.ebuild
deleted file mode 100644
index 26e0e20c8164..000000000000
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.2.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_NAME="${PN/ruby-/}"
-RUBY_FAKEGEM_VERSION="${PV%_*}"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locale po"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
-HOMEPAGE="http://ruby-gettext.github.io/"
-
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
-IUSE="doc test"
-SLOT="0"
-LICENSE="|| ( Ruby LGPL-3+ )"
-
-ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	dev-ruby/racc"
-ruby_add_bdepend "test? (
-	dev-ruby/test-unit:2
-	dev-ruby/test-unit-rr )"
-
-RDEPEND+=" sys-devel/gettext"
-DEPEND+=" sys-devel/gettext"
-
-all_ruby_prepare() {
-	# Fix broken racc invocation
-	sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
-
-	# Avoid bundler dependency
-	sed -i -e '/bundler/,/helper.install/ s:^:#:' \
-		-e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
-
-	# Avoid dependency on developer-specific tools.
-	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
-
-	# Avoid tests failing due to a missing test file.
-	sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
-}
-
-each_ruby_test() {
-	# Upstream tries to daisy-chain rake calls but they fail badly
-	# with our setup, so run it manually.
-	${RUBY} test/run-test.rb || die "tests failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r samples
-}
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild
index 1f8784cb92f6..772539ef5db6 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild
@@ -20,7 +20,7 @@ inherit ruby-fakegem
 DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
 HOMEPAGE="https://ruby-gettext.github.io/"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="doc test"
 SLOT="0"
 LICENSE="|| ( Ruby LGPL-3+ )"
diff --git a/dev-ruby/sanitize/Manifest b/dev-ruby/sanitize/Manifest
index e3e869bb6cc5..c4350859033e 100644
--- a/dev-ruby/sanitize/Manifest
+++ b/dev-ruby/sanitize/Manifest
@@ -1,5 +1,7 @@
 DIST sanitize-4.6.4.tar.gz 1349418 BLAKE2B 2d1a56340e562d057c85edc0d5157508267a4089b0aeb59156d0c249c8a39adcc15a10c8c67d84be77a2b388aa779e9330b9b4b52f28f11d7666eb97fb41bd24 SHA512 d870d8cc5ce6043e3825cfbb50f31c00d348c9ca05823c0eda245b9c175ae0bb9d0941845112bb3721ded9013bc554c09bfc55a1bfad70fcccd1660142e4ca82
 DIST sanitize-4.6.5.tar.gz 1349481 BLAKE2B bc0b3317952c1b5a903ca403300fdc788df129669761ab7f16d1cb76a75bed7306bd47065cb58449525c0ab0986015da93cc91d74f12fe407e273a84a79876f4 SHA512 3bd37faf5e99073fd87cf7e3f12628233117dcf38c298a806680da20c00050237d83d286936c898f03583d64b4bac5ae2be373fb89b259e4ca6dea283ca713b7
+DIST sanitize-4.6.6.tar.gz 1349809 BLAKE2B d34f3359f1241881f96d48cfce6aa554796e7c7a2282c729dc93b6db7f1c5d2ec1677ebd1cddb79cb14f84d7724ddb7dad551136cd130bd89750ab5851a8094f SHA512 6f2567601dea9fd08996fe537e5543c7618e407a68580a19b74333a6e840d1123891a087e6c57c88f887390cd04e4c25af71547d7d9622e61369dc4ffe92f220
 EBUILD sanitize-4.6.4.ebuild 857 BLAKE2B 9677015725246a86749b166be3de6ddc2e1b04775496a0b00bacaf5afefe038facee8f293d8d0819c68d66575c1ef24beca953dd1428bd082bb374a517e88b9c SHA512 6c8a5e5bd962d64e6e1c3a694c7e5d6b6b3ec6cfa02a4fa52cb02e846fdc4f3d6a9a9532d7ed86efb059a5220df6ca26e6201ce3e65ea22977e2b70a65e149e3
 EBUILD sanitize-4.6.5.ebuild 857 BLAKE2B 9677015725246a86749b166be3de6ddc2e1b04775496a0b00bacaf5afefe038facee8f293d8d0819c68d66575c1ef24beca953dd1428bd082bb374a517e88b9c SHA512 6c8a5e5bd962d64e6e1c3a694c7e5d6b6b3ec6cfa02a4fa52cb02e846fdc4f3d6a9a9532d7ed86efb059a5220df6ca26e6201ce3e65ea22977e2b70a65e149e3
+EBUILD sanitize-4.6.6.ebuild 857 BLAKE2B 9677015725246a86749b166be3de6ddc2e1b04775496a0b00bacaf5afefe038facee8f293d8d0819c68d66575c1ef24beca953dd1428bd082bb374a517e88b9c SHA512 6c8a5e5bd962d64e6e1c3a694c7e5d6b6b3ec6cfa02a4fa52cb02e846fdc4f3d6a9a9532d7ed86efb059a5220df6ca26e6201ce3e65ea22977e2b70a65e149e3
 MISC metadata.xml 341 BLAKE2B 8081029c35d5a56ed5a3399ecb63510e737a664e97a4eb363108b85fe75860cb8b171e8da497d669cb0491199bdbe94408570cb811a8c86d6d38541a0f65cbe4 SHA512 870423593eeb0219f2fa0b6bbb55a4a19063f5cf3d19d9c0bb352aec5632b3e5f5e717e7c6004413497a981091042d54bc092e2c029a511aa0c37e95d435996a
diff --git a/dev-ruby/sanitize/sanitize-4.6.6.ebuild b/dev-ruby/sanitize/sanitize-4.6.6.ebuild
new file mode 100644
index 000000000000..03582866e28e
--- /dev/null
+++ b/dev-ruby/sanitize/sanitize-4.6.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Sanitize is a whitelist-based HTML sanitizer"
+HOMEPAGE="https://github.com/rgrove/sanitize"
+SRC_URI="https://github.com/rgrove/sanitize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/crass-1.0.2 =dev-ruby/crass-1.0*
+	>=dev-ruby/nokogiri-1.4.4
+	>=dev-ruby/nokogumbo-1.4:0"
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_sanitize.rb || die
+}
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index daf0437f9cd7..ad2e31434d77 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -3,9 +3,11 @@ DIST selenium-webdriver-3.10.0.gem 841728 BLAKE2B fb36121b835c7750595cd57c3217c2
 DIST selenium-webdriver-3.12.0.gem 843264 BLAKE2B f9a2e233658e071144f153f7710ec15cd58d8831793f7212d1d49a76d08d80c7110bcf1afc86e98210c6753d19ab2c63f169754f148db8a994fb777048c10b6d SHA512 1d5a510e3e7775c6b8c960de8a5f0ae2084f490c17084e8ba0894dc32021c9295c9301c6bf0ba07e0e9827a8d99ac9f9c5d29fbf57425a076825fe18e4a8f88f
 DIST selenium-webdriver-3.13.0.gem 843264 BLAKE2B cce9be238d5b6480635ed286893f4b72e26166c21fd07ba99e2c008fd7360f0f3744dba24d015aa92612775a8c726616f391b1681d4a37689933a6b9b08d41f3 SHA512 e0b7d521ba748bbb224d659b56b9b4ff9970aab84b827eac1b755d950ad840b70a09567190e5ebafd1a513bb0c4cbfcc25e6a6e4a83051df951237533453ec44
 DIST selenium-webdriver-3.13.1.gem 843776 BLAKE2B 633a6582f9294f008a77d74454a208bb67425f5a790e97a59323b51bbd3d6b9f28c611cbfb72bb922898c353fb35812b99529a75230ebfb1da18683378d36740 SHA512 b372a5af0380adb607e3f9ba24713cc8ef288e1432c2c6ea71426b8f5f96b315aace36283d585cc75546b467572822f0eab3d8217702d1b6d2ec303c59c0b98f
+DIST selenium-webdriver-3.14.0.gem 844288 BLAKE2B 52c4a4cd4f4b939d685efd764a0ede064dd31713804ccbbfbb0b92b51c39c4f3eda7529c46ab795cf1e02b27d8e32309fc89801765d9542cb0df2145fd1a0b86 SHA512 81600fbc8c033e649127c21721431d7c60f17a729f21012355d4e6b866eaa22324514e813b94e9677c49f313f00afaced205fddee14756eb2fa3f1ee68cd992c
 EBUILD selenium-webdriver-2.53.4-r1.ebuild 1137 BLAKE2B c1686329733f5253efee815896b641a422b510d00ce379c14d87a68c487556bf64b0771dc73097bc483dd796e3e890c5fe74e6e4fa296e2a20b60ec8eac3ad7b SHA512 fd3f0c87afd1924a40ebf80ef783414cb6fc256db64e710b922e4b2834cefc2974d11e8a6c037b1d426f867459b4cf90a922f2a8c38ce0a1d426ccc990d1d268
 EBUILD selenium-webdriver-3.10.0.ebuild 909 BLAKE2B d2e55036612eec131dc8c2cb72c1c6f0c3a9aff238d1e3a5fe046a4d177ecf5ffbde9515f6a6fec35fa8dc4bb7175e3a095ad876747da479eff1ade787f76d4a SHA512 1b819c22107caeaba16bfd5f6c326dab4e933602ac5f4e5c3546c8a9051d6698594f3af0ed731f3cd163caafc368dda501169a0d95e9d8ba5d2c939d63f130f5
 EBUILD selenium-webdriver-3.12.0.ebuild 909 BLAKE2B 29d6b7d719d0dd9993a821f12a77b5ddb7bf647ddc381c3ec2e71c103debf69c7e773f7e7f8b980ac96d8c7d167dd84f7f0346fcfea5f597064275285929aa9d SHA512 3e7933e17836917a44275e627dd9d445b28a6d10ac3424ff357cc16a368117b527e40c2ad3fccdb2a5bb622a9f91cc5f0e0a85b28cac6ed8a6da25b6537e881c
 EBUILD selenium-webdriver-3.13.0.ebuild 910 BLAKE2B 5e54683c36cf1ad30ea7df577abc0dbdb479ba95444e24fce04d82a43798a7ae90d229b7516fe839fab0d7f048e30a95e785f002100921688312324df783dc01 SHA512 f520e1491c92e14b92340e84f09ebd4b017d161e8adb6681ead3922dc82644a41b67ab0134c0616b9c2a475985a1e9d816e5a4b7ba1e3eafa8b9ad053775444e
 EBUILD selenium-webdriver-3.13.1.ebuild 910 BLAKE2B 5e54683c36cf1ad30ea7df577abc0dbdb479ba95444e24fce04d82a43798a7ae90d229b7516fe839fab0d7f048e30a95e785f002100921688312324df783dc01 SHA512 f520e1491c92e14b92340e84f09ebd4b017d161e8adb6681ead3922dc82644a41b67ab0134c0616b9c2a475985a1e9d816e5a4b7ba1e3eafa8b9ad053775444e
+EBUILD selenium-webdriver-3.14.0.ebuild 910 BLAKE2B 5e54683c36cf1ad30ea7df577abc0dbdb479ba95444e24fce04d82a43798a7ae90d229b7516fe839fab0d7f048e30a95e785f002100921688312324df783dc01 SHA512 f520e1491c92e14b92340e84f09ebd4b017d161e8adb6681ead3922dc82644a41b67ab0134c0616b9c2a475985a1e9d816e5a4b7ba1e3eafa8b9ad053775444e
 MISC metadata.xml 335 BLAKE2B 374e7e6bdf450e60792ad3960c2c0fe8ab87f70c34ca76332bbbc632598354e2a774e4eba46434e9b7c85c7f5eee7086ac85268ae58bddea7d75713d9d2f014a SHA512 94e17dd297f6904f1b70709dba5f5612fcc42e9e0e57695df6d37344cc9a89c13b423e41d142631444990ff39367eb6132d6b070bcdbf256ae00e932cadc67e2
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.14.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.14.0.ebuild
new file mode 100644
index 000000000000..eb794075ddf1
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.14.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# NOTE: this package contains precompiled code. It appears that all
+# source code can be found at https://code.google.com/p/selenium/ but the
+# repository is not organized in a way so that we can easily rebuild the
+# suited shared object. We'll just try our luck with the precompiled
+# objects for now.
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
+QA_PREBUILT="*/x_ignore_nofocus.so"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver"
+HOMEPAGE="https://github.com/seleniumhq/selenium"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
+	>=dev-ruby/rubyzip-1.2:1"
diff --git a/dev-ruby/session/Manifest b/dev-ruby/session/Manifest
index c7c399c1c4b7..4551f661bc2a 100644
--- a/dev-ruby/session/Manifest
+++ b/dev-ruby/session/Manifest
@@ -1,3 +1,3 @@
 DIST session-3.2.0.gem 18432 BLAKE2B b50ff6f52dd0226cdfbe07ea434ac35fc19d695ab474d2c240ce3a6ab707da1d03db5006d68594de6a75ff356154a1ba5ab06fe17a766d3e4154fd11d3abe4b9 SHA512 57c0676fb4a4254e86dbe68e36309c8eb85515dd659de73a87e1ae2e8e5dc7f979192ef665135e75182c26e2a5c847d61daf855639772da7c66af888ed0dc91a
-EBUILD session-3.2.0.ebuild 1128 BLAKE2B 52d27121ec55160aa5a875289b3126670966dcc11b8e0213e14fb619f29347813864681934b3bfc1dd430b841e58e919930c3831139670144547308ec65d8250 SHA512 7721e409b7396f26bdc575b5ab8273b16b7cb804aec9f2dae99fa2d7920519471566fd894bfe15ac938389de38407f1e77971f3f6d6ad2c1f863ffc302ce1b08
+EBUILD session-3.2.0.ebuild 1223 BLAKE2B c913d7a97add1f2b6279fd467528adb1d4eebceb1b6e8899d47b7028bf3ef6785280f667cb2ceb33bae29e6aae5ef37051c240ac301413e673b200c0fa0ae00c SHA512 3a5be4f41c58556930eb5ef5d811a212d47b1ca0a586ae2744aef89d27604b051c03c6fd00dd05becdbd44eb586d90cac2cddb3d90ba5dd89f2b505d4cca38e6
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/session/session-3.2.0.ebuild b/dev-ruby/session/session-3.2.0.ebuild
index 0925580e9b6a..0074f5c3fb75 100644
--- a/dev-ruby/session/session-3.2.0.ebuild
+++ b/dev-ruby/session/session-3.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
@@ -29,6 +29,9 @@ all_ruby_prepare() {
 	# needed to void a collision with the Timeout::Error alias in Ruby
 	# 1.8.7 at least.
 	sed -i -e 's:TimeoutError:SessionTimeoutError:' test/session.rb || die
+
+	# Fix broken test, bug 662514
+	sed -i -e '/cmd =/ s/sleep 0.1"/sleep 0.1";/' test/session.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 79a932079986..a445dbbeb61d 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -1,5 +1,5 @@
 DIST sinatra-1.4.8.gem 369152 BLAKE2B 8a344f85c34dc8736180551690bc55ee615118a243c48421711339f2ef366e6c6facfecf914594f0440a825244e13f98648d11903fd9053054767a58a34aa285 SHA512 e56a5a6d7ceb0be4bc537feb6ada2956f1fd64b452dee347b259837aa02041dfa53d9808531cdd0a02a91093ba92f7c505c39f0dd990dfbc6e872681f40bc5e9
 DIST sinatra-2.0.3.tar.gz 463315 BLAKE2B 83113189f69714596ca3364ea61b6b8de844002acd32536fec69f7bf05937f1559396242170b0abe2d3028f5145c29adf46805d42969e683d60103013d72b389 SHA512 6188c6e372659522186649ae823f4fd3aa8a5b959cbb856f4cd42dc301e7430b3fad890a572d6f38d72aa99cf37a81e234e0c6ba9d03778a9c5a84b77a1dca76
 EBUILD sinatra-1.4.8.ebuild 1326 BLAKE2B 4ad5b768c4cb9b61ce4f04bfb315ae65991d126e6a4ba42da2ed30c2cc77876cf0fc98c3e89f01550fe3ac60c36570c1a52af90ec44ae2acbcf71d90fb627f18 SHA512 7b91176276d8b5db61475df18ea2ede3b0fa197d2c7341e15ad8c71adf1f1d21c36161ab4523f8918f0ee6a71f5628a3e3b8021a1a4761db91fa0de39193f417
-EBUILD sinatra-2.0.3.ebuild 832 BLAKE2B 42e4d27ee9b52df4280900ba052dc890382c2c0acd2fcd4d334dc3aa1c18842f83ac63eb6df0dfc18c90e6ce549be120a53b2ee2634d85af88f4e752bea52c6d SHA512 5cbf1f78d80bb315309f0e2152187f82c7e9c56d3a9918e0f5394c7e8c46b3e3931368a363f1a47416de74de949d6a802438875c9384c139ade015d4225d0afd
+EBUILD sinatra-2.0.3.ebuild 844 BLAKE2B ca1d0aaec1091844d677e93c61ed05045487889f1265dba45c5e81f9f16b8f6228c027c0dce6575dcf3c1dec5a5c4f0448a55dd0ed7d8bfc3c9713654ddee49a SHA512 e87c269a107e402adb3b2bb2c993c570ad73f2439f7cf9326645cfec44cc5decdf0c71a7fbb12524caaedbb5145590dca6f080bfa9171b6eb95fbadabab07302
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sinatra/sinatra-2.0.3.ebuild b/dev-ruby/sinatra/sinatra-2.0.3.ebuild
index 7945bea60b07..f63789e1eeb9 100644
--- a/dev-ruby/sinatra/sinatra-2.0.3.ebuild
+++ b/dev-ruby/sinatra/sinatra-2.0.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/sqlite3/Manifest b/dev-ruby/sqlite3/Manifest
index 2152956aee05..428601fe9abe 100644
--- a/dev-ruby/sqlite3/Manifest
+++ b/dev-ruby/sqlite3/Manifest
@@ -1,5 +1,5 @@
 DIST sqlite3-1.3.11.gem 60928 BLAKE2B c2dd494b2c5870a65588bea59cdf6752506f6389614955ecc0d006ae8a325e5ec45476bfd59fac6861b4db64108af87df4479c32775da014ea7d7306a59f8c9f SHA512 02bef5f8f61d1f04c79d9032d62c9d708dddc2446dd256ad13f932ed4cae256d6c60f742a285bc4015ef5b1fb13e9541738f31fd270fe22320fc176525fe37bb
 DIST sqlite3-1.3.13.gem 64512 BLAKE2B a36e3161e44004a0510297d16bf491df3dc29434432208ad231f5e46ddecb4607add417e105f5ae8472a768f80efef3f74b703b2a441396b4c9b6c9ff90bf31e SHA512 5d3eab7c788cc62c497de179919054324e53595294ec3a9df2a10d23151a406ee9a88f1c3ac945777f138e78cec61018c388b023456b873131d678a6788a505f
 EBUILD sqlite3-1.3.11.ebuild 2392 BLAKE2B 52685bcc7ef730fadb546a63d7af8318734a9f47d99a6802c1ab472aa851b52360f844aca405a33614ede92290fed86db47670f234dc17bdf1b456bbe17824ee SHA512 db96e0d6d0f86123b44ba7d1826bcf11085e2dcef0532134ab0c12ac5206271eabef4b039d8bab73988731c4099551fb70a3c17facd4769edd5f937cb2da9ba4
-EBUILD sqlite3-1.3.13.ebuild 2393 BLAKE2B 4275831c6c742f8c74d40bc7ce91907eed6b5cf91e9eff2b6f228e0535f09c78a2bc1f11f0dbbbb196899303831f34dfed9427d958b69b1bb5c335651a7ed955 SHA512 06dfbdf91d069bcedc09009885f8e53ae56cb1c5e1e6869ca5ff05dfd8988f4f54537a4ab45f05626859282e376d65fa3ecd54f750240c2def1059f73fd4fb97
+EBUILD sqlite3-1.3.13.ebuild 2392 BLAKE2B 4bb2b14028302e172ca63c74e19c4449e272b7738d2682357358f95724c6587d6731a2c0dabdde4bf2a2d64417eb2949ec412fa24e5317653d3a3ce25db2943e SHA512 ca7f5dae865a4e67f020b7e5b85742abc9b4a66a75e66f23909a6f501d2a50c0448bc73d49ac9cd2fe122ec1b4f83f664c0a577b4a9557ef6a84f54636672005
 MISC metadata.xml 342 BLAKE2B 1f46148873c3913fc0beee10dfd433f84a477f2f5ba8b7a8bc97e4cac6765d3c07829dabef7e697791cb42902184fbf034c5701a433717c1516c725c0b5b48e9 SHA512 3272f121743335cd749a606648660e8650664fec4f02aa6499c8f5ebcf0ff727de28619d800fc5cbda350f3076e81dfbd1993ec825cd4ca43163e160813b3f77
diff --git a/dev-ruby/sqlite3/sqlite3-1.3.13.ebuild b/dev-ruby/sqlite3/sqlite3-1.3.13.ebuild
index 1b27145c446e..0d0730790f93 100644
--- a/dev-ruby/sqlite3/sqlite3-1.3.13.ebuild
+++ b/dev-ruby/sqlite3/sqlite3-1.3.13.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="An extension library to access a SQLite database from Ruby"
 HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
 LICENSE="BSD"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/syntax/Manifest b/dev-ruby/syntax/Manifest
index 851674f779f5..621e1b759463 100644
--- a/dev-ruby/syntax/Manifest
+++ b/dev-ruby/syntax/Manifest
@@ -1,6 +1,4 @@
 AUX syntax-1.2.0-require-set.patch 379 BLAKE2B 2f142dce82c2e802e8d8b665a8f547940663366bb27037fe9da8450eee8a633ca7a64687b96532ce4a428f05506fca3bb3cc612971c264e0c5eb8181e8c65d8d SHA512 18a8465164b52a0b39317b50fd69d08f5187f0bc25e709f3bc5ee5bc16a6d257e9e70763447c735615f3b01135c4e2095e0ae8194edf308edd78f4aae08f8d84
-DIST syntax-1.2.0.tar.gz 40797 BLAKE2B e12da53ce9d27b362d70f9074b1ef8f87afb95125f9861169dccc4ea200e5a4a765ec0de867a762eecd2240d773724df25bdac50e27136f35120e182203a34ca SHA512 69804ab94203e2260b4c585aacf68db6ad8e47cf2339ffeb1105ae39da5f1d456b1413eeeef29f1c450bff19780e815b9b1b966b171de3b24595f759b36e6548
 DIST syntax-1.2.2.tar.gz 41485 BLAKE2B 09a1fc9a4172ec8e6a748981a966c891038fe43303360a3e5f2302aa0fb370b1098c7fd7b8a1fc2f022365ac8491b3e9f9146f940dffc772fb68fa8be5245986 SHA512 a3be7ac736d6c77833aa532f17485c076d34e66c40426c9c6be2dbbde87b2adb7154c9b3bed3439cc12577dffc01c8148e0870a0d02b3a02ffbf9fb1d651433b
-EBUILD syntax-1.2.0-r1.ebuild 787 BLAKE2B caaf41ab28b5a03ff413b4d30f75a4496649e57aad4afc57b64bff7b7b1c8310ad5ee8279d105cabe6a17f26a543b8b1cd8b54849d5f426dcf48293a28208d81 SHA512 ca73b45d6f062110ed3f113249129911614e0ebc2e8a40d00235a7d346c709a128d1a0bcdd14c3c52498c2a0aa437f018a5e37f6d91fb8b7598395556eed3101
-EBUILD syntax-1.2.2.ebuild 903 BLAKE2B 4b8bbb597b8c29d92330e6b523828345e13546fe152f0438b3dd578fddb434807136117632015a50a1792352255e622d1103da7d07a6c609806125b46076099f SHA512 4b66a233ecd8cf505b91be8c9460ff0032836754d1ce2f56bdefd127fc0b3bf358329fe09374fb2dfd8edf07d674b01b87d58828c1c9b4bb5b50eccdf75c08b5
+EBUILD syntax-1.2.2.ebuild 902 BLAKE2B 6314b43c8304297c764fdfbbf83c925820a60e35f8006fa29faf80517577bd170b77954e3c8094470d33e7b8756442be103cba8175e44ac6ff65005c2f489266 SHA512 c8bc71984e48ceed09e3c2a59709e2c82d32b475e2cea9ddc9ce3fad7581f60d9909aba14d5718182c186fff8937ba6e0a02bcab2304a0f4342f126ede5047af
 MISC metadata.xml 339 BLAKE2B 007757aafebca384bbe340c653875cdfa7c36a40d0fcc948f28f2a1eae85265100d30442f1bc05af9b4286f88f969d54bcf001ad9156aa0bd3dbbbf999a3f129 SHA512 d3d2406f489b687ceb61d99a66ec5e0a4539491277a5c2b5006e03414d14fbd5a25d7de00d2983ab629a1c8efb3e4999681734d07df9ef67f6a01c6abe3f0608
diff --git a/dev-ruby/syntax/syntax-1.2.0-r1.ebuild b/dev-ruby/syntax/syntax-1.2.0-r1.ebuild
deleted file mode 100644
index 28abba848f1e..000000000000
--- a/dev-ruby/syntax/syntax-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Syntax highlighting for sourcecode and HTML"
-HOMEPAGE="https://github.com/dblock/syntax"
-SRC_URI="https://github.com/dblock/syntax/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips 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="test doc"
-
-RUBY_PATCHES=( "${P}-require-set.patch" )
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	sed -i -e '/sshpublisher/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/syntax/syntax-1.2.2.ebuild b/dev-ruby/syntax/syntax-1.2.2.ebuild
index 37fd4ccb644f..c1b3b7b43e2c 100644
--- a/dev-ruby/syntax/syntax-1.2.2.ebuild
+++ b/dev-ruby/syntax/syntax-1.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/dblock/syntax/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-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 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test doc"
 
 ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index e907c9ece05b..ff76441d8165 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -1,9 +1,7 @@
 AUX testrb 177 BLAKE2B 7f0192ddcadda449bc4766d5910c76ef21ff8cadce1372a46db4fc236374eaa3cb57e145b1b7b09896b3a866ddd9fa1f910f40b751a773bac1104d705902bc0f SHA512 9de97bde52a1e5770a8dae8da3adcbde3b1dfa7cabc6d131159c8a688a7ad5b59dbb528ce9eef3346da12264c0d30415addd907bc66c1d7d90b1dbc4c605730b
 AUX testrb-3 183 BLAKE2B 5bd4712b7a73cc480669facf537b5bbeaf16eeae2782e21d5fe88cf92c9945845803d3f1611d465a3fc16f76838b5aba964e9b96eae35d9cef1b0b269bb94e2d SHA512 cff9584c54bb682f03a0253df953ea930053642e249a3c4573e34cc78f4b77ef943ca5a2c7d1869d926b4a8d9e173ebece69169d845724b03c03f00608bdbdfb
-DIST test-unit-3.1.9.gem 124416 BLAKE2B f1c88d9e7da576babaa979a57eb522a244856711d013f0bc38ffb3f04d2b290eeaa50fde14078cedf1d86e26ebf12061ed03b9b82a2d9365a0c61796ef25eb72 SHA512 ec3068db7faceb5c6a3f3a848512aa76ec2e360a2a1ca7ec45fd6c1b84f45f04fb1b4d77120dfde7b0a41e4a8435fa37ba6550e4242e3817d344b3ca8d7b4428
 DIST test-unit-3.2.7.gem 129024 BLAKE2B 31565510d5a16cf75706810a551dca40129edb0fc1528b9f55c862b23db1986640f42a72432028f47d052bb1aab3600c90c4ed19388ba11f2221a5d1e0619aaf SHA512 a55a5abee0d602b23af34ee8a9a7e26effc95ce9dd8ce98da28c49caf883d47c86bd2d0979176b0d1e239861ea73a4c5a9a280a1ceda7fbfbbd98c888ca6b01e
 DIST test-unit-3.2.8.gem 129536 BLAKE2B ee88fc653b0dc0cad7d88427391cd6a476d2d3c56c3e4bfa7e7cac28d6e9a35663c40e9c4ed29a1d5998255c434ab7884177354fd1e68b07f00fe1e0048506d6 SHA512 b7ed21744118036a997525251af2520158282ca19e99ebccaa7180361a112e0cdafaf570c36126a6b74b8480405c67aaa5394e06465145583964defb68abeb9c
-EBUILD test-unit-3.1.9.ebuild 876 BLAKE2B 7f5334600e70cccd7e83c6c13e42f42b9bb364a9d51d8898270eecc965e178062fbe6498325828b6dc6fc7b081b8e5e1d9428d87c0865f2d317b8c486826a329 SHA512 ec68f762c63e6915340d70423d335c8e26c33d4f7f1a9f859afcaa2af98b8926d364b3baf5a9f3f97f8ec730c3a143d0cb8ae0df5568346494299fb6a5535d3c
-EBUILD test-unit-3.2.7.ebuild 939 BLAKE2B a15e5c0b53f542d78888a48053c4bae16cf7e47420798480b6d51e9ae210d30803ccc76091a5f45232d5d51b117f4f59038dee8c4cd7241701a042b9b5a3071e SHA512 401ec4f0cc4f7db1d88d0d9918eb8e6894f399716f7eb9833133123a2db797ba1114a7f875914ccc5f48c49b9a312ced0bb487dc063c3d8ea2e3c35d6b388072
+EBUILD test-unit-3.2.7.ebuild 938 BLAKE2B ef192b590193ae4197b2543679891dd70abbeeed32ea08a17ec2e8c68fc4fe9f2dccacee89da0d0280659fb6a3a23dce4a77e85c8371685ddcdafab57080c218 SHA512 fe4fbc56b95e380d7e7bc5d0eab95b75f1769317a49b2f4960d7c80edd658062410e0b4f6685e84c8942c7cbb5ede30d8f599df29688b0e8ccb4d59638eaff84
 EBUILD test-unit-3.2.8.ebuild 940 BLAKE2B 3a4b1607379fd7e3b994aa59eabf32685fbe26f8923419c55a9adc96847d41ddaee119157a920a3219e5dcc733af65d9172fc081e90d09190e1dd89010fa9bf3 SHA512 a0477a944bc3d03b9cc7ab8a3e540408e6e8bb828d22a033e51271d13d8ed4a34902f74bbf40ef5b8bca29eb4107301f7315bc1d28a0cb4289b4aa2b42a70438
 MISC metadata.xml 491 BLAKE2B 9bef2b6085dbc82d562f091ae4e136cb7aa0817369b257f77bad4aca6faba4074d4dc70134999f81ea612f70f98c072414e1a92878d349e940df8ad0811304e1 SHA512 ef28e88bb4b269eeaf05f0bb512a6cdd73750247b60c2b4ba6c5b2abdb7b2e946c07bb42e7d6416f30f864378c3fa51b86455be2d3ea4467936602d5742a66b6
diff --git a/dev-ruby/test-unit/test-unit-3.1.9.ebuild b/dev-ruby/test-unit/test-unit-3.1.9.ebuild
deleted file mode 100644
index e43d252952a6..000000000000
--- a/dev-ruby/test-unit/test-unit-3.1.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md doc.orig/text/news.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An xUnit family unit testing framework for Ruby"
-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"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/power_assert"
-
-all_ruby_prepare() {
-	mv doc doc.orig || die
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die "testsuite failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbin "${FILESDIR}"/testrb-3 testrb-2
-}
diff --git a/dev-ruby/test-unit/test-unit-3.2.7.ebuild b/dev-ruby/test-unit/test-unit-3.2.7.ebuild
index 202ae793b8ea..dbe4a96ccacd 100644
--- a/dev-ruby/test-unit/test-unit-3.2.7.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.2.7.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 ~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/thread_safe/Manifest b/dev-ruby/thread_safe/Manifest
index 1869550e6a78..ede380b6652c 100644
--- a/dev-ruby/thread_safe/Manifest
+++ b/dev-ruby/thread_safe/Manifest
@@ -1,3 +1,3 @@
 DIST thread_safe-0.3.6.gem 120832 BLAKE2B 0e3a1aec1d34119dc1f673acdc3d2e18b8c5f970bf79726e4729a806a52ce6ab265fd713972065011e8a04cf2776dda871d3d747eec77b0e94235de776d0cb2d SHA512 a11808576392c068e1cb31faad706be2b1bbfa4837c655c2ab1d5a235b62b25ece62065de6b65bd25496fa827ed89eb0796b90467107df255825e01316ff1805
-EBUILD thread_safe-0.3.6.ebuild 1086 BLAKE2B d1c6048b88a44769c65192c8c3e774b8ec98c385ffcf9873ad78f3a8283ca89227399aa103422de65b63e2ba6ffb2826ee02a7a21673f9586e17fc573735a0b2 SHA512 5e030c7a8a4ecfb38851eb24dfe45dfc4e47d79d899f5fe67db090470ef6d9e94c73a5f8586e1a1d83e3c3d6d7bd8b904eaa216e16737daaf04918a2e6c3c6b2
+EBUILD thread_safe-0.3.6.ebuild 1085 BLAKE2B 0d8ab40cbe0e821ab6e8f9198ae87dc6b4ce6953c540477f328654f7aa014b195d27e3d69677ea6601b9b24ded4ed198bd74b3d38cdbca77a8b059202c0d9321 SHA512 382945eb6df104807e199073f147874c0e25435407d7cf8841b4539d39d89f7bb72c975aa49b5ba7b0edba3ab0527952f15953dcad54f2ad9f3696363971f5ae
 MISC metadata.xml 354 BLAKE2B 00b77e62b42483c496a99390ca3e024b0d26e0a3f40275299401aa9f587e8bd3e5495522ab91a00c5a785f61759493ca0bcaf7f2a7ea71adb1c7790e669e7e4a SHA512 07164e076aa4dd3def9a69d2690b5044359562184040f63a2f09476771eddcd77d2723179c91173f877b99a23c9e24d2b6e959482ae83458c4d71cd099c1ab01
diff --git a/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild b/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild
index 2766e9574cc3..9ef7ed5d214e 100644
--- a/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild
+++ b/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/ruby-concurrency/thread_safe"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Higher atomic dependency since earlier versions crash on ruby20 while
diff --git a/dev-ruby/twitter/Manifest b/dev-ruby/twitter/Manifest
index 5dcf112134b0..25adbd73f47d 100644
--- a/dev-ruby/twitter/Manifest
+++ b/dev-ruby/twitter/Manifest
@@ -1,3 +1,3 @@
 DIST twitter-6.2.0.tar.gz 519470 BLAKE2B 4c3d929d8706845610b31c8ae702563d0330a95a165e417b77ecfd894b1f216100678c9862856c3c450952e3025940a701d96f0aeb1b29de55e612c6c69ab231 SHA512 5d2bd653233f285e0c08503031317a966ec098e9b302f9e0c65bdbf4632465988b1139719dae1cabb856b08200fc7793cd341fd926981484cf416a01f309d242
-EBUILD twitter-6.2.0.ebuild 1455 BLAKE2B e545eb07a11c67f95da1a7a2a92492ed12886c737378b4ee4626ee38ad362b2ae6b72e91d2f61a18efe928ac996f00553d8bb1529d266745b02b1f204ab3ac60 SHA512 513f063bf15f3e78b35a3e988d3b8dea773f99724b00b0ca0f56e5e5040acda73660dceaf7780f566811e02e2ae454381b5145e0981b139f6a4fc5f30b1d3552
+EBUILD twitter-6.2.0.ebuild 1455 BLAKE2B fb674d55c80be9bfe1f246b84d2dd11d929d30673ed71370c47bc075f88d21b84c7b254f1f168b357f135b0f8d012009493d82e01092810e22f64c9bf73db32e SHA512 beecd23b9777a6c5e5e0100a1646249b9f764e5e68389f9c37a4bdcc159784ee0390d9aa28806082fbdfb41846b8fa7f6c8c3f1a918d6fbcbfa573f7f7a2c986
 MISC metadata.xml 340 BLAKE2B a354a967597b16b9fa93b1f41274674bd913c39321768b19ae9cf81937e53eab05bf616bcde5b375bdd2de0e91f141edc6def3d60d3d7f75732875c529d2e153 SHA512 504babcfb5a3f49934a8eb1107a5777206c134e5f39d96badd9333c57909e2e378dfa1d88dc49c945a9c5cdcf59406f7e6658c177098fde1cd2c12314f9ca239
diff --git a/dev-ruby/twitter/twitter-6.2.0.ebuild b/dev-ruby/twitter/twitter-6.2.0.ebuild
index 2bd8625d4c50..881a81d4f042 100644
--- a/dev-ruby/twitter/twitter-6.2.0.ebuild
+++ b/dev-ruby/twitter/twitter-6.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/uglifier/Manifest b/dev-ruby/uglifier/Manifest
index e5c8909d0b6d..3804e64cf677 100644
--- a/dev-ruby/uglifier/Manifest
+++ b/dev-ruby/uglifier/Manifest
@@ -3,9 +3,11 @@ DIST uglifier-3.2.0.tar.gz 169273 BLAKE2B b0263853c882859db8cc04c19e7f7f4bcbcef9
 DIST uglifier-4.1.12.tar.gz 199867 BLAKE2B 858cd1b04880775815a36515fa34077a59899a58ded15b25aa52f9fd6e232ae7576319ee67e299291f9bbb5b5a03aa883025fd133736328b11cc1e47636bb295 SHA512 cef2dcda1c7195e2af50ed94e808ddbf1ec2b95ca27cedea86180e68451d5354029d2995407150c8ee5c5e702353fcf05e205cb81cdd63e0c89bd8c8e48e5a82
 DIST uglifier-4.1.14.tar.gz 200188 BLAKE2B ef75c4e678987cc7b640cd2efd003352da978d6bc18c688670cbe08101475f3eec26880a764eb30e1c1f1694b2fdaeee3b13c825c79c0d09940824d2e6876674 SHA512 5f9c4f608e2e76e8eebaeec9dc90a100f367db79ca4a559cceb11984fc030360861fd8796cbfc67b2346b0d6b344eda647e14fa9ae29dd246a1a9b76a8d59c42
 DIST uglifier-4.1.15.tar.gz 200245 BLAKE2B 3e709eaa2394f611fdcb1996656e5531014c1cd492615f39d7309fe4089311e3838887981e5c7cc224261d4aae60bf928b8dd866985acae284c1eb5fc81906ea SHA512 673d4db046455bbde93d5542cbc2caab1f3265a8679955250227f631a58bbb303e04f92699da14aeb2f986c84c62b74f61f048e0f8625886c4f11cfe59e5ed23
+DIST uglifier-4.1.16.tar.gz 200320 BLAKE2B 3c23cc25c03a4c335b2866dee7aed34e3b32987960f5a7b8e376e3ba2dd858081286dda164fc39a55bcf0be29910fe90064ac1129e0aa370d118b5a83a2feec0 SHA512 25eccabfcf1fe2fe1dd3f3afd9835d51d692f1f57060b7c281af557f31646d293f4736c162abdba276622b0cc1558820830d073006b00e8ba6213d16c0a56773
 EBUILD uglifier-2.7.2.ebuild 598 BLAKE2B 866212993ed0781517edb9b12f37ec7c449f42dc7361aae98dd01ef31a40bd2936111446bfd17590a5b96f2a49d969641754b9aa7aff13d93d3e31614fc42fdf SHA512 6f6a691d0f60f9469080b8bf0840277424ea956b2cd509a1b7889c4798e90bd104a33c70c1511ea183391daa88f2a3cbc657614d1c9124d3e333e584d4a9a8de
 EBUILD uglifier-3.2.0.ebuild 800 BLAKE2B a19a8fe518ebeac3dd4854d7a1cfa86f04a03522ae79a4c5d211777dc3098f32e319923544ffd4f2220caf62cf828bd0c57ddada8abd9e8757e04131f4d7e013 SHA512 b0d20ca10593f7072a58a457fe7985f1e374936c96ff322df63688fbdaae167987132e5eb65aca13113c65d4448d39c94bef4b9eac5f342e6ee46245751db45e
 EBUILD uglifier-4.1.12.ebuild 805 BLAKE2B a114b6d5eb06d899384886a5cc47db85d3acf0156d31e49446126aa596dca1ccf335e32899163ff3bf5670dc9c9e5458d5bfecb69d8c79337930c45834db4ebb SHA512 32ac7dc1bcba18a57bd1c6d1ba84046c4736e8a4560a7850d83869170d759911b5e66caeb9a49ab69d387225680ef44554631abd75890ead6e2af5ddc8c1ceda
 EBUILD uglifier-4.1.14.ebuild 805 BLAKE2B a114b6d5eb06d899384886a5cc47db85d3acf0156d31e49446126aa596dca1ccf335e32899163ff3bf5670dc9c9e5458d5bfecb69d8c79337930c45834db4ebb SHA512 32ac7dc1bcba18a57bd1c6d1ba84046c4736e8a4560a7850d83869170d759911b5e66caeb9a49ab69d387225680ef44554631abd75890ead6e2af5ddc8c1ceda
 EBUILD uglifier-4.1.15.ebuild 805 BLAKE2B a114b6d5eb06d899384886a5cc47db85d3acf0156d31e49446126aa596dca1ccf335e32899163ff3bf5670dc9c9e5458d5bfecb69d8c79337930c45834db4ebb SHA512 32ac7dc1bcba18a57bd1c6d1ba84046c4736e8a4560a7850d83869170d759911b5e66caeb9a49ab69d387225680ef44554631abd75890ead6e2af5ddc8c1ceda
+EBUILD uglifier-4.1.16.ebuild 805 BLAKE2B a114b6d5eb06d899384886a5cc47db85d3acf0156d31e49446126aa596dca1ccf335e32899163ff3bf5670dc9c9e5458d5bfecb69d8c79337930c45834db4ebb SHA512 32ac7dc1bcba18a57bd1c6d1ba84046c4736e8a4560a7850d83869170d759911b5e66caeb9a49ab69d387225680ef44554631abd75890ead6e2af5ddc8c1ceda
 MISC metadata.xml 341 BLAKE2B 07cb7ce323751f520c38158ef006374652e317e5809b4fbc729c264f3b44e99fc8e1d75916d858ba50361c2d3cff389b33cba7c7f863300ae8da8002de4a8d24 SHA512 0747fa6ff0d695b149915495d5242dec8541231e0e72a2157e3b4412301d8f0767c1eab17ea72a0d9f8c1afc9107c4f55b261018744e43823c8140de38ebb0b4
diff --git a/dev-ruby/uglifier/uglifier-4.1.16.ebuild b/dev-ruby/uglifier/uglifier-4.1.16.ebuild
new file mode 100644
index 000000000000..b822aa8c1b9d
--- /dev/null
+++ b/dev-ruby/uglifier/uglifier-4.1.16.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby wrapper for UglifyJS JavaScript compressor"
+HOMEPAGE="https://github.com/lautis/uglifier"
+SRC_URI="https://github.com/lautis/uglifier/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/execjs-0.3.0:*"
+
+ruby_add_bdepend "test? ( dev-ruby/sourcemap )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index 12901254cdd6..535becad4993 100644
--- a/dev-ruby/yajl-ruby/Manifest
+++ b/dev-ruby/yajl-ruby/Manifest
@@ -1,5 +1,7 @@
 DIST yajl-ruby-1.3.1.gem 550912 BLAKE2B 809608b5c767c560cf40a0a8d4160f17092762788af9c66e729762ade50fbb0cccd266f1bbd411076ef4b2dc7a4cdfcdeeb552b6d86a58a0d9a38ebf1bad638c SHA512 f18b47f1fd0b039bfec01db0ee298296199fbf91b22a00042e1220a1d8471f72424c082b696829e48ce7dee7514510dd731c2bc36fe29bd08ba7246c820621f4
 DIST yajl-ruby-1.4.0.gem 556544 BLAKE2B 8eea447ef98cdd9b48fe6c91f2a385740339e78e6395b2f63add8757fe437dfd4ae721b604ca5b381c59e36412e1807c930730bcc1a7c7f921c50ccd7f03857b SHA512 63407542a58231305d1cf326de09e8fdb0f4f5bbf28d3b83a3d8f4099db2a425b7a310fc23c62a37681cb24b50d2ce9d10a6641e07be16b52783ea7401ec7ca5
+DIST yajl-ruby-1.4.1.gem 557056 BLAKE2B ade1c18bff1d95a733a1981f7898f1ebaecaed6e9a0354af2a6b4d0190a37e613830f77d5e57178b622c32e2d8688aaa11a7edd543c17a30a16f9045d21ea4aa SHA512 24cd82380658d784bbf0a7a16d4048125cc5a856b0e0b4d3bdec29a550a9131d3959f9a75eba0d18d5db8d0a23158fb7ef6ea6f60d221a7bc3d8efc437d52df5
 EBUILD yajl-ruby-1.3.1.ebuild 1254 BLAKE2B 6e0f05e289dd8f888945c247769d2bb689b0f12eea1df3d31263866e5d6fc721f8541f36f8358f780f8ba1f7cd12ed27fda1fede45cba0cf36cd53dcc4a99a22 SHA512 3786c6ce1bb8a0c19404f882ce7478e45b431c9b8513a53673aac6e2692510c0df53d5de7a33129f56c9520840b189b8ef8b688e9d608ae13e68f22aebeba826
 EBUILD yajl-ruby-1.4.0.ebuild 1255 BLAKE2B 2f66ab1a7fb94845f198ea123a9d1a7ea2cfc31e799f91de946e393055d7ae5ebd5b392cc3563e5bd57165d170dcb1f09a6688554ff2de48649884d833e3c595 SHA512 280f9865f087d58d5d8249daea0abb924cdb8c708e6c1b067764ba1b08131b6c96f8421b68adebd100631adb3a599e7984493922488c655b2fe0434f2534b4af
+EBUILD yajl-ruby-1.4.1.ebuild 1255 BLAKE2B 2f66ab1a7fb94845f198ea123a9d1a7ea2cfc31e799f91de946e393055d7ae5ebd5b392cc3563e5bd57165d170dcb1f09a6688554ff2de48649884d833e3c595 SHA512 280f9865f087d58d5d8249daea0abb924cdb8c708e6c1b067764ba1b08131b6c96f8421b68adebd100631adb3a599e7984493922488c655b2fe0434f2534b4af
 MISC metadata.xml 346 BLAKE2B 2fff8cc633fbc47874a3e5a9e567ef430dcdd4de90343c35f599b15a85e0601a5d4b3c5b650e3971dab90cd90f382505000b40092e57d05fdaf86536a02106ff SHA512 54921a3e3df293d819d020aa6671e7e33f9031b83d375d6f8423fd844cf757c20c2e6cafc9d5a8f2670e10bd286b4e29067a8d7176e7acafd3474578134a2aae
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
new file mode 100644
index 000000000000..d9cb6a9d9beb
--- /dev/null
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby C bindings to the Yajl JSON stream-based parser library"
+HOMEPAGE="https://github.com/brianmario/yajl-ruby"
+
+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=""
+
+RDEPEND="${RDEPEND} dev-libs/yajl"
+DEPEND="${DEPEND} dev-libs/yajl"
+
+each_ruby_prepare() {
+	# Make sure the right ruby interpreter is used
+	sed -e '/capture/ s:ruby:'${RUBY}':' -i spec/parsing/large_number_spec.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/yajl extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	emake -Cext/yajl CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1
+	cp ext/yajl/yajl$(get_modname) lib/yajl/ || die
+}
+
+each_ruby_test() {
+	# Set RUBYLIB to pass search path on to additional interpreters that
+	# are started.
+	RUBYLIB=lib RSPEC_VERSION=3 ruby-ng_rspec || die
+}
diff --git a/dev-ruby/zentest/Manifest b/dev-ruby/zentest/Manifest
index 30f43e4aefe5..2b95fedab850 100644
--- a/dev-ruby/zentest/Manifest
+++ b/dev-ruby/zentest/Manifest
@@ -1,5 +1,5 @@
 DIST ZenTest-4.11.0.gem 71680 BLAKE2B ae2d72ce5ff899dab0905eb7ed1bca0cf2158ec5044254cd7ebb86c59feb746bf18e6a0242f91c49803a062c5d94f5b1b0be4338cadef2a5afd116753259f51b SHA512 cb835ea2e937b7ea56084c138948acb1c2a96500e5b8bd54dd9d195e4005ebdce67b189cdf31a010135f55adb02f3bcf21ff663a26022eb759dd2126558c5c21
 DIST ZenTest-4.11.1.gem 71680 BLAKE2B 27bd94ca98a6739829526c06689ee5a890aa254bef3cb7b7b02d79d82a4fa96faa1853d36069aa801983b4927d44b2af2c852c111ece3b64459c99d63a7a072d SHA512 6f3b5dfb8cc8154856e94f20134e9a6bd2d54e052d05d3e7a250f831ee0a3d3196b497cf118322c51201fb8dd30a05b8a0a0462c58a8852354c4dee2a10d867b
 EBUILD zentest-4.11.0.ebuild 969 BLAKE2B 72c54b3845891c3bd8873fd3bad177c074972b9f8faa37c735cfa62d5a5b29736379e24a686927f3d363724c5df575d2164406b70f067828a4e03b5bb741e4ac SHA512 e0ccf05566fb8329d88e540ed4a6fbf34828d8c7c3108cae3e92dd21ea209349c149585973568e32b038c90247f3cb547e3fad42f38809b702ebc583eab5ec0e
-EBUILD zentest-4.11.1.ebuild 805 BLAKE2B 4ce3f61d360dc36ac45b8a2e1c9ee99786fad4efa50da844565210c0253fae19d2f93c222b41f9b0be1c981449e235ef0984bb16d9df30d222a248b75718d7c4 SHA512 66de758e96d619d243d56c456c6d99f157777bbb0ae456f1bc592989498f9e16ec26692d758612e63beb86fb85b928451dfbbd514c922f9a7f8b43de5c08c09a
+EBUILD zentest-4.11.1.ebuild 803 BLAKE2B 23499c0b85a733d60d21ecd407c49a24b76168030c9357d57f3981af239ce8380911c3f501b7d2e16a6a76771a3808c1a30525427178f99d35828c6c5c05003e SHA512 8825098e7e587db6ac63c16503c06b7b236704d9c70f48b424e3a3d5ceb8cc9a09b972309ba1e00243c6b6c48255331f0379fe07043c6c6729f2ffedf2c2b470
 MISC metadata.xml 333 BLAKE2B cf1ac3fbb6994dc96110bdb974b726f53fdfe34db473f272ba78ede47b65e26350b807bf291c65f8a8bcf9e12fc3366e431ca32a277d9ac38cf9d4ed7ea46e62 SHA512 d02fdcc6c8ef63d22d0df77a6c7c82ac1d629d29685e6fc653c70079d56fb1b28574bfc7c372a5298dd4a3e20061aecc705d6824c569ce0f99e3dea464f04fcb
diff --git a/dev-ruby/zentest/zentest-4.11.1.ebuild b/dev-ruby/zentest/zentest-4.11.1.ebuild
index 0cfefa53470d..9032f1001987 100644
--- a/dev-ruby/zentest/zentest-4.11.1.ebuild
+++ b/dev-ruby/zentest/zentest-4.11.1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::R
 HOMEPAGE="https://github.com/seattlerb/zentest"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~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"
+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"
 SLOT="0"
 IUSE=""
author	V3n3RiX <venerix@redcorelinux.org>	2018-08-04 08:53:53 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-08-04 08:53:53 +0100
commit	e3872864be25f7421015bef2732fa57c0c9fb726 (patch)
tree	9cb29a544215119b5c5538e37211b994ce1c87ae /dev-ruby
parent	480486b52ea64765faf696c88b2c6a26a5a454d4 (diff)