gentoo resync : 30.06.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-06-30 08:49:38 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-06-30 08:49:38 +0100
commit: b2be182d49eea46686b5cf2680d457df61e89dc4 (patch)
tree: c66442ced2011c5ca81c3114cc51041e314c6d33 /dev-ruby
parent: e23cdda4dbb0c83b9e682ab5e916085a35203da5 (diff)
134 files changed, 529 insertions, 587 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index c06a02f6ba8e..215cb780b562 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
index 79b34a4ce1da..ca42456a2295 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 960 BLAKE2B 2f804e3c5590dd0490028d3f099e5e911862e0290aebae7e14305356be906dc1bc889b74e76116f4d042327457a17fae2e2581d3d3aeb8a7f44ec8b71f0606ac SHA512 57ea6a50e5c4bbdb1a683673f9735dd867f409aad08451ecb53608f5514dffa6bb4bc08c9acd93f0bad49fa9948fd36c050fecc2e1a1943707d732c7091d07f1
+EBUILD asciidoctor-1.5.7.1.ebuild 959 BLAKE2B 8339f4941fd2b1c03a755a9974163af7be0f8cc2fe3aa8c9f04668d5905078bcb9dca2a6dade37de8db25b24ee67f885b6f04f4f564e6d52268dab0d46f46d96 SHA512 43e1aef88a0889ae23d6f972c66150b68b111e96a707db1825ee7a3b7edf7875f39dc2464de79e75c4c3fb90dd18835d92149a59e600c67cc84a7214e981ad41
 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 767cec45dfe0..811c7728f482 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/async_sinatra/Manifest b/dev-ruby/async_sinatra/Manifest
index 7855a2608d97..5e347a4256d6 100644
--- a/dev-ruby/async_sinatra/Manifest
+++ b/dev-ruby/async_sinatra/Manifest
@@ -1,3 +1,3 @@
 DIST async_sinatra-1.3.0-git.tgz 8657 BLAKE2B ba41b01a9ad00794f19273d41cceaf80ae5159e38f93c1907db5fae78d5d2f5d6d583f31ff495722b3a241f7e0d2d91c5b3202fe5a8ff39f500e6ab0e1e0030b SHA512 2975e41557da539e1b6427a43d41811f4e17315c01da8d1141dbdafad68702395bfce011844b8b1db2c24bbf19d09b5e680cd10e039ceaab1263ea66bcb8f9f6
-EBUILD async_sinatra-1.3.0.ebuild 839 BLAKE2B 30b0ae6798d7c8c784cd1cf723f334d3763e09d5d1e0d9a114874b06a908a5a5b626e40851b9b18d8b56d5f57d0551bd46ba6e8362bebe0ac6ac1684641be6d4 SHA512 0d1d9297e0db045dbfccdc641394072b45f5de56e346980a91779777b2bc56bc6f8655a17e065788bc74fd62068ff14a7175434c49ca4daee4a605b331220880
+EBUILD async_sinatra-1.3.0.ebuild 924 BLAKE2B 40015649382db8506d1aa9113f3c3ad8482f9df528e17f2f270fbbdfbb5d9f74a0ed1d222e827584f42cd52c96576eae2ffa0971645b6d35042c1d6939c23062 SHA512 16988f3efae98187b976a6a8f396d5172d0ac0a60f452d4dedbb5e3698659b59f042c75bdb4b962e0f6bb00e42ca7e2af9a91d6d04d8718a83351a02f853df02
 MISC metadata.xml 345 BLAKE2B bae47051fe3e703d2f308871b8f8b1b114d788d5340795ee379b6432fee4b01adad3e03eac97541135b63457520cbb04d34d9d6150e7ddff3e5c9c6ef87cc41f SHA512 0b8a1cf5f66733cdab98fca0d48c3f253f6606c4c84fb45d19af66dd41d3db463ccd7d533a6809ff1bb9262829760838fca1ac493b4c08b43903faf871bed07a
diff --git a/dev-ruby/async_sinatra/async_sinatra-1.3.0.ebuild b/dev-ruby/async_sinatra/async_sinatra-1.3.0.ebuild
index 389334c6b89e..6e70d0fca70e 100644
--- a/dev-ruby/async_sinatra/async_sinatra-1.3.0.ebuild
+++ b/dev-ruby/async_sinatra/async_sinatra-1.3.0.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
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
@@ -22,12 +22,17 @@ ruby_add_bdepend "test? (
 	>=dev-ruby/hoe-3.13
 	>=dev-ruby/minitest-5.6:5
 	>=dev-ruby/eventmachine-0.12.11
+	dev-ruby/rake
 	dev-ruby/rack-test
 	)"
 
 ruby_add_rdepend ">=dev-ruby/sinatra-1.3.2
 	>=dev-ruby/rack-1.4.1:*"
 
+each_ruby_test() {
+	MT_NO_PLUGINS=true ${RUBY} -S rake test || die
+}
+
 all_ruby_install() {
 	all_fakegem_install
 
diff --git a/dev-ruby/atomic/Manifest b/dev-ruby/atomic/Manifest
index 0149591486d9..e2712de609e5 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 763 BLAKE2B 7dc17288227f680e717286f252c8bd76cad82c71e14f2e7f887fb33f6786550f1df8626c6399ff233e29a407a96a7e844bb2f5b9bcd50d30f2ade439a0172b89 SHA512 b737757e2dc4da5da292e99e03a4b0f306c36705ae3505e4b2a17707284069810ec85720f6dbf8c781a19ce53a83baeed546350c2ffe1fc1386a8e022e6736bc
+EBUILD atomic-1.1.101.ebuild 761 BLAKE2B f4c4b246e3da8f6c471e261a27df54c1d62c7db21f82811a04f5f5d573083e9b98fdb8c2681379acd456e28123f9d02ce90f9a2ded499c50dcee3b966cf65ff8 SHA512 37561bc40705cdd68d850045757c91eeaae9c8a68097e10630474014c97f05c3a4806835a2873bc7c0654a9e44a1e2f81cef34731f7e9adb728587887fb59252
 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 7a133a5d5bda..d13599930413 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 a2277fc6aacc..be873ef83686 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 1086 BLAKE2B 5c1f46f2a63e3aec017345e38c7bdba961dd12763bf47ecdb94436b367714ccd44d5ef8bf94932dc5afb46347d225297bb6fcbc97cbd614cd650589503d10bf6 SHA512 ecfecd6423f6c67ab7bf2fa4c00e1e9fe4ec8d0e047ac21209101d11eb5431c325dc9dcffd4b4641e096ae919034f433e494ea7ddf7f268d6cd5e70598c34414
+EBUILD bcrypt_pbkdf-1.0.0.ebuild 1083 BLAKE2B 26985143bb3eec894d8b0661c637cf3379f7a981cf37e68c24a3be95b95d7ad3d2ec2458bf504f85cb378667406df350cfd83965304c10d26357be66ce768456 SHA512 2cf64562f088d731fa74e59a9bf59f74b3133f747fb8bc6dc2602c39f6a1d045e14f1f7029bd711ddcf0cd4573434fcd79af945f4a3f3ff797499e0d372316b2
 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 45776085653b..9e52946a4e27 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 8029cb624e7e..d691ae5a7984 100644
--- a/dev-ruby/builder/Manifest
+++ b/dev-ruby/builder/Manifest
@@ -1,5 +1,5 @@
 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 899 BLAKE2B cf19d2732b59bf9cccc7328869d31aac4beda6c265c8ba91552ce91b64d0a74b8189b78f44d482cb62142db9927640608524961233f82ed8b6c5b293546a8f82 SHA512 3f85c8de8ff1a67da298cf6ad1e73ac05085945fe8df652f77feb86c910415462f0af1a7dd43c4eb7b8edc55d6d99a6e4d1ca6c3d95a461adf956d3118361846
+EBUILD builder-3.2.3.ebuild 896 BLAKE2B 0881310a53950fb2a5c901839a69aa0ce52cc085d95b813dba72628a3a4d768479fa492d2461d285516324b18a120688ee9a139d7d8093b16e02dd21d4313e2f SHA512 20252f93640fc774674c70d3fae38b1b62ec3a4dcc0846d31e3121ac245ef2154863109337b6e79c1acc55ec6e593f36ac5b4a2c28c1aea9ac03cca6be1f89a9
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/builder/builder-3.2.3.ebuild b/dev-ruby/builder/builder-3.2.3.ebuild
index cd6aabc3ac5d..579678799e90 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 fdbc1b61d372..d4064ae99ddc 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -6,6 +6,6 @@ DIST bundler-1.16.2.gem 352768 BLAKE2B 4ba3729d314aec33a4ce6738a54774d4772714913
 EBUILD bundler-1.12.5.ebuild 2231 BLAKE2B a9d9fa0fd10df02af01ac5b8aecbe1507dcfa0d17db1393aacd5a85dab329313098b95ba6d5eb60614afe85d0fcd6cb8c0a054b8c098961342cde5ddf9b742de SHA512 ef0ca3ab2bf4cfd199926553f3b3d35096c91e3f6b8d32fa70414e2a4bb4a7f60f921e26d7d462e5deb512beb31f1fb74e76b2c8c34898aa87543a52950477ef
 EBUILD bundler-1.14.6.ebuild 1048 BLAKE2B 5626e25d1221e8abcd305d15bda1a5dc7cca8ca36cf14adb09ac81291c069b780569c9c2ce01245c48e84d5ada13d4a0994caaa35508e880fefab321fb5d37c7 SHA512 db402572fe27778a6f085abc8689eb072ae004eaa4ac825462a0b4ce72635a25ede60225c3f1a937e67743d70d85b35df2c770bb193fed853a7c703fae9bbb30
 EBUILD bundler-1.15.4.ebuild 1031 BLAKE2B b3600f31e90ebafd1c9aad89f25d47edfbc7bd55eed6d0c7c1efeafa6fc5757eab454b5285f5e2fccc38de016f83b6ed6e0d60953cd27cb4eb0876c4ccff7e6b SHA512 2bfd35e1a9b84683c2bee05a302b23967c5a5dd051e468ecfe0d22c7aaf7851ec011b8d5a7f25ffa4170249d0be85a224a71e75a623eebcb339d07f598753adc
-EBUILD bundler-1.16.1.ebuild 958 BLAKE2B 5e5e88915050d96cfc9d7cdb75d4e2e1c7ebb06d6099b92f0e3c9bfaae62eb7a0a5d05b28709c898e2e07fb393ea312102d39e1baf01a65c7af46c8983dedd4f SHA512 f0ff5420d124a69f09507c89214118d5ba2dbd7b660da1fe2e33244b1258acd3a01166c3cf3dd876764abc4b32c52352086295bf0cc8898dae80bf710ca82579
+EBUILD bundler-1.16.1.ebuild 955 BLAKE2B 874af50bf5a3d6908a0a81a8f5c922261977e822d0184e8b21e110b776bbae46a4e322b5dfc3b21eec3b7298a99716e2fc1d7fcd9c25aa9efdbe753ed35b8370 SHA512 8515a2ba3f40038ccc3606e8b732dc7ad19a9052290dfb5d253823ac5e56ba9d31d7dbeaa727582d1bf862c2a824e1c5cd4a1459069a04a8e5ccb90af0b14ce7
 EBUILD bundler-1.16.2.ebuild 963 BLAKE2B 4ba5577bfb001e257ad44a04e3c7e920f6e809177d2f0f0d6557ea4ed5df1955f009323900e3eb9b7fc03bcb333ad197b80e892a0c58bacfed366c606f0fcc67 SHA512 d08f8706fc972839979d1ecacb8ea2436eda09c9585fb664d150a7251cba665553a7d7641adf545628e7557f5e2b3342287287bbb21106856be078fb12f20021
 MISC metadata.xml 342 BLAKE2B 9247517894a366c8b67564e015ff966b22eb3df924ec8438d9886ee854d922e376a274e1dcb455e23451febbb1bf4d8f60023e6b7763cd42772749de1bab372c SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e
diff --git a/dev-ruby/bundler/bundler-1.16.1.ebuild b/dev-ruby/bundler/bundler-1.16.1.ebuild
index 4755add45932..1704a057c5d4 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/capybara/Manifest b/dev-ruby/capybara/Manifest
index ce6e73f97666..0a41ffc08a0f 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,15 +1,9 @@
 DIST capybara-2.16.1.gem 273408 BLAKE2B 1d1a68427fcfed9a8153e409e17fc043dd8d926c3ebbab3560ae12454f3010c8b4569348c231e807d993263940b703dc5380a235da438eb5ac2f9d0bd3a66309 SHA512 921e05111278b7bff93fe805a29e7b2e0e78b36510db5dff1189e34c3cdeada52504a8e06534238e578c32e8e0efa8d99a0ffc8516d94e60c06e7fd2c4ecb174
 DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca18ea85a7095d9e58625df6a59a349b60b462c5c4f403a6af955466bc46d82be6cd91724fc2b12cbe15ed74a4c SHA512 3bb994e022593d485a07296193a16cae7b45e96e87dd10b2bd4807ad2bc990801044c0493360598d1626c3e367e8de87e407f65c2c6f42674d5f1b9c0b5c1933
-DIST capybara-3.0.3.gem 276480 BLAKE2B a1aa8e8ccc3846c87bdc989f456fdd0c09f41b2939cfe322faa6ae478bacdd1d6b4b13dba55fc74edd50fcfe28eb59eb8a2add8e3fc5ba948bcf8365c0ffbb96 SHA512 7af6c04304f3308322ec374d226b6cd874ba2068be5451da482a6bd2861e404b580e4c74604f0873cd91a52f1d95117efdf850cf19eb9c6265715cff5d503c47
-DIST capybara-3.1.0.gem 282112 BLAKE2B 71b275c548e3327dcbad779d48563b6784cbfcc0e5c3ba5fa478488ef90276bab1aeeaecd229255047cd23e01be6923c68c1f753b9d76d3428cc0ce75ff3ede3 SHA512 64c7a22eb8d566b245084e7b95d79dec2c72162e003418c0367a46e1072ad83569e97702f61f9a87f996160a62df3a653543d33878c6d3a46ebc2c286fcfbfd7
 DIST capybara-3.1.1.gem 282112 BLAKE2B 82740933a34bc80ff4901fdf538b9d48d3ae8b5d9c906f462a964104ee1312a74697528f1803eeead0a250823baaedb1f2d4839053b26e4a9ed0fccbc224a137 SHA512 955918a004f11af93caecf964738108edd31ebfb239d6af752bc48ac74b754320014b997d01b8cd12bec5aeef27c88b6737cf7d0ba7dfdb4ce983939ae534546
-DIST capybara-3.2.0.gem 284672 BLAKE2B 7f842877e25bf7eba0bffd3b5cba0c1763d1545b6c0729ac0751e42c40e5317273da3b635c9a5a4eadd65326fe35a32c20ad985f56439da4715ab32eda342f4d SHA512 513283bb0e961069b8746ee869f77a03e632de733b364f385688c93d96228d7a09f6ccf9a9be033fba700c8be1b754ac8a578ec4ea7a3b869431d29c5770ba84
 DIST capybara-3.2.1.gem 284672 BLAKE2B 9da8f588049fab74c4e734626e42758cdd4baf555cfc64e7456bfab2cb4d5c90ed6bfc8ada7cc0d6323ef1113169aec70fd4254aa50c003408376ea4afe00a06 SHA512 50af1d4c49c200a4c08901d19b16826499abb8d19de8e059160c509afd555edbe620b6fd5d78f8c286feeb15a72e5a4b241cb1f14151b349fd94cdd3648b64b2
 EBUILD capybara-2.16.1.ebuild 1509 BLAKE2B 8ff52d1240388337ea4eefc688caeddcb53f0c589ffc50d2cddfec130e6702b5ae3bee7ae8ca0dfd8c672867ecfb0347aa37e6961f3dbf185145600e493e0276 SHA512 2b9160aa85c4ac67c1756b385e3bd98951b83e114ea390d0c0243ddae60dfc0a56ad1126a841768c1956641be68c76b935f633509791aa1c07ddc1172cc66987
-EBUILD capybara-2.18.0.ebuild 1526 BLAKE2B 83cdcaa9331642f7bb82fb71e308a8b2ff17807131a92b112f6e4e9c5fd446dc60497d6d4bb6783bff7089acfb272628c6c869bd5a187fb1ad8e5e71158b0e20 SHA512 661b0a28bdd5d6227e73466a38da14c95978a50fe34bfa459881ebf0d0b88902d3f3890816cfa10effc122451b2a6d5e331df69e6fa858e578c3cc371dc0d9ab
-EBUILD capybara-3.0.3.ebuild 1512 BLAKE2B d8c1dc1208dd7c7aedeb2f48ccaeb190dac1451e60feba70bd2cce2b3e7425f1179716e02792ecaf27b9301c560821d8bc322d2c56a5a92c3032f94303c5e268 SHA512 9f96398cd632b4b2aa5386d84c19bffc3c22cd416178e516a755412c9ecb75287dc089d88925354a6f6d1bae5d5109b4c0831b3b6edf3615deed6253aeb595bb
-EBUILD capybara-3.1.0.ebuild 1512 BLAKE2B d8c1dc1208dd7c7aedeb2f48ccaeb190dac1451e60feba70bd2cce2b3e7425f1179716e02792ecaf27b9301c560821d8bc322d2c56a5a92c3032f94303c5e268 SHA512 9f96398cd632b4b2aa5386d84c19bffc3c22cd416178e516a755412c9ecb75287dc089d88925354a6f6d1bae5d5109b4c0831b3b6edf3615deed6253aeb595bb
+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.0.ebuild 1518 BLAKE2B af598a905b37db7eb77511372ace937bff702c2aa116afcdf4bb2d32bd99489e95a61ca442c8cf5c8174fe7f0021fb7aadb6fda65b2dd7ab41a1d8829bd3099f SHA512 9bcf03fa1561b95257a319825c5ae165914fac5ad4993e028f51d9b3d70bebc7e51203f30cf70d2a9b66a61a4b30dfe85d79037a5f19c3e61997f0e3f41f5372
 EBUILD capybara-3.2.1.ebuild 1518 BLAKE2B af598a905b37db7eb77511372ace937bff702c2aa116afcdf4bb2d32bd99489e95a61ca442c8cf5c8174fe7f0021fb7aadb6fda65b2dd7ab41a1d8829bd3099f SHA512 9bcf03fa1561b95257a319825c5ae165914fac5ad4993e028f51d9b3d70bebc7e51203f30cf70d2a9b66a61a4b30dfe85d79037a5f19c3e61997f0e3f41f5372
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-2.18.0.ebuild b/dev-ruby/capybara/capybara-2.18.0.ebuild
index 40ad34e06d05..9b4c94954ee4 100644
--- a/dev-ruby/capybara/capybara-2.18.0.ebuild
+++ b/dev-ruby/capybara/capybara-2.18.0.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86"
 SLOT="2"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.0.3.ebuild b/dev-ruby/capybara/capybara-3.0.3.ebuild
deleted file mode 100644
index 0ff180fb058e..000000000000
--- a/dev-ruby/capybara/capybara-3.0.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 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 ~arm ~arm64 ~hppa ~x86"
-SLOT="3"
-IUSE="test"
-
-DEPEND="${DEPEND} test? ( www-client/firefox )"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 dev-ruby/sinatra )"
-
-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"
-
-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/capybara/capybara-3.1.0.ebuild b/dev-ruby/capybara/capybara-3.1.0.ebuild
deleted file mode 100644
index 0ff180fb058e..000000000000
--- a/dev-ruby/capybara/capybara-3.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 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 ~arm ~arm64 ~hppa ~x86"
-SLOT="3"
-IUSE="test"
-
-DEPEND="${DEPEND} test? ( www-client/firefox )"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 dev-ruby/sinatra )"
-
-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"
-
-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/capybara/capybara-3.2.0.ebuild b/dev-ruby/capybara/capybara-3.2.0.ebuild
deleted file mode 100644
index 54ef8d17123c..000000000000
--- a/dev-ruby/capybara/capybara-3.2.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 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 ~arm ~arm64 ~hppa ~x86"
-SLOT="3"
-IUSE="test"
-
-DEPEND="${DEPEND} test? ( www-client/firefox )"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 dev-ruby/sinatra )"
-
-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/celluloid-io/Manifest b/dev-ruby/celluloid-io/Manifest
index 82fd517e6013..c36a44ddc93d 100644
--- a/dev-ruby/celluloid-io/Manifest
+++ b/dev-ruby/celluloid-io/Manifest
@@ -1,3 +1,3 @@
 DIST celluloid-io-0.17.3.gem 57856 BLAKE2B 6b2368c9e51a91ba1d7707389f173c1070e2d0a81698538af5240e3798509fe8e3495c2abea83b8c9f49148d3cce59a38823f2a47d7b92da395e78ad71506f8b SHA512 8b1552549c5aad59bf3789518ea2fa6833a4d3b7213cf70d941face215382a68b3d9d2d57e76b2bd7c478fe0e2690b19984d210b806bf1f67f159fd2bdf6b8ac
-EBUILD celluloid-io-0.17.3.ebuild 1111 BLAKE2B bc86e2e4082015e76639cdbc6e873d0d78a2545061baf87f96867e195ce7ac86cc18ee6ea8971d0fb029ff34e839747f14a991aa0ed9aefbe18df3833d6fa61c SHA512 2bbe1221ca154bc83799625762fbcb9b1e117dd6d3a68cbf8ca912fa409f770a24b8235fd467318172d16f8b2a23e71518870a4890b2fc91d06512ddf48929ad
+EBUILD celluloid-io-0.17.3.ebuild 1111 BLAKE2B 0a12a4bce09694dae80caa4f215479a87a6d2b607cf09ebbde689b412982826b36232d38ef6ea7256e0293c3ab6ca6dfabb74798fb839203779bce24ea19729c SHA512 d00966a5c50e993145c7882c2d85674ed7b923ac9e1522880673a0435980f69a5551dfe0fa8a433162dba5739a62e815e9467df1e79b80756dafec33dcc518d2
 MISC metadata.xml 348 BLAKE2B 82aa98d484afd7116f7d2079ff5358bd3af36987427c49ab3c525325371ff7c8993ce49f7c1dbecd5f12d763972a84358f13523599a929b4406c51e19e13d14d SHA512 b351fe17cb7e9f63c2033e958bf2c6f37dbcae42cd59b76f7c979b42eaf3f35d79e6e82ad2e3bc4cdb2fb7e4410062acadfdfe44a5e767077a223c198bcbd2b8
