gentoo resync : 18.11.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-11-18 09:38:27 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-11-18 09:38:27 +0000
commit: 536c3711867ec947c1738f2c4b96f22e4863322d (patch)
tree: 697733f5cb713908dcf378e13fd15a798a906a91 /dev-ruby
parent: f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff)
104 files changed, 862 insertions, 516 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 9dd1a433e6cd..bd6c312ef069 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/airbrussh/Manifest b/dev-ruby/airbrussh/Manifest
index 2d01b4a3205e..162f6b23d183 100644
--- a/dev-ruby/airbrussh/Manifest
+++ b/dev-ruby/airbrussh/Manifest
@@ -1,3 +1,5 @@
 DIST airbrussh-1.3.0.tar.gz 1451304 BLAKE2B fc7fb26606efbd2591d707bff43c9bb9d1e712d4338e6151c7d5bada99f555f0dd1fe3e2c925a2e4c9bc9d0aedf9d63adfacfba77f84c07a174a2997e873db58 SHA512 e7c22f21673f11b124ac0082cfec19dc12764f52058857248619bf41841e6b10b2c402d9c17a2db76b459ec5cd1f464d2c2ef78fcf0a202ea2287653980bf10b
+DIST airbrussh-1.3.1.tar.gz 1451404 BLAKE2B 2224946477047e0b282a3ba9cc89efd888aca45b8c931a9163f6420bead2059cde380d66eb21f6cc0aac334c1cc2d1ee30d84faa7dd636bbd121c0372332b457 SHA512 edfc0b742ff854c76d96be88cb93eb385dfe554cdf4550b422b63cc6c997bc5bd6b235e52e8558ed578ebe4b1cfbb40987be48567e3b03d56f236c5497fb504c
 EBUILD airbrussh-1.3.0.ebuild 901 BLAKE2B 9e23bac7593147ec543845ec2540fb0db7089db3249a55ac54af27b10f5928dd826adc9600329d9f44825d9466e7853f0ea662ecce54ccf4689f0ea814b43009 SHA512 ecb5f376a0bce1e71d7b459882ed5d5d633e2113521b628481b1f7645a83ead5230691f5747d89a280e4142a8effc4fedd61265cad60c7fc43a59fa38326e477
+EBUILD airbrussh-1.3.1.ebuild 777 BLAKE2B b04ea6dd86a146ef52f7e8542a4324935eb080eb36c011e36fac2fc67e7b417d3d349e0b67654cf3771b5e5f7285b92234a792e09e8aaed79c697bedf71043f2 SHA512 58ac54701a2a2e9cd7d4f165fbbc7ab11af7d2275bc21642c39cb684ae0f7a2b329b27d3b22357e8d8b02c78253e570824ddc2aa4b677dd6e5260be12b5d8c5e
 MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/airbrussh/airbrussh-1.3.1.ebuild b/dev-ruby/airbrussh/airbrussh-1.3.1.ebuild
new file mode 100644
index 000000000000..ef22ce1c0967
--- /dev/null
+++ b/dev-ruby/airbrussh/airbrussh-1.3.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A replacement log formatter for SSHKit"
+HOMEPAGE="https://github.com/mattbrictson/airbrussh"
+SRC_URI="https://github.com/mattbrictson/airbrussh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	rm -f test/support/minitest_reporters.rb || die
+
+	# Avoid a test poluting the environment
+	sed -i -e '/test_color_is_can_be_forced_via_env/,/^  end/ s:^:#:' test/airbrussh/console_test.rb || die
+}
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 0f92792eaebe..15aec641fdf9 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,15 +1,17 @@
 DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca18ea85a7095d9e58625df6a59a349b60b462c5c4f403a6af955466bc46d82be6cd91724fc2b12cbe15ed74a4c SHA512 3bb994e022593d485a07296193a16cae7b45e96e87dd10b2bd4807ad2bc990801044c0493360598d1626c3e367e8de87e407f65c2c6f42674d5f1b9c0b5c1933
+DIST capybara-3.11.1.gem 310784 BLAKE2B ed2c26d0340b0c0ea0fd008436ce29a38d650bf1a7b31279863c0f84e5bcebbd534f4611e9656743cdb9c61ca9eac4c3b152d21d6b630427829f3a2e53f27057 SHA512 d97c53135d5ea040950f42750f1644c7a1ba96ff86cefbc83934a19173cae1f303f4ed5b56b95b5d7b9dfb83209312de5e129275b03d472e2614371d4234082b
 DIST capybara-3.2.1.gem 284672 BLAKE2B 9da8f588049fab74c4e734626e42758cdd4baf555cfc64e7456bfab2cb4d5c90ed6bfc8ada7cc0d6323ef1113169aec70fd4254aa50c003408376ea4afe00a06 SHA512 50af1d4c49c200a4c08901d19b16826499abb8d19de8e059160c509afd555edbe620b6fd5d78f8c286feeb15a72e5a4b241cb1f14151b349fd94cdd3648b64b2
 DIST capybara-3.6.0.gem 296448 BLAKE2B 4054aaac6b6e0d5f1f0c1adee1951dcac7fcb3b2061dfe9de261e6c8bb749d6c88eb2c5a635b683e9a02719870435d52546701f4f21f722068836d4acd78f3eb SHA512 d99e9aab306955e01c08f26e7e8e042019b30d97c106ce6e33c96d7277670b81a143312c06e89c2f6c5f959af461d219c213c3660e895bec1e8cfcae030728b4
 DIST capybara-3.7.2.gem 299520 BLAKE2B eea9d0bc35483174ccedd9366c04484a5b819e40aa6f0d01ceefad1700b04ded446d2b14de826981296666fd5f7a5440f08dc2ee437ee3db8e7bcd70d6cde636 SHA512 980346ea0fd1c3cb6de2423707d8c8e637f64bde2c1ef48622a08d1fe2177e29eb5d7125a048ebafaf4ca1591c483d34a8b17ed7288985dad783023ed35305e0
 DIST capybara-3.8.0.gem 300544 BLAKE2B 12e6d0f316fdc050380b494dd9d1b35feb14dfcf2e2fca7b439e76538f79e17020774fb02667fe2b576b5fb54fb432fd7a06fbf7147baf71baccfa5d307a337a SHA512 6b8069e1f39d42695bb8f96ddd6f221e1ddcf09ceeeec65588721c89d232497a53fd8e3b8018e65a306eec0a187a15ed26c481a7574a6af7260f86466449c864
 DIST capybara-3.8.1.gem 300544 BLAKE2B 05c22b603bb67d3217fa9c4c87bbd79b2249219d9a62d00c511fb7c8272092d381b7598e82cc03c5080b9c5ec20a9d64602ba37d235eea9717e741232c05c24f SHA512 ee4d2b3226e5233a092d163b4323f02ba84ad682682dc9e17a4343380e4480774eac1bba28e12a83000438c7bc1d2698fe1aabe6162ff729a243fb863f06fffb
 DIST capybara-3.9.0.gem 305664 BLAKE2B ee11e9dede512a49d2b652142976f34a882be2f9e02c0af6b22d4980d1c0e6c1f6f73807fee2062662625ea11e96d533c865cb9f4d25eb4918cabd0b06247bc2 SHA512 da2b9d7809d66b33288a31902ffbbad91da7b306b5035546618b987acfe40bfd99451df4be34e4eac86032e13509ca7baf4a2eef0eb4cff0dd8a265e43cc1a46
-EBUILD capybara-2.18.0.ebuild 1525 BLAKE2B 17327933169f1c330a0f0580b8dfd00be4ae39e0fa94d62e172d6621a8a91189925acfca3730685ed80573e6eb456f731d8072fb1adb2653b6b646714a89bc5b SHA512 a6347a7b9014e3ca1bdeee9eed2a9e22d866dd831041e700086b00c4245d254ea3107c82b019f7550faa273777430898c571c837ac4202cdb2cfdf15068edd47
-EBUILD capybara-3.2.1.ebuild 1518 BLAKE2B af598a905b37db7eb77511372ace937bff702c2aa116afcdf4bb2d32bd99489e95a61ca442c8cf5c8174fe7f0021fb7aadb6fda65b2dd7ab41a1d8829bd3099f SHA512 9bcf03fa1561b95257a319825c5ae165914fac5ad4993e028f51d9b3d70bebc7e51203f30cf70d2a9b66a61a4b30dfe85d79037a5f19c3e61997f0e3f41f5372
-EBUILD capybara-3.6.0.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
-EBUILD capybara-3.7.2.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
-EBUILD capybara-3.8.0.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
-EBUILD capybara-3.8.1.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
-EBUILD capybara-3.9.0.ebuild 1531 BLAKE2B 70f6b8024c6d818d437beee7556f45964e2a18054edaafa845e90fa3fbbf9940a34305d13abf30ca33e0fbeb74edf5d2c5c649825690f54dd95290250b45a490 SHA512 582287a2643283ac9c8b043aba24a441051019897f2ab4b931bb5a16569afea889d00276c447fc86660cd6cb8d294a5c51a924076ae4e4c5154e623906ef0d88
+EBUILD capybara-2.18.0.ebuild 1552 BLAKE2B 7029dd19a177f4aebc1e78d83f9561ef4f3abdd41b0b8d77426e11bbaffc7865d746d4f3d3e6ed696c4414008648acc707f42e4a716681a2e331acae512ce8a6 SHA512 87dafa1f76c10eb0853eb7c8e3da36ff7c0b522b887c037ab9c3fdf12b29ec20d39a3638c4119225ab097dee44b878ed1ef0aa753d0d83f886c6d4c089a6c931
+EBUILD capybara-3.11.1.ebuild 1593 BLAKE2B 52140986b4655ba78e1cb318f8eb5f46da85d72d94144f6261df1346de9be4ed3cb5824a65c47d4e4164c06a7575de2170c1003966972b68790e56d160122cb9 SHA512 39982cb2b2724e815772f2ad266353c6e75c22e99ef50b7f2c5585082db97e2c8bd113ece5ff037eae817b57cf818cc5554030cd297fccc3a3749ac1dd47abde
+EBUILD capybara-3.2.1.ebuild 1545 BLAKE2B 51d0f8fbc35d0f628e5224460a91fff7708e8ea100c03af063eefba6c31434af10a852f85993d7648dcf76b8c3524d5fa310b755da16ad792cad4e4d20d7cdb5 SHA512 00b38a2823b5261140e0dbff705f4dba76c8ffdb8a65a162232e22e23e3683b67a0c7568bfb642c9ff47b4d81d82b19d73c0d7a5840b0a61e07c305f51c1b862
+EBUILD capybara-3.6.0.ebuild 1561 BLAKE2B 211b2a865ebef0e2dfec03a3208333783aafa16f5c1c7b664ac62a54181a25181092529ef298f81db130aecf5d58aad48a64537bf411114e7c42b2ac2278f477 SHA512 677bb893c2dbab25eb1f992f36bd39bf5ba4383dab87a6d68fd3345d0c4c12ea2b20b2afd17905ae64de543bdb53bd539b15783e8a318632565592f8dee2201d
+EBUILD capybara-3.7.2.ebuild 1561 BLAKE2B 211b2a865ebef0e2dfec03a3208333783aafa16f5c1c7b664ac62a54181a25181092529ef298f81db130aecf5d58aad48a64537bf411114e7c42b2ac2278f477 SHA512 677bb893c2dbab25eb1f992f36bd39bf5ba4383dab87a6d68fd3345d0c4c12ea2b20b2afd17905ae64de543bdb53bd539b15783e8a318632565592f8dee2201d
+EBUILD capybara-3.8.0.ebuild 1561 BLAKE2B 211b2a865ebef0e2dfec03a3208333783aafa16f5c1c7b664ac62a54181a25181092529ef298f81db130aecf5d58aad48a64537bf411114e7c42b2ac2278f477 SHA512 677bb893c2dbab25eb1f992f36bd39bf5ba4383dab87a6d68fd3345d0c4c12ea2b20b2afd17905ae64de543bdb53bd539b15783e8a318632565592f8dee2201d
+EBUILD capybara-3.8.1.ebuild 1561 BLAKE2B 211b2a865ebef0e2dfec03a3208333783aafa16f5c1c7b664ac62a54181a25181092529ef298f81db130aecf5d58aad48a64537bf411114e7c42b2ac2278f477 SHA512 677bb893c2dbab25eb1f992f36bd39bf5ba4383dab87a6d68fd3345d0c4c12ea2b20b2afd17905ae64de543bdb53bd539b15783e8a318632565592f8dee2201d
+EBUILD capybara-3.9.0.ebuild 1561 BLAKE2B 211b2a865ebef0e2dfec03a3208333783aafa16f5c1c7b664ac62a54181a25181092529ef298f81db130aecf5d58aad48a64537bf411114e7c42b2ac2278f477 SHA512 677bb893c2dbab25eb1f992f36bd39bf5ba4383dab87a6d68fd3345d0c4c12ea2b20b2afd17905ae64de543bdb53bd539b15783e8a318632565592f8dee2201d
 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 9b4c94954ee4..323a52a3c879 100644
--- a/dev-ruby/capybara/capybara-2.18.0.ebuild
+++ b/dev-ruby/capybara/capybara-2.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86"
 SLOT="2"
 IUSE="test"
 
-DEPEND="${DEPEND} test? ( www-client/firefox )"
+DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
 
 ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 dev-ruby/sinatra )"
 
diff --git a/dev-ruby/capybara/capybara-3.11.1.ebuild b/dev-ruby/capybara/capybara-3.11.1.ebuild
new file mode 100644
index 000000000000..ff3eefbad15b
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.11.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/jnicklas/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="3"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	>=dev-ruby/launchy-2.4.0
+	>=dev-ruby/selenium-webdriver-3.5:3
+	dev-ruby/sinatra:2
+	www-servers/puma
+)"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	>=dev-ruby/mini_mime-0.1.3
+	>=dev-ruby/nokogiri-1.8:0
+	>=dev-ruby/rack-1.6.0:*
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/regexp_parser-1.2:1
+	>=dev-ruby/xpath-3.2:3"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' 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.1.ebuild b/dev-ruby/capybara/capybara-3.2.1.ebuild
index 54ef8d17123c..7cd761a4e0c0 100644
--- a/dev-ruby/capybara/capybara-3.2.1.ebuild
+++ b/dev-ruby/capybara/capybara-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 SLOT="3"
 IUSE="test"
 
-DEPEND="${DEPEND} test? ( www-client/firefox )"
+DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
 
 ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 dev-ruby/sinatra )"
 
diff --git a/dev-ruby/capybara/capybara-3.6.0.ebuild b/dev-ruby/capybara/capybara-3.6.0.ebuild
index da6c2de9e770..15c296965758 100644
--- a/dev-ruby/capybara/capybara-3.6.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="3"
 IUSE="test"
 
-DEPEND="${DEPEND} test? ( www-client/firefox )"
+DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
 
 ruby_add_bdepend "test? (
 	dev-ruby/rspec:3
diff --git a/dev-ruby/capybara/capybara-3.7.2.ebuild b/dev-ruby/capybara/capybara-3.7.2.ebuild
index da6c2de9e770..15c296965758 100644
--- a/dev-ruby/capybara/capybara-3.7.2.ebuild
+++ b/dev-ruby/capybara/capybara-3.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="3"
 IUSE="test"
 
-DEPEND="${DEPEND} test? ( www-client/firefox )"
+DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
 
 ruby_add_bdepend "test? (
 	dev-ruby/rspec:3
diff --git a/dev-ruby/capybara/capybara-3.8.0.ebuild b/dev-ruby/capybara/capybara-3.8.0.ebuild
index da6c2de9e770..15c296965758 100644
--- a/dev-ruby/capybara/capybara-3.8.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="3"
 IUSE="test"
 
-DEPEND="${DEPEND} test? ( www-client/firefox )"
+DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
 
 ruby_add_bdepend "test? (
 	dev-ruby/rspec:3
diff --git a/dev-ruby/capybara/capybara-3.8.1.ebuild b/dev-ruby/capybara/capybara-3.8.1.ebuild
index da6c2de9e770..15c296965758 100644
--- a/dev-ruby/capybara/capybara-3.8.1.ebuild
+++ b/dev-ruby/capybara/capybara-3.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="3"
 IUSE="test"
 
-DEPEND="${DEPEND} test? ( www-client/firefox )"
+DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
 
 ruby_add_bdepend "test? (
 	dev-ruby/rspec:3
diff --git a/dev-ruby/capybara/capybara-3.9.0.ebuild b/dev-ruby/capybara/capybara-3.9.0.ebuild
index fcadf0e01c6c..15c296965758 100644
--- a/dev-ruby/capybara/capybara-3.9.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.9.0.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="3"
 IUSE="test"
 
-DEPEND="${DEPEND} test? ( www-client/firefox )"
+DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
 
 ruby_add_bdepend "test? (
 	dev-ruby/rspec:3
diff --git a/dev-ruby/compass-core/Manifest b/dev-ruby/compass-core/Manifest
index cb82b4176bcb..a4821d3b4cbe 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 62073082ff43df6877cab4cfc4562a575aef6bc0b2ef9c3ca942e7e9bf2e708d6fd81e9db3ec36a8a7b9d58480b8142df598ff1444a3fb589d7cc75b6d0bf266 SHA512 58707b20f1bbf3f8bfc1162a859588456745328d7f1d2764764908ebcd74b4b5521a0d7ce14f324c47cde65cac600c1778028d33a05a17563e3234db5ca724f7
-MISC metadata.xml 528 BLAKE2B 6b7fabfe814d39ca5c07dde758c678e7a2e3bbf683a8e156145ee385060d9454947660d2ffc44a4a5426965ae81064e565c2e3191ff5d8fbe6e87b31f551565f SHA512 c65b8d5e0ea0caa17062ad77c8f099a6c2d61f1bc5f32c635c5bad5bc4fc571703b56cecef1eb2db34a932d02cd4ae4f7cce18ea86d632f0fbd4a9993d431dd8
+MISC metadata.xml 403 BLAKE2B c9baa35ae8c524820fe146bc19ad0849cbb6a6dca3aa398376cd11d76a269fdb58d2f3a6caa3d5cff410f53e0a4b40e1a95e6870d53553858de2dcd1daeb397d SHA512 672b0226ca48740bd0fe0b53eb3e9d458daf296a2fcaba76248c3850e600abc39e8256f97d2de78e52c877cc6621ca7228f3887d0279c93da8cf18f0ba5bc161
diff --git a/dev-ruby/compass-core/metadata.xml b/dev-ruby/compass-core/metadata.xml
index d874026db26b..b42e8c11f08f 100644
--- a/dev-ruby/compass-core/metadata.xml
+++ b/dev-ruby/compass-core/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vikraman@gentoo.org</email>
-		<name>Vikraman Choudhury (vikraman)</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>
diff --git a/dev-ruby/compass-import-once/Manifest b/dev-ruby/compass-import-once/Manifest
index 561a6b72cdef..b3d02ca0b867 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 797f8f8b5e259a6b2e5fad5bb6c9776c6db2af4fedadbbad941637cc51bc2d1e2622cb00ed58d52c09b8febbb17f5b4bf9b9f8380b80d2a3acf21b2e22549a11 SHA512 a6e5ff9fe4e528fb43c3b4ab26cff89589dfe7a824a11007dc18eef9c6fb39406df241bd4a1af57f5c76ee90f83fb100046ad46e5b8cb038e6807b3e67e73689
-MISC metadata.xml 528 BLAKE2B 6b7fabfe814d39ca5c07dde758c678e7a2e3bbf683a8e156145ee385060d9454947660d2ffc44a4a5426965ae81064e565c2e3191ff5d8fbe6e87b31f551565f SHA512 c65b8d5e0ea0caa17062ad77c8f099a6c2d61f1bc5f32c635c5bad5bc4fc571703b56cecef1eb2db34a932d02cd4ae4f7cce18ea86d632f0fbd4a9993d431dd8
+MISC metadata.xml 403 BLAKE2B c9baa35ae8c524820fe146bc19ad0849cbb6a6dca3aa398376cd11d76a269fdb58d2f3a6caa3d5cff410f53e0a4b40e1a95e6870d53553858de2dcd1daeb397d SHA512 672b0226ca48740bd0fe0b53eb3e9d458daf296a2fcaba76248c3850e600abc39e8256f97d2de78e52c877cc6621ca7228f3887d0279c93da8cf18f0ba5bc161
diff --git a/dev-ruby/compass-import-once/metadata.xml b/dev-ruby/compass-import-once/metadata.xml
index d874026db26b..b42e8c11f08f 100644
--- a/dev-ruby/compass-import-once/metadata.xml
+++ b/dev-ruby/compass-import-once/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vikraman@gentoo.org</email>
-		<name>Vikraman Choudhury (vikraman)</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>
diff --git a/dev-ruby/compass/Manifest b/dev-ruby/compass/Manifest
index 80c7f67d54be..e0ec58c0f48c 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 c7d220b6f19fe3228a77b556fdf4b0ad159266d226f2ed16bccab50ed7d1bd5333f9183a608276fd5bf036bb548d04fba3c8cb6ad386d6410ff6f52fa248e33a SHA512 c55d350543ca0614f2c0b82eb93c23a424d23f71ef63c7988d444066cea4b2b807e18143ae38fea6bd843122ef64db234d49172ca5a3425f272204ec1336eb6f
-MISC metadata.xml 528 BLAKE2B 6b7fabfe814d39ca5c07dde758c678e7a2e3bbf683a8e156145ee385060d9454947660d2ffc44a4a5426965ae81064e565c2e3191ff5d8fbe6e87b31f551565f SHA512 c65b8d5e0ea0caa17062ad77c8f099a6c2d61f1bc5f32c635c5bad5bc4fc571703b56cecef1eb2db34a932d02cd4ae4f7cce18ea86d632f0fbd4a9993d431dd8
+MISC metadata.xml 403 BLAKE2B c9baa35ae8c524820fe146bc19ad0849cbb6a6dca3aa398376cd11d76a269fdb58d2f3a6caa3d5cff410f53e0a4b40e1a95e6870d53553858de2dcd1daeb397d SHA512 672b0226ca48740bd0fe0b53eb3e9d458daf296a2fcaba76248c3850e600abc39e8256f97d2de78e52c877cc6621ca7228f3887d0279c93da8cf18f0ba5bc161
diff --git a/dev-ruby/compass/metadata.xml b/dev-ruby/compass/metadata.xml
index d874026db26b..b42e8c11f08f 100644
--- a/dev-ruby/compass/metadata.xml
+++ b/dev-ruby/compass/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vikraman@gentoo.org</email>
-		<name>Vikraman Choudhury (vikraman)</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>
diff --git a/dev-ruby/cri/Manifest b/dev-ruby/cri/Manifest
index de42a1ec27e1..905bd9ada728 100644
--- a/dev-ruby/cri/Manifest
+++ b/dev-ruby/cri/Manifest
@@ -2,10 +2,12 @@ DIST cri-2.13.0.gem 31744 BLAKE2B fb1ba32f4413b5b0f63d105c0770e26c20252744c0db04
 DIST cri-2.14.0.gem 32768 BLAKE2B 08c0a2bcbde8d01187e310020e95eb3fb0f41596f1b305ba64c11174493a1dfb61a5bc35ed3121052694eae5dc9d17d333909892ab9ea17b8e065b353d8ab01a SHA512 dc79d69a01978c88aebb15d03317f46fd49930025af6a300cfc3440a4928cf27fcd025c3f25b79c108ee12638d9409c81da566bb458b5ded031546925ddd5e1b
 DIST cri-2.15.0.gem 32256 BLAKE2B 995cc9e457724c540c8ae5817d6b62d7064dd19a7734fda70fc5e644dc64077ca124572cca0d2caa6858d58f28c0fab2fafc939946b06f2d31982adb169ff9dc SHA512 7325781d9fe54ba3269d0b64f8e7eb8228171aad553f9ab10fafdae4f927f6deb7061ced798e010d50e849198744c8377de3bf5a29b7c25dc45c2fee9049dfad
 DIST cri-2.15.1.gem 32768 BLAKE2B d1f829443a724a6d72f13effb279d8578ebdc4ca0b354f3285d68693eae1e6514cb0bcf831ed0068df72469f3be4b21af61a68056dc8c5fb105991cb677e906e SHA512 6ce36b74391d9635094614f5fc33738d65e40b8796caae3e39d4bc170d6f9f4bc5b2b944d36d79b453f9ba7715e2858b27f1c7433b53ce0bcf2fe748153d75a6
