gentoo resync : 09.12.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-12-09 09:14:02 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-12-09 09:14:02 +0000
commit: b9ef7cab6264f1838672efbbcb4ba3b3abd5323f (patch)
tree: 38e677f4a13244ca8ed29a815a0a62f943b430d4 /dev-ruby
parent: d37b97a25b8b10f748eead6574b01f893f140b01 (diff)
117 files changed, 486 insertions, 1909 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 0bafa76b4093..9f9ad30769ab 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 8f3501270f06..f7379d65a685 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,17 +1,13 @@
-DIST rails-4.2.10.tgz 4080905 SHA256 268a718a7a49ee3406027ac5b871959c096ae02d47db6a97934932897ee6e350 SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318 WHIRLPOOL 4ec289a2a4115e9b7cad4206fd5787b013bd273d42de1b197c17407e78c607a1d733213ff7068781ab6cc62cbc213f192ad6f0fcc363e053288a86e4d1002714
-DIST rails-4.2.8.tgz 4077925 SHA256 55e15e101fc4a466a8acafdd679509f6e25992d50ade2d98b098558c698a6320 SHA512 a457ec7422b83f35e8d1ac26f1ef8fbaec985034c5804ce92334c45fa4e4b11a29acdcef2c009c36be2deb4724faeb91b99f76a665eeacd1bda9448db2299f89 WHIRLPOOL ed46c71f527ba59f0ff4d00ae5881b46984500b4493b4c511b8037d94c76b40c0e531c635337b0795887e028aad5136048ba69b57e482489c3c049585f18f42f
-DIST rails-4.2.9.tgz 4080618 SHA256 c6b2119e0ef5a3359d00a0e634b5a3bd833e8d1108d96beaecaf83d7f82fce4e SHA512 2facc17faf0e76c8e13f997c9def344bd3e35aa77a596d85975f47eba837f99033f492f45485448f924adea95ffdd2f7c169dd2970be5f8c12bbafb23da51ec3 WHIRLPOOL adee3ffecc82838fbcbce50dfacb8ef813e061508f04306d15022c10fd0778cc2cde20ce2b913c4543541fce070b1a89439b56f4426cbe8a002e0d1fbfc6e33e
-DIST rails-5.0.3.tgz 6041420 SHA256 0c16f63af96529c1e3d2b4476031bd024ae403322fe78e80e188a422412dc582 SHA512 5a25747507d2a8e1d2a19ce14c77a80c4f9bd5751fb343c3f405b8d9ec170d11fb866ebfedf6b850b6750399015631ab1551e6f78e097c6514061462a05e88f3 WHIRLPOOL 25fd8473a4eed2f007b99e22cb7ccf834780d4f21478a0818c44bea525f4c839610bab2b52ae5087a881f8d5519b78616f4e53e6a21f7d6f9270c0ddf648a2a5
-DIST rails-5.0.4.tgz 6041948 SHA256 50f64f8c1d083d22a652ce4d594b38674a502b89ed7b913ebb9f1dce6984a32e SHA512 9a99d506606f2901f8b4afcfa8cc92e7d122b0879c619a539aee52df5b8926e6dca98e0eb14234f810b8a73730c3c051985e13ab0bab5f52cd8c11a0b112c44d WHIRLPOOL 842f3dfd691c7904804be128e4acf555076b96e5dbb8d874918a6492991f67c31faf8d4a5410969eadcef1166035f64c1fed6e8ae4f9f2b808600ea729a15808
-DIST rails-5.0.5.tgz 6043034 SHA256 a918bf9ee44252403de3f8f97b7de05a516e7fcf8368d01b1614826963ccc3a0 SHA512 7f06b31782b9814d2f9b1015d6f85944ee64d627d70d207f897401e7da4b504302990c629ff0ea93ca1d6820e1a11b5db78b525b50c8cd6cd8b5826452012b0c WHIRLPOOL 5f3a440184539c2d0680f71c221c83def9fb0b89520e7320e1fc4f517373d90450ad6e3966894c2e32d4cefd7a2a01e081ecb3a27346b5d0b28eb0f9ae1b5f26
-DIST rails-5.0.6.tgz 6043860 SHA256 be73ef6f421f0657a16fd2e9c3a582930d26cf30ab64484ab1cc9916b586b546 SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410 WHIRLPOOL 12732ac0a18b6e315cb18d366646a9627cbef904287722046adca93e3d0a95cb0f4c8ec174cfb4f929bc2a32dfc3e1a5dbc7fe176d8da6579c37af253fdf81c9
-DIST rails-5.1.1.tgz 6124695 SHA256 a09bfa7d2917865778af70dff8bd57fe01820eca0228cff85de581ee17e9adf2 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f WHIRLPOOL a23d6644126e6e01481c48c7089208a535188b5b32ad67cb69db36ac2044ee35bd95d4012076d7f12666aed2cbe984c75c3555889923710f10b1b91c150ccc73
-DIST rails-5.1.2.tgz 6124489 SHA256 cd6173b2ca492397d1cf22190a3070f1af485c2e25f7d9b3c2d0a80f553b4aae SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872 WHIRLPOOL ba3d0e231f4307343c6c955ecc273ac2e507d503f58a859ea81addd945bd8007190d45f18afbf3ec6915872af324a27dd2377927efe5e6c857e2ca09b6549fce
-DIST rails-5.1.3.tgz 6130089 SHA256 1d8f5f504173207eb8a418e071c75f656684ac4fea4b0e07d737c1c9accad423 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236 WHIRLPOOL 0561f9f386b8ab0c732302e369d159b65766a744b1784cbdabfbab46e27219128dd8bc39e262ae3d137ea3a03402174bfe7318fe87b00b2f28cf084f9089afff
-DIST rails-5.1.4.tgz 6132874 SHA256 d04168edcc8a230b80e77b766c86264a72456b56650fc45e41e5b9eb6ead1a26 SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc WHIRLPOOL b2e51c627627b1d88e8415349aacfae14b9270727090e4460ac4ddd8f34ced3b56b3345cb00158be14b7283bd56673a4c770f053ce02d98db1d10f5351a0778b
+DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
+DIST rails-5.0.3.tgz 6041420 BLAKE2B 972a85b23446e874cfd737b8c46ec1a9c94d387812e223c7ea702dee42047c8586f35254b90a3c99f7c571d4d99fd01a0c38bb994544be5840e08dca82e86bb4 SHA512 5a25747507d2a8e1d2a19ce14c77a80c4f9bd5751fb343c3f405b8d9ec170d11fb866ebfedf6b850b6750399015631ab1551e6f78e097c6514061462a05e88f3
+DIST rails-5.0.4.tgz 6041948 BLAKE2B 2d48efbc72b325604d77e1bde8e2e5eee297e752d5e9bbcbfe2c6fd2667a2db0005f5f5e6c7d46401faaf13911b30469506730530de2517f2ce9969819e3bbb4 SHA512 9a99d506606f2901f8b4afcfa8cc92e7d122b0879c619a539aee52df5b8926e6dca98e0eb14234f810b8a73730c3c051985e13ab0bab5f52cd8c11a0b112c44d
+DIST rails-5.0.5.tgz 6043034 BLAKE2B 1bf0e636d44a05ee83165f54b459d34509021d47b24844726c9baa872cdfbdeab6e22374f98d013d6be40d48d9dcac7e4216e4b08a1cce9868b1ded2b903165e SHA512 7f06b31782b9814d2f9b1015d6f85944ee64d627d70d207f897401e7da4b504302990c629ff0ea93ca1d6820e1a11b5db78b525b50c8cd6cd8b5826452012b0c
+DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
+DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651df49be3866e2df989d464a23ac5865081d243e6c6525837fb33099c46b6009cc667d0e03444cbcf9631588 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f
+DIST rails-5.1.2.tgz 6124489 BLAKE2B a7d71b99f1b9eb33e76c7941909407be0a3b086581bf3ddb4fe811a6b91bb129edb504c6fe3593a3b347ab035f7325e8e497b926a24b699a56725f89161e942e SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872
+DIST rails-5.1.3.tgz 6130089 BLAKE2B f61c016af6f5336726127372c1dd3d85088e11c0b58998ce40155b09087dcdb341a15d3ff57692d744538b571337a2e1e278542590d82077a35dc1e336539f85 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236
+DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 EBUILD actionmailer-4.2.10.ebuild 1612 BLAKE2B f7118ce7554ef06ff3a8070d45cd345229c0aa40655a8246c36bd2b38895d36ede1dcd8090dca7b30e9710bf242fa523136daecf78fb802d3790adcc5ed86923 SHA512 78db3f6fc83375f35989ad844030fb152be5509517df4703a762194c1e78a6134f6ce6eeacf642f7543e35cfe2af62a6587617bdfb039d70bcf89d63dc12941c
-EBUILD actionmailer-4.2.8.ebuild 1617 BLAKE2B dcfad310a736db977c99a4814dedbab46e25ba7cf332d8ddb8ce9db77d727359a813552fd7269d0d9c9ee99ef012b5cb251feabe44b29c851de23a00146c40d8 SHA512 1320305279dd9a0e27032544acc7099c6577ddb109f5df0ad1f18b95f291565f1d1f68ef2635c024025165b53a359acb1068c55a34b6baa08d5680583c4fc587
-EBUILD actionmailer-4.2.9.ebuild 1619 BLAKE2B dfa5046d9d53d4f3b33f861664d1b6ff96b92d38ce9de3479d0884bb58dfce5853ff629028b9801cf8603c8ff5b2c64685a70caca39f6abbba7d7ee5afc82459 SHA512 b11ed4ef84a13a9316589e87e1e3113db4600a3329efa99f6f1ec6065a72d675ba2948097a39ea8ebec466d2030767ea9a9484460d86e06ecfb43bd82c3e4539
 EBUILD actionmailer-5.0.3.ebuild 1289 BLAKE2B 55eb612ff2813b4fb5ad6c8efebfc59d32d9408a4ef7f47933cea54034a6db35a4b6ebab7f6f948179deca7dd6f1a0e5aca049f0fe7d1d425280ee69c641288e SHA512 71cdb37511a5583c11e51a8907d6224cd4fdab0246f2f953a54ac2848ced74b71ee98b244a2a6f6a29e374d87fcd9d680cfce66d1c4f7c10441c444d0a3e87fd
 EBUILD actionmailer-5.0.4.ebuild 1303 BLAKE2B 56bb9d547840c085c5242fc3529e1ca3fed475d7b5248745ddc0bfbc1304d9eed3d04a477117c663b6334a46065242f760fb853d7d73037f005077214a3f3dae SHA512 a1a4166125e9555e99881a4c3c01a23483c18c25ee2c39ff5116a4bbd6292f45836acecaa0ebe7d54c86276f5be5b37352e2a81fbc73b07d25e2bcdd25a05b89
 EBUILD actionmailer-5.0.5.ebuild 1303 BLAKE2B 56bb9d547840c085c5242fc3529e1ca3fed475d7b5248745ddc0bfbc1304d9eed3d04a477117c663b6334a46065242f760fb853d7d73037f005077214a3f3dae SHA512 a1a4166125e9555e99881a4c3c01a23483c18c25ee2c39ff5116a4bbd6292f45836acecaa0ebe7d54c86276f5be5b37352e2a81fbc73b07d25e2bcdd25a05b89
diff --git a/dev-ruby/actionmailer/actionmailer-4.2.8.ebuild b/dev-ruby/actionmailer/actionmailer-4.2.8.ebuild
deleted file mode 100644
index 84caccdae633..000000000000
--- a/dev-ruby/actionmailer/actionmailer-4.2.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-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 ~arm64 ~ppc ~ppc64 ~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-1.0.5:1"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha:0.14
-)"
-
-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 "/\(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\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || 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-4.2.9.ebuild b/dev-ruby/actionmailer/actionmailer-4.2.9.ebuild
deleted file mode 100644
index 9b86753c4c8c..000000000000
--- a/dev-ruby/actionmailer/actionmailer-4.2.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-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 ~arm64 ~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-1.0.5:1"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha:0.14
-)"
-
-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 "/\(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\|mime-types\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || 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/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index d0705f8ffec4..affa5afd07f3 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,17 +1,13 @@
-DIST rails-4.2.10.tgz 4080905 SHA256 268a718a7a49ee3406027ac5b871959c096ae02d47db6a97934932897ee6e350 SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318 WHIRLPOOL 4ec289a2a4115e9b7cad4206fd5787b013bd273d42de1b197c17407e78c607a1d733213ff7068781ab6cc62cbc213f192ad6f0fcc363e053288a86e4d1002714
-DIST rails-4.2.8.tgz 4077925 SHA256 55e15e101fc4a466a8acafdd679509f6e25992d50ade2d98b098558c698a6320 SHA512 a457ec7422b83f35e8d1ac26f1ef8fbaec985034c5804ce92334c45fa4e4b11a29acdcef2c009c36be2deb4724faeb91b99f76a665eeacd1bda9448db2299f89 WHIRLPOOL ed46c71f527ba59f0ff4d00ae5881b46984500b4493b4c511b8037d94c76b40c0e531c635337b0795887e028aad5136048ba69b57e482489c3c049585f18f42f
-DIST rails-4.2.9.tgz 4080618 SHA256 c6b2119e0ef5a3359d00a0e634b5a3bd833e8d1108d96beaecaf83d7f82fce4e SHA512 2facc17faf0e76c8e13f997c9def344bd3e35aa77a596d85975f47eba837f99033f492f45485448f924adea95ffdd2f7c169dd2970be5f8c12bbafb23da51ec3 WHIRLPOOL adee3ffecc82838fbcbce50dfacb8ef813e061508f04306d15022c10fd0778cc2cde20ce2b913c4543541fce070b1a89439b56f4426cbe8a002e0d1fbfc6e33e
-DIST rails-5.0.3.tgz 6041420 SHA256 0c16f63af96529c1e3d2b4476031bd024ae403322fe78e80e188a422412dc582 SHA512 5a25747507d2a8e1d2a19ce14c77a80c4f9bd5751fb343c3f405b8d9ec170d11fb866ebfedf6b850b6750399015631ab1551e6f78e097c6514061462a05e88f3 WHIRLPOOL 25fd8473a4eed2f007b99e22cb7ccf834780d4f21478a0818c44bea525f4c839610bab2b52ae5087a881f8d5519b78616f4e53e6a21f7d6f9270c0ddf648a2a5
-DIST rails-5.0.4.tgz 6041948 SHA256 50f64f8c1d083d22a652ce4d594b38674a502b89ed7b913ebb9f1dce6984a32e SHA512 9a99d506606f2901f8b4afcfa8cc92e7d122b0879c619a539aee52df5b8926e6dca98e0eb14234f810b8a73730c3c051985e13ab0bab5f52cd8c11a0b112c44d WHIRLPOOL 842f3dfd691c7904804be128e4acf555076b96e5dbb8d874918a6492991f67c31faf8d4a5410969eadcef1166035f64c1fed6e8ae4f9f2b808600ea729a15808
-DIST rails-5.0.5.tgz 6043034 SHA256 a918bf9ee44252403de3f8f97b7de05a516e7fcf8368d01b1614826963ccc3a0 SHA512 7f06b31782b9814d2f9b1015d6f85944ee64d627d70d207f897401e7da4b504302990c629ff0ea93ca1d6820e1a11b5db78b525b50c8cd6cd8b5826452012b0c WHIRLPOOL 5f3a440184539c2d0680f71c221c83def9fb0b89520e7320e1fc4f517373d90450ad6e3966894c2e32d4cefd7a2a01e081ecb3a27346b5d0b28eb0f9ae1b5f26
-DIST rails-5.0.6.tgz 6043860 SHA256 be73ef6f421f0657a16fd2e9c3a582930d26cf30ab64484ab1cc9916b586b546 SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410 WHIRLPOOL 12732ac0a18b6e315cb18d366646a9627cbef904287722046adca93e3d0a95cb0f4c8ec174cfb4f929bc2a32dfc3e1a5dbc7fe176d8da6579c37af253fdf81c9
-DIST rails-5.1.1.tgz 6124695 SHA256 a09bfa7d2917865778af70dff8bd57fe01820eca0228cff85de581ee17e9adf2 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f WHIRLPOOL a23d6644126e6e01481c48c7089208a535188b5b32ad67cb69db36ac2044ee35bd95d4012076d7f12666aed2cbe984c75c3555889923710f10b1b91c150ccc73
-DIST rails-5.1.2.tgz 6124489 SHA256 cd6173b2ca492397d1cf22190a3070f1af485c2e25f7d9b3c2d0a80f553b4aae SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872 WHIRLPOOL ba3d0e231f4307343c6c955ecc273ac2e507d503f58a859ea81addd945bd8007190d45f18afbf3ec6915872af324a27dd2377927efe5e6c857e2ca09b6549fce
-DIST rails-5.1.3.tgz 6130089 SHA256 1d8f5f504173207eb8a418e071c75f656684ac4fea4b0e07d737c1c9accad423 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236 WHIRLPOOL 0561f9f386b8ab0c732302e369d159b65766a744b1784cbdabfbab46e27219128dd8bc39e262ae3d137ea3a03402174bfe7318fe87b00b2f28cf084f9089afff
-DIST rails-5.1.4.tgz 6132874 SHA256 d04168edcc8a230b80e77b766c86264a72456b56650fc45e41e5b9eb6ead1a26 SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc WHIRLPOOL b2e51c627627b1d88e8415349aacfae14b9270727090e4460ac4ddd8f34ced3b56b3345cb00158be14b7283bd56673a4c770f053ce02d98db1d10f5351a0778b
+DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
+DIST rails-5.0.3.tgz 6041420 BLAKE2B 972a85b23446e874cfd737b8c46ec1a9c94d387812e223c7ea702dee42047c8586f35254b90a3c99f7c571d4d99fd01a0c38bb994544be5840e08dca82e86bb4 SHA512 5a25747507d2a8e1d2a19ce14c77a80c4f9bd5751fb343c3f405b8d9ec170d11fb866ebfedf6b850b6750399015631ab1551e6f78e097c6514061462a05e88f3
+DIST rails-5.0.4.tgz 6041948 BLAKE2B 2d48efbc72b325604d77e1bde8e2e5eee297e752d5e9bbcbfe2c6fd2667a2db0005f5f5e6c7d46401faaf13911b30469506730530de2517f2ce9969819e3bbb4 SHA512 9a99d506606f2901f8b4afcfa8cc92e7d122b0879c619a539aee52df5b8926e6dca98e0eb14234f810b8a73730c3c051985e13ab0bab5f52cd8c11a0b112c44d
+DIST rails-5.0.5.tgz 6043034 BLAKE2B 1bf0e636d44a05ee83165f54b459d34509021d47b24844726c9baa872cdfbdeab6e22374f98d013d6be40d48d9dcac7e4216e4b08a1cce9868b1ded2b903165e SHA512 7f06b31782b9814d2f9b1015d6f85944ee64d627d70d207f897401e7da4b504302990c629ff0ea93ca1d6820e1a11b5db78b525b50c8cd6cd8b5826452012b0c
+DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
+DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651df49be3866e2df989d464a23ac5865081d243e6c6525837fb33099c46b6009cc667d0e03444cbcf9631588 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f
+DIST rails-5.1.2.tgz 6124489 BLAKE2B a7d71b99f1b9eb33e76c7941909407be0a3b086581bf3ddb4fe811a6b91bb129edb504c6fe3593a3b347ab035f7325e8e497b926a24b699a56725f89161e942e SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872
+DIST rails-5.1.3.tgz 6130089 BLAKE2B f61c016af6f5336726127372c1dd3d85088e11c0b58998ce40155b09087dcdb341a15d3ff57692d744538b571337a2e1e278542590d82077a35dc1e336539f85 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236
+DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 EBUILD actionpack-4.2.10.ebuild 1797 BLAKE2B 6022652df889a53ccaf6792ad26f3441df3e225ad565dcd78df94d0e2784179edb5a49529c791da29cca7a2e854d5792d120f3ae814251e93cf0e1ed3732f739 SHA512 c1d4c0b33d3505d8a3268a8c7ea1c07ed0cf3888dbc17dd83ffd6a29ded3a14ea447fa45d01e0ef6a4696b36d5aa4238f5a99e27bf9178ced57e92f4ed1c05cb
-EBUILD actionpack-4.2.8.ebuild 1795 BLAKE2B 9eccdf81402953e721d2c6bd2d4bc569dd4f6bada58c6cda42dc566f74b13c8722fb71d4de861b1680aeff60e151f8f7d6cfbd57a3cd735e67f50928a8a3553e SHA512 2c355903d9cbcfa7ddc59d2ca8aa5febef661a0c196513b98c514a3b7556e143dc11997a05b0d6acdc9faed1586f69a9b04eb7cfde5bf4949f03fe681e341ad2
-EBUILD actionpack-4.2.9.ebuild 1804 BLAKE2B 76d8cd7658e3fa26d6039aafe34189ed57c75885ea62d00af23b48915ac5f0be882673dcb9ca2df05f152175d930584947506069a773fe4dd05ee26d2b232e02 SHA512 faa092d1ac4354474e831bec39c7abdc22bcb3cd4c03b973351518ccef47a6780bd3ce40bd1b27012264efbff616dd595279514adfa3decbb350732112715203
 EBUILD actionpack-5.0.3.ebuild 1958 BLAKE2B 38f3f49c7bd0f4e2caa1e213475be97ec4bfda1a4b011b322f5e04536255d6c42ad2a4b0c620361b787c6695d217a51f48ca74b7d62a11fc6ec5f342493af4cd SHA512 6f2c3aec506b2a6b4c9be5b6ca54fc491ae9c5b4df3c1f9f469525546d9809c4a4e542b79910517864ed5b69fa6aa9efd19a2a0cd4ae5b71b3a50367d135440f
 EBUILD actionpack-5.0.4.ebuild 2084 BLAKE2B af9a66c87e42f79a7a4e8feafb8dada343e2b8f0cd07bff054bd6248d8bd35a6947a2f9c8de7fa38f4c80c08799e328a881801a96d56630866939e9b12bf20e9 SHA512 cc16cff907ef5b0e9b793f0160c6e37409ca6f298c9976aee62123aa93971342f43762eed33395f0c074fc8cf30d6e615d941211f14e0fbb67457731c2610071
 EBUILD actionpack-5.0.5.ebuild 2084 BLAKE2B af9a66c87e42f79a7a4e8feafb8dada343e2b8f0cd07bff054bd6248d8bd35a6947a2f9c8de7fa38f4c80c08799e328a881801a96d56630866939e9b12bf20e9 SHA512 cc16cff907ef5b0e9b793f0160c6e37409ca6f298c9976aee62123aa93971342f43762eed33395f0c074fc8cf30d6e615d941211f14e0fbb67457731c2610071
diff --git a/dev-ruby/actionpack/actionpack-4.2.8.ebuild b/dev-ruby/actionpack/actionpack-4.2.8.ebuild
deleted file mode 100644
index 19d8c57bcd37..000000000000
--- a/dev-ruby/actionpack/actionpack-4.2.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-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 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	>=dev-ruby/rack-1.6.0:1.6
-	>=dev-ruby/rack-test-0.6.2:0.6
-	>=dev-ruby/rails-html-sanitizer-1.0.2:1
-	>=dev-ruby/rails-dom-testing-1.0.5:1
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		~dev-ruby/activemodel-${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 "/\(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\)/ 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
-}
diff --git a/dev-ruby/actionpack/actionpack-4.2.9.ebuild b/dev-ruby/actionpack/actionpack-4.2.9.ebuild
deleted file mode 100644
index c173ea15cb28..000000000000
--- a/dev-ruby/actionpack/actionpack-4.2.9.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-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 ~arm64 ~ppc64 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	>=dev-ruby/rack-1.6.0:1.6
-	>=dev-ruby/rack-test-0.6.2:0.6
-	>=dev-ruby/rails-html-sanitizer-1.0.2:1
-	>=dev-ruby/rails-dom-testing-1.0.5:1
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		~dev-ruby/activemodel-${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 "/\(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\|mime-types\|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
-}
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index ec5c968d7015..79485ebbd21a 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,17 +1,13 @@
-DIST rails-4.2.10.tgz 4080905 SHA256 268a718a7a49ee3406027ac5b871959c096ae02d47db6a97934932897ee6e350 SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318 WHIRLPOOL 4ec289a2a4115e9b7cad4206fd5787b013bd273d42de1b197c17407e78c607a1d733213ff7068781ab6cc62cbc213f192ad6f0fcc363e053288a86e4d1002714
-DIST rails-4.2.8.tgz 4077925 SHA256 55e15e101fc4a466a8acafdd679509f6e25992d50ade2d98b098558c698a6320 SHA512 a457ec7422b83f35e8d1ac26f1ef8fbaec985034c5804ce92334c45fa4e4b11a29acdcef2c009c36be2deb4724faeb91b99f76a665eeacd1bda9448db2299f89 WHIRLPOOL ed46c71f527ba59f0ff4d00ae5881b46984500b4493b4c511b8037d94c76b40c0e531c635337b0795887e028aad5136048ba69b57e482489c3c049585f18f42f
-DIST rails-4.2.9.tgz 4080618 SHA256 c6b2119e0ef5a3359d00a0e634b5a3bd833e8d1108d96beaecaf83d7f82fce4e SHA512 2facc17faf0e76c8e13f997c9def344bd3e35aa77a596d85975f47eba837f99033f492f45485448f924adea95ffdd2f7c169dd2970be5f8c12bbafb23da51ec3 WHIRLPOOL adee3ffecc82838fbcbce50dfacb8ef813e061508f04306d15022c10fd0778cc2cde20ce2b913c4543541fce070b1a89439b56f4426cbe8a002e0d1fbfc6e33e
-DIST rails-5.0.3.tgz 6041420 SHA256 0c16f63af96529c1e3d2b4476031bd024ae403322fe78e80e188a422412dc582 SHA512 5a25747507d2a8e1d2a19ce14c77a80c4f9bd5751fb343c3f405b8d9ec170d11fb866ebfedf6b850b6750399015631ab1551e6f78e097c6514061462a05e88f3 WHIRLPOOL 25fd8473a4eed2f007b99e22cb7ccf834780d4f21478a0818c44bea525f4c839610bab2b52ae5087a881f8d5519b78616f4e53e6a21f7d6f9270c0ddf648a2a5
-DIST rails-5.0.4.tgz 6041948 SHA256 50f64f8c1d083d22a652ce4d594b38674a502b89ed7b913ebb9f1dce6984a32e SHA512 9a99d506606f2901f8b4afcfa8cc92e7d122b0879c619a539aee52df5b8926e6dca98e0eb14234f810b8a73730c3c051985e13ab0bab5f52cd8c11a0b112c44d WHIRLPOOL 842f3dfd691c7904804be128e4acf555076b96e5dbb8d874918a6492991f67c31faf8d4a5410969eadcef1166035f64c1fed6e8ae4f9f2b808600ea729a15808
-DIST rails-5.0.5.tgz 6043034 SHA256 a918bf9ee44252403de3f8f97b7de05a516e7fcf8368d01b1614826963ccc3a0 SHA512 7f06b31782b9814d2f9b1015d6f85944ee64d627d70d207f897401e7da4b504302990c629ff0ea93ca1d6820e1a11b5db78b525b50c8cd6cd8b5826452012b0c WHIRLPOOL 5f3a440184539c2d0680f71c221c83def9fb0b89520e7320e1fc4f517373d90450ad6e3966894c2e32d4cefd7a2a01e081ecb3a27346b5d0b28eb0f9ae1b5f26
-DIST rails-5.0.6.tgz 6043860 SHA256 be73ef6f421f0657a16fd2e9c3a582930d26cf30ab64484ab1cc9916b586b546 SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410 WHIRLPOOL 12732ac0a18b6e315cb18d366646a9627cbef904287722046adca93e3d0a95cb0f4c8ec174cfb4f929bc2a32dfc3e1a5dbc7fe176d8da6579c37af253fdf81c9
-DIST rails-5.1.1.tgz 6124695 SHA256 a09bfa7d2917865778af70dff8bd57fe01820eca0228cff85de581ee17e9adf2 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f WHIRLPOOL a23d6644126e6e01481c48c7089208a535188b5b32ad67cb69db36ac2044ee35bd95d4012076d7f12666aed2cbe984c75c3555889923710f10b1b91c150ccc73
-DIST rails-5.1.2.tgz 6124489 SHA256 cd6173b2ca492397d1cf22190a3070f1af485c2e25f7d9b3c2d0a80f553b4aae SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872 WHIRLPOOL ba3d0e231f4307343c6c955ecc273ac2e507d503f58a859ea81addd945bd8007190d45f18afbf3ec6915872af324a27dd2377927efe5e6c857e2ca09b6549fce
-DIST rails-5.1.3.tgz 6130089 SHA256 1d8f5f504173207eb8a418e071c75f656684ac4fea4b0e07d737c1c9accad423 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236 WHIRLPOOL 0561f9f386b8ab0c732302e369d159b65766a744b1784cbdabfbab46e27219128dd8bc39e262ae3d137ea3a03402174bfe7318fe87b00b2f28cf084f9089afff
-DIST rails-5.1.4.tgz 6132874 SHA256 d04168edcc8a230b80e77b766c86264a72456b56650fc45e41e5b9eb6ead1a26 SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc WHIRLPOOL b2e51c627627b1d88e8415349aacfae14b9270727090e4460ac4ddd8f34ced3b56b3345cb00158be14b7283bd56673a4c770f053ce02d98db1d10f5351a0778b
+DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
+DIST rails-5.0.3.tgz 6041420 BLAKE2B 972a85b23446e874cfd737b8c46ec1a9c94d387812e223c7ea702dee42047c8586f35254b90a3c99f7c571d4d99fd01a0c38bb994544be5840e08dca82e86bb4 SHA512 5a25747507d2a8e1d2a19ce14c77a80c4f9bd5751fb343c3f405b8d9ec170d11fb866ebfedf6b850b6750399015631ab1551e6f78e097c6514061462a05e88f3
+DIST rails-5.0.4.tgz 6041948 BLAKE2B 2d48efbc72b325604d77e1bde8e2e5eee297e752d5e9bbcbfe2c6fd2667a2db0005f5f5e6c7d46401faaf13911b30469506730530de2517f2ce9969819e3bbb4 SHA512 9a99d506606f2901f8b4afcfa8cc92e7d122b0879c619a539aee52df5b8926e6dca98e0eb14234f810b8a73730c3c051985e13ab0bab5f52cd8c11a0b112c44d
+DIST rails-5.0.5.tgz 6043034 BLAKE2B 1bf0e636d44a05ee83165f54b459d34509021d47b24844726c9baa872cdfbdeab6e22374f98d013d6be40d48d9dcac7e4216e4b08a1cce9868b1ded2b903165e SHA512 7f06b31782b9814d2f9b1015d6f85944ee64d627d70d207f897401e7da4b504302990c629ff0ea93ca1d6820e1a11b5db78b525b50c8cd6cd8b5826452012b0c
+DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
+DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651df49be3866e2df989d464a23ac5865081d243e6c6525837fb33099c46b6009cc667d0e03444cbcf9631588 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f
+DIST rails-5.1.2.tgz 6124489 BLAKE2B a7d71b99f1b9eb33e76c7941909407be0a3b086581bf3ddb4fe811a6b91bb129edb504c6fe3593a3b347ab035f7325e8e497b926a24b699a56725f89161e942e SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872
+DIST rails-5.1.3.tgz 6130089 BLAKE2B f61c016af6f5336726127372c1dd3d85088e11c0b58998ce40155b09087dcdb341a15d3ff57692d744538b571337a2e1e278542590d82077a35dc1e336539f85 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236
+DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 EBUILD actionview-4.2.10.ebuild 1524 BLAKE2B 049befe50eb72e9d41a1d6a631320ef607021b98c19d4b53b107f3f7d557a2a89da6ce9c1e1b8af7e0309e29ec38be565dad9efd26e09c6a88b75cbaafcddb76 SHA512 82f37c8e1659404d16d27c4c7619a4976e454b4dc8fcb49a1be6438a17d0c75b1eca3c81137a43dae7809aaf2e6ab18a01c0c55363de0083589da82f2d8f5c4b
-EBUILD actionview-4.2.8.ebuild 1534 BLAKE2B e7f504663fdee3916cbd71cb10c43e39f98d5ba11f7b00f201baeea47c7ea08d5d6f868a2b7da28cf646679692822a9eb08ef3581826d15ea93e1f8081e5cdb4 SHA512 5682fd0bdf061134e2e8567871d2cd06cccf9cde380f118586059082b007d8b23bcb7d3e34ed91ae25eb6941afcb7f186305142a65e055daad8d8027414e655d
-EBUILD actionview-4.2.9.ebuild 1531 BLAKE2B 1a2ea4f94224fdd727e907094cfce27c488ac2d8d96847a469be1852995c2c75b5f55f64011b8fe01c0485b3e350c599315ca8b823a645071578ed3e2048499d SHA512 505a90a0db98e9c8e7952f931e2a135d7b87d9d59ff3cbe163cd5d8cb08596c561b2dc4c73135ed99414f30ef74e570b2b851fa54bbffef24e5ade150b347cf4
 EBUILD actionview-5.0.3.ebuild 1731 BLAKE2B 5d1eb5f90810f3da6554b26c2689c09843618a34f547f6be17a4dfb883596c5b6bde0b544bb24d8b7b698f5c5fbc0e7843cc967fd45e2555ff8e978d9c24eb15 SHA512 9036342a14ddcb8d4252fcc822dc1771cecd2d2e0eb5c4006eb7123f3ee7fc58585515295e545211117cc26b61f4234fa8a992c73eb48fbcf746f2d8850bb67b
 EBUILD actionview-5.0.4.ebuild 1828 BLAKE2B 69b3a421e75857be255544db13d570379513bbf4bc68efb57c07dbc9a00404dd31f2ae776093b20cd5fd3c3bae8bbecda9170dc04c183886837016fe6955edf6 SHA512 d609111e1a8db43439caf9766a3b07239d7e3ace41a512d300aacd332e940dcf9a6a059e4ea133d53034f872a5babaac26f0ab10c505e2f2d4a60cdf6b60cfd1
 EBUILD actionview-5.0.5.ebuild 1828 BLAKE2B 69b3a421e75857be255544db13d570379513bbf4bc68efb57c07dbc9a00404dd31f2ae776093b20cd5fd3c3bae8bbecda9170dc04c183886837016fe6955edf6 SHA512 d609111e1a8db43439caf9766a3b07239d7e3ace41a512d300aacd332e940dcf9a6a059e4ea133d53034f872a5babaac26f0ab10c505e2f2d4a60cdf6b60cfd1
diff --git a/dev-ruby/actionview/actionview-4.2.8.ebuild b/dev-ruby/actionview/actionview-4.2.8.ebuild
deleted file mode 100644
index 0ea4eb42a4ba..000000000000
--- a/dev-ruby/actionview/actionview-4.2.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-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 ~arm64 ~ppc ~ppc64 ~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-1.0.5:1
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${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 "/\(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
-}
diff --git a/dev-ruby/actionview/actionview-4.2.9.ebuild b/dev-ruby/actionview/actionview-4.2.9.ebuild
deleted file mode 100644
index e54184f58264..000000000000
--- a/dev-ruby/actionview/actionview-4.2.9.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-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 ~arm64 ~ppc64 ~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-1.0.5:1
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${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 "/\(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
-}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 7a3f1152aef7..822c697c4f0f 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,17 +1,13 @@
-DIST rails-4.2.10.tgz 4080905 SHA256 268a718a7a49ee3406027ac5b871959c096ae02d47db6a97934932897ee6e350 SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318 WHIRLPOOL 4ec289a2a4115e9b7cad4206fd5787b013bd273d42de1b197c17407e78c607a1d733213ff7068781ab6cc62cbc213f192ad6f0fcc363e053288a86e4d1002714
-DIST rails-4.2.8.tgz 4077925 SHA256 55e15e101fc4a466a8acafdd679509f6e25992d50ade2d98b098558c698a6320 SHA512 a457ec7422b83f35e8d1ac26f1ef8fbaec985034c5804ce92334c45fa4e4b11a29acdcef2c009c36be2deb4724faeb91b99f76a665eeacd1bda9448db2299f89 WHIRLPOOL ed46c71f527ba59f0ff4d00ae5881b46984500b4493b4c511b8037d94c76b40c0e531c635337b0795887e028aad5136048ba69b57e482489c3c049585f18f42f
-DIST rails-4.2.9.tgz 4080618 SHA256 c6b2119e0ef5a3359d00a0e634b5a3bd833e8d1108d96beaecaf83d7f82fce4e SHA512 2facc17faf0e76c8e13f997c9def344bd3e35aa77a596d85975f47eba837f99033f492f45485448f924adea95ffdd2f7c169dd2970be5f8c12bbafb23da51ec3 WHIRLPOOL adee3ffecc82838fbcbce50dfacb8ef813e061508f04306d15022c10fd0778cc2cde20ce2b913c4543541fce070b1a89439b56f4426cbe8a002e0d1fbfc6e33e
-DIST rails-5.0.3.tgz 6041420 SHA256 0c16f63af96529c1e3d2b4476031bd024ae403322fe78e80e188a422412dc582 SHA512 5a25747507d2a8e1d2a19ce14c77a80c4f9bd5751fb343c3f405b8d9ec170d11fb866ebfedf6b850b6750399015631ab1551e6f78e097c6514061462a05e88f3 WHIRLPOOL 25fd8473a4eed2f007b99e22cb7ccf834780d4f21478a0818c44bea525f4c839610bab2b52ae5087a881f8d5519b78616f4e53e6a21f7d6f9270c0ddf648a2a5
-DIST rails-5.0.4.tgz 6041948 SHA256 50f64f8c1d083d22a652ce4d594b38674a502b89ed7b913ebb9f1dce6984a32e SHA512 9a99d506606f2901f8b4afcfa8cc92e7d122b0879c619a539aee52df5b8926e6dca98e0eb14234f810b8a73730c3c051985e13ab0bab5f52cd8c11a0b112c44d WHIRLPOOL 842f3dfd691c7904804be128e4acf555076b96e5dbb8d874918a6492991f67c31faf8d4a5410969eadcef1166035f64c1fed6e8ae4f9f2b808600ea729a15808
-DIST rails-5.0.5.tgz 6043034 SHA256 a918bf9ee44252403de3f8f97b7de05a516e7fcf8368d01b1614826963ccc3a0 SHA512 7f06b31782b9814d2f9b1015d6f85944ee64d627d70d207f897401e7da4b504302990c629ff0ea93ca1d6820e1a11b5db78b525b50c8cd6cd8b5826452012b0c WHIRLPOOL 5f3a440184539c2d0680f71c221c83def9fb0b89520e7320e1fc4f517373d90450ad6e3966894c2e32d4cefd7a2a01e081ecb3a27346b5d0b28eb0f9ae1b5f26
-DIST rails-5.0.6.tgz 6043860 SHA256 be73ef6f421f0657a16fd2e9c3a582930d26cf30ab64484ab1cc9916b586b546 SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410 WHIRLPOOL 12732ac0a18b6e315cb18d366646a9627cbef904287722046adca93e3d0a95cb0f4c8ec174cfb4f929bc2a32dfc3e1a5dbc7fe176d8da6579c37af253fdf81c9
-DIST rails-5.1.1.tgz 6124695 SHA256 a09bfa7d2917865778af70dff8bd57fe01820eca0228cff85de581ee17e9adf2 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f WHIRLPOOL a23d6644126e6e01481c48c7089208a535188b5b32ad67cb69db36ac2044ee35bd95d4012076d7f12666aed2cbe984c75c3555889923710f10b1b91c150ccc73
-DIST rails-5.1.2.tgz 6124489 SHA256 cd6173b2ca492397d1cf22190a3070f1af485c2e25f7d9b3c2d0a80f553b4aae SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872 WHIRLPOOL ba3d0e231f4307343c6c955ecc273ac2e507d503f58a859ea81addd945bd8007190d45f18afbf3ec6915872af324a27dd2377927efe5e6c857e2ca09b6549fce
-DIST rails-5.1.3.tgz 6130089 SHA256 1d8f5f504173207eb8a418e071c75f656684ac4fea4b0e07d737c1c9accad423 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236 WHIRLPOOL 0561f9f386b8ab0c732302e369d159b65766a744b1784cbdabfbab46e27219128dd8bc39e262ae3d137ea3a03402174bfe7318fe87b00b2f28cf084f9089afff
-DIST rails-5.1.4.tgz 6132874 SHA256 d04168edcc8a230b80e77b766c86264a72456b56650fc45e41e5b9eb6ead1a26 SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc WHIRLPOOL b2e51c627627b1d88e8415349aacfae14b9270727090e4460ac4ddd8f34ced3b56b3345cb00158be14b7283bd56673a4c770f053ce02d98db1d10f5351a0778b
+DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
+DIST rails-5.0.3.tgz 6041420 BLAKE2B 972a85b23446e874cfd737b8c46ec1a9c94d387812e223c7ea702dee42047c8586f35254b90a3c99f7c571d4d99fd01a0c38bb994544be5840e08dca82e86bb4 SHA512 5a25747507d2a8e1d2a19ce14c77a80c4f9bd5751fb343c3f405b8d9ec170d11fb866ebfedf6b850b6750399015631ab1551e6f78e097c6514061462a05e88f3
+DIST rails-5.0.4.tgz 6041948 BLAKE2B 2d48efbc72b325604d77e1bde8e2e5eee297e752d5e9bbcbfe2c6fd2667a2db0005f5f5e6c7d46401faaf13911b30469506730530de2517f2ce9969819e3bbb4 SHA512 9a99d506606f2901f8b4afcfa8cc92e7d122b0879c619a539aee52df5b8926e6dca98e0eb14234f810b8a73730c3c051985e13ab0bab5f52cd8c11a0b112c44d
+DIST rails-5.0.5.tgz 6043034 BLAKE2B 1bf0e636d44a05ee83165f54b459d34509021d47b24844726c9baa872cdfbdeab6e22374f98d013d6be40d48d9dcac7e4216e4b08a1cce9868b1ded2b903165e SHA512 7f06b31782b9814d2f9b1015d6f85944ee64d627d70d207f897401e7da4b504302990c629ff0ea93ca1d6820e1a11b5db78b525b50c8cd6cd8b5826452012b0c
+DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
+DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651df49be3866e2df989d464a23ac5865081d243e6c6525837fb33099c46b6009cc667d0e03444cbcf9631588 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f
+DIST rails-5.1.2.tgz 6124489 BLAKE2B a7d71b99f1b9eb33e76c7941909407be0a3b086581bf3ddb4fe811a6b91bb129edb504c6fe3593a3b347ab035f7325e8e497b926a24b699a56725f89161e942e SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872
+DIST rails-5.1.3.tgz 6130089 BLAKE2B f61c016af6f5336726127372c1dd3d85088e11c0b58998ce40155b09087dcdb341a15d3ff57692d744538b571337a2e1e278542590d82077a35dc1e336539f85 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236
+DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 EBUILD activejob-4.2.10.ebuild 1069 BLAKE2B a9d5be678e6a217c5d4b3665e00f3891959ac17709239352c84d9196cc2489439380cdb99388970359d01bc35503f0d76f7d2a7177769f8474624b4265a2596a SHA512 1a4a1ad45a018eb196a5acce4aa091da06887668cf7d76975365e91703d9f29fc2ebe589de2218747b7e636b37a1f324128a2f7535de219c7bf53c2a5ceddb03
-EBUILD activejob-4.2.8.ebuild 1086 BLAKE2B 250c9e67f45d8e01dc6bb330fc96295663a195ead9cc41da9166886fc6f7983051ea4e2a86ed3e351d49c072b4453a96d57554514cc5a172a1f5e7e2af893ff5 SHA512 3084e09edb20b40e1c7b242b3e176cb86fa271bc2a471d7d1059c04ff0fac3e1bf91d919c2fed63acd0f3bcdcf5769dd23bf119aaf625f2ccce39825d41acba6
-EBUILD activejob-4.2.9.ebuild 1076 BLAKE2B 06ce9c296929fca375b9c6ad8c980f82461a6a1e03e4682963d7614132407e19d2862fa7f3e74846bd76f9979a66299a7a44f93711eade5fe3d11f7ff53ed3e7 SHA512 bf0061cac375839be998e89c766c8eea7b6ecd2eff75a0bb61ad0a8b2a0fca77d6e6c168767c7af6fb1f6c1be0b58f8369bd9204148ed385976345d44bca0586
 EBUILD activejob-5.0.3.ebuild 1057 BLAKE2B ceafea2e95a284081b64a7fcba2c8762a0d5681600d988170a4369571fb0407a93b24da920c953040b07cd4cf494e5aee84c6869879102362a913107b2109924 SHA512 5f99c6facad4ee0f258e3fe8eae986e8884bca21e7a521d979664a64f73e3c504e1103a5685451c8fe0aa89affc0492653774d0eb77359f946529afeb1e3ebfd
 EBUILD activejob-5.0.4.ebuild 1048 BLAKE2B 839aed616d90e55b7cd46b9ad45902154588b31bf922392923bc49d551b205bdb4a1eb9dcb92cf4b4c66b9a0e288e212f11fe2c47f0249166250abeca5fb1239 SHA512 7e396184f4e55e2f4718784a9fe1d98a48122e2a8a654a5584029440ab3c33441bb3faa62f3441cb99e860af7b6ddada13988d572516ff27a13268c60bf644ff
 EBUILD activejob-5.0.5.ebuild 1048 BLAKE2B 839aed616d90e55b7cd46b9ad45902154588b31bf922392923bc49d551b205bdb4a1eb9dcb92cf4b4c66b9a0e288e212f11fe2c47f0249166250abeca5fb1239 SHA512 7e396184f4e55e2f4718784a9fe1d98a48122e2a8a654a5584029440ab3c33441bb3faa62f3441cb99e860af7b6ddada13988d572516ff27a13268c60bf644ff
diff --git a/dev-ruby/activejob/activejob-4.2.8.ebuild b/dev-ruby/activejob/activejob-4.2.8.ebuild
deleted file mode 100644
index 433937fc2f1c..000000000000
--- a/dev-ruby/activejob/activejob-4.2.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-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 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.0
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/delayed_job qu que queue_classic resque sidekiq sneakers sucker_punch backburner//' Rakefile || die
-}
diff --git a/dev-ruby/activejob/activejob-4.2.9.ebuild b/dev-ruby/activejob/activejob-4.2.9.ebuild
deleted file mode 100644
index b4152f10845a..000000000000
--- a/dev-ruby/activejob/activejob-4.2.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 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 ~arm64 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.0
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/delayed_job qu que queue_classic resque sidekiq sneakers sucker_punch backburner//' Rakefile || die
-}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index ee20e9f6dde2..0b2dfa6ca64d 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,17 +1,13 @@
-DIST rails-4.2.10.tgz 4080905 SHA256 268a718a7a49ee3406027ac5b871959c096ae02d47db6a97934932897ee6e350 SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318 WHIRLPOOL 4ec289a2a4115e9b7cad4206fd5787b013bd273d42de1b197c17407e78c607a1d733213ff7068781ab6cc62cbc213f192ad6f0fcc363e053288a86e4d1002714
-DIST rails-4.2.8.tgz 4077925 SHA256 55e15e101fc4a466a8acafdd679509f6e25992d50ade2d98b098558c698a6320 SHA512 a457ec7422b83f35e8d1ac26f1ef8fbaec985034c5804ce92334c45fa4e4b11a29acdcef2c009c36be2deb4724faeb91b99f76a665eeacd1bda9448db2299f89 WHIRLPOOL ed46c71f527ba59f0ff4d00ae5881b46984500b4493b4c511b8037d94c76b40c0e531c635337b0795887e028aad5136048ba69b57e482489c3c049585f18f42f
-DIST rails-4.2.9.tgz 4080618 SHA256 c6b2119e0ef5a3359d00a0e634b5a3bd833e8d1108d96beaecaf83d7f82fce4e SHA512 2facc17faf0e76c8e13f997c9def344bd3e35aa77a596d85975f47eba837f99033f492f45485448f924adea95ffdd2f7c169dd2970be5f8c12bbafb23da51ec3 WHIRLPOOL adee3ffecc82838fbcbce50dfacb8ef813e061508f04306d15022c10fd0778cc2cde20ce2b913c4543541fce070b1a89439b56f4426cbe8a002e0d1fbfc6e33e
-DIST rails-5.0.3.tgz 6041420 SHA256 0c16f63af96529c1e3d2b4476031bd024ae403322fe78e80e188a422412dc582 SHA512 5a25747507d2a8e1d2a19ce14c77a80c4f9bd5751fb343c3f405b8d9ec170d11fb866ebfedf6b850b6750399015631ab1551e6f78e097c6514061462a05e88f3 WHIRLPOOL 25fd8473a4eed2f007b99e22cb7ccf834780d4f21478a0818c44bea525f4c839610bab2b52ae5087a881f8d5519b78616f4e53e6a21f7d6f9270c0ddf648a2a5
-DIST rails-5.0.4.tgz 6041948 SHA256 50f64f8c1d083d22a652ce4d594b38674a502b89ed7b913ebb9f1dce6984a32e SHA512 9a99d506606f2901f8b4afcfa8cc92e7d122b0879c619a539aee52df5b8926e6dca98e0eb14234f810b8a73730c3c051985e13ab0bab5f52cd8c11a0b112c44d WHIRLPOOL 842f3dfd691c7904804be128e4acf555076b96e5dbb8d874918a6492991f67c31faf8d4a5410969eadcef1166035f64c1fed6e8ae4f9f2b808600ea729a15808
-DIST rails-5.0.5.tgz 6043034 SHA256 a918bf9ee44252403de3f8f97b7de05a516e7fcf8368d01b1614826963ccc3a0 SHA512 7f06b31782b9814d2f9b1015d6f85944ee64d627d70d207f897401e7da4b504302990c629ff0ea93ca1d6820e1a11b5db78b525b50c8cd6cd8b5826452012b0c WHIRLPOOL 5f3a440184539c2d0680f71c221c83def9fb0b89520e7320e1fc4f517373d90450ad6e3966894c2e32d4cefd7a2a01e081ecb3a27346b5d0b28eb0f9ae1b5f26
-DIST rails-5.0.6.tgz 6043860 SHA256 be73ef6f421f0657a16fd2e9c3a582930d26cf30ab64484ab1cc9916b586b546 SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410 WHIRLPOOL 12732ac0a18b6e315cb18d366646a9627cbef904287722046adca93e3d0a95cb0f4c8ec174cfb4f929bc2a32dfc3e1a5dbc7fe176d8da6579c37af253fdf81c9
-DIST rails-5.1.1.tgz 6124695 SHA256 a09bfa7d2917865778af70dff8bd57fe01820eca0228cff85de581ee17e9adf2 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f WHIRLPOOL a23d6644126e6e01481c48c7089208a535188b5b32ad67cb69db36ac2044ee35bd95d4012076d7f12666aed2cbe984c75c3555889923710f10b1b91c150ccc73
-DIST rails-5.1.2.tgz 6124489 SHA256 cd6173b2ca492397d1cf22190a3070f1af485c2e25f7d9b3c2d0a80f553b4aae SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872 WHIRLPOOL ba3d0e231f4307343c6c955ecc273ac2e507d503f58a859ea81addd945bd8007190d45f18afbf3ec6915872af324a27dd2377927efe5e6c857e2ca09b6549fce
-DIST rails-5.1.3.tgz 6130089 SHA256 1d8f5f504173207eb8a418e071c75f656684ac4fea4b0e07d737c1c9accad423 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236 WHIRLPOOL 0561f9f386b8ab0c732302e369d159b65766a744b1784cbdabfbab46e27219128dd8bc39e262ae3d137ea3a03402174bfe7318fe87b00b2f28cf084f9089afff
-DIST rails-5.1.4.tgz 6132874 SHA256 d04168edcc8a230b80e77b766c86264a72456b56650fc45e41e5b9eb6ead1a26 SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc WHIRLPOOL b2e51c627627b1d88e8415349aacfae14b9270727090e4460ac4ddd8f34ced3b56b3345cb00158be14b7283bd56673a4c770f053ce02d98db1d10f5351a0778b
+DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
+DIST rails-5.0.3.tgz 6041420 BLAKE2B 972a85b23446e874cfd737b8c46ec1a9c94d387812e223c7ea702dee42047c8586f35254b90a3c99f7c571d4d99fd01a0c38bb994544be5840e08dca82e86bb4 SHA512 5a25747507d2a8e1d2a19ce14c77a80c4f9bd5751fb343c3f405b8d9ec170d11fb866ebfedf6b850b6750399015631ab1551e6f78e097c6514061462a05e88f3
+DIST rails-5.0.4.tgz 6041948 BLAKE2B 2d48efbc72b325604d77e1bde8e2e5eee297e752d5e9bbcbfe2c6fd2667a2db0005f5f5e6c7d46401faaf13911b30469506730530de2517f2ce9969819e3bbb4 SHA512 9a99d506606f2901f8b4afcfa8cc92e7d122b0879c619a539aee52df5b8926e6dca98e0eb14234f810b8a73730c3c051985e13ab0bab5f52cd8c11a0b112c44d
+DIST rails-5.0.5.tgz 6043034 BLAKE2B 1bf0e636d44a05ee83165f54b459d34509021d47b24844726c9baa872cdfbdeab6e22374f98d013d6be40d48d9dcac7e4216e4b08a1cce9868b1ded2b903165e SHA512 7f06b31782b9814d2f9b1015d6f85944ee64d627d70d207f897401e7da4b504302990c629ff0ea93ca1d6820e1a11b5db78b525b50c8cd6cd8b5826452012b0c
+DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
+DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651df49be3866e2df989d464a23ac5865081d243e6c6525837fb33099c46b6009cc667d0e03444cbcf9631588 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f
+DIST rails-5.1.2.tgz 6124489 BLAKE2B a7d71b99f1b9eb33e76c7941909407be0a3b086581bf3ddb4fe811a6b91bb129edb504c6fe3593a3b347ab035f7325e8e497b926a24b699a56725f89161e942e SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872
+DIST rails-5.1.3.tgz 6130089 BLAKE2B f61c016af6f5336726127372c1dd3d85088e11c0b58998ce40155b09087dcdb341a15d3ff57692d744538b571337a2e1e278542590d82077a35dc1e336539f85 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236
+DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 EBUILD activemodel-4.2.10.ebuild 1483 BLAKE2B ba526228a1ca951cba8360fa4fca69baaedde08054ff2a2b6d4d03fbcfcdb3b79f668d5f1e74ca8746366fce7b535dfa98795b24db239058ceafeb4d246484b1 SHA512 ab7d669381d5c53420ac6034ddf5040f16b6f53b306c189c5872fa0d51c7484f620280ef24ddb8e28e2a4223a8e54dcbc0df99c0ff11e3b83b442d823e52ad32
-EBUILD activemodel-4.2.8.ebuild 1481 BLAKE2B bd6e206d4b19bc9460bfd3bd6c2e4ea21f7b7992827ca0341621a3afea55e6c7347c9d06de6cbd7dde757fc3f348f14bd1406c98cf64ddcc47d08875d9feaf1d SHA512 173389acb53fc627e739555e32122d9b7919e30132a46ffb65775883c1ab47e0654bfa9d6ce0c4b3b8b94d9278f7a6a0e7b4192e63d72cd3adcca0e65e30ba98
-EBUILD activemodel-4.2.9.ebuild 1490 BLAKE2B 77af5989c649da40525dac7e12c88c56a80a0d3feccaae288b1a0c0df4e2837bf3ad8d6dc2ee5750305f3e9edca1a6195fa1158d2f60717a5db65a5460793827 SHA512 cc23abdd0c0e7273a5af7a91076f3c2597b2d7bae46dfc514a5edde4403b3e570183fbde36213215d92b00f7bf133d0affa1a0ef34e5929cf5705f5d40b8ca9d
 EBUILD activemodel-5.0.3.ebuild 1047 BLAKE2B 98633df49567b271efbf0d6a37ed75dc0c5d88ce1c132b4e919196ec8f1da26c21b1418acfa89c2d868eb0028eff4b9422432367c9172729718ccb549f99b1c0 SHA512 552be7115fdb783798d7329f21d4d93a84189813bb43fdbd386e91d167a370417acc8a1fef368aedce86c909d5f3ecd79d235c756be2aa616183a7058c89108f
 EBUILD activemodel-5.0.4.ebuild 1038 BLAKE2B 49865c9a3ba1ce452564670b8141b9fa458d1737fb15a71d819c097d8ce7f1cae0ab8711dc3f416a4081f8f82aa256025e1951059ef4e3e3d19cb69a26f324af SHA512 81b96fd80e8cd54338e57156ebf0cb6e517390e009f9414e577b997c937a9853e01b2a080f898ca8c4b0034eeb11468bb3076eac46fda23a3840b3d47378a4a0
 EBUILD activemodel-5.0.5.ebuild 1038 BLAKE2B 49865c9a3ba1ce452564670b8141b9fa458d1737fb15a71d819c097d8ce7f1cae0ab8711dc3f416a4081f8f82aa256025e1951059ef4e3e3d19cb69a26f324af SHA512 81b96fd80e8cd54338e57156ebf0cb6e517390e009f9414e577b997c937a9853e01b2a080f898ca8c4b0034eeb11468bb3076eac46fda23a3840b3d47378a4a0
diff --git a/dev-ruby/activemodel/activemodel-4.2.8.ebuild b/dev-ruby/activemodel/activemodel-4.2.8.ebuild
deleted file mode 100644
index 6dcffb032dc5..000000000000
--- a/dev-ruby/activemodel/activemodel-4.2.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-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 ~arm64 ~ppc ~ppc64 ~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*:*
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-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 "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|uglifier\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activemodel/activemodel-4.2.9.ebuild b/dev-ruby/activemodel/activemodel-4.2.9.ebuild
deleted file mode 100644
index 98833b181982..000000000000
--- a/dev-ruby/activemodel/activemodel-4.2.9.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-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 ~arm64 ~ppc64 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-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 "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|uglifier\|minitest\|mime-types\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activerecord-deprecated_finders/Manifest b/dev-ruby/activerecord-deprecated_finders/Manifest
index c9b2a1939bd5..43bdfe814917 100644
--- a/dev-ruby/activerecord-deprecated_finders/Manifest
+++ b/dev-ruby/activerecord-deprecated_finders/Manifest
@@ -1,3 +1,3 @@
-DIST activerecord-deprecated_finders-1.0.4.tar.gz 11394 SHA256 0ad87dc3d2363fd5d51f231ed5f6370b401d7118774e661d77ea0673484af523 SHA512 fee0cd5c2778c4d9c0935be1922f1bc9fd4eca28fbe979bb90d0e7fe960592bb1f6f2fac2b80ecce2c6d8ef2416df04a3327d0857e73c9bb8feb3a43cfb11951 WHIRLPOOL 6d8b30c6020503a40f8104e5c879a37dcf695dc6fe905c1084fe666b65a65702842a8797ff755f98fa8a0c38c78eaa0ecb83aa168197a782e4aef3483bd372a0
-EBUILD activerecord-deprecated_finders-1.0.4.ebuild 796 BLAKE2B f6ab5df957441c47ce4779312a2a0ddbe8fd3dc4b5a33d142c970ab14626f679d55af27cf9186141f13c7b4fe1b9d4b32abe7d54af786da891fa56d42bc45492 SHA512 e0280aeef81ae9b2f7d0ce09024c2dc159c7f00fc0821cec72c47f67db9113a3394135e1d3b34b226023b2274c7e7077b8f0cd8c9f0bb1c7921ca9b8ffec0e97
+DIST activerecord-deprecated_finders-1.0.4.tar.gz 11394 BLAKE2B 252b1b648fc0326e27f5dbd1b2721be6748ecde6df4cac8a23fdc312233498282b87f64388f8844b19e571fb8ab467a0df139f8708baf6ff6beffa3f1ceb774d SHA512 fee0cd5c2778c4d9c0935be1922f1bc9fd4eca28fbe979bb90d0e7fe960592bb1f6f2fac2b80ecce2c6d8ef2416df04a3327d0857e73c9bb8feb3a43cfb11951
+EBUILD activerecord-deprecated_finders-1.0.4.ebuild 777 BLAKE2B 8eeda178c074b7caf2dc17b694a238a2b6d73a3e9871c6af74997dc9da16c8fba76e74206a51678aa8f99b9628d8515e77770a29df9c9d17f1ade82643c64eb5 SHA512 125588cc00a3207e475311d54871e4db47877b769d1ad0b06662787d517680658c5416b0f2627668ad8c95f6be8b454bfcb2e8df764ab784934106e04b6a706c
 MISC metadata.xml 363 BLAKE2B 2fa42612657e5201ab6cc5b920125503a04956d636352863cd6f8dbd5f5488b423c7addfe2ee809c644aaf9153a3d35c6e4485a505f03f0725b62d00c1f6ee12 SHA512 d20b01191d8a7a6ecb7747417741d011b8805784fcfb5c5e5fd185899df9abcd713839dffb657bb57741936c382fa49c9f4026df7f9e2a1a16ba3748d47542cf
diff --git a/dev-ruby/activerecord-deprecated_finders/activerecord-deprecated_finders-1.0.4.ebuild b/dev-ruby/activerecord-deprecated_finders/activerecord-deprecated_finders-1.0.4.ebuild
index 508e078e87ef..78b502173647 100644
--- a/dev-ruby/activerecord-deprecated_finders/activerecord-deprecated_finders-1.0.4.ebuild
+++ b/dev-ruby/activerecord-deprecated_finders/activerecord-deprecated_finders-1.0.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23"
 
 # this is not null so that the dependencies will actually be filled
 RUBY_FAKEGEM_TASK_TEST="test"
@@ -19,7 +19,7 @@ SLOT="$(get_version_component_range 1-2)"
 
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 8f9754eba14a..0523a06bab1c 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,17 +1,13 @@
-DIST rails-4.2.10.tgz 4080905 SHA256 268a718a7a49ee3406027ac5b871959c096ae02d47db6a97934932897ee6e350 SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318 WHIRLPOOL 4ec289a2a4115e9b7cad4206fd5787b013bd273d42de1b197c17407e78c607a1d733213ff7068781ab6cc62cbc213f192ad6f0fcc363e053288a86e4d1002714
-DIST rails-4.2.8.tgz 4077925 SHA256 55e15e101fc4a466a8acafdd679509f6e25992d50ade2d98b098558c698a6320 SHA512 a457ec7422b83f35e8d1ac26f1ef8fbaec985034c5804ce92334c45fa4e4b11a29acdcef2c009c36be2deb4724faeb91b99f76a665eeacd1bda9448db2299f89 WHIRLPOOL ed46c71f527ba59f0ff4d00ae5881b46984500b4493b4c511b8037d94c76b40c0e531c635337b0795887e028aad5136048ba69b57e482489c3c049585f18f42f
-DIST rails-4.2.9.tgz 4080618 SHA256 c6b2119e0ef5a3359d00a0e634b5a3bd833e8d1108d96beaecaf83d7f82fce4e SHA512 2facc17faf0e76c8e13f997c9def344bd3e35aa77a596d85975f47eba837f99033f492f45485448f924adea95ffdd2f7c169dd2970be5f8c12bbafb23da51ec3 WHIRLPOOL adee3ffecc82838fbcbce50dfacb8ef813e061508f04306d15022c10fd0778cc2cde20ce2b913c4543541fce070b1a89439b56f4426cbe8a002e0d1fbfc6e33e
-DIST rails-5.0.3.tgz 6041420 SHA256 0c16f63af96529c1e3d2b4476031bd024ae403322fe78e80e188a422412dc582 SHA512 5a25747507d2a8e1d2a19ce14c77a80c4f9bd5751fb343c3f405b8d9ec170d11fb866ebfedf6b850b6750399015631ab1551e6f78e097c6514061462a05e88f3 WHIRLPOOL 25fd8473a4eed2f007b99e22cb7ccf834780d4f21478a0818c44bea525f4c839610bab2b52ae5087a881f8d5519b78616f4e53e6a21f7d6f9270c0ddf648a2a5
-DIST rails-5.0.4.tgz 6041948 SHA256 50f64f8c1d083d22a652ce4d594b38674a502b89ed7b913ebb9f1dce6984a32e SHA512 9a99d506606f2901f8b4afcfa8cc92e7d122b0879c619a539aee52df5b8926e6dca98e0eb14234f810b8a73730c3c051985e13ab0bab5f52cd8c11a0b112c44d WHIRLPOOL 842f3dfd691c7904804be128e4acf555076b96e5dbb8d874918a6492991f67c31faf8d4a5410969eadcef1166035f64c1fed6e8ae4f9f2b808600ea729a15808
-DIST rails-5.0.5.tgz 6043034 SHA256 a918bf9ee44252403de3f8f97b7de05a516e7fcf8368d01b1614826963ccc3a0 SHA512 7f06b31782b9814d2f9b1015d6f85944ee64d627d70d207f897401e7da4b504302990c629ff0ea93ca1d6820e1a11b5db78b525b50c8cd6cd8b5826452012b0c WHIRLPOOL 5f3a440184539c2d0680f71c221c83def9fb0b89520e7320e1fc4f517373d90450ad6e3966894c2e32d4cefd7a2a01e081ecb3a27346b5d0b28eb0f9ae1b5f26
-DIST rails-5.0.6.tgz 6043860 SHA256 be73ef6f421f0657a16fd2e9c3a582930d26cf30ab64484ab1cc9916b586b546 SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410 WHIRLPOOL 12732ac0a18b6e315cb18d366646a9627cbef904287722046adca93e3d0a95cb0f4c8ec174cfb4f929bc2a32dfc3e1a5dbc7fe176d8da6579c37af253fdf81c9
-DIST rails-5.1.1.tgz 6124695 SHA256 a09bfa7d2917865778af70dff8bd57fe01820eca0228cff85de581ee17e9adf2 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f WHIRLPOOL a23d6644126e6e01481c48c7089208a535188b5b32ad67cb69db36ac2044ee35bd95d4012076d7f12666aed2cbe984c75c3555889923710f10b1b91c150ccc73
-DIST rails-5.1.2.tgz 6124489 SHA256 cd6173b2ca492397d1cf22190a3070f1af485c2e25f7d9b3c2d0a80f553b4aae SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872 WHIRLPOOL ba3d0e231f4307343c6c955ecc273ac2e507d503f58a859ea81addd945bd8007190d45f18afbf3ec6915872af324a27dd2377927efe5e6c857e2ca09b6549fce
-DIST rails-5.1.3.tgz 6130089 SHA256 1d8f5f504173207eb8a418e071c75f656684ac4fea4b0e07d737c1c9accad423 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236 WHIRLPOOL 0561f9f386b8ab0c732302e369d159b65766a744b1784cbdabfbab46e27219128dd8bc39e262ae3d137ea3a03402174bfe7318fe87b00b2f28cf084f9089afff
-DIST rails-5.1.4.tgz 6132874 SHA256 d04168edcc8a230b80e77b766c86264a72456b56650fc45e41e5b9eb6ead1a26 SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc WHIRLPOOL b2e51c627627b1d88e8415349aacfae14b9270727090e4460ac4ddd8f34ced3b56b3345cb00158be14b7283bd56673a4c770f053ce02d98db1d10f5351a0778b
+DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
+DIST rails-5.0.3.tgz 6041420 BLAKE2B 972a85b23446e874cfd737b8c46ec1a9c94d387812e223c7ea702dee42047c8586f35254b90a3c99f7c571d4d99fd01a0c38bb994544be5840e08dca82e86bb4 SHA512 5a25747507d2a8e1d2a19ce14c77a80c4f9bd5751fb343c3f405b8d9ec170d11fb866ebfedf6b850b6750399015631ab1551e6f78e097c6514061462a05e88f3
+DIST rails-5.0.4.tgz 6041948 BLAKE2B 2d48efbc72b325604d77e1bde8e2e5eee297e752d5e9bbcbfe2c6fd2667a2db0005f5f5e6c7d46401faaf13911b30469506730530de2517f2ce9969819e3bbb4 SHA512 9a99d506606f2901f8b4afcfa8cc92e7d122b0879c619a539aee52df5b8926e6dca98e0eb14234f810b8a73730c3c051985e13ab0bab5f52cd8c11a0b112c44d
+DIST rails-5.0.5.tgz 6043034 BLAKE2B 1bf0e636d44a05ee83165f54b459d34509021d47b24844726c9baa872cdfbdeab6e22374f98d013d6be40d48d9dcac7e4216e4b08a1cce9868b1ded2b903165e SHA512 7f06b31782b9814d2f9b1015d6f85944ee64d627d70d207f897401e7da4b504302990c629ff0ea93ca1d6820e1a11b5db78b525b50c8cd6cd8b5826452012b0c
+DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
+DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651df49be3866e2df989d464a23ac5865081d243e6c6525837fb33099c46b6009cc667d0e03444cbcf9631588 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f
+DIST rails-5.1.2.tgz 6124489 BLAKE2B a7d71b99f1b9eb33e76c7941909407be0a3b086581bf3ddb4fe811a6b91bb129edb504c6fe3593a3b347ab035f7325e8e497b926a24b699a56725f89161e942e SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872
+DIST rails-5.1.3.tgz 6130089 BLAKE2B f61c016af6f5336726127372c1dd3d85088e11c0b58998ce40155b09087dcdb341a15d3ff57692d744538b571337a2e1e278542590d82077a35dc1e336539f85 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236
+DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 EBUILD activerecord-4.2.10.ebuild 2422 BLAKE2B 3aa1a3d9f9343e1748ac3da2e194bef433fd0071f603872bf93ac4e58dfde544e8ab3ade9021f0f65c8b1d89aabbfc4c4cdea1eb8aa863cca690ddd9a7e49161 SHA512 0b106a92a3d27e082b3855a9e597ba4af61b68631664199bb4cf939025da960734a093255cb1b12a583197946c612579881e28a4e0c39c4801b0627d3d2ffe0c
-EBUILD activerecord-4.2.8.ebuild 2432 BLAKE2B e51bae0c29d298f81b4752eae6a13b8f33452cf010b89e0e10ec1829196c542131847438ff0c6bc2179dee386e459fd3815879702efbfc2a46f6cb681459b2e9 SHA512 7563c7fe77646a104070b2e3db61fef085831f8159011bcfca15f49ff6ccd4929db6e568651f15390b0a3ea18381f97a68d342cc5abc7aec18572d15d2e37c09
-EBUILD activerecord-4.2.9.ebuild 2429 BLAKE2B 85f43e35974adcdc6840e8f6d08190c4d70555818b409273133d8c4cd607dfa977f1fa892f53da60aae61a022e6da3a0065d5db05db9da8a2e12b29057818db8 SHA512 47056988c76439d85d5494dbb916fecc26c3b0ff6180248e9cab40644704487fb0aea7ffd644b9945928d26d94bbd19b31251db7c14878e84a1fe1b7c5b84cad
 EBUILD activerecord-5.0.3.ebuild 2625 BLAKE2B ea234864d68f8f641b7f7776f84d04429d5e686d414d9fc17b81055c2fbdd15aed242eb04c90733ceb32b9c40525016c028520b94dcc66a1c035a1ec6fee1790 SHA512 1f9d3595e157dac2662689fcd4f60fdaf3f568a39cd91c170bb8101706d4fa51659834ae9b3267af6a122f9c1bc0d663476cec7357ebee581df513eef38c5ec7
 EBUILD activerecord-5.0.4.ebuild 2694 BLAKE2B ddcb4bc9562fcd09b38752ff1b3f0ac1b204ea2583addd9e971bd9598d449c5f7ff413114cbc2b02404fe1de7dab6df527deaa924d60f2a18f29905a7f6bf3e4 SHA512 f3ac596fcc000f1a46f498c67ca9eeb9269b0aaa19738912d6f6e7d36da569826b745074cb011e63308cb0c6dd928d2e26e008fb5bf790d9e5e9b20ce6270ad8
 EBUILD activerecord-5.0.5.ebuild 2694 BLAKE2B ddcb4bc9562fcd09b38752ff1b3f0ac1b204ea2583addd9e971bd9598d449c5f7ff413114cbc2b02404fe1de7dab6df527deaa924d60f2a18f29905a7f6bf3e4 SHA512 f3ac596fcc000f1a46f498c67ca9eeb9269b0aaa19738912d6f6e7d36da569826b745074cb011e63308cb0c6dd928d2e26e008fb5bf790d9e5e9b20ce6270ad8
diff --git a/dev-ruby/activerecord/activerecord-4.2.8.ebuild b/dev-ruby/activerecord/activerecord-4.2.8.ebuild
deleted file mode 100644
index 9fea2cfc05db..000000000000
--- a/dev-ruby/activerecord/activerecord-4.2.8.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-# 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"
-
-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 ~arm64 ~ppc ~ppc64 ~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-6.0:6.0
-	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
-	mysql? ( || ( dev-ruby/mysql2:0.4 >=dev-ruby/mysql2-0.3.13:0.3 ) )
-	postgres? ( >=dev-ruby/pg-0.15.0 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/actionmailer-${PV}
-		>=dev-ruby/sqlite3-1.3.5
-		dev-ruby/mocha:0.14
-		<dev-ruby/minitest-5.4: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.
-	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
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-4.2.9.ebuild b/dev-ruby/activerecord/activerecord-4.2.9.ebuild
deleted file mode 100644
index 3d5365460883..000000000000
--- a/dev-ruby/activerecord/activerecord-4.2.9.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 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"
-
-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 ~arm64 ~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-6.0:6.0
-	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
-	mysql? ( || ( dev-ruby/mysql2:0.4 >=dev-ruby/mysql2-0.3.13:0.3 ) )
-	postgres? ( >=dev-ruby/pg-0.15.0 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/actionmailer-${PV}
-		>=dev-ruby/sqlite3-1.3.5
-		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.
-	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\|mime-types\|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
-}
-
-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 166516ee9bb0..d19ed4f666b6 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,17 +1,13 @@
-DIST rails-4.2.10.tgz 4080905 SHA256 268a718a7a49ee3406027ac5b871959c096ae02d47db6a97934932897ee6e350 SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318 WHIRLPOOL 4ec289a2a4115e9b7cad4206fd5787b013bd273d42de1b197c17407e78c607a1d733213ff7068781ab6cc62cbc213f192ad6f0fcc363e053288a86e4d1002714
-DIST rails-4.2.8.tgz 4077925 SHA256 55e15e101fc4a466a8acafdd679509f6e25992d50ade2d98b098558c698a6320 SHA512 a457ec7422b83f35e8d1ac26f1ef8fbaec985034c5804ce92334c45fa4e4b11a29acdcef2c009c36be2deb4724faeb91b99f76a665eeacd1bda9448db2299f89 WHIRLPOOL ed46c71f527ba59f0ff4d00ae5881b46984500b4493b4c511b8037d94c76b40c0e531c635337b0795887e028aad5136048ba69b57e482489c3c049585f18f42f
-DIST rails-4.2.9.tgz 4080618 SHA256 c6b2119e0ef5a3359d00a0e634b5a3bd833e8d1108d96beaecaf83d7f82fce4e SHA512 2facc17faf0e76c8e13f997c9def344bd3e35aa77a596d85975f47eba837f99033f492f45485448f924adea95ffdd2f7c169dd2970be5f8c12bbafb23da51ec3 WHIRLPOOL adee3ffecc82838fbcbce50dfacb8ef813e061508f04306d15022c10fd0778cc2cde20ce2b913c4543541fce070b1a89439b56f4426cbe8a002e0d1fbfc6e33e
-DIST rails-5.0.3.tgz 6041420 SHA256 0c16f63af96529c1e3d2b4476031bd024ae403322fe78e80e188a422412dc582 SHA512 5a25747507d2a8e1d2a19ce14c77a80c4f9bd5751fb343c3f405b8d9ec170d11fb866ebfedf6b850b6750399015631ab1551e6f78e097c6514061462a05e88f3 WHIRLPOOL 25fd8473a4eed2f007b99e22cb7ccf834780d4f21478a0818c44bea525f4c839610bab2b52ae5087a881f8d5519b78616f4e53e6a21f7d6f9270c0ddf648a2a5
-DIST rails-5.0.4.tgz 6041948 SHA256 50f64f8c1d083d22a652ce4d594b38674a502b89ed7b913ebb9f1dce6984a32e SHA512 9a99d506606f2901f8b4afcfa8cc92e7d122b0879c619a539aee52df5b8926e6dca98e0eb14234f810b8a73730c3c051985e13ab0bab5f52cd8c11a0b112c44d WHIRLPOOL 842f3dfd691c7904804be128e4acf555076b96e5dbb8d874918a6492991f67c31faf8d4a5410969eadcef1166035f64c1fed6e8ae4f9f2b808600ea729a15808
-DIST rails-5.0.5.tgz 6043034 SHA256 a918bf9ee44252403de3f8f97b7de05a516e7fcf8368d01b1614826963ccc3a0 SHA512 7f06b31782b9814d2f9b1015d6f85944ee64d627d70d207f897401e7da4b504302990c629ff0ea93ca1d6820e1a11b5db78b525b50c8cd6cd8b5826452012b0c WHIRLPOOL 5f3a440184539c2d0680f71c221c83def9fb0b89520e7320e1fc4f517373d90450ad6e3966894c2e32d4cefd7a2a01e081ecb3a27346b5d0b28eb0f9ae1b5f26
-DIST rails-5.0.6.tgz 6043860 SHA256 be73ef6f421f0657a16fd2e9c3a582930d26cf30ab64484ab1cc9916b586b546 SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410 WHIRLPOOL 12732ac0a18b6e315cb18d366646a9627cbef904287722046adca93e3d0a95cb0f4c8ec174cfb4f929bc2a32dfc3e1a5dbc7fe176d8da6579c37af253fdf81c9
-DIST rails-5.1.1.tgz 6124695 SHA256 a09bfa7d2917865778af70dff8bd57fe01820eca0228cff85de581ee17e9adf2 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f WHIRLPOOL a23d6644126e6e01481c48c7089208a535188b5b32ad67cb69db36ac2044ee35bd95d4012076d7f12666aed2cbe984c75c3555889923710f10b1b91c150ccc73
-DIST rails-5.1.2.tgz 6124489 SHA256 cd6173b2ca492397d1cf22190a3070f1af485c2e25f7d9b3c2d0a80f553b4aae SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872 WHIRLPOOL ba3d0e231f4307343c6c955ecc273ac2e507d503f58a859ea81addd945bd8007190d45f18afbf3ec6915872af324a27dd2377927efe5e6c857e2ca09b6549fce
-DIST rails-5.1.3.tgz 6130089 SHA256 1d8f5f504173207eb8a418e071c75f656684ac4fea4b0e07d737c1c9accad423 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236 WHIRLPOOL 0561f9f386b8ab0c732302e369d159b65766a744b1784cbdabfbab46e27219128dd8bc39e262ae3d137ea3a03402174bfe7318fe87b00b2f28cf084f9089afff
-DIST rails-5.1.4.tgz 6132874 SHA256 d04168edcc8a230b80e77b766c86264a72456b56650fc45e41e5b9eb6ead1a26 SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc WHIRLPOOL b2e51c627627b1d88e8415349aacfae14b9270727090e4460ac4ddd8f34ced3b56b3345cb00158be14b7283bd56673a4c770f053ce02d98db1d10f5351a0778b
+DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
+DIST rails-5.0.3.tgz 6041420 BLAKE2B 972a85b23446e874cfd737b8c46ec1a9c94d387812e223c7ea702dee42047c8586f35254b90a3c99f7c571d4d99fd01a0c38bb994544be5840e08dca82e86bb4 SHA512 5a25747507d2a8e1d2a19ce14c77a80c4f9bd5751fb343c3f405b8d9ec170d11fb866ebfedf6b850b6750399015631ab1551e6f78e097c6514061462a05e88f3
+DIST rails-5.0.4.tgz 6041948 BLAKE2B 2d48efbc72b325604d77e1bde8e2e5eee297e752d5e9bbcbfe2c6fd2667a2db0005f5f5e6c7d46401faaf13911b30469506730530de2517f2ce9969819e3bbb4 SHA512 9a99d506606f2901f8b4afcfa8cc92e7d122b0879c619a539aee52df5b8926e6dca98e0eb14234f810b8a73730c3c051985e13ab0bab5f52cd8c11a0b112c44d
+DIST rails-5.0.5.tgz 6043034 BLAKE2B 1bf0e636d44a05ee83165f54b459d34509021d47b24844726c9baa872cdfbdeab6e22374f98d013d6be40d48d9dcac7e4216e4b08a1cce9868b1ded2b903165e SHA512 7f06b31782b9814d2f9b1015d6f85944ee64d627d70d207f897401e7da4b504302990c629ff0ea93ca1d6820e1a11b5db78b525b50c8cd6cd8b5826452012b0c
+DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
+DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651df49be3866e2df989d464a23ac5865081d243e6c6525837fb33099c46b6009cc667d0e03444cbcf9631588 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f
+DIST rails-5.1.2.tgz 6124489 BLAKE2B a7d71b99f1b9eb33e76c7941909407be0a3b086581bf3ddb4fe811a6b91bb129edb504c6fe3593a3b347ab035f7325e8e497b926a24b699a56725f89161e942e SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872
+DIST rails-5.1.3.tgz 6130089 BLAKE2B f61c016af6f5336726127372c1dd3d85088e11c0b58998ce40155b09087dcdb341a15d3ff57692d744538b571337a2e1e278542590d82077a35dc1e336539f85 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236
+DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 EBUILD activesupport-4.2.10.ebuild 2168 BLAKE2B 4bfe8e4d4d585733bbe6a0ab9618e5e79a04799eb699a11479b3036a123c030d1d2a99176ad5a463b6b218262f7df575506122fb36ccae504c890504374f97de SHA512 873c00a1090978e422509043f4f067c2478179db2c0bfb96d2afd9053754a89f015c4340785ed1efca3ff5e83992aeab6e72dface39c256e5b449238afe152a1
-EBUILD activesupport-4.2.8.ebuild 2294 BLAKE2B b11741433bf71b72d022a61b7d93fe97a77044e240efd50217dddb1f02069f5b213160a3f16dc9b3c3f4af12afe556a0b58d761d690b1478bedec7a5098b3f73 SHA512 44d50c00297914a8ebf8b43917f7347e30bae9d57ea3e90d6043bfbd754c38d1bb1bdada94601b306b00b06c13d2c339f2a2fd0de3a74cf14cd8650e6b888e80
-EBUILD activesupport-4.2.9.ebuild 2175 BLAKE2B 3ce2fd75c0ed1d08130a798b79cd99d7768ea47c9c4dfc96604ac08c1ef7e90a49f98547b551762c502bcd114e4478cb1bcf96026250f8fb3bad4eb3425fcdea SHA512 0dce6cc8949093faa58bc7ae8791b7bbaca092383bea0d65732cdc4dc0b5c8b61a6183f34f4ac2f5129ba10a144af19064d1ddd84a06fdeba3a44a827fc4a1ab
 EBUILD activesupport-5.0.3.ebuild 2423 BLAKE2B e89122f6c7c0062aec972d82ad88e8f550ad7e9d32e94e4ad672ab697a0cd28978fe6f2d588b2f5358e93c63e293507c37d19d57f72fc66eddcdb5cecabbaa67 SHA512 c74a9fd341a2a7de552176faee4b6b10e8ac5242b55502f1cbbed98f34a79358b6c9ec8b93a2e22e9fe1bf251f2186282557fcead77af8b9fb662985b25b61a4
 EBUILD activesupport-5.0.4.ebuild 2551 BLAKE2B f43e336330f5078cb31dd225e667bdde07b8c3932dfdce18810b3712a530fa1b30d517f97083bae9616d6e0dd29e97814ccc6892e684b9b55e7b9ab39bda5ad1 SHA512 d0fba8bdc6c62476e22f73208b72c84a85f2347db77616c37f9d430d9570963f63b348e39571e241baff8c48688064b34585c6d4f8749fa6683839ead8d80455
 EBUILD activesupport-5.0.5.ebuild 2551 BLAKE2B f43e336330f5078cb31dd225e667bdde07b8c3932dfdce18810b3712a530fa1b30d517f97083bae9616d6e0dd29e97814ccc6892e684b9b55e7b9ab39bda5ad1 SHA512 d0fba8bdc6c62476e22f73208b72c84a85f2347db77616c37f9d430d9570963f63b348e39571e241baff8c48688064b34585c6d4f8749fa6683839ead8d80455
diff --git a/dev-ruby/activesupport/activesupport-4.2.8.ebuild b/dev-ruby/activesupport/activesupport-4.2.8.ebuild
deleted file mode 100644
index d963a4f3ad2c..000000000000
--- a/dev-ruby/activesupport/activesupport-4.2.8.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/i18n-0.7:0.7
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/thread_safe-0.3.4:0"
-
-# 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/rack
-	dev-ruby/mocha:0.14
-	)"
-
-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\|mime-types\|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 that seems to be broken by lack of DST.
-	sed -i -e '369 s:^:#:' test/core_ext/string_ext_test.rb || die
-
-	# Avoid test that fails with Minitest 5.4 since that already defines
-	# a string E in its TestCase.
-	rm test/core_ext/marshal_test.rb || die
-	sed -i -e '/test_const_missing_in_anonymous_modules/askip "gentoo minitest"' test/dependencies_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-4.2.9.ebuild b/dev-ruby/activesupport/activesupport-4.2.9.ebuild
deleted file mode 100644
index 58dacef50e41..000000000000
--- a/dev-ruby/activesupport/activesupport-4.2.9.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/i18n-0.7:0.7
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/thread_safe-0.3.4:0"
-
-# 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/rack
-	dev-ruby/mocha:0.14
-	)"
-
-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\|mime-types\|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 that fails with Minitest 5.4 since that already defines
-	# a string E in its TestCase.
-	rm test/core_ext/marshal_test.rb || die
-	sed -i -e '/test_const_missing_in_anonymous_modules/askip "gentoo minitest"' test/dependencies_test.rb || die
-}
diff --git a/dev-ruby/ammeter/Manifest b/dev-ruby/ammeter/Manifest
index 2d6d9fbf6d00..ea2c97913695 100644
--- a/dev-ruby/ammeter/Manifest
+++ b/dev-ruby/ammeter/Manifest
@@ -1,4 +1,3 @@
-DIST ammeter-1.1.4.gem 19968 SHA256 bc0184bf656533d807acf37267bec3c5b00ad6ad41e7927d0f062e59cfdeada2 SHA512 57d24c67be85fe34ded8feda045771974be7cdd828780a82ff0b2f6b52d0b35b48c2eb7e59dae70700fba676242918ef6463448090d7729d49db0f05f04b0131 WHIRLPOOL 1b306f4ad62fa1ee483272e5f84cd01e53c4c8f2921c815c0ca38a28e012f6128fae225063b99db08ff90d0664ac272042470871f586c8db2b316cba972fc007
+DIST ammeter-1.1.4.gem 19968 BLAKE2B dbc773e4db83d820e5ef1c6ae3af2e65f87ff1a10a09759c66a4dad87cd175e5e8af857435b6df6cb93167869d31fb1f43dcf220e063db03d048aa8926c7daaf SHA512 57d24c67be85fe34ded8feda045771974be7cdd828780a82ff0b2f6b52d0b35b48c2eb7e59dae70700fba676242918ef6463448090d7729d49db0f05f04b0131
 EBUILD ammeter-1.1.4-r1.ebuild 1599 BLAKE2B 3d20ca8936628e349793327bafd9741ba1f6f65e09ba47af0933e0b7dc38c31b0c4f7454df7bf04045ca0f46b3269c6618dff5aaebdef4770a42b965b5c8161d SHA512 5f5be519c8ffd3f65441fb869d29649d37c096e906ecaf387ba7fd801e0e9196c05b86f33d58449a5a07fb0d7c50135622d1b5812d3cef621532986dbf74a596
-EBUILD ammeter-1.1.4.ebuild 1604 BLAKE2B e3a2b28a50544de414f4a668fadb40b92071ef364cd053bb97366e2f6c20825e6545f9db30cac9f5b8316ba23ec5a2ee29b929788d9f474278fb86e43d9ebede SHA512 f7df42ada35ac50f39be4a0322b1d5124a39f513e81f64556c7d2fa0f5f5863f1d855fbc9e7d02229657a9b4862b0303147949346efcef542a3e222a394e2cb6
 MISC metadata.xml 348 BLAKE2B 1eae86b63a0e04b8b5e8d8d9438b102b029a919af6fdb0cf2319b11a3c50ee282a255dedd7bad0bc3098ea8d1c0c05e17a5d98b382fa454feebbd304b18d3f57 SHA512 f81eb53098c1d67a4d5cfe32c9b3aace294cb90788775c639e189cf3932ef8101466d9a1541ceada391ebdacfedf926d9549f4591b42efd6c391e5fe6b0e72f1
diff --git a/dev-ruby/ammeter/ammeter-1.1.4.ebuild b/dev-ruby/ammeter/ammeter-1.1.4.ebuild
deleted file mode 100644
index d7cea2af69ea..000000000000
--- a/dev-ruby/ammeter/ammeter-1.1.4.ebuild
+++ /dev/null
@@ -1,65 +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"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Write specs for your Rails 3+ generators"
-HOMEPAGE="https://github.com/alexrothenberg/ammeter"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# Restrict tests since they now require the specific rspec version to be
-# provided in an environment variable.
-#RESTRICT="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/activesupport-3.0:*
-	>=dev-ruby/railties-3.0:*
-	>=dev-ruby/rspec-rails-2.2:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rails-4.0
-		>=dev-ruby/uglifier-1.3
-		>=dev-ruby/rake-0.10
-		>=dev-ruby/coffee-rails-4.0
-		>=dev-ruby/sass-rails-4.0
-		>=dev-ruby/jquery-rails-3.0
-		dev-util/cucumber
-		dev-util/aruba
-		dev-ruby/sqlite3
-		dev-ruby/bundler
-	)"
-
-all_ruby_prepare() {
-	# fix the gemspec; we remove the version dependencies from there, as
-	# it requires _older_ versions of its dependencies.. it doesn't
-	# really seem to be the case though. Also remove the references to
-	# git ls-files to avoid calling it.
-	sed -i \
-		-e '/git ls-files/d' \
-		-e '/\(cucumber\|aruba\)/s:,.*$::' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# haml-rails is not packaged
-	sed -i -e '/haml-rails/d' ${RUBY_FAKEGEM_GEMSPEC} Gemfile || die
-	rm -f spec/ammeter/rspec/generator/matchers/have_correct_syntax_spec.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec ${RUBY} -S rspec-3 spec || die
-}
diff --git a/dev-ruby/aws-sdk-core/Manifest b/dev-ruby/aws-sdk-core/Manifest
index 4f595a6dab28..23cacb27d1e6 100644
--- a/dev-ruby/aws-sdk-core/Manifest
+++ b/dev-ruby/aws-sdk-core/Manifest
@@ -1,8 +1,10 @@
-DIST aws-sdk-ruby-2.10.37.tar.gz 3215615 SHA256 6e1e31114ba6fdbde81bbe573a155073544f9fc7641789a848961bcacf51225e SHA512 987697dfac653035056b96de150e5db209b6db1224fa200913d60a239de0509b48d2a6f32e65b0ccce4195324874fa102b93a4181ffb4e9d4660cd9101fc2500 WHIRLPOOL a8fb464900b2b8c9225e77ac75755ea4a8bee347e9891ff366dd6ea5efff9544370626429300c5d66ae825b6a628d2506b8dd3dc731d1ae675d97723f9a0c9a3
-DIST aws-sdk-ruby-2.10.74.tar.gz 3276717 SHA256 e11bd2a64fd06f686a5737de08c205ab9894f5686ea0ec1f38a8515436aec63c SHA512 844fc20aefd11ce06e64ad80576a9467baad3e02b6e26864fde4e7e99bbfa90985ec93a154c6a4bc55d809beec0e5dd505288e664309bdfb59a68f17f1b4b254 WHIRLPOOL da16cb0e4e667513c61bdaec32c1405f6e368b8970fc197ffd1c61a538280c42916edd83a965303ef23c5479fda7bfd786ad36bf1a2e40e5f4718c39aa6d7091
-DIST aws-sdk-ruby-2.6.50.tar.gz 2794854 SHA256 6157d8ad834020f83fd7db332ff4b0a719bf0a0791ae4e7da5530915c19dbe30 SHA512 3b592e25a135b369c67ddfd8d3c33db3b25faaac3161feeb5aa3feb1fdb6cfb5ca44cadc688dcfc8d456a398d94242f7ebc2922a82547b9b767249f4c9bdc0bc WHIRLPOOL 5640fec6e04f4f7ac8abf56365fd94dc77d13c169a76655fc55393f06c45d11ff2f1a6c5b4f3957e7404b76a7a18dfc033a50aa57df5d878acf2b39cc47e741b
-DIST aws-sdk-ruby-2.8.14.tar.gz 2925334 SHA256 3fd54d79269e0a06ebdbb8ce41c7f47002a450de2ef96cb5add33f45eef3cf3e SHA512 d45e98acb924163dd0ee555ecb45729247f5bd4b788e6c22f5e95c02102945b9b67c5451958eaa2aa2195a773a49e6359405a89242cd1e283971c6065bc3de61 WHIRLPOOL 9f6e705c8fe96a7fb610b86e2f62c039d37ed89bbb07a39fd66db2c828408b69f8acffc6667de718c22ff080780c5481bb37c7e12c65e57a470360a913a67dc5
-DIST aws-sdk-ruby-2.9.44.tar.gz 3084191 SHA256 6eb8f8b992b6cce654b6f40f37bbdd6d061580f9878e44c68ebbcabf2732829d SHA512 b2ef48a821143fed624f348a30774ca9fd65af432a09a1699af84d4a757bb7026439fa07e29c43813e504baa9383285434fe72912265ef9ad50f3c2ec3f26176 WHIRLPOOL c75cbc67ff6cb8cb90468d6d2f0b73f6c5b1f1ee5413c1a812772c85bf2638197f3a67dfa067d78153e02feac1816ccd831712e5c86910d858161089570bbedc
+DIST aws-sdk-ruby-2.10.100.tar.gz 3618410 BLAKE2B 00ed6a1061901d9574f0f426dde30bb6b9565e304549aa44008a5f26368b6d143bc3e448e5b24e38a7d1e0cadbed728e961f4df3c808ce52bf941a7e3e74f0fc SHA512 39e7abb9e549803a27422a1765b84cf0e4d08a93632a6646eb1b39d67e11329ca78b4de739f8fac98291014ca408a73bf1659d9e9021c94c1494612e2c5e3679
+DIST aws-sdk-ruby-2.10.37.tar.gz 3215615 BLAKE2B 2c7fafb4e7226d4e1f149b9aeac0f1afa20711d52619a7adfc356d4b17b8a84a8224bef5993765c32fbaf80e5866bd57ed28bd3454fe4b85b23193f3ec951198 SHA512 987697dfac653035056b96de150e5db209b6db1224fa200913d60a239de0509b48d2a6f32e65b0ccce4195324874fa102b93a4181ffb4e9d4660cd9101fc2500
+DIST aws-sdk-ruby-2.10.74.tar.gz 3276717 BLAKE2B b78b2fcb84baf00475270da941d9a66da75893e74a2c6712553625c549c504d433e827e155ce3389b0e9324936fde36bdeaf905fb91082d823886d93ee9f6f68 SHA512 844fc20aefd11ce06e64ad80576a9467baad3e02b6e26864fde4e7e99bbfa90985ec93a154c6a4bc55d809beec0e5dd505288e664309bdfb59a68f17f1b4b254
+DIST aws-sdk-ruby-2.6.50.tar.gz 2794854 BLAKE2B c91d73a5d9bbf49650961ecc0130b6071e2928e8a05f9822cc890bda781006e417e2ee706549070b8be7f921a4090dd8bd43ecd57520a0b699ead94581fc1a4c SHA512 3b592e25a135b369c67ddfd8d3c33db3b25faaac3161feeb5aa3feb1fdb6cfb5ca44cadc688dcfc8d456a398d94242f7ebc2922a82547b9b767249f4c9bdc0bc
+DIST aws-sdk-ruby-2.8.14.tar.gz 2925334 BLAKE2B 28724d1ea0d25eb4e5ec0e5e64150cd2b796051aa6ab804ff6caf4aff79df5823fa9424b1702ec1e0a0d39f3bf30c1c2e52d2a016f27fde2b46f0e98ede1afdc SHA512 d45e98acb924163dd0ee555ecb45729247f5bd4b788e6c22f5e95c02102945b9b67c5451958eaa2aa2195a773a49e6359405a89242cd1e283971c6065bc3de61
+DIST aws-sdk-ruby-2.9.44.tar.gz 3084191 BLAKE2B 8fab4b1147b881963c6349a9831c899a75e332c3bdc4b8dc1e6c221fd70c8defbe43017a96972dccf96dcce855b4f58233ed77fbc695f649016b86c8d276219d SHA512 b2ef48a821143fed624f348a30774ca9fd65af432a09a1699af84d4a757bb7026439fa07e29c43813e504baa9383285434fe72912265ef9ad50f3c2ec3f26176
+EBUILD aws-sdk-core-2.10.100.ebuild 1099 BLAKE2B 8af09b83e62206d65195ea4d5d8f39a8e400f3284bcd8614a29a61167dbb4797479eb0ad33302a01819cee32a4b90e56744a69fe8e57c09d07c2be7132600dfb SHA512 7e898f070707f5c9336d66e67226133995be884737422a6d0105fa97201f13bb03f63e52141d72aa903671d34d79a88ab3458d577c2ef4c8ef1a8c04faaee5da
 EBUILD aws-sdk-core-2.10.37.ebuild 1092 BLAKE2B 2719bd2f0843f7b5719005d42a5d2a004df627678e667b06eb6db97cc7535e903c0af643e75f0435d8b93ffe0e4d91ab5c333acbdd8275c4c22f2d71284797bc SHA512 f708238d8c90824a0599d0ac67650b3527daaf2d39edfc03c21147fb1318d0b1c6876374163f1fada63b247d87c446aa00366e0b35bf7cadb41cd1a5abac94cf
 EBUILD aws-sdk-core-2.10.74.ebuild 1099 BLAKE2B 8af09b83e62206d65195ea4d5d8f39a8e400f3284bcd8614a29a61167dbb4797479eb0ad33302a01819cee32a4b90e56744a69fe8e57c09d07c2be7132600dfb SHA512 7e898f070707f5c9336d66e67226133995be884737422a6d0105fa97201f13bb03f63e52141d72aa903671d34d79a88ab3458d577c2ef4c8ef1a8c04faaee5da
 EBUILD aws-sdk-core-2.6.50.ebuild 1098 BLAKE2B 7598e2c0da31ead48f6b1af89617a88a0e4ec8506378aa0df3bf9b246da0f5941a0ad943392011ca669a5addfd64e9d095727664c5023caa1480b196dce26a2b SHA512 e45331306742f89f40e66244484b4fd4741900be8b28cf6f10593cb98ad4e53fd810c09b8bfd6f5a7aec71a7ce256a0ef6732e6e745d8d68d9eb75c843a8ae39
diff --git a/dev-ruby/aws-sdk-core/aws-sdk-core-2.10.100.ebuild b/dev-ruby/aws-sdk-core/aws-sdk-core-2.10.100.ebuild
new file mode 100644
index 000000000000..3c1115f5dbcf
--- /dev/null
+++ b/dev-ruby/aws-sdk-core/aws-sdk-core-2.10.100.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="apis ca-bundle.crt endpoints.json"
+
+GITHUB_USER="aws"
+GITHUB_PROJECT="aws-sdk-ruby"
+RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Official SDK for Amazon Web Services"
+HOMEPAGE="https://aws.amazon.com/sdkforruby"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/aws-sigv4 dev-ruby/jmespath:1"
+
+ruby_add_bdepend "test? ( dev-ruby/webmock )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid spec that gets confused by our directory names
+	sed -i -e '/requires prefixes from plugin names when loading/,/end/ s:^:#:' \
+		spec/seahorse/client/plugin_list_spec.rb || die
+}
diff --git a/dev-ruby/aws-sdk-resources/Manifest b/dev-ruby/aws-sdk-resources/Manifest
index 649215d9e86c..561972d2d320 100644
--- a/dev-ruby/aws-sdk-resources/Manifest
+++ b/dev-ruby/aws-sdk-resources/Manifest
@@ -1,8 +1,10 @@
-DIST aws-sdk-ruby-2.10.37.tar.gz 3215615 SHA256 6e1e31114ba6fdbde81bbe573a155073544f9fc7641789a848961bcacf51225e SHA512 987697dfac653035056b96de150e5db209b6db1224fa200913d60a239de0509b48d2a6f32e65b0ccce4195324874fa102b93a4181ffb4e9d4660cd9101fc2500 WHIRLPOOL a8fb464900b2b8c9225e77ac75755ea4a8bee347e9891ff366dd6ea5efff9544370626429300c5d66ae825b6a628d2506b8dd3dc731d1ae675d97723f9a0c9a3
-DIST aws-sdk-ruby-2.10.74.tar.gz 3276717 SHA256 e11bd2a64fd06f686a5737de08c205ab9894f5686ea0ec1f38a8515436aec63c SHA512 844fc20aefd11ce06e64ad80576a9467baad3e02b6e26864fde4e7e99bbfa90985ec93a154c6a4bc55d809beec0e5dd505288e664309bdfb59a68f17f1b4b254 WHIRLPOOL da16cb0e4e667513c61bdaec32c1405f6e368b8970fc197ffd1c61a538280c42916edd83a965303ef23c5479fda7bfd786ad36bf1a2e40e5f4718c39aa6d7091
-DIST aws-sdk-ruby-2.6.50.tar.gz 2794854 SHA256 6157d8ad834020f83fd7db332ff4b0a719bf0a0791ae4e7da5530915c19dbe30 SHA512 3b592e25a135b369c67ddfd8d3c33db3b25faaac3161feeb5aa3feb1fdb6cfb5ca44cadc688dcfc8d456a398d94242f7ebc2922a82547b9b767249f4c9bdc0bc WHIRLPOOL 5640fec6e04f4f7ac8abf56365fd94dc77d13c169a76655fc55393f06c45d11ff2f1a6c5b4f3957e7404b76a7a18dfc033a50aa57df5d878acf2b39cc47e741b
-DIST aws-sdk-ruby-2.8.14.tar.gz 2925334 SHA256 3fd54d79269e0a06ebdbb8ce41c7f47002a450de2ef96cb5add33f45eef3cf3e SHA512 d45e98acb924163dd0ee555ecb45729247f5bd4b788e6c22f5e95c02102945b9b67c5451958eaa2aa2195a773a49e6359405a89242cd1e283971c6065bc3de61 WHIRLPOOL 9f6e705c8fe96a7fb610b86e2f62c039d37ed89bbb07a39fd66db2c828408b69f8acffc6667de718c22ff080780c5481bb37c7e12c65e57a470360a913a67dc5
-DIST aws-sdk-ruby-2.9.44.tar.gz 3084191 SHA256 6eb8f8b992b6cce654b6f40f37bbdd6d061580f9878e44c68ebbcabf2732829d SHA512 b2ef48a821143fed624f348a30774ca9fd65af432a09a1699af84d4a757bb7026439fa07e29c43813e504baa9383285434fe72912265ef9ad50f3c2ec3f26176 WHIRLPOOL c75cbc67ff6cb8cb90468d6d2f0b73f6c5b1f1ee5413c1a812772c85bf2638197f3a67dfa067d78153e02feac1816ccd831712e5c86910d858161089570bbedc
+DIST aws-sdk-ruby-2.10.100.tar.gz 3618410 BLAKE2B 00ed6a1061901d9574f0f426dde30bb6b9565e304549aa44008a5f26368b6d143bc3e448e5b24e38a7d1e0cadbed728e961f4df3c808ce52bf941a7e3e74f0fc SHA512 39e7abb9e549803a27422a1765b84cf0e4d08a93632a6646eb1b39d67e11329ca78b4de739f8fac98291014ca408a73bf1659d9e9021c94c1494612e2c5e3679
+DIST aws-sdk-ruby-2.10.37.tar.gz 3215615 BLAKE2B 2c7fafb4e7226d4e1f149b9aeac0f1afa20711d52619a7adfc356d4b17b8a84a8224bef5993765c32fbaf80e5866bd57ed28bd3454fe4b85b23193f3ec951198 SHA512 987697dfac653035056b96de150e5db209b6db1224fa200913d60a239de0509b48d2a6f32e65b0ccce4195324874fa102b93a4181ffb4e9d4660cd9101fc2500
+DIST aws-sdk-ruby-2.10.74.tar.gz 3276717 BLAKE2B b78b2fcb84baf00475270da941d9a66da75893e74a2c6712553625c549c504d433e827e155ce3389b0e9324936fde36bdeaf905fb91082d823886d93ee9f6f68 SHA512 844fc20aefd11ce06e64ad80576a9467baad3e02b6e26864fde4e7e99bbfa90985ec93a154c6a4bc55d809beec0e5dd505288e664309bdfb59a68f17f1b4b254
+DIST aws-sdk-ruby-2.6.50.tar.gz 2794854 BLAKE2B c91d73a5d9bbf49650961ecc0130b6071e2928e8a05f9822cc890bda781006e417e2ee706549070b8be7f921a4090dd8bd43ecd57520a0b699ead94581fc1a4c SHA512 3b592e25a135b369c67ddfd8d3c33db3b25faaac3161feeb5aa3feb1fdb6cfb5ca44cadc688dcfc8d456a398d94242f7ebc2922a82547b9b767249f4c9bdc0bc
+DIST aws-sdk-ruby-2.8.14.tar.gz 2925334 BLAKE2B 28724d1ea0d25eb4e5ec0e5e64150cd2b796051aa6ab804ff6caf4aff79df5823fa9424b1702ec1e0a0d39f3bf30c1c2e52d2a016f27fde2b46f0e98ede1afdc SHA512 d45e98acb924163dd0ee555ecb45729247f5bd4b788e6c22f5e95c02102945b9b67c5451958eaa2aa2195a773a49e6359405a89242cd1e283971c6065bc3de61
+DIST aws-sdk-ruby-2.9.44.tar.gz 3084191 BLAKE2B 8fab4b1147b881963c6349a9831c899a75e332c3bdc4b8dc1e6c221fd70c8defbe43017a96972dccf96dcce855b4f58233ed77fbc695f649016b86c8d276219d SHA512 b2ef48a821143fed624f348a30774ca9fd65af432a09a1699af84d4a757bb7026439fa07e29c43813e504baa9383285434fe72912265ef9ad50f3c2ec3f26176
+EBUILD aws-sdk-resources-2.10.100.ebuild 881 BLAKE2B f896bc1ffcfa1d0a917403c4b23ee6763f68690be2062b24c18fd285cfc457a4b8c46ec0eee3c9fdbf3ad1369ee7c93868bcf1193a1d88a5eac82167cc16ed12 SHA512 e45b938ca519bbe9e2d25f4b58c75d250c328f86336cb7659679057cc7aecec378d01c5d5fea2f3a974c711cab6d213f3a9936099af521428c554864cbc585c4
 EBUILD aws-sdk-resources-2.10.37.ebuild 874 BLAKE2B db9ee59190649174ce8f4cbbd041bb1524c625f3307832874093486500c55092b643dfee0e4e2f7163b65db521a602886bd7fb51089291ead5c91e1b6efe5dc0 SHA512 cd2c9693280c7b154797ae70f81e8a488dbe266536a4cf887cab532f9743a908a2b19bf05666011bfb77e2fb70f6e1188f4a9ab7109c8a73a9218cacd8233ce7
 EBUILD aws-sdk-resources-2.10.74.ebuild 881 BLAKE2B f896bc1ffcfa1d0a917403c4b23ee6763f68690be2062b24c18fd285cfc457a4b8c46ec0eee3c9fdbf3ad1369ee7c93868bcf1193a1d88a5eac82167cc16ed12 SHA512 e45b938ca519bbe9e2d25f4b58c75d250c328f86336cb7659679057cc7aecec378d01c5d5fea2f3a974c711cab6d213f3a9936099af521428c554864cbc585c4
 EBUILD aws-sdk-resources-2.6.50.ebuild 880 BLAKE2B 4680557f1963aa32ea6ab341e7daab6b84064db9a07f5d2f1fddf039a729fda70ca0d0ea8def12c3035b76c2a0187821bd30207c948f1f07d6324f15fe4cb3e6 SHA512 13e051af5a8150fe78c220b662c78cac75add8caebcc24c157f45a960cb2bed6eccc4561ce56c38d7f237e6f23471972e2d5abf1c46a4b5b5b59127850578703
diff --git a/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.10.100.ebuild b/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.10.100.ebuild
new file mode 100644
index 000000000000..7b7648c32af8
--- /dev/null
+++ b/dev-ruby/aws-sdk-resources/aws-sdk-resources-2.10.100.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="resources.schema.json"
+
+GITHUB_USER="aws"
+GITHUB_PROJECT="aws-sdk-ruby"
+RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Official SDK for Amazon Web Services"
+HOMEPAGE="https://aws.amazon.com/sdkforruby"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "~dev-ruby/aws-sdk-core-${PV}"
+
+ruby_add_bdepend "dev-ruby/webmock"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/aws-sdk/Manifest b/dev-ruby/aws-sdk/Manifest
index 817d03afd2a0..c8942247e140 100644
--- a/dev-ruby/aws-sdk/Manifest
+++ b/dev-ruby/aws-sdk/Manifest
@@ -1,10 +1,12 @@
-DIST aws-sdk-ruby-1.66.0.tar.gz 1774530 SHA256 265e20a99c17d3f476ce6f6e981fd37e8e529dac2a38eba1ef7a25205f8f49b6 SHA512 53b13bab1db26f9eb6ba411a7143377fbdc56548fe881742953f388af60508be30cc2c82a3dce89675be2c799774d30313d19b47875a52d4c9134ce5f4b1914c WHIRLPOOL 265d01034a3e31f8e12dc8962d67fa727e7123de0e5c56c633a84d4b7e91168f6c8ea9f4e4291ef54ef570f4675f2f087610bf11b11ec9efdb1c345c42dcb1ec
-DIST aws-sdk-ruby-2.10.37.tar.gz 3215615 SHA256 6e1e31114ba6fdbde81bbe573a155073544f9fc7641789a848961bcacf51225e SHA512 987697dfac653035056b96de150e5db209b6db1224fa200913d60a239de0509b48d2a6f32e65b0ccce4195324874fa102b93a4181ffb4e9d4660cd9101fc2500 WHIRLPOOL a8fb464900b2b8c9225e77ac75755ea4a8bee347e9891ff366dd6ea5efff9544370626429300c5d66ae825b6a628d2506b8dd3dc731d1ae675d97723f9a0c9a3
-DIST aws-sdk-ruby-2.10.74.tar.gz 3276717 SHA256 e11bd2a64fd06f686a5737de08c205ab9894f5686ea0ec1f38a8515436aec63c SHA512 844fc20aefd11ce06e64ad80576a9467baad3e02b6e26864fde4e7e99bbfa90985ec93a154c6a4bc55d809beec0e5dd505288e664309bdfb59a68f17f1b4b254 WHIRLPOOL da16cb0e4e667513c61bdaec32c1405f6e368b8970fc197ffd1c61a538280c42916edd83a965303ef23c5479fda7bfd786ad36bf1a2e40e5f4718c39aa6d7091
-DIST aws-sdk-ruby-2.6.50.tar.gz 2794854 SHA256 6157d8ad834020f83fd7db332ff4b0a719bf0a0791ae4e7da5530915c19dbe30 SHA512 3b592e25a135b369c67ddfd8d3c33db3b25faaac3161feeb5aa3feb1fdb6cfb5ca44cadc688dcfc8d456a398d94242f7ebc2922a82547b9b767249f4c9bdc0bc WHIRLPOOL 5640fec6e04f4f7ac8abf56365fd94dc77d13c169a76655fc55393f06c45d11ff2f1a6c5b4f3957e7404b76a7a18dfc033a50aa57df5d878acf2b39cc47e741b
-DIST aws-sdk-ruby-2.8.14.tar.gz 2925334 SHA256 3fd54d79269e0a06ebdbb8ce41c7f47002a450de2ef96cb5add33f45eef3cf3e SHA512 d45e98acb924163dd0ee555ecb45729247f5bd4b788e6c22f5e95c02102945b9b67c5451958eaa2aa2195a773a49e6359405a89242cd1e283971c6065bc3de61 WHIRLPOOL 9f6e705c8fe96a7fb610b86e2f62c039d37ed89bbb07a39fd66db2c828408b69f8acffc6667de718c22ff080780c5481bb37c7e12c65e57a470360a913a67dc5
-DIST aws-sdk-ruby-2.9.44.tar.gz 3084191 SHA256 6eb8f8b992b6cce654b6f40f37bbdd6d061580f9878e44c68ebbcabf2732829d SHA512 b2ef48a821143fed624f348a30774ca9fd65af432a09a1699af84d4a757bb7026439fa07e29c43813e504baa9383285434fe72912265ef9ad50f3c2ec3f26176 WHIRLPOOL c75cbc67ff6cb8cb90468d6d2f0b73f6c5b1f1ee5413c1a812772c85bf2638197f3a67dfa067d78153e02feac1816ccd831712e5c86910d858161089570bbedc
+DIST aws-sdk-ruby-1.66.0.tar.gz 1774530 BLAKE2B 119c2947582e91747d54302112e07067cbacdf1cede272171f41b978e5251dfc0e87a57655491f752003324e1815adf842c6979392d38ba33696e33e0e0e3e38 SHA512 53b13bab1db26f9eb6ba411a7143377fbdc56548fe881742953f388af60508be30cc2c82a3dce89675be2c799774d30313d19b47875a52d4c9134ce5f4b1914c
+DIST aws-sdk-ruby-2.10.100.tar.gz 3618410 BLAKE2B 00ed6a1061901d9574f0f426dde30bb6b9565e304549aa44008a5f26368b6d143bc3e448e5b24e38a7d1e0cadbed728e961f4df3c808ce52bf941a7e3e74f0fc SHA512 39e7abb9e549803a27422a1765b84cf0e4d08a93632a6646eb1b39d67e11329ca78b4de739f8fac98291014ca408a73bf1659d9e9021c94c1494612e2c5e3679
+DIST aws-sdk-ruby-2.10.37.tar.gz 3215615 BLAKE2B 2c7fafb4e7226d4e1f149b9aeac0f1afa20711d52619a7adfc356d4b17b8a84a8224bef5993765c32fbaf80e5866bd57ed28bd3454fe4b85b23193f3ec951198 SHA512 987697dfac653035056b96de150e5db209b6db1224fa200913d60a239de0509b48d2a6f32e65b0ccce4195324874fa102b93a4181ffb4e9d4660cd9101fc2500
+DIST aws-sdk-ruby-2.10.74.tar.gz 3276717 BLAKE2B b78b2fcb84baf00475270da941d9a66da75893e74a2c6712553625c549c504d433e827e155ce3389b0e9324936fde36bdeaf905fb91082d823886d93ee9f6f68 SHA512 844fc20aefd11ce06e64ad80576a9467baad3e02b6e26864fde4e7e99bbfa90985ec93a154c6a4bc55d809beec0e5dd505288e664309bdfb59a68f17f1b4b254
+DIST aws-sdk-ruby-2.6.50.tar.gz 2794854 BLAKE2B c91d73a5d9bbf49650961ecc0130b6071e2928e8a05f9822cc890bda781006e417e2ee706549070b8be7f921a4090dd8bd43ecd57520a0b699ead94581fc1a4c SHA512 3b592e25a135b369c67ddfd8d3c33db3b25faaac3161feeb5aa3feb1fdb6cfb5ca44cadc688dcfc8d456a398d94242f7ebc2922a82547b9b767249f4c9bdc0bc
+DIST aws-sdk-ruby-2.8.14.tar.gz 2925334 BLAKE2B 28724d1ea0d25eb4e5ec0e5e64150cd2b796051aa6ab804ff6caf4aff79df5823fa9424b1702ec1e0a0d39f3bf30c1c2e52d2a016f27fde2b46f0e98ede1afdc SHA512 d45e98acb924163dd0ee555ecb45729247f5bd4b788e6c22f5e95c02102945b9b67c5451958eaa2aa2195a773a49e6359405a89242cd1e283971c6065bc3de61
+DIST aws-sdk-ruby-2.9.44.tar.gz 3084191 BLAKE2B 8fab4b1147b881963c6349a9831c899a75e332c3bdc4b8dc1e6c221fd70c8defbe43017a96972dccf96dcce855b4f58233ed77fbc695f649016b86c8d276219d SHA512 b2ef48a821143fed624f348a30774ca9fd65af432a09a1699af84d4a757bb7026439fa07e29c43813e504baa9383285434fe72912265ef9ad50f3c2ec3f26176
 EBUILD aws-sdk-1.66.0.ebuild 921 BLAKE2B e3034d7ee99f7ec704f15fdf4cdc91b46d0d343f3a0b52774cfd994cc065553ee32e0cd7110c2bfd70f9556f1f3b3ca379b5ef3d3d659fbc30f96be5f9ca21cb SHA512 3801a6fbb08021e59a3392355cad0072c29b76c1f0d1d61bee8991b4d954f860e9e109dc0fca936a8390d845cbfa2a1a25028291e036bf1f6f1da8a1e2611b4b
+EBUILD aws-sdk-2.10.100.ebuild 809 BLAKE2B 60297108fb3fc665b7b1d760f52a66c492974dbc8b68e6e2fed421e5bd14306672a06b57eeb4a040accb1f86dad9410d8dec57483cccf3a77c1ba46be07bca13 SHA512 813ddb148b63476561c1dfcfe8b8be1c76c541bb877468a9884dda80f6b4500862e04b1aa819c476c72c045008289030ee78e7f941d777e2c76c5c8f75559d33
 EBUILD aws-sdk-2.10.37.ebuild 802 BLAKE2B cf6a21c40922cbe53cd2d057ef46a11bef484753f0354f23da76b79084658f357f84ae49ee4b4b899c0bd5d8f0586764244cbec8bca1ef9d8fc489cdc0fa3887 SHA512 c79da5e2f228574ec120498249c41d7e41429563a4d2ef0b5555328d0eee8a1529479d38366a79b22d76b110482da9435b1ef9afde5059ec76b108cad9da9f59
 EBUILD aws-sdk-2.10.74.ebuild 809 BLAKE2B 60297108fb3fc665b7b1d760f52a66c492974dbc8b68e6e2fed421e5bd14306672a06b57eeb4a040accb1f86dad9410d8dec57483cccf3a77c1ba46be07bca13 SHA512 813ddb148b63476561c1dfcfe8b8be1c76c541bb877468a9884dda80f6b4500862e04b1aa819c476c72c045008289030ee78e7f941d777e2c76c5c8f75559d33
 EBUILD aws-sdk-2.6.50.ebuild 808 BLAKE2B c6ad34cc7786446a5b368045bd9fc09587557a844454d508c6de3f896413efa161f57aa530d25380ff9d616623bbd4076bc5ed07bac5f94a12366d8fd793e158 SHA512 51dad1513d1a59580034876778a600a2af5d0b08b88b8c78c8171a80a933e1416a46d611cdb057f9ebd7a3dc899879e17cc227e2cb20c0732e2b9145ee820e55
diff --git a/dev-ruby/aws-sdk/aws-sdk-2.10.100.ebuild b/dev-ruby/aws-sdk/aws-sdk-2.10.100.ebuild
new file mode 100644
index 000000000000..50ea2b16606d
--- /dev/null
+++ b/dev-ruby/aws-sdk/aws-sdk-2.10.100.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST=""
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="../CHANGELOG.md ../MIGRATING.md ../README.md ../UPGRADING.md"
+
+GITHUB_USER="aws"
+GITHUB_PROJECT="${PN}-ruby"
+RUBY_S="${GITHUB_PROJECT}-${PV}/${PN}"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Official SDK for Amazon Web Services"
+HOMEPAGE="https://aws.amazon.com/sdkforruby"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl
+	~dev-ruby/aws-sdk-resources-${PV}"
diff --git a/dev-ruby/factory_girl/Manifest b/dev-ruby/factory_girl/Manifest
index 83c002fd2d02..931f12b781ae 100644
--- a/dev-ruby/factory_girl/Manifest
+++ b/dev-ruby/factory_girl/Manifest
@@ -1,5 +1,3 @@
-DIST factory_girl-4.8.0.tar.gz 66025 SHA256 81149a7466ead3f3ecd5e9a4cecd19ca20646901669b2892a62413f54a24036b SHA512 c1e89b25c0dc3292b647179c3cfb487ae235d8049f936beb926c3799e0348ee66e4e6a5d3904fd1a11660477f4c2c993e5d2640a8f54f7cfc5779027d76cca61 WHIRLPOOL 075e04007a9e98c62ca09c4798cfd3dc3e1ebe7025d5b2ae1a2510f9d1a2d34ae9f9fbd56730c09757461d5c546f36517fb914c6c375bebb494409c8db268a4b
-DIST factory_girl-4.8.1.tar.gz 66262 SHA256 874255baaadcd8bedd289b3d8c39343f7ac228a6f43464e7f67f1085fabc6228 SHA512 2c27eaec8351b009bf200e10829128c5fd3e73b0383cebf7f3ccbe062ba362b29f25e5c054ed25245202c85c6ab60c637547a8f3719e2f079c86c83c30db48a0 WHIRLPOOL d3e702547015b75ce51295a1838c9aa757ee1a8c855498a8a0395258c05abba3f5a237a201aaf4e4cf371b9a71b8c5ff9362e0f605937bf9af1aba4b442bb633
-EBUILD factory_girl-4.8.0.ebuild 1334 BLAKE2B bc4e7a33dcdcce464b23606fa42463ef3737e328c29e382e7c1dfc8a2e49d662e6a5d251fdeaaa5762b9ba407c55aaa0607b1cf84478e0fb3cbe85aef210b898 SHA512 f9d0d01ebc771df112c8108af8f4250c3c2f232d365629dc48ec32a81f3da0db06b0b086837317b77c71312719ba647f714530e5c14fdb4ee446045c06fc2869
+DIST factory_girl-4.8.1.tar.gz 66262 BLAKE2B 6a90581ef7fe7f6e3d244bceebd10a4d725731ff2a7f6aae4265a6d235f5ef4f1069a0f1f2fa55121c9112b245dc947378745958583e9380536cc797d881a3aa SHA512 2c27eaec8351b009bf200e10829128c5fd3e73b0383cebf7f3ccbe062ba362b29f25e5c054ed25245202c85c6ab60c637547a8f3719e2f079c86c83c30db48a0
 EBUILD factory_girl-4.8.1.ebuild 1322 BLAKE2B 68648a2b99bbca17501728f8da93e1d7ffed5285f428a8d2e7b9a35f6739fc0d06ea8c334465ef5f543bcdc4dd85ab2c29ab7dcaf053c293c4bc5be7138cbbb1 SHA512 ddd96a37cba1dbe307cdcefa7523b9d3a929cdc79a11445c2ee820b35a261f648df79037bd042a8cdc3f8dceea2b33a6778f0549e08c25b2af584fbcfb95c0eb
 MISC metadata.xml 345 BLAKE2B 290711818c63550c33c47e1314d2e5a800f9229f44958cc06e5229a028527b455a7e7a2335fbc5e261d8b80f6d2d51e5926bb52e5d6db44d38c2ba8288bed624 SHA512 312e983fd6273c8664ddd317a6242d8176bc1ffd6f3be4842d90f4a8167c4a8e30acdac203812ead05d878d42c60588e74aaae48ee48ed0f4aa98884ddc6c6fc
diff --git a/dev-ruby/factory_girl/factory_girl-4.8.0.ebuild b/dev-ruby/factory_girl/factory_girl-4.8.0.ebuild
deleted file mode 100644
index c35532783667..000000000000
--- a/dev-ruby/factory_girl/factory_girl-4.8.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-# Tests depend on unpackaged appraisal, for now we just run the specs
-# with the version of Rails that is installed.
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="GETTING_STARTED.md NEWS README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="features"
-
-inherit ruby-fakegem
-
-DESCRIPTION="factory_girl provides a framework and DSL for defining and using factories"
-HOMEPAGE="https://github.com/thoughtbot/factory_girl"
-SRC_URI="https://github.com/thoughtbot/factory_girl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0:*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/activerecord-3.1[sqlite]
-		dev-ruby/bourne
-		>=dev-ruby/mocha-0.12.8
-		dev-ruby/rspec-its
-		dev-ruby/timecop
-	)
-"
-
-all_ruby_prepare() {
-	# Avoid unneeded test dependencies
-	sed -i -e '/simplecov/ s:^:#:' \
-		-e '1irequire "fileutils"' spec/spec_helper.rb || die
-
-	# Avoid specs that may fail due to more strict rspec 2.99
-	# interpretation.
-	sed -i -e '/callbacks using syntax methods without referencing FactoryGirl explicitly/,/^end/ s:^:#:' spec/acceptance/callbacks_spec.rb || die
-}
diff --git a/dev-ruby/fast_gettext/Manifest b/dev-ruby/fast_gettext/Manifest
index 3d2d259d2463..bf2ed7b333c1 100644
--- a/dev-ruby/fast_gettext/Manifest
+++ b/dev-ruby/fast_gettext/Manifest
@@ -1,10 +1,5 @@
-DIST fast_gettext-1.4.1.tar.gz 88329 BLAKE2B 2e8e75de28bd0e53a394367344544f3524213a0d0bce8d450e37f639f34499c2a80f400ea10c05b930ed9eec1c8d970a28e0c03780bc1076471d20909bb216e0 SHA512 43edce74ab294c92dc63baa855ec0a408ad3fa2092f920d71265516b64bbf2a10863b43aade55b583e792b6ef4901641f24cdce12477b595ffa86f47642dc522
-DIST fast_gettext-1.5.0.tar.gz 88258 BLAKE2B 710e013b7a1295b44f95827fc0e2dfdc805a4c0dfa98750b84a82440519292231ab7399d8af5b2c5408dab1fa7b1c54a524287d1805d2379c44f015094411002 SHA512 dabb6933337715b967ebebff5efc40b05cc5b59a254edc7399c905be30d378e25ac0e930d5a6317269e12f6b55db180b8e4580c679382d8f3cec2ee782d45563
 DIST fast_gettext-1.5.1.tar.gz 88259 BLAKE2B 75f9875e7a51d28a16d2acb690dfebe97bb0ac64a715b91348537b15c52643c2f08e5597cc135a95e66a0d4d87445ba40ba98b7c08f70a33cdae873c1e4d1e7f SHA512 44b6531d3a50982f2eee5f6154fd716411d85fcc19750781596253af1e841852f0178f2a735ba3d3d45a037c8204de18c6b1390d1e9e2bdd7b3f895eb740ccff
 DIST fast_gettext-1.6.0.tar.gz 88780 BLAKE2B 237a37bf505fe7520a25c6014f0524201905f8cf112624370477229db2d06f7160bad62e42878688ef954a1b72166e21a7f3a89de66c21aec780749fb26cd8bb SHA512 0f26cf8bd8a2078631d32be14fb6bd194dc9bd8a6727a355f4d2978441c972785747063ec4d8b8b1d4c78f07914a8b6cccf37ed85a37e7833bfe724d1d159ae9
-EBUILD fast_gettext-1.4.1-r1.ebuild 1502 BLAKE2B 62f8fe9a53138df27b414571bdef8719eb6dcad3139bc71feeeede8f62c086c7d22428b39397d0c443af1494d7d70f5e88a3da128993c4e5e82ae90c30730540 SHA512 331c6f696495025c85b154c6808d7549283b31aba313a085c9a34f347f83957ab044c5716deabae41d0801e0e5c0725dd36700f5c073f9b12f5a1da26014fecd
-EBUILD fast_gettext-1.4.1.ebuild 1492 BLAKE2B 0af4525bbf994293210441af8e849a308f6379c390c52e64c48c865820586e6a3bf6ecad861e04a978e1683c32e12182da056cb130a2f548cdc48fe9f2d678b6 SHA512 f415105dae08b21e54fd4cd1145d2c181bca825efe14a4403985f18e00ef4e796152502ee74f0a13e1a7fb2689b3a2e8165892f45145cd7707b1e8502307a208
-EBUILD fast_gettext-1.5.0.ebuild 1502 BLAKE2B 62f8fe9a53138df27b414571bdef8719eb6dcad3139bc71feeeede8f62c086c7d22428b39397d0c443af1494d7d70f5e88a3da128993c4e5e82ae90c30730540 SHA512 331c6f696495025c85b154c6808d7549283b31aba313a085c9a34f347f83957ab044c5716deabae41d0801e0e5c0725dd36700f5c073f9b12f5a1da26014fecd
 EBUILD fast_gettext-1.5.1.ebuild 1963 BLAKE2B 7ef844f2d36e7a2ca728a998d2329fa448658e78164255ba422cdabc1f616acfbaab3dfe89ebe3f9a837aff9408768c674a58d3203fa25dd459feecb161e28de SHA512 ce7f4cb2c64c3bafffdaa283d7f67a28889087c79e68e833f75de17730586b3bf38de05f2ab3e9357956b6d55989c751e4f0ade1751d205e73b7ae4b6f0aceb0
 EBUILD fast_gettext-1.6.0.ebuild 1956 BLAKE2B e00aee9438384b333f4b79ed842ae8e91df4bcaa2a29154d36cb0d35438c1974443b9663dc4a4dd5d7c5d6552297809fc1f297434178e75da07dbdbd273fe90a SHA512 282906039620913874f33b5caa60aea51475d96088c0a4fc3cee7d0e22498cc9c61b72a6e2644ff81fb2c56fe4c8a4084167162f5c8a4cec30c8ead0136b706c
 MISC metadata.xml 346 BLAKE2B 93a39aacb63cc0db79f126c108547c24dd182711584ef61c481b762a35f96cbee330ee29baea8d063e6f2ea2fc0491e572b860156f14be164ab29131a8f047a2 SHA512 1b57982213ae99ae1dc5ea06240bf81f7719f3cc576926de6a0d308f26895236eaa9b3312157eb5af3e47893787c9260e4386988a6f156c9a8b660aae85007ce
diff --git a/dev-ruby/fast_gettext/fast_gettext-1.4.1-r1.ebuild b/dev-ruby/fast_gettext/fast_gettext-1.4.1-r1.ebuild
deleted file mode 100644
index e3434c1e0df1..000000000000
--- a/dev-ruby/fast_gettext/fast_gettext-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!"
-HOMEPAGE="https://github.com/grosser/fast_gettext"
-SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activerecord[sqlite] dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm Gemfile.lock || die
-
-	# Remove jeweler and bump from Gemfile since they are not needed for tests.
-	sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die
-
-	# Avoid unneeded dependency on git and development dependencies.
-	sed -e '/git ls-files/ s:^:#:' \
-		-e '/\(wwtd\|bump\)/ s:^:#:' \
-		-i fast_gettext.gemspec || die
-
-	# Don't run a test that requires safe mode which we can't provide
-	# due to insecure directory settings for the portage dir. This spec
-	# also calls out to ruby which won't work with different ruby
-	# implementations.
-	sed -i -e '/can work in SAFE mode/,/^  end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Make sure the right ruby interpreter is used
-	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
-}
diff --git a/dev-ruby/fast_gettext/fast_gettext-1.4.1.ebuild b/dev-ruby/fast_gettext/fast_gettext-1.4.1.ebuild
deleted file mode 100644
index 83316badf547..000000000000
--- a/dev-ruby/fast_gettext/fast_gettext-1.4.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!"
-HOMEPAGE="https://github.com/grosser/fast_gettext"
-SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activerecord dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm Gemfile.lock || die
-
-	# Remove jeweler and bump from Gemfile since they are not needed for tests.
-	sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die
-
-	# Avoid unneeded dependency on git and development dependencies.
-	sed -e '/git ls-files/ s:^:#:' \
-		-e '/\(wwtd\|bump\)/ s:^:#:' \
-		-i fast_gettext.gemspec || die
-
-	# Don't run a test that requires safe mode which we can't provide
-	# due to insecure directory settings for the portage dir. This spec
-	# also calls out to ruby which won't work with different ruby
-	# implementations.
-	sed -i -e '/can work in SAFE mode/,/^  end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Make sure the right ruby interpreter is used
-	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
-}
diff --git a/dev-ruby/fast_gettext/fast_gettext-1.5.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-1.5.0.ebuild
deleted file mode 100644
index e3434c1e0df1..000000000000
--- a/dev-ruby/fast_gettext/fast_gettext-1.5.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!"
-HOMEPAGE="https://github.com/grosser/fast_gettext"
-SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activerecord[sqlite] dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm Gemfile.lock || die
-
-	# Remove jeweler and bump from Gemfile since they are not needed for tests.
-	sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die
-
-	# Avoid unneeded dependency on git and development dependencies.
-	sed -e '/git ls-files/ s:^:#:' \
-		-e '/\(wwtd\|bump\)/ s:^:#:' \
-		-i fast_gettext.gemspec || die
-
-	# Don't run a test that requires safe mode which we can't provide
-	# due to insecure directory settings for the portage dir. This spec
-	# also calls out to ruby which won't work with different ruby
-	# implementations.
-	sed -i -e '/can work in SAFE mode/,/^  end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Make sure the right ruby interpreter is used
-	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
-}
diff --git a/dev-ruby/gettext_i18n_rails/Manifest b/dev-ruby/gettext_i18n_rails/Manifest
index 868ecfce72f9..ccfd2cd86762 100644
--- a/dev-ruby/gettext_i18n_rails/Manifest
+++ b/dev-ruby/gettext_i18n_rails/Manifest
@@ -1,5 +1,3 @@
-DIST gettext_i18n_rails-1.7.2.tar.gz 22133 SHA256 ba29437c92946191db695d8cb64ccc23834252aea17758e6e6277e083d55eead SHA512 5c9dc7932810bd96be0da2282d72ea87d9fcdfab1f33fce7736dddc04784586d79d64dd9e9d828c5fd07b8eb3d466e29bdee08ad02d64973bef1e69599c9325b WHIRLPOOL 255a1eae16b9cc7b3b59077d9407251286cce369ece1435a97f98fd173780b057e1dc4429e51dae1f5676565103310e84e0a2834a6ddeae5923a960d7a3153cb
-DIST gettext_i18n_rails-1.8.0.tar.gz 21702 SHA256 8cf8230e64a63adf83e21fff26006683996de3d55efc660bd191deab4ac73584 SHA512 9005526dd14e5e36f5ffdd207af824ad110f5e0c8dcf34175b6a68caad257d45a7b9ee048c6d0f38ffb399fbeff689b5e64b7c26f00263001efeababfa85aa7e WHIRLPOOL e730a47072d3901ab78fe809a5bc4ae49578c49d9da299d23d7358944c66944c18252556dfee43e665d1a265c958f13a62db7d6579fbd33f820cb72842f4b9b0
-EBUILD gettext_i18n_rails-1.7.2.ebuild 984 BLAKE2B c144da1988d009de8891bfff320d463a40fb78f68f8fb1294d66656ec53dcba5d087293031a27b6738851e7f93ffb9bff65abe620a252a89bb6d65e2692d7743 SHA512 8c9cd30fa440cc216d8a31bf02435350f9f9e8481b3d30332640631107810db7fbda81d138d1e594a7acaa4c304668e197c7e0cec69f5ad1d7e93b10dc89d91f
+DIST gettext_i18n_rails-1.8.0.tar.gz 21702 BLAKE2B 1742e12198313384e52fc43795086efb2112b00bdf4c740db717ee2feb7c25453f0e6acdeb4ec2ab79de82d291ef117e38cabf4596be2da760c4144b2c660115 SHA512 9005526dd14e5e36f5ffdd207af824ad110f5e0c8dcf34175b6a68caad257d45a7b9ee048c6d0f38ffb399fbeff689b5e64b7c26f00263001efeababfa85aa7e
 EBUILD gettext_i18n_rails-1.8.0.ebuild 986 BLAKE2B 349ae4ef1d470eab8707dcd65adebb5f01852024b1c79bb682ae26b0da5fc44f898f559da88a4d801576bbd83124a170545c626b5f523bc3a28639b13956d0d0 SHA512 3e4c81dc0b3141dd95b9599033e633a1ff2decdc36ab8cfef14e2cb3c179f9a868f93f9f276212245cf42fc75ce4d5a7b7ad42736003e11d10712647c191b2b6
 MISC metadata.xml 352 BLAKE2B 853fa3af6e9c076cbf64bd209e35fdfb7308c002c47585c7af99e77c0dfb92b6fe71ff2b6ec02959d7f3c568a29d58e1e2597d495dbdd75c6d3f9f96bbd61ad4 SHA512 86f6231a5a94e4a0edeb825bde56326adaf58fc96763cc8a2138c909ddb101c6e1eb6ed3bec18fe7b550d4e9f40c6411acc12f8881729b89b57c0973a9c0a164
diff --git a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.7.2.ebuild b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.7.2.ebuild
deleted file mode 100644
index 5fd7dfa002bf..000000000000
--- a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.7.2.ebuild
+++ /dev/null
@@ -1,35 +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"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="FastGettext / Rails integration"
-HOMEPAGE="https://github.com/grosser/gettext_i18n_rails"
-SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rails:4.2 dev-ruby/activerecord:4.2[sqlite] dev-ruby/temple )"
-ruby_add_rdepend ">=dev-ruby/fast_gettext-0.9.0"
-
-all_ruby_prepare() {
-	rm Gemfile Gemfile.lock || die
-
-	# Remove specs for slim and hamlet, template engines we don't package.
-	rm spec/gettext_i18n_rails/slim_parser_spec.rb spec/gettext_i18n_rails/haml_parser_spec.rb || die
-
-	# Test against Rails 4.2.0
-	sed -e '1igem "rails", "~>4.2.0"' -i spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index 1e417c470670..6fdda3d2e5fd 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,5 +1,5 @@
-DIST haml-4.0.7.gem 121856 SHA256 3754d0f7c21cf261a30b207a94524211293b921492fab58c89d1ede7e7933f57 SHA512 5736ded231bb10a0c0932453294604075e24a9020c2658e703c13ebf7a8d148327188157f982a3aea5db6d6938beb372c0167dfbc4ff06325517b2c8bd71a568 WHIRLPOOL 62f1f152dbf8eea15ef3935d8e85b062f5a3f079a3cc4e4ad47056acfe7427b443611f092f591ff957f348d1727ce43b23d9f88083a4678b30d759a2ecd6e659
-DIST haml-5.0.2.tar.gz 124000 SHA256 76e1024120d00454e11d6061a630ce785bf7092ba9063bbe1926ae51fceeb619 SHA512 c266a48424db4c9949d29bdb72f2c96ef5878a78ae98867b9259b0e2e2f581cb9fecf4c51091e6bce3ba4d86c60b44e8c7e95759a8aec8c95d59b9707903032e WHIRLPOOL ffaf5249f3241573c4752d31031b290a5190da14701b5f194660c342bffd546b38f279707a9befcfbb72f8ec70fe994966bcfce5c4f576ff1a1fd97615ea3d2c
-EBUILD haml-4.0.7-r1.ebuild 1281 BLAKE2B dabb9485ed0d336f6336ce07bc813deb33223020ff6ad69e24c6795d584c227c7a3f03c427918aab772d5cafebe0c9f95dba307026c3b3ed018000580e337de7 SHA512 45971815783fab1814eb9252db45d1f9fbb4caf43bc3eb85c31555a6e57d65fc9c5ec50f818d9c6e2c3b27e157f9fa8cae6b7f89bd7027103ac54e2ff86a4a4b
-EBUILD haml-5.0.2.ebuild 1581 BLAKE2B 9f16631e5158fe0a6b6b9657a31ea8aae3b9d4944ee7a5ed9fc44fb0013412cf73130e12c399bf8072e9892edc42574216993f20babb863a046bfdda6af537e9 SHA512 ba3c27c518d89bc5eedc0e77a1c799776cbcf500dbc886121cf11d94bd4a5ef29c6fac4a312abcfbf39ba51708c26e0da3806830bb29f64aafcff79f1d1debbe
+DIST haml-4.0.7.gem 121856 BLAKE2B e2598df73b9bf7337c06f60b30fcf7925fa5948f4643051aabbbdf600d25dbc2f614c4cf2054a916f69ef431847279eee1fbdf02e9bf2811369f2c195ed00413 SHA512 5736ded231bb10a0c0932453294604075e24a9020c2658e703c13ebf7a8d148327188157f982a3aea5db6d6938beb372c0167dfbc4ff06325517b2c8bd71a568
+DIST haml-5.0.2.tar.gz 124000 BLAKE2B 852a674d0519ca785fdd448295c402f203d21e627e9dccbbbfe835ed51fe19d4110c908e14cb40c18644e758d609d3651dddd750df7208627e108832c2f06cc9 SHA512 c266a48424db4c9949d29bdb72f2c96ef5878a78ae98867b9259b0e2e2f581cb9fecf4c51091e6bce3ba4d86c60b44e8c7e95759a8aec8c95d59b9707903032e
+EBUILD haml-4.0.7-r1.ebuild 1270 BLAKE2B eee99c2870b4e17991a2d90a2b1002e5fba2d26ed3c9548988b4083c6f4dd5d0a203847a1154d9e99a2c9081954e7c534fe032906c13d02e85218760dba1b0bb SHA512 fa5712f9ec78c20f529dfba71bf40367bd9b1931fec46d424c3d8042c38da60ecd636951b2b8a337dcdcae116b493461ef738965e98fe1167e370ef3c4c6be7b
+EBUILD haml-5.0.2.ebuild 1569 BLAKE2B a762048a812e983a1997c699029dd2ddbc0029afc3e7778f461809adb5793c2b003f90f5a95eba2e8a833306de0c706b1ccefb09b74830e438ce9b49ffb5de9c SHA512 f6a0735c0263bb85484b5aabefba5c5e1ab83777073bd09b7acd5d5eca67d2777ffd1178635358eb00a843dca4ad5221604740d627b715d3bfc552b87274b66b
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/haml/haml-4.0.7-r1.ebuild b/dev-ruby/haml/haml-4.0.7-r1.ebuild
index dd4fc79a6502..14564a4e5844 100644
--- a/dev-ruby/haml/haml-4.0.7-r1.ebuild
+++ b/dev-ruby/haml/haml-4.0.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
@@ -18,7 +18,7 @@ HOMEPAGE="http://haml-lang.com/"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 arm ~arm64 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 ppc ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="doc test"
 
diff --git a/dev-ruby/haml/haml-5.0.2.ebuild b/dev-ruby/haml/haml-5.0.2.ebuild
index 4c1f5904a900..2fe525516d4f 100644
--- a/dev-ruby/haml/haml-5.0.2.ebuild
+++ b/dev-ruby/haml/haml-5.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~ppc64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~ppc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="doc test"
 
diff --git a/dev-ruby/hoe-seattlerb/Manifest b/dev-ruby/hoe-seattlerb/Manifest
index 053395b7d36b..ba333bd158e4 100644
--- a/dev-ruby/hoe-seattlerb/Manifest
+++ b/dev-ruby/hoe-seattlerb/Manifest
@@ -1,5 +1,5 @@
-DIST hoe-seattlerb-1.3.4.gem 14336 SHA256 48390e18948cdd1efa13af1f5be56239547e88f7d7267e26e5f335823f3fdf79 SHA512 5e968611f3826fcea8f1a896b1883e07d5cf8d02bb20d0de2d8c7bacc0538163b5996d0a2f41dc8f892c4629bfc9e2630f14b374d73fa0b13daa2ca5de3433cc WHIRLPOOL 4390688cd888e26921b830b13bf2fefa351d342c7998df75c1e9ccae2f436a2296ead64576cbab7b3145077cccc99bed7a73310a720c69a1539664003e0dc789
-DIST hoe-seattlerb-1.3.5.gem 14336 SHA256 735f9a98d4124beff49bbc94982093046361f0d9fc27ccfc89a6719808ed0293 SHA512 a5cdb38114e22e07824749e721ad7ff85724c04d8ca1c66996ca86fc9ec150a3b0b7b3bc83511932af0c4acd7e9b581d6b1583eda60160bf7ed91021ab803d0f WHIRLPOOL af9f54f4871fd9b1ef8c2624396e6cd57369c575c55cbbe206375fc18efd163486e34cda4f41ba6bdb3063cd9be1deb219861df7818791a61431e7977c610028
-EBUILD hoe-seattlerb-1.3.4.ebuild 776 BLAKE2B 1170d2f58b6d3bd2e3ea8c672363f6304afc710e1d9844192ef6c46cd4a9244989b714e819dcbaf170a16bfd7411036dce795d71a45a034fd588cc04e7e32ab9 SHA512 262d1888b139209f8fa047c4cee93101501a166aaa7addeee758abf090f7022349a7b4d12555722ecf43b4b155ab73e2d1195d73f5555414fdd97f41e9873767
+DIST hoe-seattlerb-1.3.4.gem 14336 BLAKE2B b53cb91cfba8d0e53290c40c29812163b99b81ee110818f1460f1aa155be27940199e38b32a9b65261dc00cf6db2a9991ac4323a851afb1383a9907a01899d79 SHA512 5e968611f3826fcea8f1a896b1883e07d5cf8d02bb20d0de2d8c7bacc0538163b5996d0a2f41dc8f892c4629bfc9e2630f14b374d73fa0b13daa2ca5de3433cc
+DIST hoe-seattlerb-1.3.5.gem 14336 BLAKE2B 76dd4e82e4b3ceee897d484e2bbf596414bfbe50d998f2f3833e6be63dacbec4d4d1014b14d9504cbf9615736f584ea3c083c8f5b15609f400264ce5cb31856b SHA512 a5cdb38114e22e07824749e721ad7ff85724c04d8ca1c66996ca86fc9ec150a3b0b7b3bc83511932af0c4acd7e9b581d6b1583eda60160bf7ed91021ab803d0f
+EBUILD hoe-seattlerb-1.3.4.ebuild 775 BLAKE2B 85fa5cb8bf5481b33c588522a62ad57d898a272dc8b7f24abca03c8fb7a389f5b2fe5a98495219b08b1f507ca408838d07fe302aa317ef0fa9b091a4dfa0e275 SHA512 712af42765bb7a7bd5a1187fcf578e730b14d8a467ef38dd42e28bb6da98aceec79c247e9db97425a80ee1a4a29b38da24dd4235785793c4de4c36b78b996d12
 EBUILD hoe-seattlerb-1.3.5.ebuild 789 BLAKE2B 834f4f08648d3bb1fadb9bb3a842817e3064e12a76b44a69c991d3f0099fcaa7686e753fa6b7b03cdee6a103e68b45d696ec383521f45f05f928081cf324305c SHA512 5fa382ba69e1142efeb157787bda6d9bd704371a750bd7b7e1a5ea86639371d84720adae0e4b56abfad609e8e187a892d4d57ff24a34b104c2c632393117d044
 MISC metadata.xml 339 BLAKE2B dfe565b89582b66fb99b6c9e50c9ca3efc0eeeb4a2c2cecd5e103f2d9526fde1a6e591c240cc83163d55c2973adb9482dc8c91ec3cea5a8f67848aa0bcdf5e4c SHA512 2e0d6992a3e11200d4373727efa7ea4c1a1eb1e1cc2a1023b0d0b651769580d2405378c4560e498ee5f52f7350fee443a443247ccedef5178be40f014f44cd20
diff --git a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.4.ebuild b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.4.ebuild
index d24b2e961103..593c555c872c 100644
--- a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.4.ebuild
+++ b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.3.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://seattlerb.rubyforge.org/hoe-seattlerb"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/jquery-rails/Manifest b/dev-ruby/jquery-rails/Manifest
index 767437eec43f..ad291b9e2fcd 100644
--- a/dev-ruby/jquery-rails/Manifest
+++ b/dev-ruby/jquery-rails/Manifest
@@ -1,8 +1,8 @@
-DIST jquery-rails-3.1.4.gem 190976 SHA256 f908f67bb9b63dbc88eeecc78257235dbc695e23926fd53911378a27b4d6b532 SHA512 fbec0e09bff90d4f21a512c628767ceaf85f311ac8bd81ca58a7b41f71c0a6b25d9ab9246c4043abf71f7afaf217d51a796f2207c2321583ddd14845248c9f1a WHIRLPOOL 2bd95564248bc843321d48703d889ac8c9afccc0c4c447b9b3dd4602f6a5a83c3a7b3c7cd368d64bc65722b71fae527b4004f4f3cebd2ef5ca2bd22133651f32
-DIST jquery-rails-4.2.2.gem 516608 SHA256 c2cf4383922a53c43bf5f92af90f1e4eb616b0f197e56a4dd1be19daef35df41 SHA512 4270bbad954b7ac00b7a1d3f1b44778d3194647cc85b59ceb6b0a458cbfdc898514470afc7b2fe12b4ea9aa1fe71797d5950421724546d345f5f32cdb1f9b670 WHIRLPOOL 2839b5bc26fea0b5b410c6c8d0eb99e904c24edb5e103b2c8516b7bf4d20ef4d4603b607b0108fda48b14b38e13e38af3843658895e5f90f0c64c6b79b72b576
-DIST jquery-rails-4.3.1.gem 517120 SHA256 711e4ed2e04b678f6b62537d0ea32d77211304e7bfad99a97089b0cef739310a SHA512 9ded8b0e9e3811b79e6a9cee3fdcbd5f560e75f104f464732efe6c36fd988891427ae21dd14b2cd90f01ea91c4be4b15f427c8a4ba832cb5979e45c942b59222 WHIRLPOOL 160b87c1c9495ede0cba26de0f7d7c03d37ae2e0abe26d6557f38e66d422d99d9a6932228b90a695ca2e721e6496d50ef01ca3265e9714eb67372bf9aaf5fba0
-EBUILD jquery-rails-3.1.4.ebuild 676 BLAKE2B 57d71a9bf9e25d1cb20869850e605e0c407c6ba36e0f2328dd295798f9d4c5c2bc7b9edc49638a2358162041329833cc70b8af9b7ebba3dd7178212fe6340869 SHA512 8dde602a88338aa53ab1c844348ca91b8abffdb331c16c3cdea3dc5e1a2c53b419d3de32493db3d8ad697df2cf394fec53e05d56c8dc3f8cdc2b35a34e44960e
-EBUILD jquery-rails-4.2.2.ebuild 760 BLAKE2B 3ce57d3f7541248b3120b5b5d67145902fbbc9ccf84aefb077a2a105cf97d82c5811dd84015f3634cc7a539dc5f9483150edfbcdd696f6ce820b1fff69ac9e84 SHA512 c9e69382ad67dc2f19b893a209b911d4ebf0e8a63d33c6a07b48099cca71f08fbc24d3593716420b4983f7379caadeea1ca2fbcb9bc040ffc24d82fdc540192f
+DIST jquery-rails-3.1.4.gem 190976 BLAKE2B d0f0177bce04ca49a41c4a12e3ec35b1e4e7c6194fbda7a5e6ca48ae4a1cd1bf6845196f7b001330d54e4c19a4d3730932bb36741077980fda8de1e1a47be1ba SHA512 fbec0e09bff90d4f21a512c628767ceaf85f311ac8bd81ca58a7b41f71c0a6b25d9ab9246c4043abf71f7afaf217d51a796f2207c2321583ddd14845248c9f1a
+DIST jquery-rails-4.2.2.gem 516608 BLAKE2B d24c92b6c4382d0bbbf9176f4b23350147eecdb32f10ffdb224c0eb06a5a21b047519e129f8f14dd08b77964368c77353d68f454d69839ce785921ee59bb7c10 SHA512 4270bbad954b7ac00b7a1d3f1b44778d3194647cc85b59ceb6b0a458cbfdc898514470afc7b2fe12b4ea9aa1fe71797d5950421724546d345f5f32cdb1f9b670
+DIST jquery-rails-4.3.1.gem 517120 BLAKE2B c5bbfa66d604aebdf954b2ea1c8abdfa52cea8a27709876bd99a9c77705f4dcb4ca27f726faab90485a3adccbe0aad40c464171bf97e8401782d1684e1a24d29 SHA512 9ded8b0e9e3811b79e6a9cee3fdcbd5f560e75f104f464732efe6c36fd988891427ae21dd14b2cd90f01ea91c4be4b15f427c8a4ba832cb5979e45c942b59222
+EBUILD jquery-rails-3.1.4.ebuild 664 BLAKE2B 7a1dfd0319ace0d14575b0c377ee620b4d95e3e29f23e767031c1aac6a7a809df847fd26099184aa61f2cfa281bf26069719d75d8f7c226e10c30a49bfb70f6c SHA512 481912364adfce9639882e8345d5c2a812e2b73a1c99354be7321e0967a7fefad70a3544af958a2ca90d8ab1e83e4d88eaa71a6bc433e3dc4de9de7fdebb9678
+EBUILD jquery-rails-4.2.2.ebuild 741 BLAKE2B e61e7b0ff429736eb36aa11ab0417c277d8ed4ae0a9a11f6f97a07a8e46a70f4fc22dbd203c07e6865142196a7cad62d0025b58f3b2a4dbd065c6bb5a8d0b5c5 SHA512 b1f7df6d55e5749488fad8dc6d07e4c96ac3f3b916a901f5c379aceff6bc0b796f25417d510e5bd84d11b96a6eecb8eaa3376f6d73dc0bff453185d5a5703413
 EBUILD jquery-rails-4.3.1-r1.ebuild 762 BLAKE2B c5f303ecb769bef2029ed68d1bd19db2c3f19967adc4bb21685b2791889207dd45a9e775a24ec428ac26680395b14dd8f3db8df402c79eeed807b29e9a9aa600 SHA512 de6e3acc6a79b78b8849ca10611d8e301f55fd6655a515f463670e0e4218208f5f0ccf59d88ceafdea109643cda51d59c2866ccb5ee205cbc44c216d07ec9c87
-EBUILD jquery-rails-4.3.1.ebuild 753 BLAKE2B dad6c31e8c433c856981e4be8b855b1b50d58f7e12ee1e6f7d45d0ae9bba2905663e368cc4b15057dba72aed9234064d07cc256b94ea1ac1d1f20fb790da2945 SHA512 a06d8d56a0ec0f0b069b353454b27b3f849c24faf2dc164d7257dc6716e2756d5857a0f8453be2681eb8babd9e53d61e470869c241ce9a762165d3b73cd8cef4
+EBUILD jquery-rails-4.3.1.ebuild 741 BLAKE2B e61e7b0ff429736eb36aa11ab0417c277d8ed4ae0a9a11f6f97a07a8e46a70f4fc22dbd203c07e6865142196a7cad62d0025b58f3b2a4dbd065c6bb5a8d0b5c5 SHA512 b1f7df6d55e5749488fad8dc6d07e4c96ac3f3b916a901f5c379aceff6bc0b796f25417d510e5bd84d11b96a6eecb8eaa3376f6d73dc0bff453185d5a5703413
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/jquery-rails/jquery-rails-3.1.4.ebuild b/dev-ruby/jquery-rails/jquery-rails-3.1.4.ebuild
index 495b7ae29d89..a33b3a204cb0 100644
--- a/dev-ruby/jquery-rails/jquery-rails-3.1.4.ebuild
+++ b/dev-ruby/jquery-rails/jquery-rails-3.1.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.rubyonrails.org"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~x64-macos"
 
 IUSE=""
 
diff --git a/dev-ruby/jquery-rails/jquery-rails-4.2.2.ebuild b/dev-ruby/jquery-rails/jquery-rails-4.2.2.ebuild
index bf42b3d80efa..2829173505a8 100644
--- a/dev-ruby/jquery-rails/jquery-rails-4.2.2.ebuild
+++ b/dev-ruby/jquery-rails/jquery-rails-4.2.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.rubyonrails.org"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~amd64-linux"
 
 IUSE=""
 
diff --git a/dev-ruby/jquery-rails/jquery-rails-4.3.1.ebuild b/dev-ruby/jquery-rails/jquery-rails-4.3.1.ebuild
index ca50a71263af..2829173505a8 100644
--- a/dev-ruby/jquery-rails/jquery-rails-4.3.1.ebuild
+++ b/dev-ruby/jquery-rails/jquery-rails-4.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.rubyonrails.org"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~amd64-linux"
 
 IUSE=""
 
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 4e7dc035c019..88e1a17ce7fb 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,11 +1,11 @@
 AUX json-1.8.6-heap-exposure.patch 2937 BLAKE2B 204f4c5a16df8fa99ea46e7d29c4a7e8790da9c11ff1dddfeba47b73a3bbf3e06a9243a48fa1d95fc029d21a1031e689b16a91295a1601d4e62a4c18cee2bb3b SHA512 42545c069c8c36b120b63e74b8276b8a6b57237e6cd8ccdeb0e6e9b9acd4f9213e5a4fc35b2f804300e8d00a12546c51b9ef944bde60d679567544de796c87e1
-DIST json-1.8.2.gem 152064 SHA256 256f73d107635f54e3dd84daba65da7b08f9d6a6e6aeb046db6a46b98bd8fb7f SHA512 5c94ec2c5378f7f54cd87a2e265b058e80031d2dd29daf14639c80ba0ac285a527ab7961f5a2cd1e483f455fd8f8c88575950822b7b2d431aa7b2b9c8be819c1 WHIRLPOOL dc17e0c011523434ed29e428a2658ebe58d08df8252e7ee8990882b6d17c19354b3e4ba6985a2a45e4b94932ad265698197ba64ef891f38d3be154da4edde8cb
-DIST json-1.8.3.gem 152064 SHA256 8ca2091e26678fb989d66cdb9f0104f1307bc584b429c2fd783d51e4b3f14bdb SHA512 313f6016aca5eba4d4a14a72b60b3e9c5e863a6681eb9e499cacedb63969694be563990af0a44dae52963f07b6e6c7aa7e0876ab1348b214f53d925bdc5e83ea WHIRLPOOL 8c6dc26a578aedcd4bbc1e6ea95f2a72debe6bdaca5a4c2a4e70b81d9947048c6648b62d5546fa572084d37ba99ce199a177b87838be5cc3f11d8d0fa0f62a63
-DIST json-1.8.6.gem 144384 SHA256 65af27ca985f70eb0d083aab0f75712c771871222af021ce533bad77bd3bb262 SHA512 8f393da080293965389df4a606e0604c500b4b267897b3c1b9007b7700dde8156f6598c25790e84fa20a7e03c7ae359a0b267c7b84e52dfe2a1ac83cf652ad9b WHIRLPOOL 0d55a8086f54eafa8e2d9e49e71436750b63c4bb7164fe06e5fa298f112f5612c428e3d4377e1ca824577d01eb21a6862b42236a147c85e9faa8a3f623184bf8
-DIST json-2.1.0.gem 140800 SHA256 b76fd09b881088c6c64a12721a1528f2f747a1c2ee52fab4c1f60db8af946607 SHA512 bffbe462e952bca321d4325ecb9c5e9f61e51cad13758581ecfaa6a038bac4e30dc7db50bd897086a5592f6fc437d0e0909f91e279aaf4dd71cf127100c3550b WHIRLPOOL 94140475051d90e9b207c6d0224483b5ee0c371a27b7a4aafc612bc2e828cffb350afd4001ba20a3b5ddb124561da960cdb0d757bfbfbba031942d6bbb9cc641
+DIST json-1.8.2.gem 152064 BLAKE2B 5d819cf6ca1811ff6b7cb171ecda005192c9c06955641251f4066436e9746071d04ac37dedb7b3f7938d3c910d5d894f040388b8887b2d08918b344673d1624f SHA512 5c94ec2c5378f7f54cd87a2e265b058e80031d2dd29daf14639c80ba0ac285a527ab7961f5a2cd1e483f455fd8f8c88575950822b7b2d431aa7b2b9c8be819c1
+DIST json-1.8.3.gem 152064 BLAKE2B bbc043e3cdcd06d20cd31fd2c23e583917c8886919527a30072aeb141d2808e924b27069adc19d38409e81189aa16584cc13ab449bd4e54d241f738ef9d26a30 SHA512 313f6016aca5eba4d4a14a72b60b3e9c5e863a6681eb9e499cacedb63969694be563990af0a44dae52963f07b6e6c7aa7e0876ab1348b214f53d925bdc5e83ea
+DIST json-1.8.6.gem 144384 BLAKE2B db9e407be4ac7e0cb2e09369637b88f70cdac7a659c600dc83a5390746dfd21b0a5243af62afaeeff013b5a4116a3b22c65a481cad89f1ca9be8904af87d0345 SHA512 8f393da080293965389df4a606e0604c500b4b267897b3c1b9007b7700dde8156f6598c25790e84fa20a7e03c7ae359a0b267c7b84e52dfe2a1ac83cf652ad9b
+DIST json-2.1.0.gem 140800 BLAKE2B 28bb5334358369351ec9f13f5fb609ce34eb429cfeffb8dfde70864541516a0c2abd00a640b4647f76dcef198f967456bae0a858a2f213e5a30272c1be1878c7 SHA512 bffbe462e952bca321d4325ecb9c5e9f61e51cad13758581ecfaa6a038bac4e30dc7db50bd897086a5592f6fc437d0e0909f91e279aaf4dd71cf127100c3550b
 EBUILD json-1.8.2-r1.ebuild 2076 BLAKE2B 6b63ce42432a9285009398545c473ee71c1eefc67c2ed799c2a6eafa6423dc2ec66cba5514511c02cb3b1681423bbee9e17dfb632f493c349a5811f8ce87955d SHA512 99ce2593c742309f7b9d2d984f53eb6d71c6743fe59571e42a173a62040455ff8a46d5a2169a49784a40e8bfd3cf8b54d190281821c35fd6ba81b87640b3c0f3
 EBUILD json-1.8.3.ebuild 2091 BLAKE2B e3dc333e3057cf263cd47af3c1f4489668b1e04ff4e513419798c5ac65f33d563cf0f1c7ce4e06f5176f8d3ab5d1583481409c847e9c36b75184cec362333d7b SHA512 3601ceb5b0bbdada74836475f3730f11da8c7a6bfec49397e7eecdf9686571917f5b51fccfa900656991baaa2e99c154a1e7b31af1cefbc5d8b6fbd966d3e6b7
-EBUILD json-1.8.6-r1.ebuild 2111 BLAKE2B a0e2251068ce75a663a042347b43350196c150a4190324ca3103a7e09c7929da6c7d72f3233f86f084f4e7c2c16b2db63b8df4cbb8d6a0bf32e8d53af2e987f5 SHA512 4b2ce2dd5e5c3713f2920e6a67d30d7f3c5a8db746711c536eb1acf65401a48a0f6617386180827596c65f5564c59a995774a0c68cce996f07ead09736d78aa5
+EBUILD json-1.8.6-r1.ebuild 2110 BLAKE2B 941953d1fcdcf4e5e289086cd019f4d99441563a396a944d67a64237d6b998fde4e120f40ee9061956813707bfa9639f0ab6439aac105676d74cf8a86c88bf18 SHA512 f2d5fb012fa39868622bc7e69e20b6ef4012abee3a2a690621e0f8995a644d6660f6c28ba0bcf3a3081fde8485dce78e3488ef381b6b8747e5c20df0986eb2d2
 EBUILD json-1.8.6.ebuild 2071 BLAKE2B e0689668c3e53cc763bfbf015926aeb167e5fbdad60dce788c281ffde98ddb51efa77230c79c673eafc22844d237336a0125daca216f23fd71b9e1fb8809a965 SHA512 bfe55a86afea8a96f28feeac30edd2e51729b99a74a680b12b8799794c8697554574826fef5ddcffc37a14c5dc90d55c886d2e3a7dfbef5c5675bdc32424f55d
 EBUILD json-2.1.0.ebuild 2063 BLAKE2B cb3a4fe2596dc3545dc90b0e57f48138b0873735e4123ec26fb34f0165ec1c325d03a09506c681e72a2b0799404d1dbd7f6b73c96d6ac0d1901582c14fc980f4 SHA512 296d0175321fd6811b144f37bbb39ebad763edf5f4424a0ef35a6f4a3c75a555df35629ab356e12813e09eff35fd0f5564ad46bbbf655d6fd4a7de52e9bdcb64
 MISC metadata.xml 336 BLAKE2B e1094160e19b252f7b3233dbd2006c889c0a02aa4b04063caeb7ded80bb2f08a2c4bc31cfb7bdc17398b8d1b8c3fc9f3600eafad9920fe0355c807d3899f794f SHA512 8b4fa7ef9b753bbf1206b1f8a796d3f3b8e3f9ca07906a2e01dbcc8c69d4cb5e5cb26c395d0676b4dedd70fb910cf0abd3be83d3c94f0b90aee87ea6fda12877
diff --git a/dev-ruby/json/json-1.8.6-r1.ebuild b/dev-ruby/json/json-1.8.6-r1.ebuild
index f8814f50c0c4..ec8980e5fdf1 100644
--- a/dev-ruby/json/json-1.8.6-r1.ebuild
+++ b/dev-ruby/json/json-1.8.6-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
 HOMEPAGE="https://github.com/flori/json"
 LICENSE="|| ( Ruby GPL-2 )"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/kramdown/Manifest b/dev-ruby/kramdown/Manifest
index f37f53253f66..ee35e46c0e3d 100644
--- a/dev-ruby/kramdown/Manifest
+++ b/dev-ruby/kramdown/Manifest
@@ -1,6 +1,5 @@
-DIST kramdown-1.13.2.gem 249856 SHA256 2d11a7f9a9ec8dcf84e54af0a98b141a50a102b78e99b64e799f100c08c351c7 SHA512 dd2194184a7761bc490535a9d5631b78441b83f040e37dafc25b956dd680fe398d19ae75aff06dc2ec6a7573ac198169e175ef78a95743f0f7b4874bf28cebf8 WHIRLPOOL 7afe8437f9e24b4a5071a9031e67a871b2c6e0c4e66f5b3235eb345779bac382c6dab68de09f4e38749e517549e32b9b1cb188dbd88e46c09f082395a2b62585
-DIST kramdown-1.14.0.gem 250368 SHA256 f166820406ba92beeedb8cc496c1d1040cb237d5ad9d073b251e4a26562650a1 SHA512 bd6295db2fe0d3a7dca936d47f0aaf7f939a86361dfdd3203a52683a9eb11a68075cad7d068cc56a315db3c14e73cf5aebb87531ba3086301a7521c5a86f9905 WHIRLPOOL 8b2fe0cf3b7190b5640bcee3a03bdd0d688c4e2a3b2bc37efee3dbd84a2725a76f6e068fcf48600b96dbb654edcd22c93e59d3e83f1adb5a7cda2be6afc3f4a1
+DIST kramdown-1.13.2.gem 249856 BLAKE2B 33aacadc09a1f720cf9876690647d2005272c571e861f9f69852e7bbfaa2cbd36802def1f732e9762e9c5c417f85a4eaa63d72a70e37cd9a6b6dd6bed5a099e0 SHA512 dd2194184a7761bc490535a9d5631b78441b83f040e37dafc25b956dd680fe398d19ae75aff06dc2ec6a7573ac198169e175ef78a95743f0f7b4874bf28cebf8
+DIST kramdown-1.14.0.gem 250368 BLAKE2B 78d3638ec58a5c237a9350cad1edabf2d4fa0307013a0ced18f6835c4a8cdd623e4825b06670d5c588147013b191912f93e51e74ab1fe007761c117334f378aa SHA512 bd6295db2fe0d3a7dca936d47f0aaf7f939a86361dfdd3203a52683a9eb11a68075cad7d068cc56a315db3c14e73cf5aebb87531ba3086301a7521c5a86f9905
 EBUILD kramdown-1.13.2-r1.ebuild 1433 BLAKE2B 146c083e53d7e5edb39764440ae5698e4ed0f4e4a6f855f2ac9eccc0c827d4c5c571b543bb6cfac0f00269f056971e5d228fd3c16f0f3343c5602bb85bf0f7a3 SHA512 01988fd89a93c712525168d26a5e9f31c9f72eb2f2b60619ec7e32deb3013740ef8ea6fb910df986ddd4670ba0082dd41e024a7fd208df0b940f974198c6a970
-EBUILD kramdown-1.13.2.ebuild 1433 BLAKE2B 56663ec968b4b2521af9581f0b375cd824e98ea9c54ed09aaef3b805b80f8f3ceb80e17cafeccc3a590405ce9081468b23d2666d3e8622a68384252b2f46d81c SHA512 a6af928f24c142e99eaa13edf2503a0643c52f6d7df094ac60c2d7037b29a0b4328e8dc91a3465f7cb30b00e8a5af1dccf5abb1987799c85d06c83f3515c0280
 EBUILD kramdown-1.14.0.ebuild 1440 BLAKE2B 43e14535274315971f06489abb00ed77606a3abbe7dfae9110eab8954bbf69b5c133d1d8f76b7bc73c06c0004e5a6295731b578876f8f2bbc841c37e45c9774a SHA512 899679c2c10b956544b10365a4512e4022cf5f459be895e1cbc12c987e2d51aa7adadc01fd77121af3244f2ab05367df511cc1afbc7749c8fdfd36efc736d79e
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/kramdown/kramdown-1.13.2.ebuild b/dev-ruby/kramdown/kramdown-1.13.2.ebuild
deleted file mode 100644
index c2e6c9b83308..000000000000
--- a/dev-ruby/kramdown/kramdown-1.13.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition"
-HOMEPAGE="http://kramdown.gettalong.org/"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="latex"
-
-LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
-RDEPEND+=" ${LATEX_DEPS}"
-DEPEND+=" test? ( ${LATEX_DEPS} app-text/htmltidy )"
-
-ruby_add_rdepend "dev-ruby/prawn:2
-	>=dev-ruby/prawn-table-0.2.2 =dev-ruby/prawn-table-0.2*
-	>=dev-ruby/rouge-1.8:0
-	>=dev-ruby/itextomml-1.5
-	>=dev-ruby/coderay-1.0.0
-	>=dev-ruby/ritex-1.0
-	>=dev-ruby/stringex-1.5.1"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )
-	test? ( >=dev-ruby/minitest-5.0 )"
-
-all_ruby_prepare() {
-	if ! use latex; then
-		# Remove latex tests. They will fail gracefully when latex isn't
-		# present at all, but not when components are missing (most
-		# notable ucs.sty).
-		sed -i -e '/latex -v/,/^  end/ s:^:#:' test/test_files.rb || die
-	fi
-
-	# Avoid tests requiring node to be installed with mathjaxnode.
-	rm -f test/testcases/span/math/mathjaxnode* \
-	   test/testcases/block/15_math/mathjaxnode* || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/man1/kramdown.1
-}
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index b31f4c72d6f0..dc01b21d093e 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -1,10 +1,8 @@
-DIST listen-0.7.3-git.tgz 34831 SHA256 e6e1b8b45251e5bdcb397a9774dea57918ab091b6358ae42654a99bda280686b SHA512 9d4297f24b63449f3293f750d903170793b31c2a7d0a87c16bc4c3b741b993e0cc06ec5408d7a2c706505641fa3cd3f070cc09e7a7a5d358d8f18f26b41fb408 WHIRLPOOL da8c416f3e2757f146c6bdc83f7c527b8c566ac7716b52408788abd3407c2ac823d5f1cb94dd3df92ce75e5510705aa7bb65f9833974c3be20c18a470d9e5659
-DIST listen-1.3.1-git.tgz 35521 SHA256 36676ee96fac67e46f52227ce8590a7532b0861ad1d0fa865d8783b635c56749 SHA512 4676d030a3e676249a221cf4a136ce69651009ce5855821924be184460e404e4f33026627c9d524156a89344c826b48a690a249f1059493d7d214b922381bdd0 WHIRLPOOL ecaf0e8dca01fba1d75c5c8bfc5bf6a3c5d371d5ca8c38bb92aba9a95cda6c1fb39b5e9927524581ef54f4ff2faf2e739f0dbf61b3a016c8943858f785e06ad2
-DIST listen-3.0.8.tar.gz 49637 SHA256 8322a3578acd62b467f387355d401bfa44a7364f0c6c9b3283282edad1009e19 SHA512 69fa4931be540185dab8f111e0b56bb37b369e89c5283089ececca9c907814b493cd3e31b12f2803a406f039ebaa966d6bf1367ebdcc72fe129e713063530135 WHIRLPOOL 6d85da5f7cff21c72db488514feefe14eda2c5f63db7e93e52464fd54489244a3e2fa2b174b59d8bf9904a1c103bb391098d5c5cdfe936f82b410bcefe7baab1
-DIST listen-3.1.5.tar.gz 51250 SHA256 5a5b5656515be880f9b880dd3c7fd0bbbdc18dc162b159f7d627b4fb2de91538 SHA512 132266485d70002da5bd1e680530331db6b74e8ea12011d60a6ba7df0ec045459b5b3a6305bb2ea6a80ff6a4a1244ef935a4143f6c8709df7a176d6db69da08a WHIRLPOOL 325593d1db7b561e07cf5ccfe42d64a5e7edeede6aacb7d37394accf7b8f48d285bf6349c98b88b9699428bf4647b134509751487b22d9bf5e4fa0b877d349a6
+DIST listen-0.7.3-git.tgz 34831 BLAKE2B 38ad9805080606f17cfe4073ce503985ee4a131258e4887c06901ac42da6ee5a987f1db97c26747e3f518d56336b074b485ac1e4c4d3cee6cf15ff9586e9a090 SHA512 9d4297f24b63449f3293f750d903170793b31c2a7d0a87c16bc4c3b741b993e0cc06ec5408d7a2c706505641fa3cd3f070cc09e7a7a5d358d8f18f26b41fb408
+DIST listen-1.3.1-git.tgz 35521 BLAKE2B 6b93daff2b3ba221d0c0f196c67353963e983610dd9deb3409c8ad270f7221d50e9eefee826c16c51ac0361cf7f5da727db216b1bd92a02077b0bee580fa368c SHA512 4676d030a3e676249a221cf4a136ce69651009ce5855821924be184460e404e4f33026627c9d524156a89344c826b48a690a249f1059493d7d214b922381bdd0
+DIST listen-3.1.5.tar.gz 51250 BLAKE2B 8ed941ed72293fad3327f2fb939920f82b02a9c0f25e8b1273961d9bff64830d619e9e97c184e353b69a78fe38be01a2fd2f0453cf94d3ca9fff66e40d18f59d SHA512 132266485d70002da5bd1e680530331db6b74e8ea12011d60a6ba7df0ec045459b5b3a6305bb2ea6a80ff6a4a1244ef935a4143f6c8709df7a176d6db69da08a
 EBUILD listen-0.7.3-r2.ebuild 894 BLAKE2B 7c3223adae2b7852ea9d9bff70e018e37f1f26948842105e4f59763b0069e51f5b3f2fe7800c3ed16f55d7f8762fe0de612cad50084c0a99bb3f2eee6dc9f8ef SHA512 267964667edf9c79b1a0652d32a8827f46a4307cb59245ecf9fd246a212ef0c7046f8c7319e352929c7836f71749b4344fcd74e90c63491c55abaac762a53a5d
 EBUILD listen-1.3.1-r4.ebuild 977 BLAKE2B 45c6d8c6d577e83d5f5d5af5172617875c83a51a670b9947e89c9c250eb05f1c6283a821bd56840f7586545ba14a3e295d04cf789df9f407e6aa7f61daea70a0 SHA512 9051c534210cd5e7a9eac6a38e7d0c3f2a01cad620866fa5e6177d58c69a1610221b131d174ce073d198dac2a797404127a61602ed2a3549042acb0401775631
-EBUILD listen-3.0.8.ebuild 1489 BLAKE2B 8107384ecca43e79e663b5d4579a4af4fd4cceb1969cc6075ec494d15867a18d980110d80bb271d309706504008c9fb36e33336f6d4339253d78cc7d749c4d89 SHA512 7b98141df2bd9e26ff19770ba99b93c6077c54ce5841d131d3804e0f68824cb3235855c4b6ef603f5fb6b113543dd5cc2030883e946bd87d794dca24cc8195db
 EBUILD listen-3.1.5-r1.ebuild 1224 BLAKE2B 5911a6ea57ccc430d14368d9a465df760e2f6ad8bc2a1ed76b847ba8e3f5dcdf84c08d025d141adad21d17ad1d41102169276c3f7f07af6fe0dfdb94de329537 SHA512 ce667d1911a8320f71b008e9e0379a4226bba2c2498fab1aae210953c6a551a8492fa12e682395862226d270efc76ac5a96b217d215a422dbdd79cc56ff08d93
 EBUILD listen-3.1.5.ebuild 1240 BLAKE2B 05dff2609fffff83d14cac7e29d0db5d766ccd2ee0d1d83d5b1164c8a743c120718167c921136fade76940dab1756acba6c310489c6ca632b0b158b1b74750ce SHA512 aa7a3d783f4a9b3df163a80c7ee957bcdf5d3e6c36b52d1091d1eb94f33729a5448777d7d7fd4f7eea48066bb2d4facc5e4de33236cf0ce01e453d01a8ef1d62
 MISC metadata.xml 338 BLAKE2B aa66734c1150c6a7b21e1c018d4303311955fb6e1eadcdfe16c3ca514b3aad663e4c16399a75b091e614ed87a86b6958577771e040700e01590447d33bd77dab SHA512 f4035107afc1bcbab797e116a0f39e49c9a4034f838878ad448efea9eba8d2fbc4db074db73871550a42c175c9e36a220877d2ed50580828c3180fcc50913288
diff --git a/dev-ruby/listen/listen-3.0.8.ebuild b/dev-ruby/listen/listen-3.0.8.ebuild
deleted file mode 100644
index 46cadc5072ed..000000000000
--- a/dev-ruby/listen/listen-3.0.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Listens to file modifications and notifies you about the changes"
-HOMEPAGE="https://github.com/guard/listen"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-# Block on other packages trying to install a /usr/bin/listen
-RDEPEND+="!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2"
-
-ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.7"
-
-ruby_add_bdepend "test? ( dev-ruby/thor )"
-
-all_ruby_prepare() {
-	rm -f Gemfile || die
-
-	# Avoid dependency on rb-fsevent since we do not support Darwin
-	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
-	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
-	# Try Linux first since we now we use Linux and since the Darwin
-	# adapter now throws errors when rb-fsevent is not present.
-	sed -i -e 's/Darwin, Linux/Linux, Darwin/' lib/listen/adapter.rb || die
-}
-
-each_ruby_prepare() {
-	mkdir spec/.fixtures || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	rm -rf spec/.fixtures || die
-}
diff --git a/dev-ruby/metasploit-concern/Manifest b/dev-ruby/metasploit-concern/Manifest
index 84afcc26a3cd..a81c5639af9e 100644
--- a/dev-ruby/metasploit-concern/Manifest
+++ b/dev-ruby/metasploit-concern/Manifest
@@ -1,5 +1,5 @@
 DIST metasploit-concern-2.0.1.gem 19456 SHA256 ef42d34726f294712710c9efbd6229733877051eab77bfd1369e83df39a0c2a9 SHA512 759b1d96a3339f2396fe98ae979e0d3188fc75ff7374069b90e8cd98145d18c5d77d863d580aa1481aef91f8b8eb3d12e6fc1dc67354e1b52be33fad28741003 WHIRLPOOL 31243cd6b167c1766785e918515234e17f6ac47d764e00eb5e6e0782bd14ab8c053cf2c9b03ebd25e7a5dc35e9b439ab4bf03d1a4be6af6507bb91c266382491
 DIST metasploit-concern-2.0.3.gem 19456 SHA256 e3e8ecfd767d3e3b1713cebd160f9d79a3ccd70355a89d031aab6b299f65df7c SHA512 2323bd2220abc7305bcbdeacf9e079fc9af23a84dd62865078f0b476a55d32b803a6bf2bb2e7c93fb42e49b0bb3b495a6854b6c294a0938fbfb9461af41a366b WHIRLPOOL ae3a6c9a23da01f4ef14941e5f4412c4085029d7d612a7971ff7fc7c1864cd477ca70c4693aa307c15c9d9cf8db5cb7646d69ba38cd556ab46e8233f441f3ab5
-EBUILD metasploit-concern-2.0.1.ebuild 661 BLAKE2B 9cd16ddd4ffbdd784027b48c75f857453c97f6efd3973ec46da405ec92f68f97da88d321525fcc8e62d94b824a3e3bf3fcd9c762b82866a334e5071c9901ede7 SHA512 9301bbbc138889ee14f2427c516445b25e79f7fb27abd1142190231b430b8b60b85efe878a1138cfb381baf3889efe054f4a4d6d0ba09ed00b00ded6197e0736
-EBUILD metasploit-concern-2.0.3.ebuild 691 BLAKE2B 1ab2cb6b597ba5e8d7e976bbd3f0427ee37fbfc580e5a24d6dfa5b0ed320dbf1c153e1bdf89a5ab93c5f67625187fd06911e0bbed2b0878ea36d1eb569856959 SHA512 fc7c3e7f814914dbba4bf5088101a472f23b3a56c71bcd78d5ba4bc0bf8ef7b46497ebe7a06e429470307ebcbeff80c16aacb5bfb2cf88ca1b78430169cc9e84
+EBUILD metasploit-concern-2.0.1.ebuild 649 BLAKE2B 0610592db6ab9ded2c7ab42d7a7de55b9396aeb206faf1eb01101b80ff03fc367b2eae6ed1991e906486c4220b3728048e69e616098fcf6806dc7bfd26faceac SHA512 fa588b99811163ed4ee33a31f51fdd62805fcab5fdd0935288f64066de56a9df626aed71646065f67490cb2e2230bc512ca603d4cd02dd8e8214a31ee9b49392
+EBUILD metasploit-concern-2.0.3.ebuild 686 BLAKE2B ca1319dbfdcde3705c0ba0d935ac8dee94c38cf9960ae6e9b8f3dcdbd33d48e4efe383ac346804baf8d2fdd2faaf4a9cdba117ba8e7943c9dce3e943afd1c76c SHA512 d48b8fa1f3522c4079dadbcecf0e883e8476f11251ec88ef0843adcfc32afc7122c82bf796207894407599b62e05f587399d5855b4ed0e417e694c161a75f626
 MISC metadata.xml 347 BLAKE2B 40af03c4a528780d9384ff7a2624ecdf51b782f33959396e0da772f6a6d680d129a6d177d5afdcb123257b21e69e3eec0f6243fac9a0d29a4f0fb0acc2239c3a SHA512 212f4b974bf78cb2129eae840f163bcecf594f1331a2b73635999785937113ee550b8ce10d05853ba81df3d3ecf80c21a93c04b8607e2fa1820921b8be9ef679
diff --git a/dev-ruby/metasploit-concern/metasploit-concern-2.0.1.ebuild b/dev-ruby/metasploit-concern/metasploit-concern-2.0.1.ebuild
index 4572ea66e5a9..464e63ee8752 100644
--- a/dev-ruby/metasploit-concern/metasploit-concern-2.0.1.ebuild
+++ b/dev-ruby/metasploit-concern/metasploit-concern-2.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22"
+USE_RUBY="ruby22"
 
 RUBY_FAKEGEM_EXTRAINSTALL="app spec"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://rubygems/${P}.gem"
 
 LICENSE="BSD"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm"
 #IUSE="development test"
 RESTRICT=test
 IUSE=""
diff --git a/dev-ruby/metasploit-concern/metasploit-concern-2.0.3.ebuild b/dev-ruby/metasploit-concern/metasploit-concern-2.0.3.ebuild
index 47fe9354e4b6..fd196351a7d8 100644
--- a/dev-ruby/metasploit-concern/metasploit-concern-2.0.3.ebuild
+++ b/dev-ruby/metasploit-concern/metasploit-concern-2.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://rubygems/${P}.gem"
 
 LICENSE="BSD"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm"
 #IUSE="development test"
 RESTRICT=test
 IUSE=""
diff --git a/dev-ruby/metasploit-model/Manifest b/dev-ruby/metasploit-model/Manifest
index 8c70e1b88fad..031a9a5e5ef5 100644
--- a/dev-ruby/metasploit-model/Manifest
+++ b/dev-ruby/metasploit-model/Manifest
@@ -1,3 +1,3 @@
 DIST metasploit-model-2.0.3.gem 81408 SHA256 011290db16ca8c84a82652be8481dca14c34edd8b0e2c9fd69f84ae1cc210fb4 SHA512 a6d77940e6b85925cc93c57f69910fde5c8eb2458d6707847be9f5856cfceee33304209e8c7076484151d9daf1f23cfe28cb0c00abb83176b7bc6c819fb128ec WHIRLPOOL a711cd41496acd8603a7020cda9aaed8cc8c84929e7a48db2a59fbdb29c5907d3224829d0bf41c39329c23441a3e1ec0e03848bdc3ebddc05571a0f4e9753a20
-EBUILD metasploit-model-2.0.3.ebuild 1893 BLAKE2B df294c1dc1cc5e8c38af3638ba7fdecb0de00b44839817fe9af763aa9793841e7091d85a8b74b13b328c6fccc14ea124a566b66a133a2d8dac6d368b162256b0 SHA512 3a91533f1cd24d8c0ebeec6cbf0960bb6260557820127265ca0f5176057170b7b2cf7b57bc24c1efdeb719381757eeedaea8a8400cf541cbd5e234a2bf9d3655
+EBUILD metasploit-model-2.0.3.ebuild 1888 BLAKE2B bf26f289c0edaa5d3439c62c34d16748c8d9bc90ad7fe34ea21f674201f3c1207bfa76a7e0aa6289932fd14f1689f3162fab66322e0f49998f7f4d1f34c5fb8d SHA512 fed2f4dd07f83b5c2037b5625c22aaedff446bd25a32205231d6d99e51ef4bd57992b46c00152285aacd777a4253e8e5754b4e5bbf2c31cbedc69fc68a7ee0d4
 MISC metadata.xml 541 BLAKE2B 5cbf1dc5abd33de9b63c4b70eceaa58cc2e9b4d4fbf4ebae04ee5ad769c3a419ae7c5e3f5508370f88fc2b3f44e13c5de0ba782322173142211e92a3c713f5b7 SHA512 a61494f72cb863a18cf370ebfdadcda7f4f3ed54e2c9d1e4ab9cf006f26bbefd30b1f293bd3f7df5e766994b044fe27a7b4fb4d78a1c7fdac7e2380aace901cc
diff --git a/dev-ruby/metasploit-model/metasploit-model-2.0.3.ebuild b/dev-ruby/metasploit-model/metasploit-model-2.0.3.ebuild
index 32cf654d8272..8ffc7598d3c7 100644
--- a/dev-ruby/metasploit-model/metasploit-model-2.0.3.ebuild
+++ b/dev-ruby/metasploit-model/metasploit-model-2.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://rubygems/${P}.gem"
 
 LICENSE="BSD"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm"
 #IUSE="development test"
 RESTRICT=test
 IUSE=""
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index 7eb5f0ce4835..4effd211a717 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -9,6 +9,6 @@ EBUILD minitest-4.7.5-r2.ebuild 951 BLAKE2B f199c1f122069f2e8226551f335d2022ca97
 EBUILD minitest-5.10.2.ebuild 806 BLAKE2B 38d0fe4a589a70a3002d54f7faf8d9252fc988746bb55b1d8ee2318770e77b8cd32bd3d9b298b1b4629181f58b84612d125f0b67d50bed37a3be77ed89756d10 SHA512 5c6c2c91f11eeafe874fb60b3c351ad304cfd81cbacec656aba32b27b549f9e5d21cfd486b6e2a90cfbf1c1cfab6cc8ab654fa82f3b0149328e6e72ccade4084
 EBUILD minitest-5.10.3.ebuild 806 BLAKE2B 38d0fe4a589a70a3002d54f7faf8d9252fc988746bb55b1d8ee2318770e77b8cd32bd3d9b298b1b4629181f58b84612d125f0b67d50bed37a3be77ed89756d10 SHA512 5c6c2c91f11eeafe874fb60b3c351ad304cfd81cbacec656aba32b27b549f9e5d21cfd486b6e2a90cfbf1c1cfab6cc8ab654fa82f3b0149328e6e72ccade4084
 EBUILD minitest-5.3.3-r1.ebuild 817 BLAKE2B a2173c0cb66ae8fbce47f13b0afd04f78ffff56c246670462f7cee90a73b6f26435c4489f3dcc4a35bcacba892a752c8681341ad896425565890c21b2c162737 SHA512 b96a9b0b391626ec3579314fb4d5e4d2635a8b78bdc3acec904519c78c87b633e5ed015fed19f7bba04a47adb7d2808495354e7ae378847c88cd4fcff3d84c53
-EBUILD minitest-5.8.4.ebuild 797 BLAKE2B dfc3285c681805a5bab3d1a3f2546cffc65f3eb0454c46e9ba369175cffe04dd340a80adc51ccd54232729228610a096b09b98f84465eb59d0bcf0d40b4e3792 SHA512 fbed034036e2ff323466bcb3deb5d5a369f07c8d4c0636676c068e12e3df290de4f6579c54f167b975407093f1b5661c9271db364b9fe1cbd9f239c7b5913ab8
+EBUILD minitest-5.8.4.ebuild 796 BLAKE2B 6e7708f2fc1cd4bd22980dae3c7306945c18ad9c112390e3d3325d84a2387c7726e22f69de3137c338933831e1a0420675acfbde440555d5e46badf5886544bd SHA512 e2958bf4b1822b12a1d1f957f81f2b01be96ee60454ad0f523d2d8aed04c74d0366f5d7fdca03493c0958a1772d0c6fb9fb6e2a32d1ca8f4f424b626ce0514c8
 EBUILD minitest-5.9.1.ebuild 798 BLAKE2B db1bdd395d8711d4c008683de5216764709101b18cadd07ef563fa22edf51082046a074c9f6931f98b6cec808199cb8ba2cec268dbc8889052af202fdecc15f1 SHA512 adca77f3173b648e067e0236138d0a2e2422294cb06b959c51edebf2ae7d2f40b27a75c0914b3cbb54a155df5e1a8b6ccab4639cf9298b93808e2a1b94519e60
 MISC metadata.xml 344 BLAKE2B a719762acb7e752051fc25d212f40e610a1a00644f8a09a4122bd874ec15af826d9360697b8d63d68fafd6596a8ea34439540894d8b8b9606baf5ddd4573d152 SHA512 48a43ffed154ec65035a6e84ec7e7e9ec222698b4dd56a81b6ca84844d9835c087fd7972d38ecc40fdba7f74acfeb2004bd1084d2cd123ffd09906e644c59e00
diff --git a/dev-ruby/minitest/minitest-5.8.4.ebuild b/dev-ruby/minitest/minitest-5.8.4.ebuild
index 3e3ee573433c..83732bbda3ea 100644
--- a/dev-ruby/minitest/minitest-5.8.4.ebuild
+++ b/dev-ruby/minitest/minitest-5.8.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 each_ruby_test() {
diff --git a/dev-ruby/msgpack/Manifest b/dev-ruby/msgpack/Manifest
index 8cb29e1cde4d..d92f5f99c1fe 100644
--- a/dev-ruby/msgpack/Manifest
+++ b/dev-ruby/msgpack/Manifest
@@ -1,8 +1,10 @@
-DIST msgpack-0.7.6.gem 74752 SHA256 8537beb868cc6e742488c54928961cd79694fa0ef5d10772dd3e3eaf62ccc2ba SHA512 9d30533175118c08f671015a99664e4798c845f63595495933b42f0fa95c160a6708e472da70baeb64537a704dd4768cdc9ab99a19045daabd92555b21f4e389 WHIRLPOOL 879e5b6b3fc6cd82d28cce5c4f91621437b2cfc34caf21bdbad5d1bf48d8f7719c97b7b1f96e5648ddc77cee679911c58711a8804dc30765f1ae3ff7f8e32f94
-DIST msgpack-1.0.3.gem 77312 SHA256 6a0de861d6ef51e9155ddac15a476358fbcc21d64be059b7cc2dea076c130623 SHA512 b76db7f5c91128d19677774c7bf8c914a7e85e374fc0149bf5d0b470729fa01f4fdf173f7397e6f8df32af760a622a405cdc6d268f45b776b172bb39b9f1f4f7 WHIRLPOOL 77ee2a14fbcd1245ee8e515df8756b2d37aa7f89b842b5e67726b72b6cc1e8bec3d91bc223107cb03a7402d1b2ea3328900f5d7c6119363fcca059bf9d4278bc
-DIST msgpack-1.1.0.gem 78336 SHA256 07d27ad7563ec84adf6881e2aee2942c45f8d62938401bd15a922cd34ee06732 SHA512 0142c9a446a476a7b4f9212513dd7b1fbe107193a473873f4eb6f4321d5515c42ea3540ac4de17f37f9e833f19bb75594d14b84ccf70b16d2a3840e066c873da WHIRLPOOL da057f4cb9815ac05729af36f362aa82aefdc2fbe7d14d97ec91f5745e6583aa7d8562b7c18bb4d8ca32c82118fda01ca0d32c0943e62774d6ed696f155564aa
+DIST msgpack-0.7.6.gem 74752 BLAKE2B 4ad445ce73c1ba2889a7989f15a06ddafc8c304a53096ed3b0881da3829d7a90e4456a017536dcac49c48fdaf39776534ef3270581ed58ee79375741dd93632c SHA512 9d30533175118c08f671015a99664e4798c845f63595495933b42f0fa95c160a6708e472da70baeb64537a704dd4768cdc9ab99a19045daabd92555b21f4e389
+DIST msgpack-1.0.3.gem 77312 BLAKE2B 57b02566009c19ff9c7886b82e6ac300c598462cfc3a8f29f07bf53e037508aeba5f6a783a865a49014bc9a99d5256f6dc59b20739ab7a3d34c84bc534cafb7f SHA512 b76db7f5c91128d19677774c7bf8c914a7e85e374fc0149bf5d0b470729fa01f4fdf173f7397e6f8df32af760a622a405cdc6d268f45b776b172bb39b9f1f4f7
+DIST msgpack-1.1.0.gem 78336 BLAKE2B 34b450bfded43cbbde3246ec581191de85131b6b74b4bf57ce6dce26cde3d6d40ab9f018e28b4b2e2b144c44cfaafd704ca4edd641371b179b3779f43c6ce23a SHA512 0142c9a446a476a7b4f9212513dd7b1fbe107193a473873f4eb6f4321d5515c42ea3540ac4de17f37f9e833f19bb75594d14b84ccf70b16d2a3840e066c873da
+DIST msgpack-1.2.0.gem 77824 BLAKE2B 15b44b5de8ae02ec6864323241a8827099d912850158c1bb81d32840ff7f0c7e53351d30b209f7c0bfea9e099c34ec724c98420bec45e0701918d883a16a8367 SHA512 c81d68519d5dfc6188799a889fde3d5aec0fc4231366da61914b028e8ef23c8de0bdc2399e634327ca1885566c14ceffe08def795417e386834d07dddf5f8836
 EBUILD msgpack-0.7.6.ebuild 1135 BLAKE2B e0e4232e256e721b5e3ff9e54c2244bae6cd09fc9521bc86dfac3a490c43d9ffead1ac4cc333e10c3e5f6462429414af1680d0009e355eb788a0baac37d4bdef SHA512 f0c00b42fab6d68ee37b8a8b56ac578517614fc5aaba7376d10e508926b20aa9bded94dcaecd440a56a91ef7a62dd10a3327f35aa323d03c339cd240cd65a4fb
 EBUILD msgpack-1.0.3.ebuild 1134 BLAKE2B a69cee974f76d65644db684152f1cdc0d53eeb635243d89dddd02314cb37064c79472096d4605a19b6696482b9ecc8e0d71ab343dfcac4981151ca7736b7ed65 SHA512 70de551f55543ff788216e6193d748e7f610f8957d1ced9701dadffc79fd2964b3c6692b2e7fbb1d755b9f41669a9fd782cf3f9b1fb353d76c27dd36c2cae8a2
 EBUILD msgpack-1.1.0-r1.ebuild 1134 BLAKE2B 11fba0baa2676881c4c2044c3b1489be8b30a4a5ff3be1d7bc25ca952d57329899a4abcb882d73acd0e18811cf5d19d0b2985e288116551da0601cddb964b77b SHA512 203489b8cc169c99f692328a7952e11b49ffcb42f72f3a04a0bbccaff3d0187d632b31c2c2b8d56a7cd979ab7606ecaa2e3ee957781c3a92c1fcd1da16cd7f72
 EBUILD msgpack-1.1.0.ebuild 1134 BLAKE2B a69cee974f76d65644db684152f1cdc0d53eeb635243d89dddd02314cb37064c79472096d4605a19b6696482b9ecc8e0d71ab343dfcac4981151ca7736b7ed65 SHA512 70de551f55543ff788216e6193d748e7f610f8957d1ced9701dadffc79fd2964b3c6692b2e7fbb1d755b9f41669a9fd782cf3f9b1fb353d76c27dd36c2cae8a2
+EBUILD msgpack-1.2.0.ebuild 1134 BLAKE2B 11fba0baa2676881c4c2044c3b1489be8b30a4a5ff3be1d7bc25ca952d57329899a4abcb882d73acd0e18811cf5d19d0b2985e288116551da0601cddb964b77b SHA512 203489b8cc169c99f692328a7952e11b49ffcb42f72f3a04a0bbccaff3d0187d632b31c2c2b8d56a7cd979ab7606ecaa2e3ee957781c3a92c1fcd1da16cd7f72
 MISC metadata.xml 331 BLAKE2B c964da6cce4e1e413377a6bf37282aa6ba207c33f3682ca5738361bb0df8c45dec063abe22f3183354b79b70707f897382a3412de1f6b185460a26ac2006f082 SHA512 5cff44a3b9425bbdccb3b682a26355c9526931b2826d7ff91da0d6db5e0dd139ae556a47dd06757b5cd209413b67181483189ba2dae819f70ffa58a46751c4c0
diff --git a/dev-ruby/msgpack/msgpack-1.2.0.ebuild b/dev-ruby/msgpack/msgpack-1.2.0.ebuild
new file mode 100644
index 000000000000..dd26691671f2
--- /dev/null
+++ b/dev-ruby/msgpack/msgpack-1.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
+HOMEPAGE="https://msgpack.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd"
+IUSE="doc"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# Remove jruby-specific specs that are run also for other rubies.
+	rm -rf spec/jruby || die
+
+	sed -i -e '/git ls-files/d' msgpack.gemspec || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/${PN} extconf.rb || die "Configuration of extension failed."
+
+	# rb_num2int is not inlined on 32 bit arches but also not explicitly
+	# defined, bug 582968
+	sed -i -e 's:-Wl,--no-undefined::' ext/${PN}/Makefile || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/${PN}
+	cp ext/${PN}/msgpack$(get_modname) lib/${PN} || die "Unable to install msgpack library."
+}
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index 82839a0485e5..4351d858fc1a 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,7 +1,7 @@
 DIST multi_json-1.12.1.tar.gz 25579 BLAKE2B 50fa37b907289b8247ffff1e22ebde1b07ee32e5ca97984be1243340f14185ebaaeb72cb28a18c5c77b1b48bfd0b400479fe7ef532e40cef3736d782c84c0d09 SHA512 f61e500197c5a1373443b308bd9307238c54d2d23ba9da91843c667c12e491f34fd87575028c3630a81a7355d4903344996f20408bbb7971b12dfba3cc4f76df
 DIST multi_json-1.12.2.tar.gz 25630 BLAKE2B 61209dc4be50b44302cfe40e45b840ae8d81e827d8b9df82ca6b852a72d360fbe09c0f5b0ef8eecfbd08b6bd08343ab7bb307d91d9abf28c9b9adb35f18bea51 SHA512 bbbdd05a6dd12052aa3e09389f47212f15799310d5c265057f7ca801622d32295d1f0844b37e51f8f1fd2d48e4430234f99bc6de4b9ed149e81d9a33a831e6d9
 DIST multi_json-1.9.3.gem 30720 BLAKE2B 9e5fd49a1fd79857bd7c907d536d7e6eee9908720bca8a33abf9f1ff18deb68965140cf978d0d10323edf7e2f426aaa5925dc692fb5707c6f879f4921651a799 SHA512 7f06747e760a63b6421dfda480522924f12bd00ad63f95414f6624173b9b9b255b139f9dc33d2d2a8d19b232f99a005033e00e3a0b223be992f73d142a55b8b5
-EBUILD multi_json-1.12.1.ebuild 1921 BLAKE2B 175a6a8d5fafb14f11e7532189598036bf9911726e7816893ec303175b08e5f59f1d27e8ce7290338ddc74b1f9a4a25e6235f39b1f8b753a462e59dae00602fa SHA512 47763a05bc03e994e499ff0eea1471aafd66fc89fecb425040d4b0a4bf9f553af548e54f75628d769b5e8d75359adc5bc876a67d65e8d80623dbcf6313b316fc
+EBUILD multi_json-1.12.1.ebuild 1927 BLAKE2B 774ac82df00e3520f572a818e605d541936780184d4bd7b5aab81c8c8c79025a2dd9fae1749e76e51407d0ff2841be43a1ef8d1c452f9ef49d6fdd0a7d0ac995 SHA512 85fd39b44fea3ac6774f2436210616caeca2813aec9e149a5aafc59e5228bcf4db9e7934f57e1831fb58a72f14aa43192ae03b4865f2c5ac3c9ff04d57fa84ca
 EBUILD multi_json-1.12.2.ebuild 1922 BLAKE2B 338cbc039830d46a7cebb61b82ee7fcce1b6722a7de17a9cff0ff1372c12c7157d01bf0c8b1fe05cf81d2f5a4b51aaecaf807ee6563b84ce31e843963e78c992 SHA512 429d8f7036473500cc478d690e28ab4baab02cce66a474f0c73e03b2362e3b9124248520bca8ce1c2c89ab46f6ca41dab196b654919f8bd43e66e76c6e04e9cc
 EBUILD multi_json-1.9.3.ebuild 1879 BLAKE2B 171564ac61d2af2fc7afe916fe730c9eda9e72457d0750bda5d07ad0bcfdb43fed40201d97c43e1a357058754047fc3f6a3d4456b50437a114f9530928291bae SHA512 1b135e0cc7ceb66860fa8ac533ffa66af464f4a019b897540ce0c8bee6764826a78aadc29ddf4cfc67f66147193398819e50d322e0e82d68ac088078abf5f7db
 MISC metadata.xml 345 BLAKE2B 7d7684a1546dcc97e934f1a7df4484b568c5e8043dcfd0493e03124fa9f96959de5dccb78d22b1ff51ebc39b5fbec8b9a1dfd24531d676b8982b1f1dbd5097d0 SHA512 5fe7f117806d67e0d295bfcbdd07d4bbe8d3c3875e07cc3d276f2aee81b89f2e90174cbf4264d647384817fe0e8c81c2f2c9d9d67e3f78b46c3c194001bcace9
diff --git a/dev-ruby/multi_json/multi_json-1.12.1.ebuild b/dev-ruby/multi_json/multi_json-1.12.1.ebuild
index 1db549288f6c..ad7b258ac212 100644
--- a/dev-ruby/multi_json/multi_json-1.12.1.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.12.1.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="A gem to provide swappable JSON backends"
 HOMEPAGE="https://github.com/intridea/multi_json"
 LICENSE="MIT"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 66da2d86febc..6a79ebf34e97 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -1,9 +1,9 @@
-DIST pkg-config-1.1.7.gem 19456 SHA256 1f3cd171432f4634805ebf7cd187d1d728d732bfead3837c349f2c502d8e9252 SHA512 9f515874d3edabdfff5f4c8d624bbc91e9c5032e79c241412cd073f0a049e35a2e2a660d5503eaae9640286d74cb98510bbbb34f757c702e220f728fba1c2337 WHIRLPOOL b1eea580d1db95bd651004752f913c7ce5f821ebaa0a1742609bd2e07738c2d125b36f6d5a03dd8b6c34b126246163ee1bd59ef19143df8a0b2f01bb7b260f9b
-DIST pkg-config-1.2.3.gem 19968 SHA256 bc193fda2ceb83cd0eeca87e1c9eba8e142dcd785699205246e28b1a7f14a84a SHA512 1e0ec12cdb9647d9d5b29c48940f15dcf27e346a18b9f33922a5b8e0a57957206981cf5c7dd70da36fdb2a32bbe8e3ac38737f66abc5f5afa8b4dabf52a696fd WHIRLPOOL 7a2220cbdfddc3b93ca7f47ae4c9cd026ca6088a3dd5ee3c16bb2fd09644465d18e0def8d2e3d00e92f7f9f83aecfbfaf424c25047a2b71cedc2bc23b288a320
+DIST pkg-config-1.1.7.gem 19456 BLAKE2B ae6f3641181a60aa46a2da63a5343f23c4a41a9499ff5e00b1115ddfb328a4db33db2890d234f5cbc9a45af28aa537e886c776f0a8f24e54e307f637e5a2c8ae SHA512 9f515874d3edabdfff5f4c8d624bbc91e9c5032e79c241412cd073f0a049e35a2e2a660d5503eaae9640286d74cb98510bbbb34f757c702e220f728fba1c2337
+DIST pkg-config-1.2.3.gem 19968 BLAKE2B 2db6c37aecbcbe63aee639a8cba99840d618a24877ada52838bda4c5775bfe8ca2d555cacad9bf53477882df555cf118c43bf54c9360d5cf05b21e7b4b136629 SHA512 1e0ec12cdb9647d9d5b29c48940f15dcf27e346a18b9f33922a5b8e0a57957206981cf5c7dd70da36fdb2a32bbe8e3ac38737f66abc5f5afa8b4dabf52a696fd
 DIST pkg-config-1.2.4.gem 19968 SHA256 cf3f95210991dd3e4c54b5e41ac7b7dfaeddb5a0564e437b63a7516c01e75802 SHA512 74abccc5b067d4b98bc1aa20eaf990f1e31f8ab9251f8081440dd2b11e9d14ffe82ccff92d0858386e11fe3ff4f8927da7ca17d382946e4b0c3dbd7a45ffae24 WHIRLPOOL afe3a26ec7579ccee57b5c1ed39505b90232bafee34d5456828f9b2c9a353c7ec85cca535a20c9f247658f612ff3aa7bc222ae7be1c23ef5bd7f997901cea2bc
 DIST pkg-config-1.2.7.gem 20480 SHA256 fc8ab6f3200cddfeacb8a29168daa38d8f76c0e09af91a00a3d423bc472d70af SHA512 88a0d0c616e4c00dcdc25980c532476eb9c9ff17e9f8a015c414cf2f536c558bc10656e2a56dbe01f34c016e86fc92959f2231a07e03b541c32c79ab36423760 WHIRLPOOL 9a93af606ba0fe167b2dabd8e0cff8b055412146175ddfbb28a20de44da222c7603a1178f8bbc617f8495f5f8d9341925222c2b3d6b037972b3e267f94420cfe
 DIST pkg-config-1.2.8.gem 20480 SHA256 9aff7ab9d6aea2218dba94791a1b3ba6f149fa57dc9c81634e54f0c59959d814 SHA512 d83a599a48c7d404946054c6846b6cfd9fce2a264c288519a6eccd9787f05d45397dd46300bf97c80700921456318154ea6d44ba32cd159803471073c2a2b065 WHIRLPOOL c924956bd3a8acc9d24d877e6803be0d8ae73a0dc578f5c1089c98c9bbe7ffa290329c5870ba5b2afc0f37b92a30feef2d4758ac3e3d8ac92f5eb5aa4ea80190
-EBUILD pkg-config-1.1.7.ebuild 815 BLAKE2B f40a6c5770b8c4bbd617820c8de5ad8b334fabc6b4f66534482e38755d06fc87142cfba15c2b4ee6ccc45f95df6fa2a8f94b85138df86950fc9a49701c845437 SHA512 f5574a0724a162fb834e5bc0cf0056eaf74f463f0b99b775ac966ec1b47d4965e0905b08078ee2f6915133bd862c27293992021417d20198c130e49e7c84f2ea
+EBUILD pkg-config-1.1.7.ebuild 814 BLAKE2B b6739a0cc7285df5a6db56eca3473742fac6b816e7bae226e1673b473743a9b6cbf655016bc9b5c90aaa9605b73b35f5479604f4bb6b60cae2944345fb25e324 SHA512 5e6e06a783a032ea54412a27780c7837133e295cf3d0becfeb22d0ef7d2fac4b5188d3fe415abb092c827c81efa5ce382c42eced83833b79bef7464d5324e232
 EBUILD pkg-config-1.2.3.ebuild 824 BLAKE2B 36e4dd1071f3a0ae61ab79542311227282af483357da170a1de393fbef3dd34626ada77983a6700130c7acd720c7b478a1ba3531bea7318b21eafc831dadeb38 SHA512 e33cbcf684fe1b3b913d1048c1d2b94d6412f5e8af28d2646e28603ef18eb0cbc1391d39c5c80f150eda0df76dee1339a8de2c4d7050a2bb2a1ff302a88a7fb2
 EBUILD pkg-config-1.2.4.ebuild 824 BLAKE2B 36e4dd1071f3a0ae61ab79542311227282af483357da170a1de393fbef3dd34626ada77983a6700130c7acd720c7b478a1ba3531bea7318b21eafc831dadeb38 SHA512 e33cbcf684fe1b3b913d1048c1d2b94d6412f5e8af28d2646e28603ef18eb0cbc1391d39c5c80f150eda0df76dee1339a8de2c4d7050a2bb2a1ff302a88a7fb2
 EBUILD pkg-config-1.2.7.ebuild 824 BLAKE2B 36e4dd1071f3a0ae61ab79542311227282af483357da170a1de393fbef3dd34626ada77983a6700130c7acd720c7b478a1ba3531bea7318b21eafc831dadeb38 SHA512 e33cbcf684fe1b3b913d1048c1d2b94d6412f5e8af28d2646e28603ef18eb0cbc1391d39c5c80f150eda0df76dee1339a8de2c4d7050a2bb2a1ff302a88a7fb2
diff --git a/dev-ruby/pkg-config/pkg-config-1.1.7.ebuild b/dev-ruby/pkg-config/pkg-config-1.1.7.ebuild
index 7017245415bf..216fc64a8465 100644
--- a/dev-ruby/pkg-config/pkg-config-1.1.7.ebuild
+++ b/dev-ruby/pkg-config/pkg-config-1.1.7.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="A pkg-config implementation by Ruby"
 HOMEPAGE="https://github.com/rcairo/pkg-config"
 LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/postgres_ext/Manifest b/dev-ruby/postgres_ext/Manifest
index 2581ce18018a..41c75fb8aa4a 100644
--- a/dev-ruby/postgres_ext/Manifest
+++ b/dev-ruby/postgres_ext/Manifest
@@ -1,5 +1,5 @@
-DIST postgres_ext-2.4.1.gem 20992 SHA256 41d5bd383537e90833005f87fe502843ee7097c5a981e81f7ed8464635d89df3 SHA512 e8a0b2990e2939f600c92bfae70ebfb142875ca3b86d6d6ad95bc8bbaf350df8c2fde5173f51ff71616e5b68d7d852d1f4b201573c05afa39aa4134c9cb4ef75 WHIRLPOOL 8d2126b0717c7f4311bd171542dd76db8d56c6b07cdd05400af7130a9e8f06df324faf4ca5aacbddfb31fdfeedf2e40bb9f960f1cbd515f3687dbe5a31c1a622
-DIST postgres_ext-3.0.0.gem 21504 SHA256 ec311a5550a0ad7a26ca9a3d1aaf3cb0a9a4e75fa49d6a3f6c4d055d1c0e77d1 SHA512 3d17a0f6ed98badf5c196ddc78e50d47c6a24edc19276f3939255f3d23490e30a3abc344da020d0480a8ec73586c6084349caf472f735461c4f9b6084d4d2c52 WHIRLPOOL 3c6a03884f608ac98353194c111acbbe06f9589525a4844185e2dcbb4a0166b56b66f51a5ae6041d52b972189d0e8f7963fc56429f5d5cb31cbf1a4f71048418
-EBUILD postgres_ext-2.4.1.ebuild 1512 BLAKE2B 9e04e7f3c1e9bea1181c5ed0fb873c31ed9bc6c78d21d91cb147bb2c519f3ef3ea92ac228e6690f1c5051a2d07242d76a8fb22924d7df766c3585e0b46c7a354 SHA512 f0539e851fd2fd74a4910a3a5614aea292458c96dfea2105f3f58df5156be5c069a69e03d213b5e27188ad10c339beb95bf33134b1afc4672901b736317a1b22
+DIST postgres_ext-2.4.1.gem 20992 BLAKE2B cd678aaf94cf56d511e1650a36427a0bc71f776e3a19bc5486e5197c6aff5c8b3e7e98da3a7ccf7451b75a62a37965641020a7b070c9cba7d951e7d493fe25f4 SHA512 e8a0b2990e2939f600c92bfae70ebfb142875ca3b86d6d6ad95bc8bbaf350df8c2fde5173f51ff71616e5b68d7d852d1f4b201573c05afa39aa4134c9cb4ef75
+DIST postgres_ext-3.0.0.gem 21504 BLAKE2B 8fa38e78bd182e8c89746492d7082383b3411d987b95b6f01ca0fe961913aa74f3e32923150e3ce8d9dc0bf7377a65c6f2f926681b7dce0cf25873a8537c9ad0 SHA512 3d17a0f6ed98badf5c196ddc78e50d47c6a24edc19276f3939255f3d23490e30a3abc344da020d0480a8ec73586c6084349caf472f735461c4f9b6084d4d2c52
+EBUILD postgres_ext-2.4.1.ebuild 1500 BLAKE2B 4145038da404706b2294a049d1fccdf0452364d3b9d025cb9e560a7c895852dd116327c1ad1f95f921438286cfa97dae7da28e4ca9840f775cc4c611725094d7 SHA512 03059e4c5decd0dc6155f67ae0c8fe8cc2662d5f73b283adfd070043705cbc4a30cc1cc0c3f1d6130afefa3d8945b3c2994762622cb2746751761c3751b1bf0b
 EBUILD postgres_ext-3.0.0.ebuild 1504 BLAKE2B 990944ea11fb8e783dcd1cab947c67440376581775d2e80f666321bf2afb44af0d132ac4e836a340e6528126a698a1fda54fe5ee7055eb020c4e94d7236a24eb SHA512 c51974d40c3e0623a7095e5d36bf635de1ae60de1729ff4a5e09f073344bc3e3ca57fd9e7f28a1da514e09fe5bfb2ba448a07d1dd782ee326457d68ef4cf3f28
 MISC metadata.xml 343 BLAKE2B d0e9097262d31b024b2c77f30e35d4d905b6dc9477f670e00d34bc7e60f54a5df408280bc65e168d4b9d0b37ef0e4f479aa485762d14952f7c13a2740548aa13 SHA512 b00bbf491b1dca98cdcbdd8a23982a5120205f07e9948c453c9c18ae3233e450cda7d6e78986b4a1b6ae17db15307ef9494be4e85aca31b453e3531ff0de060e
diff --git a/dev-ruby/postgres_ext/postgres_ext-2.4.1.ebuild b/dev-ruby/postgres_ext/postgres_ext-2.4.1.ebuild
index 1c406910eb46..2656b0f4076c 100644
--- a/dev-ruby/postgres_ext/postgres_ext-2.4.1.ebuild
+++ b/dev-ruby/postgres_ext/postgres_ext-2.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22"
+USE_RUBY="ruby22"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://rubygems/${P}.gem"
 
 LICENSE="BSD"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm"
 IUSE=""
 
 # Requires live database connection
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index fd4a126be554..bfa4da774e06 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -1,10 +1,10 @@
-DIST power_assert-0.3.1.gem 14336 SHA256 f89ba9cc1fa9d684b8f9f1221e94a8472a89355b5a6cb40d99fc863cbb4bec3a SHA512 0523c9c2f45ae60e93b491bed8ae3ff3bd83cfdf8c23d784ce19f87a52d90b94095d3e5ca38fbc2e4917a8895309194e06ec519099b69096bef69a4d9466da64 WHIRLPOOL 7a378ee685ab2b5d47885285b6c2b5377dae60f63fe23ac1ac2f776e6acb7b80445ca033a8ba0c4df6bb56eebecb084d9cede10d90d6f63750aea6e9d5d80ed0
+DIST power_assert-0.3.1.gem 14336 BLAKE2B d29f8ffb84c1322610e1bfc819a599828a386abe2a21bf60d8e5a397dafbad52885c20899a78f713d39aedde992ac180138ed7fbd96ebf48d9bad753a51f0097 SHA512 0523c9c2f45ae60e93b491bed8ae3ff3bd83cfdf8c23d784ce19f87a52d90b94095d3e5ca38fbc2e4917a8895309194e06ec519099b69096bef69a4d9466da64
 DIST power_assert-0.4.1.gem 14848 SHA256 8d2bf80d28a9f8bc4c6c7eb162780971896d0a27fa0540093a0f125157aa6b7f SHA512 18b55e841499be7827cdfbcca41fe786a4fd7d0ff2aed049c289b917ab4487e035cc4321f39ccab2dcc5967c668df36f0cfb96d8e799793c9cb8dfbf9b3622c9 WHIRLPOOL 8609198b6c7453f11b51b651d9911d8118cf3ecf6af1f05d721c7e33f06620a030538de11c39816435810e4c7c1993148a287cdaa1e48b86456edae07fe6c4e6
 DIST power_assert-1.0.1.tar.gz 15376 SHA256 58681a9b3166b9f7d2ee41554a3d5363b5a6f64f5262f703fce5285c4ebd58c7 SHA512 69370f69e7289c36a8d16a433e3629d25aa99049eec9b737af56d56c07ed5c4e72692c9fdc544cc76e7008babb2c7fd68c796e27e300268cd75b12cabe1d7403 WHIRLPOOL 0a2be78ba7d5eeef66995d3c32b3b99ce91b624cbee55e0cb78b3272816d9d3faa21cc36e597d541666e496381e663d458b497a8e2aab0ded8526a03aaf27aad
-DIST power_assert-1.0.2.tar.gz 15381 SHA256 f2fb8a6830617659263c57b7a5c742611c83360b93d5282d355678c407fc1711 SHA512 31e1f0eb0b873b3ce05c72cd467e1928d53b028e1ec30314bd027d7402b5834442ff268d0263100d657cb485e67c64fae93996d08ba74d603b924c4526a7022f WHIRLPOOL 2ea494fb3be7620ff504299028acfdf05693198d0f97258886fc403ddd2471a4cdb2a57a1a98ba01cf518465036a5a46d1ac29f10f0de1238f5f0a9ec5102e69
+DIST power_assert-1.0.2.tar.gz 15381 BLAKE2B 8ee6db646f4d0f9d25b5faa9974dd6d30eefdad09a68d5cfc2c78fbb5df1b891671296357c6ab834813ebcfbe241c28053f458ef31503c90ccc9d0aa9441b4ae SHA512 31e1f0eb0b873b3ce05c72cd467e1928d53b028e1ec30314bd027d7402b5834442ff268d0263100d657cb485e67c64fae93996d08ba74d603b924c4526a7022f
 DIST power_assert-1.1.0.tar.gz 16184 SHA256 56c8a1f7588ebf00ca0fa1ead298d5f8e44743c1bead4abb3390414cf3bce3ac SHA512 271de1c87adb2a1e427329cba4f3e7ab15d17bde9afe4725de7b50f895fb4fd5b89bdd08694c84e1eac1183abbd53ffc56ad55216e0cd7841378e48393c885b0 WHIRLPOOL 835e11280251a5d51576fb88b6bc1d168ed1403c57dee8aebd657187616630187e1a60554d15ac4e7496a8e24ea5f3c8addecdbb20968cc11a78a31702dcc235
-DIST power_assert-1.1.1.tar.gz 16799 SHA256 6d31e3a1aa5aa358cafc108fbb5d3b18b633f6a71727c99709ebb701204e9dd4 SHA512 a33429bf918c71a5b75e56940d46dfd05ed3c87f909d6f09ebf2d8b2cd43a3c5c37b5ac13c334383f1b3f52817ecd4ccf68cd649c53bebdfbc464a18c88b702c WHIRLPOOL 0fd5121ca6d538fbb30f6bc177b448af53924b56bbd9f06e657136a54ac5addad82a6e028370ffdc8fa776f01949768a8dbab2b228d73bb3bf6bfbd249467dd0
-EBUILD power_assert-0.3.1.ebuild 793 BLAKE2B c445345e53041ca0b830a8521bf992b46ba13a91c57402c25ebcac9ed2db588c49558aa100bcff790e3d5b96ef940055cd55e4e5e1c78f1088f2baebe8d2eb7b SHA512 6ea74f0fd4a955a5082a2445202c837633a9f530d7fe0ca571ab0bf1c52897cb4f13a49bb167197bce85fe6a810e7b1d467cefa122aa6fb470dd0c98386fe454
+DIST power_assert-1.1.1.tar.gz 16799 BLAKE2B df5f688d4242373f1a5de95fcbcdd63d23a14314a890a32839ba88494d04a09ad6b9c1dedea23f43d53cb708b3e5eee8d0a2307be16a1c11cf3cbf22ea254344 SHA512 a33429bf918c71a5b75e56940d46dfd05ed3c87f909d6f09ebf2d8b2cd43a3c5c37b5ac13c334383f1b3f52817ecd4ccf68cd649c53bebdfbc464a18c88b702c
+EBUILD power_assert-0.3.1.ebuild 792 BLAKE2B 04dc6541c2f8ef2055d8c48190e39dd4caefb01a15bfdbdb9a390615bce66454e9cc2a1c277759f7d0d1fb7de6192dd56b93fa37b3cf0866dbb77f089aea0b7d SHA512 c455df2723fcb267cd3780ccc8b8d86569beeac449688740edf619215a4b2957271a58b697c10e198080a976ce3400de988a71d033dff9fa041de551f022464d
 EBUILD power_assert-0.4.1.ebuild 808 BLAKE2B 05a9b68383b4b11cebbc0d4aaed0254359d37120ce079bdfee31019cbcff01e9634ee27b8c1afbb76fbe8f416586b83d0fc9dddf9ce249833c005f25b214618d SHA512 bd5324d32bd8e296a7bd64856d615ae744ac983de3d99c0d97e81945894a052e466da11aed23d0495af89a4704da744dab89653ecaa60cff43ee548db165a9b1
 EBUILD power_assert-1.0.1-r1.ebuild 1338 BLAKE2B 5b7eb97146ceed908e05d4b11251b6975a8daf29a30205c4003aa72f244c012eaa935b3f7d35c623676c3072e93c1ea87608d30970070a00433bbb72b39fe4b0 SHA512 3d16f1eb1d5289b2eaa6e00618f02f237ea263e24b26546a9c288d31c297e3237fba68dd907a5f00eced3ece8fef9f9044240b44bf2114d6204056b2945983a8
 EBUILD power_assert-1.0.2.ebuild 1338 BLAKE2B 9b559c557516bf5d3e5501a17b086c6b162993a95c7490a99d4ace6c7337c8026072fbc587c2d383a56d26e0eec88872b0c723e1f8e51fd4924619721785a09f SHA512 d51eaa7a24fb5af4067cd8b6f32c0e08cef4b48a2c9f9bc3fac677e86e89b16e37f42c3f6fcd397a89f7c78a9fa33006b2511aa00e8b71a3d7a9d1e7b5d9473a
diff --git a/dev-ruby/power_assert/power_assert-0.3.1.ebuild b/dev-ruby/power_assert/power_assert-0.3.1.ebuild
index 1a9dd0ab6d1f..28c73e067aab 100644
--- a/dev-ruby/power_assert/power_assert-0.3.1.ebuild
+++ b/dev-ruby/power_assert/power_assert-0.3.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Shows each value of variables and method calls in the expression"
 HOMEPAGE="https://github.com/k-tsj/power_assert"
 LICENSE="|| ( Ruby BSD-2 )"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 SLOT="0"
 IUSE=""
diff --git a/dev-ruby/protected_attributes/Manifest b/dev-ruby/protected_attributes/Manifest
index bde454880bea..2b93c8616465 100644
--- a/dev-ruby/protected_attributes/Manifest
+++ b/dev-ruby/protected_attributes/Manifest
@@ -1,3 +1,3 @@
-DIST protected_attributes-1.1.4.tar.gz 23562 SHA256 6858cd3b18ec2d893539ff78fe542fec600b2f6c7848316bde10992ca7850d40 SHA512 02c55825ec21dde386e31b25e71df4ac48c2356bad303a82cc33703b930c5f8e36b57193761dba59dff3868d39a3b5458fb2a2c49809019e72ed4b4f4313bed3 WHIRLPOOL a96e8268c4b22f4205a054d61e91334bee873c67cb6835418f6f4e0b6acb404e43126d892e833decb63d571073c557d475f976855e069a944bd2a9d2b2207a20
-EBUILD protected_attributes-1.1.4.ebuild 849 BLAKE2B e36553d3ac81ef4dc0f2c6ccf360946a9191c3c717d40c524a39e04a49cc748bb90b03464649d84c15f5602df5c664883b753b45bbee940ac3bc23802b0d1c78 SHA512 b2fce71bcf162ed5dde4a28af86adfcc403aa5001670339ec17d542b26e0440e9ba372f5af7f96f72a6f38357e5329db2b73b6d13b3b6f78aafcfd734159c437
+DIST protected_attributes-1.1.4.tar.gz 23562 BLAKE2B 8b8c8a9f533344c6344de0e389807e39c06f53948d9206f965d0f954a9e8e8f4de61aebcbf96d95186b94e600ceceb48fd258087dfcc3baf15e65d588569829f SHA512 02c55825ec21dde386e31b25e71df4ac48c2356bad303a82cc33703b930c5f8e36b57193761dba59dff3868d39a3b5458fb2a2c49809019e72ed4b4f4313bed3
+EBUILD protected_attributes-1.1.4.ebuild 837 BLAKE2B 5b93fefb850447727b3eac39ab510b6e0009ecb6239cb987d0a5bc52e6a7e17848925fbeb5f9db85ce20d0fbbc50d13ee2be0264d5b99f874171011146e44e13 SHA512 23029c7c17d281b6274c6e351f6bc1a6b7ca3a5860736c493d658406cf79179936aacdcb37ab163edff757f0a9c8833177d9464b21e8314331da62b28ff78eea
 MISC metadata.xml 352 BLAKE2B c790bc4e8d646e1d3f14c8828332433d544d0b51331a3e42701679fd7796341bcd29c1d255916611ecde2ebf63d508c2a8494d2e9a46a99938f2c247d8bd0d74 SHA512 ec61fe67997d2f82c23e5746c2e1dc2176beb97b672d9d6ebfc68922e174f00c2a5867a7127feec9c65c7d93fbc8a3e167d7e574627ca6090b0cca5f5df26b4d
diff --git a/dev-ruby/protected_attributes/protected_attributes-1.1.4.ebuild b/dev-ruby/protected_attributes/protected_attributes-1.1.4.ebuild
index 99231a4a360d..ed89392ecde4 100644
--- a/dev-ruby/protected_attributes/protected_attributes-1.1.4.ebuild
+++ b/dev-ruby/protected_attributes/protected_attributes-1.1.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
@@ -18,7 +18,7 @@ SLOT="1"
 
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index 980e804f320f..2a51f16ba76a 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -1,5 +1,5 @@
-DIST racc-1.4.11.gem 113664 SHA256 1e2e420d5e2e4b9f2b352e9b2828448a2ee13a16fdebf6a7e863252b5054c840 SHA512 147c3c0ade40ec5544397a9dbf8579514d97145c2cc9f4e16508d41265c1b5cd6fc986c09367792592b5ab6b274e271eb7dded02ea9c398eadafb8addda4ef0c WHIRLPOOL e54b553547bf13816033c103a4de79e7e5bd50bf30b58a7525a059ce0556071f01ee6658ad00febbc024314f322ce114b41864d1833ce8bc282519fe5c868f40
-DIST racc-1.4.14.gem 116224 SHA256 f4876d08e9bfb560ec281301347a3550ef9526b46b6e5c07dac5fbf394d0d003 SHA512 7401ad1722c92101c24f881226e44bd8b21033c7bae8b13cbf329f9b426c312ce61d14ce584b4f94d6863b77f30d6ebccf26f9fca2de724f8e0659f0e2d2173f WHIRLPOOL f8fa70a6967218ec5364aa9e7b56fc01b2c1b6e2b82ad50282cf2974dfc66e233eae07ba01fa2d832116284a6ab3c940d22f469e9d70538ca571cf4d3eacf062
-EBUILD racc-1.4.11.ebuild 1828 BLAKE2B d3078da400fd1d0974ec843fcf5d162493fcd6a9b3b89710e32944634d60c2ef61402f51d7ed98e1140991f6ff9821bb0fbcd386b959f52cafc9f6bbeab45f79 SHA512 c539e2b8fa52ac80fe7eef2768c7094d104806053de97ff86aaa0f7076ce720ab1adb05836b16a2c6f428621e3081163fe48e37c03282617969e69f69aee6031
+DIST racc-1.4.11.gem 113664 BLAKE2B 4068da68e1579fb2034c454ef0d19e00d1f7e48eba9a1e1646eecd4e75410d9bdb2ab84a9f40b3446fc686014f87042d843cd7c4726acf24632b5f208e34ee9b SHA512 147c3c0ade40ec5544397a9dbf8579514d97145c2cc9f4e16508d41265c1b5cd6fc986c09367792592b5ab6b274e271eb7dded02ea9c398eadafb8addda4ef0c
+DIST racc-1.4.14.gem 116224 BLAKE2B 67abd0e9bed46d7c589c62426943c8594d3b119328cd08576247727b11beb9e32ea45c54d0aadefc26691972fc40aad1b009c55bcd90a5b89aaf37e37a1097c1 SHA512 7401ad1722c92101c24f881226e44bd8b21033c7bae8b13cbf329f9b426c312ce61d14ce584b4f94d6863b77f30d6ebccf26f9fca2de724f8e0659f0e2d2173f
+EBUILD racc-1.4.11.ebuild 1827 BLAKE2B 1cdcfc9468a2abcc1aceca319b6825946ebe518e8259fa567ae63c55a3ed3aaae60ecd6885f7ee7a1b06178deccdd8e8295599ce8cb89e19de4916161b71e9ac SHA512 4504b57d06984bad7069c431d9634c43adafbb93d3ec00b25d30aa643006439df0e918fdf71cb8cde4e7949e16acf9791e4ed0b0a2075f517f3215507c3ae8cd
 EBUILD racc-1.4.14.ebuild 1848 BLAKE2B 69b0967a601432e0cadbe070fec88364ec030dab9d75e470b4808a277199824df53f42cde16588099f8b74ea1763ca06a81af7d10eecc5a045240d7613ec9b1a SHA512 53d96a2d735db2925c08388e888ef7bef0ef3665410413611dca871f0f45bc4ff9a0d11809f5953da60d283a277e916cd2fef7c795b194a87f6db7cab88fb36a
 MISC metadata.xml 331 BLAKE2B 67dac6bbbf2927c5fa694a0de98635c952eab8ceffa913aac7762c88625957b83f7bbeb22dbab5adb445b306e7bb5efed458e23b9a2c8137e65c36b4d12744fa SHA512 cf609ee98391504a83037f2fb2601b7b4f5dcb3ce58be9dfb895b8b961ed54e19d9782979cf24f1c1187087c1a8482e755d24abec089187870dd6361f17559b1
diff --git a/dev-ruby/racc/racc-1.4.11.ebuild b/dev-ruby/racc/racc-1.4.11.ebuild
index 2a1d988e5c86..281ef2ebbb06 100644
--- a/dev-ruby/racc/racc-1.4.11.ebuild
+++ b/dev-ruby/racc/racc-1.4.11.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/tenderlove/racc"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_bdepend "dev-ruby/rake
diff --git a/dev-ruby/rack-test/Manifest b/dev-ruby/rack-test/Manifest
index 45f3809f9857..993641ac31e1 100644
--- a/dev-ruby/rack-test/Manifest
+++ b/dev-ruby/rack-test/Manifest
@@ -1,7 +1,7 @@
-DIST rack-test-0.6.3.gem 23552 SHA256 ff60b122e2940e32e94a2e4a61bceb8d9c99a97c1817ecc47e535522b02cdd40 SHA512 a5ad0f20130eedc153515127d2483cb1322c230ab772307943ec6eb295706f3aab26c8599cba69323b3cdc5692b284ba0609d8db957ade7085a95d94ccdf8b41 WHIRLPOOL 033543478a05cd4703a1600f84e7ca74bb7813f3a3bf38afd29784285130b18c5bb0d2fb1fea9aff57bc7f458856969ffc27f8b72dddea20fa79fef9d8ef6189
-DIST rack-test-0.7.0.tar.gz 22768 SHA256 be717ce03016d14a4582ba054c511d371bcddb54d3ef53e70f04f89c204e3a78 SHA512 1cbfa905237dccf7e385eeda1d4bef6089a1eafcbedcc92e1b7cfe5978e00764fcb4ffd9ed9c08025d450667286ab58190ff940e977ac12cc2d5a6bdccb35477 WHIRLPOOL fcc4587da08958e9e0aa1d47ca9197bea74a7055b1325c851585bdf56b0480061738e634b70aca14a931678353d79874993cd7af13dcc819777589769dcd4ed8
-DIST rack-test-0.7.1.tar.gz 24492 SHA256 7f0b49bcd7d88305f80fb775a4a55d2acbe71d0a8c529261ab7722062b3212c0 SHA512 2b202d1f485fa2aa927d2c599e0b3bde08f5d93b6e8a36ccee5b5e064acfd0979154de8db8639bfb78f3ab038b006305379389889239dbee13020b72f060a8db WHIRLPOOL ae830686128a199725a9e8877cc6fa9dc35eb66accfeff8295983a41ab3d88fc374df12a903843f48442e28fc390f017b8dcd3bbc52620c489a17cf538c5fa91
+DIST rack-test-0.6.3.gem 23552 BLAKE2B d494f7fa3d2f7ed6fc6d33e507c445990613425826ec2e3d059d978b09d316ab93685aa5fd00ea89d00002ec7ec242f7fa64a42ce214fa7e9c40334d7e7a3750 SHA512 a5ad0f20130eedc153515127d2483cb1322c230ab772307943ec6eb295706f3aab26c8599cba69323b3cdc5692b284ba0609d8db957ade7085a95d94ccdf8b41
+DIST rack-test-0.7.1.tar.gz 24492 BLAKE2B 594fa05287399425557f579c871accdd268c463e77bef3e86f2141f5c5d824abc2a245a636390e0957cafb2db86a5483f9de2f13571b5c44a506f93122fcd2f0 SHA512 2b202d1f485fa2aa927d2c599e0b3bde08f5d93b6e8a36ccee5b5e064acfd0979154de8db8639bfb78f3ab038b006305379389889239dbee13020b72f060a8db
+DIST rack-test-0.8.2.tar.gz 24830 BLAKE2B 730581f654501faf0aa243675738e67a8b1cc5cce9df3040b40cdaf00bd9c3fd2feee11656442aa413132a268d971b34732626e27924ecd32fee30ac6ca6d211 SHA512 3012c1f294835473605e2f648af0cc19b9d4bc5963d507a0beae31782ea84c613bfc43a1995f8808174d468206aa9c66953cbc1ff83e9e7876142594115d063d
 EBUILD rack-test-0.6.3.ebuild 953 BLAKE2B 40c079b188a858723cc09f416a3ef8b55141f0bdc44100aa67a80ef8160113f38301297b6bc6d6b29661926c19d7c5f03eb902428664390c86000aef635d7444 SHA512 9ad27605a01e13ddd0e816b5b99b995739968ac2f61433b95aeed5100e8cceac8ff2cc90bacf72fa3185fb1453ca4caeb8a11aec94157e8c48a135c1e380153e
-EBUILD rack-test-0.7.0.ebuild 1060 BLAKE2B 4d6f64662fafbb6d704e3cd6206c89d3d5f2f11adaec026329586968fcd1e0675d05d84d33aa6d6b0f8c5080cbb61f71a356df7e5712dac712f27d459c036a7b SHA512 6dda136bed046502ebb5a9dc9a4112e6a54cfe347c4b87ae774880a48edfa6266eb83e43dab97bb3e849cb38080f83a690715ab627c2c3457b0c29097e33bcd6
 EBUILD rack-test-0.7.1.ebuild 1053 BLAKE2B 06946dcbbab2c1b38d876e252ee76ec610e322195499320de09dccf32f107c617fa616b0d24060bbf3a850ef16b1236e31b723b2da60247ecd1815672ad6042d SHA512 1fe57bd6729df633362488c7c3434f4a64b72b8f7db17bb4162bb4637cead1b3426708caa9f98b7a79ea430e4e153ee26b5f4f25235e9079d5cbf0e27e2497fc
+EBUILD rack-test-0.8.2.ebuild 1053 BLAKE2B 06946dcbbab2c1b38d876e252ee76ec610e322195499320de09dccf32f107c617fa616b0d24060bbf3a850ef16b1236e31b723b2da60247ecd1815672ad6042d SHA512 1fe57bd6729df633362488c7c3434f4a64b72b8f7db17bb4162bb4637cead1b3426708caa9f98b7a79ea430e4e153ee26b5f4f25235e9079d5cbf0e27e2497fc
 MISC metadata.xml 343 BLAKE2B 3d64a9d71f8ea0b1af70404e282f27ba4028ccada49dd94cc54f3517a939749d1d98cf1e08c85ce1e4481971b007f88dd40b7bb9609b4879cfcceb55519f97fa SHA512 8f9aa1b7be720aa89aff9ada3782e3b7098edd7181203d78a56fd6576ff3d2cfb812557158a30353eabff9084f6cd148222f4d7cd39b7cf0073c4f9da0aacd0d
diff --git a/dev-ruby/rack-test/rack-test-0.7.0.ebuild b/dev-ruby/rack-test/rack-test-0.8.2.ebuild
index ae9160eb992f..3e638f2b29e7 100644
--- a/dev-ruby/rack-test/rack-test-0.7.0.ebuild
+++ b/dev-ruby/rack-test/rack-test-0.8.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/radius/Manifest b/dev-ruby/radius/Manifest
index 6f52263bed07..b7b62199efad 100644
--- a/dev-ruby/radius/Manifest
+++ b/dev-ruby/radius/Manifest
@@ -1,4 +1,3 @@
-DIST radius-0.7.4.gem 220160 SHA256 ba6c93d0047568ac7c5065905617410b163e9fe928fd4be51355debedfa70c58 SHA512 68d28f4bcf7122b729bc92fec8021bd9844407d65e3ee9075c909b1b9fe7e0227ff70c678829b8fc9386b46dbc2983f835486609f74eba99a2511cc43ea78526 WHIRLPOOL cc64b3e679c2f34fda347374a6bf933085c441fbdcb3f30ee03695ced771b966635e26ffd54fa3bdb135d65b87fbd0c764057a8b1dbfd1a7ab8b4902bc267966
-EBUILD radius-0.7.4-r3.ebuild 563 BLAKE2B d11dd0dc31e5d18a8b5c2fb662c5f941934d988820d14c10ee585bfd396003ea641ee0c0986dc1a9b42a0cf7d39082fe6b64c4f0476c4a8a0fce0044263f8df5 SHA512 7bf9eca569299f50a6245ab034c58132ea2911be61c4065795527f2805cf9557306e4868a3112c49e95a9934907b8d10c0fee0cd4a248cc8fa249a462979c4a3
+DIST radius-0.7.4.gem 220160 BLAKE2B 9d5c04c955aa1540a33615e8adcad9b1723c601ea71202bca03aa425966e1a2c361cd88be5e98d6c159e7a2c2cc4cf80e0854a6d9a5d77f515e1853815cf8b5f SHA512 68d28f4bcf7122b729bc92fec8021bd9844407d65e3ee9075c909b1b9fe7e0227ff70c678829b8fc9386b46dbc2983f835486609f74eba99a2511cc43ea78526
 EBUILD radius-0.7.4-r4.ebuild 551 BLAKE2B 6ba986651de3451ddc02e17ed701af3f4db7b792b881634601da3b803d7c619184e6cb7d15a78af2483f94ef375ef72f22fea5086bf2588c73d80d2ad5b03920 SHA512 1664243e64ac284870e34c1440857637cf818c29d1db565877ef9f90ac74f591eb01fd0acb417121e1f6030c607e7cdc8d549895d5c0ecac36c3775afeeb9fbf
 MISC metadata.xml 338 BLAKE2B 9f40be1812f1b5df68280d3d0215238442df3ab392f054bc4394aecd1bdb688b194c40ec14d30ddbd5cb93890ce0b6d01b514e46c1451167fa10883aeae70f35 SHA512 4674778d8822f53f2a50ab0ff42d386d4e3fadd620747ac2c8bf6833669025076486b01b105ef15168cdc4c303c324d7dc773c94fe2e31bb343aef51e1a5c80c
diff --git a/dev-ruby/radius/radius-0.7.4-r3.ebuild b/dev-ruby/radius/radius-0.7.4-r3.ebuild
deleted file mode 100644
index 9165627ffcb8..000000000000
--- a/dev-ruby/radius/radius-0.7.4-r3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG QUICKSTART.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Powerful tag-based template system"
-HOMEPAGE="https://github.com/jlong/radius http://radius.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/kramdown )"
-
-all_ruby_prepare() {
-	sed -i -e "/simplecov/,/end/d" -e "/coveralls/d" test/test_helper.rb || die
-}
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index d153719df9ac..e6c162339faa 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,17 +1,13 @@
-DIST rails-4.2.10.gem 1476096 SHA256 141067e1dd4ec59d7a49e54936b68d8e44d8616515625dcf0387405a276d6b97 SHA512 04fd6e27974d4f0432be8a881abf0f00c8db448748118105c26a0dd0303e3914e469b7fc302a73ca4956d00a84e3d8fc16a179aad2f1f3ebdd11cae3a6c90717 WHIRLPOOL d968a1bae805a8292ffbfcedcace45c12fbbdc4865400e3ede87a6f6e7cbd1532f2ecd6e6acf2c2f2f9fc9ef5de1a6a7d14be684ab785e9a2301c5a047a74cbd
-DIST rails-4.2.8.gem 1475584 SHA256 90552099146e785e66cf90ede51dca0c1814440026eef2f8c418aebffc70eb36 SHA512 43f7961f50b500990318b8dd89ef833bf7d6ab22fcd6dc9657a4cf3f4c9a6105af0a55b4c9c3a811f150a4a3e6fd3f42f82812209c0707a60f3ca1bc46aaa61d WHIRLPOOL 2d4aef219d35d979d785ae715694680127f36efcf80ccffe5061d73590609e98c137f5bdc15732a96bfcf4f4a56978ae2f7fa99d650d910fa2dbdf0c3a1a44a1
-DIST rails-4.2.9.gem 1476096 SHA256 eaaa4c1cafb3f9bd9f8dd58dd142522e398a5ad0d03abf2e3de364a63d4b7d1a SHA512 04e2b1f59c2eac42895ca0ce0c92d5b949f8a32f44594b44fa0711b705bc5cc3b8a77df044b30d1543b7178274cd1b1d7ab94fffdf55be345e39dfedef16b5ed WHIRLPOOL 7368930dfb3653af7ef09414ce927d3532d7e4bad291a4c8b6edf3c783c67660697bba81302f20854135d04fc8160a5098897c139ea90a27758dd9963f78b1ed
-DIST rails-5.0.3.gem 6144 SHA256 fba5f99999f1b01367010f0d85a28b5d992d5866766fbc3d485bce8e14915f2b SHA512 f0c63958819a15368bdc88d277bca288661ff5dd5b3a5f64b9fc78d338c0700b7f3b6acbb103f309826ace39a67206cfbfbe52c22fbaf6d9b63850dad1eed823 WHIRLPOOL f3a3f5ae5df8c7f061c8308fd06d15c33d1ac683efec7c722df29a3f9789233983297b1d500f317c268278b2f0a6f9cd710fc444221881e6ed8f23f0413b6039
-DIST rails-5.0.4.gem 6144 SHA256 956e9bd0acf86701b139432eb3c9e6bc6d2f51e7cccec9a5dcf9c7d3cb14d87d SHA512 09dc6f23d9afdcf31c3ce77f92b071f65d2077b4729c5c45062735264167f5e8f3ed5574ff106967fc8924b4c8cd1a0e783363ee48285d5f03b9b2d3e68f4f27 WHIRLPOOL 15ae0e22467f4c5f3444d06b95855252af475db203a96a780ad2c9d3d29719d66563335ee8bfea521c0c1fe118e393ebd7d3a31ef601c38766043447cf42e88d
-DIST rails-5.0.5.gem 6144 SHA256 15e2c25872e5dc2069b0d7bf4535eb4887e77d49166ccfba5871a904c18957b1 SHA512 3522ff8407b2a2b024d53f98d741088abe6d1b82cb4324a210b540b4f53bad8e71ceae92e9968883aaa180e1a63f3d1be65d320a18766947ea068cba1c8ec585 WHIRLPOOL 8e4eb3eca0e4dead8dad9cae81fe59156e9f366ac707d591be1384763795affe9add77fefea206a232544a14653f79c4bf6e5c096416fc49f05c779a44de6aaa
-DIST rails-5.0.6.gem 6144 SHA256 a86663f8d0d4dd0cb07272394a6d0c7d250be617c6efe77edd2ebc9c9d139746 SHA512 7c30767c92e52e0ada10b779204ac814e7425bf3d6b417c1976f33f4815caac8cd634ed9e24cc2c0bbea51ddabde1ff708c4f1391ed2763107be3ebb26f2e293 WHIRLPOOL 5a9c21e6e938d7349304bf94b8e72e2a25554c079ba49c15b715d0ea4dd44e5b9b9067bac0574acd309bf2719bd9bcee0b19f1286cc41d966557d7e5d21a2839
-DIST rails-5.1.1.gem 6656 SHA256 175e79dd0770470e4ff7055989ae136fee9cbb4b3145bcb00a5c4783e941aed7 SHA512 c2d65b293710f5de8e114b2b5825c281c81586d6df39fc6f25ac8382baf8a77088d6d7d57b89d19b9882002a065fb0951b0c052104df2fea224abc2a91fe961b WHIRLPOOL 14cd3f7fc14c789191b1e89ce2405ef0822e2476cf5d5b9bab7ab1027c2edc3e59978117f6cd758918931e3ab7b74f61ee8fc3d0351e4613f0803355a0a50c83
-DIST rails-5.1.2.gem 6656 SHA256 4ee8ea1a2760cafbd70fbc878fd0c4ad2fec105082719c818934b39fd4ff0e9b SHA512 d79942aaa7f8cc717323955ea870e1a297d0b0190902071bba02eede36faaa6f70e36951f7b6afc8796fec825d505577e04c46aa409925511b40d441c76a1175 WHIRLPOOL b6d263df257f67531205a672c5ae7a31717bf0bb5ece7bbf16c7e72705e1214de058a0b74a9a02683cf97cf91cf412080a67d83daf301885bb2d9b482087c240
-DIST rails-5.1.3.gem 6656 SHA256 28c73c5aba5ce71d4bcd6af273be3e565ab7a49abd22fd511dc79fcb36329d19 SHA512 6d2f61acdc217cfa4fcdf79e51ba647e6a9737af83f243d3e425ce57270ea5d6f5ec76db4b33c43e69743f310cd4f13f85a59655b5c823f9f387996d7218ce0d WHIRLPOOL 085ef39fc10288ff0862e501f90d689983d1d0a50dadd5ec9dc18363c84a26ad04b6642584ec76cbe70a69c9f44579f17237c772afe850e205201c6f33a8ef35
-DIST rails-5.1.4.gem 6656 SHA256 5cc2192045678789e5e7b289476af8bc0a79210ee6713886200cb303ed6f98b8 SHA512 a75927619afce0b4b29b99697040bf5039a856bceac033b63dd910b9ad99adb5f5078eab9be22468104be134ed72a861ec349cc5c59748c1fefd558a1e11d94a WHIRLPOOL 46233550ef7b6c8a67635d494bba0e23dfd2b9c79874bcf0f937591bb31a7350f8b0b4b0331f262886254a04537f340f0d8b7795b44525085b07e8bdda2f1bef
+DIST rails-4.2.10.gem 1476096 BLAKE2B 6da658d4bf1b64574a3d7652aaa938e45e01db11f68f5fdf76ca70d84dae927828ea52262ee0777deff2408f4325d87a6d86f545c714a1180f1efef0099fa749 SHA512 04fd6e27974d4f0432be8a881abf0f00c8db448748118105c26a0dd0303e3914e469b7fc302a73ca4956d00a84e3d8fc16a179aad2f1f3ebdd11cae3a6c90717
+DIST rails-5.0.3.gem 6144 BLAKE2B 43d4dc5e3de7de69ccd3d82ffbe59507262faac2482510eb3403242bc7ebf25f40a32e7b2d144d11b1a79b22221debb39a338f32bcd5d662ff6208c4daa7ec9e SHA512 f0c63958819a15368bdc88d277bca288661ff5dd5b3a5f64b9fc78d338c0700b7f3b6acbb103f309826ace39a67206cfbfbe52c22fbaf6d9b63850dad1eed823
+DIST rails-5.0.4.gem 6144 BLAKE2B 2236a54a5920096a4dd955fbe3e3bbda3871596aacde4002ff72f367ff2e1ab6f1f268093fc08c9c9da6270839f1165a6d674b420d174a304d3185c6457b608a SHA512 09dc6f23d9afdcf31c3ce77f92b071f65d2077b4729c5c45062735264167f5e8f3ed5574ff106967fc8924b4c8cd1a0e783363ee48285d5f03b9b2d3e68f4f27
+DIST rails-5.0.5.gem 6144 BLAKE2B b4958f2ce24663d63663798f4cbbf67e83225864db7d01c01a3f23c14d93aae3ac92a2ddb00f34fd5d983481e6828064cbaa92a6525558d8ed0b45a86e184424 SHA512 3522ff8407b2a2b024d53f98d741088abe6d1b82cb4324a210b540b4f53bad8e71ceae92e9968883aaa180e1a63f3d1be65d320a18766947ea068cba1c8ec585
+DIST rails-5.0.6.gem 6144 BLAKE2B e9af96cd669b44fd3aa0b8ba744b522be93579ebb3532e71494cf9d973ea08eae8d0d9dfe9eb2ffbea73e0b5443f786784b16fb8510f9568bce4ad1182c4927b SHA512 7c30767c92e52e0ada10b779204ac814e7425bf3d6b417c1976f33f4815caac8cd634ed9e24cc2c0bbea51ddabde1ff708c4f1391ed2763107be3ebb26f2e293
+DIST rails-5.1.1.gem 6656 BLAKE2B af350844951e92ac240585cc0e78217ca877573c50195725b21e9ed3e82cc182b99f975deb485fa70a026e5a8b8766495b3f88f07efef08c917f04be3f6e616c SHA512 c2d65b293710f5de8e114b2b5825c281c81586d6df39fc6f25ac8382baf8a77088d6d7d57b89d19b9882002a065fb0951b0c052104df2fea224abc2a91fe961b
+DIST rails-5.1.2.gem 6656 BLAKE2B 38400b89019517ed1cddf92dd11f221d1316aa1677e33a47a389cc7321d977d2c032e847395bc2c6f3a48b3a72bcb8b6ec99fe54025c635b1d3494d60d3f0855 SHA512 d79942aaa7f8cc717323955ea870e1a297d0b0190902071bba02eede36faaa6f70e36951f7b6afc8796fec825d505577e04c46aa409925511b40d441c76a1175
+DIST rails-5.1.3.gem 6656 BLAKE2B 541566cdcfac40ea80130a2a126df5c0c9d7ef3d9534d1e496c1c84ba74d94bb2682b994bb7362a183dd86f29d54bce4a4d4148c416c2ec7b59aa908f0742a21 SHA512 6d2f61acdc217cfa4fcdf79e51ba647e6a9737af83f243d3e425ce57270ea5d6f5ec76db4b33c43e69743f310cd4f13f85a59655b5c823f9f387996d7218ce0d
+DIST rails-5.1.4.gem 6656 BLAKE2B 1a6d15a13eca0fdc3b78d359b0d1edc29c29ac4186f15f823af3410f1fd6e25c7fb42e707437c3344b9933e63e8a8061e3282e14083f11b7161b8e0af9f6c292 SHA512 a75927619afce0b4b29b99697040bf5039a856bceac033b63dd910b9ad99adb5f5078eab9be22468104be134ed72a861ec349cc5c59748c1fefd558a1e11d94a
 EBUILD rails-4.2.10.ebuild 1112 BLAKE2B 1292989041a7387242a40c3e7bac9288be92dd5e2765cf682baff24d57493a4ce0c06ddc5cf99527a1abcd6b15fccc432068c1b03ac5669602f0ac4249aa7595 SHA512 699c641b237c56cc5d12dc4e7f16f2412e59a746734e10dcc5dfa5bbeb1fba493a7d4e61907d061e3158cf248ae45dfda3cfcd55a057ed3c8e72c79f4fc78e31
-EBUILD rails-4.2.8.ebuild 1124 BLAKE2B e856902c8d93174921cd4af2bebcbdc985cbec73dbbbac475c794684afd4ea0ac4cdc7e5ac6b40a2d1aee28dafca4eeac9b9f196bb9a2e4bb16a760fd30fd19b SHA512 e77f3a3f6ec2b0437776666f9461b9d5d6fee2b27fd9a968329378ccac930a570580b6285120e49c3701e292b6593c758f4cbdb9cbf2781cb42c177f0b58e4e3
-EBUILD rails-4.2.9.ebuild 1119 BLAKE2B 5233b1cfff5f166726ff88cca8cd4a43ad336b9c4d4de572cc4f98fbc7aa42aafcb9216fe4db590433707e3fac2bc8a4cb554cd5d698e1363bda0abd04344c0a SHA512 b941b269fce17b478ea74415d768ea7a434816d16762856b065002aced2451912576bc5f02ef3e75031f62e2156ec7d2ac942507069c59a7d87d1d41d6ed8f3b
 EBUILD rails-5.0.3.ebuild 1054 BLAKE2B d5414291908b66aa6e5fdf16443e057b68ae63b8b2918ea519a21db9eb61e9b675a48437eb40ebf7b5372ff0b6f3c80992f9f5f45d5c713dd72e616e8aeafdaa SHA512 c74228a7b2e81d144e878b72f8aa38231dd86510b85c9bc7194ea82b178c6a8f6b0efdc69c9561bd83246aabe16d8f35a6edb789c092a2c9b7c51ccaff56fae3
 EBUILD rails-5.0.4.ebuild 1066 BLAKE2B 1c0c15dccfb2f435e092d62d4ec1022b2e9ebba0303c9b2eedea55911a44d832740a4165ae745ce5e5bcb17e52909986340a10da171d7e8574a43e6972771496 SHA512 6421640f5bcead5a2b76add12a68b19182aac601b02a6c7e391fab8e29c01b1c9d8b38c2bee351cf75461ee926a6ef28f69861df6aedcf255f1a455e77fd40f4
 EBUILD rails-5.0.5.ebuild 1066 BLAKE2B 1c0c15dccfb2f435e092d62d4ec1022b2e9ebba0303c9b2eedea55911a44d832740a4165ae745ce5e5bcb17e52909986340a10da171d7e8574a43e6972771496 SHA512 6421640f5bcead5a2b76add12a68b19182aac601b02a6c7e391fab8e29c01b1c9d8b38c2bee351cf75461ee926a6ef28f69861df6aedcf255f1a455e77fd40f4
diff --git a/dev-ruby/rails/rails-4.2.8.ebuild b/dev-ruby/rails/rails-4.2.8.ebuild
deleted file mode 100644
index 40bb87afd4c8..000000000000
--- a/dev-ruby/rails/rails-4.2.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-# The guides are now here but we'd need to rebuilt them first.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md guides/CHANGELOG.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 ~arm64 ~x86 ~amd64-linux"
-
-IUSE="+asset-pipeline"
-
-ruby_add_rdepend "
-	~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:*
-	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/rails/rails-4.2.9.ebuild b/dev-ruby/rails/rails-4.2.9.ebuild
deleted file mode 100644
index 41cee259f300..000000000000
--- a/dev-ruby/rails/rails-4.2.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-# The guides are now here but we'd need to rebuilt them first.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md guides/CHANGELOG.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 ~amd64-linux"
-
-IUSE="+asset-pipeline"
-
-ruby_add_rdepend "
-	~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:*
-	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 1d0ee0ff326c..03ec1756721f 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,17 +1,13 @@
-DIST rails-4.2.10.tgz 4080905 SHA256 268a718a7a49ee3406027ac5b871959c096ae02d47db6a97934932897ee6e350 SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318 WHIRLPOOL 4ec289a2a4115e9b7cad4206fd5787b013bd273d42de1b197c17407e78c607a1d733213ff7068781ab6cc62cbc213f192ad6f0fcc363e053288a86e4d1002714
-DIST rails-4.2.8.tgz 4077925 SHA256 55e15e101fc4a466a8acafdd679509f6e25992d50ade2d98b098558c698a6320 SHA512 a457ec7422b83f35e8d1ac26f1ef8fbaec985034c5804ce92334c45fa4e4b11a29acdcef2c009c36be2deb4724faeb91b99f76a665eeacd1bda9448db2299f89 WHIRLPOOL ed46c71f527ba59f0ff4d00ae5881b46984500b4493b4c511b8037d94c76b40c0e531c635337b0795887e028aad5136048ba69b57e482489c3c049585f18f42f
-DIST rails-4.2.9.tgz 4080618 SHA256 c6b2119e0ef5a3359d00a0e634b5a3bd833e8d1108d96beaecaf83d7f82fce4e SHA512 2facc17faf0e76c8e13f997c9def344bd3e35aa77a596d85975f47eba837f99033f492f45485448f924adea95ffdd2f7c169dd2970be5f8c12bbafb23da51ec3 WHIRLPOOL adee3ffecc82838fbcbce50dfacb8ef813e061508f04306d15022c10fd0778cc2cde20ce2b913c4543541fce070b1a89439b56f4426cbe8a002e0d1fbfc6e33e
-DIST rails-5.0.3.tgz 6041420 SHA256 0c16f63af96529c1e3d2b4476031bd024ae403322fe78e80e188a422412dc582 SHA512 5a25747507d2a8e1d2a19ce14c77a80c4f9bd5751fb343c3f405b8d9ec170d11fb866ebfedf6b850b6750399015631ab1551e6f78e097c6514061462a05e88f3 WHIRLPOOL 25fd8473a4eed2f007b99e22cb7ccf834780d4f21478a0818c44bea525f4c839610bab2b52ae5087a881f8d5519b78616f4e53e6a21f7d6f9270c0ddf648a2a5
-DIST rails-5.0.4.tgz 6041948 SHA256 50f64f8c1d083d22a652ce4d594b38674a502b89ed7b913ebb9f1dce6984a32e SHA512 9a99d506606f2901f8b4afcfa8cc92e7d122b0879c619a539aee52df5b8926e6dca98e0eb14234f810b8a73730c3c051985e13ab0bab5f52cd8c11a0b112c44d WHIRLPOOL 842f3dfd691c7904804be128e4acf555076b96e5dbb8d874918a6492991f67c31faf8d4a5410969eadcef1166035f64c1fed6e8ae4f9f2b808600ea729a15808
-DIST rails-5.0.5.tgz 6043034 SHA256 a918bf9ee44252403de3f8f97b7de05a516e7fcf8368d01b1614826963ccc3a0 SHA512 7f06b31782b9814d2f9b1015d6f85944ee64d627d70d207f897401e7da4b504302990c629ff0ea93ca1d6820e1a11b5db78b525b50c8cd6cd8b5826452012b0c WHIRLPOOL 5f3a440184539c2d0680f71c221c83def9fb0b89520e7320e1fc4f517373d90450ad6e3966894c2e32d4cefd7a2a01e081ecb3a27346b5d0b28eb0f9ae1b5f26
-DIST rails-5.0.6.tgz 6043860 SHA256 be73ef6f421f0657a16fd2e9c3a582930d26cf30ab64484ab1cc9916b586b546 SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410 WHIRLPOOL 12732ac0a18b6e315cb18d366646a9627cbef904287722046adca93e3d0a95cb0f4c8ec174cfb4f929bc2a32dfc3e1a5dbc7fe176d8da6579c37af253fdf81c9
-DIST rails-5.1.1.tgz 6124695 SHA256 a09bfa7d2917865778af70dff8bd57fe01820eca0228cff85de581ee17e9adf2 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f WHIRLPOOL a23d6644126e6e01481c48c7089208a535188b5b32ad67cb69db36ac2044ee35bd95d4012076d7f12666aed2cbe984c75c3555889923710f10b1b91c150ccc73
-DIST rails-5.1.2.tgz 6124489 SHA256 cd6173b2ca492397d1cf22190a3070f1af485c2e25f7d9b3c2d0a80f553b4aae SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872 WHIRLPOOL ba3d0e231f4307343c6c955ecc273ac2e507d503f58a859ea81addd945bd8007190d45f18afbf3ec6915872af324a27dd2377927efe5e6c857e2ca09b6549fce
-DIST rails-5.1.3.tgz 6130089 SHA256 1d8f5f504173207eb8a418e071c75f656684ac4fea4b0e07d737c1c9accad423 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236 WHIRLPOOL 0561f9f386b8ab0c732302e369d159b65766a744b1784cbdabfbab46e27219128dd8bc39e262ae3d137ea3a03402174bfe7318fe87b00b2f28cf084f9089afff
-DIST rails-5.1.4.tgz 6132874 SHA256 d04168edcc8a230b80e77b766c86264a72456b56650fc45e41e5b9eb6ead1a26 SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc WHIRLPOOL b2e51c627627b1d88e8415349aacfae14b9270727090e4460ac4ddd8f34ced3b56b3345cb00158be14b7283bd56673a4c770f053ce02d98db1d10f5351a0778b
+DIST rails-4.2.10.tgz 4080905 BLAKE2B 5a46ed9e3664a65545a709577b49864e14cecfc89c798facc0412b4da2842dfb86a611f1fd0ce50da6a40c81a19d3cdce0688b40ad92180ce8ababa5f38d23cc SHA512 c1331638326960c6df9000a2383ad1905d5e794fddddfdc7422cfa2ff89039e3c0e272a79fa43423d5ae0e56436eceb22b8276e6a8bce7eb765da33f02742318
+DIST rails-5.0.3.tgz 6041420 BLAKE2B 972a85b23446e874cfd737b8c46ec1a9c94d387812e223c7ea702dee42047c8586f35254b90a3c99f7c571d4d99fd01a0c38bb994544be5840e08dca82e86bb4 SHA512 5a25747507d2a8e1d2a19ce14c77a80c4f9bd5751fb343c3f405b8d9ec170d11fb866ebfedf6b850b6750399015631ab1551e6f78e097c6514061462a05e88f3
+DIST rails-5.0.4.tgz 6041948 BLAKE2B 2d48efbc72b325604d77e1bde8e2e5eee297e752d5e9bbcbfe2c6fd2667a2db0005f5f5e6c7d46401faaf13911b30469506730530de2517f2ce9969819e3bbb4 SHA512 9a99d506606f2901f8b4afcfa8cc92e7d122b0879c619a539aee52df5b8926e6dca98e0eb14234f810b8a73730c3c051985e13ab0bab5f52cd8c11a0b112c44d
+DIST rails-5.0.5.tgz 6043034 BLAKE2B 1bf0e636d44a05ee83165f54b459d34509021d47b24844726c9baa872cdfbdeab6e22374f98d013d6be40d48d9dcac7e4216e4b08a1cce9868b1ded2b903165e SHA512 7f06b31782b9814d2f9b1015d6f85944ee64d627d70d207f897401e7da4b504302990c629ff0ea93ca1d6820e1a11b5db78b525b50c8cd6cd8b5826452012b0c
+DIST rails-5.0.6.tgz 6043860 BLAKE2B ae5c1e6df39575a40001ea8b009c39ed414661b1458934efad44e50cb48f3f9906150560008fd3eac39a627c14a32ac3e5f7366b62596d13df11e579beddac6c SHA512 3487db6d59e65a0abe56bf9edfc343a0e0e78119b2bb08f333c8203840ae33897030897d2677d4a28257b479b605b2679ffb7b5d21c724557142023fdb723410
+DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651df49be3866e2df989d464a23ac5865081d243e6c6525837fb33099c46b6009cc667d0e03444cbcf9631588 SHA512 fd62506eac440f1ad9b37f20c7c712733440bc2ee676390c02e3bd50b912fe0fd53e8092c23664d47818ee62583568c6e20d2bfd5eff6d22a005289bb3bb258f
+DIST rails-5.1.2.tgz 6124489 BLAKE2B a7d71b99f1b9eb33e76c7941909407be0a3b086581bf3ddb4fe811a6b91bb129edb504c6fe3593a3b347ab035f7325e8e497b926a24b699a56725f89161e942e SHA512 95072d06ce19726343758f4dbdac96728598e31be0a0560f240511bf043aab47d55530ef47bd9b390aa61b5e0ad6e142781ed7167ce7f2cf11d22a71127d7872
+DIST rails-5.1.3.tgz 6130089 BLAKE2B f61c016af6f5336726127372c1dd3d85088e11c0b58998ce40155b09087dcdb341a15d3ff57692d744538b571337a2e1e278542590d82077a35dc1e336539f85 SHA512 5aa9f7e5211e8dd36b7bb54ab7dc0e88241253ab560355497da2eff9c5bae5dab877640ce8e066fd637e145752af7e1942743359ab8028e6376bc905a9b18236
+DIST rails-5.1.4.tgz 6132874 BLAKE2B ec5642b860b7c18cea2c56aa5e2a652e28ab08d39c5863dc4ee66fd3caf375e55706e4317ecae5bfc5581922cf1549c38c22529d2e44a98c84cde332491e49cc SHA512 8f0837e0a2c5b0189375f10310a6e6b43e32f1fecc503582efc6490436c943e774495262e508e4ca1a1874132ae6e4a541e81c06f0d8f6fe8ab85bd2fd10d4fc
 EBUILD railties-4.2.10.ebuild 1706 BLAKE2B e64b9508c3fb9c41a307c10a070025c25b5acd85483b91ae0646c057f33cfbdc205ce96cd790c8dda20b6003913cdfd466348dbdbff3ed1bb2402a7d2d6fb0fe SHA512 67d6b08c15b88f03279b1a69cee9877a27512f40ee1b9cbf11d8b4592034b532fc784dac8258dd3a7574de9f9d3a15fc97d831df817babb925054a7ae1950e87
-EBUILD railties-4.2.8.ebuild 1716 BLAKE2B c9a92de5306da4340075b8998de84fa7c2d793b463570fe1eca53f022ccf0a4b5f1547522baa48c46e219d0541446df14a994ab3bf0d18b8132f043ecabb850a SHA512 75ee4567945f35f08778f663ce9ca7ca28170e3ed19e55ae5cac4dd2d09907a22842ea1fdac4b5734a9bc10d28cc4df75cb6949a17a8273698a4de3b94b18e86
-EBUILD railties-4.2.9.ebuild 1713 BLAKE2B 980ad61f97bb2dfd4e11a31a2645d3bd1892eb29998ab63d0eb44629cacd8c419e133f944d4f4c3a9cee8c443c1129671c18275b7bb4d5b38731817b33eb18d8 SHA512 e44fe70be3683c12fa380cc76c64abb39bc1cab88eb48ccfde92b493ac7dc38815d8435f405a7a82846b5436e8d9fa2041a220ad41ca3ca268ec734732c2ae67
 EBUILD railties-5.0.3.ebuild 1839 BLAKE2B 577e7021811d562441cd6d0c8839925223de052431bca75f5533289ee49a48a5967648264873d4242c9b89be7c928746c0c906c5cfcd98d9acabac476782f49f SHA512 34b1953872b14b47022fbd3057bf6355ee2db039f1f2a1093673ba931eb78b3d3b54d6682eb7310f4400beb604d854a519a9f9fc5204d748501453baa2887181
 EBUILD railties-5.0.4.ebuild 1836 BLAKE2B 5ca74f25893c278df5940a71c96db5c0f6ff125adec5444385579f109e4dd0714271becc2ed123de8837fb90d3f5dc43f2a724f24cc54e3b706651e9e4f56b94 SHA512 d7e76cd7753f383109f22283b373cfc618136c12d937f67df2bee04c59713e34fb0d674024197a121311f3ff3de15847ad6941c306ba8c22db988d70765e8732
 EBUILD railties-5.0.5.ebuild 1836 BLAKE2B 5ca74f25893c278df5940a71c96db5c0f6ff125adec5444385579f109e4dd0714271becc2ed123de8837fb90d3f5dc43f2a724f24cc54e3b706651e9e4f56b94 SHA512 d7e76cd7753f383109f22283b373cfc618136c12d937f67df2bee04c59713e34fb0d674024197a121311f3ff3de15847ad6941c306ba8c22db988d70765e8732
diff --git a/dev-ruby/railties/railties-4.2.8.ebuild b/dev-ruby/railties/railties-4.2.8.ebuild
deleted file mode 100644
index 3f8f97750614..000000000000
--- a/dev-ruby/railties/railties-4.2.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-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=""
-
-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 ~arm64 ~ppc ~ppc64 ~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.21"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	>=dev-ruby/thor-0.18.1 <dev-ruby/thor-2
-	>=dev-ruby/rake-0.8.7"
-
-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
-}
-
-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-4.2.9.ebuild b/dev-ruby/railties/railties-4.2.9.ebuild
deleted file mode 100644
index 491d5d2feb2f..000000000000
--- a/dev-ruby/railties/railties-4.2.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 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=""
-
-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 ~arm64 ~ppc64 ~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.21"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	>=dev-ruby/thor-0.18.1 <dev-ruby/thor-2
-	>=dev-ruby/rake-0.8.7"
-
-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
-}
-
-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/rainbow/Manifest b/dev-ruby/rainbow/Manifest
index 823efb21fcc0..344aa59fc6e3 100644
--- a/dev-ruby/rainbow/Manifest
+++ b/dev-ruby/rainbow/Manifest
@@ -1,7 +1,7 @@
-DIST rainbow-git-1.1.4.tgz 10301 SHA256 f8815c1e017ec3939114047f0af779feb88e637432ed9edebe0ab74dc133d236 SHA512 ca46337628a93530ccb10d66fad428248bea62c5a103485afff68584370a325a31f4d1f2a52e1228c1faa65c6f3cc2e19af22ee24ef3a61aa707899f04c4f546 WHIRLPOOL c493498b9eeb3281af79251a7bc2f5c4175773ee8f3b018fdbad75f4f2ac047238afa1ee4bf8186eeed8f808c1b8692df47fd5b01758fe0d3bf6ae00d77e421d
-DIST rainbow-git-2.0.0.tgz 10480 SHA256 d3b2bc51449429669e91c5edea05f973cc0568cff78cf5461f03068c18e127ad SHA512 1acf0d2a1c0c0d70cad2cebcd65011dc2e53b991e49cde69b909c80b354ee084f86531a793b2d43ac4da6eed55d53c483de9f3f345b548b34c4331ea62494881 WHIRLPOOL 41d6702c03c8720c0ad6d62639ea103458d178642ae014914e84d4cc6f4a221a504c8fa5a6aea656db73cc8d625f9fe6712d622ee7808c4d45114a7a3aa31b85
-DIST rainbow-git-2.2.2.tgz 14295 SHA256 6e5c6e852cd62b6975a9594d0a0a03f9f9cc997f308a12f38f040698e6e1b9f7 SHA512 fac9a8cc39f23a1b268f3a01d755a5ccb79f8ee11a28228d958a5b77472c5b3fbaac748c917f7d4afebb911cbef0e0242c5224c8df29672073c1f54bf44c9307 WHIRLPOOL 750642e8d95f4629954d5a7a7ca2251a4b3429a6b1f71eb05a240f4f95470f98d9673db21c0a5b5c7c8e103e5926789677e602b7aa4ea8a5bdad6fe8d4017481
+DIST rainbow-git-1.1.4.tgz 10301 BLAKE2B db89785e5147148a91dfed4dedbadf96bd9912b337fe7b5d1f5249029741ebc43b74183abdebf92e2cfa1ae9624cc57a2145a8f3d20d5996c2d4a7e495220ed5 SHA512 ca46337628a93530ccb10d66fad428248bea62c5a103485afff68584370a325a31f4d1f2a52e1228c1faa65c6f3cc2e19af22ee24ef3a61aa707899f04c4f546
+DIST rainbow-git-2.2.2.tgz 14295 BLAKE2B e89cb8d72d8b90f71967ee714098a133244673f00af39d7202d2a7fa1aa92c55af307d08417f83f63c967e568e9e9a15e47cc9dfd672dd8e6974e3eb4b630a4e SHA512 fac9a8cc39f23a1b268f3a01d755a5ccb79f8ee11a28228d958a5b77472c5b3fbaac748c917f7d4afebb911cbef0e0242c5224c8df29672073c1f54bf44c9307
+DIST rainbow-git-3.0.0.tgz 15105 BLAKE2B bc2c91b8ac726c080dbed45584adcdf4a4a496de070a92291042490009ae490efc4ab91cdd12d338f0cda156811358550507ad629e27dd54445a68427f8d4d2d SHA512 863b89152696b6a13606a1e92b68a788b9b5bcd6f521f02f26fb189fc6c9613e5db032dd5deed1aa95247ab0aa08a44981756f941af6eb786076c271881a38c1
 EBUILD rainbow-1.1.4-r1.ebuild 569 BLAKE2B da880f336e12ef9d74c7f5c9108fa042543ba4131f4cf7c217981b4ea3d2d71e452baa01c4aefba7792a5769b2d7d5efb9d720f109ae2b2dc8501e56b7b919a5 SHA512 a51516649b6ca94f881e87eafc899bfd45a03cad1821ded93985636fac645cac9fd1d3e0a10513c185fbfbc66fd1bff8688d2c913611eee84b68e41f7b5dcba9
-EBUILD rainbow-2.0.0-r1.ebuild 575 BLAKE2B 6acc419c4e1833c7faf94633a66d65b6f8c567f73c2478072ce7ca5fd4fb77919e491990b02462d77235c371605549562644704d22541bf2893a0b793f0b111b SHA512 af3d38179f214ff0f06c2834d1612cd2da381ad56eaa91f11f8c247cb145f1dd0ba53d2d008bd0f0473d0bee8f5284123f210a51ce4efa4911a2ec9e3a9df8c9
 EBUILD rainbow-2.2.2.ebuild 582 BLAKE2B 67bdd624716f8a8e5fb3b8339ab13a898c4174bccffe0db9e3dddd076037454438b638fa3d45fc118e07b194a678790f3b9dd17c2bb9d9e6c3c835f039ebd0d1 SHA512 7ddb7b7c25d35796a0e1ca497519f562a4afcba4020e271aa4b5bfdf1930ba7dd871f8c9b8a9e4b17bbed28edf3c899da7275ffefc5cf53e071ef431c4e2eaeb
+EBUILD rainbow-3.0.0.ebuild 579 BLAKE2B 4a0ccb40a5199db330607c503c8d8c5f09a95cc83296f2478864773d4ec33157c61e14069b8b68cdcc1279f50af5ac34c3d1eed6a2208d9270c27f15c38ac32c SHA512 b36ee7847586f5503da8155453f58b2915d9909427d254b0e9bad4e93048343ad248d53bca058b6419b393b5400521ab646e348174b2093f17700e5c8d11ef35
 MISC metadata.xml 341 BLAKE2B ac36a2d34fa9a3fc33e7e0e8f32652ef92c26924ceba4ca13529a0f4bef493a524eba45cea38cf81fdd28988566344545295b96c3e86089b262fbac519644d74 SHA512 b85bd3a7b023aaa019689a9e8caaa2c1d920d35ceb3b7af8ae249d9ce42c15d73d466d926561b160bc18ed9acd2ffec6fb169a625c46c37abb5de356eb4ab067
diff --git a/dev-ruby/rainbow/rainbow-2.0.0-r1.ebuild b/dev-ruby/rainbow/rainbow-3.0.0.ebuild
index 171e0b61a16c..f32f5ad0f694 100644
--- a/dev-ruby/rainbow/rainbow-2.0.0-r1.ebuild
+++ b/dev-ruby/rainbow/rainbow-3.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.markdown"
@@ -17,6 +17,6 @@ HOMEPAGE="https://github.com/sickill/rainbow"
 SRC_URI="https://github.com/sickill/rainbow/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
 
 LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 hppa ~ppc ~sparc x86"
+SLOT="3"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE=""
diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest
index eaa4b56dd3fb..3ba3b0170d83 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -1,13 +1,13 @@
 AUX rake.bash-completion 1335 BLAKE2B 5f4b81b850e3435246018d7bb420263647c11573657cb7362d95727800f4197a904003b5a967cf0df862edb36af02d640a052b5ad33218d3bd7a6945302ebf94 SHA512 bac238c0023e525570dcb93c2092059b8a952ed54bd97344db8011f89720af947b840564701b75e03f37a6994f27da95d8f44f1fc28839c8cb1d735cdedf07a4
-DIST rake-0.9.6.gem 123904 SHA256 0cde8637bc097b984b602d7db77b1982b3a0be5ab014f1e533b6b517ca807e26 SHA512 9ea3b7bd96db7e96f8bf5a00db710003d39ffeea6eabfde4b9a8afead0e6f6a8fa7740f42a61d77a4322f64ab0338b19af8c63d0178624dc7c0e787e11b0b6f3 WHIRLPOOL 90ab856325bd4c4a3944720e063156d65368298658ed0619380da4cdbc7c932ede44e39fd79f87f5a5ed6ce63f4c7d01c0d1f06ee1b720e3576ac6ba04290e03
-DIST rake-10.5.0.gem 130560 SHA256 2b55a1ad44b5c945719d8a97c302a316af770b835187d12143e83069df5a8a49 SHA512 0c95921e00af8dbc51edf9fdb8a8d8b0cc68295894fd310b3c4e5aafef1d5d6f9819a9e8a9b4c854f54835115123411278992f6223e0fb18e2efa7fa58ab6fcf WHIRLPOOL a35b2070c8b0eef32a106b2d15c77ab60010cc4472d222eaed826cd98302e4c037f16c6bef5f1c372ea4c8b648edd2bd8e0895133d1efaee5548744d0770cc54
+DIST rake-0.9.6.gem 123904 BLAKE2B 501823948aca339130fabc1cd303c8f30c5afa864fa4178def77514ffab1ed0a372284535324c8d66c331b60a2f1a6e74df2338312770974ef9cab8f5163fc54 SHA512 9ea3b7bd96db7e96f8bf5a00db710003d39ffeea6eabfde4b9a8afead0e6f6a8fa7740f42a61d77a4322f64ab0338b19af8c63d0178624dc7c0e787e11b0b6f3
+DIST rake-10.5.0.gem 130560 BLAKE2B 05ae87d68641d5afbdc16c36d33c5cef626c8290abe5131f93f84e85861f0175f0b72a62f1b42076dd42a546a08c6efaa9400cf46707a2d4adca6bbff407b769 SHA512 0c95921e00af8dbc51edf9fdb8a8d8b0cc68295894fd310b3c4e5aafef1d5d6f9819a9e8a9b4c854f54835115123411278992f6223e0fb18e2efa7fa58ab6fcf
 DIST rake-11.3.0.tar.gz 134863 SHA256 d60ecce6911035a65daf80d038123a55723dedd62b960bccaaeda55a278b5375 SHA512 705c4b1979bdf8042acdc6cea403b2886ac9c589ed0eba7c258d0ce5c46104b7d6556415e82a26b5cd9559954ee53a0bd9f4e0373fd2601bb3b3338a426b3e5c WHIRLPOOL 162de593a1492623f2281339fb8a8974f36e691a0ab4fedae6a01f3b23a4b0dca2cbc2d0e90bbaa444a90872b55d18652800aa95c60ff8459ea732f4c0b69d5c
-DIST rake-12.0.0.tar.gz 117571 SHA256 0754389d1ca3448a3715ca9f61ef303631cc6998c9483f8eceba0109de3a35f5 SHA512 2c8a0442b8c2f7755d8740f89d0772c646c87f64c04377955760c42a37ac25334628044ea37c09cd21e7372cab9e8f3d04b0076f0c34466eb4ea328c0bdcb01c WHIRLPOOL c083a8c61e0e074e2a13bcde93043dfa47523374d8a5221f5965721c690e5c39579dc367a4c85c883c515da70adac58012d11bc15ac5141688636be3ce40dc98
+DIST rake-12.0.0.tar.gz 117571 BLAKE2B 529dae3997b033aab8c117f02d41d2cd19df253b4b6dec391940e28b2849823976c3b0d5b302a3941c892354b14bebf10031c7eb63a05f0865bf928c8c0ca41b SHA512 2c8a0442b8c2f7755d8740f89d0772c646c87f64c04377955760c42a37ac25334628044ea37c09cd21e7372cab9e8f3d04b0076f0c34466eb4ea328c0bdcb01c
 DIST rake-12.1.0.tar.gz 118891 SHA256 5935501d3e777405a5cc83050d3aaad14b889766d0298c8ff1d8334be58c6591 SHA512 931161e9c220bb18b913c7a2aeff5bb4711cb6a4ff5ab1850aae307e6ab38ac0dd9d0aaaaba4510c27006def6734a8debf8e500a5de8d6f827c3c954832ff136 WHIRLPOOL ff1c9e8790039d6ceed7fb21842d25122aede8b0aba657107dff4fbe4b905aaf5bb8a880de3492bcd205e3fffcf8f9523405f61d2817a8b32e2a8f2db0230d77
 DIST rake-12.2.1.tar.gz 119660 SHA256 bf3226cabe1814c557c084c90d23343b925962360fea70846fcdb4355da51ca4 SHA512 930e2d82f0b5a3250cc0e8357bad60a7ad5f01fed06884e746b72cab60065a326c84d78410943836a698ee8cac1b291d162350d8304a4abcb7e8c930c026af4f WHIRLPOOL 901930bec67d3740e994570c5c5bf2cbe2932a0f7f3ff714e97e2bae0f832fea03de5bac01b7dc0f0d03d8103b7e221ae2aee4b5f5d3435722b4b370e06de36f
-DIST rake-12.3.0.tar.gz 119742 SHA256 522e015007fd501879eca9f96802f7635f0429540f1faf2fe54d7bd7a3bd8635 SHA512 a4768530d484dd2a1abd19c1d89b33ae31da54d59a8719f7559c586abb1c4eb7f6dc3cd05f85ad136137ad3395f57a121ebcc693da2d35e4cc1d70c1f64b666f WHIRLPOOL 46c3f1bae2af9c0b6abe5a1b1b550a34b9e2d10265c9c4395370acadffbcc6feb0c81a3307721eb9a967c04bdca6b77562ed96bc13ebe99bf89de87d29423cc4
+DIST rake-12.3.0.tar.gz 119742 BLAKE2B e8850fa4afe1c27f3502ec32738258823295bae992a7e6ee2d88fa53d13c9213509db48736874cc30f0610285272ace33c91a147a1891774f2f26b6b022dbbbd SHA512 a4768530d484dd2a1abd19c1d89b33ae31da54d59a8719f7559c586abb1c4eb7f6dc3cd05f85ad136137ad3395f57a121ebcc693da2d35e4cc1d70c1f64b666f
 EBUILD rake-0.9.6-r1.ebuild 1652 BLAKE2B 12d15696c6a7a96adffceccef1887362054e2d0e6efe1681f0e6e131b11813265861eaed2998df470dd785a13d843d91e05c7de3c3ce1d7498ca1fd1949c2b1f SHA512 2bade0e1137fcef57b593440604ddffa7cbf8ceb12c1f7eccc3f91abc05a01b86090dafcffc807dc47f46ab17b1fbdd68fde456cc7d8c06753efd79e50af7f97
-EBUILD rake-10.5.0.ebuild 1195 BLAKE2B 9a2c4d0b21ef7e0d558d683b69b8f00b0e3a7d1e023e7e1f4919b9e4e60f4f617c70706862a8f8848cef5a7b9c2bf470693079d91f75c9e334e0b1fb4e87f1b1 SHA512 42baa6f51ac1604a1594eaffce3b374b9c983861ed5373e5f7fd94a7b789d2a0b6da36fe044f2354aa64494b5f9f1565b2edc2173a60be3f9585d7976e521664
+EBUILD rake-10.5.0.ebuild 1194 BLAKE2B f8d764db98d3c976571a492c59c420bee4a5a6b459b79938de3e8a63090e85234fffadc7bc8151a8fb8365bd2ffaed4df11029b7997961fc4bc878d272957d38 SHA512 c818bfed0c41931bbd39066dcb3a82e80c0f1c0e21752d038e9fe6c0059679176fc34e537f1458ac48252798496304a40c310648ead421fcbdab3ed0387aea61
 EBUILD rake-11.3.0.ebuild 1301 BLAKE2B d45fdbf2ade4b863f22caac24f2c946bf7fd71b847aaea3229064423969d33a1283d38e5b944e1d4a15be5d9e3ad60792ec565379770739159dc739b2500eae1 SHA512 99fee0adee74014b78392cfcad60ef753adac4e8fedafcada27b5429a3746b45f36caa854d4fbc4f888901b2d14604f427b0d0c99fd98a577c36efaa5488dfcd
 EBUILD rake-12.0.0.ebuild 1308 BLAKE2B 9d9cf580af743e4e9de4fe4e63d5ed9369048ea54c2188cffcaa8b6880ec883a2201679f6d88a70325431cf12183ca92c49533a103c138e52ed04805b70cc6bc SHA512 95125011cdd74c8b6b1befe9378e65b46d8c8af66776e427ab4f4b8f7dfe96059db06717b43911c066c35dce1607c58c739b72c409bbd0299bdb9885f27433ea
 EBUILD rake-12.1.0.ebuild 1395 BLAKE2B 94ea9f18d6630daca91db006674d4bdbd158b80f12c96d16c290e9e6e40c4bdeead969bd2d4d0ca26ea6b85c6a8dc6cc5ff9e919879604b93524b6473e4e8d53 SHA512 d46d7e79b563a974e055ab02d4224d7b7110769133e6c837454b7e4372db202d293cace9afe4c6fd96c4950c003cefc726fc90267ac93bcf98e6b575662e377f
diff --git a/dev-ruby/rake/rake-10.5.0.ebuild b/dev-ruby/rake/rake-10.5.0.ebuild
index b1358550b629..4a2fbbc3c5c3 100644
--- a/dev-ruby/rake/rake-10.5.0.ebuild
+++ b/dev-ruby/rake/rake-10.5.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/jimweirich/rake"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND+=" app-arch/gzip"
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index c011e074256c..6d501e23ab8e 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,10 +1,12 @@
 AUX rdoc-3.0.1-bin-require.patch 632 BLAKE2B 9835233574b78ddf5c9e1d60aa4a755928854ade5076141696ebc046ecbfb0ed1a83754454e7cdd6accd42a49bad6cbd23258cd8e4e14a280463fa0e368d62ed SHA512 d8840d320582f1b744597a4a48008508dfcfe7537b24570e977f7e10f1bc6e5955cf9319182d2546db23d96fa31a55320bf54f49d127623c9d9cac9d639c572f
-DIST rdoc-4.2.0.gem 735232 SHA256 391bfe3484a69db2cfa0fa32eed9010a7878b33ae645d67558d1806c847290cc SHA512 d58aebd7969fa8ea795fd4a2b35ba92d0f7368526ae0fc7fa64956db4e3d80c1b61f472384fe7e5eaa628e9c1ee637c967caf1a52362422cb7c2757e486594de WHIRLPOOL b2b8ee2500c901b8638d1dcd1b8194ee12f447a8ecf56205f77999e75a0f038583382efc6147719d4782befd6a3e4106697ea3158deb00c6183c4388223a720c
-DIST rdoc-4.3.0.gem 738816 SHA256 8cd820f70ec4b315ffff8e0653c8ce46cc9e444f3f8e7ed21c57338c61156a8d SHA512 7ec5c8055262300c159ff2dbca3bcd09e169002acad8602db89086d2b9409a096209a1152dca68c79dcd1b5e3c1fdf55e7f89d82b33fa2ce65c816695350b029 WHIRLPOOL 98f36bf06b3cf1f6f7fc7ee57395d794d17100dc7d996f95780ecd46a2d7fb9a0990e8c8c5e424790ac5dd32382f4e3e876bfdb91ba419cc6963b7ba360c11ac
-DIST rdoc-5.0.0.tar.gz 701335 SHA256 bf7b8be4afbec4f4fe38ed2d5cb4bbcccf7c4c7288547cbee12739a867488318 SHA512 922c1fc36a3186eb2784754297930306b420a27ed2dcae879ed34b9325158e1e9c4e0721a44a027805c3e921f9b975b69009ffbf734173d668ba9df1d959c061 WHIRLPOOL af68197e6681ef8f17f9d857fdadd6b628eefe0ae65abfe663b399339877977fdbea63763e0293b00da045b84e3b673b4e262ac3b7be9bd97303a6bb187c6fc1
-DIST rdoc-5.1.0.tar.gz 702376 SHA256 d2cd37fd5f8f78a84ac73806f1b2c232d3a07f2177d616d21c3410a1c8dfe4df SHA512 cd2ed37e8502a3e9093c88c258ac5e39542a23c3dcaedb9b5eb48ce391a694e5b35fbcfd62f01ec6353ac9c40a4b7043b2ff11bbc403d2e03de9a84c52bcefe7 WHIRLPOOL 0f6266b82b254774222d7b1ac1fb88fc90f62221bc04827e9ef78811a5d10c17fc877a840d38570e9eabc8abf54bd272a937b460d01be689d1f948e96a940172
+DIST rdoc-4.2.0.gem 735232 BLAKE2B 86bcfe63dcdec62a2297e1fd61c16e5930d920a44551d2c952dd7eee0c5fcc0f69a56f031b272463521928a77085e7c5e6258a95cdd56c9f8a46abf43faa9e8a SHA512 d58aebd7969fa8ea795fd4a2b35ba92d0f7368526ae0fc7fa64956db4e3d80c1b61f472384fe7e5eaa628e9c1ee637c967caf1a52362422cb7c2757e486594de
+DIST rdoc-4.3.0.gem 738816 BLAKE2B f705b4fed5a9a7e3a850cacc17b7df3f8fdeb163938ed7d2d29979337cb24bca4a66695643ecc62f811d8e49a931296e1972d5d13366685315649e0ec44ebef7 SHA512 7ec5c8055262300c159ff2dbca3bcd09e169002acad8602db89086d2b9409a096209a1152dca68c79dcd1b5e3c1fdf55e7f89d82b33fa2ce65c816695350b029
+DIST rdoc-5.0.0.tar.gz 701335 BLAKE2B 6fb6fe6bd6c00886229613f2d49e3f9bd1b7158c16ffa75b2ba8db73dad373b09cf8460ec81f54e555d15ca5b7f7f9703eabf3d088944de6922acc8c8778e189 SHA512 922c1fc36a3186eb2784754297930306b420a27ed2dcae879ed34b9325158e1e9c4e0721a44a027805c3e921f9b975b69009ffbf734173d668ba9df1d959c061
+DIST rdoc-5.1.0.tar.gz 702376 BLAKE2B 733d77a341ddad10f5b648b6bb492e0f79daa392e2ca371d38236e4c85a1c409699e35dd3f5bc8bc48551b399603bb0a747cb3c5f7f1fbf4765aabffaad575aa SHA512 cd2ed37e8502a3e9093c88c258ac5e39542a23c3dcaedb9b5eb48ce391a694e5b35fbcfd62f01ec6353ac9c40a4b7043b2ff11bbc403d2e03de9a84c52bcefe7
+DIST rdoc-6.0.0.tar.gz 696677 BLAKE2B d12ce5a22462b797252182244bbd2d1089c557a77f901224b06bc75bbffc9c50055ea0de5808a2055293730e0e79632bd2361a814eb5370b05c33a225c2e0d2a SHA512 18669123b3d712f73f901599a3ae903914369dc3c985651b7bc7ff6e1893a834e6c5688ced97ea6324e6af13050d151bee5d62f44e7a4a1cb8d314acac77b50d
 EBUILD rdoc-4.2.0.ebuild 2796 BLAKE2B 9dcdb3ecbe89839686b3257a3ed0e4028bbd0a18a52fb87bc2190cc530acecdaee99acbdc593fdb85808272d1605c857761afe703fb77cb05a9eb3f3b6b2099d SHA512 20f754838e46a669b0bfa35479bd203b8bbec48b38b4a374d931672f76ac47013f5bb44951fac909c8dacc687e53261e53269a12e6d8a3c35cf12b77cd479ed1
 EBUILD rdoc-4.3.0.ebuild 2707 BLAKE2B 31a52357a6dad42bcfc4ab8bbb3931659f9686b4df85eacb8580814d315e6cf480d334ad08305c759b166c5c8cb326267452b889a976b4ac8a276148c0c4d5fe SHA512 c4718a527c6b5f909c1ce50127bbe6df1194e0b785289098f919b008a9e986674850c6ae0ab1d60cb5a82ecfb3072404aee3dd1e3ae1e304ea0def1d04a35df7
 EBUILD rdoc-5.0.0-r3.ebuild 2484 BLAKE2B 31647ada85763217c1f1d5dde63a26dcd3d31bf2d08dd6ef81c9b6611bf8a1a1e038ca67d20d8a64ab1027156667586c9a8007f96451a9c161b8ba8a761dc86c SHA512 1f5e26c651945069ba5e20ba7b1941b44a39d93253a57c36974ef2e486e1f5f60be9b134e80b83d9a661e90b12083045778a231751436188fde1f2b8bb401d52
 EBUILD rdoc-5.1.0.ebuild 2575 BLAKE2B 3c3c26b0395e376710b616112c1e4fc476582fb6c1d01ab3aee9b3b316e76bf691a9acde559c26ce5b1b9d098c661999de883385a9e277a3531f8a036a7fa99f SHA512 3e2ad90adcd556d8c834878c2ae82de6b7a52c8849f74712fed888e2663c1285e32c25c025477e3cbd833e311c4705ac3c064371ebb8c2d51ed6e2bcf2f79881
+EBUILD rdoc-6.0.0.ebuild 2526 BLAKE2B e1d77770cb608be2408df290838585bb7694c2d90a6406717d0bd280349173eb1e13407fefd9f9289a30f4a6d62f1280542d64934be6a0a3752c3d232d317d57 SHA512 97b278f2d205b5041c2af33fdc934f17605cf6e4a6cb2aa46f99147f73d8462a84b636d1ed1dd6cb3dbb3cd0e113060a579d73d68acaaec17bc8961a58dbd0fa
 MISC metadata.xml 335 BLAKE2B 835d498407155ac5295c70af8a671114c777e5f9371b3d47f9f92a6b102b8e1d58755df0737c34820630464772dc001163e83b5d319707a1c630f4cf2f9ef8de SHA512 3421081016cb99570f9ce9f775097669cd40a709efbbb3c76a20947717bc40d886195a5fda889407d1c436a387c126e07def1eeae01edff53c490ea9c630e992
diff --git a/dev-ruby/rdoc/rdoc-6.0.0.ebuild b/dev-ruby/rdoc/rdoc-6.0.0.ebuild
new file mode 100644
index 000000000000..a2fd6a5a44d6
--- /dev/null
+++ b/dev-ruby/rdoc/rdoc-6.0.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
+HOMEPAGE="https://github.com/ruby/rdoc/"
+SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Ruby MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+RDEPEND+=">=app-eselect/eselect-ruby-20161226"
+
+ruby_add_bdepend "
+	dev-ruby/kpeg
+	>dev-ruby/racc-1.4.10
+	test? (
+		>=dev-ruby/minitest-5.8:5
+	)"
+
+all_ruby_prepare() {
+	# Other packages also have use for a nonexistent directory, bug 321059
+	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/test_rdoc*.rb || die
+
+	# Avoid unneeded dependency on bundler, bug 603696
+	sed -i -e '/bundler/ s:^:#:' \
+		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' Rakefile || die
+
+	# Remove test that is depending on the locale, which we can't garantuee.
+	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
+
+	# Remove test depending on FEATURES=userpriv, bug 361959
+	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
+
+	# Remove tests for code that is not included and not listed in Manifest.txt
+	rm -f test/test_rdoc_i18n_{locale,text}.rb \
+	   test/test_rdoc_generator_pot* || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		ruby -Ilib -S exe/rdoc || die
+	fi
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake generate || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for bin in rdoc ri; do
+		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
+
+		for version in ${USE_RUBY}; do
+			version=`echo ${version} | cut -c 5-`
+			if use ruby_targets_ruby${version}; then
+				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
+				sed -i -e "1s/env ruby/ruby${version}/" \
+					"${ED}/usr/bin/${bin}${version}" || die
+			fi
+		done
+	done
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/rdoc) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+}
diff --git a/dev-ruby/rexical/Manifest b/dev-ruby/rexical/Manifest
index 7b496074677c..95281b0991d3 100644
--- a/dev-ruby/rexical/Manifest
+++ b/dev-ruby/rexical/Manifest
@@ -1,3 +1,3 @@
-DIST rexical-1.0.5.gem 20480 SHA256 2db1bcd03fcf7f072ccbf0555417a095f0c5b344d12ecf9a73fc589761006512 SHA512 6cf5eac36953203a2de66eccbbc8679a4d695c3f0540ab8adf7a3db37eb4e94889c64c3ce4e4e88ea52738a6733680be2105e0604d01a2e07bae10939deb03c1 WHIRLPOOL 9ebebfc1a01545a85f5366b12962d72d3a2fad0b4fc094486985285576fc7f279cb2360b09bb666761ca3dfd8c26e8a278fc85a4297cc8433d7a3ea8fc5b9779
-EBUILD rexical-1.0.5-r3.ebuild 1069 BLAKE2B e424cd70d45cd475e34d707f7b5cd33c428f240a6ac95d29474380011f8a0c9e1739ea1952011df156cb624d7ea9c9324fda4c5ae8b2cb74503391705514823c SHA512 0d1bbd542b6a4218e39662fcaed6b050dc41d088c9fb4893e82d6259dbe014ae8aa9fb65506533e7e1e743df26da17be878cd05a5c22c20bf29523e7d0cbda44
+DIST rexical-1.0.5.gem 20480 BLAKE2B 6ed81f9247410aa68cec1ad02a49774da839679fa3f535691f79da42144fbcda4b0f0dac74c7c02bb08d262b66bd543a8bde05ac5871454b96a7582c228e5fff SHA512 6cf5eac36953203a2de66eccbbc8679a4d695c3f0540ab8adf7a3db37eb4e94889c64c3ce4e4e88ea52738a6733680be2105e0604d01a2e07bae10939deb03c1
+EBUILD rexical-1.0.5-r3.ebuild 1068 BLAKE2B 7af00cab69887ea014d512cebc073d8f28f505085f86c9a1ec061ff183542d6d0e9866f270c002f3e0d2745cbd0ef590aa52c9dc8079f5e545eb88005e30d133 SHA512 fba12a513351a5503c3a281159fa4b80c9a34335df1a47dde57ba3adad936e8b2206f516ba7dd447de05145fb0cac1678f91e637bf61515d32db18b752aa48af
 MISC metadata.xml 344 BLAKE2B 308f72345dd9f7ce808e53f6b3883102b7c5b51d41ff822d28888d684abb4efdce86e24fbbb2d6ba46342c85e23189fa619343c467689a13b62382a5ea024d2b SHA512 96c6b9e4f3ca4aad95e01087158bbcd9a159569d7ccfc90365732e4ee6b9772506521c7e4706043897ffceccc98236077abf570efac9f0ddb24ef56efa65176a
diff --git a/dev-ruby/rexical/rexical-1.0.5-r3.ebuild b/dev-ruby/rexical/rexical-1.0.5-r3.ebuild
index deac1967aa25..3b68cfa6a7be 100644
--- a/dev-ruby/rexical/rexical-1.0.5-r3.ebuild
+++ b/dev-ruby/rexical/rexical-1.0.5-r3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Rexical is a lexical scanner generator"
 HOMEPAGE="https://github.com/tenderlove/rexical/tree/master"
 LICENSE="LGPL-2" # plus exception
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 88e65f2a7d81..e9d39960d6a7 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -5,7 +5,7 @@ DIST rspec-core-3.5.4-git.tgz 369170 BLAKE2B c95fa7740bcc1b586b4e26be1db4cb52bb4
 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
 EBUILD rspec-core-2.14.8-r4.ebuild 2764 BLAKE2B d8a6bda7260cf9657695ad47473edea4d49efb97dc8e591b7ae642b971c93d5df370a254e0831bd422cb80e10314e25169fc09ed82f601faa63fc5f11411a95c SHA512 3c53e284b1c11850a610dd956b31aa0e6cedaf7925d346c95198a1cd9cfdd3a2c23f9b14aef382d3b9c6551241b20980a2f563ce9f11264048daa649ded2e694
-EBUILD rspec-core-2.99.2-r2.ebuild 3051 BLAKE2B 2c876764fef17f0f74ce528cd25654832d86b49d73db1570ce270f3fae7816d1deca51deefb37c184e99d33d2ce019d296b5b4092332458812ad4458c070e52e SHA512 572f1466fb894509935704691806563f7186e1911201b4b7bba04245d43928e8bde4ddf1370b358c2abb15ab3c924395e181a6b2257b19f98493dc64bd8cdce7
+EBUILD rspec-core-2.99.2-r2.ebuild 3050 BLAKE2B 4174c8af656edc98bf8c83032a7d0fff374c9beabbea68697c9270c3d685a57ba4481305cf2d66482f5a6511aaee6debacd176a88f5b99e5073753853dea4fa9 SHA512 1ba71ce94d0bf9c2fdadfe42f34bf668ae0cb2a69cf0584b3ae10afd02ade337705c51339edc2500d2379696d4f883a7479f8f7c2b659ad55744d5b8a48903c1
 EBUILD rspec-core-3.5.3.ebuild 3164 BLAKE2B 0eb341fc376171025a09bac586b90d4a1f16412bdb384df1d14b3dad7e4784ac4c456acb6dcc400fdeedcd1d9fbb2c6b098f60259bc179e8a9aae3cc4e36e2ae SHA512 fb8fc39c784cf66a63385d6e58abfe2e74833ea5594c0d01887e883003a67603dabea69a2c598bd38ab69a49938136c0462fa4a217363b1d4cd189a9e4946dbe
 EBUILD rspec-core-3.5.4.ebuild 3178 BLAKE2B 511992cfaa43a4fb51e907994c0edf0862d31f6f899c0cc04577d8fd31f48c450a1a82ebeabc5862d10e5a0793d266cabdffd94541ad3ff6016043029d07b1a6 SHA512 93b1179badab718a9ba151b489381a0892ab9975fbe405fcc99cf6b4725965d5aca29b25ec4bce93e2636a8d87ccdf427ad39ba468643f506d8aee4adea04b0f
 EBUILD rspec-core-3.6.0.ebuild 3246 BLAKE2B a355b0b37d5a30e603cd24bd9795d5fb9961d249c928a85e089265ac86009ed4be963cf15718ad672320a3160f7679efcd749226574b1a006a90de9d85f3ee0f SHA512 1b6d34c39c4cdb18261f16e78d988fe18f60a81a72a34a09fae96ec7f7a29c6b2d7ae01a8a60daaa26c6d96d1d6d607dee91d7fa728dcd7e07671a69b0391f5d
diff --git a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
index 6b01d05d9ae3..896b625923c0 100644
--- a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 "test? (
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index 655c1f37a987..064596f06604 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,14 +1,11 @@
-DIST rspec-rails-2.14.2.tar.gz 75049 BLAKE2B 6b3fb32b85b050bcaf7f83cf489ba551bf0b718b0d6a14cd1ad352c6d8ba3633a82c75d8316d2e76e351e3f222b7b61bc37f03d3f385173fd608b354458a2fef SHA512 2dcc568c578f3201dbdc6a757c84d0e689c3f221fe7cbd57849524680e40150c972436a2c6fcc1220e99c9d2e6c97c62bb6d4c5c59e9d6890a67caceb94ed5cd
 DIST rspec-rails-2.99.0.tar.gz 78448 BLAKE2B 242df5d1540de8516bec8f6fbf1c2072278489add524b526f6f125e55401c7fa6c80d8a6ef11faa7d908765b25c43ca826c8cc1aa71ed2599706ba8793105f6e SHA512 0453450cf5a5435dc4f870ae7a37a299c6b17a4df04de730c14ca3d070808c9a9a70a6f485a1d0c6f4f8ddf3def6e4710ae5842e9e8f0b59c10b2177299670f4
 DIST rspec-rails-3.5.2.tar.gz 123642 BLAKE2B 7580846be34bfdf542f2c15f83e4dcdea98929b5d2feb04c645b905497522f5ee050ada800ceab975204c9671e8833b9c3fb978e4b55d6cc75b2291a96a1fd60 SHA512 4f7f03c740d7215591f9ac4fc9fb77f8d747b6446a831580518db2974b07806eab8ed29ade78afbdd981236f3c64b0d933f04be7cccf72c5e57fb85795dc7df4
 DIST rspec-rails-3.6.0.tar.gz 127171 BLAKE2B 05a9e486840f724b15bf61bb72b870a27fca47ce28d242b9613e15f006293865d8c25e964896195b5fadbf7b73267ea7d1c6e6e3d17fb7016928b951dc28ae40 SHA512 f093c96d2d0c5b75ca055bfd1e7dfb990a66288a84293c6b3bd4622dfad52716b4b60553eb83878fb566c2e4d8b25b91da2071727ef54e6dd8aa11babeb80f81
 DIST rspec-rails-3.6.1.tar.gz 127123 BLAKE2B 9dd03d8483c1ef94ca7c7e561ca2a6aad82fb8400cfd5a48f40e3feff7597aaaf2a877d72d356ffca2455e6f3069a2d60c23ebf2ff3bdb8e95d954ff88832a3d SHA512 4d83f04ab640fdee6da5d6eab2c2a3bf8e04ad2f55e1a31f1dffc3a85ea3e731f1a0ffa586825e12972120568226d52fd6c26ce261412ad69dcc73ed879e763f
 DIST rspec-rails-3.7.1.tar.gz 128940 BLAKE2B 8a5f707ca83970cd6c97f80c945b7f297fc86ba4ccbf2390d00ec0f8f0a5bc11d7eee822bae333d33d3f6acc2de7dc23f100eb59015861cc7265b2426a054676 SHA512 080d26297d722baf796463ecbb1aec29c925eddcb1e09a82479090d5b1d64c0320b0f370e4c0063ae0bddc3f7bc377d8cc5764b0464a8bc65300ec7ed78202d6
 DIST rspec-rails-3.7.2.tar.gz 129851 BLAKE2B b37619b4a953fa44ef402a0dea1531837932dc7bc147c08b29bf85dcad61c7ca72b30f28edc391ae05d5040dcc902d6571342bb51559de84ed0c93244deffbec SHA512 a1dbbde3539b09c33d85c9307126df09c508fcf39abc25a6438fb0582ec19049ee1888d7d17d256d33bba08c29792a0ec30dabc37d870a369580a58cb7ef03df
-EBUILD rspec-rails-2.14.2.ebuild 1281 BLAKE2B 1794507c98eb4d6ebcb8c9100eb7d6502a3a2630b3e18431e3053aa9debd6ab9b249e613672012c38023495d73ca4feaf62393ede35a982ef4fecb652a2ea8cf SHA512 dd62182782ce569a02fdca1a68eebeafb67b5ccbd2e5e7c0a314e49f8b5fe34403df1cfdfc5f721ec47969cf317cee5bb8e41e0717584f30d3a100e695a1baff
 EBUILD rspec-rails-2.99.0.ebuild 1276 BLAKE2B 9e89cf804b918dae0e5ffef95b225770b93518a9d99731af80f968e7dcf7b86b4c1dd273efaf8f9d51f6fa496b93e2417f47963306a7089fe5088d51d5916ac7 SHA512 bfd59985e24aaf911efb4238078cc306b6d73c5eedd6ee67189dca581b8b32d941d0c699b4b873c1fefb89184632eb20897c525089856874f1d796e9d93c6728
 EBUILD rspec-rails-3.5.2-r1.ebuild 1448 BLAKE2B 3b208f678509b6812b5bc2bfd7dcc6cb9480848d71ba4a0d01646e4e09a7fca274926d1dbfc5ba207301d444a2c0ccd54c070649b94da7eb6675b5b2b5bf434d SHA512 92ce74b24b1a330b83132f2c9c79829c1a172709a96b8735279688a015178e98c3979385b86ebf4ca6c1841dd744be23947e5b5951964559ea512df0fcf18e18
-EBUILD rspec-rails-3.5.2.ebuild 1453 BLAKE2B aac926c02025da2da2218b8159e8c1bd4739cb4cc47fd5ff3ba4439f03a4f309018b93287a15ce3a80e2624cc35f7ddea61ffeffb95287fee1269d9b4df3ae1a SHA512 2ae2a7982811ebf209e578f554e0e5a0702c9cf7f2746d1b5ee7340db3825f4992d422f400bba8f8e56f196920d0620563ff73f10895d8ba16b2d8e8fb347a17
 EBUILD rspec-rails-3.6.0.ebuild 1448 BLAKE2B ab0ecb95e96eedddf57dbc1e254df43b97cd3d9a0930942b3bdc3554b7b277e8823dd8dc77eb32b58f339736b0b71f0b307202996edbc9970233c44cb3fbc3e1 SHA512 4f28e6dbf5fb2f4e188eced4b308d470c8e4275154a20ac869e2c4b4539b83f4a56c80338376d4dc00f8d8c150011d9c2ede6ad3f849389bc528b63fe5a69694
 EBUILD rspec-rails-3.6.1.ebuild 1448 BLAKE2B ab0ecb95e96eedddf57dbc1e254df43b97cd3d9a0930942b3bdc3554b7b277e8823dd8dc77eb32b58f339736b0b71f0b307202996edbc9970233c44cb3fbc3e1 SHA512 4f28e6dbf5fb2f4e188eced4b308d470c8e4275154a20ac869e2c4b4539b83f4a56c80338376d4dc00f8d8c150011d9c2ede6ad3f849389bc528b63fe5a69694
 EBUILD rspec-rails-3.7.1.ebuild 1441 BLAKE2B 3cf794cb4a3501ed6882defcce32e0d3e9be1fd78ab5b13e20cb5e8fd67801697a61f730fb51fada29bbfae36fa552e2553a541e085d06a06bee619591ef7e0d SHA512 a416bfe0d389d18d8881cd0eec566e57325401929d8497194dda1ef31dd20905bb5000804c5f5baefdaffa3dd2dd90e15a09dd0ba99a814efe07c4635404d481
diff --git a/dev-ruby/rspec-rails/rspec-rails-2.14.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-2.14.2.ebuild
deleted file mode 100644
index 828faf404fa8..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-2.14.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="http://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0
-	>=dev-ruby/activemodel-3.0
-	>=dev-ruby/actionpack-3.0
-	>=dev-ruby/railties-3.0
-	=dev-ruby/rspec-${SUBVERSION}*"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? ( =dev-ruby/mocha-0.10* >=dev-ruby/capybara-2.0.0 >=dev-ruby/ammeter-0.2.5 ~dev-ruby/rspec-rails-${PV} )"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	# Remove specs that no longer work with Rails 4.1 due to changed naming.
-	rm spec/generators/rspec/install/install_generator_spec.rb || die
-}
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.5.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.5.2.ebuild
deleted file mode 100644
index 57ccea0f52c1..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-3.5.2.ebuild
+++ /dev/null
@@ -1,54 +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"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="http://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
-	>=dev-ruby/actionpack-3.0:*
-	>=dev-ruby/railties-3.0:*
-	=dev-ruby/rspec-${SUBVERSION}*"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? (
-	>=dev-ruby/capybara-2.2.0
-	>=dev-ruby/ammeter-1.1.2
-	~dev-ruby/rspec-rails-${PV}
-)"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm -f .rspec || die
-
-	# Avoid bundler-specific specs.
-	rm -f spec/sanity_check_spec.rb || die
-
-	# Avoid broken controller generator specs for now.
-	rm -fr spec/generators/rspec || die
-
-	# Avoid loading rspec/rails explicitly since ammeter/init will also
-	# do this and loading it twice causes an error
-	sed -i -e '/rspec\/rails/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/sass-rails/Manifest b/dev-ruby/sass-rails/Manifest
index 020257feae05..8ce0667c8092 100644
--- a/dev-ruby/sass-rails/Manifest
+++ b/dev-ruby/sass-rails/Manifest
@@ -1,8 +1,7 @@
-DIST sass-rails-4.0.5.gem 92672 SHA256 8b93da41049d32f14625abd6a0514d34286b87e9123093db054eddbe644487db SHA512 71515d2c16886d64af4c00bd78094691579bfbb3660ff9ba4d9f2807bcbedf104da2f7a321a3cc558f0e2420f702eb2bd2379cce30f1d21d8b09ab5fbc8347c5 WHIRLPOOL 9a39907a182ba20c7a14963dc00d6455babc63c1a3c5a202c6475f5e7b0dbec86663309f416b21d393e904da704f84f15634cda9521d5fbfbb03bb5bf10338a1
-DIST sass-rails-5.0.6.tar.gz 89862 SHA256 65e679876056ffdc3d25c5d3f3bce44a5b4ab246a82d101b8b7b9f463ca0b321 SHA512 97b48e3b928c4323007b7df7f6e51d5a1c1f16c5f9276786bdb6b3a4f293ec73c4c18037cd3cd5d0bbdfa3ec92f44a8793606aba9cd23f5518b637cdee58c915 WHIRLPOOL 0ffcfdace2a6573a4ce300f320046a834431bb243619f6a2e3d6807b8f5b883d5ef3c6f7f09374a06313ed99544f3437a57e614f8facf8b61a18fbb12203b2cf
-DIST sass-rails-5.0.7.tar.gz 90425 SHA256 a3c922c80947478adf3bf094051cbc226d485543567db4eff404360c9955e806 SHA512 491a1618a75becf6095b102c996e50d25fe701d3a6c1b6c6fadff81c6c09260c3ee6ff9c84abf7bc62779fa7034d54d7c0d9a7c4148d3cc741d83efda87ec0a0 WHIRLPOOL b8135ea9c5052a01bebe2e752619f682bf5cf06d45301092547689cc09da29b8a971a6eb742a09955ede15967332aa165b8876ddaed2841dafd58599fcf9aa59
-EBUILD sass-rails-4.0.5.ebuild 854 BLAKE2B bd82e86e868d9ae7642bc6bd602abb1b4b52132230f18703ac52f8f75b41afc1416448c59b3b768716afe4aaf187c82a3815382cd66a9086e04c55b6e52441e1 SHA512 e5d6f57776411c8cdb1cd965e88892e09d4c46d00966fe5dcb804516be636d1b9f7e2ce2c62a00c88bfc3d13177c7eebf8899264cd16db3ba250f6c1fd3b51a6
+DIST sass-rails-4.0.5.gem 92672 BLAKE2B a10dc27ff95122bb2e4518c927c5a81d4a5116bb70d60e68a6c697a7dc10d2781e2b2b702e8b0fe79d7b4562126c0f9d4c0172f5a8a604ea525027c1c8853465 SHA512 71515d2c16886d64af4c00bd78094691579bfbb3660ff9ba4d9f2807bcbedf104da2f7a321a3cc558f0e2420f702eb2bd2379cce30f1d21d8b09ab5fbc8347c5
+DIST sass-rails-5.0.6.tar.gz 89862 BLAKE2B 2626331eea22031d767b235d0187c3d8f4b12b0a74682bcab8fbeac46aa62d8021baca247442519056b6c0617a76b76f917dae38ec5026cb98e14d04ca61d6d2 SHA512 97b48e3b928c4323007b7df7f6e51d5a1c1f16c5f9276786bdb6b3a4f293ec73c4c18037cd3cd5d0bbdfa3ec92f44a8793606aba9cd23f5518b637cdee58c915
+DIST sass-rails-5.0.7.tar.gz 90425 BLAKE2B 8aceff670ba2e4993597858b74362a02307e39ac967a331005f21d384644d0dbdd414560abaa88e60d35358b47d65c146baa72f37c879a2f13178e187cc1f79b SHA512 491a1618a75becf6095b102c996e50d25fe701d3a6c1b6c6fadff81c6c09260c3ee6ff9c84abf7bc62779fa7034d54d7c0d9a7c4148d3cc741d83efda87ec0a0
+EBUILD sass-rails-4.0.5.ebuild 842 BLAKE2B c475aaaa4b5a5601639f79b1750c182e43246afff86e34043a324b172ccfe5a174e3b7ad08c0207c360951e771c371ba7721aa2532d1d95b850e523ae3c4d3db SHA512 39f80de84f307ebf5b2973e07ef994b07fe621a13123fa4ea61eb056ead7a0cb469e3b75766ec8d56ffcbe04d92bb28e0e3a6641cf6f053f73fced6765da10a6
 EBUILD sass-rails-5.0.6-r1.ebuild 1134 BLAKE2B f417c4833a1276539bd32164328f98271bec994d74021046ee4ae5b87459b525683dd36563e6dfff35e75302518e15f9da13bddb06ac0ad27786f2b1ebfcdd59 SHA512 9c11b70d9096f51f9c095c925f8e7c9f7ed9c0d726f789a5979169e6ab980dc7ebfdc75014bd737fc5a28cb6e8f1d5e0ab307a5faceffad6adec2e615c4535ee
-EBUILD sass-rails-5.0.6.ebuild 1132 BLAKE2B 81fc18253e05b2eb5ab4a63b234825aa0cea556f3ae49fadcf94be5d3822859c7056d78a00907aa769256d434256ad3e808dfcf0e640b88e371a62cfeddc11ab SHA512 f474f3daba507d178f8516f6d4daf22b8bc14174598e10203480770ba37ae4df49d20c251a48872ea7f111d5ced1cea49b112155d69ceddefb19a10fd4565d75
 EBUILD sass-rails-5.0.7.ebuild 1127 BLAKE2B 5cc36c6263cb67f01e789166dcbe54d98e3f49f44099fb4af4b222b9e003d331e15198796384a0dea89c0017dded0b9b2a47294425ad3dbe6572514313c647fa SHA512 e7a209a46f779b5a662bde8c0e2abe8d4ba965387ea5a5ff02b543b5ed987b7ccdbdac56e0e5da165aab43f6097bfa23005b3f8684c99e9583405661490bde2a
 MISC metadata.xml 342 BLAKE2B ada4b20d7341b3ce1b6062b13b4e2e3bbeabd0d5c1532a1d488ba4d25b4de5b940e2632a84ba7a4fddaa02439308dd0c39d993991a3f29f45d4e6bb5a2c66a84 SHA512 92d0e35a64810351db2a1d71d32b1c93cefd2689eee3bc4eb275c9fd016aad8fdfaeb0ece230a5da7d2158f720d6715d2f15b14bf3c7e80c0211ffc895863920
diff --git a/dev-ruby/sass-rails/sass-rails-4.0.5.ebuild b/dev-ruby/sass-rails/sass-rails-4.0.5.ebuild
index 076703de1f31..24ba742ccbb3 100644
--- a/dev-ruby/sass-rails/sass-rails-4.0.5.ebuild
+++ b/dev-ruby/sass-rails/sass-rails-4.0.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22"
+USE_RUBY="ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rails/sass-rails"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm"
 
 IUSE=""
 
diff --git a/dev-ruby/sass-rails/sass-rails-5.0.6.ebuild b/dev-ruby/sass-rails/sass-rails-5.0.6.ebuild
deleted file mode 100644
index a20242bbf4cf..000000000000
--- a/dev-ruby/sass-rails/sass-rails-5.0.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Official Ruby-on-Rails Integration with Sass"
-HOMEPAGE="https://github.com/rails/sass-rails"
-SRC_URI="https://github.com/rails/sass-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
-
-IUSE=""
-
-# Restrict tests for now since it is hard to set up the right
-# environment with the correct ruby interpreter and Rails test
-# application.
-RESTRICT="test"
-
-#ruby_add_bdepend "test? ( dev-ruby/sfl dev-ruby/bundler )"
-
-ruby_add_rdepend ">=dev-ruby/sass-3.1:* =dev-ruby/sass-3*:*
-	=dev-ruby/railties-4*:* <dev-ruby/railties-6:*
-	>=dev-ruby/sprockets-rails-2.0:* <dev-ruby/sprockets-rails-4:*
-	>=dev-ruby/sprockets-2.8:* <dev-ruby/sprockets-4:*
-	>=dev-ruby/tilt-1.1:* <dev-ruby/tilt-3:*"
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rake test || die
-}
diff --git a/dev-ruby/stringex/Manifest b/dev-ruby/stringex/Manifest
index 1815ec808070..5797c23961a6 100644
--- a/dev-ruby/stringex/Manifest
+++ b/dev-ruby/stringex/Manifest
@@ -1,5 +1,3 @@
-DIST stringex-2.7.0.gem 130048 SHA256 e9864b143c4c27a61a2af5d8ad585809e36d7708b51daee412919ed44682031a SHA512 f47cbddc0e298548d230759c5d0da84bca4d754141ad900cbafad09748d389505358e2a4dd0b61f2e55804c15d9c6d1b0fbccde9c3cd3408814dd898461e1212 WHIRLPOOL 2de63c63fa28b726e87b5e5961d6790a3838b3cb0ae182a11ef15b916c5f7d03887cf54de18c8f6d0a360b13f670e82f8a4a4548fa97d8f8a31174aba65d3ce6
-DIST stringex-2.7.1.gem 130048 SHA256 bb054a02e2d43bfc918d2d40e815f6059e38394f804a6b181dc46c05c01e89fd SHA512 2e53079ceaa33a7d040efcd3428601ffa0b4a1c2c231c8d068754ed4577ca610aeae46cde5d402566929cb5204a1999a287f10661a241197e6efbdadd4c928c4 WHIRLPOOL fadca31bf7ffc295d822d0e68238168c4b8a292ad685dccad4af65091af546fbc93626e2ec4a011da0e67bfbe6b82c16197783307a5da95f516de3465204e564
-EBUILD stringex-2.7.0.ebuild 1021 BLAKE2B 83714d54d094c09b4e2de9262fe13661899a4f64c052773e61d92999bbd358e7f6bd47f49d93acbb521b3b2a086316d44a4ccdc936c5736c98cf7f1ab6ecbf41 SHA512 9e0aae3bcb24bf21c90b5a529376b27714b3c125b194628bb01b6626613be7fbcceb144953967c81635c5d24e0c32f3c8c2f250244b7474522b40a96005c1c1e
-EBUILD stringex-2.7.1.ebuild 1038 BLAKE2B ea5e45a866634a595a37a1deecd6cc086c3b1851f1f8f79ed7e686bbd48ad4adbac63a1caa715e79a7ec19018f8a15c2ab100a3047443171ec7b1c81d2f53d96 SHA512 d17c0e011574b5e982b0b47a806f28cf9735f2f062d57f1d2b12a1527403bb14eec5ff743b5276bfa3e96f44c7093cb53c58641b100b964918bdd08eab7e215f
+DIST stringex-2.7.1.gem 130048 BLAKE2B e16eba7e5bf85fdaf262205e39387483a00559bdaeaabed51b349319328d0fec4b14a2117c949f36e3d190bc86dfd9cebb93823ce23521df74c4783a58225e4f SHA512 2e53079ceaa33a7d040efcd3428601ffa0b4a1c2c231c8d068754ed4577ca610aeae46cde5d402566929cb5204a1999a287f10661a241197e6efbdadd4c928c4
+EBUILD stringex-2.7.1.ebuild 1026 BLAKE2B 7aa28e0f61472e51e3583e9299d7fddbb2ef68b65911758c2f611938350146acfd11ccad7b99ace1194cd0c7d93a676d7e791ceab5ceb5092fccaf3413c7ef2f SHA512 e248735a07cb8a4d6c4c70561e19b89cda019d339c3db4e3c85da9505d51bbc58e743df8fbac6e2b19c1aee512c17a346ee2f10ebeeb142a89f4f05702646e3b
 MISC metadata.xml 338 BLAKE2B 5cf0c51755ddcf10add2da7ec28ff2f3b9f9cf80a9b834a626851ac0635f02e72b8af33391eb281a45a646cbe3854e69e46bfc9e626dac1ba98de6375e3dcd53 SHA512 76f5dde82c273cc2b573f3e2eb417808b9095ae684a860abad1dac99829e0b70790fc3874a8dd8b06c5e8a3dbc71142fd69abb0c860ff9e997b57dde623a11b7
diff --git a/dev-ruby/stringex/stringex-2.7.0.ebuild b/dev-ruby/stringex/stringex-2.7.0.ebuild
deleted file mode 100644
index 1b9bcabc7102..000000000000
--- a/dev-ruby/stringex/stringex-2.7.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_DOC_DIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Extensions for Ruby's String class"
-HOMEPAGE="https://github.com/rsl/stringex"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64"
-IUSE="test"
-
-# we could rely on activerecord[sqlite3], but since we do not remove the
-# sqlite3 adapter from activerecord when building -sqlite3, it's easier
-# to just add another dependency, so the user doesn't have to change the
-# USE flags at all.
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/i18n-0.6.9:0.6
-		dev-ruby/redcloth
-		dev-ruby/test-unit:2
-		>=dev-ruby/activerecord-3
-		dev-ruby/sqlite3 )"
-
-all_ruby_prepare() {
-	sed -i -e '1agem "i18n", "~>0.6.9"' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	# rake seems to break this
-	ruby-ng_testrb-2 -Ilib -Itest test/unit/*/*_test.rb test/performance/*_test.rb || die "tests failed"
-}
diff --git a/dev-ruby/stringex/stringex-2.7.1.ebuild b/dev-ruby/stringex/stringex-2.7.1.ebuild
index 71237f02b888..7aaf587b1f24 100644
--- a/dev-ruby/stringex/stringex-2.7.1.ebuild
+++ b/dev-ruby/stringex/stringex-2.7.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_DOC_DIR="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rsl/stringex"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 IUSE="test"
 
 # we could rely on activerecord[sqlite3], but since we do not remove the
diff --git a/dev-ruby/syntax/Manifest b/dev-ruby/syntax/Manifest
index 3dfcee442462..afd86eb6ce9e 100644
--- a/dev-ruby/syntax/Manifest
+++ b/dev-ruby/syntax/Manifest
@@ -1,8 +1,8 @@
 AUX syntax-1.2.0-require-set.patch 379 BLAKE2B 2f142dce82c2e802e8d8b665a8f547940663366bb27037fe9da8450eee8a633ca7a64687b96532ce4a428f05506fca3bb3cc612971c264e0c5eb8181e8c65d8d SHA512 18a8465164b52a0b39317b50fd69d08f5187f0bc25e709f3bc5ee5bc16a6d257e9e70763447c735615f3b01135c4e2095e0ae8194edf308edd78f4aae08f8d84
-DIST syntax-1.2.0.tar.gz 40797 SHA256 9cec12fac6b6dc4f3fee263f5765333880ae26d4194b9670f3de26d4674dde9b SHA512 69804ab94203e2260b4c585aacf68db6ad8e47cf2339ffeb1105ae39da5f1d456b1413eeeef29f1c450bff19780e815b9b1b966b171de3b24595f759b36e6548 WHIRLPOOL 4eb23d481dbd56878ac024643d10069f644ac182813dc744fa61ea44a418d04caa738915a7a60ca85aff5bf90c35e92187e18a1adf168cd17265c06f2b3a4e66
+DIST syntax-1.2.0.tar.gz 40797 BLAKE2B e12da53ce9d27b362d70f9074b1ef8f87afb95125f9861169dccc4ea200e5a4a765ec0de867a762eecd2240d773724df25bdac50e27136f35120e182203a34ca SHA512 69804ab94203e2260b4c585aacf68db6ad8e47cf2339ffeb1105ae39da5f1d456b1413eeeef29f1c450bff19780e815b9b1b966b171de3b24595f759b36e6548
 DIST syntax-1.2.1.tar.gz 40994 SHA256 d1d4d39f63e4dd4753f68b3baee76ad35941c74257816ac9688ce132dbf92701 SHA512 1b2369a5a71f1818f0074e47e56054707986fbfc14bc799e39925c919d3f00d008e102f11dfc7bbc30ea03c7fab9dddce76e5262bc3e85ce75bcd0550e793f13 WHIRLPOOL f1f6a727a5e2dfd3b6afdbd7f5cd756c5a685e08cdbd41ee73845c434ecf7eb22057857a3a25df8f748e461441519f432fff188f83240794ab566d9290393cf3
-DIST syntax-1.2.2.tar.gz 41485 SHA256 0f4fe45d8dca5cbc6bb0870de5f23aa4d2f518c320dcb38f24b8d603abf16e3a SHA512 a3be7ac736d6c77833aa532f17485c076d34e66c40426c9c6be2dbbde87b2adb7154c9b3bed3439cc12577dffc01c8148e0870a0d02b3a02ffbf9fb1d651433b WHIRLPOOL 1e671223cf2d01bbd6237cbf7684927c363d57709f140ad193974c84c3cfbfb0a4ebb2241573c669b7fb5b5d14c3bfb7542adf86fe4681f9f2c5bb5d11dba31c
-EBUILD syntax-1.2.0-r1.ebuild 788 BLAKE2B 5a8cc23f7823ca5d512f7d97da25fe2bd55f21112cbb4c43742603e60de9066a092c17c91e1033387b43e81c870eae2f15b84c31babbcc88892c895425bcf412 SHA512 721a01d4e1cbf6c2abe6544ac7250f9dda76f5116230de33ecaba4ed2d62ccceb227597063be536d5e9953e35724baed27920b253c84430c08f3d11156cae172
+DIST syntax-1.2.2.tar.gz 41485 BLAKE2B 09a1fc9a4172ec8e6a748981a966c891038fe43303360a3e5f2302aa0fb370b1098c7fd7b8a1fc2f022365ac8491b3e9f9146f940dffc772fb68fa8be5245986 SHA512 a3be7ac736d6c77833aa532f17485c076d34e66c40426c9c6be2dbbde87b2adb7154c9b3bed3439cc12577dffc01c8148e0870a0d02b3a02ffbf9fb1d651433b
+EBUILD syntax-1.2.0-r1.ebuild 787 BLAKE2B caaf41ab28b5a03ff413b4d30f75a4496649e57aad4afc57b64bff7b7b1c8310ad5ee8279d105cabe6a17f26a543b8b1cd8b54849d5f426dcf48293a28208d81 SHA512 ca73b45d6f062110ed3f113249129911614e0ebc2e8a40d00235a7d346c709a128d1a0bcdd14c3c52498c2a0aa437f018a5e37f6d91fb8b7598395556eed3101
 EBUILD syntax-1.2.1.ebuild 918 BLAKE2B b0be7aee8bdf190d9022aa957e622e4d2bdfb218c51793d188303df4bc3baf62e519b62af2b7f6b4e86c126fe80e5ba0837f2b604d13d94bd522274fb92e6e0f SHA512 f209e06add7527ec1c5ede89149f406d8c04f8258ea2ff132e47f934bccdd9c51b95982d72aaabd6cc597c9b91af8a136c2c749d25ce47fc8418c8a35b950103
 EBUILD syntax-1.2.2.ebuild 911 BLAKE2B a7683447f3d2b8ddf909dc72158e9c5b44dfb339bb59cd8a0c8d848b0113fb2cf2340f93954a69afc40b8a2d632d0f59e04fe6eef1f3affad24c7e199d5c67f4 SHA512 4e9d799d4ecdf4fa13cc1ca43415a272bfcd9a6c0f19ee7e97a256e796d4cba0204f3291378fe6fb96f55447d1d9607cf0fc698433c14cb7bdf561691176ddc9
 MISC metadata.xml 339 BLAKE2B 007757aafebca384bbe340c653875cdfa7c36a40d0fcc948f28f2a1eae85265100d30442f1bc05af9b4286f88f969d54bcf001ad9156aa0bd3dbbbf999a3f129 SHA512 d3d2406f489b687ceb61d99a66ec5e0a4539491277a5c2b5006e03414d14fbd5a25d7de00d2983ab629a1c8efb3e4999681734d07df9ef67f6a01c6abe3f0608
diff --git a/dev-ruby/syntax/syntax-1.2.0-r1.ebuild b/dev-ruby/syntax/syntax-1.2.0-r1.ebuild
index cd7e6aae61be..28abba848f1e 100644
--- a/dev-ruby/syntax/syntax-1.2.0-r1.ebuild
+++ b/dev-ruby/syntax/syntax-1.2.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/dblock/syntax/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test doc"
 
 RUBY_PATCHES=( "${P}-require-set.patch" )
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index e24b973d6acb..18a889aeeb07 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -8,7 +8,7 @@ DIST test-unit-3.2.5.gem 128512 BLAKE2B 08758e57b9080b37a00af804d86ab63c582440e8
 DIST test-unit-3.2.6.gem 128512 BLAKE2B 51d20d77858d706c3db7e653cfa372d10f339b441fd6ee8a0487f89e7ba82bb525ace07da6962a87fc01d0515825dd72bc376309010bcaf4ff2a21faded0edff SHA512 4731f40a0c7ef855892a308470ccf005d31518122b0431b44406e627957819c9fb6a00eaca970e5914626e2ed12a4f6801e90df2ffc2762085fa414ea2203d7e
 EBUILD test-unit-1.2.3-r3.ebuild 812 BLAKE2B bbf4b93f0cf854f6c88dd88d1a0bf672087d520c35273e630dde345e63ad3f81d62967635d218c9adae8df2961b00916840c4f14b961d753a1bff4cb5dd637dd SHA512 3cfe35c894cf42716263cc7bddf8d2cb36d0ebe87f7b4c2bf0270f905a7b3d185055a8e423b412c6ada6b0af3c4c952ec6a89e54f83e739898570413797544f6
 EBUILD test-unit-2.5.5-r2.ebuild 729 BLAKE2B 6acc3dd37241489f366050d57ac19bb0a2d9557c339793da3f96e104398b6422d31485e7c85348a52c05687b7777da6984fbf293dc53af2186e9ba27e79ac7d0 SHA512 64939cff707ac0ea52a491015d017ac8ef6282e6c0b204ed86d980c6d27909d0a2211731bdc832305fa177fa2090c86c743d4deea794c6e3934cc6d242b01b31
-EBUILD test-unit-3.1.9.ebuild 877 BLAKE2B 0212085b55316a4c2a1cc2956e8bc4bfc3719c614081cdefb6a763ef30fb6e4d229ed4ce12fcea1f070d218d3c162af3dd8595dc9a66331f798533365ae2d80f SHA512 cdaf2f48b8bc868a9786fc7b71ca04331ffbbb4f5c7b3b5becea36da474f4a912cc2bbda665836733369977b48f73d2e911162f695020f963ccad83c7cc932d9
+EBUILD test-unit-3.1.9.ebuild 876 BLAKE2B 7f5334600e70cccd7e83c6c13e42f42b9bb364a9d51d8898270eecc965e178062fbe6498325828b6dc6fc7b081b8e5e1d9428d87c0865f2d317b8c486826a329 SHA512 ec68f762c63e6915340d70423d335c8e26c33d4f7f1a9f859afcaa2af98b8926d364b3baf5a9f3f97f8ec730c3a143d0cb8ae0df5568346494299fb6a5535d3c
 EBUILD test-unit-3.2.4.ebuild 947 BLAKE2B 0569da6b4395309a7d79c93f3d0c1fcae2827b9b0137589e58cf7a2ac0fd6b72be2b5fd6a3d44487a77bfe3a5de7c9f7e6a5ea3f5128b03e387b9221af6eb2b0 SHA512 bd590d1cef14dfeaf6d76255552ad6a5f184382a5af929b9fc6773d01f397badecdaf50d8ad3b78a9681be3caf29d3cc6b509ff1961c22827880d379ca15493c
 EBUILD test-unit-3.2.5.ebuild 947 BLAKE2B 0569da6b4395309a7d79c93f3d0c1fcae2827b9b0137589e58cf7a2ac0fd6b72be2b5fd6a3d44487a77bfe3a5de7c9f7e6a5ea3f5128b03e387b9221af6eb2b0 SHA512 bd590d1cef14dfeaf6d76255552ad6a5f184382a5af929b9fc6773d01f397badecdaf50d8ad3b78a9681be3caf29d3cc6b509ff1961c22827880d379ca15493c
 EBUILD test-unit-3.2.6.ebuild 940 BLAKE2B a4bcacd37f13a205b87bf9955b5d4015ebbb8455e4641a66a741383f35de3eff2179a044d41f886b1bedb048fbfcc5dee576a29db9aa184209fdfa693ef34d1b SHA512 b152a4ca3bbbd89f88a97ef682b679c96cd852cfed11e18b391b400261d9e1cc6e2f3bba5ecbaac851d81c48b44fe185827459b101fbb852083e889deed2bcef
diff --git a/dev-ruby/test-unit/test-unit-3.1.9.ebuild b/dev-ruby/test-unit/test-unit-3.1.9.ebuild
index 9148e3b26341..e43d252952a6 100644
--- a/dev-ruby/test-unit/test-unit-3.1.9.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.1.9.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://rubygems.org/gems/test-unit"
 
 LICENSE="|| ( Ruby GPL-2 ) PSF-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/will_paginate/Manifest b/dev-ruby/will_paginate/Manifest
index b69ec8d3a35c..8fe0cb5976a0 100644
--- a/dev-ruby/will_paginate/Manifest
+++ b/dev-ruby/will_paginate/Manifest
@@ -1,5 +1,3 @@
-DIST will_paginate-3.1.5.gem 36864 SHA256 d204bac6b85c34e6c13f176583ccef1fdfdbd802658271d1b84791d7ca0b2f06 SHA512 3bac95c0c602d3eba9f6a96bce0cffa619d0e297db85f866287317621713885f2f53257f9d69faa7a2b31c2db86b10c5969206d6118ab8b4d11f4f8fa54f1732 WHIRLPOOL 387d539c8ee9e8c51a4a1bf3fa1037d6f7a643f5b2d1b14b14f68ec6ef59622406a34c111a580ba1a154fc2dd2eb5351769699d89f68c05c207f6fcc3bc25820
-DIST will_paginate-3.1.6.gem 36864 SHA256 c92e843f0a8fc1e5df28a83885b7767fbcfc81c107f7095b1b0821a97c090e46 SHA512 50e0fed5a3ea6a62f8620db3d30046a7a4cc602d9d7936a265d0c20a50eb267ecebb2c7d3bb07f3a514f70e556dad78085971bb80f94e1f4baf7048d6fd34c11 WHIRLPOOL e9cc0362f11fb525761a3be6f4ace8decf9cb9f61fac71608441e49a296ddbb59b96641bfd214acbb2be5e9eb5e15f7a1c3250a2ad8a53478e6ef01847aa679c
-EBUILD will_paginate-3.1.5.ebuild 693 BLAKE2B 375a426ed043f237750882edd9796ab550983731173cc3b6d64e03e20ab7bc737a20f29425be9163d037c85263521070a2ac032104972de6a228a69436e7b7f7 SHA512 57fad0735846a9fc8961c9503deb1eebcc8f79d08b160471567759db19ef5dc2407b08b54892badb6dac65d7e193be0ff8107dcb4ef654b214bf4e43170ee222
+DIST will_paginate-3.1.6.gem 36864 BLAKE2B c6babf7125c20d7ed646930b7df39db864d0d46fd89d743daab73ba35254650ec0b4c7e203c5d5a2b00439d928b95508c1a82107db142f8cd77d27a14be00e7f SHA512 50e0fed5a3ea6a62f8620db3d30046a7a4cc602d9d7936a265d0c20a50eb267ecebb2c7d3bb07f3a514f70e556dad78085971bb80f94e1f4baf7048d6fd34c11
 EBUILD will_paginate-3.1.6.ebuild 681 BLAKE2B 3d5417cab8dc2379621df378a0e767ef5a0e9e2f5aef78ac17496d8cf7c313c4693072c66ff36745576acdef5b21ad504a714959da090383c4711ab80599369a SHA512 606e40042db68a5b7d22d96e85d38caf8684b56f4a3cfd3b9a3d04f7568d946b826bd80bddfa10e048e5b49bd9b1f996ed891f93b3687db8f6c4cb2d075ff8ad
 MISC metadata.xml 346 BLAKE2B 859514393fc9d9ac988a812dbb5fc126a269616351c6d8fc32c6ec0f25d685c835f4c1d27ce818807bb330fdc50839b81e6f63d0eb4d77d8f6a95f2da3d849af SHA512 2e061bf277b39327fb84988df2dd9cf548c87dc0bdc51e63b47aeb816c099a4a7fa5b95fc1f3ba35e15c7499d897770397c6f6f2f4d3c1b03733f16f1d0556d3
diff --git a/dev-ruby/will_paginate/will_paginate-3.1.5.ebuild b/dev-ruby/will_paginate/will_paginate-3.1.5.ebuild
deleted file mode 100644
index d66149d9a435..000000000000
--- a/dev-ruby/will_paginate/will_paginate-3.1.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Most awesome pagination solution for Ruby"
-HOMEPAGE="https://github.com/mislav/will_paginate/"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '1igem "rails", "<5"' spec/spec_helper.rb || die
-
-	# Remove tests for unpackaged ORMs
-	rm -f spec/finders/{sequel,mongoid,data_mapper}* || die
-}
-
-ruby_add_bdepend "
-	test? (
-		<dev-ruby/rails-5
-		dev-ruby/mocha
-	)"
diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index 1eb30ec13c16..6ed46e412221 100644
--- a/dev-ruby/yajl-ruby/Manifest
+++ b/dev-ruby/yajl-ruby/Manifest
@@ -1,7 +1,7 @@
 DIST yajl-ruby-1.1.0.gem 557056 SHA256 95b85940c96c0745e780f363170b8bd1b7b66d36073a061b1461b1788834446a SHA512 bde81b5fbe467c6403d27b49075822ff07b5cf356c05f711757fea5162543af36846f1f1da36acd5da359133f05e2cb3186215dc5597f3255da74c76cc8bf3ec WHIRLPOOL baa8f6ec2bfe70cd8f3441c971b2854a99b9f132eb2cae22f9fe6a9de7c7ccbf84f0f3ec982296d4cbc998051529b464aaf16b268049193aa4170ec7ec1ca11b
-DIST yajl-ruby-1.3.0.gem 550912 SHA256 f1941b3606aa8da0800ab0a5560929454a1ba9c7ec41cb5a2905eabb2f155069 SHA512 351e46fb7037541096172bac5c3dcadaa6ac9650ac6aae46de2b4ba31b82427f596bade2b233d0d8e916927800e83b7930b5ceeb9d7340edd02c323f9c0b3116 WHIRLPOOL 8de8b6575f3972dbb2503315d33f5701f6141b0ce11f9f3b027a7c15ab257823e772d14400dc3db94b41135e90b25c89a89931fb2670a7e0de72a0ee40d885dc
+DIST yajl-ruby-1.3.0.gem 550912 BLAKE2B 1fe5fd43809fec2bf06d8db14cb6cc6ac5fe59dea8afc12d4c8ca6d0ba7c1095f307575c86cdd6954ce0b5756de3fc2232fbd60398bdf1902da005c6d8242031 SHA512 351e46fb7037541096172bac5c3dcadaa6ac9650ac6aae46de2b4ba31b82427f596bade2b233d0d8e916927800e83b7930b5ceeb9d7340edd02c323f9c0b3116
 DIST yajl-ruby-1.3.1.gem 550912 SHA256 60bc04e0e58ce689a4f37787ba152b037a960da48f8b229a072929e8129bc4e6 SHA512 f18b47f1fd0b039bfec01db0ee298296199fbf91b22a00042e1220a1d8471f72424c082b696829e48ce7dee7514510dd731c2bc36fe29bd08ba7246c820621f4 WHIRLPOOL 369462f5104b826f9160215a06050bdc53f61ef937a8461d8e1a11b62d68267fec3a0cae087cf4be6f161e76d1b92c077f9d861c3ce027927308bbb6afab2709
 EBUILD yajl-ruby-1.1.0-r1.ebuild 926 BLAKE2B 659db38ba63a87cc0eadf75c49e818717f3de2a7767ca35fcc75a31ce519284a5127557a341814eee87780fe6df95b6cded29a110b8e4e1be2d071da5681beae SHA512 53665219df16267cbf79029858e425226d0872484a11d9178ea3eb6698e236f3d70634e4301416687f9cdee4f555be8df1df0be4866f70d9b4da3edec9e73dfe
-EBUILD yajl-ruby-1.3.0.ebuild 1233 BLAKE2B d2a694ea504fb9028821764a7be6b7b430e8693bbd97429cec517803277cf32f0b0e2fd17829caa824eda4627175b1e88e6e104e7f08977161c3290224f19a2b SHA512 4c9e184373b0b33618020c6ac9722ae37c69b39628f83b99d9b2803784b5f706ca14a810e8fecf20b86b1b3e0df4d2b4edcf81bb552dc91a9f56c27446176368
+EBUILD yajl-ruby-1.3.0.ebuild 1232 BLAKE2B 07cb4225f0f003fcf464a7cbd5b2fdad7d58fd10cf132861274e5da54b8632426b3f78c5f7f47d3160f47d27fcef947ab8f628316587ef3d154eb695321d9443 SHA512 a7f8e2e70de898d7ef858226a05d1217d2ba15a4b9285aac8b7f1482a5b61a454172ba9ba8bd78fca6da41875674cd530b31a46b33647486a9ff334f5ba177e6
 EBUILD yajl-ruby-1.3.1.ebuild 1239 BLAKE2B 73ac727e72bbbe17d3131c37794c1cabd0330417b96b616432b8b9e7364c15bfd402d2d9db93511771719ceb30db9cbea64164b5b395b828a5349df219329386 SHA512 ae4041c9c58da6853b328c60607442c28bf47cfd425cdf9040abf7077afed7b9bf84f217eccf9dda56f52c630299cae741712d15a865be040fa152255f085ccc
 MISC metadata.xml 346 BLAKE2B 2fff8cc633fbc47874a3e5a9e567ef430dcdd4de90343c35f599b15a85e0601a5d4b3c5b650e3971dab90cd90f382505000b40092e57d05fdaf86536a02106ff SHA512 54921a3e3df293d819d020aa6671e7e33f9031b83d375d6f8423fd844cf757c20c2e6cafc9d5a8f2670e10bd286b4e29067a8d7176e7acafd3474578134a2aae
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild
index 1ced589e5871..ea763d40e30b 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/yajl-ruby"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${RDEPEND} dev-libs/yajl"
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index 3055c2b4159e..397a471f2c01 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,7 +1,7 @@
 DIST yard-0.9.11-git.tgz 916355 BLAKE2B e9f27fe129cf93c51dbf83f4a7d5745d385252ba63c90f85223f2e9436c22a55aaba296f263072069d39e4beaca3e0830775a8be121c64cdc2a15afd3539a73f SHA512 375a4878e61888cf73aaa06e9300195ae48b9898d8cd639fa796a067e5fa0b89d6ef62d327a388ee83953e80177515f4d8c070042188e3a1e597f48b82b3a72e
 DIST yard-0.9.12-git.tgz 916462 BLAKE2B 905f0e4408f7829ca599b578344d695e4c7b68d46b982f39277dcd69ee726a9ac283910e1031d635917b149f182fb302cae537ff8a8a81960fa27965fda82a0c SHA512 f987da7e46bb3dafb9ba8c761b51345ee67102e21d05181c3090f31ff37179505134c93e83efdd39bb35cf6fe6dfa530d0017ce4680a08f858e78cbb073b239f
 DIST yard-0.9.4-git.tgz 884608 BLAKE2B 9d17d7cdfa0432d769026f6bc12354be236b5d07d65bc510bfd6bdd5add12d87f77808832f9f011d327f13b495d499e395c232a3d77c7e779dd0ed40a676d911 SHA512 2255c56498dc147ee5ede5e4898ce7aad78e9350f317e5d5c942f6b12262e9e1d0893ffd985a6bf3822d6af902e8ff555c489e1d847049ba51a472ad3c4aa140
-EBUILD yard-0.9.11.ebuild 1284 BLAKE2B 5b869a98eff3294da80c4c5ee924f522228e5faf6795990d93d2ee0e19a1dea102ab446a2106314438b82592750f2465640b92ba1fde04693f36ba0eeadf3e7e SHA512 f679151717bee34c7cafdfb0e1aea9466f01cebd861936bdc7af823baa7d66a3bce23e843269364debcf72e1313afa44629e92e36f5d29315978667aff531f80
+EBUILD yard-0.9.11.ebuild 1290 BLAKE2B f1556a637a29a1680a77ba97ecff0bb76191af00dd42d460f7e995a9d0821dffd9840b6be93e0fd5ef4d55a75707c6c208aca5e813ce3c74f16ec4d8dbcc4e17 SHA512 8d86bafbdfe86101fa0fc0afa022090bf3218d18589db06be5d818cb1138a6eb267d565a873ebd38176733d13b84290247e3edbf22a8b6441c9c056c6d24d263
 EBUILD yard-0.9.12.ebuild 1285 BLAKE2B 73feeb381e397653ebd2361ca4e4d3c1f7d056fc73059a691f7c166d8b7c8517d1c5fae67fed15646757460e9cc4984bb977fb06de93125b887bc8b3a96ad5ce SHA512 11950cd03ff8d582b6c8ea0ca82276ae35f4af83c1302d7c7f9fbfec9f240a3be4e92c23a39910d498473efc68b2916d77a1d3ff3fb932a00ec876991ffa7ae0
 EBUILD yard-0.9.4.ebuild 1316 BLAKE2B c1f9b2e880648300b34516c4a3ae7f63a51dcfb245be4237be7c4ec582a276f333231d79d50b5720c332d5d0c31f06ed3e4ae40c7c7fc700c3401788a5c26ed1 SHA512 999695d04608dd86062574814e1c02ddbf5c1a6ce3727c3da3c1137805e05a28c0b373f6c3eae13b94f398c99ac67978ae2f82a5d65550d27712755ffa0e14eb
 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 c0938bb672dd..32690da711f6 100644
--- a/dev-ruby/yard/yard-0.9.11.ebuild
+++ b/dev-ruby/yard/yard-0.9.11.ebuild
@@ -23,7 +23,7 @@ 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 ~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 ) )"
diff --git a/dev-ruby/zentest/Manifest b/dev-ruby/zentest/Manifest
index 5259495503d2..bb2a54e2528d 100644
--- a/dev-ruby/zentest/Manifest
+++ b/dev-ruby/zentest/Manifest
@@ -1,5 +1,5 @@
-DIST ZenTest-4.11.0.gem 71680 SHA256 c81b515c0a620379877edad823aad8e155700166e6a7f6e441e7b1c5729fa05e SHA512 cb835ea2e937b7ea56084c138948acb1c2a96500e5b8bd54dd9d195e4005ebdce67b189cdf31a010135f55adb02f3bcf21ff663a26022eb759dd2126558c5c21 WHIRLPOOL f6d827937a33a448d9cfc530b3da235e3694256c55bf57242f440f3aab427ad249ef2fc1e58b4dd5a80a29ccb7b8e359b5a2e1989a631da090461e745e67e52e
-DIST ZenTest-4.11.1.gem 71680 SHA256 a5b5c2e457d05cee95f4fc50d5c133421c3a2697683cba33882e604242632077 SHA512 6f3b5dfb8cc8154856e94f20134e9a6bd2d54e052d05d3e7a250f831ee0a3d3196b497cf118322c51201fb8dd30a05b8a0a0462c58a8852354c4dee2a10d867b WHIRLPOOL c677e0cf0ecfa0d28a1cacce5a84b65016f06662f7256337ab1d9e0f6880f17db5d8018f4567021b53bc7d356d7a2a7d32579bfe63ba0ba6653c29d22fb7fedb
-EBUILD zentest-4.11.0.ebuild 970 BLAKE2B 96f8ddf495e87c3f97201b673e9fadcef357bbb235a2773a08f0be4136b255dd1e44b72be86559a3bed9de87cd58be2cae2b18bf7ed28f0209428236f027e03f SHA512 501bc676e7e2e4ea19b80980f76cf20c69ea9a2156e9ed354f69af8f262021a06c0f3c4d9bf468e530f24717e8bdccf33670869abdf32744250699741e8fbd27
+DIST ZenTest-4.11.0.gem 71680 BLAKE2B ae2d72ce5ff899dab0905eb7ed1bca0cf2158ec5044254cd7ebb86c59feb746bf18e6a0242f91c49803a062c5d94f5b1b0be4338cadef2a5afd116753259f51b SHA512 cb835ea2e937b7ea56084c138948acb1c2a96500e5b8bd54dd9d195e4005ebdce67b189cdf31a010135f55adb02f3bcf21ff663a26022eb759dd2126558c5c21
+DIST ZenTest-4.11.1.gem 71680 BLAKE2B 27bd94ca98a6739829526c06689ee5a890aa254bef3cb7b7b02d79d82a4fa96faa1853d36069aa801983b4927d44b2af2c852c111ece3b64459c99d63a7a072d SHA512 6f3b5dfb8cc8154856e94f20134e9a6bd2d54e052d05d3e7a250f831ee0a3d3196b497cf118322c51201fb8dd30a05b8a0a0462c58a8852354c4dee2a10d867b
+EBUILD zentest-4.11.0.ebuild 969 BLAKE2B 72c54b3845891c3bd8873fd3bad177c074972b9f8faa37c735cfa62d5a5b29736379e24a686927f3d363724c5df575d2164406b70f067828a4e03b5bb741e4ac SHA512 e0ccf05566fb8329d88e540ed4a6fbf34828d8c7c3108cae3e92dd21ea209349c149585973568e32b038c90247f3cb547e3fad42f38809b702ebc583eab5ec0e
 EBUILD zentest-4.11.1.ebuild 986 BLAKE2B 284b3f0fbcfa42703b0b62da0ab9d7fdfa2e33513b721b4d6710eed7b164a8ebc3983225201820eabf3050d4e0f004ddff236ffc3ef13197c39c9a7434f15d4e SHA512 3e998207df4f16b8593b16fa23840f6d7d1d081a855157127b245899e013b9665286d17f47efce7231c9613d998d9bd8c95160563ab2195cd7a912995a73721b
 MISC metadata.xml 333 BLAKE2B cf1ac3fbb6994dc96110bdb974b726f53fdfe34db473f272ba78ede47b65e26350b807bf291c65f8a8bcf9e12fc3366e431ca32a277d9ac38cf9d4ed7ea46e62 SHA512 d02fdcc6c8ef63d22d0df77a6c7c82ac1d629d29685e6fc653c70079d56fb1b28574bfc7c372a5298dd4a3e20061aecc705d6824c569ce0f99e3dea464f04fcb
diff --git a/dev-ruby/zentest/zentest-4.11.0.ebuild b/dev-ruby/zentest/zentest-4.11.0.ebuild
index eb29305c54b0..279b41748806 100644
--- a/dev-ruby/zentest/zentest-4.11.0.ebuild
+++ b/dev-ruby/zentest/zentest-4.11.0.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::R
 HOMEPAGE="https://github.com/seattlerb/zentest"
 LICENSE="Ruby"
 
-KEYWORDS="alpha amd64 arm 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 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
author	V3n3RiX <venerix@redcorelinux.org>	2017-12-09 09:14:02 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-12-09 09:14:02 +0000
commit	b9ef7cab6264f1838672efbbcb4ba3b3abd5323f (patch)
tree	38e677f4a13244ca8ed29a815a0a62f943b430d4 /dev-ruby
parent	d37b97a25b8b10f748eead6574b01f893f140b01 (diff)