gentoo resync : 24.02.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-02-24 19:58:07 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-02-24 19:58:07 +0000
commit: 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (patch)
tree: da76713365257a445f3ae3b95470917f59d46728 /dev-ruby
parent: 4935506e9a5cbfabd37c64093eac5f36c2ff0017 (diff)
157 files changed, 863 insertions, 1334 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index c7abdd0b443a..93d8a6f12f9f 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index 844af7db4c44..08571117fe7d 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -3,9 +3,11 @@ DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651d
 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
+DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 EBUILD actioncable-5.0.6.ebuild 941 BLAKE2B 76bbd65b75a57abeb351ab20ae1f1ee0a5481a4a4e9efcb98c279d8ef85914f5596fb22bf2835ce55522de0e96db4849be7c3c58da1d77d48cca7af9160aa909 SHA512 2e5d199f6e444f35796a84027e701601abe5d9d4c70ed712b01e59303a6d7f679b0f9dd3e9e64bcf2fff18ef5fae980edf458288cf5fffc9ede53a4d387b5be3
 EBUILD actioncable-5.1.1.ebuild 981 BLAKE2B dd908463932d01c3df29a302467f7b9ff6217ded16bfb0557618805d09ed842daee049775b63bec84566b6d5070e40c41439b881433a2094db05780a509050ae SHA512 a870ba042522b7d4f5e88c41dc6d92d9bff54f983d109fe3e03c186ec0fae0418fa59c3b6c56f17617227ac89face6adb46f677a3bd82a526c771011905b9241
 EBUILD actioncable-5.1.2.ebuild 988 BLAKE2B 4ee488547a301721103e24230e59f1b1b379ffbc9ca7056996f9037aeff48f475356c4980b59cc689814a46143bf94cdaf8ffa9535ca9fd3c78fac0c74e3dcdb SHA512 a67eefde750c952534996e0853b1d2d6fb93d2f729eb416396d68a8fae89ae88c6ec00104cb71fd2eb73e83d391477044eaa9ecec9afc2ef6874303ae2ed0d71
 EBUILD actioncable-5.1.3.ebuild 988 BLAKE2B 4ee488547a301721103e24230e59f1b1b379ffbc9ca7056996f9037aeff48f475356c4980b59cc689814a46143bf94cdaf8ffa9535ca9fd3c78fac0c74e3dcdb SHA512 a67eefde750c952534996e0853b1d2d6fb93d2f729eb416396d68a8fae89ae88c6ec00104cb71fd2eb73e83d391477044eaa9ecec9afc2ef6874303ae2ed0d71
 EBUILD actioncable-5.1.4.ebuild 988 BLAKE2B 4ee488547a301721103e24230e59f1b1b379ffbc9ca7056996f9037aeff48f475356c4980b59cc689814a46143bf94cdaf8ffa9535ca9fd3c78fac0c74e3dcdb SHA512 a67eefde750c952534996e0853b1d2d6fb93d2f729eb416396d68a8fae89ae88c6ec00104cb71fd2eb73e83d391477044eaa9ecec9afc2ef6874303ae2ed0d71
+EBUILD actioncable-5.1.5.ebuild 988 BLAKE2B 4ee488547a301721103e24230e59f1b1b379ffbc9ca7056996f9037aeff48f475356c4980b59cc689814a46143bf94cdaf8ffa9535ca9fd3c78fac0c74e3dcdb SHA512 a67eefde750c952534996e0853b1d2d6fb93d2f729eb416396d68a8fae89ae88c6ec00104cb71fd2eb73e83d391477044eaa9ecec9afc2ef6874303ae2ed0d71
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actioncable/actioncable-5.1.5.ebuild b/dev-ruby/actioncable/actioncable-5.1.5.ebuild
new file mode 100644
index 000000000000..611bac0920fd
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-5.1.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Integrated WebSockets for Rails"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# Tests require many new dependencies, skipping for now
+RESTRICT="test"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	dev-ruby/nio4r:2
+	>=dev-ruby/websocket-driver-0.6.1:0 =dev-ruby/websocket-driver-0.6*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+	)"
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 4b57e0c72399..7f9d14a80f30 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -4,10 +4,12 @@ DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651d
 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
+DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 EBUILD actionmailer-4.2.10.ebuild 1617 BLAKE2B 6a068ae6a7e30dc952d09396ce8d902eb8197281f4c10c238319727538bc7ae1a4f5b5b8088223dd084b72efa32d2e0c07cc43af3d50a372181d04c63a1770ed SHA512 e2072bdc79095d08934973725bd35b0cef0ae584a18cb7c09bdc4cd65d0e008610d0a16ed1571387b952a8c09b8236ec3d7eff3ec7a926434b9c98ecaa5c6604
 EBUILD actionmailer-5.0.6.ebuild 1335 BLAKE2B 214da356148bbedbc6a3eb5f33916c48b2f46787bfc05cedaec48efb922f229ee5e71f6a1a0b936b9b1f88600966dc88458cea03d9697a4c5ef543a4f1c99fcc SHA512 0991d793ed6896eadbe98ec2181e5070c2d189720313c97367f79bf3adaf27c5dbc83fb2cd405330e4952aa078d1ac0e8c6fda5cb03c349ee66a0bb4a844b6eb
 EBUILD actionmailer-5.1.1.ebuild 1301 BLAKE2B 3850e82dc6cabc8d9aac3bf33d520de346267f91c2d39aa5e269c28c74c3db6924fcc5ee549f88351852c33f924fc362d3c971d4903dd9f7848600ef0e84a765 SHA512 20ddfb35b637f9b692a63f16fb1b0e660506cf4183b8c9c6bded3b7216a7830b17abf4bddfe8d9f272e5a737408cb23d42ff7abe05351439a68b22fadcb7169b
 EBUILD actionmailer-5.1.2.ebuild 1303 BLAKE2B a34fdb937e9ee1d148e758e0842320edf767978dae4370d5ec52e0c886675cd766b3bf68dfe118412643168edadd9c3ac4f838276c71dc7c110f8a4e497963df SHA512 1a75ba1160fbc98c786823e5c86166a316aa810f48f199a768b294b87b28676d56d6d78136d2f60e6e7f0f580fbab383f30a9c166e9ee2f910a3013aea88fbe8
 EBUILD actionmailer-5.1.3.ebuild 1303 BLAKE2B a34fdb937e9ee1d148e758e0842320edf767978dae4370d5ec52e0c886675cd766b3bf68dfe118412643168edadd9c3ac4f838276c71dc7c110f8a4e497963df SHA512 1a75ba1160fbc98c786823e5c86166a316aa810f48f199a768b294b87b28676d56d6d78136d2f60e6e7f0f580fbab383f30a9c166e9ee2f910a3013aea88fbe8
 EBUILD actionmailer-5.1.4.ebuild 1310 BLAKE2B bc8b2a8fcb383d2aa94c3775d9a78c7ac9f642c39da640b74e59c52390d465a4424d1e121481dc226377ebb3c6567377d9ca63bd4a531800275fcae984460a73 SHA512 e6382888f238e76be44f77c772350c9bcebbc508ec33bd131cbeb6f0ae2fcbb2a8c9792ef0864855c6e11c53155934a89117bf207e50ae033dd769b9518f9c29
+EBUILD actionmailer-5.1.5.ebuild 1310 BLAKE2B bc8b2a8fcb383d2aa94c3775d9a78c7ac9f642c39da640b74e59c52390d465a4424d1e121481dc226377ebb3c6567377d9ca63bd4a531800275fcae984460a73 SHA512 e6382888f238e76be44f77c772350c9bcebbc508ec33bd131cbeb6f0ae2fcbb2a8c9792ef0864855c6e11c53155934a89117bf207e50ae033dd769b9518f9c29
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailer/actionmailer-5.1.5.ebuild b/dev-ruby/actionmailer/actionmailer-5.1.5.ebuild
new file mode 100644
index 000000000000..8057fda40e78
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-5.1.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~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:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha:0.14
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# 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 3cd25f0d7523..3c6353201aad 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -4,10 +4,12 @@ DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651d
 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
+DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 EBUILD actionpack-4.2.10.ebuild 1802 BLAKE2B bc9cf671ae32b5541e67a793a4ed9ddc6feb397bd60122eaeb4455375f652df0d86a6fea3f7315c04a7e3d9c8b84fb94a74fd7dabfc0de569be02047a4b39a5b SHA512 a4ef0c1dcd050688b3ec8419b991a0f93f17a4e6cf3f2152d4e052c5311c306343ce01216a444175b4f4acae24ff9916948fe17a047eac795862d89d1a4a2760
 EBUILD actionpack-5.0.6.ebuild 2089 BLAKE2B 645b07ee258110c830a546239069783c81200cdc1b8f99dcbbeadff07d3dc0f5ef7e82dc24ac264b3c8259e952f65408a039df87be4bb0791fe0c1d4dcfaef62 SHA512 238ac61cac0930c6db145e7509eece8fb59eb5d01acb8c516a82fc4babf8d7d55f9fe1b92b75f0ad3512db022c400e4cd8ddf3cd9c75a1fb93c2cc67b0e19458
 EBUILD actionpack-5.1.1.ebuild 1965 BLAKE2B 20544d76a0d62bd39267dd8c76c11282640a4f782d1a006bda0f92a68770016731a007e2d47dac05ae12578b06f70880351a9341e7deb4f6e4c8f400c010b2b6 SHA512 fed8e87f9c8c5442cad91e1e783aa2a4729894f5ddaeb7dc6ff30d4fede84730862cff52c20b0c51950afeff4a01f0d820f3b5cba70172f1bdbddcb127441f4a
 EBUILD actionpack-5.1.2.ebuild 2015 BLAKE2B b4ac41fecb9b690c80935f3c0376a305dfb14704656c9eb7407dd2b96034530239e124aa9b87ea0b5fba4753be61c178a65aade65d739041af00f49e197a6ac4 SHA512 2ee7193e5f467ac03879fd6da99d243fdfbf6a701e6e62cc570efc80b60df6c669240011b1587578d3719684c15dedf7db367b07abaa19a36e02cff88b97023b
 EBUILD actionpack-5.1.3.ebuild 1653 BLAKE2B fcdeff741194b78b697314a336e896c02a02f24a1c09ecbd5314a014a45792b520848ed780e14769a551dcfa7df74d912bde4c16b6f56f747d2d48fb0ff18005 SHA512 98e951f65fe651e01a038ef3ad95bf69b1e3a29456ca495305f790919cfb999cf9f6704e5a68f9d7cc36e724315b72083151898509b29e074236c0b310af3dca
 EBUILD actionpack-5.1.4.ebuild 1659 BLAKE2B 7dd7a82495c13290541583a4b6a2ee14674c6574207b920a653dd1460e149be0c5313a383f690eec2b166421302cd5187370469e7c08e6bc330673429f4c862d SHA512 f7b59bcfef2ffe7a088148db9c7d6cdcc8e825074ec5010001a1262e09870cd01828c758960f642a3ad7e9cc05938fde4d4f67f02e3100e9e06a29d24cc3caf3
+EBUILD actionpack-5.1.5.ebuild 1660 BLAKE2B 6ab689fae2d6afa3df97ea6527ecea2d77cee544fd6d964ef663e9bf1e55da328d8a92ad10fd4c312340e137cb8921ebdded5d0a8ddbe373f57998fc4c96ffeb SHA512 a71dc69fa759d20758dae54e04291913bb29185c85fbaeecd0029454b2ec84e48728ed4130b46f69542cc7c1e3840274710538ce7ff4c5fc94cc7ddae40d61df
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionpack/actionpack-5.1.5.ebuild b/dev-ruby/actionpack/actionpack-5.1.5.ebuild
new file mode 100644
index 000000000000..a47a30544f1b
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-5.1.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionview-${PV}
+	dev-ruby/rack:2.0
+	>=dev-ruby/rack-test-0.6.3:0.6
+	>=dev-ruby/rails-html-sanitizer-1.0.2:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		dev-ruby/bundler
+		>=dev-ruby/capybara-2.13:2
+		~dev-ruby/activemodel-${PV}
+		>=dev-ruby/rack-cache-1.2:1.2
+		www-servers/puma
+	)"
+
+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\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+	sed -i -e '1igem "rack-test", "~>0.6.3"' test/abstract_unit.rb || die
+}
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 6c5b1f538842..8b038d6fa7fe 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -4,10 +4,12 @@ DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651d
 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
+DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 EBUILD actionview-4.2.10.ebuild 1529 BLAKE2B 863864f765f73f02f20ae965d60eeda83457afb4a76b2f52e5f5028a4b3826b2e5594028ea9c59cc5b8cbc93fee75c44183a7a670c3c7ab9826e07c92159ca9e SHA512 788342b31b877a59cb6545405d8b9cc2827abfc68a2a6cbc2a823701108d9e8e2e3593fac4a17288530a48d48d77395ae83e21552f236e9939d4a49e726db838
 EBUILD actionview-5.0.6.ebuild 1833 BLAKE2B cbe6da45b593907d4d526e7d250e854f43819dcb36e283e2be314d5229e091da04d646c57b4efca9a917311f9391cec1c24b4f332b4565802fcf9bad5fdb762b SHA512 1c7c84730582b790914dbda83ae0b2fbd949fdfb7b16506fee5047b01c1f3b07bb724211d83b4ec13755aa4b2aeccf1b6d79572803b368c2176c81f170d526f1
 EBUILD actionview-5.1.1.ebuild 1737 BLAKE2B 91cb80ffe615ac1473afce97b9a0c4526ef42ec202a70c24d1718b60c5d8e5bbdfa3edf2aecde464a18ba1a5150a8986f39799070d29e2a4bcad9ac2642bdb14 SHA512 e34c62fd1319862bfb402f5d0778cce7f42df0d17dcd581b3013a3a6a6070209d5af2829970bfe496479dc4c189f4f27e6b851e49a7974ed92feb970e5a45802
 EBUILD actionview-5.1.2.ebuild 1739 BLAKE2B 9f12caef3bae5dc4b41cde564927352a1495f200050ddf5b15330b44e4419bb544ebe8d83f490c6293d611fe8e779de7ff1f0330e3422660184c5a02005f60df SHA512 56bc70e425cf3ed8c555b0f1e6cfa0f194440df78c270452f1953855bf07fe09060d1382bbc8a78db8185c4ebf702e08f4cc92d183615ee2a5eaa8c2ba4f2819
 EBUILD actionview-5.1.3.ebuild 1739 BLAKE2B 9f12caef3bae5dc4b41cde564927352a1495f200050ddf5b15330b44e4419bb544ebe8d83f490c6293d611fe8e779de7ff1f0330e3422660184c5a02005f60df SHA512 56bc70e425cf3ed8c555b0f1e6cfa0f194440df78c270452f1953855bf07fe09060d1382bbc8a78db8185c4ebf702e08f4cc92d183615ee2a5eaa8c2ba4f2819
 EBUILD actionview-5.1.4.ebuild 1745 BLAKE2B 7181b97fb7d626b63885ff3772a2e593faad62803cd83bda7e3c77ca6eee5b5a78e86e66491a50db63f7e77fa628063181833f1242540384e6bf91b5a85f3760 SHA512 4f1ca738c78fdabb0f8b8434319a5bf7edc383f09c76ce3ddc8ffe39eb1f67c7c681a044dc8d5936e1c88f44e62c18473818e73ec41bff37dcccb375322a45e6
+EBUILD actionview-5.1.5.ebuild 1746 BLAKE2B 4d5cc6994f75e590626261f800820cd435ab71460b63265c22b20ba28f7553b14886debaebdc1e9b0720a652982ffbeef187be50f7f21d608c3a975afceb1009 SHA512 ca6a94c9014e007da121ad384f93ccbb9cfbf5d5ebae9e9c7c173e67258a6320fa4cfd9c89651fe78a453cb16d40686f5435609fc72ae54f0d73d97e2451af04
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionview/actionview-5.1.5.ebuild b/dev-ruby/actionview/actionview-5.1.5.ebuild
new file mode 100644
index 000000000000..da44ca0a64dc
--- /dev/null
+++ b/dev-ruby/actionview/actionview-5.1.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~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/erubi-1.4:0
+	>=dev-ruby/rails-html-sanitizer-1.0.3:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		~dev-ruby/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
+
+	# Avoid tests failing due to missing logger setup in activerecord,
+	# most likely related to test environment setup.
+	rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
+}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index b7b3decaaa0f..4e0349eb3fd9 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -4,10 +4,12 @@ DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651d
 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
+DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 EBUILD activejob-4.2.10.ebuild 1074 BLAKE2B 3322a54f249eaae68f1886b1a699ad8e0b6e3cb191aad9a4ddce7d3d21a0fa77bf3ea6f43b00fdeb3b131a888f5b11a20060084dc01e7b1d358776917de5d0d8 SHA512 ea15ae864763a439a8c3db85e6c316d19d70cc913b147883b42cb164404dffee1eafc460e0d98bea3f3484207367e5c7d246160d0252ccfe5cf74aec4af9a49a
 EBUILD activejob-5.0.6.ebuild 1053 BLAKE2B 8237e3dee9b404ebf3a188920e2b9c7459265e9dbc5d7902eafb5787f486a27c1ed78e4aba80c89d2c6aac421938ea6b29c49ce3c8cda20c3903422d38eeaccc SHA512 bc28806ed3f526fd0ae936fcdfd51614f97caa7fb2ca8da9a0635664d87f7d3a062f9c2e7b008ce20e9c8e6771e1019d3dfac958ecb30c30e582ca8c1ce6ba9e
 EBUILD activejob-5.1.1.ebuild 1082 BLAKE2B aafcfbfb76b51bec48ebc66d35e974d3ec7b32a0291a334df7e657dfdaaeeccc0b383234db6d0a48a1a050ae34513eebbef8d61c0188b482c3cee6f69a184335 SHA512 bea1ef04a9e4f5fa1d53efc83d25c509e7b015c223ec3b2f14fadbb6c6dfb1b6556ce41692753dfc8198ce4ce6536d35c3069aa8d84db56b39a87b4077375c44
 EBUILD activejob-5.1.2.ebuild 1084 BLAKE2B 1b8e8aaa09c12acca24ab3edd27e136302c00110a1c2ae1d932dc9a3d8c56b768a6d9f39c0ebe742e2fd03625ba4c29d86a649151e777dcda93a6f898ee3f4b9 SHA512 e76263e72f0e05b2c70d1123ee574c9b827cd30be5bcebc986235a3937b42a4aa4c1023ebac7c1248bf42bf10432965db1007b5f07b4eee0a068d02096572589
 EBUILD activejob-5.1.3.ebuild 1084 BLAKE2B 1b8e8aaa09c12acca24ab3edd27e136302c00110a1c2ae1d932dc9a3d8c56b768a6d9f39c0ebe742e2fd03625ba4c29d86a649151e777dcda93a6f898ee3f4b9 SHA512 e76263e72f0e05b2c70d1123ee574c9b827cd30be5bcebc986235a3937b42a4aa4c1023ebac7c1248bf42bf10432965db1007b5f07b4eee0a068d02096572589
 EBUILD activejob-5.1.4.ebuild 1091 BLAKE2B 1ed3e23f6d860c5c0e5c94c1e1b07c826fadf78732306d82e0f7060219b2e1189ea1a4d61f572a180012fb28bc80fa511f66fb8221188e484321af53548597ae SHA512 27ed5e642b310ef3903eeb1b6b1a345bf223c46cddf7769d626fe7ac01cac368c8139483e835712ffd7ada4c74216ba6978927feef05ffd15c65e3085caa10d5
+EBUILD activejob-5.1.5.ebuild 1091 BLAKE2B 1ed3e23f6d860c5c0e5c94c1e1b07c826fadf78732306d82e0f7060219b2e1189ea1a4d61f572a180012fb28bc80fa511f66fb8221188e484321af53548597ae SHA512 27ed5e642b310ef3903eeb1b6b1a345bf223c46cddf7769d626fe7ac01cac368c8139483e835712ffd7ada4c74216ba6978927feef05ffd15c65e3085caa10d5
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activejob/activejob-5.1.5.ebuild b/dev-ruby/activejob/activejob-5.1.5.ebuild
new file mode 100644
index 000000000000..c101a50ae529
--- /dev/null
+++ b/dev-ruby/activejob/activejob-5.1.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+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 ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.3.6
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/mocha-0.14.0:0.14
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
+
+	# Remove all currently unpackaged queues.
+	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' Rakefile || die
+}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 98b6a1ddb191..5ff87c8743df 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -4,10 +4,12 @@ DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651d
 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
+DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 EBUILD activemodel-4.2.10.ebuild 1488 BLAKE2B f6adebca7b124a86885bb130aecce02ec82804120267cfaa140ab86d885396ee45a6267675de625ae432294538a4998b0c54dffd2e87e66dc21a79f9a38d773a SHA512 a639ccdd7482408292bdad286ee4424582116ad02050545923c403ba496738042d499f88f3e86217d035603f8f6e12728cb93e37f8072f3266037a4b18bf1082
 EBUILD activemodel-5.0.6.ebuild 1043 BLAKE2B 4fa29652603ca43e5dc4a63f6b7537f3a690a2eff56090720cb5412fe84931f4972645848a030b7f3d5bb76ed20e9fcf1cb148a85fc55f5e0fbf6a0b55acbf12 SHA512 3566ebb42a4a40d614346320205924e6bc3e990964ae4d108fe61a2fac673610ff55ef78b0ca23c540ebe38cf4baaec932152539c8e62600c60ddccab034957a
 EBUILD activemodel-5.1.1.ebuild 1053 BLAKE2B 4850423952a0d414050c9d7643e547c5684d07fc38fdf9fe5cfd727f9bd605f25f7ac11fd054fb28cb4cc009c4767723621c9ff2226f950264afe47ea2a2ad14 SHA512 6ddb727e171628c3712f80f8fc250c16a1b8cee51730efad1a2a1d541871899bcd3591e6d7b7bb0a9539f2e2324512e734be2cbe609ad1d10b4df08eaa37a9dc
 EBUILD activemodel-5.1.2.ebuild 1055 BLAKE2B 02beb0f6cd6d32fccd9cd43bf0c4738c6adb63f8469cdbe5a48ef6360c858ab1e13db064065572a40292963dfff7f199fc030fc4c66e1eb67856dfbe63cc38c7 SHA512 a74e6a2c6d1347cb00dfd65705c90a98b4c4340bb49038c3246a3e4b128d2b949c5a9024b2c152358d79c986306abc8427e4175116c1c1c16dd3d5e532a94ef0
 EBUILD activemodel-5.1.3.ebuild 1055 BLAKE2B 02beb0f6cd6d32fccd9cd43bf0c4738c6adb63f8469cdbe5a48ef6360c858ab1e13db064065572a40292963dfff7f199fc030fc4c66e1eb67856dfbe63cc38c7 SHA512 a74e6a2c6d1347cb00dfd65705c90a98b4c4340bb49038c3246a3e4b128d2b949c5a9024b2c152358d79c986306abc8427e4175116c1c1c16dd3d5e532a94ef0
 EBUILD activemodel-5.1.4.ebuild 1061 BLAKE2B 780847963d026d7855f73b8d0719394d08e5c1e702721d70129dec773c0a3c3d1e04e25046da0637323c878b8e6b35d5eb500698891f104053c62953a1f16664 SHA512 ade0ee1e7b4a9b72f432297a091ba188c512f3dff7ec38967e348c711b86c180a310978198bc2801d2cb4d8b0f9b6a753c7ebfeb2f9786220c40370e94500eb8
+EBUILD activemodel-5.1.5.ebuild 1062 BLAKE2B afef5cbc0e55782dae8dabe8eee90054fb81c9a259184b0b1e0a65599115d905343a210ec22c4a47b0a20b885f975f39932f21cc04b496ac8317f2d3f42648d0 SHA512 ec3ef2176e071e820f4349e2e288c9c5e67b1d85974acc712366e5d68f9d3eed8c3e0ec09e0a1734475df7fa072cb0dd42097889cc801c5120dea1417d17d0b6
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activemodel/activemodel-5.1.5.ebuild b/dev-ruby/activemodel/activemodel-5.1.5.ebuild
new file mode 100644
index 000000000000..83eb60077ebd
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-5.1.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}:*
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+		>=dev-ruby/bcrypt-ruby-3.1.7
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index cb553abf07f5..173b43570b27 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -4,10 +4,12 @@ DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651d
 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
+DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 EBUILD activerecord-4.2.10.ebuild 2427 BLAKE2B 60c4378cb10f8775d3756057f0efe7ff94a6a274b26cd81f73c258ae9fe2228745c5b64db8619c90b88ec83e0c84ee3f3f89f52f326cb3c5d82fd40b4c12eef2 SHA512 a03d268178ec14375dfb2404dfa8fad63287f4c99d9cd3c0a09f4ea99b58cf83a0da94c55cb8ad55ebcc9755f877be18051ec9cddec1f184e3e98072158cd322
 EBUILD activerecord-5.0.6.ebuild 2726 BLAKE2B 5fe1a8fcb6f09bbb7df3d3b1e99868f72c8ae97ced3d54542f0aed80abc2bed430d69e543a0ac93fdc510bd63c0c0a3f6d9be82fb8b17ec12706dd5201637ed7 SHA512 79208fdb91653138d92dbfadc6522f40cd28e60c243eaea2f3d8133a12cc6fccc5163535b72a6145790964511ad19217f0c99b36dca5c54ce35e991f2893d7a8
 EBUILD activerecord-5.1.1.ebuild 2630 BLAKE2B 6ced56cdb0e790e43f5267b8c8d9fcd49870cabafd48f1ac3b5dd279c3c23113e38376e0b852bea0eb6622091af98c74df85792255eec0e4c9837e37b0aac141 SHA512 ba588e52482f10761db896c6d51bd833bbaacaaccc30820ecb8cf7930e7d9be68e28e3c5690905f8cabb6c47085da45e4c88fa2f7d7e360eb3e96f4ee5b9b7fa
 EBUILD activerecord-5.1.2.ebuild 2634 BLAKE2B 2c85ff752ddd59a33c78f69fb923d2f0b652ef8bc51010d3b1a21202da2789af729662f554d724945f9a9eac2a7a5454b17dc8b2ab41458d23811f767bef804a SHA512 e5123135e2e07d6ddf9e0c357b0964bd578aa927b9f5d123ce0f5ddc92d5faeacdd8f0f36d4019195c549dad62bbb4a388686609deb47c5685b5a2710cc3b94d
 EBUILD activerecord-5.1.3.ebuild 2634 BLAKE2B 2c85ff752ddd59a33c78f69fb923d2f0b652ef8bc51010d3b1a21202da2789af729662f554d724945f9a9eac2a7a5454b17dc8b2ab41458d23811f767bef804a SHA512 e5123135e2e07d6ddf9e0c357b0964bd578aa927b9f5d123ce0f5ddc92d5faeacdd8f0f36d4019195c549dad62bbb4a388686609deb47c5685b5a2710cc3b94d
 EBUILD activerecord-5.1.4.ebuild 2641 BLAKE2B ad7e5ba1e2d993f6351d64700644786e078768e8352cc9854a3e477970e1949d7cbcf4ab7a1ee4bee0d5f3184ba7c53d87d289302f91dd327b9516341bff5400 SHA512 db5ffde7d808eca0f5fc13d0a6761e98a3b8b726a624076004369a0d72dc020b953a3482f55157fd6e8ae38d8019bfb11859cddaab7a0c16385f2db0c29e0c9b
+EBUILD activerecord-5.1.5.ebuild 2641 BLAKE2B ad7e5ba1e2d993f6351d64700644786e078768e8352cc9854a3e477970e1949d7cbcf4ab7a1ee4bee0d5f3184ba7c53d87d289302f91dd327b9516341bff5400 SHA512 db5ffde7d808eca0f5fc13d0a6761e98a3b8b726a624076004369a0d72dc020b953a3482f55157fd6e8ae38d8019bfb11859cddaab7a0c16385f2db0c29e0c9b
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activerecord/activerecord-5.1.5.ebuild b/dev-ruby/activerecord/activerecord-5.1.5.ebuild
new file mode 100644
index 000000000000..67308bfbc8a0
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-5.1.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~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:8.0
+	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
+	mysql? ( || ( dev-ruby/mysql2:0.4 >=dev-ruby/mysql2-0.3.18:0.3 ) )
+	postgres? ( >=dev-ruby/pg-0.18.0 )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/actionmailer-${PV}
+		>=dev-ruby/sqlite3-1.3.6
+		dev-ruby/mocha:0.14
+		dev-ruby/minitest:5
+	)"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	rm ../Gemfile.lock || die
+	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	# Avoid test depending on mysql adapter which we don't support for
+	# this Rails version to simplify our dependencies.
+	rm test/cases/connection_specification/resolver_test.rb || die
+
+	# Avoid single test using mysql dependencies.
+	rm test/cases/invalid_connection_test.rb || die
+
+	# Avoid failing test that makes bad assumptions on database state.
+	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
+		test/cases/associations/has_many_associations_test.rb
+}
+
+each_ruby_test() {
+	if use sqlite; then
+		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+	fi
+}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 38ae1228bbcb..0f96143e32db 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -4,10 +4,12 @@ DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651d
 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
+DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 EBUILD activesupport-4.2.10.ebuild 2168 BLAKE2B 4bfe8e4d4d585733bbe6a0ab9618e5e79a04799eb699a11479b3036a123c030d1d2a99176ad5a463b6b218262f7df575506122fb36ccae504c890504374f97de SHA512 873c00a1090978e422509043f4f067c2478179db2c0bfb96d2afd9053754a89f015c4340785ed1efca3ff5e83992aeab6e72dface39c256e5b449238afe152a1
 EBUILD activesupport-5.0.6.ebuild 2555 BLAKE2B 544f10137c0b154e3f052be3a558b20aca91d488f92d0e7dbb0c616d279993ab181f58f58005f33052fbb68a7a22bc685da72d49a75452f01e4d5d92f8385fe3 SHA512 b94e09c3adb37edf5a05dea921e9a8981779a7ee1cb0ebcc5604d5125ee9a498b9b19fb34d8461c3fbe22f8aa35fe90d8b8515e082deabbde0228848e488b895
 EBUILD activesupport-5.1.1.ebuild 2202 BLAKE2B 77ef796d8afc9ca3d94f10a55dbaa74a55b20976b566396a4b5f91cdb09b898569b36bd9f8520c625254e5c9a12c27f53e2d3a586ec5bf0adc134dc4d40c0a35 SHA512 cf29ff2bc2ca3328e0c94c5ab6569b6effc4a17ce3e7f82e6455bdd1b605a8915a66f9e0c737cc00a1e0f86ac0676d300f580a5b6ddc73c492c21d8d22604c5e
 EBUILD activesupport-5.1.2.ebuild 2191 BLAKE2B 4fb1a3453486085397a1594d0d4f4ac798ca06af5e8ed0e0ddf42b5ddf399123f5500edbce036003f9521017816982ae13c749025be49d6016edfd619fb054ba SHA512 d9a7266b376550af3ef596a9d43ac759b89639a4a00a8d3b22bd6b36eac47bd6fff6a9ea43cc858f3323e67377938c8fd06230e95920cb0715f86cd61c7a7f67
 EBUILD activesupport-5.1.3.ebuild 2191 BLAKE2B 4fb1a3453486085397a1594d0d4f4ac798ca06af5e8ed0e0ddf42b5ddf399123f5500edbce036003f9521017816982ae13c749025be49d6016edfd619fb054ba SHA512 d9a7266b376550af3ef596a9d43ac759b89639a4a00a8d3b22bd6b36eac47bd6fff6a9ea43cc858f3323e67377938c8fd06230e95920cb0715f86cd61c7a7f67
 EBUILD activesupport-5.1.4.ebuild 2197 BLAKE2B 96b406268d1fddcd0808624cef4b1104dc356fd3d457ace9037ffddcb415c9f71e5091166eca45ddf44082de126f41a70c3dc97315332f5df6130fd35652e93e SHA512 f6252a41024533a257305b392fe9f5b406b691478808a843ddaa0fefd639dd40753a58826980aaac3d90cd52623c81e358fbf44615865cea892634f05077d459