+DIST cri-2.15.2.gem 33792 BLAKE2B 778f115db95cc0d4678a1a5805aa8bfe6208f3518fdf593efc61e51d5e6cc611ac88e1a6d66d1dfd231dcf31198b08dfc3f9f6ae1f2896e7a68083e96fbb318a SHA512 75e9e8e0107879aff62be8ec07eee1f37996c42a1077955f444e1b1da320c59cf272692cb33c4a197bcdbdc994b7e17dfb4de5accc41c6a2165b89a17f1b28e2
 DIST cri-2.7.1.gem 25088 BLAKE2B 20317d886401d6d5f034c27396cad2fdaf322246c319ef3cadc3e38169dbc00c83771fdb2d564efd0ca386b916a0bc2d8cf283742ccd18ca390e491a84f5e31f SHA512 37d641390dc83550c254b3c48018f7f2c53f73161807c299cb78ef84b8625e5f00cd8c877ac464ece5c6623d7118872c45648ed56c2bd5f53ae62cd66b8e24d1
 EBUILD cri-2.13.0.ebuild 770 BLAKE2B a281b6c5524b3dac245dc5a892d4fa278d275ea12af194332800627832484016b5090e3b0cc6da82bc0a27e3fa85211d6704dbba0f9d2a2a055b2bf28745ee25 SHA512 a33ab9b67b71b48e61196ea591909fc9de4ab537dbb05f8e2740db4c7905f7ec5074dce2d8698d0b390fa8374f88a4c9a83ef0e96371d46ad9ac38de202bbf1e
 EBUILD cri-2.14.0.ebuild 770 BLAKE2B a281b6c5524b3dac245dc5a892d4fa278d275ea12af194332800627832484016b5090e3b0cc6da82bc0a27e3fa85211d6704dbba0f9d2a2a055b2bf28745ee25 SHA512 a33ab9b67b71b48e61196ea591909fc9de4ab537dbb05f8e2740db4c7905f7ec5074dce2d8698d0b390fa8374f88a4c9a83ef0e96371d46ad9ac38de202bbf1e
 EBUILD cri-2.15.0.ebuild 770 BLAKE2B a281b6c5524b3dac245dc5a892d4fa278d275ea12af194332800627832484016b5090e3b0cc6da82bc0a27e3fa85211d6704dbba0f9d2a2a055b2bf28745ee25 SHA512 a33ab9b67b71b48e61196ea591909fc9de4ab537dbb05f8e2740db4c7905f7ec5074dce2d8698d0b390fa8374f88a4c9a83ef0e96371d46ad9ac38de202bbf1e
 EBUILD cri-2.15.1.ebuild 770 BLAKE2B a281b6c5524b3dac245dc5a892d4fa278d275ea12af194332800627832484016b5090e3b0cc6da82bc0a27e3fa85211d6704dbba0f9d2a2a055b2bf28745ee25 SHA512 a33ab9b67b71b48e61196ea591909fc9de4ab537dbb05f8e2740db4c7905f7ec5074dce2d8698d0b390fa8374f88a4c9a83ef0e96371d46ad9ac38de202bbf1e
+EBUILD cri-2.15.2.ebuild 767 BLAKE2B f29200d7dab980c5abf5177f4181a0f4fd02fe99d35b17fbe6e0f0715c9d4cd4b400225e4533e6db3102cb4f6a17d174529229ed090f184775651c4f798eae6e SHA512 49b159f0c6fb6193e3e9a3b22086c20efebb94bb9b01a8dc2d0ba737d5635bb9d4bfc888fb9af723513bb1b6e737ca6bf221bbe35fd2f1f5205ec8134e8268fa
 EBUILD cri-2.7.1.ebuild 772 BLAKE2B 3e09c46b3ec082da544c48c2a4c6a024ec45c83547bb3558a5b26c0399818a1fd9ee602155aeaea5e7a408fe4d3abc1294f03bd1d3d14af437a77ba125651e48 SHA512 29b1e00f40376ec04affde1d366437fb65bddab170bc6f4b66c3a4f42c560bd2970b923a2cfa17e62620170695c1929e6958b1f0da966e87280ada6c08b80ee8
 MISC metadata.xml 321 BLAKE2B 2bbd02b4b0f33bb2e3942b93c9af104fcafe960a59b2f109935f5121c2476635f1a3efb9ac092f4f5e6138df0398ea0ca874ee62390d20f3620d442d3502d42d SHA512 8e90f3ffd2b30ff9557e4c11bb31655cbd65498191288c68191f2e5f6d7bbdab6f1c22935f8d45fa95673582d1d0bf776055c0242cee2da27c9d3e71e2851f72
diff --git a/dev-ruby/cri/cri-2.15.2.ebuild b/dev-ruby/cri/cri-2.15.2.ebuild
new file mode 100644
index 000000000000..1108a4528f6c
--- /dev/null
+++ b/dev-ruby/cri/cri-2.15.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cri is a library for building easy-to-use commandline tools"
+HOMEPAGE="https://rubygems.org/gems/cri"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/colored-1.2"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	test? ( dev-ruby/yard dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -e '/coveralls/I s:^:#:' -i test/helper.rb || die
+	sed -i -e '/rubocop/ s:^:#:' \
+		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib -S rake test_unit || die
+}
diff --git a/dev-ruby/did_you_mean/Manifest b/dev-ruby/did_you_mean/Manifest
index 7c599dc9c56b..8af51022f2b9 100644
--- a/dev-ruby/did_you_mean/Manifest
+++ b/dev-ruby/did_you_mean/Manifest
@@ -1,7 +1,7 @@
 DIST did_you_mean-1.0.2.gem 30720 BLAKE2B 8b61cecd66affedc4a730655d251f99581febad4e51f18e3b48f30a01f25fa9ed4897c9431d872d9daedf10f46310481979cd44cbf4640d7681bc7425f4df35d SHA512 a6b19dd909423505553759d6470266680056b6804f9c42452eecf9104a8de71a460a4baa53111ccfe830e3dbdc04bad9382d77f9098d1e114aecdc34a4ef57b6
 DIST did_you_mean-1.1.2.gem 30720 BLAKE2B c1fb841143928854854892e2c7890cb3952329ae3efd50401b43bb4bd327b0564ab2f0fb33a4bd23278e1a3570594f2e13ae6c0cb52ea244ccef392f68e79d09 SHA512 bd1f5eeaf6c527bd6a0ef79555aeee459f9e2fee82215e6f3a47e380535d366eea1f7b199ae99de2736125785c7fd76a1cd6e8bc7cd0599a8d4cc6c5184c85de
 DIST did_you_mean-1.2.1.gem 20992 BLAKE2B e8827b3f6797145c1adf5fae2a681ad8f437c1dfcb746465c4bb0c59f61285c2f2a65d5e31e2a501da812baf52a2f1d78b81c2d74a194d7309778cece56c1752 SHA512 98a71ad3c4fe92efec50575e26723cd3b5c60b25cd24767a7aabdb4e2b343b131fe3677367c78995f07c513d39d47984af80bde0ec2f6aeafcb34be97f134b1b
-EBUILD did_you_mean-1.0.2.ebuild 523 BLAKE2B 9d189683c287c639922a6567e08aa98e789a69022286b18afb1b7a054f63c713fdaff5ae2fb96e2ac1485fd1eefb8acc36a21d72455a1485fadf1a0f1df790d3 SHA512 2de114fd164672accc10263013116afb366a350d02450d541a686598019f08221902e3605d9342361aeb3e0ee8980b7d03a740c1bb1089521bc6037de87fc9cc
-EBUILD did_you_mean-1.1.2.ebuild 625 BLAKE2B 6eeb5327b26e85ea21925844a1623037bb889b18584d021452a8dd2afca78965d9cb4cdd9e8dae36b8f075e329179eb706e252d2bb709443a9a4e083becec906 SHA512 f85fa26f14e84d2bc6e3579550f952560cf8889f32ddbe65a2322aed641378ee12fb45e329796c2a235b21babe0aa570e38820ada710ec771fbd461e8e11d232
+EBUILD did_you_mean-1.0.2.ebuild 669 BLAKE2B d0b35f752625a31f68a3f38fac8837809129c1eb9668972f34df168c420e4003b5fcd0bf0975ca7778d935a4824ab2ff287ee7202369d9b213ed77c89bcfd044 SHA512 253afd8bc2b8bbb40d34f05d75f174bcf5083ca5e2276b0054c16aad32f2bcfe3058bcb1b90c084c73436e2ef8caa533ef00186dc6c1923c82794d5b5b136396
+EBUILD did_you_mean-1.1.2.ebuild 769 BLAKE2B 9c99c3e0ee07791489761d5b6eb60f0119d45e578d3d570edfcdc6305afa7bd88dfdf9e5d137285fc689f185c81d0142f19f9f952d8a4d1b344d4dc5bc4d99e7 SHA512 3d8d28a116b1e5515a0b05803ca1462968fa0d53266a1c5d6009a3e3f4bf6c81e9ab1b0585e06cc3f52099dfec72955c624ad4f49437dc0c2d5ae29e40a2a385
 EBUILD did_you_mean-1.2.1.ebuild 625 BLAKE2B 1d1b067f8f160aef0c3ed34a6aa03d10055dbd96387b99eb5e6cd5db3f3f287b1c05a97fc3832fd90fb205ea425cd58acd2b6ee2239655bb806f6bb4f13f2dfe SHA512 0b5001995dd33b7ea70857e7b2b4280df489128477710b58d81d7b1f7054bfe2c3f6abd380940d660150f5df4ebfe8d11568d3c719a2cd0187653065dcd640c7
 MISC metadata.xml 345 BLAKE2B b3764e5648286cb66e03f3343a41b460ea2bb24f51e1c25e89e386c2b16769c9b1f88888b1e10b2c2d0a2346659195454e4ee8262aec0d4a9066795759cad053 SHA512 418114238e3e2db16ebcdd3de5213b3bc0f0a45ed719de1be60cb19015966cf39912f38d0858e22aa6330ac2e7fb58a1452e9623e7559c26161d70e0f29e66cb
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.0.2.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.0.2.ebuild
index 5531a462bc14..3d4c3dcac4d8 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.0.2.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,4 +19,7 @@ IUSE=""
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+
+	# Skip test that is broken with newer ruby releases
+	sed -i -e  '/test_message/,/^  end/ s:^:#:' test/core_ext/name_error_extension_test.rb || die
 }
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.1.2.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.1.2.ebuild
index bd875176b602..2e405f4bcfab 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.1.2.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,9 +14,12 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
 
 LICENSE="MIT"
 SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+
+	# Skip test that is broken with newer ruby releases
+	sed -i -e  '/test_message/,/^  end/ s:^:#:' test/core_ext/name_error_extension_test.rb || die
 }
diff --git a/dev-ruby/ecma-re-validator/Manifest b/dev-ruby/ecma-re-validator/Manifest
index 0503c2ae8028..e5ecc1ff7174 100644
--- a/dev-ruby/ecma-re-validator/Manifest
+++ b/dev-ruby/ecma-re-validator/Manifest
@@ -1,3 +1,5 @@
 DIST ecma-re-validator-0.1.2.gem 824832 BLAKE2B 0ccc81114611b85bf799644dd6f28f75397c3f4223a4eed03206e75b0478a9c4d6ea8807e5b8bc9f06771d51543210fa93fc355d791f7d91bce0f255860bd353 SHA512 4f00dcc940dc13f91b823ce9538239c3d545e79027f8ebc45b258fc807d1dcedeaa128070f666c6c57d50715d76908f45ca7bd639ee5a7bfdd6617f713f2c0fb
+DIST ecma-re-validator-0.2.0.gem 865792 BLAKE2B c41b01dc36f3000331085666f235b0adc749516b19028ee78ef56c68c00b7ab9105d4bfcfa9b061cd1f63987054a33a7e31cc3957be17182245120d679f5b6f3 SHA512 5e2ff7c2e8b8d5a8749d87f1678b235e69f197b9af95787f59cfff492ff3d8b8e2bc45a0e3da83d92ffa646e9b1b12ef5c4cab324d6e29a0c1f53e211d00aba9
 EBUILD ecma-re-validator-0.1.2.ebuild 598 BLAKE2B 3d107472310ce99bcac039993a9b28ccfa7de5c79e2bf1494ed1dd10e1765cbced83dea050f8909997533e2a14006b628840918a0909a40188d7f04f7d9c0db6 SHA512 3199d326f74cff278224939be7717b75c27209dfc16ef3ce716f16f995d0c41e73fba837942c596fb240b56043fb05944d180280448f0f715bd8ba2d0c8f6687
+EBUILD ecma-re-validator-0.2.0.ebuild 598 BLAKE2B 614966302b8f59adc3e50a63c966cc62ef02d333e2e8d5bbd0a44e78ba003d9691ea43b424c5837c2d7094d4c2c7b79c7c500b66d4a2798a36f0b1bdf4d0150c SHA512 f21f733db7a200dd2a83ca4fb30f64ab81881024f685e2f1b895abb6ff25ed992a8a819203f5eeea69430aabe24e9d7b3b9f86745eb0d50c1d75152e0dcba0da
 MISC metadata.xml 335 BLAKE2B 35e81faf43eed5db18d046798d4a20e63363f829379c1706f29ec2e62f32972ce6de98a580697e6f7a7077aee14bdeeb52abd7172d78557a215c36be78ff1daf SHA512 14e2cf3112c5b046847c542192d8260c69f66057e15d791eeec9297b0ef94c036883bcdc3273a08fcdd91836a3f39d5aa651d2fd3db8a09f905e3ec54e185ad8
diff --git a/dev-ruby/ecma-re-validator/ecma-re-validator-0.2.0.ebuild b/dev-ruby/ecma-re-validator/ecma-re-validator-0.2.0.ebuild
new file mode 100644
index 000000000000..906fde0d3ab6
--- /dev/null
+++ b/dev-ruby/ecma-re-validator/ecma-re-validator-0.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Validate a regular expression string against what ECMA-262 can actually do"
+HOMEPAGE="https://github.com/gjtorikian/ecma-re-validator"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/regexp_parser-1.2:1"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/ed25519/Manifest b/dev-ruby/ed25519/Manifest
index 5510fb60bbc8..ce59469a5ae7 100644
--- a/dev-ruby/ed25519/Manifest
+++ b/dev-ruby/ed25519/Manifest
@@ -1,3 +1,3 @@
 DIST ed25519-1.2.4.tar.gz 136685 BLAKE2B d0fd78f16df2b09f5835fca4b0963cee930e17ece2c4eea2cbf4544ed1a5e30c7dc63525b285f4e1e150e5e70d1e8207ca07ce985c27441a903c69875fd92dee SHA512 cf2de7781848d804f3a279baef26f887846d7d846d225293c74dc3f4e301d18518c9edc8b721f9637fff8f087703e91d2376119f2d8185ef19be5862f99801b3
-EBUILD ed25519-1.2.4.ebuild 802 BLAKE2B e01cc2789ed2891609edd794b6a3c19e8480cca63161f1b9aa02ced879ac29f397cce988ae4f02a94f5068be4cb9d2ced6cbc4e62d3d7ea21aac8226352978bb SHA512 a0fb815ab52183ff24c033a826015d4eaa0f8b274a4e96a09689e392fba8ba124d99b5332ad5ed1d0b494b3b6e9326fe5aaf814a41e1025803f5724b325423e5
+EBUILD ed25519-1.2.4.ebuild 807 BLAKE2B d316dc0740a088cfd7736a24b135b10dd43aa73a1c01516252324106d887e77250dbbdbceb3b1f2ce8a91d0cf2e11ef70603f23d39b2f726650334beba90347a SHA512 5aadb9392ca346912c1f2721791ce086dcfbb6fef6f4eddb5edd2a4b10126ce4d4469de476e167b0f2b2e51c180a8fbe03fe6323ee7b1aa79f9d13800c065e72
 MISC metadata.xml 343 BLAKE2B cda5dfa27c8ad6f26c92ebb6ff29d1d861211716018a37c1b4e5736191b9c9b1805b4f9cb05817345af609f0df7b458e3d223b9a2d79e213098ca08bd7457f5e SHA512 68f441e5fba00bf886e2035f32e1f16522340d762b0872f39783d8d8659044c69e63d6b36f401adf2519c5e160c88aa39fb5bed58ea64dfcd607b2e72d8a6918
diff --git a/dev-ruby/ed25519/ed25519-1.2.4.ebuild b/dev-ruby/ed25519/ed25519-1.2.4.ebuild
index bac0177a8e52..42d20b58a4f2 100644
--- a/dev-ruby/ed25519/ed25519-1.2.4.ebuild
+++ b/dev-ruby/ed25519/ed25519-1.2.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/crypto-rb/ed25519/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/execjs/Manifest b/dev-ruby/execjs/Manifest
index 3d53e6b02ee2..3275503c75fe 100644
--- a/dev-ruby/execjs/Manifest
+++ b/dev-ruby/execjs/Manifest
@@ -1,5 +1,3 @@
-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 1168 BLAKE2B 5e9b233eaa8f317a61565a89903f6d14a91b02965d81cb458d2586f3b788320c82b5be9d1b11ea6ffe56ed1531c7024c217164cb4305fc3938f294701529c7c1 SHA512 90378fe036dc70f8f7e316e01b4d88d7bc2f4c340529365478a7ce396b59b06b7d0dd6c0d5f5ddb10ee5418f8781462abbed47285d30dfbad4643781ea6a9d19
 MISC metadata.xml 338 BLAKE2B deb976ed7b368fddcb7e6b7b553ff8fc748f90c61d23f84cc251e7154f6f5f5c79c7d3d962dd2bc8061df7be36dc719ffb2c247c759e6fc7e4e4ff211eba6e16 SHA512 34e46d203d186a98cb50f83fc6508457a8ec536920b9640b7c0ce2f6f00e96643f1265c750a0f8555e57eb14ac1d19f0487bbe6e7fe5afe0870d8ecb162e2f27
diff --git a/dev-ruby/execjs/execjs-2.6.0.ebuild b/dev-ruby/execjs/execjs-2.6.0.ebuild
deleted file mode 100644
index 50b6d43eeff0..000000000000
--- a/dev-ruby/execjs/execjs-2.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-inherit ruby-fakegem
-
-DESCRIPTION="ExecJS lets you run JavaScript code from Ruby"
-HOMEPAGE="https://github.com/rails/execjs"
-SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x64-macos"
-
-IUSE="test"
-
-# execjs supports various javascript runtimes. They are listed in order
-# as per the documentation. For now only include the ones already in the
-# tree.
-
-# therubyracer, therubyrhino, node.js, spidermonkey (deprecated)
-
-# spidermonkey doesn't pass the test suite:
-# https://github.com/sstephenson/execjs/issues/62
-
-RDEPEND+=" || ( net-libs/nodejs )"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" Rakefile || die
-	# Avoid test requiring network connectivity. We could potentially
-	# substitute dev-ruby/coffee-script-source for this.
-	sed -i -e '/test_coffeescript/,/end/ s:^:#:' test/test_execjs.rb || die
-}
diff --git a/dev-ruby/exifr/Manifest b/dev-ruby/exifr/Manifest
index 96b7c6632b5e..13ca5341a7ff 100644
--- a/dev-ruby/exifr/Manifest
+++ b/dev-ruby/exifr/Manifest
@@ -1,5 +1,5 @@
-DIST exifr-1.3.3.gem 231936 BLAKE2B 44958407a3f743a995b4ec28a287ea5352bf2da77362ce8e3cf61a51ef5b1d86836e64766a95697b4d3f142690d1928e11affb57fdc2568ee65e76f28787b0e8 SHA512 7362913874d4d78f8c5b7da7a5bc99a6f7bb120e58ebb67dc196e60bc7ac14243a2989a7e4e7db1853c71d09d866275d909c6407d72ec0271c34c1bb7f15ebc9
 DIST exifr-1.3.4.gem 232448 BLAKE2B 525f2b8c74b15b2abb3a5fac82e475421a0e68003159cb5dcce99436ef7adff13ca614d82cfc55d2680bef64a9de7d5c65a9e1eb72d72b04987a5882fcaf81dc SHA512 1609018119942bd845fc06a93783cb8035da1bdbf8cdaa8335f649f226ba6c6fc52c984528db5fbc3277faa80410fa3708845f26d2e5a48ef36999f22e1cc3be
-EBUILD exifr-1.3.3.ebuild 507 BLAKE2B 25f2f0f228ac0822a9b1b6b15f96701667e4ac75af39f76969a3c0c020bdbe101cef7120eb7969f67dd949dc269bb65dc0a51250823eedb8c32427949754775d SHA512 961b7dc15cc92b4d7dbd889b3c0d4522780200aa27d1bb55ed439cc532043df7467bfd36fa2cb84b4f47e1bfb5b62ae302026792df53b701d18ea50ceab357c9
+DIST exifr-1.3.5.tar.gz 245074 BLAKE2B 8cf2d1a8a400c39fedc21f2186742d83b4ec1931f18cce70938638ffce1dc97d0f3c631504adfa30cbd8a40774b78e83e4a7738665765381c222805b71d40630 SHA512 3d219957040f082d9f0ebb0897301c7fca162f9f0483443237dc410161aa564cbd4818a7bcc88efbe5072414c27e4818a86e8615fca9ba93c2564147b4ce6fc3
 EBUILD exifr-1.3.4.ebuild 500 BLAKE2B 34b2149a016da78cae5d049a945327a5973833339ba2d4ed8d00aeb748b9d0bd74ce8423570757b9ab36da0361bf05428209bef5302f8c846407c648f35c43f1 SHA512 fee71096f1e22999c9c783dd0d6c3f69b1d612bb1f613b4334646673a5303a07d8666b9c51488d4d50aa4ce437cf6cbc03f452fe577b28341680a12cbc6f7884
+EBUILD exifr-1.3.5.ebuild 650 BLAKE2B 2cfe9b1217642fe9c2b88b5216e759f4ba5629ef2c0b528498ca23647e9580203932362e1a9b0116c39a64860b11c3d23c4babbb72dfbc06560b82f65843cb64 SHA512 97f784822eececcd4f5cf189ae0e0f860ecb27820991fa02d00dc074e22cd2fc2840a3893bfef1d8b6770d2110e3735ec26dc00da9f6b0efffd18b686ffbddfd
 MISC metadata.xml 338 BLAKE2B 47c3d987095290c119098638186a209bceec785b33cd6501a3a45c373f2e0a15f1f9da565b7b05c948ab9889780969935c631f418fed04a6b2d45d346e530f82 SHA512 76f53e033898bf27e6d8a3a2681dd5aa66f7b112fda61489397fb0a1205ac1c2e3a07007493d9de82e7ce5fa57b4f7452d214b6873f325fd0ff53d9730721bc1
