gentoo resync : 21.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-21 18:59:32 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-21 18:59:32 +0100
commit: 520a5b56dff7c24c9d42eafec142cb78b44f8e3e (patch)
tree: f562f705600dbd2292e97c0b4145787c2a8d1f97 /dev-ruby
parent: 3811bc3072bf19e2be351d2c63f81532945c0f21 (diff)
116 files changed, 681 insertions, 1201 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index dd8339f0e109..7e4fc0e7b8ef 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index b1781839fc6d..17b206b98871 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,10 +1,8 @@
-DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
 DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
-EBUILD actioncable-5.0.6.ebuild 941 BLAKE2B 76bbd65b75a57abeb351ab20ae1f1ee0a5481a4a4e9efcb98c279d8ef85914f5596fb22bf2835ce55522de0e96db4849be7c3c58da1d77d48cca7af9160aa909 SHA512 2e5d199f6e444f35796a84027e701601abe5d9d4c70ed712b01e59303a6d7f679b0f9dd3e9e64bcf2fff18ef5fae980edf458288cf5fffc9ede53a4d387b5be3
 EBUILD actioncable-5.0.7.ebuild 941 BLAKE2B 76bbd65b75a57abeb351ab20ae1f1ee0a5481a4a4e9efcb98c279d8ef85914f5596fb22bf2835ce55522de0e96db4849be7c3c58da1d77d48cca7af9160aa909 SHA512 2e5d199f6e444f35796a84027e701601abe5d9d4c70ed712b01e59303a6d7f679b0f9dd3e9e64bcf2fff18ef5fae980edf458288cf5fffc9ede53a4d387b5be3
 EBUILD actioncable-5.1.4.ebuild 993 BLAKE2B 3d32ab30014b97a719eb25a34e443f1d41f49eabf3f87c6f21772ae72423f3913d2b6d3283e8eca416aa2e8482019882bdaebb002360e0c36073d15b864366e3 SHA512 5941e8ac6f9311e5168f30a2bcb37f84e73b2ab601cb7a37f2646a194033c1c994ba6eed1c2c4db5be37bee389c04c03a96077aff263efa4b801809f98f00325
 EBUILD actioncable-5.1.5.ebuild 1000 BLAKE2B c5ff9fb4aa09f74fba83da260b9e136a096200b6d517904ccad399fc26d29a816f6201be72ce2037efbd0e3a24b56aed181fc4e969b18b1e683ce72155e315d2 SHA512 524f765727e7f879da16178df6bbda7cbbbbfdc49b4a042f08a861a4563b5c6936e3e9ea22636dff3d9539c647de77545ce452dc8ddf5f0c3c3dcf1454b8f537
diff --git a/dev-ruby/actioncable/actioncable-5.0.6.ebuild b/dev-ruby/actioncable/actioncable-5.0.6.ebuild
deleted file mode 100644
index 220bca44c465..000000000000
--- a/dev-ruby/actioncable/actioncable-5.0.6.ebuild
+++ /dev/null
@@ -1,41 +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_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	>=dev-ruby/nio4r-1.2:0
-	>=dev-ruby/websocket-driver-0.6.1:0 =dev-ruby/websocket-driver-0.6*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index e9842da48e88..44d05b0f9f73 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,15 +1,13 @@
 DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
-DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
 DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
 EBUILD actionmailer-4.2.10.ebuild 1623 BLAKE2B 4d0c3f0bda494ed811e449e1495e80dbd219655656af9f5660ad0ea52a17658e4db5a07054af00ad3c3948db9cf352e3cb3d0f84f1c3930d437eb5367c605f9c SHA512 ac0680ca62d49c5b7a3b5f3c99ded7bf6cee1388909d6533dff042790d3f117eaf5b2692a823b7e46ded85783f5c7bccfba0606b09563632a9844ea38b1ecc09
-EBUILD actionmailer-5.0.6.ebuild 1341 BLAKE2B 2a17605f8210edb2253fe3914d267f32c1bd2ad0cc0f744b835b20e61a19eb4ed65328bdf28e4e835efa558155fb97d26fc6269dd172e4515aa15cb3c6c804bb SHA512 1ec9190bb29c931be32dec90015c68af783b4d9f26bde51e7df2195ec605e7a61b8374c423ea83533b15a51721f5d62f804095542fd294e49a6cb4d2e7dea4a6
 EBUILD actionmailer-5.0.7.ebuild 1341 BLAKE2B 2a17605f8210edb2253fe3914d267f32c1bd2ad0cc0f744b835b20e61a19eb4ed65328bdf28e4e835efa558155fb97d26fc6269dd172e4515aa15cb3c6c804bb SHA512 1ec9190bb29c931be32dec90015c68af783b4d9f26bde51e7df2195ec605e7a61b8374c423ea83533b15a51721f5d62f804095542fd294e49a6cb4d2e7dea4a6
 EBUILD actionmailer-5.1.4.ebuild 1321 BLAKE2B a1225fd8d4433c84dbd412ca2a9d763791ea9bb13c1b7064490743156238fc7291494419837cd0843d82ca7e67dbd4ac660185258ec78922abc4eb7c57d88f7d SHA512 11568b63575505388731bc9db9240b24b3b260fa5e2883fc72b00aca5729e12543b9bb93ba7c7331eba7ff5053ffae0f1b9ca1de21b353a9ec66b1baa9f2a909
 EBUILD actionmailer-5.1.5.ebuild 1321 BLAKE2B a1225fd8d4433c84dbd412ca2a9d763791ea9bb13c1b7064490743156238fc7291494419837cd0843d82ca7e67dbd4ac660185258ec78922abc4eb7c57d88f7d SHA512 11568b63575505388731bc9db9240b24b3b260fa5e2883fc72b00aca5729e12543b9bb93ba7c7331eba7ff5053ffae0f1b9ca1de21b353a9ec66b1baa9f2a909
-EBUILD actionmailer-5.1.6.ebuild 1321 BLAKE2B a1225fd8d4433c84dbd412ca2a9d763791ea9bb13c1b7064490743156238fc7291494419837cd0843d82ca7e67dbd4ac660185258ec78922abc4eb7c57d88f7d SHA512 11568b63575505388731bc9db9240b24b3b260fa5e2883fc72b00aca5729e12543b9bb93ba7c7331eba7ff5053ffae0f1b9ca1de21b353a9ec66b1baa9f2a909
+EBUILD actionmailer-5.1.6.ebuild 1379 BLAKE2B ac0d01d99ff1344b7d7276faa30e1321b684599df861b4fdcddfe8890002f891badd7a8b8226501fd37aa93a4af314fe798f2f0e30e4386319cf2e5be027560b SHA512 a2642967c13c1a8fd31a312d041a2087367bba2d3b9a31877a61b9262d4e61314112181d3c29aedd748fc360a046249fbd7933930e40e6a4faec3c7253c72692
 EBUILD actionmailer-5.2.0.ebuild 1316 BLAKE2B fac377956e157d869078e2142ccdd7afdb0977ed06046109b71c4f745cbf96977ee0f4961dccd2a970c1b72e696524f25b2fb9c10e9517e30ec3d5003c254ce8 SHA512 7c0fd6e1568849cb44d6a127d03a14c34631f766f282074d7a6dfae6ebc6b7497d99966285dfe78b518135dd7e517c77c94f4ef41bf68270513ed2f984779483
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailer/actionmailer-5.0.6.ebuild b/dev-ruby/actionmailer/actionmailer-5.0.6.ebuild
deleted file mode 100644
index 54b101336651..000000000000
--- a/dev-ruby/actionmailer/actionmailer-5.0.6.ebuild
+++ /dev/null
@@ -1,46 +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_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha:0.14
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '1igem "actionpack", "~>5.0.0"; gem "activejob", "~>5.0.0"; gem "railties", "~>5.0.0"' test/abstract_unit.rb || die
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-5.1.6.ebuild b/dev-ruby/actionmailer/actionmailer-5.1.6.ebuild
index eb97299a0c6f..3715e6a04346 100644
--- a/dev-ruby/actionmailer/actionmailer-5.1.6.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-5.1.6.ebuild
@@ -38,7 +38,7 @@ ruby_add_bdepend "test? (
 all_ruby_prepare() {
 	# Set test environment to our hand.
 	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -i -e '/\/load_paths/d ; 1igem "railties", "~>5.1.0"; gem "activejob", "~>5.1.0"' test/abstract_unit.rb || die "Unable to remove load paths"
 
 	# Avoid a test failing only on attachment ordering, since this is a
 	# security release.
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 68d3086887a1..93ccbe4f6fdf 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,15 +1,13 @@
 DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
-DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
 DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
 EBUILD actionpack-4.2.10.ebuild 1813 BLAKE2B ea7e07d54d35fd6754cf574aa2f98ded244d8df6f8e86e4e639295b6651353c71461a6cdddde94062d820fca03746e49573e9ea4e134d0e37d254f99345db838 SHA512 41f1e17fd3f40e72d6c5ed659dae4281a7a94b5b2528f2931f0203f4ab778ad2eea16e4110aaa7c5e320073608667b5fc41c31d12d37c39eedd5f4b0c771bec8
-EBUILD actionpack-5.0.6.ebuild 2095 BLAKE2B 90e1cc87ff932dcb868e0c75479adce4137e9d6472ad1520e00d324242cbff1a2462ff8579fb5a435525ea94586f8458899b382ad4ed0bcce2452ec68ff4145a SHA512 b1be51877b60e2b359d6bdfe7e37cf84af47dff1024f96fee9e8bb71f09e403a9d7eefba007de52d535c8726739160f6416b72dc740853438fdcc07e891b4948
 EBUILD actionpack-5.0.7.ebuild 2095 BLAKE2B 90e1cc87ff932dcb868e0c75479adce4137e9d6472ad1520e00d324242cbff1a2462ff8579fb5a435525ea94586f8458899b382ad4ed0bcce2452ec68ff4145a SHA512 b1be51877b60e2b359d6bdfe7e37cf84af47dff1024f96fee9e8bb71f09e403a9d7eefba007de52d535c8726739160f6416b72dc740853438fdcc07e891b4948
 EBUILD actionpack-5.1.4.ebuild 1670 BLAKE2B b2b115ec16dbee477649e0068b6407f5097fda63bc746e6451a5eb8d8a0cc3ac6e58a5d3ab761789b3acda4708e1bc0e822b8ba9334f26e29cabd0d3c53c40f9 SHA512 d757de769ecae219fc268fbcb98b046117a3d880116ac7a309278e778fff575d3d34f53d8bba98c306a678c94e6d7518fbae2aa00046701ea48921055891abe2
 EBUILD actionpack-5.1.5.ebuild 1671 BLAKE2B 4f9741a6208682c3c3dc86b92e23cf1578950f64f7991e9ac69faa3d3ca375691a40c717e475bf3d4d92c77c164dc33ce15b8b904487fc4520cdb5e34ada2217 SHA512 7bc54a749625c4ed9b8e8d2cc54f9a9f0ac0338c647138a9e8187578e5583dec1e023c7d5fa1b4d1009ebe9d1fdf6d21c679cdb3d359fbc23650f7fe2d013f1d
-EBUILD actionpack-5.1.6.ebuild 1671 BLAKE2B 4f9741a6208682c3c3dc86b92e23cf1578950f64f7991e9ac69faa3d3ca375691a40c717e475bf3d4d92c77c164dc33ce15b8b904487fc4520cdb5e34ada2217 SHA512 7bc54a749625c4ed9b8e8d2cc54f9a9f0ac0338c647138a9e8187578e5583dec1e023c7d5fa1b4d1009ebe9d1fdf6d21c679cdb3d359fbc23650f7fe2d013f1d
+EBUILD actionpack-5.1.6.ebuild 1727 BLAKE2B 95e81c77b8c3b36cada69a289d0530d26d81044e58352cfc73b42c4faa106de94a3737fa36e0ad5c9669a31d2922080980b36b24456134dda88558020998cbc7 SHA512 24ce6a5ab88ed34c62bf0a52d4651d2684601e33edc1b7dd6571eb1039c69161fb55353ea51e1576a6819db29b62d1c52482a83896ee4a8a5a8a85976d67e7e3
 EBUILD actionpack-5.2.0.ebuild 1598 BLAKE2B f1b2b9f4823bc2122b1a4ed973406a05feecad21e58cc2c543dbe28be6f5442e6863d0f6bc3dcc2c2c19f1d988d4a3d20e2a92f90b59ff0aa889c50b9a9c8ce7 SHA512 fa8a005d7899fcf3f7bfba6d7930a843e3131edaf04b7b84d615e176709f5da7dd242cf33a73b1220df8007e77697db1b6e71f3e9c5ff8f743e84f8f966971be
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionpack/actionpack-5.0.6.ebuild b/dev-ruby/actionpack/actionpack-5.0.6.ebuild
deleted file mode 100644
index 1bf769932432..000000000000
--- a/dev-ruby/actionpack/actionpack-5.0.6.ebuild
+++ /dev/null
@@ -1,65 +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_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.0
-	>=dev-ruby/rack-test-0.6.3:0.6
-	>=dev-ruby/rails-html-sanitizer-1.0.2:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		~dev-ruby/railties-${PV}
-		~dev-ruby/activerecord-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e '1igem "railties", "~>5.0.0"; gem "activerecord", "~>5.0.0"' test/abstract_unit.rb || die
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Skip a failing test related to security updates in 4.2.5.1. Let's
-	# assume that this is not a bug but a test lagging a security
-	# measure.
-	sed -i -e '/test_dynamic_render_with_file/,/^  end/ s:^:#:' \
-		test/controller/render_test.rb || die
-
-	# Skip brittle test depending on mime type registration order (fixed upstream)
-	sed -i -e '/parse application with trailing star/,/^  end/ s:^:#:' \
-		test/dispatch/mime_type_test.rb
-}
diff --git a/dev-ruby/actionpack/actionpack-5.1.6.ebuild b/dev-ruby/actionpack/actionpack-5.1.6.ebuild
index a6ccce8788de..e9b8f315d8ab 100644
--- a/dev-ruby/actionpack/actionpack-5.1.6.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.1.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -52,5 +52,5 @@ all_ruby_prepare() {
 		-e '/:job/,/end/ s:^:#:' \
 		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
 	rm ../Gemfile.lock || die
-	sed -i -e '1igem "rack-test", "~>0.6.3"' test/abstract_unit.rb || die
+	sed -i -e '1igem "rack-test", "~>0.6.3"; gem "activemodel", "~>5.1.0"; gem "railties", "~>5.1.0"' test/abstract_unit.rb || die
 }
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 88e1feeae480..7ce7acf9a427 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,15 +1,13 @@
 DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
-DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
 DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
 EBUILD actionview-4.2.10.ebuild 1540 BLAKE2B 0be7bac1a0113b5d07b8f5cf7632c1387177ef615a151b47519353ec6f498d8f7bf930fe841b03b1ef48e96cb3fcc6e2db6f4ea8b8869f2849a8551687d935ff SHA512 6a9cb78813408092737682398c6f909c7be13654f09c555c88293885c5a8f6e9f9e9d60968df27d2054ca18ff9de3009fd8eb884a4eea8cd36cb2fb06168015a
-EBUILD actionview-5.0.6.ebuild 1839 BLAKE2B 766842730ddb8927b3be2fb39382ec1689e558a8df29ad66e5ca9757d5cd822fe5ffa40ab558cd7f2d608c346359966deb61bd9bf10d78f22690d3d2a0320f79 SHA512 5db463c1aeb7c227b2fc260b6f9a053281809541614db067edcaeb192cb5b361aa9297d36f1862770efad3f4b9bffbb10fa6796814d5f1a9800a9b47cf6b95a2
 EBUILD actionview-5.0.7.ebuild 1839 BLAKE2B 766842730ddb8927b3be2fb39382ec1689e558a8df29ad66e5ca9757d5cd822fe5ffa40ab558cd7f2d608c346359966deb61bd9bf10d78f22690d3d2a0320f79 SHA512 5db463c1aeb7c227b2fc260b6f9a053281809541614db067edcaeb192cb5b361aa9297d36f1862770efad3f4b9bffbb10fa6796814d5f1a9800a9b47cf6b95a2
 EBUILD actionview-5.1.4.ebuild 1756 BLAKE2B c154d68ac1efe85f9fe58d4605915ac457d23201447284c070e4e376c8161d81c7f7cde71b8090b88c19efe14d619cce54985ad42374da9ae2f6301a0737c4dc SHA512 7d21a6d903260203b96f7ea725bb2d9a72a25ae90a4ff84d7a5d302f349a4f85c6735bdad874fafa39f7988ce15100cbca634ea73bb7ec80845ea90b7ce7a084
 EBUILD actionview-5.1.5.ebuild 1757 BLAKE2B 186d24cfa202cb32fc97791e9d957c69f09e9af8293fd6ce09dbb70dea96835a337b7eea36f4a5757aaf2900dfa8e6844007f907f1d12dfc144aa404ed20b67a SHA512 45daa6fe7a74262b1aedabcf5280786f3282ddf5d29dc646092c82b6754b05014e1a81f768bde5661f5fbef248ff5c964267e150b85055d78ce3249afa3e3285
-EBUILD actionview-5.1.6.ebuild 1757 BLAKE2B 186d24cfa202cb32fc97791e9d957c69f09e9af8293fd6ce09dbb70dea96835a337b7eea36f4a5757aaf2900dfa8e6844007f907f1d12dfc144aa404ed20b67a SHA512 45daa6fe7a74262b1aedabcf5280786f3282ddf5d29dc646092c82b6754b05014e1a81f768bde5661f5fbef248ff5c964267e150b85055d78ce3249afa3e3285
+EBUILD actionview-5.1.6.ebuild 1887 BLAKE2B 75354ee4950ae9bb6c67b5b878c85c7436b9a5cc462f10eb06178c8a3c5eb8c4ba0c462b06daa71990caaabc486431bee2a05bf54d44d79219b84c89d1664ab0 SHA512 42caafaa2a8b9959383419715d0f1287f22f17a357d1358b2a4b0fe0de6605dffdec6985e3579049f112e6cf8322971590f32d12a66f1a6b0bb99ecca3c9c180
 EBUILD actionview-5.2.0.ebuild 1752 BLAKE2B f5df1ae26919c1671d24396e870ffa22615a082e843794e17be6da618aadac44af1615d4c41e28b13633ce634eabc18e6b67c92a5d94345e51b678f55f4ef0c0 SHA512 b95cfb9bb71c5ed58286b2b4dd0dd19be223c954cf2e689f48117f5c4fd0c1da0e0b4b17b2792542acc0bf883f6564758cde5377d7041cb90e584fd2f274dd52
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionview/actionview-5.0.6.ebuild b/dev-ruby/actionview/actionview-5.0.6.ebuild
deleted file mode 100644
index 671fde0cad4a..000000000000
--- a/dev-ruby/actionview/actionview-5.0.6.ebuild
+++ /dev/null
@@ -1,56 +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_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubis-2.7.0
-	>=dev-ruby/rails-html-sanitizer-1.0.3:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		~dev-ruby/railties-${PV}
-		~dev-ruby/activerecord-${PV}
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e '1igem "railties", "~>5.0.0"; gem "activerecord", "~>5.0.0"' test/abstract_unit.rb || die
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid tests failing due to missing logger setup in activerecord,
-	# most likely related to test environment setup.
-	rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-5.1.6.ebuild b/dev-ruby/actionview/actionview-5.1.6.ebuild
index a8a2e7bf010c..649b600b5204 100644
--- a/dev-ruby/actionview/actionview-5.1.6.ebuild
+++ b/dev-ruby/actionview/actionview-5.1.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -52,4 +52,6 @@ all_ruby_prepare() {
 	# Avoid tests failing due to missing logger setup in activerecord,
 	# most likely related to test environment setup.
 	rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
+
+	sed -i -e '1igem "activerecord", "~>5.1.0"; gem "actionpack", "~>5.1.0"; gem "railties", "~>5.1.0"' test/abstract_unit.rb || die
 }
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 4d4360c8a244..5568e03d1438 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,12 +1,10 @@
 DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
-DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
 DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
 EBUILD activejob-4.2.10.ebuild 1080 BLAKE2B 4c8c1019fe13365a0c3ffa221319c5816ab25cf1d5b8802e6b5236768dcfc6394ce6eeef42a20c24b8619cd6b7c3d26844eb6535063dc59c81c0f91fa3e1161f SHA512 fce94a7ddfa303fdb02233985944c11ddbfea867f5d9de2c893be34f43941b74073f2c66ec0d3b3e1c9f84ee7fe4ca286d1fd6bac24bbbb30040a8853dbd79ea
-EBUILD activejob-5.0.6.ebuild 1059 BLAKE2B be868a59498580fde255d69be0810c016779918c144f4ed24955120148b923b82c1a65db530cbd118d7df1a36c2bb8809155d97d86da385a1fe215179e03f22d SHA512 1a1d094f838f5a2becf84f227a1d62f6a0caf54843b78b757e12756a0f7457c264a3286234f5a32ce0e23883376573ab39be580b28c6c4434204ed4bfa00a092
 EBUILD activejob-5.0.7.ebuild 1129 BLAKE2B d5cc088a44ce42427940b892e0f8a560ef2b587ee12ee5f3d07cef82369025d921bf2d1e0a2ac091e95c2f251bf0f7788d61a13c5b51b0db2052c3afc7d7dea2 SHA512 9c19395298377b1653cdfc2cfafdbcccf396b77787a8bb0dffe12564aa26c1ccf7f3bc447edc21f1eecb128ccef550143edbc1f4f482c966ebaa8384e58d2d52
 EBUILD activejob-5.1.4.ebuild 1102 BLAKE2B cea04c003777a5c731ae3bcd33ae2e2feba2d4d8b723236413788ea313519ea109f6825fadf9e3c46e47a1dafb999dc62a7bbf16c3ab7aab54a3870dd38f9d1c SHA512 96b0ccd5572ca46e69264e7ef96dff7dd538f566d38b823c14e57e08427bb3dab5902d94251ab0ec3dbc314d0591e0bf1afcc8169ba715931a4b4eb660af23de
 EBUILD activejob-5.1.5.ebuild 1102 BLAKE2B cea04c003777a5c731ae3bcd33ae2e2feba2d4d8b723236413788ea313519ea109f6825fadf9e3c46e47a1dafb999dc62a7bbf16c3ab7aab54a3870dd38f9d1c SHA512 96b0ccd5572ca46e69264e7ef96dff7dd538f566d38b823c14e57e08427bb3dab5902d94251ab0ec3dbc314d0591e0bf1afcc8169ba715931a4b4eb660af23de
diff --git a/dev-ruby/activejob/activejob-5.0.6.ebuild b/dev-ruby/activejob/activejob-5.0.6.ebuild
deleted file mode 100644
index 33e36ad548c9..000000000000
--- a/dev-ruby/activejob/activejob-5.0.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '1igem "activesupport", "~>5.0.0"' test/helper.rb || die
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/delayed_job que queue_classic resque sidekiq sneakers sucker_punch backburner//' Rakefile || die
-}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 959685343914..751a2fee8ba8 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,15 +1,13 @@
 DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
-DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
 DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
 EBUILD activemodel-4.2.10.ebuild 1499 BLAKE2B 7cc5ec14bca05ddbe528396c7f721f28015d711dcefdaa2e45addb1887473cc4b9ca2f34859ef22f8b40c8dcb697588531e6dbdcb719d9a9a8c5d19ee9640ed7 SHA512 8b01a0317dd860a4196a70d44630924a02caecc09c8fbaa787a66f4f794975e2722cf886d107d42e4060e4d71cff133512cebc3d1e211ec035a5740578b297b8
-EBUILD activemodel-5.0.6.ebuild 1049 BLAKE2B c9c18543ca2671932e46098cd7baf12b29059ad74e3785a0c174296c93a693e9e09b5955c71e7d7b1f3f67dd92f2025df337dfad31eee953fd738324fad547ce SHA512 3c6c3121f4eeb2f5770366924883dc312d0413ddba3de490d4eb44822d7cd6d2e5f815ab93b38992ba48de2e9ce6e4a681c9e98ef7cf33031a07c5bbfc510d50
 EBUILD activemodel-5.0.7.ebuild 1049 BLAKE2B c9c18543ca2671932e46098cd7baf12b29059ad74e3785a0c174296c93a693e9e09b5955c71e7d7b1f3f67dd92f2025df337dfad31eee953fd738324fad547ce SHA512 3c6c3121f4eeb2f5770366924883dc312d0413ddba3de490d4eb44822d7cd6d2e5f815ab93b38992ba48de2e9ce6e4a681c9e98ef7cf33031a07c5bbfc510d50
 EBUILD activemodel-5.1.4.ebuild 1072 BLAKE2B dee7ef7b1c90455a737cde502105ec1a9b5b4b6362dc115d4f5fa2f4057bd19bf2ba2c79ccd1ce81cf5fe74a3399efd9e511a3e60034bc20f8d04321a7392080 SHA512 d39122a4323f0ad9ac1ddbebfd5c7c579c216682e7676f5f3025ab11a44d8a9366671c2c7f860bef1ed721a630a36a37fb0649897c6b7e9935eb61707151490b
 EBUILD activemodel-5.1.5.ebuild 1073 BLAKE2B 2f5781d6165bdd88e801cd598dbcfb123f99bbfbc68428fe3aac48b5dba83d4a4e7820c2ce588ae2452dca2db0d4e40fb02b41a133bb00ad5b84989759acca06 SHA512 afb9244e7d717cf10c681ca2a3b62fae982d58b91f0dcf60be9854b580e7ad787bff501c52adf7cb27e72969bef2fc2574aa61c468f727f1b2641ac13790036a
-EBUILD activemodel-5.1.6.ebuild 1073 BLAKE2B 2f5781d6165bdd88e801cd598dbcfb123f99bbfbc68428fe3aac48b5dba83d4a4e7820c2ce588ae2452dca2db0d4e40fb02b41a133bb00ad5b84989759acca06 SHA512 afb9244e7d717cf10c681ca2a3b62fae982d58b91f0dcf60be9854b580e7ad787bff501c52adf7cb27e72969bef2fc2574aa61c468f727f1b2641ac13790036a
+EBUILD activemodel-5.1.6.ebuild 1128 BLAKE2B 2fc63660f837f86752d5f00f61232e76ab31e62a8848ae49bdfa02895fad2f72371b4874993389299adbd8f5c68dcb722e6692a5e003b9beab58ab74dfd3a035 SHA512 2b180c4ba579b11fb455495f97eef341d5b7757207b153ac8459f5a44a1f3ffb8e2cc3b3e42e014c8ab4c979a6717f4a8642f5bb528c05a5e50596b3d616097b
 EBUILD activemodel-5.2.0.ebuild 1059 BLAKE2B 70b0fc0b667b918a04486d26eacd0b46a6797b9ab50396752ab35d7de908a348638d66e5519f711f12676aeb61cbfb1534fa95c2557ddd8012ec57c68ca09f17 SHA512 8e17729197e212eaf4efd6f56e1ae1d350be6560f36677d8f417db63fbc4a47421c0cd36186e2f18f469cddfe2a5c10e5cdcf8a7380d967e3a38f7550d82837a
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activemodel/activemodel-5.0.6.ebuild b/dev-ruby/activemodel/activemodel-5.0.6.ebuild
deleted file mode 100644
index a7adb554db31..000000000000
--- a/dev-ruby/activemodel/activemodel-5.0.6.ebuild
+++ /dev/null
@@ -1,44 +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_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/railties:5.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-		>=dev-ruby/bcrypt-ruby-3.1.7
-		dev-ruby/bundler
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "activesupport", "~>5.0.0"; gem "railties", "~>5.0.0"' test/cases/helper.rb || die
-}
diff --git a/dev-ruby/activemodel/activemodel-5.1.6.ebuild b/dev-ruby/activemodel/activemodel-5.1.6.ebuild
index a0b573ba9df5..b9653e5377c3 100644
--- a/dev-ruby/activemodel/activemodel-5.1.6.ebuild
+++ b/dev-ruby/activemodel/activemodel-5.1.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -40,5 +40,5 @@ ruby_add_bdepend "
 
 all_ruby_prepare() {
 	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+	sed -i -e '/load_paths/d ; 1igem "activesupport", "~>5.1.6" ; gem "railties", "~>5.1.6"' test/cases/helper.rb || die "Unable to remove load paths"
 }
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index b7c9adeaacbc..9fd5b02f3da0 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,12 +1,10 @@
 DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
-DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
 DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
 EBUILD activerecord-4.2.10.ebuild 2433 BLAKE2B 606c1cd593165b80487fa6e9b20dc437d785dc283910003db2802d274175170cb906412239afedf4955db3535b689eb8f1812a81011d6d7f9309c10e6de19ff7 SHA512 bf9b3edea74d5c2a2e62772afe4558752b392152e60af194e5772b23aa889c9ad58bf0c676ed103235127ef5d7b2362e9ebb66ed2381c004c16f17d9392387ea
-EBUILD activerecord-5.0.6.ebuild 2732 BLAKE2B 52ff7f3e27a3c9bfbdb82884c6a70408e3cac330ad79c0e26e9ab5cfd360cd3f2d55f5ed637f3e60880c260a6c73fb06896e1b647d9a0b3d470fa64d8a1b9d13 SHA512 29fbf0ba49971b440999f9e8ab2bf74574ce166933990d2bd2e83e6c6da98d56cee2460391ef8b14b5a534cc041f304dc0493de60500b624eb8430250bade393
 EBUILD activerecord-5.0.7.ebuild 2732 BLAKE2B 52ff7f3e27a3c9bfbdb82884c6a70408e3cac330ad79c0e26e9ab5cfd360cd3f2d55f5ed637f3e60880c260a6c73fb06896e1b647d9a0b3d470fa64d8a1b9d13 SHA512 29fbf0ba49971b440999f9e8ab2bf74574ce166933990d2bd2e83e6c6da98d56cee2460391ef8b14b5a534cc041f304dc0493de60500b624eb8430250bade393
 EBUILD activerecord-5.1.4.ebuild 2652 BLAKE2B 399413789bf9faf2fbe4116ca0d821841f5b758c990aeb5d041a0e5c6c265dd025e55337f6538aa65edb388ed6bf8e98a98b0e60f3bf839be71089ddb20457b0 SHA512 9c0d204f106e22b8a8cd8abd2e5407ef8ef64b3ef854613c53a63187137e587f16dbd3e784c099d71baac62b3a8b8e06f86e93c29d30926c18931183d8f55ce7
 EBUILD activerecord-5.1.5.ebuild 2652 BLAKE2B 399413789bf9faf2fbe4116ca0d821841f5b758c990aeb5d041a0e5c6c265dd025e55337f6538aa65edb388ed6bf8e98a98b0e60f3bf839be71089ddb20457b0 SHA512 9c0d204f106e22b8a8cd8abd2e5407ef8ef64b3ef854613c53a63187137e587f16dbd3e784c099d71baac62b3a8b8e06f86e93c29d30926c18931183d8f55ce7
diff --git a/dev-ruby/activerecord/activerecord-5.0.6.ebuild b/dev-ruby/activerecord/activerecord-5.0.6.ebuild
deleted file mode 100644
index 399aa51c243d..000000000000
--- a/dev-ruby/activerecord/activerecord-5.0.6.ebuild
+++ /dev/null
@@ -1,80 +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"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	dev-ruby/arel:7.0
-	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
-	mysql? ( || ( dev-ruby/mysql2:0.4 >=dev-ruby/mysql2-0.3.18:0.3 ) )
-	postgres? ( >=dev-ruby/pg-0.18.0 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/actionmailer-${PV}
-		>=dev-ruby/sqlite3-1.3.6
-		dev-ruby/mocha:0.14
-		dev-ruby/minitest:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e '1igem "activemodel", "~>5.0.0"; gem "railties", "~>5.0.0"' test/cases/helper.rb || die
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single test using mysql dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index dee7c347d634..ee1ab4b6514d 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,15 +1,13 @@
 DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
-DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
 DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
 EBUILD activesupport-4.2.10.ebuild 2168 BLAKE2B 4bfe8e4d4d585733bbe6a0ab9618e5e79a04799eb699a11479b3036a123c030d1d2a99176ad5a463b6b218262f7df575506122fb36ccae504c890504374f97de SHA512 873c00a1090978e422509043f4f067c2478179db2c0bfb96d2afd9053754a89f015c4340785ed1efca3ff5e83992aeab6e72dface39c256e5b449238afe152a1
-EBUILD activesupport-5.0.6.ebuild 2566 BLAKE2B e86c5bcc677978762bbc2e8cf988582525abe765878ff1f41f2ddb80d1cc5c7fe664caf9d7ea048dfd069e20778abb09c9a642656783c2e12e126934c538f96c SHA512 f9294fe58b9a9a2a6edb0962004016b0f4bfe8aaebeb2f45bf7c67b6acb3a3b6286605069fd8ad2f4da260e2d4805b138f829326df5ccfeaf67131cce19add6a
-EBUILD activesupport-5.0.7.ebuild 2647 BLAKE2B 44a801239a05899172555f3968624684fe6c0dd210d9c73f280b2cfff7fbabbcbca0f9d40f1002a357336673bc14be4c61317f783fe2df80bd12e67a05247724 SHA512 d53aaeb613e82e4563a78b114e8f3cb8dda86e9b563a1696024f6e320251133174972fe9da3ab1fcde2922a27c5f6b9edb0519b2cf3a543b2172ee7f3d974ff7
-EBUILD activesupport-5.1.4.ebuild 2215 BLAKE2B ae6b03b5a7811c324137d1c5b9f5bc09b7414ee30b3e300f18aae64716eed216b4fb7e132ed47e4a00b12c5e31572ea424c9b158a143678b84d1de22899f227a SHA512 64f1687f73f7d8aabe765e7c5d341299f0a6f362f4abe5ebcaa82e6e322a400d0f2615fbb770fd5924b0c929a664853f882d573113a4b483e7619966faa97627
-EBUILD activesupport-5.1.5.ebuild 2216 BLAKE2B 93f2cb5abc9f9852f16855bc306a47d45eeaef819bb104033959220020e29be1be9cd74f2b11b9b3b9eacac2cff760d17e8c9d32811e910dff787030ea9e3c2b SHA512 1a175fb73bb3654ae437bbc0645eead34bbdb6e4dffed23f7bf0f1437ff978d42c3776393340d15698baf02289eeeef1bdc1cdb088be98c62bdd94d65e606cbf
-EBUILD activesupport-5.1.6.ebuild 2345 BLAKE2B ae44ceb7dccc9eeb5f9b76b0442ec30a31ee804a0eae1cea9f8a137920b96225148d201ef3e721834510e0bc0ed2ba9c65025adc8b8a3f0b3fcf7929c01f815e SHA512 6c04d09d71181511af7b5eac1b368995467efff6fad9adfaef6917ca61782ec814477e359c869e0fb567ce4cdd2eda3859ec53f46a2945dc354c99596b6d9b85
-EBUILD activesupport-5.2.0.ebuild 2559 BLAKE2B 04f3c8a728886919db3ebf3eb07564a6ef6e6b22b227d00f2cd1f93cb7ad95bc848ffc9f12d6daad33f0632ac94c6e89298ea44c010a58ec723e1c5e6228cbde SHA512 a1e1687adeb6dd4d35a5d54e31382fc26b8bddba3364b1a19f5bf93c47c14f07b55252348ab4af8443207f604731b96056538a25df7016e9427bc9cf20289a7a
+EBUILD activesupport-5.0.7.ebuild 2646 BLAKE2B 8a5b75824494c5f25b43e9196b38ce5ce4a1e7dd6398345b70e028198afc73c92ef8b83effc12abbbcfe30325f44df4e7ca89f52cf986b55439b9fb35d807d9b SHA512 6b7242961eb6b2a4e5070925193d8c03ff7ad95275922ae52b86d5017262059e918c462381d5655479868203f0fe634b3231376a24e6db64fb5b219aab818500
+EBUILD activesupport-5.1.4.ebuild 2191 BLAKE2B 1686675733d595c5ffb005b7b343bd0ae1adf1da2564baf31cb13b48f8edb867d9cc1ece62d7b0e39f7490b48f9a91c923eed1ee0cf8ed157509a4d4574c526d SHA512 d2fa57234919fecd20717dc7a84c271ddfc7ef74437cbc63f3bcc6b83c08c38c5f0bac72833ea0dd34c5121654dcdf429535143f1e7677ea9b6c3ced03a38eaa
+EBUILD activesupport-5.1.5.ebuild 2192 BLAKE2B 6609109cdce8db84365b4acc378641e477ed98ccbd082e0e71da261917c9c719019fc303fb4607311be842f00db5e68c819054ddfb38bcd50156552c9bb56089 SHA512 8372de87880a7be9104082c95ecc059ce7ae27f8963560858a0cd8305513f2dd592f297375fa2a38527fdeefe9decd70c1dab6bfeac6d5436383c3f50b139733
+EBUILD activesupport-5.1.6.ebuild 2320 BLAKE2B a56309fd9c8fade096989b148ef03d0ce42c902aefc24972e40a333fd2cfdc55fe7ce7c45b057b4abc7643c34dbc872ea14a622a437e5f27bd51d3fdeae7815c SHA512 bbf22dc539464f64d2628e9fd0e14f8d83fad292e9f8ce2e3234c4ae719e2139dfa04bb22d6c0d732c978a0632af1e5cea2075cf7115ec8ca720ef30a5a4e912
+EBUILD activesupport-5.2.0.ebuild 2535 BLAKE2B 68f3dbf317ff7f7dcc4a744c1d3c7c502a41bfe31dd8a5957884c6f22349eaca05b02f8b66d6536cfcb1950dbbc31d751bdb86ceda585c7a75270896d8675c55 SHA512 379fd25deea457cd5f69fb65015ca7cd7972cbe732c8262acdf6d4a01515c221289186f0ef991f03c4aedc687d76ae5dad34b1133bd0ef9caa987192e54a67cf
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activesupport/activesupport-5.0.6.ebuild b/dev-ruby/activesupport/activesupport-5.0.6.ebuild
deleted file mode 100644
index fef8c518147e..000000000000
--- a/dev-ruby/activesupport/activesupport-5.0.6.ebuild
+++ /dev/null
@@ -1,73 +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_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	>=dev-ruby/i18n-0.7:* <dev-ruby/i18n-1:*
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5"
-
-# memcache-client, nokogiri, and builder are not strictly
-# needed, but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha:0.14
-	<dev-ruby/minitest-5.4
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid test not working within portage
-	sed -i -e '/test_messing_with_either_encrypted_values_causes_failure/askip "gentoo"' test/message_encryptor_test.rb || die
-
-	# Avoid tests failing since test_order cattr is also seen as a test
-	# method
-	rm -f test/xml_mini/libxml{,sax}_engine_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions. This might be
-	# fixed upstream in 7bd41994480c17db71fdc07e3447ade929eaa386
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid tests which make network connections
-	rm -f test/multibyte_{grapheme_break,normalization}_conformance_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-5.0.7.ebuild b/dev-ruby/activesupport/activesupport-5.0.7.ebuild
index 23d02efa9e08..bb434f435694 100644
--- a/dev-ruby/activesupport/activesupport-5.0.7.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.0.7.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-5.1.4.ebuild b/dev-ruby/activesupport/activesupport-5.1.4.ebuild
index 0c0f4522051a..37af0ab21a65 100644
--- a/dev-ruby/activesupport/activesupport-5.1.4.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.1.4.ebuild
@@ -41,7 +41,6 @@ ruby_add_bdepend "test? (
 	>=dev-ruby/listen-3.0.5:3
 	dev-ruby/rack
 	dev-ruby/mocha:0.14
-	<dev-ruby/minitest-5.4
 	)"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/activesupport/activesupport-5.1.5.ebuild b/dev-ruby/activesupport/activesupport-5.1.5.ebuild
index 3457102cac6a..742467adbb38 100644
--- a/dev-ruby/activesupport/activesupport-5.1.5.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.1.5.ebuild
@@ -41,7 +41,6 @@ ruby_add_bdepend "test? (
 	>=dev-ruby/listen-3.0.5:3
 	dev-ruby/rack
 	dev-ruby/mocha:0.14
-	<dev-ruby/minitest-5.4
 	)"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/activesupport/activesupport-5.1.6.ebuild b/dev-ruby/activesupport/activesupport-5.1.6.ebuild
index 230ceb0f1f5c..d74aa86dd308 100644
--- a/dev-ruby/activesupport/activesupport-5.1.6.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.1.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -41,7 +41,6 @@ ruby_add_bdepend "test? (
 	>=dev-ruby/listen-3.0.5:3
 	dev-ruby/rack
 	dev-ruby/mocha:0.14
-	<dev-ruby/minitest-5.4
 	)"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/activesupport/activesupport-5.2.0.ebuild b/dev-ruby/activesupport/activesupport-5.2.0.ebuild
index b988ac9c4964..00df2f4bb0a8 100644
--- a/dev-ruby/activesupport/activesupport-5.2.0.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.2.0.ebuild
@@ -41,7 +41,6 @@ ruby_add_bdepend "test? (
 	>=dev-ruby/listen-3.0.5:3
 	dev-ruby/rack
 	dev-ruby/mocha
-	<dev-ruby/minitest-5.4
 	)"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index c7db5b6121ee..6ec8d903d3bb 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -1,7 +1,9 @@
 DIST bundler-1.12.5.tar.gz 371552 BLAKE2B 0aca136308d9c393c945037dc18f7b8e7563017933aa5ef3cf14b50e095c200b82046a9d8cb00641e16507d588fe2aec8da59b22fc063bb4ecfb55b36627e981 SHA512 d42b2a10b97ab9724b9f3c6d1493a46ac212a918acc556ae90faed63b128190fd365cc0ba8c9ed9db30fc285e5c4d4183ddb698eee9a8607e9e40e860e78518d
 DIST bundler-1.16.1.gem 349696 BLAKE2B 6057aed2e3bffdfa7f3ea8489c4ae79d9241b7b300fd35c4a2c14899ff306183165d1554be793a1856d9fd1c696161161049519fc8915800c68c60a9a5b116d8 SHA512 2cca87aa17b61df98ef98a648a7d7cfe0529015f1278e8cb2298bb12544157933d723bd666d945bcdbaceacbf97a092a3848e2a587bd01cffa73c662d37d4834
 DIST bundler-1.16.2.gem 352768 BLAKE2B 4ba3729d314aec33a4ce6738a54774d4772714913d132493a8bfd719b53c05e9beb498835c01fb1904336d80fb3bd9466f71cc8e5bd1e34491f7e1f38b7bf9bb SHA512 998708b0eec5cdf7ab89b415a0a5173275b221b46e7151c0f05cb49f64a902a0fb0d77f831c60afe55ac4cafe6f4229d082d3f6c38ec13767add7979853f9221
+DIST bundler-1.16.3.gem 353792 BLAKE2B 5a36cd3e3a7fed39ea1de8d7bcd27a2f7758e4fd67bcfdbcc877a44c491624b45736e9aa122a14d792f2ff11605d226cdfb5a70c2d6cdadb5e0e4e36d597c96c SHA512 bc6b911a5ad2911c35be1ce4e28d42b7762cfc950bc060cca1527b66f78c5f125ed5524d1fc161f68053f00997742c6354549712be0a49c72877ab32ccbbefe6
 EBUILD bundler-1.12.5.ebuild 2231 BLAKE2B a9d9fa0fd10df02af01ac5b8aecbe1507dcfa0d17db1393aacd5a85dab329313098b95ba6d5eb60614afe85d0fcd6cb8c0a054b8c098961342cde5ddf9b742de SHA512 ef0ca3ab2bf4cfd199926553f3b3d35096c91e3f6b8d32fa70414e2a4bb4a7f60f921e26d7d462e5deb512beb31f1fb74e76b2c8c34898aa87543a52950477ef
 EBUILD bundler-1.16.1.ebuild 954 BLAKE2B 1eccfd49dc3216195408d82ccdd1d11e84acc673e0b8aca219f1939f6e7d109193c41ec9068d617e108eea0b5433d2724092107c8b1c465d9f6957824a9377ea SHA512 51381084a359ac00bc68ac3ea4cf909baad11f05b05f4ffdb6342adf5efee3a4512b4c03906a574199f0848ec707699d97242babec40c0cef81fcd3c3ba8d172
 EBUILD bundler-1.16.2.ebuild 963 BLAKE2B 4ba5577bfb001e257ad44a04e3c7e920f6e809177d2f0f0d6557ea4ed5df1955f009323900e3eb9b7fc03bcb333ad197b80e892a0c58bacfed366c606f0fcc67 SHA512 d08f8706fc972839979d1ecacb8ea2436eda09c9585fb664d150a7251cba665553a7d7641adf545628e7557f5e2b3342287287bbb21106856be078fb12f20021
+EBUILD bundler-1.16.3.ebuild 956 BLAKE2B 16a90a9a7d14d861369b7b0f0f2c3dfaa59bc04e96ee3833aecbcee6070f58ec524758a61bcce3d93690f6ab70579de519bd90d6b816bb0bc93b3773de464cc2 SHA512 aba431908bdaccc5d70c76e0bf1209148c4679ec9eca1073025b89d3c0fb630def82147f7c76f35c0a1a81bdf0017888db7fc3f171adbefe808de8c4091957cf
 MISC metadata.xml 342 BLAKE2B 9247517894a366c8b67564e015ff966b22eb3df924ec8438d9886ee854d922e376a274e1dcb455e23451febbb1bf4d8f60023e6b7763cd42772749de1bab372c SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e
diff --git a/dev-ruby/bundler/bundler-1.16.3.ebuild b/dev-ruby/bundler/bundler-1.16.3.ebuild
new file mode 100644
index 000000000000..b8d61098f3b1
--- /dev/null
+++ b/dev-ruby/bundler/bundler-1.16.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="man"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/carlhuda/bundler"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git"
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 0a41ffc08a0f..92329ce4878b 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -2,8 +2,10 @@ DIST capybara-2.16.1.gem 273408 BLAKE2B 1d1a68427fcfed9a8153e409e17fc043dd8d926c
 DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca18ea85a7095d9e58625df6a59a349b60b462c5c4f403a6af955466bc46d82be6cd91724fc2b12cbe15ed74a4c SHA512 3bb994e022593d485a07296193a16cae7b45e96e87dd10b2bd4807ad2bc990801044c0493360598d1626c3e367e8de87e407f65c2c6f42674d5f1b9c0b5c1933
 DIST capybara-3.1.1.gem 282112 BLAKE2B 82740933a34bc80ff4901fdf538b9d48d3ae8b5d9c906f462a964104ee1312a74697528f1803eeead0a250823baaedb1f2d4839053b26e4a9ed0fccbc224a137 SHA512 955918a004f11af93caecf964738108edd31ebfb239d6af752bc48ac74b754320014b997d01b8cd12bec5aeef27c88b6737cf7d0ba7dfdb4ce983939ae534546
 DIST capybara-3.2.1.gem 284672 BLAKE2B 9da8f588049fab74c4e734626e42758cdd4baf555cfc64e7456bfab2cb4d5c90ed6bfc8ada7cc0d6323ef1113169aec70fd4254aa50c003408376ea4afe00a06 SHA512 50af1d4c49c200a4c08901d19b16826499abb8d19de8e059160c509afd555edbe620b6fd5d78f8c286feeb15a72e5a4b241cb1f14151b349fd94cdd3648b64b2
+DIST capybara-3.4.1.gem 292352 BLAKE2B baf07378ec9c932ca4fac4b9ce465b76704c5b17cea73db01d584dbf7076b2c6defe0170a0575691f6af5dcda2d8f97bd16a3901d36c8a9db63c72491fbfc962 SHA512 abd969af564a9b8a827493674d51e2cabbb57c47795ede260498f99600da0da9bf00c97e64ccd07cfdb1b630135714191f232f166e08856a4cb9fdff6c47fe1a
 EBUILD capybara-2.16.1.ebuild 1509 BLAKE2B 8ff52d1240388337ea4eefc688caeddcb53f0c589ffc50d2cddfec130e6702b5ae3bee7ae8ca0dfd8c672867ecfb0347aa37e6961f3dbf185145600e493e0276 SHA512 2b9160aa85c4ac67c1756b385e3bd98951b83e114ea390d0c0243ddae60dfc0a56ad1126a841768c1956641be68c76b935f633509791aa1c07ddc1172cc66987
 EBUILD capybara-2.18.0.ebuild 1525 BLAKE2B 17327933169f1c330a0f0580b8dfd00be4ae39e0fa94d62e172d6621a8a91189925acfca3730685ed80573e6eb456f731d8072fb1adb2653b6b646714a89bc5b SHA512 a6347a7b9014e3ca1bdeee9eed2a9e22d866dd831041e700086b00c4245d254ea3107c82b019f7550faa273777430898c571c837ac4202cdb2cfdf15068edd47
 EBUILD capybara-3.1.1.ebuild 1512 BLAKE2B d8c1dc1208dd7c7aedeb2f48ccaeb190dac1451e60feba70bd2cce2b3e7425f1179716e02792ecaf27b9301c560821d8bc322d2c56a5a92c3032f94303c5e268 SHA512 9f96398cd632b4b2aa5386d84c19bffc3c22cd416178e516a755412c9ecb75287dc089d88925354a6f6d1bae5d5109b4c0831b3b6edf3615deed6253aeb595bb
 EBUILD capybara-3.2.1.ebuild 1518 BLAKE2B af598a905b37db7eb77511372ace937bff702c2aa116afcdf4bb2d32bd99489e95a61ca442c8cf5c8174fe7f0021fb7aadb6fda65b2dd7ab41a1d8829bd3099f SHA512 9bcf03fa1561b95257a319825c5ae165914fac5ad4993e028f51d9b3d70bebc7e51203f30cf70d2a9b66a61a4b30dfe85d79037a5f19c3e61997f0e3f41f5372
+EBUILD capybara-3.4.1.ebuild 1497 BLAKE2B d6e23247a1af0d26fbc832e9747f14c9efb963c65ccf8dceea02d1d5b01a639757543af1cda60464cdd7a5adf639057fabfb8ac198e3d7939fb9d51d6afbc4f2 SHA512 93888436e322a879a1effd6f3e56ff5ddac73f7d73860cb6021fec5869ebdcca744359f90b6c833de63e2d63ceaa48dc1801b9fd3cc4e93c8f5b605031f9db88
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.4.1.ebuild b/dev-ruby/capybara/capybara-3.4.1.ebuild
new file mode 100644
index 000000000000..27821bfea232
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.4.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_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"
+SLOT="3"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( www-client/firefox )"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 dev-ruby/sinatra:2 )"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	>=dev-ruby/mini_mime-0.1.3
+	>=dev-ruby/nokogiri-1.8:0
+	>=dev-ruby/rack-1.6.0:*
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/xpath-3.1:3"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' spec/spec_helper.rb || die
+
+	# Avoid window-manager specific tests (sizes are specific for fluxbox)
+	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+
+	# Avoid spec that requires unpackaged geckodriver
+	sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Avoid test dependency on puma server for now
+	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
+}
diff --git a/dev-ruby/ddmetrics/Manifest b/dev-ruby/ddmetrics/Manifest
index 89aeb94744ca..54b41c7d8404 100644
--- a/dev-ruby/ddmetrics/Manifest
+++ b/dev-ruby/ddmetrics/Manifest
@@ -1,3 +1,5 @@
 DIST ddmetrics-1.0.0.gem 15360 BLAKE2B ef8771fc0d74db7ad2652e6009d3bb0cf0dea5aee051498d275efaba76bb68dfbfbc6eb18f7961e8d0db4ac2f81676433dd5e04ef3f3cfb984973d797877f983 SHA512 30b6a3cfaf219043fb7eafac9aa4104d53080af11a98fb8e2a9cfecd3d55ec2977a9fdc2fd4a960709071184ecf247e81bc223d7cd7b69f1db2eef83387546c3
+DIST ddmetrics-1.0.1.gem 15872 BLAKE2B de0fbb540c45b84c36c37b652f1a987c49d416e63aff644950091f4a84a76338590e1ce62e20df092488bd43af566dfcdb4a056d57ae306f7f3855bba43326f7 SHA512 d3b97bbcfe12a666c0bf28abc076510bb1ceb8e6f0ebda3ff40bba64da50bbb2995beb09da9b2c03b8e54271b143bc0703fb1d0b1db729d092281138ba717b3c
 EBUILD ddmetrics-1.0.0.ebuild 676 BLAKE2B 13f40f3bb3d439f715cce160b7dcb4b2c0f1dde2d37fe0876b191e6ede77baba9e7b5c4df95df4129d2b8b5a97f4c00c5ac8adab52894604b465d2abf431ea61 SHA512 77785faf477281ccb8b71309c1727a28c8f3660f9c9f459352548d1dc428ff803b70b55ca25cdde6918837036c10af8a105c987e74b9ad80890e1d30b908fb07
+EBUILD ddmetrics-1.0.1.ebuild 676 BLAKE2B 13f40f3bb3d439f715cce160b7dcb4b2c0f1dde2d37fe0876b191e6ede77baba9e7b5c4df95df4129d2b8b5a97f4c00c5ac8adab52894604b465d2abf431ea61 SHA512 77785faf477281ccb8b71309c1727a28c8f3660f9c9f459352548d1dc428ff803b70b55ca25cdde6918837036c10af8a105c987e74b9ad80890e1d30b908fb07
 MISC metadata.xml 344 BLAKE2B 0273d97e71d33a034491d3b930f31a0351f4a75d2165577cd76d5e20aa391b86d780d2cbe956777afe9749a7f1a5041713e98537adc759c28bc49ae881619171 SHA512 33eca59dd735b2d2d7f539eef5a639fbf4635783a83bae7313d038734f6ef4268c3b0f5b90cb9abcd95466e877ef55d726871240b2be1e5fca186c876ac11311