+EBUILD activesupport-5.1.5.ebuild 2198 BLAKE2B 42fc042b30d56ee455e17d9113f8b27e05f0bc93f7ba5566eb9ec01e0469a1809dd3a4a71475df1abcc290c68dea792c664285cb59e471132c6bbe0a66852e5c SHA512 d1a1e6be780df04fe36d798ed83d3ebd33c09b56ae761606795850fec31ab970b05d8d7e50c9556c34bcd3e8082cb771ef70ab32b1d422dd225ab865d3b6e8c3
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activesupport/activesupport-5.1.5.ebuild b/dev-ruby/activesupport/activesupport-5.1.5.ebuild
new file mode 100644
index 000000000000..281cc7bce793
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-5.1.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~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/concurrent-ruby-1.0.2:1
+	>=dev-ruby/i18n-0.7:* =dev-ruby/i18n-0*:*
+	>=dev-ruby/tzinfo-1.1:1
+	>=dev-ruby/minitest-5.1:5"
+
+# memcache-client, nokogiri, and builder are not strictly
+# needed, but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-2.2.1
+	>=dev-ruby/nokogiri-1.4.5
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.0.5:3
+	dev-ruby/rack
+	dev-ruby/mocha:0.14
+	<dev-ruby/minitest-5.4
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"; gem "rack"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+}
diff --git a/dev-ruby/amq-protocol/Manifest b/dev-ruby/amq-protocol/Manifest
index ecaca70f70dc..623952a93956 100644
--- a/dev-ruby/amq-protocol/Manifest
+++ b/dev-ruby/amq-protocol/Manifest
@@ -1,8 +1,6 @@
-DIST amq-protocol-1.9.2.gem 43520 BLAKE2B 5085326ac5865876ce17c4acfc2fe89f8946fa5fb6851bb5bfb3eea387e505083ceaf9033243b47b5b9cf484217f6bbffaac567ef44b5069d505d4ae6cb394e3 SHA512 ea4553b337589589cc89b70e351722ec8af402bd560d73fd35ad41665424a6212e03e26ac86aace5d90f599c7fc2236686fbd83bd75c7023647d95163a2d8573
 DIST amq-protocol-2.1.0.gem 43520 BLAKE2B bcb389c1ce1e250e78d96f2451c5d01b22d151fec3a7e5666d284edb0c46609a239cd9426dabc92e8cb1b3d28b677b57b89c2510b2cb7ac13368287bac5d2d30 SHA512 3111c3233a3fdf830cb95d9161132b96035c3835bcf4acd74ec9a915a44096295f5e0cb6b444db7fc4eba84b218800f9c9d33d1cfa5b2d3dcd80dfc65c92c133
 DIST amq-protocol-2.2.0.gem 43520 BLAKE2B 7cc9d8550ec2bfb40f4ad64f1baaeb782bda52562ccb6f7bb7692a1db400e1320e52c6ee10d0c1d3a96557fe4aa8f428e4f524e36b2a4c8685ca60b505fb3d9a SHA512 8637e7c1b2540edd57d9d06f5cf51430ff2ed4cd603e3b8a9f9c48dce2468452a4d365782ba949b7e007d773febe83c1a22bca2dafb21c24b3c8f655eb53e5b4
 DIST amq-protocol-2.3.0.gem 45568 BLAKE2B f5af9184a37bb7484e18765cf6bd807048339f44ece70a1c5dc8d6580eb1449bd1deda9bd467970c0d03088f4f666ef0ba59141fe90b335508a854440cc5dae4 SHA512 cb9ca136908f09dd7f38f763b87516379efafb2cc3dfe34268064c08ee9fdda8e9299de4d94b70aa0569362fe18a541287a6b9649383ee0720f199fdc0b75263
-EBUILD amq-protocol-1.9.2.ebuild 573 BLAKE2B f6b873cad7ddaf37c80b70442d30eeae7f283e405c37ecf765462cfec5d6cf605fee626a6d31879a2483bad662f324a382442ecd443543ce3c6710410ffe7523 SHA512 7cf29cbf88226eba36f3e7b644b7ee61a899c561af47ac0b1153e1641cd13778f5f49b40fc66f58304e037813c093cfb767bf007fbfb2ec42bb284f29d18d60c
 EBUILD amq-protocol-2.1.0.ebuild 623 BLAKE2B 48f3a9792bf8f6523923ba9303158ff5b4facdca76ee5ba35b369e0496e489d69f9cdd95da579edc4ac9d79af59a436596b282e724b2cbc91423df2ab937ea48 SHA512 d2385b2ffda00df75c5d53d4b90445002f154b040ed2766e8d808418f79d0924fce45c4320c145354c1b538eb45c6d85fb2f9b70949e7bff25f0c4a2515c007d
 EBUILD amq-protocol-2.2.0.ebuild 630 BLAKE2B 2a2ee4777165f13f95274f063110b5e4d977d1b045b29bab2e49d7a38e23f4fe59e5a71ad385f7a12f22df9575d21679714b4f0bb3c05976f55cda254d8e317f SHA512 cdc140bfb73cb0d9ab312e2ce12d32244db637c28cb0209348b6d90b7b02d1f62b7853562bba005b1eb212956b395ecabdfb25125209d77e96357d6e9eaf29cd
 EBUILD amq-protocol-2.3.0.ebuild 670 BLAKE2B 4f78f212afae79bd4bce94792bfe75d732a52274eb3390610d7c8e6a74da28ff5da1bf370f940ccb9f88c226b4f8d02d27fde1e5aaed38a919f38b60a389b09c SHA512 cc911a2884dac9192ca570768dc5edec4cf8b79468e0a9af20c7b173f40f25a9b0d51266f1392feb493205459f0f7d3eb9a5a5e1f90312b1bfd87f52a253bc3a
diff --git a/dev-ruby/amq-protocol/amq-protocol-1.9.2.ebuild b/dev-ruby/amq-protocol/amq-protocol-1.9.2.ebuild
deleted file mode 100644
index 0eee50e76d65..000000000000
--- a/dev-ruby/amq-protocol/amq-protocol-1.9.2.ebuild
+++ /dev/null
@@ -1,25 +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="ChangeLog.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An AMQP 0.9.1 serialization library for Ruby"
-HOMEPAGE="https://github.com/ruby-amqp/amq-protocol"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/bundler/ s:^:#:' -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/aws-sdk/Manifest b/dev-ruby/aws-sdk/Manifest
index c8942247e140..c7e2c806aacd 100644
--- a/dev-ruby/aws-sdk/Manifest
+++ b/dev-ruby/aws-sdk/Manifest
@@ -1,11 +1,9 @@
-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
diff --git a/dev-ruby/aws-sdk/aws-sdk-1.66.0.ebuild b/dev-ruby/aws-sdk/aws-sdk-1.66.0.ebuild
deleted file mode 100644
index d403ffb57dcd..000000000000
--- a/dev-ruby/aws-sdk/aws-sdk-1.66.0.ebuild
+++ /dev/null
@@ -1,41 +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="rspec"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="ca-bundle.crt"
-
-GITHUB_USER="aws"
-GITHUB_PROJECT="${PN}-ruby"
-RUBY_S="${GITHUB_PROJECT}-${PV}"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="http://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="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl
-	>=dev-ruby/json-1.4:*
-	>=dev-ruby/nokogiri-1.4.4"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r samples
-}
diff --git a/dev-ruby/bson/Manifest b/dev-ruby/bson/Manifest
index d80271002711..e24f261e862e 100644
--- a/dev-ruby/bson/Manifest
+++ b/dev-ruby/bson/Manifest
@@ -1,7 +1,5 @@
-DIST bson-3.2.6.tar.gz 51846 BLAKE2B a714c4166f30df6376523fd500557905507c180c9b5d1042d9b6b03e03edd996ca46f0d043180786b97d81c289d51f29e7b9904aff903f7dbba5826e857357c9 SHA512 da8d7c4e50bd5387a50f0ef471f1d854e0a1bf3f109bb793b16c8e4d110f6b98cb37aee126176eccb097c5d7814360ef85e96be4aa4704226a8490984a5dd3f2
 DIST bson-4.2.2.tar.gz 96725 BLAKE2B 62c40df519e185665f0c42bc8ab6a2d8472d123397f1ed1403e40254944cd423e6cedbfa014a03f6c6ed8a7cde94f8c26d06e784b82ea55f17a97996915381d6 SHA512 4de8950271f5fdd5927eda290b6506248012cb8a932d65773ad53f1e3e4c67ea17575b559447d5eb6c9286f672439879dbc89aa0cded4ec2d0fa35c49da7a574
 DIST bson-4.3.0.tar.gz 103341 BLAKE2B 29f7d870ce85e4984f47fda482b9ebc33986332eefcc3d9c5d56f7cc628e698a4a2e879225b81c6d0b1edc9e62f9b426f2510b67b51398a699d96de390544efb SHA512 c753bd68df5871a7cbed78dc68791a5d1c30db5975b70702742f12373afb754df8078d2bc6a772fd398815bca05a2fa020cc820a1ea9238f8b01eb492581b17f
-EBUILD bson-3.2.6.ebuild 1070 BLAKE2B 903a80be05a034b68e1acac344f10b5b12dadf8d8e1751b919e710e06ca01056d39e13706716b9763f2f656e682e19493d024b9314287b047acf078564e7b972 SHA512 ecab3bff188bcc88170d0e5df621110f51248281d70e092497af201983f20f74dd915896e67be79e5b729f8f513b0ce712d083421e03647eb01ac0159340f22a
 EBUILD bson-4.2.2.ebuild 1078 BLAKE2B 621d2c66b6c5f941fa2279b6a534d232020069aa1ba55ad256e912945c51c73b823d486190679b47f33282bc947a15ed9d01117be35aa55394cb9adef64c8744 SHA512 d74d592a22fa0e30b90999478eb850f2d291118cb1bef2a8fa7af6fab934f20c46ba4ec91fa6a947302139ce9758d60cf004d3ed1604af3fc2dbcade09f4df80
 EBUILD bson-4.3.0.ebuild 1071 BLAKE2B c9b5ad65853b9785c3dc6b9742e12541b66b72bb3dfd9aa3180a1c7f0e8df9af18327c5d57da42dcd37fb254c32687da40bb416c5c8e4124b7e9db39a0dd0802 SHA512 c75607cb669ff83a7de59db486d8057e8865c3f1c1c21cf4c87a4400924b411d391248157de4f66304a7ecff5f8212df1e23ceae356e3b3efb81538db853ee16
 MISC metadata.xml 343 BLAKE2B 45b4f3d9d5e86b9fee94d0b51c420d48c51b914adb49585c12519a81de40c555bc5ed48b03b751c7ab524464e46836a25d51f824c56cb03837f61ae071e1517b SHA512 a5fdde2808fc5c77be1a62a593215b8b619f53ffd8606e76db34a2eb2006deea409c64e85d6ba8a5b4089133265b6911188a9026c3698b44270ef8ce1f12967f