diff --git a/dev-ruby/exifr/exifr-1.3.3.ebuild b/dev-ruby/exifr/exifr-1.3.5.ebuild
index 042c834dc241..4b4effbe274f 100644
--- a/dev-ruby/exifr/exifr-1.3.3.ebuild
+++ b/dev-ruby/exifr/exifr-1.3.5.ebuild
@@ -1,17 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # 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_DOCDIR="doc/api"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
 
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
 inherit ruby-fakegem
 
 DESCRIPTION="A library to read EXIF info from JPEG and TIFF images"
 HOMEPAGE="https://github.com/remvee/exifr/"
+SRC_URI="https://github.com/remvee/exifr/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-release-${PV}"
 
 # License is not specified in source distribution but is in the GitHub
 # repository.
diff --git a/dev-ruby/fakeweb/Manifest b/dev-ruby/fakeweb/Manifest
index bc0c0cad4dd0..66c95260c2d1 100644
--- a/dev-ruby/fakeweb/Manifest
+++ b/dev-ruby/fakeweb/Manifest
@@ -1,7 +1,5 @@
 AUX fakeweb-ruby22.patch 870 BLAKE2B e96c9c58c5973bb4b028bb2582b40b418723df5548446288cf9df843dbf39377bf48a38416183b627ff022c2ce06f0f42fd7aa77dcf1ca51243dc5e5720b4da4 SHA512 32c5c7e3b6e6e5402ffeb809b74036de854752eded5721ea778ecd9d83b19e992ff3091ac7608e49b0984f3c26b21c95ae52489a585bb862e03f1fc201e4fa89
 AUX fakeweb-ruby23.patch 1214 BLAKE2B 4fa44c8b30adb0ff76372d7d6581f8b326e020348c07b37daa24407a959da4fabe2e51eeec01ca81a1f5abafbd87b42132e5f9aa38fed70f872c1ee18b66ca03 SHA512 3384a8fb96b34f17f929ebfb0ceb01d1238a7333058954097985928ef8bd9d5ec31002a8f2d18b65133ea48cb4309e24222bc675f15f72d869dcea062164f3f9
-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 1305 BLAKE2B 190167d38b4615ed4d7b6777912ae271cecb1fea4f24f88b20db2b79f091b77e2291b7fc258655efb0b5ecf60b4e59d2aaf99e3302101b1653660ae3ee397e7b SHA512 e2df710acfc7f4f806a21d32be1b0a4e638ab5f03bde3f9c5f3b60097f5619cea3cfed8c3a5b51b22a0b765b610ea697c36431f5d00dae97ca698e17eb55224c
 MISC metadata.xml 340 BLAKE2B 7058eef4592a28cd630ef9d8ccbd6920dae2909bb1740172464de06215a3a970e2291a855cbad1206205e90cb04bb711e4725b8d566e6388134501706168914b SHA512 4915509da84a354d665c9c59881e83356a8e8b2f7f09afdae68755484a6e575a7502f98ef8da1cffab96ff12264c048cda182f1c5042b95b058b731bf0395077
diff --git a/dev-ruby/fakeweb/fakeweb-1.3.0.20131201-r1.ebuild b/dev-ruby/fakeweb/fakeweb-1.3.0.20131201-r1.ebuild
deleted file mode 100644
index 02e0bb4aa9b5..000000000000
--- a/dev-ruby/fakeweb/fakeweb-1.3.0.20131201-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ruby24 -> not compatible with Net::HTTP implementation
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-COMMIT=48208f9bf053577befe5723746b6ff35b99b45d0
-
-inherit ruby-fakegem
-
-DESCRIPTION="Helper for faking web requests in Ruby"
-HOMEPAGE="https://github.com/chrisk/fakeweb"
-SRC_URI="https://github.com/chrisk/fakeweb/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-${COMMIT}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_PATCHES=( fakeweb-ruby22.patch
-	fakeweb-ruby23.patch )
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/test-unit
-	)"
-
-all_ruby_prepare() {
-	# The package bundles samuel and right_http_connection, remove
-	# them
-	rm -r test/vendor || die "failed to remove bundled gems"
-
-	# We don't package sdoc and we don't have the direct template.
-	sed -i -e 's/sdoc/rdoc/' -e '/template/d' Rakefile || die
-
-	# Require an old enough version of mocha
-	sed -i -e '1igem "mocha", "~> 0.14.0"' test/test_helper.rb || die
-
-	# Use the test-unit gem to make jruby compatible with newer mocha.
-	sed -i -e '1igem "test-unit"' \
-		-e '/bundler/I s:^:#:' \
-		-e '/simplecov/ s:^:#:' test/test_helper.rb || die
-
-	# Avoid test dependencies on unmaintained packages that no longer work
-	rm test/test_other_net_http_libraries.rb || die
-
-	sed -i -e '/test:preflight/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/hiredis/Manifest b/dev-ruby/hiredis/Manifest
index 0d747a96856c..6e78f8b23d6d 100644
--- a/dev-ruby/hiredis/Manifest
+++ b/dev-ruby/hiredis/Manifest
@@ -1,4 +1,6 @@
 AUX hiredis-0.6.1-unvendor-hiredis.patch 668 BLAKE2B 028700bf24f26e0090fefde677c32c44de57558ce9e334c7d2396e8fd98112ad96fa9502a1aa363ff4843d3b7e9d80a07870a011482d0716b84d22414014d3eb SHA512 c58191682152d26c823c01c689a4cb9becc6dd870034e8ddb7f1aa64a345025f771beb1f72b3dcfebb6948412e1548c9f28fb65c11d60243acad232ecd5e5787
 DIST hiredis-rb-0.6.1.tar.gz 18843 BLAKE2B 56edb460d39018730f43aeb443b6a9d81e2573ebbb6c3149a18db836c8ef5fc8ceceaa768b1a7157280f3e2fd1ed117a76cc6d06c13e326fd45b8bd4efccb24a SHA512 23107d68501c244ec2669448aa919a612be182b559f28a715a4e3a91a894332105ae3a5c96652a691f01e49c88772a482f0da11b80bbb443fa0146bbf77cc722
-EBUILD hiredis-0.6.1.ebuild 1099 BLAKE2B 8938a1e43b3540c935e92a3e68e575a24f21774c8ba9c44615dffaecb9d64244ca25c379ae35d9935d938f943aeff9048c2c322425a718bbff173f4d895783cc SHA512 3f32b22b30d19acb2309ef55cc5367f76a65c4cb006e2a89a16761246e20f8fd1ae65fd97ba524996225a706082edad40d2985635808a154aa80f8327c4ea522
+DIST hiredis-rb-0.6.3.tar.gz 19106 BLAKE2B 2892fd28bf7e7edfc3563a0c321fd781baeca9eb31a64dd559a6c828bb9c4fe37c995748782c5222db46b5b35a4d17f5b8b4d8e5306209a0e374ec7096d3cd4b SHA512 3e081d46aeb128789fa41fe9422186dd30e88c5a7a3c16dfcf1a92fe7faf99cced352ea39a885785fc12f0a974625be329d9ff2a5936a786febe8a2c81f5e139
+EBUILD hiredis-0.6.1.ebuild 1103 BLAKE2B b254b716a2999f3f2153e539c551144f010f65b24e00ca7fd7c7837e6b8aef8c41be601c4496af54c428ee7bea96977e55389bedb6fe55524cd96c445df5cec4 SHA512 ed008ee2aa2f173667db2394ba0ecfb3cfe0a5ee3157e6f609ec23ea5bb273a5697dbb98b18c3d2343f4adbdfe62731121729798c25fd8dd0c4f844c82e7ff0a
+EBUILD hiredis-0.6.3.ebuild 1103 BLAKE2B a83cf45b27ae7eff314f8bd9074cc9ff07aa004fad97d3c29a60262a8d2752017c7e6ea28dbbf931e5f73c31d4d3f2faaa075b9b757e9c74c414fc5d4c209586 SHA512 f30ebe6c664d8edd71c4b8325aa0eb00c5afa028ea720f65489d8273c668e6def4856b26b420dc6f3bb9ddfc995d29b87f1739a86da8139e99a330e352be5ba9
 MISC metadata.xml 342 BLAKE2B fd0bfbbf389a657ac98a4bd4da04180258197b8947e4fcff2d0495f99d74795e97c17d90e4f8cd3c37896fe438fb51f61b7c8bf524a546da12f1e1db949275cb SHA512 82e2c1eba3739857ef533105899b3fa50865136d9aa54709b97d46beb8791c3025b78fbd5173db3c5e0981c0d0873f88ceef9b4a1abdeee7d47c860ae6b25c92
diff --git a/dev-ruby/hiredis/hiredis-0.6.1.ebuild b/dev-ruby/hiredis/hiredis-0.6.1.ebuild
index c41f5f6a8a25..0ff6a725e116 100644
--- a/dev-ruby/hiredis/hiredis-0.6.1.ebuild
+++ b/dev-ruby/hiredis/hiredis-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND+=" dev-libs/hiredis:="
+RDEPEND+=" =dev-libs/hiredis-0.13*:="
 DEPEND+=" dev-libs/hiredis test? ( dev-ruby/test-unit:2 )"
 
 RUBY_S="${MY_P}"
diff --git a/dev-ruby/hiredis/hiredis-0.6.3.ebuild b/dev-ruby/hiredis/hiredis-0.6.3.ebuild
new file mode 100644
index 000000000000..d840099be264
--- /dev/null
+++ b/dev-ruby/hiredis/hiredis-0.6.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+MY_P="hiredis-rb-${PV}"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Wrapper for hiredis (protocol serialization/deserialization and blocking I/O)"
+HOMEPAGE="https://github.com/redis/hiredis-rb"
+SRC_URI="https://github.com/redis/hiredis-rb/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND+=" >=dev-libs/hiredis-0.14:="
+DEPEND+=" dev-libs/hiredis test? ( dev-ruby/test-unit:2 )"
+
+RUBY_S="${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.6.1-unvendor-hiredis.patch" )
+
+all_ruby_prepare() {
+	sed -i -e 's:/tmp/:'${T}'/:' test/connection_test.rb || die
+}
+
+each_ruby_configure() {
+	CC=$(tc-getCC) ${RUBY} -Cext/hiredis_ext extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/hiredis_ext
+	cp ext/hiredis_ext/hiredis_ext.so lib/hiredis/ext/ || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/httparty/Manifest b/dev-ruby/httparty/Manifest
index ddf05428207b..4c38921fcbb0 100644
--- a/dev-ruby/httparty/Manifest
+++ b/dev-ruby/httparty/Manifest
@@ -1,5 +1,5 @@
-DIST httparty-0.16.0.gem 89088 BLAKE2B 27715c6760a9adeec289a005f89de219b32e6ad5c3f937478ad4187df895096f9375b0d20a4b33c1c62b96de6313017a713a036247756a96fe9366e7c1e77247 SHA512 c523ab3555d0a86e2df53e800be57b88f40bb680e7df31e754ddc3e76728eb2228e6ddbe9a3e580c4c604a126ebcd33be79dfde3758faf99aadbba4d30d9508d
 DIST httparty-0.16.2.gem 89600 BLAKE2B 581b5fcadf59bb50864b2fa6d1aae220ff9881bba53363601c6e70c3291dc2cee351a8f42b1946ad516cdcab5a85b832e4260f04394e54255e0cd76bc6860d5e SHA512 13efbacb9ee0325fbb185279ca9f7ffcc0131189ccf98d9889c6a1b6bcfa04fd7cbc6d1393bffe69a5a813a2f54f70b5926e176305fa70480dd0902968c894d0
-EBUILD httparty-0.16.0.ebuild 1246 BLAKE2B d3305c8cd1703486ab374b67d5a8a197e6c9ce0b700e570ba1407148aa692ab1c402f5977e263aa4303a6b3e6bf356297f7572d3a582ae306c9937909c65d137 SHA512 ff0d3fce64021e7ae05c74bd58576bdafd00c52d0ac9241e2faa899f8f12baccbb141f23778f35d0a2878bb468bd8c4cd440fb78d963851053136e6584c0d806
+DIST httparty-0.16.3.gem 92672 BLAKE2B d32f0da8eb2c5e9f2e094c1c8971c53a8e6eab4b0a7b98014d04b27a644d1c2142cf6c97f4db5cd1274f35c8e80ce332f86cae8ee4adba2d0636aabb7f40bea5 SHA512 26916c635fe4cc01a38132ab5970487aef4529239e922d196f5922187eb466d24ead0e2e15889d721a37f6358b65570ca022b78e166bd49ed08c7150acec816a
 EBUILD httparty-0.16.2.ebuild 1425 BLAKE2B ee10a7354a8def05470c713c7eb023bc68c7afd19e8f2af091bb1d76fd2cda47a6bda95f50ee3c21c77ba2613ccc6b33540169af24ff5b81bfc62e93f96e3e7d SHA512 8a7f215586f32a513a2db0a57803d8af58f2883503c5bcbaf1bd76f4246ae5a4b27036c66f75cad60566a74fc23e8224afe5c5323e373b6c79caea24abc96b76
+EBUILD httparty-0.16.3.ebuild 1445 BLAKE2B 53c5311f7e0debc47d55be1bd191154d5ebd3de080ea0d6cda91d9eafa7658ec72cc084a70650deb5841ad2c364d3cd39adb46856ff7bbf52109c84b20d20cd7 SHA512 16cbfa61fb6ddcb6e49c53e010e980e5b60beb009e3fcde5c6798fbae5777bae44670c9316d969deac3b27beb2adfa2deb7e20c41c2dd02836ef4440b69f5ee7
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/httparty/httparty-0.16.0.ebuild b/dev-ruby/httparty/httparty-0.16.3.ebuild
index 472d30ad10ff..4b5fde1500a6 100644
--- a/dev-ruby/httparty/httparty-0.16.0.ebuild
+++ b/dev-ruby/httparty/httparty-0.16.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # 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"
 
@@ -17,10 +17,10 @@ HOMEPAGE="https://jnunemaker.github.com/httparty"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-ruby_add_rdepend '>=dev-ruby/multi_xml-0.5.2'
+ruby_add_rdepend 'dev-ruby/mime-types:3 >=dev-ruby/multi_xml-0.5.2'
 
 ruby_add_bdepend 'test? ( dev-ruby/webmock )'
 
@@ -39,6 +39,9 @@ all_ruby_prepare() {
 
 	# Avoid test that works standalone but fails in the suite
 	sed -i -e '/calls block given to perform with each redirect/,/^        end/ s:^:#:' spec/httparty/request_spec.rb
+
+	# Avoid test that is not fully compatible with newer multi_xml
+	sed -i -e '/should be able parse response type xml automatically/askip "multi_xml"' spec/httparty_spec.rb || die
 }
 
 all_ruby_install() {
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index a055b8457959..dadcee1dc88f 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -2,5 +2,5 @@ AUX json-1.8.6-heap-exposure.patch 2937 BLAKE2B 204f4c5a16df8fa99ea46e7d29c4a7e8
 DIST json-1.8.6.gem 144384 BLAKE2B db9e407be4ac7e0cb2e09369637b88f70cdac7a659c600dc83a5390746dfd21b0a5243af62afaeeff013b5a4116a3b22c65a481cad89f1ca9be8904af87d0345 SHA512 8f393da080293965389df4a606e0604c500b4b267897b3c1b9007b7700dde8156f6598c25790e84fa20a7e03c7ae359a0b267c7b84e52dfe2a1ac83cf652ad9b
 DIST json-2.1.0.gem 140800 BLAKE2B 28bb5334358369351ec9f13f5fb609ce34eb429cfeffb8dfde70864541516a0c2abd00a640b4647f76dcef198f967456bae0a858a2f213e5a30272c1be1878c7 SHA512 bffbe462e952bca321d4325ecb9c5e9f61e51cad13758581ecfaa6a038bac4e30dc7db50bd897086a5592f6fc437d0e0909f91e279aaf4dd71cf127100c3550b
 EBUILD json-1.8.6-r1.ebuild 2117 BLAKE2B 73c347a1b355e862f58de9df53ff014569623c8eec076943a664444cb8fe537e6ebc0645429265730c3e8f649245cca967e8b0c488968a0054c537f8705d6490 SHA512 40709b7d045f68490cd78d9dd27a044c13ca4581a3286cffe3646013152b3a7968b1e3a5a3586413254e6660dc0beb4067f92443368d3400d043dbc1d72cd930
-EBUILD json-2.1.0.ebuild 2063 BLAKE2B a6858ead286219160db9a7f1ffb8ee078b3c2ab80bccbc4e79f8eb9e3d00e042813a3a99967b4ceaba58ba17bcef96fcb6f18014368b664656f7cca64b3a3c4d SHA512 02b679b5c90009dba80a4ee57ae1076ce8784c4b3a39ed5252555201f97522eed853c4756c6c06f8a8cdfd537b06d138f5bd06eaf56264fe65a599171fee5c02
+EBUILD json-2.1.0.ebuild 2058 BLAKE2B a0214ac6af5d97e67cf47acf4e8b886f4690bb0f3b5cf600e8aee46b3a15a0a88b7d66385c24aa35f6536db6331a296376c7e458b243508b6abaac10cacdb4d9 SHA512 d6683a16be75cea3dcdd4245de401decb7fdb2359d53f896aba8274b1406c20fc9f02c502f4f26dc1543039c2049ac8d731739e197c0bdb0b518cd038bc72f43
 MISC metadata.xml 336 BLAKE2B e1094160e19b252f7b3233dbd2006c889c0a02aa4b04063caeb7ded80bb2f08a2c4bc31cfb7bdc17398b8d1b8c3fc9f3600eafad9920fe0355c807d3899f794f SHA512 8b4fa7ef9b753bbf1206b1f8a796d3f3b8e3f9ca07906a2e01dbcc8c69d4cb5e5cb26c395d0676b4dedd70fb910cf0abd3be83d3c94f0b90aee87ea6fda12877
diff --git a/dev-ruby/json/json-2.1.0.ebuild b/dev-ruby/json/json-2.1.0.ebuild
index 4e6c977d3bac..c56d1ff9a923 100644
--- a/dev-ruby/json/json-2.1.0.ebuild
+++ b/dev-ruby/json/json-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
 HOMEPAGE="https://github.com/flori/json"
 LICENSE="Ruby"
 
-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"
 SLOT="2"
 IUSE=""
 
diff --git a/dev-ruby/kpeg/Manifest b/dev-ruby/kpeg/Manifest
index 378c9612c771..4cf98b7f79ab 100644
--- a/dev-ruby/kpeg/Manifest
+++ b/dev-ruby/kpeg/Manifest
@@ -1,4 +1,4 @@
 AUX kpeg-1.1.0-utf8.patch 450 BLAKE2B 00472188e53b34f8395c33c9510232ad826ce71235b3110807d1a3fc9068684cf367f6a312e6adccbf93fbdbc783d69eb8e14a536365f8c72e1ac6841a364171 SHA512 eb0c3b6d3ba32e3496f7f115804dfbef949dfb34e842886cbcc3c8b49a0bfbb21d1ef3510590e335a2836eca09cd031d9e75a8d601176465c84e5424fceba663
 DIST kpeg-1.1.0.gem 57856 BLAKE2B 6aab84aec59c4962ef39f31a7de89a7bb84f0ae2b64327206fefa8bc243e0dd405db121bfe2f50c72b18933c2f4ce7a47a842c741cbd53db1ad73415d41b95dc SHA512 4ca7007bea74485ceb7c3f53eef1cd2e162fed45872f8f078d5b5d2ffd1ecaa0e8fc65ed6f1b220bf6f4642d455a582cb754cdc6350edf856b33d9908510cb66
-EBUILD kpeg-1.1.0-r1.ebuild 743 BLAKE2B f20e8901b0adec15f0d20082ce28a93f608259e577eccb51fdb500d3abf2971c674453fedf3abce0935adc37b7f8943e8d10c2e5e46ee3e6839162fdb77fc1e3 SHA512 233ef339a3656990604cb00a3532cf8be64879c22c8bf71b6418220b704dc2cd18fec220f75e3f900c31fcd056ffa902d160a37ceedffca01d98671594b2176d
+EBUILD kpeg-1.1.0-r1.ebuild 738 BLAKE2B 6f0e9a356e4539db3f6a5c18b9cf95de156efc6b141ea17b5bc9e0165164235dddf15e1ef72eb9dafa4b6d3622c6b27c06ad18c3c2f083bcb7f580a0c47fda49 SHA512 5b09dc41e358874894f707febbdfe9223fd09a95739991c88631d5c9cc65282a5a177d700a11fea16ab6ff5390fb16368fdabcc303ad428c53f0b369724bfd7a
 MISC metadata.xml 338 BLAKE2B fc0c3e4cbb7613cd0fb29651974822b31bbc14da28427772026ac068c6d8ca698c4c38073df6a5d06a864ffdca14477d71ca32dd7b4ca4244cfe02e9e052d4c2 SHA512 981524b3599f2a7a812c468763137a4e38b445c87224f91dc12d128025bd42657b62ff1b5fa9797bf437f46b9f9195bb0469431e77646ad5f0cfbe2c6b5e1f21
diff --git a/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild b/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
index 52d864e2684f..e6ab0b20f7a8 100644
--- a/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
+++ b/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/evanphx/kpeg"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 PATCHES=( "${FILESDIR}/${P}-utf8.patch" )
diff --git a/dev-ruby/loofah/Manifest b/dev-ruby/loofah/Manifest
index ea063ab96e86..55c548122037 100644
--- a/dev-ruby/loofah/Manifest
+++ b/dev-ruby/loofah/Manifest
@@ -1,7 +1,3 @@
-DIST loofah-2.2.1.gem 65024 BLAKE2B dfa45264e9dc0cb4c9fd8eaff8831b5098ae9c1e7fd46d3e965362e46851d5b19102fb23dc96393091ca8e2f8bd9a12f5098ace3c2d6e25236a33fa5f2579c69 SHA512 df971a1bee08f0ee0913af2b4b7baefa6d1ad04af82de796f6f0d505fab7749d52ce79db0118343d336bdae6fcfd4190fecb315019b2c821d81ac1c08d5b8e2a
-DIST loofah-2.2.2.gem 65024 BLAKE2B 4ddb20943b4258c4be621439d38b094dfc79947f092ffa2ff9af56db40538e9672f50762562ffbe5b7c5788fe12ab07ff7601383cfe7e6fc0f4209dad9edceee SHA512 3c64182f8fdb7d79a5be65969728c4c51a4535f53fdae7c8e5f4d487d43af3efac9d2f3746d8e02564d0979e94a0e63dc5974701c151e31c502cb8ff97f1295e
 DIST loofah-2.2.3.gem 65536 BLAKE2B ce1dd5255b0089862d26926624ef6007416318b77f4eb818ff462d8f680f8ef901ecb6ae751e33e1881e303fd005a4bd776c0e6a575562ffb7fb0b62e376b753 SHA512 8e63e1d4e3719c2ffcc8cf3208dbdfa3eb6e328bb91fc8dc6de88c472aac47f1a22771928b08f3c6816c159c6a9672299823f5d48177ae543358e73444b8ac56
-EBUILD loofah-2.2.1.ebuild 1111 BLAKE2B fcc45fdf8a497aa038a01fab8a22e771c993bee533ddc22ead0eac920da70432f2760a71db12446ddb0e864a97143c48296a67aac1a29b39496b13282f78ab22 SHA512 0f64103eaa919ba66c76cbaa8eb144cf1bef933df1f98038d28d661831c121ae13fde36d56754912ec26aa8ffd34b75d71b4974d2fe8010a3504c5ca40b93d43
-EBUILD loofah-2.2.2.ebuild 924 BLAKE2B 015abb2fbea74e8b0fd80b61468b2f61bd0373ee875e7432cef854216a4803a279c059ccd0d389e5c6445e26b4b4569f2eba2fc868d85cd4bf7d092c4b3ce19c SHA512 c52803149543808a0f0032d27db48e9b15d5373a0d7cd44d1a6325f9c016ea7a39b04db8f525dce8d5ab582d5d00769221ca47df5ac0a21f3dcec8e82a4a431f
 EBUILD loofah-2.2.3.ebuild 920 BLAKE2B aa28e6588dd0c809156990e7fcb91646612f4203dc62bf951313f549c2d6e204bb0323a73095c43f22b1df9b765a9d572ef93ac8356bb8465830f17fa04e1977 SHA512 3e32ff081f48000b2672ef3c6ed6fcf0f791b63db1674c7fb39940e6cebd6f5e1fc08f4069a09e5a7d3ff6ce3f7519fbae52140f33fe01b1f178509063917e39
 MISC metadata.xml 344 BLAKE2B a3f2ff5b2aab094581e9f6a3874fbc35fde908d210ea6fbe3643bf8ffcae21de206d0d6afa5055ef3f9dc520778aebfe182dc6018bebc19b075e717278b7babc SHA512 dbcf17023520a30b8d578f04db73d0a67851199b31589473c9bddf1d82f6096d78369ce1b943f05cca904f1bdb2a09adc605a3dc5d8d4e64db5df152b89dd843
diff --git a/dev-ruby/loofah/loofah-2.2.1.ebuild b/dev-ruby/loofah/loofah-2.2.1.ebuild
deleted file mode 100644
index de5c55886283..000000000000
--- a/dev-ruby/loofah/loofah-2.2.1.ebuild
+++ /dev/null
@@ -1,33 +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_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for manipulating and transforming HTML/XML documents and fragments."
-HOMEPAGE="https://github.com/flavorjones/loofah"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.5.9"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 >=dev-ruby/hoe-2.3.0 )"
-
-all_ruby_prepare() {
-	# Avoid unneeded development dependencies
-	sed -i -e '/concourse/I s:^:#:' Rakefile || die
-
-	# Avoid test failing on different whitespace.
-	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
-
-	# Fix test for new libxml2 results (fixed upstream)
-	#sed -i -e '348i "xhtml": "&lt;&lt;script&gt;alert(\\\"XSS\\\");//&lt;&lt;/script&gt;",' test/assets/testdata_sanitizer_tests1.dat || die
-}
diff --git a/dev-ruby/loofah/loofah-2.2.2.ebuild b/dev-ruby/loofah/loofah-2.2.2.ebuild
deleted file mode 100644
index e26b8c34f427..000000000000
--- a/dev-ruby/loofah/loofah-2.2.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for manipulating and transforming HTML/XML documents and fragments."
-HOMEPAGE="https://github.com/flavorjones/loofah"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.5.9"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 >=dev-ruby/hoe-2.3.0 )"
-
-all_ruby_prepare() {
-	# Avoid unneeded development dependencies
-	sed -i -e '/concourse/I s:^:#:' Rakefile || die
-
-	# Avoid test failing on different whitespace.
-	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
-}
diff --git a/dev-ruby/method_source/Manifest b/dev-ruby/method_source/Manifest
index fa596ab91e8f..117ef46078b0 100644
--- a/dev-ruby/method_source/Manifest
+++ b/dev-ruby/method_source/Manifest
@@ -1,5 +1,7 @@
 DIST method_source-0.9.0.gem 13312 BLAKE2B c3d3cd541b782a3e4e2aa2b1576d9206338988330a17e9770e82ff9fc3156f6feff9be970f5f5f0cef90ee160a3dfbbd20c1bac34593906a47daa7404895b08c SHA512 4ef6cdf3f4427a7910f9da8e569d9cc2711de449498fe88ea8782379330a5725a4800168b06fcc593c18faa52294836881852768306303ebc658f97c1bec8830
 DIST method_source-0.9.1.gem 13824 BLAKE2B cf56840a311f628e43888e7907f497ecca726a9211960d097d8a82f4220b2b825cd521a0da16ce9fb2aacdba04f129576fa1e9f77c15828c8d3fa60d8882b332 SHA512 950fe3ca8f4f2087133e23ab13d7a82ebacfcf873cde32d30f7601d48b37527570572012ed3bd06a04cdaa4e603444eab91f9b6287025460bead64105b913313
+DIST method_source-0.9.2.gem 13824 BLAKE2B 842277a0a38331430c3c6a9f45c01d965de1997d8e9aa291d1948103c9812a23c5e67f3e7b7a2e6ec982de2a5eb841a78f6b8d1633ed17c5b7fa916698737ffb SHA512 87bac1d9ef2f1b09a26358d6d2e7e1035703d1bee9b6689567e8967baa544a456b63b2a1271305979ba077ebae32062708666588500e5810dd9f8e282d444b8c
 EBUILD method_source-0.9.0.ebuild 478 BLAKE2B 01630b9db733e9573586f94ca393b2ff53303cd19bdffa4490fac69dd872e6242711c517d26fb391aad175869877c83b63aaea06bc750573534b213f3c581bed SHA512 3ec28bf46d6dbd89cb56076eddfd32024f71e3ddaf4a13159066e9da7f7514a1d500b0c6d99070b69a4f7846b233b51512f91fea5520e0acd006de6fa29b54f1
 EBUILD method_source-0.9.1.ebuild 476 BLAKE2B 3f859cc18fbe18f534aa5e0d825a66a776c70a5911f9ebe731057c320095edaf09dd95e38aabb7d63ae458a15b9146220a414a4685233dd602a83d5e662ddb73 SHA512 9b9c27d708f536c8f61fa6763c1b4760ca6874a9acf2c1778650270d23b3bb928b8b9ecde2a322a50ddac38f2bd8ac71ba7447ff297a6f2473c289a8e401a492
+EBUILD method_source-0.9.2.ebuild 469 BLAKE2B ed01871ebd69853b43113d3604493392a055a7d6f5d2b40254eefc05a1b519890592cd3b243ae7e163ab9eb5d0e79fb56e88b1799916518bea8f57ac9abb1aa6 SHA512 fd31525587ef6e774a8ea82d5bc392fd6685f9f065ec1cdd3eb08ac0912ce8fe5a531dde41c206c52d087e729a47181782d057caa2360e40e49e1177bae1e38c
 MISC metadata.xml 348 BLAKE2B 055674d709a654248c63bf20a1867646170cd6b9e2d74cf54b6640ed14b5b0255b2e23986ed068a96412b0c288262fd207d0e267b70f356ee048635732f8a965 SHA512 425721c75e37753f9df91fdc628d1cdad2ab61fb9c49af31405df4070bcf429a703b8696ba5f0a596416f7d7f14ccb4285e39afd15302da6ec753a630d098e88
diff --git a/dev-ruby/method_source/method_source-0.9.2.ebuild b/dev-ruby/method_source/method_source-0.9.2.ebuild
new file mode 100644
index 000000000000..c09563e2b275
--- /dev/null
+++ b/dev-ruby/method_source/method_source-0.9.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Retrieve the source code for a method"
+HOMEPAGE="https://github.com/banister/method_source"
+IUSE=""
+SLOT="0"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
diff --git a/dev-ruby/multi_xml/Manifest b/dev-ruby/multi_xml/Manifest
index 05d03b945efb..1b7ebd899e4c 100644
--- a/dev-ruby/multi_xml/Manifest
+++ b/dev-ruby/multi_xml/Manifest
@@ -1,7 +1,4 @@
 AUX multi_xml-0.6.0-ox24.patch 866 BLAKE2B 366aa40e831d76b4dfd6516d0b80599c70e0b0c2cd804c2f8f96b82a1582c933e931153f81f27bba8176bbe3ee8f6c4517468b58bd8bc7b380fe6c6257cb953b SHA512 f054a4bba4990f1ff8d6236ed2a99b97182b96c343b749e18c90c63faef10ea25d8f40ca0dd92e58aac8924d0cee15915b3ae2ebe5a6e6c024ea6d4b38b5e05a
-DIST multi_xml-0.5.5.gem 20992 BLAKE2B 8dbd35ca1cf2209850e2c694c435e7bddfc204a15663091d005c6f45faf85c91e8331b2b1fc37ead4f28732a5f73d878c50f13ec7d4681c3ac598a230d4f34b2 SHA512 692f55908ec5e9ee27bec858325ff9a0b15037a6563d5a21bd742ec3c959f3dbc04f1a232782f20827c9af49f3dd14fd725a0c19dbacb3708067c19dedf427ba
 DIST multi_xml-0.6.0.tar.gz 16571 BLAKE2B 1492eab7782823915167ebdb529b6d4699b31f3b66c48eee5acf7857dc25caae62b63a0da10a0bd862ade22865432bc6c4290a3f6ff8e99a889fcf09b56f6b7f SHA512 67e280d838ba07373a6ad5cbe4658b32655102906d8e0ed5429d21220475c21e07ea2ec0d2729df4d30a1bf7d0a5e6ff2d4482342098873135cb12e18c53194a
-EBUILD multi_xml-0.5.5.ebuild 745 BLAKE2B f55d89d13c5b497f3b6e62bd89b2eb62afac93cb19331dac7eeacd434a6103738b2d859b8c73e8541b41b9cc52b1ef25c4d710f42e9265529ce2544b48654ffc SHA512 5631174dfc19f5e492752bdc8dd63ab5ed8e624a49074072c2ef07a4aa7a49f3b59f9768013a129c17fb7636c270e948fb4f4a82f627ff5955ee00f30cd6f31d
 EBUILD multi_xml-0.6.0-r1.ebuild 927 BLAKE2B a6f6433a1d5c8bb055a9ea2fdbcc02d37d685fb2d19e40bd4ea3908542bbd8cde5f9e26178ce42d42f5aadc3b5534408e71fb71c27d6f768398afaa999a7faa8 SHA512 78b7be9063b05c4317ee26c1a9bce2227cfb6fdee0ee80daccf293ea056a6a7de7d8d024324b21ec6bfd76cac4877eb0e0a24459ddfc6c685180842ed0f022b4
-EBUILD multi_xml-0.6.0.ebuild 887 BLAKE2B 6f1d208c684cb16d2e5a973a85c33e22702cead0d56cd0d05b730bc652213e0d859eb1d98d1098d024bc6eb53800152553ea9a93cd3d9b26cac517e624b714a9 SHA512 73fa7f1d63a050b60de4ea41178147a68dd7c802437de2f1ec304fed45f3f3ad7b9767300fb739db994233375bd19f2538f8d42d4bc4b132cb003c7b394ca1c9
 MISC metadata.xml 332 BLAKE2B fc83aa0e31b636d7abd190715ebdb0e7b205444f571344bbddd7d9b130d7ea566c38ce12caf4429b54db3415181f229ba5e012408596b6dff701f34e7e5b3a6f SHA512 53ff80596848fb984f23e66f1eae8bbe9e844de4760fbea929405d6515a250a710dc9a05f61cc7bf84afb069b2bc52a7304a1c15fa1a109bc7d6494fb5e1ef93
diff --git a/dev-ruby/multi_xml/multi_xml-0.5.5.ebuild b/dev-ruby/multi_xml/multi_xml-0.5.5.ebuild
deleted file mode 100644
index 306f842813c4..000000000000
--- a/dev-ruby/multi_xml/multi_xml-0.5.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC="doc:yard"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A generic swappable back-end for XML parsing"
-HOMEPAGE="http://rdoc.info/gems/multi_xml"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-ruby_add_bdepend "test? ( dev-ruby/ox )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/SimpleCov.start/ s:^:#:' spec/helper.rb || die
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	CI=true each_fakegem_test
-}
diff --git a/dev-ruby/multi_xml/multi_xml-0.6.0.ebuild b/dev-ruby/multi_xml/multi_xml-0.6.0.ebuild
deleted file mode 100644
index f99474a2df51..000000000000
--- a/dev-ruby/multi_xml/multi_xml-0.6.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A generic swappable back-end for XML parsing"
-HOMEPAGE="http://rdoc.info/gems/multi_xml"
-SRC_URI="https://github.com/sferik/multi_xml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-ruby_add_bdepend "test? ( dev-ruby/ox )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/helper.rb || die
-	sed -i -e '/bundler/I s:^:#:' -e '/yardstick/,/end/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	CI=true each_fakegem_test
-}
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index 568c86375300..e3f26a7f1bb0 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -3,5 +3,5 @@ DIST net-ssh-git-4.2.0.tgz 197417 BLAKE2B 5714185d9b83d3010e6b9baa07ac541e922737
 DIST net-ssh-git-5.0.2.tgz 206757 BLAKE2B ac9a317dc238f7e3e794e4d8fcccc063d5d34dbe2e50a142e701957ad5c754985523624e97ca0b7d5773d2fefc3f10f3d61b2976997abd29511cd3934ea0e0bd SHA512 6e96d4b3cb2f4f14aa046af72b70a5e3b218153db40dc64996ad0061ea89cc9ac0dc0510a4231734c7385c03436d4116dfe4c9ac4b313c9fc5b029fc8a6c04d6
 EBUILD net-ssh-2.10.0.ebuild 858 BLAKE2B c2780b2cdb45c313638ef427dbdfd588e121449df679d5f1b7423dc489964681cb440dd7e1b54bd5cc131eb9f40e8dae05095b82a3a73edb1dda884bec2dad3a SHA512 7b5630727ba7547c4a6f86e89547270064b77ec874eff574bb724ec8347994e3e4f38e01d1f981da67b187942e7cf648c09681d6a046b0a4a27fa623f2381087
 EBUILD net-ssh-4.2.0.ebuild 1102 BLAKE2B 323e79278e37c7ebb2c8620b9edbb5cca0c6a8dd6211d8c7bd6de0533f5d137b59fdaddd525ff431f6cf11d424c3e820212983af2ce330319a7694fdf29bfc05 SHA512 509757362c9077df31219435c98036ed0f731268d5a351d0c46bc1b5142587c0dde339777e0534005bf41cc0cbf62666a6f3d833b4711e07af8aa2cdd6497d04