diff --git a/dev-ruby/celluloid-io/celluloid-io-0.17.3.ebuild b/dev-ruby/celluloid-io/celluloid-io-0.17.3.ebuild
index 82e2eb972c28..5703464d9361 100644
--- a/dev-ruby/celluloid-io/celluloid-io-0.17.3.ebuild
+++ b/dev-ruby/celluloid-io/celluloid-io-0.17.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/childprocess/Manifest b/dev-ruby/childprocess/Manifest
index e89b3a9d0c15..fdbe143e1852 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 976 BLAKE2B eaaa66f6aaae2220a794701d4b014a1db1a7aef497cef3f20ebfe287fabc435a4da75398cc220ded68c3d19cff181e394cd39cbcba3a18121a7df66ce98e6f13 SHA512 232b0f43d14d1036dd3a371ed35d9456d4cc5539d77138b12295487243e335db147db9c821b85b1c5989f4e56c672475c2fd5974f7f2843c6daf8db240deec43
+EBUILD childprocess-0.9.0.ebuild 974 BLAKE2B 1c3ea5aa7a05529fcbed0c6b1edacf6777c3f31e7b8e89c05c5c1dd11ed546104ddee1aac56c450af3318977ed020633e6849796097256e7e3f98bf668e783a9 SHA512 b8b867ed4f323bd27352d783e7813762cafcb45d8a674dba48a252429f621e6e5065b4230ad7686c8418947e981e07075766166a00374aee3c7a66f09355d6a7
 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 63792b61343c..a6269b3960cd 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/chunky_png/Manifest b/dev-ruby/chunky_png/Manifest
index ee79e28aed85..cc3c76240fea 100644
--- a/dev-ruby/chunky_png/Manifest
+++ b/dev-ruby/chunky_png/Manifest
@@ -1,5 +1,3 @@
 DIST chunky_png-1.3.10.gem 352768 BLAKE2B ae34d2bc8199e46add874511343a7e8ecf08ed3ec3e488a22a99335895d260ebb60c6be96c5771915a176f44e354599373feafce9dda362b6ebc2b58cd92e79f SHA512 968e068a6fbcc3a91d435509a118976de56c62b9e311d201064aae2eb8129994b6c0876ca5ed3368b0415b238f46d14ab1059d00cbf473aaf9631456596e58c3
-DIST chunky_png-1.3.8.gem 351232 BLAKE2B 9eb2ca5f997558240911e1a62801c5058e052731a512fc5c35a36e77468c1c93263cca25a11cccdb45bc70bcf53e44681bbde7f7fa2016857f6b054ab79a04e8 SHA512 3e4725c960e8f404f9702323deec6d77a3ef8bcaba9b679483c7de2be1ea327a2a8a7f67cb6beaa1a3c473e573600cc7b228aceceaa37f0a522cf9b2892e0351
-EBUILD chunky_png-1.3.10.ebuild 731 BLAKE2B fe32293bee795c1c2d17bb97fe6c2f15e193146e8b19f660b0309d35d98add4b1e1730f1fd5b6187bba13786ce0382fa44c8c8aac9a1fae1008d232c4b995cf1 SHA512 cccd8ea89597a44ff2f528fc73465efbc8f71675f6703fe9f8cc7e48eabc9848b4fe2d8bae802eb3aeee1555f1e73d80bb2422e29cfad4df2c7021fb8bc96cdc
-EBUILD chunky_png-1.3.8.ebuild 731 BLAKE2B b95a391393d98ea155206a8046cf9456615bea591dba51bfe47bb7ed861a8be1ff962974dc4718600c56cb57c48d8c6f0780e5ac2cb6e73a4789ec336044b9ef SHA512 fc39eac84acc399d50d4e207725b992a29695d9cee324c157f471446a9c7fc2b56ac21f1b9bcf87f053a0df198b66710fa9a1b1e5a2e9b666b16f0f25a60f083
+EBUILD chunky_png-1.3.10.ebuild 731 BLAKE2B 70584df88f08dff030b96a12d3607c396fd5e65d12747347bb82c39050b3f3ea898078f0b5944c54ded72520586ebce67a2fed795fabdd082b8cf321ba282eab SHA512 bc1a595afe80b8cd8ad31ef61fd5ee3d762b30a0ab29b712ec8c4e35c92ce54fbf5f09511c32111732a016ad158fcc62212adc39a9514a33d9bf3372c33aa698
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.10.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.10.ebuild
index f94b9a19988a..36d324ce1bc2 100644
--- a/dev-ruby/chunky_png/chunky_png-1.3.10.ebuild
+++ b/dev-ruby/chunky_png/chunky_png-1.3.10.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/chunky_png/chunky_png-1.3.8.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.8.ebuild
deleted file mode 100644
index 35e39e17f514..000000000000
--- a/dev-ruby/chunky_png/chunky_png-1.3.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-
-RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc CHANGELOG.rdoc README.md"
-
-RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure Ruby library that can read and write PNG images"
-HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
-	rm Gemfile* || die
-
-	# Avoid git dependency
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/climate_control/Manifest b/dev-ruby/climate_control/Manifest
index a57b00f07d80..eeacb94ac463 100644
--- a/dev-ruby/climate_control/Manifest
+++ b/dev-ruby/climate_control/Manifest
@@ -1,3 +1,3 @@
 DIST climate_control-0.2.0.gem 9728 BLAKE2B 9868eef8836189d7567d8fd8f5dade874ed4baef883f38b2d6148bde4f1e24544f31fae75ff7bcec4dc685c1fdd23d5164817460eeaf151d8eb105e023bbd741 SHA512 c264d731fb02c7a15932d2724bcd54dff91d2370a0b5336444e167e0d39596974c3826db502be7dc1b6d99cdbbc022135822222a5a6cb6b822aa32a0913c1ec9
-EBUILD climate_control-0.2.0.ebuild 664 BLAKE2B f4dc42e94ecd440312021d943880baee94e37c08339d5e113d5062549907805374364ad6a50defc36cf19b37de76220f18e921a9b9ce8ac4c0540b9840da892c SHA512 37acdf58331f602381977885f91b2b5134cdd4c6aac92c0d121ef93ffb9bd8e784082fb31767ab3966699ae3abf969f4af4a4bca648b3e44e26aace0e46c0bd4
+EBUILD climate_control-0.2.0.ebuild 657 BLAKE2B d1d686ded8cf2710b0e8cb302bf66e3f53675efc39978c2d4284e0f7d67c462fe280a098e91718289821e5a9d257c946b85922598aabc3057f20fe7788ebe2dd SHA512 3425952c19cdd8d7bfdfa50770e5b6f44aa5d03471af371cd6b7b7b5a3ee413c5fd36e5473fa13d3ffe2382777a12ee942cad06b3c5a2e106a3a8e0ad7de1b9b
 MISC metadata.xml 352 BLAKE2B a7a827d3c582adc7be3ce1b6e979b5325fdc2c6402d404f7072f59c679b2c599f532b530f26777ab9b40bc5ec9f87babda71ec39f685b8b7ce897e3e3cb7078c SHA512 033eff127f4aba2219417b177dbce740027acc4f9e0723e86faca2368ada2cee92e336575cea9d48a255075525c2fc78677f0c48b585f3bdf851372d66517e3d
diff --git a/dev-ruby/climate_control/climate_control-0.2.0.ebuild b/dev-ruby/climate_control/climate_control-0.2.0.ebuild
index 64d71cae53f1..1c6e46d2953e 100644
--- a/dev-ruby/climate_control/climate_control-0.2.0.ebuild
+++ b/dev-ruby/climate_control/climate_control-0.2.0.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_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="NEWS README.md"
diff --git a/dev-ruby/compass-core/Manifest b/dev-ruby/compass-core/Manifest
index 4e52aa84289b..cb82b4176bcb 100644
--- a/dev-ruby/compass-core/Manifest
+++ b/dev-ruby/compass-core/Manifest
@@ -1,3 +1,3 @@
 DIST compass-core-1.0.3.gem 137728 BLAKE2B c27a84f32973ee6f163129ff344019beb5658585b1567f5e7ac6a47108bced6da77537328f23f3c03e7f402db5387bb39fa41f726bb7e89f2b7b8f80f65b7132 SHA512 90ee9fbd2266fc3e437162c8920710e4885446333c8d4b5ae22c652c7572b93ce3071574fa74f432b0036795865f92c888a6d648ee20bf5618cf58fb7b2b1dd1
-EBUILD compass-core-1.0.3-r1.ebuild 567 BLAKE2B 2e3ac70e6776014fd89373662374d75698421ada670428718e1c8fe183e0c0421db6f01faec824099129b2189715a94c58672fdbe2ef61bd9a1cf93943d53ebd SHA512 c757fddb4abf05baa4994273f3b9512d4ff07f0a9f3b7a9053dd7057d8e9c73f80f6bb18bdb7b2eba5d2c300c496d73e46a6a33dcf3986ca1ab53f3c2818a6a7
+EBUILD compass-core-1.0.3-r1.ebuild 567 BLAKE2B 62073082ff43df6877cab4cfc4562a575aef6bc0b2ef9c3ca942e7e9bf2e708d6fd81e9db3ec36a8a7b9d58480b8142df598ff1444a3fb589d7cc75b6d0bf266 SHA512 58707b20f1bbf3f8bfc1162a859588456745328d7f1d2764764908ebcd74b4b5521a0d7ce14f324c47cde65cac600c1778028d33a05a17563e3234db5ca724f7
 MISC metadata.xml 528 BLAKE2B 6b7fabfe814d39ca5c07dde758c678e7a2e3bbf683a8e156145ee385060d9454947660d2ffc44a4a5426965ae81064e565c2e3191ff5d8fbe6e87b31f551565f SHA512 c65b8d5e0ea0caa17062ad77c8f099a6c2d61f1bc5f32c635c5bad5bc4fc571703b56cecef1eb2db34a932d02cd4ae4f7cce18ea86d632f0fbd4a9993d431dd8
diff --git a/dev-ruby/compass-core/compass-core-1.0.3-r1.ebuild b/dev-ruby/compass-core/compass-core-1.0.3-r1.ebuild
index b1432f7ee1e3..bbb42be8816f 100644
--- a/dev-ruby/compass-core/compass-core-1.0.3-r1.ebuild
+++ b/dev-ruby/compass-core/compass-core-1.0.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/compass-import-once/Manifest b/dev-ruby/compass-import-once/Manifest
index 1c619ccc2ef0..561a6b72cdef 100644
--- a/dev-ruby/compass-import-once/Manifest
+++ b/dev-ruby/compass-import-once/Manifest
@@ -1,3 +1,3 @@
 DIST compass-import-once-1.0.5.gem 9728 BLAKE2B 24a48d11427b30ca14ab27d34c3a9906c1fe9f9d363b910e4c9e3a2488890f4908ec8bdc4a3323a145cce81f8c2344b95302cd168266bf6a1b36d850a1412e59 SHA512 2ef723803341892b34a4bbe691b32ddd266a125c5e3faf8034c473566d70c7a8c0931f1a02abe64c243fe62f2a204cc8e53b951dd88c440eada4ec2dfc19856b
-EBUILD compass-import-once-1.0.5.ebuild 783 BLAKE2B 6918bc97924266e3937da0e781f009ba042f350a5900b1d3e09bd7840ad509c0b555b0b7ed1319be087e80a5dfc9b57f9b646fd688bcc31f0975dfc35674e82c SHA512 d082797e164fb978d90cd9d473e4b7c0f387bed7d2d0e73e5ea433effe0c7baa35302ad28fc7788692f86991c77ec4dc86ad60dea8f3af7688bd535ff2749b2d
+EBUILD compass-import-once-1.0.5.ebuild 783 BLAKE2B 797f8f8b5e259a6b2e5fad5bb6c9776c6db2af4fedadbbad941637cc51bc2d1e2622cb00ed58d52c09b8febbb17f5b4bf9b9f8380b80d2a3acf21b2e22549a11 SHA512 a6e5ff9fe4e528fb43c3b4ab26cff89589dfe7a824a11007dc18eef9c6fb39406df241bd4a1af57f5c76ee90f83fb100046ad46e5b8cb038e6807b3e67e73689
 MISC metadata.xml 528 BLAKE2B 6b7fabfe814d39ca5c07dde758c678e7a2e3bbf683a8e156145ee385060d9454947660d2ffc44a4a5426965ae81064e565c2e3191ff5d8fbe6e87b31f551565f SHA512 c65b8d5e0ea0caa17062ad77c8f099a6c2d61f1bc5f32c635c5bad5bc4fc571703b56cecef1eb2db34a932d02cd4ae4f7cce18ea86d632f0fbd4a9993d431dd8
diff --git a/dev-ruby/compass-import-once/compass-import-once-1.0.5.ebuild b/dev-ruby/compass-import-once/compass-import-once-1.0.5.ebuild
index 473d793e2a9d..3138a33b49b1 100644
--- a/dev-ruby/compass-import-once/compass-import-once-1.0.5.ebuild
+++ b/dev-ruby/compass-import-once/compass-import-once-1.0.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 # Skip tests since they depend on sass-globbing which does not have a
 # license and where the last version is known to be broken.
diff --git a/dev-ruby/compass/Manifest b/dev-ruby/compass/Manifest
index 1f2dfbfea1d6..80c7f67d54be 100644
--- a/dev-ruby/compass/Manifest
+++ b/dev-ruby/compass/Manifest
@@ -1,3 +1,3 @@
 DIST compass-1.0.3.gem 378368 BLAKE2B 1c33f576ba0c1117d8ca3deeb4d422441fd50922df3443a68b4eeabdd45d804fe505461a687053b6a0ebf0a2aed2539482843eac786226d16ad5ea5fb51a5284 SHA512 bef1ca903cb982df39330a913051c1a330aa1ecad9abbe5a7644e335c7ed2d152901a4079cc5ee43e9f7ce85a671f1d5552a3c98cf40b04134de072a120deef6
-EBUILD compass-1.0.3-r1.ebuild 1068 BLAKE2B 00b808c1274cd109fa44d029f491cecc1e88716e19f897dc0fa091d9a747b2923ce5197c6b7da36fad93c10f1b3909c6674c89bc760776b6d1085222a0a4a57a SHA512 6dcb5b44c8dad0c8951b4d143d0931a6c0d01f60e39fe2129fdfd19af5767d9f49c5b9f2aff7785243f0b58ff18666c158525da4441f81fd20119ec29c646be7
+EBUILD compass-1.0.3-r1.ebuild 1068 BLAKE2B c7d220b6f19fe3228a77b556fdf4b0ad159266d226f2ed16bccab50ed7d1bd5333f9183a608276fd5bf036bb548d04fba3c8cb6ad386d6410ff6f52fa248e33a SHA512 c55d350543ca0614f2c0b82eb93c23a424d23f71ef63c7988d444066cea4b2b807e18143ae38fea6bd843122ef64db234d49172ca5a3425f272204ec1336eb6f
 MISC metadata.xml 528 BLAKE2B 6b7fabfe814d39ca5c07dde758c678e7a2e3bbf683a8e156145ee385060d9454947660d2ffc44a4a5426965ae81064e565c2e3191ff5d8fbe6e87b31f551565f SHA512 c65b8d5e0ea0caa17062ad77c8f099a6c2d61f1bc5f32c635c5bad5bc4fc571703b56cecef1eb2db34a932d02cd4ae4f7cce18ea86d632f0fbd4a9993d431dd8
diff --git a/dev-ruby/compass/compass-1.0.3-r1.ebuild b/dev-ruby/compass/compass-1.0.3-r1.ebuild
index 8b15b5dbe22b..cc402da8bb91 100644
--- a/dev-ruby/compass/compass-1.0.3-r1.ebuild
+++ b/dev-ruby/compass/compass-1.0.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/execjs/Manifest b/dev-ruby/execjs/Manifest
index ebb28324bcd3..358dc4872a7f 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 1171 BLAKE2B 7f968eda4d5536898a76dde6e9915624c8d2a94082e0813f6b3a61ac8e96f3faeabbcab67daf128580ed59e10d92a663b381facd5ffac6354e83d77613d72f5f SHA512 b34233bbbd591ef7ee0fd8f7e23f1215a7c0f4b15ad19a9b0d89ca30bd99bc02ab2b98f701e661978ba6fe699ddb8d2ba9d8018ba6a3f2e760fc11a80a1885e4
+EBUILD execjs-2.7.0.ebuild 1169 BLAKE2B da680e4efb29973c8f19178dc8153f3b8b4152b817ad3ab9c1747cbb6555113b700d29e6a69c83739213829119f48083f12d22e1aa28178060ca73ac1080dd0c SHA512 da202bc866f97093d55f426d32052e7b9ba9c9ebe5ce7b4b52e50fe8603981576a5f8ae0cd8169c442293d80a219d3dcac223bc645b12c21995828f0bede8dc9
 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 0be376f01285..7cbdde6fd375 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 db36402eed20..ce75b085892c 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -10,8 +10,8 @@ EBUILD facter-2.4.6.ebuild 1913 BLAKE2B c05f0516f84135fac1d9b4b6a456045e4e593441
 EBUILD facter-2.5.1.ebuild 1918 BLAKE2B 303788746f2ba6e1385356526e17965528f10e06546c918f0aed7ecb884bd4e0386387ad01d9e59fd7cb9254d91b26c91ceec1fa9bd75dfd34bedb1d02df9115 SHA512 ed07f3b39a71b147a1a07ac161e1895a4e7380aa773c146d702f82eb5a6bf342aa8700f100c4c56ac2996a2d7fc82b5bd4af492c77aed4ba78d308c18a507ab6
 EBUILD facter-3.10.0.ebuild 2858 BLAKE2B 109339f25aad0509563fe4515440eb9cc05b70fc880e26fc3528c86daa4080c923acb2bdb6594de6470fa8b12fe64d2a83af3cfab55774a775a9ac275b9a7c8a SHA512 932183b19c54b30b99103a2cbcf2fe7822f783ea8b8802369efeaac53c82f872eeb7053475ca8a3b8379cade457625d2e019c6eb020704b45a8f3f18867d8fb5
 EBUILD facter-3.11.1.ebuild 2851 BLAKE2B f7195a19a256dca9b6c1ca5aede6001421411869b4b4c1e9dd02ca91a9e73a6a4efeacbc2809bda46977f5ba2ea4b8efc6d52ecbd5a09b2fb44addfc2ff369b5 SHA512 fb1d8480fe94d452b49560093151be5ee068ab6b8a7f2fe7d90a1d07aaea0b0becd35d435189a7dbe9b9eff60ab2d82d703d700668951c562774f55dc12d375e
-EBUILD facter-3.11.2.ebuild 2853 BLAKE2B 2425736023bfe5ace9eff4381af0fcdfe5d5e5837955fbcbfff9ac0b8a1c44b92e249ee3e25b989b666263b15a57d9d752796db6831e84ea982b0d6984843fe4 SHA512 fcd5019219eec0c2dcd3eeedc1abe563c4e7ed36c85fd24ce5508d06503eaf6d25b37c027ea1319024edeb7fcc429f48bb9e712eca650f3c903da14bc08be23e
+EBUILD facter-3.11.2.ebuild 2754 BLAKE2B 0b0a66a4ee65c54baac05172ec2d35ecd31d7252797631458004d0055dab3dfcb0f1a1103cec9b40e2d8de465672efdc1aa3f69e7856de2d05fa335099e2ea8f SHA512 21993d6b5dd6227e1b862abba394b15473ca02f14b8a14e133d08a50ad5b1f6a09291225bbe4e49144d9c6d25e4ae50177aad0a624533f83b20c6f93c1db665a
 EBUILD facter-3.9.2.ebuild 2106 BLAKE2B efcbbd0cfe6a71b1b1a08bbc1f7abe4b94845c9e13192deae811466211ab2ba533ae10732a4d72635609b9cb419051b7c4a39f248e9b06f7ec751cd893d28852 SHA512 5cfb67a3db8d288302f21bf0092c05ce19b40c8a2f00b4b9b63e3e02cd7d1af3dd20670b744520cb42db2b2ccd52e9153d86c0e1db7a36c4c7854c70d79149dc
 EBUILD facter-3.9.5.ebuild 2860 BLAKE2B 281388c538d03258b1ac0c6773c41a5face26dd3e380281b43093ef42e931e9f7cef0e33d336d986ec43d41647c92fbbecc7435248b85f677d8f359489c2f195 SHA512 79a214ee0a4dbcafa96e012b26fd1b1977d890cc956e18d892a359e9df2145a2f8776e9ebe35edaca6b411aba67d9275a8b8b87ed11d2cc3ac78266c1391e8fa
-EBUILD facter-9999.ebuild 2860 BLAKE2B 281388c538d03258b1ac0c6773c41a5face26dd3e380281b43093ef42e931e9f7cef0e33d336d986ec43d41647c92fbbecc7435248b85f677d8f359489c2f195 SHA512 79a214ee0a4dbcafa96e012b26fd1b1977d890cc956e18d892a359e9df2145a2f8776e9ebe35edaca6b411aba67d9275a8b8b87ed11d2cc3ac78266c1391e8fa
+EBUILD facter-9999.ebuild 2761 BLAKE2B 45a04ae914f400f4b80fa0f51fed999d08344ca58005040f7930f2fa7c4092329fdf4557a9babc81ebde788731844cd8299af704dda71a22521a14515f7c6c73 SHA512 58190ff28a512818b79e49c92525c61898a29ce3ce8f8b9b884489ca0f08ae980d906164a45d5a60fef9bc3a8f38ef88882474243188f250ab57043079845f16
 MISC metadata.xml 854 BLAKE2B 51b94622bf8ce34658bf34bf266effc445fdbee52fb22e70c9a645c36b7ac28db73793f185b2dfa791d8459a56ea66eccc6a3f4da56db4fe4ee171ee607366ea SHA512 27e7e17a15ad80544fb121b050f0f5c39d3e27a53ade89063a894569472618b29649b5a737011b8d6597594d9bc94a49cf52c9df857d577a098d6c770b4a9639
diff --git a/dev-ruby/facter/facter-3.11.2.ebuild b/dev-ruby/facter/facter-3.11.2.ebuild
index bfde41b21699..6210613630d9 100644
--- a/dev-ruby/facter/facter-3.11.2.ebuild
+++ b/dev-ruby/facter/facter-3.11.2.ebuild
@@ -71,9 +71,6 @@ src_configure() {
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
 		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DUSE_JRUBY_SUPPORT=FALSE
 		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
 	)
 	if use debug; then
diff --git a/dev-ruby/facter/facter-9999.ebuild b/dev-ruby/facter/facter-9999.ebuild
index 921e49af4500..4500cc443e23 100644
--- a/dev-ruby/facter/facter-9999.ebuild
+++ b/dev-ruby/facter/facter-9999.ebuild
@@ -71,9 +71,6 @@ src_configure() {
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
 		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DUSE_JRUBY_SUPPORT=FALSE
 		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
 	)
 	if use debug; then