diff --git a/dev-ruby/bson/bson-3.2.6.ebuild b/dev-ruby/bson/bson-3.2.6.ebuild
deleted file mode 100644
index 771786c4f359..000000000000
--- a/dev-ruby/bson/bson-3.2.6.ebuild
+++ /dev/null
@@ -1,44 +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="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="mongodb"
-GITHUB_PROJECT="bson-ruby"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
-HOMEPAGE="http://www.mongodb.org/"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="bson-ruby-${PV}"
-
-LICENSE="APSL-2"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE="test doc"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Remove project-specific rspec options
-	rm .rspec || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext/bson extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -C ext/bson V=1 CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-	cp ext/bson/*$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index e315bf0293fe..7f321008a6ef 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -9,5 +9,5 @@ EBUILD bundler-1.12.6.ebuild 2240 BLAKE2B 90a0f4d6470713841bb6b3baf431be33e57e6b
 EBUILD bundler-1.13.7.ebuild 2247 BLAKE2B 857270df538621f2c176617c4e4ced03faaa17f2a3081ba6e4f2e4ee137d59a76e84b3501984a29a60a5ef74561197905dacb176099ad867cd5233746813efa0 SHA512 b50b829b5660cac8e3ddfa550732da4208345c56d5c39b5dc037ad806e8d8e56b306863e8c3f6c23e2f42d9576ae322273ba9305026dc9fbe36663393e7cc884
 EBUILD bundler-1.14.6.ebuild 1048 BLAKE2B 5626e25d1221e8abcd305d15bda1a5dc7cca8ca36cf14adb09ac81291c069b780569c9c2ce01245c48e84d5ada13d4a0994caaa35508e880fefab321fb5d37c7 SHA512 db402572fe27778a6f085abc8689eb072ae004eaa4ac825462a0b4ce72635a25ede60225c3f1a937e67743d70d85b35df2c770bb193fed853a7c703fae9bbb30
 EBUILD bundler-1.15.4.ebuild 1031 BLAKE2B b3600f31e90ebafd1c9aad89f25d47edfbc7bd55eed6d0c7c1efeafa6fc5757eab454b5285f5e2fccc38de016f83b6ed6e0d60953cd27cb4eb0876c4ccff7e6b SHA512 2bfd35e1a9b84683c2bee05a302b23967c5a5dd051e468ecfe0d22c7aaf7851ec011b8d5a7f25ffa4170249d0be85a224a71e75a623eebcb339d07f598753adc
-EBUILD bundler-1.16.1.ebuild 945 BLAKE2B 488018610df26b036ce59a3f3343ccb483617e8cc383eab6ea798b2b6dba5aa4f79ea3c8e539d34a7e637c7fae4b9ea2421d7e0d8cb338091eebde3d1631c604 SHA512 57b0d0d046d8ab6999d49df9a50481b50a87f6c45502cfeae14ab6824ea1f8fd7ece7a0ef92bfd16b33d74967749f7d313d031216ab1d08060ee0c213d6e6b0f
+EBUILD bundler-1.16.1.ebuild 957 BLAKE2B 95163ec2b6b9953d13dd959a6b070772f577f1ecc03e86b0351df82d6cc107b6be73932c40795c725dfb3cf62bd35916c82cbcf92c0bd53d7f91b8d3540b29bc SHA512 a6435e52e6b0d07fa2166f837c0bd285f86bbf770dee3364437476338b441651226870535b79f000c19d637fcacfbeaaf5c7f4f2cb70aa4ae9922d045116cbd7
 MISC metadata.xml 342 BLAKE2B 9247517894a366c8b67564e015ff966b22eb3df924ec8438d9886ee854d922e376a274e1dcb455e23451febbb1bf4d8f60023e6b7763cd42772749de1bab372c SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e
diff --git a/dev-ruby/bundler/bundler-1.16.1.ebuild b/dev-ruby/bundler/bundler-1.16.1.ebuild
index aa0191af8aaf..24412a047802 100644
--- a/dev-ruby/bundler/bundler-1.16.1.ebuild
+++ b/dev-ruby/bundler/bundler-1.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ HOMEPAGE="https://github.com/carlhuda/bundler"
 
 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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/camping/Manifest b/dev-ruby/camping/Manifest
deleted file mode 100644
index 3bc79d63a674..000000000000
--- a/dev-ruby/camping/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST camping-2.1.532.gem 375808 BLAKE2B 332e3a3111fc0fa812ef976769ddfaa0b6ab1fa0fcf55fde12cf0bba28913a9f94c0f55f33fdd855262436fbb7f1753245fdfd07a371bf5ec6581203b022c760 SHA512 0a061ed886b7bb86bfe0906e8a7950b96d2c8360bde3c0545b52d41b3012b1c3975a056449f1919c8ba454ee6457738bfc9f815da8ce764e79ef3cf9981e9408
-EBUILD camping-2.1.532.ebuild 817 BLAKE2B d0ad05b874a9451ff1a08a64d451f1763d4788c5ee4f3e4216e904f7f961133569f54762dba8dcb7daa2a8addeaba86606873dc69ff1baa50051e27327793c59 SHA512 7f3843c357048ebff0435b11768983318607db17d1602caa95f8cc8a05f1fce60e72e14663b3d92f17538049c43eee3e261c750e0fb9b0059c32430967c22d94
-MISC metadata.xml 257 BLAKE2B 6339b8ae3ef779011f34940b5af7faca341317790ee6752ad73cb83db463ddad10b25cacf16f73ce6d0fde976d916e2838e6209bdedfbe5ef6da285be302203d SHA512 d86ea11e509e5d031f82c4bb476a5974b85d812abe415e95799bdf34a308ade95e2f1cf35f6af84ae5acd0f67996b150c02712b75ab4f5a1ff4eef0ffb046d7e
diff --git a/dev-ruby/camping/camping-2.1.532.ebuild b/dev-ruby/camping/camping-2.1.532.ebuild
deleted file mode 100644
index d3557862b96f..000000000000
--- a/dev-ruby/camping/camping-2.1.532.ebuild
+++ /dev/null
@@ -1,32 +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_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A small web framework modeled after Ruby on Rails"
-HOMEPAGE="https://wiki.github.com/camping/camping"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/rack-test >=dev-ruby/minitest-4:0 dev-ruby/tilt:0 )"
-
-ruby_add_rdepend "
-	>=dev-ruby/mab-0.0.3
-	>=dev-ruby/rack-1.0:*"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "minitest", "~> 4.0"; gem "tilt", "~>1.0"' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/app_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/camping/metadata.xml b/dev-ruby/camping/metadata.xml
deleted file mode 100644
index 3df5c34efc94..000000000000
--- a/dev-ruby/camping/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/daemons/Manifest b/dev-ruby/daemons/Manifest
index 30840469890a..815be9560e0d 100644
--- a/dev-ruby/daemons/Manifest
+++ b/dev-ruby/daemons/Manifest
@@ -1,5 +1,5 @@
 DIST daemons-1.2.3.gem 24576 BLAKE2B 23cd623c2f9c84ba182b0d1eeb5bdccf9273dc5f0d41cd51377abe7fe1c29e6c7bd342afa9891a54638aefaa4bd1353a3183516bb4355eb93772de633e2db05a SHA512 05acecc07bc3f760472453dd11eb0231b9e7f2e04a783ab44dacecf9c666d01122d27fdb782d9973f475bc378e0e3e51795ad58e221f29b201b1ba5e0de1e277
 DIST daemons-1.2.6.tar.gz 27557 BLAKE2B 7c08b637ab37f764309fd260c4ea6c11402b89ea327eb47ea0af3860397ece795467a11c4ae5d8577972f5d8e2c6590f4d8112027f06db941b7181e33c158736 SHA512 8276685a684093252bf136c552a613a5208f4ab34f178be9425c62ea59fe1eebe671a7dd6c57d30744187b9ae58d7a7f1ebf58468e988565a30ca4417f2a90ea
 EBUILD daemons-1.2.3.ebuild 689 BLAKE2B b6481ed945f1d6d35089f5d0b630cae361da7e3bcf4ce39dca45540aef6ba93e87196abae160d7b9061d5d689270349b3de0260a6c0fbb194913287819e13383 SHA512 888620fe4d6e4d073b48028fae6d211e1c51fb81cb5556a8d49227f8d7fc42f21e77181da4b3396cf575cd90fea879416be3f773120df4c7a2a2d57e20a84e5d
-EBUILD daemons-1.2.6.ebuild 883 BLAKE2B 232eaf318ab66e7877d3733ab51e7d5e296a92184d77308573bd2edba0bfe4e3cafbdc696aefa30c5b1762f57af50efd18e9243dcec277c34229ddd1db82658a SHA512 21fe7b84e3640603319b471d5cbdf77b4644facd6a65b8850084efcfd4de2250eb8bc91793d67ff12b5d43b6331efa1c3ae3607e5851607b8caab3e3f190e1a9
+EBUILD daemons-1.2.6.ebuild 882 BLAKE2B d9c1e77949bc70f9d6a727392bfb6d64b485eedf7fddd9ba589d6b7e40109663acea33f3dfaea60bed09a8183f7f291252558ab20b5be173cf3c1511a6b37f0f SHA512 e0ebed6cb14cb241c8e431b61cb06e2ab4ac2e1fbc28cc9fe2ba6ff0f5e745552698bec8120e025e5ace6019d14f96791cf33e49a3fcb1556e446d637b1d5c64
 MISC metadata.xml 345 BLAKE2B 7e783ce974aa702ba94e5d1d1b17646297e1db1c51d4dad02408e678092afb21647d8a21f0beca7d8e03f4c5271e3f63f643e3d113bd1d89ca927110b9d447f6 SHA512 c6e30f1117d3ebc21e91cf49a6e4952f3cadef673c1a624f9b5cdd4bcf036f1a4d25120799ff72896b2bd38386fe251e72b27028e2a31551716f21bc90217cec
diff --git a/dev-ruby/daemons/daemons-1.2.6.ebuild b/dev-ruby/daemons/daemons-1.2.6.ebuild
index 14452521fe30..116557ea9a56 100644
--- a/dev-ruby/daemons/daemons-1.2.6.ebuild
+++ b/dev-ruby/daemons/daemons-1.2.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="examples"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/did_you_mean/Manifest b/dev-ruby/did_you_mean/Manifest
index 702ea038b04f..ef19c6964d44 100644
--- a/dev-ruby/did_you_mean/Manifest
+++ b/dev-ruby/did_you_mean/Manifest
@@ -1,7 +1,7 @@
 DIST did_you_mean-1.0.2.gem 30720 BLAKE2B 8b61cecd66affedc4a730655d251f99581febad4e51f18e3b48f30a01f25fa9ed4897c9431d872d9daedf10f46310481979cd44cbf4640d7681bc7425f4df35d SHA512 a6b19dd909423505553759d6470266680056b6804f9c42452eecf9104a8de71a460a4baa53111ccfe830e3dbdc04bad9382d77f9098d1e114aecdc34a4ef57b6
 DIST did_you_mean-1.1.2.gem 30720 BLAKE2B c1fb841143928854854892e2c7890cb3952329ae3efd50401b43bb4bd327b0564ab2f0fb33a4bd23278e1a3570594f2e13ae6c0cb52ea244ccef392f68e79d09 SHA512 bd1f5eeaf6c527bd6a0ef79555aeee459f9e2fee82215e6f3a47e380535d366eea1f7b199ae99de2736125785c7fd76a1cd6e8bc7cd0599a8d4cc6c5184c85de
 DIST did_you_mean-1.2.0.gem 32768 BLAKE2B a73873f18c36d9e811e51a1c8b974ebb44f6029468c34a33b7af6c299b78025750e043d960f15baa5f5aad89df906df743196c5fdafa368c740f8112936c8655 SHA512 9b807d707f1931639b04cac485e0b58a2ae2cd6377d0782317f62e9d469c9394e4088fae16e7ec3ba45e7d2afaeeb2fe10358dd70f9660e08c30f51a4f2d0b8f
-EBUILD did_you_mean-1.0.2.ebuild 517 BLAKE2B fc6efeb4a32911f384f1760f5751e4a59be39b305cde96dbeea9ff7bd580db87347a6d021c7a145271ec6b7a8b1846a15ff1c6a2789cbca28100718222a6cc72 SHA512 18ec40985d2bf8c5f86e398080bc7951ef9f559c43831a3569b981eef70a37fd99804f73f742b98135bbff76c892040a83066936b6c8ab81a117763e06593bc4
+EBUILD did_you_mean-1.0.2.ebuild 516 BLAKE2B e68dc99e14daa52f0c85df13767a3781428c104c932882171109f6acf6b23e1bac314fbc52a098bbd5402ef99615b4bf0310259f101b3073c65b6379bdaed540 SHA512 363efd58b76faa994f77e1ea4d86a8c7c77521d6e9a6fcef1c514d645b8944dccafe02def8b43fbf29918c118709539b66315bd2a397bc681b4e05563b6a2d7d
 EBUILD did_you_mean-1.1.2.ebuild 613 BLAKE2B 285fe2790652d6d517d5546fcc000f763cb1c9c86829ae7bc82c67ef69700178984363dcaf0832a2d43e6e289b7089cdc51eb03a8ab143ee9237cb9adfe48418 SHA512 cdd1d7b556aa5b6204371b3a37f19c7d915aea7b28f40b516dbdb5cc437d880109ad19282d30c4d318e5671b16480aef3991d942def00da9b4d9d70f7aea4642
 EBUILD did_you_mean-1.2.0.ebuild 613 BLAKE2B 88c98094eefea99512c68f8a31066c2709d51ad0b141d09965a6b249e73ccd7c5519afeb7d793fcea7ca7ab6111426583944f6cadf87226937725f72cd6ee85a SHA512 281a345267c6a7bc40acd9db36a02d93e9706a6e2773acab7502b745503bbb6c16030ea83ac27ef73f67d3396a5f64e63f95eaa472afd363311912ba91d91fcf
 MISC metadata.xml 345 BLAKE2B b3764e5648286cb66e03f3343a41b460ea2bb24f51e1c25e89e386c2b16769c9b1f88888b1e10b2c2d0a2346659195454e4ee8262aec0d4a9066795759cad053 SHA512 418114238e3e2db16ebcdd3de5213b3bc0f0a45ed719de1be60cb19015966cf39912f38d0858e22aa6330ac2e7fb58a1452e9623e7559c26161d70e0f29e66cb
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.0.2.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.0.2.ebuild
index 58ed4895aa1f..f8b7796d9e22 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.0.2.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.0.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/execjs/Manifest b/dev-ruby/execjs/Manifest
index 5b1ded543ddc..bbdb03d86c0e 100644
--- a/dev-ruby/execjs/Manifest
+++ b/dev-ruby/execjs/Manifest
@@ -1,7 +1,5 @@
-DIST execjs-1.4.0-git.tgz 14300 BLAKE2B 956c66008ffac5afc1d07b4c49b365085f1b54d438b2e22b832e8d9ae763d87c1880224ec765cd69d17b140f85401587abaee826554d1cfe287379803a73d18f SHA512 ed41db6f1c95be7bf5b379370c2f06894a0a233aaceeadf45172c0cfa1ab84f4eac7cb91608d02888c35f1dc9355f1fce60a5779535db58066ff1dacab6e0be8
 DIST execjs-2.6.0.tar.gz 423437 BLAKE2B 9b7594a47cc463e28c959bb4f21819be64083ea174c2dc61e656f3cc882ee4abceb4199fa47ee9b410035326327ca2a4636be054b7321d9aba6dd2929d490636 SHA512 9740feceb3f9eae59aaa3697bd8f2fa1bb606cac4868b107bea4b3e9a7fe7fcdcfa387d852f0c267635163fc70eaba60a0ba241421434b26e1f94421b80ad468
 DIST execjs-2.7.0.tar.gz 425361 BLAKE2B 8dd3bb5557a6993667abfa6c424cbea6377c1ea7b3928b9b60a6ba084f1df8a109d10d1a616c9d302e1b98a2031ece9e710d7dd933791cbfb3eaa48e45b9a595 SHA512 9627f466e8a363404c940b29227d08a8ad067b53383989a3d8f4f902e8c050c0e81facdbdafbb660c41f7c8dc2fbdd3bd357ca708e612af4d223b5412c6c1fb7
-EBUILD execjs-1.4.0.ebuild 1153 BLAKE2B 9de6a96d4033b8bf3dfbdee04a0728661a68bf06dbe7de798b340cfa8f50d5263d89cc53fb4077de5c23aa3aa8831575ddb258617961b82021d5313fa9387b4a SHA512 5c63e6ddc57895e9e6574e9a762096a927d0b78d7331ee744094812d77c83a22a5c670fe2f9b3229f083c763368e765a2f9f7c05444a66e687ec8a859dc16fa2
 EBUILD execjs-2.6.0.ebuild 1161 BLAKE2B 0d3c8a52c055a3e024ac41ec9609b304184893f3a84b7d788dab54ea02251d232e0c890124901ac5e72a24b06e4790ea9d9424a0b1d76f6cd3bc8c3f410a2aa2 SHA512 bf29b773af7b9ababc95c55d9a998407c871cfd351f902ab6af6dcc0199a3b30acdc1049345f4968bfab79af35f7fd3c739fc0f421925bc5ff07570a983eb7de
 EBUILD execjs-2.7.0.ebuild 1173 BLAKE2B ddd90b4c13178c4edb071c4dde82446c1baa204f8346f884df41aa81f5950a28689003421991c8a294eb162e84e66236c40c118a3a5da4f58408bc0b6822c728 SHA512 09dbcf0b0d48a33090199a07ed36b0f7a8d59a58555453e0085d1b3ed191edf7cc4a0cec1150685375679a595bb2315d1c0f9c4ecdc8475941e9f53460b70f2e
 MISC metadata.xml 338 BLAKE2B deb976ed7b368fddcb7e6b7b553ff8fc748f90c61d23f84cc251e7154f6f5f5c79c7d3d962dd2bc8061df7be36dc719ffb2c247c759e6fc7e4e4ff211eba6e16 SHA512 34e46d203d186a98cb50f83fc6508457a8ec536920b9640b7c0ce2f6f00e96643f1265c750a0f8555e57eb14ac1d19f0487bbe6e7fe5afe0870d8ecb162e2f27
diff --git a/dev-ruby/execjs/execjs-1.4.0.ebuild b/dev-ruby/execjs/execjs-1.4.0.ebuild
deleted file mode 100644
index c0dbad0d2387..000000000000
--- a/dev-ruby/execjs/execjs-1.4.0.ebuild
+++ /dev/null
@@ -1,45 +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_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="sstephenson"
-GITHUB_PROJECT="${PN}"
-RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ExecJS lets you run JavaScript code from Ruby"
-HOMEPAGE="https://github.com/sstephenson/execjs"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/v${PV} -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/multi_json-1.0"
-
-# execjs supports various javascript runtimes. They are listed in order
-# as per the documentation. For now only include the ones already in the
-# tree.
-
-# therubyracer, therubyrhino, node.js, spidermonkey (deprecated)
-
-# spidermonkey doesn't pass the test suite:
-# https://github.com/sstephenson/execjs/issues/62
-
-RDEPEND="${RDEPEND} || ( net-libs/nodejs )"
-
-all_ruby_prepare() {
-	# Network access
-	sed -i -e "/test_coffeescript/,+5d" test/test_execjs.rb || die
-}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 8189da4b4edc..5a16add63b7e 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -8,8 +8,8 @@ DIST facter-3.9.5.tar.gz 388129 BLAKE2B baa63de9c2faf4b1891999fdbb5c576461ebc0fe
 EBUILD facter-2.4.6.ebuild 1913 BLAKE2B c05f0516f84135fac1d9b4b6a456045e4e5934416f1fee52654c901a9d50b4e69e10e2669f98806779fdb36f6bb6184698581be4191058d91eed8807c602b407 SHA512 bdad132d8bd7abf5cdb15f3fa35ba76dedf5fbb5243799b46538eb6377776f3a7ca08ed8bf21af11ff5b301add9d2f0cbbc794c4e35ba5d5ba8f27cc74f1519b
 EBUILD facter-2.5.1.ebuild 1918 BLAKE2B 303788746f2ba6e1385356526e17965528f10e06546c918f0aed7ecb884bd4e0386387ad01d9e59fd7cb9254d91b26c91ceec1fa9bd75dfd34bedb1d02df9115 SHA512 ed07f3b39a71b147a1a07ac161e1895a4e7380aa773c146d702f82eb5a6bf342aa8700f100c4c56ac2996a2d7fc82b5bd4af492c77aed4ba78d308c18a507ab6
 EBUILD facter-3.1.8.ebuild 1832 BLAKE2B d82c18bb394b316a1c397be60905bbc0333697ebe68504562053acde280d0cb3c56ec6bb767be3c6c9edf78bd32b72ec919c8092a255574ff2076bc83efc6ffd SHA512 48bf7bb8ac8b39c8ab7ca2ac97fa6bbf4201b485eabdb3d6410e4568270b11fe863e88dbd1cc93f8c0b690372b5fc635cf72e5a5debb1e97bb5ed1797811d5b0
-EBUILD facter-3.10.0.ebuild 2860 BLAKE2B a8d778927698bc3c572db121236e757659bd0db7a968d7921c602a54c44b8ab912ce41bcfbd65d16f028c020855a6815ff02a63ff26e82d1944e2cce583fb5f9 SHA512 cabc5475b721916a4d4c3534d0b6956f4fc6ddfc99d086af714956193d0ca5b953b8c433848f6d342d284c9f8e347c51af4164fe2f45bde2aab5dd14802414b5
+EBUILD facter-3.10.0.ebuild 2860 BLAKE2B 281388c538d03258b1ac0c6773c41a5face26dd3e380281b43093ef42e931e9f7cef0e33d336d986ec43d41647c92fbbecc7435248b85f677d8f359489c2f195 SHA512 79a214ee0a4dbcafa96e012b26fd1b1977d890cc956e18d892a359e9df2145a2f8776e9ebe35edaca6b411aba67d9275a8b8b87ed11d2cc3ac78266c1391e8fa
 EBUILD facter-3.9.2.ebuild 2108 BLAKE2B f5ff96477d41f3c85555e15cafc455d5fc571a27594d5fe9fe38525c6ee083e0cd59435031ca81bfb7666632a683ea24d0e9c4b55eadeebd17dad6bb8a241f4b SHA512 67fb489f027193816d966aa4132873e73892c3ef36146abd6c069746c6a807e7ad1aa1f2b3b14f0aa7c97236018882be37a71f5daa95a27491110e6375b5040c
-EBUILD facter-3.9.5.ebuild 2860 BLAKE2B a8d778927698bc3c572db121236e757659bd0db7a968d7921c602a54c44b8ab912ce41bcfbd65d16f028c020855a6815ff02a63ff26e82d1944e2cce583fb5f9 SHA512 cabc5475b721916a4d4c3534d0b6956f4fc6ddfc99d086af714956193d0ca5b953b8c433848f6d342d284c9f8e347c51af4164fe2f45bde2aab5dd14802414b5
-EBUILD facter-9999.ebuild 2860 BLAKE2B a8d778927698bc3c572db121236e757659bd0db7a968d7921c602a54c44b8ab912ce41bcfbd65d16f028c020855a6815ff02a63ff26e82d1944e2cce583fb5f9 SHA512 cabc5475b721916a4d4c3534d0b6956f4fc6ddfc99d086af714956193d0ca5b953b8c433848f6d342d284c9f8e347c51af4164fe2f45bde2aab5dd14802414b5
+EBUILD facter-3.9.5.ebuild 2860 BLAKE2B 281388c538d03258b1ac0c6773c41a5face26dd3e380281b43093ef42e931e9f7cef0e33d336d986ec43d41647c92fbbecc7435248b85f677d8f359489c2f195 SHA512 79a214ee0a4dbcafa96e012b26fd1b1977d890cc956e18d892a359e9df2145a2f8776e9ebe35edaca6b411aba67d9275a8b8b87ed11d2cc3ac78266c1391e8fa
+EBUILD facter-9999.ebuild 2860 BLAKE2B 281388c538d03258b1ac0c6773c41a5face26dd3e380281b43093ef42e931e9f7cef0e33d336d986ec43d41647c92fbbecc7435248b85f677d8f359489c2f195 SHA512 79a214ee0a4dbcafa96e012b26fd1b1977d890cc956e18d892a359e9df2145a2f8776e9ebe35edaca6b411aba67d9275a8b8b87ed11d2cc3ac78266c1391e8fa
 MISC metadata.xml 854 BLAKE2B 51b94622bf8ce34658bf34bf266effc445fdbee52fb22e70c9a645c36b7ac28db73793f185b2dfa791d8459a56ea66eccc6a3f4da56db4fe4ee171ee607366ea SHA512 27e7e17a15ad80544fb121b050f0f5c39d3e27a53ade89063a894569472618b29649b5a737011b8d6597594d9bc94a49cf52c9df857d577a098d6c770b4a9639
diff --git a/dev-ruby/facter/facter-3.10.0.ebuild b/dev-ruby/facter/facter-3.10.0.ebuild
index 948c25dd68c0..921e49af4500 100644
--- a/dev-ruby/facter/facter-3.10.0.ebuild
+++ b/dev-ruby/facter/facter-3.10.0.ebuild
@@ -27,9 +27,9 @@ fi
 
 BDEPEND="
 	>=sys-devel/gcc-4.8:*
-	>=dev-libs/leatherman-1.0.0:=
 	dev-cpp/cpp-hocon"
 CDEPEND="
+	>=dev-libs/leatherman-1.0.0:=
 	dev-libs/openssl:*
 	sys-apps/util-linux
 	app-emulation/virt-what
diff --git a/dev-ruby/facter/facter-3.9.5.ebuild b/dev-ruby/facter/facter-3.9.5.ebuild
index 948c25dd68c0..921e49af4500 100644
--- a/dev-ruby/facter/facter-3.9.5.ebuild
+++ b/dev-ruby/facter/facter-3.9.5.ebuild
@@ -27,9 +27,9 @@ fi
 
 BDEPEND="
 	>=sys-devel/gcc-4.8:*
-	>=dev-libs/leatherman-1.0.0:=
 	dev-cpp/cpp-hocon"
 CDEPEND="
+	>=dev-libs/leatherman-1.0.0:=
 	dev-libs/openssl:*
 	sys-apps/util-linux
 	app-emulation/virt-what
diff --git a/dev-ruby/facter/facter-9999.ebuild b/dev-ruby/facter/facter-9999.ebuild
index 948c25dd68c0..921e49af4500 100644
--- a/dev-ruby/facter/facter-9999.ebuild
+++ b/dev-ruby/facter/facter-9999.ebuild
@@ -27,9 +27,9 @@ fi
 
 BDEPEND="
 	>=sys-devel/gcc-4.8:*
-	>=dev-libs/leatherman-1.0.0:=
 	dev-cpp/cpp-hocon"
 CDEPEND="
+	>=dev-libs/leatherman-1.0.0:=
 	dev-libs/openssl:*
 	sys-apps/util-linux
 	app-emulation/virt-what
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index d1eecaa6c0d5..a8340ca225c7 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,5 +1,7 @@
 DIST ffi-git-1.9.18.tgz 901805 BLAKE2B b04715095858d461e4a0a904185dbd603e391611ef446de385deb533d8fcbff0ada3f1865599fb51e3446df629c16d491c476e179cfa356c7d8c84e1827b2729 SHA512 49c52e5e42e436b7969c35a34b28bd7929d75372638ac5373486a1d624026c12dc682009bc101e4a2c8f1442ed6f1ba17b438cda2e02d4256622b489c4bd9945
 DIST ffi-git-1.9.21.tgz 161824 BLAKE2B f31f9caca1c6f90d7f6bee7756630fdfaff527a96735b3a80ac1f5f0c1a860d6ac6500da06c96e99527a2e75de0a839067d1171cdbefdf9401df101d59b38d4d SHA512 c3049baa2aada3deb1d5a029ce659f802cb0533e2fa6ab6ccc3a45abda4a97fde7964dde314f45e93e4ec3e73f66aa53ff8f7a397a12c70e191f4ddd0b3ed063
+DIST ffi-git-1.9.22.tgz 159304 BLAKE2B 096f625d6f1b162cc99f70b9d0783f1176e0d9faa65dcf06c346ef0b78c495a85c50dc728b302bbd9a8648d4d589eea56c0e9791f6065bc5a87331bba92e9656 SHA512 0e2159133629f505de233fa44a004ec74196488540552c8036640c7dd770fadf2b90987096a48ca796ad98436dd63998bd4c7f8b01c871755be49b1ef6045642
 EBUILD ffi-1.9.18.ebuild 1539 BLAKE2B f8a42a2d72c94d76b9f9c4178c212b429cf799ee912a7905e806a3aa14e16b361efa873feb00ce1aed50b9e8e0357029fbc805db2596720dcf6c4cfeeda1f168 SHA512 9bb9f63adea8e800990926785cb52853e5f3bfe8cf658381dd87da9eba60051d9d344b53c420816a5e31c29b0d0de88d70542041211118da7a2637d50a8b6bb2
 EBUILD ffi-1.9.21.ebuild 1548 BLAKE2B 4ac2b2687b8f12bfdcadfd59d1a46627cade30ad709306ac542a52e011272930286ef0916ca05717a631df5b25fcda56f729f13ea2050b14029070ead013d4ea SHA512 26ae06b0189c80063ab90673538c282fe0a6dbdc58caca86ce606a8606692c21d8a13d12ed0c4814e0215ec07e74956dddb8192157b0705e3485155978181c3f
+EBUILD ffi-1.9.22.ebuild 1548 BLAKE2B 4ac2b2687b8f12bfdcadfd59d1a46627cade30ad709306ac542a52e011272930286ef0916ca05717a631df5b25fcda56f729f13ea2050b14029070ead013d4ea SHA512 26ae06b0189c80063ab90673538c282fe0a6dbdc58caca86ce606a8606692c21d8a13d12ed0c4814e0215ec07e74956dddb8192157b0705e3485155978181c3f
 MISC metadata.xml 333 BLAKE2B ccc40c1a86563165c3d6aba6bb40012dc02d86f836a5e050dafc34298c9b08aaa676be33e7c2ce5bf6acd36cdd8250328150383652ac5a1515c2832969c481ae SHA512 9105a49b39afce8695d4c8e7082690ca25806cf08ad6b6b9528343e1bfc72097369ab2868b3eebde55c6cd70d0baae1f085b4ad3468a9c5621d97dd8def76173
diff --git a/dev-ruby/ffi/ffi-1.9.22.ebuild b/dev-ruby/ffi/ffi-1.9.22.ebuild
new file mode 100644
index 000000000000..f6c709230ae4
--- /dev/null
+++ b/dev-ruby/ffi/ffi-1.9.22.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
+HOMEPAGE="https://wiki.github.com/ffi/ffi"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND+=" virtual/libffi"
+DEPEND+=" virtual/libffi"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+all_ruby_prepare() {
+	sed -i -e '/tasks/ s:^:#:' \
+		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
+
+	# Fix Makefile for tests
+	sed -i -e '/CCACHE :=/ s:^:#:' \
+		-e 's/-O2//' \
+		-e 's/^CFLAGS =/CFLAGS +=/' libtest/GNUmakefile || die
+
+	# Remove bundled version of libffi.
+	rm -rf ext/ffi_c/libffi || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/ffi_c extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext/ffi_c V=1
+	cp ext/ffi_c/ffi_c$(get_modname) lib/ || die
+
+	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
+}
+
+each_ruby_test() {
+	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc samples/*
+}
diff --git a/dev-ruby/gherkin/Manifest b/dev-ruby/gherkin/Manifest
index 8d57aa337203..849bdd2a5b7f 100644
--- a/dev-ruby/gherkin/Manifest
+++ b/dev-ruby/gherkin/Manifest
@@ -5,7 +5,7 @@ DIST gherkin-2.12.2-git.tgz 1764938 BLAKE2B b5cc7f063c8567df2dfe92fe805d5310feeb
 DIST gherkin-4.1.3.gem 350208 BLAKE2B 3b0f54124c9f29c9216aaa9810526f1e11f6243b02143443d0ac18209320c14fda67f1c36d3056dbe5adbc18c36f72270054c17a011921eb87f8d21bc3e8c3c9 SHA512 7c113172ddf38ccf7e49eaac19355f3cb991f69d7499dba9189f375b75d3614f349fc6374e584a92c1223b0708cc8944859b4b38e28d79779a5091fa0c775e6e
 DIST gherkin-5.0.0.gem 340992 BLAKE2B a8292fde04c98c409423733791e78b9d6e40a7a60b59a1acd0a0e9c6df0be9185e90f1c5af6ce0ac39f352457c18094c495557fb05323eb7ea5ae8ce27008950 SHA512 cc782e37f5aea4ad0776f5336e6218b77e7fd8d193786acffaa44685de3a2592e4e6f37a3787add807654901afd12bc2d094a782b154bb2be9e2cd16e283df2a
 EBUILD gherkin-2.12.0-r3.ebuild 2701 BLAKE2B 2200f26428812a62bcc335eb45d8e717cdca9fcad4d6592d8fea2a0f952835ffc48e231af501b3d7e71150c51fb08bd1aab006ed5f17cb089173658bfb6ac6fa SHA512 86e0e25dbe9dbb6d7f51b54d22b6021e3e6fb128ae4e0eafc9cc33c126c0d6f11a946dfbedfac86bfc31085d2ff59de90214b982e2780630feb997108655e9c5
-EBUILD gherkin-2.12.2.ebuild 2617 BLAKE2B 54adcbe59ce90f0b5eb36943350e3176f8b5bea71ae011f237c0abd372aa231ca25cd2594e09af68bf372aee63cc4206412e8b7350694ad3cd2ba6d010e46954 SHA512 dc8923078e2708f37d93be648f8a56c61ac3dbd7cebd34b420e14b9ccbf70e13f82b58b69611bee8a4b51559d31831ef8bfbfeaa21acb249a8c1198c68755d35
+EBUILD gherkin-2.12.2.ebuild 2616 BLAKE2B ea6d44a7d2581666b612e8900feeb6248e76d8f06a2321e02b092a221a326239827af6aa333abca8521c45d90d38e245f548b66ab6875f5dbdb39f544e5be01d SHA512 2e1fc5e3bc1429d806e7e6fdc5fda22998dc747382b8f30e5cb992dc16f9eea3e93a56e1adb6b8addae76344e2ddff67795e25f91b296af83bbfb2ace8e9da5f
 EBUILD gherkin-4.1.3.ebuild 580 BLAKE2B 169c4b356aaf6d491575a3650de9775d0894d9bab392209e6c2b90219e6dd4b24164b847db6bea9676124e512387314fb3094068336f72e98c1db60c6f128b03 SHA512 a513a27536182f794351b7b3fc11150b92df0c74824300935327afba1ad486670eedbd3cb75c905c5a629a9cccd395c5db5bede91d60901756b0b6725c8e4138
 EBUILD gherkin-5.0.0.ebuild 570 BLAKE2B befb2fe67dee3c7f0447de9fa7046422b5f53144142288d26af1112bacfd67fa30f74d54a74ae61430d9dadfba2bae7024318bd4ecf7b47679836752ed57e76b SHA512 2ff4378fb44a32d53f7f067d5ccc447f0e9647d9a7571fad93f843eb4458b0c66a3873dec55de533f947bb704a96729ccedaee038d4d0a65ae92ff9e8c24eb26
 MISC metadata.xml 342 BLAKE2B 9a34d41c97eea1996d1fabbee85346c55ab263b0f7087661038b42d2fb25d05f03ec46cf804f8972984200b9891c5ff8b77d26faf5edd8d3d63a76e25ec66b5e SHA512 83d54811e863b8af9f5ba53f081e140d12af0d20ba5ae7273317fd42aea5a5a0fca8f742352794dacbddcdca932dc2ea60e1201f3d6429315210da99578f844e
diff --git a/dev-ruby/gherkin/gherkin-2.12.2.ebuild b/dev-ruby/gherkin/gherkin-2.12.2.ebuild
index d366350fd991..fb6c427787f5 100644
--- a/dev-ruby/gherkin/gherkin-2.12.2.ebuild
+++ b/dev-ruby/gherkin/gherkin-2.12.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/cucumber/gherkin"
 LICENSE="MIT"
 SRC_URI="https://github.com/cucumber/gherkin/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
 SLOT="0"
 IUSE="doc test"
 
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index c0b0c920fc49..7dabb145ca99 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -1,14 +1,8 @@
 DIST mocha-0.10.5.gem 73728 BLAKE2B 334bb5f3fb0f2248362f43bf2efaa879294fb46b2984e1594822f6293496f23a70fcc3f5153fd47106d5139c1e98e362ed1e71a17c590db38b3e8b22324d0698 SHA512 147c1b91e6d30598f91bc2c9311b71dd37cd83b0c870dbe7ec1a45b014ccde9ee37c9fe38b6ab250d78af9c0c5629ff4a47a208ae3e8c206eba401c2b3ec871d
-DIST mocha-0.11.4.gem 75776 BLAKE2B 9dd3a7d4e2dccf11647436087ef287ea0273623cddbc41603905509083a69f979c1e14633f5705746a6e5bbef5fd030fbd52bb7b61facfc4e5211d00dca3461c SHA512 8a862f49e0dc7f2c98d499d0fd48d567b0d20580bba7f963d4643962e598dbda75135caf53a7fa04118f3faefb75c7627dec47b2f1330d1bd4bfecd9c78581ed
-DIST mocha-0.12.10.gem 77312 BLAKE2B b71ddfa79149d33d7a5c21655e2bbd7b80aa1296c08bda3b5d5d45606e8521aadf76e3f1e34f9e3f0f4d31fba977e49263a70b61d34c9622b305afaeb07af336 SHA512 78deff0f59895e27a66d1ceb7795f92ea3338f7f3d4ee897c6c594497bd5bcfa8383777925128c8e43bafcad89276a2d0d3c6d71d3e2ca4b1de552b5576199f2
-DIST mocha-0.13.3.gem 82432 BLAKE2B e5d8f495db5df3b51b2be9d294f2c9354de979d2547e1cb1d6e70cda4a36b0170cd934b3e17e8d3fa38d4a380a12ccdb49ddf2d34662dc0dc8029faae4463d8c SHA512 4c013565644d4b3af9bdc515c7b9b5be39c606c53d0b5da4569bd7c3fd98db3f2a7e6b88e566b32277c8e8d0ea6c83340e6afd1e80cdec0dfabd41e4fe5dbf27
 DIST mocha-0.14.0.gem 82944 BLAKE2B 50a066e2f5007df08a7f76785fd4c2b12327b4969c11324a0574c707bea3219d51edb9ab40635378c16b46ad826ec7eff42434a27cd61113a6f40251fa2e6930 SHA512 918e45f2ee761c7dc399c7958e4d406f9e186c90f479fd01a421aa542944b47e9b2c5e938f4fc5292a7da345726447b2d47dc5f417e114201f8a4d9893c4d461
 DIST mocha-1.1.0.gem 87552 BLAKE2B b09721474520b57472bc54eece8ea27f0172e49ffbf43802854c111632673d05f35931150fe83cf83862471b606c70e8667327f491d280f3cc3d059e752ff0b2 SHA512 5a07c8364ae649a6be821c4b61c349d79e1dbf1e574ed95b07848f5dae3a2860e2f2e06499fc15b8352ec2146f273cc40ee8e65e670214f0f0669b6eedf698bb
 DIST mocha-1.3.0.gem 92160 BLAKE2B 10ffd1bd9b1ecb99555490b17451ae883986ef17856fb401165bb5239a2c07af2532b20bd62a5b1d8dbdeabda830c01179a025174b890be7ceff238fd9a67dad SHA512 a24de9129da65f6b37f06ad888fdb80ae987f51594980991a6ac3ffd23e9dafeedd7a2e758835f33f4de59e07b7c39449e3a49228159710bd87a3de7d3df6a3c
 EBUILD mocha-0.10.5-r2.ebuild 1189 BLAKE2B e2f7ad7e9a1427076462906dd1a56dbca10d2de77aa5092a2249301319ed29b6fac9f563f5549dcdbafb82d1d062c1d25a9f25813f8006a24f75639551cea219 SHA512 6e2e346028954787b176dc3de5188c852cfa0231bc442b902059d014780011b52bf7d079b63e826d3da76efc87669b2cc74df9a983ad45417f153bbaa7e67bf3
-EBUILD mocha-0.11.4-r1.ebuild 1104 BLAKE2B 56408bd162417ec1ddca77d6c16ab99be2ef67337bfa0e0e268e1e7874c23a565b8526a6ba83c06e631902e0fb61de7b6bdefdd19ed646d9d4b63d82b0779e1a SHA512 8239c9d49d50a3a9636c215099dc3917db1eccd7cef08c96a7a34352cf2885ae78652dbe30928dd6d393cb831d9312c88a959ca8b982421eaa237d9dc66d274e
-EBUILD mocha-0.12.10-r1.ebuild 1150 BLAKE2B d24d4aa4b07c2aa432c609b9d94939c26ce8a551fb9698af0c91a7b9909c88d966770966eebb0a641626b2aa617f0ad4a2c2ac1d2b2d6396c87fff87b6cfb58b SHA512 a832c6e25857b6aea86be90bffeedd9ef22431a11d97185388428488196569a10a70c2085d545f55a50512120b64edfaf3b66b6c8eb125beeb5ba8678a30d3b0
-EBUILD mocha-0.13.3-r2.ebuild 970 BLAKE2B 44c99d61d386231f1c5b1cf0bbcae7942d7c4a1d74ccb20ae3a4567430c2a4f7e9c7c974cdb59b83bb0a725676f6577e3da45bce054f02dafb0ee25b0e748d2c SHA512 da30332becf147dd12ab3939dad77185c9b650009404bd6e299e744a06a759bbba3ec70c9b2b88a35495e0bbd7143345647a874f3e069721f3ae99de71930a86
 EBUILD mocha-0.14.0.ebuild 891 BLAKE2B ea0c96b43633f7b6dcb242224146aecea671121c49049b96f1816b76259fbefc0916dd88c3a25d9484016ce1639c9a4796f3ef7e3c582c9d95bcfa925ea6df1d SHA512 1d03a7eb194ffe9b086ea3cead434824effcb92a9b927ee8938d052e36663283037d9a88604082ca4646c139ff3228208bbc494877a9f0d562141c9409097f70
 EBUILD mocha-1.1.0.ebuild 853 BLAKE2B 1e239f2abd34221cee9af37f775c07ed22285c3db09695e6a175a86bbbec786046e80efdaa490959144ca5e5853ffd40faae3e1743991de9df1636da153314f5 SHA512 a1f48fa4bb83754b1d6af4e5d50ed63c404c6b1e788a4d83ec2c190813b72916d73de541ad97cedf14073444aeb4bdf4174411be1fa6aa66eaf28b124b9a67ab
 EBUILD mocha-1.3.0.ebuild 861 BLAKE2B 087b553954eae1c73a77ddd5fb50d96951e58a42ac35f5c76de92606f49253eb64aaba9822709402501f7f88d0a1d5498a60033e81bb14fcb3750712ffc35ae7 SHA512 f06e0d7a05935b6605b4e2a9916b684d0fbe12e25b73d6042fc8185a870f07982f8f0088fc0fc17cdeff9aa73e00d9044f95c721f3de1d453193c8eb628524c0
diff --git a/dev-ruby/mocha/mocha-0.11.4-r1.ebuild b/dev-ruby/mocha/mocha-0.11.4-r1.ebuild
deleted file mode 100644
index 8b18f1331b27..000000000000
--- a/dev-ruby/mocha/mocha-0.11.4-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc RELEASE.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
-HOMEPAGE="http://gofreerange.com/mocha/docs/"
-
-LICENSE="MIT"
-SLOT="0.11"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/metaclass" #metaclass ~> 0.0.1
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		rake examples || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S testrb-2 test/unit/* || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*.rb || die
-}
diff --git a/dev-ruby/mocha/mocha-0.12.10-r1.ebuild b/dev-ruby/mocha/mocha-0.12.10-r1.ebuild
deleted file mode 100644
index 49ab08f21c31..000000000000
--- a/dev-ruby/mocha/mocha-0.12.10-r1.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"
-
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc RELEASE.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
-HOMEPAGE="http://gofreerange.com/mocha/docs/"
-
-LICENSE="MIT"
-SLOT="0.12"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-ruby_add_rdepend "dev-ruby/metaclass" #metaclass ~> 0.0.1
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		rake examples || die
-	fi
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 test/unit/*
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*.rb || die
-}
diff --git a/dev-ruby/mocha/mocha-0.13.3-r2.ebuild b/dev-ruby/mocha/mocha-0.13.3-r2.ebuild
deleted file mode 100644
index 373dab9d3d03..000000000000
--- a/dev-ruby/mocha/mocha-0.13.3-r2.ebuild
+++ /dev/null
@@ -1,36 +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_TEST="test:units"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
-HOMEPAGE="http://gofreerange.com/mocha/docs/"
-
-LICENSE="MIT"
-SLOT="0.13"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-ruby_add_rdepend "dev-ruby/metaclass" #metaclass ~> 0.0.1
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 test/unit/*
-}
diff --git a/dev-ruby/mongo/Manifest b/dev-ruby/mongo/Manifest
deleted file mode 100644
index ce3612defc1d..000000000000
--- a/dev-ruby/mongo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mongo-ruby-driver-2.0.6.tar.gz 173405 BLAKE2B 94363a19308627897a585594388b074348e047afb644d199763686353f4fa1c89f1a410f84ffba68a0bbd057321e83b9b323663e3200b05c4aa668e6cdb5ab4f SHA512 25e5e63538f498b42a44665d725b04e8b7ee0fae4d3331d43b883e427fccdcf0de5a1151819ba04fb6520b5d20da02adf59f1c144176bc2a458142efd5ca7b95
-EBUILD mongo-2.0.6.ebuild 1245 BLAKE2B 9aea077e63d394d385009adae78774c28c822856c1a3fdd164812cfbee2487708f3d55878261e92c1223a23dd2e0493eff03d9d5554d95b26f7f9af33488aa91 SHA512 66d724a2c7e76de24bf677b6a5e4bfe52513a30a007ca1208970d092c9e4b02e0069a6488cb3acaf46eb4a1b80a4be90abe5ae05d3c85c656324ffd4cdecd115
-MISC metadata.xml 351 BLAKE2B 725e20908ef05d137114e3115107df14c9e0dcd5cdaec4ed378db1c4d03768d712df424f7003d0fe34db45c66a49ba626247d717b3712217cb3f5555022fbaa8 SHA512 ea3f9835f69f1e2a5eb00f30d215e26b7659664a8fa72138538c4c4dac48c87bacc9aa5575b0fa193a2bd9b862bd70a5348c986ed73aef97e2c95b4cff5c6c45
diff --git a/dev-ruby/mongo/metadata.xml b/dev-ruby/mongo/metadata.xml
deleted file mode 100644
index 5e9c8a35c627..000000000000
--- a/dev-ruby/mongo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mongodb/mongo-ruby-driver</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/mongo/mongo-2.0.6.ebuild b/dev-ruby/mongo/mongo-2.0.6.ebuild
deleted file mode 100644
index 32f4923247ec..000000000000
--- a/dev-ruby/mongo/mongo-2.0.6.ebuild
+++ /dev/null
@@ -1,58 +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="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="mongodb"
-GITHUB_PROJECT="mongo-ruby-driver"
-RUBY_S="${GITHUB_PROJECT}-${PV}"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby driver for MongoDB"
-HOMEPAGE="http://www.mongodb.org/"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="APSL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/bson:3"
-
-DEPEND+=" test? ( dev-db/mongodb )"
-
-# Requires a running mongod
-RESTRICT="test"
-
-all_ruby_prepare() {
-	# Avoid test dependency on pry
-	sed -i -e '/\(pry\|coverall\)/I s:^:#:' \
-		-e '/simplecov/,/^  end/ s:^:#:' \
-		-e '/config.formatter/ s:^:#:' spec/spec_helper.rb || die
-
-	sed -i -e 's/localhost/127.0.0.1/' spec/mongo/*_spec.rb || die
-
-	rm -f .rspec || die
-}
-
-each_ruby_test() {
-	CI=true ruby-ng_rspec
-}
-
-each_ruby_install() {
-	# Remove bson code used for testing. This is installed as part of
-	# dev-ruby/bson.
-#	rm -rf lib/bson* || die
-
-	each_fakegem_install
-}
diff --git a/dev-ruby/net-ssh-multi/Manifest b/dev-ruby/net-ssh-multi/Manifest
deleted file mode 100644
index a204623de77d..000000000000
--- a/dev-ruby/net-ssh-multi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST net-ssh-multi-1.2.1-git.tgz 26500 BLAKE2B 8c5a9b6a829de3aade316bd9aa5d543fefc68df1c0b82fc0185a055ae81522b4c169a7c667b7b2ec484ac58fa36e1f392a0d655f3a02bb72d18d172f0a0ac175 SHA512 69266d8b165db67794de764511653ccf47c54c30072881f398ee240a0cbd530314e9115cdc015d7cde0d52e16c565e6469afab25b9bfa0633c4f0567faa2645c
-EBUILD net-ssh-multi-1.2.1.ebuild 761 BLAKE2B 940ca7264ea1199d1d36f95a1446050d4255ceedf77cdea7be725202981526de585bdfca0d19f5748818a93b4b0fb2b29e963abf9267adf89b2529486afd4306 SHA512 b37c3d02cd0b2c0fc9ff9867faeeab65388a96d01c0aba4a734f053e7ad627d2b07b686aeceddf12ce565e8ba38e33fddc97662a0c972493cd2b3d8d90e368c2
-MISC metadata.xml 347 BLAKE2B a74cccfddf6e99ccb409959ba4feb2bbf5542d91efaabc9557d48aee3b5ae474338070b34288b5235090eb81db82ae5283ff79270d577bf86abe9a89867bc7a1 SHA512 3ae2a1ca35a64703770c32db84b9d224d06b692dd729feb4e3ecd720630873a8ea4720fb9938f51df93d002e474eda13d4a75872935a33f3d0cec544cc2be738
diff --git a/dev-ruby/net-ssh-multi/metadata.xml b/dev-ruby/net-ssh-multi/metadata.xml
deleted file mode 100644
index 42635733b2ef..000000000000
--- a/dev-ruby/net-ssh-multi/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">net-ssh/net-ssh-multi</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/net-ssh-multi/net-ssh-multi-1.2.1.ebuild b/dev-ruby/net-ssh-multi/net-ssh-multi-1.2.1.ebuild
deleted file mode 100644
index 63139d09309c..000000000000
--- a/dev-ruby/net-ssh-multi/net-ssh-multi-1.2.1.ebuild
+++ /dev/null
@@ -1,30 +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_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for controlling multiple Net::SSH connections via a single interface"
-HOMEPAGE="https://net-ssh.github.com/net-ssh-multi"
-SRC_URI="https://github.com/net-ssh/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/net-ssh-2.6.5
-	>=dev-ruby/net-ssh-gateway-1.2.0"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/test_all.rb || die
-}
diff --git a/dev-ruby/net-telnet/Manifest b/dev-ruby/net-telnet/Manifest
index dae64dcb9d6b..a0fe3b8ce81a 100644
--- a/dev-ruby/net-telnet/Manifest
+++ b/dev-ruby/net-telnet/Manifest
@@ -1,3 +1,3 @@
 DIST net-telnet-0.1.1.tar.gz 12794 BLAKE2B 5a82e62e47cb9153b17dd6042c7e5c767ae3a9cbe0739ad769aab2fe798c7766819b89bc325f148791ce37a55ae267eb5854142d2fcb7d387fd29c32e118c169 SHA512 769d83bae55826bb99f189d06a8fb8a6d497d6c7687289f5aad2efced6f282484e5f766dc95f0158045b824532cd8f0a674ecc69883018814a009bc29d6fe29d
-EBUILD net-telnet-0.1.1-r1.ebuild 902 BLAKE2B 7c440fec89762571aaf7d327c3306e877a58e65bd618095a46fb096fd48b7aee3b51792e886af886c5cf494a1f343613f4008d59f2b21356cd3ee0d824a28c4b SHA512 0aa24ba88d89dfa17a5e6a4b11da03588928e45089f3cbeef29c7d88bcb9841bcf16e1789d16769760612c1a9e758a5585d6a7e70dde4067572ca67edd785b8e
+EBUILD net-telnet-0.1.1-r1.ebuild 901 BLAKE2B c3f8d67bd8acc77d5061a9eb1cff10c28f068e0eabf2ceb7395364eeba2c526b2dc768d7147ed540570b6e3113f581b24c28efaf13f96929852b0748ba95089e SHA512 cacf5a68775ced9163fc1eb62b51d5d23a57b34f51a59f7ba34551be422c2a7a7dfe552a171b9de9ec8c9abea69527b36d73d23428191decf2c0f7c8b4508b9c
 MISC metadata.xml 341 BLAKE2B a3489378bdb1735168037d2bf0c8798de575e898bb5a686efc06d1d2c41cb1cc674a387c8b042ee789e1bd4694a1e744759637cb820ee7d820b130a966db9573 SHA512 e536a7ac7e41bab692cde766da2aebc72df4a9392921dfc2b81df82ac128ff85cfd58900ff157046eb316cb927d58fcb48605fb364c7fcf25e82c3ed676e22ea
diff --git a/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild b/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild
index 202fdb700089..0a5d5e70c1b2 100644
--- a/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild
+++ b/dev-ruby/net-telnet/net-telnet-0.1.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/net-telnet/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/pcaprub/Manifest b/dev-ruby/pcaprub/Manifest
index ec18b8a318e3..3f876fa073bc 100644
--- a/dev-ruby/pcaprub/Manifest
+++ b/dev-ruby/pcaprub/Manifest
@@ -1,5 +1,3 @@
-DIST pcaprub-0.11.3.gem 32768 BLAKE2B 88ed94a8f767e25374fd1692007d5d2c3cee00bbcf12a911a7039ec60e8281c8329a02ac3fb8d5df03a1d9993e42b580fdcf59b8ce2e2220d981bf4afbb4940d SHA512 0ac8b5b2be85a2e17dd9f253ae3705a9faca390cefbaeae737ba20a23a3e2d95a6d492d5f7b3ecac611361a264db43cc79fddfbab58056e7de8e075fb1d1ef4f
 DIST pcaprub-0.12.4.gem 36864 BLAKE2B c2e86624431cc758059a997ebae716adb1d7de74ba62a375787608f6c68f7b85a614ec5859e251724475e1b68e8e90108f408a2e833f896461a95bda04d4d9ad SHA512 707221429dcdf95eba24076589054dd022ba8a479148c3ec8ce9667016225ee64bed13d3fdf8ebd46027244feec8e77a484c67f040d0439bfa44d9212997645b
-EBUILD pcaprub-0.11.3-r2.ebuild 752 BLAKE2B 175ae572b62b16a592b689a11e20108b492de6cca4b5a818ce3e01e77cf2a4783e38f5cb7e3995ce0c8fa39886a0168fbaedf0317c2099fe110c9a3a23170281 SHA512 ed31780dfc4bcb81a50d5939d0ade5780cbc67beeeea6e1abd772b5ef13f4fa17158d95d11b9fa3cb2bab273678e33c4425f152d314b34c173e2791fc43a704b
 EBUILD pcaprub-0.12.4.ebuild 775 BLAKE2B bce93ad392b6bc13a498bb927b0f27a45f20fd952d7f762074d5730bd9dd6a3dafa301bbd74652e193de92348f125a1741b12114b01b9a6b2a36a54a6a4dedfe SHA512 aa620e625f70ad17d7354f1a953d413b7c349d58255b74bed08dad41f5d2e19830ad640040827915c204bf3bd8708743ac838f9f029964a5e2c7d740bd506fb9
 MISC metadata.xml 433 BLAKE2B 2782f98bbd93dcc77f98585870e85b8031ec65f752050a382d3fcb637f57ba330bf40b592dd5494792977d555373abd316209df45263d8b2d411c9a4fd4271cd SHA512 0e1abd6609263bc8770684a59646ffdfedffcb5b14a4d2e160b3edeb44ce89154b58ad14e6c830e63ca39cf6799261c40182040d570d422cf4e6bd9732a30eec
diff --git a/dev-ruby/pcaprub/pcaprub-0.11.3-r2.ebuild b/dev-ruby/pcaprub/pcaprub-0.11.3-r2.ebuild
deleted file mode 100644
index 63989a93926c..000000000000
--- a/dev-ruby/pcaprub/pcaprub-0.11.3-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="FAQ.rdoc README.rdoc USAGE.rdoc"
-
-inherit multilib ruby-fakegem versionator
-
-DESCRIPTION="Libpcap bindings for ruby compat"
-HOMEPAGE="https://rubygems.org/gems/pcaprub"
-
-LICENSE="LGPL-2.1"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DEPEND+="net-libs/libpcap"
-RDEPEND+="net-libs/libpcap"
-
-# Tests require live access to a network device as root.
-RESTRICT="test"
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/${PN} V=1
-	cp ext/${PN}/${PN}$(get_modname) lib || die
-}
diff --git a/dev-ruby/postgres_ext/Manifest b/dev-ruby/postgres_ext/Manifest
index 41c75fb8aa4a..b7422d0dda2d 100644
--- a/dev-ruby/postgres_ext/Manifest
+++ b/dev-ruby/postgres_ext/Manifest
@@ -1,5 +1,3 @@
-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
deleted file mode 100644
index 2656b0f4076c..000000000000
--- a/dev-ruby/postgres_ext/postgres_ext-2.4.1.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="ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Native PostgreSQL data types and querying extensions for ActiveRecord and Arel"
-HOMEPAGE="https://github.com/dockyard/postgres_ext"
-SRC_URI="mirror://rubygems/${P}.gem"
-
-LICENSE="BSD"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm"
-IUSE=""
-
-# Requires live database connection
-RESTRICT=test
-
-ruby_add_rdepend "|| (
-			dev-ruby/activerecord:4.2 )
-		>=dev-ruby/arel-4.0.1:*
-		dev-ruby/pg_array_parser:0.0.9"
-
-ruby_add_bdepend "dev-ruby/bundler"
-
-all_ruby_prepare() {
-	[ -f Gemfile.lock ] && rm Gemfile.lock
-	#if ! use development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
-		sed -i -e "/gem.add_development_dependency/d" "${PN}".gemspec || die
-	#fi
-	#if ! use test; then
-		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
-	#fi
-	#if ! use test && ! use development; then
-		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
-	#fi
-		#https://github.com/dockyard/postgres_ext/issues/166
-		#ugh, thanks
-		sed -i -e "/byebug/d" Gemfile || die
-		sed -i -e "/fivemat/d" Gemfile || die
-}
-
-each_ruby_prepare() {
-	if [ -f Gemfile ]; then
-		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-	fi
-}
diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index f85038bfbc9f..a29e3098be69 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -1,5 +1,5 @@
 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 1828 BLAKE2B 9b31fb98384a29bcc5b93c23bd6767e228ecccdeaa7d3d1afea9ccb2a4297fa44aa6450af8b6f622ef8abba87d548eb272af87b5a99009cdb1fa22f037bac781 SHA512 a00981cb876f59793386634ee683614a04c85e0a6f0ddc6fc60370e632e758855d3066cf963f2ae43ec8f4c88fb14651386d785b70811d1e7c31a097a86235d8
-EBUILD racc-1.4.14.ebuild 1838 BLAKE2B cb0e8b539f1c2dd0c4068c16ad1ca644a604550b8b600882390f238412342bc8069295b263a743f6708015b8e55060ae558c4954986e499edc9b01b2761986eb SHA512 567b77d42645b98022a9cfb4d6bacc2bdbc5ff4ed5452c725612d10be5b3b95e3e11fc3ba4f6577bb885578e9064329c6f1c3fbba63f0155811b6a23a397a933
+EBUILD racc-1.4.14.ebuild 1837 BLAKE2B d8b8e236902701bed52ceed99e956e714b8243a118590938912c110eb8bdffbfdb5fae2b3fbc3fe3402f9024a454d3142274e57eb8538ddfbb34ce3e7bbf1638 SHA512 3a6a5c1bc2c6b907a39489e9e6633ddd91e730644529e45fe365b9346f1d5a446143a16492d006d208cba6dfd4041dca938b8d695c54328b0eb82043666473cf
 MISC metadata.xml 331 BLAKE2B 67dac6bbbf2927c5fa694a0de98635c952eab8ceffa913aac7762c88625957b83f7bbeb22dbab5adb445b306e7bb5efed458e23b9a2c8137e65c36b4d12744fa SHA512 cf609ee98391504a83037f2fb2601b7b4f5dcb3ce58be9dfb895b8b961ed54e19d9782979cf24f1c1187087c1a8482e755d24abec089187870dd6361f17559b1
diff --git a/dev-ruby/racc/racc-1.4.14.ebuild b/dev-ruby/racc/racc-1.4.14.ebuild
index bd74491651e2..229565dd05be 100644
--- a/dev-ruby/racc/racc-1.4.14.ebuild
+++ b/dev-ruby/racc/racc-1.4.14.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-protection/Manifest b/dev-ruby/rack-protection/Manifest
index 457fa8459a9d..a950ed2980f5 100644
--- a/dev-ruby/rack-protection/Manifest
+++ b/dev-ruby/rack-protection/Manifest
@@ -1,5 +1,7 @@
 DIST rack-protection-1.5.3.gem 18432 BLAKE2B 96daf85f6b51b4a8c8992109ccb0821b9f713166965a6d1392f20a966e3502facc4294c0a824beaa395306e0ba3234902eef717ed839e3e3ca907deedf83370d SHA512 9f94f9f25197c3f8227f5c9c9fd2e896e35bfc08d4a20f4dded9c42772f348d16dceda6916429833b498b29c4dbba4dbb31b1a3cf90de597fb6df2de145d655a
 DIST rack-protection-2.0.0.gem 15872 BLAKE2B 706fba47a09565bc973a5dbae3369cb26d02839be92347bb153c5f12054ef605e8e025a0666cb0aa44aae316ba494fffdbb7bbc840dfefff9b3e0b0efd39817a SHA512 cce6a8a64c502e4cfec47ae3d76e71aef42b1eec5aa4802a6c443fcb7a8971a99ad9a5b34fea7ae878630faba10d4f5bde4d9a3eb66f63600fcaf02d9ecc0c2e
+DIST rack-protection-2.0.1.gem 15872 BLAKE2B bd2b17d21767f4f6772400168ddd53491693780b62359d526739580cca66b5b27d4f4c6f419a6ef695ffbef5ff9045bac683c78117765ff784fda136ec102090 SHA512 6dd525384a0027a1943741881168433c63dc2d18093833dffb3417f3f6ccc46d597435a880d297d07751db1c449f3e37942ae03e33d378dbc74caec38c5cf1df
 EBUILD rack-protection-1.5.3-r1.ebuild 720 BLAKE2B ad7219b5ad108d2e851eee04ea99dd298d7e0d9e5fcbe79ca1d729b1ff9a9feb956735c6976201e0166d5f7ce7f387cac5cd22e07911d634c52218d74965711c SHA512 03804266f97f678734bc79a95392fd5bd1b9bcb4ff48f0e51294e8fd1feafc2a7dbf8adcbee420f90817b2931a322ebdfc9f8f8d5c3dfd935beacd042cdf6a31
 EBUILD rack-protection-2.0.0.ebuild 790 BLAKE2B c6e9c7085f72d26081ce76b3ae5ef7eaf46aa9efcb835cafa00c27e39a77a98706767e6068b60e67287c3936f5ead1b47c6acf57a9b55627a09b2a8247909156 SHA512 f0896ecd0cd997e4ede9ca7f76fe6b680f77c694b49be4b95590b292588fc04000db94c348389ed470e14a26f592d506877ead2e6a629533f3dfd543c4f297f5
+EBUILD rack-protection-2.0.1.ebuild 783 BLAKE2B 3b21814b236d7963b487867257d83464648301cf92f8d619b129b5407af7ce4a93949722b9c38720a8ccf8901b08ec6600db73d9e1f7cf0bc0b545b0c5c32f10 SHA512 40230459e2bfcd3b90b95a1f7a01a8bb7460ae5bb4fd7d2e61c7b14e3aea89c474e20e8547de164c25cc98c9e084765a625ef07661f9fe85c6149c62aba6463d
 MISC metadata.xml 488 BLAKE2B 1db94e175d1248a334fa9ff0b5936d0281a1ee2ef69974cc33ba65e19de9ae043e98599a52f5cc55d3e1ca3e5bef3e223cab7f3be0ad9b561b05d81da8c09687 SHA512 ad0122f6e0dde2c02a1af8b8e81a5aebb1a13e0f56dd8f222d6f051da55015a89db0430efa6c1e6b5e193a94ba69d0244498d7cc14f0212f8032393a7f5988b8
diff --git a/dev-ruby/rack-protection/rack-protection-2.0.1.ebuild b/dev-ruby/rack-protection/rack-protection-2.0.1.ebuild
new file mode 100644
index 000000000000..58c4ac881ee6
--- /dev/null
+++ b/dev-ruby/rack-protection/rack-protection-2.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+# There are no specs in the gem and the source cannot be downloaded separately.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem eutils versionator
+
+DESCRIPTION="This gem protects against typical web attacks"
+HOMEPAGE="https://github.com/rkh/rack-protection"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+# ruby_add_bdepend "test? ( dev-ruby/rack-test )"
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index b762816af505..f1e64da1397f 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,13 +1,9 @@
 AUX rack-1.2.1-gentoo.patch 410 BLAKE2B 18246afd31b682e66a5bdd92c08bb9faed9a9fe22fade22f2c124a3a499b67794082e1bd03081c1914793003fe3c0a73b2d42f51395fc2603eb6513a3b404ece SHA512 03dba431bbdd77f87e0f26ccc6022248edbde20930254da1c55db6115dd49be5dd3f16919e15ee7baab40682b3f959b52692d5018b09ad79d4db3acb3adf6f43
 AUX rack-1.4.5-fix-test-ruby20.patch 1043 BLAKE2B 0855e3e996b26d961fef09cb12254a2b1b5bd9e29e86c71b902d8c7a8c7f525d0aba39f6f381c7b6a67332a0a8784cb03b3c4b7d073610660a68534bc6f9e7cb SHA512 93d188a60d8c9aa0178319b08ea1723fec5cca9efbd308f56149e90964b9cc991f82cb9e3603962ff35dfa225b9da2a7d28949cab16ee8503a280dc12b59d9c8
 AUX rack-1.6-rewindable-ruby23.patch 1360 BLAKE2B 062c4a474959c4dce61969583b6aec1ae98acff38c1e72f5e22440c4c8938dbaa2142d70a0354948c151eede2b23ca5accadc72aeab366ca1457216d9725292a SHA512 3cb110af584cc3f767a0d3976acb66f37423559865af0726109419728ce6fbe9f484ac2340b1816ae89c1a59ca64330c1bfe4be3910bf6a8ecb05784115a1cda
-DIST rack-1.4.7.gem 204800 BLAKE2B 4572e736215025900c254781e98de91ea4d533b039215c3dc268f111e8bf6c87a4bd73dbd7c4d4cb90a8d2c6375dc3c5a4792a15c6992addecaca516c470c0d4 SHA512 26391faec30b12981413eb1f433bfc9be5d124689bc3ae6e32de7d544917f2330fa4f9255c6879632f2edae5a05a4198454b8fe1310bcdb3d2e0b8b336a20359
-DIST rack-1.5.5.gem 216576 BLAKE2B 4fd13cb14630f6f3afbaac76bb554f46520c125b50d4bdb12fbd939c83af1e189e6f2fb55565a4d3790258e28bc830dbcaa0465622eb9f78b8b9220ae0c9e11d SHA512 7b8ea669c55fa94801aae20612076db702837194bc602c64bec1085836712806a081504b37e4c545bcccf0337e7afc0ad9dca3c1258260fde5f3ec505247056a
 DIST rack-1.6.7.gem 229888 BLAKE2B b4ea51d9a0606c92c6cc199bcaf3f7068e6360dd972417af7fe8784a5b23a8de1288347431f08d9af1d19f1409f18035d668d6e80f0b2080d761a3e703259d0c SHA512 e1cc22d78a61998c034bbf9217cad5cc0e614697e787f58aed9cfb1c3a12f69b557c9e95a4b09fcc1509cb607332a8655a66159b2492ea6fdc2bda21f588a59e
 DIST rack-2.0.3.gem 254464 BLAKE2B c7052ae0210d2c8d9aeaa6e3b5b10b272ea48d6c2601aecd524eeab141d3987b7905d9511814d0ac7a62413ef5eb01e847168a278bafb5a0e8f882c526cdfcc9 SHA512 c48e6681544c2f37797ee697f5c4f0d4de6008a3df2506665b52c248fca1ef7321a892dd28475e4d7b461a0b2d12112903a67e1bed7c7397742833fce85167e1
 DIST rack-2.0.4.gem 254976 BLAKE2B e816bda9969117525d061b2de2e9172d831a1fd0654ee5f4ff0293a95c01b8451204cab034816f7b2382b77cae3c9a735184f3f1c8f5b9e8cb43963001f815da SHA512 d6624d52c456654ab4c98554d544c6cb0bd15fad5a494575ad329bd1892dca2ac612b5730f4e3f6eddf2c0496afc393f215fb7d60795c264d2251896c27f450a
-EBUILD rack-1.4.7.ebuild 1557 BLAKE2B cbc32e320f170ee5347549eac30dc2dfd47ff5d7de2277ed2ad2d0f09fef14f41b98194369afacf21179ffc00fe1d28a09c5ce2710918cee500720f6ee96a68f SHA512 b239eb29871e63a8833c59f38d32703ca11463040f2606dadacf43b382b52cb706b0e1e9e223ed1c956d28470c51b8b038492304c657214e7fb8c7b45b61bf74
-EBUILD rack-1.5.5.ebuild 1390 BLAKE2B d02e9894ac29f189ef11dc64c3388dc9e1bc1f160c27f0c0800f6a2fbfc6fe97f91d4d34aff5cd5e61fb237a15dd91fb0bf06377de81609707a32a8d1c8db2ab SHA512 e71a13d85c2bd8513a14fc805ed3ae4795be5de773e9cf9982e7ba3309695f97b221de9a84856ee9e2465c28de88509a1a48e0af5d33b209a0341ad5fcc62ca1
 EBUILD rack-1.6.7.ebuild 1650 BLAKE2B 33d989d656b6b63de13a30e8ba021596107bb19457e3a04142d478a11bc1d45414e5adfcb7b1ce6164049cd3bac6736e59ee9d6d515be92cf4f119b44bc04f09 SHA512 19bf31a91818bb58322c68978825af255fc32a75aa81906de61f436f477b6ab75a96949079de2c68753fed5743b937d2190330fe19f1eaf16fa9d157709a0053
 EBUILD rack-2.0.3.ebuild 1508 BLAKE2B f5f9bafb1ca637b1303cbf44a32b77b1969e8b773408141de007781524f40643fa59e9b37bb8feb92e950fecb7fa4b96f0d1fe4e8db2c9ab9e7cbf15f9dfd1b3 SHA512 e62cc26861382a150c813a39a5aef7d9e41858ba415f03f789333e4e9f64187b506df4bee860abfca3a2c120b2251b416c3058179be47ca58a4138437145895a
 EBUILD rack-2.0.4.ebuild 1502 BLAKE2B 347d8a48482ba6eff1ef94b9042ba32165977f2c182895f0f9843e916fef267387529a0696ed4329f1d6242f1c27f3489d4402b518e7805ed767fbb40e538d41 SHA512 c62fee19f221abab58b7e9a5d319b29a7cd65b1b08cd057aee3a7cc2a5323f0089809da8de0c1f8995c8849fecc8e77f1673d90b642de31343d3e0bb61beb09f
diff --git a/dev-ruby/rack/rack-1.4.7.ebuild b/dev-ruby/rack/rack-1.4.7.ebuild
deleted file mode 100644
index 518e1116c544..000000000000
--- a/dev-ruby/rack/rack-1.4.7.ebuild
+++ /dev/null
@@ -1,42 +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_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="KNOWN-ISSUES README.rdoc SPEC"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eutils versionator
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://rack.github.com/"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-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=""
-
-RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch ${PN}-1.4.5-fix-test-ruby20.patch )
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-# The gem has automagic dependencies over mongrel, ruby-openid,
-# memcache-client, thin, mongrel and camping; not sure if we should
-# make them dependencies at all. We do add the fcgi dependency because
-# that spec isn't optional.
-ruby_add_bdepend "test? ( dev-ruby/bacon dev-ruby/fcgi )"
-
-# Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} !<dev-ruby/rack-1.1.3-r1:0 !<dev-ruby/rack-1.2.5:1.2 !<dev-ruby/rack-1.3.6-r1:1.3"
-
-each_ruby_test() {
-	# Since the Rakefile calls specrb directly rather than loading it, we
-	# cannot use it to launch the tests or only the currently-selected
-	# RUBY interpreter will be tested.
-	${RUBY} -S bacon -Ilib -w -a \
-		-q -t '^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|Rack::Server)' \
-		|| die "test failed for ${RUBY}"
-}
diff --git a/dev-ruby/rack/rack-1.5.5.ebuild b/dev-ruby/rack/rack-1.5.5.ebuild
deleted file mode 100644
index 7e90b68a6c6d..000000000000
--- a/dev-ruby/rack/rack-1.5.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="KNOWN-ISSUES README.rdoc SPEC"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eutils versionator
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://rack.github.com/"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-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=""
-
-RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch )
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-# The gem has automagic dependencies over mongrel, ruby-openid,
-# memcache-client, thin, mongrel and camping; not sure if we should
-# make them dependencies at all.
-ruby_add_bdepend "test? ( dev-ruby/bacon )"
-
-# Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} !<dev-ruby/rack-1.4.5-r1:1.4"
-
-each_ruby_test() {
-	# Since the Rakefile calls specrb directly rather than loading it, we
-	# cannot use it to launch the tests or only the currently-selected
-	# RUBY interpreter will be tested.
-	${RUBY} -S bacon -Ilib -w -a \
-		-q -t '^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|Rack::Server)' \
-		|| die "test failed for ${RUBY}"
-}
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 9bad5038f682..7ac06d8204a7 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -4,10 +4,12 @@ DIST rails-5.1.1.gem 6656 BLAKE2B af350844951e92ac240585cc0e78217ca877573c501957
 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
+DIST rails-5.1.5.gem 6656 BLAKE2B a6d86d40c215ba343f4bfeb5bb11db15a3f3b0d5828df3a8179f678b8df313a49952bed21842bdfe71965d80da88ce08fb665a3a843ff5ab4115e49ca71f5a8e SHA512 33aa51d13261b2cc040a603f3a94a2a56d02e7e9f2591d46b43c72a00923b7869ec61ae288cb19a6d90789ff322c4a536f715ddf6d79eddf6ae8bc72f1b3332f
 EBUILD rails-4.2.10.ebuild 1117 BLAKE2B 4e31a087075b1e4ce236a372a4dda915467c1aa020a0de9d56ed01eae3a7011838f476da849faff693be03c13036a42802881d145e8cab62af87e0cf51d8ac6f SHA512 a7fcdd075d0cf39399307c017bbc4c04529ac30a2229c725e762a692a911e533574338444a885835aabc0c07dc69ff82f79f38c0a428475ccfa5965b26332967
 EBUILD rails-5.0.6.ebuild 1071 BLAKE2B b70df468058ba620fd44049ee714350e04450a15688ae8e5171bb5222b2e90346ba6b54cdf4cf89348844d923bc79e4158d9a0b40e3d1feb2bf965ece8a3d79c SHA512 cbdb54c6799b1b25dc3d927c332a6137f7106c5f982442cc407e119d96bc63d892cc884c0ac139ccee904c0d45ee92db0898f95a2d612a54a1005f295b2e55ae
 EBUILD rails-5.1.1.ebuild 1059 BLAKE2B 451efdb97dcd756cfc4f154efe168a0cad074741190e2d81fdd10139d0042fdddfc00eb13b7aea37397c6ea8be500f8ccf82743482eeedc3255ac6bad619ba81 SHA512 087da95795fc9e9585903c3aaa6fc4164ef568f3551eab807c0048bc6d6351e4d5f8c5ba2969442682c4f0098f07fd558a384374ae2a6a9e7d521b68da8c9fa1
 EBUILD rails-5.1.2.ebuild 1066 BLAKE2B 6500a6a3e24868f1095c1ff0a3d743273fd17a0885f8b49f0dd8a2b8d4259285b11f66732890bab9f91367583adc62a3756bfb2e41185ad43b0fc8dc793eb47a SHA512 31501ee766fedd24cc140db6a9d370a3cb636315497b4430cab9bbfe54153701662fc97a23067145078f70b5bec7d6410985b8d368d1355bb53a9327f9ec6331
 EBUILD rails-5.1.3.ebuild 1066 BLAKE2B 6500a6a3e24868f1095c1ff0a3d743273fd17a0885f8b49f0dd8a2b8d4259285b11f66732890bab9f91367583adc62a3756bfb2e41185ad43b0fc8dc793eb47a SHA512 31501ee766fedd24cc140db6a9d370a3cb636315497b4430cab9bbfe54153701662fc97a23067145078f70b5bec7d6410985b8d368d1355bb53a9327f9ec6331
 EBUILD rails-5.1.4.ebuild 1066 BLAKE2B 6500a6a3e24868f1095c1ff0a3d743273fd17a0885f8b49f0dd8a2b8d4259285b11f66732890bab9f91367583adc62a3756bfb2e41185ad43b0fc8dc793eb47a SHA512 31501ee766fedd24cc140db6a9d370a3cb636315497b4430cab9bbfe54153701662fc97a23067145078f70b5bec7d6410985b8d368d1355bb53a9327f9ec6331
+EBUILD rails-5.1.5.ebuild 1066 BLAKE2B 6500a6a3e24868f1095c1ff0a3d743273fd17a0885f8b49f0dd8a2b8d4259285b11f66732890bab9f91367583adc62a3756bfb2e41185ad43b0fc8dc793eb47a SHA512 31501ee766fedd24cc140db6a9d370a3cb636315497b4430cab9bbfe54153701662fc97a23067145078f70b5bec7d6410985b8d368d1355bb53a9327f9ec6331
 MISC metadata.xml 491 BLAKE2B 83b3fd3239655be2b30f22235bac80ff14e4c7480a50a32921ce1be24e898b62b68738d635f037ee2a5c5e645b616aa5a2f9e3f1f7df09ca59378ff30f35b6ab SHA512 329f17a58eab42893f554965a142409c32b26e1b195ee315a833ccc96f3081e8920d2c97bba0230a03c882c027a0184f340b8c7760d4e1b3765041f56781769f
diff --git a/dev-ruby/rails/rails-5.1.5.ebuild b/dev-ruby/rails/rails-5.1.5.ebuild
new file mode 100644
index 000000000000..288bdf5b1bf5
--- /dev/null
+++ b/dev-ruby/rails/rails-5.1.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="http://www.rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+IUSE="+asset-pipeline"
+
+ruby_add_rdepend "
+	~dev-ruby/actioncable-${PV}
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/railties-${PV}
+	>=dev-ruby/bundler-1.3 =dev-ruby/bundler-1*
+	>=dev-ruby/sprockets-rails-2.0.0:*
+	asset-pipeline? (
+		dev-ruby/jquery-rails:*
+		>=dev-ruby/sass-rails-5.0:5.0
+		>=dev-ruby/uglifier-1.3.0:*
+		>=dev-ruby/coffee-rails-4.1.0:*
+	)"
+
+# also: turbolinks, >=jbuilder-1.2:1
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index a8833af0d070..2541dd9cd43a 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -4,10 +4,12 @@ DIST rails-5.1.1.tgz 6124695 BLAKE2B 6a02843a036594d02aee37413713950f495db24651d
 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
+DIST rails-5.1.5.tgz 6142269 BLAKE2B e31b6fb39df4a5cbfa9acd31058b018f5eb8d45d0886d9cb1de5d7de9ed082b67f27d257ac8eeffb0a2663466bc958c72d63309f0a68989d189a11510e835e3e SHA512 8fde1b043976c6bd69235ccbfc1f4ab593fa0cb7ec0dc0cbafcbd2727dfd1b405cc6131e41cc40871bc893cc64f524a347dd91efd1816b724deb5ca1cf879c63
 EBUILD railties-4.2.10.ebuild 1711 BLAKE2B 038ff72491477f62a688557cf1e27735712213f51929cdfbd52334ecd9467c3f438e1d8715b5dc2ab5f6d4320ca8392b2d1aa9265cc1507d43166f9b58201327 SHA512 75b866aa49ed46636f461bbc596b5e278d5e7ecbf9a68ea7ad5bed3c19044461a23f67beb09826be678d559cddc0a95206de7e48650fa79a864c56bec566f073
 EBUILD railties-5.0.6.ebuild 1841 BLAKE2B da7596d222885cc137bbac538460a1324c92f05578c4768bc2c2355ce849ecc6de9db21e85c382aeae78fbcd17cb500b8e7d7a4ce4f0f77d4dbc2f645f28a9d3 SHA512 93bbfde4ff6f8e8eb143dda48cf6191ba0a7c9fc52df302a4b97dfd203b6a8bb07c78e483015c937994b3998fa02e87305a6be8e7379d74c93535ca1fd7fc0fc
 EBUILD railties-5.1.1.ebuild 1651 BLAKE2B 4cab3c27ebfbcbc87b52401ebe8bae65caa0c390c651dc69453ade6158023ad8f1bbec82e443e51619eb2b8d21e2aa9d1748ac9ac8da02747a306005263ac5d0 SHA512 fb25e9b7932c90c5fd716dd88c0d1510a7c689f7e986e1be2ded79d57a0e03f40ce8eaff533f76521ad4990c972c75bc52bd9065639d97ababfd0dc5ce92bca6
 EBUILD railties-5.1.2.ebuild 1653 BLAKE2B 540d2f91b82becb540cb330e73a7297e947caa16004f60b7456db5abce2631e7ac15ab9f5de7bf8da82107da3d69c107a19f8df574b4c7f512c34402f8faeb24 SHA512 3f90b43e2f5bb72c76fc8efca56973ed49ebfad29a5f606b02c3633f330f5d38bce33316f38c1857cc1c287fe004f65c80c3d43be1c608b2edd3b740371fc2ce
 EBUILD railties-5.1.3.ebuild 1653 BLAKE2B 540d2f91b82becb540cb330e73a7297e947caa16004f60b7456db5abce2631e7ac15ab9f5de7bf8da82107da3d69c107a19f8df574b4c7f512c34402f8faeb24 SHA512 3f90b43e2f5bb72c76fc8efca56973ed49ebfad29a5f606b02c3633f330f5d38bce33316f38c1857cc1c287fe004f65c80c3d43be1c608b2edd3b740371fc2ce
 EBUILD railties-5.1.4.ebuild 1659 BLAKE2B 2fc6ab322bd061a9e74076d28952f6253b92f3d4ab7582d7f19147e2ea794fba799fc219625f638846b08e671f06f7a1580f5e94ff19272f95245bb2d4c7fbf2 SHA512 a0716716b46a9771b9d8fe7a1d4e3ca815fdb7321a71716b752b2afed60b565ecc43eb469946f6d2770a6bc72b152b13a8b550297a113666c822a742aed2d8fa
+EBUILD railties-5.1.5.ebuild 1660 BLAKE2B 2ff4cb59ac896573005d6fd458dcd359c309337b0de6b93f3d0effb489bf2a2e58b48b5f756b8b0acbc92806e7bf79da81c81e24dad042b170e5289af48bcf2f SHA512 757b17882ac235be261c6651b63797b839c1e70cd68444ec0b695bd91cb4d3919d7b05f47a8899cca8dd75393df44621cdc8c39cb74e5af9399def58b001a0ec
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/railties/railties-5.1.5.ebuild b/dev-ruby/railties/railties-5.1.5.ebuild
new file mode 100644
index 000000000000..0d85404938c2
--- /dev/null
+++ b/dev-ruby/railties/railties-5.1.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+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 ~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.23"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	>=dev-ruby/thor-0.18.1
+	>=dev-ruby/rake-0.8.7
+	dev-ruby/method_source
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/actionview-${PV}
+		dev-ruby/mocha:0.14
+	)"
+
+all_ruby_prepare() {
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+}
+
+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/rbtree/Manifest b/dev-ruby/rbtree/Manifest
deleted file mode 100644
index ba58fd23934e..000000000000
--- a/dev-ruby/rbtree/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rbtree-0.4.2.gem 30208 BLAKE2B a79b02849c98034b718040411a03de4a04e9865bb8429252571a1f761329332d414530b8df7bee2d81956394987bc66017049ca041893f987d139ea62e6deb7e SHA512 84a6cb5567e319e5ee830afb0fe4f64697a2748099e2976e85a2998123f4fe4acdadb1ee9574178576ffc5e989e15c6ce033ebcb58e24fcec9662a3feee9eb20
-EBUILD rbtree-0.4.2-r1.ebuild 735 BLAKE2B 484742409841b66c156646e2efd43168165bdbc3259715da4371704b4bea2e3d945b5ea3901f54c565bfa609e9d6dc01102f74f5bcbe859a21685cc552f199f8 SHA512 aec47319cf688326c83733bf8e68ddbc2ce222d21b24b0b76a5b85be5b84327d1544d7f9fcd33f85e72dbcdf899f164f3a19eff6e65b55869a4fd1b84145b402
-MISC metadata.xml 505 BLAKE2B 30380886c85ee7b1c6a01b07ea7a5c9b06cf1ebe660c5326b4b11082c0714a653a8cf72296d4c7b9ca3fbb177f206568e4f79d1cdd9fde35aebdb0fdfd4ec448 SHA512 e7e5417702625dff54e25eeafd2da3a494589424bcfdd05c48e4ddc7dfe78dc1d4f2fc23a86b8e5844bc8063fd9c4af41bb241dcbe58007cce3a561cca297f23
diff --git a/dev-ruby/rbtree/metadata.xml b/dev-ruby/rbtree/metadata.xml
deleted file mode 100644
index 2f1bf407848f..000000000000
--- a/dev-ruby/rbtree/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
-<longdescription lang="en">
-RBTree is a sorted associative collection that is implemented with Red-Black Tree. The elements of RBTree are ordered and its interface is the almost same as Hash, so simply you can consider RBTree sorted Hash.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-ruby/rbtree/rbtree-0.4.2-r1.ebuild b/dev-ruby/rbtree/rbtree-0.4.2-r1.ebuild
deleted file mode 100644
index cc62c6aef3e5..000000000000
--- a/dev-ruby/rbtree/rbtree-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ruby23: fails tests
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby/RBTree module"
-HOMEPAGE="http://www.geocities.co.jp/SiliconValley-PaloAlto/3388/rbtree/README.html"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-all_ruby_prepare() {
-	# Fix test for random hash ordering.
-	sed -i -e '527 s/flatten/flatten.sort/g' test.rb || die
-
-	mkdir lib || die
-}
-
-each_ruby_configure() {
-	${RUBY} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1
-	cp rbtree$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} test.rb || die
-}
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 88512931366c..3849c81111c7 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -6,7 +6,7 @@ DIST rdoc-5.1.0.tar.gz 702376 BLAKE2B 733d77a341ddad10f5b648b6bb492e0f79daa392e2
 DIST rdoc-6.0.0.tar.gz 696677 BLAKE2B d12ce5a22462b797252182244bbd2d1089c557a77f901224b06bc75bbffc9c50055ea0de5808a2055293730e0e79632bd2361a814eb5370b05c33a225c2e0d2a SHA512 18669123b3d712f73f901599a3ae903914369dc3c985651b7bc7ff6e1893a834e6c5688ced97ea6324e6af13050d151bee5d62f44e7a4a1cb8d314acac77b50d
 DIST rdoc-6.0.1.tar.gz 697323 BLAKE2B 7af4a3189c6680ae3d92b7a0b7764e73a104017b49442d89ffa0e2da2d504e7493b6842a3b5b60326e8f633a10447e2e6efb17ff61da7b6e4e55b52d973fa523 SHA512 43812f068b430d4462821098bca1a1f0fc2adc63c6f358a48b4af94aafb76d33eb494ef06f91aa72065f128fb0d34f53a05cb246f0c4fcc31ce9c1b31658d108
 EBUILD rdoc-4.2.0.ebuild 2796 BLAKE2B 514132cad27ecb546f55be2b14f9904ec09306eff42afc836aaaf61a8a2e056db6337d6cd2bd7769580961fef39bb35c570d0d190c0543fc03177ebadf34ec00 SHA512 02f126f26d26b4d033e4dfd35cf9d5ea623b9af10f230ca8a1c1dba9f0e7c72c9e41ee261350680ae5ea666dad842d156c103b123c661cd1a58665547a031952
-EBUILD rdoc-4.3.0.ebuild 2704 BLAKE2B bbcd2708a52c49868c6718260b1dd90e8c26195effeef291ab1277f4ff456f785dedb1d2ebca8d84067c0c385e8ceac6079766dbf6dfb67832806c92abf33c95 SHA512 d51a9f66268f196e26eb2314d423f124503f78fd80986c5cf3cf7029c00f7600032c1fa480cdbf753cb3707ad20de0ac8ab4feb4342d94462697ecd67ebcea73
+EBUILD rdoc-4.3.0.ebuild 2703 BLAKE2B 9a0a2a8732db2340a27d99cfb1d6f23a773da22af39666e58a029315726cd1fe72bf31436d29727952ffe5309c05b1d4bc2e19c5e232b21b1b6db6919d2cf7e5 SHA512 c489178e4c0c3b2c37d4f3017f557629b95a4c7a4aee6e5c2e48782e2abdc56997940458e1f525796498187bd881841c53864fe76e0f7149db5d979280129aac
 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
diff --git a/dev-ruby/rdoc/rdoc-4.3.0.ebuild b/dev-ruby/rdoc/rdoc-4.3.0.ebuild
index 49d59beed562..79b2bcc682e9 100644
--- a/dev-ruby/rdoc/rdoc-4.3.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-4.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/rdoc/rdoc/"
 
 LICENSE="Ruby 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=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/recog/Manifest b/dev-ruby/recog/Manifest
index 28753f637305..49118819a8b7 100644
--- a/dev-ruby/recog/Manifest
+++ b/dev-ruby/recog/Manifest
@@ -1,5 +1,3 @@
-DIST recog-2.0.14.gem 193024 BLAKE2B 16cfa639970495235945c345c592c4da6acc9c61e07c7c6ef4bf6efea7c7a665229c56904ee073a090720cd0180d908f25c2e0a6021ca1afbcd0c2112cdc0db3 SHA512 6e1a3872f1daaf86c00c1c535b5019761efa23af83d4ccf5996fa3a1e66a1aa468603e3582f48b88c74dc419b1a659ead683781f3c93f4f315d4aeebbf95f768
 DIST recog-2.1.6.gem 214016 BLAKE2B cfc29bc2dfe887383d321143db00dfeb1f72106c118c9848b8fdfe871047f465b59b04afa7de13b8269686d328856de26497f89ba9bd79b9198c480340872520 SHA512 21e6f3116252e8d6cfa6abe14adb100b2d2637e8f61852c86266467465056f06bf25e4eb17ac874c772963b2b13e31f84bd157bcb058fe0f58d6609b2b2d0c15
-EBUILD recog-2.0.14-r1.ebuild 756 BLAKE2B 3d57018f0dde6dd596e04653cfc8f543ddaff3a5b09a87523d98f1fbc127d8949288f971464685ab448d891c1079d4de18874776cae0b399e0f2584205bb1428 SHA512 cce3a16f9abacd08e1dd1ef2908a0d4275518d5e54c4a9cebcba33d960f66c16d95b12c1543267639bd66b0d0f6d69fdb8e94b01b42e645c1141780de3cecd3a
 EBUILD recog-2.1.6-r1.ebuild 784 BLAKE2B f4822abf41ed81301fcb209d0624efeb526f637ad23c608a94047cc4eef391b0be06ce1d0f3a56724adb4359e9a1fc96d10dc621bbc60f5b011bbd9b506f13d9 SHA512 0ba37fb717bc93c839f959e79790a0239c4355bf68f0d22fa3adad691f7f9903b95810f5f1a735de6b8d26d846d412a9b4086d153a8ae610b937a3733fc16c48
 MISC metadata.xml 334 BLAKE2B bccb589153c4961a76c8bbd83ace97d4295b5c6a3b66ede325156940c8d0a1119bfaa838caa5d1e7ffb1363e4a3cbe8d2899fc2430b051dab63b11709f16d190 SHA512 cb416ad148d55b439a260d17b6f014075031a7b60cbf686b75e2b34f4d7bf82a8f0001c84f0dcbd9506a855a64dd20902965a0744cdd9fa06f6391929d5245fa
diff --git a/dev-ruby/recog/recog-2.0.14-r1.ebuild b/dev-ruby/recog/recog-2.0.14-r1.ebuild
deleted file mode 100644
index bae0d347d824..000000000000
--- a/dev-ruby/recog/recog-2.0.14-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pattern recognition for hosts, services, and content"
-HOMEPAGE="https://github.com/rapid7/recog"
-
-LICENSE="BSD-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/nokogiri
-		!<dev-ruby/recog-2.0.6-r1"
-
-ruby_add_bdepend "test? (
-	dev-ruby/regexp_parser
-	dev-ruby/rspec:3
-	dev-util/aruba
-	dev-util/cucumber
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	ruby-ng_cucumber
-}
diff --git a/dev-ruby/right_http_connection/Manifest b/dev-ruby/right_http_connection/Manifest
deleted file mode 100644
index 47b5a7db9b28..000000000000
--- a/dev-ruby/right_http_connection/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST right_http_connection-1.5.0.tgz 120451 BLAKE2B 83b44f205ee418548b6bc70342cf0cb0429a21d624d65ee5bffe447e1aef8e286ce634dfce3bda0c1f5e480bb98dfe1f061eff40ed8b8360bae3d864577c3ee7 SHA512 7db0e85ba8140343ef06bbfce2d9ee5f6ce6823fdcfee71875c74a609e77de043a0e5d6fced18ee2bd111ea6a8a592d3855e1547dc2bfec0e963e446c366aef7
-EBUILD right_http_connection-1.5.0.ebuild 1206 BLAKE2B 433b4c3441e66fd29a4a5866eee8efc7e576c579514193b02dffad3036b15c7102751a0b4571e46c344a46378ccf73d474f8bd9be34fdcb4eb6933f554a64ab8 SHA512 e6bf6588f53fe61dc8ef22bb49706e5f53053d23535950ee2e0028fb75a0802fc821869ec4840d2c455a4b920d18e818a0a22991a09797d187048257107a607a
-MISC metadata.xml 358 BLAKE2B 026d47f4d3e9a72f0a1844180a323ab3ca5baea82a7a6445c103ccb4ab9ec1330d559cc84c23df690aabe74f09401f980691799030afa8be49db553c27056a87 SHA512 eb21d48f5932674ee17f589e29644b8c87cfc530244bd8423fc71261c45b5b85b44f481812929d03e99b4d5bc99e37c30f052dec7eae954e5fe93520d83ea35a
diff --git a/dev-ruby/right_http_connection/metadata.xml b/dev-ruby/right_http_connection/metadata.xml
deleted file mode 100644
index b317a7489014..000000000000
--- a/dev-ruby/right_http_connection/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rightscale/right_http_connection</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/right_http_connection/right_http_connection-1.5.0.ebuild b/dev-ruby/right_http_connection/right_http_connection-1.5.0.ebuild
deleted file mode 100644
index 663d90839760..000000000000
--- a/dev-ruby/right_http_connection/right_http_connection-1.5.0.ebuild
+++ /dev/null
@@ -1,50 +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_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
-
-RUBY_FAKEGEM_TASK_TEST="cucumber"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RightScale's robust HTTP/S connection module"
-HOMEPAGE="https://github.com/rightscale/right_http_connection"
-SRC_URI="https://github.com/rightscale/right_http_connection/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-USE_RUBY="${USE_RUBY/ruby22/}" ruby_add_bdepend "test? (
-	dev-util/cucumber
-	dev-ruby/rspec:2
-	dev-ruby/trollop:0
-	dev-ruby/flexmock
-)"
-
-all_ruby_prepare() {
-	rm Gemfile Gemfile.lock || die
-	sed -i -e '/bundler/ s:^:#:' \
-		-e 'arequire "rspec"' features/support/env.rb || die
-
-	# Avoid features that require manual input (PEM pass phrase) or have
-	# certificate issues due to unknown CA.
-	rm -f features/{proxy_ssl,ssl}.feature || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby22)
-			einfo "cucumber is not yet available for ruby22"
-			;;
-		*)
-			${RUBY} -S cucumber --format progress features || die
-			;;
-	esac
-}
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index 79f87e0f25c1..f16da1454e6d 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,8 +1,6 @@
-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.1.tar.gz 127123 BLAKE2B 9dd03d8483c1ef94ca7c7e561ca2a6aad82fb8400cfd5a48f40e3feff7597aaaf2a877d72d356ffca2455e6f3069a2d60c23ebf2ff3bdb8e95d954ff88832a3d SHA512 4d83f04ab640fdee6da5d6eab2c2a3bf8e04ad2f55e1a31f1dffc3a85ea3e731f1a0ffa586825e12972120568226d52fd6c26ce261412ad69dcc73ed879e763f
 DIST rspec-rails-3.7.2.tar.gz 129851 BLAKE2B b37619b4a953fa44ef402a0dea1531837932dc7bc147c08b29bf85dcad61c7ca72b30f28edc391ae05d5040dcc902d6571342bb51559de84ed0c93244deffbec SHA512 a1dbbde3539b09c33d85c9307126df09c508fcf39abc25a6438fb0582ec19049ee1888d7d17d256d33bba08c29792a0ec30dabc37d870a369580a58cb7ef03df
-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.6.1.ebuild 1448 BLAKE2B ab0ecb95e96eedddf57dbc1e254df43b97cd3d9a0930942b3bdc3554b7b277e8823dd8dc77eb32b58f339736b0b71f0b307202996edbc9970233c44cb3fbc3e1 SHA512 4f28e6dbf5fb2f4e188eced4b308d470c8e4275154a20ac869e2c4b4539b83f4a56c80338376d4dc00f8d8c150011d9c2ede6ad3f849389bc528b63fe5a69694
 EBUILD rspec-rails-3.7.2.ebuild 1448 BLAKE2B edb9e628276bc97d90ee7f9272145da0f03fc50d3736362e45851b113dace36b93544fef8c8a4cefe68d93d265d2bd7bc4e4ab9c6f523147a19c265f20e60c40 SHA512 b8a8b28c585ea62e3d29c07b01e0758503647561b3f0b798354ff3097433890245baf3b4b83491620b1575d77f5941867adfc4c5bd27e0957cf224def09ab466
diff --git a/dev-ruby/rspec-rails/rspec-rails-2.99.0.ebuild b/dev-ruby/rspec-rails/rspec-rails-2.99.0.ebuild
deleted file mode 100644
index aa2f3667559b..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-2.99.0.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"
-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/ruby2ruby/Manifest b/dev-ruby/ruby2ruby/Manifest
index 8e061f45a23a..c8cad20593a8 100644
--- a/dev-ruby/ruby2ruby/Manifest
+++ b/dev-ruby/ruby2ruby/Manifest
@@ -1,5 +1,7 @@
 DIST ruby2ruby-2.3.2.gem 26112 BLAKE2B c6b7d84c3cdc9212972b766382f4f560ea840ea65f2d961de7b836cc67bcbf69a427c2431533d98b91b209eec8dd7ea54cb17c0c01e021c8e4289abe6211bfca SHA512 4cccbc0498ed2af8302860b5547a54b4fada04eff8158ceb9e6a8969f85ddd84dcf315e90b2308b3f5e9e685d6e2105125ca9197dd1cf26cd03179c50e460ee7
 DIST ruby2ruby-2.4.0.gem 26112 BLAKE2B 017f7b8299a5104742d6224194b65ad848bc5347cd48d710b3a81d7203faf0670564ea08eedec3cb000d574b22736cd38476dd6f1aea3c45521fa39bfa7df6de SHA512 1edeb5e90c5d33dabfdf7579d2f24f6daed8b9686ce1f7d746d96b18c23c2d4c505a4807a224536d194426fbd81e740113bba6d659bd2dbd2a84c71e04594300
+DIST ruby2ruby-2.4.1.gem 26112 BLAKE2B d7d033d80d0d82d9c6bd7b23efd3326645f2f4cfd308f30db6a38022a9648f474741403b45a9294359b8ffacd44ab82ba6dabb0e55b0edb60364440dbf572604 SHA512 5c0ee1b3738a5c4f780cea15cdc9ba679e31b9fe26f11b458a881d40b4717e9d07202f4358e9a0ec53a657b275f86ba466bf6ace8111403d35553292bee60c3c
 EBUILD ruby2ruby-2.3.2.ebuild 803 BLAKE2B 7067fc7fd27224c70d505628ac8eb4480008b0ec355c6b95bade10af1db89077da52707527549b04c07a63cb225ff771816ae21a78fdf958e334d31986ad6360 SHA512 f230576f8b88ddbe7075b7ae4967d91973d73f0c9c26da9ede36780b85f90a6a3e560ff0a288b5054509bc2fdf0175b0ee5ebfa0c978bd1f807299b1e6e0522a
 EBUILD ruby2ruby-2.4.0.ebuild 844 BLAKE2B 52d078fcf23a83bbf8044c848e2640ab3736cba06eb3fd308842e620d345946d5b73a4181e23751822cc5b9654ce1fca3a8877e5845b58e46424915d3057202b SHA512 b47c71ce59d46f894da4a1c1d0bccae6e4e59ea8a1277cf355bef9099aa8211eaae197a82587299755565792e80ac6f22250d061396df2ec39d3944fa13f4ac7
+EBUILD ruby2ruby-2.4.1.ebuild 844 BLAKE2B 88fb24dc9edc6ae98e0545b58064e429a65f14b5622beaa585c632e9ac31ef4025fe2a91844d43765432a0b457692aaadf54ead14529cf4b5d479453b80fb3a1 SHA512 db9ff1d8d10c320f19e5836649cbbb665f552f80b4e897d1d1433e828fdf758a5acf5d2c02daf173071798dd5e1c8645d21e012b1ccce3b656d65e2b15765df5
 MISC metadata.xml 345 BLAKE2B ad97abb4ce420cd1a798b019724f408bf5e8f04116ea72d8de35cb220b028d1e31d9b1380b625dd478e110edbc5100d38fa7ca10ee336d131338f2ba148ed284 SHA512 160d20c5eca00fc8d0cf3145e26d1a89ac158d5d7b826cf1161255c2b895986e7629215d330277d2e3bd8b08c106c4e8725f8d1d8aa3566cdc9e66a3e8cf37c1
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.4.1.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.4.1.ebuild
new file mode 100644
index 000000000000..bbbc83c02083
--- /dev/null
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.4.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Generates readable ruby from ParseTree"
+HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/sexp_processor-4.6.0:4
+	>=dev-ruby/ruby_parser-3.1:3
+	!<dev-ruby/ruby2ruby-1.3.1-r1"
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 >=dev-ruby/sexp_processor-4.10.0:4 )"
+
+all_ruby_prepare() {
+	sed -i -e '/plugin :isolate/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index d41aac265b0f..fcc49326cf65 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -1,5 +1,7 @@
 DIST ruby_parser-3.10.1.gem 414208 BLAKE2B 22b0df7f5b7c137e6c331b13639ccd399323bcc6d439ffd8a07ac1f0b11db9abfd1d6a6a36d6c313a86a525d55742fca6050287ef88cf2829a164cb6f0b9a110 SHA512 57abb2a972020d443baa46b2866ded1bdd5a5d6d7d5649375e9bdaf0d3884dba23d152db2e50db776bccefc51e0bf1221e1eb8c3a6468bfd5b19b2e47dd16cc8
+DIST ruby_parser-3.11.0.gem 463360 BLAKE2B 6001914a0835c5f21e16eff279100335855fd833b60c7508fe66378a899af44e928afe31efb78ad1189301b1e85facba2d025c6e544a95d730f579642169eb1d SHA512 62b01b3ecbed0fbcd75a7d3515d4804dd1d8544667ad667dc36cf19cc2e380d87bb58ca56342ee4428cdf7044356cdfa2585125636a9c18ec4a460eb901baa22
 DIST ruby_parser-3.9.0.gem 411648 BLAKE2B ba5247a408c24c2ac36561ed9c26b4124a61565327247ee5dc3315a9f3e1f995fd6419c19ee8013efcc2b30fd752b3c8f6dd24011d35168f7e8cbcd224ddb909 SHA512 f609084d82caf4c33a40b64ee9df473375f00c59a34ec5b419f155a54a7fb9436ffb77ace406a01974c6c0d7b11b97447da0b3053c1fd87c66eb0406a0150312
 EBUILD ruby_parser-3.10.1.ebuild 1084 BLAKE2B 78259aa149f4c9b469ede68bddc76316ed55a09d98a3439c5a7d57b4da379ea0b5eac33894ee105bbd04c74efc7b7de1a854694be9a336b19d62d85557abfea3 SHA512 b8319def22cb90240ede21b0a9b5527d599c959c2b535f1582d76b6f9abbaf6b6724b10baacbfc78a02e777908b5296b8951f3947be02f17551d9de796fe8e14
+EBUILD ruby_parser-3.11.0.ebuild 1119 BLAKE2B f8b85bb33e78f675cba43ad165cd32cf827b75d53629637a495c9c4c0c54eb3f872b840f6b13963efa2ff354346f620a7d0de14027f21703e2416e89caab7f04 SHA512 2e2aa20b4307e1dd09abc73426789e1b79ef424e67c19f5efbc63075afb6650e201321d845f2a1901754d251ef81ae8bc62feed21dd0e4a8800558d4ae317ae5
 EBUILD ruby_parser-3.9.0.ebuild 1080 BLAKE2B c5fd16c860245dcfdf71e00c3ae3e26c577444eefbf58c30607e5a6c53ad9d1a7fcc457a039463172bb26dfc9ba6cf9918dd7de582b6baaa11243b53b48a795f SHA512 7a0e378e6c76fa2f33c31000722490d28912f8153972442156ee48a821f2e20703edb3a1fc5f648da8d200e80106fae8b5001f158a74a65cf15796c464541084
 MISC metadata.xml 347 BLAKE2B 58585950079ff918b98a50b41060c516e4640d3d9e382bdd659ad6b17c1f0e138782cc7e94085cfae35faca53445beef7ce645113a49a47d42e912246ce8dd6b SHA512 ff141bbed5bdb7f610f87c5f8040889784f9a3a1f7a2f5802d0ee52a2a3d660d7ef2e8e3cc37af9c8b549433447f1d523b4864a6175efab755a3009c99c59632
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.11.0.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.11.0.ebuild
new file mode 100644
index 000000000000..fbea3e303693
--- /dev/null
+++ b/dev-ruby/ruby_parser/ruby_parser-3.11.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby parser written in pure ruby"
+HOMEPAGE="https://github.com/seattlerb/ruby_parser"
+
+LICENSE="MIT"
+SLOT="3"
+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=""
+
+ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4
+	!<dev-ruby/ruby_parser-2.3.1-r1"
+
+ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
+ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.10.1:4 )"
+
+DEPEND+=" test? ( dev-util/unifdef )"
+
+all_ruby_prepare() {
+	# Remove reference to perforce method that is not in a released
+	# version of hoe-seattlerb.
+	#sed -i -e '/perforce/d' Rakefile || die
+	sed -i -e '/license/d' Rakefile || die
+	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/sass-rails/Manifest b/dev-ruby/sass-rails/Manifest
index 80e0e379add3..11fa8a0ef849 100644
--- a/dev-ruby/sass-rails/Manifest
+++ b/dev-ruby/sass-rails/Manifest
@@ -1,5 +1,3 @@
-DIST sass-rails-4.0.5.gem 92672 BLAKE2B a10dc27ff95122bb2e4518c927c5a81d4a5116bb70d60e68a6c697a7dc10d2781e2b2b702e8b0fe79d7b4562126c0f9d4c0172f5a8a604ea525027c1c8853465 SHA512 71515d2c16886d64af4c00bd78094691579bfbb3660ff9ba4d9f2807bcbedf104da2f7a321a3cc558f0e2420f702eb2bd2379cce30f1d21d8b09ab5fbc8347c5
 DIST sass-rails-5.0.7.tar.gz 90425 BLAKE2B 8aceff670ba2e4993597858b74362a02307e39ac967a331005f21d384644d0dbdd414560abaa88e60d35358b47d65c146baa72f37c879a2f13178e187cc1f79b SHA512 491a1618a75becf6095b102c996e50d25fe701d3a6c1b6c6fadff81c6c09260c3ee6ff9c84abf7bc62779fa7034d54d7c0d9a7c4148d3cc741d83efda87ec0a0
-EBUILD sass-rails-4.0.5.ebuild 847 BLAKE2B a056a5e8433913c14cf2a2478ea335e2d7abf144cd00cfde1751a9188794e00f9dd9adc329676506cb2a49ef2654d9481e5f5540be52470df2fcd5d87f9ef8bd SHA512 c8b0d2c3e3eef50095999eb20a0a88d35a19512a43ce16100ead8d48605a1fa8cdfb50aef374d7f3c58e65eb3de6ad1868ecff6bacdf98f425ecd6a68311b464
 EBUILD sass-rails-5.0.7.ebuild 1132 BLAKE2B 4f3ff16720e7a63505190a1153bea443ed95608103c6392523658e516d7514ccd8523243bcaca7b0834373da765ef15ce1060b4df8d1978d56bee751858dcdfd SHA512 6a6f46f00987eaee55172f31d0b5530ab59396104d18dc72466535c6630ef1d21ea52dab3e5efa9a179ca1f684af76b44a478ea77263901079a02007a3cb7a2c
 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
deleted file mode 100644
index 1f13ad1cc608..000000000000
--- a/dev-ruby/sass-rails/sass-rails-4.0.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Official Ruby-on-Rails Integration with Sass"
-HOMEPAGE="https://github.com/rails/sass-rails"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-
-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.2.2:0
-	=dev-ruby/railties-4*
-	=dev-ruby/sprockets-rails-2*
-	>=dev-ruby/sprockets-2.8:2"
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rake test || die
-}
diff --git a/dev-ruby/sass/Manifest b/dev-ruby/sass/Manifest
index e5e2585da9d1..8d5509a65fff 100644
--- a/dev-ruby/sass/Manifest
+++ b/dev-ruby/sass/Manifest
@@ -1,9 +1,7 @@
-DIST sass-3.2.19.gem 261632 BLAKE2B ef71c3a0fb1035c8e61759428a973adcc3732d788d5b86f88208ba60f70ec1824886a15068b610958b4031123da10ea8d5c0f7fa7da41df2f3413c8eb2d1f621 SHA512 6c288985d53b905aa3cc5ed471359c8a47b82fc30e9c576332fcf20c3d033e1f683c390e2b300295aa3b4be4f7b640ed5578e937793d0bc3537c268ed6986429
 DIST sass-3.4.24.gem 351232 BLAKE2B e22953cdfa28461d7f0952dd746a4390bfdd59c78aa52f9284ab0c2ef8ba4f1ad6745bdb181fcbb9dc865213761255a47fa588d150bdb4724436c116c91b92d5 SHA512 8435005234e5e734894f39fbfaccb83ae8f077f91604e59b4c4bcf9bc92be0bced4544b7e1ce0fefc6b382590407915d438e7f99828735e5eed7ba76f3ffb7d9
 DIST sass-3.4.25.gem 352768 BLAKE2B f3c725ee75f0d5b3a30cfbfdbf5dd949fc2b6d99878039a073c3b369753609f9b202ea6f756016783b251877831d1480dad4032db8338dff453b088b219b799a SHA512 5ff4bd47857425832c6a39b963ae4465dd91d63774eb35196ec28075082ad231254babe507d7071304ddb73cdfc1168a547bf231225afaeb3b7ddd677c0bd712
 DIST sass-3.5.4.gem 319488 BLAKE2B 1cbf4972fac0252e6d54b44f586fcdb4698e58ef29e780bdb1ca1c18cea8237a03f8b25a6c047f4e7d75957ea0d94cfb05a54ed511582f5ec9d6379cd6a9c655 SHA512 3fd3001b326f8a31e6b0c5e7fbd06acb4a4ee8213d86c65d325198b50115996ffa728d0a482333b2b4eeafdceecf28fad49db58521c2d059d69ecbff418c0315
 DIST sass-3.5.5.gem 320000 BLAKE2B 8120373a68e8808a4d716d45e979ab3fdb18225622fa9399220f9ef76874f99ecf5d798de254607f295dfbd238541e5a016ba9117fe07bc9393de251b096f7ab SHA512 e8d6951f1310b05fc978546afafa8ba0dbe11b02ae8d3ba8d3a28802c874d951859b35f5adcb45f56497dd72706e8b70283b8def4a4c4614e649412deedd2a42
-EBUILD sass-3.2.19-r2.ebuild 911 BLAKE2B b7aae89855097bb6fdf4fb25b02bc9b86908988a9411125e801d2211087b1a01c696a5c3cfaff7ea206f2a3454cf01cae0e2a8599ae3374d05ba79ff26e5a6e2 SHA512 58e0b4f34452d8cdf450c968f5908ce9b6c008f5dd1e7c83d3b0b30d212202ef626ca39548915089a2737d28f1121306e9d667f43eceaf251de126ffc6f43a90
 EBUILD sass-3.4.24.ebuild 1025 BLAKE2B f5516d95ad1027b599595b6d21460b96db749df3c92aa6bad54946528c5494e5dbf7a1001c609c2fc3b5a9f7eb4ea31731b7272d7ee8f9e92d831ffe3e328b96 SHA512 df5a4bb3a6b858c95a8afb067728c3625cd35be9ed6a5fe91bf6937017ca08f95402d659d082acc1fc3ec15c40621fa65a88894039fa42a42a0c45e118542ae9
 EBUILD sass-3.4.25-r1.ebuild 1096 BLAKE2B 51908d63537fe1ba1fb712b36636f0c61520822dd04e9b53a54f25ca3efb2699840bf535b58f649bdd0d1b51bbb266bb167023505894b943b40d36bdb430178a SHA512 2dd345951e73f1057a54b68154b18850173fde06111a2763a407051bfdceebe9a46e92346ff0cdcfbf8056f854f0d6c37f04efecb8ec3aaf3b440dec730b41b5
 EBUILD sass-3.4.25.ebuild 1030 BLAKE2B bba7b7b44ab3ae7caf356ea39433df5f4abd261b573d44801271c699e14c668979b20fe52816ea9a8e7a831fe5d1baa8206d07557e6d8d3ebbd4555ed0597aeb SHA512 d79047902345dfaea83ef95e010e121957f488f38861e8f340b7731ef361ea535236853f7fdd4e0b32035ba3cd59ff9313448dc7916caba6fffc49807a0eb743
diff --git a/dev-ruby/sass/sass-3.2.19-r2.ebuild b/dev-ruby/sass/sass-3.2.19-r2.ebuild
deleted file mode 100644
index 6883dd5e0332..000000000000
--- a/dev-ruby/sass/sass-3.2.19-r2.ebuild
+++ /dev/null
@@ -1,38 +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_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="rails init.rb VERSION VERSION_NAME"
-
-# Don't install binaries for compatibility with higher slot.
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins and more"
-HOMEPAGE="http://sass-lang.com/"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "doc? ( >=dev-ruby/yard-0.5.3 )"
-
-ruby_add_rdepend ">=dev-ruby/listen-0.7.2:0 !!<dev-ruby/haml-3.1"
-
-# tests could use `less` if we had it
-
-all_ruby_prepare() {
-	rm -rf vendor/listen || die
-
-	# Don't require maruku as markdown provider but let yard decide.
-	sed -i -e '/maruku/d' .yardopts || die
-}
diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest
index 4de818e60ab8..6c4f91c6b8aa 100644
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@@ -1,5 +1,7 @@
 DIST sexp_processor-4.10.0.gem 54272 BLAKE2B 1e02525dc989fcdf09b502230b145b38ee2771f41b05a37ba96d177a67fb04843397cefd62affdb4fc447f43943f6c9b0b763c3e21790d96c1bad5d3e4d1f5d4 SHA512 6ab067d921b8ad9f88fd35b942f0c28c3d8d1ac17cc85e73774c97cd4cdd5f91dcfb9392ef0337a7b3ffcd8dda8892f0d71c9323d45f453819848aed52965019
+DIST sexp_processor-4.10.1.gem 54272 BLAKE2B 6798a884367862f684cf315f6583b50188bb094e0f67baa80250f1a69b2c12283515a2caec2ef3fc9e06ce565fb5e0ce1375abf0a4edf17187deac9b443b7b8a SHA512 6f51fd4d856f65fc84c4b4307adb432829a115dfdf62d44fa6aa3127bbc3da37f3361f3716c9de60c6bd47ae38414ffe2ec3aa921bed26d465ef8de498c18935
 DIST sexp_processor-4.9.0.gem 40448 BLAKE2B 327298cf76d9acf3229f80965e6cd626a36b3585afc847c4f4164780d93710e089fce09f4d453baaa8e8d99fc30249c40ccd825058d971176e26cc6edc296b3a SHA512 f73b71fa436b73db3adb590f3273904474f2a8575377c0ea9184c2dbe8068b3c673f74657e949666fc04d2028efc22f81c14488a5484c66e2b6810afdbbcc531
 EBUILD sexp_processor-4.10.0.ebuild 763 BLAKE2B fdc4728069f684d9a25be521f97ba4df1600da9750debb5ac60fa8893630fc5c70565fbe5ca26cf92afbc9db4eebed5f5e75205dade1732596b227bbc63e293a SHA512 a4a9209549ab236eed76c190ebcf628bbeea28e72aa9f6cff493bae1b20c5193b347290e8b7b681ccc051ee416811ed8b9b64082a39f8b06347f08026d7bb05b
+EBUILD sexp_processor-4.10.1.ebuild 765 BLAKE2B f7447994f783d6c026cd516cb1e2e1531e4e8e0e4271306bad86bed0107d3c96de0686c2ced31f850936266779b203194f4d84678405ba1edc63f0bff1b75274 SHA512 afe68c10b81406e66bd8730f588112323263f0fd7fde3dd058623a165a1a8e16778c1484e17c1f37dd2b7312d6f4bbd8fe9e4addfa197f97dae410b6d7047463
 EBUILD sexp_processor-4.9.0.ebuild 759 BLAKE2B 68b9dc146966ec712f2586937756eac3564055c51f421712f290778bad5aa8f7b3fb08350e1fdbf95f72f412a5c94ca4a7a750c6b4323a9a44da80acdb243e16 SHA512 ff5ea8d9b8e4420c4536f9c33af2e3517b773e94a625f82d8f0734e99d4f82467d0ad565a17a9d5d834a8d021674b83aa12e57c07d557c45090db88381a69992
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.10.1.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.10.1.ebuild
new file mode 100644
index 000000000000..7c5d88b665eb
--- /dev/null
+++ b/dev-ruby/sexp_processor/sexp_processor-4.10.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
+HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
+
+LICENSE="GPL-2"
+SLOT="4"
+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=""
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/hoe-3.13
+		dev-ruby/hoe-seattlerb
+		>=dev-ruby/minitest-5.5
+	)"
diff --git a/dev-ruby/simple-rss/Manifest b/dev-ruby/simple-rss/Manifest
index b69da3459889..9e6b0376cb07 100644
--- a/dev-ruby/simple-rss/Manifest
+++ b/dev-ruby/simple-rss/Manifest
@@ -1,3 +1,3 @@
 DIST simple-rss-1.3.1.gem 35840 BLAKE2B 0eeae28a610ccfc82ffe2cb7dc6e00a419fcb6db658e1d5a0d1e8769b04002c084f4606991d5d61eab314a198c98eca2354d2d89624f22695a51423db15c3210 SHA512 a24eca178f0777ba1747e420a883fae7650767cb212fd3dbb89ea35d81d1d0766ab6ac891d19abcc88ed7a2209890a4fbf3827eab6ffb0c11ffe69e4abaa6f4a
-EBUILD simple-rss-1.3.1-r1.ebuild 722 BLAKE2B ecf4173e40f8809bedbfda86b7ede1c3c49d6bdd717e9abd8699c6599b2d397449f097aaacc963daa41b7a1f3140568da86f5d4e54e5096ebfd255c29f5f7e1b SHA512 f117b8d85c4d4e5e02a88fb1cfdd03138794569196de902811548175991594d22d0518fefdf11946e555ad288e05a6dec5e87f995b9a391acb1f5d8c9367c74d
+EBUILD simple-rss-1.3.1-r1.ebuild 715 BLAKE2B f48de5cacfeddafea2f5343bb0badcf10a8bc941f8e09f881a2c225a2918a238010d93f161255b4cbc000706fb443365ef01798646c613b1c2cd5bcaf38b3f85 SHA512 81c7b3f87068a6e9c9d6fb7f6921e4db34f8568df8cf789865b0d071b26a44a14eaba0e7effd70af0da6bf48162f0bcec4dbab496ec64f8a89653668bb02eeec
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/simple-rss/simple-rss-1.3.1-r1.ebuild b/dev-ruby/simple-rss/simple-rss-1.3.1-r1.ebuild
index 6a3d89d245c4..5457a3d692bf 100644
--- a/dev-ruby/simple-rss/simple-rss-1.3.1-r1.ebuild
+++ b/dev-ruby/simple-rss/simple-rss-1.3.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC="doc"
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
diff --git a/dev-ruby/simplecov-html/Manifest b/dev-ruby/simplecov-html/Manifest
index d3ee9dc30c7c..b55d271af80d 100644
--- a/dev-ruby/simplecov-html/Manifest
+++ b/dev-ruby/simplecov-html/Manifest
@@ -1,5 +1,5 @@
 DIST simplecov-html-0.10.1.gem 182784 BLAKE2B f38ba817a68ecbb6426e1eeead0a53f06d804d859b073f9a98d00e6c21c85b92318fa5b9a7de33dbf2434b70fa75f91f33d0b7474e283b1ccf8bf5bdd49efc4e SHA512 b64668f70d0c90b2b0d789dbf4cde76151e5b93057a3e08599cad58e73f7699e23721b9c0df4ca3a054413baf0a11b43df3f156c7a1761ac15f9ce537075b239
 DIST simplecov-html-0.10.2.gem 183296 BLAKE2B f4edfe25249927d46f32d422b004d8a03671926792ea78016864764242f8bf8dc9131a0580b9519db6798beb3fa093f79a0d585b63d6b6b62c9faf7ae94087e8 SHA512 141b9d55ca7cbf1bb64616482828107c7c33c7d6db1b5650ae9d463e5ece7a7fb56d123c539c7364fe2a35e5faea382620a0b34e337d4c9d4871caafc794a967
 EBUILD simplecov-html-0.10.1.ebuild 528 BLAKE2B a75bedc33fd54b1f9b90796b707695b2a9f440c474f3d37163fd6fd67d665948c8969a5d96672392c980ca0547c8a033ce5b30a5ffca5c06c07f20d53c4d8862 SHA512 02b8bef86ab3073585907e4c08cfb669e4c54ea619f9f7285fcff3104e0240739aed9388b705470ff7b99197376e3c02827ef40d89fdc27ec7c7a61d811da571
-EBUILD simplecov-html-0.10.2.ebuild 528 BLAKE2B a75bedc33fd54b1f9b90796b707695b2a9f440c474f3d37163fd6fd67d665948c8969a5d96672392c980ca0547c8a033ce5b30a5ffca5c06c07f20d53c4d8862 SHA512 02b8bef86ab3073585907e4c08cfb669e4c54ea619f9f7285fcff3104e0240739aed9388b705470ff7b99197376e3c02827ef40d89fdc27ec7c7a61d811da571
+EBUILD simplecov-html-0.10.2.ebuild 528 BLAKE2B e2613e33c33b39806ea27ee26e4d10c9f26703d1677b8567451b09d5291ed4d9e6efd2756b0c9be8ef42008f9780a1fcf60dc4cd0492b539360bb8d230a12206 SHA512 b5fee3fb8b9a913aa98bc022cfd1afcf67a3d2539fbcdcae76571c74bde939d57df6f28c5d99933ede5a7702d1c4221d28ffe2e3455fb6324703db01d860a2e3
 MISC metadata.xml 345 BLAKE2B b1b086ff87954b47674d7c4ea2e3179d43c10fab22383c937600b0b83675a9dba5434dc9425a1dd1bfff27c8bb81d36fc558523a0b80ed818a37ff9585dc094f SHA512 ca0ae8784caca2cc0091622a5bfa3796600239a0d81bc5338eb36f743db99f36ba7b50866b1de1cd2ae541f2c2dff96c648f5cdb0661ab766501f4c757d2ddd5
diff --git a/dev-ruby/simplecov-html/simplecov-html-0.10.2.ebuild b/dev-ruby/simplecov-html/simplecov-html-0.10.2.ebuild
index 47392acd979a..ef33bfe352c8 100644
--- a/dev-ruby/simplecov-html/simplecov-html-0.10.2.ebuild
+++ b/dev-ruby/simplecov-html/simplecov-html-0.10.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/six/Manifest b/dev-ruby/six/Manifest
index d0ad7c0821a3..7663b5891018 100644
--- a/dev-ruby/six/Manifest
+++ b/dev-ruby/six/Manifest
@@ -1,3 +1,3 @@
 DIST six-0.2.0.tar.gz 6747 BLAKE2B acf034ac527b3e5379a55ad95bacdf18d544577cad9e7f7ea322e6b05d2b1557f5712915ec79d51e48e5d246661f384207a5eae07775a85e27548fb9af99e6fb SHA512 8c3bfbe2b07b5682b696800a9235ebf542c7d292f69728aa9c9707f92fa042fe7bfee6a0b28808dab86f8ec80fec5ba993be5e42f4a098d8cfccbc7611fa2016
-EBUILD six-0.2.0.ebuild 595 BLAKE2B fef70f62bd5c81efa402a6c237615d996e8b5f95aa1b91c5865d34f3e92d40c9630ef0c75484f526985ed0c640bdb2584a0d90d78706000063d073d05692c671 SHA512 bf023d24cef845914dcf9444c581f758f69469c2fbf0f768b6bb0563dbea336eca053e0bdf8afaf644f112ac67a8d5c1cda6ee64e15ef8ec1f93093eba4c9218
+EBUILD six-0.2.0.ebuild 588 BLAKE2B b7bc09b2904d94d4247a2d64b4dc71a3888995aa9a0b2e77e13a965d465aad2c2bbb9a5d70a7535ff8bc19e14f4d11fda5d9237df2e33f862c5b20dcac86b83d SHA512 af1661d0f3120130010ff1e188c1f0fab911bdc8d00dbffb4597c1e39a6faa6fb04424d477e6d504d5a0244230140896e54bb56fd2f88b8b5820d64344c57a4e
 MISC metadata.xml 335 BLAKE2B e1bafe2e453249abe6095958abfad021b1c49785b441431663154e63d4e69cc86227c2d157eb161eb53b8e1a553459ba9e0f0f651b6092cccc8c006dae6bc21e SHA512 7321ca2e3338f779ed480d672160c7903fee2c989dc88a7f8df76bd8a3c8aef7569bf6805ecdb62328df70650634fb6e6392f73929bb281e148f7d8fb330440b
diff --git a/dev-ruby/six/six-0.2.0.ebuild b/dev-ruby/six/six-0.2.0.ebuild
index 32a082e425ae..beb43f942e72 100644
--- a/dev-ruby/six/six-0.2.0.ebuild
+++ b/dev-ruby/six/six-0.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_RECIPE_DOC=""
diff --git a/dev-ruby/slop/Manifest b/dev-ruby/slop/Manifest
index 5b823b1aba64..0bd2623c2f21 100644
--- a/dev-ruby/slop/Manifest
+++ b/dev-ruby/slop/Manifest
@@ -9,5 +9,5 @@ EBUILD slop-4.4.1.ebuild 638 BLAKE2B c41a98e00bd8ebe25b64155de10970cf574a030d921
 EBUILD slop-4.4.3.ebuild 638 BLAKE2B fce7884ce43ab0c83990a4a025e7ddc81aaf7c64b0f84b61e799f233cabe13cf1c3a8ed4757962d2a0b93fb405cf656883cccfd6e3e87b0dd668bff749739308 SHA512 9d9feef39f49c71454dfd5ea982d9046678157c4041a09019076ce283038dec8bbb8c21b73d821d18cb549c576875dbda16af48594cfa489141f6ce5eccf1115
 EBUILD slop-4.5.0.ebuild 638 BLAKE2B fce7884ce43ab0c83990a4a025e7ddc81aaf7c64b0f84b61e799f233cabe13cf1c3a8ed4757962d2a0b93fb405cf656883cccfd6e3e87b0dd668bff749739308 SHA512 9d9feef39f49c71454dfd5ea982d9046678157c4041a09019076ce283038dec8bbb8c21b73d821d18cb549c576875dbda16af48594cfa489141f6ce5eccf1115
 EBUILD slop-4.6.0.ebuild 631 BLAKE2B 6572b6ee7a3c86b55530f546a06908d97f87392dcefd6f6dced041e87f289309148687caf2e4be3cad8644bee5ef8c2bf046ef6aae06014d3ea1dbc7372e29f0 SHA512 91555e6d6f23cf8c667def9c84818c58996b00268d7840a3e25643a52b5cce41a60a87e01a65401011c2391be258ac45d2b84e9d6fe0ab37c6d8f4af675b9d36
-EBUILD slop-4.6.1.ebuild 631 BLAKE2B 6572b6ee7a3c86b55530f546a06908d97f87392dcefd6f6dced041e87f289309148687caf2e4be3cad8644bee5ef8c2bf046ef6aae06014d3ea1dbc7372e29f0 SHA512 91555e6d6f23cf8c667def9c84818c58996b00268d7840a3e25643a52b5cce41a60a87e01a65401011c2391be258ac45d2b84e9d6fe0ab37c6d8f4af675b9d36
+EBUILD slop-4.6.1.ebuild 638 BLAKE2B 3105f2474174daccf3e2f86eb9fe2feecab9eafbf19dc8180585025542fa56922a6ea9c1204daaa3ddac6a51a08aace4ddd14a21b1f3ad6baa6ed42f54eaf46f SHA512 c6e0d293939be1879f3e7c2cb5b5fb59deab829b7f3e3090328e45a686bb8168ec5f59691736a7c553417c4676330267a5a5d34d735cc4c54df3b81edb7099f1
 MISC metadata.xml 337 BLAKE2B 257bf07d00a3f336c737c4135fae690b12a7b383de865d09fca95667efdfc4d66adcb55343b064c1fefa190f1f7c21c7b3f18ecde8d73e9d7632209ee8adc720 SHA512 2036c518a80c08e41ddec04f397959241a28fdbec0071c98120bbe2fade6e69ef67b1aa46191099520dced091d5aa0d16ae1484d831061c0681315cb0fa3b35a
diff --git a/dev-ruby/slop/slop-4.6.1.ebuild b/dev-ruby/slop/slop-4.6.1.ebuild
index 1d555e7413bb..b1b5e9148f25 100644
--- a/dev-ruby/slop/slop-4.6.1.ebuild
+++ b/dev-ruby/slop/slop-4.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/snmplib/Manifest b/dev-ruby/snmplib/Manifest
deleted file mode 100644
index 99afe407b6a4..000000000000
--- a/dev-ruby/snmplib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST snmp-1.2.0.gem 205824 BLAKE2B fe248f3321fa395b6b54475d028e09c0f6e70ed425871fb97c0c5662edb2308d4f0442519092f05b24ca526274566c2e10d5408d36ba646f933f77c4c8ac07f2 SHA512 861910d0a9182098043dec2c4c6e2f3782988de28f56dd399a0fbf3d8e3ae3494fa79f5dede978b15065bd5adb842dd876bd05b578cb4bb9510fae73201e92cd
-EBUILD snmplib-1.2.0-r1.ebuild 775 BLAKE2B 4c93f5f78888d4a0a70c4d47a3dca2b63133cbfc9a009e7e6c379ab406cecf79eb652da487e3a7d89d375621c6d475f3b51018349c2b93e99f768568b5fa375d SHA512 eb83ce370b943ac14f6075efc34f31f1b71d2ffca73c5f36eff15a75bd9e187fdbffb9c3cae1b88fc0209e466be89ec23fe9240f6f8c943bf8fc84d2b1cd93b4
-MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/snmplib/metadata.xml b/dev-ruby/snmplib/metadata.xml
deleted file mode 100644
index eb1e47f2edfb..000000000000
--- a/dev-ruby/snmplib/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/snmplib/snmplib-1.2.0-r1.ebuild b/dev-ruby/snmplib/snmplib-1.2.0-r1.ebuild
deleted file mode 100644
index aa671e4aaf10..000000000000
--- a/dev-ruby/snmplib/snmplib-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,39 +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_NAME="snmp"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-IUSE=""
-
-DESCRIPTION="SNMP library implemented in pure Ruby"
-HOMEPAGE="http://snmplib.rubyforge.org/"
-
-KEYWORDS="amd64 ppc x86"
-LICENSE="Ruby"
-SLOT="0"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-4:0 )"
-
-all_ruby_prepare() {
-	sed -e '2igem "minitest", "~>4.0"' -i test/test_*.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-}
diff --git a/dev-ruby/sourcemap/Manifest b/dev-ruby/sourcemap/Manifest
index 7b750a82f276..042dfebb9050 100644
--- a/dev-ruby/sourcemap/Manifest
+++ b/dev-ruby/sourcemap/Manifest
@@ -1,3 +1,3 @@
 DIST sourcemap-0.1.1.gem 15872 BLAKE2B fac8ae7604a5d5a56b6aff82742b8c773bebfdeb41be6b6aeb3f2b5aff9c6cb2bf584b29ee7a6cfcb4b3064e6b1666e6c0341383fa4d39037759fcbf51ae57ee SHA512 d197a3aab0fe8c9e620c50d3bd994ed957b37dba071f6abc3b8a149a8a0490ee1b89512036b833ec44e6bdcdca6dacbdda9872036ba51736ac1d1e1f160ded59
-EBUILD sourcemap-0.1.1.ebuild 460 BLAKE2B cca9b50505245ce9a11cc04a09cc5e60d829ccd6197fd141ddaed1a40317ead225f84ff93d8f08e9aac83d2c0fe131f704a16a6bb6f79654b6190b32e79f2491 SHA512 49e8d01085d8e55b707050deb4d7f59ede9eb414ea74a484b5bac644ec08b803403beebf2b321dd99053a843fb2befc46f1847133e2fce5ba56cd7457f7ac8f7
+EBUILD sourcemap-0.1.1.ebuild 460 BLAKE2B 97e33a608fb53ca2d6be41288f568347472d5979fea8377caf397b7f632d8e3ddfc14dea56715bd3279912933b2b4e6527b99636fbf8ba30e64e896ff8b4fab0 SHA512 04ebc23f0bcec07646b3eda2b29f6e8ae12effb238d40efdaae43c3ac020eee184b6cfaebbb10bdfeb5386e5a8257a11641f989b490731a86e7c78d4d94677af
 MISC metadata.xml 343 BLAKE2B a8f9658e9fea493c4d839537333079971a0b6afc29a46258763c8febf0862925f02bbdeb1696528c2e752a625d9e536282aad3cea7edbb624e3b1ebc2a545e49 SHA512 5347372e3013b627aeb9194714f4a1525a232b1d85eb252d2537606639ab95ce351396a094ffbcacb0caf5c153b77f4381abdcf8670b914b9fb43c26a05c3e4c
diff --git a/dev-ruby/sourcemap/sourcemap-0.1.1.ebuild b/dev-ruby/sourcemap/sourcemap-0.1.1.ebuild
index 57cc91ee52b3..b79838deeec0 100644
--- a/dev-ruby/sourcemap/sourcemap-0.1.1.ebuild
+++ b/dev-ruby/sourcemap/sourcemap-0.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/spork/Manifest b/dev-ruby/spork/Manifest
index e0f0128542f0..09bb19f320b2 100644
--- a/dev-ruby/spork/Manifest
+++ b/dev-ruby/spork/Manifest
@@ -1,3 +1,3 @@
 DIST spork-0.9.2.gem 33280 BLAKE2B 0c06cad1d6fc7264aee25fa400ddf1890685f87bbcb3fa8f5cb31f45f9c99845ff650b1d8e9738b04d87bb35fa4bc4466c24ddfb0d35a27377b9f42ba46eddfb SHA512 04acbdb00cb23c74ab5e3737d85f6b353dd50555e01e13aa4e0289bc7716eaed144800127840d9eae8d580f020ab646351411f5c1cbf299cf17ed5a73d24d81a
-EBUILD spork-0.9.2-r2.ebuild 519 BLAKE2B 7b34ec2c8348e746fa7907fbd0cba8d1fc1ff80e9dcd8704096faeac37abf10be40efd0bfbdaa3f2f36aaa921c6b231719f8c480697801a2e9f612d7c9552fd7 SHA512 ef7f45403d3a2c18952039e1d3f0dbc8fb661704457ec3c19a309a363d8332abc3f3080dda61ca0cc2d0e9bb6466b26e2282fc7a39dba2120105ee380c9db357
+EBUILD spork-0.9.2-r2.ebuild 512 BLAKE2B b2cb768058491c060d4aefe963249770cd4a321267b892b8af58896a0ee90f385f4dc9871e7d7f7816f8b159a4c6a9674c40422c0535f261a3c6c68c229c2356 SHA512 10a72a904f11f901e7cfa2c1da245dd4a5501e05630cf6e600813519d16584c2c84ea5bb4ad0492fc284230b34cf7babb37c7be5b46f1a931febf63d297c5d99
 MISC metadata.xml 339 BLAKE2B 0c874f7cd4273f669acd83ec67b0a84797bfeabdd71ed53597fcc6263578a3ab2480d24c161b4b17669456c2415fcca3f1d4110bc7047907491944e88fa64976 SHA512 e70684bf4dda9def0a09a12a67a94741cea52601c298e76fdb2b1d628f311fa043cbb2d6c8b1d1a3c5cd1a6139ff753f6d264350f53496847c77bf26a62685ef
diff --git a/dev-ruby/spork/spork-0.9.2-r2.ebuild b/dev-ruby/spork/spork-0.9.2-r2.ebuild
index 960d5d11c8cb..ee9ba6a9b70b 100644
--- a/dev-ruby/spork/spork-0.9.2-r2.ebuild
+++ b/dev-ruby/spork/spork-0.9.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/spreadsheet/Manifest b/dev-ruby/spreadsheet/Manifest
index 837485af1d62..55167ca43ac1 100644
--- a/dev-ruby/spreadsheet/Manifest
+++ b/dev-ruby/spreadsheet/Manifest
@@ -1,3 +1,3 @@
 DIST spreadsheet-1.1.3.tar.gz 4655837 BLAKE2B fdb28822c0d40eaceaeccd7ecb7861fa7ab9cf2f775aeca2f5fa00dc7932d17f1cbf5298aac4458109bada8e1d97a5a537f9054cc947aa4140dde3ae260556e3 SHA512 c1529318384c4e48abe20aad21aa80d652ab91bca505379c310707fa23382654252bfc04d1f8bdb7aa6ec00d0e064790e3ffdcf1c1089bd49010e79729a36690
-EBUILD spreadsheet-1.1.3.ebuild 851 BLAKE2B 475e28dcb09dec4a4c2c3694f5a882a54b654fcd85b870ff0f0d83e115f8dccd51829aef5d5ce9ab169a6074ecc779632963154ce63069fa326a259348269678 SHA512 31cb85c7478832fa0beb9e4ff691583f91fec1852b80a78784011065f1c6ee1c65a2c61ce95a5586e9f77ca32142c6097479415b3c751eb5dcc70e5a9758995a
+EBUILD spreadsheet-1.1.3.ebuild 858 BLAKE2B 50d430f040cc966c821bd9580eee072fea15f75ab91de8f33d7b12ee06dd96b44cb06fa206182e01ef93561879a1f769443aed0d53ec7373d45440d35fba4060 SHA512 91c10e423b90c3c8a6e88a79ec5f8a44812fbcaadd6309632fd50023c7838b9ea7efab30fa471f9009c36a6d6bc3eb824b6543f40105175457ed95951a6f083b
 MISC metadata.xml 452 BLAKE2B acebaf37b6e910c08eda195fab8eb473c2516d5a22d30b64cbb564d25e9c162d3f2a5918fe5ed208533fd847de10ba374c5647f18d33f2045ced2c0fc6158af8 SHA512 a0677ee7cb739f0108436f4021f487e59ad4d24af2d3e08c463b0042cc3016f02a025cbb558a68c04cb13fac2b099530fa3c17b29b473c9371b2243810664416
diff --git a/dev-ruby/spreadsheet/spreadsheet-1.1.3.ebuild b/dev-ruby/spreadsheet/spreadsheet-1.1.3.ebuild
index a55178d70a24..1176b8281a0d 100644
--- a/dev-ruby/spreadsheet/spreadsheet-1.1.3.ebuild
+++ b/dev-ruby/spreadsheet/spreadsheet-1.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 # Avoid the complexity of the "rake" recipe and run testrb-2 manually.
 RUBY_FAKEGEM_RECIPE_TEST=none
diff --git a/dev-ruby/sprockets/Manifest b/dev-ruby/sprockets/Manifest
index 0743a7a8b8be..d438a6c36e0f 100644
--- a/dev-ruby/sprockets/Manifest
+++ b/dev-ruby/sprockets/Manifest
@@ -1,5 +1,3 @@
-DIST sprockets-2.12.3-git.tgz 195647 BLAKE2B 332855d9505456ddf2cc17e8027c1a048ff503c82deb4cb22d0df1d1711a88db11b2e9b3a102843e1affc8d4c676726344f5676248ea8a3e8de57746e4fba4e1 SHA512 fd9544ed946bdf95968f198e74a36b682613d68e29a46708fd46c8b58792bf52526936b4c8d9ec3acea8f7cce789a69bcf4da3269741d43e186001061cbed03a
 DIST sprockets-3.7.1-git.tgz 368910 BLAKE2B 1411f0ad02da1fe6c3774a3c7fd689b174e18ef72a2a032eccfca2c9b4bb5298312488cd97511572e7785e7eb1b00b6accce90046b2d59b91edc8b38542aa0e1 SHA512 b766070806d62ef10839c12c0e1ba31b3553d014fc45df27fe7dc678d6980b8da3080733b1bcc3d40b1ed9d41550e45da7a365d10fc5de0b1eb88d769169cc3e
-EBUILD sprockets-2.12.3-r1.ebuild 2387 BLAKE2B 6bebabb98692c32068bc0001ac1bbf097b49f884dec8a47a4249cc6625a5950c9bfc74337e9086e4b676ee49325c153310a5d3303a118d85e0793cd7efb35c66 SHA512 44eed9b85ee296118f9679b8269f6fa3eeaaff00e301efa69bb6f3ff46c4659eb2c77549505061f2355646e7418cfefc8c13b2ff9c5212d95ddcebd8e8526288
 EBUILD sprockets-3.7.1.ebuild 1713 BLAKE2B e0051458ff89aada71c0d71ac4b3bb03b156ef80deab750716a8d18d0f6087507457f8f077d2ef8aa07229e22840ba75e4f567541bcc8a56a1015e80415457e0 SHA512 53c819dc0c006f6ed682fed08c034dcd761c5444b235b4e6e04dcf7bd879d5e506eb1d0c0e731f02c95acccf2bae9e938442ebd0f3a0235c278ac7f1842701a0
 MISC metadata.xml 341 BLAKE2B b649927de729737d95d006cd0f45484827a9628ca6cdf92589986b371059bc424f9888a5c727396b7aabc0326e94cbbbf0cc49d60c8e4c8ff09f44dafdae89df SHA512 4339a35e1af44e24e5b447c3a331e79609c0ece1b9a1a54a1e23a3c40eca5d4f0b3d788e965f102115565c45a9aaf3c59d8b1997c61bf584d1c3545f1e9fd55a
diff --git a/dev-ruby/sprockets/sprockets-2.12.3-r1.ebuild b/dev-ruby/sprockets/sprockets-2.12.3-r1.ebuild
deleted file mode 100644
index e33a105fff55..000000000000
--- a/dev-ruby/sprockets/sprockets-2.12.3-r1.ebuild
+++ /dev/null
@@ -1,79 +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_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Ruby library for compiling and serving web assets"
-HOMEPAGE="https://github.com/sstephenson/sprockets"
-SRC_URI="https://github.com/sstephenson/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend "
-	=dev-ruby/hike-1*:0 >=dev-ruby/hike-1.2:0
-	=dev-ruby/multi_json-1*
-	=dev-ruby/rack-1*:*
-	=dev-ruby/tilt-1*:0 >=dev-ruby/tilt-1.3.1:0
-	!!<dev-ruby/sprockets-2.2.2-r1:2.2"
-
-ruby_add_bdepend "test? (
-		dev-ruby/json
-		dev-ruby/rack-test
-		=dev-ruby/coffee-script-2*
-		=dev-ruby/execjs-2*
-		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
-		dev-ruby/uglifier
-	)"
-
-all_ruby_prepare() {
-	# Avoid tests for template types that we currently don't package:
-	# eco and ejs.
-	sed -i -e '/eco templates/,/end/ s:^:#:' \
-		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
-
-	# Add missing 'json' require
-	sed -i -e '4irequire "json"' test/test_manifest.rb || die
-
-	# Avoid test breaking on specific javascript error being thrown,
-	# most likely due to using node instead of v8.
-	sed -i -e '/bundled asset cached if theres an error/,/^  end/ s:^:#:' test/test_environment.rb || die
-
-	# Require a newer version of execjs since we do not have this slotted.
-	sed -i -e '/execjs/ s/1.0/2.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Make sure the correct version of tilt and rack used when testing
-	sed -i -e '1igem "tilt", "~>1.3"; gem "rack", "~>1.0"' test/sprockets_test.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
-}
-
-each_ruby_test() {
-	# Make sure we have completely separate copies. Hardlinks won't work
-	# for this test suite.
-	cp -R test test-new || die
-	rm -rf test || die
-	mv test-new test || die
-
-	# Make sure we use the correct tilt and rack version.
-	sed -i -e '2i gem "tilt", "~>1.3"; gem "rack", "~>1.0"' bin/sprockets || die
-
-	each_fakegem_test
-
-	sed -i -e '/tilt/d' bin/sprockets || die
-}
diff --git a/dev-ruby/sshkey/Manifest b/dev-ruby/sshkey/Manifest
index 9f4c9df45dc0..622c587e5806 100644
--- a/dev-ruby/sshkey/Manifest
+++ b/dev-ruby/sshkey/Manifest
@@ -1,5 +1,5 @@
 DIST sshkey-1.8.0.gem 24576 BLAKE2B fb9c992924a75e58edd6c2589f355adefde58722f29d34ec712104620bf9124f202bb0441b82ed01e84d6964bdb47a986c308ba2a560d411636089f69a6e5671 SHA512 90274b506959e1433ebcd902ff7b4c6d5f29f4a120b85e34d81ab10e680aeacc3916f30ae93a3efc447b1b0717caeec6c23de08c4ec897b91bc7fcb902169fa7
 DIST sshkey-1.9.0.gem 25600 BLAKE2B 8d20f10c7bbb243ed6a0eb41ddf07b06af803fb71ad7fe49c5b0a90fffe0db167e0b527513401400d12486fcf3fa445db1934b2eee08a5954cd2347dbaa03506 SHA512 d8cebd1341ee70886f868e4f7b4a524b1781a229e80261172b8c9a14ae665cc5e84b98f7b476cd62e57af430247c172a08dcd219956adc95a42caf88aab1b0b7
 EBUILD sshkey-1.8.0.ebuild 400 BLAKE2B 10a6ddd78b5da71ebc0ec03b15f61a92b1aa8e7a82a46a4fe459db5063cfb5e0d9666bdcb3a4e96ccf394c6c9149d5f26985345487617608e55009403d3d84d7 SHA512 13d4211acb5c36dee72c97f50f6840e5bae116eba5b9afd4ed58654451c38be36b4383967aa108e82193e79545e9ad9a292321aea8d811513583c8a025a4b77c
-EBUILD sshkey-1.9.0.ebuild 379 BLAKE2B da2f2685f61aeb46f68083942013d60d8c89d8d5807dceb8204e56de8df0a73b063ac2693ca2355b78c21aa5ad16e7d34d900e4bee4e1b972e2a9c4b05fa8e0e SHA512 945994da481de58c51bde6c64ba8f8e03c3329384e8e9c088f98fe20f6d3c946f109ed1bd09ba3b5a153a19eb1cca37b8922b222051244a0ef8c7de9cafad88c
+EBUILD sshkey-1.9.0.ebuild 379 BLAKE2B 6bf09896919c30bf7f83dc22cf7fe63f9192863ff898bce4d491cb0e3a9ba31844578cd1d190c3074ad792e52d053b650a3f5d9204b4d14bb47fba088dcb11fa SHA512 f55c2faef59fa491a4eeaf5f409f8c388cab7d1cfdbcd08e3f7523415003e3225fb41f1eada6146d24b598646f3387bf90cf875761239fb62d9b56a4fde90e8f
 MISC metadata.xml 385 BLAKE2B fbc4e3d95d9b9daf6730d746905abb421dae2ecfd755ccd8f27ea57c295edb4efa6bfe61fe1b404341a76851d3b6802ae748485b30c3275d408900ebf164ce1a SHA512 74b48960f9e2ce4390ab3919d3f0334a5633995dc437613ca2ed13e3f2de8f0e76fc79cbc5f5c8b1526976e72ce3abe9eb1bc44ca4c1721500e14ee27f63a39c
diff --git a/dev-ruby/sshkey/sshkey-1.9.0.ebuild b/dev-ruby/sshkey/sshkey-1.9.0.ebuild
index d26ce5ca1b98..594170914c9a 100644
--- a/dev-ruby/sshkey/sshkey-1.9.0.ebuild
+++ b/dev-ruby/sshkey/sshkey-1.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/stamp/Manifest b/dev-ruby/stamp/Manifest
index d99a2182a8cf..490b115bf856 100644
--- a/dev-ruby/stamp/Manifest
+++ b/dev-ruby/stamp/Manifest
@@ -1,3 +1,3 @@
 DIST stamp-0.6.0.tar.gz 9099 BLAKE2B 6e5d4b95fcd6f31f47b02a4053670fad53e982bd965120f02ef3751e9b499d21a0867ef11afd628eeb2b1bcc523e3423aa319103868554b4c74341253614b1b3 SHA512 2f467444bad3c8932aeaeda061796ee3469b16d908027325efa28f7da005c8a4c8c95f0d3b84b6b1040bf5e5fe4114fc4779e3c9efc6c00817a050c13be62472
-EBUILD stamp-0.6.0.ebuild 793 BLAKE2B df63a15580f885c3e3042ec3f30163bd35bdfabea0ffee78d4196e74fd01845df74e3b4feaab02673b64775b9dcde6cf9e19ba74f447194641c95beb2271425a SHA512 545e819162c7ec5ee77d5677ef98620617e926cec636ebcb1f1194826e632ed2644e7d9bc1a81424d86fe67d46320a10e27807f2086e90d1cce1a63ea989fb62
+EBUILD stamp-0.6.0.ebuild 786 BLAKE2B e2d11998e7219274644208bcfe83178100f226e8d7c913def8373c02b1928df14e254ca0a3942cdae78322578dae7227eb80add3c5dd49f3ed2327571d068ca7 SHA512 c55855b18bbf8ca620ecd28ae8ee2130eb8f637d2e7e439b1f5d66feadc69043acdbd8175e6ade69f8b876e7eaeb960f9505c2f2e73e6f3e46760565d0383294
 MISC metadata.xml 339 BLAKE2B 39578762fb4e2cabf1c1d57b6644848565610013bb0cb5a0885eaf2923dcbc9ac2246e5ae22d688fc4c1eb607a3caf2288ed45400b635debd87a2e20c99bee6b SHA512 b81167c6ad8195382cfb07051680ea331441869f33b0e9eee25c86b18ca6f107b7e464581d0f63422ca2c81ead34d8bb51cebdb1e9cb7afffdb99fa6e2d33329
diff --git a/dev-ruby/stamp/stamp-0.6.0.ebuild b/dev-ruby/stamp/stamp-0.6.0.ebuild
index b19ddf56a9bb..42f25e85d6a3 100644
--- a/dev-ruby/stamp/stamp-0.6.0.ebuild
+++ b/dev-ruby/stamp/stamp-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="cucumber"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/state_machine/Manifest b/dev-ruby/state_machine/Manifest
index 791f931162a5..37b52451b295 100644
--- a/dev-ruby/state_machine/Manifest
+++ b/dev-ruby/state_machine/Manifest
@@ -1,3 +1,3 @@
 DIST state_machine-1.2.0.gem 604160 BLAKE2B 5fe7b3b192d887293fccbd27c2c1b289883e0c0fdc918b188564ded4366175278f172907ee62a57bb37a9d969e7e989f6cda639fe0b946935455cf81466c9ed6 SHA512 aa26d9cc99b0e873f9b146acddaa53f0332cff403463a5079cab5e00902db7b60e47957fc8b4c7ebc62861894460613a0b075b13548544392432ee564936567f
-EBUILD state_machine-1.2.0.ebuild 628 BLAKE2B 152c849edaf2fe9533f20cc7fca5309b4a34ca75606ae97d560744410d4c579d10d2ddd08021fee0ef6fdd61bd17a4d6eecec6e4f94c12c6b808b2ed84ffb863 SHA512 5f3b93e0668fb619a8c7397196d6482e75a79cb7783a38c1676daff8a0ca3d6ac4aaa57ed5af48d33ff584385c5372713dcd37208fe1696da5f4103426cb7afa
+EBUILD state_machine-1.2.0.ebuild 628 BLAKE2B 11ea2189855ecee249b570246354bc15ec5a86f556a57607544cc300eb6fc127666624e665088a2206b9ec49f4ba0614678eb9bd829a8df4b7b322c25998a293 SHA512 fa243657e202a83f6fbb3701e527f0c201b6b87e591f59a297172be3b511039b5212304552a626107d1ab48465a3549bf06ac26d8029879256dd038978dd545f
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/state_machine/state_machine-1.2.0.ebuild b/dev-ruby/state_machine/state_machine-1.2.0.ebuild
index 1fd85de6d438..2757123094a7 100644
--- a/dev-ruby/state_machine/state_machine-1.2.0.ebuild
+++ b/dev-ruby/state_machine/state_machine-1.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/subexec/Manifest b/dev-ruby/subexec/Manifest
index 1872159be167..3b9b59efd4d7 100644
--- a/dev-ruby/subexec/Manifest
+++ b/dev-ruby/subexec/Manifest
@@ -1,3 +1,3 @@
 DIST subexec-0.2.3.tgz 4384 BLAKE2B 27dc40377f7b2fee33553543723b9e15cd02a1171bd24b5d213b3546b7b20267cb8cbf987c1a1f6c0285f594b194f1dc20c41314266587be30d961e4b514f8b9 SHA512 b6fc5ee802906a690a1d1542ada44aba1df5e6861a66f4df58623e366d8d3ab2349d2963817bf07089e1dc15932ca03f0020d16777012ec4b92879280868bb75
-EBUILD subexec-0.2.3-r1.ebuild 747 BLAKE2B 91c8ab54546df3a10ccc28cf30d51927a1be19c6b8f1187500a6b9c0bf293b60af12116322575aab868b88d93e31cfa6794939b18340a0c7594516526b6d640c SHA512 8bf7f4dc1c1e9642f26445a9fd334926b8d469447fde5c7757419cb5416ce7fa09c5d0ed9a6265f8b9e11bd418d53b0d873de22f4c779e040a9cbf57ffb5b378
+EBUILD subexec-0.2.3-r1.ebuild 740 BLAKE2B fb3942affc86ce61ef8098e03b2ed2d2f8c7ceab7b50920c0adaf17e9472141605334a4f7fc88e15fabdbeaea2d9868bc0fc9267ccad7edc130659820e9c480a SHA512 4fec6839455d2463596071480276ca831c533b59c53da2bfd2efee322a04e4fe78dc65c86a03da42763a32de5b66e2d69b06de2de51614c62d46cc33a85b3950
 MISC metadata.xml 341 BLAKE2B aa5ca57e8f90589a330fcec539b522d24e13584b305e4c89ccc0a1efd3e62b50887da931ec7fd2321810b165e6ac09c8ee0dfbe78447a0341a8a749526261b7b SHA512 3bfec664d4436ca5e76c8d73872f7bc23ccfd6fe676725d96c96a64651a33660d4f0ec6f3aaaa6c231594684904078a848622332d9729a4fee1ffbfc60e29972
diff --git a/dev-ruby/subexec/subexec-0.2.3-r1.ebuild b/dev-ruby/subexec/subexec-0.2.3-r1.ebuild
index d1743c0022e9..0154b8bee659 100644
--- a/dev-ruby/subexec/subexec-0.2.3-r1.ebuild
+++ b/dev-ruby/subexec/subexec-0.2.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/systemu/Manifest b/dev-ruby/systemu/Manifest
index 3d758a0758ad..d89e3ff02806 100644
--- a/dev-ruby/systemu/Manifest
+++ b/dev-ruby/systemu/Manifest
@@ -1,3 +1,3 @@
 DIST systemu-2.6.5.gem 15872 BLAKE2B 795245f1741af87da43b51839d758123909e3d2a6bb95bd516bd5cc8b73fd38610c00445a49ceb784efedffc575eca96bc61e17585dd50c67bf0ecfc6b9256d1 SHA512 1755e1d24f6d93fd07578859873b94d3fbc855f86c94bf9eb0389959837e94e432883c638ed188e75254312c2ac66eee2041d8b13eff428b473ddf8a8105461f
-EBUILD systemu-2.6.5.ebuild 525 BLAKE2B 2591813fd26dd8d9b0631541eddc1a3ad66225d8ce107bc6e284540da291419a998c69de64ca3968bbfc94d05cdc0082df3a665dc1b883fce969887cc8496e46 SHA512 74f31a331228929a47034c146f1552fece59eeacbfcd1f021f07190986b022c785929747cf272b7b86b140de6630cc4f245014bf713ecde372470ff2148668a6
+EBUILD systemu-2.6.5.ebuild 525 BLAKE2B 8503ffd706f4423895dfdff437b2a0f8b49edfce4e2726f8f29d3dc769ce715d74a08ab4cc252457ff0dd821ff1d81b9321f1f241195eb3ecea3466f30513494 SHA512 524821b1446784b5471b697f5fd7696dc8e953eae6dfc54c5cd9d496d9feb8fcddf43cde9b265d3ab1f31642f2274861b4664dea66e194b51b95b1274889ddba
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/systemu/systemu-2.6.5.ebuild b/dev-ruby/systemu/systemu-2.6.5.ebuild
index 98361c0e8298..ce6d42b0eb92 100644
--- a/dev-ruby/systemu/systemu-2.6.5.ebuild
+++ b/dev-ruby/systemu/systemu-2.6.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index 0fb484a8f793..e07359cf535e 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -1,12 +1,10 @@
 AUX testrb 177 BLAKE2B 7f0192ddcadda449bc4766d5910c76ef21ff8cadce1372a46db4fc236374eaa3cb57e145b1b7b09896b3a866ddd9fa1f910f40b751a773bac1104d705902bc0f SHA512 9de97bde52a1e5770a8dae8da3adcbde3b1dfa7cabc6d131159c8a688a7ad5b59dbb528ce9eef3346da12264c0d30415addd907bc66c1d7d90b1dbc4c605730b
 AUX testrb-3 183 BLAKE2B 5bd4712b7a73cc480669facf537b5bbeaf16eeae2782e21d5fe88cf92c9945845803d3f1611d465a3fc16f76838b5aba964e9b96eae35d9cef1b0b269bb94e2d SHA512 cff9584c54bb682f03a0253df953ea930053642e249a3c4573e34cc78f4b77ef943ca5a2c7d1869d926b4a8d9e173ebece69169d845724b03c03f00608bdbdfb
-DIST test-unit-1.2.3.gem 40960 BLAKE2B f376db195cc7daf90807f8824954185591d913912c2b0f66efdff5fcbeb034dad4f9adc8586afcefe7946698be9d19d3afddea16b266a4c035376e84c2936470 SHA512 5e12a9691715a1e1afb53623867b77e2e06739929da5f0615c7341dc75f5feb281492bc0f6c55bdf1cc190f09a9a2c0f602638d5cad8a65682ba5f361bd22e57
 DIST test-unit-3.1.9.gem 124416 BLAKE2B f1c88d9e7da576babaa979a57eb522a244856711d013f0bc38ffb3f04d2b290eeaa50fde14078cedf1d86e26ebf12061ed03b9b82a2d9365a0c61796ef25eb72 SHA512 ec3068db7faceb5c6a3f3a848512aa76ec2e360a2a1ca7ec45fd6c1b84f45f04fb1b4d77120dfde7b0a41e4a8435fa37ba6550e4242e3817d344b3ca8d7b4428
 DIST test-unit-3.2.4.gem 128000 BLAKE2B d651a951d41d0a1ee2b95380d68dd15862959244eaec0e77750b910fecbe0f1be8d75f0dad7a2ac9f73bc4398e996a737a1218404f532f9b87ea7980ecc048e5 SHA512 e2ff209c9aef1b01c14a9dcea0c07d22fdc302cb42d68ffa8dd98d64dc444252ee746c3f3a2ad6ff4651c176d84d1b862e037a8a140c078b7f142a624115d3c7
 DIST test-unit-3.2.5.gem 128512 BLAKE2B 08758e57b9080b37a00af804d86ab63c582440e879724427ffe8429c5d9cc1c7d7bb0fc94df7c5d72fa18e07ace565b39b9e8531328b227b8ef997306ea95fd7 SHA512 4c2efa61893d20d593c3b4ab620219c4540f04abd8566c4448e17f50727a955188d76e2d09759f7829b4587c40369a2b7419bf13315537cea7da8bb95c795ab0
 DIST test-unit-3.2.6.gem 128512 BLAKE2B 51d20d77858d706c3db7e653cfa372d10f339b441fd6ee8a0487f89e7ba82bb525ace07da6962a87fc01d0515825dd72bc376309010bcaf4ff2a21faded0edff SHA512 4731f40a0c7ef855892a308470ccf005d31518122b0431b44406e627957819c9fb6a00eaca970e5914626e2ed12a4f6801e90df2ffc2762085fa414ea2203d7e
 DIST test-unit-3.2.7.gem 129024 BLAKE2B 31565510d5a16cf75706810a551dca40129edb0fc1528b9f55c862b23db1986640f42a72432028f47d052bb1aab3600c90c4ed19388ba11f2221a5d1e0619aaf SHA512 a55a5abee0d602b23af34ee8a9a7e26effc95ce9dd8ce98da28c49caf883d47c86bd2d0979176b0d1e239861ea73a4c5a9a280a1ceda7fbfbbd98c888ca6b01e
-EBUILD test-unit-1.2.3-r3.ebuild 813 BLAKE2B 5299d76d7553432c112062d748df701f19ffd98a653a3a877fc393d8c94eb34135d7af36b430d586fedd999dfe5b3de90f95bd82eb344a7d88b47edc21aec2f7 SHA512 e6c4a1501d0e7bda1e192e215da71e85a810f04e8f0a3c55fdadc39905eb4eef71467ea70ed0465a3f4150f30acc2bad693f5ab1ced96d571d1af0d5c2821ef3
 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
diff --git a/dev-ruby/test-unit/test-unit-1.2.3-r3.ebuild b/dev-ruby/test-unit/test-unit-1.2.3-r3.ebuild
deleted file mode 100644
index 67d53c5772e9..000000000000
--- a/dev-ruby/test-unit/test-unit-1.2.3-r3.ebuild
+++ /dev/null
@@ -1,35 +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_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
-
-# Disable default binwraps
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-# Tests need to be verified
-# Two tests are failing
-# test_assert_nothing_thrown(Test::Unit::TC_Assertions):
-# test_assert_throws(Test::Unit::TC_Assertions):
-RESTRICT=test
-
-DESCRIPTION="Nathaniel Talbott's originial test-unit"
-HOMEPAGE="http://test-unit.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/hoe-1.5.1"
-
-each_ruby_test() {
-	cd test || die
-	${RUBY} -I../lib:.. -S testrb test_*.rb || die
-}
diff --git a/dev-ruby/text-hyphen/Manifest b/dev-ruby/text-hyphen/Manifest
index de7d035f18de..4e3e2538d729 100644
--- a/dev-ruby/text-hyphen/Manifest
+++ b/dev-ruby/text-hyphen/Manifest
@@ -1,3 +1,3 @@
 DIST text-hyphen-1.4.1.gem 751616 BLAKE2B 4a6d6a9b430c2dee2a486dde9f49405b98bc32fe8f96448c0cbe8d55f416c4e4e9bef5ae3adb57576dee6fa285680fc57b958cb279786872c8d95282cbf72e73 SHA512 4a6667aff01e56afce79302f46d0afdbf9c965ad80dbf9a7266a213143e6b6bc2cb00092d26900286bf72a700e47be6b0860cfdf87fa2856477db02261f9ef3d
-EBUILD text-hyphen-1.4.1-r2.ebuild 798 BLAKE2B 6ffd89809e2bc5d56aacb64b9e1141f77635d513f54f4214e87abfe4635ceff3f521dc3179d3943ae19821119c1d2afecca36a79f3e8350bcc5d3bfae6b227b4 SHA512 b8c873bb718adea783857a8f1bebbc767af31a766971993635bd51fd3a40b59773e118dbef98d4e7468fdc0466b6188a2e0479fa694d34bca21cee5181e5f9be
+EBUILD text-hyphen-1.4.1-r2.ebuild 740 BLAKE2B a3ecc9d342c0d1fda1b471a05af34d84a35926efc7d900c2c40daa368b5767ff5c0e02a78f4217c65ab96da25b087f12b3b81a3d095f9c254852ccc170175c05 SHA512 3ff7a752729affc7bdaa354d251e2d5e021a7b0081bd1a5080ee4cea701a46ed1afd137d6b2c3163952f57a024bf52e765958f592e4dd87d617ddebaa2db56f2
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r2.ebuild b/dev-ruby/text-hyphen/text-hyphen-1.4.1-r2.ebuild
index 944872608d10..78164eece2a6 100644
--- a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r2.ebuild
+++ b/dev-ruby/text-hyphen/text-hyphen-1.4.1-r2.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
 
 inherit ruby-fakegem
@@ -20,9 +19,6 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~pp
 IUSE=""
 
 ruby_add_bdepend "
-	doc? (
-		>=dev-ruby/hoe-2.8.0
-	)
 	test? (
 		>=dev-ruby/hoe-2.8.0
 		dev-ruby/test-unit:2
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index 829b58cfc689..0e0bba63aa5e 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -1,9 +1,6 @@
-DIST tilt-1.4.1.gem 42496 BLAKE2B 34b142f50650e418f37cd68b81f97257c4ffd5b2b0788582e4981438f2164c70d5219c27d595e820772ab7e26e80fce752f49a6f9c52a17bdbba659ca487a0e6 SHA512 10fec263596d0e18a7a1440a7edfa08a161526cc46cc70427bc251951c447c40b4a4e8675e9162a9ed288879682b4aceeeb35b48cf3f4925921025194543363f
 DIST tilt-2.0.5.gem 52224 BLAKE2B c3bcd3cbf45ec3cd7669e5f3adb97f26508b5fc57fa234af8074422f7de62be8fca960d94a9b637b8adf8825b7b31cb5049b48bf75c08565b4ba42e2d37b3493 SHA512 b032439d00e09d3968b20f5ea5937c5918b1e10e0255cce402b6859b7d59ecdc265523a151c0fcca0034e0de26ca5fe422944790939896d7e0000641980764fa
 DIST tilt-2.0.7.gem 54272 BLAKE2B ee532ce6e68937677f7d5c4ea763ba5bfc84d87a052e15a58f09a1c453458e1b995506a32f3f33cc34e4642bcdde954b0c02c4588b550888c9704fbfe49be7cb SHA512 5becf05d870db6ddb656e7a1c45615aa821e0b9827a9cdc4212dcca25c24db671bd8d9fb8f8d6a6ea4095dbe6a80fc0b4792b4382d50ada6c0eec81fd6270064
 DIST tilt-2.0.8.gem 54784 BLAKE2B 14b067227a1c81060b4627d39fadcae00300fa30c3b4741c2c07f0e69bbe62b1f1e8f3a165f43ff72c9788d3621a133375c3be72c9bf16f0c18686f550bc3c16 SHA512 1767f2e5ce45afe95d84d32de7c2b6fe24ff7cb6f7ee8485d84344820b2f6e969ae60a6fbaa7141f7fe135c6540d96fa5b27fd8010b95c0ded5d049a315001d5
-EBUILD tilt-1.4.1-r2.ebuild 1067 BLAKE2B dfa5709e45ee9a417bafba11c525ffb03c715af0caf69e6344ac2df930c3532ec7616e4de7b1e58cb23b9369d042ddf1b4a85262d0e5c6a01e697508e6425c2c SHA512 169e975f74592ffab938381950332041f54c9f5463e09c254a7c1a1ed6930f9173f55e4936478b3895a6c4aa0a6702e9d6fa381466d2cd6934179cc602499358
-EBUILD tilt-1.4.1.ebuild 863 BLAKE2B 38c5de104c8bd36dca3c07867a47c8fde17ddcf4cd568847e352a1dbd1597374700e93b38fec17ebfc58f254c0096399169e3a8f6575bd6a55ce6779b9c0766e SHA512 77b54973e4ecafaa6a798c1de0dc0786c8d7cfcec418bf466eeda81cf500a913bdc8423fe9f09ec13061f0595b4e28b59b854c04bcd2f89f505f888be0920284
 EBUILD tilt-2.0.5.ebuild 1476 BLAKE2B 06c6e022c0a989f69995a62e893b0a4abd25f03ed9dc5d8daaaa8a6f02aa9856ede7e4e6e49624f88a0a6a11cf45ba27e99b3b4576fbe6a1a0dead5440d787db SHA512 89e0fcaf8fa663e5868f36b2b85192b0922e27ca0c9a3c82ced87c8b31d8d456dc994f67304a2c2908e07062ee225527cbef2c79d83a3e7fbe3b865e875353bb
 EBUILD tilt-2.0.7.ebuild 1453 BLAKE2B 40f643f867244d0056b23bd20c6d438eefab81a076ac6a7880c1a863f0e2f9dde14f4a67603503bf7c25dd420b45c8399385de47ef606ea3a481aef4675d90f6 SHA512 a0cbaa9ab3c7eb7dbb0b184951b57c8b2c3e5c2dd9dbd60d66c8d5e2a95c5c56cde0f8dd336046d970cde62791a1364a087d48b0866d5b47e51bf7ad4a1e674e
 EBUILD tilt-2.0.8.ebuild 1453 BLAKE2B 40f643f867244d0056b23bd20c6d438eefab81a076ac6a7880c1a863f0e2f9dde14f4a67603503bf7c25dd420b45c8399385de47ef606ea3a481aef4675d90f6 SHA512 a0cbaa9ab3c7eb7dbb0b184951b57c8b2c3e5c2dd9dbd60d66c8d5e2a95c5c56cde0f8dd336046d970cde62791a1364a087d48b0866d5b47e51bf7ad4a1e674e
diff --git a/dev-ruby/tilt/tilt-1.4.1-r2.ebuild b/dev-ruby/tilt/tilt-1.4.1-r2.ebuild
deleted file mode 100644
index 888e75799c31..000000000000
--- a/dev-ruby/tilt/tilt-1.4.1-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# jruby fails tests
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md TEMPLATES.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A thin interface over a Ruby template engines to make their usage as generic as possible"
-HOMEPAGE="https://github.com/rtomayko/tilt"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/bluecloth
-	dev-ruby/coffee-script
-	dev-ruby/erubis
-	dev-ruby/nokogiri
-	dev-ruby/radius )"
-
-# Most dependencies are optional: skip haml for ruby20 and ruby21
-# because haml depends on rails.
-USE_RUBY="ruby20" ruby_add_bdepend "test? ( dev-ruby/haml )"
-
-ruby_add_rdepend ">=dev-ruby/builder-2.0.0"
-
-all_ruby_prepare() {
-	# Recent kramdown versions handle quoting differently.
-	rm test/tilt_kramdown_test.rb || die
-}
diff --git a/dev-ruby/tilt/tilt-1.4.1.ebuild b/dev-ruby/tilt/tilt-1.4.1.ebuild
deleted file mode 100644
index 01ae1f65439c..000000000000
--- a/dev-ruby/tilt/tilt-1.4.1.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
-
-# jruby fails tests
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md TEMPLATES.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A thin interface over a Ruby template engines to make their usage as generic as possible"
-HOMEPAGE="https://github.com/rtomayko/tilt"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/bluecloth
-	dev-ruby/coffee-script
-	dev-ruby/erubis
-	dev-ruby/nokogiri )"
-
-ruby_add_rdepend ">=dev-ruby/builder-2.0.0"
-
-all_ruby_prepare() {
-	# Recent kramdown versions handle quoting differently.
-	rm test/tilt_kramdown_test.rb || die
-}
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index c73f100db912..fd0662a124e7 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -7,5 +7,5 @@ EBUILD tins-1.14.0.ebuild 632 BLAKE2B 441f04010ddf736f421db682cc787c64b4efbeb6b9
 EBUILD tins-1.15.0.ebuild 639 BLAKE2B 15f659b442ca6238b51ad77ac380fd1196cc9a9898cfc3f24f1a75a1f64bb986a9f7e42fdf6348e5b73b096a455ff45f8c3878d9418b099ba6474e1a8754d683 SHA512 cf2c36314b7e9a7e37bfefc83ebdfed9d3e68992275714d94ab00ca66e8c7f762d2e1921640dff4401059f6f64d9c991c26d7363a8f4a35029cb1b0942809c01
 EBUILD tins-1.15.1.ebuild 632 BLAKE2B 65e866d56142cd7e8ebd4e59200caea901b615fd507820d3709e204b1f2cf1a22cce2812c689f857cf3f99eb3b85d6928e9eb78a774970a9c73c3d4ccf3c0cdf SHA512 b21a158ed081c54b920ad7e27a9daf674bafb7d662ccc3146e185291e4e38806bc4b3fa088320ba0d74f2a77eb1c49e2923e220f9525aa30407ceb3ad2135ed4
 EBUILD tins-1.16.0.ebuild 632 BLAKE2B 65e866d56142cd7e8ebd4e59200caea901b615fd507820d3709e204b1f2cf1a22cce2812c689f857cf3f99eb3b85d6928e9eb78a774970a9c73c3d4ccf3c0cdf SHA512 b21a158ed081c54b920ad7e27a9daf674bafb7d662ccc3146e185291e4e38806bc4b3fa088320ba0d74f2a77eb1c49e2923e220f9525aa30407ceb3ad2135ed4
-EBUILD tins-1.16.3.ebuild 632 BLAKE2B 65e866d56142cd7e8ebd4e59200caea901b615fd507820d3709e204b1f2cf1a22cce2812c689f857cf3f99eb3b85d6928e9eb78a774970a9c73c3d4ccf3c0cdf SHA512 b21a158ed081c54b920ad7e27a9daf674bafb7d662ccc3146e185291e4e38806bc4b3fa088320ba0d74f2a77eb1c49e2923e220f9525aa30407ceb3ad2135ed4
+EBUILD tins-1.16.3.ebuild 639 BLAKE2B 634a599adf1431d8edc6c63337d2c8fb47ae5c47ff0a1dd62bc4647f8fc4fda1532f412e1ced057534c695cea833ea00b3f2a8d153db55744dcf0646272e88f8 SHA512 9ec1757c4e5983e42bf49108fa9c97d80311c5134eaf839e36d8d9b608321f987b619f7a11306355c930810c5106ed079e97f6342f3fd840f412667fbe87a4ae
 MISC metadata.xml 336 BLAKE2B 00b8e1ea737e7431865357c6f52ec454afa14e9e22e130b6ae286a4bbddc2813c2f34ddbe492897c19683ce329bb146be74b994955efab2799d23f81fbca4eca SHA512 fe0912b4e761404c8d0d5860e663270bb47610ce4bee99569588e2c2300b80bd8e5df2bbdbb91afcdec1df178d605acd61635695eff0e7696e04b673a3e14c46
diff --git a/dev-ruby/tins/tins-1.16.3.ebuild b/dev-ruby/tins/tins-1.16.3.ebuild
index 9a51da89a888..9383f378dede 100644
--- a/dev-ruby/tins/tins-1.16.3.ebuild
+++ b/dev-ruby/tins/tins-1.16.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
diff --git a/dev-ruby/tokyocabinet/Manifest b/dev-ruby/tokyocabinet/Manifest
index 182eb846a10c..049e6e8c6a3a 100644
--- a/dev-ruby/tokyocabinet/Manifest
+++ b/dev-ruby/tokyocabinet/Manifest
@@ -1,3 +1,3 @@
 DIST tokyocabinet-1.32.0.gem 18944 BLAKE2B d55ebba43bfb904dfe2b18bc0c22e92b30ced4cdbda8025f7e4d9088da03a2c8486f210473bd05be13fa8d8448830a8f11fc9dc9c34b9803514fd8fc5cce984c SHA512 274a72e166bfb776b66379f587a141c8d0407dec7aa17bcd2e1ce2a401784f52433e72bc356140f69dcca651351edb22d5c9da6fec09b1b1fcfd53cb5af666f3
-EBUILD tokyocabinet-1.32.0.ebuild 582 BLAKE2B 74c4fdd34a4fc640418daf882b6b0d25fbb9e6c00ae388eb85fbb07ac0e5780b075e5563b08759f148358ea32c32de47514c6671e1d0370d8b944671fb500c19 SHA512 2f64cc97d32f157fa79a7dff93f5be07f8f4393b0230299f45896ce9785c10dffe3b73b4196dec91b1b6d6932c4fa08f0fc958f260f5944a69ecab6f00dc7074
+EBUILD tokyocabinet-1.32.0.ebuild 582 BLAKE2B 64fa40aa38e17a6cbea8b87fa09ea1940e220b6d42033456dd825406624aab3c9e316d545d6c51e5f3ed407810439487291c899cb5414c268d82109e9c621ae5 SHA512 ec4789846e6bceb532766cfe2f8f653f7074b1121dc2cff754e3ebb5d31c198e4560b1e898cc6f3e27f966f2270112275062db4f17eff41c705f1d787e8af9bd
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild
index ca676620f04a..0d9f0771410b 100644
--- a/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild
+++ b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/transaction-simple/Manifest b/dev-ruby/transaction-simple/Manifest
index 0d27406d80d2..cb66c9c65aae 100644
--- a/dev-ruby/transaction-simple/Manifest
+++ b/dev-ruby/transaction-simple/Manifest
@@ -1,3 +1,3 @@
 DIST transaction-simple-1.4.0.2.gem 17408 BLAKE2B 731564406f9904e243838ae207958857065aa7e785c6c92ce769cdfe4fe8c32e8bbaedadd1a258b40babf3c4d59c77894ddaf3607978129590c7bf642f2877d8 SHA512 083c2c0d8c094d052a5262e21911985a3bf91875892844fb0559546901eea21ef14b139d7af6446c7a7bfbd1adf177e2d73cba2798c823bf295a6c87981165a4
-EBUILD transaction-simple-1.4.0.2-r2.ebuild 664 BLAKE2B a92bd21ff33b90a1471057b7b9f4b251ed4723fc13c120b8457918f0eb93f0692a83a2aecc2648d762ed0fb8de7dced280f7f07e5175002becc150c5491d1e65 SHA512 278a62e5480bda9a89b8a17662dc1880c58af0d0a30c671334b7749b9bbc37021bcb81945184eea7ef0524ca75be2e9033f5c8dc5e966749fd11d75998e3a212
+EBUILD transaction-simple-1.4.0.2-r2.ebuild 664 BLAKE2B 0553e8625b482d8342cb010b847bf4291a62ab3b8879757cd5acf4fa1249650edf01e34a994dce98e566bd029f8feb65710b25f5f3564166910efc3d79da3649 SHA512 17764ce5f658426b15e4b8feb2c3c77a68a494f4d979165c04835cbb2648ba19aff7d7d776a0e3534efcdc1946a37ea424bdd2782c15a867b1d8ae3e7d5590e1
 MISC metadata.xml 355 BLAKE2B 6f5adbc9e94fff385e78b876b2a7fd8789af24ec402ea9eedae24ec285d8dff6700536e28406ade96acdaff2ebd3b92a9021dc35c4acdabc7619d824edaf236d SHA512 7c8a72f1194aec3e61c829170307b845bc29bb6733d70aa6a1fd33f36ea60c8997c8ff0b42f7304cd7409fad530f4d12149c7aa5e492cb190f68855f2de5d5e9
diff --git a/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r2.ebuild b/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r2.ebuild
index a93faf83f100..711b9ff6435a 100644
--- a/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r2.ebuild
+++ b/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/trollop/Manifest b/dev-ruby/trollop/Manifest
index b44da4227ac8..b39da8eb0a08 100644
--- a/dev-ruby/trollop/Manifest
+++ b/dev-ruby/trollop/Manifest
@@ -1,5 +1,5 @@
 DIST trollop-1.16.2.gem 22016 BLAKE2B 12d9ad62173bd53e542b4d8c61e7b5fa2116487d2f933b735d73fb101d85555498e497f53d4d6cb145c0970b297f3cfa048ece0e68ee7887ce4b53141993859f SHA512 ad99aa2c0c3b9a8ce7fe0e3f5fc1ab6f600dda5229cb5a15cdf2a3dcc6ffadb8e386a695eebc07b86742c7d62a99794e57e86263a6e03f3bd5f883ad9fe1959e
 DIST trollop-2.1.2.gem 26112 BLAKE2B b8dd1540b7b50a8b587137306df5536a1402457621236a40086ec8e02a48ac0d6aaa1b6f8273ee0814438788f09564bc236031603f9b88bf9705d04cea940053 SHA512 afebe220119476fe3b992f430c79c9de06a6b5398f3ccf957bc0e3b3a1bcebd47a350a94882b3c46aa4db93c70002f3d4adabfe95d0338f14149545c7a9e8dc3
 EBUILD trollop-1.16.2-r4.ebuild 612 BLAKE2B 1dd2eaaf76eeb86945a7de2b9c9c8dc07ee8e3c3de84b7fcd023c5a53c6c554dcbabc6ea23494985e3bc1dcc5aa18f51f803f76b255969b51bd8b20f11bdcfe1 SHA512 5b847fe3c867b5c384722a7acba477774e2cebf4938551092e54d4318c5f9fb9008d053537883ce766bffc1dd678231327571a1ecf893d6a9488d48f55775c0d
-EBUILD trollop-2.1.2.ebuild 694 BLAKE2B 8d267fe9b37ea9625c20da5cfc00b74fa414efca2e2caa293d0e69aa8983ebedda1ebe679e55dedf20323b4d4b598b133e40126fd5ab8338fcf0ca817802f4a5 SHA512 091404c4272f3c373b3b0f6898fdda88f415e07046da739ab10f25b5b551441e0a770d9b910e0b10cca3ab5652c919ce9015833db95876bed8413a5de8d5508b
+EBUILD trollop-2.1.2.ebuild 694 BLAKE2B fc2889417b3588dc1d2e525702675a756ac26fda08ebfb96dd5b207e2f7c5645b7f03aac7ffa666db5ec0eef6acfd02ea76dee31f5c8abf8d1870446b26a897c SHA512 aff0e3e325f619997ed378c66c75a2fcd836b84b58a5b3b2fbc105f43bfe0b47c6a2a140f15379d912708bfca6a9f2fcb804db647fe397989da5ac876ac1bfcf
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/trollop/trollop-2.1.2.ebuild b/dev-ruby/trollop/trollop-2.1.2.ebuild
index 4d5b467bb0f7..039dc93c5fc6 100644
--- a/dev-ruby/trollop/trollop-2.1.2.ebuild
+++ b/dev-ruby/trollop/trollop-2.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="FAQ.txt History.txt README.md"
diff --git a/dev-ruby/ttfunk/Manifest b/dev-ruby/ttfunk/Manifest
index 31997b32c364..d68484f4ceb4 100644
--- a/dev-ruby/ttfunk/Manifest
+++ b/dev-ruby/ttfunk/Manifest
@@ -2,7 +2,7 @@ DIST ttfunk-1.2.1.tar.gz 733233 BLAKE2B ac0d44d0568e56519a85f6453ccd3df48de4b76b
 DIST ttfunk-1.4.0.tar.gz 784076 BLAKE2B bf2a9c9a54127eb922e2d3f4e98033092adb8c9b434564f61dd7d8a334723e484a42ce0425bf85908c16e91a2ba8fd4e1bdb3fd4d5c55ece8d20c9912de709b6 SHA512 369c7230c3e1eee57f0fba77cf2bc67c3ef6c6a1d2ba0280e1c6776ea1a6aaffafd2cb1f1d410f7be9d594c640d6afa4fc985c4eea85938d2feb37c3c7886295
 DIST ttfunk-1.5.0.tar.gz 1454334 BLAKE2B 207fffb2ff9df88ceac83a8270bf65edef1c31ddd7a6b5e29b1753c4f653f9418f70eace5727e6eae7164b4f2eadfada55c9124f1a5edc1781b467ff87c73566 SHA512 824cbed423144b2057d9f1ae6d268d2aa43bffef3b35e076a660cf9359c1751276672b2892cd75b7cdecb71df511d18daf123e6c6885b63553ef847f674d5f72
 DIST ttfunk-1.5.1.tar.gz 1454516 BLAKE2B 08bb349f4289977b7391013a6686a05f27b4faea9f4b005a5056e525ce02fba2de43712e4538ccf17d967d9cc2c29cbb95e6fc39fc11b6c17291ceac54f63849 SHA512 6f2ffb30200b5b5d36150fe8e81e376e8f4ceec3ac4b1bfe9363191f37616f7a22849a826c19a87458ea5ca70c381e6f976311964bac113bfe5aa767d9e459d4
-EBUILD ttfunk-1.2.1.ebuild 703 BLAKE2B f18668a2c3d27935a85c52becd91fb3107972220b6248e59c2e36515710e52ab66c20220f41e530063d39397b82d36241c0e3a90d620096d7e6f9f495c13ac42 SHA512 46621b31fd420038152f595ce26a5fef40c8aa019c3edf5de0b78fc648acd9446411ef4347cf96e8f2ba208dbf9b36dd2ef5742617470bb39a98650e8e873705
+EBUILD ttfunk-1.2.1.ebuild 696 BLAKE2B 8465d4a1500fc81f9ddb7bee961b67e622fb89203e5665a9b32c4b379f2f689385c3b6e763978814713c6523f63762bc5e7d3a21efd73df6aa42d1494e3b33c4 SHA512 c7be9639b7d5ee7679be8b02200dcd00b860384ebb94bd4492c446aec43a162b1c0efd85ba831a80b2bf3a28f3eaefa605648220982f9b4debcb445f5503abea
 EBUILD ttfunk-1.4.0.ebuild 703 BLAKE2B f18668a2c3d27935a85c52becd91fb3107972220b6248e59c2e36515710e52ab66c20220f41e530063d39397b82d36241c0e3a90d620096d7e6f9f495c13ac42 SHA512 46621b31fd420038152f595ce26a5fef40c8aa019c3edf5de0b78fc648acd9446411ef4347cf96e8f2ba208dbf9b36dd2ef5742617470bb39a98650e8e873705
 EBUILD ttfunk-1.5.0.ebuild 714 BLAKE2B b30c095ab73485c816c230468125a50541d7f98152abb83897db6d6066481685a1b5d1989bfd92bb12d37aae1b36015878af2fa3dd22f9defe7da0ff42a3c722 SHA512 f85dde7d19ff0dd80e38dff574b4238c97de6baa1aa9a8b10bffd99fa5a055eff5b8b057a255cde1ea2a9010b6540a255d061eb44542e51fb9d6e14d8ba2f95d
 EBUILD ttfunk-1.5.1.ebuild 721 BLAKE2B f4b8613ec0c0fc18cf06bfb3b212d5a3ba1b816187a8ad5aa2702a04db655f533d9981e69032afc2f736934915c29b56cfc7f99680e8d77c5f68bcd072c57db6 SHA512 46d1169e4e47e9792dee6cd00bf6103197bd65d862ac482cee9d974badcdc9e7563048946f77b78d85b96680d3bb2f204328b60b799c1aeddc27d2165b9b8e65
diff --git a/dev-ruby/ttfunk/ttfunk-1.2.1.ebuild b/dev-ruby/ttfunk/ttfunk-1.2.1.ebuild
index 70a258318fcc..c635cf8d8606 100644
--- a/dev-ruby/ttfunk/ttfunk-1.2.1.ebuild
+++ b/dev-ruby/ttfunk/ttfunk-1.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
diff --git a/dev-ruby/turbolinks/Manifest b/dev-ruby/turbolinks/Manifest
index 1e2537358b98..aff1d68e2b1b 100644
--- a/dev-ruby/turbolinks/Manifest
+++ b/dev-ruby/turbolinks/Manifest
@@ -1,3 +1,3 @@
 DIST turbolinks-2.5.3.gem 20992 BLAKE2B 55883b4ef728d6499d01357e404cd5bdbc7ce7914c78dc1abbaf7e18737bf9120988662bdd8acdfa61129f2099c8c27cf34e3b88a046d24cdd94f574488d5879 SHA512 3ac0bd52793ae60d57ab8936646157eccd3e83b112ff4456286caea61c195a855f6b3d0b474aa3f298515bda537545fb8c328254144a958ff9a7271183011d2e
-EBUILD turbolinks-2.5.3.ebuild 523 BLAKE2B 44c4ed0e2c0847a00533e20758672b692e48b7cc2a12072341347af4e83cbc0543d878cdb8fa312763027241ab4f01de576fe1e11cc00c3a6a32fc5a6c3181a8 SHA512 78ad949d12e299c763adabbd3e839c8c562eed5dc159b7a84c058c0e04c083a932769d964e5ca1d8c03627d3ccd1a14c76d61535d70b78e3f7d3731ad930a4f9
+EBUILD turbolinks-2.5.3.ebuild 516 BLAKE2B 837f5e4a45639fabbd9f02c22e7a8200d4304c8dc0a5c836de02bde34e0d786a96d30152e4f39fd97eb094c214afe35881d1d92e743df6116fc0970d083ae1e8 SHA512 3fa11bbc49e1bf4ac95dce5c09a12fb9a9e721fbd930e491b6c5162a5b30f9cb5b7d042ef01770dfb8b3d5a03a413e07bb1eb27d00119dc4f7bd5e76e703630a
 MISC metadata.xml 342 BLAKE2B 6a78075d284b979777608d6701b92ffd1b4e72af314ce5c49a1f975615379fd976031455feaa2e6efb14289398d434642b6b2b6e8e037c4ff69226649247a9a0 SHA512 3ea14f0b2b2e0ac563e97ef9eb9ea84e6389dbd456655f344a9cfd4a7a9d24eeb3eaa4fbbe30683cb7f7adeae9c51d136a5a2174cca6ddc1e0d7b31d380a66ce
diff --git a/dev-ruby/turbolinks/turbolinks-2.5.3.ebuild b/dev-ruby/turbolinks/turbolinks-2.5.3.ebuild
index 8379c386cafd..4d9fc16cec66 100644
--- a/dev-ruby/turbolinks/turbolinks-2.5.3.ebuild
+++ b/dev-ruby/turbolinks/turbolinks-2.5.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 # The gem does not contain runnable tests.
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/twitter/Manifest b/dev-ruby/twitter/Manifest
index c04c5d842488..a487905fc91f 100644
--- a/dev-ruby/twitter/Manifest
+++ b/dev-ruby/twitter/Manifest
@@ -3,5 +3,5 @@ DIST twitter-6.1.0.tar.gz 1269592 BLAKE2B b8859fa7e630bc188704e895a3adcc4a3911b4
 DIST twitter-6.2.0.tar.gz 519470 BLAKE2B 4c3d929d8706845610b31c8ae702563d0330a95a165e417b77ecfd894b1f216100678c9862856c3c450952e3025940a701d96f0aeb1b29de55e612c6c69ab231 SHA512 5d2bd653233f285e0c08503031317a966ec098e9b302f9e0c65bdbf4632465988b1139719dae1cabb856b08200fc7793cd341fd926981484cf416a01f309d242
 EBUILD twitter-5.17.0-r1.ebuild 1509 BLAKE2B ec5c10eb5e0d042f0e706bc9e2aa1ba7e62fb2e269ac3c2f11013fad2480a8da2ae3e9c43da59fbaf4f9e415a27a792622a65d65bbc713d63d15db891dcfa424 SHA512 02b8f9e4618fce7214d05078c79e02cdcd49d276be96fdfeae85e69362643268893bd513310de2bb8d3bf705cb339ba90d8d78a3a865a7f9373cc0f7da2f6488
 EBUILD twitter-6.1.0.ebuild 1435 BLAKE2B 00518bb604f605ad25c6edaa88c036bcc107367599fe10af10d6a5bbddda224ec6ed221e500b736c3ce9e441d0b8b4b29fbb117bda8d093fc96eeb39acb1b860 SHA512 3a4b329819ebae7674e22eb86ec53d7dcd33a58c5607802dc43e987daf267fc7fb8bf8dec60fb6c0ec433a51fd6d77a0f8c53a072b7f8f9c64a24b2ff3bb929c
-EBUILD twitter-6.2.0.ebuild 1448 BLAKE2B 458920c07371b584bef8d84638378ff0fd1110d7d82ed6d6b14772c1f26b76eb27b237d7fb1c030f02583561acbb1b72fbee05c060556439a1b1be85648a3774 SHA512 8adddba296ee05373e959c3e028cb7de2eb1fd01819d5fbcf99f71be97f92d4b43ca2a8907a7c0eb51398ff6c1a922b66d28e6e29b14071e6e33f97e72bd8d8f
+EBUILD twitter-6.2.0.ebuild 1455 BLAKE2B e545eb07a11c67f95da1a7a2a92492ed12886c737378b4ee4626ee38ad362b2ae6b72e91d2f61a18efe928ac996f00553d8bb1529d266745b02b1f204ab3ac60 SHA512 513f063bf15f3e78b35a3e988d3b8dea773f99724b00b0ca0f56e5e5040acda73660dceaf7780f566811e02e2ae454381b5145e0981b139f6a4fc5f30b1d3552
 MISC metadata.xml 340 BLAKE2B a354a967597b16b9fa93b1f41274674bd913c39321768b19ae9cf81937e53eab05bf616bcde5b375bdd2de0e91f141edc6def3d60d3d7f75732875c529d2e153 SHA512 504babcfb5a3f49934a8eb1107a5777206c134e5f39d96badd9333c57909e2e378dfa1d88dc49c945a9c5cdcf59406f7e6658c177098fde1cd2c12314f9ca239
diff --git a/dev-ruby/twitter/twitter-6.2.0.ebuild b/dev-ruby/twitter/twitter-6.2.0.ebuild
index bcac905abbf5..2bd8625d4c50 100644
--- a/dev-ruby/twitter/twitter-6.2.0.ebuild
+++ b/dev-ruby/twitter/twitter-6.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/typed-array/Manifest b/dev-ruby/typed-array/Manifest
index 026426c45563..0d5465a9c461 100644
--- a/dev-ruby/typed-array/Manifest
+++ b/dev-ruby/typed-array/Manifest
@@ -1,3 +1,3 @@
 DIST typed-array-0.1.2.gem 10752 BLAKE2B b329b08d58d964e43d8ac78d0aa5b8a86c375d7d2124314fb20582bd04dc0843f22f7932fe8302a13c7071e55b2da913d95c4bf06fb3e61de093a22dfae70015 SHA512 e61631e6c9c4835a1ab11a0c3698df3c5831a0b1b03737a51496e9af971541a07259e55ba2430471c868770d950bb8cb77b5eec810807d05d3eded506c588937
-EBUILD typed-array-0.1.2-r1.ebuild 564 BLAKE2B 70c2623e35a915f70acb22c2f609083b58852fb26c261e241af5c407b395073d5729fd310258e58164daaa05ee1530336ab42447d75e0120cffa347cc1d3ae19 SHA512 e7bce48fd99656d80eccbb1d8c7ad17adcf8eda5ca6a1d06bb69714a0e1af655299d3d98ab53174ad794fb7eefa5c4e8d9ad873cd17da8055231c0dc47aaa29f
+EBUILD typed-array-0.1.2-r1.ebuild 557 BLAKE2B 04368f39e26590c8b25aca222d61c248e6d9538e856a0ef825aee82b6c5fa69025af202e4ecdcd65343909558a15e72da2f2b316e111b7a176a848abbc2ae573 SHA512 c4cfe9f5f26687402f40a93a741f7d79231c74ec9f95806a6ccef13597f1146b4cc021731802b72608098ad611af3411e389b253f7c987cc6f82402c7059a39d
 MISC metadata.xml 425 BLAKE2B 963e3a53fa20754db4c151be6dbf604742f8733db5cf74a68cf7293fc37a8b785f9cb59b1f5796b845562d61bf98470c34b561f3543cae7bb13e0050c26b49ae SHA512 d9ce219d11df30d3350552c448fcf5c2c4c4448db74a2fffcffb48308380fdcdd63e8708c0f15060f8980e98bfb39d564bc1d2bb1721466e78fec3e853c32ff2
diff --git a/dev-ruby/typed-array/typed-array-0.1.2-r1.ebuild b/dev-ruby/typed-array/typed-array-0.1.2-r1.ebuild
index 71c4e8df0439..b325d29339c3 100644
--- a/dev-ruby/typed-array/typed-array-0.1.2-r1.ebuild
+++ b/dev-ruby/typed-array/typed-array-0.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 inherit ruby-fakegem
 DESCRIPTION="Gem provides enforced-type functionality to Arrays"
diff --git a/dev-ruby/uconv/Manifest b/dev-ruby/uconv/Manifest
index beb3f1c25fcc..b55f31a67d5f 100644
--- a/dev-ruby/uconv/Manifest
+++ b/dev-ruby/uconv/Manifest
@@ -1,3 +1,3 @@
 DIST uconv-0.6.1.tar.gz 740417 BLAKE2B 41bd221121e301d5df365f6d9eca56fd37e3185cbe75f653d60fe3df5d62c385c831607086330e56c45e280627cb03247be230e655f293c09d671fd1ee574723 SHA512 6f964e42886f498bd6c4111e522143d8d958b8c6e401d26f784fdf1441684f1fde7cfdc35a08d3707a42e305d5508d9ff3fbc1b735298f8af2aae3923cbda68d
-EBUILD uconv-0.6.1-r2.ebuild 725 BLAKE2B 76bfe909cdd8dcdeeda108133250fdc2ac885a84cbc7355a5a757667b25843d998d6742b665d240c1078e734cd5a81c45694cc16f49cfeebf2bbdcd54f499967 SHA512 2218cb368b2c1791b1666aa0ede2f5a2ff866d878f9c4b6e971309506baef3b6718fc2524a783fae6f3c0627a3503a9bdd892f4d01a4ff3d8b2d4204abf06172
+EBUILD uconv-0.6.1-r2.ebuild 725 BLAKE2B 37d8546df94654c0fe15b95ef47ea904ca90d2b812a961bd09f7f6940e7f5e89109f85c86d049e5afbbf59701b6a52e2d7c2d03f9174a6d36230f060d3a21103 SHA512 2d2925114daf5fecd1c85a5088e00822eb98257643d61b563ac2fc81864980712f1a9e9d77f57d45ce60e359c07d964e79cf970485e567d240605f238eb0f4d4
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/uconv/uconv-0.6.1-r2.ebuild b/dev-ruby/uconv/uconv-0.6.1-r2.ebuild
index 00855189d6c0..3297b851af64 100644
--- a/dev-ruby/uconv/uconv-0.6.1-r2.ebuild
+++ b/dev-ruby/uconv/uconv-0.6.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 inherit ruby-ng
 
diff --git a/dev-ruby/ultraviolet/Manifest b/dev-ruby/ultraviolet/Manifest
index 7689543cebd7..c13951501daf 100644
--- a/dev-ruby/ultraviolet/Manifest
+++ b/dev-ruby/ultraviolet/Manifest
@@ -1,3 +1,3 @@
 DIST ultraviolet-1.0.1.gem 46592 BLAKE2B 2dd9b69bafdb83c321eee2c4fed9a39782959893993bdd27d3c1ab8337ac1f9a68d8cf7cddbef12404041d541d183f0bd205a4c36ee4978a2c0a631d0df3fbce SHA512 f974f95743b56d7424c8ac96867c56f4d849247ba552bd09ba8893ca6520758ff2132ac46a42f22b8547732bd148531d177a7d38522fad1dfb86d54ffbb29861
-EBUILD ultraviolet-1.0.1.ebuild 695 BLAKE2B f977ba4158467c95034ab4f409760ccc857ddf63b40f010705cadc7e3780b265fdb3161fea80f8b7de0931bdddc20e4161c9357fa4981f627c7f40a129650803 SHA512 4c0def5ffcb8636d13b5b8525e5f5a428b1102ffb0b79c9e9a8ac13c684e0781e2cbf78843d3fd4d6ab3d6882eb60f12ed8b569c42b1703cb7ec63fecd708d8c
+EBUILD ultraviolet-1.0.1.ebuild 702 BLAKE2B 008d10ce7dbf50325f9ac5e8e534b90e132e59e8f5cfa6bd9438a25177f07cf1e13bcc1b4a66ab2f741e850bbdb117d3417fedf85092f9d4122fe039f4935e59 SHA512 ee92a82c5f8324552f13e068a58f1bcee4e33069b824aec8f1071d48bf97b2835537ee49905c0d0e3e090244358ef7d2e5043a3d1ec22511712e6ffdcfbdc154
 MISC metadata.xml 345 BLAKE2B 72aef81c1274db29f1898e20cf4a298d017000f8cc2842be7066fad3600feb955faaa0a0f8361fefd931395a252ffaf43bcfc0761074a1a8ddc6ce150ca26c36 SHA512 3cf569bd61e3369a5b1ebfe5c45d01df67316bdf5aaf429514f68f89e2aa526a6bb7460a970b906c8845c3f04d25d35151d986ee72e3f9509791340576539391
diff --git a/dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild b/dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild
index bcfde08fffa4..d51c2a60206f 100644
--- a/dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild
+++ b/dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
diff --git a/dev-ruby/unindent/Manifest b/dev-ruby/unindent/Manifest
index 417bc977c4ed..30160a2274c4 100644
--- a/dev-ruby/unindent/Manifest
+++ b/dev-ruby/unindent/Manifest
@@ -1,3 +1,3 @@
 DIST unindent-1.0.gem 6144 BLAKE2B 8720a1f6aca7da8cc8659f5a3943e9e56d15f9349efdd622857bbeffc39b04b61beb2b72a9cd337d516db2fbefd7aae02827b6705a81622ca5904dcdcc7575ad SHA512 1bab3352fc8da8b8a3ade8dff2f7c565e36529a79ca68c0a1ca73cdeca93fa507baa9399c6eed4fa020aa74dea6c4260a0242fa8057931a90bc172f138a5e655
-EBUILD unindent-1.0.ebuild 536 BLAKE2B 7f7c5f56a3bd68ac89af9009327ff2d393a934d5fb86ce8b93b15a496439eca388d75fc076ce9887b206074bc8f0b06c0992ea700611ada18230709e1a21d802 SHA512 15ce3c07413cbad23009cc781207b1f58577d1df3a05060e9f8a70f8ef9b43479b75a852a3e4a27b120d703f527189cf36add15f21f0470de1648a1ae4fe4421
+EBUILD unindent-1.0.ebuild 536 BLAKE2B 8abc00aab06cd8cc790120c5c02858cf5be794a4e2c6087e0247c179827a3a95b37c8de17df68c14c072b6f1c6fa8c4c9a4efb19c35acd5ff2f0bd31aeb3da5f SHA512 890fed320a81deb82dbd9b65ed7f128b7ef7f51ba687f5735529f300eca57aa25caf8ef668b5adfbd19309e001dd8fed58b44acfd0cdbb2cac3e9d78ddf1467e
 MISC metadata.xml 341 BLAKE2B b95139c053f991f2430ac53d70f116c8d70757162b4bdd246283cd3e477afc58c0bb9ce2de89cdf27a7f54148f4958920b04a5066522a7f628a062a81f4bf033 SHA512 41d29de1617293949f2df18b503f931818137f002639578a75b7b6254d78f47d5b56f08ac028c37b3d399dfd8a1d63b2d3f40e22452f9a7ec8beb61c52d88e21
diff --git a/dev-ruby/unindent/unindent-1.0.ebuild b/dev-ruby/unindent/unindent-1.0.ebuild
index 9e78e54753d7..2b8addbec471 100644
--- a/dev-ruby/unindent/unindent-1.0.ebuild
+++ b/dev-ruby/unindent/unindent-1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/vcard/Manifest b/dev-ruby/vcard/Manifest
index a43ce8b641ce..cf975fdf02d4 100644
--- a/dev-ruby/vcard/Manifest
+++ b/dev-ruby/vcard/Manifest
@@ -1,7 +1,3 @@
-DIST vcard-0.2.13.gem 51712 BLAKE2B 5b33ddcf7ce0d514924482b78447345a30204c28f10faba444e47b1004351e1be1f3bc4f75468ed6789af8d40299d2b0c1e1b93e0ae53ab0aa7f56a89e7ce2de SHA512 4ab38ad9408349e7a8fc15ebb75d7bfa50607e81987965bf03625cde0991df8a11c78ae7e2e5d7144e555f7d501ac5e0e4575015068d2dd8f579f4ffd392dae7
-DIST vcard-0.2.14.gem 52224 BLAKE2B e97c8b477bc623a5ec4806046ac4160a50e93fae055048e1a8dd14d84530abf7535d1e31fc0a952ce098ffeb59e873d47b54f69850bb1dcae648cdad8a2d4473 SHA512 b40223afac51391c6da6350e59405e5450647a9136b7e2b3873d111731a4c922af6ade23c30b7d02ebcd9f04cfa032a56ade528333f5930c9d073d42e813d049
 DIST vcard-0.2.15.gem 52224 BLAKE2B bb9850d69048709b27f5031c038dad774a175161d70402e0cb8edd8976a88da7ddb8effeab1efe3d0f794a41fbc45ce748fd0d170d9eafe99556d396792d28d1 SHA512 598133f82fcbb3e953a0ec9e933fd140f5b3501870a1698f202ae7990aea82aa2c9951c7ab4e6abd29b826771fb810fee3c8c890feb0ca3a19bd3ca9197c176b
-EBUILD vcard-0.2.13.ebuild 593 BLAKE2B 8c41a89da798b72ddbe23aff55863f125a3162719f8c117cad70dd831e3f4e0b8f0192ad9339ab179252b44329504cbad2688675ca27a3734193b89a4eb39607 SHA512 81a34ae4cd091a28a7b979b71bb278fae800304805b1a4b9339fc52eb020a94a2063780004aaf5c3b43431970b872d33a472fadb4b7fde9dd77f4308c3d03f35
-EBUILD vcard-0.2.14.ebuild 593 BLAKE2B 8c41a89da798b72ddbe23aff55863f125a3162719f8c117cad70dd831e3f4e0b8f0192ad9339ab179252b44329504cbad2688675ca27a3734193b89a4eb39607 SHA512 81a34ae4cd091a28a7b979b71bb278fae800304805b1a4b9339fc52eb020a94a2063780004aaf5c3b43431970b872d33a472fadb4b7fde9dd77f4308c3d03f35
-EBUILD vcard-0.2.15.ebuild 593 BLAKE2B 8c41a89da798b72ddbe23aff55863f125a3162719f8c117cad70dd831e3f4e0b8f0192ad9339ab179252b44329504cbad2688675ca27a3734193b89a4eb39607 SHA512 81a34ae4cd091a28a7b979b71bb278fae800304805b1a4b9339fc52eb020a94a2063780004aaf5c3b43431970b872d33a472fadb4b7fde9dd77f4308c3d03f35
+EBUILD vcard-0.2.15.ebuild 612 BLAKE2B 1d62d3d4630c76e50d8ac1a3aac0bb64a6700577afe8c452d923893a2f6ecd2af6372290dfec2cd2ceeb07478e345134c7acc576e7ea4ab91142241776a4ec94 SHA512 b5ec32d06edda01a2389b1c8a51d2e5ef49981384d66aa742c3dd9d7a5a7d137024cf73a3a11fa77fd78c9414dc5a430784c1a35c526e4b65b3386032af92c55
 MISC metadata.xml 451 BLAKE2B ec59cfbfdc28cd790fba6719deba4994e01d341432c8adf7f02ab787f7f0727cc457ad00ebecb6fcf186e17dd57e783083ac59760065fed9518ac75cd2d078b1 SHA512 1a65f9f7236506f7d781a4eac82c69d06c769273e3eb906e73c953b2b9a627419207f8dd9def143e4514025e795bf7d517e41febdb8809f0caedd2fd741c3a1d
diff --git a/dev-ruby/vcard/vcard-0.2.13.ebuild b/dev-ruby/vcard/vcard-0.2.13.ebuild
deleted file mode 100644
index 46a876a4aa5a..000000000000
--- a/dev-ruby/vcard/vcard-0.2.13.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-# Avoid the complexity of the "rake" recipe and run testrb-2 manually.
-RUBY_FAKEGEM_RECIPE_TEST=none
-RUBY_FAKEGEM_RECIPE_DOC=none
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby vcard support extracted from Vpim"
-HOMEPAGE="https://github.com/qoobaa/vcard"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 --load-path=lib --pattern='.*_test\.rb' test/
-}
diff --git a/dev-ruby/vcard/vcard-0.2.14.ebuild b/dev-ruby/vcard/vcard-0.2.14.ebuild
deleted file mode 100644
index 46a876a4aa5a..000000000000
--- a/dev-ruby/vcard/vcard-0.2.14.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-# Avoid the complexity of the "rake" recipe and run testrb-2 manually.
-RUBY_FAKEGEM_RECIPE_TEST=none
-RUBY_FAKEGEM_RECIPE_DOC=none
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby vcard support extracted from Vpim"
-HOMEPAGE="https://github.com/qoobaa/vcard"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 --load-path=lib --pattern='.*_test\.rb' test/
-}
diff --git a/dev-ruby/vcard/vcard-0.2.15.ebuild b/dev-ruby/vcard/vcard-0.2.15.ebuild
index 46a876a4aa5a..a3f74a90943b 100644
--- a/dev-ruby/vcard/vcard-0.2.15.ebuild
+++ b/dev-ruby/vcard/vcard-0.2.15.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+# ruby25: not compatible
+USE_RUBY="ruby22 ruby23 ruby24"
 
 # Avoid the complexity of the "rake" recipe and run testrb-2 manually.
 RUBY_FAKEGEM_RECIPE_TEST=none
diff --git a/dev-ruby/warden/Manifest b/dev-ruby/warden/Manifest
index f506c1c68879..280f59f83569 100644
--- a/dev-ruby/warden/Manifest
+++ b/dev-ruby/warden/Manifest
@@ -1,5 +1,5 @@
 DIST warden-1.2.6.gem 32256 BLAKE2B cad24360b2cec74021d456d151f196929b0d8854703c32e3132a6c2f3433898ec0851222ff32a746496ec366f8615bcfdbff1d6e5b361f7a79afdc10eda031e5 SHA512 dc2ad118faa90f812eb615fe9c41e1edb1564812f7bf6a7759a782825757c899082956ba318956bfc745c23eeefe41dcddfa9f605ef76bd12ec264f8b85f38d3
 DIST warden-1.2.7.gem 32256 BLAKE2B 258f8c83792fd5464c2bec957335ded49922fbe75ef3e2f6869a147b38b89be83b4601c8cef7e3008cb1495bdf9a6eb4d798974eff0565f48b05937b9c4fca3a SHA512 f02f695586c26c42b1bbd621e54dad04a42e8bfb4bfacc4f90f67ef2fb0c8593a3c32dc1545ee6483ab0df094cae6e6a5c614718b65a13103f83af13407c5336
 EBUILD warden-1.2.6.ebuild 477 BLAKE2B c034fde9bc0ca74043c6fbab2b113e2f7ea09490159b68003bf2e2df8fa3a61afc72311a0598edba3cf43b073d11d03463312ad77e1e1f39732626e293af7d05 SHA512 aeaf29b2a384b524b50446ce4ef90166add0350f5c0ea2fd0a6ddb8fa257c08221efd5ff3c4b872e36e9d38341e0688c9883a2d79fdbf4255c59be6404d4e807
-EBUILD warden-1.2.7.ebuild 470 BLAKE2B de458199a2775026e82dbe1ed9e51de8af42cbb553802ae4c45061ec14f0eadd4a4215a1517ce4bcdfd8ebb582ccf0b15ab70d463405e73da28e35d5d72675e9 SHA512 bcc34ca7b3af4f0d33800556ae7eda483374dcdd2982ef86408b527aef2839bf82b90e34be6f4fb13f10d3684145477728310e7faac5d6b83d7bd81540457afc
+EBUILD warden-1.2.7.ebuild 470 BLAKE2B b6b1a6cf1cc103722057be498b4a0ca59e54b2464fb18540b8fc6002364809b59b19d74dbc268e52de072781851b800811381a3ab65151919f6492294e2a003e SHA512 13d5d4d62ad076e15e50bc8897e9c1f66a5f39ae0116470dd3af5440055dc562fb59cdfcef226e69ab6b0c3f9081d4105514d41f9ee3ef118b14f6e2d377c0fe
 MISC metadata.xml 339 BLAKE2B 393d527f8c13840cff0d3f73c38e94964fcfb294074767d395ad1e61048d950cc291737406fb0009ef7e7566f175d18a271b35f783dc70e348325e8c0569f6ea SHA512 60503377aabecc35e11148db41d73be583fec27d3776388f7a2f59eeef85d948f13d071fc245555b8d37148147a5c019d094c9cc7ff044b262dbf44bcb3d40e2
diff --git a/dev-ruby/warden/warden-1.2.7.ebuild b/dev-ruby/warden/warden-1.2.7.ebuild
index aeaf7b8b11c3..b8e3f03717ec 100644
--- a/dev-ruby/warden/warden-1.2.7.ebuild
+++ b/dev-ruby/warden/warden-1.2.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_EXTRADOC="README.textile History.rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/zentest/Manifest b/dev-ruby/zentest/Manifest
index bb2a54e2528d..0038422d56ba 100644
--- a/dev-ruby/zentest/Manifest
+++ b/dev-ruby/zentest/Manifest
@@ -1,5 +1,5 @@
 DIST ZenTest-4.11.0.gem 71680 BLAKE2B ae2d72ce5ff899dab0905eb7ed1bca0cf2158ec5044254cd7ebb86c59feb746bf18e6a0242f91c49803a062c5d94f5b1b0be4338cadef2a5afd116753259f51b SHA512 cb835ea2e937b7ea56084c138948acb1c2a96500e5b8bd54dd9d195e4005ebdce67b189cdf31a010135f55adb02f3bcf21ff663a26022eb759dd2126558c5c21
 DIST ZenTest-4.11.1.gem 71680 BLAKE2B 27bd94ca98a6739829526c06689ee5a890aa254bef3cb7b7b02d79d82a4fa96faa1853d36069aa801983b4927d44b2af2c852c111ece3b64459c99d63a7a072d SHA512 6f3b5dfb8cc8154856e94f20134e9a6bd2d54e052d05d3e7a250f831ee0a3d3196b497cf118322c51201fb8dd30a05b8a0a0462c58a8852354c4dee2a10d867b
 EBUILD zentest-4.11.0.ebuild 969 BLAKE2B 72c54b3845891c3bd8873fd3bad177c074972b9f8faa37c735cfa62d5a5b29736379e24a686927f3d363724c5df575d2164406b70f067828a4e03b5bb741e4ac SHA512 e0ccf05566fb8329d88e540ed4a6fbf34828d8c7c3108cae3e92dd21ea209349c149585973568e32b038c90247f3cb547e3fad42f38809b702ebc583eab5ec0e
-EBUILD zentest-4.11.1.ebuild 986 BLAKE2B 284b3f0fbcfa42703b0b62da0ab9d7fdfa2e33513b721b4d6710eed7b164a8ebc3983225201820eabf3050d4e0f004ddff236ffc3ef13197c39c9a7434f15d4e SHA512 3e998207df4f16b8593b16fa23840f6d7d1d081a855157127b245899e013b9665286d17f47efce7231c9613d998d9bd8c95160563ab2195cd7a912995a73721b
+EBUILD zentest-4.11.1.ebuild 811 BLAKE2B 112dac37d0c2288f2296ed15a09fa52b093b15ae8dc47847dd277a5c10604e18b63f6f660549783764e989e85926073ac2012a321cbac11acb811418d231b970 SHA512 a72f16080df4e87ada649fa2f6e7b049bb1fdc5fca307585917eb1476ca3330326256f5ab367c4e6afddb76220c73428e43846d9215787813b4948b15b12e219
 MISC metadata.xml 333 BLAKE2B cf1ac3fbb6994dc96110bdb974b726f53fdfe34db473f272ba78ede47b65e26350b807bf291c65f8a8bcf9e12fc3366e431ca32a277d9ac38cf9d4ed7ea46e62 SHA512 d02fdcc6c8ef63d22d0df77a6c7c82ac1d629d29685e6fc653c70079d56fb1b28574bfc7c372a5298dd4a3e20061aecc705d6824c569ce0f99e3dea464f04fcb
diff --git a/dev-ruby/zentest/zentest-4.11.1.ebuild b/dev-ruby/zentest/zentest-4.11.1.ebuild
index 61e050a2d23f..12a974b16c23 100644
--- a/dev-ruby/zentest/zentest-4.11.1.ebuild
+++ b/dev-ruby/zentest/zentest-4.11.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_NAME=ZenTest
 
@@ -26,13 +26,3 @@ ruby_add_bdepend "
 		dev-ruby/hoe-seattlerb
 		dev-ruby/minitest:5
 	)"
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby23)
-#			sed -i -e '/test_testcase9/a skip "ruby 2.3 defines more methods"' test/test_zentest.rb || die
-			;;
-		*)
-			;;
-	esac
-}
author	V3n3RiX <venerix@redcorelinux.org>	2018-02-24 19:58:07 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-02-24 19:58:07 +0000
commit	99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (patch)
tree	da76713365257a445f3ae3b95470917f59d46728 /dev-ruby
parent	4935506e9a5cbfabd37c64093eac5f36c2ff0017 (diff)