-EBUILD net-ssh-5.0.2.ebuild 1019 BLAKE2B 075b59b9cee40c68bbb48e6b640dce85a83d763611b5a17564a754bd1060cdb29dd19c9424054907fe913fc3d98794ec58a09e4d4a2264ff6391e63c64c3d02c SHA512 580194ef8f34474a44d6d5953ddc0ff442a1e110c4682a95110d0a8da57c4a227fcceecdcd1d8e473e6209c17981706c4dd3e95d13f34c99e4af1cb75b3234d6
+EBUILD net-ssh-5.0.2.ebuild 1024 BLAKE2B 95acd6122d6e723ac574cdb3328249e9663c02068f1fc3214b664cc5cfa33872b0f7ffb835cebc72adcc8f4de659eb7558a97f3b2bad66a67c2d17e612b55bd6 SHA512 4e03a94f12a5249298f5c7114d58d43e5bed07becef04030b0eb7c583ea6fc23a1297ef49195ecdc048b9804020cd9deb49bc582446a2330a25c779b84e36280
 MISC metadata.xml 542 BLAKE2B 0afb600fb7668a66e39bfe556157fa6a91eaf67299ba7560a550d041fced876a66ffc83700983fa4f3249a35785e93a7d980ff0940365df1fac626f22189a863 SHA512 f350079143da9f4e43f9da43556d343c01b88782a3d4fe8bdc08a7c901308f352fc9cfd0f998bd4471bed923ccbee0fd1d6112cfe91fa7b71ce9f39a665bcd60
diff --git a/dev-ruby/net-ssh/net-ssh-5.0.2.ebuild b/dev-ruby/net-ssh/net-ssh-5.0.2.ebuild
index 922e6c46fc71..d3f19b3653ee 100644
--- a/dev-ruby/net-ssh/net-ssh-5.0.2.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-5.0.2.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="5"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="ed25519 test"
 
 ruby_add_rdepend "virtual/ruby-ssl ed25519? ( dev-ruby/ed25519 dev-ruby/bcrypt_pbkdf )"
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index 4d1769936b56..11cb507b6d3b 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1,3 +1,3 @@
-DIST octokit-4.7.0.tar.gz 2926712 BLAKE2B 07224de4132ac97525f2a8da784c74a150328f7e7ba08de32485e3fc43231e1583ddf8c16b119c85baece2cba90321059c77c624e450e98dc03ce7c84be54719 SHA512 7a760f909e4756401ce7ecfb3dc8682ec2c630b7ca1639135e61912f8dac2a18974ced1fd5b2d75ee14d1fcc567a370781c159303d7789a9a3f4b756186e72c1
-EBUILD octokit-4.7.0.ebuild 860 BLAKE2B 03369a2a73b94fe8ac54db3922481b2cc6b801ef5cd96018fb7ecfe48f073a2935af9c93dad481d815e713e9ade2db5a1715c39c0e54c040be311e73729fcb5a SHA512 df6ff18d386049ffc81b6aaca3512d4374738cac3f4d8de0e9769d1c0ba0a10b88cc2b27d856e87376ba6e3b8fe4ab2b7c51787e1878102c33721220fa278a04
+DIST octokit-4.13.0.tar.gz 3053006 BLAKE2B 7028cd8c14865a1b061a5ad95f103944b20827797e5f75dbbc8237ed91cb7c9fc79e9a9319dddd9dcee58d32071156e02c04f7d39c4073bad789cbc65887c2df SHA512 48716876e8c5d807e5ebfbd2236bc4b1558d0d1dfd5d3c4cd42b345e3c8164ea36176c23a23e2bb84078e5a6fdeba2b55c3ae8ec0a6451258fe683d84b007013
+EBUILD octokit-4.13.0.ebuild 852 BLAKE2B f5c5bc2a791373ca6a2c208dbba09a683244052fa74124728498a45eb5c2a46ede25489d147fd2199f4927337affe16989df00097e9213c888dedf2152e99fef SHA512 157c43b756654cafc1c281828455fe4f8c1ddfd0d18e06c1d916a3c57eb65bd2fff17a126495bd9bf2aee300185f866fde4d9931c5168a128d2570b6608be19b
 MISC metadata.xml 344 BLAKE2B a2013bc4988a44c7d4b2e9dd6005d30390a7fdaf39f37a4adf8b539825b43f5d0eec457dae147b782f90f15d77fa5f485a6bada65be086f67b7350603945cf64 SHA512 3866d3979a8749d780367b56ae524d8f78286d2174602452ba272d26a4fb49cbbe8945183e4a64e70400b758fba4fc6bf88bcdf24908e474a378b628a1263457
diff --git a/dev-ruby/octokit/octokit-4.7.0.ebuild b/dev-ruby/octokit/octokit-4.13.0.ebuild
index 6510b8100b28..b7f0f47af5c1 100644
--- a/dev-ruby/octokit/octokit-4.7.0.ebuild
+++ b/dev-ruby/octokit/octokit-4.13.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -25,9 +25,9 @@ RUBY_S=octokit.rb-${PV}
 ruby_add_rdepend ">=dev-ruby/sawyer-0.8.0"
 ruby_add_bdepend "test? ( dev-ruby/mime-types
 	>=dev-ruby/netrc-0.7.7
-	dev-ruby/vcr:2
-	>=dev-ruby/webmock-1.9:0 )"
+	dev-ruby/vcr:3
+	dev-ruby/webmock:3 )"
 
 all_ruby_prepare() {
-	sed -i -e "1,10d" -e "/require 'vcr'/i\gem 'vcr', '~> 2.9.2'" spec/helper.rb || die
+	sed -i -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' spec/helper.rb || die
 }
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index 3bace2700f93..8300014fd00b 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -1,7 +1,5 @@
-DIST parser-2.4.0.2.gem 591360 BLAKE2B 77a832e444e70853fe2aab27c0dfc99536aeafac78e3b4f36d3b1863d5498b656ccf62c55481e9fed763828bd4212b1688f06d77c01cb216653a925081f45cf2 SHA512 6ad62084437556bfa3bdb862bb031646e25ec733ab0e34432580351562a72a71507e454da9fd4f53e590163ea9d666c8076ecb7c92a7f5bf5579ca46cbb28a55
-DIST parser-2.5.1.0.gem 652800 BLAKE2B 56411c34da273d8d02d05eb0dee470cf9afd3ed563d02fc8614cc93cb62f0a1e12cfcd02da95b9ed93acfc69a75ebef2b2b25cd885a69ecac31e3c2b4b37bee5 SHA512 252a20b1b578c4c4b0704001aa7b38ef94e5cc24f3eff34d3afcd661e4f5ce2aa25d2113e42a7d0c8e22583451d3e8067429782be12789cb9465262d7bd1839e
 DIST parser-2.5.1.2.gem 654336 BLAKE2B bc6960730337d39d60fc63d6da15023c31986230260358bb64b172d06978ec7fd7cd031e1c9db3cf8a04c96c87b034d8043351c3ee4875402ff8fbac7bcc217c SHA512 d7c06cdf77c2efcedd656dc541ca5f4cd80e3c7c16977a87ce29d51515f4d724ec6bdc3367527d14d93b8339e64103b3cb757dbc2f8731b8941aa6ee4ff838d8
-EBUILD parser-2.4.0.2.ebuild 726 BLAKE2B 22565d48789c7a626bd3d94c44444052358d6d265f7b397e4b71bc16ffede9c21879d30eebeac4faef30ed0ab9f93dcc54e9305150f21425e266dcb73d8eece7 SHA512 183978bc420a988967be08320546002e5d2bb69b1b22c3cbed49beef1c010c59bb02f4cf6325107f4e2ed7efe03b5392dd1ffdb359abaaf9748943f34478d9c3
-EBUILD parser-2.5.1.0.ebuild 733 BLAKE2B 7f18c1a6ea9f9fc9e0ed7d0b037854e13cdf5534cdee41a0e884883333f9526e7e27bde82d5a28f61fba4f72219da36fe464cf27497ab6714cc46871786cb035 SHA512 3432558547d973d064981db11a60c1b71b50fa23f60f9ff49a7b97b617403ad96851f5d4a4655fe1987d2266969b83658e4f9a8c5f00ca70c71977ff25781e96
+DIST parser-2.5.3.0.gem 654336 BLAKE2B dff1b0e0b593a5603f1b0fd9c39f59b6126ad9575d8c077d5a7e2feb16e6f9ef72321a3c7d3a0c21e2f7c26446132c8c30120785390f2b450a0f42a1b2d11128 SHA512 3721b5064ebd9a7de4e50f299001f1640ecdb27b99d932f0a509b89c0b5bf2b337b0298466e6267c61d2b5fcf2e556e0d1a10f6c29dc6f64bd042667f9d79d5b
 EBUILD parser-2.5.1.2.ebuild 726 BLAKE2B df9d16e835249008165c115a6c994e81a1f3b718718bfdfa091c8a585892f95c1f963cce4a76a350f5ce15d6c26fa29f906086dad663e63551d820bb743f66ae SHA512 8de9474b3ea328a8ec6082776bbeb4ef4a37d6ecf182107116cac2bf48071e31e55b72a884dc436b1e8168c56457275708e00346b538dce2e5ca14ae5d3eded3