diff --git a/dev-ruby/ddmetrics/ddmetrics-1.0.1.ebuild b/dev-ruby/ddmetrics/ddmetrics-1.0.1.ebuild
new file mode 100644
index 000000000000..990ee6d14c9a
--- /dev/null
+++ b/dev-ruby/ddmetrics/ddmetrics-1.0.1.ebuild
@@ -0,0 +1,29 @@
+# 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="NEWS.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Non-timeseries measurements for Ruby programs"
+HOMEPAGE="https://github.com/ddfreyne/ddmetrics/"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-its dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' \
+		-e '/fuubar/ s:^:#:' \
+		-e '/RSpec.configure/,/end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/did_you_mean/Manifest b/dev-ruby/did_you_mean/Manifest
index 13d1e5f2e8db..7c599dc9c56b 100644
--- a/dev-ruby/did_you_mean/Manifest
+++ b/dev-ruby/did_you_mean/Manifest
@@ -1,9 +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.0.gem 32768 BLAKE2B a73873f18c36d9e811e51a1c8b974ebb44f6029468c34a33b7af6c299b78025750e043d960f15baa5f5aad89df906df743196c5fdafa368c740f8112936c8655 SHA512 9b807d707f1931639b04cac485e0b58a2ae2cd6377d0782317f62e9d469c9394e4088fae16e7ec3ba45e7d2afaeeb2fe10358dd70f9660e08c30f51a4f2d0b8f
 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.2.0.ebuild 625 BLAKE2B 1186c24385aafd494741fa942ba52dcf09b90dd0da5ff6c4fb1fb097b0895663241948c8ecf488f6dfde5b68cb9f41ad4a61ff27e33b843abdd57e4da488dee1 SHA512 418260a135bb846ae15f9859e8fa9fbb8b8835fc62ea1bd7e4973eaf5b7607d2cec4ea06ed2d8f6d1a32c477dcc87f531e800aa0a9c15a3e40a57aefa39f2dec
 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.2.0.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.2.0.ebuild
deleted file mode 100644
index e31d894d88c4..000000000000
--- a/dev-ruby/did_you_mean/did_you_mean-1.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="'did you mean?'experience in Ruby"
-HOMEPAGE="https://github.com/yuki24/did_you_mean"
-
-LICENSE="MIT"
-SLOT="2.5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/dnsruby/Manifest b/dev-ruby/dnsruby/Manifest
index 0c6ab465ca73..6f5c8495ce1c 100644
--- a/dev-ruby/dnsruby/Manifest
+++ b/dev-ruby/dnsruby/Manifest
@@ -1,7 +1,9 @@
 DIST dnsruby-1.60.2.gem 254976 BLAKE2B fa91e3994331fcb37650c905fb00cd58363ca9b90a3943934b2bb3de0ac82b9efeda418bba45673ec3911676dd1b68bd47d079c3ded201c190d17e2ee2bef0f4 SHA512 dcf191421aaf667f59baaa8098099c5532542e1b9e4fa6ad63a727361d985f14adb3d3fee4aef78c4b6ef8809fe06447ee60d7a220af93e57848a57e0ddfaa22
 DIST dnsruby-1.61.0.gem 257024 BLAKE2B ba0662b758e8950bf4d9617ee1b36330ba5a66560c8a07985dcd7c41be0881287e4b4de35e009c0319021ba7ebde107f67b3bff0eecbac101ebe32fa0d8b3d97 SHA512 7ea06e40790a822d7eaa604d349acb692103b7dd5faa2b9fce8e3a4bba520d9597e1c6e7c5f74ad64cdcdf2583bce606d444c07b4e52d3ef6630fc7869168015
 DIST dnsruby-1.61.1.gem 257024 BLAKE2B dd5329ec48220b6ddd8b156701b840b1990c12bd1d7d46fcf1fbf62cd86437fa47829fdf95b48aa0d1e2608be524fdb1580019817a96b6ccf7297be490ea97fd SHA512 418dc94931a5a0f8ed136caa29acadf1d45026ab521bf95d0548e7f8122599f405e71a73331921e606542a9178bde99a7ba53aee91459201d73b33f9f0f59b58
+DIST dnsruby-1.61.2.gem 257024 BLAKE2B 9b87f0f7e1d3062d30128b131e0ba5fdf7dee8114e0e86f6d63ca79e15db686b412906b685a7db0571fb5678de5148cdb59c0e67c6402c193e13772645be31ba SHA512 39ba76a0ca5073b5d03172754f99fad31c3a9af9e2856b930364eb2a5859619b56a1adbf5c84ccae085afcfdc2e32ffd67cf2a92a4e6150b3a113a03e5c7503d
 EBUILD dnsruby-1.60.2.ebuild 802 BLAKE2B 66ba1eb5a8a48f3df819d15e0785ba52399a61a1a574b693d80db25e99e0df315d950166a93ad002c381be8b57400255b3eb461dc08344f042f309d7994cdd62 SHA512 4cd705757ee37462f5183542cafa9ffbe5ae8acb0f0c6abef60af4a48c87ccfe96cb8cb8115bb6505ef156e442ae8ef3b6498c8d2b1b28e627d5b0da7a992f86
 EBUILD dnsruby-1.61.0.ebuild 795 BLAKE2B f8e90b4cc2103c0ab1685576405cdc97274439450285c9941bdb894db32989d25df523ad70a6aa907a043d83cc62e5cc44c58d266823d49e16bc2c6d8ce602b9 SHA512 620a80c40b8897e885f21223fa8c14edc596a0253ddf11276a02311ecd4fa080b90fa675f41dd1e22d91de7b1a60dbadb7da9241af048ba9c0227b2a0231e6cf
 EBUILD dnsruby-1.61.1.ebuild 795 BLAKE2B f8e90b4cc2103c0ab1685576405cdc97274439450285c9941bdb894db32989d25df523ad70a6aa907a043d83cc62e5cc44c58d266823d49e16bc2c6d8ce602b9 SHA512 620a80c40b8897e885f21223fa8c14edc596a0253ddf11276a02311ecd4fa080b90fa675f41dd1e22d91de7b1a60dbadb7da9241af048ba9c0227b2a0231e6cf
+EBUILD dnsruby-1.61.2.ebuild 795 BLAKE2B f8e90b4cc2103c0ab1685576405cdc97274439450285c9941bdb894db32989d25df523ad70a6aa907a043d83cc62e5cc44c58d266823d49e16bc2c6d8ce602b9 SHA512 620a80c40b8897e885f21223fa8c14edc596a0253ddf11276a02311ecd4fa080b90fa675f41dd1e22d91de7b1a60dbadb7da9241af048ba9c0227b2a0231e6cf
 MISC metadata.xml 413 BLAKE2B afeb40e610311f15b7a95117ea91507e9cfcc0e26903cab7e58f0af5dfce580dd782e96338a8a6a7573cb3ac12497541c2c3284fac9f35b045d5a26608c5506f SHA512 4badb70d7bfddbd8d242d1b400672691ccf737a329e365321dc403dff791669417ba0b0df62efd1ad1c5946e11a7756b22a2790b171e3629d2d30ebfefc5c0f9
diff --git a/dev-ruby/dnsruby/dnsruby-1.61.2.ebuild b/dev-ruby/dnsruby/dnsruby-1.61.2.ebuild
new file mode 100644
index 000000000000..305d820349e9
--- /dev/null
+++ b/dev-ruby/dnsruby/dnsruby-1.61.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_DOCDIR="html"
+RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README.md"
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby DNS client library"
+HOMEPAGE="https://github.com/alexdalitz/dnsruby"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Cc]overall/d" Rakefile || die
+	sed -i -e '/display/d' \
+		-e '/Display/,/^}/d' test/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	# only run offline tests
+	#${RUBY} -I .:lib test/ts_dnsruby.rb || die "test failed"
+	${RUBY} -I .:lib test/ts_offline.rb || die "test failed"
+}
diff --git a/dev-ruby/eventmachine/Manifest b/dev-ruby/eventmachine/Manifest
index a8a8e6913b1b..33ee7ef61ea5 100644
--- a/dev-ruby/eventmachine/Manifest
+++ b/dev-ruby/eventmachine/Manifest
@@ -1,5 +1,3 @@
-DIST eventmachine-1.2.0.1.gem 241152 BLAKE2B f7df9888ba9f3ef731099124ce7cf2b6b396f57dc948feb828f015f2b33426348c87f2443fc6f678e94550167241c2ae154f3679b13b3b7e1bdb6bcdae6cfaab SHA512 a861a2c5172b7cf2720bdb54f52ea96c311c10efdb2f54970054901674e044a72307a5b32210efbbdb78d0472a9b3fb6e898640e1c0b406bdad8b581970e30aa
 DIST eventmachine-1.2.7.tar.gz 246402 BLAKE2B 3eee1e5fbb367c03e3d801cb705a0f95b7bbb461885f04820f57421019a3d61eecabe71309981eec35168395eb6d98a8c675bd0fb225497de511f2ce09a5df92 SHA512 768ec084903dce4c737cf564fce7886a3e7e5b7d4a89c2baea3e998130c53dc00488eaa2d8e9b0133d9e4d8fffbde80c3025403881486a7968c2d84425cc1f50