diff --git a/dev-ruby/fakeweb/Manifest b/dev-ruby/fakeweb/Manifest
index 96dd4749445f..bc0c0cad4dd0 100644
--- a/dev-ruby/fakeweb/Manifest
+++ b/dev-ruby/fakeweb/Manifest
@@ -3,5 +3,5 @@ AUX fakeweb-ruby23.patch 1214 BLAKE2B 4fa44c8b30adb0ff76372d7d6581f8b326e020348c
 DIST fakeweb-1.3.0.20131201.tar.gz 60162 BLAKE2B 856c499041b122d84fde595343e0917a9ac47e81e50560be79a53def2099ea0ad05532bf3a7e3cd5e8dc668235c1ee75989b15465f397f56b7c0edd028bf980c SHA512 f3bd40680b7eefe90d3fee67f5282dbe4c67d46a1f1040d0d0d62c978b69d08987581a53495bb56e32ebcc6679c84f03c2e26c51d2bd98daa80554d3424c6603
 DIST fakeweb-1.3.0.20170806.tar.gz 61449 BLAKE2B f015f95897383e0b65ada5a7833f7bd3fd61ae77f4ab38bf6bb47f2eecef0c778928090302e46157ae4e2fc6c3df4559e9f5c8004a6474ad8852d157aa3af6da SHA512 1871b7c9f2e4f12cd1c434ef4f760828187078a951517fe3f7a6ca5c5d6f08e3056cae2bb012eca1ba556c2f4d369cb2716c637fefee67eb723428195c482edf
 EBUILD fakeweb-1.3.0.20131201-r1.ebuild 1531 BLAKE2B 5f74809778f489d609192d9c3d8ac98ebc9c38438afe7b8e317c312e506aae85b49a017c32a9506e6eb478d5a73eac670654cd3089b2584cf668044f5eb1ff1a SHA512 1f8f894770da7851958560caaf3adc3c3d8e17f2e8bcbe158785f199a8e1875e9f26b1b0c26d2c468122501f92ddba42329744d232a82f1099b507445d042d05
-EBUILD fakeweb-1.3.0.20170806.ebuild 1306 BLAKE2B b66d56e393c2ba8d8f5af99f2d543f4cdfafd2ff02f427b133f69be2ff25322fd913665b2d0739998a6921cd71e81338026430319a7547cefb479ca617c1ba0c SHA512 71698d6d27f02dce21180b86ba651c0ac9e4abaf2a7ab3f64653bbf37fb38117fc57dd805fa951410e221ef3639f5d1e46ca01500eaded18b91843db589591d7
+EBUILD fakeweb-1.3.0.20170806.ebuild 1305 BLAKE2B 190167d38b4615ed4d7b6777912ae271cecb1fea4f24f88b20db2b79f091b77e2291b7fc258655efb0b5ecf60b4e59d2aaf99e3302101b1653660ae3ee397e7b SHA512 e2df710acfc7f4f806a21d32be1b0a4e638ab5f03bde3f9c5f3b60097f5619cea3cfed8c3a5b51b22a0b765b610ea697c36431f5d00dae97ca698e17eb55224c
 MISC metadata.xml 340 BLAKE2B 7058eef4592a28cd630ef9d8ccbd6920dae2909bb1740172464de06215a3a970e2291a855cbad1206205e90cb04bb711e4725b8d566e6388134501706168914b SHA512 4915509da84a354d665c9c59881e83356a8e8b2f7f09afdae68755484a6e575a7502f98ef8da1cffab96ff12264c048cda182f1c5042b95b058b731bf0395077
diff --git a/dev-ruby/fakeweb/fakeweb-1.3.0.20170806.ebuild b/dev-ruby/fakeweb/fakeweb-1.3.0.20170806.ebuild
index 8c53e00193b5..83bf3f1aa1ab 100644
--- a/dev-ruby/fakeweb/fakeweb-1.3.0.20170806.ebuild
+++ b/dev-ruby/fakeweb/fakeweb-1.3.0.20170806.ebuild
@@ -19,7 +19,7 @@ RUBY_S="${PN}-${COMMIT}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/fast_gettext/Manifest b/dev-ruby/fast_gettext/Manifest
index 00b86a3fc952..64799172fb0f 100644
--- a/dev-ruby/fast_gettext/Manifest
+++ b/dev-ruby/fast_gettext/Manifest
@@ -1,3 +1,5 @@
 DIST fast_gettext-1.6.0.tar.gz 88780 BLAKE2B 237a37bf505fe7520a25c6014f0524201905f8cf112624370477229db2d06f7160bad62e42878688ef954a1b72166e21a7f3a89de66c21aec780749fb26cd8bb SHA512 0f26cf8bd8a2078631d32be14fb6bd194dc9bd8a6727a355f4d2978441c972785747063ec4d8b8b1d4c78f07914a8b6cccf37ed85a37e7833bfe724d1d159ae9
+DIST fast_gettext-1.7.0.tar.gz 89176 BLAKE2B a42f50570c65ecf229dab0e29ad40ed3fd0f431f59fcc7daff4ad564131751e8a9884d52dfb8f2edd87b6fd5d1267973225fb51f9256844b37c28b251d15d757 SHA512 83c66c4f7bce6ccc08c1fe9e2b3cb71ea751d68bbff36587039a0b7af7e6276cb481debd3668673822455b9805114531547b28a777cafa8bda0f204ba36bf5a9
 EBUILD fast_gettext-1.6.0.ebuild 1999 BLAKE2B d56cb283287f37612c2b166b76d31acfd8774968664ab1f107c76e3e32310c6f15119d1357e58a562cd8d3c893e30abb564f97ee2ea846d8a7aedf464fe604d2 SHA512 d760902688d8dfc33a4c26a94e889c3135d17049291fdd1dbf660b5ec8d88f5396a3b7459317d0b9c7dfff7292e714ca95d41856e55cf8202ddd0c85e6700842
+EBUILD fast_gettext-1.7.0.ebuild 2001 BLAKE2B 78abdc2e9de11ae3e6827df900ca25b483180dda5e2115e8da27cc4ef4649f88820c6e383783030678ff2cc94b2827e798ff8f457f9521ac823b34c143bafa13 SHA512 55605c23f802ba1debb8523800a23e5fe125d14f47d63f649a9dff23a62bd8f404458b47e2985a0c76027d949dbed61ac66592768b1d2d91422dee3051180dd0
 MISC metadata.xml 346 BLAKE2B 93a39aacb63cc0db79f126c108547c24dd182711584ef61c481b762a35f96cbee330ee29baea8d063e6f2ea2fc0491e572b860156f14be164ab29131a8f047a2 SHA512 1b57982213ae99ae1dc5ea06240bf81f7719f3cc576926de6a0d308f26895236eaa9b3312157eb5af3e47893787c9260e4386988a6f156c9a8b660aae85007ce
diff --git a/dev-ruby/fast_gettext/fast_gettext-1.7.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-1.7.0.ebuild
new file mode 100644
index 000000000000..97967bdb5e89
--- /dev/null
+++ b/dev-ruby/fast_gettext/fast_gettext-1.7.0.ebuild
@@ -0,0 +1,55 @@
+# 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_EXTRADOC="CHANGELOG Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!"
+HOMEPAGE="https://github.com/grosser/fast_gettext"
+SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm Gemfile.lock || die
+
+	# Remove jeweler and bump from Gemfile since they are not needed for tests.
+	sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die
+
+	# Avoid unneeded dependency on git and development dependencies.
+	sed -e '/git ls-files/ s:^:#:' \
+		-e '/\(wwtd\|bump\|sqlite3\|activerecord\|i18n\)/ s:^:#:' \
+		-i fast_gettext.gemspec || die
+
+	# Avoid a test dependency on activerecord since this is now in the
+	# dependency tree for app-admin/puppet and many arches don't have
+	# rails keyworded.
+	sed -i -e '/active_record/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/fast_gettext/translation_repository/db_spec.rb || die
+	sed -i -e '/works with DB repository/,/^    end/ s:^:#:' spec/fast_gettext/storage_spec.rb || die
+	sed -i -e '/with i18n loaded/,/^  end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die
+
+	# Don't run a test that requires safe mode which we can't provide
+	# due to insecure directory settings for the portage dir. This spec
+	# also calls out to ruby which won't work with different ruby
+	# implementations.
+	sed -i -e '/can work in SAFE mode/,/^  end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Make sure the right ruby interpreter is used
+	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
+}
diff --git a/dev-ruby/gettext-setup/Manifest b/dev-ruby/gettext-setup/Manifest
index 0a34914b7f54..f7bd6a369e8b 100644
--- a/dev-ruby/gettext-setup/Manifest
+++ b/dev-ruby/gettext-setup/Manifest
@@ -1,5 +1,3 @@
-DIST gettext-setup-0.29.tar.gz 15811 BLAKE2B fab356f79e9a84433df583d122a391240ec9c412b062d6aecd13116bba483b3e9f71f8364e82cabc1f695ada416c99fcc8fafb2c8a7b99dc9f21881b4c045069 SHA512 b6bad9c38481880f1086ad9edca86ee46d5afb915213591d7b30526ee3428c91325f59f977ab21395fdc73df702f05666a3e00116ac5765b9bf66ce6bfa90575
 DIST gettext-setup-0.30.tar.gz 15952 BLAKE2B d224e0fee34b0735fdf22abe2efe81b45c6494fc48ca509daf076cda9d3b83dc6dcd3e44c20ae9776d98b7d6128e5b9a93fa49ba1f2daa4b00929714e8d7365c SHA512 6ee398a131098f46dcc2951d166081a90872330b6ba5637292eb326b1bd6f40f46350f6be7b2b9ebee0c62442609700e06d25befcbcbf6510f3d96e656855124
-EBUILD gettext-setup-0.29.ebuild 1060 BLAKE2B 330bf2b6be2c95711be022a987e39566ab9e242535b1726c1490d908af4571c1e526ee328aef0e6853519f2d8a4ca7353218b0e2a679120274406d394efc2f21 SHA512 1b05afca02c2fd5232f0e012dda6484b06c0e17ebd74b3c2edda67c314477542a554bb86a646deae3d7b336a0a3b9623cda2566317d2d9b5e339030990b2aede
-EBUILD gettext-setup-0.30.ebuild 1058 BLAKE2B ef0d177ac4433f09692bbd348be0bd9ea3d52b8cf93e6b4ceb0812f2f2c3fa5fc7209d97752f4ec93ec4fb4f98c438e3c830beeaa976e7e2ed72a1729e1a02ee SHA512 c9e12d9fd124026e375527e206336de83f7867856266bc02b5ae71df8c7ee553d66f9abf991c8e9cac122ef1a26118ec54b46726fb67662ef0831c660f552d6f
+EBUILD gettext-setup-0.30.ebuild 1077 BLAKE2B d43509ed7d77b5e7529eb240163eafe6b47fd08d488998d96def063adc62466fc52c07f978a114d195b65df6e315be9b1b0a46311e9b6f142c2d956bc06d5498 SHA512 98fe1ef213729c1bfd45fe3901573d7ad73b4c989f578bbc284a43e4126057838581edbb9fbeef0aed8572a00538c5148a4dbe7156a6ed68b2eebbae74301924
 MISC metadata.xml 344 BLAKE2B 14075c722372613eeff2cb810420e1e0ff7cdcf4ee1ba748a0b615222b88b13a0ecc01c9d0ca1aab71c0bb28359c18682b7402444caa01100c3d8381b9b13e08 SHA512 f7f8c8e7f745313b74340ffe738cab426f793f452106e0ae70f5e73a3a745f1b9ae7b1b70b5951f1d5eb81d4e61851845fa53bd2aa3dab8362f330e6f8d79e9c