+EBUILD parser-2.5.3.0.ebuild 723 BLAKE2B 8789c34bf456237f0c19782f6d46b6605265e71a576e4f6524c49eb762a46fb0d499306f8cd4f9d6b3297587ffd16c6674e12d4e7145d5de218f08603b93213b SHA512 aa5d0c9e12db9f8c35b1cb34ac34d045cc0fe6a6f69f3cad530468d2dd63dc8fc4ae90c99bc8cf70232f565210c37bbbc6fe45965dea8bd44ead58e137c10bc9
 MISC metadata.xml 343 BLAKE2B 7da9e267560e7a67c7a8afd5c283389dea1d4db2cb0ca65e4fda61a576036bb8068005b5e31ba9cc8fe7b68b8f8af5f93bd104e6d63412842dd7d0030b83fbd5 SHA512 f8dccc996237113d4add61dcc46e1407ea6edf156b001994e31d920f688dfcf9efe8d3d991ef31dc0084b7695b57b5d51471c57e9e945308279dec7909c69517
diff --git a/dev-ruby/parser/parser-2.4.0.2.ebuild b/dev-ruby/parser/parser-2.4.0.2.ebuild
deleted file mode 100644
index d0e04b7b254c..000000000000
--- a/dev-ruby/parser/parser-2.4.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
-HOMEPAGE="https://github.com/whitequark/parser"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/racc
-	dev-ruby/cliver )"
-ruby_add_rdepend ">=dev-ruby/ast-2.3:0"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e "/simplecov/,+35d" test/helper.rb || die
-}
diff --git a/dev-ruby/parser/parser-2.5.1.0.ebuild b/dev-ruby/parser/parser-2.5.3.0.ebuild
index 2033169ac320..6a974f1af34e 100644
--- a/dev-ruby/parser/parser-2.5.1.0.ebuild
+++ b/dev-ruby/parser/parser-2.5.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # 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="yard"
 RUBY_FAKEGEM_TASK_TEST="test"
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 629aa9e21354..d4cdebc3ef9e 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -1,7 +1,9 @@
 DIST pkg-config-1.2.8.gem 20480 BLAKE2B cc11b5eff30f0f5e1a91e64902931ed540da108fd326fe731b71527c9c4310f55e9002617e1baae4f71a4b705b20cf10f6fa112f8ef56971e82868145d372a47 SHA512 d83a599a48c7d404946054c6846b6cfd9fce2a264c288519a6eccd9787f05d45397dd46300bf97c80700921456318154ea6d44ba32cd159803471073c2a2b065
 DIST pkg-config-1.2.9.gem 20480 BLAKE2B 8a77d1b00082635ff622940cf313e18e9639e22d7cc0cc170ef62b65c69a3f2d98409339de3d8de2c765699734c6177dfa77ca8357090c4f8d805b9cff453f40 SHA512 6b16b741f8efce51623a98a1979b3bc8af18ce6d74bd35f46baafa9eb19bdab50372921f8548a958bc4428f5e9ff0015ca9ec1700065d70bb9fb9d2a98c311c7
 DIST pkg-config-1.3.1.gem 20480 BLAKE2B 016290cf7eecabc5923333b2fc1e124a369f9a267e7157fcbc842e19b8fe0f3ceccfef77bb4c3b9b0300b72bf503d1ea823b8c2743c3d56da06d75e5a81768c0 SHA512 801dbe70ad1ef075d74f260a124d4b3a78a237abc133bd3da8ac93f0ae51b8d6e94efc1064ffea64138bae26efce52ef5bb23553625d808cafa477af50ca55ec
+DIST pkg-config-1.3.2.gem 20992 BLAKE2B 53881385d6751fb77b91428aeac553863d97c1792c30194733fdfc48746dde2178d2e3ad30157ae0061a16e7c0e094fae4fadb3148b4c9c1da0a66e0937d7cd7 SHA512 19f3ba9eaf8e81504ead9445a735e1afbb1726be8671e5146f31e31ad311b34ed17a5c01769aaadc9450667c1f69f14451eed68cfe87339b00f0b87e3e7d592a
 EBUILD pkg-config-1.2.8.ebuild 815 BLAKE2B 14e9131af5184dfcd43ab15edd031aed81b11c385930f2a178fa745a47391a6cd6e4f55c3053714eec8e0226717099cbc647e040f0205fe8ec6520c91d83869b SHA512 d6cb2e50e5c9902852306d99739a4be821d132982a41f6d3d449263fbcd58e944fc4394633786ef25bad14f50eb8f215910db531fa13ec2d85bca00f36e2587f
 EBUILD pkg-config-1.2.9.ebuild 824 BLAKE2B 9c03eaa53bfaabea7177f1f02b2e2673f99be970f2c896c695bc8de38eadd84e5f47c1c9d7fbba2f2cb8feb7601451e416bfa0dd7c2148755fe75bf6e4b0077c SHA512 a4997b9fef72f9a616e68ec66b05366cac3cc8ca2aaed521f3f64ecf00d28c675a1bc2cf5750a9aadb42dded8f92489414de9ec646661a0e8ae7dc61de28b5ea
 EBUILD pkg-config-1.3.1.ebuild 817 BLAKE2B 95317b9d4f7845810fe5b50899b97f4cd6e0bd189e8d0eb78ff731997eb8b0281afc5244c26cd061675d6223a4977e6aed3342ca89aa29df8ba48a5098f1a3f8 SHA512 6d36b5b7a17c0ec5131d1661fb7e6d0752470ee5ca73aaabf47099fb5b2baf5a5501f280a4af32d599a879450a94b22c01199bf9b8c5419a5bbffc157d960cbe
+EBUILD pkg-config-1.3.2.ebuild 814 BLAKE2B 6aba7252568430045550840a13d05125aef81e9ffeb264d4a2ffc379abbe04c96f060c7cd05c382bc8ba722cd7a5f127c8cb36b3ff160b62a8d5aac534876919 SHA512 9ba2e57b87edc66bace74ab288783c86ce1a3402e5844590b137711f0c0c271d04d96797e07be6aaf4242ed7ce9e1794a96bd862569170670a335f3b996c2a99
 MISC metadata.xml 424 BLAKE2B f3283c73952daca20d85a5421afb67150aae553faa03d653686718ca5216c1a65ab5983fb669cc34003902b0a969275bd22e4d1765f3896c7e25bee301323f42 SHA512 40e700a309e3678157d9da4ef18e8f0178e23aa192949ac06acd6f8026d0d53d4f79c199aaf59e0e27dba17925f44a97ad901e0774c6b70583b24b09254eb8d5
diff --git a/dev-ruby/pkg-config/pkg-config-1.3.2.ebuild b/dev-ruby/pkg-config/pkg-config-1.3.2.ebuild
new file mode 100644
index 000000000000..ff17071fdd3f
--- /dev/null
+++ b/dev-ruby/pkg-config/pkg-config-1.3.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pkg-config implementation by Ruby"
+HOMEPAGE="https://github.com/rcairo/pkg-config"
+LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+# this is used for testing
+DEPEND+=" test? ( x11-libs/cairo )"
+
+all_ruby_prepare() {
+	# drop failing tests
+	sed -i -e "/test_cflags/,/end/d"\
+		-e "/test_cflags_only_I/,/end/d" test/test_pkg_config.rb || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib test/test_${PN/-/_}.rb || die
+}
diff --git a/dev-ruby/pry/Manifest b/dev-ruby/pry/Manifest
index acd5617500ba..4c0d1a42549e 100644
--- a/dev-ruby/pry/Manifest
+++ b/dev-ruby/pry/Manifest
@@ -1,3 +1,5 @@
 DIST pry-0.11.3.tar.gz 225483 BLAKE2B a8d680c095a887e2612b61ef2f892ece8468e447f08e209b97494844fb27cf2441b8d575125ac5657b6f0feefa8b2726bfd78966ce44da1d96af84982918f428 SHA512 6c5c983d0d446cc7cf105797083d932d95db9821215635cd3929ce2e229e21c4566d0644a6283de462e735aef577cd8c115589d2dd8bac88ac2f911be0bf729f
+DIST pry-0.12.0.tar.gz 237643 BLAKE2B 3c1d749c4df638652d0c9e2a11efe1c48225f2aa434e1adb3323fa5cc21fce40f12c7cecdff20589e8329acef30523114292a2834392b53f5d31c40132bc4232 SHA512 bd8ea74c281d64262d499970c0861659679670f052acde37f1d7fa50f2184c816e5681ef2566bf3a6010d150f9c649b39024a79a269e2a7b47057e1d8173d2ce
 EBUILD pry-0.11.3.ebuild 1183 BLAKE2B 7c056cb9b033556b1bacf8457d4fb059947595272bf4b77d82dd1efa067eaaf0d194186072609ac424606e0944d0e295d8985ef9842b1c4f9fd8f2c906f18963 SHA512 c9424ef1fc6fba78a607369ea61929201f14d67bc5631d7ed4a2f89dc098c725e2d9204fe4cc51477126b204282eb24762786db8ab78e7681f6f1cf9352ff5d9
+EBUILD pry-0.12.0.ebuild 1173 BLAKE2B 4030f510c1a19efbb3924c9c71947bc83c1c5991645c5e7178614c53e527d5ab07a5c9ab366aea6a9d04b006c5ff42e178a54ad2f487026a4143c1c0a94e015f SHA512 e5cce7a60c3236f85d58ccef83f1e17674c1f4bee2e1847d31cc025363254591a8810c27e88b7ba72c43a30464e3c18e8b3501b9098e7729d2ccf7cf0d897087
 MISC metadata.xml 333 BLAKE2B 0c32ac9d2cb59e7aa1dfca56e88a2a38b783bdb2779c9336eca40d06770f02252442afb3372c1a786bc491693548c145079b3aa8e61fefeb0b81209f0afe3fa5 SHA512 4bd968aba7e36044799dfb4abba1a0127c4aa4ccb4e7d1830dafbf27c6c9e94fcc29ad008dc527cf2c409c8308dee14f803946afbf716bc22d9d3f716b951887
diff --git a/dev-ruby/pry/pry-0.12.0.ebuild b/dev-ruby/pry/pry-0.12.0.ebuild
new file mode 100644
index 000000000000..dca7baa3cb19
--- /dev/null
+++ b/dev-ruby/pry/pry-0.12.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+RUBY_FAKEGEM_GEMSPEC=${PN}.gemspec
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pry is a powerful alternative to the standard IRB shell for Ruby"
+HOMEPAGE="https://github.com/pry/pry/wiki"
+SRC_URI="https://github.com/pry/pry/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE=""
+SLOT="ruby19"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/coderay-1.1.0 =dev-ruby/coderay-1.1*
+	>=dev-ruby/method_source-0.9.0 =dev-ruby/method_source-0.9*"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/open4-1.3
+		>=dev-ruby/rake-0.9
+		>=dev-ruby/mocha-1.0
+	)"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on git.
+	# Loosen coderay dependency.
+	sed -e '/git ls-files/d' \
+		-e '/coderay/s/~>/>=/' \
+		-e '/bundler/d' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -e '/[Bb]undler/d' -e "1irequire 'mocha/api'\ " -i spec/helper.rb || die
+	# Out of date tests
+	rm spec/commands/gist_spec.rb || die
+}
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 31338c3b5be4..63cddcadd30c 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,11 +1,13 @@
 AUX rack-1.2.1-gentoo.patch 410 BLAKE2B 18246afd31b682e66a5bdd92c08bb9faed9a9fe22fade22f2c124a3a499b67794082e1bd03081c1914793003fe3c0a73b2d42f51395fc2603eb6513a3b404ece SHA512 03dba431bbdd77f87e0f26ccc6022248edbde20930254da1c55db6115dd49be5dd3f16919e15ee7baab40682b3f959b52692d5018b09ad79d4db3acb3adf6f43
 AUX rack-1.6-rewindable-ruby23.patch 1360 BLAKE2B 062c4a474959c4dce61969583b6aec1ae98acff38c1e72f5e22440c4c8938dbaa2142d70a0354948c151eede2b23ca5accadc72aeab366ca1457216d9725292a SHA512 3cb110af584cc3f767a0d3976acb66f37423559865af0726109419728ce6fbe9f484ac2340b1816ae89c1a59ca64330c1bfe4be3910bf6a8ecb05784115a1cda
+DIST rack-1.6.11.gem 230400 BLAKE2B 923a0a1ee7c3ea86c76e632764a678d47be4d4d953d3166488fdea6c198a64603017ff0bd21597dc633dbcb1f108363c52480a98ac0b80991fc4a759dd374f6f SHA512 f54d9c4d72d22c57624bb745399ac0d4f155185d01f956ad395bee2a0add6f11e8d9d25fcd330ec6aa97409ba10c2246424d067999b86f2e5cb1fd74a43c6529
 DIST rack-1.6.7.gem 229888 BLAKE2B b4ea51d9a0606c92c6cc199bcaf3f7068e6360dd972417af7fe8784a5b23a8de1288347431f08d9af1d19f1409f18035d668d6e80f0b2080d761a3e703259d0c SHA512 e1cc22d78a61998c034bbf9217cad5cc0e614697e787f58aed9cfb1c3a12f69b557c9e95a4b09fcc1509cb607332a8655a66159b2492ea6fdc2bda21f588a59e
 DIST rack-2.0.3.gem 254464 BLAKE2B c7052ae0210d2c8d9aeaa6e3b5b10b272ea48d6c2601aecd524eeab141d3987b7905d9511814d0ac7a62413ef5eb01e847168a278bafb5a0e8f882c526cdfcc9 SHA512 c48e6681544c2f37797ee697f5c4f0d4de6008a3df2506665b52c248fca1ef7321a892dd28475e4d7b461a0b2d12112903a67e1bed7c7397742833fce85167e1
-DIST rack-2.0.4.gem 254976 BLAKE2B e816bda9969117525d061b2de2e9172d831a1fd0654ee5f4ff0293a95c01b8451204cab034816f7b2382b77cae3c9a735184f3f1c8f5b9e8cb43963001f815da SHA512 d6624d52c456654ab4c98554d544c6cb0bd15fad5a494575ad329bd1892dca2ac612b5730f4e3f6eddf2c0496afc393f215fb7d60795c264d2251896c27f450a
 DIST rack-2.0.5.gem 254464 BLAKE2B 91fdb183a7e79b853d5ff8ef0d95799fdcdcb92ae69406666a96742dfe9abf7211c0d3ee0ec21edfb01392006e30c146573acb532a83bbf807f743272fb77dd9 SHA512 ac820997ec5804816e26275630797d0c86e2dc04d43572e66e99a25067d531c8a6fcdfb7b5157ce44d039d1690bb015567d859a13a85dc7d22fa0f7454ea0aa2
+DIST rack-2.0.6.gem 255488 BLAKE2B 7b23ad825e3e82f5010e810acde5eb6f3696489a78c3c67d7ac6cd73574236f83107b8a5fc0dbd4c932e2bf866c03208933d4e5bd78bf8d57aff02f96bccf6e8 SHA512 f1b93bbd16b7e44423c0977444183d9685e3c82e806304f304620731e5b4590920dcc363026277aa4b9ee0a2151c54570be341dcb9265517c7315ca4a504ef22
+EBUILD rack-1.6.11.ebuild 1811 BLAKE2B d63dae6d416a69afd0e9ca5fec99868e0f07a2e6dfac2d6ad5cef8918d818c19d6fff1f81ef19c693e43f837eb52e314677b142c79e7035764da3a5e708c76e5 SHA512 5904ba760d3ce7daf1d23c9fe05e1d288b86e3d3757ea9f60a3e6f0dc98b760a8226c8c87d50bafdb41523c47b79d5840bbfb5981c7e17c0e9fad1969815ba1a
 EBUILD rack-1.6.7.ebuild 1650 BLAKE2B 7c921e890048cc0f9db6fc066695dafbf1afdf816ed87aca9c9d1e713ed704a2335b40e7654f0f96a1f511232b30780c82a4ac6232f80f9a054a299bc307da3a SHA512 be28af8b62260dc820f1c52ae44d1e46fd416dad453a0ac03eef8cfbbcaffd056b7744d61e5b5b287de90d5ad745bac5225b6c58b9808e75058638a1f61b9360
 EBUILD rack-2.0.3.ebuild 1508 BLAKE2B f5f9bafb1ca637b1303cbf44a32b77b1969e8b773408141de007781524f40643fa59e9b37bb8feb92e950fecb7fa4b96f0d1fe4e8db2c9ab9e7cbf15f9dfd1b3 SHA512 e62cc26861382a150c813a39a5aef7d9e41858ba415f03f789333e4e9f64187b506df4bee860abfca3a2c120b2251b416c3058179be47ca58a4138437145895a
-EBUILD rack-2.0.4.ebuild 1466 BLAKE2B 8d95bf901666ae8b174dd8a7e689ce8687572a796d6a68106277de69507b203b06e6177fd1b531eceac21e86452e278b4df617def2e769b0857dd551d316bbc9 SHA512 e00386ebd69f3ab4a0c39d9507a6f32ee7214e4ca8e24cf9807644644cda7c7896251dc81f553f14655bc4c49ae7d19b31b58c0f64a3162a13e085c65e1f8cf1
-EBUILD rack-2.0.5.ebuild 1466 BLAKE2B 8d95bf901666ae8b174dd8a7e689ce8687572a796d6a68106277de69507b203b06e6177fd1b531eceac21e86452e278b4df617def2e769b0857dd551d316bbc9 SHA512 e00386ebd69f3ab4a0c39d9507a6f32ee7214e4ca8e24cf9807644644cda7c7896251dc81f553f14655bc4c49ae7d19b31b58c0f64a3162a13e085c65e1f8cf1
+EBUILD rack-2.0.5.ebuild 1462 BLAKE2B 65a692be97fa6dc653d39536dc19fdc054fdaa0a8759e2e62bc5a76ff84d22ea317767aae5db7bf6133ddfeebafdbbaed81ecccc582949a365e1b6d3fdd19d51 SHA512 3f7aa747aacffbeb8266627c7f2c7bbcc41ae3d261b4a6915850affcba5526bf88ec22fba26586f40d1434fd985d593f8d129e2ca6c11ef238c072d5ba8c7063
+EBUILD rack-2.0.6.ebuild 1426 BLAKE2B 171d02790efec49527a65976d89ebb0a4e145c42a07e8342e92dbed8b1f7304a3f3d8f754b537be39968838b6f910eac78c674a2784378a145ee7f0667e5fe26 SHA512 215e32f5e31bef462f350dd66a7c01c8729b5a182139293696d40a7900f50475269bab50d02fa19494e4e08cb0fe451ec489554b731c8f1d111652505d03379f
 MISC metadata.xml 391 BLAKE2B 5ed2f863a5fd68cf57f25afc2c2efa63df1eb25c4e01087130f70edbbd1b79c655ff7455b73ecdd31e083cd35381331fceef52856f946d24fc3d313705fbaef3 SHA512 7ffff4c4cc64855b0c95e2364fa9cfd1e3b06946155cc8244444f5f4e450abda8d8387aabddc224b94a55ff3d5e42391970e5541923e5aae24f408113a65a5c7
diff --git a/dev-ruby/rack/rack-1.6.11.ebuild b/dev-ruby/rack/rack-1.6.11.ebuild
new file mode 100644
index 000000000000..6814c334d423
--- /dev/null
+++ b/dev-ruby/rack/rack-1.6.11.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md KNOWN-ISSUES README.rdoc SPEC"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="https://rack.github.com/"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch ${PN}-1.6-rewindable-ruby23.patch )
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all.
+ruby_add_bdepend "test? ( dev-ruby/bacon )"
+
+# Block against versions in older slots that also try to install a binary.
+RDEPEND="${RDEPEND} !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5"
+
+all_ruby_prepare() {
+	# The build system tries to generate the ChangeLog from git. Create
+	# an empty file to avoid a needless dependency on git.
+	touch ChangeLog || die
+
+	# Skip test also failing upstream in preference of making a security release available.
+	sed -i -e '/knows to prefer plaintext for non-html/,/^  end/ s:^:#:' test/spec_showexceptions.rb || die
+}
+
+each_ruby_test() {
+	# Since the Rakefile calls specrb directly rather than loading it, we
+	# cannot use it to launch the tests or only the currently-selected
+	# RUBY interpreter will be tested.
+	${RUBY} -S bacon -Ilib -w -a \
+		-q -t '^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|Rack::Server)' \
+		|| die "test failed for ${RUBY}"
+}
diff --git a/dev-ruby/rack/rack-2.0.5.ebuild b/dev-ruby/rack/rack-2.0.5.ebuild
index b8f6568045d8..08ac8e021516 100644
--- a/dev-ruby/rack/rack-2.0.5.ebuild
+++ b/dev-ruby/rack/rack-2.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://rack.github.com/"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rack/rack-2.0.4.ebuild b/dev-ruby/rack/rack-2.0.6.ebuild
index b8f6568045d8..6d59ebf24678 100644
--- a/dev-ruby/rack/rack-2.0.4.ebuild
+++ b/dev-ruby/rack/rack-2.0.6.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # 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_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.rdoc SPEC"
 
-inherit ruby-fakegem eutils versionator
+inherit ruby-fakegem eapi7-ver
 
 DESCRIPTION="A modular Ruby webserver interface"
 HOMEPAGE="https://rack.github.com/"
 
 LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest
index 6421d46a681d..cfdcadd96eb5 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -4,5 +4,5 @@ DIST rake-11.3.0.tar.gz 134863 BLAKE2B 0c4bccabdf98bd90c9121af20d892243ae283e8f1
 DIST rake-12.3.1.tar.gz 120170 BLAKE2B c0d087911f33ccd5256462501d175e1f92fa104a3c89b62a5bc434836d5abb277a61fb12269778d0a6e3b9b831e78c0a94d9d1cd885906980fdb55e0402e398b SHA512 49736059713d609b0786d4ea89866fd5d58076977aabeda3eeee0440f10edad708cc10ba91b5224f59a8ab87ee2ab8e2674e9115f90f035c16e1fa8cba3f7649
 EBUILD rake-10.5.0.ebuild 1195 BLAKE2B 21a3d9d9d09fc565347694c84799dcdc6a8f53348b5e90c97382d7c595d6231a2b45db9158db84f37a3d9db44bdb950b3343fa79ce0dba82ef76b1a8c8dc1549 SHA512 4e689f4db52872206700137ccdc3dbfbfa882d0371724cf5468b3f51559c08a0e3011d7aad68ad638448096da2bdb69530225f7aeab08e85cd33dba419ef2ad7
 EBUILD rake-11.3.0.ebuild 1301 BLAKE2B d45fdbf2ade4b863f22caac24f2c946bf7fd71b847aaea3229064423969d33a1283d38e5b944e1d4a15be5d9e3ad60792ec565379770739159dc739b2500eae1 SHA512 99fee0adee74014b78392cfcad60ef753adac4e8fedafcada27b5429a3746b45f36caa854d4fbc4f888901b2d14604f427b0d0c99fd98a577c36efaa5488dfcd
-EBUILD rake-12.3.1.ebuild 1402 BLAKE2B e021fccbc0f95eb9536ccecb68cef83458fb92abe891e80f2c5f21218b18b0e25a1499ace122abbf6a2fb65efc1c20deac87e60fe09b07fb3f75c88d9e6c28b4 SHA512 c47bd4c826fa80706f23c96033e019632105a49ca4e8ea3b8a5e4c60c330a9e5bea7e20d88eb4f17674dd6e749cd67e84f96fc4d2e65c33b9be81aa1c5525032
+EBUILD rake-12.3.1.ebuild 1397 BLAKE2B be3650d4798295420fd8665992b571c52c7cd4f7d4fb9ed66d48f0dbb910b46a37a2d24f0c8e429190389f69424b8404ee2db7f086120fcc1bd53d59661fe5a2 SHA512 69f81ec4cf709235298b32845bf66ebe311c7ab85fe9ce0ae650d39e124e8ef6e84308390f5304af5106b123d8cbcef0bcd849552c4bfabc93d4421064aa799d
 MISC metadata.xml 341 BLAKE2B 4f6fce5484dd3adf4b7025f95d26ecd9f2f435d2b5e5774cb3f6ea2ea07727d4d76ef640eb039aafe67e5597b70d22258d0f8f939471af2057f0f933250098e6 SHA512 56fc95931062163036dde73847a796fd5802ff4bcb8a8e72686847537d0f38c9d15e0ec83bd06c2f86ce92952e9fbaa0e90eb4633d7afc460adbc0c9676e0040