-EBUILD eventmachine-1.2.0.1.ebuild 2774 BLAKE2B 49a46edecc1b6da43cf90d5da669818ecef2722450f5245651976421ba5c0ea77db4a7269df8c66d35ec780be4acdda49add7a0fdc6aff06fde47e6a5de08bb8 SHA512 9f8132929ec7ef0b4c121d0456baf88dcd3943aafda51cbeb5fb5214ddaa01423022250ed6aae6194358cd2215d1c51f3f1e3ee20034f63d86d890130ffd63b9
-EBUILD eventmachine-1.2.7.ebuild 2811 BLAKE2B 4b132e0712a7bd8e50bc5c4a0fe35cf8b0b8bcdf49b65a9df52deaf4525c59d76da04da429fda97360781a0da817dbf6fab84c27a999189246a09e48bcec9bad SHA512 e04154068c33c09281c662095046df7ebbf61f01548dc74d0605090c33eb09d4d1c6be2c82f7e9bfd576a8903d5453dde1a172c8161621f4888f56860da84216
+EBUILD eventmachine-1.2.7.ebuild 2809 BLAKE2B 2e7ec8bc8eaa96fc9c55c6bb48353c2c05d89bd955d474cb0e7ff1680f01de062638a3d87af871e06953a545f73480d90e6d572b2f8a53e50b3843b747e3f93d SHA512 e886821a5af97d2e5771d50160b417a0bcd2a3ca3d9484ee174ab0b1d8f01e48ef112c2fa5b8b0bb2ca0263cf4cfa388629ae93057b75cf7483d808b4e82bd05
 MISC metadata.xml 523 BLAKE2B c8c4dc99c1560b2dc7233a194f0892bf86397594daf3896408d080632dda52cae3fef16654e2a35340bc0746befab669071ff9de7707fcbd92583472aa52f73d SHA512 622ac8cdd832ad49db828fefc3c9ab089e1d7e3795e369778591b4f572a647a99d4625fb9a3624189d0521a8daa9d2360bfe01fd905e8d106b83e244d900e509
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.0.1.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.0.1.ebuild
deleted file mode 100644
index 600e79ac5697..000000000000
--- a/dev-ruby/eventmachine/eventmachine-1.2.0.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="docs/*.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="EventMachine is a fast, simple event-processing library for Ruby programs"
-HOMEPAGE="http://rubyeventmachine.com"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="${DEPEND}
-	dev-libs/openssl:0"
-RDEPEND="${RDEPEND}
-	dev-libs/openssl:0"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Remove package tasks to avoid dependency on rake-compiler.
-	rm rakelib/package.rake || die
-
-	# fix test issue - upstream b96b736b39261f7d74f013633cc7cd619afa20c4
-	sed -i -e 's/DEBUG/BROADCAST/g' tests/test_set_sock_opt.rb || die
-	sed -i -e "/omit_/d" tests/test_*.rb || die
-	# Remove the resolver tests since they require network access and
-	# the localhost test fails with an IPv6 localhost.
-	rm tests/test_resolver.rb || die
-	# Needs a tty
-	rm tests/test_kb.rb || die
-	# Avoid tests that require network access
-	sed -i -e '/test_bind_connect/,/^  end/ s:^:#:' \
-		tests/test_basic.rb || die
-	sed -i -e '/test_\(cookie\|http_client\|version_1_0\)/,/^  end/ s:^:#:' \
-		tests/test_httpclient.rb || die
-	sed -i -e '/test_\(get\|https_get\)/,/^  end/ s:^:#:' \
-		tests/test_httpclient2.rb || die
-	sed -i -e '/test_connect_timeout/,/^  end/ s:^:#:' \
-		tests/test_unbind_reason.rb || die
-	sed -i -e '/test_for_real/,/^    end/ s:^:#:' \
-		tests/test_pending_connect_timeout.rb || die
-	rm -f tests/test_{get_sock_opt,set_sock_opt,idle_connection}.rb || die
-	sed -i -e '/test_ipv6_tcp_client_with_ipv6_google_com/aomit "network"' tests/test_ipv6.rb || die
-	# don't test unsecure and obsolete protocols
-	sed -i -e 's/sslv2 sslv3//' \
-		-e '/\(test_any_to_v3\|test_v3_to_any\|test_v3_to_v3\|test_v3_with_external\)/aomit "obsolete"' \
-		tests/test_ssl_protocols.rb || die
-
-}
-
-each_ruby_configure() {
-	for extdir in ext ext/fastfilereader; do
-		pushd $extdir
-		${RUBY} extconf.rb || die "extconf.rb failed for ${extdir}"
-		popd
-	done
-}
-
-each_ruby_compile() {
-	for extdir in ext ext/fastfilereader; do
-		pushd $extdir
-		# both extensions use C++, so use the CXXFLAGS not the CFLAGS
-		emake V=1 CFLAGS="${CXXFLAGS} -fPIC" archflag="${LDFLAGS}" || die "emake failed for ${extdir}"
-		popd
-		cp $extdir/*.so lib/ || die "Unable to copy extensions for ${extdir}"
-	done
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S testrb-2 tests/test_*.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}/
-	doins -r examples || die "Failed to install examples"
-}
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild
index 68b8c3ce8508..db8dc33c6ed5 100644
--- a/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild
+++ b/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eventmachine/eventmachine/archive/v${PV}.tar.gz -> $
 
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="${DEPEND}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 91ce7d200834..3ff131f6e9d8 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -2,10 +2,12 @@ AUX 00facterdir 15 BLAKE2B 88b3bebceec0d9b8943b36a373a5475d2600c8cee5770c2f93916
 DIST facter-2.4.6.gem 246272 BLAKE2B 105a43b2697cde0a48d4fcf87e221cfcb348695f81722b8cfe2819a8f3fe19e575d22642a708c798648d05c71f54e7bf0281345320612a8fdb3b68fce993ec20 SHA512 a0a2bef37451ab96ed331c79171f77d89b6db430b083e6888a306fa5b57a72986b7f600cad3e09b5f4706e54736d1d32ea25525fe18a6108cc95f315da16664a
 DIST facter-3.11.1.tar.gz 384201 BLAKE2B 349493f0046239ed900cb22df6cac2f5c1f748503e057a68e9be34c2f24f134a280ab9292d7f4e754a5974818a1fd01bc55634905d84706b47686a9e7a1ccc39 SHA512 295c91817912fb43fe259ede4b51ecf4ae5efd500d64b2682c700583bfdf694a8849a4bd4cb3a16a8046d563f487225957a49b760cc03d8bf86ac8487e37a756
 DIST facter-3.11.2.tar.gz 384784 BLAKE2B f280772231a9105e5924cdb777411861a76a67c15b4d7f3cc73fb9c089752a4e5fa43c4d84b8525917fae71ae34c770925161cc94882e74a704d6609b1c1778a SHA512 aaeee7449813590ac8bc8d3b1b2a654e75bcdaabbb19f91f8b282f747e0f8af05ef71bc872b99c226f0db4d06b67549551f62c365853f5829c6b26c931c0b582
+DIST facter-3.11.3.tar.gz 384882 BLAKE2B ad6103df38efb6abd68d9f831e53dba2767401e129d55bb94adee4dc3f8bc48c7a969050cc52d395a196883d561317ccb72bfaba2775e003171fd6941935feb8 SHA512 6b2dbc5a0bc1c70739a4c0987311ef0891a27f64ed1b45a46cc20a37e6d1d24fda0481976fbf743f83f10d2014f6e0df0e2b5cc9eba19924e831652e1a8417ef
 DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
 EBUILD facter-2.4.6.ebuild 1899 BLAKE2B a8e0d7c7a83c42150219a300d4a1a512913deee5d66e3a28a4f285a27d731cfa1937bb4d0d9bd8c80e133f2956ecf17690f5a94d66b385507a4f3740a425872f SHA512 0f4a589cb04567a42181bf366e51f6224d792c63bc2b38d2db3653688844e2cb611223fe148a6ff015d8dd734695214afc33ec0812e1707ac629344a691a396e
 EBUILD facter-3.11.1.ebuild 2851 BLAKE2B f7195a19a256dca9b6c1ca5aede6001421411869b4b4c1e9dd02ca91a9e73a6a4efeacbc2809bda46977f5ba2ea4b8efc6d52ecbd5a09b2fb44addfc2ff369b5 SHA512 fb1d8480fe94d452b49560093151be5ee068ab6b8a7f2fe7d90a1d07aaea0b0becd35d435189a7dbe9b9eff60ab2d82d703d700668951c562774f55dc12d375e
 EBUILD facter-3.11.2.ebuild 2752 BLAKE2B 6759e761e7152705a9fae260d626b78c32119553b63e37d19186b20d2afd8efa3a1b92286117f0c10486ecb818086e01352bdfedddd33b37e576cc9c90f731b2 SHA512 d9558badde687ae24b9150e36ccf7ee557463ba996c9654b87ccca5fa8ce44dbb38925282aa3af41aaa366b126a805d8cad42c2dd7d771ccb03d4b85ead17b63
+EBUILD facter-3.11.3.ebuild 2754 BLAKE2B 0b0a66a4ee65c54baac05172ec2d35ecd31d7252797631458004d0055dab3dfcb0f1a1103cec9b40e2d8de465672efdc1aa3f69e7856de2d05fa335099e2ea8f SHA512 21993d6b5dd6227e1b862abba394b15473ca02f14b8a14e133d08a50ad5b1f6a09291225bbe4e49144d9c6d25e4ae50177aad0a624533f83b20c6f93c1db665a
 EBUILD facter-3.9.2.ebuild 2106 BLAKE2B efcbbd0cfe6a71b1b1a08bbc1f7abe4b94845c9e13192deae811466211ab2ba533ae10732a4d72635609b9cb419051b7c4a39f248e9b06f7ec751cd893d28852 SHA512 5cfb67a3db8d288302f21bf0092c05ce19b40c8a2f00b4b9b63e3e02cd7d1af3dd20670b744520cb42db2b2ccd52e9153d86c0e1db7a36c4c7854c70d79149dc
 EBUILD facter-9999.ebuild 2761 BLAKE2B 45a04ae914f400f4b80fa0f51fed999d08344ca58005040f7930f2fa7c4092329fdf4557a9babc81ebde788731844cd8299af704dda71a22521a14515f7c6c73 SHA512 58190ff28a512818b79e49c92525c61898a29ce3ce8f8b9b884489ca0f08ae980d906164a45d5a60fef9bc3a8f38ef88882474243188f250ab57043079845f16
 MISC metadata.xml 854 BLAKE2B 51b94622bf8ce34658bf34bf266effc445fdbee52fb22e70c9a645c36b7ac28db73793f185b2dfa791d8459a56ea66eccc6a3f4da56db4fe4ee171ee607366ea SHA512 27e7e17a15ad80544fb121b050f0f5c39d3e27a53ade89063a894569472618b29649b5a737011b8d6597594d9bc94a49cf52c9df857d577a098d6c770b4a9639
diff --git a/dev-ruby/facter/facter-3.11.3.ebuild b/dev-ruby/facter/facter-3.11.3.ebuild
new file mode 100644
index 000000000000..6210613630d9
--- /dev/null
+++ b/dev-ruby/facter/facter-3.11.3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# git-r3 goes after ruby-ng so that it overrides src_unpack properly
+inherit cmake-utils eutils multilib ruby-ng
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="debug test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+	S="${S}/${P}"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${S}/all/${P}"
+fi
+
+BDEPEND="
+	>=sys-devel/gcc-4.8:*
+	dev-cpp/cpp-hocon"
+CDEPEND="
+	>=dev-libs/leatherman-1.0.0:=
+	dev-libs/openssl:*
+	sys-apps/util-linux
+	app-emulation/virt-what
+	net-misc/curl
+	>=dev-libs/boost-1.54:=[nls]
+	>=dev-cpp/yaml-cpp-0.5.1
+	!<app-admin/puppet-4.0.0"
+
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="${CDEPEND}"
+DEPEND="${BDEPEND}
+	${CDEPEND}"
+
+src_prepare() {
+	# Remove the code that installs facter.rb to the wrong directory.
+	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
+	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
+	# make it support multilib
+	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
+	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
+	# make the require work
+	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
+	# be explicit about the version of rspec we test with and use the
+	# correct lib directory for tests
+	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
+		-e '/libfacter.*specs/ s/lib64/lib/' CMakeLists.txt || die
+	# be more lenient for software versions for tests
+	sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \
+		-e '/rspec/ s/2.11.0/2.11/' \
+		-e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
+	# patches
+	default
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
+	)
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+each_ruby_install() {
+	doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	ruby-ng_src_install
+
+	# need a variable file in env.d :(
+	diropts -m0755
+	dodir /etc/env.d
+	echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir"
+	fperms 0644 /etc/env.d/00facterdir
+}
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index bea3d6a96999..55984a2287f7 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -3,9 +3,11 @@ DIST fakefs-0.13.3.tar.gz 46019 BLAKE2B 2ff858106a4d5b4f6859b806cc1aa54a08917ecf
 DIST fakefs-0.14.0.tar.gz 44808 BLAKE2B 9957e95e5d8c6188da0cfa9160067b27485b9222a4f6342b2901a769b437ffcf4322e6ea377ac80ec95fd59ec56c5a48d3012e5c50b49a9fa8085c5c7b0fdd20 SHA512 8afc29bdff38232bf86de37771653b3f519f21e3c148afe7376d6df86cb303452f06a430f359f0df80a9f01aa9d697b24018e6b55a185e649c82e81d43274739
 DIST fakefs-0.14.2.tar.gz 44978 BLAKE2B 6cf17d70c1c65ff5dd17c00d2a2f61860aa2d499365906e8a056d182a2402af08c33b1d4608ed2ea2749a49966eb3142195b5d29b014e41a176e793bd8223e97 SHA512 bfe33f0849a8e72bae6c3b4cdd05485c6ea807f2048decfcda84055fa601c85fcb6ebe0db9de81d9ec77c5040e58335be7109779bd765da73a405541903049e1
 DIST fakefs-0.15.0.tar.gz 46331 BLAKE2B 5994921c2696a48ea0541a2a49fc9e372a52ef585a7a48ad4c15303d8f817dbb95411d0efcfb93334ffaac876e349a41cb7330d073f019bb09d60e22f6bf5f1a SHA512 49602cb3dce3b0bd2950e77aed515bcb71dd453bf658c8f15f218abec7fe595aa62969495d46974d983bd52a19d6d19bd2986ad8a6e9b45e370c37259c9f32fb
+DIST fakefs-0.17.0.tar.gz 48156 BLAKE2B 0d05def00b527fb0d510ea73d6c39ac9025f5d2e79b04055ef4e7c9250152f9c7a339f2566765da5a406c3c0c561252a70d44da13fdf3b042e58e60275e7465f SHA512 3e63a439a2d9e3898c50453e062808110128d5bcae148d90751e72a2a1ba528e00e4cf1511b4cef3c3fb37b8dcfca038289bef35eaeccc1f766aeb2984530203
 EBUILD fakefs-0.11.3.ebuild 1098 BLAKE2B d31a81a83d641186b7780447a291fab0812191766b5a6600ded1e365d3ffe1807df11ab4bb557d60782532a67cf13b05c5b892fcc8fadbe536eaf3cb9c3a6047 SHA512 52832e5b6530397c423f3ebfa64c7fb9b60e52acc9e5d84aec735a784130ecc75a604ded3cba48979c4e511624e90bbff8d9e3dea9df9dbde84a0bbb8c40f53b
 EBUILD fakefs-0.13.3.ebuild 1111 BLAKE2B b1662f69aba52dbc1867e019631029a0e589e54ce3c253285e081342d77d3a6dd8a11e43c2f8a368c9fbbbdbd7ef1efe8f960a07b1d08aaffe01c92862201e01 SHA512 5131fbb7fe77ab2678b183e5492c38d96f3742eeebe7fdf7aa1a1ab09ceb5748446cc12aea77bf75361c40e1aa7e43214d9a571167db598750d15fe32945dad2
 EBUILD fakefs-0.14.0.ebuild 1104 BLAKE2B 5c672ea370bd900215722582fcde3fe53a9318a2a59e6ee555ff887d89ae8bb8f46b99e7ee0d2d960b3171f6113c57d8ceecc2adef89d32a65f75af8880a8de7 SHA512 486e8c96c9ba5099b280990c5d0860e7513fbf40dd1dae361eb760443bb82220a432096077da3eba7baac9d98b5d8f5db8252956a25119d3b47df9b2b0c97f08
 EBUILD fakefs-0.14.2.ebuild 1104 BLAKE2B 5c672ea370bd900215722582fcde3fe53a9318a2a59e6ee555ff887d89ae8bb8f46b99e7ee0d2d960b3171f6113c57d8ceecc2adef89d32a65f75af8880a8de7 SHA512 486e8c96c9ba5099b280990c5d0860e7513fbf40dd1dae361eb760443bb82220a432096077da3eba7baac9d98b5d8f5db8252956a25119d3b47df9b2b0c97f08
 EBUILD fakefs-0.15.0.ebuild 1104 BLAKE2B 5c672ea370bd900215722582fcde3fe53a9318a2a59e6ee555ff887d89ae8bb8f46b99e7ee0d2d960b3171f6113c57d8ceecc2adef89d32a65f75af8880a8de7 SHA512 486e8c96c9ba5099b280990c5d0860e7513fbf40dd1dae361eb760443bb82220a432096077da3eba7baac9d98b5d8f5db8252956a25119d3b47df9b2b0c97f08
+EBUILD fakefs-0.17.0.ebuild 1104 BLAKE2B 5c672ea370bd900215722582fcde3fe53a9318a2a59e6ee555ff887d89ae8bb8f46b99e7ee0d2d960b3171f6113c57d8ceecc2adef89d32a65f75af8880a8de7 SHA512 486e8c96c9ba5099b280990c5d0860e7513fbf40dd1dae361eb760443bb82220a432096077da3eba7baac9d98b5d8f5db8252956a25119d3b47df9b2b0c97f08
 MISC metadata.xml 340 BLAKE2B a31a62212f53154af4d3dce332d30eab8433785cdcb07531f743a5d48f3e7d9dc55580651cdcc765d4dcea5d27e78902624d475f8ae052efc6d9c2eea8b57d0e SHA512 1369c8941ac7aad5dd54222a870a5d173194c4f241093864b25abc1ca97e9f55d8fe928157c11ed63d2281352bbdbf6779cbc00abaac206fd024385ed5eb8478
diff --git a/dev-ruby/fakefs/fakefs-0.17.0.ebuild b/dev-ruby/fakefs/fakefs-0.17.0.ebuild
new file mode 100644
index 000000000000..0190df166417
--- /dev/null
+++ b/dev-ruby/fakefs/fakefs-0.17.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="A fake filesystem. Use it in your tests"
+HOMEPAGE="https://github.com/defunkt/fakefs"
+SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-3.1:3
+		>=dev-ruby/minitest-5.5
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler
+	rm Gemfile || die
+
+	# Avoid unneeded minitest-rg dependency.
+	sed -i -e '1igem "minitest", "~>5.5"' \
+		-e '/bundler/ s:^:#:' \
+		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/idn-ruby/Manifest b/dev-ruby/idn-ruby/Manifest
new file mode 100644
index 000000000000..105a2730934e
--- /dev/null
+++ b/dev-ruby/idn-ruby/Manifest
@@ -0,0 +1,3 @@
+DIST idn-ruby-0.1.0.gem 17408 BLAKE2B 42bc51f28dbe02c1dcf111de00a52352adcb173be3634a20503708e38c48cb0290cd9861f7ffe7dd0442afd8874b5db4249c1b5956b0acb368fbfc30e6fc0029 SHA512 5356266daefabfc5213f91c419ee1beb91972510bb016e7beac9719c501c643f9c35335ea8a46da1c1905a30d02d4b1cbec0f0ebb080ce2683faf8f29422295c
+EBUILD idn-ruby-0.1.0.ebuild 832 BLAKE2B 048404c7c90350cbcfc24cc80c8583e964f74f1cebd42c8ad98cc8fe495c2bc73f9ed79fad85061fb2a9b634d383e45c18484d0e99dc603292a9e9b303f3eedd SHA512 7ee093995ba18ebbc634a22381e54ccdb7c2996e7dc8b45c49da3bfd7554f7737f53af38ba3c83cdf8ca45d3b052469d8c53425181d9d1ef59574c4bcff530b2
+MISC metadata.xml 344 BLAKE2B 973cbcfc63c742c7c08a694d38f01391b68d279b6dd9d506f954829eed7f31ca86f359cec5a8745822476abb063046c38e11e273fae78f75984e4f0fe00ae23e SHA512 2aa5eefcd6531d9772d88d59a942919dba7b683cd7f8deb6d6500756050126f31b500697f7b2cd698eb6ffd3b289cdc653ecf081e8141308540e7c4c66e42e72
diff --git a/dev-ruby/idn-ruby/idn-ruby-0.1.0.ebuild b/dev-ruby/idn-ruby/idn-ruby-0.1.0.ebuild
new file mode 100644
index 000000000000..994b0ebe8a97
--- /dev/null
+++ b/dev-ruby/idn-ruby/idn-ruby-0.1.0.ebuild
@@ -0,0 +1,43 @@
+# 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="CHANGES README"
+
+inherit ruby-fakegem
+
+DESCRIPTION="LibIDN Ruby Bindings"
+HOMEPAGE="https://github.com/deepfryed/idn-ruby"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND+=" net-dns/libidn:0"
+DEPEND+=" net-dns/libidn:0"
+
+all_ruby_prepare() {
+	# Avoid UTF-8 tests since we cannot guarantee a UTF-8 environment
+	rm -f test/tc_Stringprep.rb || die
+}
+
+each_ruby_prepare() {
+	mkdir lib || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext
+	cp ext/idn.so lib/ || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/idn-ruby/metadata.xml b/dev-ruby/idn-ruby/metadata.xml
new file mode 100644
index 000000000000..ced94d917291
--- /dev/null
+++ b/dev-ruby/idn-ruby/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+  <upstream>
+    <remote-id type="github">deepfryed/idn-ruby</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/logue/Manifest b/dev-ruby/logue/Manifest
index 313b7ad0b8d6..13cd214f2876 100644
--- a/dev-ruby/logue/Manifest
+++ b/dev-ruby/logue/Manifest
@@ -1,8 +1,6 @@
 DIST logue-git-1.0.11.tgz 11535 BLAKE2B 6515efab4cb42fa7a787bded637ea6d21ff9d4f99acbc6f14334a0aa6b49c6b93b48f57c78e38b52761cd9e59e722b94b4992a0c585bad601a70b425d0abb165 SHA512 8a5793967eeed4df21439f55bb1bc33037d7c18e8b5f543bef7d6bb9e54e6c5acfb6302f754c7454ef0d8ddf5717563e136b45ee3c5e0c08d92fad15028220b9
 DIST logue-git-1.0.13.tgz 14389 BLAKE2B a6886989e561124904e6e6016c84b53abd1ea5be2f92958dffdc9b5ce9741728b9760034a9a7517ff35dfe0ebf10d6a6937aee426b85de3e71690098e9eec0ad SHA512 677ef2a8fecc50cb923dcf85ab0bdd984ea5806c31e11df9438af92912b94a4ce227837fac4baee05595f894f6a0fd4167f2984357628eb3e8036479103340c4
-DIST logue-git-1.0.4.tgz 17797 BLAKE2B be99a6c9ecc8bbde25d9a485d83b1d485e7afbe3e5fb8954dd6140881bff496c48185e15ad4596bcf7abba3a19e556da9ac6d44623be33887e32590cb35abd0f SHA512 e3d6ec6a8b302fbdf7a2b7842b31f88af4f0576166b632dd356a40902dc816bbfdaf18a170d5c8066fbfa97643d38d6c8137d4f435f478f04badae4a0120184b
 EBUILD logue-1.0.11.ebuild 641 BLAKE2B 268a65af2a5250319bdbdf3c72f28a8a213e16a5a020aa3dc656e5420141788fab4226ac99a10871216c80242b1b7d27854ecede4bdc9f3dc5501e06704e5083 SHA512 49763d1cede8d908ef5b86a47e07e200bda2d7be3e62d276a793643e3da26b863a101b5f1ca7046af8c74d460ee6cf673c90c70358936e20afb05ea98b739ab8
-EBUILD logue-1.0.13-r1.ebuild 787 BLAKE2B d346a92af9f80c0b618de0f828e3312ec9d9576a690679b317c1dc51708d79af78c824ff37eb61918701953a4cde2a46f7c7355ee03b72969c5f093c679e3d21 SHA512 b9fa5ac4b3a438bedec57acc84403999a33f5d4c1d3550f6eea47934ed5856d84fe04c434e0e4d1abb294755e7c7bc2c2e46f2d7aecf97f6388e203d7849ae05
+EBUILD logue-1.0.13-r1.ebuild 785 BLAKE2B 293a2d4b2c394437d4c7bd40066b650b2bf17d191d7abf2284af33be4173c2c53afac58c8fd950b4217b0dd4bd5ca0fd17f9ea85c9b801ac323b7d4870fe58f8 SHA512 90cd6bf999c3a2d0dd730a937f8b6ba5d0a7a7a8c3cf6af3389d91a5d8e533623777e92cb39fa14bc2fa9992f47fd1372c6dbd87f337905fcfc75b235571744d
 EBUILD logue-1.0.13.ebuild 744 BLAKE2B e7df279983c71b4d2b61f58cf33bd488263545eccd10ec4e715816b684366db24c5530901db6ba52d3d950adb4d4627f619cc331f49b29be19ca830dfb9946ae SHA512 721482f9aa82592cb7624e38f459e455cca7f075d02ff5c29eb5ef62838cc9e28f4dd46713db40546b78e59d946628427c26a2dd034fd9c0cfd0264275375dfc
-EBUILD logue-1.0.4.ebuild 601 BLAKE2B ce2b1f04851d4e26bff1a1bcc2385786c7ed3cf6bf3afad51bd4b6f7a451f322a7c89e37de17fd404ae14eaee066b99d959185dea984831c6483b663b1c4ffd5 SHA512 f3800e592f379b269bb25a2c6ab8ecf64fdbeedc91e7712989a2021181c3081231445c906f3303f0add37cc230e97227f44c8349e6afefa0d3ebf171e03d9770
 MISC metadata.xml 337 BLAKE2B 045c92dadbdfb3a0c0506734134b5c62b6fc842e12cfbae746a6d9cf07dc65dd5d240575639ef8563baf4d201a43d1b3aed0f3ebf54f88a85e7cf8305926d29d SHA512 2d11804bc1d4e53888e62609677d7bc0c20882ed3cc779dfdf5733adf9cc94ba671af7e901724fe30159ebea1cdcb1039e5c83ead45ebff75b9ce64018bbc1f6
diff --git a/dev-ruby/logue/logue-1.0.13-r1.ebuild b/dev-ruby/logue/logue-1.0.13-r1.ebuild
index 5750a90c7811..a652a558f859 100644
--- a/dev-ruby/logue/logue-1.0.13-r1.ebuild
+++ b/dev-ruby/logue/logue-1.0.13-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jpace/logue/archive/v${PV}.tar.gz -> ${PN}-git-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/rainbow:3"
diff --git a/dev-ruby/logue/logue-1.0.4.ebuild b/dev-ruby/logue/logue-1.0.4.ebuild
deleted file mode 100644
index aaf9ad555dfd..000000000000
--- a/dev-ruby/logue/logue-1.0.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="Features.txt History.txt README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A module that adds logging/trace functionality"
-HOMEPAGE="https://github.com/jpace/logue"
-
-SRC_URI="https://github.com/jpace/logue/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rainbow-2.0.0"
diff --git a/dev-ruby/mecab-ruby/Manifest b/dev-ruby/mecab-ruby/Manifest
index ffc5043f01d7..d737e530f1e8 100644
--- a/dev-ruby/mecab-ruby/Manifest
+++ b/dev-ruby/mecab-ruby/Manifest
@@ -1,3 +1,3 @@
 DIST mecab-ruby-0.996.tar.gz 48723 BLAKE2B 205cb2764327ed9e377bc94d65711555683bfce55e87b7a2cc4a985df5078b598c932fff23aaca889040295b96ebf59b0acbcfb638e42f71c6ed338a2b9a6e37 SHA512 a6beb9992d441118e4d824a7c8378bc1bd86d232a843e2327ab43cac0e0b1bf65c17f27ca8787f336c21796c77f4e8c350813e1ee84f7938654d1dcba876b4db
-EBUILD mecab-ruby-0.996-r1.ebuild 668 BLAKE2B 4504d4fede24d1881f00586f863ec2b89148c48d0a40c2579fcbf9faf9ce660e00d3450ae98ddfb1843d93e393b3525550a2fc0f07b836047f98a5e540a9ed7c SHA512 6a94cff7fff6b7fecde8fd64757c2d302724bda98f4d382a79ae25853040077b84dd028a8d3dc5c66d5a7de28b1744a68d96040cf6f71007818ca6eb05044baa
-MISC metadata.xml 359 BLAKE2B de31f469c45b9e95fd1cb0ae1d255977d78a8c96ca3bdea624eac82653e390f89972f2e680ea27a46d49909e185da8f70b51f7471974c7ad3f2947a425481da7 SHA512 26564a01d9ab28904670979d1961ab53dff53842e73ddb00f7d28f40c63ee0550daa6d48e44ea7e8a9ba04fe6852f61fae99612f111c0aef96d7422b21818c87
+EBUILD mecab-ruby-0.996-r1.ebuild 747 BLAKE2B 85e34e886fa0de96ac88e1ec9b252c38f9cf598527e10296d1bf3acb68a2d8a59198cb8bd4f7f98144e83c3d06e815d7f5efc3d58f3582320affc5501bb667ad SHA512 94c91808188f00f5f6e0aa69384e202d08d958eb707ae8116fce544e933cdd8145e7ea0fe5b7684399430273ed400e7c0958a96dbbc3bf2563f93dc10dc3dbab
+MISC metadata.xml 412 BLAKE2B ca6440887d39a7ded3f9d000ec965344164f69dfdf0e98bd070cdc531804d7c94d74fe9a6a3ead7876fd9bf39eacbe5649b3e5357b1083f30d78ac51fd0a7afa SHA512 78feb6a8557ee197f02071540a3c6836cebec69cffc3d32a22f8563008614da66a6b26fafa0dae24b0c21cb7492e203c096f67c5482d1ffe617098b0db0670e0
diff --git a/dev-ruby/mecab-ruby/mecab-ruby-0.996-r1.ebuild b/dev-ruby/mecab-ruby/mecab-ruby-0.996-r1.ebuild
index dcaa73a9d32d..14e17b2d3b0b 100644
--- a/dev-ruby/mecab-ruby/mecab-ruby-0.996-r1.ebuild
+++ b/dev-ruby/mecab-ruby/mecab-ruby-0.996-r1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 inherit ruby-ng
 
 DESCRIPTION="Ruby binding for MeCab"
-HOMEPAGE="http://mecab.sourceforge.net/"
-SRC_URI="https://mecab.googlecode.com/files/${P}.tar.gz"
+HOMEPAGE="http://taku910.github.io/mecab/"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN%-*}/${P}.tar.gz"
 
 LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
 SLOT="0"
@@ -19,6 +19,9 @@ IUSE=""
 DEPEND="~app-text/mecab-${PV}"
 RDEPEND="${DEPEND}"
 
+DOCS=( AUTHORS README test.rb )
+HTML_DOCS=( bindings.html )
+
 each_ruby_configure() {
 	${RUBY} extconf.rb || die
 }
@@ -32,6 +35,5 @@ each_ruby_install() {
 }
 
 all_ruby_install() {
-	dodoc AUTHORS README test.rb
-	dohtml bindings.html
+	einstalldocs
 }
diff --git a/dev-ruby/mecab-ruby/metadata.xml b/dev-ruby/mecab-ruby/metadata.xml
index 367494a8fef2..82adca0f7b81 100644
--- a/dev-ruby/mecab-ruby/metadata.xml
+++ b/dev-ruby/mecab-ruby/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Cjk</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">taku910/mecab</remote-id>
 		<remote-id type="google-code">mecab</remote-id>
 		<remote-id type="sourceforge">mecab</remote-id>
 	</upstream>
diff --git a/dev-ruby/mustermann/Manifest b/dev-ruby/mustermann/Manifest
index e7585ffb322b..f44786fc9c7e 100644
--- a/dev-ruby/mustermann/Manifest
+++ b/dev-ruby/mustermann/Manifest
@@ -1,5 +1,3 @@
-DIST mustermann-1.0.1.gem 51712 BLAKE2B d81e67ca6eeee89004aba2c8c152671f37b4f77c8c3ee8d88cb7a028c9145b922a298e6a40998ec1e9e3cbcfbb282c9324147a49fd5694a72e3fabf67aaf9e2a SHA512 6fbe0a0a2af41a4276283029ef3883e031080c7e1394e9a1e496c9de0dfbdd9dea3c753fc9fd64718f3d1d04ed61ea865165bab96e53c1b8b1258d91c5231562
 DIST mustermann-1.0.2.gem 51712 BLAKE2B dedfd8c4f5a2819ffbf3a7f5462e656d7e50e28e773abbd391bf01c984eb0a25274ee1c5080da0ec5c2f9ac88294be4975ab4310502dd83ac74010443ac582a6 SHA512 89f27ebdcb6df3eac82159b77d6fb6b87fe3c0409e14975abbbca01675eb84c6b49c52ccf75ffa779ff0b476b904834eb349ecb416324e6c61a360d583aa16dc
-EBUILD mustermann-1.0.1.ebuild 508 BLAKE2B bafc5723c6b4b0b3d4895d2716b5cf78c6920ce65bcff5c8430d03cb4c265bd8b515e2b1ea48633b2ecccf414f53ed3e2af8eba4a67f74edb4cbd92bc3bc9a68 SHA512 e5c6482ed59ea261e8f6dd268067926351736c14a066ca5fe8bd587e55d365ae50a7172806e7f8c3f5e7f333a7b6166829add89663c1755221f5b77eed631e6a
 EBUILD mustermann-1.0.2.ebuild 515 BLAKE2B d6718cddb55bb96f5f03befea1cdb3f05cd6a2f8fa0b0bcc6ac0c944e75ab8cbbd5dd07b24227274976991cee5fc228fd0a1a8a3baefe91fece5e74334d9184d SHA512 2a9a0835b83dceb6a9fa6373da7d4cf17731fdee029907634909b63d418eef9256aa1015dd72f9bd9bd7eeba24c8ad26b7a4fe034355c799b578574cf9d3d44f
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/mustermann/mustermann-1.0.1.ebuild b/dev-ruby/mustermann/mustermann-1.0.1.ebuild
deleted file mode 100644
index 5dc350ef6924..000000000000
--- a/dev-ruby/mustermann/mustermann-1.0.1.ebuild
+++ /dev/null
@@ -1,22 +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"
-
-# There are specs but they depend heavily on unpackaged code.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library implementing patterns that behave like regular expressions"
-HOMEPAGE="https://github.com/sinatra/mustermann"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index 421d06705ede..0aa770d0ef36 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,9 +1,7 @@
 DIST ox-2.8.2.tar.gz 193670 BLAKE2B 70e38754594a40ed35aa43aad32806d5c9eec7d3f60ee18a846a99f28b558173ea99b554f7f3a4f2b848686536d194035fd345ab33b9d7b5e12a246a472463d4 SHA512 18a887db70962a1dd1c6ea18461eca0efbcffdb231f934c3603e63537e9911e820465ce5e4ab86cbedd65b396a9a12b0ad7e60ea7ae687c4ebe8436e0c37988c
-DIST ox-2.9.0.tar.gz 197666 BLAKE2B 0bc211df2c3940c64df2b0e90991e828e7403c3a1f7eb885e9464659dd33930d881fdcb6443cf5b08b27f69388525c2da99d1bb686da66937f9b288ac21f7aaa SHA512 b681f3532f22e7111f693106728bcae19a7ed2eba058cfab62d73977281093cc64833460ff64fcfecc4f1bfc115c150d0712819345b0765c6dc4b4d0d67fd59c
-DIST ox-2.9.2.tar.gz 198295 BLAKE2B cc60a0382ebe3632296b9239b8e5101f3e5a08b434923982c54f453f4d95d37180dc938c6e577834721aada11d0d00bebc12776b04e28036ea067a3064e8eaa1 SHA512 4d77eea444fa6ce07e3b9d174745071fb1b7dd053e512255b9be73d6f528e590d614c86b4b61aa03163669bd5b637a60f7aef47f223e2dd719b2e5923712e95d
 DIST ox-2.9.3.tar.gz 198296 BLAKE2B 90f3e3b159caf8aede8233d49dc67a42bf9d5d7348769f50ad042fdb54e01f2672fb3f04d6062663e35cc1819389a16457905c80891846fca859334e0f6d0863 SHA512 fb342376c5d01029ee6ec18deb10561e7e4e123707bda7f1ab4c8782beee7493a7dd3f7745c179ec04d868c9787899715edd2f74b26ad4f769b14d1e6b54da1f
+DIST ox-2.9.4.tar.gz 198547 BLAKE2B 4a088fb9d8ff0aa89c6496f8d1228ca33445e34fd66476de288c4373401421b27fceced671d4754b23ddc4da0b49b1ddba1ce060c5468723a146e4d5d10b7a0f SHA512 babb1e4a88596553ddba79afeaa2bad0221e90e08cc0505c8297b61b6a1acb7c9e458ee71da420ee49378c4ac8d3b8545d1ab7e05710da556c452f3f7bb133f1
 EBUILD ox-2.8.2.ebuild 713 BLAKE2B d8d3bd205f3daf3e5169d9232b131f907cd9b948fab849dcc41ab2aaacf712b6a9aa10ca247345f847a8b2883562170d60f88ea39edaeffcb3f64c05a092e92b SHA512 4b85e25b89f8b8c024746a24b08d8ed6c626d62525b6e0a388078b0cb39caa4290d9517f379cbbca4df914f5e091b25e19f044806641bdc8ac110ccdb1e764e1
-EBUILD ox-2.9.0.ebuild 713 BLAKE2B 87c860a576d6203e9df168538a4f418ebb313795bf3565f70e2faee991730b3872b7a1e8c7917526511c1d78fdcb07733adbde8623217fb6ea96e80e9524fd4b SHA512 1a560e9c39b610c5d8fb9be08378f19babe4073baaaa0582454a6abdfbdc51921c45a8de4d7974805a4e6afe8e767db1f2464ded398d49504b53d2e9633c5a55
-EBUILD ox-2.9.2.ebuild 706 BLAKE2B ac8f3329a276431dff5156bed9aca0cc4ffaf56e82a6b4c20f09345082b71a428fe01142db9b509562673616fc546d7dddaa67a218c9d7b01763c27d3df79094 SHA512 48d3e77ca274280e240f78c910a57b6192ca15f48d32a1913796f1a84b3498d5bb6bbdcaddd2bef46a6aa3c87110d64675e0b6d6bccbb303d278e6727cdb6ad4
 EBUILD ox-2.9.3.ebuild 706 BLAKE2B ac8f3329a276431dff5156bed9aca0cc4ffaf56e82a6b4c20f09345082b71a428fe01142db9b509562673616fc546d7dddaa67a218c9d7b01763c27d3df79094 SHA512 48d3e77ca274280e240f78c910a57b6192ca15f48d32a1913796f1a84b3498d5bb6bbdcaddd2bef46a6aa3c87110d64675e0b6d6bccbb303d278e6727cdb6ad4
+EBUILD ox-2.9.4.ebuild 706 BLAKE2B ac8f3329a276431dff5156bed9aca0cc4ffaf56e82a6b4c20f09345082b71a428fe01142db9b509562673616fc546d7dddaa67a218c9d7b01763c27d3df79094 SHA512 48d3e77ca274280e240f78c910a57b6192ca15f48d32a1913796f1a84b3498d5bb6bbdcaddd2bef46a6aa3c87110d64675e0b6d6bccbb303d278e6727cdb6ad4
 MISC metadata.xml 336 BLAKE2B 7371e572c7bce86e0d3c2ac19ff7555b4bdf793d96377dcdbb810f8fc09feb597f4cc883a03e888c0c38c1a1d9ceb7ef150ac228db7300aea01238f497f0473d SHA512 43b8b42cb09fe73a49e0db49671effd91859d2b9001fc3e51761a1b51b245e83a719ddddd100ecfeb92910baa06690b2cc0bd52db0afc872e007c4be9616908e
diff --git a/dev-ruby/ox/ox-2.9.0.ebuild b/dev-ruby/ox/ox-2.9.0.ebuild
deleted file mode 100644
index e4715b4a4976..000000000000
--- a/dev-ruby/ox/ox-2.9.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast XML parser and Object marshaller"
-HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
-SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/ox extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/ox
-	cp ext/ox/ox$(get_modname) lib/ox/ || die
-}
-
-each_ruby_test() {
-	${RUBY} test/tests.rb || die
-}
diff --git a/dev-ruby/ox/ox-2.9.2.ebuild b/dev-ruby/ox/ox-2.9.4.ebuild
index f03cb3bed818..f03cb3bed818 100644
--- a/dev-ruby/ox/ox-2.9.2.ebuild
+++ b/dev-ruby/ox/ox-2.9.4.ebuild
diff --git a/dev-ruby/paramesan/Manifest b/dev-ruby/paramesan/Manifest
index df80c59280ae..93f199aba280 100644
--- a/dev-ruby/paramesan/Manifest
+++ b/dev-ruby/paramesan/Manifest
@@ -1,3 +1,3 @@
 DIST paramesan-0.1.1.tgz 4064 BLAKE2B f6c0e8b0df885e9dda4d5c2a3f0226703a94237707b877a7b82d5b8b0fdc812fcf289019a1ed550640a7f99a59a0b0389407857bc0e21987c7dd734734d32c0d SHA512 927595ed9686fb8833beaabf4421cb2c4908bf6e2e1c656034a79c839c292b503ca0ae211f8bdd3916501a281eb2f0b374fc5f4c90615629170e1ba767f0e7fc
-EBUILD paramesan-0.1.1.ebuild 686 BLAKE2B 22d8d8cd7e41f936d3c709814aa68193e68dd4aeb8accd9423437229c89cd87b0e20e3a69ae7f61a5597e496f8724662ddf6ed4153b9e06b4e09b13ef5ca4a9b SHA512 b9acd86697f59e71d934f9716a2c6af368d20c67092c4ac8a843a36612f270bc5bd9e0c23affe681c75760d2d8e94263df13cabc4ca487835848490a317a42b5
+EBUILD paramesan-0.1.1.ebuild 684 BLAKE2B 2b9d3a9bb70c735d112d381aa4bd7dbd8d7392831b65964361b5ed962120f06a515e70bdf912aa7fb9a5490901b42832a08818ffd46f859862adba7d4acbaa42 SHA512 7cac55746423e2af4baf15eaf7d8e8f907895a317e119e4311b30dd7da7313ca9e0ba06dfc7c9d988ecf8bce175f8a7e77f25175ea74cd57718e48dd14ee8dae
 MISC metadata.xml 336 BLAKE2B e2b9e1f7e89c66ec2a9e7a7269b48f0eb15c8ed0997e8287d1ae187d4be2e9a52e420de1a44cd13b92f9ec80748b5b6d9ea1237ccac0fdb4e28728f380f58aa4 SHA512 9ff8be1939525ea473bc5b870130a9bc0ac3bdd8c1ca8578ae476c71f6829f1698f646e5661c10a5fa55f6ed0608f7369acf8de24036ed98f5ae9e55c63eef44
diff --git a/dev-ruby/paramesan/paramesan-0.1.1.ebuild b/dev-ruby/paramesan/paramesan-0.1.1.ebuild
index 206ae48e49bc..44a1bac87404 100644
--- a/dev-ruby/paramesan/paramesan-0.1.1.ebuild
+++ b/dev-ruby/paramesan/paramesan-0.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/jpace/paramesan/archive/v${PV}.tar.gz -> ${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index a1c07dd7519d..3eec2c3ca496 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,3 +1,5 @@
 DIST puppetdb-termini_5.2.2-1xenial_all.deb 20540 BLAKE2B 2aa48a9de8e512d81fd2e38fff4664bf3ccc69d4fdc6558edf1838171dbc01f3e87186a84a3308c33955336ba3b7d0d70dee640da0cf145ed1624d2341f7614b SHA512 7ac62306b16af0ebd9423a66ac911d35ac11403f45b03d2efe0a4d7c2aec3572670abd0c8930bd3b141c8d4a3aaf1c0b849535e74361b0b1f273b93a6bd855e8
+DIST puppetdb-termini_5.2.4-1xenial_all.deb 20538 BLAKE2B aad000bc0e13e3c97f4428bca88653cbfd76db2e5499f2acad90afcff58847e1dbaec9bc9ae8ec30e21c9b5c8308061b7d51058f0a17e2936d6dfd05ccc650f4 SHA512 98e871a4867735a8ca677ee3fbb6ab5e8718e78623fe6d497a3c680e090b86a0cefc35ee318f6f5abb45ebfd02d9bf75a04f0f1fc48ba654443c5c4ca99f3180
 EBUILD puppetdb-termini-5.2.2.ebuild 658 BLAKE2B 94ce86150e8228a994207160c454fa5d2adec923000e3056c8c94af52be9e970ae143e1c5f885adbd0aa2a17fbdb5f59eab9465c9beec94d98949a6eb652284d SHA512 44ad07412a536aaeea6bbc9e73c9beecb68df91e12f5b5818c3a2fcc7f472bca9e08853b2b1f7f6412e91a0c65bcd4da11a81da73471f75c7eb79ca3df8e9757
+EBUILD puppetdb-termini-5.2.4.ebuild 660 BLAKE2B c73b33d7739eb07ee79a51fb7cb21c83fbe884ed91a914b8ff2290a543e839f9c310579e3bac9f8114bd3445b1f0e310189114948124d17c9f397234f08ade6a SHA512 69f5d75586eab1fb449863e50151213db8b21dccd931a07cd6c2a2465a2315becd341e064e7a7f5dc709708f434aebb4c0662d4a791499ba91ff39c616a7a5a2
 MISC metadata.xml 459 BLAKE2B 90810b08bfad84e8e841bb1bbe1a2340f5f4a5b214642cef60a882dc8acf4f502d8e971dc04ab6a614e0437c8321c98c6a7566f0151475adaf8c0daa275c485f SHA512 122359cc00e8fa171933fb808692db59e25a4350a4efb72ca78dc5451e8b96f17fae32a8cd6e532f4c2fbaffc8b7d7bbb1ce141ce1e48d93c928cfb3ba3cfeb5
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-5.2.4.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-5.2.4.ebuild
new file mode 100644
index 000000000000..ecc47a98cfa9
--- /dev/null
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-5.2.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit unpacker
+
+DESCRIPTION="Library needed to connect puppet to puppetdb"
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="http://apt.puppetlabs.com/pool/xenial/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1xenial_all.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND+=""
+DEPEND+=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
+	doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
+}
diff --git a/dev-ruby/rack-protection/Manifest b/dev-ruby/rack-protection/Manifest
index 2c7e76eef598..06e934453ffd 100644
--- a/dev-ruby/rack-protection/Manifest
+++ b/dev-ruby/rack-protection/Manifest
@@ -1,11 +1,7 @@
-DIST rack-protection-1.5.3.gem 18432 BLAKE2B 96daf85f6b51b4a8c8992109ccb0821b9f713166965a6d1392f20a966e3502facc4294c0a824beaa395306e0ba3234902eef717ed839e3e3ca907deedf83370d SHA512 9f94f9f25197c3f8227f5c9c9fd2e896e35bfc08d4a20f4dded9c42772f348d16dceda6916429833b498b29c4dbba4dbb31b1a3cf90de597fb6df2de145d655a
-DIST rack-protection-2.0.0.gem 15872 BLAKE2B 706fba47a09565bc973a5dbae3369cb26d02839be92347bb153c5f12054ef605e8e025a0666cb0aa44aae316ba494fffdbb7bbc840dfefff9b3e0b0efd39817a SHA512 cce6a8a64c502e4cfec47ae3d76e71aef42b1eec5aa4802a6c443fcb7a8971a99ad9a5b34fea7ae878630faba10d4f5bde4d9a3eb66f63600fcaf02d9ecc0c2e
-DIST rack-protection-2.0.1.gem 15872 BLAKE2B bd2b17d21767f4f6772400168ddd53491693780b62359d526739580cca66b5b27d4f4c6f419a6ef695ffbef5ff9045bac683c78117765ff784fda136ec102090 SHA512 6dd525384a0027a1943741881168433c63dc2d18093833dffb3417f3f6ccc46d597435a880d297d07751db1c449f3e37942ae03e33d378dbc74caec38c5cf1df
+DIST rack-protection-1.5.5.gem 18432 BLAKE2B abda1313e7e0d04299a689c55241cd92d0f5ed2048395ab79f09ba271100a8dc99fbf5f924e3b3cbe28f318090144539eb0174cc1813d371d9f37df31ab04315 SHA512 c4066a50771247fc89d4ddee44ff87e40a24bad95e914ed2f72cbf9c45152e67e51d2ccc7d1725ade637296a080b06f304157a1a024613a97595b144e03e2e70
 DIST rack-protection-2.0.2.gem 16896 BLAKE2B b3ed6a399f93c359a305cef0893bb5056ac26e8d5f345761f497b5eb77aecc201cd388bc0fc021ed039f230bc2ca2348f7eec19aaaac3f2662500bd4c6496a93 SHA512 e74be8b079a1c436d80df2e6bf58dcaea089aceb58b8ec6c08d6ac78b5390bdb1b494d9155350dc7e2639e858209aac10757be54085a565b910e5e74ee882235
 DIST rack-protection-2.0.3.gem 16896 BLAKE2B e33cfc8290cf108f986bd625623411f63812aa79bc5354041e3d541a244bdc6f2ba30ebfab77cb2fe15c8a53e21e11adc6a54ab90a687147759d1b14b5e0be73 SHA512 396d1b45783e0b6782b479b6ba77c2eb23c2a6a2b695a631b7a4b9ace661471325d4d321a40ba7c8090964e68b5dd8f9c92c4843464e6d6ff178aecf9996f338
-EBUILD rack-protection-1.5.3-r1.ebuild 726 BLAKE2B f4edf631b7100e462ea90d33aaca1d20ad043adf01458032039d16b365806a0c91974c05f66780c24ab4d1246dbf779de9dbb760922bc1f40767324e632b10b8 SHA512 18b63b6719fc0c27cda9e5ce050e5932afbe30c0118aedd6a64d5d7338427b4faab755cc0e50b96588bf13db16abd752585e424fc682139ec6d007145ff8205e
-EBUILD rack-protection-2.0.0.ebuild 796 BLAKE2B 7103c44fe355976ed905a9f77e1d46882cfd67c51ce429265f7606d9422514df8eb18382ff5e42b8eb5aff0fcef21509f8248a0342ab2589ccff557a41490fff SHA512 5ee15793429e98cf67966e1a41d06e6c51cedaee4f24b2e0747a48f467122c2e17535ec83726b6b91a493adf6b79c887608112ea6fefcf8fc0b15bd1501dd1dc
-EBUILD rack-protection-2.0.1.ebuild 789 BLAKE2B 9ef3981b82f570cc2ee569661d05428ab10279afe7f4d6dce8003835002528308361194294adc22534d1caa12aa1c7919563a274e88f556cb3cc6e2a31253f36 SHA512 62650d79ddde05798cd042bf826dbc1522030b5dde936476dc78656d649ac7232cf5dc7aeaaa08232f8428a0f145d1ae6b2735c2d9e7282bfba69a4ec3f2d1f1
-EBUILD rack-protection-2.0.2.ebuild 760 BLAKE2B fcc65b5c9913f321ef21eca240412a818c5d480b5361ef91c501a0ecb05f92b59deafadbf02721014efabe67cd326bb5e9ecc5b3b3d41bb49fb709d71dc38e06 SHA512 1423babf10def58ef75091b09567ce7f4e6287b3eab4340f7f922832576e2d0c7db45eb1a0fdfb15a22c68d79557e54af5b4359d67aeb579f99cee68c5fc1cc3
-EBUILD rack-protection-2.0.3.ebuild 760 BLAKE2B fcc65b5c9913f321ef21eca240412a818c5d480b5361ef91c501a0ecb05f92b59deafadbf02721014efabe67cd326bb5e9ecc5b3b3d41bb49fb709d71dc38e06 SHA512 1423babf10def58ef75091b09567ce7f4e6287b3eab4340f7f922832576e2d0c7db45eb1a0fdfb15a22c68d79557e54af5b4359d67aeb579f99cee68c5fc1cc3
+EBUILD rack-protection-1.5.5.ebuild 690 BLAKE2B 00837887ebd9fd360b9be647ecb2850dcf9d39f9843eb0f20290d075db288fddfc7070c24a324f8bed9c74b98daf153ced7a1c6dae45bdeafd4a46dd4de2d77f SHA512 dafb498a3d11002ce365d26ffec3b2dade3c4e3ab26536035fe2954d32a926128b23ca3a16116ca84821c89e218144cab416f85679401ac28502ab486997e650
+EBUILD rack-protection-2.0.2.ebuild 767 BLAKE2B 9482e5025dbec9e86e2ee96c849fc51cfe5c498beef71275ac4c9bb59b53be29b318ffc787becb285cf262b667bd1f49c5b666138e02a1ac0fad1f4d34174e24 SHA512 a68ee524fdf9f060449cef4184b62b9439a56829eae1704a44f6754c6f15efee860fc9f60287f3a7d00a3d60b364aab0d14efd5580f57031d98ac5430abffcde
+EBUILD rack-protection-2.0.3.ebuild 767 BLAKE2B 9482e5025dbec9e86e2ee96c849fc51cfe5c498beef71275ac4c9bb59b53be29b318ffc787becb285cf262b667bd1f49c5b666138e02a1ac0fad1f4d34174e24 SHA512 a68ee524fdf9f060449cef4184b62b9439a56829eae1704a44f6754c6f15efee860fc9f60287f3a7d00a3d60b364aab0d14efd5580f57031d98ac5430abffcde
 MISC metadata.xml 488 BLAKE2B 1db94e175d1248a334fa9ff0b5936d0281a1ee2ef69974cc33ba65e19de9ae043e98599a52f5cc55d3e1ca3e5bef3e223cab7f3be0ad9b561b05d81da8c09687 SHA512 ad0122f6e0dde2c02a1af8b8e81a5aebb1a13e0f56dd8f222d6f051da55015a89db0430efa6c1e6b5e193a94ba69d0244498d7cc14f0212f8032393a7f5988b8
diff --git a/dev-ruby/rack-protection/rack-protection-1.5.3-r1.ebuild b/dev-ruby/rack-protection/rack-protection-1.5.5.ebuild
index 10a511702bf5..947c453c7e41 100644
--- a/dev-ruby/rack-protection/rack-protection-1.5.3-r1.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-1.5.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_TASK_DOC=""
@@ -10,13 +10,13 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 
 RUBY_FAKEGEM_GEMSPEC="rack-protection.gemspec"
 
-inherit ruby-fakegem eutils versionator
+inherit ruby-fakegem eapi7-ver
 
 DESCRIPTION="This gem protects against typical web attacks"
 HOMEPAGE="https://github.com/rkh/rack-protection"
 
 LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
+SLOT="$(ver_cut 1)"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
diff --git a/dev-ruby/rack-protection/rack-protection-2.0.0.ebuild b/dev-ruby/rack-protection/rack-protection-2.0.0.ebuild
deleted file mode 100644
index 275dc5649590..000000000000
--- a/dev-ruby/rack-protection/rack-protection-2.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-# There are no specs in the gem and the source cannot be downloaded separately.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem eutils versionator
-
-DESCRIPTION="This gem protects against typical web attacks"
-HOMEPAGE="https://github.com/rkh/rack-protection"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rack:*"
-
-# ruby_add_bdepend "test? ( dev-ruby/rack-test )"
diff --git a/dev-ruby/rack-protection/rack-protection-2.0.1.ebuild b/dev-ruby/rack-protection/rack-protection-2.0.1.ebuild
deleted file mode 100644
index 77b5b0414129..000000000000
--- a/dev-ruby/rack-protection/rack-protection-2.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-# There are no specs in the gem and the source cannot be downloaded separately.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem eutils versionator
-
-DESCRIPTION="This gem protects against typical web attacks"
-HOMEPAGE="https://github.com/rkh/rack-protection"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rack:*"
-
-# ruby_add_bdepend "test? ( dev-ruby/rack-test )"
diff --git a/dev-ruby/rack-protection/rack-protection-2.0.2.ebuild b/dev-ruby/rack-protection/rack-protection-2.0.2.ebuild
index a874a0ed9292..688357c23602 100644
--- a/dev-ruby/rack-protection/rack-protection-2.0.2.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-2.0.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/rkh/rack-protection"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/rack:*"
diff --git a/dev-ruby/rack-protection/rack-protection-2.0.3.ebuild b/dev-ruby/rack-protection/rack-protection-2.0.3.ebuild
index a874a0ed9292..688357c23602 100644
--- a/dev-ruby/rack-protection/rack-protection-2.0.3.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-2.0.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/rkh/rack-protection"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/rack:*"
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 4e974723d458..cdfb61c9c9a8 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,12 +1,10 @@
 DIST rails-4.2.10.gem 1476096 BLAKE2B 6da658d4bf1b64574a3d7652aaa938e45e01db11f68f5fdf76ca70d84dae927828ea52262ee0777deff2408f4325d87a6d86f545c714a1180f1efef0099fa749 SHA512 04fd6e27974d4f0432be8a881abf0f00c8db448748118105c26a0dd0303e3914e469b7fc302a73ca4956d00a84e3d8fc16a179aad2f1f3ebdd11cae3a6c90717
-DIST rails-5.0.6.gem 6144 BLAKE2B e9af96cd669b44fd3aa0b8ba744b522be93579ebb3532e71494cf9d973ea08eae8d0d9dfe9eb2ffbea73e0b5443f786784b16fb8510f9568bce4ad1182c4927b SHA512 7c30767c92e52e0ada10b779204ac814e7425bf3d6b417c1976f33f4815caac8cd634ed9e24cc2c0bbea51ddabde1ff708c4f1391ed2763107be3ebb26f2e293
 DIST rails-5.0.7.gem 6144 BLAKE2B 7fa6cd84e6ce8714ea051991403c098291cf6fb946e09cdb520cdf0fd38541b9e0720e28cf4d19ff5191ed7199d3ce68da6c1ca0640b5776ed7b8f0132e53a38 SHA512 3480d8e5aee024a22819fb40610d78a41c56b89195f432d35c086f519d7530655a2a77ea09a40eeba19764adf2a06401749e7f763f945ee87321d95dd94df67f
 DIST rails-5.1.4.gem 6656 BLAKE2B 1a6d15a13eca0fdc3b78d359b0d1edc29c29ac4186f15f823af3410f1fd6e25c7fb42e707437c3344b9933e63e8a8061e3282e14083f11b7161b8e0af9f6c292 SHA512 a75927619afce0b4b29b99697040bf5039a856bceac033b63dd910b9ad99adb5f5078eab9be22468104be134ed72a861ec349cc5c59748c1fefd558a1e11d94a
 DIST rails-5.1.5.gem 6656 BLAKE2B a6d86d40c215ba343f4bfeb5bb11db15a3f3b0d5828df3a8179f678b8df313a49952bed21842bdfe71965d80da88ce08fb665a3a843ff5ab4115e49ca71f5a8e SHA512 33aa51d13261b2cc040a603f3a94a2a56d02e7e9f2591d46b43c72a00923b7869ec61ae288cb19a6d90789ff322c4a536f715ddf6d79eddf6ae8bc72f1b3332f
 DIST rails-5.1.6.gem 6656 BLAKE2B 9e5af755854f7096446f5f02cc93ea0f32d9699440cc925c397fa8a62337d01b3d8e04f74d40d1a409e789b55e3046e3ed565d87f5cfe8f8d8225335c7ed0734 SHA512 df201bdbdb720c4ec3045cab908d5e97c53e3a31e29d84224e7bf918f6f2cd108a47792ac39e091b9a0cdd9749f15adc8c5c703659610f5da11d9bd9a63c13b9
 DIST rails-5.2.0.gem 6656 BLAKE2B f436d571ba9bb3866ad0568d3514b46fecdc26019b2237b111089df9473ec9706e52aaa00a1d8787523847cd5bd2e6fc3f470257f347fb5f37ce293d570859e8 SHA512 323b82b0b6a8451d37097925299624814f54a1f7896563bb23d34df37a1d41bf1ee50164211569fd9859ed55a6323af13310f9ad267d130fd3341acd71275558
 EBUILD rails-4.2.10.ebuild 1117 BLAKE2B 4e31a087075b1e4ce236a372a4dda915467c1aa020a0de9d56ed01eae3a7011838f476da849faff693be03c13036a42802881d145e8cab62af87e0cf51d8ac6f SHA512 a7fcdd075d0cf39399307c017bbc4c04529ac30a2229c725e762a692a911e533574338444a885835aabc0c07dc69ff82f79f38c0a428475ccfa5965b26332967
-EBUILD rails-5.0.6.ebuild 1071 BLAKE2B b70df468058ba620fd44049ee714350e04450a15688ae8e5171bb5222b2e90346ba6b54cdf4cf89348844d923bc79e4158d9a0b40e3d1feb2bf965ece8a3d79c SHA512 cbdb54c6799b1b25dc3d927c332a6137f7106c5f982442cc407e119d96bc63d892cc884c0ac139ccee904c0d45ee92db0898f95a2d612a54a1005f295b2e55ae
 EBUILD rails-5.0.7.ebuild 1071 BLAKE2B b70df468058ba620fd44049ee714350e04450a15688ae8e5171bb5222b2e90346ba6b54cdf4cf89348844d923bc79e4158d9a0b40e3d1feb2bf965ece8a3d79c SHA512 cbdb54c6799b1b25dc3d927c332a6137f7106c5f982442cc407e119d96bc63d892cc884c0ac139ccee904c0d45ee92db0898f95a2d612a54a1005f295b2e55ae
 EBUILD rails-5.1.4.ebuild 1071 BLAKE2B d135e4b6112ae71d2e9517d383751896b5571f747f2fef2c0c331a6ebdcdcea4bc6b0ac72cd0b4686acbb98e3933775775d6de64f012f7eb71f634b877c387ea SHA512 ee99ff8624133f1a83998e3af0e0473d790a8ad3a453eaed448e74741a4262f01e7ed6ee536360781649d800201f3f345adbea36e8758420a0c3fe7e1d34938c
 EBUILD rails-5.1.5.ebuild 1078 BLAKE2B 92b2e355b162f771cee82a983df74cd8063e27a29af0b6b637dfdd12ff64dc40804e5afc50a06849cfe05c69cd4c00dda20c75474308ba68eb4fc76c1504f07a SHA512 bae7bba25b9174d0641a9e34ebe65e91e4203a6942556287d094ef95b4a0b68625b1f9c7b064e3270d7a969cdfb722c7726f3950df586f894f09d208e4d0fd7d
diff --git a/dev-ruby/rails/rails-5.0.6.ebuild b/dev-ruby/rails/rails-5.0.6.ebuild
deleted file mode 100644
index d9de98a24596..000000000000
--- a/dev-ruby/rails/rails-5.0.6.ebuild
+++ /dev/null
@@ -1,44 +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_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="http://www.rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
-
-IUSE="+asset-pipeline"
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3 =dev-ruby/bundler-1*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-	asset-pipeline? (
-		dev-ruby/jquery-rails:*
-		>=dev-ruby/sass-rails-5.0:5.0
-		>=dev-ruby/uglifier-1.3.0:*
-		>=dev-ruby/coffee-rails-4.1.0:*
-	)"
-
-# also: turbolinks, >=jbuilder-1.2:1
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index df591fcd3185..b36fa0756469 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,15 +1,13 @@
 DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
-DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
 DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 DIST rails-5.1.6.tgz 6142931 BLAKE2B 0c24677946c3421e73903214822a13cb26609a3c7e7826020b76a48809a8672c1dfb05d1bd362fab956a397636db5e691a91bdea64ee6073190e8663fb58a7df SHA512 1ad70fb57af753bb6aff27345021af97d177aed95e295273044d8ef5723aa6b64fc03104d2cbd1cc5337127f71b3eef9b19fa582f4d53cb746ed9b152a8392bb
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
 EBUILD railties-4.2.10.ebuild 1717 BLAKE2B 3ff657f26f860f75d7c34be0410e06cf68f3a1ee79f6c3317af9cd75ac2f68d2ee43ace1c9ced96f7c8cd6c4339317dca56ae0808fb39c5600bb9c5802244287 SHA512 aecb917e4204cc2d7dd8948bcbebfcb9f4f01022d5c691f0aa4878e74b3ee3a7ee0044f54e0878db398a6af873e793b4c648d3d7a269b9f144288bb52bbeaf1d
-EBUILD railties-5.0.6.ebuild 1847 BLAKE2B cde912bbfe97eb8897785c6e7d1767b3ee6132bf2160c292f1c7e1dc9b273a09f67f5e807bc0801a685094ac11eb915b6a024550a3dc33746b5848089585eca6 SHA512 920393642215f96bf98b0d2ba3a18a5d323dd1cb109e9780f39e8de43d287b793d160c519f9d9cbc23cf031ace33fe283632d57941d8a30921fc0201bae54d2f
 EBUILD railties-5.0.7.ebuild 1847 BLAKE2B cde912bbfe97eb8897785c6e7d1767b3ee6132bf2160c292f1c7e1dc9b273a09f67f5e807bc0801a685094ac11eb915b6a024550a3dc33746b5848089585eca6 SHA512 920393642215f96bf98b0d2ba3a18a5d323dd1cb109e9780f39e8de43d287b793d160c519f9d9cbc23cf031ace33fe283632d57941d8a30921fc0201bae54d2f
 EBUILD railties-5.1.4.ebuild 1670 BLAKE2B 7d953780b258c60f033f5bd5c6e6b453687aca3de51805a745f08c032d2386a6b06af4cac2d2169aff145cf64ed2ef35057b0e466684cf878f1ae2b20b90ec81 SHA512 add35da11cf530b55e60d7382b0129ef43c75794b586e0c9b42a7e19a34969ab233672727b4d3397bcb67f44c969a409833ce6408e71f4626ceb2ef91148080f
 EBUILD railties-5.1.5.ebuild 1671 BLAKE2B 89d54e60f7fc09216c7c31cb44221a5e126e75ace5c6e2eec2a094328355044c09e764c6ed395b3058e4473fec24b89c101b555ed3af0d28024850d6ff35acae SHA512 10b0a2da5a63d928e84653dd50561ea9a7421f2cd8f0ab2f192c5d423441954ab9c17cd5d11d39f41a195ff2f7751b156f3e21c3eed3ec93ee745e06d064326e
-EBUILD railties-5.1.6.ebuild 1671 BLAKE2B 89d54e60f7fc09216c7c31cb44221a5e126e75ace5c6e2eec2a094328355044c09e764c6ed395b3058e4473fec24b89c101b555ed3af0d28024850d6ff35acae SHA512 10b0a2da5a63d928e84653dd50561ea9a7421f2cd8f0ab2f192c5d423441954ab9c17cd5d11d39f41a195ff2f7751b156f3e21c3eed3ec93ee745e06d064326e
+EBUILD railties-5.1.6.ebuild 1670 BLAKE2B 7d953780b258c60f033f5bd5c6e6b453687aca3de51805a745f08c032d2386a6b06af4cac2d2169aff145cf64ed2ef35057b0e466684cf878f1ae2b20b90ec81 SHA512 add35da11cf530b55e60d7382b0129ef43c75794b586e0c9b42a7e19a34969ab233672727b4d3397bcb67f44c969a409833ce6408e71f4626ceb2ef91148080f
 EBUILD railties-5.2.0.ebuild 1671 BLAKE2B cd775122965ad69f2f595b01d2d97b129ffeec30a5b2e91d50b750e11f52136f2df82453e6b0fca737a5bb0f2177061b4f13a7458ac84219066568bd2cc811cf SHA512 9e843354fa41e19161b989a102e3e2b7f4f2d50c90536edaadaf9276cd8f69a021566d381ff527c17174e945ff9940be54b4d82524be16fe4e79a4825c54bb52
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/railties/railties-5.0.6.ebuild b/dev-ruby/railties/railties-5.0.6.ebuild
deleted file mode 100644
index 82547a65b623..000000000000
--- a/dev-ruby/railties/railties-5.0.6.ebuild
+++ /dev/null
@@ -1,78 +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_TASK_TEST="test:regular"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.22"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	>=dev-ruby/thor-0.18.1
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-
-	# Also allow rdoc 4.x
-	sed -i -e 's/~> 3.4/>= 3.4/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Also install rails in bin to let our binwrapper work
-	mkdir bin || die
-	cp -f exe/rails bin/ || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-5.1.6.ebuild b/dev-ruby/railties/railties-5.1.6.ebuild
index 45ce9539c7b0..e7b02135521b 100644
--- a/dev-ruby/railties/railties-5.1.6.ebuild
+++ b/dev-ruby/railties/railties-5.1.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/rainbow/Manifest b/dev-ruby/rainbow/Manifest
index dbf93a2ab38c..276fd9424815 100644
--- a/dev-ruby/rainbow/Manifest
+++ b/dev-ruby/rainbow/Manifest
@@ -3,5 +3,5 @@ DIST rainbow-git-2.2.2.tgz 14295 BLAKE2B e89cb8d72d8b90f71967ee714098a133244673f
 DIST rainbow-git-3.0.0.tgz 15105 BLAKE2B bc2c91b8ac726c080dbed45584adcdf4a4a496de070a92291042490009ae490efc4ab91cdd12d338f0cda156811358550507ad629e27dd54445a68427f8d4d2d SHA512 863b89152696b6a13606a1e92b68a788b9b5bcd6f521f02f26fb189fc6c9613e5db032dd5deed1aa95247ab0aa08a44981756f941af6eb786076c271881a38c1
 EBUILD rainbow-1.1.4-r1.ebuild 569 BLAKE2B 4d4d43552d21ecf981a73674fab86d0fcdfb3747d6adb8e07d86b0172c027a9685e3361ff0564838edd413a86e0fc5dccae3bc8f2bfb4f7fc5c34caab565a02e SHA512 682044fc0d352633c894da5f81ac5d9f01cf0919f61a82c81eb4e1590f1fee280643a7c941546ebe9444c35b286ebedc434033b1341e9adeefd1a4fb731561b6
 EBUILD rainbow-2.2.2.ebuild 583 BLAKE2B 81c03f55af70fa4536a9852c887a4c2aab609ed4d0a99d3406e7c9ab9ced393a26f1a2c3f0cbebf58954263ee7d307ca9f62d5e8179141108a3859b689f25115 SHA512 ffa85090092d2abaf74b128d713d72cb7d1ce69845b16833e25f548b0b8fcbb3c1ce2176df6af1edd514af85b3efa95bc45b0a595e42214a06cee08172aff94a
-EBUILD rainbow-3.0.0.ebuild 586 BLAKE2B 7c5fb03ee3e8a38f9cf43e35ac4743fa4dbb504d26726ce62851a7e933b2d5861de5249c06a4349d373bcfef901e670f0bba2dbcad7af4f3c559f47bc7bcdf31 SHA512 227f7978b6046021e7ef910ef6fe60af5f378976b3eee26984a6c77872642ee05cf47cd64e4cf94324d28821fe5362f5fb0efff93ef0f0160d755157724d59a5
+EBUILD rainbow-3.0.0.ebuild 584 BLAKE2B aef77e75adbfede0a0cc787fc32671125898f08ee7b6daff89d953726bc055279b4c177e757154cc4074618d7afccab15709c7c96613652ff05b756ae9e8b686 SHA512 25deb42d359523aa5a703517888d3b956be5c669e69e4b8e3fbb5b15b2e156991aaca2fc1e6bef37569b02b84afb7ca1d264139910fcbe0f4161af269ed8bee3
 MISC metadata.xml 341 BLAKE2B ac36a2d34fa9a3fc33e7e0e8f32652ef92c26924ceba4ca13529a0f4bef493a524eba45cea38cf81fdd28988566344545295b96c3e86089b262fbac519644d74 SHA512 b85bd3a7b023aaa019689a9e8caaa2c1d920d35ceb3b7af8ae249d9ce42c15d73d466d926561b160bc18ed9acd2ffec6fb169a625c46c37abb5de356eb4ab067
diff --git a/dev-ruby/rainbow/rainbow-3.0.0.ebuild b/dev-ruby/rainbow/rainbow-3.0.0.ebuild
index 7d9e8cb424b3..1965a591b369 100644
--- a/dev-ruby/rainbow/rainbow-3.0.0.ebuild
+++ b/dev-ruby/rainbow/rainbow-3.0.0.ebuild
@@ -18,5 +18,5 @@ SRC_URI="https://github.com/sickill/rainbow/archive/v${PV}.tar.gz -> ${PN}-git-$
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
 IUSE=""
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 187c02353941..649f4df103d8 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,11 +1,9 @@
 DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab63230ab07ea97928d6f66face8d07ab54d87f19535f5f235c441b2da6dec17ef2a889e9ccd7e83d987086e24afd1b82 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44
 DIST rspec-core-3.5.4-git.tgz 369170 BLAKE2B c95fa7740bcc1b586b4e26be1db4cb52bb470cb23c9ef74dc644d0ea7c4ca769ab62e587ecff2a16cd6f656e9f3bbdc81b199765f9397dddbe28a8cdce6a1945 SHA512 c672381e9233b6f8c6e92ed70d084ff7a558edd6ca7d5a09a28fff1554975b952b6fab94483324b5bd6a62ff7aac576e7a216dbb3972749ef0210fe1cd05411d
 DIST rspec-core-3.6.0-git.tgz 375590 BLAKE2B e8b4987ea3d5cc3a403eaec98243e4c4be6c9eace798bc97599020543401ecd036c6121a6736995fb716aabd1a2016393506bee1e3076c61b0c49173d991d990 SHA512 cecd3885652e18ba1ffed45e40d12c932ba0d880e96b2f1d264709f55dbda8d6b0c78c3bf4bb940d246b84261d1b80038618735f65302ff62646165b2e932be1
-DIST rspec-core-3.7.0-git.tgz 376565 BLAKE2B 86b0584883047c83e4fddfd09924a5b68828f53e2018d2513cd79484a390d1b7b89e8176b0098b8869d5ed7206c132d77a0d8ef2ffb5447da317460b152e5e23 SHA512 071bd2a5c905d4ce621f2d7255b882a9d34cf42001cb2995fdb05a91387805929198c32e53cf4c2df2a43d179d2c49337214066be87eb50ab044b5f70aba8c54
 DIST rspec-core-3.7.1-git.tgz 376819 BLAKE2B 6747ffd8f2d426718376b51356d8838a7db0d0246ee619e8edef30bd9f7aeeb80bd0488e4fc73b0a00d119074c35055f6b9d0cbbe6160ae78d0727ce9848a710 SHA512 1561d044281c1b8b97cc89033ad991548fa74abbc5f20d3951d3f3de754c581a027f9ccb2bd0107c05e744d3b2804555cf4cf207e72adf365b28fc7ce052dab8
 EBUILD rspec-core-2.99.2-r2.ebuild 3518 BLAKE2B 017a60ccb0ac017b08c4d97903a5bd59921fd0c0bc3b4322059d856bfee6eba2c026242bfda1e2083b043c190ad9160c6122ad62350b07aa0a486afbbb3089b6 SHA512 7b22027fa5ae71e80f071c4fc7cf3fa0e291ec42e06e0c07bcd0e94ab2782aa2dd79d4cba709751077b7c19cb0c5bc7a346c2c424cf9ffbbb62ed486776b6888
-EBUILD rspec-core-3.5.4.ebuild 3178 BLAKE2B 511992cfaa43a4fb51e907994c0edf0862d31f6f899c0cc04577d8fd31f48c450a1a82ebeabc5862d10e5a0793d266cabdffd94541ad3ff6016043029d07b1a6 SHA512 93b1179badab718a9ba151b489381a0892ab9975fbe405fcc99cf6b4725965d5aca29b25ec4bce93e2636a8d87ccdf427ad39ba468643f506d8aee4adea04b0f
-EBUILD rspec-core-3.6.0.ebuild 3249 BLAKE2B 5c7700afd2a5bd82e7f227e57b5919866343a7b8312ff9644776350cc865c95a51766c85478a3d48688cc9156ac79aa1c76b82895ffbbdd439d9ee10521f7f5e SHA512 db1a89cc337823f947a5fdbbf493c85e1a9755eda0b94f6df7632ef130fb47f7656142aaf423f53c488226fefd0bc3eb3343c1bdd1b2b71ba8a4b1383d20b4e3
-EBUILD rspec-core-3.7.0.ebuild 3246 BLAKE2B f5c0c6f89a22fb6cfe8a7afb12fc5cec63f3450773aab0dcd61b953ef85214abffe321064bb61c292c2947cac562a8ec17d793dd17465a74760c84c06e60f678 SHA512 22ffd717b140a26b85efb1f02f5c5f6730642704a4990c842edf5d8dabdf3e9f49ece645a7bdd6393b070c9fe1cb59f7ae01770d806a4ebabde063e3523f6d46
-EBUILD rspec-core-3.7.1.ebuild 3253 BLAKE2B 3c8585f4b7ace2abd81ff397049a501ec8fd3c6feebd1a01062406d2be85e32c7c2b779002efafa503ef9be002e9e1eaeb6367e6233313721c0cd472ed3006a0 SHA512 497430cb4ff8f9f24432acac441f597450e90575d67561a8793e8cb4c9142c2a639f1233cf47c1fb12c6366fabe7d1b2e1f623ab7e59401e838f1d2175613768
+EBUILD rspec-core-3.5.4.ebuild 3096 BLAKE2B 0dd38520f3c03ff53f1d4de2ad6add6df77e8f55719eea1e7282fe4411e254afe0b51b06a2b7a7263b7a77c5caa7ec0cfd773444c6edf9846d06c98ba68a959b SHA512 2b5c663071b496f4925624d74ab18a870bb1ac64089164f8fae9216a00999465073de08741db7aec0fed85a2beb3e94808abb423dfcd9e44ff094f402317aacc
+EBUILD rspec-core-3.6.0.ebuild 3181 BLAKE2B fd32fb6c11b0cadb9ebb047db880a4101ac266ddb4805f22a947546228ee1b8ee6a596a905ea4d7755f04ee09199ead85bc1a575784c7383caa445b9ecc5e58c SHA512 a8a4c8c1c6767db0ef8798666487b6c17e64218f32c6267f10532e23ae662ceceb1f50d8b9bb5c1e889327bab6c95b007577ddbadb2336e6a09abee8d33a68cf
+EBUILD rspec-core-3.7.1.ebuild 3185 BLAKE2B 5a4e8a629a70b01a5aa516bcd9e9ed2f710b1d8114f19b8d35ba8a187af77d738b202f18096147b6cde84945c253e9e474ef3a35ccdaf8f826b4de49860c4d4a SHA512 53ad4a20ca22fb63fdfedb6bc2e8e95c5f8c8f1b2749cb3e30d8c60ab5cabb2048fd6242770c9c398675389bf8e0d3fb1ed7398047e1ca238d469514ffe8e3b8
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild b/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild
index 0c937d52f425..8c95a2ed7487 100644
--- a/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby23"
 
 RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
 
@@ -82,12 +82,6 @@ each_ruby_prepare() {
 	# esac
 }
 
-all_ruby_compile() {
-	if use doc ; then
-		yardoc || die
-	fi
-}
-
 each_ruby_test() {
 	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
 }
diff --git a/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild
index cc729f3fa43b..6c4ff090e3f7 100644
--- a/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
 
@@ -84,12 +84,6 @@ each_ruby_prepare() {
 	# esac
 }
 
-all_ruby_compile() {
-	if use doc ; then
-		yardoc || die
-	fi
-}
-
 each_ruby_test() {
 	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
 }
diff --git a/dev-ruby/rspec-core/rspec-core-3.7.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.7.0.ebuild
deleted file mode 100644
index 77a50c005413..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.7.0.ebuild
+++ /dev/null
@@ -1,101 +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_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	!!<dev-ruby/rspec-core-2.14.8-r4
-	highlight? ( >=dev-ruby/coderay-1.0.9 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.0.9
-		dev-ruby/syntax
-		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/rspec-expectations-3.3.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/support/aruba_support.rb || die
-	rm -f spec/integration/{failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
-	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
-
-	# Avoid a spec failing due to path issues
-	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
-		spec/rspec/core/configuration_spec.rb || die
-
-	# Work around coderay incompatibilities
-	sed -i -e '/be_highlighted/,/end/ s/32/33/' \
-		-e '/highlights core RSpec keyword-like methods/,/^      end/ s:^:#:' \
-		spec/rspec/core/formatters/syntax_highlighter_spec.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-
-	# case ${RUBY} in
-	# 	*ruby22)
-	# 		# The rubygems version bundled with ruby 2.2 causes warnings.
-	# 		sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
-	# 		;;
-	# esac
-}
-
-all_ruby_compile() {
-	if use doc ; then
-		yardoc || die
-	fi
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild
index 464be3781aaa..2d053a7ba98a 100644
--- a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild
@@ -2,10 +2,10 @@
 # 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_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
 
@@ -84,12 +84,6 @@ each_ruby_prepare() {
 	# esac
 }
 
-all_ruby_compile() {
-	if use doc ; then
-		yardoc || die
-	fi
-}
-
 each_ruby_test() {
 	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
 }
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 11c731308106..1e73a3ef590d 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -3,7 +3,7 @@ DIST rspec-support-3.6.0-git.tgz 64987 BLAKE2B 9337da63047a1b33e8534a74a6dd40042
 DIST rspec-support-3.7.0-git.tgz 65675 BLAKE2B abc204f641014b16cbb433c10b5d5953c8fb1f94491bec359febb627ce1864776ab59e0b706ca908d00c79e75d8c95dc5c8673937c4bb24a2c7c90e6ec5f4e7e SHA512 a4a3fc705d4c31d760777513f86d8b0ca4c9e540b0a6f4b6d1152676f252e1276fedebe7cd259f0dbbb60b447cc179eea194f3a3e5bb023907923cbf16fc8033
 DIST rspec-support-3.7.1-git.tgz 65831 BLAKE2B 8595c496bc8d13e36fdfd4a8be8e055db4ac1e85af63f99158d191c9ef9e0a6ba0a2972ad7661a63eeda959e2969139a99ded71219777fd493544b711b6fea53 SHA512 a5760d696048897d76c665a756474bbb1a1995891e577c989cf68a205644c8608c538bf3d87c558428e2c412e02d3552d47567a0679cd4f8793c06f43eccf459
 EBUILD rspec-support-3.5.0.ebuild 1327 BLAKE2B 0573e7a4db15827ecb994b4f3cb1597b781e8e5faa9b6cbc1ab65ea6940b943f3cfa495d378e72b939472ec0481e014d69a222464aa8e7cb117877e620acf4ca SHA512 4d9e61775a435d1cd2af88e98257b13f21584368903cf3c941b29adcd265f49e5d840268d378fda884c30d7532e16975c7bdb009870abe96181e02a216978db5
-EBUILD rspec-support-3.6.0.ebuild 1346 BLAKE2B 11bfeb0e6ff0a687168fb7d21c8a7928b659650052afce60498467387c1ef0d23a9e38c24fd1be6c24c7b0fe828814652ac68a2e8a7d4296b815fda8a18773b8 SHA512 088faf3330b63e402976a4a2a48e1a346adf3239bde8f10add8772d1cf0798622dfc16bfd5a7569bb4836dd89eb582252ec57b6ec2a96ecdd036e74260723532
+EBUILD rspec-support-3.6.0.ebuild 1346 BLAKE2B 556ea79762c786f6cb9fb8988d55e634fa596fa5a1163de613e190d986fe0d2d8ee928161ab306d6df83ddb0d5c613c494f9c367e65979511c937c61274e5f29 SHA512 4600a8f8baa8f5d267fc499b1f88664addd8617cea3568c4770a6a658a040a8dbcd48f1cc27ac4ed5527a891bbc16a139db9d89ec01b4f19e8b2a4b6b35c9758
 EBUILD rspec-support-3.7.0.ebuild 1336 BLAKE2B 69fa85e41eb65bbeee3a4e3781d239d6fa489660f1aa8dc0326d4adb989ca8640ab11cea76730d2d707950e91f3616441720ba4c43d54a425c40e4b27fa0380a SHA512 143f1f5e7462a9cd2f61e690cce3bf6d228db73f3adcc9343032c8c88eb112831d993bac92a52571d0b2ca0ff1056c58a3d8c136a6cc1a2205c5aebd5885a1d0
 EBUILD rspec-support-3.7.1.ebuild 1343 BLAKE2B 951484a84844e5042cda10591933a2857b756ed93e45fa54adbd11f31bb8aec6c60748050f8a95034de08c83815a01be065b25a28d6c723c0a0b7436a88fa95f SHA512 d1afec7a788a72076737aea3cce0a4ca0ad0ee1f22d28936343c2ada2185db20ddc65f792e0bad5623fee5118c24455a074bae9ed8b35b84a137d7ce11cab48d
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild
index dcc0c476ae98..14e8867ee253 100644
--- a/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild
@@ -22,7 +22,7 @@ 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"
 IUSE=""
 
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.5.0:3 dev-ruby/thread_order )"
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.6.0:3 dev-ruby/thread_order )"
 
 all_ruby_prepare() {
 	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
diff --git a/dev-ruby/ruby-oci8/Manifest b/dev-ruby/ruby-oci8/Manifest
index 8e051070f77c..7912dcd704a3 100644
--- a/dev-ruby/ruby-oci8/Manifest
+++ b/dev-ruby/ruby-oci8/Manifest
@@ -1,5 +1,5 @@
 DIST ruby-oci8-2.2.4.1.gem 325120 BLAKE2B adb8eb38a1368b0ed305c9173c9e68f60845f454c618ba54b64c95bd6f7d1f9507c38419e5c334cbebca67ce38e7d4edba1dc4778a742147ff512bf32edf4d30 SHA512 54323843ebd3f7252b6d96cd1136752172f879bb6a67842c38e3a84effae18fddb2350be2ed4257c1db5ee54bf7678a098e2b1424508d3e597778e874bcbf20f
 DIST ruby-oci8-2.2.5.1.gem 329728 BLAKE2B e235d2b252673962618d8a7840b10c62944407a08bef02a47cbd3fa091fc41404b682d9f89ff42592f16b990ff0e051d0a1b4c87409bbd2429ced488a8e67696 SHA512 e868fae291155f3fdeff2acd948fcf3e56d9dfc5ea9c60e40cc9c742a82fc924999f788b2765088d31fb680c9e192e37e6d12c6dcedd2ed1f6aeef4c8c9bfe7a
 EBUILD ruby-oci8-2.2.4.1.ebuild 981 BLAKE2B c694bdf96e4c931cd5795cb2643dea9824290ddd33663a8624dad91a88a602829e05c11eb7474b0063976f4ec26e476f8f3dd3f8a78504113730cc0e440a7e4a SHA512 fe5735116572e937e2520cbb71c9bff3a325c72f646993f5c793611ac9312944d2409c5ad156875c95f02a7b7436ba0dc8248c447034fdee16391ed8f6fa5f06
-EBUILD ruby-oci8-2.2.5.1.ebuild 975 BLAKE2B ddd511ccc9356d7a6d9a64f28702dcb9684562970213ca2a3f9dd5a8497cc2b3cc6ece84b920e062a78e5920c7d125b5542490f33ce61cf9b4644b9a0e403ba4 SHA512 d9dc71c3b3e2127dc72861c60ccb62c479effb179267f7ff41b5073656276199692a4da1d631687fa759f6d689df2243e3ff97e081e551114198cb42cd6ba313
+EBUILD ruby-oci8-2.2.5.1.ebuild 975 BLAKE2B a72d26f8fd30bd5ab4afa22825cc884163c231b3f3f6e54187ebf229c8075d03a932987cb7f7facc9350d9e90c5ba75ffa6b66051c814a29b9f23065ea1acd23 SHA512 827ff368836a6dbba62dcaafdde377f4ad70a041d3ad22bd577668b9f33c31939611b7a1a370e871a4cf55e0ef1d27cb787375ac678725970472a1c136b13919
 MISC metadata.xml 651 BLAKE2B 4ac983df534d442e63e0d6b9e664b51b2ebda1be8345721c684d683acf5a7cad953e73fc1064a7706cf43406e4439cb5f09f749a6e3efdf3face5edfae0fc61a SHA512 596959885bbdf6aa103b16ac124de1929f7d52a7df1bcbb9d28ea9442e693cf44780dcff0605d256461c70e7d2c183f5dbb930a2f9e498ed3602b3a0aa9151fc
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.2.5.1.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.2.5.1.ebuild
index 6d4c7da62af7..42aa7daca187 100644
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.2.5.1.ebuild
+++ b/dev-ruby/ruby-oci8/ruby-oci8-2.2.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 inherit multilib ruby-fakegem
 
diff --git a/dev-ruby/ruby-odbc/Manifest b/dev-ruby/ruby-odbc/Manifest
index 21db33c412e6..14f247026664 100644
--- a/dev-ruby/ruby-odbc/Manifest
+++ b/dev-ruby/ruby-odbc/Manifest
@@ -1,5 +1,3 @@
-DIST ruby-odbc-0.99997.tar.gz 76708 BLAKE2B d122e7f2cccd305731ba598ca684761daab288903e0f3866735b2672f20a9c6b55ed74d768bd4f79a03e0d743b4dff4704f465e58ed331ce37762ba9f7c1e871 SHA512 15ea850efa9f65467ea829c93f7dc9ecbef9409876b19d0a309d085b20e711da2888b918f77fcd26e6a40096358eab836d6bc3000c534da88f4f3c2b60a8662a
 DIST ruby-odbc-0.99999.tar.gz 76934 BLAKE2B 59de5a544b7eefe8e181f2c6a9a61915361743ef5f7554f778667b50ca0dc57fd0c4f71e406ad6f1d00fb2c6a6509030e61ad34dddecff61896f7bfe383d0a9b SHA512 05e3e67a895406e1a57fbea6f8ecd1c087d836794ea3245bd9eec888eb3c46fa2bf2607cc1b8fdc416d7bc531d783d621c03c9fde004db8c2e431fe838c531af
-EBUILD ruby-odbc-0.99997-r1.ebuild 1484 BLAKE2B 18d2e05bd4cc0eb7ad034edcf24439d35d08963e43f1c77869ae80adfa27485859dd48184e7d69fb58280263b101f133eaaee19d7f362f335da4931b9c8d2771 SHA512 7a36ff449684777faa4bd5ae3aee430f49c7c24619e494220a3c8c456bf01f9be3a35b9e74cb123acb1c5c615078aacd3bb1632e48870026f743d53229e9d568
-EBUILD ruby-odbc-0.99999.ebuild 1485 BLAKE2B 2205e62132c5e233b3ec4e1636ee0c90bba455dfeb1812925176eaf735f9e9445d6262de039692d5e33478b3886d1ed4aa8df878c8042261b326a4c2ba911b5e SHA512 36c7dd561f07194a07b4c79af43c49c7cf9c34436fd2e13d65d6e400acade4050a7e5207dd4371ffbb0cfc9521a6d401bcb77aa1a5a9dbf506cc63314ee50605
+EBUILD ruby-odbc-0.99999.ebuild 1484 BLAKE2B 7323e78323916d173497778bac0211089bf721cdabc3df522c5e1e02b12aa846a85bb03f29b1278281c88b80b57b322ff8d716a022111ad6b5c5dffbe530e4f9 SHA512 0fba32f7c5af1c98ea6824faefc6009c666ce202c4f4a74f6acffe6a7c5dde53f3a03bac101902c80c6186b249439a6523b4287455bf98fa08610702df2588fc
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ruby-odbc/ruby-odbc-0.99997-r1.ebuild b/dev-ruby/ruby-odbc/ruby-odbc-0.99997-r1.ebuild
deleted file mode 100644
index c8b261c8b74c..000000000000
--- a/dev-ruby/ruby-odbc/ruby-odbc-0.99997-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README ChangeLog"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RubyODBC - For accessing ODBC data sources from the Ruby language"
-HOMEPAGE="http://www.ch-werner.de/rubyodbc/"
-SRC_URI="http://www.ch-werner.de/rubyodbc/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="${DEPEND} >=dev-db/unixODBC-2.0.6"
-RDEPEND="${RDEPEND} >=dev-db/unixODBC-2.0.6"
-
-# tests require to have an ODBC service enabled, so we can't run them
-# for now :(
-RESTRICT=test
-
-all_ruby_prepare() {
-	# Make sure that it doesn't try to use the absolute-local path for
-	# the extension as we'd be unable to run it properly otherwise.
-	sed -i -e 's:\./odbc:odbc:' test/{,utf8/}test.rb || die
-
-	# Since lib should not get installed avoid it entirely…
-	mv lib contrib || die
-}
-
-each_ruby_configure() {
-	for dir in ext ext/utf8; do
-		${RUBY} -C${dir} extconf.rb --disable-dlopen || die "extconf (${dir}) failed"
-	done
-}
-
-each_ruby_compile() {
-	for dir in ext ext/utf8; do
-		emake V=1 -C${dir} || die "emake (${dir}) failed"
-	done
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	ruby_fakegem_newins ext/odbc.so lib/odbc.so
-	ruby_fakegem_newins ext/utf8/odbc_utf8.so lib/odbc_utf8.so
-}
-
-all_ruby_install() {
-	all_fakegem_install
-	dohtml doc/*.html || die
-}
diff --git a/dev-ruby/ruby-odbc/ruby-odbc-0.99999.ebuild b/dev-ruby/ruby-odbc/ruby-odbc-0.99999.ebuild
index 17a995e7b856..0ac09ca47400 100644
--- a/dev-ruby/ruby-odbc/ruby-odbc-0.99999.ebuild
+++ b/dev-ruby/ruby-odbc/ruby-odbc-0.99999.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.ch-werner.de/rubyodbc/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="${DEPEND} >=dev-db/unixODBC-2.0.6"
diff --git a/dev-ruby/ruby_smb/Manifest b/dev-ruby/ruby_smb/Manifest
index 7c9306325a46..f657cd87d4ee 100644
--- a/dev-ruby/ruby_smb/Manifest
+++ b/dev-ruby/ruby_smb/Manifest
@@ -1,7 +1,9 @@
 DIST ruby_smb-0.0.23.gem 149504 BLAKE2B fe9e8dab2d0437cff691293b71473c5bbbc697952e1ce2ca52176922a7fffdeecf05e38ec139ee6f5f8c6615b2f80e6ded3b6c50390b9a7c7d06c777ce738491 SHA512 eaa779a3e9e3858142ed5581fddf5afd1f05106257e314c8811ca05fc80ce50c7944c8cbc147d652aad4c8fc4b3247c97f9f57eed44887de47abd51fe576e5e1
 DIST ruby_smb-0.0.24.gem 150016 BLAKE2B bd9af5646e151dd61d89057c325f4246dd2bed686fffc56cc1d281615093223a71dc3f2cb67d8e2f6ddacdbfafd4121e46b4109de652f90363451cb905fee2be SHA512 bef4a57edd906f84eaa46072d508578e23834e08d0f66b28feaf3f7c861474bbfc763b9f4e117537d635165fa6f0d1d2430a9e4dadf23bbf99485893ce735cc2
 DIST ruby_smb-1.0.2.gem 150016 BLAKE2B 4d661a12fee0430be8e071069d8457d4a11f197087bd1cf208f206e705285ea236a445a9396d13868335ef67c4ad7972890ffa22fe2efc3c98ef0d3503474033 SHA512 e8c1314d34e282bb117ea5587b18a41c25315c515cc5141d1a4bc98b423c25ac923e5c8836eda039f201204f82587bfc3d2ee89193277231424b99f512b27a59
+DIST ruby_smb-1.0.3.gem 150016 BLAKE2B 0958a17c1140a543d3065c147a534d5426529fbf1477e3ca2624317a4c21907f08e1e0e0690c72415ba6c0577fd611c255637ea8adc48f1d934b2fab253e5130 SHA512 7649d064618ecb28b828c55ab5184dcf13a989dd0ddcf67e431fcc8147308c649b5a8ce7b826451487eb19a9d1daf0bb22d6d9288a0108a9cc771b364a11be13
 EBUILD ruby_smb-0.0.23.ebuild 777 BLAKE2B b74ddb0413fb0383f22b2b3dd834cfb8a8a71af2e12f3fd612fb7cd2164cbd9c2482203c175ce957b2b626bf7e67e176150296925b1357d5d32a6bec7ecc1d33 SHA512 7f2a759ace80474556cbf95f9c1372590b8cca41c154df1a83e44b4d351e2dfac27d3f0a8b9a7a6c5518a32a979da8834fca62e5d5098927fc55b5b2d7e8195a
 EBUILD ruby_smb-0.0.24.ebuild 780 BLAKE2B 32253b43745e43551d12ed48e518ef5fc7727f1368574ec040c8ef1adc2aba79d50304240821875b2c072fe853bb914c097b87a9e2f7f36a76132a56a5c0f213 SHA512 33f282d8a739ccd97ab16187aef29c09a3a2d86631446eb24f32d808e71559ce4deea2137dbdf4388c1f065048a51e5d0a73323169bc9613354f239c48c8f698
 EBUILD ruby_smb-1.0.2.ebuild 780 BLAKE2B e1b43811ae1c55325a099454ae50f37ac5768a31035d0fe37f1298ac8615c6cf529116dbc6eb9766c0b422f25dfdbe6ae045aec83313f9a015fa0068bac98061 SHA512 50a71097d7d113e085d7b3badf38ecf97f6e7c5a99d9113067a4e1c486d11d374ca7f980e77f702eb7a310a778500946f9027e79d9381b5cda6963c1db7b1be5
+EBUILD ruby_smb-1.0.3.ebuild 780 BLAKE2B e1b43811ae1c55325a099454ae50f37ac5768a31035d0fe37f1298ac8615c6cf529116dbc6eb9766c0b422f25dfdbe6ae045aec83313f9a015fa0068bac98061 SHA512 50a71097d7d113e085d7b3badf38ecf97f6e7c5a99d9113067a4e1c486d11d374ca7f980e77f702eb7a310a778500946f9027e79d9381b5cda6963c1db7b1be5
 MISC metadata.xml 327 BLAKE2B 54b35b9e00051b0f0d0d8edc8ef6726c756c3050a3ea51b83213bef2fa8d5f91639819d849fe05db9f27cc8960cba7a100925dadfe4d0b9db685ae2fa05a9081 SHA512 596657669aca98301cccbd30cb719709f4dd36f2c829f9a44f3cc133aa8857f3167f9fbd89791c814e67312369acb92792ea9e230a510ef3dd2aeac64c3c1ab7
diff --git a/dev-ruby/ruby_smb/ruby_smb-1.0.3.ebuild b/dev-ruby/ruby_smb/ruby_smb-1.0.3.ebuild
new file mode 100644
index 000000000000..bb1733e03cf3
--- /dev/null
+++ b/dev-ruby/ruby_smb/ruby_smb-1.0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="pure Ruby implementation of the SMB Protocol Family"
+HOMEPAGE="https://github.com/rapid7/ruby_smb"
+
+LICENSE="BSD"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/bindata:*
+	dev-ruby/rubyntlm
+	dev-ruby/windows_error"
+
+all_ruby_prepare() {
+	sed -i -e '/simple[Cc]ov/d' -e '/coveralls/d' spec/spec_helper.rb
+	sed -i -e '/[Ss]imple[Cc]ov/,/end/d' \
+		-e '/[Cc]overalls/,/end/d' spec/spec_helper.rb
+	sed -i '/TRAVIS/d' spec/spec_helper.rb
+	sed -i -e '1irequire "rubyntlm"; require "time"' spec/spec_helper.rb
+}
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 79b7ac1c202a..e7018be9bf43 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -2,9 +2,9 @@ AUX auto_gem.rb 159 BLAKE2B f5091d3df1318606e623a3bde402bb51b693875ba9504e0a48a9
 AUX auto_gem.rb.ruby19 509 BLAKE2B 3aeb669d0dc6c6016091375adf8df8f8a2b810d40e11b3142669098d119369c4294c5d4758d1369fb2479ae3766d8e1421daa0076e2da4f66d00f9e0ed6584c1 SHA512 2b8f4ae00fae383357dd1eb1159ecf1689cb5b79e996688ae091a157b9f27e980761ed8a771d9d3b954d325f817972c4d02f4b5d3c8f4307d2cebce7651af666
 AUX conf.d-gem_server 81 BLAKE2B 2019f1b5085a824e1a9e0551a8b224391b1db777f15aea7fa613faa1c7a51f6c0015f92c16a95c0c368ad701c125307c0535ca1029891345476636fe45289fb8 SHA512 71630a0530ec62f4024d9bfc4e6afe1f409f3bcb5d71ee5876d1e190c9e69016571ca8f500fcc7ffea6cbc36a8dab5eef2d0c61f72de99f2776c9137010b9ccd
 AUX gentoo-defaults.rb 972 BLAKE2B 4353b782296ad04f400fbdbd67dcc2f26b23a9bc4a716d107a8f98c5058676c675eb42e1d5e0a7214cd74df9148d54220c0202189938c45f4000301e52a3a73f SHA512 fd5a33c433041efeefba4bb8d550b8db66f31d4c0966188f07943f4f575ee9e13da6ef6fd66f89a4b3b979c5b310d96e2876407b79aee6ed404ca3027859160c
-AUX init.d-gem_server2 503 BLAKE2B 7c602202ba101a5ed7e74a67bc4183085a98fdefb5528afbf975a9f834ce71eb1342bf2ff6206ec6fb8fbb893c908f1aa1cb7a067ec9f161a6205de220ee5259 SHA512 8b9386b93a8ef43fffba5a8c4c5232265a9b0d146d24839e75874721d3377ae0c3d0f52f14592e54c9ee94d26d7a81bb125b25f8c270253cc27e4a76dd64757d
+AUX init.d-gem_server2 505 BLAKE2B ea5807a1c8ffdaa61bf37315c71d910bbf2bf4b0b4c62e3cef3b76176e9cc1fc39272f59bd46e55e17427f730315e2c691fa3f471c1cbf697073c45c0c7589a2 SHA512 fc2c57f4deebf479a36e69c3507f109abeda9f73b22bb2e617f56e6be0069af075fa6d66708d7324922f3d8bfaa96bd8c71292d9e388e27217cc7687ab4004e1
 DIST rubygems-2.7.6.tgz 852486 BLAKE2B b2c7cf7f2ce5a27beff846d85a3ca2867a4bbadd5bc76af0df76e774c239979bc4b3fac406a65c45444c9f401f92cd1058b45c8b3750c1ee5477cd2b4b513709 SHA512 bc168afc40c974dbc7c37eb5678432ba2ed7469c3f007a159699467ff2cff5205c508237193ee8becaa6eb555b043969cc5f92b2aaa6bf7c958dd7c187e258a7
 DIST rubygems-2.7.7.tgz 915847 BLAKE2B a7a2ae2b88d7e6bfc68c298802dd29d6dd0c76573e39a3088ba06b112761059f6bbbe4565e7e7e22fb1121fc597c2139dc8a80ae1555ab15713cb2ebc50f5710 SHA512 f93b7eacf5ef8725c40d618daf9deabc7e9eed74b3b7f13ecd16f89205fe24958e782314c52f8a8fe3205b93e20b830b4fbf7ff8944ff1cf56feb7de2d773252
-EBUILD rubygems-2.7.6.ebuild 4402 BLAKE2B 676944287a3dcc19d81fb767b230a81722458e3326ae45bf92dee940e665c737e14493ffb985eb946bd44d7cc74cb9a349c200976887722f96cd8646448adb52 SHA512 e0748516cb6effd9153a72490ca0e0660c0a27db18d10858cc0dcfa0380dba8be9c8824684f9b2077f52cc43a506c360935068380f6ab6392c9970015093341b
-EBUILD rubygems-2.7.7.ebuild 4411 BLAKE2B f7c29b2b5d4feec9e59f9f9e0632d7b0064c7f73b7c80f4c91d69afda0ebe05c03ccdff64146afa78e41e80fe547ec9e8d2ad697add9cd50411c1c10a8e1b5c6 SHA512 f6736fca01c08db1e4d17a0be07dedb2f1c2a71ab82347292089fbd71c092f46aa2faffc9cf730c97938520e9777dd71321681967b6bf36fba567a9aa0472b98
+EBUILD rubygems-2.7.6-r1.ebuild 4408 BLAKE2B 3f830b52018561faddc3b8ea4c790d1739e6ffd5c4040e52e61e7c96bc50e16312f5321ea00d56266e8f093cbb66f1a9649f0976a65907599d441fde272baca3 SHA512 051ee36ab87c0a8c83b8900706f4b4d0a1dcbf16544fb6dee7e53643fd31b39abafc650b779c64cb2eea0963ec18db4e8bcb16460f3e5160686e4a255b4bba81
+EBUILD rubygems-2.7.7-r1.ebuild 4417 BLAKE2B 527b3bd24cc99b8419e01e4a1fbdd6e73e8c9af327230cc7b8c6648790c13a49ded339aef76de71e6611504c48b3b45e9a17d10c8b358e45b309715c18684cde SHA512 00529429e5e0301507bdf9eaa1938abd230c594cbaed66092afe81a6423a3c1457732f7c6d0f3dd6acf58ef0c4eacc32e33425c0c22680ce157d6f537810657f
 MISC metadata.xml 335 BLAKE2B c86eaf3d37fad025b8f6ca0b03e65b1b472716b4fda4ca4d08b415b29a63405d8e7b2684d309091c90411c5fe809e5129c6e0c0c4e7a982b4aa062ffdd0ca7fb SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e
diff --git a/dev-ruby/rubygems/files/init.d-gem_server2 b/dev-ruby/rubygems/files/init.d-gem_server2
index c7a6b6f1dc0b..213d88b0bd6e 100644
--- a/dev-ruby/rubygems/files/init.d-gem_server2
+++ b/dev-ruby/rubygems/files/init.d-gem_server2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 PID=/var/run/gem_server.pid
@@ -10,8 +10,9 @@ depend() {
 
 start() {
 	ebegin "Starting gem_server"
-	start-stop-daemon --start --chuid nobody --quiet --background --make-pidfile \
-		 --pidfile ${PID} --exec /usr/bin/ruby -- /usr/bin/gem server ${GEM_SERVER_OPTS}
+	start-stop-daemon --start --user nobody --quiet --background \
+		--make-pidfile --pidfile ${PID} --exec /usr/bin/ruby -- \
+		/usr/bin/gem server ${GEM_SERVER_OPTS}
 	eend ${?}
 }
 
diff --git a/dev-ruby/rubygems/rubygems-2.7.6.ebuild b/dev-ruby/rubygems/rubygems-2.7.6-r1.ebuild
index 58c82993295f..6d73dee54da9 100644
--- a/dev-ruby/rubygems/rubygems-2.7.6.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.7.6-r1.ebuild
@@ -9,7 +9,7 @@ inherit ruby-ng prefix
 
 DESCRIPTION="Centralized Ruby extension management system"
 HOMEPAGE="https://rubygems.org/"
-LICENSE="|| ( Ruby MIT )"
+LICENSE="GPL-2 || ( Ruby MIT )"
 
 SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
 
diff --git a/dev-ruby/rubygems/rubygems-2.7.7.ebuild b/dev-ruby/rubygems/rubygems-2.7.7-r1.ebuild
index bc4d93c8c1ec..c04b117ed93a 100644
--- a/dev-ruby/rubygems/rubygems-2.7.7.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.7.7-r1.ebuild
@@ -9,7 +9,7 @@ inherit ruby-ng prefix
 
 DESCRIPTION="Centralized Ruby extension management system"
 HOMEPAGE="https://rubygems.org/"
-LICENSE="|| ( Ruby MIT )"
+LICENSE="GPL-2 || ( Ruby MIT )"
 
 SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
 
diff --git a/dev-ruby/sass/Manifest b/dev-ruby/sass/Manifest
index 0f5767f5a9f0..a73a1ef0efca 100644
--- a/dev-ruby/sass/Manifest
+++ b/dev-ruby/sass/Manifest
@@ -1,12 +1,10 @@
 DIST sass-3.4.24.gem 351232 BLAKE2B e22953cdfa28461d7f0952dd746a4390bfdd59c78aa52f9284ab0c2ef8ba4f1ad6745bdb181fcbb9dc865213761255a47fa588d150bdb4724436c116c91b92d5 SHA512 8435005234e5e734894f39fbfaccb83ae8f077f91604e59b4c4bcf9bc92be0bced4544b7e1ce0fefc6b382590407915d438e7f99828735e5eed7ba76f3ffb7d9
 DIST sass-3.4.25.gem 352768 BLAKE2B f3c725ee75f0d5b3a30cfbfdbf5dd949fc2b6d99878039a073c3b369753609f9b202ea6f756016783b251877831d1480dad4032db8338dff453b088b219b799a SHA512 5ff4bd47857425832c6a39b963ae4465dd91d63774eb35196ec28075082ad231254babe507d7071304ddb73cdfc1168a547bf231225afaeb3b7ddd677c0bd712
-DIST sass-3.5.4.gem 319488 BLAKE2B 1cbf4972fac0252e6d54b44f586fcdb4698e58ef29e780bdb1ca1c18cea8237a03f8b25a6c047f4e7d75957ea0d94cfb05a54ed511582f5ec9d6379cd6a9c655 SHA512 3fd3001b326f8a31e6b0c5e7fbd06acb4a4ee8213d86c65d325198b50115996ffa728d0a482333b2b4eeafdceecf28fad49db58521c2d059d69ecbff418c0315
-DIST sass-3.5.5.gem 320000 BLAKE2B 8120373a68e8808a4d716d45e979ab3fdb18225622fa9399220f9ef76874f99ecf5d798de254607f295dfbd238541e5a016ba9117fe07bc9393de251b096f7ab SHA512 e8d6951f1310b05fc978546afafa8ba0dbe11b02ae8d3ba8d3a28802c874d951859b35f5adcb45f56497dd72706e8b70283b8def4a4c4614e649412deedd2a42
 DIST sass-3.5.6.gem 320000 BLAKE2B 5379e70c3882e422db63d46ec1dddb057fbcf64a4298b51de33a3f1057ac5f16bd1b673c871d21d98a330835182182e529a137f25d4a21b5f9df2ba5cfc62254 SHA512 de7ac9598a36e60cdb440b6c8b36fed638ce3384ff078000c4d59eccb76b65d1c944aad8568ee078d6f2ca228d4f4c512143065bc20c5f91d28c2f0a170de96e
+DIST sass-3.5.7.gem 320000 BLAKE2B aeae548d1005b9f420c82f4efc96b2428d3025395b49784917c298fa48228d8052f758c1f851fb6e4e8024c63d48a9880f6c2e88411cd2125e76ad291e469bc0 SHA512 a72b499cfca4862fb4bfeb5201fda788339bb57d97b467c427e9c8365b03088b886a0f3cb3a6d87b1426e1497032b8394a948eb4a2f45004be80c03070304f95
 EBUILD sass-3.4.24.ebuild 1025 BLAKE2B f5516d95ad1027b599595b6d21460b96db749df3c92aa6bad54946528c5494e5dbf7a1001c609c2fc3b5a9f7eb4ea31731b7272d7ee8f9e92d831ffe3e328b96 SHA512 df5a4bb3a6b858c95a8afb067728c3625cd35be9ed6a5fe91bf6937017ca08f95402d659d082acc1fc3ec15c40621fa65a88894039fa42a42a0c45e118542ae9
 EBUILD sass-3.4.25-r1.ebuild 1089 BLAKE2B 95ebe33839bb530d8186c5f571ccc7b8ad4892299c71c0baef51c2955600d90ed5e15f6bc2f5eda0d30b32004c613b1f9478587c9b19c3949c393acdf7e76b73 SHA512 f3ad8048b996b105d1051d53e2162576628d88f23594be88e1e24d5569da929e4f6963604189d2cb8608f8417b72410eccd1c0833970f1edd6c5b0bdb4ac218d
 EBUILD sass-3.4.25.ebuild 1023 BLAKE2B 3629e417c266a743fa0bcf9db5b697f0ec0fd8fae29d547af9a513b0133a528a9f43ca213c38dd722e1d87e6923b1d6eeb9332bfea3a6ab436b7d0015d3600f8 SHA512 3621477d6585689856a21930d866f93b9d09a75a142a914b1866652663e8aeceff8f2a84cb07ce621a8c55e083e6a9ea19ba385f60e5c47aa6dde2d3db04f083
-EBUILD sass-3.5.4.ebuild 976 BLAKE2B 1852e9a8ce4db55eac9728a29795b35d3f257e6c3d640de65ac4c9611f75542485c16e873da21e1fc1fd210636960f4600c280088c0f63fbc6695c4463cad597 SHA512 201b8c54f1bdd012f15c6d7fd85a9f8cc7641b45f2d4dabac6ee6fb7d652a9e0c452c332d7bfcef19d09470b1e07240e2258ba7908323174fc0d5137cdea7eab
-EBUILD sass-3.5.5.ebuild 1100 BLAKE2B 68c441766e40a91e66ba41ab7340f0c6f633acc998380ca05345be75035b2e69ec8fccb13d7ee45c3942bd45513aa2c50a4ac52adaf838810c7d1815a94f07d0 SHA512 67f4967e491b505608648525e6584ed0481876a6ecd2771b258c150df9fd16f6c203ad5223660afebc793e731881ebf5f0500dc3fe2b05ba8f9116297fa1a0ba
 EBUILD sass-3.5.6.ebuild 1110 BLAKE2B 1b2b23d52f9f1261403df5e997fa553a48c06e704bd8c7eac7708bd9888787d6b1d657795bf3784e91c50be361e17336ca2b49f8db97e99a0d63f8b1fba2782b SHA512 6998ec05d8ec6425cb214224dbb30a47f408718c28ed514e8f2a63b536622a836e6435af242cbf945e5502fe224b280a136fa32a3ad8793813e7e6874cd68fe8
+EBUILD sass-3.5.7.ebuild 1088 BLAKE2B 0a290f2cb3cf4091d796fef7b6c855b402202b3dcaeb1f8284e3d6bc4b6cbc762cbf94e536f70ae30f0f1763bf4339cd46a1976e30d79cb83b5d770271ebe4a4 SHA512 1a46a0f5b1253c56ad785a7f178db05fcde96fdc49f1b6230c0b147868567a1fd91e3c421678701994997ef89f6e1a10629260c72c196c8974429b96e03edf4a
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sass/sass-3.5.4.ebuild b/dev-ruby/sass/sass-3.5.4.ebuild
deleted file mode 100644
index 6f2e5e6057c2..000000000000
--- a/dev-ruby/sass/sass-3.5.4.ebuild
+++ /dev/null
@@ -1,40 +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_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="rails init.rb VERSION VERSION_DATE VERSION_NAME"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, and more"
-HOMEPAGE="http://sass-lang.com/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
-SLOT="$(get_version_component_range 1-2)"
-IUSE=""
-
-ruby_add_bdepend "doc? ( >=dev-ruby/yard-0.5.3 )"
-
-ruby_add_rdepend "
-	!!<dev-ruby/sass-3.2.19-r1:0
-	!!<dev-ruby/sass-3.4.25-r1:3.4
-	dev-ruby/sass-listen:4"
-
-# tests could use `less` if we had it
-
-all_ruby_prepare() {
-	# Don't require maruku as markdown provider but let yard decide.
-	sed -i -e '/maruku/d' .yardopts || die
-}
-
-each_ruby_test() {
-	RUBOCOP=false ${RUBY} -S rake test:ruby || die
-}
diff --git a/dev-ruby/sass/sass-3.5.5.ebuild b/dev-ruby/sass/sass-3.5.7.ebuild
index 7c50b0d97ec2..980f085d81c5 100644
--- a/dev-ruby/sass/sass-3.5.5.ebuild
+++ b/dev-ruby/sass/sass-3.5.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -11,14 +11,14 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 
 RUBY_FAKEGEM_EXTRAINSTALL="rails init.rb VERSION VERSION_DATE VERSION_NAME"
 
-inherit ruby-fakegem versionator
+inherit ruby-fakegem eapi7-ver
 
 DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, and more"
 HOMEPAGE="https://sass-lang.com/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~amd64-linux"
-SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+SLOT="$(ver_cut 1-2)"
 IUSE=""
 
 ruby_add_bdepend "doc? ( >=dev-ruby/yard-0.5.3 )"
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index 07d9d30cf0ec..daf0437f9cd7 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -1,13 +1,11 @@
 DIST selenium-webdriver-2.53.4.gem 897536 BLAKE2B 630b5e8cd5ce53de7a689135ce80e364e33b783bd8493f79af01d79717d3d65541fe04c6c0e5016a85af8a559864ddcb641d06c99430599b21095b54ff40845a SHA512 ad7934a67c4415a81c2d0efae5f510d41784411076ea903724e1fa2be1b209382131aa1b05f3636deb1deca38db6e76805262f5037ab2e621e785e4eb3c2b90e
 DIST selenium-webdriver-3.10.0.gem 841728 BLAKE2B fb36121b835c7750595cd57c3217c234e12d9f78a29131a12148f464955b1bc3f5a9ef96b6bd8f8aaedd0fa9943bcc42c1f83a0d31ec6663664f6c4f0102b5a3 SHA512 ee1ccad5661f06b16c106b2515285f763baf2b66aefe4c20aed0521e602997af8b1b12640b1099ad0a64f18b01bcec7824dcdd20fe36d9176337f177b8417b2b
-DIST selenium-webdriver-3.11.0.gem 841728 BLAKE2B b3f069645fb166258aebb0f04c8d3f828413b2a1e2f818b7501118760ba79e812ce7d314b21076076f1e6c30590e0d38f026b32ede63ff08197c8f8fbaaefded SHA512 85488c257772a4628d19bd71e7993a82c2c5a9f6332d591b19507ca5e2a96c03fa5c351714a492915888510728f2e5eca28862c69e1ced43d8b56db128d7705e
 DIST selenium-webdriver-3.12.0.gem 843264 BLAKE2B f9a2e233658e071144f153f7710ec15cd58d8831793f7212d1d49a76d08d80c7110bcf1afc86e98210c6753d19ab2c63f169754f148db8a994fb777048c10b6d SHA512 1d5a510e3e7775c6b8c960de8a5f0ae2084f490c17084e8ba0894dc32021c9295c9301c6bf0ba07e0e9827a8d99ac9f9c5d29fbf57425a076825fe18e4a8f88f
 DIST selenium-webdriver-3.13.0.gem 843264 BLAKE2B cce9be238d5b6480635ed286893f4b72e26166c21fd07ba99e2c008fd7360f0f3744dba24d015aa92612775a8c726616f391b1681d4a37689933a6b9b08d41f3 SHA512 e0b7d521ba748bbb224d659b56b9b4ff9970aab84b827eac1b755d950ad840b70a09567190e5ebafd1a513bb0c4cbfcc25e6a6e4a83051df951237533453ec44
-DIST selenium-webdriver-3.8.0.gem 840192 BLAKE2B 3f3871afed9734627757e58a211ad894fd45a49b73208b533fd39e0d99172536e7f2abdfbed1e0589c45aac6a26dd0c1ae0cf8f25053d44082957f7d07591d37 SHA512 c00c44786ecee4c02723b88c9ae5921d6a3f2d4c6c3bd043da1f524692c75a69357b752fc183c7881de0d0a6e6d6ddb03ca31e6a983afacdd06978bdd0797957
+DIST selenium-webdriver-3.13.1.gem 843776 BLAKE2B 633a6582f9294f008a77d74454a208bb67425f5a790e97a59323b51bbd3d6b9f28c611cbfb72bb922898c353fb35812b99529a75230ebfb1da18683378d36740 SHA512 b372a5af0380adb607e3f9ba24713cc8ef288e1432c2c6ea71426b8f5f96b315aace36283d585cc75546b467572822f0eab3d8217702d1b6d2ec303c59c0b98f
 EBUILD selenium-webdriver-2.53.4-r1.ebuild 1137 BLAKE2B c1686329733f5253efee815896b641a422b510d00ce379c14d87a68c487556bf64b0771dc73097bc483dd796e3e890c5fe74e6e4fa296e2a20b60ec8eac3ad7b SHA512 fd3f0c87afd1924a40ebf80ef783414cb6fc256db64e710b922e4b2834cefc2974d11e8a6c037b1d426f867459b4cf90a922f2a8c38ce0a1d426ccc990d1d268
 EBUILD selenium-webdriver-3.10.0.ebuild 909 BLAKE2B d2e55036612eec131dc8c2cb72c1c6f0c3a9aff238d1e3a5fe046a4d177ecf5ffbde9515f6a6fec35fa8dc4bb7175e3a095ad876747da479eff1ade787f76d4a SHA512 1b819c22107caeaba16bfd5f6c326dab4e933602ac5f4e5c3546c8a9051d6698594f3af0ed731f3cd163caafc368dda501169a0d95e9d8ba5d2c939d63f130f5
-EBUILD selenium-webdriver-3.11.0.ebuild 910 BLAKE2B 5e54683c36cf1ad30ea7df577abc0dbdb479ba95444e24fce04d82a43798a7ae90d229b7516fe839fab0d7f048e30a95e785f002100921688312324df783dc01 SHA512 f520e1491c92e14b92340e84f09ebd4b017d161e8adb6681ead3922dc82644a41b67ab0134c0616b9c2a475985a1e9d816e5a4b7ba1e3eafa8b9ad053775444e
-EBUILD selenium-webdriver-3.12.0.ebuild 910 BLAKE2B 5e54683c36cf1ad30ea7df577abc0dbdb479ba95444e24fce04d82a43798a7ae90d229b7516fe839fab0d7f048e30a95e785f002100921688312324df783dc01 SHA512 f520e1491c92e14b92340e84f09ebd4b017d161e8adb6681ead3922dc82644a41b67ab0134c0616b9c2a475985a1e9d816e5a4b7ba1e3eafa8b9ad053775444e
+EBUILD selenium-webdriver-3.12.0.ebuild 909 BLAKE2B 29d6b7d719d0dd9993a821f12a77b5ddb7bf647ddc381c3ec2e71c103debf69c7e773f7e7f8b980ac96d8c7d167dd84f7f0346fcfea5f597064275285929aa9d SHA512 3e7933e17836917a44275e627dd9d445b28a6d10ac3424ff357cc16a368117b527e40c2ad3fccdb2a5bb622a9f91cc5f0e0a85b28cac6ed8a6da25b6537e881c
 EBUILD selenium-webdriver-3.13.0.ebuild 910 BLAKE2B 5e54683c36cf1ad30ea7df577abc0dbdb479ba95444e24fce04d82a43798a7ae90d229b7516fe839fab0d7f048e30a95e785f002100921688312324df783dc01 SHA512 f520e1491c92e14b92340e84f09ebd4b017d161e8adb6681ead3922dc82644a41b67ab0134c0616b9c2a475985a1e9d816e5a4b7ba1e3eafa8b9ad053775444e
-EBUILD selenium-webdriver-3.8.0.ebuild 903 BLAKE2B 6fcc42a6fcc196f662bcc1eba11a627c5e5add3d1f76cd3cdfdec1f451c6ba21b1eb07527a39edbbb386984e502ca749ea4dd9f14afe97902ff7f0e6cd0dabf5 SHA512 753b1db1cd486886846531b97fb0d0fcb08eafcdbe86bf960fe08471feb301d655460e110cf809a204bc3ac3068a1b39f96bf4c180b50408b3c9ab220747510b
+EBUILD selenium-webdriver-3.13.1.ebuild 910 BLAKE2B 5e54683c36cf1ad30ea7df577abc0dbdb479ba95444e24fce04d82a43798a7ae90d229b7516fe839fab0d7f048e30a95e785f002100921688312324df783dc01 SHA512 f520e1491c92e14b92340e84f09ebd4b017d161e8adb6681ead3922dc82644a41b67ab0134c0616b9c2a475985a1e9d816e5a4b7ba1e3eafa8b9ad053775444e
 MISC metadata.xml 335 BLAKE2B 374e7e6bdf450e60792ad3960c2c0fe8ab87f70c34ca76332bbbc632598354e2a774e4eba46434e9b7c85c7f5eee7086ac85268ae58bddea7d75713d9d2f014a SHA512 94e17dd297f6904f1b70709dba5f5612fcc42e9e0e57695df6d37344cc9a89c13b423e41d142631444990ff39367eb6132d6b070bcdbf256ae00e932cadc67e2
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.12.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.12.0.ebuild
index eb794075ddf1..24006f2dbf93 100644
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.12.0.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.12.0.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="https://github.com/seleniumhq/selenium"
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.11.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.13.1.ebuild
index eb794075ddf1..eb794075ddf1 100644
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.11.0.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.13.1.ebuild
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.8.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.8.0.ebuild
deleted file mode 100644
index f62ef3257164..000000000000
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.8.0.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"
-
-# NOTE: this package contains precompiled code. It appears that all
-# source code can be found at https://code.google.com/p/selenium/ but the
-# repository is not organized in a way so that we can easily rebuild the
-# suited shared object. We'll just try our luck with the precompiled
-# objects for now.
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
-QA_PREBUILT="*/x_ignore_nofocus.so"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem provides Ruby bindings for WebDriver"
-HOMEPAGE="https://github.com/seleniumhq/selenium"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
-	dev-ruby/rubyzip:1"
diff --git a/dev-ruby/sfl/Manifest b/dev-ruby/sfl/Manifest
index 7aef3e9ef454..e6be6811a26b 100644
--- a/dev-ruby/sfl/Manifest
+++ b/dev-ruby/sfl/Manifest
@@ -1,3 +1,3 @@
 DIST sfl-2.2.gem 8192 BLAKE2B 631712748d0f58a9d76087a194cd889c4cc95696df2ac755a13357e7055f0277a146f6f3df58e678f95134ec9fa1d5ecf720c702b2bf2c7e4385d443381b3cdb SHA512 9b64a966ec4125ae39d273e9ea1529f422dd17bfe2c4696574ab7725c0aad42f974febe7359dafa073c2291b47c6e351e1d549e145d247ed7c2ea6ebc5c73932
-EBUILD sfl-2.2-r1.ebuild 608 BLAKE2B 080f280d4ea39662e789caa9b1ccb3d0eaf877434a907355eb6de26d1770af35419c1b26ef0b0f318cd4e0067bb0f89a8b189befdf0f703aa41d3fa97c3ce425 SHA512 120c103ce8195837a26d7ebabf9ad143b67058eecf70a188a030d86f6be8837f4194fa60e534249b52c65c970da4a5c552d795cea6151f1e364108e29942195f
+EBUILD sfl-2.2-r1.ebuild 608 BLAKE2B 13f28a9fefb03fdcf6d8d18c587d43ecb55558acc72ca8fc89daeb1cf81eade2b3c24fb9e395a7ee0570e56e88b923162d0794a8edd5600241ba950fa983b06b SHA512 321cbd089c281f64c495558c69c95de9298ad8f55bdc44c39a11ec80fb38726b45af3ecb0d587e2eb459edbd3258a51dc86ef02caeb2bb958e4cf3e066372c3b
 MISC metadata.xml 350 BLAKE2B 1e4b5ed1332607b056a79f85f6929b2f5a7705055127e0d0de3cbdccb851cde6f9f4f4462285e4c22847dc6ac807a5a9269b8dc9d8af840ad4f1e59391e5c055 SHA512 91539030961ec4d6d9b70ac65fc3b8236521dec596bc06f865e07f2aab3b0ba80584a2a49d07d4b008a7c5ae41e9c17017a1a309bb08af5d72df15509cff8dbc
diff --git a/dev-ruby/sfl/sfl-2.2-r1.ebuild b/dev-ruby/sfl/sfl-2.2-r1.ebuild
index c7fb7102e591..c0ba46b3d8d6 100644
--- a/dev-ruby/sfl/sfl-2.2-r1.ebuild
+++ b/dev-ruby/sfl/sfl-2.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index ea876f6d3fe7..79a932079986 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -1,3 +1,5 @@
 DIST sinatra-1.4.8.gem 369152 BLAKE2B 8a344f85c34dc8736180551690bc55ee615118a243c48421711339f2ef366e6c6facfecf914594f0440a825244e13f98648d11903fd9053054767a58a34aa285 SHA512 e56a5a6d7ceb0be4bc537feb6ada2956f1fd64b452dee347b259837aa02041dfa53d9808531cdd0a02a91093ba92f7c505c39f0dd990dfbc6e872681f40bc5e9
+DIST sinatra-2.0.3.tar.gz 463315 BLAKE2B 83113189f69714596ca3364ea61b6b8de844002acd32536fec69f7bf05937f1559396242170b0abe2d3028f5145c29adf46805d42969e683d60103013d72b389 SHA512 6188c6e372659522186649ae823f4fd3aa8a5b959cbb856f4cd42dc301e7430b3fad890a572d6f38d72aa99cf37a81e234e0c6ba9d03778a9c5a84b77a1dca76
 EBUILD sinatra-1.4.8.ebuild 1326 BLAKE2B 4ad5b768c4cb9b61ce4f04bfb315ae65991d126e6a4ba42da2ed30c2cc77876cf0fc98c3e89f01550fe3ac60c36570c1a52af90ec44ae2acbcf71d90fb627f18 SHA512 7b91176276d8b5db61475df18ea2ede3b0fa197d2c7341e15ad8c71adf1f1d21c36161ab4523f8918f0ee6a71f5628a3e3b8021a1a4761db91fa0de39193f417
+EBUILD sinatra-2.0.3.ebuild 832 BLAKE2B 42e4d27ee9b52df4280900ba052dc890382c2c0acd2fcd4d334dc3aa1c18842f83ac63eb6df0dfc18c90e6ce549be120a53b2ee2634d85af88f4e752bea52c6d SHA512 5cbf1f78d80bb315309f0e2152187f82c7e9c56d3a9918e0f5394c7e8c46b3e3931368a363f1a47416de74de949d6a802438875c9384c139ade015d4225d0afd
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sinatra/sinatra-2.0.3.ebuild b/dev-ruby/sinatra/sinatra-2.0.3.ebuild
new file mode 100644
index 000000000000..7945bea60b07
--- /dev/null
+++ b/dev-ruby/sinatra/sinatra-2.0.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_TEST="test:core"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"
+
+RUBY_FAKEGEM_GEMSPEC="sinatra.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A DSL for quickly creating web applications in Ruby with minimal effort"
+HOMEPAGE="http://www.sinatrarb.com/"
+SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/mustermann:1
+	dev-ruby/rack:2.0
+	=dev-ruby/rack-protection-2.0.3
+	dev-ruby/tilt:2"
+ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder )"
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index d54f4bbfb8a7..7b1565f6caf2 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -3,5 +3,5 @@ DIST slim-3.0.8.gem 99328 BLAKE2B a63191186223e32f36cc19b9513b22b2312c9d848aa390
 DIST slim-3.0.9.gem 99840 BLAKE2B e449585fe5642c1980b4d8fb0c93979d8c16020c331f1bc2993c6f7b5bb3e55c1b85595711bf3acdc369c6a3fbfdc6873a8208c59aedaa49dead1cd9166347d4 SHA512 220dbcde230aab05e294022924346fbb02a1bf813a7c97910c2f60d7b3a7dd498d04f6f4f2883b895d2a3e6e9f526331914e3ab4560e748de2bd991358cca90d
 EBUILD slim-3.0.7-r1.ebuild 1689 BLAKE2B 0e89951b909fb7db81b261d78e88798f4f3f7e493ef80973bbc9a55db9fb4813a14a8555cfc2a438467648e1777cd8acd59340682164d1a3f1f9ed6e967cbb6a SHA512 35305de1f03ebc7b1eaefae992bbb73d41e6f3938bfe670a045c810b71e92a6c741fdfdc35b9e67288543701ac0b10bcc48d0b6317ac0752dfbfe69d160538c9
 EBUILD slim-3.0.8.ebuild 1594 BLAKE2B 2a7b23003db0cd991730ca467c371ca9afc951c5c797333fd537d83b67156b84f1cc51af715e8c669e974f2d913a91ae889c2063ab9c75c1ea5da2e59a1addfd SHA512 6f8166253b01ab0a4ef73f3601195bfa492441a33e52ab0ad4c09bfb75bf2bcbea7a1513573a1f875de5889cf05b3487e0d33a60a6d0a76ddeb8d8ddf6a69448