diff --git a/dev-ruby/gettext-setup/gettext-setup-0.29.ebuild b/dev-ruby/gettext-setup/gettext-setup-0.29.ebuild
deleted file mode 100644
index 756bded96c7f..000000000000
--- a/dev-ruby/gettext-setup/gettext-setup-0.29.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A gem to ease i18n"
-HOMEPAGE="https://github.com/puppetlabs/gettext-setup-gem"
-SRC_URI="https://github.com/puppetlabs/gettext-setup-gem/archive/${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-gem-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/fast_gettext-1.1.0
-	>=dev-ruby/ruby-gettext-3.0.2
-	dev-ruby/locale
-"
-
-all_ruby_prepare() {
-	sed -i -e 's/1.1.0/1.1/' \
-		-e "s/spec.version.*$/spec.version = '${PV}'/" ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid spec with specific locale requirements
-	sed -i -e '/can clear the locale/,/^    end/ s:^:#:' spec/lib/gettext-setup/gettext_setup_spec.rb || die
-}
diff --git a/dev-ruby/gettext-setup/gettext-setup-0.30.ebuild b/dev-ruby/gettext-setup/gettext-setup-0.30.ebuild
index 8c7fbd5c3f8b..40e499ee5d61 100644
--- a/dev-ruby/gettext-setup/gettext-setup-0.30.ebuild
+++ b/dev-ruby/gettext-setup/gettext-setup-0.30.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_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -33,7 +33,7 @@ all_ruby_prepare() {
 	sed -i -e 's/1.1.0/1.1/' \
 		-e "s/spec.version.*$/spec.version = '${PV}'/" ${RUBY_FAKEGEM_GEMSPEC} || die
 
-	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/simplecov/,/^end/ s:^:#: ; 1irequire "date"' spec/spec_helper.rb || die
 
 	# Avoid spec with specific locale requirements
 	sed -i -e '/can clear the locale/,/^    end/ s:^:#:' spec/lib/gettext-setup/gettext_setup_spec.rb || die
diff --git a/dev-ruby/gherkin/Manifest b/dev-ruby/gherkin/Manifest
index a24716db2bf4..4550d87c7d52 100644
--- a/dev-ruby/gherkin/Manifest
+++ b/dev-ruby/gherkin/Manifest
@@ -1,9 +1,7 @@
 AUX gherkin-2.12.2-ruby21.patch 1485 BLAKE2B 99bd60c95f0cb38f5ece36329d10254b5961bed856131d0f615b4dc044f973346dcab68d53fb9df6f1cf5f0b12bcca8b43eaf45bdbc4acc1b6aae7c2dcfd9712 SHA512 5d5efcd50727072918c481a972546fc11b04685eb0ce4194ece9316bf100a004d24960d03531da7ee3ccbd7d7e56ea74e93a02400b1302c855bdcfc47b541d0c
-DIST gherkin-2.12.2-git.tgz 1764938 BLAKE2B b5cc7f063c8567df2dfe92fe805d5310feeba967865221ce69c8c24986ab786851885f4724b17a028daea298eea340b3bcd0c7296f05b02816c837ffdf8a41b5 SHA512 1030bcaf31791c7031f22b8e4c5d94ddbddf012b8686d06a7598fde99a28f8a1fda45dc66dbdefdb825a045730b077a10ca1134835630710551e20364886ce51
 DIST gherkin-4.1.3.gem 350208 BLAKE2B 3b0f54124c9f29c9216aaa9810526f1e11f6243b02143443d0ac18209320c14fda67f1c36d3056dbe5adbc18c36f72270054c17a011921eb87f8d21bc3e8c3c9 SHA512 7c113172ddf38ccf7e49eaac19355f3cb991f69d7499dba9189f375b75d3614f349fc6374e584a92c1223b0708cc8944859b4b38e28d79779a5091fa0c775e6e
 DIST gherkin-5.0.0.gem 340992 BLAKE2B a8292fde04c98c409423733791e78b9d6e40a7a60b59a1acd0a0e9c6df0be9185e90f1c5af6ce0ac39f352457c18094c495557fb05323eb7ea5ae8ce27008950 SHA512 cc782e37f5aea4ad0776f5336e6218b77e7fd8d193786acffaa44685de3a2592e4e6f37a3787add807654901afd12bc2d094a782b154bb2be9e2cd16e283df2a
 DIST gherkin-5.1.0.gem 29696 BLAKE2B 2439b82a147a546e8df71e11996f9560a8720580e07795542fc81781449b483a42e54251f3d0dd3482331773b1cada1d61b468bfcec2a9464ee2542eef2ed13e SHA512 d935ccceaec493736f337a4c3db69909858d15f4c41e93ecfc6ca31a30fc48eec1cecbe71d455265e1062006f49f05461c9860c9b3cc4806bb25f42dec6f504e
-EBUILD gherkin-2.12.2.ebuild 2615 BLAKE2B b50787711a231ddea79841dd235ea076078f32a9bceb6ec32ba3f9d7164ef9eac34e2f3bf916aabb7839d8a0ed081206cd5b91fbc173f4085e1b6b3e6a918b7a SHA512 475270e4edef3ae3a115aab6dabe3f3c7e89539a92eaee529b54e78e58a90081019f8b501d83f836552536d2245f6d59c271ce3b861dc906138f98e03d72bcdc
 EBUILD gherkin-4.1.3.ebuild 576 BLAKE2B d77399ae72a01d8560c19beb62895afe101fa8cb9d3e3b20c2cc58a3f8947ae63d15730601ea3e0b5528b580634085374344ab3bfe550b9041ddcb25be3751b9 SHA512 38aa1134b3056e7485a9e3dc24293fffbb0a2fed1bbc57ccb17df9dbdfb610e6685eddadc98b7be46de29990ebff9680ddcd12832b6807bc98d3a8020607fb11
 EBUILD gherkin-5.0.0.ebuild 570 BLAKE2B 123b9798a8f8798dcebceec2cc45b5d1888c36c9044aba95efc2a70b1e462cb4d769c0bcc373decfae1b683fe85c0b92f3c8da1e42695824f7f7e83212fbce9d SHA512 7ea2209ad7c942b049701d127fdaec66c13357fdf2f4fb4fbaa978bdeac1b1c75fdf50a699378df5cbbccc750c58f1edfb0a4100688f27c489e2a04ac7aba8b2
 EBUILD gherkin-5.1.0.ebuild 570 BLAKE2B 123b9798a8f8798dcebceec2cc45b5d1888c36c9044aba95efc2a70b1e462cb4d769c0bcc373decfae1b683fe85c0b92f3c8da1e42695824f7f7e83212fbce9d SHA512 7ea2209ad7c942b049701d127fdaec66c13357fdf2f4fb4fbaa978bdeac1b1c75fdf50a699378df5cbbccc750c58f1edfb0a4100688f27c489e2a04ac7aba8b2
diff --git a/dev-ruby/gherkin/gherkin-2.12.2.ebuild b/dev-ruby/gherkin/gherkin-2.12.2.ebuild
deleted file mode 100644
index a0671caf9601..000000000000
--- a/dev-ruby/gherkin/gherkin-2.12.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Fast Gherkin lexer and parser based on Ragel"
-HOMEPAGE="https://github.com/cucumber/gherkin"
-LICENSE="MIT"
-SRC_URI="https://github.com/cucumber/gherkin/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
-SLOT="0"
-IUSE="doc test"
-
-DEPEND="${DEPEND} =dev-util/ragel-6*"
-RDEPEND="${RDEPEND}"
-
-ruby_add_bdepend "
-	dev-ruby/rake-compiler
-	dev-ruby/ruby-beautify
-	test? (
-		>=dev-ruby/builder-2.1.2
-		>=dev-util/cucumber-1.1.3
-		>=dev-ruby/rspec-2.6.0
-		>=dev-ruby/term-ansicolor-1.0.5
-	)
-	doc? ( >=dev-ruby/yard-0.8.3 )"
-
-ruby_add_rdepend ">=dev-ruby/multi_json-1.3"
-
-RUBY_PATCHES=( ${P}-ruby21.patch )
-
-all_ruby_prepare() {
-	# Remove Bundler-related things.
-	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb features/support/env.rb || die
-	rm Gemfile || die
-
-	# Don't use compile dependencies to avoid building again for specs.
-	sed -i -e '/:compile/d' Rakefile
-
-	# Keep this hardcoded -O0 optimization level since
-	# https://github.com/cucumber/gherkin/issues/182#issuecomment-6945009
-	# hints at the fact that removing it might cause the mysterious
-	# Lexer errors that hapen intermittently.
-	# sed -ie -e 's/-O0//' tasks/compile.rake || die
-
-	# Remove feature that depends on direct access to the cucumber
-	# source. We could probably set this up by downloading the source
-	# and unpacking it, but skipping this now in the interest of time.
-	rm features/pretty_formatter.feature || die
-
-	# We need to remove these tasks during bootstrapping since it tries
-	# to load cucumber already but we can be sure it isn't installed
-	# yet. Also remove other rake tasks for which we may not yet have
-	# dependencies.
-	if ! use test ; then
-		rm tasks/cucumber.rake tasks/rspec.rake || die "Unable to remove rake tasks."
-	fi
-
-	# Avoid dependency on yard if USE=-doc
-	if ! use doc ; then
-		rm tasks/apidoc.rake || die
-	fi
-
-	# Avoid implicit dependency on git
-	sed -i -e 's/git ls-files/echo/' gherkin.gemspec || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		yard || die
-	fi
-}
-
-each_ruby_compile() {
-	${RUBY} -I lib -S rake -rrake/clean -f tasks/compile.rake compile || die
-}
-
-each_ruby_test() {
-	${RUBY} -I lib -S rspec-2 spec || die "Specs failed"
-	CUCUMBER_HOME="${HOME}" RUBYLIB=lib ${RUBY} -S cucumber features || die "Cucumber features failed"
-}
diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest
index 10cebaf1ff5c..1f016452c1f0 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -1,8 +1,6 @@
-DIST hiera-1.3.4.gem 30208 BLAKE2B c0f65db3807e645ec08d60447b3aa0ecd9e826afc730296743faf6cded31ac203fdbe369df0055dc68fbb90f453dad26e8f3679d0c707b14cdcb6ff67328229b SHA512 be3b702f0e3c2e61d8d6a8c1ff1280f9a1be3dc4adc2a605b4ee3b5db82d513bd58fb6b22ef546a625cf4eefa43d597365187b776ee92c2dd9946eaa4b147128
 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-1.3.4-r1.ebuild 685 BLAKE2B d69e8aa9dbf9b475bced497dbcc712db7fe3a80d266d432c626f78151c546eecf168e17c3d2ac9a038f47d25eb953a625bf08e7c2583d12acae25ac7c02679c0 SHA512 2d5f76593e2532055635ed78a7796115dea8d422aa9194d481ece0e2beb655d06eb459cce49053f967a2b6da4b5194e441ff5705c73bc872c8b8d1ebed562228
 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
diff --git a/dev-ruby/hiera/hiera-1.3.4-r1.ebuild b/dev-ruby/hiera/hiera-1.3.4-r1.ebuild
deleted file mode 100644
index 3d141d0fc9ed..000000000000
--- a/dev-ruby/hiera/hiera-1.3.4-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-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 ~sparc x86"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-ruby_add_rdepend "dev-ruby/json"
-
-all_ruby_prepare() {
-	# Our json package is either the compiled version or the pure
-	# version. Fix gemspec accordingly.
-	sed -i -e 's/json_pure/json/' ../metadata || die
-}
diff --git a/dev-ruby/hocon/Manifest b/dev-ruby/hocon/Manifest
index 68aafb5b91d8..a3d3a44fa6ff 100644
--- a/dev-ruby/hocon/Manifest
+++ b/dev-ruby/hocon/Manifest
@@ -1,3 +1,3 @@
 DIST hocon-1.2.5.gem 147968 BLAKE2B 9fe004d59cc3e66d770c7c8069ff2934a17befa120ccfb2e382f36f632a186095c3a94eb25e77ba3fff422394444ae85cf3adde2ed045d50f0ac99871c6dd909 SHA512 7d2d86c28edd6ed6dd99358558093cd224b9922bcbcdd2e95e23134ef0e9a2bae6129e7273435032850b672094e77f8f5b6d8cfeec03762b39ed6b63fc5fb5dd
-EBUILD hocon-1.2.5.ebuild 541 BLAKE2B e17b8df446e25d777a97d4cc67a1396f1cbf818690f7beb42d972b67a5a0e95fa89f1dea67f61231a39ab416759fe68d3ff66bc126ccfca51c22557e424ecffd SHA512 eaeb0c712a6b9f8f996987720d39096df86c2aa6feaacb7a76fb53556ded883393cab487c3d4ca88974513944417064ddc71d84742a30c263e7bf478788edae7
+EBUILD hocon-1.2.5.ebuild 535 BLAKE2B dd70c64fa87ea29ad167a65f14621ef3ca452b3d5563e52597509c9300f5607c58bded23193c66e66d802369ce53bf594a00bb3040acb1a0b3d38b15bfa96943 SHA512 05db1fc82a0dfb2c54b4c400f34d05c516bcb244be69c05c1028116417d75d7de1b0ac5b4dc62fc001addc7907c668222bcc9a788397a77b6593122c39644cd3
 MISC metadata.xml 514 BLAKE2B 41c8fb2854ca091452e2530a98518581287253088bc3709b9945a47ca1ad06ffeb4ef40a1da8e2843322fde51e805e381a768a8cf3fd14b5d62d660fe975a59e SHA512 cfd1c8e9f9eaf4f3cf797e9fb40bdeee6004a38e1d3dac66469dc43944204722720c63798671d3032034dd826f44075257db43021910d31af3333df423064ba3
diff --git a/dev-ruby/hocon/hocon-1.2.5.ebuild b/dev-ruby/hocon/hocon-1.2.5.ebuild
index 1bb497b7278c..ccfcd6606a4d 100644
--- a/dev-ruby/hocon/hocon-1.2.5.ebuild
+++ b/dev-ruby/hocon/hocon-1.2.5.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23 ruby24"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_BINWRAP="hocon"
 
diff --git a/dev-ruby/hoe-seattlerb/Manifest b/dev-ruby/hoe-seattlerb/Manifest
index da79f4174089..497c9b1ac3bf 100644
--- a/dev-ruby/hoe-seattlerb/Manifest
+++ b/dev-ruby/hoe-seattlerb/Manifest
@@ -1,5 +1,5 @@
 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 785 BLAKE2B a99f0f2e425378ec43bc0821758a3b6ef7eac6847e1c3a432bb626ec3adbab80d06df32b4ced0fd13d35d472fe0fad17bd7bfe0e4538ddbe7891b73457c166d0 SHA512 3d89990fabe055021b5e3b0f29eaab3604034138cfc32270dca12d239bfecfa85e1132d5e6e1f638102e47fae52372b29b72505b3b36262b7f8647d86fea4db0
+EBUILD hoe-seattlerb-1.3.5.ebuild 782 BLAKE2B 1f9f507f5eccf7d2214d9879252fed5826e21e6a5428046fa060e764ba6e52bae63843c112af44acc38a60b89e8b4cece0b029ee33f671d9e4fae70459d68743 SHA512 23f89981add8fa5a74213d9069513d54813cc19748b71fa71be5cbc93e11a0d7c33e4d26cdd8c452f39e920b191a4be2b593ed113ad2a3fac9cb02e7217a22f4
 MISC metadata.xml 339 BLAKE2B dfe565b89582b66fb99b6c9e50c9ca3efc0eeeb4a2c2cecd5e103f2d9526fde1a6e591c240cc83163d55c2973adb9482dc8c91ec3cea5a8f67848aa0bcdf5e4c SHA512 2e0d6992a3e11200d4373727efa7ea4c1a1eb1e1cc2a1023b0d0b651769580d2405378c4560e498ee5f52f7350fee443a443247ccedef5178be40f014f44cd20
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 55e4bd20405d..f14531f848f3 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/http-cookie/Manifest b/dev-ruby/http-cookie/Manifest
index 8274bf3f3af3..07ade3a11560 100644
--- a/dev-ruby/http-cookie/Manifest
+++ b/dev-ruby/http-cookie/Manifest
@@ -1,5 +1,3 @@
-DIST http-cookie-1.0.2.gem 37888 BLAKE2B 9fb33cc4f7b97f520e1703488381ad17424f6242fbf83efcfae0cef34f6937526c8a664911406a7f9fb1f15ba07a8d9deebde1a812fd5dce01e81f40d9384242 SHA512 447b7fcfd67f64edbd8420672add7ff04f28358ecd8ef59c3bf861b48378729d02bc1e4396259104651794e011ef0de72c892f28fd658474a1fc315b9b750178
 DIST http-cookie-1.0.3.gem 38400 BLAKE2B 6b7292b2a5d7c37b6769cdd38f01d8cf78aa9557b4a204d736dffeae5d31768c57ac58f00577df78252f9a8bdb12a7faecf5e1be64c8ee29aaf67cc9307d0a35 SHA512 43ac1218e98dd47ee22e33e72e20bc5b55f65e60aadd417641f8a4221eba88995d418c7738a4c35dfba132e05c0c4b0df2b2bedd56c22e82c062d1f03de0052f
-EBUILD http-cookie-1.0.2-r1.ebuild 702 BLAKE2B c7554c5200e0f093a82ff9efb943c85c37190734d9f1781ec7c3567d60e57b6902e741b5883edb99d47e80407bb2662807c1a5b6a083e212ca43f5157dcd7417 SHA512 96f242450407fba07ecf5ef5e31498bdefcee8a767909be09ddc1aface8ee31e51d5574a3d21b39d9d50e022bfa23e71dd9e9272bf90aca2eddae7cae483bd56
-EBUILD http-cookie-1.0.3.ebuild 707 BLAKE2B 9e814704202d9a665286b9275b22040807eae22d341668e7c2a675e4f6df3e80cb05e7d0c05eb28d899b6913205e0b0d5033950c067def889410588172e45309 SHA512 22e750a8de1d60a651db340debad18fd7c2bf9cebbb54db751df1d39d6365621f4d3d68c5c32d6ccb251141a26577b5d49a8e047817b443bfc2c27a1c8c13e7f
+EBUILD http-cookie-1.0.3.ebuild 702 BLAKE2B c6e437e218957cc01357d3983ab0e1b24b3dd72821ce920fe772645f0942f90437323fc5cc4fb7d515b56feefb952f36e7a2deaacacba705c3046427a722eea8 SHA512 8699a40ebd602e93f16c06de1937c03bba92ebf99f3c87dfd1cfd1db914b9c38ada31b92b1bb5a0fee596df808cdf6c1ffc571be2b5ad52cf7643ce061e12578
 MISC metadata.xml 351 BLAKE2B 926eb407cb14931a24791340dd7b529823fcf35a7ed86f5b9f13a6238db82d71f71775f4820b07056d486c299afb97b23acb0f6419fbbeab69feb4b49e667950 SHA512 e9ad64c767ea22fcd169c61f71dfd8b292592e6efcb27273df9d90584e39897434d52f974037694f346d8388564fa8b8550f2da1ac11ef4e4a2e450e11701efc
diff --git a/dev-ruby/http-cookie/http-cookie-1.0.2-r1.ebuild b/dev-ruby/http-cookie/http-cookie-1.0.2-r1.ebuild
deleted file mode 100644
index 0b93a9817336..000000000000
--- a/dev-ruby/http-cookie/http-cookie-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,29 +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_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby library to handle HTTP cookies"
-HOMEPAGE="https://github.com/sparklemotion/http-cookie"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/domain_name-0.5:0"
-
-all_ruby_prepare() {
-	sed -i -e "/simplecov/d" -e "/bundler/d" Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/test_http_cookie.rb || die
-	${RUBY} -Ilib test/test_http_cookie_jar.rb || die
-}
diff --git a/dev-ruby/http-cookie/http-cookie-1.0.3.ebuild b/dev-ruby/http-cookie/http-cookie-1.0.3.ebuild
index e82bd8c68e8a..eed00c01bec8 100644
--- a/dev-ruby/http-cookie/http-cookie-1.0.3.ebuild
+++ b/dev-ruby/http-cookie/http-cookie-1.0.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/sparklemotion/http-cookie"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/domain_name-0.5:0"
diff --git a/dev-ruby/httpclient/Manifest b/dev-ruby/httpclient/Manifest
index 396e7b00d867..0ab735da7cc4 100644
--- a/dev-ruby/httpclient/Manifest
+++ b/dev-ruby/httpclient/Manifest
@@ -1,5 +1,5 @@
 DIST httpclient-2.8.2.4.tgz 462907 BLAKE2B 46886ff67c9d0d5b81189c975d4bbc732c8bcd328eef9a52b5b22b405e9b12c5a2bf45b876d97195044c699ca9389729acfc384932c7e6698d59770f92a3ee14 SHA512 c225f302e6bd1f08fc089c202d4d870999ae9ef4bf1df416fb7f06b1732f50b9a7c69a5b73f1ee2f963665d5d436c243830555f8d42c60ac536abbae72b693a5
 DIST httpclient-2.8.3.tgz 464624 BLAKE2B ce8ed523a24acce219027a4f1985caf2b4dae29bdba038ca2397e5f4d4b36c90b35cedfb62faa7faf426c3ce8589906df7832968c81b64bc9100eff6f4fe9745 SHA512 b65b5adb97af069d7ff6b6f4cccd6a42c6d9c88b797e9495768fe1f36a6bd93defe50190edc201de5e39c4e306ba0bd17a8ff2f8eba4d636dacafa06c172967d
 EBUILD httpclient-2.8.2.4.ebuild 1768 BLAKE2B 4be7e4820a16c967a1c2deaed905b800f5809bc282fd988722c613f259179f441783de23a176175ce3ab9bcdec25616cca615252b14dbfc9a8cad8ef2f1a9985 SHA512 3d8239e96098db4d928826edbf908e74f1e3765519457697e1b6c3a6ddf743f8b8c31ef9736656df14bb74e322d1deff79afef244aff87cf88347578a34ab62e
-EBUILD httpclient-2.8.3.ebuild 1997 BLAKE2B 18e5105c08ebb5e7c2f59a4c927c868eed0d130a591e1cc70c389a63df586d3d77426b7878027730e44a24270b15bd78b51143c66416a31e2b34fc91f4aa5db3 SHA512 328ad9b52b99b51979da4a7e7f8fdfefba0240bebfdff4090f807542c96ad689b939c862085b4cc0b8757ea1720ee98cfed894cdc9d91c5e16eb7b59d714aabc
+EBUILD httpclient-2.8.3.ebuild 2003 BLAKE2B e378f622692eaaacb15a7cd0fafc012b24abd84a602c83cffc1e1e14d1550306f3c7ebd9b06e18fbc3192bc3aac20cc39d176d06ca8c8ec8508cc38335035779 SHA512 9cbec223e251bd2150b397719f4b7800eb83ffd821d7f626ea892572e372bf48143f5532c59001a2d1ba9157a6c68ac0b37055105d93329fecf3b4827a9d3397
 MISC metadata.xml 341 BLAKE2B 09a632c45802b3044056e60f69c99f2829bd710728ae4014de53ef83dc1e273a6e751a1d84e08195319ea207e8b62f11a1d055c96f6f161483a00746d6103cd4 SHA512 04d6c137c27403e7512feab47cd105f6cef456af315ec05b5204022eb9a8b7eda358f3ef4a19ff457770b3898c6395055880f5a162477f15d0948b148c902288
diff --git a/dev-ruby/httpclient/httpclient-2.8.3.ebuild b/dev-ruby/httpclient/httpclient-2.8.3.ebuild
index 7479097a9286..b359fcf1a0ea 100644
--- a/dev-ruby/httpclient/httpclient-2.8.3.ebuild
+++ b/dev-ruby/httpclient/httpclient-2.8.3.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/nahi/httpclient/archive/v${PV}.tar.gz -> ${P}.tgz"
 LICENSE="Ruby"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index dc210ed94c5a..e35ea5943fd9 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -13,5 +13,6 @@ EBUILD i18n-0.9.1.ebuild 1393 BLAKE2B bfd42402e4c243c86285c6ee40019454595a17b38a
 EBUILD i18n-0.9.5-r1.ebuild 1466 BLAKE2B 4fa4e7bd038ec1edb85e3c8fa5d97c29e263727fb0f2a89c68858bf8e8e1d0903a883f29e1eddf26f2444cba486a9fe761d96740bf64a52ea47e0c23760be844 SHA512 03e9185d1ba538e167f11805935f4e17ff0f381a81ccfa289d19fd37bcd38d8892db89ebe99699031d957b275ebe7a02fd6e89bc21f9a08f2ab2c2fb3ef43bf5
 EBUILD i18n-0.9.5.ebuild 1475 BLAKE2B 177aa41b3e8af750c7eaa59f3c1f8bbf0b8cbcff0b2797ba68ad11d0153339faea0e6fc70f6883d4ad084a3d68f3d07814701b303aa0b56126d9819b3621d9ad SHA512 ea69750d22d11bd6acf125dce3677bf5550d1ec5b421e449f8dcbdc3c16a883e54abf09ecd62f952fdc695744318fe7214ed502094b7d9ff3ce102a8ff31687e
 EBUILD i18n-1.0.0.ebuild 1473 BLAKE2B db2fdf21648ff851b12ce06b91a49dc23bbc1b9c2030a0cab4eefc14dcfbdf81e94c13b8155cb0b4e1e924753f5834e2786d68550961aa74d64d9602880cb2bd SHA512 663274fcf31d82f478ddcd5e4eadf84f3cb9b59b891ad42d851d493b673e06a919a638db2abe16688688fab986c921e3f75deddd74a7a01677ae793933c894c4
+EBUILD i18n-1.0.1-r1.ebuild 1501 BLAKE2B e168d9e52efb48344ffca7b6628cfc1ac7b8a2e88e025de6e1ca3c2376bbb591a72e3b3e29eb26fcd94f2083c8c9d6914a8c7375173892b83c5a923737b81dcc SHA512 6cf36365d47e0cbf155d021cce55488407816978a1d90d34287ce177f3215d4433093c0174ee0266839054ccb7f2417954fcc1ea06dfd35a11e92e294e7eb073
 EBUILD i18n-1.0.1.ebuild 1473 BLAKE2B db2fdf21648ff851b12ce06b91a49dc23bbc1b9c2030a0cab4eefc14dcfbdf81e94c13b8155cb0b4e1e924753f5834e2786d68550961aa74d64d9602880cb2bd SHA512 663274fcf31d82f478ddcd5e4eadf84f3cb9b59b891ad42d851d493b673e06a919a638db2abe16688688fab986c921e3f75deddd74a7a01677ae793933c894c4
 MISC metadata.xml 340 BLAKE2B fd50e1569f22c70ba423cfd181cdfbad5348aed4ffc751ff04d38db0e3c64ec0e3d7501fd134401337337549509f7501a23e36b8a9bdd99a18a374885f8c8596 SHA512 09bf74eefe2371ac635fe302efe1b928e37cf0e1da0979f629085f357bc3e93ea87407781ad172139166f21cb979dbbc7e1bec013f8fe0a760cbbe94ab23ac64
diff --git a/dev-ruby/i18n/i18n-1.0.1-r1.ebuild b/dev-ruby/i18n/i18n-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..4b4f9e363e13
--- /dev/null
+++ b/dev-ruby/i18n/i18n-1.0.1-r1.ebuild
@@ -0,0 +1,59 @@
+# 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="test"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Add Internationalization support to your Ruby application"
+HOMEPAGE="http://rails-i18n.org/"
+SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/activesupport-4.2
+	dev-ruby/bundler
+	>=dev-ruby/mocha-0.13
+	dev-ruby/test_declarative )"
+
+all_ruby_prepare() {
+	rm -f gemfiles/*.lock || die
+
+	# Remove optional unpackaged oj gem
+	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby25)
+			versions="5.1"
+			;;
+		*ruby22|*ruby23|*ruby24)
+			versions="4.2 5.0 5.1"
+			;;
+		*)
+			versions="4.2"
+			;;
+	esac
+
+	for version in ${versions} ; do
+		if has_version "dev-ruby/activesupport:${version}" ; then
+			einfo "Running tests with activesupport ${version}"
+			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
+		fi
+	done
+}
diff --git a/dev-ruby/instantiator/Manifest b/dev-ruby/instantiator/Manifest
index 95bfb45840dc..d0038a75be61 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 568 BLAKE2B ed7860ab0c18a56a3cd3a98af1bb5bf238eacef55f2c9d5491107aff803982b2febcc9f4dee408378c36e7c1f022667949da322c74a23303b1dc587eea59e9dc SHA512 d4663594c8a37f5855589a52b10e4d2ab13ce41b49ccb9dc218e5784f9651f77edcafa6d2aefb7dc58360aeb71bf407eb7be11da06a66ac822ce00fbd3d873a9
+EBUILD instantiator-0.0.7.ebuild 567 BLAKE2B 1cfd7311dd0f302254625ec9390d15e308e8397406a0d9320ad6fcc9b7829ebfac4237a0608c715bc57019aaba7e36661b80827b83cc70f706f676bdfc8433b4 SHA512 3ec6d4549724dc46b712ef3e560624b014a3f4d90c9efcdd9976f4d11853093346a7f1d8e2a7530da28cb9380d2aa5ca1273e76e34a5d8947a0ce3bb4239bf55
 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 4ca35a2c7a6b..e9b004c8f8fb 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 fbba6ef669d7..aaf7e0691ba5 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 672 BLAKE2B 27220f278b3ba844b3b610aea19d5ac2e4ca6deaccd9e1e8adaa958af359d5c0850691be43c156935ee017842aae49c861790c193982fa60cbb36c80145b188b SHA512 d7307f04bca66165315f8dab16238c52f9a48ac8be76a7f68836990f0832105d9ade22bc2fe39ceb847c5e12c64852182c8425c124a213920a199c44a500321c
+EBUILD introspection-0.0.4.ebuild 671 BLAKE2B 26cc2e77805c8a4a4299da9288f01f0957a2870144beb79a4877fff19f45d5e31065ece3db747b85394a765e5004187facfc724553359b89b541cd2d62c71682 SHA512 403fcb81ec1aa8f77d6d9b57834b6cfc307c56bccce100f8b690a0c6189b3a668f79f0c172c7623e56cb2ac0c8a5a852363836cfc72c68631e348c918b7d636d
 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 71c802b5ee83..02cedee13c23 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/itextomml/Manifest b/dev-ruby/itextomml/Manifest
index 29d0ea035e6c..1f443f803883 100644
--- a/dev-ruby/itextomml/Manifest
+++ b/dev-ruby/itextomml/Manifest
@@ -1,3 +1,5 @@
 DIST itextomml-1.5.6.gem 125440 BLAKE2B b0894d26d20e85454c310589509cb0eef371f3c9139450ce8dcd25fac6b83e831557e05ba54b449557422b23d59868ee75f022fe4ba1c205d32926f923986864 SHA512 b74f5a9ca4eb669fee547bdf729e456dfe07b8be4e9ac0d1b7c3ad5d4e99371ae7b5bde565e6472ab07bbcec2754d4ee628ba07a6a7e938ea8a55a6023c2f1fd
+DIST itextomml-1.5.7.gem 125440 BLAKE2B babdfdb7e81415a06875ba72a84da31f910bb0f634e2fd2ea724785b56d84b6d6ca7e544ddfe617a53c91a89314f0e0e8c2ac0f20f0cf8e26c11327f865e423b SHA512 65fbf03096695330e32ac9093e923ca50bb92a3b32a7657bea65e6abf51c7824fc8b650f564352c41d28e846cba62a60ffbd57ca14ad2587e3164e48d7d1043f
 EBUILD itextomml-1.5.6.ebuild 742 BLAKE2B a3b0c797eb53d82160e9fec01e2c2af41be577d5265cc69f2cdc0d3c25f3a61f3b5764213434f9f88d9b41cca9ef281435de017bbf01a7280a30d3e2efac8ffc SHA512 981eefe3909d3bb29cebc9751026f2d057372a802437ebea804d2a92a184913a1eef279a1a5f78ac1f447dd464ae2117efb08c774ddb3b141e3feb1dfa7e40ef
+EBUILD itextomml-1.5.7.ebuild 742 BLAKE2B a3b0c797eb53d82160e9fec01e2c2af41be577d5265cc69f2cdc0d3c25f3a61f3b5764213434f9f88d9b41cca9ef281435de017bbf01a7280a30d3e2efac8ffc SHA512 981eefe3909d3bb29cebc9751026f2d057372a802437ebea804d2a92a184913a1eef279a1a5f78ac1f447dd464ae2117efb08c774ddb3b141e3feb1dfa7e40ef
 MISC metadata.xml 257 BLAKE2B 6339b8ae3ef779011f34940b5af7faca341317790ee6752ad73cb83db463ddad10b25cacf16f73ce6d0fde976d916e2838e6209bdedfbe5ef6da285be302203d SHA512 d86ea11e509e5d031f82c4bb476a5974b85d812abe415e95799bdf34a308ade95e2f1cf35f6af84ae5acd0f67996b150c02712b75ab4f5a1ff4eef0ffb046d7e
diff --git a/dev-ruby/itextomml/itextomml-1.5.7.ebuild b/dev-ruby/itextomml/itextomml-1.5.7.ebuild
new file mode 100644
index 000000000000..8f5692eb0c80
--- /dev/null
+++ b/dev-ruby/itextomml/itextomml-1.5.7.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_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Native Ruby bindings to itex2MML, which converts itex equations to MathML"
+HOMEPAGE="https://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
+
+LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+#Tests don't fail here
+RESTRICT="test"
+
+each_ruby_configure() {
+	${RUBY} -Cext extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext
+	cp ext/itex2MML$(get_modname) lib/ || die
+}
+
+each_ruby_test() {
+	${RUBY} test/test_itextomml.rb || die
+}
diff --git a/dev-ruby/jeweler/Manifest b/dev-ruby/jeweler/Manifest
index c8adb18c0290..1c3c487b4b72 100644
--- a/dev-ruby/jeweler/Manifest
+++ b/dev-ruby/jeweler/Manifest
@@ -1,5 +1,3 @@
-DIST jeweler-2.3.7.gem 61952 BLAKE2B fff72e299131b3080c36002e90d36e89db8fcef85cb5e8cbb0976e4b06f0555117d2b6e6375d298f03683565a8d2826471a2f847f481f215d1ccdc231346e1e9 SHA512 4ca397c75059a28d623afbb22fc5b2b5627e7c3f078b2b77eb623d0b70f518fa58fce54526e12b417ffbf40e1b635dfbd57ff1d91264ed3ca7bb6917bb4ca784
 DIST jeweler-2.3.9.gem 61952 BLAKE2B 2c802f27db9a5018473792c184c56b1d2262ec4e30ba24da964bd8dfebecc7551ea50f4a4c0f823907a14afc5358036ff2efb0d9e8404befb2c451688f578b1e SHA512 d8e91702cf046cd16b5b0f718966adecaa7777f2ce526e3fac3be97f8e91ffa32362a9a96d1c8b390b400f38d0d7a59860437487459cb0490366ef2d38fec6f2
-EBUILD jeweler-2.3.7.ebuild 1810 BLAKE2B 5eac599ee75477850d05a0f8a9cfa7b73b9a641fa6ae9b9fa341666ae906ddaf02682876d94ce17953ecaf72c28a36010db4b3f7b91683552e225b918e49121a SHA512 d861f57caf2d4f824d43ed56371494387211868024fa93f2f24e1fdd64be9ebea1bb92908a2e707d48beb1931eee9737f5dc1232016dc57ed86af1ed6ed9806e
 EBUILD jeweler-2.3.9.ebuild 1794 BLAKE2B 97acccc69294783beb56ea36911ee696bc661530fc8dc607b54b513f7ef624421d5bdc0004c91c9f394c113c8b404b68438fa6e1d5ef1fdf02ddd0a7152ab222 SHA512 d84abe728c83b52a0365e09433bdb5bc5d657619456e6ece14bd4e639bf8fc4307969e75d33580360fbc7864f548b1106ed06736ac3c7b01c595c73a58bcecb1
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/jeweler/jeweler-2.3.7.ebuild b/dev-ruby/jeweler/jeweler-2.3.7.ebuild
deleted file mode 100644
index bbe331659d1e..000000000000
--- a/dev-ruby/jeweler/jeweler-2.3.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC="-Ilib yard"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-# Tests and features also need the same set of dependencies present.
-RUBY_FAKEGEM_TASK_TEST="-Ilib test"
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.markdown README.markdown"
-
-RUBY_FAKEGEM_GEMSPEC="jeweler.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rake tasks to manage gems, versioning and generate new projects"
-HOMEPAGE="https://wiki.github.com/technicalpickles/jeweler"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		  dev-ruby/shoulda
-		  dev-ruby/rr
-		  dev-ruby/test-unit-rr
-		  dev-ruby/test_construct
-		  dev-ruby/test-unit:2
-	)
-"
-
-ruby_add_rdepend "
-	dev-ruby/builder:*
-	>=dev-ruby/bundler-1.0
-	>=dev-ruby/git-1.2.5
-	>=dev-ruby/github_api-0.16.0
-	>=dev-ruby/highline-1.6.15
-	>=dev-ruby/nokogiri-1.5.10
-	dev-ruby/psych:0
-	dev-ruby/rake
-	dev-ruby/rdoc
-	dev-ruby/semver2
-"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm Gemfile || die
-	sed -i -e '/bundler/d' -e '/Bundler.setup/d' Rakefile test/test_helper.rb features/support/env.rb || die
-
-	sed -i -e '/coverall/I s:^:#:' \
-		-e '1i gem "test-unit"' test/test_helper.rb || die
-
-	# Avoid a test that only passes in the git repository.
-	sed -i -e '/find the base repo/,/^  end/ s:^:#:' test/test_jeweler.rb || die
-
-	# Avoid dependency on cucumber, make sure semver2 gem is used (puppet also provides "semver")
-	sed -i -e '/cucumber/,$ s:^:#:' \
-		-e '1igem "semver2"' Rakefile || die
-
-	# Loosen github_api requirement
-	sed -i -e '/github_api/ s/0.16.0/0.16/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/jquery-ui-rails/Manifest b/dev-ruby/jquery-ui-rails/Manifest
index ed71d8b0ca6b..46c553a915a6 100644
--- a/dev-ruby/jquery-ui-rails/Manifest
+++ b/dev-ruby/jquery-ui-rails/Manifest
@@ -1,5 +1,5 @@
 DIST jquery-ui-rails-5.0.5.gem 163840 BLAKE2B 6eb6b788c826da95143a2d739732e1d1c18a13e76a71a0666f5b4163ca882b4b2b68f273610ccb340352b13c0f6763348fa4ae80b1f6a79d5e6d85110a06a36a SHA512 1db2e47d6a70d4326a25e89d3ff297e39bcbffbe644ddd97b95a837c3d4af7ff812bf165858382e0448f73406a4edf2b7e9c0e1622c1fdae68c52b1a60f77ff5
 DIST jquery-ui-rails-6.0.1.gem 175104 BLAKE2B f990968bc75d5f2c5556363f41eafd9ce2207dc08e20bbf10f857656219253fd5f29e8b4d131f7a8b942682d6c32bb11797c08621b34847f77984e7fe57e111b SHA512 ec0fd8c15ef9dbdbef01bdaca22fb36251a2ced090ade6859cff7c72e183c3c750fc384fdf757db7160ec1c6426ce84c972cce255c3d42a2bb9ebe5539390485
-EBUILD jquery-ui-rails-5.0.5-r1.ebuild 541 BLAKE2B 1386dcc1f7251b9dad930c97ca4f07e0e2fc022f0fc0f7d7a3e293e7a245bfca2e3288e9fdcb85d50e161dc4618aca66b11da00f8385b0c3f8244e40f5425ee1 SHA512 21b0e16b8458fa13dd8745bb0fdc382a17555a35ad536daa25de8d920ad0f214cc10a8b9c5067fb965bf60b11bc08327dbe73f09e5860a09c12d0077c7e8c836
-EBUILD jquery-ui-rails-6.0.1-r1.ebuild 556 BLAKE2B 86bce36cf8ad4bdaba4046c26d848f8abae15eb2836aea67eeb1733513075396a2bcadcd5c7c1833d4c9f0057ebdf82f0beb4bea137a7643af85670a6878413a SHA512 06cc653793a8dfd9fcf2c5a14706d67b4fccdc347c94ecef221e1851a1639289c8565a65a8fe04603a29ca0727c7faf45af946ed521905dd1537979eb3591da1
+EBUILD jquery-ui-rails-5.0.5-r1.ebuild 541 BLAKE2B 81e1cef5a5cfca5faaff1d1b9c10a926299539c2a220e35a2c6aab3796fd304bba8ba55d177b81811ea08054d3111f58eadcf37a1eed9d0ff605f4302fea59f4 SHA512 4b2022b50cc838313be85fa76c453629e9f72355e3618ea13507c14231e99e47cf59547a15d55bfbc398131632171b76aa567b3f8ef0f0e978213485b067a23c
+EBUILD jquery-ui-rails-6.0.1-r1.ebuild 556 BLAKE2B 6e1d56e780cea745562d9b2ca8c944ad247e2eccc71919d4306a8349904731ee59d4241af60d26781fc7e4be3197e79e7c5a329a7375d057f512ac6cce665d88 SHA512 d3002d0104454c1674361c479ede78a4e97883f615ea65882c031cd732e45238c2f7af5919f3e7aaf91b03306423d05a34992dc00efa6b547fc3b7df51697cfa
 MISC metadata.xml 338 BLAKE2B 6a200e9f8a3f4c11774a587a5b742e8acb4ae7651694adc7d27240aa86a8b38613598cdee1d38bbc9b5aaa4819c702aac8e638b1cf9650619f3b5bfeb7278a7e SHA512 6af21bcb48be71d72486aa079919f8fc18c54442b65598fc8500ff3fbbf0fd49f1d3d51b86ccaab4f625fba5ac07ebb44c69fa2d7e64a4821983d0eae49f53c1
diff --git a/dev-ruby/jquery-ui-rails/jquery-ui-rails-5.0.5-r1.ebuild b/dev-ruby/jquery-ui-rails/jquery-ui-rails-5.0.5-r1.ebuild
index 3885378910ad..f27e9179bbde 100644
--- a/dev-ruby/jquery-ui-rails/jquery-ui-rails-5.0.5-r1.ebuild
+++ b/dev-ruby/jquery-ui-rails/jquery-ui-rails-5.0.5-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r1.ebuild b/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r1.ebuild
index 817e0c54f24a..d9857ba11521 100644
--- a/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r1.ebuild
+++ b/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r1.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_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/logue/Manifest b/dev-ruby/logue/Manifest
index 81e207c562b2..eda79cd168fd 100644
--- a/dev-ruby/logue/Manifest
+++ b/dev-ruby/logue/Manifest
@@ -2,7 +2,7 @@ DIST logue-git-1.0.11.tgz 11535 BLAKE2B 6515efab4cb42fa7a787bded637ea6d21ff9d4f9
 DIST logue-git-1.0.13.tgz 14389 BLAKE2B a6886989e561124904e6e6016c84b53abd1ea5be2f92958dffdc9b5ce9741728b9760034a9a7517ff35dfe0ebf10d6a6937aee426b85de3e71690098e9eec0ad SHA512 677ef2a8fecc50cb923dcf85ab0bdd984ea5806c31e11df9438af92912b94a4ce227837fac4baee05595f894f6a0fd4167f2984357628eb3e8036479103340c4
 DIST logue-git-1.0.4.tgz 17797 BLAKE2B be99a6c9ecc8bbde25d9a485d83b1d485e7afbe3e5fb8954dd6140881bff496c48185e15ad4596bcf7abba3a19e556da9ac6d44623be33887e32590cb35abd0f SHA512 e3d6ec6a8b302fbdf7a2b7842b31f88af4f0576166b632dd356a40902dc816bbfdaf18a170d5c8066fbfa97643d38d6c8137d4f435f478f04badae4a0120184b
 EBUILD logue-1.0.11.ebuild 641 BLAKE2B 268a65af2a5250319bdbdf3c72f28a8a213e16a5a020aa3dc656e5420141788fab4226ac99a10871216c80242b1b7d27854ecede4bdc9f3dc5501e06704e5083 SHA512 49763d1cede8d908ef5b86a47e07e200bda2d7be3e62d276a793643e3da26b863a101b5f1ca7046af8c74d460ee6cf673c90c70358936e20afb05ea98b739ab8
-EBUILD logue-1.0.13-r1.ebuild 775 BLAKE2B 8f4f23b714524cc4b4889d50facdd4683d18aabf52825e1941db71b18f191d9167dca3459ab9cc0fc7545d59d3ac48f8976ea91b6a5019102e5b52b88e3f176e SHA512 93c7a3418f77cb3701291003ca1eb5d03ce5110565ed7f08026e796b01a401770eef5fe5b48079490401bab33fc631e89b07fb34db3465d5166fbab34fe69ee5
+EBUILD logue-1.0.13-r1.ebuild 782 BLAKE2B 7e66445529c698288a8eaef756ae9c111a87820e2150cb0b6e6e0636b022104d5ceb654feaa86323c7695ea69b2c932e605c46529dcb325274b3dd560e251648 SHA512 263ad8a0127d635fba7315681500a1e3a5cd8d7e1802ce8c7463fb40e4bb8aca69dc153f7054c921e4a1db53626d198a7eb8368ef22a4257cd0068624a917187
 EBUILD logue-1.0.13.ebuild 744 BLAKE2B e7df279983c71b4d2b61f58cf33bd488263545eccd10ec4e715816b684366db24c5530901db6ba52d3d950adb4d4627f619cc331f49b29be19ca830dfb9946ae SHA512 721482f9aa82592cb7624e38f459e455cca7f075d02ff5c29eb5ef62838cc9e28f4dd46713db40546b78e59d946628427c26a2dd034fd9c0cfd0264275375dfc
 EBUILD logue-1.0.4.ebuild 601 BLAKE2B ce2b1f04851d4e26bff1a1bcc2385786c7ed3cf6bf3afad51bd4b6f7a451f322a7c89e37de17fd404ae14eaee066b99d959185dea984831c6483b663b1c4ffd5 SHA512 f3800e592f379b269bb25a2c6ab8ecf64fdbeedc91e7712989a2021181c3081231445c906f3303f0add37cc230e97227f44c8349e6afefa0d3ebf171e03d9770
 MISC metadata.xml 337 BLAKE2B 045c92dadbdfb3a0c0506734134b5c62b6fc842e12cfbae746a6d9cf07dc65dd5d240575639ef8563baf4d201a43d1b3aed0f3ebf54f88a85e7cf8305926d29d SHA512 2d11804bc1d4e53888e62609677d7bc0c20882ed3cc779dfdf5733adf9cc94ba671af7e901724fe30159ebea1cdcb1039e5c83ead45ebff75b9ce64018bbc1f6
diff --git a/dev-ruby/logue/logue-1.0.13-r1.ebuild b/dev-ruby/logue/logue-1.0.13-r1.ebuild
index b6eabce1a05f..a270a9b23874 100644
--- a/dev-ruby/logue/logue-1.0.13-r1.ebuild
+++ b/dev-ruby/logue/logue-1.0.13-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jpace/logue/archive/v${PV}.tar.gz -> ${PN}-git-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/rainbow:3"
diff --git a/dev-ruby/maruku/Manifest b/dev-ruby/maruku/Manifest
index a0e4ea93cede..a78335b544b9 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 1259 BLAKE2B 3d9351eee705c93b801e4227ca4b62bf9414f3b6a7c597d8b048cca3f22e4205e5036f35af55f3d8bced1cb77fd67a5a05f3042b18784af2567b3865e8c68281 SHA512 8c16aa1d3f1b43bf824a1633210f22d729fa92e933c7934cd33889e325d0e77c2f422bd0e26f396a927ca66d20d5837bb80d6e722365eda470ebdfd420e6042c
+EBUILD maruku-0.7.3.ebuild 1258 BLAKE2B 0864918b72e8f123c9277d78454526c12ad9aa4aeb63b6e79efb5d74d454afbe52f5dc08780eb9c7646659a2c7edbd18d17b0e017a5e540ae61e987bfb0f46e4 SHA512 2c25cc6941caa6d8aeee193b63424e18bd1a442ef268c5383637699c35249d2cee6ea769ec3f92a56e6071af20193d2cb9afd0327fd31e78b640f011e28df23f
 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 9a21bffa004c..f58ea3aa540e 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 bd4a98eb3376..a2341dc675a3 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -4,7 +4,7 @@ DIST minitest-5.11.3.gem 79360 BLAKE2B c348957e094bd91e88c6dace522b8e88c37ec435d
 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 802 BLAKE2B c9897425c76c8606de9431650222bf3b781575bb807832234c7c7ae0bbba8f2fa87bb9465551c2f86a785b32e500564dc40da27a9271bb87d2e25d0d63809cd6 SHA512 1a01a36477178f69d450acabb1fbb5c9484cefbb045135192c41c8fe1d4d528ce47dd400f09855948d961e05021793489e28196af275b62af8601790101c4491
+EBUILD minitest-5.10.3.ebuild 799 BLAKE2B 5b85f8ed5164d1a18078275098cf2536e8baa94a30f23a4e0225dc977db815b423bf6ff187f0788cd2b3897df83a0b48637431122c0ffdce71e8b8e99c5d8e2d SHA512 0b8d6a16e230cee7382d219f266a6fa440657bd3a38d70430a3af039677f23daabfa0a7ffbbb8e4a8dc576debfd462b5b7f6eaf53fdcc92ff037ac0ce378e237
 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
diff --git a/dev-ruby/minitest/minitest-5.10.3.ebuild b/dev-ruby/minitest/minitest-5.10.3.ebuild
index 4fd4a1fe9f82..1ac4b72abda3 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/mocha/Manifest b/dev-ruby/mocha/Manifest
index b677072ae564..dd7c42fef44f 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -6,6 +6,6 @@ DIST mocha-1.5.0.gem 93184 BLAKE2B fe29eab462db2283449587324fa7c607c84bdc6cf8106
 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 863 BLAKE2B b0b427f0b0b4b110003ca1458c60e20e3ac7cdd47828adcc89ba92a5f68a77e5bb6687421bd86bd943ba5ea52213719eaea97dd6eaaa20537c154855f0d6124d SHA512 9aa1ccf6d09ce28273c7cf650e941eb5d07a8ae18f6fc7e03aa81de11323e1b385d693c362cdadb6475fb9e981eb3a4f269fbeafbef86925954225ff0a460166
+EBUILD mocha-1.4.0.ebuild 862 BLAKE2B 14e7b0832e8550fbe1ca39c15cfca1c5dd484e3c51fada45285b0d1b94e4e2f3edd0f1f228344f5f1353a388b0d706410de94341a824232530e2d09c01e1a71a SHA512 b55bf4fbbda81f9f9b36f4871b501b5fc31923db41025f1bbc41bfeb527b6e4634d4e495b4a1096defaa6a7c30226307fee1b9812a1c25ec510231f2148b202c
 EBUILD mocha-1.5.0.ebuild 868 BLAKE2B a3f08dcec677979fc2fc3daeaa93e15ccf712b6d9e72959ce5f6f5fec7bbb0ff3fa40fcdca9214f9b8df64c8cce6e3bb14cd9eb0a9fbe9ba9ec6232288c498d5 SHA512 2140cabf3e252fbdf6a15817130c5876ab4bab69a79097af5de290ff36d9381616e3e995a9e21867c36d95d2afce788f3e417d20370655fddb29fe1a2057cdc8
 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 aab14a01606c..e34a7ae12d24 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/mustache/Manifest b/dev-ruby/mustache/Manifest
index f3c2c1f99f63..65d651bb3dbd 100644
--- a/dev-ruby/mustache/Manifest
+++ b/dev-ruby/mustache/Manifest
@@ -1,5 +1,5 @@
 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 909 BLAKE2B 35984a90a2e2869045d1511a3c24a258ac3fc262dd6de51748b464f8a184f5e887685e1a204501a4013ef2f4f0fb0b057d19d33fd64a9d5b66171a1545d77ae8 SHA512 4cceeb61f41d50a9b7295d41f9f41f02f7abf144359eaba451b4fa7ac69a4e601f6cd6f36238dad6769e15a758ace2b70e8f38573559ab0ad560042c15b64a98
+EBUILD mustache-1.0.5.ebuild 906 BLAKE2B db4ffa66797fa32d173bc30612065ee9c2c9805197d2f826c011a589dcaf40a19a851637d7c9e982c438ee81b1ea6fb1ee1d247486d4137a5ffe5b6d7f43ead9 SHA512 25677fa12890c3e5a885debd5014d6d4cb509963fac3a6ed9bdc43637cc12c09fac8f70e47fb8c42796fa25fd4b90d6a56009ea1a86653bbfb8ff3b1bfccafee
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/mustache/mustache-1.0.5.ebuild b/dev-ruby/mustache/mustache-1.0.5.ebuild
index bc2e6ede7f9c..c98353187531 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/net-scp/Manifest b/dev-ruby/net-scp/Manifest
index 4d77b26b056f..dbc0a499a805 100644
--- a/dev-ruby/net-scp/Manifest
+++ b/dev-ruby/net-scp/Manifest
@@ -8,5 +8,5 @@ AUX net-scp-1.2.1-raise-correct-errors.patch 3046 BLAKE2B aa0e36edfdc85c944d3ba3
 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 1067 BLAKE2B 294191a95549126cafb3f1a149042223853f45d24444c93aefd60b0aa0b80fb52bdbbb1bd1d55fb0e70fdfc8b79790c1dda23bb55327e6dbcc8ba1943ba80781 SHA512 5ff115becd5e667c795f1cab5e586dee4c14d450ba5c6edecb4a461d0909d93748d165fba11e0cfc06a8688fc66a88656cb4b2cab552d7cfd3b3fe86832e8fb9
+EBUILD net-scp-1.2.1-r1.ebuild 1064 BLAKE2B 58cf422c2598d0aaac3991578e6990e6929f7d84af8e1e502fe01efc6a742059213234ad2f2aef80ab5045d3be1e584a75062f25f485d3c81ccc1bafb7c38478 SHA512 b766fd29fcddd1f1eef69d23d4884cfbba3b8c94080c83be30fe39eb895d86d7ba06317a1e61c0f8420174cccca7f0e8b9ad7caab27dab781cb0287d796c51ba
 MISC metadata.xml 341 BLAKE2B aec6f820a216a818e7f6a82ffe48f73a01cc662d9a5e10a5dee98885f564560644e377158ccd5c4cb6e914205fa5aa6753aaf5dcd52e1849437955553f3c268c SHA512 bbb71a6668f329ca9b1f5636aa71720a8234a7683fe374b2fde4113ff56d3a5c2242bcba7e3023090a7955870715e0040d990326942def6d3be7e31d5f07d39c
diff --git a/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild b/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild
index b0d5247366d6..312e76dc2f1a 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 017369149c1d..6e199f03f41c 100644
--- a/dev-ruby/net-ssh-gateway/Manifest
+++ b/dev-ruby/net-ssh-gateway/Manifest
@@ -2,6 +2,6 @@ DIST net-ssh-gateway-1.2.0.gem 23552 BLAKE2B 9eb12c34b3c0980a9bc2058ab68b0511f96
 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 844 BLAKE2B fef9154db18e39fe1bc02b8f073589171b701bd59d5c4e53fec2a402ecaec3c980b5919e7283dc0f1440e9716b7a4188753e20b12fa011cbff9f0e526c4ea612 SHA512 7d77070fa0ace7779a4b32a2c409bd955a7c56b55db00f3f841d589b63bf7a29e65abcdb6364160c43c3f853244715a43ceb35f913f6ecf9dce0b1c49b4d8385
+EBUILD net-ssh-gateway-1.3.0.ebuild 841 BLAKE2B ff40dcf5a089d637a07c4436b07bbd7dfdb8826229a620eb56dc09f99ae9537aad95ff923a9e6a368607f937a06bb63911aa954e1a201165e93ca46ab17ccc45 SHA512 9c51faf97276dccb79f98df0051eb2f4d687f3f4eeaccfb74f1882437b97fe184137a29bd76e10aa9f79bf58e4ffa154aa9ebedc0048958583d0f1b65c026198
 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.3.0.ebuild b/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.3.0.ebuild
index 4e1440f3800d..76a4b19f2e30 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 35357f4740d3..b6319367db0a 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 1106 BLAKE2B 0ec6f872ccd878f9bc2af78098287cc4e918893e88bb8712b16f4fef5a733d5306aa1350190a344048d12aa3a1560b46bad56a5868dc682700c4f825e23b2150 SHA512 17b60cc8f4bc9b615ba95e5200b63f501f2d545ebae1ebd18e29bb5f013afdfc7f97f7e9d031fbef7704d7955dacf5dcaa65c71e282e716cfd630ecd1b20bf85
+EBUILD net-ssh-4.2.0.ebuild 1103 BLAKE2B dc9fcdbfaa2981422e54186d065a7beea532fae698fb5a071e910405a6b9a195322cff7a6af0085d9ceb3d4cff0b55869676925125e0df189d4da5463382aaa8 SHA512 1e0525a708142728fc71029e084ac95a5c06ac49aedc447b426fb2727b78aa8e515c075897587137a5153c8989cf80b037d503a02016ba0db00a3bc100dce7fa
 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 6d01274e11ab..89e2cbe7b45f 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/nexpose/Manifest b/dev-ruby/nexpose/Manifest
index 4e193dddd4ca..084b2adc4b0b 100644
--- a/dev-ruby/nexpose/Manifest
+++ b/dev-ruby/nexpose/Manifest
@@ -1,3 +1,5 @@
 DIST nexpose-5.3.2.tar.gz 111862 BLAKE2B 4d42038f8b4eb0444f54df3139e4533437c081521ae586f79baa80a812dbdac9c56bbfbcfb24f1f4fcfb5d854507374d9dbc5f600f79b09d918322132dd00a7f SHA512 7a79a796e853cfe0d5e3f61b969903f3ecf033914a8caaccb4ff175774ab2ec187a2b7c106f91d82e65edc35fab98621c1ae831017268fde2e8714c45346f4b6
+DIST nexpose-7.2.1.tar.gz 123143 BLAKE2B 2bf9a022c6695fa759c5193510c2cfa793b8014b36914c7806f1ee888ac8eb21466efa46539a9e9b7dab31454b8604b10b71d59faffd001254ee0561f456b707 SHA512 8c0d8b4537513396c9c7cb01330310ed30f8995890c60fdb956ad4760fda6e89a4d1d400e6b71cad1fd2d8c5f2176074c415d35597b1c8740233ebcccbc7d870
 EBUILD nexpose-5.3.2.ebuild 865 BLAKE2B 1e1cce7a2d790d57981109aa4bc18b1f46ca469ab29952430ef271da9871c0563d7d9322666fa8418d358a1dc5260b04fdb454086601dfa57f9de94bc29954a4 SHA512 8bcc237e7dfb47250bb628711d51e272b297825774adb266c628465192d3cbb56cecefdba7805d91ce9591c1200508687a0c766aa5ca335fe4d3157f45373ab6
+EBUILD nexpose-7.2.1.ebuild 856 BLAKE2B cfbbee796ff3216c10f1c9ba4184c34d0c838a335a70394fc2332dc4a1cd274595cab3f7567fdb00c49cb19014878b6c430166b7d7efa25c120c3189643306f2 SHA512 bdcde5f3f3591e2c22b22050bcf8a523f3b5c71600e0ce3bf968cb1a83a91361adf268ffbd8d86a55d5cc95baf65d0f6d8861103f2a0d8f4b26ef5e5c0ce627f
 MISC metadata.xml 386 BLAKE2B 38f2a377e32dca943f2ec8fed27ca520a9beb62e3bde0efe031eabddf4e2e82a85c48c20d66f7abc3e392306b2c31426e0f8235aea857d343546696436f6048a SHA512 eda3260ba0add70830dc9b03a10ee372363346646b2107e6187f4691ab9043eece8fd07f6a6c9c9fa9e87e4c63bb45b818fdb5ad7b663ccc1c5872c79ae6e2ea
diff --git a/dev-ruby/nexpose/nexpose-7.2.1.ebuild b/dev-ruby/nexpose/nexpose-7.2.1.ebuild
new file mode 100644
index 000000000000..b2a2709bd24a
--- /dev/null
+++ b/dev-ruby/nexpose/nexpose-7.2.1.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"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="API client for Nexpose vulnerability managment product"
+HOMEPAGE="https://github.com/rapid7/nexpose-client https://rubygems.org/gems/nexpose"
+SRC_URI="https://github.com/rapid7/nexpose-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-client-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-ruby/vcr:2
+	dev-ruby/webmock
+)"
+
+all_ruby_prepare() {
+	sed -i -e '/\(codeclimate\|simplecov\)/ s:^:#:' \
+		-e '/SimpleCov/,/^]/ s:^:#:' \
+		-e '1irequire "nexpose"' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/paramesan/Manifest b/dev-ruby/paramesan/Manifest
index cb53ea66c1ed..56f3f2aa53cf 100644
--- a/dev-ruby/paramesan/Manifest
+++ b/dev-ruby/paramesan/Manifest
@@ -1,3 +1,3 @@
 DIST paramesan-0.1.1.tgz 4064 BLAKE2B f6c0e8b0df885e9dda4d5c2a3f0226703a94237707b877a7b82d5b8b0fdc812fcf289019a1ed550640a7f99a59a0b0389407857bc0e21987c7dd734734d32c0d SHA512 927595ed9686fb8833beaabf4421cb2c4908bf6e2e1c656034a79c839c292b503ca0ae211f8bdd3916501a281eb2f0b374fc5f4c90615629170e1ba767f0e7fc
-EBUILD paramesan-0.1.1.ebuild 635 BLAKE2B 95f39842c372439c65f25637fae4411f4cca42c6a60574490a67d0f7b3a586213c8eb4e545bb78dbceff5a43411e89de791260158d519526eb00224a5e4c130c SHA512 6bc287e49ee60d3d37711e76b145fc1b3b708ee75367662e3e97b4a6a74c264be66d65e27e318ad38306dbc062194317f0d0d98a06632323bf0398bbed517058
+EBUILD paramesan-0.1.1.ebuild 681 BLAKE2B 717623661fc9e5ea003dd9cd142d57729cc212c89b817728a5b38df534718afff58727bf4062d19e35003613e073f3d02dac74e1f0cbba108c88bc001eed3f21 SHA512 87b6cfd25f17d7480ab2b48faf8ee414ad4a8d6d6fb741d347f482eca8b9f33f4d534f81e328856c594290ca471745df9c30a9ebda5d847300472ed09c34942c
 MISC metadata.xml 336 BLAKE2B e2b9e1f7e89c66ec2a9e7a7269b48f0eb15c8ed0997e8287d1ae187d4be2e9a52e420de1a44cd13b92f9ec80748b5b6d9ea1237ccac0fdb4e28728f380f58aa4 SHA512 9ff8be1939525ea473bc5b870130a9bc0ac3bdd8c1ca8578ae476c71f6829f1698f646e5661c10a5fa55f6ed0608f7369acf8de24036ed98f5ae9e55c63eef44
diff --git a/dev-ruby/paramesan/paramesan-0.1.1.ebuild b/dev-ruby/paramesan/paramesan-0.1.1.ebuild
index 07efac2d72b6..722012645a0a 100644
--- a/dev-ruby/paramesan/paramesan-0.1.1.ebuild
+++ b/dev-ruby/paramesan/paramesan-0.1.1.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_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -20,9 +20,10 @@ SRC_URI="https://github.com/jpace/paramesan/archive/v${PV}.tar.gz -> ${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE=""
 
 all_ruby_prepare() {
 	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
 }
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index 0ec8d477e8ab..fe9c7dca5553 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 1707 BLAKE2B bbf0de90919975e2a210db855aaf6a661dfdf7c281da982d7035bd4f3db806332e71be3d3e6529a4428613471939d133042dd41205df0d07ed68137a88fdfbd9 SHA512 916cd04d5dcc699968dda2da31e8f12c096b3f7726f12a4122d540fbe73bf06cde9a202d387dc445d780182f94b79bebd17a0d237c26cdac507771ff07295313
+EBUILD pg-0.21.0.ebuild 1705 BLAKE2B 4bd2da2760f0db193ed2b055c0b61511b010c62eed1e5aca03f166eee33006bb1459b35a243821e233883c98b1afa6cbd303e8ced293d9e8378687c7166e5a01 SHA512 04bf8259e5c1d6c59b18b6bdaaf8630915c22d9a6b2d7f394f5ddddae565b13f28a2ff6658c94ee8239983fb7c96048dcc97ad343e0829d8b2e9f97e5ef44ab8
 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 24430c4f4590..0121b1f24c8d 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 b926f348c8ab..0d0dfd07a12a 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -1,7 +1,9 @@
 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 1334 BLAKE2B 92f52321c24ac3ea93838011f12a015da03ec76cb691538174b7ec739e3707039102af6bed4fc780c9b3f26e9ea8a62c51ee0a6756d659857876b18e72673d75 SHA512 82cf59c52582b00c598c07dce17f931189199491d5489796d254ed33e59d69cc84cc81d38aa73fc8c5eb2c616bfc2c387aaa6624202174050bdeeb1abe49999d
+EBUILD power_assert-1.1.1.ebuild 1331 BLAKE2B fd217d26d23e34a04d18db25a47120f7f31495bd472b1d0ff9f2e5accbca00df2c1e0728a27cc03c058266691c78ec6570c53399224b47d14206af20d1cd8e5e SHA512 14cf05ddbf7d645804a4fe2ecd5e64de7a278c2e23028b468f6a4e7cfddc3bfa6b480b4d72bf45c68edbad1e8f438c246ff018bac2d630f8451ac1c0d31a9eec
 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-1.1.1.ebuild b/dev-ruby/power_assert/power_assert-1.1.1.ebuild
index e7e223d83bad..3960ea9c8790 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/power_assert/power_assert-1.1.3.ebuild b/dev-ruby/power_assert/power_assert-1.1.3.ebuild
new file mode 100644
index 000000000000..d7094d7ebe93
--- /dev/null
+++ b/dev-ruby/power_assert/power_assert-1.1.3.ebuild
@@ -0,0 +1,37 @@
+# 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.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Shows each value of variables and method calls in the expression"
+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"
+
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
+	sed -i -e '1igem "test-unit"' \
+		-e '/byebug/ s:^:#:' test/test_helper.rb || die
+
+	# Avoid circular dependency on byebug when bootstrapping ruby
+	sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' test/test_helper.rb || die
+	rm test/test_core_ext_helper.rb test/trace_test.rb || die
+
+	# Avoid circular dependency on pry when bootstrapping ruby
+	sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^    end/ s:^:#:' test/block_test.rb || die
+}
diff --git a/dev-ruby/rack-attack/Manifest b/dev-ruby/rack-attack/Manifest
index d0ae711610e8..ad5e9e71bff1 100644
--- a/dev-ruby/rack-attack/Manifest
+++ b/dev-ruby/rack-attack/Manifest
@@ -2,8 +2,10 @@ DIST rack-attack-4.4.1.gem 16896 BLAKE2B 0c7248c3676250a94078c23256d6f33471b619f
 DIST rack-attack-5.0.1.gem 17408 BLAKE2B 5aaba2c1b4b2c69a02734d082bc18e670c1c7ad8e2ea40945f3f3afa1f136c11bf74a582763d914ed0ef442e26ccfb35fc7328b0d7deaea74110deec9e91c84e SHA512 e5833d8506990d352073573de3b52deff910201f89f31bf9c4ded53644aadf52ee85b63a239f41e38d37baee4fb4c630f4c00abb1f0ea1fca1be78ca56e0e648
 DIST rack-attack-5.2.0.gem 22528 BLAKE2B 474b70dd4a4a949cb295922bdf9d141fd1c8241d9d2179fd43fe38a7d9687c39a712ad7473956302fa8f4f4bcf84cb284475a90e7e264f18f45a1e7228a66659 SHA512 f9d9e07a993e8bd93e7f09110055bb4ba0478019f1d08f44cc9ac497cd0badf1095a512fb5e556dc82ecc8ba3b9ddbe38ae6c8cd3c570bd29237a550788fe0ab
 DIST rack-attack-5.3.0.gem 23040 BLAKE2B 415df5f1d4b07de0a4e80f77acf59330e74893b3abc9863638628f36d8b946dd330ae931f672671f4a9fe1fc4b1f6bb12fda2115e3dec9fea58ed04577676c4f SHA512 4749d4a86c6f91618092614dcf99cbf64722d6de9bb1150208fb89ea83862b980581c543a46355b45b553f0132bab26ef0d16ad2e4a35677d734c4a6449a2d4f
+DIST rack-attack-5.3.2.gem 23040 BLAKE2B 169f14030860b2727a494cbf4770beb6c9f74cfd1fdb9a70fb95e537eeccb08f158d9de74d81061fde39413f66b805d9ace0a586f7232ef5eee9b75b8ab73e77 SHA512 de79fdf59786ee00077ab97566ee75e38d823d4ea1854ba877fa2fdb92ae659c0c1bb6aa6b47754b6e28f1a7dbd6061e57171b0b1626dff95c17178bf4891390
 EBUILD rack-attack-4.4.1.ebuild 750 BLAKE2B 5a51479a818bee5383233d19e11cc2b865f4a3e8a099dc7f442aa42ee9c71befece48d87f7d109087020301353067dc949e9bf73cdbfa5a59fad6f81307f4b4e SHA512 c144e27e9b68aa0ca675e2016b26d82a216ce4fa1daa781e2580002f45f9c855aa2000bbd24b86146b7f3dac0722f601c46ba7bb265d2d3de3788a5f0bbd5cc5
 EBUILD rack-attack-5.0.1.ebuild 844 BLAKE2B 98dda503f59371bd3268dac391344a203cfbaaea0107511b5229375bb7969b7b9c19cf629bd07c28dceb3cbdd1981b951a739fdf3f3bd9b99988cb3650f96f28 SHA512 cf115c97cd333bedad5e28ac75c905148bc6d2d75b0b82021fc33e185d6e37c361d679803602d26e52bd78f7073acf3c1c6c51fb017bd0155c5b34b4f202a030
 EBUILD rack-attack-5.2.0.ebuild 855 BLAKE2B 0f37b13f9784b107db4cead765db30198f70c6b73f4c28979d5b9f05386651b1d45225692b0047f485e4992fa70a7a9c455bbca5b9117629acf30bdfdbcb1119 SHA512 529d12a160929891b635ce973ea81dc7e523528b132baf2128bd282b651ee27973f8761c728f0c3c8a48ef865c8ba267b6e8e3764c14b37613cf766dc58258d8
 EBUILD rack-attack-5.3.0.ebuild 855 BLAKE2B 0f37b13f9784b107db4cead765db30198f70c6b73f4c28979d5b9f05386651b1d45225692b0047f485e4992fa70a7a9c455bbca5b9117629acf30bdfdbcb1119 SHA512 529d12a160929891b635ce973ea81dc7e523528b132baf2128bd282b651ee27973f8761c728f0c3c8a48ef865c8ba267b6e8e3764c14b37613cf766dc58258d8
+EBUILD rack-attack-5.3.2.ebuild 855 BLAKE2B 0f37b13f9784b107db4cead765db30198f70c6b73f4c28979d5b9f05386651b1d45225692b0047f485e4992fa70a7a9c455bbca5b9117629acf30bdfdbcb1119 SHA512 529d12a160929891b635ce973ea81dc7e523528b132baf2128bd282b651ee27973f8761c728f0c3c8a48ef865c8ba267b6e8e3764c14b37613cf766dc58258d8
 MISC metadata.xml 349 BLAKE2B 5e0852caf34767613f144f3a6680223198c6cad55b7ea30d0778d788ce2293a2586bf0edc698dc0a5edc11d4e1d408576ce9d7c1eb3602e7fe7f10e2be33c1ba SHA512 9584ab20de3f1604d81e9be1baa8b4e355e5a43fba3a0cfc43a3d4f5e67df0d089a906b479b99150f76e54d07310d650ae96171d6ddeb8e3f00a446e2a95a795
diff --git a/dev-ruby/rack-attack/rack-attack-5.3.2.ebuild b/dev-ruby/rack-attack/rack-attack-5.3.2.ebuild
new file mode 100644
index 000000000000..585b3e58c40c
--- /dev/null
+++ b/dev-ruby/rack-attack/rack-attack-5.3.2.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"
+
+# Skip integration tests since they require additional unpackaged
+# dependencies and running daemons.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A DSL for blocking & throttling abusive clients"
+HOMEPAGE="https://github.com/kickstarter/rack-attack"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/rack:*"
+ruby_add_bdepend "test? (
+	dev-ruby/actionpack
+	dev-ruby/activesupport
+	dev-ruby/rack-test
+	dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|byebug\)/ s:^:#:' Rakefile spec/spec_helper.rb || die
+	sed -i -e '3igem "actionpack"' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rack-openid/Manifest b/dev-ruby/rack-openid/Manifest
index f5744c95f374..c679e18a50b3 100644
--- a/dev-ruby/rack-openid/Manifest
+++ b/dev-ruby/rack-openid/Manifest
@@ -1,3 +1,3 @@
 DIST rack-openid-1.4.2.tar.gz 9444 BLAKE2B 0aa675ff4b6a67fe21b93d245111415f5e483f7b4a210f819a1f1eb6b242f6d75a1c182a2965a57350eb6bf2a088989c90d4b3c0348a4643a3889639759be3c0 SHA512 7b651899c7afc10d11358bd6de075f2f902c2188ce5f9d7bb6d1fb75ec77d1c53b11926ee254eead2229ac00312382540dd550debfc5fdc137e009011eadd321
-EBUILD rack-openid-1.4.2.ebuild 895 BLAKE2B ed9a5e0e1fa7ecc04bf5b6abc89b0ad129c4eada2460ba2f791e45953d10c41163e1d45b24febe986b5fd0bd607dc128308a09738e27dd31e0fd6a2fa9e2d244 SHA512 9ef67fe30971d075e89cd449f2a935da9e570473ab2eeaf7a534a0ec47ce28071af67bd713b40ec9c1b4e01ee3caa563183b835f67ee389607e9391550e95240
+EBUILD rack-openid-1.4.2.ebuild 888 BLAKE2B 8191cb9cbcb1d9bb114769c2e14eea3234407d0d19f431999bb33cf9354bced086a0f362c0b78a2623a54e25e5fc36fd44e1c4119ffc947b6b850ac4cc3dc980 SHA512 1c8cf1538b41c7c49f5e71de484c14434d6fe9aefbdac0164c2a20158913a877b6c42fc16630564e9dcf1ff3a42c6d02eb8dc0a99d92bd9b0f07453f19cceaa8
 MISC metadata.xml 345 BLAKE2B efd918bb5eaf6ed922c59cf416781fdfcad6a7ec77ef8280c769d19019f77d789ee9db60c5e2e3722fd3563c51f2a615a9ad5c6739422e2ff492f17a3afad2e5 SHA512 bca9d433271ba8324b1f0bdc704daa808f7d989b3f2838085615be87ef11a03eb1378c12674a6d8c82ec950bad70c33fdbadfde72503b3c2dd5dbfd79efd7db2
diff --git a/dev-ruby/rack-openid/rack-openid-1.4.2.ebuild b/dev-ruby/rack-openid/rack-openid-1.4.2.ebuild
index 69e77d8e9071..9b56b77bd4fa 100644
--- a/dev-ruby/rack-openid/rack-openid-1.4.2.ebuild
+++ b/dev-ruby/rack-openid/rack-openid-1.4.2.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=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="Readme.md"
diff --git a/dev-ruby/rbnacl/Manifest b/dev-ruby/rbnacl/Manifest
index 6a2f45aeee74..b7975f90c718 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 796 BLAKE2B 42a3e01b108b90a63ef266fd5638fce5e70bdf0f344d27365f48400209ed8473371d80f94780b2f4beb3577304b911a78cc77516daaa7c8ade85bc3be8252ef3 SHA512 fb722992e5c9fb35e2bc9879838cec4b7bb8b90c63cf8ea873810cc3825c7beec50cb52e01dc1f4b4da501ea37be547cb6cb40a24fa52bf93edef74c43bb499c
+EBUILD rbnacl-4.0.2-r1.ebuild 793 BLAKE2B 8ccb1d4e86ad54f5236ce5e552efcf2632e7142d8bc36f83547c930c739a6d882198f46858183a063bb54b8f8aa7586e22bb8a1249963fb369afe48b232da759 SHA512 d2bfdcb7df8a062c08c1d7940fda61acc9b08c35062a11edef2ce410fc8b09f2a77d4206bddde690e68231cf044bfa3e6e9009fdbb359613c080bb9ca646cd61
 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 da9980ebca5e..b62445566fca 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/rbpdf/Manifest b/dev-ruby/rbpdf/Manifest
index 6a104d74b2e8..8bd18e037a9c 100644
--- a/dev-ruby/rbpdf/Manifest
+++ b/dev-ruby/rbpdf/Manifest
@@ -1,5 +1,7 @@
 DIST rbpdf-1.19.3.gem 295424 BLAKE2B 27ec18ad5b2082562f9121f625397cdff60824325f6a7fd39f9109f3d7ba68f60cbca2c08bc3c177dfd2a972ebdd90260535bd36d98240ee96fe50bba8a9f1c0 SHA512 ec169555973122418f0a15bdbc9ec212d0a5151dea849e64b21e45390a2fbd6571e4918322e9c6ec048cc10e53ecbab9b32a1bfe484f2fe6a9f13ce0f01f53ee
 DIST rbpdf-1.19.4.gem 295424 BLAKE2B 4dec81dfddc6aab7da97c178e3c8bd665b803e807db537722abdde0fb846ed147d070bce6351aee0529d0032e73cd82caf47d263ab3cc86e1e66ac0ddcea3a1d SHA512 876b36b7a03f675597110c8e3b82c4a3088816bb6fa6cbb300d066d6873ca24d517eb63e6b81d6851e836524e5b1a9baa19a125ed0f6d369527fe1df3feb86c7
+DIST rbpdf-1.19.5.gem 295936 BLAKE2B b75f317a93e45cc83928cae039fd49dfc4cfb6325c4c7445b85bd396ce31b468c49935537cc6eaef5b49d55f5e12eb41258ac7b688bf4f41d94a8be3b2172d2f SHA512 736d11ba3f34fe93bce1343610a5a6ce0e9f9f7084f63c4dc58f1d94f66a3d9371ff2a89706fa9c6c32326999181ea420e4ee0ccf7e337cd938b2181fa204ea9
 EBUILD rbpdf-1.19.3.ebuild 1232 BLAKE2B b8ff390e2a51584258e36d8b37b030347bb20e7928dcc50ffcca50b884811096fb39d88c22444bf56d896b820fdabcfcce3265554ce3195fd0346842b8741096 SHA512 a3d67be4d3a5c1a7d95506553780ef2dffd270e79047d6d01d186d44de87aeb1902905021a70a8a59b0984e789bb85673d7b51f85e219294706f14da77d3b58a
 EBUILD rbpdf-1.19.4.ebuild 1225 BLAKE2B c9c85cb2211ef8a7f4a57d1a55acb122a654955e176f1486792531cc77e5b760889eda849180ec46d5eb6d6f9521d8f7d1e0afeaaf0ace9ff6fd485744863c64 SHA512 e97dc812ad1796ab1204b141d5b63a5a5a28f5664108506be62d6e134cc8c267bafd007a1c44acce35308ca2c75f70b4a55da8dd8dd2af03972896eee21618bb
+EBUILD rbpdf-1.19.5.ebuild 1232 BLAKE2B 4c1c27b25203ebd32e43f75ba664a7a0048231999607dd7068aa83ca34d8939132d0db432feee2e1b476b79cac6072e2d9c01fd937b8d6751ec47d52da71a052 SHA512 b450f82a5162e0135ebcae2ce8e49fc7fbee4c744dcf2d33d03a40dd370a9429c92cb3d9ee39e9bdc68eba854b5dda980bfb1234c9bc17a18c0b077d38175bdd
 MISC metadata.xml 417 BLAKE2B b48fb397e76caa8bfa35675062a6c4026ae44fe43cd305eb51c9470d9dce6654603742954145f3bd063f6ccc6f56162ca9affa6acc6698ac81432e0dde42a070 SHA512 c33c8dded82e45f867b4e93cb3be96cabf42152bfd6aa13f9144fae15b2b4f4b8f503d4aef4af8c2448584c2e71251c958b8dacb14c26da4a6c2b9b3ff442dc4
diff --git a/dev-ruby/rbpdf/rbpdf-1.19.5.ebuild b/dev-ruby/rbpdf/rbpdf-1.19.5.ebuild
new file mode 100644
index 000000000000..7fca048891a3
--- /dev/null
+++ b/dev-ruby/rbpdf/rbpdf-1.19.5.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"
+
+# Avoid the complexity of the "rake" recipe and run the tests manually.
+RUBY_FAKEGEM_RECIPE_TEST=none
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby on Rails RBPDF plugin"
+HOMEPAGE="https://github.com/naitoh/rbpdf"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 )"
+ruby_add_rdepend "dev-ruby/actionview:*
+	dev-ruby/htmlentities
+	=dev-ruby/rbpdf-font-1.19*"
+
+all_ruby_prepare() {
+	default
+
+	# This test is enabled automagically in the presence of rmagick, and
+	# then fails.
+	rm -f test/rbpdf_image_rmagick_test.rb \
+		|| die "failed to remove rmagick tests"
+
+	# Loosen very restrictive htmlentities dependency
+	sed -i -e '/htmlentities/ s/=/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	local cmd='gem "test-unit", ">= 3.0"'
+	cmd+=' and '
+	cmd+='require "test/unit"'
+	cmd+=' and '
+	cmd+='Dir["test/rbpdf_*.rb"].each{|f| require("./" +  f)}'
+	${RUBY} -Ilib:.:test -e "${cmd}" || die "test suite failed"
+}
diff --git a/dev-ruby/rdiscount/Manifest b/dev-ruby/rdiscount/Manifest
index a0c1a9625518..2a834d1606de 100644
--- a/dev-ruby/rdiscount/Manifest
+++ b/dev-ruby/rdiscount/Manifest
@@ -1,5 +1,5 @@
 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 1109 BLAKE2B 986b6061749c0a957f5169710c5f0e4a6b2cc58ffc128d103e0bbb27df8fd43504f0aea3781af10052b3441b35f385a328d4078b0875571c4b42af9117ac90a1 SHA512 e8906aea43a07b831a0d61d8059aa40b32c999bce620503bea9d29e6322781fd9b29fab0372d33f46e96998a15b3467a614e0473d114f50a7ead4c31f0ccbbc0
+EBUILD rdiscount-2.2.0.1.ebuild 1106 BLAKE2B d3c1a02e9ffbf2a10e2acbe572dc7cd8d663ec7605eee32347b9e6e2d9fb1ba5c986831875a6b56ee8a1c4f9296774f4e2a943cd52973faf3dec751850982516 SHA512 84ed54035a08065f48077acdd82cd2c570cc4d412e0b25022c86cb864a4a9df38473923fe8d8ac708114316bb3475014e0fce35ad6f068c46b1c57a067635a48
 MISC metadata.xml 344 BLAKE2B 4afa4c43c02006cc29edbfd9c7792c42aec4aff05203b57a9e727ec6333f3f55c13b8f197f915f8a632d9deb888f5e00f3992fa8df48d7f0969206927a342d0b SHA512 4d2e68c0284b778089ddae07ad5026c296d997afc771a5b3b994464691ac794dee27f1f7bbdbdbe2037565be70d2bc480480a7b93c867dc100dca228b09b7aec
diff --git a/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild b/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild
index 2f9f1288aa70..13fcd639a51e 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/rest-client/Manifest b/dev-ruby/rest-client/Manifest
index 0e404302667d..164775f4b153 100644
--- a/dev-ruby/rest-client/Manifest
+++ b/dev-ruby/rest-client/Manifest
@@ -1,5 +1,5 @@
 DIST rest-client-1.8.0.gem 124928 BLAKE2B e7ec09b6d91b1bb97f0a6ab9add98c696e5b2b0dbdd08b3bdd7e6ec9ff1b07dd356d4f3a84a485c7c9be58dd389b73920bfbf28d8d1e22ee3bf2f9f618bc28bd SHA512 d4c03b2d2807ae963b116e8c977411305b55836e4129b18ce2e88ea5795838c448bece151f6b57aa03920ea21d9120835159a7e9c4bc5c9998beb3705d1f2bfd
 DIST rest-client-2.0.2.gem 149504 BLAKE2B 839003255545ad8d67b0fd896f56b628d647a90fdf9eaf4e27f6c5d0179f15a1c17683e81ff7f288ffac55dcd523f5b01b4217a277b6c260bf45df8cef3998e2 SHA512 c132518a9ff0029e79826cf90de442b01f6f422b464e04914947c2f757cb7046b96c915f0248a82172f7980519fa9fe5f7bcb9dcfe28889abc62dbb48cee1030
 EBUILD rest-client-1.8.0-r3.ebuild 794 BLAKE2B d3efc607838448cf2bc2a28aaeb25e8173a98a05f9dc550c05e73c54ee5f9e006c997386b83bbd8aa8514213c09fefa26a11c5063fb338f805e847fc947904eb SHA512 7bc7ded2dd6b63e012bd20135a5305810d17dbf61698bd4e53c4a210b7017f5b2615cfd264baef617d9a7df72194ee08e26dbbb310ebf8f3476879c10732f8c5
-EBUILD rest-client-2.0.2.ebuild 876 BLAKE2B 3a721a1b118ef6067a179988d8fe3f9cd19468e86819e06092a317d8a9859aa1c057310679a43c57fada2930ee8e91091054b3ccbc5a547c7229cf5b20fa487b SHA512 b522ba2d1e59561553cfb10b9e45de34158388f76cf88bfd7dfeae957d120363f27476262739d52a9f59121c70aae41cdc6fef76682dd0efe0d73e93a770fcfa
+EBUILD rest-client-2.0.2.ebuild 876 BLAKE2B 50dcac41bae15929b377a988f6ab1f44055734026acc8b4ebbfaf142302840c6bf5a0eed3673830a8a2a1842ed1d3919f9b87b33abe90116aab5ee38158eb786 SHA512 ce6f667712fcfe29a322409155f4123c6ccbb541e3dc0902fe4c2345be1658071963179fcc6797a4839b2f7c82445b22630ea78e6f7bba5496f9e616c50bf8ae
 MISC metadata.xml 348 BLAKE2B fe9d706faa604067ae6a773bcb6f1738aea6003905ba97c7d1b2c01847013a71a7e6293a4e0eb01371ec70fbc6d62ffd2220c8d63f0741d9d53a5517b817bbc0 SHA512 333b578a89b557f43afab3b52f1e14cc9ecc4985c2909f046c9dbb9f9e333ad9ad7ce30af72141348f6205fa3b9e213143974e05aa8cb269ff17712c0fce5757
diff --git a/dev-ruby/rest-client/rest-client-2.0.2.ebuild b/dev-ruby/rest-client/rest-client-2.0.2.ebuild
index 89b520306179..939b7939b7f5 100644
--- a/dev-ruby/rest-client/rest-client-2.0.2.ebuild
+++ b/dev-ruby/rest-client/rest-client-2.0.2.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_TEST="rspec3"
 
@@ -19,7 +19,7 @@ SLOT="2"
 KEYWORDS="~amd64"
 IUSE=""
 
-ruby_add_bdepend "test? ( dev-ruby/webmock:2 )"
+ruby_add_bdepend "test? ( dev-ruby/webmock:3 )"
 
 ruby_add_rdepend "
 	>=dev-ruby/http-cookie-1.0.2:0
diff --git a/dev-ruby/rex-powershell/Manifest b/dev-ruby/rex-powershell/Manifest
index c3c3b2eb003f..e5c777bbc3a9 100644
--- a/dev-ruby/rex-powershell/Manifest
+++ b/dev-ruby/rex-powershell/Manifest
@@ -1,3 +1,5 @@
 DIST rex-powershell-0.1.77.gem 28160 BLAKE2B d1fb9f6e9f66e6b55b09bdda329037ea7da135b9eaec9f1437ca374f3be5da1b5ee63f7c92d56447c88964a4c1a4bef68b2d6b64a4e507b7c2a7010f1ff09d40 SHA512 99e3a8394c580b07580f8c230f049b15fd80b02db4b940208a1086e1c3d679ab1b757fee56356d6b25a6876ccb21c50d1037b7bbadc486a7c38b10b9b81a09d3
+DIST rex-powershell-0.1.78.gem 28160 BLAKE2B 922a4a6f8605335c664fbdad7e6214bdd48dff5d648eb324f92a5f48dd62d2a0b98283f4cddd4ccb8190b78b1c1a637190a836d0d0b486c80b18e383fa49820a SHA512 db3e1cf0e10d6454fb5b5b76e346fa7f299f14e8d2399ee7f863708444bd6404984a16bc2fccedcc1f06a1eac7add63fc75c5f1d2b8c9fb5c421817e385000cc
 EBUILD rex-powershell-0.1.77.ebuild 537 BLAKE2B 3db094c5379606ab5db1b8e006f45ff14832611f640478af83e8620eecb6336f40c5de9547b1585f6d2a26b1a496452cd3549d0dd7be778bf466f28b01301047 SHA512 30f79caa12c09d40f493cba08cc85695a6d14d1bfad439cfeb7a81d7fab44f8145db7ef1a104b05880f14cdc3cd2c16f477a3e0736e7642864311fe07ef4f7eb
+EBUILD rex-powershell-0.1.78.ebuild 537 BLAKE2B 3db094c5379606ab5db1b8e006f45ff14832611f640478af83e8620eecb6336f40c5de9547b1585f6d2a26b1a496452cd3549d0dd7be778bf466f28b01301047 SHA512 30f79caa12c09d40f493cba08cc85695a6d14d1bfad439cfeb7a81d7fab44f8145db7ef1a104b05880f14cdc3cd2c16f477a3e0736e7642864311fe07ef4f7eb
 MISC metadata.xml 401 BLAKE2B 9ced95a371f0f76b272ae92fdb6955e87481fe0e5054d87ead013f86a91e83573aac67611acb9da9c765b8e6970a71cc99714ce9e6b0a52d66f7da5f2a365134 SHA512 1960bdc2bd8ecd7b03969c7dc24374ea46e45a7b7218c7d5f0677aa6906e191908416919302f5d9082c35021d7be414040852c33e457eb6d8ad5030e95b4bb52
diff --git a/dev-ruby/rex-powershell/rex-powershell-0.1.78.ebuild b/dev-ruby/rex-powershell/rex-powershell-0.1.78.ebuild
new file mode 100644
index 000000000000..d44f1014de16
--- /dev/null
+++ b/dev-ruby/rex-powershell/rex-powershell-0.1.78.ebuild
@@ -0,0 +1,24 @@
+# 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_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby Exploitation(Rex) library for generating/manipulating Powershell scripts"
+HOMEPAGE="https://rubygems.org/gems/rex-powershell"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_bdepend "dev-ruby/rex-random_identifier
+		  dev-ruby/rex-text"
diff --git a/dev-ruby/rex-text/Manifest b/dev-ruby/rex-text/Manifest
index 87761267bc99..5f8ffc144e29 100644
--- a/dev-ruby/rex-text/Manifest
+++ b/dev-ruby/rex-text/Manifest
@@ -1,7 +1,9 @@
 DIST rex-text-0.2.12.gem 43520 BLAKE2B fc9ce7134dd1ba8ba21ad6a27ae913d6abdc50d9436675f2c847330a4126b404271bcff6d46c15fcfd64069a2cf92142c8511952abcd17a75d10b776f3ab9bfc SHA512 20ff6df7527f06f3970cd5359db42893bcedf5b9432c8b349a71d22af4940a2b6fb3ab455cc9fd40301102f29e6c2de07043faded0d63a19cd951b3402eafa8e
 DIST rex-text-0.2.16.gem 44544 BLAKE2B 8ac7be3fa894fa47229aba39be046cb4e6f40a47f65a4d290e7fdc1756b29b063799429e3ee793e69f19adb0c5cc589ff3c4c2261d2a5c4f4851a075bd98eec2 SHA512 8b7cf93579abbd67445de9c89469f4d717fae15b3b1d44602733c91cbba024788aa8c76cc45c8bc6351062571b2c938d33c1f9c6059a2cc1c1b604bf6494526c
 DIST rex-text-0.2.20.gem 44544 BLAKE2B c446dfcbb54ed9cf57f019f2158fdfe37ae6815f3e02627564e0a0e472f56ab301a805e12f4aafb3f1e8e3052b35737add225c16979bb6dd4a7988b08062ff99 SHA512 0043abccc14dc70c750edf42f405368ac305158bcad98586f169b3edb808a5565101a302b32afd5d916a96a7cce4e2e27f2b0e1bcaf152367aac8bafdfbf1474
+DIST rex-text-0.2.21.gem 44544 BLAKE2B d905973b190b84f048ab26774651e394d8902b81377cab92298800b462e009b7ed8b8ac8f8c10f3726475bfe2a696a40655cbbd6efbf820974c503df37f07d10 SHA512 9504b78f77f4c00cc42e43313f48b058ecb5fb8c183225e580b8750810c26eaf22949793b46d90e5e36276d25a419153b38ea387fd28bc9414de62843e3efcba
 EBUILD rex-text-0.2.12.ebuild 506 BLAKE2B 1aadc0a8678de99d5ca6fab07bbc5b622356a0ce6ef1b726cc525074b552c861077bc2db1905c92e996ffd79f43a91338dbfc8b9c65e9acdb9c492b7606b863e SHA512 3248b1ebad78b268444514940470966c4fdbd25ab2577d1890bb7b7b8e182bda6fda94f90f5054a6583567b25a566b7d43ba3f739ac9ee9698170b5269b438aa
 EBUILD rex-text-0.2.16.ebuild 506 BLAKE2B caff75c6e8d09729f0699b7ba164f7120ee971c6ef63195ac711edaf5d20a33ad7cadb12727e57ada1dc4cf60928af992ffa7ca61870621c857dbeffd1654daf SHA512 73b3908dc76cb1136f143a19c9c36fccebc2e0a50db45005feb451d11ec1cbdd024c263a2e665d40f51eefd699ea31f71ec1b6f83f2514e74353fcbd8b0a4aa1
 EBUILD rex-text-0.2.20.ebuild 499 BLAKE2B 6b33b438b6a2fc0697ffaacd68b65d0ad7e154a767b83446ceb8b04d8047db86c2d4bc4af037e72099894724805c2944a0becab778f5c9101f0c768bc92003a3 SHA512 285f14b9a7a681c659e09c44e29b9bf874c3ae86459cea5199470220ecda001553fd1d01660eabfc917c7c7f627d7ca929ccb84a976a25cac62bc525c7dc180b
+EBUILD rex-text-0.2.21.ebuild 499 BLAKE2B 6b33b438b6a2fc0697ffaacd68b65d0ad7e154a767b83446ceb8b04d8047db86c2d4bc4af037e72099894724805c2944a0becab778f5c9101f0c768bc92003a3 SHA512 285f14b9a7a681c659e09c44e29b9bf874c3ae86459cea5199470220ecda001553fd1d01660eabfc917c7c7f627d7ca929ccb84a976a25cac62bc525c7dc180b
 MISC metadata.xml 337 BLAKE2B 5309d74f65e9d31fb44761ea01a28cddc4a698ec2700bf2a18806871b42370d931405eaa6a2c8093d7405de11defe6aedaeeb72ea585d7cfefd970a323cb82e1 SHA512 24d194089e40848fc1ccce781e29de3bbf56c536a4f5fea036d2bd783483d2018b1105a4be88b8fcd57408651d3cac45ca649a111364dcdb834014bc6bda7bb8
diff --git a/dev-ruby/rex-text/rex-text-0.2.21.ebuild b/dev-ruby/rex-text/rex-text-0.2.21.ebuild
new file mode 100644
index 000000000000..bb5e58149f4c
--- /dev/null
+++ b/dev-ruby/rex-text/rex-text-0.2.21.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"
+
+# Specs are not bundled in the gem and upstream source is not tagged
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rex library for text generation and manipulation"
+HOMEPAGE="https://github.com/rapid7/rex-text"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/dev-ruby/rgen/Manifest b/dev-ruby/rgen/Manifest
index 411e38d82899..d9d4de7c27c2 100644
--- a/dev-ruby/rgen/Manifest
+++ b/dev-ruby/rgen/Manifest
@@ -1,5 +1,5 @@
 DIST rgen-0.8.0.gem 382976 BLAKE2B a9d6c4e60451ad537b9213d679558ba48b313dff1a6720f72881d10c68d2ecb5c9a5796bfdb8ea0d7ea1fcd02f309725d99af59d8d9c7ed179c296371ba8e3ba SHA512 cf4f5435fdc78850a05b44477804f511f52be0be3999dfabd52cbaeb26e93c2e2eb9d18a094373ddaa61076a437f0b26e9371de0a10158969b3934d530b230b6
 DIST rgen-0.8.3.tar.gz 275845 BLAKE2B 90addb8511646ac1bcfce113b39bc6998704a7e92319b7854c56fb85276adee86b64e847f940769076967090fe62024aa641c6d194c9dd57acecb855eafa8cae SHA512 74f6ed04c49b880bee8c6ed126874f8def43c8ff7a58a8e09743fbd8e255707f6b947b37205c4c35508aec983729fdec228c30e297d7ac6e3bd7f8c2167c63e1
 EBUILD rgen-0.8.0.ebuild 573 BLAKE2B e772bb843512d19b1722132c3a5c61fab4efa52f50d632d6036685f90cd043f5af4ae759b60b67f3e2d1669c00d5966c21acd1194734eee20637bb42f6bc7ffd SHA512 7d50a0a66a57f6cb1ec6f256fafa2658d5a5e3fd63af96eb61a09484815956870df71c9f94db951f3044a8ad387b5959e4b0e9dfc84e4edbaf4939884b4074e4
-EBUILD rgen-0.8.3.ebuild 796 BLAKE2B bd2b99711ef4d5e00309cb5605d03e153bbab120fb459c6460c6ba5907372173ed084cf2cf1ee48c18dc046d83a5f8fa3049aafc136853956ea37350c78258bc SHA512 02776506499570a6d83bbe9ef975007bd835c01c57c9758a3e64abd503789a66320cfe16915e11ac820313c302609882344046ee63413d66fe9486b914cbf8c1
+EBUILD rgen-0.8.3.ebuild 804 BLAKE2B d650ba6030677a57c485fdecf9c46d64aec49e0510318c9ac8852154381f8e25b746215c2255f8af01183fc65cc14c71e30825151b9047f87cc65448273bde85 SHA512 79e79cc2c5d4baceae77c14a649ebc3181f0a6cd77f7cbd76a232f97de3aa75756614849578be3e7b59c295b6c9b550c5f62fd3009bcb5d60ca9d4de4fbba145
 MISC metadata.xml 338 BLAKE2B 93ef49d518bff5cbddf74d2d851eadfdc01b79389f77fb002c456c453978d41c5157f545cce8dfa09878f42599daba66d8cfce611f6ebe91496cdb1589309ee5 SHA512 714e42942d30a44542c2c9804e4c5532fb69bedd0c12b9488cf23f64fb58abc80c068c7049e10f793005ae1c6d1c54694dbef0982f2adee03dff58855f41b9b6
diff --git a/dev-ruby/rgen/rgen-0.8.3.ebuild b/dev-ruby/rgen/rgen-0.8.3.ebuild
index c43167c5aa81..a2986146efc1 100644
--- a/dev-ruby/rgen/rgen-0.8.3.ebuild
+++ b/dev-ruby/rgen/rgen-0.8.3.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=5
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
 RUBY_FAKEGEM_GEMSPEC="rgen.gemspec"
@@ -25,7 +25,7 @@ ruby_add_bdepend "doc? ( >=dev-ruby/rdoc-4.2.0 )
 
 each_ruby_prepare() {
 	case ${RUBY} in
-		*ruby24)
+		*ruby24|*ruby25)
 			sed -i -e 's/Can not use a Fixnum/Can not use a Integer/' test/metamodel_builder_test.rb || die
 			;;
 	esac
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index 498e43e165b1..26d5f5229707 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,5 +1,5 @@
 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 1668 BLAKE2B f38cf7d830a7abb59c97f3214fd0581efe56205c30ceae1c446dcc6cdbe1faa614067142619ce7cc18906224b64b354f8339347a3c84534891c6b6556f479807 SHA512 5f315248eb1c97774b6366f2a68bbae64d22b6e5eeb123978cb816b65a019ddfc5a1431cc2f643accb70fb5701699f63153d1961fabd854593715b7dbdeb8d3d
+EBUILD ruby-gettext-3.2.9.ebuild 1666 BLAKE2B 3adbfa4f74a54c4e00857dbf0798bfc1f183cfecfb2384e72d1f1094934ee0576038abeed475afe102dd4d27f37bbcd3d2188c74466fdb2637fbc9c28503d7c4 SHA512 02cd59cae4053b31432af81eeb89b4799071baed82cdf437914cec8b51102e6d3f8b917df002dbc776a69077855d5b754929aad69c97f6a7249dabd1b35e66c1
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
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 9fbb1b45ccde..c5875b66e047 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/ruby-progressbar/Manifest b/dev-ruby/ruby-progressbar/Manifest
index 73170b87f4ae..b574383f84f3 100644
--- a/dev-ruby/ruby-progressbar/Manifest
+++ b/dev-ruby/ruby-progressbar/Manifest
@@ -1,5 +1,5 @@
 DIST ruby-progressbar-1.4.2.gem 24064 BLAKE2B 4c26f5c281129a7333c8a7a1f7738a094ec02d769293252c8fbc6df0bea99971cd0d235b6bbeba7e2e4fac10409028f7cdb15870484878c26d9ea9f709f0135b SHA512 443fc015b2dcabc76c685f1529a39ffba289cb00c3cee3992ef240fb9822729f9049db4d85c58ee1ab6cc17927cb325044ea45a968c755a9b5ad93f7b9999fbd
 DIST ruby-progressbar-1.9.0.tar.gz 47888 BLAKE2B 26707f4f931e378da18a29d20da47963c06bde537155d0e9bd3a623b9b3edd9d653a50ca106dcb29ffb53668a869815818398ae514ef3302465cf5a5504b2cda SHA512 d2b01c205dec3bad6989a1ea466070fdc0c3fc5bc0c8685a21094c52d2f2c6a11849b42d88d3ec70df1475ad47c9f84a4c4b603948344643310e2180122d9b67
-EBUILD ruby-progressbar-1.4.2-r1.ebuild 586 BLAKE2B 4ff46ead2318201c0b11af1f4777e40c106da70cef86fc45bca848aec1588ea662fa8cad7935ff866c4ce5871b3300242aec3e5cf7bf3ebed824b05f45a8d790 SHA512 fef8225dcc16c090ab7d32cdf6b0d2fc87deb04f8bced7a9e7fc593c8276de2997b14b8f69225831282cb12dc127fa992c21a7a0c8c35522287f76efad72d5a5
+EBUILD ruby-progressbar-1.4.2-r1.ebuild 586 BLAKE2B d9a86d4032d44252d30e5fcb3774ec26efbfb6d1348cc604fc6008ab31ef836e84e558bdf1610168ac97e06aa48310f7d1b74e908e5e3aee60ef165b946b8535 SHA512 7fe1ac90518b66e1605b96c966e31ac111491d1af807b9f5d45a27832d872452db3a1c3aa981af03247670139a3feaf7d26f3443b32f6aafaf05cfd8407a7c22
 EBUILD ruby-progressbar-1.9.0.ebuild 1032 BLAKE2B 4232d3368457607a33731f9711161b08e7e5e1f846b0f034bd19363cd1d5085cc52f4f9307ce6fe148f8dfb95cc13288064a5e42ff2001b0144d60a0aa42eee9 SHA512 9402021f21d8d8d47cbcfe38228ba5cd75061e5eb22367bfc44440fd2f5983e8aa36e81679cb672b17b0b5aba9f637884f2f07db27633d7b16e4230b9e410aa1
 MISC metadata.xml 352 BLAKE2B a36b436c51b56ed96a170c6edaff16655ff0d3b42f2cc6b13e67c252f89e2d56c47ce0c69fd693acc9ddab9a755a5fbf5d72e360f2e6a16bc0117148eb7a25ef SHA512 a572b7825c4e778c503bfa3bb1b82d4d91c28285578c614a8a0c62bdf1967f307645c92f0101a4898baa0ebeac9a26455e459b2440db6989593c0cc4472df616
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2-r1.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2-r1.ebuild
index ea6370d2e547..af0511dbb7d4 100644
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2-r1.ebuild
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/ruby_smb/Manifest b/dev-ruby/ruby_smb/Manifest
index f9ba5af9c714..281452a10781 100644
--- a/dev-ruby/ruby_smb/Manifest
+++ b/dev-ruby/ruby_smb/Manifest
@@ -1,5 +1,5 @@
-DIST ruby_smb-0.0.12.gem 59392 BLAKE2B 3bf8497a75936c6ac06515239ea4be40cb29f7002a69ac7fed0d71cb5bee88fe77a5dd3863b93d5ca7c77e39c07493a1bac414f72c0c009e7ed9ceb850adb76f SHA512 8343c18e1592a0b0878fe70999e0cacc32059fc721da4690a7ebfadc1ed86562a177e715ce83a8a7993a3494bfa4195b81d790e5d675a4093a5455a843e8b95f
 DIST ruby_smb-0.0.23.gem 149504 BLAKE2B fe9e8dab2d0437cff691293b71473c5bbbc697952e1ce2ca52176922a7fffdeecf05e38ec139ee6f5f8c6615b2f80e6ded3b6c50390b9a7c7d06c777ce738491 SHA512 eaa779a3e9e3858142ed5581fddf5afd1f05106257e314c8811ca05fc80ce50c7944c8cbc147d652aad4c8fc4b3247c97f9f57eed44887de47abd51fe576e5e1
-EBUILD ruby_smb-0.0.12.ebuild 775 BLAKE2B 821e7dfafbeb9815ffbeb38804a27981bcf567bd90e3fba6b77aafa747b7d11a6f8ca4c49960115de00be1eeb2ce32e99f2dbe1253b6a2382b0126191cbdaeaa SHA512 559eccc270ca1f34784007b02c9cf12983456c12f3b6527d2b75a1c13d26b6cf7995b380293a7794035d80d4404af1200badb6501b7b2590d241f71c719e7c1e
+DIST ruby_smb-0.0.24.gem 150016 BLAKE2B bd9af5646e151dd61d89057c325f4246dd2bed686fffc56cc1d281615093223a71dc3f2cb67d8e2f6ddacdbfafd4121e46b4109de652f90363451cb905fee2be SHA512 bef4a57edd906f84eaa46072d508578e23834e08d0f66b28feaf3f7c861474bbfc763b9f4e117537d635165fa6f0d1d2430a9e4dadf23bbf99485893ce735cc2
 EBUILD ruby_smb-0.0.23.ebuild 777 BLAKE2B b74ddb0413fb0383f22b2b3dd834cfb8a8a71af2e12f3fd612fb7cd2164cbd9c2482203c175ce957b2b626bf7e67e176150296925b1357d5d32a6bec7ecc1d33 SHA512 7f2a759ace80474556cbf95f9c1372590b8cca41c154df1a83e44b4d351e2dfac27d3f0a8b9a7a6c5518a32a979da8834fca62e5d5098927fc55b5b2d7e8195a
+EBUILD ruby_smb-0.0.24.ebuild 780 BLAKE2B 32253b43745e43551d12ed48e518ef5fc7727f1368574ec040c8ef1adc2aba79d50304240821875b2c072fe853bb914c097b87a9e2f7f36a76132a56a5c0f213 SHA512 33f282d8a739ccd97ab16187aef29c09a3a2d86631446eb24f32d808e71559ce4deea2137dbdf4388c1f065048a51e5d0a73323169bc9613354f239c48c8f698
 MISC metadata.xml 327 BLAKE2B 54b35b9e00051b0f0d0d8edc8ef6726c756c3050a3ea51b83213bef2fa8d5f91639819d849fe05db9f27cc8960cba7a100925dadfe4d0b9db685ae2fa05a9081 SHA512 596657669aca98301cccbd30cb719709f4dd36f2c829f9a44f3cc133aa8857f3167f9fbd89791c814e67312369acb92792ea9e230a510ef3dd2aeac64c3c1ab7
diff --git a/dev-ruby/ruby_smb/ruby_smb-0.0.12.ebuild b/dev-ruby/ruby_smb/ruby_smb-0.0.24.ebuild
index 80a8900098a1..fc708a285da3 100644
--- a/dev-ruby/ruby_smb/ruby_smb-0.0.12.ebuild
+++ b/dev-ruby/ruby_smb/ruby_smb-0.0.24.ebuild
@@ -1,11 +1,11 @@
-# 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="ruby23"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 inherit ruby-fakegem
 
@@ -13,13 +13,11 @@ DESCRIPTION="pure Ruby implementation of the SMB Protocol Family"
 HOMEPAGE="https://github.com/rapid7/ruby_smb"
 
 LICENSE="BSD"
-SLOT="${PV}"
+SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
-#I cannot make tests work, and I'm not spending all day on it
-RESTRICT="test"
 
-ruby_add_rdepend "dev-ruby/bindata
+ruby_add_rdepend "dev-ruby/bindata:*
 	dev-ruby/rubyntlm
 	dev-ruby/windows_error"
 
@@ -28,4 +26,5 @@ all_ruby_prepare() {
 	sed -i -e '/[Ss]imple[Cc]ov/,/end/d' \
 		-e '/[Cc]overalls/,/end/d' spec/spec_helper.rb
 	sed -i '/TRAVIS/d' spec/spec_helper.rb
+	sed -i -e '1irequire "rubyntlm"; require "time"' spec/spec_helper.rb
 }
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index f1ddeac4c27a..07d9d30cf0ec 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -2,10 +2,12 @@ DIST selenium-webdriver-2.53.4.gem 897536 BLAKE2B 630b5e8cd5ce53de7a689135ce80e3
 DIST selenium-webdriver-3.10.0.gem 841728 BLAKE2B fb36121b835c7750595cd57c3217c234e12d9f78a29131a12148f464955b1bc3f5a9ef96b6bd8f8aaedd0fa9943bcc42c1f83a0d31ec6663664f6c4f0102b5a3 SHA512 ee1ccad5661f06b16c106b2515285f763baf2b66aefe4c20aed0521e602997af8b1b12640b1099ad0a64f18b01bcec7824dcdd20fe36d9176337f177b8417b2b
 DIST selenium-webdriver-3.11.0.gem 841728 BLAKE2B b3f069645fb166258aebb0f04c8d3f828413b2a1e2f818b7501118760ba79e812ce7d314b21076076f1e6c30590e0d38f026b32ede63ff08197c8f8fbaaefded SHA512 85488c257772a4628d19bd71e7993a82c2c5a9f6332d591b19507ca5e2a96c03fa5c351714a492915888510728f2e5eca28862c69e1ced43d8b56db128d7705e
 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.8.0.gem 840192 BLAKE2B 3f3871afed9734627757e58a211ad894fd45a49b73208b533fd39e0d99172536e7f2abdfbed1e0589c45aac6a26dd0c1ae0cf8f25053d44082957f7d07591d37 SHA512 c00c44786ecee4c02723b88c9ae5921d6a3f2d4c6c3bd043da1f524692c75a69357b752fc183c7881de0d0a6e6d6ddb03ca31e6a983afacdd06978bdd0797957
 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.11.0.ebuild 910 BLAKE2B 5e54683c36cf1ad30ea7df577abc0dbdb479ba95444e24fce04d82a43798a7ae90d229b7516fe839fab0d7f048e30a95e785f002100921688312324df783dc01 SHA512 f520e1491c92e14b92340e84f09ebd4b017d161e8adb6681ead3922dc82644a41b67ab0134c0616b9c2a475985a1e9d816e5a4b7ba1e3eafa8b9ad053775444e
 EBUILD selenium-webdriver-3.12.0.ebuild 910 BLAKE2B 5e54683c36cf1ad30ea7df577abc0dbdb479ba95444e24fce04d82a43798a7ae90d229b7516fe839fab0d7f048e30a95e785f002100921688312324df783dc01 SHA512 f520e1491c92e14b92340e84f09ebd4b017d161e8adb6681ead3922dc82644a41b67ab0134c0616b9c2a475985a1e9d816e5a4b7ba1e3eafa8b9ad053775444e
+EBUILD selenium-webdriver-3.13.0.ebuild 910 BLAKE2B 5e54683c36cf1ad30ea7df577abc0dbdb479ba95444e24fce04d82a43798a7ae90d229b7516fe839fab0d7f048e30a95e785f002100921688312324df783dc01 SHA512 f520e1491c92e14b92340e84f09ebd4b017d161e8adb6681ead3922dc82644a41b67ab0134c0616b9c2a475985a1e9d816e5a4b7ba1e3eafa8b9ad053775444e
 EBUILD selenium-webdriver-3.8.0.ebuild 903 BLAKE2B 6fcc42a6fcc196f662bcc1eba11a627c5e5add3d1f76cd3cdfdec1f451c6ba21b1eb07527a39edbbb386984e502ca749ea4dd9f14afe97902ff7f0e6cd0dabf5 SHA512 753b1db1cd486886846531b97fb0d0fcb08eafcdbe86bf960fe08471feb301d655460e110cf809a204bc3ac3068a1b39f96bf4c180b50408b3c9ab220747510b
 MISC metadata.xml 335 BLAKE2B 374e7e6bdf450e60792ad3960c2c0fe8ab87f70c34ca76332bbbc632598354e2a774e4eba46434e9b7c85c7f5eee7086ac85268ae58bddea7d75713d9d2f014a SHA512 94e17dd297f6904f1b70709dba5f5612fcc42e9e0e57695df6d37344cc9a89c13b423e41d142631444990ff39367eb6132d6b070bcdbf256ae00e932cadc67e2
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.13.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.13.0.ebuild
new file mode 100644
index 000000000000..eb794075ddf1
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.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"
+
+# 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/sqlite3/Manifest b/dev-ruby/sqlite3/Manifest
index 1c8f3ad7f3f3..2152956aee05 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 2396 BLAKE2B f42621a309da89bee957bf8ab8f7d2898166e1ed98d4094f1c57a088596dd82c7ffc48d793a8a77c13d27520cd8b95a857466099dcd3926e9bce9190b1e9c233 SHA512 4c5c0c58fcea4e944d27c03e7f553da934cb3df80a08aa781b3ddd0a2286d523250489de2e3c7972ae324d8c8d756ef18021bbf9d7e9578a71d97b4358a0fb6e
+EBUILD sqlite3-1.3.13.ebuild 2393 BLAKE2B 4275831c6c742f8c74d40bc7ce91907eed6b5cf91e9eff2b6f228e0535f09c78a2bc1f11f0dbbbb196899303831f34dfed9427d958b69b1bb5c335651a7ed955 SHA512 06dfbdf91d069bcedc09009885f8e53ae56cb1c5e1e6869ca5ff05dfd8988f4f54537a4ab45f05626859282e376d65fa3ecd54f750240c2def1059f73fd4fb97
 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 69489385eef0..1b27145c446e 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 51b8cecca948..40788a8117cd 100644
--- a/dev-ruby/syntax/Manifest
+++ b/dev-ruby/syntax/Manifest
@@ -2,5 +2,5 @@ AUX syntax-1.2.0-require-set.patch 379 BLAKE2B 2f142dce82c2e802e8d8b665a8f547940
 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 907 BLAKE2B 7d59125e644f8a8339a948c2781e4a9c98e9a84df5aceb8371646b1b7b264de93878e45bdd1fb5e3b41ab34d727e758e286fa71390a337d4dbf47efe6caa1416 SHA512 50a7505edc2913dee70841139524fe190d39f17d5cb9d37c8c596d34c4daf351061d99e0ebec8f1d131fd10043293f09a736bf3a41c2653f4a205506065ba803
+EBUILD syntax-1.2.2.ebuild 904 BLAKE2B ba12f008179ce04ac876d6b9ffe1a5496a3591ca84582ec6ffe5182bcf4a368d97b1754ec494d6b8e85f5dd00e9f548012971b07fdbac57742abf052c646f95b SHA512 19354aa0bc8785d58a475d7048796128986d0444e524b8030276bee3e4c082af2a03350dbd502554e8ef649bbc0d78584b2354163cdbd99bc4201a25282db4eb
 MISC metadata.xml 339 BLAKE2B 007757aafebca384bbe340c653875cdfa7c36a40d0fcc948f28f2a1eae85265100d30442f1bc05af9b4286f88f969d54bcf001ad9156aa0bd3dbbbf999a3f129 SHA512 d3d2406f489b687ceb61d99a66ec5e0a4539491277a5c2b5006e03414d14fbd5a25d7de00d2983ab629a1c8efb3e4999681734d07df9ef67f6a01c6abe3f0608
diff --git a/dev-ruby/syntax/syntax-1.2.2.ebuild b/dev-ruby/syntax/syntax-1.2.2.ebuild
index e2c3716433bc..d08fd1de1ccc 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 a7a7c2e61c67..90dbbdff3c01 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -4,6 +4,6 @@ DIST test-unit-3.1.9.gem 124416 BLAKE2B f1c88d9e7da576babaa979a57eb522a244856711
 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 943 BLAKE2B f5fb79ca5ae3acb165b3a8baa68ee4a833abfc1f70806285603b6e47d5578eb61ff7498e26342e00642498c9dca42063c98ddc32901d5bf56bace766bb501665 SHA512 280bb49cd79286d5ffed94d379328dae6a39d82279d732581e2b65bd302dbbed73205bce018394554a41449cce38cd3b2690ca84750630e4db2fac8fcccba69a
+EBUILD test-unit-3.2.7.ebuild 940 BLAKE2B d33c33b937b0634ce65dd34394dded1b9dea30a6933cb2e91f0b612ba5f9a21bee959a778e88ce2d7887945d7963bb7f9aca6d6920f3d9d4bec07a1ee0bf2c0f SHA512 bd7cf8557eb019d45654edaf2d72344770b186953e66938172eda0c71a4f34f5160907316406dd50b36e4deebe36f3deb556f1a0ef7833b0f569a91b3747bccb
 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.2.7.ebuild b/dev-ruby/test-unit/test-unit-3.2.7.ebuild
index bf53010baaae..ed2c7d88768b 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 d1f1735262ba..8c5456772526 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 1088 BLAKE2B 926bd8fdae711501c93e75e2e3fb4c837a6f9818cd1f73d7e5d3360c2e6d6d632e2616de62d046df46c18ce343dd249a2e7ef527fa0222fe277fb2ceaf072ddc SHA512 3f082f4788e81851242ac2ecc377938c4aeefd62fbfd5d658d9ada3f4a98104ccc46a393985b546ff9f040d9898b5edfcd10f43c5a7682296fd50a61c68e7e20
+EBUILD thread_safe-0.3.6.ebuild 1087 BLAKE2B 35b53779c57a5e1164c2c8671c4fb77f1c2fe72f22ec2ef57530b22571e56682c832ea40bad37ba1622149d36d0037849fa98a332065b6ed8326e82ef06ba1ba SHA512 a5f6d33a10ccf736d75f8d32352e3f7d8022e8b6cccc4c07b0dea35149ccb06b8ea362b673461c7cd2a4982fa2ef461443d293027d3da45c55a00fcdf5a1360d
 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 7d78dd4390d4..eee14d7a63bf 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/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index 5d3df0be5bc6..dc0412bedf20 100644
--- a/dev-ruby/yajl-ruby/Manifest
+++ b/dev-ruby/yajl-ruby/Manifest
@@ -2,6 +2,6 @@ DIST yajl-ruby-1.3.0.gem 550912 BLAKE2B 1fe5fd43809fec2bf06d8db14cb6cc6ac5fe59de
 DIST yajl-ruby-1.3.1.gem 550912 BLAKE2B 809608b5c767c560cf40a0a8d4160f17092762788af9c66e729762ade50fbb0cccd266f1bbd411076ef4b2dc7a4cdfcdeeb552b6d86a58a0d9a38ebf1bad638c SHA512 f18b47f1fd0b039bfec01db0ee298296199fbf91b22a00042e1220a1d8471f72424c082b696829e48ce7dee7514510dd731c2bc36fe29bd08ba7246c820621f4
 DIST yajl-ruby-1.4.0.gem 556544 BLAKE2B 8eea447ef98cdd9b48fe6c91f2a385740339e78e6395b2f63add8757fe437dfd4ae721b604ca5b381c59e36412e1807c930730bcc1a7c7f921c50ccd7f03857b SHA512 63407542a58231305d1cf326de09e8fdb0f4f5bbf28d3b83a3d8f4099db2a425b7a310fc23c62a37681cb24b50d2ce9d10a6641e07be16b52783ea7401ec7ca5
 EBUILD yajl-ruby-1.3.0.ebuild 1231 BLAKE2B 29060bac0d2f196a06fd38d0010e826b6dea1d2a9c32e11aecb115a314de02c411d9d30889cdd2a8666a2302bfb4ae79cacbc86b9310b9196b0b32aadaeab685 SHA512 c8c2c76ec2c322ab5126822cc75c50cb2005ebc3b1af0bc6ffc5ea9daa83b9a6e07ff40ab4d1f90c1f6cdd6d56d9aae563c05c00b7a3fe6801e8eff3a75c0c3d
-EBUILD yajl-ruby-1.3.1.ebuild 1241 BLAKE2B e01f9f7da0bcca2ab280ef639fbd7dc171c40e7a1a5799903e36c4113ddb207c60db453954e9942bbeccc9d40abdd049004fad2bac69fdb006939aac3362195c SHA512 b6692a2dd966de76148c2b2fdee312a230478a4e7e5e6532657daa93ab95cc8b3c95899d90040f3e24756bbcd8d1648c19bfb00ca6236c2d2293b803e5f291b5
+EBUILD yajl-ruby-1.3.1.ebuild 1240 BLAKE2B 81f8697ee2589204fee42bd361f891a75c776aca41e71349408930d035eb52b8a473805e8fdb464ba613afa52c7a5e4d36858882f3224c0ba78d0332c9404134 SHA512 56140f29a5e237be208e09d31133ea70354527c0c11c244d4c0b9f84cb985d0efb83da5086023b6c00caa3fd05a92972601762c5a6ffa8716d37ea3f51513a90
 EBUILD yajl-ruby-1.4.0.ebuild 1239 BLAKE2B 4423c37b22330c71a28d64ec4f94330efc9398f1f7020d8093335ed9b9e2ec4a673b141d4b62a9a4fd180334fc496e085d57dbc355ea85480012be729928a866 SHA512 e13f92a287eeb1036c60f67f5d67be12660321410515070995199053853a3ccae011ca962d7571e7a206242dea029a50d48c12dc694f7c0b16dd5e5962fd6f3b
 MISC metadata.xml 346 BLAKE2B 2fff8cc633fbc47874a3e5a9e567ef430dcdd4de90343c35f599b15a85e0601a5d4b3c5b650e3971dab90cd90f382505000b40092e57d05fdaf86536a02106ff SHA512 54921a3e3df293d819d020aa6671e7e33f9031b83d375d6f8423fd844cf757c20c2e6cafc9d5a8f2670e10bd286b4e29067a8d7176e7acafd3474578134a2aae
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild
index 62463b7a9440..7df07bfd296e 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild
@@ -18,7 +18,7 @@ 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"
+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"
diff --git a/dev-ruby/zentest/Manifest b/dev-ruby/zentest/Manifest
index 65e749e7d088..cdae3a452073 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 808 BLAKE2B b95e19e3bf4a162c02e3b85477224cf8585ffc67684dd0ee174ac77af263a1a8e6c02ea63641b7cd5c89d47ee1b697916f286cf17bfaa3d58739e025cf580072 SHA512 278c321bd73a0f2b27b015f7112aff56c590d0988144fab2a47e0013489e4f122cac99b69df76edfd20fa1c148a64ae48d020fa418095ab4654037ee1c2442d0
+EBUILD zentest-4.11.1.ebuild 806 BLAKE2B 632ed26c4cd2153ebf4dac76b25f7fa9bffa4457b42aed6f424e47a8f57d3f64417700d768a54b8eedcaa3e1316a2c81d686c13714051b55a0c341296e264748 SHA512 6c0a2dc33a0447c4045898ab7fe69ab6b04f4da68ee5a93d64748dc999da07c0717c460f6e803702e1c98a330d2cf4ce715bd72e47cc5a43e2d54e4919c27fa7
 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 dfd42130fc05..28301bbd3500 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-06-30 08:49:38 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-06-30 08:49:38 +0100
commit	b2be182d49eea46686b5cf2680d457df61e89dc4 (patch)
tree	c66442ced2011c5ca81c3114cc51041e314c6d33 /dev-ruby
parent	e23cdda4dbb0c83b9e682ab5e916085a35203da5 (diff)