diff --git a/dev-ruby/rake/rake-12.3.1.ebuild b/dev-ruby/rake/rake-12.3.1.ebuild
index 651385e7ba6a..eeed09edcad5 100644
--- a/dev-ruby/rake/rake-12.3.1.ebuild
+++ b/dev-ruby/rake/rake-12.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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"
 
 DEPEND+=" app-arch/gzip"
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 688b24c59088..12a4dbd10dcb 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,10 +1,8 @@
 AUX rdoc-3.0.1-bin-require.patch 632 BLAKE2B 9835233574b78ddf5c9e1d60aa4a755928854ade5076141696ebc046ecbfb0ed1a83754454e7cdd6accd42a49bad6cbd23258cd8e4e14a280463fa0e368d62ed SHA512 d8840d320582f1b744597a4a48008508dfcfe7537b24570e977f7e10f1bc6e5955cf9319182d2546db23d96fa31a55320bf54f49d127623c9d9cac9d639c572f
 DIST rdoc-4.3.0.gem 738816 BLAKE2B f705b4fed5a9a7e3a850cacc17b7df3f8fdeb163938ed7d2d29979337cb24bca4a66695643ecc62f811d8e49a931296e1972d5d13366685315649e0ec44ebef7 SHA512 7ec5c8055262300c159ff2dbca3bcd09e169002acad8602db89086d2b9409a096209a1152dca68c79dcd1b5e3c1fdf55e7f89d82b33fa2ce65c816695350b029
 DIST rdoc-5.1.0.tar.gz 702376 BLAKE2B 733d77a341ddad10f5b648b6bb492e0f79daa392e2ca371d38236e4c85a1c409699e35dd3f5bc8bc48551b399603bb0a747cb3c5f7f1fbf4765aabffaad575aa SHA512 cd2ed37e8502a3e9093c88c258ac5e39542a23c3dcaedb9b5eb48ce391a694e5b35fbcfd62f01ec6353ac9c40a4b7043b2ff11bbc403d2e03de9a84c52bcefe7
-DIST rdoc-6.0.1.tar.gz 697323 BLAKE2B 7af4a3189c6680ae3d92b7a0b7764e73a104017b49442d89ffa0e2da2d504e7493b6842a3b5b60326e8f633a10447e2e6efb17ff61da7b6e4e55b52d973fa523 SHA512 43812f068b430d4462821098bca1a1f0fc2adc63c6f358a48b4af94aafb76d33eb494ef06f91aa72065f128fb0d34f53a05cb246f0c4fcc31ce9c1b31658d108
 DIST rdoc-6.0.4.tar.gz 699314 BLAKE2B 37b9c65a55357b9edbf85889c086948a6e80094846434d46e6ffbf17e16eba9e964dc09721f921d5042d6e0c72619fc59d87c8d969490e6af50fddaf49d36556 SHA512 8bf61bda88ea1a85178f5fdd62e87c79c5efd6d6f64d9d8651bbbc37e02da02b7189c7e60e4853a962507cc2ee4c703b6532f28db763202fa24c4b364cee8e28
 EBUILD rdoc-4.3.0.ebuild 2695 BLAKE2B 49ec379de4d303a230b37e7194d07f44c2036d1ffd612f0eee8c5e9877d1023eead430aea666f193509b87d675c89447948d9334c587c8169274ecc164ac56f3 SHA512 24aeb3c3ed906dab7d3c570cc825d1152a769f24c775e529c3ed66160f6a36f211e581dd86aa3efcad5c209e50263a536c0d84067e23e65057f38f975ee5c907
-EBUILD rdoc-5.1.0.ebuild 2568 BLAKE2B 2c2bc3d067b2a5eb6c3f0a176620297ec2409811258ab44dcd8912b9fc9d9dbb104bc7f2608bb33cfeb367a55a0b6aff5c0707fc85e8342bc276a89abcf5ce09 SHA512 445fffe0e53abed82e729ff5cdd322cbed1b485ddf419ced48c1b18035fa42dbb76cb5cceb8d1e604a4737fdab08866a6ffdb691c631c83b2fd58a4265534df3
-EBUILD rdoc-6.0.1.ebuild 2556 BLAKE2B 1007587db7b44f6fbe077215f4a53329f787e0ff2e150f4351e2efb31974101dde55c2e00e4d7bec68eac190ba5987689ef28980f9ca1bbb8eed05ad2525c660 SHA512 5db8d8cd9387c2731b618664cd166950cad142df5994e0f6995574a922dc0ac25746afb3b8108dd40c9f7c514b593e0c22993fd097b9c2d8d4abcd9d805f411b
+EBUILD rdoc-5.1.0.ebuild 2582 BLAKE2B f89fd2f231b5a40e8b151e8d24c7912e771c07a3539c35c3d31f355d682e90a62db64e0de7a90d6263e3b3d682032e09e1410df8c4557b2a35ab8fbef00b77a0 SHA512 8e691d5bf2b48c80ea335259a8d14d039fa1dbf9099afbdca582f1ece8a5f2e30e22e88574ef355a1f811a9510be18174007667c5d636cd0d3af121089cbe09e
 EBUILD rdoc-6.0.4.ebuild 2561 BLAKE2B ebffcb449dc097f3c2d0d46d56e4d95565f2a088124c858b30881e2b01b02762e628a7345918a5c9f6ed5b869c70ef546270e73ecf2ffca1a714fb9c34b1d30f SHA512 27ca6b208c38c08027b7083cf4db6eca4fe814734fb7c3167d13a06a9bea44c4e9477c870b7b6785c9c165730e5c4d50a45b21e8c728c1fbf37c0406e7a7d870
 MISC metadata.xml 335 BLAKE2B 835d498407155ac5295c70af8a671114c777e5f9371b3d47f9f92a6b102b8e1d58755df0737c34820630464772dc001163e83b5d319707a1c630f4cf2f9ef8de SHA512 3421081016cb99570f9ce9f775097669cd40a709efbbb3c76a20947717bc40d886195a5fda889407d1c436a387c126e07def1eeae01edff53c490ea9c630e992
diff --git a/dev-ruby/rdoc/rdoc-5.1.0.ebuild b/dev-ruby/rdoc/rdoc-5.1.0.ebuild
index b701fb53afb1..83a1d350e168 100644
--- a/dev-ruby/rdoc/rdoc-5.1.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/rdoc/rdoc/"
 SRC_URI="https://github.com/rdoc/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
@@ -28,6 +28,7 @@ ruby_add_bdepend "
 	dev-ruby/kpeg
 	dev-ruby/racc
 	test? (
+		dev-ruby/bundler
 		>=dev-ruby/minitest-5.8:5
 	)"
 
diff --git a/dev-ruby/rdoc/rdoc-6.0.1.ebuild b/dev-ruby/rdoc/rdoc-6.0.1.ebuild
deleted file mode 100644
index a9d943d4e523..000000000000
--- a/dev-ruby/rdoc/rdoc-6.0.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
-HOMEPAGE="https://github.com/ruby/rdoc/"
-SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND+=">=app-eselect/eselect-ruby-20161226"
-
-ruby_add_bdepend "
-	>=dev-ruby/kpeg-1.1.0-r1
-	>dev-ruby/racc-1.4.10
-	test? (
-		dev-ruby/bundler
-		>=dev-ruby/minitest-5.8:5
-	)"
-
-all_ruby_prepare() {
-	# Other packages also have use for a nonexistent directory, bug 321059
-	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/test_rdoc*.rb || die
-
-	# Avoid unneeded dependency on bundler, bug 603696
-	sed -i -e '/bundler/ s:^:#:' \
-		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' Rakefile || die
-
-	# Remove test that is depending on the locale, which we can't garantuee.
-	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
-
-	# Remove test depending on FEATURES=userpriv, bug 361959
-	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
-
-	# Remove tests for code that is not included and not listed in Manifest.txt
-	rm -f test/test_rdoc_i18n_{locale,text}.rb \
-	   test/test_rdoc_generator_pot* || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		ruby -Ilib -S exe/rdoc || die
-	fi
-}
-
-each_ruby_compile() {
-	${RUBY} -S rake generate || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for bin in rdoc ri; do
-		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
-
-		for version in ${USE_RUBY}; do
-			version=`echo ${version} | cut -c 5-`
-			if use ruby_targets_ruby${version}; then
-				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
-				sed -i -e "1s/env ruby/ruby${version}/" \
-					"${ED}/usr/bin/${bin}${version}" || die
-			fi
-		done
-	done
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/rdoc) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-}
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index 4309cbc66a93..979813b0c969 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -1,5 +1,9 @@
 DIST regexp_parser-0.4.13.tar.gz 81658 BLAKE2B 008b5c2ab7b08a23c18f165de2028fab7b42660644dedc467edc5b36065ccebdd80aac0612a37efc59248d2c7116746de41beca964a5c92800c23d33faf98ac0 SHA512 f6996b4c0be7f387657fed7a8fd505dd9dd3a15dcd09e12be0bcaf0bdf2321dc6a15a731e7062b76dc40e953b207340747f1429cc7e621dc0b1caa58154ba841
 DIST regexp_parser-0.5.0.tar.gz 80554 BLAKE2B 7890e6850e3ffbb927c5e72430ab29e6aeec4f8684eb56f4153414aca62702faa57f48887618e84b1d087e2ba366ec9d6b2e92200cc34472b7bbb5a8b0043415 SHA512 0d1c43fda01077b9b3d9c28ce9cb01772f10817e42d9c0ff28e6ea5cd059ad4869b940498c6a4e77d4fc6acb6ac0aba293ae67dd012650cdb58989b90868be16
+DIST regexp_parser-1.2.0.tar.gz 82333 BLAKE2B 9748e69c876365f8ef9431dd14168e2759312e51145d856043cd36a7198a68ea08ad31e120aab76ed64a615d776c3ac20e269fc62915fb3ef472438eb90fd440 SHA512 4f47a12e420ecefcc167ff9655b4df97c4a06de4e0ac6479d3595fe1d89b142dc6a64d34b9f4401da9f06119e71fde19d46db7c7e28c4eb0ab5df2e293a36cea
+DIST regexp_parser-1.3.0.tar.gz 82564 BLAKE2B 4b35174893fe3af4d4c2f65625c8920ed4fa5b081868ecfdd418af5bd24749e123c27f26201caa7a792cc3abd89bd826ac332ad042731a330fbf3b05052c14fa SHA512 e2947d32bb8f81fab2428c92ca03389a6df963c4bc2104f9cb9bf013616efc5fdbef711e87d6ff15e2d3a5bc667b1a8c9fc643672975fa23b6e700b2a090c536
 EBUILD regexp_parser-0.4.13.ebuild 874 BLAKE2B 3b5f06c9ecbaf5f8cf271834c4faa3838d30364619cfe3794c4bb1ac00e6495b06918dd54d451d3bf1a6edd0d358eb96c48b3cb647750e4e4a63ce42a971d4ee SHA512 ce7521f4dd924ac5ae9c8af6b2e8f72d34162c63d0b99e35f440c771bb74279a78fddcd21a597405c94ac10bcf0f311b253585753667e4e7da7a0bfd7096b975
 EBUILD regexp_parser-0.5.0.ebuild 874 BLAKE2B 3b5f06c9ecbaf5f8cf271834c4faa3838d30364619cfe3794c4bb1ac00e6495b06918dd54d451d3bf1a6edd0d358eb96c48b3cb647750e4e4a63ce42a971d4ee SHA512 ce7521f4dd924ac5ae9c8af6b2e8f72d34162c63d0b99e35f440c771bb74279a78fddcd21a597405c94ac10bcf0f311b253585753667e4e7da7a0bfd7096b975
+EBUILD regexp_parser-1.2.0.ebuild 911 BLAKE2B 6b2d971f37996822af7d5014d88f4a79ced9da64230097d7cb4d64cab78464c19215bd1511e3cadc1dd484c817310f37180771cfefd11f81b39f5b585f43ac47 SHA512 e07c7cadd43850db6f5a20fd41afe68e67170d7efbbd67d2734b5db09bf3262d0c538f90797dc87f550ba7bd92ab6b930ec7a4636254a5a8e3bda4eccd752789
+EBUILD regexp_parser-1.3.0.ebuild 911 BLAKE2B 6b2d971f37996822af7d5014d88f4a79ced9da64230097d7cb4d64cab78464c19215bd1511e3cadc1dd484c817310f37180771cfefd11f81b39f5b585f43ac47 SHA512 e07c7cadd43850db6f5a20fd41afe68e67170d7efbbd67d2734b5db09bf3262d0c538f90797dc87f550ba7bd92ab6b930ec7a4636254a5a8e3bda4eccd752789
 MISC metadata.xml 345 BLAKE2B 1b8ad1173966e2528e85b076052a92f378eccb6bc3159a69de1a276dea6e65c3b2e83db43d65ab9cd357fa58ee0af3cde2485b0926002cb74e0fe1d54cef375c SHA512 aeac372e6213e9b018782fb640fe6d88b3d86d8f5d02b8511f69980df204dd82d45443c371e81527fc6c34b2c1684ff04b3a7789808b884644c348139b4999ff
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.2.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-1.2.0.ebuild
new file mode 100644
index 000000000000..6489aa2afd89
--- /dev/null
+++ b/dev-ruby/regexp_parser/regexp_parser-1.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
+HOMEPAGE="https://github.com/ammar/regexp_parser"
+SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "dev-ruby/rake test? ( dev-ruby/regexp_property_values )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+	sed -i -e '1irequire "delegate"' test/support/warning_extractor.rb || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake ragel:rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib bin/test || die
+}
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.3.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-1.3.0.ebuild
new file mode 100644
index 000000000000..6489aa2afd89
--- /dev/null
+++ b/dev-ruby/regexp_parser/regexp_parser-1.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
+HOMEPAGE="https://github.com/ammar/regexp_parser"
+SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "dev-ruby/rake test? ( dev-ruby/regexp_property_values )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+	sed -i -e '1irequire "delegate"' test/support/warning_extractor.rb || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake ragel:rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib bin/test || die
+}
diff --git a/dev-ruby/regexp_property_values/Manifest b/dev-ruby/regexp_property_values/Manifest
new file mode 100644
index 000000000000..e1ea594bce3c
--- /dev/null
+++ b/dev-ruby/regexp_property_values/Manifest
@@ -0,0 +1,3 @@
+DIST regexp_property_values-0.3.4.tar.gz 11273 BLAKE2B a52ab11676b58a752741240912da5fa312661a583dd74a4321f8184fef2864c74e0d5f709cb68e3ce64a3e19e9320305e80bf7614a40142c4855ccec1c40b5a5 SHA512 01ca50f831bf3364e38559e06cb54faef59fdb0b995a6bfa0aaa3943591d98f97939a47911bf8b075b34b3c401b5de51e42a71088400112ee8afd8d39f164465
+EBUILD regexp_property_values-0.3.4.ebuild 1243 BLAKE2B eff393d0962cdd31d0bb616fa9a0be7cb51adf0cff41ff0489ad6d406491298e13fe004afd08f1b93463220979970a0d9a64a62ffe7409a8f28cc5e7513a8170 SHA512 660d1ee28056a2a1d97cc5f08a6f0545c13c69bbf56e2b1637a6b4981574060f69123cea9fb52abcccf2a5419f9a6fb1431ddca2c9bdd76d6a8f9a1549dfd423
+MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/regexp_property_values/metadata.xml b/dev-ruby/regexp_property_values/metadata.xml
new file mode 100644
index 000000000000..28ab0c15f206
--- /dev/null
+++ b/dev-ruby/regexp_property_values/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ruby/regexp_property_values/regexp_property_values-0.3.4.ebuild b/dev-ruby/regexp_property_values/regexp_property_values-0.3.4.ebuild
new file mode 100644
index 000000000000..93ab3b93bc45
--- /dev/null
+++ b/dev-ruby/regexp_property_values/regexp_property_values-0.3.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="See which property values are supported by the regular expression engine"
+HOMEPAGE="https://github.com/janosch-x/regexp_property_values"
+SRC_URI="https://github.com/janosch-x/regexp_property_values/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid dependency on character_set which would lead to circular
+	# dependencies.
+	sed -i -e '/returns a CharacterSet/askip "gentoo circular dependencies"' spec/regexp_property_values/extension_spec.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/regexp_property_values extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext/regexp_property_values V=1
+	cp ext/regexp_property_values/regexp_property_values.so lib/regexp_property_values/ || die
+}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 31179f00a98e..59ade5aa1d86 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -4,6 +4,6 @@ DIST rspec-core-3.7.1-git.tgz 376819 BLAKE2B 6747ffd8f2d426718376b51356d8838a7db
 DIST rspec-core-3.8.0-git.tgz 386022 BLAKE2B e827f006fe9f05f93b741d021bbb108ae3e98cd23f3388c1fdf2a87d8be349c04e91c810cbb7c47cc99ce99a00f62e13eb01a927b8b89d54dfa437ed46b1d24f SHA512 6d3f431a1f9485009f5029bea967f36cb789be8cf33722b36c40df44e12a2284674c6c8af333bfe8ba8825e032576569fd42c92f798988faad732ac3a720c5e6
 EBUILD rspec-core-2.99.2-r2.ebuild 3518 BLAKE2B 017a60ccb0ac017b08c4d97903a5bd59921fd0c0bc3b4322059d856bfee6eba2c026242bfda1e2083b043c190ad9160c6122ad62350b07aa0a486afbbb3089b6 SHA512 7b22027fa5ae71e80f071c4fc7cf3fa0e291ec42e06e0c07bcd0e94ab2782aa2dd79d4cba709751077b7c19cb0c5bc7a346c2c424cf9ffbbb62ed486776b6888
 EBUILD rspec-core-3.6.0.ebuild 3405 BLAKE2B 9bae8f3c31fb7c77ff882337c2285ed3b2966d0472d256101b7ff01f38c54ce8263189c5b8841164ff4d6e4bed8f12ba86956054597a6143482b5474a3b2dc6c SHA512 31b31d1341539a5a7fe30ba7fb81f756f5b59195984cf0afac96ac60c233646f98edfd0e9d59f53bfb321d845d8a339ba3711add3ac49e755bfbfbc9b8d7c001
-EBUILD rspec-core-3.7.1.ebuild 3409 BLAKE2B 5ff47ed3c921cd9ec7b909c9b8a412b4d5627f2fef531b1cb743f434fb08af1843a2a9d7b2f2ecc07fd6d335c68ca8200de281ccb2833f6ca162c45d22e097e7 SHA512 3f400e182717b0a5f41b82695793c203f93a6c5efcbd50ccd377a4cafb33616d4389ad8805991a9005ff34fdaeb39347be0f67de83b2af82865a989f98928a54
+EBUILD rspec-core-3.7.1.ebuild 3405 BLAKE2B a7f4bc6db9482e223eb83d309dc4421b9b971d83d23328a35c63c08a3ee38d9573735ad227f315190b0551a294751bcfc41bfd034536c80e01b31ffc1b80beb4 SHA512 12dbc8d86ca136a02b68be7ac1db53d0c1a61287456c49fefd42ffd300d9e807bd3fd1dbc34f48a65dccc6c2e7fefcdb08b2a3133727b02b232ee4f74103b1da
 EBUILD rspec-core-3.8.0.ebuild 2965 BLAKE2B cb76ba83dce43eda2f511949f085697c832142a34c611d6ec845d7da73801aba37136d392fceacbb3241a69e63f1148631eb2bd584db2d611eb38e52fe5c4004 SHA512 175a24dd2d96a60a39d185aa855b6a1c771d1cf996e5b3898878e86e65fefcb81b399b24f9339c27815268e083bd5f9ce47e1828178818d0fa7e33134a3be837
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild
index b75df1c7b42a..9adc841a77db 100644
--- a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 8030d4c22a78..c791854b40f4 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -7,7 +7,7 @@ DIST rspec-expectations-3.8.1-git.tgz 198732 BLAKE2B 243dccbf1771bda4a445abdadfb
 DIST rspec-expectations-3.8.2-git.tgz 198952 BLAKE2B 6952f895251f26f8a1b7746b277fc92b296e78fb23b8f581e90f649ccc28e21e0a695f87b012b4925becfcda8f8876414f74a826c75bdfa5114092849bbfe525 SHA512 d374f7add45d2b6ce607c1a068e3e0970f902a0edf96ec891bd618dd17253878c1e0b625296ff12a6dc35103651bbfbcfd1a1b444f94e08eae2680e32853a198
 EBUILD rspec-expectations-2.99.2.ebuild 1696 BLAKE2B c613aa21e9d76decaf26954bf8be2357a12dc92960ab966ac587883a91d023a79d5c9fd4e8e00ffdec9a647cf2483e2aeda03c3a851e2a43dcf5bb340caa7ec2 SHA512 54646cef1a0b856616797a8c11ae5bc684b3c3d9db2999f2a3e6e78b2254ae7efcbc22a924fa069d4b560c407a4cf010d4db3bfeb10851febb90d23d7f032ef4
 EBUILD rspec-expectations-3.6.0.ebuild 1329 BLAKE2B 4c1367ffe0dac6fe8ef5235cc6a3bc4c36bbae2939f79d4a9febe273a9cf9db60d7867588e6bf4212167720153addcb6577c2a41a8e6982f5481072bbda689af SHA512 4772ad69bad84bad114a1e4f303c7ece91c7b964d097b50d5a02dee5ca855365051b3662071274d64afe7357d1c03d9fa70d52563571bf73c02ee8fe7ecffdec