-EBUILD slim-3.0.9.ebuild 1585 BLAKE2B 64854a66b75b2d4aacabc71c3fc3aadc0b3656b242d1a2f853d72e27c02c93c5c897b1892ee33131cbf9092bad3b2b3abc74e1d3846f84a3d22abccea3890530 SHA512 648350c329afbc72af72edefd1cddb20e4960e79eea28f4e0f11f3225a617e401069a755c685bd003d5e6c00e225cd11972deb704ba9d454f218316277a6b10c
+EBUILD slim-3.0.9.ebuild 1604 BLAKE2B 6c1fad6f4335d23c7f104344a414d0da423dcb9c8d80dcc6ea7c605c578e26a17dee2764b959e3225c9d0de588fb5176bc79c52f15b78b398d1075e2b1b28a96 SHA512 f4bcca1ff439af9ca723e7d572bfbca224842da932f91c1dcf39339f32a7c106fc42f4a6aa807fed4d9860b57fb76874bf3fb4bd45af49d5739a39b9ccd3f1ed
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/slim/slim-3.0.9.ebuild b/dev-ruby/slim/slim-3.0.9.ebuild
index b3f7d2954da4..807990b24fee 100644
--- a/dev-ruby/slim/slim-3.0.9.ebuild
+++ b/dev-ruby/slim/slim-3.0.9.ebuild
@@ -26,7 +26,7 @@ ruby_add_rdepend ">=dev-ruby/tilt-1.3.3:* <dev-ruby/tilt-2.1:*
 
 ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/redcarpet )"
 
-ruby_add_bdepend "test? ( dev-ruby/sass )"
+ruby_add_bdepend "test? ( dev-ruby/redcarpet dev-ruby/sass )"
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/I s:^:#:' Rakefile || die
diff --git a/dev-ruby/twitter-text/Manifest b/dev-ruby/twitter-text/Manifest
index 697b2a7b8578..3dcf52b6cfd5 100644
--- a/dev-ruby/twitter-text/Manifest
+++ b/dev-ruby/twitter-text/Manifest
@@ -1,3 +1,5 @@
 DIST twitter-text-1.14.7.gem 48128 BLAKE2B c80b9cb894438ca427ab3ba864362bd3b1b58a852c4720178fdbffef7d42b276a62d6c39d2163fa875101210a72cebbe2e4aad5c080631f07efb3657da2668b5 SHA512 98addbf8efe7b9f2685f00827194dbb255b31512e8aa5c9dab22ec08b95ccebbcf53790dfc983e71b0644c687b4db98c5d30f74f15b925377403b4d5cf6e5194
+DIST twitter-text-2.1.0.gem 54784 BLAKE2B e0ee791f63d43f8ff8d87f5b4cca337761efac24417702ba5cc0fb50db3b622ef86a2d4ca1ce753272668df825fd92ac561a2cc528ae6435976d830d1ac9a329 SHA512 ac23e05f13a008d733a9417d47e633838584b548a41741a28ca399e1548344b39081b0c6677b7be9df1feb6ffcc491718ddfb5cd55cffb63d7bb680f1431907c
 EBUILD twitter-text-1.14.7.ebuild 680 BLAKE2B c29b150b4c4e45ffb53d1d9e08c6f3ef07d83243f3d9557d3f423b1ad54d5fa9528e3219db8b719ffe9be35b2cae82f10487c5399928d3fab8a2e86068212548 SHA512 79b220db94ad7d250ac8bba09205e7efee7c2217d2b4dc08d1b52af714a16de2b9340676c531ef11bd47a78a83041dda69e34f7c0676dd9d20cc8a4875575ce3