-EBUILD rspec-expectations-3.7.0.ebuild 1378 BLAKE2B dd0eba7ee6f0260c2b461e0dcaf07cdee1c3060adb86b9eef86919f97d0be2f070c43668edd00914b941b196849d65af6394d1813d2f2f6713e29f754ebd9517 SHA512 b1eaf25f1de68bdb9e1581cdc983974e9441357effe6701bd9f8868e0fb6fdaa39406592b2fe6ddde461b22a900ba929ae9c5ea6f6b6deb131c2e1c953aead52
+EBUILD rspec-expectations-3.7.0.ebuild 1374 BLAKE2B cd9ce974c6ccc1974d4d75e08085bddc88a626739d5689606bc7564159f9d181f6da8daa779823e2d2b601527c61ef8ff33e6b78ed9e7e8f6c14128288a42c18 SHA512 74563230e08f637e15c9275e1b1b0ae6cdcbd353ed667cbe87411a2cb1f41f19b806212e36085aa5137b442b655623e2d0db3b0a584b049ec2f0913ee7d27cea
 EBUILD rspec-expectations-3.8.0.ebuild 1321 BLAKE2B de7686b018317122fd6b575d036f7f0b65ad316a4d81dc2b9723159fbbc248417c1e7a5a5982b6e83acf80d79e2eb0cd94c20f9fe8d2c1e54423e287cc9bcece SHA512 74518415bcc778e35ec50f414b6dd737703c7b5ba5955de91e60cb12a7c962a589976d4ed69cb35bd6ef37a4e835cab2fce1813508fae88a0a4a2ed01c8434b6
 EBUILD rspec-expectations-3.8.1.ebuild 1321 BLAKE2B de7686b018317122fd6b575d036f7f0b65ad316a4d81dc2b9723159fbbc248417c1e7a5a5982b6e83acf80d79e2eb0cd94c20f9fe8d2c1e54423e287cc9bcece SHA512 74518415bcc778e35ec50f414b6dd737703c7b5ba5955de91e60cb12a7c962a589976d4ed69cb35bd6ef37a4e835cab2fce1813508fae88a0a4a2ed01c8434b6
 EBUILD rspec-expectations-3.8.2.ebuild 1318 BLAKE2B f9ff54fc06a9198c48b0692491b197968b661b4da0d3cd72cd387bf6f27cdffd8640333175a188d2fe8cce47b5d59d1459743c0e8bf0af64294d79df3b07f3e2 SHA512 dfa87a38a039130a47741c61bb7959a35e5ed1db17eb65708422a3a549cb52199ac5dca54bf1a9db15687edc5b04c219aadd77a52bb1b1c7212e2c1d4955a6a5
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.7.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.7.0.ebuild
index 86a099902d3f..b17350467144 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.7.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 7900d938d653..16e7262a8342 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -6,6 +6,6 @@ DIST rspec-mocks-3.7.0-git.tgz 189170 BLAKE2B a0a622ac593660c673cd80b3f3caddd2ac
 DIST rspec-mocks-3.8.0-git.tgz 191102 BLAKE2B a8dc3794245e4508fb57874ba11a753db5622abda2d34a022c6f01b2e95bf43dd2df8612abcb84c32cff632f70083ea9d76171de73720d00dd929d562fa5993d SHA512 0649c3722479013aa1a20f750b3a83a9b426e5f79cb0edff995b09d1e2fa674fb8e91c0c94e7f9513f338c3c2e9c5b824a9473e91955cf928542324b8b1463ba
 EBUILD rspec-mocks-2.99.2.ebuild 1532 BLAKE2B b8cf9d6afcc3f38d304daf6abd0610f4fad1e21f1985a01c906e476a35f50f129175fbe7e457509a7eb65f6a09cbca301deb84c9c70abfec23b48016e52d0356 SHA512 98dadc99f3a3bd894ccca1d2763526acb9754646e5b13fc471672d86a96efc10921742f626ef1090d6285faaf6e7f047abdeaee3217d681e7f4583b19ca774f5
 EBUILD rspec-mocks-3.6.0.ebuild 1353 BLAKE2B 3bab6513a6cfbf127c706826e4f946c6ab76bf3dd3cef0bd21065b197b10a950b840d59bbc58fbd9b7c00335b83548f61f98360fc22ee47f8bc1050830975245 SHA512 b1320a3f762bc5e3aa63d9e3c3aecd93f254b217905eb5e752068c25c43d6679095b2664f833119a42b5b6a5ae1f85770d8386fa5e12dda79b8085f9a07ab6fd
-EBUILD rspec-mocks-3.7.0.ebuild 1438 BLAKE2B d8130f73014b411894564fd2cae57ba4f6f7114009ff077b16e9c384e2710b41d4627eb9b7c5daed59c5c085471c8af8c927d98d58727c013d53fb32b0d145d2 SHA512 25106105ee19ee84d88a86c7007aa011e31984919ab83231e5995768eff543d2502456014eae8d705b8eb256aca1f5262c902fb128ce6d84d9a62616be2818b1
+EBUILD rspec-mocks-3.7.0.ebuild 1434 BLAKE2B 1eb1de5f133f57903161e29aed90798c4d422ab2a11fe8bdf11b4e0c583a346ccbcadfc14d9e7e19e49a5b844fb8a154a17e4591ec8a81e769b5faf73c3c26af SHA512 748dcf45d9b79ec6f455972274ed86dce284309c0d95e9c0f63413cc8e37d1614f9ee191b212c0983aab08a50ca4cfc1e40e05e50814eba24b994c025792f018
 EBUILD rspec-mocks-3.8.0.ebuild 1345 BLAKE2B 3ac475af432a4af5e352ca2be716ee4ce46618ca921728c138f5ac935dacff07f072430adef1c8e84de6425b71b881f89f96446b3d15e0a5745fb84a2a2d5cd7 SHA512 5f4b3415624b24f2ba4ccc969056f2d4d5c7893a40b9cd6abc72be0dc9dc4a2f462932f45ebfeecc9241305c93fcda6ddda0b25aae8a60a7765d1dfac7440f56
 MISC metadata.xml 343 BLAKE2B 87ebb52b322f698e5242c517ca646e64b3a9a33c6b76d968847b2224b4dd683a9eaae5d03470efe775d350c65e3bfbe16547d4b4b99e2744379fbb7c76cc5680 SHA512 c7956e0175d9fdbfd423140f3c757d4c9e1deb6089577f60d11111a93fde6a7c056dcbac8620c30c8c02693297402aa2f0710e43f60abc0878a51bcb8c624667
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.7.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.7.0.ebuild
index 860b63ed8d16..2bda67348d43 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.7.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 5e03d9774d9e..d8e37d42b97b 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -2,6 +2,6 @@ DIST rspec-support-3.6.0-git.tgz 64987 BLAKE2B 9337da63047a1b33e8534a74a6dd40042
 DIST rspec-support-3.7.1-git.tgz 65831 BLAKE2B 8595c496bc8d13e36fdfd4a8be8e055db4ac1e85af63f99158d191c9ef9e0a6ba0a2972ad7661a63eeda959e2969139a99ded71219777fd493544b711b6fea53 SHA512 a5760d696048897d76c665a756474bbb1a1995891e577c989cf68a205644c8608c538bf3d87c558428e2c412e02d3552d47567a0679cd4f8793c06f43eccf459
 DIST rspec-support-3.8.0-git.tgz 68415 BLAKE2B c1b13d639213e03c4e334de5520f19136da0e25e96a93b685776a691a84dc1daa66e4dacf3feb83b01032cb1364ba16cdfccf19e738264bbc3bef20882a89d8a SHA512 e16cc7bcc3de797e78c4f6ed475b0e60d492d0442dc048b4b2769a4819b80d1fb4a12aefaee3cc6a35f08d35f5fea82e00cc0fcf04363e57e74a6f5ed73d0693
 EBUILD rspec-support-3.6.0.ebuild 1341 BLAKE2B 2e2368bf2b251859d938df965175f19c08efc9ffc11d3f801352597ad1cd537aad772c2c57b61d1bd627b5a241a413bb8087f041d866cbc29e9f94b453a17f5f SHA512 5a8a476f085a4ed63c67806fd04793b4ab9c6bffc40d09043d533105ed06f3e1a62edd1225b753c68eab39b071e4b02760dae4b35bf5f2d82b1eddd85c12a900
-EBUILD rspec-support-3.7.1.ebuild 1345 BLAKE2B 1aa69984b92d5ada0a76e75507f4fc6de80d87283a820cef70eece477efa3dc07d0e6bb0e299bd290f467dcc8d0ab295e7b331302d92f23ce78e8262e66bc6f9 SHA512 99b3cf8c57564eb40dc90c91469269b899930a05507ea74570e8d8f10e46f82e9f4134e27cf79f47afe3407899af2cecd2171a779ca8232b2951a9ebc50a778e
+EBUILD rspec-support-3.7.1.ebuild 1341 BLAKE2B 55985a1405e7a62d2eb5afe397e58cc2aa76996f39a2d9594bb8531065de9dc2a731badedd88fbff11b09b4a840ba2b37982cb0978d24e9e212a66377151bacb SHA512 2c078dcb27947614d19ea8c5ccea36427649ce8478ab7833ca6f386957ec1e6d633de733d53bc8b0e155b916abb84e4c72d371a0fb05b6398f267243bc10c912
 EBUILD rspec-support-3.8.0.ebuild 1351 BLAKE2B 36e3b765c3ffc5a12d2bb2c76754255e19cff7595ac8624ea755fdc13f4a4df1a0c6ef66c4b7ad56feaed83181f4112c14d1b2f8a1dac34cbb8f1bc827a20351 SHA512 5020cfcfd026a57fbfb79bf1856bd9ddaa905381f24701788e3c12a33d66d42f6ad32350189180bcee6ba7da39ee3edd9ceaa342b367d2f39d1e55de27520893
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.7.1.ebuild b/dev-ruby/rspec-support/rspec-support-3.7.1.ebuild
index 85252235633f..768bfc43df1a 100644
--- a/dev-ruby/rspec-support/rspec-support-3.7.1.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.7.0:3 dev-ruby/thread_order )"
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index c9982c011014..88ca85d87542 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -4,6 +4,6 @@ DIST rspec-3.7.0.gem 10752 BLAKE2B a0e15d557b0d9089a886d04c917feda80c7a8e5eb70a5
 DIST rspec-3.8.0.gem 10752 BLAKE2B 14b1710fb64fb2ab46d59ac692ceb95dbe7f5e2f5c54e4f97170bd99c2b0d32e1977250f69160ab191367c8016663ecf5cd4e0c89941ff12c727ed52e6118551 SHA512 aa3ecee499240a26866797c00461c7e63915bb84a9a29afce75bd4e7864027588bafde05b108aa7b6d988c1a123265587db807567a8e0f3d03527b0f2d8329ba
 EBUILD rspec-2.99.0.ebuild 796 BLAKE2B 1f7e76cf83dabe36056c164d335150f56d9a666b389d02e5878ff15464fb50084053f8a4feb545bb314aecafcdaf54d417d94bece5154854e539768e063889cc SHA512 85040ba6e2d27ef48d167ce1365e8301812dcfd1917d5bc84d2509a5fe51fcb2d44c007834fd0fb6e77843f5263122c6f1f045649a9e18b091e3300b63545163
 EBUILD rspec-3.6.0.ebuild 674 BLAKE2B 18851dc284da064fe9225e7cd1ab5bf7cc2cc2c707b78cffa9a11eb1a1eeecc5d4f82220a4d1ffc45876a1f40b4a250d96510e3b96bd807d9c7039624e68b322 SHA512 fb3ee553c56bca5f8b26f7ada3d65d9fdb1c649e6cf269c3c59ab33350e26039f5c61310b1381ede6574e34bb4cd57127dff16a7b610f1136562320f9b72e0ab
-EBUILD rspec-3.7.0.ebuild 678 BLAKE2B a71ba7fc053797e220ab7dd9af461d6d4422fb90fb417dfdbb1be5ba130cdae857a71face17d90503bd9964bade851bf16343c5ce159d63b4f46f293d804d0aa SHA512 dc4f074ab096280d9fa3e1aa736b439307b8cb7269d201b99fdf30b7a8059449477c4581e9e7616ce6bf0d3d38d466afa2955d516ecba705811112ddb8509db8
+EBUILD rspec-3.7.0.ebuild 674 BLAKE2B 09b1a1da9b38ead754958e6ab97e420c8e8ebf8f8b44035d11d3554a4270d10d316abbe7eb5e313d7e50d076b0a62727cf178630e644b1d949b468b771db2481 SHA512 a965adfa249558e666030a726fb410f6c313cc944c1d172054ba59bfdd20d8527276536299cd0802bae7cc4c96b6e5c44914c08d26964e18a44f9314a106b3f2
 EBUILD rspec-3.8.0.ebuild 654 BLAKE2B 6f47fa6866e3093488c36d7755a1a32be9ef1fdd2b8b0ac05163b2cd19561d604a5b3ecee868029b3dae4f17e261223fe2fc019401d214f07659e70749ba4054 SHA512 3675490d5c2b0cb218d0edf63c5a104a2baed1b11ff31ad7e0a03aa0b2529ec77dc5db1846b36b44d4a307fa0cd8170c2957325e2e01cb710c4cbbdd12081e23
 MISC metadata.xml 337 BLAKE2B fd99a128031819f061bb4b2fea336d7b14b26b7a986d782d8a4e2b9b9b7ce4c703242ef724cc9bdd98cf0219973dfcfca2a2eb7979b446f879d2f337b566985f SHA512 0a9165edcea2906fb370afa35ef77b74a4b833539959e8f28194e4d02ab7685f23dd16f04ea7e18873d10bf607236972610c49cf61ed97e5df7b4796ec9a66be
diff --git a/dev-ruby/rspec/rspec-3.7.0.ebuild b/dev-ruby/rspec/rspec-3.7.0.ebuild
index 0a23e1ad7dbf..c5753adb2d69 100644
--- a/dev-ruby/rspec/rspec-3.7.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/serverengine/Manifest b/dev-ruby/serverengine/Manifest
index 9af2c8039d56..8ce481960c9f 100644
--- a/dev-ruby/serverengine/Manifest
+++ b/dev-ruby/serverengine/Manifest
@@ -1,5 +1,7 @@
 DIST serverengine-2.0.6.gem 38400 BLAKE2B 51722d222bfcb9c0063f64ceed666be147bcb4dce9947fd60b723507c5f3e2479b445902bd2a2e985d0a8216462b91b1545ccc458e36e7134fa11a4a746302a7 SHA512 ffb35eb51226793181a5266e3ddaf3255ce38e7fda90c2257fa16044829199dc5ee30cb9c38925f1820cb20fd36d01a47af0a8cbee96edc0ecb5206e2ab17da3
 DIST serverengine-2.0.7.gem 38400 BLAKE2B b457925fae394ede56e9d866ebc0ebe02262b1ec799cc03090eb8b037b5e617836dd96860bf1e23a7c62fd09139f007dbf561f378d839cd07d3da70e11b5983b SHA512 5e4dee38ab00641d5f47c29cf765220a327aee3fdd3dface4e1996f7b12abd65de8ac03278e528467d0a508921aa3e504d7a34a7ebf2ddae419618262faf6616
+DIST serverengine-2.1.0.gem 38912 BLAKE2B d89298a8f7a985a8daad8604c88e63c7f534fe1b9020141ba704e34b48ea0b78f6da855d6253bec29abb449c58b51d6c7d83a97add36abf962b7fb478b6c68a6 SHA512 57231afbf28d8e54c90c99adc4c9443d865592a6fdaed85c66dd8e123af06d8b72567f6d0f3b058af388293c25fb52ff954d37517c21ae518314b3f5c307c8da
 EBUILD serverengine-2.0.6.ebuild 821 BLAKE2B cf1e340e0c51b97f7576c2aaca1624b398ad07be06852659c0b8d232f1c23ff5d512905a28f2b5aa5a6efe3fc01263a42fbc430eadc00a55e08247fd4ee311b3 SHA512 3f7a465425ee87c3d1e3e52fd66fa3115f4fd38e6218e35e76f5b0a106896bf84a21ff16741086a5fac962c1f4c6d57d425ddc6a6fae612671a40aeacb95c807
 EBUILD serverengine-2.0.7.ebuild 814 BLAKE2B 8d721c9124100ddda5b87e16a3d32e5d27e5ce93468f7f646a2f7c41991ed4d09df5618138b71646231a571c9dff497d6887682a08fa766af95e175301868137 SHA512 864c06e6570d2e04b7e40d8f13c287f4f478ffc2c5a233cf0eab02af6d8914352ed720eb5f28154f9c216683301ad47da19b1c1897f85cfdb10d642d768aa9e9
+EBUILD serverengine-2.1.0.ebuild 811 BLAKE2B f326145db69d27bd247f8c407c0920023d9db8bbf4d4679de9d90a906eb11580d0c004de6e63ce8ce909e7a2355b6e7a6ad1e9931332bd9e6c2a8e048a53eaf4 SHA512 30d4a757af202c8df97e981eced0081adad9f37273e523ffcad4fb6376b49c948cc06a394c73849ad842615da56d90fb42dd7dd1ad60c00c59ae44dcb1975a33
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/serverengine/serverengine-2.1.0.ebuild b/dev-ruby/serverengine/serverengine-2.1.0.ebuild
new file mode 100644
index 000000000000..14e544d3ead4
--- /dev/null
+++ b/dev-ruby/serverengine/serverengine-2.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="Changelog README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A framework to implement robust multiprocess servers"
+HOMEPAGE="https://github.com/fluent/serverengine"
+LICENSE="Apache-2.0"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/sigdump-0.2.2:0"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	sed -i -e '/rake/ s/~>/>=/' \
+		-e '/rspec/ s/2.13.0/2.13/' \
+		-e '/rake-compiler/ s:^:#:' serverengine.gemspec || die
+}
+
+each_ruby_test() {
+	# The specs spawn ruby processes with bundler support
+	${RUBY} -S bundle exec rspec-2 spec || die
+}
diff --git a/dev-ruby/stringex/Manifest b/dev-ruby/stringex/Manifest
index aeeb536b5cd9..6c102cbcd245 100644
--- a/dev-ruby/stringex/Manifest
+++ b/dev-ruby/stringex/Manifest
@@ -1,5 +1,7 @@
 DIST stringex-2.8.2.gem 130048 BLAKE2B 3f3e88d69924a26eba830d94d9bc9240eb2b7a32cc9d3e444fb55af5f462d2091f2069c8c0ba39c9bebc7c4a48b54d23ee5b3fb9ba18f93a4c122d5b2f237e51 SHA512 e5750df84eeea6787d85f9289200d1f32fe9feb31c44c583a8e2e153c7d6cbcd940ca1cfd7cfd6f9a958e4a866f0ea3204ddb584ff2a43893da274e9813a4497
 DIST stringex-2.8.4.gem 130048 BLAKE2B 69cf894a0d7a6828197d70c474f6075083c41cf36171808d8f16763283654c7907938411b44bdd6a2af85ae445442bf018788c851f72276f89eeae467c01da59 SHA512 5ab6e096133e49ef426c8faee897bd8fbb6fc61db87a80ced13900f7191639b8f5abe223bdfc5170e5049ef7b340883a436ab53feefb708c47207d6fead9094a
+DIST stringex-2.8.5.gem 130048 BLAKE2B c07eaaee07bf348690166b41b0846bc49eb49c5ba9e39c7eaeea2a3a60d6089edd7c7d1d75fd9a5208c9883c4bff8840ccf56c6f186daeabcf79e7f4fb6b4d25 SHA512 53f9908f176f465d2e884e92dffb26abcdf75593c94ee8250253da0eb29eddf489cf5b3f539135659ad4c0e2dd738d2affff6a946c50abd5f36517148d8338ce
 EBUILD stringex-2.8.2.ebuild 876 BLAKE2B c8152e60e4b83c36dff56683c861783711c69e551e322e62767d5c0c1ca5aef6ae97964303f33b60e381dadf545b8243334eac8c270d3be596e04a94fb0577ef SHA512 35ebc94e81699a8e87b784d3cdd86af8ec6d55047b868c56547f46cf7ea1aa042ce7bb257bf7badf1b6fda0ad399779b91b15c214cf7e47e9ebed109b004c121
 EBUILD stringex-2.8.4.ebuild 881 BLAKE2B 5f83f6da5131fa56f714425b584148d9f955713e99bc1799e44de700b07bd1872428beb2aea77c13a630513f975637de5f7787dfa43cf7f4ac84b5af7af03b44 SHA512 c321eb7e843a987278b413fa8958187bc7be321e2cc9a7c5a5cd77864a38f88a213ca2171117222ff5ed0960296814dda06c9bf525d80b3d06a305bf78009b28
+EBUILD stringex-2.8.5.ebuild 845 BLAKE2B b73b2c83a8d0fa24902af4b8b075aa6f94165b119942635995d423679ebc440c846c1da99b786d0e7c7e2fecf440f2f53db5c8cf0b7fbcfe0daade580af06b7f SHA512 dffd73a62169b3500251c008bfe6eb5084471304644b22a95666a50e53e4238a3a719a5322d37e1dc61034c305ddab7e16711c928c8490cb9a3567e404fc16df
 MISC metadata.xml 338 BLAKE2B 5cf0c51755ddcf10add2da7ec28ff2f3b9f9cf80a9b834a626851ac0635f02e72b8af33391eb281a45a646cbe3854e69e46bfc9e626dac1ba98de6375e3dcd53 SHA512 76f5dde82c273cc2b573f3e2eb417808b9095ae684a860abad1dac99829e0b70790fc3874a8dd8b06c5e8a3dbc71142fd69abb0c860ff9e997b57dde623a11b7
diff --git a/dev-ruby/stringex/stringex-2.8.5.ebuild b/dev-ruby/stringex/stringex-2.8.5.ebuild
new file mode 100644
index 000000000000..30df68532aba
--- /dev/null
+++ b/dev-ruby/stringex/stringex-2.8.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Extensions for Ruby's String class"
+HOMEPAGE="https://github.com/rsl/stringex"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+IUSE="test"
+
+# we could rely on activerecord[sqlite3], but since we do not remove the
+# sqlite3 adapter from activerecord when building -sqlite3, it's easier
+# to just add another dependency, so the user doesn't have to change the
+# USE flags at all.
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/i18n-0.7.0:0.7
+		dev-ruby/redcloth
+		dev-ruby/test-unit:2
+		>=dev-ruby/activerecord-3
+		dev-ruby/sqlite3 )"
+
+all_ruby_prepare() {
+	sed -i -e '1agem "i18n", "~>0.7.0"' test/test_helper.rb || die
+}
diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index f50f56e3db17..83617dc2642a 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -1,5 +1,7 @@
 DIST thor-git-0.19.4.tgz 88733 BLAKE2B 8be54310cc4bf4a0308e6b103832831b89285003bb22a679986cd02636aaee57a25aa606f3e99bf532961a4e1d3625c46bfdb874a09f66cab85a21e5f7ed22d6 SHA512 a5cc52b23806e6104b12f924324960f2567bcd6c73b72ad47c33da222201b0377e7677b996698774de8adf3eff551926393785323ecf46cb59d72eb0e5b05aa0
 DIST thor-git-0.20.0.tgz 91758 BLAKE2B 86e4079a86a9c65852e710e40e49e915afe5522512f061ecc62aed48acc08a5397cc82d45cff7c4b1dd549ec57d8699b9afe7c391ac9ab838d1ba9100f1f058a SHA512 aa5344c94cad7c33dd0582409dbcf9bd109bf97b37131357a4cc8a66317acf8781460e8fe5532b301a74521010be59bb34ac1c68bc01ad3140bfe73fedc2a451
+DIST thor-git-0.20.3.tgz 94786 BLAKE2B a27ef27d9d375c1f5ab1b065f6ee5b635dab3b43cac7915ae24771e7a9e24189b8c3df8936bf6ad333f0660e4e36ff73372746afc227972f1745dc993b90c85f SHA512 368cedd9584fcdecf8f5feb9b727aa283b37747e8200f8629aaa762f8e3a59dafe6ee1e7c60ef2b43b2a16b319842b10d0f3face12ba8dded4b6211640db7f44
 EBUILD thor-0.19.4.ebuild 1155 BLAKE2B db1b5e8f9f73f8638aea3ead1a1cc7e754a829c8be39d8179aa5a7b9af1ce50349191bff14e2a8c52d0f3e54e64cd60d7eb486c55b6316f951e4660c3f7826e9 SHA512 74b73fbce42e3fc78572b5d9723fdeb6d00fea7544583540bce034265ce27744c4cfa86b346331d1db051c6858a420afcac5ca027ed9d4fc987d7e9a424c47b6
 EBUILD thor-0.20.0.ebuild 1437 BLAKE2B 2402abd3eb5b17bbd577f0a77df7d95b51a38e023555b0f39136cc9e3d3a0e53b80ba375a3851c4ffd037d5341f1d6606583c7339429a436df2c140ca9b6d990 SHA512 90e2e05922022ed356d7c81812cfadef0ec1fff1f0f9680edf9c039d33cdebc44128f31408df83e1eee7cd1696cfa267ec239bfd9dd0941dd16d7daeb299fda6