+EBUILD twitter-text-2.1.0.ebuild 724 BLAKE2B eef9bf040c4e09f4ca58b457f1fd5202f09ab3375459dcfa40cb9f7fcdc9f079e08e78d1a9c1092e077e9c480c87c082c3b6c27bb2c77a92c8dce7f78a8b5a18 SHA512 00496136bc4b3c86b6392e4f0d9a716530409df3f8e3c89aff2b0f43fb07aaf89e98af9091f86c9f11735aff514f5a797231843c1f17676214d091e522e8c141
 MISC metadata.xml 346 BLAKE2B 3c20459269b0d8df90be33c5884c0e5925e9f2cde075ebac70a03e74e8afc51cb0d652aa4825099a775cd266e50e47ed6b2efc12a1ac253b68fce15a97766101 SHA512 89f26f9a6f6b3ae47bfbfcdb944b44b17f4fc9217c6858d88c3127dbe580f8e00575c6214cbe62f8e5e83e3d662255757c03d4c5608e69229c0417f55ae23bb1
diff --git a/dev-ruby/twitter-text/twitter-text-2.1.0.ebuild b/dev-ruby/twitter-text/twitter-text-2.1.0.ebuild
new file mode 100644
index 000000000000..c99fa83a6806
--- /dev/null
+++ b/dev-ruby/twitter-text/twitter-text-2.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Text handling for Twitter"
+HOMEPAGE="https://github.com/twitter/twitter-text"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/idn-ruby
+	=dev-ruby/unf-0.1*
+"
+
+ruby_add_bdepend "test? ( >=dev-ruby/multi_json-1.3
+	>=dev-ruby/nokogiri-1.8.0 )"
+
+all_ruby_prepare() {
+	sed -i -e 's/2.14.0/2.14/' twitter-text.gemspec || die
+	sed -i -e '/simplecov/,/end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/uglifier/Manifest b/dev-ruby/uglifier/Manifest
index 1a0b0e72ddcd..e5c8909d0b6d 100644
--- a/dev-ruby/uglifier/Manifest
+++ b/dev-ruby/uglifier/Manifest
@@ -2,8 +2,10 @@ DIST uglifier-2.7.2.gem 84480 BLAKE2B a446f21f9b8682ba7ec020d355ec5b6eb573649116
 DIST uglifier-3.2.0.tar.gz 169273 BLAKE2B b0263853c882859db8cc04c19e7f7f4bcbcef9d0b4080e414c9e1c86b691307c59d694abb33582485ea432b787f36445a49c39ece298d90806838bc56a4b7360 SHA512 5bc577753c175cddd7b3241f7343b75f593141c3bfa9ffa1325f7ade4a9acaf3b47e711007b5708f7cea1a7e9e768cbc3bc845d9eb362f877fe2fc83c047bb57
 DIST uglifier-4.1.12.tar.gz 199867 BLAKE2B 858cd1b04880775815a36515fa34077a59899a58ded15b25aa52f9fd6e232ae7576319ee67e299291f9bbb5b5a03aa883025fd133736328b11cc1e47636bb295 SHA512 cef2dcda1c7195e2af50ed94e808ddbf1ec2b95ca27cedea86180e68451d5354029d2995407150c8ee5c5e702353fcf05e205cb81cdd63e0c89bd8c8e48e5a82
 DIST uglifier-4.1.14.tar.gz 200188 BLAKE2B ef75c4e678987cc7b640cd2efd003352da978d6bc18c688670cbe08101475f3eec26880a764eb30e1c1f1694b2fdaeee3b13c825c79c0d09940824d2e6876674 SHA512 5f9c4f608e2e76e8eebaeec9dc90a100f367db79ca4a559cceb11984fc030360861fd8796cbfc67b2346b0d6b344eda647e14fa9ae29dd246a1a9b76a8d59c42
+DIST uglifier-4.1.15.tar.gz 200245 BLAKE2B 3e709eaa2394f611fdcb1996656e5531014c1cd492615f39d7309fe4089311e3838887981e5c7cc224261d4aae60bf928b8dd866985acae284c1eb5fc81906ea SHA512 673d4db046455bbde93d5542cbc2caab1f3265a8679955250227f631a58bbb303e04f92699da14aeb2f986c84c62b74f61f048e0f8625886c4f11cfe59e5ed23
 EBUILD uglifier-2.7.2.ebuild 598 BLAKE2B 866212993ed0781517edb9b12f37ec7c449f42dc7361aae98dd01ef31a40bd2936111446bfd17590a5b96f2a49d969641754b9aa7aff13d93d3e31614fc42fdf SHA512 6f6a691d0f60f9469080b8bf0840277424ea956b2cd509a1b7889c4798e90bd104a33c70c1511ea183391daa88f2a3cbc657614d1c9124d3e333e584d4a9a8de
 EBUILD uglifier-3.2.0.ebuild 800 BLAKE2B a19a8fe518ebeac3dd4854d7a1cfa86f04a03522ae79a4c5d211777dc3098f32e319923544ffd4f2220caf62cf828bd0c57ddada8abd9e8757e04131f4d7e013 SHA512 b0d20ca10593f7072a58a457fe7985f1e374936c96ff322df63688fbdaae167987132e5eb65aca13113c65d4448d39c94bef4b9eac5f342e6ee46245751db45e
 EBUILD uglifier-4.1.12.ebuild 805 BLAKE2B a114b6d5eb06d899384886a5cc47db85d3acf0156d31e49446126aa596dca1ccf335e32899163ff3bf5670dc9c9e5458d5bfecb69d8c79337930c45834db4ebb SHA512 32ac7dc1bcba18a57bd1c6d1ba84046c4736e8a4560a7850d83869170d759911b5e66caeb9a49ab69d387225680ef44554631abd75890ead6e2af5ddc8c1ceda
 EBUILD uglifier-4.1.14.ebuild 805 BLAKE2B a114b6d5eb06d899384886a5cc47db85d3acf0156d31e49446126aa596dca1ccf335e32899163ff3bf5670dc9c9e5458d5bfecb69d8c79337930c45834db4ebb SHA512 32ac7dc1bcba18a57bd1c6d1ba84046c4736e8a4560a7850d83869170d759911b5e66caeb9a49ab69d387225680ef44554631abd75890ead6e2af5ddc8c1ceda
+EBUILD uglifier-4.1.15.ebuild 805 BLAKE2B a114b6d5eb06d899384886a5cc47db85d3acf0156d31e49446126aa596dca1ccf335e32899163ff3bf5670dc9c9e5458d5bfecb69d8c79337930c45834db4ebb SHA512 32ac7dc1bcba18a57bd1c6d1ba84046c4736e8a4560a7850d83869170d759911b5e66caeb9a49ab69d387225680ef44554631abd75890ead6e2af5ddc8c1ceda
 MISC metadata.xml 341 BLAKE2B 07cb7ce323751f520c38158ef006374652e317e5809b4fbc729c264f3b44e99fc8e1d75916d858ba50361c2d3cff389b33cba7c7f863300ae8da8002de4a8d24 SHA512 0747fa6ff0d695b149915495d5242dec8541231e0e72a2157e3b4412301d8f0767c1eab17ea72a0d9f8c1afc9107c4f55b261018744e43823c8140de38ebb0b4
diff --git a/dev-ruby/uglifier/uglifier-4.1.15.ebuild b/dev-ruby/uglifier/uglifier-4.1.15.ebuild
new file mode 100644
index 000000000000..b822aa8c1b9d
--- /dev/null
+++ b/dev-ruby/uglifier/uglifier-4.1.15.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby wrapper for UglifyJS JavaScript compressor"
+HOMEPAGE="https://github.com/lautis/uglifier"
+SRC_URI="https://github.com/lautis/uglifier/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/execjs-0.3.0:*"
+
+ruby_add_bdepend "test? ( dev-ruby/sourcemap )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index d0e8b51e3748..12901254cdd6 100644
--- a/dev-ruby/yajl-ruby/Manifest
+++ b/dev-ruby/yajl-ruby/Manifest
@@ -1,5 +1,5 @@
 DIST yajl-ruby-1.3.1.gem 550912 BLAKE2B 809608b5c767c560cf40a0a8d4160f17092762788af9c66e729762ade50fbb0cccd266f1bbd411076ef4b2dc7a4cdfcdeeb552b6d86a58a0d9a38ebf1bad638c SHA512 f18b47f1fd0b039bfec01db0ee298296199fbf91b22a00042e1220a1d8471f72424c082b696829e48ce7dee7514510dd731c2bc36fe29bd08ba7246c820621f4
 DIST yajl-ruby-1.4.0.gem 556544 BLAKE2B 8eea447ef98cdd9b48fe6c91f2a385740339e78e6395b2f63add8757fe437dfd4ae721b604ca5b381c59e36412e1807c930730bcc1a7c7f921c50ccd7f03857b SHA512 63407542a58231305d1cf326de09e8fdb0f4f5bbf28d3b83a3d8f4099db2a425b7a310fc23c62a37681cb24b50d2ce9d10a6641e07be16b52783ea7401ec7ca5
-EBUILD yajl-ruby-1.3.1.ebuild 1238 BLAKE2B 78c94f018014810a2ac68d8536467d02bc80f919780ce77a6fc9aa8a9bdfe7dc725688da6c821562551b7f7d3b575285ba5ddbb9f2157051532afb8b0b3b4f85 SHA512 d8d786c531daca6c16153dca807b359dbbb6ed02035ef84b8a780bc58dbfa9e4c95e744062c3eae5e380fac4b20fd99e724d28c167e1ddd566e4d07dfccccc25
-EBUILD yajl-ruby-1.4.0.ebuild 1239 BLAKE2B 4423c37b22330c71a28d64ec4f94330efc9398f1f7020d8093335ed9b9e2ec4a673b141d4b62a9a4fd180334fc496e085d57dbc355ea85480012be729928a866 SHA512 e13f92a287eeb1036c60f67f5d67be12660321410515070995199053853a3ccae011ca962d7571e7a206242dea029a50d48c12dc694f7c0b16dd5e5962fd6f3b
+EBUILD yajl-ruby-1.3.1.ebuild 1254 BLAKE2B 6e0f05e289dd8f888945c247769d2bb689b0f12eea1df3d31263866e5d6fc721f8541f36f8358f780f8ba1f7cd12ed27fda1fede45cba0cf36cd53dcc4a99a22 SHA512 3786c6ce1bb8a0c19404f882ce7478e45b431c9b8513a53673aac6e2692510c0df53d5de7a33129f56c9520840b189b8ef8b688e9d608ae13e68f22aebeba826
+EBUILD yajl-ruby-1.4.0.ebuild 1255 BLAKE2B 2f66ab1a7fb94845f198ea123a9d1a7ea2cfc31e799f91de946e393055d7ae5ebd5b392cc3563e5bd57165d170dcb1f09a6688554ff2de48649884d833e3c595 SHA512 280f9865f087d58d5d8249daea0abb924cdb8c708e6c1b067764ba1b08131b6c96f8421b68adebd100631adb3a599e7984493922488c655b2fe0434f2534b4af
 MISC metadata.xml 346 BLAKE2B 2fff8cc633fbc47874a3e5a9e567ef430dcdd4de90343c35f599b15a85e0601a5d4b3c5b650e3971dab90cd90f382505000b40092e57d05fdaf86536a02106ff SHA512 54921a3e3df293d819d020aa6671e7e33f9031b83d375d6f8423fd844cf757c20c2e6cafc9d5a8f2670e10bd286b4e29067a8d7176e7acafd3474578134a2aae
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild
index 3211a411b19f..778feca9ad5b 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild
@@ -41,5 +41,5 @@ each_ruby_compile() {
 each_ruby_test() {
 	# Set RUBYLIB to pass search path on to additional interpreters that
 	# are started.
-	RUBYLIB=lib ruby-ng_rspec || die
+	RUBYLIB=lib RSPEC_VERSION=3 ruby-ng_rspec || die
 }
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.4.0.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.4.0.ebuild
index 8c309083d19f..d9cb6a9d9beb 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.4.0.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.4.0.ebuild
@@ -41,5 +41,5 @@ each_ruby_compile() {
 each_ruby_test() {
 	# Set RUBYLIB to pass search path on to additional interpreters that
 	# are started.
-	RUBYLIB=lib ruby-ng_rspec || die
+	RUBYLIB=lib RSPEC_VERSION=3 ruby-ng_rspec || die
 }
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index 7e3200ab3340..9fb791331bf3 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,5 +1,7 @@
 DIST yard-0.9.11-git.tgz 916355 BLAKE2B e9f27fe129cf93c51dbf83f4a7d5745d385252ba63c90f85223f2e9436c22a55aaba296f263072069d39e4beaca3e0830775a8be121c64cdc2a15afd3539a73f SHA512 375a4878e61888cf73aaa06e9300195ae48b9898d8cd639fa796a067e5fa0b89d6ef62d327a388ee83953e80177515f4d8c070042188e3a1e597f48b82b3a72e
 DIST yard-0.9.14-git.tgz 917830 BLAKE2B dd0d1d6dbc5aa9b549bd4c110f1abd57edc76b85e7c936bca8f7d35761d705ba86cd169c3c2b2141095dda68a8ab350b46bcbeb978d655addff78b110fbd2b71 SHA512 7974d431b2c1ef4830f225fd2012592405e7fb63546aeb52b74f4ad8b498926be979f3010bd315877bb4f738f6aa6c31f54b71832b461ebd3fa54fe1a1fccf5f
-EBUILD yard-0.9.11.ebuild 1317 BLAKE2B 491c69e138eae9ce9b3e8c80b266910414bea131d6dffc6788534f2519b674125fe316f1d7c5c4a56bfb9e6bb10042eeea3a08e6243a3fd5d2992900b0e7a6ba SHA512 7461bdb4de4b211037e2f616e5614c995a8f62f691777348c8f549b58d22b395df6b29e0d625bc3e308a7bdd2cb707bb09dcc4d3fc451fabbed04f1635328b30
-EBUILD yard-0.9.14.ebuild 1440 BLAKE2B 1130caaab8d43bf4cad4c7669d6b5a6b93b5703ef1020d18eb52d32fac14a4e330c69d05746462df7f9a8a3fce4d74ae6b14a03dcd9bd63d77ef764cae353fb4 SHA512 be5266e5244726469c82fb2a133f4b54fb1080886b051de5edebdbb0d3856bb157c6e442e9c24a796b27bbd601e386559c8f1334be0b83bfc4bc628936dcca11
+DIST yard-0.9.15-git.tgz 918280 BLAKE2B f7ae54298cfb8d19e006ad5e18525c3e73e423894e37c3af1fbf555227c4f66bbbcdae781addf7ad30ac900d2af7458550558fe75d876d9fa4c0cd5a2a1a3668 SHA512 45e3a6e170c06c0f7e7ff508d33e87ed9922be3e8fca19d272553b84e678fa209c44460665b86e508145b147dbbc6d4664b95694dbcf91c421988b233e63dd40
+EBUILD yard-0.9.11.ebuild 1464 BLAKE2B 0e4ee9f923c5a7fdfa905a50fe8a69b2273795c19e4c0665d015807e283b8cfee92ce936dcc1d08ca2d5c3c1001452ccc7d2e4b9fb1b9097e008de723db048d2 SHA512 0eb51531a2c15800b4af27f4174abd3fe161448f7d275e63673ccd4e6787fdbfd18ab50563b454495e7707d68df90281c3e7b97f82be977095c41ac9ec74dbdc
+EBUILD yard-0.9.14.ebuild 1588 BLAKE2B 52adfcc822cfd56271195f6814091ae790477cdfa30574bc1a23862f0c6d8d61725b5e75540057b6da305842fb77a9b26dd82a21c4e75e90c00ce980438c70c3 SHA512 93ca7b3a3771f5c1df77f5ebb2e9d12cefe45ce6fb05f32a8b4035df555e72b03ddce7b29b3a7a0e687ef6e7368518e5a874d8f570f557ba979b16740f4b6d2f
+EBUILD yard-0.9.15.ebuild 1588 BLAKE2B 52adfcc822cfd56271195f6814091ae790477cdfa30574bc1a23862f0c6d8d61725b5e75540057b6da305842fb77a9b26dd82a21c4e75e90c00ce980438c70c3 SHA512 93ca7b3a3771f5c1df77f5ebb2e9d12cefe45ce6fb05f32a8b4035df555e72b03ddce7b29b3a7a0e687ef6e7368518e5a874d8f570f557ba979b16740f4b6d2f
 MISC metadata.xml 337 BLAKE2B 1aedede1271d1f9a566743dd25b1fd9961e429b78bb5f9f36bd6ea66f631f376a273d7a094fba7121d099f3a4a3f0e7738753078e2a1a554cfe6cf32acc6e2b6 SHA512 0de30cc9c4a9d08649f141cb6df0ee9c05703831603c77a0605f0bf8e2f49b8324a782d092aaa690581e23d6d948fda9781b98770a3ba89ed6bfc0de351c11bb
diff --git a/dev-ruby/yard/yard-0.9.11.ebuild b/dev-ruby/yard/yard-0.9.11.ebuild
index b70b4dd17ad5..20374f2b0f8d 100644
--- a/dev-ruby/yard/yard-0.9.11.ebuild
+++ b/dev-ruby/yard/yard-0.9.11.ebuild
@@ -23,12 +23,12 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
 
-ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack dev-ruby/redcloth )"
+ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack )"
 
 all_ruby_prepare() {
 	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
@@ -37,4 +37,7 @@ all_ruby_prepare() {
 	# true for us. This may be related to how we install in Gentoo. This
 	# also drops a test requirement on dev-ruby/rack.
 	rm -f spec/cli/server_spec.rb || die
+
+	# Avoid redcarpet-specific spec that is not optional
+	sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die
 }
diff --git a/dev-ruby/yard/yard-0.9.14.ebuild b/dev-ruby/yard/yard-0.9.14.ebuild
index 878b62659879..4270103786c4 100644
--- a/dev-ruby/yard/yard-0.9.14.ebuild
+++ b/dev-ruby/yard/yard-0.9.14.ebuild
@@ -28,7 +28,7 @@ IUSE=""
 
 ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
 
-ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack dev-ruby/redcloth )"
+ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack )"
 
 all_ruby_prepare() {
 	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
@@ -40,4 +40,7 @@ all_ruby_prepare() {
 
 	# Avoid specs that only work with bundler
 	sed -i -e '/#initialize/,/^  end/ s:^:#:' spec/cli/yri_spec.rb || die
+
+	# Avoid redcarpet-specific spec that is not optional
+	sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die
 }
diff --git a/dev-ruby/yard/yard-0.9.15.ebuild b/dev-ruby/yard/yard-0.9.15.ebuild
new file mode 100644
index 000000000000..4270103786c4
--- /dev/null
+++ b/dev-ruby/yard/yard-0.9.15.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_DOCDIR="doc docs"
+
+RUBY_FAKEGEM_EXTRAINSTALL="templates"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Documentation generation tool for the Ruby programming language"
+HOMEPAGE="https://yardoc.org/"
+
+# The gem lakes the gemspec file needed to pass tests.
+SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
+
+ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid specs that make assumptions on load ordering that are not
+	# true for us. This may be related to how we install in Gentoo. This
+	# also drops a test requirement on dev-ruby/rack.
+	rm -f spec/cli/server_spec.rb || die
+
+	# Avoid specs that only work with bundler
+	sed -i -e '/#initialize/,/^  end/ s:^:#:' spec/cli/yri_spec.rb || die
+
+	# Avoid redcarpet-specific spec that is not optional
+	sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-21 18:59:32 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-21 18:59:32 +0100
commit	520a5b56dff7c24c9d42eafec142cb78b44f8e3e (patch)
tree	f562f705600dbd2292e97c0b4145787c2a8d1f97 /dev-ruby
parent	3811bc3072bf19e2be351d2c63f81532945c0f21 (diff)