+EBUILD thor-0.20.3.ebuild 1420 BLAKE2B 525b9a0be3cc7c53245e945bde6e4f84f11c337a10e450c2deb3f7329d2ea20777af43321fb5fb83ae4df95877c967ee5fbf4eb716c1ead28430f853d2dc72b3 SHA512 6abbc470ad09433b6194048864ac107bc5f8964023949cc1f23b517601a8cb946dd63b65cb454331796b230e40dd9c74b3b048ccf1404c79fca35dbf343e1b5c
 MISC metadata.xml 680 BLAKE2B d4b03ac058de229b055e01ee99da7745a8fc67200979f626b55d6156d573269bb260c42ef44d6dd3b391a3e06d46844ef3fcd7cdd1f0d4053957c00bcfb1fd27 SHA512 d4938ad6ec003fe17d09274f39a2526c84d69d447b1e8063e9301000b776496fb3f8fd6d7e596791d9f8d05714e856d6a6d8df2c5c4747420e3221edf48ab264
diff --git a/dev-ruby/thor/thor-0.20.3.ebuild b/dev-ruby/thor/thor-0.20.3.ebuild
new file mode 100644
index 000000000000..d80e48320449
--- /dev/null
+++ b/dev-ruby/thor/thor-0.20.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_BINWRAP="thor"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A scripting framework that replaces rake and sake"
+HOMEPAGE="http://whatisthor.com/"
+
+SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="doc"
+
+USE_RUBY="ruby23 ruby24" ruby_add_bdepend "
+	test? (
+		dev-ruby/childlabor
+		dev-ruby/webmock
+	)"
+
+all_ruby_prepare() {
+	# Remove rspec default options (as we might not have the last
+	# rspec).
+	rm .rspec || die
+
+	# Remove Bundler
+	#rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Thorfile || die
+
+	# Remove mandatory coverage collection using simplecov which is not
+	# packaged.
+	sed -i -e '/require .simplecov/,/^  end/ s:^:#:' spec/helper.rb || die
+
+	# Avoid a spec that requires UTF-8 support, so LANG=C still works,
+	# bug 430402
+	sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby25)
+			einfo "Skipping tests due to circular dependencies"
+			;;
+		*)
+			RSPEC_VERSION=3 ruby-ng_rspec spec || die
+			;;
+	esac
+}
diff --git a/dev-ruby/timers/Manifest b/dev-ruby/timers/Manifest
index be4da91697a3..bfd6904734f0 100644
--- a/dev-ruby/timers/Manifest
+++ b/dev-ruby/timers/Manifest
@@ -1,3 +1,5 @@
 DIST timers-4.1.2.gem 15360 BLAKE2B 2480b6051825e26c9c30418e4acd7f9d8d0173d21038349ff16c086a2712eff7e9349720d270ed6505d8f90b14fc4dc99cf06d948922a222196d338b7933b5a8 SHA512 8c43f6ab09b918fc047056de20e85371929cd6841d7e26dedf54d565585eba040e23cef83c8747eb0ec43df8c9d9cf5915b5ea0ac6f6d551a0b086de3a9f3499
+DIST timers-4.2.0.gem 14848 BLAKE2B 0d3c1b70e6b4dade1664eac6951dfa1ff876098747d2f6eab21a2dff2f334cd614ac2c73e0651b93e92b3850c7933445a14bc4f43b50adbf1895b49c05d9507d SHA512 c5516c45e47bcd35bb5f16be0ddb31a2b1370bf06ee833c50b3121a7c36437fb418c58986b0d71979cd01af47bceb1ccd2ff50b1472592868175c4271c85e15c
 EBUILD timers-4.1.2.ebuild 799 BLAKE2B 7987723613746413a08b27ab26bf1905df37aeac417cfc6fd138759adfffc8cd2f0826153bc982c17613e5b4cda947d8527ea8f7b19dfea7a3732cdefcfc07fc SHA512 9ad952a071e71579a131d97af99e2b3b55db6a640eb412d079aceb5695fecf324701e7dfed7776c5d7e29a8283f3cb74f1ec05fa2137c97ad5cb06fa92abcfad
+EBUILD timers-4.2.0.ebuild 967 BLAKE2B f730e43889597b3e4f9ccd7ac1a3c17470e202ab25bd652430c51514a03f448a40fa6e15b71e4302bec8730788fd15266a30f67a9ac2bda6cd1a128c5b781ee7 SHA512 d763c67a5498940cd442b00c3df19fa076682eb31c9eb6c31f4efcb0cdf0abb5a59cbdba0c3cab752d58e0d9e4eaa171292163539cad2b249993eefcc6aaabf6
 MISC metadata.xml 341 BLAKE2B dfe2c9228e7b666d6b7acb9d9f0cdaa70263a6d5960ecbb144699e62c94ded1b613a8d22f82e5125f6a2e954901a65da57bd432823d922d17164e273b809d8a9 SHA512 b863e101e06e7a8827cd6166688dbfdf77c5bc84203294d0ab63315fe5b5b03fe1898d02b9f219bbbb3f3cddd3d5185c34d9e4079bd993631cc849eae9ac9be1
diff --git a/dev-ruby/timers/timers-4.2.0.ebuild b/dev-ruby/timers/timers-4.2.0.ebuild
new file mode 100644
index 000000000000..25acc7e22960
--- /dev/null
+++ b/dev-ruby/timers/timers-4.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pure Ruby one-shot and periodic timers"
+HOMEPAGE="https://github.com/tarcieri/timers"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/hitimes"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/coveralls/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/Coveralls/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid performance specs to avoid ruby-prof dependency and 
+	# because we cannot provide a good environment for performance testing.
+	rm -f spec/timers/performance_spec.rb || die
+}
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index 004e80a49083..a75ca9311e67 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -2,8 +2,10 @@ DIST tins-1.14.0.gem 303616 BLAKE2B 3ead5751b4b9c79bdd366c37fd0d7366246a3f9ba65a
 DIST tins-1.16.3.gem 304640 BLAKE2B 5400b1ec1443b1f432c0a18c35a7a3a2175b7327601e2bd106218a119ad930bfd912fa59cf7d1788fe65c9d172e6a7af7385c9e2ef2e4898e490bc838cf119e1 SHA512 f132cd5bdb2ff02805b78856f0340723fdf89437514ef0067f2eabd3742a2282463bb18f4750ea6496124fff48a3e82e73220af3555700839b5270311a1b4ac2
 DIST tins-1.17.0.gem 305152 BLAKE2B af8eec7ab4574bffa9eeca9772417acf2a3bc2582c5afc8313e309733f188301a66669c8954d704c958c2ee97004598d2b058295e5959cbd0982f700706db5da SHA512 abc6bbb534701bd9f4bffb2c0d89ebf63e36b90618e8e45de0ded8787bfa7f9217dffc0983ba683e6463f140199e5e0f73e57de8a8bab4b2dd3812c84a932ab4
 DIST tins-1.18.0.gem 305152 BLAKE2B 41869047e82a85c7b9199c9d1408d8b1e2e64f368683172be4465d7ac545369d3e5e5286bafd37da4684ba127d5c04f0b67642b740adb508e340ba317ce90eec SHA512 a9a74232eb39df9e906fd00d25f92b32992645e05fd652541f95ee3d0bf55d0ffdf3b3cfd2329184b344682f1b263e711feaeb9a88c1c382c0502075ba80dc78
+DIST tins-1.19.0.gem 305152 BLAKE2B 57cab6a7e6b63a64a44a6143b88e6286a70e91ee0e53b71519645d403e7f22f2ffea0a19ff0fb293fe54c1a002f952c5f7388a908ce536e750b8f6f1370753ae SHA512 95ef05e148121e915fb104fa0b42c7e18d168466b8856d959a38a3b92a61709f92a3fd4ceaf11d2fde8bc255fe437637f263f320f3dec4a2139280cc0d0e7605
 EBUILD tins-1.14.0.ebuild 632 BLAKE2B 441f04010ddf736f421db682cc787c64b4efbeb6b9df81c84722147e27bd44b89b0d682f6acb4867dd3d9135c36e8b12925c7969424abb5a311cbfb73d1d45fe SHA512 7f699acd28e99825416faed2c1d25d03240cbb5607e26b5aa1a9e86b8bdc51de6a3b007c7fd0fda9e1c27b2fca1684006b3da43e178e15f7e1cd5de43d33399f
 EBUILD tins-1.16.3.ebuild 639 BLAKE2B 634a599adf1431d8edc6c63337d2c8fb47ae5c47ff0a1dd62bc4647f8fc4fda1532f412e1ced057534c695cea833ea00b3f2a8d153db55744dcf0646272e88f8 SHA512 9ec1757c4e5983e42bf49108fa9c97d80311c5134eaf839e36d8d9b608321f987b619f7a11306355c930810c5106ed079e97f6342f3fd840f412667fbe87a4ae
 EBUILD tins-1.17.0.ebuild 629 BLAKE2B 9bb5aa47f696559706f4f41e15b782f6b96f20dabd6b2894b838b54c1fe128b20553106a021306425f26a4b60e7485921695aab89df598102f3e66b0c581a2ac SHA512 6a3b1e38ccaa091df2f4f34f0d530d6b12ff4b44408721316f8fcd4c12b8a6dfc1ca29e04ca959694aa38f6068f92f4ff46da5900da68e853f9ec061e0baee11
 EBUILD tins-1.18.0.ebuild 629 BLAKE2B 9bb5aa47f696559706f4f41e15b782f6b96f20dabd6b2894b838b54c1fe128b20553106a021306425f26a4b60e7485921695aab89df598102f3e66b0c581a2ac SHA512 6a3b1e38ccaa091df2f4f34f0d530d6b12ff4b44408721316f8fcd4c12b8a6dfc1ca29e04ca959694aa38f6068f92f4ff46da5900da68e853f9ec061e0baee11
+EBUILD tins-1.19.0.ebuild 629 BLAKE2B 9bb5aa47f696559706f4f41e15b782f6b96f20dabd6b2894b838b54c1fe128b20553106a021306425f26a4b60e7485921695aab89df598102f3e66b0c581a2ac SHA512 6a3b1e38ccaa091df2f4f34f0d530d6b12ff4b44408721316f8fcd4c12b8a6dfc1ca29e04ca959694aa38f6068f92f4ff46da5900da68e853f9ec061e0baee11
 MISC metadata.xml 336 BLAKE2B 00b8e1ea737e7431865357c6f52ec454afa14e9e22e130b6ae286a4bbddc2813c2f34ddbe492897c19683ce329bb146be74b994955efab2799d23f81fbca4eca SHA512 fe0912b4e761404c8d0d5860e663270bb47610ce4bee99569588e2c2300b80bd8e5df2bbdbb91afcdec1df178d605acd61635695eff0e7696e04b673a3e14c46
diff --git a/dev-ruby/tins/tins-1.19.0.ebuild b/dev-ruby/tins/tins-1.19.0.ebuild
new file mode 100644
index 000000000000..82e6d4a478a0
--- /dev/null
+++ b/dev-ruby/tins/tins-1.19.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="https://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-ruby/typhoeus/Manifest b/dev-ruby/typhoeus/Manifest
index f81e0dd0b6be..a82a528bf602 100644
--- a/dev-ruby/typhoeus/Manifest
+++ b/dev-ruby/typhoeus/Manifest
@@ -1,5 +1,7 @@
 DIST typhoeus-0.6.9.gem 49152 BLAKE2B 0c80c76c6ed8e9e564d6fc48b259b6c1d9c5c4422d29ef356fb092dc722e96afba319e682f5548603f1bebce96aa3e616161a5e036a7c23264b98835c41955e0 SHA512 5063d3217f35db29d216327b6eed10d6613d018c496935e78aa8e2b10ec21f3372df11fe48155b45387767d5572efa93e74afb0bb9b10782d28e87dead0294a4
 DIST typhoeus-1.3.0.gem 55296 BLAKE2B 0e95dea7156713756cd7fbeddff3d1cc2530c220352e84c790886f4cf473a6b1b49565aeda6136ba2c5d40a506050438b5066f6a9c6fd5b3156f794b0c6df04b SHA512 c51458c27ff07cbde095d22e0d98c1602b2b2cb67f7e0f8f27ab931d8b3c62cd7a256f3baaefa88852f96769508e61290eb7eefceaff5f28912aef292eb56269
+DIST typhoeus-1.3.1.gem 55808 BLAKE2B e3153870bfe2d5187aa433d81a287c2f9e9e6cf3caaf52b0f542fd35e4ac812786abc389c47ab56dd4267adb5206a5ce25c5ab6cc8559fa8dfbbd6b78e53fc16 SHA512 f826cdb7e48577226b12fc2715123e13519148f67d036470e385f80f8f3112d1ad24bf580c2ed0d213242c9afc1bdf868084266d430858b2cf6de73e50a11422
 EBUILD typhoeus-0.6.9.ebuild 730 BLAKE2B 766b748f85ded62ad0b6442a432bbee81896d7911d176ceebd23784e3b5d90b50411b8a041744b6a25e4698aabfecac20859c0e3cffc4663cb5bfa7eeccf8363 SHA512 37ae2c8ea809ccd1048753c3afa993745d0ed37a67e5d0d029f649f14cc4a5ff468fc948630b956e6e4fd3d4a9c5764ba55b60fcbd2670ed7efd4720855701cf
 EBUILD typhoeus-1.3.0.ebuild 759 BLAKE2B a172b38ce6db4242fe6b1054e6083c5babfcd932abde32a9f3a668c0283bcef4acccaec3237204a5db961b4fe072ada80a231d06c6cd8addd3fa46771fa6d9f1 SHA512 15c07b9d333da47c0392c875c1ab5c2d6e1206cfa65bf2d0091583348b560bcc393b25524a68c191eba3c964d43b5affaa322e56d639c6ab0d9605cecc78ffcd
+EBUILD typhoeus-1.3.1.ebuild 756 BLAKE2B 34bd85b82fc227a3b7e99bf8b10e589d0135f81681ba59fc8aef1aa9ab79d37f1f62236b58d1bb333235b6aea1bc5aa06874b12513a8f88a248e8c49e068f4b7 SHA512 ee4ea88b459559daef824a1603137868ad3443dee0b5cabf149ee911edf4fca8d68397d7ec920529eecaf6c949e278a83345046657d0b50d68157c3422b57eb5
 MISC metadata.xml 383 BLAKE2B fc06c06493e84a900ad29aa3997b8291d86a81c5b980c20f8abeb3897bbe6519bbfa5681d53df1629590e353f78aa6e0ecad3596cd6976a07302ae757f30f371 SHA512 976c74c44bb50748aedfeb7fa8a4b5f35afcc24cd962ef0441f0210f14da52121531ab23072bc8fabad9954b3bb384fbc4ae016397653b1e152434288fb9b6b3
diff --git a/dev-ruby/typhoeus/typhoeus-1.3.1.ebuild b/dev-ruby/typhoeus/typhoeus-1.3.1.ebuild
new file mode 100644
index 000000000000..93bf4dcea13b
--- /dev/null
+++ b/dev-ruby/typhoeus/typhoeus-1.3.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Runs HTTP requests in parallel while cleanly encapsulating handling logic"
+HOMEPAGE="https://rubygems.org/gems/typhoeus/
+	https://github.com/typhoeus/typhoeus"
+
+LICENSE="Ruby"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/ethon-0.9.0"
+
+ruby_add_bdepend "test? ( dev-ruby/json >=dev-ruby/faraday-0.9 >=dev-ruby/sinatra-1.3 >=dev-ruby/redis-3.0 )"
+
+all_ruby_prepare() {
+	sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/warden/Manifest b/dev-ruby/warden/Manifest
index 76503ad421ad..d27fc14460e6 100644
--- a/dev-ruby/warden/Manifest
+++ b/dev-ruby/warden/Manifest
@@ -1,3 +1,5 @@
 DIST warden-1.2.7.gem 32256 BLAKE2B 258f8c83792fd5464c2bec957335ded49922fbe75ef3e2f6869a147b38b89be83b4601c8cef7e3008cb1495bdf9a6eb4d798974eff0565f48b05937b9c4fca3a SHA512 f02f695586c26c42b1bbd621e54dad04a42e8bfb4bfacc4f90f67ef2fb0c8593a3c32dc1545ee6483ab0df094cae6e6a5c614718b65a13103f83af13407c5336
+DIST warden-1.2.8.tar.gz 29841 BLAKE2B 657f9d1b5a7fbf3b07ac8cfa514c410561cce853cbc2e6c7bf6d98deab8f625771b20d339613738a979395638b654b066080fad5a7378b15345cb46e273966c9 SHA512 efd7a416f2da3095d6d33c2dca3a7e09d127fb0abec86e959aba56739ae865ea9a11e234ea1f6d557466d9076e3f271481e20982bc159a3f09a4d55148d45734
 EBUILD warden-1.2.7.ebuild 470 BLAKE2B 1ce5041761dc668c95ae0ac98f89d5db2679938c49c1857b122e79ca7cb2ff792912d12c25648bbab20cc2987a19639423dd567e1056b814e8af09baa7768ea7 SHA512 16f6189d3880cc1393f1c0c8e9dc0cfcb654bd4c1af2f5225361ac19aa63aeebb5ee41c64d9d92dc4488f8276b97ac91b1d77fcdca3322b6342b41e7154e8194
+EBUILD warden-1.2.8.ebuild 607 BLAKE2B 0f0b031f9dd1534a89bea3137990592e9db6423c4f7c36ca01e3315cfc87d98e268e10768e5440535fb0d5ec292be2f3289f6b65ea06805eecf4499e45c80444 SHA512 1100db473f360d904129e97da6fb2f5dc9f73bb2885edd21aa7d17a4e95738f97413d8af37631c09933cc0b7a4cc8887b26bca78d7c974fcf02d89b0cf02d0c5
 MISC metadata.xml 339 BLAKE2B 393d527f8c13840cff0d3f73c38e94964fcfb294074767d395ad1e61048d950cc291737406fb0009ef7e7566f175d18a271b35f783dc70e348325e8c0569f6ea SHA512 60503377aabecc35e11148db41d73be583fec27d3776388f7a2f59eeef85d948f13d071fc245555b8d37148147a5c019d094c9cc7ff044b262dbf44bcb3d40e2
diff --git a/dev-ruby/warden/warden-1.2.8.ebuild b/dev-ruby/warden/warden-1.2.8.ebuild
new file mode 100644
index 000000000000..43eecbd6e5f5
--- /dev/null
+++ b/dev-ruby/warden/warden-1.2.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="General Rack Authentication Framework"
+HOMEPAGE="https://github.com/wardencommunity/warden"
+SRC_URI="https://github.com/wardencommunity/warden/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rack-2.0.6:*"
diff --git a/dev-ruby/xmlrpc/Manifest b/dev-ruby/xmlrpc/Manifest
index 2302b7b0909b..68c88ef986f2 100644
--- a/dev-ruby/xmlrpc/Manifest
+++ b/dev-ruby/xmlrpc/Manifest
@@ -1,3 +1,3 @@
 DIST xmlrpc-0.3.0.tar.gz 34157 BLAKE2B 862bff09fdd7febfd85ef4fde77a913b77f20024692b1475994b93b394d587f1b2139c82ed7159cc756bd1757ee2fee55f103866c52d4297d8a38be70c066c22 SHA512 370b2fe2ed9ca37fbbc2e85d08328450671019a2dc0c2a31ecf8fc8af95105ccf1b8f728307a5d9cf5f4dbcd93ccfb2f66244b441c0aea1cd1aaca2e820dfe31
-EBUILD xmlrpc-0.3.0.ebuild 922 BLAKE2B 7048d6e21f9392f57b5bf65d10d4f5c0af161c292a76ac5f91f661dba32e17fa264310242b247270c610a2034156e246b6b05c0badd67a7f89d4c27fab81b066 SHA512 2e79ef6434f27507e242b8d7a87fca6a7f02b86a08a2d750494203b29d40f3296c1cc5c4a1263b4ef3c1ed2e38bb7bf7426396b1dc77cf2d9cfa525e9886843b
+EBUILD xmlrpc-0.3.0.ebuild 970 BLAKE2B af385b98250bf83248287aba07061ab8c85133fbb233228891edec16187ecef6574cf4f05a131287c01cdf715a3f174a1fb8577f7949684b0b176eee357f3965 SHA512 7df552723bb5ead4f7675e8ab31669aec54286678603f8e66114d30981394b37e8e47ef6d767ef5f8167a3e42619526a16341c68e1f6184db18709cdf7627f51
 MISC metadata.xml 337 BLAKE2B e45e1b70e063e5f33759c32c987c2afee3283a31fddf4eec4a44c317f65a68926a84af12c5ab9a72e5315033593105dc95d1919fce3de684593755078246ef71 SHA512 94f995e14666100fd2f0e569f01bfcc86cfa319c213f0fb99e7fe104bc9b731dbd06e4e35cb76d94b126b296e1a5b916b4940c59f251a899781357f587f9be14
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
index 4bafca04f61c..bd7d8eee5422 100644
--- a/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
+++ b/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,8 +18,10 @@ SRC_URI="https://github.com/ruby/xmlrpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit )"
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' Rakefile || die
diff --git a/dev-ruby/zentest/Manifest b/dev-ruby/zentest/Manifest
index df756d336786..1c376bcab116 100644
--- a/dev-ruby/zentest/Manifest
+++ b/dev-ruby/zentest/Manifest
@@ -1,5 +1,3 @@
-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 802 BLAKE2B 1f43da0be5ac4497a647e799de76cf5364bf9c8a557291798dac4ce01eb3776f925983e2ae705a4e2e5b78cbc941105f2f614aa6248efcbd2d3e1528a46efca3 SHA512 776b7d1876e2bbf24e5937fbad393a34b685a28f3b5ad944bddc15552efe08fe28ddb0b1d476eb2efb437c29b367f08b09bd43edaf9aacb2fbd41a9040879f4d
 MISC metadata.xml 333 BLAKE2B cf1ac3fbb6994dc96110bdb974b726f53fdfe34db473f272ba78ede47b65e26350b807bf291c65f8a8bcf9e12fc3366e431ca32a277d9ac38cf9d4ed7ea46e62 SHA512 d02fdcc6c8ef63d22d0df77a6c7c82ac1d629d29685e6fc653c70079d56fb1b28574bfc7c372a5298dd4a3e20061aecc705d6824c569ce0f99e3dea464f04fcb
diff --git a/dev-ruby/zentest/zentest-4.11.0.ebuild b/dev-ruby/zentest/zentest-4.11.0.ebuild
deleted file mode 100644
index 279b41748806..000000000000
--- a/dev-ruby/zentest/zentest-4.11.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_NAME=ZenTest
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt example.txt example1.rb example2.rb example_dot_autotest.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::Rails"
-HOMEPAGE="https://github.com/seattlerb/zentest"
-LICENSE="Ruby"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/hoe-2.10
-		dev-ruby/hoe-seattlerb
-		dev-ruby/minitest:5
-	)"
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby23)
-			sed -i -e '/test_testcase9/a skip "ruby 2.3 defines more methods"' test/test_zentest.rb || die
-			;;
-		*)
-			;;
-	esac
-}
author	V3n3RiX <venerix@redcorelinux.org>	2018-11-18 09:38:27 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-11-18 09:38:27 +0000
commit	536c3711867ec947c1738f2c4b96f22e4863322d (patch)
tree	697733f5cb713908dcf378e13fd15a798a906a91 /dev-ruby
parent	f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff)