gentoo resync : 25.01.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-01-26 15:48:02 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-01-26 15:48:02 +0000
commit: 38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch)
tree: 6fce284d5bfddaf597a490ac66069d16c6a485db /dev-ruby
parent: 0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff)
206 files changed, 361 insertions, 3504 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index d049f738778e..9fc3ff695f59 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/ammeter/Manifest b/dev-ruby/ammeter/Manifest
index ea2c97913695..0621acb69a47 100644
--- a/dev-ruby/ammeter/Manifest
+++ b/dev-ruby/ammeter/Manifest
@@ -1,3 +1,3 @@
 DIST ammeter-1.1.4.gem 19968 BLAKE2B dbc773e4db83d820e5ef1c6ae3af2e65f87ff1a10a09759c66a4dad87cd175e5e8af857435b6df6cb93167869d31fb1f43dcf220e063db03d048aa8926c7daaf SHA512 57d24c67be85fe34ded8feda045771974be7cdd828780a82ff0b2f6b52d0b35b48c2eb7e59dae70700fba676242918ef6463448090d7729d49db0f05f04b0131
-EBUILD ammeter-1.1.4-r1.ebuild 1599 BLAKE2B 3d20ca8936628e349793327bafd9741ba1f6f65e09ba47af0933e0b7dc38c31b0c4f7454df7bf04045ca0f46b3269c6618dff5aaebdef4770a42b965b5c8161d SHA512 5f5be519c8ffd3f65441fb869d29649d37c096e906ecaf387ba7fd801e0e9196c05b86f33d58449a5a07fb0d7c50135622d1b5812d3cef621532986dbf74a596
+EBUILD ammeter-1.1.4-r1.ebuild 1599 BLAKE2B 2e0b618ab5c7f549dd5d13e116b947349e57b0c6076a2af2a44035b567a796c826854b4268d074325ff71db357a207ab344a14cf23aa9da1b60b17f361ef1538 SHA512 7d85cccbb8d0649954122aa4b99c9b60502e93a3215a53373bed9319cff3c8bac2727db4ed5636ddf8448be9f19df72a96e89effb65f7fcf34d0b1528dca5b75
 MISC metadata.xml 348 BLAKE2B 1eae86b63a0e04b8b5e8d8d9438b102b029a919af6fdb0cf2319b11a3c50ee282a255dedd7bad0bc3098ea8d1c0c05e17a5d98b382fa454feebbd304b18d3f57 SHA512 f81eb53098c1d67a4d5cfe32c9b3aace294cb90788775c639e189cf3932ef8101466d9a1541ceada391ebdacfedf926d9549f4591b42efd6c391e5fe6b0e72f1
diff --git a/dev-ruby/ammeter/ammeter-1.1.4-r1.ebuild b/dev-ruby/ammeter/ammeter-1.1.4-r1.ebuild
index 90c73cf3ff9a..c27bb706e506 100644
--- a/dev-ruby/ammeter/ammeter-1.1.4-r1.ebuild
+++ b/dev-ruby/ammeter/ammeter-1.1.4-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="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/ascii85/Manifest b/dev-ruby/ascii85/Manifest
index 801e4bd01a5d..9c14bee10275 100644
--- a/dev-ruby/ascii85/Manifest
+++ b/dev-ruby/ascii85/Manifest
@@ -1,3 +1,5 @@
 DIST Ascii85-1.0.2.gem 10752 BLAKE2B 1a38fb0d04eefcd73028aeb166169bf04dced4695eaa3ab8d5add8233bb898780b896101558f7db248aeb4cd9c58edaf36b67085ba0b2cb06bb32b312e576c56 SHA512 e2437948697dd46c646e55a361b74ad5069b261809a0e374eee1f3e755d07bbc45d85fc8ab6d620eceeeb020e6ff23224703cba0ce4ddf37f8a5a96289efd74b
+DIST Ascii85-1.0.3.gem 11776 BLAKE2B e08bbc089546dd3b91ff5fd85b8652dd6f5c06025c29ac67004bd7d4c7bb8fc38c77b604dd5a884970b05041e173f37eaf895f0bb9ac1947ce70e4f0cc54906c SHA512 b324ff06ea0cd46a679619a2bfca9f05c30ece9f0342f8a8d097841f3fb4dbb29cf4b6f6832742c50fe5a51895a9048308981be296466422269ce34c4d936f5c
 EBUILD ascii85-1.0.2-r2.ebuild 679 BLAKE2B ff94a3d791054113a575c2a6f48f5edfd91299dd33f750006b461afdcb2a150174a50c6467b59f2c8b81251cd5795d198c131d08d5db3d6339eb5425fb1d0867 SHA512 2e9aba974fe41c7dbf6d4ca9067a09e347dbfac9fd2044e410a721b8c01868b2aaca0d4ba3468a5ba75f3f62714c1cc9a221cac7b96aa66e868ee8b4b0aceb27
+EBUILD ascii85-1.0.3.ebuild 677 BLAKE2B b26846b43d8e4adc6319cac1e49e85a1c9b0922a4db6154db94bc76d7b8fa1512bc3627bdf95d347e19b48bbde49d992e088614b40ac1bb639866e71a1ca667f SHA512 3f2c69e6c97a6a2bb4b1dc774903fac5665a4712b9853837ec60452f51429dc2a754b66e453a8cbefc85683b03316ac3e1e4da3627b3f1252547b2bc41ccdbb2
 MISC metadata.xml 347 BLAKE2B 3b0a255aa723b441f953964689464ac15e6542dbab4183a32f670408039421d294eb308c0ec37d6080cbb6ebac4c43473f67ed3eb7429880fc0cada79d7bc560 SHA512 362fbd91725d86bf6694499188bdb904b99639488b2cc87f6fa7c50392790f921abb54cc8d329cac0e3f1d4cef6d24c05eb8ab8a365ddf149a7dc23dea5f72f8
diff --git a/dev-ruby/ascii85/ascii85-1.0.3.ebuild b/dev-ruby/ascii85/ascii85-1.0.3.ebuild
new file mode 100644
index 000000000000..84e2c0e63200
--- /dev/null
+++ b/dev-ruby/ascii85/ascii85-1.0.3.ebuild
@@ -0,0 +1,28 @@
+# 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_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md History.txt"
+
+RUBY_FAKEGEM_NAME="Ascii85"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Methods for encoding/decoding Adobe's binary-to-text encoding of the same name"
+HOMEPAGE="https://github.com/datawraith/ascii85gem"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+}
diff --git a/dev-ruby/ast/Manifest b/dev-ruby/ast/Manifest
index a96152a0313e..813408acbfb4 100644
--- a/dev-ruby/ast/Manifest
+++ b/dev-ruby/ast/Manifest
@@ -1,5 +1,7 @@
 DIST ast-2.2.0.gem 14848 BLAKE2B c74733f6d72eeefb9576128e1e58f1f002352ba9d7c2a2474677b580a85783c5963ba7f681caa0e3fe08ab4c5fdf05d304898a478550ab437665eb520fc1f851 SHA512 556b9d68787a05f33f6f7e518971dfc965d326fd1a2e0dd1d16d1360526c598fccb0117a09348da88f6243bb3295dbb6d91fa6bd2a27c19cd7b519105b826aea
 DIST ast-2.3.0.gem 14848 BLAKE2B 141aa3fd01bfd9d7c1b82ff20cab9243322c70f69ee54026ec121c5491fdfca1c00eae293c631c67b0c12b0ba9aeadcf3756a9cbe2a05cfa7c89a8acda48d188 SHA512 7b814517075a5f4607cab24e1c20747c7def1d818e6df95205eaad2152952a38cd551bff5f0d59979fd8c6cb7dfa6bc9830541257bb3a24927217fd84526d58f
+DIST ast-2.4.0.gem 15360 BLAKE2B 1d68fa8137bf2a158e8b2e0f30d3d803791db7fcb397133681cd2ffb57badebe6f9afd792a7cf3907dc1fa3e3a617fbb0331c85c69e36a46ca49962f30be9979 SHA512 60a0b00103ed57c71907155ee7966127985021e51c1d829e2149c87066504e76fdb955f9717bb19b5627d5b8c44f0d6a165e208900ede2355a47970ee9664b72
 EBUILD ast-2.2.0.ebuild 703 BLAKE2B edb2720c234b99b7ebf7311d92653ecec344c1270a781150e63fd9ea71b14c568ac591846aca52ba2b36a900a319c5d0c4c9f79277895be78a34cba47cd8df1d SHA512 4833fbe23d8600490b6fd70df241bb307319108a119d9f8da06b9d09dd730d717ec86251880f86f928b16aab04ab236e91c5d190cd4abdcacd73a59113626ab4
 EBUILD ast-2.3.0.ebuild 703 BLAKE2B de64826b497d003d6a657ad35bbd01e8c88be7e0836dddb7195c35ca11c85168016de967d26176be462c70da5099da5a467edf46492899ad24982e28c60de26e SHA512 a3d8192dd239548a7fcd44bf40227659b86f997503a3f8bc70c7bf08581fe136d4e721ff6cd26d780b9f9868bd70b9cb00a788ae34bcb1bb126011af24138bb9
+EBUILD ast-2.4.0.ebuild 703 BLAKE2B 75a60dbc26cc730c9e4e36fd177a04fd2391e6daa7b38a8c47f63ab50f6441efb013cbdbfc0fbc06389a8c13e4808134adc60265d1d358503e794ebc0a7242e7 SHA512 2b4d266f4ea4e6c51501626101ae3ab1f6851298da24cd17ce17803b2038621e704e608c6d4d66b3f382c52cf5fb626d1c47effdafb4f44fbd342c34065aa6ca
 MISC metadata.xml 340 BLAKE2B 30aec3a2478894cc3d10da2ff828e275c0400061f0fcf123131501a55ca56355e9af3fd0d53bf5edbbd4e5953a426fd68ba1b912771f66bedd9a2c61c335ca58 SHA512 cb57a981e9698ea62d17dbb519c215e420d9fbc791ef3d98394202909beacfaae2bc425332febaae18d9966b3586e82c52f60cd442f9cdb9b4f2abc25ba7b86e
diff --git a/dev-ruby/ast/ast-2.4.0.ebuild b/dev-ruby/ast/ast-2.4.0.ebuild
new file mode 100644
index 000000000000..3f3bb140d306
--- /dev/null
+++ b/dev-ruby/ast/ast-2.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for working with abstract syntax trees"
+HOMEPAGE="https://github.com/whitequark/ast"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-ruby/bacon )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e "/git ls/d" ${PN}.gemspec || die
+	sed -i -e "/simplecov/,+11d" -e "/colored_output/d" test/helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bacon -Itest -a || die
+}
diff --git a/dev-ruby/celluloid-io/Manifest b/dev-ruby/celluloid-io/Manifest
index 18d782d5c216..0fdf8257f26c 100644
--- a/dev-ruby/celluloid-io/Manifest
+++ b/dev-ruby/celluloid-io/Manifest
@@ -1,5 +1,3 @@
-DIST celluloid-io-0.16.2.gem 53248 BLAKE2B 5ec918e12e3b1f86796ef73a3a3c68863f3267c63b06fd65cd78ac471af8985974a61b6f4e4e1bc542e71ee24af30a2900b843b43654da9b4a964d9d1f46aa44 SHA512 6e37fbf99cc57aab13f63da68318fcab5d70b0c48da154da22a5fc12ac9a17d015d5784af9c02679d0f5c72fed6a693ec459cb455f10aa75b83e5e0dce913f71
 DIST celluloid-io-0.17.3.gem 57856 BLAKE2B 6b2368c9e51a91ba1d7707389f173c1070e2d0a81698538af5240e3798509fe8e3495c2abea83b8c9f49148d3cce59a38823f2a47d7b92da395e78ad71506f8b SHA512 8b1552549c5aad59bf3789518ea2fa6833a4d3b7213cf70d941face215382a68b3d9d2d57e76b2bd7c478fe0e2690b19984d210b806bf1f67f159fd2bdf6b8ac
-EBUILD celluloid-io-0.16.2.ebuild 850 BLAKE2B 8c0e1c2fdf8afd65b5f38c345dad27a7c3499d685e0b8248591caaf450d57dfabfc648eff0f31f30ae263997bc4c70ac2a05705413c6ce1fc76803793d3a1336 SHA512 2eb824ec95663cd308293de7e801055dd534082d1f60b35aeee086459f725927dec7919e58650fdad253a418401879aeddd7d1b7ec27ae90b5fa5851e4c0b1a5
 EBUILD celluloid-io-0.17.3.ebuild 1094 BLAKE2B f636d994cdbc79302e32726a9c05987775d87cc5eaf71f259a348d5667379a999096e9baa54a74f633e84d913184bfa3cc7561f3741edc424d68eb1b78821136 SHA512 b96dd242e7e56f35bdbef49633ed2c804309dd9f2e9b8713d027b4e8857dd3fbe7a3b18282654c8b1ca654888e4c59bb66a6535e90223d3e8895c24cc2958d30
 MISC metadata.xml 348 BLAKE2B 82aa98d484afd7116f7d2079ff5358bd3af36987427c49ab3c525325371ff7c8993ce49f7c1dbecd5f12d763972a84358f13523599a929b4406c51e19e13d14d SHA512 b351fe17cb7e9f63c2033e958bf2c6f37dbcae42cd59b76f7c979b42eaf3f35d79e6e82ad2e3bc4cdb2fb7e4410062acadfdfe44a5e767077a223c198bcbd2b8
diff --git a/dev-ruby/celluloid-io/celluloid-io-0.16.2.ebuild b/dev-ruby/celluloid-io/celluloid-io-0.16.2.ebuild
deleted file mode 100644
index 5df64dbf5044..000000000000
--- a/dev-ruby/celluloid-io/celluloid-io-0.16.2.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_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Evented IO for Celluloid actors"
-HOMEPAGE="https://github.com/celluloid/celluloid-io"
-IUSE=""
-SLOT="0"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-ruby_add_rdepend ">=dev-ruby/celluloid-0.16.0
-	>=dev-ruby/nio4r-1.1.0"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' -e '/[Cc]overalls/d' spec/spec_helper.rb || die
-
-	# Avoid DNS tests. They either assume localhost is 127.0.0.1 or
-	# require network access.
-	rm spec/celluloid/io/dns_resolver_spec.rb || die
-}
diff --git a/dev-ruby/celluloid/Manifest b/dev-ruby/celluloid/Manifest
index 8336a35db826..b74e57374e33 100644
--- a/dev-ruby/celluloid/Manifest
+++ b/dev-ruby/celluloid/Manifest
@@ -1,6 +1,4 @@
 AUX celluloid-0.16.0-call-private-methods.patch 765 BLAKE2B 2f1fc1108906d31682085a4deab14ebd390d24d40e53a2c555d843ae67561c452d215b975a769d7f808dc1b738f64287c48fd0ee304c9a127b2d0d1c120c818a SHA512 322039ffb8c08f88c334e84123084aac3c870d2149d67d3bb083a6496a383cfe6506f4fd2b62fb1b59a261a9be4ab24975b6196cd74a2561f17e0a98dc6cae40
-DIST celluloid-0.16.0-git.tgz 63859 BLAKE2B 701347cf2ab55d4855722805209f5336cd3ffeb16561227781b4d696f417711be231d8eeec084f965b872f1c364a3d7dc5a3d75906eb15d235d2809529bb3203 SHA512 b1acc0daf35b16c086d720fccec93519de609e6c9e8f411ed70c48f3cfcb0c88f5ee665ac41e4a535e00eef112cae26ca2e8ab6b6de4738e13ed50579098d8ed
 DIST celluloid-0.17.3.gem 61952 BLAKE2B 5b64b67dea84261706acaf2612c23cb0b82d6af7fe0eece9d9e17e5d948d83a81b0de7598a1709fb5e1073f3632c7df6d6730c4797e0a4da593795b85c3bf9e1 SHA512 bb5005452ef7a2da1fb6b6515a6ad9df992dfd043caa605d1282a24b874c1f0798da0d19ee00f434486f9ef2c9467b1d6d2cadaa7883db98b885eeb842f1b94c
-EBUILD celluloid-0.16.0-r1.ebuild 1315 BLAKE2B e723e86b7a3994ccf6a9883dffc26c651566b99072d1678be0f2ebce285a66d606c3fe08d8ecb457319b0305cca6b323a84eefde2be3976332ba5c702bdf961a SHA512 3062aa391bef128d2482605aab724d8ebc2fd960716bc539db2e756dbafcf8ac15dbec761e3616468499a0373e38880511bfdb75828d7447843fff83db03a5e0
 EBUILD celluloid-0.17.3.ebuild 1178 BLAKE2B 2f605e51c48dbfb0f123e22b1d6e851ffa31857534aa1508f046c238610454478229cbbe8d9e233ef38806cab5a9305db6fa2d885579351e9f8e22309552bd90 SHA512 8878fed12a3a31361a0e9fbd3ecb31975b8acc630fea1da440449fabaeb68e4fe82f81a41f118b02161a7751bcb83d7088b61566241020322a3939c4045d0455
 MISC metadata.xml 345 BLAKE2B 57803cd94baa4d58e4c4c418834347d84a4e8bd5b4ae5019dd71797ace22f508b601bbe62221df4a2fab04eff1fa1aa43d78d98462d189ba13b9bcdf70375f44 SHA512 e07f38e8feadf085f1adeb737ff56aeb9cc4c79a3b7702f9c018544bebcc14646be394aa32ff5502c37ef0fb8968707b7f8d9a6fdaeff23cac5b71fabae46aa8
diff --git a/dev-ruby/celluloid/celluloid-0.16.0-r1.ebuild b/dev-ruby/celluloid/celluloid-0.16.0-r1.ebuild
deleted file mode 100644
index 30755bd02299..000000000000
--- a/dev-ruby/celluloid/celluloid-0.16.0-r1.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
-# rbx or jruby recommended, but only in 1.9 mode.
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-#Needed by dev-ruby/listen
-RUBY_FAKEGEM_EXTRAINSTALL="spec"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a simple and natural way to build fault-tolerant concurrent programs"
-HOMEPAGE="https://github.com/celluloid/celluloid"
-SRC_URI="https://github.com/celluloid/celluloid/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-IUSE=""
-SLOT="0"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RUBY_PATCHES=( "${P}-call-private-methods.patch" )
-
-ruby_add_rdepend ">=dev-ruby/timers-4.0.0:4"
-
-all_ruby_prepare() {
-	rm Gemfile .rspec || die
-
-	sed -i -e '/[Bb]undler/d' -e '/coveralls/I s:^:#:' spec/spec_helper.rb || die
-
-	# Force loading of the correct timers slot to avoid a bundler dependency.
-	sed -i -e '3igem "timers", "~>4.0"' spec/spec_helper.rb || die
-
-	# Adjust timers dependency to match our slots, bug 563018
-	sed -i -e '/timers/ s/4.0.0/4.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/chunky_png/Manifest b/dev-ruby/chunky_png/Manifest
index 31b2a8f83f4a..ee79e28aed85 100644
--- a/dev-ruby/chunky_png/Manifest
+++ b/dev-ruby/chunky_png/Manifest
@@ -1,7 +1,5 @@
-DIST chunky_png-1.3.6.gem 350208 BLAKE2B ee18c9c2eaf3c9d4384dee92d05d046a3a8b3f8e379c6d8fb7e7c545736425f2cd09e9c1a270b0ea588bd0a233e0e6254c8f5169bad288875f76460e5d18fe9a SHA512 334ea571194a3357003ddbdf41c669ae189c6927c43182a8814e5aa5b3cdee2a3adef80cae4453a3d6d186652c78fdde496bf9080a28227d26dd411dbe0d880e
-DIST chunky_png-1.3.7.gem 350720 BLAKE2B 6096b01989df944647f39f459beaee8b350c3bd6472ddedf7a858e7fda7353afab3049cbd2b7e3639ba2a22bcd77a0841c04997a1ceac06f6823a1b579e8b636 SHA512 0cd9314ad551128d3d9dd234b3998ed8a96d1a038ed92288485538873be76e5034233e205f16491031ebdade9501593133ea8bfd7b0288bfd83c03de034a5bc7
+DIST chunky_png-1.3.10.gem 352768 BLAKE2B ae34d2bc8199e46add874511343a7e8ecf08ed3ec3e488a22a99335895d260ebb60c6be96c5771915a176f44e354599373feafce9dda362b6ebc2b58cd92e79f SHA512 968e068a6fbcc3a91d435509a118976de56c62b9e311d201064aae2eb8129994b6c0876ca5ed3368b0415b238f46d14ab1059d00cbf473aaf9631456596e58c3
 DIST chunky_png-1.3.8.gem 351232 BLAKE2B 9eb2ca5f997558240911e1a62801c5058e052731a512fc5c35a36e77468c1c93263cca25a11cccdb45bc70bcf53e44681bbde7f7fa2016857f6b054ab79a04e8 SHA512 3e4725c960e8f404f9702323deec6d77a3ef8bcaba9b679483c7de2be1ea327a2a8a7f67cb6beaa1a3c473e573600cc7b228aceceaa37f0a522cf9b2892e0351
-EBUILD chunky_png-1.3.6.ebuild 733 BLAKE2B 9855014bbf8115ef647de4318131d01852397df4df1ce98a9817af2c38138a0bdeeb17165d7e2dcdb1206daf4e0a7b0e94e1d050813ff213c1296ab80b4c5c39 SHA512 b004ccce3b8a5135e41b1b22e0c2544506fa15b061748a1fbaaedf9dcaaf3c113685c6955c2abb70dfa64230ace5e79b99bb597724bf5f6d730a9e25775b4932
-EBUILD chunky_png-1.3.7.ebuild 738 BLAKE2B d19f5b3fa2d9316e8d2dfcc661da7a151105e3ff97836360a75e1940255d5ee5566eb13ace58bfde1f2fd272431b75824458cec74346ef1023dbb68ef00ce1bd SHA512 e665b8f0fe3b0ade1be1030acfd94de7df8f81d96a1051f15e01613be3dfc771798188450a3b16ea24b84effdd53e8e4181a4670c3f7b57415452c368e0b679c
+EBUILD chunky_png-1.3.10.ebuild 731 BLAKE2B fe32293bee795c1c2d17bb97fe6c2f15e193146e8b19f660b0309d35d98add4b1e1730f1fd5b6187bba13786ce0382fa44c8c8aac9a1fae1008d232c4b995cf1 SHA512 cccd8ea89597a44ff2f528fc73465efbc8f71675f6703fe9f8cc7e48eabc9848b4fe2d8bae802eb3aeee1555f1e73d80bb2422e29cfad4df2c7021fb8bc96cdc
 EBUILD chunky_png-1.3.8.ebuild 731 BLAKE2B b95a391393d98ea155206a8046cf9456615bea591dba51bfe47bb7ed861a8be1ff962974dc4718600c56cb57c48d8c6f0780e5ac2cb6e73a4789ec336044b9ef SHA512 fc39eac84acc399d50d4e207725b992a29695d9cee324c157f471446a9c7fc2b56ac21f1b9bcf87f053a0df198b66710fa9a1b1e5a2e9b666b16f0f25a60f083
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.7.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.10.ebuild
index 20d1b94cad5e..f94b9a19988a 100644
--- a/dev-ruby/chunky_png/chunky_png-1.3.7.ebuild
+++ b/dev-ruby/chunky_png/chunky_png-1.3.10.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
+EAPI=6
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.6.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.6.ebuild
deleted file mode 100644
index 1662f8502fc9..000000000000
--- a/dev-ruby/chunky_png/chunky_png-1.3.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-
-RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc CHANGELOG.rdoc README.md"
-
-RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure Ruby library that can read and write PNG images"
-HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
-	rm Gemfile* || die
-
-	# Avoid git dependency
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/coffee-script-source/Manifest b/dev-ruby/coffee-script-source/Manifest
index 6065899310d3..faedf8b62cd9 100644
--- a/dev-ruby/coffee-script-source/Manifest
+++ b/dev-ruby/coffee-script-source/Manifest
@@ -1,5 +1,3 @@
 DIST coffee-script-source-1.12.2.gem 65024 BLAKE2B 7796ea3b031fe04ff286c023d5de62a1bccff6bef7aa6b0eb01e92bdae59f2e46134c0efae36d647a07cb0dcea61d7da5bf47d1197bdd02a4a2daf0edcbae743 SHA512 f20dfc576202e5100f297e28481ac4e61776fd6684600ce5949b5deb26bfbacd74ae183462fc3cdaa81f95eb95729cd520b72841f70b6b4b133b1eea08ed6fcb
-DIST coffee-script-source-1.9.3.gem 58880 BLAKE2B 2dfb9e88d9f3ff0486359282b0df6061b81f70432089fbd4c10bac01fa90baa4905fcfca38d63535b63aae5cfb085e411f7730559c060d21a476cc5676b8e6d3 SHA512 099a656499b72bd532d5c6d365f168f82dfdec91c79edb385ed939f9d78055926846c1a03084b41aa1e789f5b32873d5d86e8079bc081acb61654996371c829b
 EBUILD coffee-script-source-1.12.2.ebuild 459 BLAKE2B 179619e4211a71bd3a935af4ed20b4c412214bf13901f50eaad43413301790ef7d75df97ce70a6c775e5ab3b17aedb8c0cf5abf959e9500a7b90f6b77b637eeb SHA512 bcf4d62d4bcf14e524c0c8d047d1eeaa0880461495c000bf40ded9def795a8fdc7c4bf0e89a75d47c2d12f900d93584f88744aebdec6af5134313cdf072261db
-EBUILD coffee-script-source-1.9.3.ebuild 449 BLAKE2B 9e452ef7460425f4d06b31f740e82a4d59abd92ec732ac4b350a38ce2de2e04f603858f8a28676f31327e06d84661b887d6acd151893b6fd4c2af802e9421c58 SHA512 ce6b41ebcb2061ad91e95b62451ae705bb7f2cd20bc4195fa91807757b3e4ac3b389b70b2d6a6d80df911bbe12007db73eae174d052d01d0730a8f1f75d91f6e
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/coffee-script-source/coffee-script-source-1.9.3.ebuild b/dev-ruby/coffee-script-source/coffee-script-source-1.9.3.ebuild
deleted file mode 100644
index 138110280a1b..000000000000
--- a/dev-ruby/coffee-script-source/coffee-script-source-1.9.3.ebuild
+++ /dev/null
@@ -1,19 +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=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby CoffeeScript is a bridge to the official CoffeeScript compiler"
-HOMEPAGE="http://jashkenas.github.io/coffee-script/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x64-macos ~x86-solaris"
-
-IUSE=""
diff --git a/dev-ruby/compass-core/Manifest b/dev-ruby/compass-core/Manifest
index d3d88cc8516a..4e52aa84289b 100644
--- a/dev-ruby/compass-core/Manifest
+++ b/dev-ruby/compass-core/Manifest
@@ -1,3 +1,3 @@
 DIST compass-core-1.0.3.gem 137728 BLAKE2B c27a84f32973ee6f163129ff344019beb5658585b1567f5e7ac6a47108bced6da77537328f23f3c03e7f402db5387bb39fa41f726bb7e89f2b7b8f80f65b7132 SHA512 90ee9fbd2266fc3e437162c8920710e4885446333c8d4b5ae22c652c7572b93ce3071574fa74f432b0036795865f92c888a6d648ee20bf5618cf58fb7b2b1dd1
-EBUILD compass-core-1.0.3-r1.ebuild 574 BLAKE2B 0e90c1e238271adb680196be7964ca94fe0a9854a54a432a5b4667bc0b2ca56a7e2fdd85fc16cfff9f38a8f39c6953591a4232c7b1c49676afc03de4921e4ddf SHA512 1963288a863a2753167ec9ef18c7a3ab4430eef4e2b4e642e11d2b7b5f4a5dc298b7d139e498cd88e99aaa24d0007461cceaaecef6c1c1371d99c1b8810635a0
+EBUILD compass-core-1.0.3-r1.ebuild 567 BLAKE2B 2e3ac70e6776014fd89373662374d75698421ada670428718e1c8fe183e0c0421db6f01faec824099129b2189715a94c58672fdbe2ef61bd9a1cf93943d53ebd SHA512 c757fddb4abf05baa4994273f3b9512d4ff07f0a9f3b7a9053dd7057d8e9c73f80f6bb18bdb7b2eba5d2c300c496d73e46a6a33dcf3986ca1ab53f3c2818a6a7
 MISC metadata.xml 528 BLAKE2B 6b7fabfe814d39ca5c07dde758c678e7a2e3bbf683a8e156145ee385060d9454947660d2ffc44a4a5426965ae81064e565c2e3191ff5d8fbe6e87b31f551565f SHA512 c65b8d5e0ea0caa17062ad77c8f099a6c2d61f1bc5f32c635c5bad5bc4fc571703b56cecef1eb2db34a932d02cd4ae4f7cce18ea86d632f0fbd4a9993d431dd8
diff --git a/dev-ruby/compass-core/compass-core-1.0.3-r1.ebuild b/dev-ruby/compass-core/compass-core-1.0.3-r1.ebuild
index 1b3f59e82912..b1432f7ee1e3 100644
--- a/dev-ruby/compass-core/compass-core-1.0.3-r1.ebuild
+++ b/dev-ruby/compass-core/compass-core-1.0.3-r1.ebuild
@@ -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_TEST=""
 
diff --git a/dev-ruby/compass-import-once/Manifest b/dev-ruby/compass-import-once/Manifest
index b1a17342a403..1c619ccc2ef0 100644
--- a/dev-ruby/compass-import-once/Manifest
+++ b/dev-ruby/compass-import-once/Manifest
@@ -1,3 +1,3 @@
 DIST compass-import-once-1.0.5.gem 9728 BLAKE2B 24a48d11427b30ca14ab27d34c3a9906c1fe9f9d363b910e4c9e3a2488890f4908ec8bdc4a3323a145cce81f8c2344b95302cd168266bf6a1b36d850a1412e59 SHA512 2ef723803341892b34a4bbe691b32ddd266a125c5e3faf8034c473566d70c7a8c0931f1a02abe64c243fe62f2a204cc8e53b951dd88c440eada4ec2dfc19856b
-EBUILD compass-import-once-1.0.5.ebuild 783 BLAKE2B ad8f09f448439c58ec957dbfd05412cdc4235fafe68f1dbcf70d0068606f8b61fc1c60b0a0523e7b5154de215c2897a47dc8aa3f2da5ebc6dcff77e51bebee5a SHA512 0ca7f0051961fcc8a861ab612122a802871deabf55c4b0926bd5cce8b15fa2884104af9b4108110169641956ed8ff4d1a179e36cc63a23954878f6fb3628c476
+EBUILD compass-import-once-1.0.5.ebuild 783 BLAKE2B 6918bc97924266e3937da0e781f009ba042f350a5900b1d3e09bd7840ad509c0b555b0b7ed1319be087e80a5dfc9b57f9b646fd688bcc31f0975dfc35674e82c SHA512 d082797e164fb978d90cd9d473e4b7c0f387bed7d2d0e73e5ea433effe0c7baa35302ad28fc7788692f86991c77ec4dc86ad60dea8f3af7688bd535ff2749b2d
 MISC metadata.xml 528 BLAKE2B 6b7fabfe814d39ca5c07dde758c678e7a2e3bbf683a8e156145ee385060d9454947660d2ffc44a4a5426965ae81064e565c2e3191ff5d8fbe6e87b31f551565f SHA512 c65b8d5e0ea0caa17062ad77c8f099a6c2d61f1bc5f32c635c5bad5bc4fc571703b56cecef1eb2db34a932d02cd4ae4f7cce18ea86d632f0fbd4a9993d431dd8
diff --git a/dev-ruby/compass-import-once/compass-import-once-1.0.5.ebuild b/dev-ruby/compass-import-once/compass-import-once-1.0.5.ebuild
index bab268b2e693..473d793e2a9d 100644
--- a/dev-ruby/compass-import-once/compass-import-once-1.0.5.ebuild
+++ b/dev-ruby/compass-import-once/compass-import-once-1.0.5.ebuild
@@ -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"
 
 # Skip tests since they depend on sass-globbing which does not have a
 # license and where the last version is known to be broken.
diff --git a/dev-ruby/compass/Manifest b/dev-ruby/compass/Manifest
index 2c702eff1ecf..1f2dfbfea1d6 100644
--- a/dev-ruby/compass/Manifest
+++ b/dev-ruby/compass/Manifest
@@ -1,3 +1,3 @@
 DIST compass-1.0.3.gem 378368 BLAKE2B 1c33f576ba0c1117d8ca3deeb4d422441fd50922df3443a68b4eeabdd45d804fe505461a687053b6a0ebf0a2aed2539482843eac786226d16ad5ea5fb51a5284 SHA512 bef1ca903cb982df39330a913051c1a330aa1ecad9abbe5a7644e335c7ed2d152901a4079cc5ee43e9f7ce85a671f1d5552a3c98cf40b04134de072a120deef6
-EBUILD compass-1.0.3-r1.ebuild 1068 BLAKE2B a657ff0ea0c46488e0e840e1d2bbf72cf3adebbd3afd8569544dd12b2fcc0f1fc8856835df366269c09738aaa2e31b1faa6cfb6d52b0858ecacd44f31d06dc12 SHA512 312ddca9b3208ab48c7507c33aa4f55fcce465d98aecd43891ea231aec67dd3fd9c40d3a76dd1d63915ce10d5eb57e53e7d4259641c0010d412a4858bb2e3929
+EBUILD compass-1.0.3-r1.ebuild 1068 BLAKE2B 00b808c1274cd109fa44d029f491cecc1e88716e19f897dc0fa091d9a747b2923ce5197c6b7da36fad93c10f1b3909c6674c89bc760776b6d1085222a0a4a57a SHA512 6dcb5b44c8dad0c8951b4d143d0931a6c0d01f60e39fe2129fdfd19af5767d9f49c5b9f2aff7785243f0b58ff18666c158525da4441f81fd20119ec29c646be7
 MISC metadata.xml 528 BLAKE2B 6b7fabfe814d39ca5c07dde758c678e7a2e3bbf683a8e156145ee385060d9454947660d2ffc44a4a5426965ae81064e565c2e3191ff5d8fbe6e87b31f551565f SHA512 c65b8d5e0ea0caa17062ad77c8f099a6c2d61f1bc5f32c635c5bad5bc4fc571703b56cecef1eb2db34a932d02cd4ae4f7cce18ea86d632f0fbd4a9993d431dd8
diff --git a/dev-ruby/compass/compass-1.0.3-r1.ebuild b/dev-ruby/compass/compass-1.0.3-r1.ebuild
index 35064a11d33a..8b15b5dbe22b 100644
--- a/dev-ruby/compass/compass-1.0.3-r1.ebuild
+++ b/dev-ruby/compass/compass-1.0.3-r1.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_TASK_DOC=""
 
diff --git a/dev-ruby/crack/Manifest b/dev-ruby/crack/Manifest
index 1de0275dc3b5..a3596cbfad2b 100644
--- a/dev-ruby/crack/Manifest
+++ b/dev-ruby/crack/Manifest
@@ -1,5 +1,3 @@
-DIST crack-0.4.2.gem 37376 BLAKE2B 9bf06d5cd918ed1490be511728b67e1bd51decbcf4a13b1a79f70483867dcf0372f1e63302f731b7eaf2ebc1a605b6bd9d063267878b0abf713bb8f8f8f175b4 SHA512 0c1adfe9cbcf6c5bdabba20819c7ed7dce0a8e360695564927bab447c3d66d786bd9267066efb08732b0fc4687d9dc3ac74c650eb8cec17575926aa9a24f7723
 DIST crack-0.4.3.gem 574976 BLAKE2B 4b6f23277ec17a516d06e6e6785889996172b3ec077f022d1a52ab4b8e938b2735abbaecc71288b55654ff09a428c33eb944b627cfdc827ea1f4ddc6289461d9 SHA512 c6577bd86fe2e36b2a37693729da9fc35c5d4deb860ac1873265ccb6fb38056fd76d8c17bb4f779b39f4bc13b9db37c1768433f518c17090ccbb0872a103b386
-EBUILD crack-0.4.2-r1.ebuild 1029 BLAKE2B 2fc0531a64c8a6fe18882078020fa5aa6ee86d4769d440ae11b575935afccc7b6ad20e981a490d9043de791add75430dd5c40eb67c0711a238638f4265077a30 SHA512 4b91b8f10d43108fc07a62d1027d1309311bf7d4e541b528ae12babed36ae5561d3ddde3e5c3138e7600db9357ee9c46c4ff4c11aee79fc5f573f1f229eca57d
-EBUILD crack-0.4.3-r1.ebuild 1049 BLAKE2B 6737a3336af4ac739076633b2491b43b2587d90fb0568350622525ed44d8130f79c33abdf40f98e026e343a01c1bfe87d4e1602fa075a3ae0b6e570b45da9778 SHA512 ced23d5dbc7e11b77db635365d7976e60a4c7a9593854192308f3c51a4ac40ac1163406a50f939bd0ed472afd66f235e7c4289722b711676a745e488d186d8a1
+EBUILD crack-0.4.3-r1.ebuild 1048 BLAKE2B 4cda36008da21797b0f610d9cf3c03e527d05f3a91ee22dd8b7b01ea6b04b1c0d398a8cfd9db06cbfa9354deb60daf8351a39d25a01b89a4ac9c22e250d1b397 SHA512 aa02e9d2e57fa58304fb7cfb5f131236dc740d3a0bb9e7144ca06b8e714deff58e062677bb23131b2eb694a6cc6907a2987f2220771e9ffac944452d3b13a3aa
 MISC metadata.xml 342 BLAKE2B bf1bf4fa826a68ba0c2344619bd3a18ea9f3944f41ee9edda5b0cdebb46d8790a39dd6ef738f996a3c15672a1fe7242c55132eefaf719f21725d9b4372eb4f07 SHA512 2f890aec4b5c1bf8a31bd079d8e0b8e17242e262b7ba2619e5f791da25e2e7510a52086b4103ed257726d0a47e999dd22d0b3c60f8dc77c515f5fc61b122f2a8
diff --git a/dev-ruby/crack/crack-0.4.2-r1.ebuild b/dev-ruby/crack/crack-0.4.2-r1.ebuild
deleted file mode 100644
index 44c674cc9607..000000000000
--- a/dev-ruby/crack/crack-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,33 +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_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md History"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Really simple JSON and XML parsing, ripped from Merb and Rails"
-HOMEPAGE="https://github.com/jnunemaker/crack"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~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/minitest )"
-ruby_add_rdepend ">=dev-ruby/safe_yaml-1.0.0"
-
-each_ruby_prepare() {
-	# Remove tests which fail when run by portage but pass when run by hand
-	sed -i -e '/{"regex": \/foo.*\/}/d' test/json_test.rb || die
-	sed -i -e '/{"regex": \/foo.*\/i}/d' test/json_test.rb || die
-	sed -i -e '/{"regex": \/foo.*\/mix}/d' test/json_test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Itest -Ilib -e 'Dir["test/*_test.rb"].each { |f| load f }' || die
-}
diff --git a/dev-ruby/crack/crack-0.4.3-r1.ebuild b/dev-ruby/crack/crack-0.4.3-r1.ebuild
index f5754be064a4..71b36feaa94e 100644
--- a/dev-ruby/crack/crack-0.4.3-r1.ebuild
+++ b/dev-ruby/crack/crack-0.4.3-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/jnunemaker/crack"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 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/minitest )"
diff --git a/dev-ruby/daemons/Manifest b/dev-ruby/daemons/Manifest
index 8cefb5bca51d..30840469890a 100644
--- a/dev-ruby/daemons/Manifest
+++ b/dev-ruby/daemons/Manifest
@@ -1,9 +1,5 @@
 DIST daemons-1.2.3.gem 24576 BLAKE2B 23cd623c2f9c84ba182b0d1eeb5bdccf9273dc5f0d41cd51377abe7fe1c29e6c7bd342afa9891a54638aefaa4bd1353a3183516bb4355eb93772de633e2db05a SHA512 05acecc07bc3f760472453dd11eb0231b9e7f2e04a783ab44dacecf9c666d01122d27fdb782d9973f475bc378e0e3e51795ad58e221f29b201b1ba5e0de1e277
-DIST daemons-1.2.4.tar.gz 27191 BLAKE2B 090aa40cb9ab12a94da24e2ecb2d2c6ca66102166a2a81ef19ca4cd8ae8a93a96a25af2b694412f30a068ee51eb5e230a32e7c56d1c0f74d3803521f1988236f SHA512 9b6f0202ad87704b441f150ae5c3f5086861ba220069b6e7219714b62c36711889fdd094cfc1de907e9fb4528e5f6bb42b5421b9bcc4ec286648349e78da280f
-DIST daemons-1.2.5.tar.gz 27475 BLAKE2B 0308c43efda4698bf0dd277dc45fde1fe67d907ef9b5447b855dbc93fc775d470f199e8e2e187f5c1bb809559288623b72c474f4d3994323a3466742f1099119 SHA512 5d3db8e5917eff5a3946c385a1ac6f561d1e9d1d6cd87c0deb4c4777bdab33a5e4f889300ee61a2e68df0200d51b3ddd0aa01d9f2841104d01a866f3ee8c09ac
 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.4.ebuild 872 BLAKE2B 6f072cb71d7a087c2c2dcef08c7ea8c67b0d26711aafc1075dda42f844451fa6783b327db3ff41a37eb78b5c5febb27ab5fa4d3efb4d07144ad6dd6292e244d5 SHA512 d156400a5b403ec8d7a4f81046f3942bdf1e600268f940a3300267fc980e708622e0ec73f4566a7e8388e2163db6d9e85def59493b8698df624d4dbef8ad12c9
-EBUILD daemons-1.2.5.ebuild 865 BLAKE2B 582ac900363b3d32abbc0353b34ec3872a8eedbe1ea62bb95de32d2b83bf881efc17eccd6cb4da907529a118552adcf0fc9b3b9afa7147d209591ee23c790827 SHA512 f9d9f6d339b8157ddbabd42cc495d4ce874bbe9151fae2f17441884764a4aba9fe8ce77b65f3250272d5d967ef626757c0b1036860a6680e4e9a32568eda6da4
-EBUILD daemons-1.2.6.ebuild 865 BLAKE2B 582ac900363b3d32abbc0353b34ec3872a8eedbe1ea62bb95de32d2b83bf881efc17eccd6cb4da907529a118552adcf0fc9b3b9afa7147d209591ee23c790827 SHA512 f9d9f6d339b8157ddbabd42cc495d4ce874bbe9151fae2f17441884764a4aba9fe8ce77b65f3250272d5d967ef626757c0b1036860a6680e4e9a32568eda6da4
+EBUILD daemons-1.2.6.ebuild 883 BLAKE2B 232eaf318ab66e7877d3733ab51e7d5e296a92184d77308573bd2edba0bfe4e3cafbdc696aefa30c5b1762f57af50efd18e9243dcec277c34229ddd1db82658a SHA512 21fe7b84e3640603319b471d5cbdf77b4644facd6a65b8850084efcfd4de2250eb8bc91793d67ff12b5d43b6331efa1c3ae3607e5851607b8caab3e3f190e1a9
 MISC metadata.xml 345 BLAKE2B 7e783ce974aa702ba94e5d1d1b17646297e1db1c51d4dad02408e678092afb21647d8a21f0beca7d8e03f4c5271e3f63f643e3d113bd1d89ca927110b9d447f6 SHA512 c6e30f1117d3ebc21e91cf49a6e4952f3cadef673c1a624f9b5cdd4bcf036f1a4d25120799ff72896b2bd38386fe251e72b27028e2a31551716f21bc90217cec
diff --git a/dev-ruby/daemons/daemons-1.2.4.ebuild b/dev-ruby/daemons/daemons-1.2.4.ebuild
deleted file mode 100644
index af7191e4d5db..000000000000
--- a/dev-ruby/daemons/daemons-1.2.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_EXTRADOC="Releases README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Wrap existing ruby scripts to be run as a daemon"
-HOMEPAGE="https://github.com/thuehlinger/daemons"
-SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples"
-
-all_ruby_prepare() {
-	sed -i -e '/\(pry\|simplecov\)/I s:^:#:' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	use examples || return
-
-	insinto /usr/share/doc/${PF}/
-	doins -r examples
-}
diff --git a/dev-ruby/daemons/daemons-1.2.5.ebuild b/dev-ruby/daemons/daemons-1.2.5.ebuild
deleted file mode 100644
index 792eabef56a8..000000000000
--- a/dev-ruby/daemons/daemons-1.2.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_EXTRADOC="Releases README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Wrap existing ruby scripts to be run as a daemon"
-HOMEPAGE="https://github.com/thuehlinger/daemons"
-SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples"
-
-all_ruby_prepare() {
-	sed -i -e '/\(pry\|simplecov\)/I s:^:#:' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	use examples || return
-
-	insinto /usr/share/doc/${PF}/
-	doins -r examples
-}
diff --git a/dev-ruby/daemons/daemons-1.2.6.ebuild b/dev-ruby/daemons/daemons-1.2.6.ebuild
index 792eabef56a8..14452521fe30 100644
--- a/dev-ruby/daemons/daemons-1.2.6.ebuild
+++ b/dev-ruby/daemons/daemons-1.2.6.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
@@ -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 ~ppc64 ~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 2d390a1b6106..702ea038b04f 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 519 BLAKE2B 1b975a8ee8a9cc880a1a25038db51842bd2171a864196e5e86f2f9b1468959ef47ba1e2e00849b68c5bd315ca00ffea7a5044e47618883158e5e578f60f07866 SHA512 a93852a7e0ea15a86f184bc8ad8b10d58f09ce4751d4dad410aea70033da705fb03a1e2caf71e8f30214420e563c5ca55bb560150e54ef70c1b62b7a9bfc20dd
+EBUILD did_you_mean-1.0.2.ebuild 517 BLAKE2B fc6efeb4a32911f384f1760f5751e4a59be39b305cde96dbeea9ff7bd580db87347a6d021c7a145271ec6b7a8b1846a15ff1c6a2789cbca28100718222a6cc72 SHA512 18ec40985d2bf8c5f86e398080bc7951ef9f559c43831a3569b981eef70a37fd99804f73f742b98135bbff76c892040a83066936b6c8ab81a117763e06593bc4
 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 09bc4c5f7cee..58ed4895aa1f 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/domain_name/Manifest b/dev-ruby/domain_name/Manifest
index 651f356e6a3c..4a402fdf1009 100644
--- a/dev-ruby/domain_name/Manifest
+++ b/dev-ruby/domain_name/Manifest
@@ -1,5 +1,3 @@
 DIST domain_name-0.5.20170404.gem 120320 BLAKE2B c2dbb97c67e1303c272ff67f2c32314827513a5953ca3b9d49667828f6972904249ab98ee0541a380fddb7c6e3fcc3959f8e5f8746ae6b38a3915169ef6c0dc2 SHA512 3314d87ac3b04337dff047c423ded2f4b99a4b9300528c34388cbc30fbcc7e84ae884969624e046e0dcc1d856e0bb8246b1556ac2dc755a1b4917ccf975fece3
-DIST domain_name-0.5.24.gem 104448 BLAKE2B 7a2ad0838710da737ea259c797bfaba93728b3548561fee2fa31c52553d9c8d947b25fe6a5cc2a304146eeed376994d6557dc945fbde1e74dcbc7aea875500d3 SHA512 46caf0be89c3b2f38f79180c14f4eaa1096f12f80feb881dafb394033d2c6118f481c898310d281d15acd5b9a54473c9d9ee8f0e77dda5b03c40a0d6f137f602
 EBUILD domain_name-0.5.20170404.ebuild 1100 BLAKE2B 24ea0a0b37c149c66b66125d21bc76abcca90d65e9ef34eaca9521f4587723e23c2a313f998d44817d45b4d16e1d02edd7209f8df8cf4db0d5ca2e2be7824138 SHA512 53e379cc0ea301f1e1113d3cbfd4152b4c89944e74c7678ca9a6e8aceeec2fab4dc9416721fba1970f848163d371c9709bbeebae1e88e6acad9019304b77ec95
-EBUILD domain_name-0.5.24.ebuild 1073 BLAKE2B ef7da3a3dfd7774811bb474c429dff83ad52af1abc8c5c4942d3694b31781ff9ba15e921c99f3323e27c0d179ce35ba13234708471493ef4b78b0dce74a6b07e SHA512 0c57d6f2c1ac8466042770cbe972690af01e1d5d7bbd253356f59e5bd5b65df87f08362c663e513fdd149a16464f427d7c48b888be814e7dd1261ef25bfde73c
 MISC metadata.xml 346 BLAKE2B e97527fee7fa9d73d77ef7a9e9325c9017fff3a9912fc76c74b76f5c4cf53aac583157ff02ccd5a969882829c1ffc4f35d44cb739497050a59402f88b06de2e5 SHA512 f9b3df47565a7827242a16355e01c450977cc12b7c0cf091590b1f642f5c941e2e3f4f14af66fe2975ffa6f7d53c3385ae2a87ffa666c1c1b7f7356f07c94830
diff --git a/dev-ruby/domain_name/domain_name-0.5.24.ebuild b/dev-ruby/domain_name/domain_name-0.5.24.ebuild
deleted file mode 100644
index 8cd2c216e78c..000000000000
--- a/dev-ruby/domain_name/domain_name-0.5.24.ebuild
+++ /dev/null
@@ -1,46 +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="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Domain Name manipulation library for Ruby"
-HOMEPAGE="https://github.com/knu/ruby-domain_name"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.5
-		dev-ruby/shoulda
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ d; i gem "unf"' test/helper.rb || die
-	rm Gemfile* || die
-
-	# Remove development dependencies
-	sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rdoc\)/d' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on git.
-	sed -i -e 's/`git ls-files`/""/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib:test test/test_*.rb
-}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 82896d057fdf..c78945ffed04 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -3,10 +3,6 @@ AUX is-integer_fact-1624_3.6.5.patch 2220 BLAKE2B b8253f3d7eb654c944cce5d75715f7
 DIST facter-2.4.6.gem 246272 BLAKE2B 105a43b2697cde0a48d4fcf87e221cfcb348695f81722b8cfe2819a8f3fe19e575d22642a708c798648d05c71f54e7bf0281345320612a8fdb3b68fce993ec20 SHA512 a0a2bef37451ab96ed331c79171f77d89b6db430b083e6888a306fa5b57a72986b7f600cad3e09b5f4706e54736d1d32ea25525fe18a6108cc95f315da16664a
 DIST facter-2.5.1.gem 254464 BLAKE2B 7276e9c406c000e51e68a2a1c22d0636e294902d31bcaf58e922961a8e1dd99a362467b7046362a5f179fe72f6c077656d4d400e354ed40ed3a06c71de7f07cc SHA512 4fa4b5248bac64c7a76036e428f0f5fdb0b2173987fbaaf18d0130386126dabb083e23cea8cb4df37bae0ea5a883663f71bc6c04406c562bfb7adc23e0899f57
 DIST facter-3.1.8.tar.gz 324710 BLAKE2B 9b7ce93d7d0b2112771ea79df0cb35e7bb752e19e4a54d213161479c27c7ade79e148fe1fdbbb3c20d0d61462aac5f4b97b6e84fdca89623d9ba4911f286e9fd SHA512 2884c2c0bb3075b2552763dee7f33228b0e70b4eb46367f52c4cbf9e01930ddc5e58d062d06ced4174900fc3eae5214d80471a4fe499bf0f2ac0278640e0e8c7
-DIST facter-3.6.3.tar.gz 370771 BLAKE2B 2c94f319e4f739fd750622e431239412726b193db26ea4f9a9eee79a5a1cf6db76721d343ae042b1ce9a5e6a8ff48461251ca088badedb6754e4a2d31f547e5d SHA512 cdcc6bd848c664f395f656d57e0bd28b62cccfdaeccdc9cd364d90a96693c6c8cdc079aa70409297f0ecfdee041c28bad52b3cb4b8981e66de2887bc5eb1bf33
-DIST facter-3.6.4.tar.gz 373722 BLAKE2B df6c38f0828010a2b9663fb66965e0b4c69ebce0e3d4bd9cbe424cf82ff0f47f6c60ece6206728d0420047f078cec96e37a16f0a41bd79274b2525d1d3d8b071 SHA512 d5e03bb40da448805a56accc2fb972569f686a1e8c8b343d4e0defb5a00a982665496049174c225a8b04abb4d09112bd2117a8a96c9360bb2e36e4d569d86337
-DIST facter-3.6.7.tar.gz 372697 BLAKE2B 1adddd0f118049e698048cb94544041d7a6feb3f530c62837e477deb0b0c4254efdf27a793a1ceb9182185a52e7dc277587834a80c9dbc8ec994e86cc12f36a3 SHA512 a9f2781b0e05d09240efaf88d79476786782df7afc5afa222df30f3cd69eb1712dca59bd33157c2be43e7c54ab940e8d8ef0642dc075c44ee86fc6fd89a102da
-DIST facter-3.6.8.tar.gz 378732 BLAKE2B d898e6ccab188fa90b867a337aa3c248dcb913d75318749b35639c429b192ceb9dd4cc20eef1f1e478540702b6f9487558bc8da865a7a40b851389d8da594e56 SHA512 f076819ce04aee404fb54e0f97423f39bf60ca56d8927bbd778972efaf650e2ffd0c75e5be0a3108738fd65242582269f17eca865fefc74dfef8f6a5bbec7f88
 DIST facter-3.7.1.tar.gz 374576 BLAKE2B 58f3a8f22c0a01bee1202fdb3f44a8f61a2f9bfed18585c6ccc8f0f3990fcde8c267540a0d06b805b91c538dcdee90e9b9dba3d618cd2df8e935d8d994134167 SHA512 3b2d218d60f5ad9ef756a50540f638303b7a4eb0ea2afca10d2c41f4e6e3f6c2bb6337de417e4989664e32317b0f8db921fed68e813e4cebe10083c943b33fee
 DIST facter-3.8.0.tar.gz 378859 BLAKE2B 3fe790c21211fe749727e6da7849911751c8deb51c5ef08ca9669ba385a1791a289c50d4696eb1ed72b06c934bdf385b6928ef04d20ae7b903090162e047b3c5 SHA512 e28771c7136c9b40e2f8b3509fbe07188d2640288705b5bd531521e476b8b8386e5003448b4c199c9d6cced8128ec113dcc9ae317cd4aa5319da906e605cfc4d
 DIST facter-3.9.0.tar.gz 380715 BLAKE2B c4045020edaae06b23e0c75788cc76854f440ec7605234e3fef476e92ebb4d541d4b1b9148fc0350cc4b1854c1cb7888482120a3566fc579dabe033301791019 SHA512 ca818ba58fe232752a74faaa8377f706a49661e37ce85af7e6eaf735ecbcdcda4071618a6b8906b0444fea989b7b16cb85171b980a089cd57aaad37508a2b905
@@ -16,10 +12,6 @@ DIST facter-3.9.3.tar.gz 387062 BLAKE2B 7fef72ae0ded8be1ac0eae317b748995df58e668
 EBUILD facter-2.4.6.ebuild 1914 BLAKE2B b13ba79845f5a6ce0d27a8b66f034e12be1a7b522fe263c74760d65d3bf4565bf43fed49cf7e475afb673aaa57f579a5d9ad79b38219c8dfdf0ce32b15eb6536 SHA512 e1e6727b7b66fcf3b306f83563293c5bc7ac541efa775a1b4894c99fc0fa0fe00202cee368b25b389d4264ed868af57fa88489df6b4d8e0283fb0ada79d97440
 EBUILD facter-2.5.1.ebuild 1918 BLAKE2B 303788746f2ba6e1385356526e17965528f10e06546c918f0aed7ecb884bd4e0386387ad01d9e59fd7cb9254d91b26c91ceec1fa9bd75dfd34bedb1d02df9115 SHA512 ed07f3b39a71b147a1a07ac161e1895a4e7380aa773c146d702f82eb5a6bf342aa8700f100c4c56ac2996a2d7fc82b5bd4af492c77aed4ba78d308c18a507ab6
 EBUILD facter-3.1.8.ebuild 1833 BLAKE2B 35fb5f497db4c8285afef7c7448f67532a8dd6d180a6ea0d63faf8d87d2c09fb8d9ecb27ed40d1dded577205e7e1529035abf8dd0f268f22bc7686c09f8f091c SHA512 56425967d45ec216d15a8604d17688b6103d023587e6b806869372bc5b6ed0927d6503ba2be0da4010ad1400f6a475ad82a03bd8a39757c92da952eb599238f1
-EBUILD facter-3.6.3.ebuild 2062 BLAKE2B 1115b4d2beefbeba5d21b979a063a00ff12fd963e9aa023f4c59122823911f4375585313530a7f773e4a4e8ab5876b9e20c8022e96fe663eccdb08ea5f7a3676 SHA512 051f5a4e627e21cc58b31a98857ebb64b7cfba338db8b8e02a2a9b3a184cc663bc640666fab4c6934b45c299c73f04eba49b2b654680d7a71abe1cf75f22b554
-EBUILD facter-3.6.4.ebuild 2081 BLAKE2B 2697a165ff4ba354406c3835e7adc41f2b40a2c0eb974ea21e17a0905535cc8383a12810f5b78ebf568e8b3e4372a82622780b40a7d9b01284eccd9abedebe10 SHA512 818c8c1d376f143894e04bcb881797e5e2eb825be12b485495d1bafefd5fbb50981440e890a6f5b6477516407277bb2dd76caed1b208498665bd3dfc7ff5bfa9
-EBUILD facter-3.6.7.ebuild 2145 BLAKE2B a4c08b61b82387bac20006accc83d362c06778aca9233bdfb3844fcfdc7ddc6df3a16d482af978df1ba3d1ec218ff2a2fb9b787154c519f95f32b4454115c708 SHA512 06dcad1ffa7a6c262d54026666571aa99ccc2fea5d2f30b0c7690ef493cd8f2b39a83ad73b846ade930831dec236f5bd9cde017370a149076cc4d41eba348539
-EBUILD facter-3.6.8.ebuild 2145 BLAKE2B a4c08b61b82387bac20006accc83d362c06778aca9233bdfb3844fcfdc7ddc6df3a16d482af978df1ba3d1ec218ff2a2fb9b787154c519f95f32b4454115c708 SHA512 06dcad1ffa7a6c262d54026666571aa99ccc2fea5d2f30b0c7690ef493cd8f2b39a83ad73b846ade930831dec236f5bd9cde017370a149076cc4d41eba348539
 EBUILD facter-3.7.1.ebuild 2102 BLAKE2B 96a000c70aeabd1554b918c6c38b40097a4a5edeceaa93d57c8a53e7d9cf09988d00ee426d1618f98fb24aec5d6a2b04b199488af591771ddc563719c61cef6d SHA512 8111259a1c695acc9dd884f6dc19560fb18dcaf4412c924529312b288565d20efb010cb41c64a55594f32cce47071b1216a29df23e93df578cdfa047897736ad
 EBUILD facter-3.8.0.ebuild 2105 BLAKE2B 01ca6da63a7b7d3c679fef5d47732ca66369637414087ef5144edd8b4d3d69d052ffff1590bd7c781111f5246a547e5eee689963ed2fa091a59ab513cf5d7959 SHA512 ab626767328201b102fe8d678296c0132d5b695c69649064421dc42d52f911a8fab75343c7c348b46e09ae52c2ba5ba3a0edc98eb9658951988db5cf2fe9cc74
 EBUILD facter-3.9.0.ebuild 2105 BLAKE2B 01ca6da63a7b7d3c679fef5d47732ca66369637414087ef5144edd8b4d3d69d052ffff1590bd7c781111f5246a547e5eee689963ed2fa091a59ab513cf5d7959 SHA512 ab626767328201b102fe8d678296c0132d5b695c69649064421dc42d52f911a8fab75343c7c348b46e09ae52c2ba5ba3a0edc98eb9658951988db5cf2fe9cc74
diff --git a/dev-ruby/facter/facter-3.6.3.ebuild b/dev-ruby/facter/facter-3.6.3.ebuild
deleted file mode 100644
index ad8f6680f77f..000000000000
--- a/dev-ruby/facter/facter-3.6.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-inherit cmake-utils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/leatherman-0.9.3
-	dev-cpp/cpp-hocon"
-CDEPEND="
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	>=dev-libs/boost-1.54[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-
-RDEPEND="${CDEPEND}"
-DEPEND="${BDEPEND}
-	${CDEPEND}"
-
-src_prepare() {
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
-	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
-	# make it support multilib
-	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
-	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
-	# make the require work
-	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
-	# patches
-	epatch_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DUSE_JRUBY_SUPPORT=FALSE
-		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-	if [[ $(get_libdir) == lib64 ]]; then
-		dodir /usr/lib64
-		mv "${D}/usr/lib/"* "${D}/usr/lib64/"
-		rmdir "${D}/usr/lib"
-	fi
-	doenvd "${FILESDIR}"/00facterdir
-}
diff --git a/dev-ruby/facter/facter-3.6.4.ebuild b/dev-ruby/facter/facter-3.6.4.ebuild
deleted file mode 100644
index 6ba5e69df6da..000000000000
--- a/dev-ruby/facter/facter-3.6.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-inherit cmake-utils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/boost-1.54[nls]
-	>=dev-libs/leatherman-0.9.3
-	>=dev-cpp/yaml-cpp-0.5.1
-	dev-cpp/cpp-hocon"
-CDEPEND="
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	!<app-admin/puppet-4.0.0"
-
-RDEPEND="${CDEPEND}"
-DEPEND="${BDEPEND}
-	${CDEPEND}"
-
-src_prepare() {
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
-	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
-	# make it support multilib
-	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
-	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
-	# make the require work
-	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
-	# patches
-	epatch_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DUSE_JRUBY_SUPPORT=FALSE
-		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-
-	# need a variable file in env.d :(
-	diropts -m0755
-	dodir /etc/env.d
-	echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir"
-	fperms 0644 /etc/env.d/00facterdir
-}
diff --git a/dev-ruby/facter/facter-3.6.7.ebuild b/dev-ruby/facter/facter-3.6.7.ebuild
deleted file mode 100644
index b1ecb67c84c8..000000000000
--- a/dev-ruby/facter/facter-3.6.7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-inherit cmake-utils eutils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/leatherman-1.0.0
-	dev-cpp/cpp-hocon"
-CDEPEND="
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	>=dev-libs/boost-1.54[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-
-RDEPEND="${CDEPEND}"
-DEPEND="${BDEPEND}
-	${CDEPEND}"
-
-src_prepare() {
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
-	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
-	# make it support multilib
-	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
-	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
-	# make the require work
-	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
-	# patches
-	epatch "${FILESDIR}/is-integer_fact-1624_3.6.5.patch"
-	epatch_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DUSE_JRUBY_SUPPORT=FALSE
-		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-
-	# need a variable file in env.d :(
-	diropts -m0755
-	dodir /etc/env.d
-	echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir"
-	fperms 0644 /etc/env.d/00facterdir
-}
diff --git a/dev-ruby/facter/facter-3.6.8.ebuild b/dev-ruby/facter/facter-3.6.8.ebuild
deleted file mode 100644
index b1ecb67c84c8..000000000000
--- a/dev-ruby/facter/facter-3.6.8.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-inherit cmake-utils eutils multilib ruby-ng
-
-DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
-HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/leatherman-1.0.0
-	dev-cpp/cpp-hocon"
-CDEPEND="
-	dev-libs/openssl:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	>=dev-libs/boost-1.54[nls]
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-
-RDEPEND="${CDEPEND}"
-DEPEND="${BDEPEND}
-	${CDEPEND}"
-
-src_prepare() {
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
-	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
-	# make it support multilib
-	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
-	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
-	# make the require work
-	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
-	# patches
-	epatch "${FILESDIR}/is-integer_fact-1624_3.6.5.patch"
-	epatch_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DUSE_JRUBY_SUPPORT=FALSE
-		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-
-	# need a variable file in env.d :(
-	diropts -m0755
-	dodir /etc/env.d
-	echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir"
-	fperms 0644 /etc/env.d/00facterdir
-}
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index 19470d0da787..0be7b622482f 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -3,6 +3,5 @@ DIST faraday-0.12.2.tar.gz 62809 BLAKE2B 4dcd60192df36e1b9766eab3bcbacd729239b0e
 DIST faraday-0.9.2.tar.gz 57013 BLAKE2B b153188e32ab385c22b011a916125088f56e8dc4ddd5f5fec3b7d0b8fab23900dff4610c642dbe80db0989244952f938d3dfeac0a022493855d6e4ba778d2482 SHA512 12c4ead8dca6baf6292291943ea1aab1a534509bf92c6e0a621c1c69e3493480fced68aa529d8678847028f2fc2a7672411df7e4d09e65a5e764c957fed1ee72
 EBUILD faraday-0.11.0.ebuild 1894 BLAKE2B 42b66ab1eff06f53738c22f7bf0fa8fe4e0e1a170354fd5c9f4a9d7cfdcaf7a155b956e716bd3d5a5cb81c5170a5c67002410dc1061335d23a4c5af870b3a3ee SHA512 7effae5fbd3d5d896e246584cd405bad0e24a934c48955ca49e2dee5db7006560d2655cb74583f98493b2fbf0b7acd322bdfc7286a7c2f3fd12cdd28e74fd3d6
 EBUILD faraday-0.12.2.ebuild 1901 BLAKE2B f686b6d0f5faa8b778b2e80e802c3126dacfea7b06849a7d95b9de0157db54846eac853b31b3ab18efb4e6f09749dbf0676eaca5b952725ae7e5d3417cdead5a SHA512 5a811d93fd62ee14ccf0425a2e59aed6ec676e81b85d994ad437e7f11a29848c4c978a3f235d5a0a76b2435d0aa1952cde1e2eefe9724f8a55c04493376bcefb
-EBUILD faraday-0.9.2-r1.ebuild 1845 BLAKE2B 605eaa1d214c621acb01ab3c580cd3e9863aad6805e4f136cca0e97d834d6e605090d63d69efb6736990a5495e0a75f9c0e0e58cfbe7bd9958c2ca42f040ed40 SHA512 4a977c5aa9ec0187a88b1a8804c5ad94ffaf485f5307c8ab45c01194efc4018bc8f59a8a896b26be15d74be4d94e2b3ee9f0bc5aa9f6636ba6467db01549be60
-EBUILD faraday-0.9.2-r2.ebuild 1842 BLAKE2B 23f7aa9286e6349f4b4ebf422fb03ceed30c91ccfafcef1655a7943dd281c741f09bdb2ee6a465347240f3b5078ad763540d81473fd2eced21dde4aa45c30a51 SHA512 3d67866fd7dbe5b51e1463fea1911833952ab3a9bf2ace4c0882252aa01c986156c47e7a76ed1582b1a3d8615233cab5d62e9995027b1d5f155ab7bb9ad7e0b1
+EBUILD faraday-0.9.2-r2.ebuild 1852 BLAKE2B 224eb26b782e7f9dd3ddb581e171327808a6de0f0d3b033043f795436e78320798ebe64894fe0fa94385d63eb3aa340ba2733383e2d722c4cf695c97b419c7ec SHA512 a3a63ff39b478748b03ecbf3ff3a59246d51b1f421655893c6432c3fb5f4da7218ab772ca6e8900a260d2d5e6d8a920edfd06d0656328a9f1b182a8a3314925b
 MISC metadata.xml 344 BLAKE2B 818dc9570594eef636f7b37ef9322ea083998a0905c0f9f55e758df3ebfa9e36efe5a42d95a666fc5c613a38b9c3a28d55ef0b3f48573dedf786883957d1adb2 SHA512 10e3c69f600e5be2306aef49c4466e399a52e2db52c8b53b7430bf72d6cb8696a71fdaa3a212eb37d2dad86480ea949447aee3f3e224f020e0629e56b35582e0
diff --git a/dev-ruby/faraday/faraday-0.9.2-r1.ebuild b/dev-ruby/faraday/faraday-0.9.2-r1.ebuild
deleted file mode 100644
index 7c79c02e334d..000000000000
--- a/dev-ruby/faraday/faraday-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,67 +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_TEST="test"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="HTTP/REST API client library with pluggable components"
-HOMEPAGE="https://github.com/lostisland/faraday"
-SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+=" test? ( sys-process/lsof )"
-
-ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3"
-ruby_add_bdepend "test? (
-		>=dev-ruby/test-unit-2.4
-		dev-ruby/httpclient
-		dev-ruby/rack-test
-		dev-ruby/sinatra
-		dev-ruby/net-http-persistent
-		dev-ruby/patron
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile test/helper.rb || die
-	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
-
-	# Remove simplecov and coveralls support, not needed to run tests.
-	sed -i -e '/simplecov/,/^  end/ s:^:#:' test/helper.rb || die
-
-	# Remove tests for adapters that are not packaged for Gentoo.
-	rm test/adapters/em_http_test.rb test/adapters/em_synchrony_test.rb test/adapters/excon_test.rb test/adapters/typhoeus_test.rb || die
-
-	# The proxy server is already killed, may be OS X vs Linux issue.
-	sed -i -e '138 s/^/#/' script/test || die
-
-	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	# Make sure the test scripts use the right ruby interpreter
-	sed -i -e 's:ruby:'${RUBY}':' script/* || die
-}
-
-each_ruby_test() {
-	each_fakegem_test
-
-	# Sleep some time to allow the sinatra test server to die
-	einfo "Waiting for test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/faraday/faraday-0.9.2-r2.ebuild b/dev-ruby/faraday/faraday-0.9.2-r2.ebuild
index 673d327b9a79..b30965657cf1 100644
--- a/dev-ruby/faraday/faraday-0.9.2-r2.ebuild
+++ b/dev-ruby/faraday/faraday-0.9.2-r2.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
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND+=" test? ( sys-process/lsof )"
diff --git a/dev-ruby/faraday_middleware-multi_json/Manifest b/dev-ruby/faraday_middleware-multi_json/Manifest
index 95890819673d..350414e59617 100644
--- a/dev-ruby/faraday_middleware-multi_json/Manifest
+++ b/dev-ruby/faraday_middleware-multi_json/Manifest
@@ -1,4 +1,3 @@
 DIST faraday_middleware-multi_json-0.0.6.tar.gz 3455 BLAKE2B 3fcdf69d90fe2da5cfe16851b5a5050429593c39c3d56eeab3e687ee89d036822197273fda44370878fb4087c29d6e2357b3220526c9adb8566a83f8d50bbac4 SHA512 4abc794a06725d4a584af08a58874162f1bea6424569f0fa6683ac0df7882708d3872e6a42024d7fa764d08688ceccbdf61d9870f23b71ea3c842440b495cc61
 EBUILD faraday_middleware-multi_json-0.0.6-r1.ebuild 983 BLAKE2B 52a0a44cd1d48b32fa9099c008444e8fc5ca75c30b6fdf7984b31272b83c241ff941b2c75a95e43971f53cdf48afb2e04ba4d87d062b084621f8bfdc40aaa9fe SHA512 c06f079f4f84ea266ba8f0693e4c12fcb4c4338b457907f164211a82543e07524946d13d44b5108c884327b492aada7b14bd95e98e6b65eb8faffec57e7ebb5c
-EBUILD faraday_middleware-multi_json-0.0.6.ebuild 988 BLAKE2B 11f33c8f7f2887ae083c3d6b6236c67f0a8768e64040c8334b89f3f2d2268376f199f3c8869c35cd3c597ebd89c6c8a5ff0cc063db90944f8ba7381f9be65a7e SHA512 5cea4319aea6f958292a651cd8cad182082392172c10c8b381c1cdf0a2b939b6acaf2ff953f872229ee59d73f6c97c4ce13536da92cf83351b037f1ef400b498
 MISC metadata.xml 623 BLAKE2B 7be969984baa0dbd08ae9c667ab8a6dc7144de07d5a54721a0f8630ee458b02f8e21f2a693d43224d860daae2464e5e88e43b437c62dc695cf2d2c61cea13e9d SHA512 df56fd21e8b99a769ea2e9c214a2720f90e32d410b78bf884c13fca5a4f79d84f3c3f02163e7b3f39d86f15aa54e6bf1fbabc15e0bbbd4bac8c516f241b0d2e7
diff --git a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6.ebuild b/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6.ebuild
deleted file mode 100644
index 132577790567..000000000000
--- a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6.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_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Response JSON parser using MultiJson and FaradayMiddleware"
-HOMEPAGE="https://github.com/denro/faraday_middleware-multi_json"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/faraday_middleware
-	dev-ruby/multi_json"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm -f Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	# Make sure the test scripts use the right ruby interpreter
-	#sed -i -e 's:ruby:'${RUBY}':' script/* || die
-	:
-}
diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index 906e98069ef0..25cba08665c4 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -1,9 +1,7 @@
-DIST faraday_middleware-0.10.0.tar.gz 22646 BLAKE2B c880dbfe73a33b3b2ab5b4f7211b5f095b203551fe3164f963ef06781be271580d3c43a6320ed189180191e0711ac61b8d7514456d87d1fc62d0a82ec97eb2d4 SHA512 f516f040a7be7b14635e8685d6d63647fd49ef595f31c655b6cd8e6b9443a80e1d4c68a516cd4088c129a73e411748d15d97b24cbcf321fd15953292ca3c7964
 DIST faraday_middleware-0.11.0.1.tar.gz 24349 BLAKE2B f2ce9ece102baa86c9ee763c51da2d7a7318a72d8e6b6f102baaef51ad7b13da32c525b7a67992fcab83d0a145e8cb40d3c4bf31ea1bcb18bd73ee54e327e6d9 SHA512 0bda75432ffa406485e60e9f71dc850a13dc1dd89a8262c9a4101d982fec44b63c72452458d29c49b529ca3483b577ea760400b465bf4b30ae1623a42cb96051
 DIST faraday_middleware-0.11.0.tar.gz 24345 BLAKE2B 43325e27d428a74b1b20eafbe99562442ed7d0f98d19cec3f96fea0ae63f810fab92eabb9a3deb586e4d5933db8d2e9bc1f8270bc99c76a4afd7035fa251f192 SHA512 555407c2daa220fe050a33a6572626bdd47b800f75a87cc0b4da7a311aa3a89c24873434fdb8c14ae92e34c253179697471c25a42d18034b8a1e1e8c332f0e13
 DIST faraday_middleware-0.12.0.tar.gz 24896 BLAKE2B 2a371a55baeafb86196cda66b4d36d1aee3d96c50c1e2550edfe70fe0512c2462739b19c3001bb4569d70d98fda2b27fb59fb466051f331a0839420494f564fe SHA512 e4867c122d69e3b8e8a405a85bc8be4c1489861f4acf42369f34ecda67ca0e821509ef522e742bc8b7a20fb0650a45866a04f4b4469829fbc50cd040cef374af
 DIST faraday_middleware-0.12.2.tar.gz 25041 BLAKE2B 0ce9750f9ce8394d1d926345c50c6b565bc2f5bbc3991d8543424dacb243f2176a066cdb4c7dd4fa66f7f90beb477aa66513538d7a6c2f84de56075c304d3caa SHA512 a93c6ad6a97da1c84e539ff5976f464e6126ea444b269be2f3bb3dab71ef6f46fd12cc0b4de7aa34842d4dcc274cca584ef879a8c1b80ca4557af4d4dafcd755
-EBUILD faraday_middleware-0.10.0.ebuild 1359 BLAKE2B 937e7b70937403f6dee197de470beca6893edf7757fdef5162eefd529c4fe5410d3eb790b149b9f9b1e499cac09c9f4a69978eb35db39e3d4b2fcb383e3fb2a6 SHA512 04d8a468b989f55420d00efceb59de17db39460d21954524f1a9c6eb4fab4c9182770860e57c121a509c295a4eb2965e8e79dd03ab71806d1ee0c77cae9ac5c9
 EBUILD faraday_middleware-0.11.0.1.ebuild 1623 BLAKE2B 46208c7e0f5096d71369491e6f2d8209e403a86d8f1030f602451753b5cf685834a9609fc76389177910bdc400452b9aeaf8c344e66e96f3077bd2521fef7abe SHA512 ebd707f39403687f73ae25857649c2206a803ac2266ae9ed6d833327288a472fba7dbdfce78fa67f9c3da5e7fab2e7f5fd8f2372ce1e686e0fdc4ce4cb6233ca
 EBUILD faraday_middleware-0.11.0.ebuild 1510 BLAKE2B 926dcb593631fa724d4bdf5ed00b3fe91f345c522f12558e24c06f93366c5c530bdb100fe954ecc2fd7529401c7d93ad8abfad3cce6f71731f8fe3f6ee2c9e5a SHA512 a749d71974bb80c4f4fdae02303d17dd4665abf27d9b430e54585546d22024377a3876cf471fb07ea109f8a4d62f45a10e7cbc87f87707e6bc8678c92fc71377
 EBUILD faraday_middleware-0.12.0.ebuild 1636 BLAKE2B 5af39ee600118af5981388488d9bb56a85ec5a6816ccc982e013f8ec8e47b411423c72372320323501b91d5f8f4ce70eaea0aac838843e5f27d6f92cd149cf20 SHA512 133c50770b3ca3c1a0845f18f47022af28b51ddbbd27f953ff4be7c97c3d83bb378da57750356487df7e28177a8d8251dc882adcc1ed42a84bd2ddbebfa2be81
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.10.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-0.10.0.ebuild
deleted file mode 100644
index 7e358013e24f..000000000000
--- a/dev-ruby/faraday_middleware/faraday_middleware-0.10.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Various middleware for Faraday"
-HOMEPAGE="https://github.com/lostisland/faraday_middleware"
-SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+parsexml +oauth +mashify +rashify"
-
-ruby_add_rdepend "
-	>=dev-ruby/faraday-0.7.4 <dev-ruby/faraday-0.10
-	parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
-	oauth? ( >=dev-ruby/simple_oauth-0.1 )
-	mashify? ( >=dev-ruby/hashie-1.2:* )
-	rashify? ( >=dev-ruby/rash-0.3 )"
-
-# Bundler must be used because the optional dependencies have different
-# version requirements that must be resolved.
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	>=dev-ruby/multi_xml-0.5.3
-	>=dev-ruby/rack-cache-1.1
-	>=dev-ruby/simple_oauth-0.1
-	>=dev-ruby/hashie-1.2
-	>=dev-ruby/rash-0.3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(cane\|parallel\|simplecov\)/ s:^:#:' \
-		-e '/rspec/ s/>=/~>/' \
-		-e "/simple_oauth/ s/, '< 0.3'//" Gemfile || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rspec-3 spec || die
-}
diff --git a/dev-ruby/fuubar/Manifest b/dev-ruby/fuubar/Manifest
index be2dd865a874..0c5c252009c3 100644
--- a/dev-ruby/fuubar/Manifest
+++ b/dev-ruby/fuubar/Manifest
@@ -1,5 +1,5 @@
 DIST fuubar-2.2.0.gem 13312 BLAKE2B 332fa172f5f029e26df90e622c78ebed2a58351f89c121016a7effb078508a064846945e3b915c51263a3d149f34308bfe21fbf5f3080a0a19fadaec0f0cdf04 SHA512 5d421fe61b2c28a30165beb10852b31d8eda71af0e8b62dbb4f4385f064a2a5ab2929933df41c7665e1fae6750763a13cfa016a506d93e7adc1bb03c227ad0e7
 DIST fuubar-2.3.1.gem 13824 BLAKE2B ad7c0de7dd75b6164045bab69cb8be12999828edbbe12157cdfcc9188cacf03a3528731d85918cd205e8659739f177908b3a635adf0f722bcdf78dfb6eb2c10d SHA512 e83b5474b6805f03e3a81e9b25d97e3a3819d7d3972c7f164dc4dc09bc163eb86457a3cfe5fd53df336f821846e5fd63739fe05c30200537c22aa329215c1900
 EBUILD fuubar-2.2.0.ebuild 716 BLAKE2B f4efba236c599d9fef7bc089eaa609534158882284e882de61fc3464599f959c44ef9f4fa0302545be209a697b51d69da4a9f72320f692f227b705c3870fdf20 SHA512 8c88572f677032f6968943fdad2d7535b1bfdd479d6ae8197158918b5ec99cd95c35f696b6842fe0664a89e9c6c69eb2e493b477a4634e9298c29469d34718b9
-EBUILD fuubar-2.3.1.ebuild 702 BLAKE2B f139f4b9baa9ea7714d7c8ffd58fe57212613a7fb0b74cc9b5708b80df1293266b7672eb6478263805a49ea759e70516555e873eb19273be55723af5119949b1 SHA512 4a6d0fda18b00cce9877bc19ffc47952f80bf3803e13a1e47ce56fcd4521dc445abfb07c93915c85a95b23cd41a41b7c22b13196b5da0394acb44b7b2d95d4ce
+EBUILD fuubar-2.3.1.ebuild 709 BLAKE2B 260d13ee5e2ae4ee0013d54d01300e99a6a467fa25de6bdc1e136b7692e97f5cbd3223c33f51df9a28c92d7d180c27334e4c355f695de8774110e8ce2808bb50 SHA512 58693eaca05edb17bf04019a223d28c8504857cd6bde5ceb047838d94757765225086bf2810fd0786c0de419e464b7e735bc37c8dd6eb3bad01b6eca281b8a76
 MISC metadata.xml 349 BLAKE2B a394e14e59c6aff0211e2b84c89f5d12b862cf44d604c6dec72d80ac8b52c6ad2333069fb04fd257d0d761283bd4aa041ff716f34576f46e455d075ce2ea2fab SHA512 0c974aa96afd7eab91e27ea72859e709fd5d8691055a06b57e2267e2ee36904b3f4b92b1b0d24659015f303017298cbb4373f225471a6350551d3d85574930f7
diff --git a/dev-ruby/fuubar/fuubar-2.3.1.ebuild b/dev-ruby/fuubar/fuubar-2.3.1.ebuild
index 87149eb80c57..7e4b4ab27341 100644
--- a/dev-ruby/fuubar/fuubar-2.3.1.ebuild
+++ b/dev-ruby/fuubar/fuubar-2.3.1.ebuild
@@ -2,7 +2,7 @@
 # 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_TEST="rspec3"
 
diff --git a/dev-ruby/github_api/Manifest b/dev-ruby/github_api/Manifest
index 3a8f3f6a8807..c3e383504b75 100644
--- a/dev-ruby/github_api/Manifest
+++ b/dev-ruby/github_api/Manifest
@@ -1,9 +1,3 @@
-DIST github_api-0.14.5.tar.gz 2047231 BLAKE2B 3c44afacbb7c50908b553464266d1f66f50b71869987a43086fa8c88a9d038901790661c9515aa7eac54128fb9b946a77278f2cc129e0aeba120726c7b984fdb SHA512 c19b8364e627427ae0447810b7d56b5bf50f89030a02af9b19116abc906ac780149b47d54ae3a93d4e1a3f52461fd1b8fe969501fa5ec6e535db22749b8ecd89
-DIST github_api-0.17.0.tar.gz 2122803 BLAKE2B 66bc23ef31d2d7a4e45cadea0b20e64a451672d4ecac2822b01db166af9a4af92681d9c8ec79d05eb930e78935ddacc885d17f0f4db5e42166737467c6f33f02 SHA512 0b85b299fb85e8f5e48d5c0a18fbab1d6d43fc2a35bd3dc7d6517b06267c9daed6bd60fd1572b64d61c034be30729e7aeda38aad15f7749b40935761d3db7a98
-DIST github_api-0.18.1.tar.gz 2124835 BLAKE2B 23d0e884aeec023233d2be534a2de336ae6702ada6933d52572fd1695b1217a0cf7be062b233c614456def11014b182fba182585c8d8665a6f8e126d813bd9ef SHA512 92c0348807307d00d92d12cf72e736bfbd525b2db9cc6ccc0caa74753a88166941e0300db55f353a7b2d169fd0b409ada7eb76b505b902a949388b5bf24c0457
 DIST github_api-0.18.2.tar.gz 2124932 BLAKE2B 62ce868b5437262c3cbcac7cf8e3966288cdf5b78e4698f3d3e35d1da3e839f6445e582db74db47292749014a9532a0ad3077a7b5bd30e2148546348241e52a0 SHA512 ebc57fb86bf56b5af6f6ed96c3dab9190dc7695f37826851d35a7621f8f655c3aae5ef613e48fd6bc98e74e8cb6218a3cf425173feb98e6e054d7fced115ac14
-EBUILD github_api-0.14.5.ebuild 1543 BLAKE2B f3058b8b5877cec2b67a95e83e5d66bcdadbffaa4188418f47482c66e5a63ca9a5e16f62dd8fcab5b30dbc585a264e290d665f3b29bc1d55883094d910e7a00b SHA512 fdfefba7bbd00ba78e66396b26d37ef2141f6c0a05b748ebdad3406287e5c4dc3127401a6974b18014f4d68ae7d43722b5776b4bced82e55402e0ab3eb00f724
-EBUILD github_api-0.17.0.ebuild 914 BLAKE2B 86103fd2b772cc9f150415f0d71f850616fb3837ba16a406257d63c88c81d79e39dba5c3f14cbfa306c4d176470688292d334c88c411fff963f23b70f64984c8 SHA512 afeebf35d73ec2df3d15aa33fc2484949632af983e5b63619c29758f76a44d568d18f0d29b6d1319e412d022eda6f75e2e503065f469488e4d1d95e705a42ccc
-EBUILD github_api-0.18.1.ebuild 831 BLAKE2B 174ddf1d1b8525f6750209778ebae4dfb2768246623d4a526b88bae07a259cbab0ce3e49b00f37acbca448b7b1fa5da52e1474b2beb53e0b6002e9ee962f35b8 SHA512 ee6a0420d78b8c4ebd9ab9788a4982d55a028f4473e8f7a4c0fcb636f8ead94a54240de155667d98ef87dac678f16ea45bbbbc5f66e28b1d5a6777789a9f851e
 EBUILD github_api-0.18.2.ebuild 833 BLAKE2B 210f9586660f01b3dbcf14e8b7042f9a9aa17f9f39c5f0678927af6383b35e25b3d2f116aef1467ac3cfc5695a9e95ccdf5c9b35595c8c9c0a07b472da65eaa4 SHA512 4e2c70686d25551360e6fb4a302da9eea15aba57b84a55d7b8597bc1cb8b72799941565f12406dde4a12dfdc04796b3a9c47aacb5f2d9c14e06b860bb7ee62a8
 MISC metadata.xml 345 BLAKE2B 1ae3691e311b91be47dcaf3c085fc67853e1a70564fbbb8a99d53046e0e33f23cca172222528a87c46d82393c6854787790eb33b22dec23cc9d71917166c8dba SHA512 13a9b76087f805e0ef3cb5a1a115dc72d681d15899f0fec4e003583f29811e3b7cd690c4e6fa8f138c4d992c39551a6b40e71a25484017e0d647ebcc9c0602e6
diff --git a/dev-ruby/github_api/github_api-0.14.5.ebuild b/dev-ruby/github_api/github_api-0.14.5.ebuild
deleted file mode 100644
index 51ebdfb245b4..000000000000
--- a/dev-ruby/github_api/github_api-0.14.5.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_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby wrapper for the GitHub REST API v3"
-HOMEPAGE="https://github.com/peter-murach/github"
-SRC_URI="https://github.com/peter-murach/github/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="github-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.4 =dev-ruby/addressable-2.4*
-	>=dev-ruby/descendants_tracker-0.0.4 =dev-ruby/descendants_tracker-0.0*
-	>=dev-ruby/faraday-0.8 <dev-ruby/faraday-0.10
-	>=dev-ruby/hashie-3.4
-	=dev-ruby/oauth2-1*"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.14 dev-ruby/webmock:0 )"
-
-all_ruby_prepare() {
-	# Work around or avoid webmock incompatibilities
-	sed -i -e '1igem "webmock", "~>1.17"' spec/spec_helper.rb || die
-	files=$(grep -R -l "with(inputs)" spec)
-	sed -i -e 's/\.with(inputs)//' \
-		-e 's/\.with(inputs.except(.*))//' ${files} || die
-	sed -i -e 's/.with(hub_inputs.*)//' spec/github/client/repos/pub_sub_hubbub/*subscribe* || die
-	sed -i -e 's/.with({})//i' spec/github/client/repos/{list,contributors}_spec.rb || die
-	sed -i -e 's/.with({.*})//' spec/unit/client/orgs/memberships/edit_spec.rb || die
-	rm -f spec/unit/error/service_error_spec.rb ./spec/unit/error/unprocessable_entity_spec.rb spec/github/client/authorizations/two_factor_spec.rb || die
-}
diff --git a/dev-ruby/github_api/github_api-0.17.0.ebuild b/dev-ruby/github_api/github_api-0.17.0.ebuild
deleted file mode 100644
index 3f81c5eddb54..000000000000
--- a/dev-ruby/github_api/github_api-0.17.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby wrapper for the GitHub REST API v3"
-HOMEPAGE="https://github.com/peter-murach/github"
-SRC_URI="https://github.com/peter-murach/github/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="github-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.4 =dev-ruby/addressable-2.4*
-	>=dev-ruby/descendants_tracker-0.0.4 =dev-ruby/descendants_tracker-0.0*
-	>=dev-ruby/faraday-0.8 <dev-ruby/faraday-0.10
-	>=dev-ruby/hashie-3.4
-	>=dev-ruby/mime-types-1.16:* <dev-ruby/mime-types-3:*
-	=dev-ruby/oauth2-1*"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.14 dev-ruby/webmock:2 dev-ruby/vcr:3 )"
diff --git a/dev-ruby/github_api/github_api-0.18.1.ebuild b/dev-ruby/github_api/github_api-0.18.1.ebuild
deleted file mode 100644
index fd1ba6c6b751..000000000000
--- a/dev-ruby/github_api/github_api-0.18.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby wrapper for the GitHub REST API v3"
-HOMEPAGE="https://github.com/peter-murach/github"
-SRC_URI="https://github.com/peter-murach/github/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="github-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.4 =dev-ruby/addressable-2.4*
-	>=dev-ruby/descendants_tracker-0.0.4 =dev-ruby/descendants_tracker-0.0*
-	>=dev-ruby/faraday-0.8:0
-	>=dev-ruby/hashie-3.4
-	=dev-ruby/oauth2-1*"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.14 dev-ruby/webmock:2 dev-ruby/vcr:3 )"
diff --git a/dev-ruby/gpgme/Manifest b/dev-ruby/gpgme/Manifest
index 53c69f4e5e52..1a264bb9c4a8 100644
--- a/dev-ruby/gpgme/Manifest
+++ b/dev-ruby/gpgme/Manifest
@@ -1,4 +1,3 @@
 DIST ruby-gpgme-2.0.12.tar.gz 2414972 BLAKE2B 8890e01ffeda828468d4fd520a102a9bd9415a1503faa57b0b01f6f9f96b8f7d459ebf615f402e3b62583530bef71fc1c07ed859e9b2201657af4a487b70b794 SHA512 7c98defc69fbcee37af654d7f13110ca10663da15f40b2b558c32c1695caaa6b4ec2c65c9c6dcb1a60b9dc955d11226776d4ec7db978847b74638cda3274644e
 EBUILD gpgme-2.0.12-r1.ebuild 1432 BLAKE2B c7c7a499a550d6a6a4a9865f7a2c598834b2a5e49f4b51c4c10440d8f4b0bf75c82907847320dd2a9ebdb58bf718a2c80f710f9ad7ded52e60101d0095b1d70e SHA512 eb791978ee0bf94622528ca5e08226e427e4b8a949d9730704eb484c035175bd9947dfc10e716d5630d10287cfe2ee5936f16bda7296e184d1b40f2cd0178d12
-EBUILD gpgme-2.0.12.ebuild 1418 BLAKE2B 484d96e1ef24bf68d9abd2a7a3eaa3b034fbe9beb2d3dada4ba4d82a9c8d4abe625b7dc515949cd86bd2d45ccb8a747c0604793dc0697e1fc6d78d46c7cb5676 SHA512 0116ecccf754ec45e36b24f271eeaffd449901ff9de60ec0f2b784e7aa75ba9d28a4a2b019fdbda19961b3632627cfd1313987a447dba13483f8f60775719d7a
 MISC metadata.xml 467 BLAKE2B 43fb75477602eef095d6c69fcb8c54d00c41bbe84b8ab313dd0d7b0f5c2cb0164f61d9fe66da75c3b0e0c9dd2f01621bb65c9243242432e0ebe00d1980ac59b4 SHA512 ef3183e3a7feebe61f96efe8398b19502d57fc8595f6bbd7c0382c4c060003116648605f8ccdb193103f0433b321e98dda3f720da993a7840e7645f8911c0a79
diff --git a/dev-ruby/gpgme/gpgme-2.0.12.ebuild b/dev-ruby/gpgme/gpgme-2.0.12.ebuild
deleted file mode 100644
index 43dbeeacf695..000000000000
--- a/dev-ruby/gpgme/gpgme-2.0.12.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="NEWS README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-ng ruby-fakegem flag-o-matic
-
-DESCRIPTION="Ruby language binding for GnuPG Made Easy"
-HOMEPAGE="https://github.com/ueno/ruby-gpgme"
-SRC_URI="https://github.com/ueno/ruby-gpgme/archive/${PV}.tar.gz -> ruby-${P}.tar.gz"
-RUBY_S="ruby-${P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND+=">=app-crypt/gpgme-1.1.3"
-RDEPEND+=">=app-crypt/gpgme-1.1.3"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha:0.14 )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(coverall\|bundler\|ruby-debug\|byebug\)/I s:^:#:' \
-		-e '3igem "mocha", "~> 0.14"' \
-		test/test_helper.rb || die
-
-	# Remove failing tests for now. This package was added without
-	# running any tests :-(
-	rm -f test/{ctx,crypto}_test.rb || die
-
-	sed -i -e '/portile/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	append-flags -fPIC
-	export RUBY_GPGME_USE_SYSTEM_LIBRARIES=1
-	${RUBY} -C ext "${S}/ext/gpgme/extconf.rb" || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -C ext archflag="${LDFLAGS}" || die "emake failed"
-	cp -f "${S}/ext/gpgme_n.so" "${S}/lib" || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/gruff/Manifest b/dev-ruby/gruff/Manifest
index 6194b1fceeae..117431039515 100644
--- a/dev-ruby/gruff/Manifest
+++ b/dev-ruby/gruff/Manifest
@@ -2,5 +2,5 @@ AUX gruff-0.3.6-spider.patch 521 BLAKE2B 8b966f23a41ee914c87b2a8f699b62d64e6a8d5
 DIST gruff-0.6.0.gem 316416 BLAKE2B 717f46d94b4b0811f2edbe42fac9c79ed389e509aad9a4f166fb068a7bdd4c7fecfaf97059364505fa354755ce9e9f79c87452e55f1eb05dae1efe41b76e1915 SHA512 4771637157d11c85d437d41d63d018915d1214fd09dc7078b883c98f640821aec3ddc64fcd4516ca4bfd06c9523ee5a4b60dc6233903e03d7336ad10989613cb
 DIST gruff-0.7.0.gem 318464 BLAKE2B bcc51f524089f53b89778143b444c70d4e168983edda247cdb4c9c84c288450154ce6e5234bbf7a0a8ae7251df611333c8bb411a8fd3765ccc5fe9650c3efc38 SHA512 b9842213ab3da7b4eccf8bd06e18d62aea14a6a15d7c45ebe7e51a76acd456ce140f094a9419d4c0bd1774e7d203bea49f9c39aca36c75d744f2732bcde9f688
 EBUILD gruff-0.6.0.ebuild 1128 BLAKE2B 1fec7b730d7689370d733fc1461fb608cd54d608a584d05f86439a2419550b9b046197df9e0b0e4e8c0753f8051149efc8f223ca0c63d82e7ee8ca02f8bd4838 SHA512 e33695c234831924428d516d7b5d906f3c5a3becaa2e601db6bd81f3eeaadce508cce0d6a0c969b476c114953ad03fe74d6aa17a40a7db78e0b24219941dd2f9
-EBUILD gruff-0.7.0.ebuild 1212 BLAKE2B cc16a4d3629107f141e8111b1679fd2040569378b8a4ac135e97d04f5a56206ed231df56f34af6dcb6600bbf6bbb1ee547bcb9915a524eb64ed0b36b704de52f SHA512 5c6f3d902f94ffe94318cd265c0f2132f5ba1ec374c2334772db67e36006883d28cc41a04201da8c6889fceb570ea9f836e38e151ff5ae121f5ba3122d81b5ca
+EBUILD gruff-0.7.0.ebuild 1212 BLAKE2B e4dd20611be0f38e3ce80204a4a75c85350ebdcdec39f8620d7c19db128ac19b5817790e64eaabc18025b1e129e7f68d489d504cec6e3f33ee6c9445a031b31b SHA512 5d3232cb384426a3ff5b721c7788414c5e39ebee43b98d816a5050891b0387f313843221bfbc2c7f678bdfb1307f474549ae5e4338fcb12a5afb7b8d9c41fe7f
 MISC metadata.xml 340 BLAKE2B e3adfc25e09939c98ba4a4323afd0babccd4b0c11ea712e93a454ea4d3074f12a895d674735f8209598336a1d62ea61d6d00c8956a47cccd583857c36f261ab7 SHA512 1136e2805ed73f18bba2c981e2788fa635face71a9b1b384e3dc20680afd4fb354f33ac099077568f7fa1f3510e1c46771f663341153ae64ef961508243c16d6
diff --git a/dev-ruby/gruff/gruff-0.7.0.ebuild b/dev-ruby/gruff/gruff-0.7.0.ebuild
index f6eee6617f08..14e5a2b1e10c 100644
--- a/dev-ruby/gruff/gruff-0.7.0.ebuild
+++ b/dev-ruby/gruff/gruff-0.7.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"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index 6fdda3d2e5fd..8c51b4a7d28a 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,5 +1,5 @@
 DIST haml-4.0.7.gem 121856 BLAKE2B e2598df73b9bf7337c06f60b30fcf7925fa5948f4643051aabbbdf600d25dbc2f614c4cf2054a916f69ef431847279eee1fbdf02e9bf2811369f2c195ed00413 SHA512 5736ded231bb10a0c0932453294604075e24a9020c2658e703c13ebf7a8d148327188157f982a3aea5db6d6938beb372c0167dfbc4ff06325517b2c8bd71a568
 DIST haml-5.0.2.tar.gz 124000 BLAKE2B 852a674d0519ca785fdd448295c402f203d21e627e9dccbbbfe835ed51fe19d4110c908e14cb40c18644e758d609d3651dddd750df7208627e108832c2f06cc9 SHA512 c266a48424db4c9949d29bdb72f2c96ef5878a78ae98867b9259b0e2e2f581cb9fecf4c51091e6bce3ba4d86c60b44e8c7e95759a8aec8c95d59b9707903032e
-EBUILD haml-4.0.7-r1.ebuild 1270 BLAKE2B eee99c2870b4e17991a2d90a2b1002e5fba2d26ed3c9548988b4083c6f4dd5d0a203847a1154d9e99a2c9081954e7c534fe032906c13d02e85218760dba1b0bb SHA512 fa5712f9ec78c20f529dfba71bf40367bd9b1931fec46d424c3d8042c38da60ecd636951b2b8a337dcdcae116b493461ef738965e98fe1167e370ef3c4c6be7b
+EBUILD haml-4.0.7-r1.ebuild 1237 BLAKE2B 157a533f01c713c1c9afdc3c6cbc14d6dafeade63f2450835ed5156af7994eeeb476069e3f4b9f22fd19da6a25538fc203008802c7241299da413ea0d4e140d5 SHA512 4d085239c32be797b539414e36d25d944acccb937ca280c2c07e424d27b88d1df34cccafee98f309d66c5a9506afc443296d96c7644f82c83cba1d826436acb4
 EBUILD haml-5.0.2.ebuild 1569 BLAKE2B a762048a812e983a1997c699029dd2ddbc0029afc3e7778f461809adb5793c2b003f90f5a95eba2e8a833306de0c706b1ccefb09b74830e438ce9b49ffb5de9c SHA512 f6a0735c0263bb85484b5aabefba5c5e1ab83777073bd09b7acd5d5eca67d2777ffd1178635358eb00a843dca4ad5221604740d627b715d3bfc552b87274b66b
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/haml/haml-4.0.7-r1.ebuild b/dev-ruby/haml/haml-4.0.7-r1.ebuild
index 14564a4e5844..e57ebe24cda0 100644
--- a/dev-ruby/haml/haml-4.0.7-r1.ebuild
+++ b/dev-ruby/haml/haml-4.0.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
@@ -31,6 +31,7 @@ ruby_add_bdepend "
 		dev-ruby/minitest:5
 		dev-ruby/nokogiri
 		dev-ruby/rails:4.2
+		dev-ruby/bundler
 	)
 	doc? (
 		dev-ruby/yard
@@ -38,13 +39,9 @@ ruby_add_bdepend "
 	)"
 
 all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' \
-		-e 's/gem "minitest"/gem "minitest", "~>5.0"/'\
-		-e '1igem "actionpack", "~>4.2"'\
-		-e '1igem "activesupport", "~>4.2"'\
-		-e '1igem "railties", "~>4.2"'\
-		test/test_helper.rb || die
 	# Remove test that fails when RedCloth is available
 	sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,+9 s/^/#/"\
 		test/filters_test.rb || die
+	# Avoid tests that are fragile for whitespace
+	sed -i -e '/test_\(text_area\|partials_should_not_cause_textareas\)/,/^  end/ s:^:#:' test/helper_test.rb || die
 }
diff --git a/dev-ruby/hiera-eyaml-gpg/Manifest b/dev-ruby/hiera-eyaml-gpg/Manifest
index 2921dd6ef6fa..ce9c5a1adc56 100644
--- a/dev-ruby/hiera-eyaml-gpg/Manifest
+++ b/dev-ruby/hiera-eyaml-gpg/Manifest
@@ -1,4 +1,3 @@
 DIST hiera-eyaml-gpg-0.6.gem 9216 BLAKE2B 2578195d92d4edbfef9184ea8d9a72f2bea3c67a51ab95579292859c81f41a199ddb92a0168f209548354b3365c66593d48df1b9dacb9774df42c3439305f8da SHA512 bc66c5adbbb4e861ceab689f0695bc6d36b8fe5ecc9e42d03f2640c4264b65d93a19e829edae8aed531f101ac2f41dcccd676741323011a83f0e11944c5204cb
 EBUILD hiera-eyaml-gpg-0.6-r1.ebuild 506 BLAKE2B 58fc226b617fb57eb434e1f5a41f6e461fe76d8bc2533c0e1f6d78a5027814ba2bb160423e1eefae063228137807a2b1919da3148f15475760ddf212972c0f93 SHA512 71caf274361b14bf562577c1d22110a07571f964fe61f6b89f85a527c3fd9ef6440593c6fd0a3b5b18f90b9283105fa6840ace78de0d43d526105e35311185a1
-EBUILD hiera-eyaml-gpg-0.6.ebuild 492 BLAKE2B 9d4b3e3de9bb20c2ff3bd9940727f87f7a5ea7c5a266e11404bdba81c3ba31bc2d3389d4c30fed5d56e2764ead2c559141e4ec7c4f1fe14e4e8aa2dbf5b18809 SHA512 9b8669691d5f4e89e1e7880557e8a1c78b4bfc68e60ee500617931f44c1c1d2315db72f81290ed22af4e945f05e4115eee6191e2c91f6156e9f852bf8000b174
 MISC metadata.xml 473 BLAKE2B 076b7ca0bd642db56643c593070270ec77bccfed2f6ca545571e291c5faa7ddbf437c7216c3d115e8c646e41ff2914db4e7e9c6af0fae792cac38136caf04fc9 SHA512 5c9d09cc98b71839551598112cedf87d6adbd9311f126400527c61a8827c708d69a62bf84d4e269373729426740aca87060f7ef3467a0d3b5fef60920e811a21
diff --git a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6.ebuild b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6.ebuild
deleted file mode 100644
index cf6bf0057bc5..000000000000
--- a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A GPG backend for hiera-eyaml"
-HOMEPAGE="https://github.com/sihil/hiera-eyaml-gpg"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend '>=dev-ruby/hiera-eyaml-1.3.8'
-ruby_add_rdepend '>=dev-ruby/gpgme-2.0.0'
diff --git a/dev-ruby/hiera-eyaml/Manifest b/dev-ruby/hiera-eyaml/Manifest
index b4e69b864171..1ab4d9ee5e40 100644
--- a/dev-ruby/hiera-eyaml/Manifest
+++ b/dev-ruby/hiera-eyaml/Manifest
@@ -1,5 +1,3 @@
 DIST hiera-eyaml-2.1.0.tar.gz 46179 BLAKE2B a25eaf1e013af4add5c4628dab168daedfeb8763038f4e003d5e48b5e51ddc25dbbb8b01d024836163089106d0786d27af43113b3db950ecb302c3ec5a82d7a8 SHA512 b85de0de0cb4f4a7b381ec7e406e5b3858b1e93b5475830df6991fc679d1391a88dd988c0d266942e70fb4705ba47cb656fd732bd923f8290dd90a5bf6e4a5fb
-EBUILD hiera-eyaml-2.1.0-r1.ebuild 1367 BLAKE2B 8beee29507f3abef3e0f3236250d86552b1c187d34b586d5378cac6e51c086915148d16ea88b864cadade6e9841451314314f2a0d86095dc507f4f3b0082ce13 SHA512 be9963887cd38d58f5d813f708ca4ddb0a41e4e46be862e92c894756ced58541c9a63279714358b60e341db87581fc0d5ea85cf728ce18c80dd0aae72bd7fb1c
 EBUILD hiera-eyaml-2.1.0-r2.ebuild 1379 BLAKE2B 549d02bf177ca7829527913a7ad6ddea1041e442f2bb28d6d8a49d4365bdc780b7fffee3171c0bc14ebe1b3e2c56d819abc75265bead9a6f44f43e5635f6d6a6 SHA512 10a4d2f4dc4586619f2a96250106982676476908d706581cb45fef0550b503886e8be40b4d0ffcbf29c8304dd7a0c0b270af22247a20a474610e158ca7491c74
-EBUILD hiera-eyaml-2.1.0.ebuild 1372 BLAKE2B 3e54f5cea58e4ccb20da384e854a525c59d4966ce6ab99b7d50f4a84e8c8be6e98c8e3bd97e07d29ccc20e5145ef2c6ecad033f64e3736692a7b5e7479d7216f SHA512 d111b6c708f1139bb8644a38f59c0a53e0bb80bb39a0e4c13dd38281531a19ba5311f04b6d2cf9589f0541446ae017f20912fd4f8e430ad087e358be929d0be5
 MISC metadata.xml 474 BLAKE2B d527c2a402f1ccb95a35c7a75baa9f71710dee53d9f37e424f28827182fe5500cdddb7af8297be14fab4805ac430d92efcc564419940065bcb0bedd3b7252b84 SHA512 af80beefd80dfb83c5c95f9d1707cda077ef7323004785e420ba56f6a4ccf42181247adaec2d023857d410ed003b82919a72af2a5e024c9d76a0ee696009361e
diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0-r1.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0-r1.ebuild
deleted file mode 100644
index 3a1c363d721d..000000000000
--- a/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGES.md PLUGINS.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Encrypted YAML backend for hiera"
-HOMEPAGE="https://github.com/TomPoulton/hiera-eyaml"
-SRC_URI="https://github.com/TomPoulton/hiera-eyaml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/highline-1.6.19"
-ruby_add_rdepend "dev-ruby/trollop:2"
-
-ruby_add_bdepend "test? ( dev-util/cucumber ~dev-util/aruba-0.6.2 app-admin/puppet dev-ruby/hiera-eyaml-plaintext )"
-
-all_ruby_prepare() {
-	# Fix highline dependency to be compatible with more versions.
-	sed -i -e '/highline/ s/~>/>=/' \
-		-e '/gem.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e 's:/tmp:'${T}':' \
-		features/sandbox/puppet/environments/local/modules/test/manifests/init.pp \
-		features/sandbox/puppet-hiera-merge/environments/local/modules/test/manifests/init.pp \
-		features/puppet.feature
-}
-
-each_ruby_prepare() {
-	# Run tests with the correct ruby interpreter
-	sed -i -e 's:I run `eyaml:I run `'${RUBY}' '${S}'/bin/eyaml:' features/*.feature || die
-
-}
-
-each_ruby_test() {
-	${RUBY} -S cucumber --format progress features || die
-}
diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0.ebuild
deleted file mode 100644
index 05be0dd4b982..000000000000
--- a/dev-ruby/hiera-eyaml/hiera-eyaml-2.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGES.md PLUGINS.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Encrypted YAML backend for hiera"
-HOMEPAGE="https://github.com/TomPoulton/hiera-eyaml"
-SRC_URI="https://github.com/TomPoulton/hiera-eyaml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/highline-1.6.19"
-ruby_add_rdepend "dev-ruby/trollop:2"
-
-ruby_add_bdepend "test? ( dev-util/cucumber =dev-util/aruba-0.6.2 app-admin/puppet dev-ruby/hiera-eyaml-plaintext )"
-
-all_ruby_prepare() {
-	# Fix highline dependency to be compatible with more versions.
-	sed -i -e '/highline/ s/~>/>=/' \
-		-e '/gem.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e 's:/tmp:'${T}':' \
-		features/sandbox/puppet/environments/local/modules/test/manifests/init.pp \
-		features/sandbox/puppet-hiera-merge/environments/local/modules/test/manifests/init.pp \
-		features/puppet.feature
-}
-
-each_ruby_prepare() {
-	# Run tests with the correct ruby interpreter
-	sed -i -e 's:I run `eyaml:I run `'${RUBY}' '${S}'/bin/eyaml:' features/*.feature || die
-
-}
-
-each_ruby_test() {
-	${RUBY} -S cucumber --format progress features || die
-}
diff --git a/dev-ruby/hoe/Manifest b/dev-ruby/hoe/Manifest
index 166a9198032a..7a019eeceb66 100644
--- a/dev-ruby/hoe/Manifest
+++ b/dev-ruby/hoe/Manifest
@@ -1,5 +1,3 @@
-DIST hoe-3.13.0.gem 130048 BLAKE2B 9b5c63b539e8bc2faa3bbeed4a706d413ea1305c2104e3b215fa7c2a00ed06dcc4e13dd10a81c697d1e66405711e0c187e09f01463a3f14450efb2a5ec6dac3c SHA512 0b6b109a063811651787ccf3d63eff2944024013a75c0c3362056d2fba6668141b7541fff8e53a9ef414899adc560546a98c452878aa5c53620a115fef7ce242
 DIST hoe-3.16.0.gem 188416 BLAKE2B 48383c46512a359a269ca3475ec701b1443e0ef71b31d1ca1604de391ed4df6b0ad27dd1c5f6ed04751047d211f2c6299245361cf131e2418f224324ac9934c3 SHA512 66cefb5a24906e19bbf0c82c8539d6d101b84d0dc1d3ce1910e4117357639489968271e76e86bd3c432b9ef7e3b24a78294c06210cbef280860f7dac18100606
-EBUILD hoe-3.13.0-r1.ebuild 1451 BLAKE2B d11ea06a959d802d3715b2fb77923d6e59cb1204e1707a3204113fbd3ed3c6d683c57147283e188c8fabdcd082b1419d42de6a7d5bdb6e31ef2a2946fb722cbb SHA512 43628099f9f8480855fa9a60d82bc8379f732d6b06fae5b7ffa3066a01ea0e9b001f444b6c4cd3cebc9af12579b4ad926869f762c1ba821d2ac7e9eea0439013
 EBUILD hoe-3.16.0.ebuild 1519 BLAKE2B 764738ca5d9c9e9b5594d5ba663b9b4c8bf904dc586662b44e36d8a697e8abda3bc5b0ffd7aaf05ac0eb1abbac3bb85458d79b196217da6f9df81d5a6744831a SHA512 7d846277053b5fc31f3967388833cb16e7d95481857e2154798dcef672f8d335d729a89203bac1c45e8b0c6531c782d3bf0669854441ca929eaa3d743c273b90
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/hoe/hoe-3.13.0-r1.ebuild b/dev-ruby/hoe/hoe-3.13.0-r1.ebuild
deleted file mode 100644
index 10657938c0cf..000000000000
--- a/dev-ruby/hoe/hoe-3.13.0-r1.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="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="template"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hoe extends rake to provide full project automation"
-HOMEPAGE="http://seattlerb.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
-
-ruby_add_bdepend ">=dev-ruby/rdoc-4.0" # Needed for rdoc call in compile, RDEPEND could have it merged too late.
-ruby_add_rdepend ">=dev-ruby/rake-0.8.7 >=dev-ruby/rdoc-4.0"
-
-all_ruby_prepare() {
-	# Skip isolation
-	sed -i -e '/isolate/ s:^:#:' Rakefile || die
-
-	# Skip test depending on specifics of gem command name
-	sed -i -e '/test_nosudo/,/^  end/ s:^:#:' test/test_hoe.rb || die
-
-	# Gem.bin_wrapper does not work as expected on Gentoo.
-	sed -i -e 's/Gem.bin_wrapper//' lib/hoe/rcov.rb lib/hoe/publish.rb test/test_hoe_publish.rb || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	rdoc --title "seattlerb's hoe-3.5.1 Documentation" -o doc --main README.txt lib History.txt Manifest.txt README.txt || die
-}
diff --git a/dev-ruby/httparty/Manifest b/dev-ruby/httparty/Manifest
index d53c913c3979..c6e0f24174de 100644
--- a/dev-ruby/httparty/Manifest
+++ b/dev-ruby/httparty/Manifest
@@ -3,5 +3,6 @@ DIST httparty-0.15.5.gem 87552 BLAKE2B b5505b08ec91986da860d998a49b277e86151cb4a
 DIST httparty-0.15.6.gem 87552 BLAKE2B edbaf27c17d423e8bcc13744f7b567953c4486e41fbd91442261bc2981a46385dcbcbf10b62c63a6ed713cf5ffb38287be6afcc1af1ebbde8365e1920eec9341 SHA512 2c38cd0a20cccd03c33e521ca683c4c2eaf487acef00d4cab244898bb227bf05e21e5f01a9641869635391ad052fc1d79d63c46fce0e09a96908b4e5aa8ec571
 EBUILD httparty-0.14.0-r1.ebuild 1046 BLAKE2B 114af3a01a68b18490e38a3aa08b154ba3fe4ca5789a515967b89ccb1cd9f4c89c7c353620069e00058f06badba819f0cb5dbf4fdaebfe1d8769431491474272 SHA512 1b3759dc601a16703f7c29afaa90b64562a4bf860738307429d359ed248ca64c02ec27ae36fea632092941170ea693b2dfd73b70d7c17d55d6b8bbaee27d856e
 EBUILD httparty-0.15.5.ebuild 1247 BLAKE2B 3d484c298569c5ebea6c090744a32d1574e68218ea5e5eacf0b3125978e35308f7208c6be86900038e4894791aed37b6b3bcb2c253103ce50673be78c40ac81c SHA512 b0bd04b9e6b7b1bfa46b2ec5839e438f293d0a4383d4436e9c12c070beabeb0d70ca484cd3b9212e1ef10d80428d17f5fb18008936410c2d6495ddeb392b2e8a
+EBUILD httparty-0.15.6-r1.ebuild 1242 BLAKE2B 329a8a7ff1acf5ef77c1a4ced10c99538a9e66505117c1cd0913f2ccc72d7a5b5a6fa9bb5552412ccfd561c3b7ae327f5386c164f6376feec61a98d94e2a23b9 SHA512 5cf24082c7cba284c1307abdf57e923b65a3986179f9d99ea494b642fb574674580d30bb77a67d3393cece44ec0a46c5a5e25f4c9324f97db41c7aad3adf0879
 EBUILD httparty-0.15.6.ebuild 1247 BLAKE2B 3d484c298569c5ebea6c090744a32d1574e68218ea5e5eacf0b3125978e35308f7208c6be86900038e4894791aed37b6b3bcb2c253103ce50673be78c40ac81c SHA512 b0bd04b9e6b7b1bfa46b2ec5839e438f293d0a4383d4436e9c12c070beabeb0d70ca484cd3b9212e1ef10d80428d17f5fb18008936410c2d6495ddeb392b2e8a
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/httparty/httparty-0.15.6-r1.ebuild b/dev-ruby/httparty/httparty-0.15.6-r1.ebuild
new file mode 100644
index 000000000000..8d3f9cac0555
--- /dev/null
+++ b/dev-ruby/httparty/httparty-0.15.6-r1.ebuild
@@ -0,0 +1,49 @@
+# 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_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Makes http fun! Also, makes consuming restful web services dead easy"
+HOMEPAGE="https://jnunemaker.github.com/httparty"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend '>=dev-ruby/multi_xml-0.5.2'
+
+ruby_add_bdepend 'test? ( dev-ruby/webmock )'
+
+all_ruby_prepare() {
+	# Remove bundler
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
+
+	# Avoid test dependency on cucumber. We can't run the features since
+	# they depend on mongrel which is no longer packaged.
+	sed -i -e '/cucumber/I s:^:#:' Rakefile || die
+
+	# Avoid test dependency on simplecov
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '1i require "cgi"; require "delegate"' spec/spec_helper.rb || die
+
+	# Avoid test that works standalone but fails in the suite
+	sed -i -e '/calls block given to perform with each redirect/,/^        end/ s:^:#:' spec/httparty/request_spec.rb
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/jquery-ui-rails/Manifest b/dev-ruby/jquery-ui-rails/Manifest
index 38adfe5d6fa7..3a245767a896 100644
--- a/dev-ruby/jquery-ui-rails/Manifest
+++ b/dev-ruby/jquery-ui-rails/Manifest
@@ -1,9 +1,9 @@
 DIST jquery-ui-rails-4.2.1.gem 155136 BLAKE2B f5ae03a3ebf41ed8a588ea9572a4627701b9e93dd6af289582d0f96881cbac41d3f94c56596c31af42eddb477f892c47b9c0260e3027813d86b98da3c1b9300f SHA512 632ebd8994d8b045e303c591b778cf85de9ea666901761201caefb818af56ed8021152b95b50ecb0e25d10c512b6fb4846b382a21f2a220b9d3550be1c434375
 DIST jquery-ui-rails-5.0.5.gem 163840 BLAKE2B 6eb6b788c826da95143a2d739732e1d1c18a13e76a71a0666f5b4163ca882b4b2b68f273610ccb340352b13c0f6763348fa4ae80b1f6a79d5e6d85110a06a36a SHA512 1db2e47d6a70d4326a25e89d3ff297e39bcbffbe644ddd97b95a837c3d4af7ff812bf165858382e0448f73406a4edf2b7e9c0e1622c1fdae68c52b1a60f77ff5
-DIST jquery-ui-rails-6.0.0.gem 175104 BLAKE2B 844c61c2b30c90d8c8842afdec682c7abd53283b649627740781714df43cc9d8436ff922d8f824dcc5cc3e4743089c23f2d5c8c63cae61ceb8cfc4bfc208ec88 SHA512 c25049927bf806d37cf6f9015b0224e35ad65e5f425974c5a33a06994bed8c78a9d224650f462fd49db269355a3b434d11e7ceef4e00979f91f14fb042e3da50
 DIST jquery-ui-rails-6.0.1.gem 175104 BLAKE2B f990968bc75d5f2c5556363f41eafd9ce2207dc08e20bbf10f857656219253fd5f29e8b4d131f7a8b942682d6c32bb11797c08621b34847f77984e7fe57e111b SHA512 ec0fd8c15ef9dbdbef01bdaca22fb36251a2ced090ade6859cff7c72e183c3c750fc384fdf757db7160ec1c6426ce84c972cce255c3d42a2bb9ebe5539390485
 EBUILD jquery-ui-rails-4.2.1.ebuild 532 BLAKE2B 9db1daca2bc8dbfe61e63c5507d7260d7a741b96c16b80ee5dbe1b3d046841d77c37ca137e3ba8a131ceef230df7fabb8f2a7435e76a97c6ce615ec99f1b9cd6 SHA512 9bed0c661c0fa6ba65e216d226d1725620e75fa1f70db797ec64c396bc43fc0af4f1211703d1f775613453b5de7630e4ce365b4a4c7c0a35e6f765b4a4b8e66b
+EBUILD jquery-ui-rails-5.0.5-r1.ebuild 536 BLAKE2B c87671c12d00d4907ad8db26115677ba5a385843d42c212368cfffe6961435d9037c35258cb33d19b10f85c8093d6ae79db1a3d86fa019f979859e66d4f5ffec SHA512 fe57c3470316bcddec04159d0d2f50394fb51e9a3d13de897f953430ec84e855d37ddabe2a53b65d2a708e777b45ac00323796be9cb69b8fc931f932b1b92883
 EBUILD jquery-ui-rails-5.0.5.ebuild 541 BLAKE2B 31c302e7f3f27ae79027486a451c47e6da0b5dcb3bf40163df57e3cbbe9b8efec66317eedf2c7cc6c8f1757b183c5073fa709544d582f532d05b56524f390c9e SHA512 a58a99899a59f3ac868905d881295f823cd3aefff5d68bd3b0a204f84278c7abe369cfb8f81dbecb6ab913fdd66ae9ba85e6dc1200cf146c066fa15370142c18
-EBUILD jquery-ui-rails-6.0.0.ebuild 563 BLAKE2B 5a5a3f1a1fa6a23d1668d78f660b929b068180b77b0caf98985bc2dde1896bd39fb3575d89bae05110e79c8e228416844fa6b2f122ed3fb53c6cd37c0dc24845 SHA512 9f0060cf7ae928e6dc4a627d0d5008c0f5110bbe78522d1bdfd24c4ad33b1773f93aeb046d90425816bf1887e802407cf019b9a3d24d1dd24eb020c606929a4d
+EBUILD jquery-ui-rails-6.0.1-r1.ebuild 551 BLAKE2B f12a8a6b618b66e7a12587d1d1bd8f4da7ff3066f551ef567e95c1737500087472498e9c1015b6e11f8d8d64192f0b988a93e0ed1e5a9774c19a095970f0f6d1 SHA512 469a406f702a569e4da2f4af8e4ccd49c87f8f904dbff31a7dbfe8918a086e124d35eff0d9283782bba8ea5829c7ca8ef218e5ba50b5662502290b22372097da
 EBUILD jquery-ui-rails-6.0.1.ebuild 563 BLAKE2B 5a5a3f1a1fa6a23d1668d78f660b929b068180b77b0caf98985bc2dde1896bd39fb3575d89bae05110e79c8e228416844fa6b2f122ed3fb53c6cd37c0dc24845 SHA512 9f0060cf7ae928e6dc4a627d0d5008c0f5110bbe78522d1bdfd24c4ad33b1773f93aeb046d90425816bf1887e802407cf019b9a3d24d1dd24eb020c606929a4d
 MISC metadata.xml 338 BLAKE2B 6a200e9f8a3f4c11774a587a5b742e8acb4ae7651694adc7d27240aa86a8b38613598cdee1d38bbc9b5aaa4819c702aac8e638b1cf9650619f3b5bfeb7278a7e SHA512 6af21bcb48be71d72486aa079919f8fc18c54442b65598fc8500ff3fbbf0fd49f1d3d51b86ccaab4f625fba5ac07ebb44c69fa2d7e64a4821983d0eae49f53c1
diff --git a/dev-ruby/jquery-ui-rails/jquery-ui-rails-5.0.5-r1.ebuild b/dev-ruby/jquery-ui-rails/jquery-ui-rails-5.0.5-r1.ebuild
new file mode 100644
index 000000000000..98196abf825f
--- /dev/null
+++ b/dev-ruby/jquery-ui-rails/jquery-ui-rails-5.0.5-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md VERSIONS.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The jQuery UI assets for the Rails 3.2+ asset pipeline"
+HOMEPAGE="http://www.rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~x64-macos"
+
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/railties-3.2.16:*"
diff --git a/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.0.ebuild b/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.1-r1.ebuild
index 0dfad7c4bc70..12d543825ac3 100644
--- a/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.0.ebuild
+++ b/dev-ruby/jquery-ui-rails/jquery-ui-rails-6.0.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"
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/joliss/jquery-ui-rails"
 
 LICENSE="MIT"
 SLOT="6"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~x64-macos"
 
 IUSE=""
 
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index e2e7cd7b7086..26d579add889 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,8 +1,6 @@
 AUX json-1.8.6-heap-exposure.patch 2937 BLAKE2B 204f4c5a16df8fa99ea46e7d29c4a7e8790da9c11ff1dddfeba47b73a3bbf3e06a9243a48fa1d95fc029d21a1031e689b16a91295a1601d4e62a4c18cee2bb3b SHA512 42545c069c8c36b120b63e74b8276b8a6b57237e6cd8ccdeb0e6e9b9acd4f9213e5a4fc35b2f804300e8d00a12546c51b9ef944bde60d679567544de796c87e1
-DIST json-1.8.2.gem 152064 BLAKE2B 5d819cf6ca1811ff6b7cb171ecda005192c9c06955641251f4066436e9746071d04ac37dedb7b3f7938d3c910d5d894f040388b8887b2d08918b344673d1624f SHA512 5c94ec2c5378f7f54cd87a2e265b058e80031d2dd29daf14639c80ba0ac285a527ab7961f5a2cd1e483f455fd8f8c88575950822b7b2d431aa7b2b9c8be819c1
 DIST json-1.8.6.gem 144384 BLAKE2B db9e407be4ac7e0cb2e09369637b88f70cdac7a659c600dc83a5390746dfd21b0a5243af62afaeeff013b5a4116a3b22c65a481cad89f1ca9be8904af87d0345 SHA512 8f393da080293965389df4a606e0604c500b4b267897b3c1b9007b7700dde8156f6598c25790e84fa20a7e03c7ae359a0b267c7b84e52dfe2a1ac83cf652ad9b
 DIST json-2.1.0.gem 140800 BLAKE2B 28bb5334358369351ec9f13f5fb609ce34eb429cfeffb8dfde70864541516a0c2abd00a640b4647f76dcef198f967456bae0a858a2f213e5a30272c1be1878c7 SHA512 bffbe462e952bca321d4325ecb9c5e9f61e51cad13758581ecfaa6a038bac4e30dc7db50bd897086a5592f6fc437d0e0909f91e279aaf4dd71cf127100c3550b
-EBUILD json-1.8.2-r1.ebuild 2076 BLAKE2B 6b63ce42432a9285009398545c473ee71c1eefc67c2ed799c2a6eafa6423dc2ec66cba5514511c02cb3b1681423bbee9e17dfb632f493c349a5811f8ce87955d SHA512 99ce2593c742309f7b9d2d984f53eb6d71c6743fe59571e42a173a62040455ff8a46d5a2169a49784a40e8bfd3cf8b54d190281821c35fd6ba81b87640b3c0f3
 EBUILD json-1.8.6-r1.ebuild 2110 BLAKE2B 941953d1fcdcf4e5e289086cd019f4d99441563a396a944d67a64237d6b998fde4e120f40ee9061956813707bfa9639f0ab6439aac105676d74cf8a86c88bf18 SHA512 f2d5fb012fa39868622bc7e69e20b6ef4012abee3a2a690621e0f8995a644d6660f6c28ba0bcf3a3081fde8485dce78e3488ef381b6b8747e5c20df0986eb2d2
 EBUILD json-2.1.0.ebuild 2063 BLAKE2B a6858ead286219160db9a7f1ffb8ee078b3c2ab80bccbc4e79f8eb9e3d00e042813a3a99967b4ceaba58ba17bcef96fcb6f18014368b664656f7cca64b3a3c4d SHA512 02b679b5c90009dba80a4ee57ae1076ce8784c4b3a39ed5252555201f97522eed853c4756c6c06f8a8cdfd537b06d138f5bd06eaf56264fe65a599171fee5c02
 MISC metadata.xml 336 BLAKE2B e1094160e19b252f7b3233dbd2006c889c0a02aa4b04063caeb7ded80bb2f08a2c4bc31cfb7bdc17398b8d1b8c3fc9f3600eafad9920fe0355c807d3899f794f SHA512 8b4fa7ef9b753bbf1206b1f8a796d3f3b8e3f9ca07906a2e01dbcc8c69d4cb5e5cb26c395d0676b4dedd70fb910cf0abd3be83d3c94f0b90aee87ea6fda12877
diff --git a/dev-ruby/json/json-1.8.2-r1.ebuild b/dev-ruby/json/json-1.8.2-r1.ebuild
deleted file mode 100644
index e15a6827e7db..000000000000
--- a/dev-ruby/json/json-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,69 +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="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README.rdoc README-json-jruby.markdown"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="json.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A JSON implementation as a Ruby extension"
-HOMEPAGE="https://github.com/flori/json"
-LICENSE="|| ( Ruby GPL-2 )"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}"
-DEPEND="${DEPEND}
-	dev-util/ragel"
-
-ruby_add_bdepend "dev-ruby/rake
-	doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	# And use rdoc instead of sdoc which we don't have packaged
-	# And don't call git to list files. We're using the pregenerated spec anyway.
-	sed -i \
-		-e 's| => :compile||' \
-		-e 's| => :clean||' \
-		-e 's|sdoc|rdoc|' \
-		-e 's|`git ls-files`|""|' \
-		Rakefile || die "rakefile fix failed"
-
-	# Remove hardcoded and broken -O setting.
-	sed -i -e '/^  \(if\|unless\)/,/^  end/ s:^:#:' \
-		-e '/^unless/,/^end/ s:^:#:' ext/json/ext/*/extconf.rb || die
-}
-
-each_ruby_compile() {
-	# Since 1.5.0 a Java extension is provided but it does not compile.
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		${RUBY} -S rake compile || die "extension compile failed"
-	fi
-}
-
-each_ruby_test() {
-	JSON=pure \
-	${RUBY} -Iext:lib -S testrb-2 tests/test_*.rb || die "pure ruby tests failed"
-
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		JSON=ext \
-		${RUBY} -Iext:lib -S testrb-2 tests/test_*.rb || die "ext ruby tests failed"
-	fi
-}
-
-each_ruby_install() {
-	each_fakegem_install
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname)
-		ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname)
-	fi
-}
diff --git a/dev-ruby/locale/Manifest b/dev-ruby/locale/Manifest
index db6764c0b14f..8765c54adaf7 100644
--- a/dev-ruby/locale/Manifest
+++ b/dev-ruby/locale/Manifest
@@ -1,5 +1,5 @@
 DIST locale-2.1.0-git.tgz 99139 BLAKE2B d45adbc07795fb045e13ea62493c97b7b635093e61e7ca807bd5a63720a8ecef57cfc522fe9d5fd2d6cd8bc5c02aaccfc509bf191f0f9d7e8d0fbd70fdc84557 SHA512 6f87730f8e6b128a6647bc0c7d223d5e90e85d5bcec884c0680963b09a221882a6dcadb088a27aeb8cc96652582278a5ce24302125902b2c97ca8b00c701abeb
 DIST locale-2.1.2-git.tgz 99433 BLAKE2B b735d913e4a2f1f09131eb9aabc17cee93cd4b28f10458928942a3edd159cd1cde71226d4ad9aa9e340f5df5ba52a298805d1a4e73cb8dbc83d00bcecb7ceb85 SHA512 62a0c60f2102cd2d144126985748f4ab186b8f582c9597f7f4080e782196a39d72b9947b90aaecf5b208ccad0175064ac90e816472fb374d19cb5209da0f7ff4
 EBUILD locale-2.1.0-r2.ebuild 1087 BLAKE2B b3a834d32116c0f5353add347abea7f59e9322effe414fb9f299f25ca67f867cb7a61e3ac060177f0063dce02eed20b7e29573f4df7dd6cce55af30afa97c870 SHA512 c23d691a26387359a82fc617a1a6e9824e3693e20f292096988b5869512bf54e7afef3f5a54c3ba3e97caf27b640501d7440857eb603a959b8736ddd8428458e
-EBUILD locale-2.1.2-r1.ebuild 1103 BLAKE2B d26661b6aa8eefe2082a2a372d26887f4d7a173bfa5b5f51b025fe1030c308d81d5d123682f690b4c03d6844193b1cf63cea0737a63b5178f979843c9286935c SHA512 35f44701b6ac3827b2d8ba31383ab2a02a42cae8cce2ed81d551ae22665a13724b53742b993a2594a195d0627722d522fb0e7aeb0e3d0285e41a38a90686d2a3
+EBUILD locale-2.1.2-r1.ebuild 1102 BLAKE2B 43ee224833d4e6614d4406f55e8b73e0bd5e0d172430c8c4a9988473b1b798bfa78a2bcd03fcab4d92b13945134046ed5f3c8533f38a4bb0fb090dd1648e1652 SHA512 903171405607a77b48e20c6606137163c499fd232f9a41d0f6ce8f447b8f6e5101aa8c38afd190fd63e7fdd2d6954bef5a58bfb96d22b6d5a4e808fd1bb79225
 MISC metadata.xml 345 BLAKE2B c2f8101d9e2cd59540e4e95827ac5fa503b0f76bec78ba5a73031b3b966ed1e3153a05aadad5dd563db931881ff3597d1cfb74e113eba53470da11de29eaa809 SHA512 1da3655a6dd1df21971ff6ef41e3fce230f17379bb936ca8a03d1fec427a6904fec717884fd4551d23a493fcec85beb1a9107907c01faadb63b02db8efa0d5af
diff --git a/dev-ruby/locale/locale-2.1.2-r1.ebuild b/dev-ruby/locale/locale-2.1.2-r1.ebuild
index 2a05ea204dc3..a9a7970b1b6c 100644
--- a/dev-ruby/locale/locale-2.1.2-r1.ebuild
+++ b/dev-ruby/locale/locale-2.1.2-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ruby-gettext/locale"
 LICENSE="|| ( Ruby GPL-2 )"
 SRC_URI="https://github.com/ruby-gettext/locale/archive/${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-macos"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/mechanize/Manifest b/dev-ruby/mechanize/Manifest
index fb79f2f166f1..63f7a2c5a409 100644
--- a/dev-ruby/mechanize/Manifest
+++ b/dev-ruby/mechanize/Manifest
@@ -1,6 +1,3 @@
-DIST mechanize-2.7.3.gem 133120 BLAKE2B 163b9e03d40f774bffe16459f027202f18d3b2c974ce7c0bc527021177ca47c38bfe25d87fe0b862ec85e73fdf6e39ce8ff3392f4f7ba557fedcf3c4e63cfe2c SHA512 5a06f1e7a1c97f985f3011358061c631bcc69e3092082959f738670c9491f734bc6dbbca321018fa484ee493f2f251b8af0cf17602fe381d491ff3e18663f2eb
 DIST mechanize-2.7.5.gem 137216 BLAKE2B 696b0fbb84b8f25e3d52d9d9f20267d53a4294e15ed64f6cefc87dd6d2a279c6f3c7608bfdbdbfbe6fc188cb16b06e219067c97838db4249f233ae12f047b9b8 SHA512 0dfd000d8f58be3fc08e2d6e625128135d6fc2d22e899152f46f66c545c6ede0d1e7b798f4b7de2f96ccdcf7c47001a3946866d0d6a19f9faa946ade6a4bcf92
-EBUILD mechanize-2.7.3-r1.ebuild 963 BLAKE2B dd38b5100ace47096fe46413e843a749f4299daf5c3fe0280b9e5e0d0454202d39e43f2c4282c76fc8bf975a054b337295456fcbc18cd2deb0aac02547917158 SHA512 e58b0a49e0876f2ca06257dc6ee6a4721d3b83aeedff0290b659e2bb5634112a73187a3d5c0c251e1f0360a738839d6c894f38178ee8fc47f17a3f17c64fc997
-EBUILD mechanize-2.7.5-r2.ebuild 956 BLAKE2B 1ea0ad0e0e3eb15c0a5a83673823555b76fed02bd93ae398cce7914559f85e7d4fd992c9df3b97554150f85b6306433c1d4443e8ecdf1709fec658da354f54e1 SHA512 a9763542089b7000d37d38b1efd4012e64f4d0939ef37bf7f05d6b7730b91e2c8e843603228d346f7bcbca4277cc0f542809036ebf2048e5a500c832adb75bb5
-EBUILD mechanize-2.7.5.ebuild 963 BLAKE2B 00616fac39bfdd4426944e93d3e6c0806c8357856fa58a67d02d6575a1c8bf17d0892c0b8df42f0c1bc0a842a10a31f02c3adc8e0d99e0010bc42dfc25245f70 SHA512 c2b27d38c499616a3b44599f088936975f804cf49bad87f3087d88de922451e7f887e8b24d0831674e317dd5db265fbee6aa596a73fcc94a5775f31c68c0b097
+EBUILD mechanize-2.7.5-r2.ebuild 955 BLAKE2B f1f80baa609ce3038103c528da7cb084707c7f55573102538195bffc00f1987e24a573b9f9f65a349c81cab9f81cf76dfabdc96b155d79e03d12505c959b9a68 SHA512 8447d414b6689ac54445071bf07a6542bfc7cd8109670c1633af8c8d058e649e3badf992e03dd56e74cea042e03359a4e1e95c1cef3b71950b77e0e4de96610d
 MISC metadata.xml 349 BLAKE2B 9d63a73c5a28fb2fcef06d4c7b8da3b24d108534b999e76d0d1df86bdfe615e53248deae3d9450824c700a0740b75d0f7c897c8a8c9e5b4339021e30edab51de SHA512 1bc38bd045fa219ec2c86bd942055c0188561fee4ec5e7e6ba4ad2268f653fdeaac40122ed0605af7d47f8dfceb0781d65aeb68bf2fd62e3b8ae5a939f61076a
diff --git a/dev-ruby/mechanize/mechanize-2.7.3-r1.ebuild b/dev-ruby/mechanize/mechanize-2.7.3-r1.ebuild
deleted file mode 100644
index bda76ad11ed5..000000000000
--- a/dev-ruby/mechanize/mechanize-2.7.3-r1.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_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc EXAMPLES.rdoc GUIDE.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby library used for automating interaction with websites"
-HOMEPAGE="https://github.com/sparklemotion/mechanize"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend ">=dev-ruby/hoe-3.7
-	test? ( dev-ruby/minitest:5 )"
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.4.4-r1
-	>=dev-ruby/net-http-digest_auth-1.1.1
-	>=dev-ruby/net-http-persistent-2.5.2
-	>=dev-ruby/ntlm-http-0.1.1
-	>=dev-ruby/webrobots-0.0.9
-	>=dev-ruby/http-cookie-1.0.2
-	>=dev-ruby/mime-types-2.0
-	>=dev-ruby/domain_name-0.5.1"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/* || die
-}
diff --git a/dev-ruby/mechanize/mechanize-2.7.5-r2.ebuild b/dev-ruby/mechanize/mechanize-2.7.5-r2.ebuild
index de8b57ba64ab..e6dd626b63f0 100644
--- a/dev-ruby/mechanize/mechanize-2.7.5-r2.ebuild
+++ b/dev-ruby/mechanize/mechanize-2.7.5-r2.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=5
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/sparklemotion/mechanize"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend ">=dev-ruby/hoe-3.7
diff --git a/dev-ruby/mechanize/mechanize-2.7.5.ebuild b/dev-ruby/mechanize/mechanize-2.7.5.ebuild
deleted file mode 100644
index 4ebf8a556ca0..000000000000
--- a/dev-ruby/mechanize/mechanize-2.7.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc EXAMPLES.rdoc GUIDE.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby library used for automating interaction with websites"
-HOMEPAGE="https://github.com/sparklemotion/mechanize"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend ">=dev-ruby/hoe-3.7
-	test? ( dev-ruby/minitest:5 )"
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.6
-	>=dev-ruby/net-http-digest_auth-1.1.1
-	>=dev-ruby/net-http-persistent-2.5.2
-	>=dev-ruby/ntlm-http-0.1.1
-	>=dev-ruby/webrobots-0.0.9
-	>=dev-ruby/http-cookie-1.0.2
-	>=dev-ruby/mime-types-1.17.2:*
-	>=dev-ruby/domain_name-0.5.1"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/* || die
-}
diff --git a/dev-ruby/mime-types/Manifest b/dev-ruby/mime-types/Manifest
index 804134cb87c2..6f7e28e8b6d8 100644
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@@ -3,10 +3,9 @@ DIST mime-types-2.6.2.gem 190976 BLAKE2B 985ed336dd20e1dfe8603ef8e8ae1868c605ff9
 DIST mime-types-2.99.2.gem 149504 BLAKE2B d2088d606b0210a8607d351ce7b7e3b7f25c3d518eaa3cb32ccfbf56a16eea104c908614f315317cece175003261d240f43bbf203619b54da35702abb94be8ce SHA512 46b3add451c3a6879f0f5df5f1e09c41d78d5a5b3872c2fcae7c8b097008cb04a9f5606360af9cc9880d7d659fe2dad19a118e6dfca1774ec3f5a5b852e31720
 DIST mime-types-3.0.gem 44032 BLAKE2B 68629be95467584e68bf265f48781d4c22de003c323fcbe80b423822aea6a76f50b675f2394f60ec0b39d76dafab9b67ba56471c6291d66176931a4e012b3d4f SHA512 762ad862714f31cf68c9f872f23efc9c85ab0ab4f451553dd4a7ec30ac5bfce804037a413ae05bad253f4a4f82ba6578e3f3e87aa11b5e525d3f237fdf547850
 DIST mime-types-3.1.gem 42496 BLAKE2B a586c6264e46fd45c5fa7bf79b8ca79e086d4ed23c0bfafb0c38f508b638df886b8b4e43d975955579fa24f19de6c90b16d1f0395a80f676b4c153e4431accd9 SHA512 1923ff7032aabbf83569497e0016ea0ff183a13751b0ba0a5b09a132e7c18154bbb19e7d3877adc2e1d21cdff612713201a465f954309794fa1d9b330975a112
-EBUILD mime-types-1.25.1.ebuild 923 BLAKE2B e93c47526f55fbced7f1f9f4089c023506ac78e59a2def4b2556af3bcf858afa515b19ef62bcc1ed66d495ca87ac91a420818d59a66dce4690b749c62ebd0775 SHA512 4e4d8b669caa5560ff15c6d8150583802d2842e79fe0d652971a9dcf37b7894ae05abdd22152ef5fa0608b28cfaeee5af4ff91e6861b3f3b606ad72701de5479
+EBUILD mime-types-1.25.1.ebuild 930 BLAKE2B 89306f2bc2bdc4acfa22985d105956a9cc446cd49f8ef3efcc8d6df307958e5e6dbd27192fd914799adecef52003c8dda784025a454a0b7c2b8e7ec994bf7aaa SHA512 38aef1f501418bce5c169ddc81c669bae21359c458e1c78d61a669c25d4fdeedb032631733191721b8b93a0b5f887f695d3e8c243f867d95af9a241d9f7c08cc
 EBUILD mime-types-2.6.2.ebuild 946 BLAKE2B 2988ff13f6e1c1e9d65cc6b1bb6d69d4db1bc5028e384445285bdedbbb7c7f035387f9bfa5e0902eb8eddc15d5895e9a64076c565a679b2e465d305b4bd02b15 SHA512 30885a365989359975affc1985f1bb0eca60640e7e7bad9a4ef8192e412ad8fa6894f37604ab42a082accd73ddab740cb8f66bde27eed5ff1622db37d0f6cf7e
 EBUILD mime-types-2.99.2.ebuild 987 BLAKE2B 1c2f734ef41404c9c92067ce614915f462f30766fee3544915d6fd661aa724df56198902fa3452100250d0b132aa9d0bf4d614a7f83711d679f0fd313af1dcec SHA512 0239e618bfd9f264d42817e3607ccd441775fd329f6ca229988c3276aaf6b75d3210d838e820ec83089c494613b24ec9d76e25339121df6f65bfca84db23db18
-EBUILD mime-types-3.0-r1.ebuild 964 BLAKE2B ebbedf055c2eaf4154d99b47bde52a50265fe4db579ead0d820822816195f2da173b2496d7f5f14b737faa359c6f3b72ec9b8df4180b937570382af178682a04 SHA512 b481a12187d21275a9868d75f7ff6e61f912d0a6b35da911699005d435a024a3278adb1c3a5b7fd235354b92e14268144c5bbfb10d5702614408c10bc33a22bf
 EBUILD mime-types-3.0.ebuild 905 BLAKE2B 3925f33cac886ee367e84983fe769ace8764ce516c771e48240dd6abdd5cb83fdb3354ea71b30a0104ca7133822b51919af5ef5041db21f4845dfb3a44321c38 SHA512 c203c79f414e871a057356d94a6f28d0bb557959f0c4bfea721a079d1444d6f4876f37bf8dae2a55f368c5808d4dc6cb2723def874638c93a265e71892e5640f
 EBUILD mime-types-3.1.ebuild 908 BLAKE2B 1015467053edf70801e75aa4ce9cb6a32f08766d4ebc6a91f07c39ce3dc01d2332fc4aae7ce1633e3f105da8c678a3265e844ae972236a3a0ecc2e304f7a41f1 SHA512 36198382535a550d994d4ebfb9812f6934c1148365bd311cba909043376b8c8c02ebffddd92fcdb84a654c204ceab44ab2687f29d011ff468881b926e9749be4
 MISC metadata.xml 352 BLAKE2B 6edd7bc99a1f3c2522e87695e078800275b4e9301597961b8e9ba3b920f7b75c92c8133860be4642995d2501e9bcc6f8f7cdbf611d85aa8ea23dfeda9353011c SHA512 01ae71ee2d991c0669ce4f9ac252f8edcdbe1df3f2510e5497f9a0fd0bcc1dc10a10259dc1b3dd14b73edd58895911d363b6a60105b619033a2bf09f987f4b5b
diff --git a/dev-ruby/mime-types/mime-types-1.25.1.ebuild b/dev-ruby/mime-types/mime-types-1.25.1.ebuild
index 199fdd466ab3..e6db30968360 100644
--- a/dev-ruby/mime-types/mime-types-1.25.1.ebuild
+++ b/dev-ruby/mime-types/mime-types-1.25.1.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"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
diff --git a/dev-ruby/mime-types/mime-types-3.0-r1.ebuild b/dev-ruby/mime-types/mime-types-3.0-r1.ebuild
deleted file mode 100644
index ddf3a4c8152d..000000000000
--- a/dev-ruby/mime-types/mime-types-3.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a mailcap-like MIME Content-Type lookup for Ruby"
-HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~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/minitest:5 dev-ruby/minitest-bonus-assertions:2 )"
-
-ruby_add_rdepend ">=dev-ruby/mime-types-data-3.2015:3"
-
-all_ruby_prepare() {
-	# Avoid unneeded developer-only dependencies.
-	sed -i -e '/\(focus\|rg\)/ s:^:#:' \
-		-e 's:fivemat/::' test/minitest_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index f96dfa4c740b..ceedd80b1e95 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -5,7 +5,6 @@ DIST minitest-5.11.1.gem 79360 BLAKE2B 97066b398d04a840327bbcc0cfdf71d7945450f97
 DIST minitest-5.3.3.gem 67072 BLAKE2B 58511cd3cf5e8cadc78427a4818f973aa59873cd35bf553874cfa3e785a6c3d427d3c8b7e5f5f915842ca2b4b2ce594f847873536b49b8860cbfb3812dd58908 SHA512 e1ea2cea5b61231b3074aea1dfb15b104a4e8a6b361d274194b6876401c29f839be618eb7c0448a42bc51ce57f0c2fcd84a72d1b0e0ba034ec5ffe6fbf2ae509
 DIST minitest-5.8.4.gem 72192 BLAKE2B 364cd5da716e33b9c4a6e0b1e249864445205a759b289f940379db033c25edda776177bb2435df75d30b51602193a1f039e72bf3515cfcc4cdbcc83e5a7815e6 SHA512 92569e41e334f209260ac77f9157f1dac8824111c6a810d954f7c66d24cf7a16d7d874186288580bf1f800889d8bdfc80437691d91208990878c295e14c1f906
 DIST minitest-5.9.1.gem 73216 BLAKE2B 553143159ddc688ee0961a1714aded658dea3b6d5823bfa1555e96d25506eed2a789ad0b31939da1947e3e1d21fa9b4a9f59f3b429354283baa8c28fcda1a444 SHA512 4b02ea62297ad5be8bbc8d541405b0d73668ec7fe0f78318fb85fcc35321d934285df13aac2f3e5c4f9cb303b2689bca36a13bf1f8359486f9c66d4ca2fc6e72
-EBUILD minitest-4.7.5-r1.ebuild 755 BLAKE2B 8bbc1e959aaa032aa41c151bf19a294229421d3e0f3ff8491411f65c4a0bbea3be5d0e925277fd70c797865795cb58feca6ae2a9828e3384220d6dec88fb6fb1 SHA512 3af943e583afb74c7006994e2e93f5386b1b0f3d16c66489f28f9580694e28b0b59d7af5829135460552ab38b7483286688602a695cb8125496f4b3510df114c
 EBUILD minitest-4.7.5-r2.ebuild 951 BLAKE2B 378b2e1f8b34403503cac08066cf9b1bd17cabf18960356ac67986def2416f774f8a7f5f7b44ef7c2d9dc1c293fc5a2f6412e36c9ae507466dc4881dc8f04df1 SHA512 76b836e2e763bc224add765ece794d0c23f986c2b136fd3d762f5165134518a213f2f7477031be6f03e349bfaa329f38ad5e6700bb453f3ba3e5e95c1caf7a82
 EBUILD minitest-5.10.2.ebuild 806 BLAKE2B 38d0fe4a589a70a3002d54f7faf8d9252fc988746bb55b1d8ee2318770e77b8cd32bd3d9b298b1b4629181f58b84612d125f0b67d50bed37a3be77ed89756d10 SHA512 5c6c2c91f11eeafe874fb60b3c351ad304cfd81cbacec656aba32b27b549f9e5d21cfd486b6e2a90cfbf1c1cfab6cc8ab654fa82f3b0149328e6e72ccade4084
 EBUILD minitest-5.10.3.ebuild 806 BLAKE2B ba232bd0de4eecddba4e56dd4254a594e379f8cae03fa9f503665d898cc2ee395ea75dfd69ae45c41439bfee275b883e0160b71cba71702b8282384c2245ad36 SHA512 e61c3fc6f57eadaa35bd70dd8539f6445a66867d129ef960c77a6a4c996c57f81c861aa9b93afa447a9fd0c0446104d795bddbd4a18c95a73fcde552d9f9bbd9
diff --git a/dev-ruby/minitest/minitest-4.7.5-r1.ebuild b/dev-ruby/minitest/minitest-4.7.5-r1.ebuild
deleted file mode 100644
index e93ccde1f786..000000000000
--- a/dev-ruby/minitest/minitest-4.7.5-r1.ebuild
+++ /dev/null
@@ -1,24 +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_DOC="rdoc"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
-HOMEPAGE="https://github.com/seattlerb/minitest"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-	${RUBY} -Ilib:bin:test:. -S testrb-2 test || die
-}
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index 06f9776e934a..c0b0c920fc49 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -4,16 +4,12 @@ DIST mocha-0.12.10.gem 77312 BLAKE2B b71ddfa79149d33d7a5c21655e2bbd7b80aa1296c08
 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.2.0.gem 90112 BLAKE2B afbf191380cb36b84dca7ceb9b1d638112797f64d9a8c03421123b5804313f322f542e94fc46b2057eb7ed87ae8dd9a974a27d0858e843449129bea24e39f895 SHA512 cedbbafb095ebc54b74cdb848d11acddaf44333c6f844282fc217906c551f1ec7f0d33bc881e1c410e59917bcfc0b2b7d15d8c549d56ef9c6663907d0d7c0a87
-DIST mocha-1.2.1.gem 90624 BLAKE2B 6c543c2e0d2f86cc6d4353308871486ad7a4e288e43d5c0c9f66159b021281ce964070a6857b3859729f3a3c367b79baeba542ec7d07a499884c5b03e2bd0a24 SHA512 318fc7275b7ef14b6839ce68beb4a6dcd2a06325bcc5e69d82bd6842dc39c78b8a09d6d06d36dbf0f43e59bbcf441be9a6b1d3037f0cbde25be9d04ae44b2aed
 DIST mocha-1.3.0.gem 92160 BLAKE2B 10ffd1bd9b1ecb99555490b17451ae883986ef17856fb401165bb5239a2c07af2532b20bd62a5b1d8dbdeabda830c01179a025174b890be7ceff238fd9a67dad SHA512 a24de9129da65f6b37f06ad888fdb80ae987f51594980991a6ac3ffd23e9dafeedd7a2e758835f33f4de59e07b7c39449e3a49228159710bd87a3de7d3df6a3c
-EBUILD mocha-0.10.5-r2.ebuild 1189 BLAKE2B 87c937da8dce9992d985727e3640ba5fae32fd5011c605f40c2cb4383653156d68a02c7b0980603265db84386a0007a1c2f543fa052e4f11cdbb932824fce6a5 SHA512 96a13c3e12a67666ed519a8371c0fd93fb4ed42c492e066de3664351bc730df5c8aebb94c157d666c039a9c01976f5ccc4840101324a0128c1f5a6dec789c158
-EBUILD mocha-0.11.4-r1.ebuild 1102 BLAKE2B be117388abc6d74944b1308649feb1559f5efa16ff51f81973cb9a7991fb3d4ff0c61d8730ef6a584102bfe6fb7ac8e3adaa2458e8fea91adfcfaad32e249d70 SHA512 df891065ba65d4949305b4fcbc017f48728569a15375aa8d073e70369f7f596710ac0fb67513e78d3be86cc33b9645deeb8bc99461bce8c238af2585c040a247
+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.2.0.ebuild 861 BLAKE2B 691cd0dacacde916d60069b7097f60dfab5d25e79d335eba1eadbc94b98dbc39f37f57f14f0450b72178b26c86ebeba8954085e19047b58116d190a3ebf5f7ef SHA512 0be815d7e7d31f89732cc995c98106a753e0b5421b573968c60ffd38261a58c762dd936cfdde63541b8f7169bfad7a53616a5cf53a9f4f0a0c32be153091c9d3
-EBUILD mocha-1.2.1.ebuild 868 BLAKE2B c04f1cb6204c30149ddf48e1b66adb55ab00fd8be2c37dbf9ef0adf19238f7e0aae11142bfae6db77a188b10279556c4288f7217fc5959a87e7daa5811be8bec SHA512 3c152d838a7faeb2aa722eb0bdcb34e7141fbc4eb681b4edee722a8efcc940e49a6b0f0dc7dc1f716c5633b95cf628e89c3b5f3f123350cd5bcb594ee4a25790
 EBUILD mocha-1.3.0.ebuild 861 BLAKE2B 087b553954eae1c73a77ddd5fb50d96951e58a42ac35f5c76de92606f49253eb64aaba9822709402501f7f88d0a1d5498a60033e81bb14fcb3750712ffc35ae7 SHA512 f06e0d7a05935b6605b4e2a9916b684d0fbe12e25b73d6042fc8185a870f07982f8f0088fc0fc17cdeff9aa73e00d9044f95c721f3de1d453193c8eb628524c0
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/mocha/mocha-0.10.5-r2.ebuild b/dev-ruby/mocha/mocha-0.10.5-r2.ebuild
index ad0f32c8ab58..1c5367b78581 100644
--- a/dev-ruby/mocha/mocha-0.10.5-r2.ebuild
+++ b/dev-ruby/mocha/mocha-0.10.5-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="ruby20 ruby21 ruby22"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST="test:units"
 
diff --git a/dev-ruby/mocha/mocha-0.11.4-r1.ebuild b/dev-ruby/mocha/mocha-0.11.4-r1.ebuild
index 7c9fe8d25c01..8b18f1331b27 100644
--- a/dev-ruby/mocha/mocha-0.11.4-r1.ebuild
+++ b/dev-ruby/mocha/mocha-0.11.4-r1.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="ruby20 ruby21 ruby22"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST="test:units"
 
@@ -37,7 +37,7 @@ all_ruby_compile() {
 }
 
 each_ruby_test() {
-	${RUBY} -Ilib -S testrb test/unit/* || die
+	${RUBY} -Ilib -S testrb-2 test/unit/* || die
 }
 
 all_ruby_install() {
diff --git a/dev-ruby/mocha/mocha-1.2.0.ebuild b/dev-ruby/mocha/mocha-1.2.0.ebuild
deleted file mode 100644
index 49b6731baf92..000000000000
--- a/dev-ruby/mocha/mocha-1.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-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="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "
-	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
-
-ruby_add_rdepend "=dev-ruby/metaclass-0.0*"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
-}
-
-each_ruby_test() {
-	export MOCHA_NO_DOCS=true
-	each_fakegem_test
-}
diff --git a/dev-ruby/mocha/mocha-1.2.1.ebuild b/dev-ruby/mocha/mocha-1.2.1.ebuild
deleted file mode 100644
index cb3828914f50..000000000000
--- a/dev-ruby/mocha/mocha-1.2.1.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_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="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "
-	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
-
-ruby_add_rdepend "=dev-ruby/metaclass-0.0*"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
-}
-
-each_ruby_test() {
-	export MOCHA_NO_DOCS=true
-	each_fakegem_test
-}
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index d5b35624929e..7008b4c0ff6f 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,7 +1,9 @@
 DIST multi_json-1.12.1.tar.gz 25579 BLAKE2B 50fa37b907289b8247ffff1e22ebde1b07ee32e5ca97984be1243340f14185ebaaeb72cb28a18c5c77b1b48bfd0b400479fe7ef532e40cef3736d782c84c0d09 SHA512 f61e500197c5a1373443b308bd9307238c54d2d23ba9da91843c667c12e491f34fd87575028c3630a81a7355d4903344996f20408bbb7971b12dfba3cc4f76df
 DIST multi_json-1.12.2.tar.gz 25630 BLAKE2B 61209dc4be50b44302cfe40e45b840ae8d81e827d8b9df82ca6b852a72d360fbe09c0f5b0ef8eecfbd08b6bd08343ab7bb307d91d9abf28c9b9adb35f18bea51 SHA512 bbbdd05a6dd12052aa3e09389f47212f15799310d5c265057f7ca801622d32295d1f0844b37e51f8f1fd2d48e4430234f99bc6de4b9ed149e81d9a33a831e6d9
 DIST multi_json-1.13.0.tar.gz 25954 BLAKE2B 22a2f2ff2f1291a45613f456661a1735fc41ad80f28ee7d2c9b97109f0637da4e60439686cfc29b7ced501c32d2fe9236c9acc25acc0f55e57ec0bfe53331f37 SHA512 b168b2a093865f48f1a4d1941e8cfead8b3efba73bcd59660dae581a77ab7149f0f452f1280e69061187f35c84b6eeff70144f815f9f669db03dba49100143aa
+DIST multi_json-1.13.1.tar.gz 26098 BLAKE2B e82a08a747a092a9094cd7b35b4f933b5ac922a01f45a51b215ca9c4cdb9a083a4808d4bbe67a147ecb57e0b7b7e313c3d896f8cd80c79338c24abc3b90a09f9 SHA512 7c98392bd1c909fcc05249a02a010b561bf6c2d812ae42413d6e8dafa62926d8cb76226ded4c61558a00e5fa531ba33b6f4ef562648c52ba9b552ff7b7e27682
 EBUILD multi_json-1.12.1.ebuild 1926 BLAKE2B f392a89f6f23033080a4ec1fa22b638f41a44f00638a0ccf1fbe34dc70150082b0e3eaa5b926df620efd7676bab3f31fd197ea0f99496cddc918d93ef4abada3 SHA512 9cc52c4e92ef2c398bc05ae8dd53ba440dd3713b3713972bb44ae6aa5881e13b7b79a382b16abf64e75da531f35871b0a98ae8470fab1e9b6b4cdc7c6c3442d3
 EBUILD multi_json-1.12.2.ebuild 1922 BLAKE2B 338cbc039830d46a7cebb61b82ee7fcce1b6722a7de17a9cff0ff1372c12c7157d01bf0c8b1fe05cf81d2f5a4b51aaecaf807ee6563b84ce31e843963e78c992 SHA512 429d8f7036473500cc478d690e28ab4baab02cce66a474f0c73e03b2362e3b9124248520bca8ce1c2c89ab46f6ca41dab196b654919f8bd43e66e76c6e04e9cc
 EBUILD multi_json-1.13.0.ebuild 1922 BLAKE2B c909ef211d008b8f12d400319e89674f79cc556d4f3aeea0d5b76c7c43ec671f2a4e6e48fd3f1861f7c157668778a86cbdf151f77bdf64392f0be4a859aa0695 SHA512 170aa5bb583feeef39ca4600bdfba839e7b640a4ac376de56e42641eec72650b536ccc16a1fc8065c843ffaddf2b1655bac68608804abc669f5b67be7146c39c
+EBUILD multi_json-1.13.1.ebuild 1929 BLAKE2B b68b75b0af496028c629a650422714877a3b8fb15866c00472e1b450752c51a67136cebd2baa019dea4012abc58498502f8a3293d7b1b7fe0a3e6a07d5caf8fe SHA512 e7b31df3ac6a0e7c9794dc9eb143f6ed7148301f8d26b53497403de21cabe9e6de52175d4ceb346d5e8f739b4158b35be73d809e44dc9dba3e586c7188265fdf
 MISC metadata.xml 345 BLAKE2B 7d7684a1546dcc97e934f1a7df4484b568c5e8043dcfd0493e03124fa9f96959de5dccb78d22b1ff51ebc39b5fbec8b9a1dfd24531d676b8982b1f1dbd5097d0 SHA512 5fe7f117806d67e0d295bfcbdd07d4bbe8d3c3875e07cc3d276f2aee81b89f2e90174cbf4264d647384817fe0e8c81c2f2c9d9d67e3f78b46c3c194001bcace9
diff --git a/dev-ruby/multi_json/multi_json-1.13.1.ebuild b/dev-ruby/multi_json/multi_json-1.13.1.ebuild
new file mode 100644
index 000000000000..c6f124cf97f5
--- /dev/null
+++ b/dev-ruby/multi_json/multi_json-1.13.1.ebuild
@@ -0,0 +1,61 @@
+# 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_TASK_DOC="yard"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="multi_json.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/intridea/multi_json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="A gem to provide swappable JSON backends"
+HOMEPAGE="https://github.com/intridea/multi_json"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "|| ( >=dev-ruby/json-1.4:* >=dev-ruby/yajl-ruby-1.0 )"
+
+ruby_add_bdepend "doc? ( dev-ruby/rspec:3 dev-ruby/yard )"
+
+ruby_add_bdepend "test? ( dev-ruby/json
+	dev-ruby/yajl-ruby )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die "Unable to remove bundler."
+
+	# Remove unimportant rspec options not supported by rspec 2.6.
+	rm .rspec || die
+
+	# Remove specs specific to oj since we don't package oj yet.
+	sed -i -e '/defaults to the best available gem/,/^  end/ s:^:#:' \
+		-e '/Oj does not create symbols on parse/,/^    end/ s:^:#:' \
+		-e '/with Oj.default_settings/,/^    end/ s:^:#:' \
+		-e '/using one-shot parser/,/^  end/ s:^:#:' \
+		spec/multi_json_spec.rb
+
+	# Avoid simplecov which only works with ruby 1.9
+	sed -i -e '/simplecov/d' -e '/SimpleCov.formatter/,/SimpleCov.start/ d' spec/spec_helper.rb || die
+
+	# Remove unpackaged and for our purposes unneeded coveralls
+	sed -i -e '/coveralls/d' spec/spec_helper.rb || die
+
+	# Avoid testing unpackaged adapters
+	rm spec/{gson,jr_jackson,oj}_adapter_spec.rb || die
+}
+
+each_ruby_test() {
+	for t in spec/*_spec.rb; do
+		${RUBY} -S rspec-3 ${t} || die
+	done
+}
diff --git a/dev-ruby/multi_xml/Manifest b/dev-ruby/multi_xml/Manifest
index 9602349cb06a..fc33b56a0e41 100644
--- a/dev-ruby/multi_xml/Manifest
+++ b/dev-ruby/multi_xml/Manifest
@@ -1,7 +1,5 @@
-DIST multi_xml-0.5.4.gem 20992 BLAKE2B 2ed4fd154a44ff7717e702c03d29ab06cd688d6950861bd02b6f57a1b78daae94ab6b3c6d30f15cfa9f6516758a29df5d35d1b31427188378203e7c0ea8e0b76 SHA512 d78ae3c401741c4d396bed6074efd24e8712cd70d9b9ef7008abb3ff662edc2292be42dfbd101be384aaf2ce207271004eb7b7cadccba746b9afe385a9fbdb7a
 DIST multi_xml-0.5.5.gem 20992 BLAKE2B 8dbd35ca1cf2209850e2c694c435e7bddfc204a15663091d005c6f45faf85c91e8331b2b1fc37ead4f28732a5f73d878c50f13ec7d4681c3ac598a230d4f34b2 SHA512 692f55908ec5e9ee27bec858325ff9a0b15037a6563d5a21bd742ec3c959f3dbc04f1a232782f20827c9af49f3dd14fd725a0c19dbacb3708067c19dedf427ba
 DIST multi_xml-0.6.0.tar.gz 16571 BLAKE2B 1492eab7782823915167ebdb529b6d4699b31f3b66c48eee5acf7857dc25caae62b63a0da10a0bd862ade22865432bc6c4290a3f6ff8e99a889fcf09b56f6b7f SHA512 67e280d838ba07373a6ad5cbe4658b32655102906d8e0ed5429d21220475c21e07ea2ec0d2729df4d30a1bf7d0a5e6ff2d4482342098873135cb12e18c53194a
-EBUILD multi_xml-0.5.4-r2.ebuild 702 BLAKE2B 75d7cc40c71f5a779bfbd7ab7c97237d051be17cdc3a0b76c6f6b504a3743670f0a24ddaecafc7854f5b89d90347b0a4408ee43a9fd282dbe01dbb6e3998502a SHA512 6780f4a6962474000b3e05f9bc69e6031f060f89bb97789dc53216cc1f13ebfe7d02d861e8644585d1126e673a6282d12724fce45bdb7dc927813ca68829d356
 EBUILD multi_xml-0.5.5.ebuild 745 BLAKE2B f55d89d13c5b497f3b6e62bd89b2eb62afac93cb19331dac7eeacd434a6103738b2d859b8c73e8541b41b9cc52b1ef25c4d710f42e9265529ce2544b48654ffc SHA512 5631174dfc19f5e492752bdc8dd63ab5ed8e624a49074072c2ef07a4aa7a49f3b59f9768013a129c17fb7636c270e948fb4f4a82f627ff5955ee00f30cd6f31d
 EBUILD multi_xml-0.6.0.ebuild 887 BLAKE2B 6f1d208c684cb16d2e5a973a85c33e22702cead0d56cd0d05b730bc652213e0d859eb1d98d1098d024bc6eb53800152553ea9a93cd3d9b26cac517e624b714a9 SHA512 73fa7f1d63a050b60de4ea41178147a68dd7c802437de2f1ec304fed45f3f3ad7b9767300fb739db994233375bd19f2538f8d42d4bc4b132cb003c7b394ca1c9
 MISC metadata.xml 332 BLAKE2B fc83aa0e31b636d7abd190715ebdb0e7b205444f571344bbddd7d9b130d7ea566c38ce12caf4429b54db3415181f229ba5e012408596b6dff701f34e7e5b3a6f SHA512 53ff80596848fb984f23e66f1eae8bbe9e844de4760fbea929405d6515a250a710dc9a05f61cc7bf84afb069b2bc52a7304a1c15fa1a109bc7d6494fb5e1ef93
diff --git a/dev-ruby/multi_xml/multi_xml-0.5.4-r2.ebuild b/dev-ruby/multi_xml/multi_xml-0.5.4-r2.ebuild
deleted file mode 100644
index 1effd90c7a2e..000000000000
--- a/dev-ruby/multi_xml/multi_xml-0.5.4-r2.ebuild
+++ /dev/null
@@ -1,33 +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_TASK_DOC="doc:yard"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A generic swappable back-end for XML parsing"
-HOMEPAGE="http://rdoc.info/gems/multi_xml"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/SimpleCov.start/ s:^:#:' spec/helper.rb || die
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	CI=true each_fakegem_test
-}
diff --git a/dev-ruby/narray/Manifest b/dev-ruby/narray/Manifest
index eeb7ef0c1a5c..a61872dddef6 100644
--- a/dev-ruby/narray/Manifest
+++ b/dev-ruby/narray/Manifest
@@ -1,5 +1,5 @@
 DIST narray-0.6.1.1.tar.gz 68536 BLAKE2B 07aaa85ed719da6e5d78f1783e93bf5a46574e2fc8461a75f7a20aad56234c973ec3e5267888e94b505baab2401a210368f93bd003db2e57ac41d4ac5f54875f SHA512 1c9983d29c774cb61b7f8ec53290d427c123b648d88407ff4a2e2aef1a289267050d4846adfc00c075629cb228ed5b3d4f9f5ded4cded0b84ec1a5532cbb49ff
 DIST narray-0.6.1.2.tar.gz 68621 BLAKE2B c4e48b81fb0d79cc49e32ed8204d9cac3f483eb44e1207f422f5b272bb8891836d81cd83c090f4d643677b1159801c13d15580504e6ca244a2a75d4b6dfb3204 SHA512 51e9bec0b711e79e268b73496ad742b80bb46a6e9ea6aab9a2535a700b6efc8f7ae2e854f5772d434e3d385d81275744dbc796ebec4d3de73f2ec0546bd2339a
 EBUILD narray-0.6.1.1.ebuild 1311 BLAKE2B dee780e2aab194ad6f7275a5422a9219b76d2f97fb5a74fe2fd5360372da2f1074b9dab7b883017d6cb7c13b27c301d3f835f274da8fb8b409cd889a2561eee7 SHA512 6cf6b52fa5bede49559f0348e85f8da12a3140cf9c75b4ccf6f21cf82169ea8b51135d2f6cf06896434a3b20a676d93e72525c16091c43ef4ba96386a8fce7de
-EBUILD narray-0.6.1.2.ebuild 1293 BLAKE2B 24cd036d3d5a95eb3b6e16f5391a2a0b3450ac1812a86a748e1ba788811d73d4d8546e9ae97a88151a71e80cc2eda16e95c797b45ccff64585a757c2a045a1de SHA512 77d6551f965b8b7d888edfa60f9d7182b90363d86533b342c2703036061491cc1800814d923b7b5cc59254440d38bb71c1da1493c917f2e66e4851f54bb5f5db
+EBUILD narray-0.6.1.2.ebuild 1293 BLAKE2B 89792d4a2b34f00fa7ea5d5ced4d44afb10ada44b182bd500a60161279cd4763023848c9e178b1c3937c8d8d189dfed406f9b2c9f84535aefd75ae0dcd818582 SHA512 fd3d2e44d70cfa0574e536b66102baf0f07507703a9fe4ace5ed22f3e68463b04f402724971899d00b29ca7a6e7dc73010d6d72354247fd70f7161932b247289
 MISC metadata.xml 339 BLAKE2B 9337a45d749879673fc180a12d5e7d27326fdfcf326f86ccc45fc2ad10b7eff1c4575c1379fb6b634f1482b7adb40531f78cc0b556148fdd622b9807e11122b6 SHA512 47c9372c3fa2a28f5d728cd9d3df7b030c2e0bb2378099c287018cd55324a188eb2ef8c901b52acfd87d278c4990752a4860a7281e062f4209bf92c10bdc36e2
diff --git a/dev-ruby/narray/narray-0.6.1.2.ebuild b/dev-ruby/narray/narray-0.6.1.2.ebuild
index af3971c34406..c0ed314c4f5f 100644
--- a/dev-ruby/narray/narray-0.6.1.2.ebuild
+++ b/dev-ruby/narray/narray-0.6.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_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/net-telnet/Manifest b/dev-ruby/net-telnet/Manifest
index 4de5b4dec909..dae64dcb9d6b 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 904 BLAKE2B dda59f10c0d8413e42c8f9373b1809aaae34d49c0931620516b59c85726ed3b72854ba78bc9f6d289cf722f5387cb4884e31cf592ae8d3b596a83dbee7a1d841 SHA512 ee493e32909f2bd2637efc14ef698eaff3f66da959b28d389e4ae4ea9969950010c99f5838197b3d0ae47d6f5e2afe1bfadcaf4f671932508bb5bc8ca743f279
+EBUILD net-telnet-0.1.1-r1.ebuild 902 BLAKE2B 7c440fec89762571aaf7d327c3306e877a58e65bd618095a46fb096fd48b7aee3b51792e886af886c5cf494a1f343613f4008d59f2b21356cd3ee0d824a28c4b SHA512 0aa24ba88d89dfa17a5e6a4b11da03588928e45089f3cbeef29c7d88bcb9841bcf16e1789d16769760612c1a9e758a5585d6a7e70dde4067572ca67edd785b8e
 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 4af31427d5c4..202fdb700089 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/parallel/Manifest b/dev-ruby/parallel/Manifest
index 7afca3fd2ca8..1ee808b769ca 100644
--- a/dev-ruby/parallel/Manifest
+++ b/dev-ruby/parallel/Manifest
@@ -1,5 +1,5 @@
 DIST parallel-1.12.0.tar.gz 20472 BLAKE2B b6e998588f94e07194c19d4bf38964aa5e846b7f62c7a267041473a237a9d8fdebb4dc501695b00902c852021ce7817b24bfe01dcf4c0e18445b46d46c7cb42b SHA512 8ca41cf577ee4743ef50abe693d0040eaab12b61eca17c3d6c33d3720c38563e2df9a0eb5af0fe9d8c34c3b910f1c626ce141fd2eb7d2edfbe5abbcb9f54191b
 DIST parallel-1.12.1.tar.gz 20499 BLAKE2B f0fa25b9fe65e44804854f703dd2d80e53572e64c2072c418d0462922bd04f89cff0e023caf4293d8a1504ad66a2a29ebbdd01920fc6fe400837859da0f0eb78 SHA512 f0ab332dfa60bb3190bba8275dbdf7b54d3de205ab76099d11f0a64e1fc28e1ba7e72d1a242bd615015c2d09a3f08df01c382869fd6990b854b01fe182245857
 EBUILD parallel-1.12.0.ebuild 1703 BLAKE2B ba3bce20cf9bf46583d7f86a96672e7634d2b41db785589b8048dd56452ff6b3f1b215638a3d189d677b9e597278ca5462b907179650ec49005f5d5345b16ac4 SHA512 da3a7ed5449817d475ab381949bf8e55d32abe4b319a0000960c3cdc38b5c62f909dc40c9a8ff8b18b75072429fb9da1c48754779c565f13aaafafac9ce9179d
-EBUILD parallel-1.12.1.ebuild 1719 BLAKE2B 623bca5065f52cf4cacaff1826493d2edbe268b9f540e4d877941843f05a237a0a9c37fa4e8ef729fcd714c7d76a042aecebf17647d97010cda40496e3384758 SHA512 6973d3bef49c096ee20093fb7e3860c72c319e02480dbeb4dd528336b751ecac2fc7688210a856558c94daa6b510f622335d8e918955f930dbb98a98deb80030
+EBUILD parallel-1.12.1.ebuild 1704 BLAKE2B 8b686ca1ce60df0b706f20e425b27693b8c1b93b0065bcbc4eb580e0527f35d9b6a9ce981d4ecf3a8a9f1c23e1200b5758ee9a817f66529780b8cc7b15615677 SHA512 c8496b23a1c7a6945d82eaf9e85cec0f36bf95c8e9d4b7f1178dae58f24e9d8046288b11cc9182fb8331a0caaa5fa812dfd91be5c907dbf3d4af507bcf168e01
 MISC metadata.xml 342 BLAKE2B 0860273d70423cb92207369335e1f684ea623e1217d7aaf4d016d9aff9c02b0b8dc9af3654b523f77cbd8d92f7043887a97ff87abb79d3c65b66b0e6b40082fb SHA512 805eaecfea071b1d632ade7da42ed63717d2f829c4c99e29a4600b26a81e87c4032d7ee441b865d86f37faa13f455c9f2888dc8099178cf6211ae13d3e3e1835
diff --git a/dev-ruby/parallel/parallel-1.12.1.ebuild b/dev-ruby/parallel/parallel-1.12.1.ebuild
index 1bd63afc39f0..db82a8f90f7a 100644
--- a/dev-ruby/parallel/parallel-1.12.1.ebuild
+++ b/dev-ruby/parallel/parallel-1.12.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-# ruby24: fails specs
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/patron/Manifest b/dev-ruby/patron/Manifest
index dffa2a7f2f27..a74970c5c092 100644
--- a/dev-ruby/patron/Manifest
+++ b/dev-ruby/patron/Manifest
@@ -1,5 +1,3 @@
 DIST patron-0.10.0.gem 59904 BLAKE2B f4ec8c81e4c0c13f3d3b5e0696955c01c8ff962980a8ed83ca7aaca722c422b0466a806af9b2c36f0183c16767f5b3f37dae4ae4a8801866592c8f861ba9778d SHA512 bfe5fabbcbfa3d1c73ef6f79d100547de7e4121bcbd1f427423a127f0bc698bb8b6ade06c0e2eb1f529d1524e95fc36245b8be9d6e2c12b7e8d18b5f03ae6606
-DIST patron-0.4.18.gem 35840 BLAKE2B a8018495aecbf5a158a3964147d6f12138d8288fe48a0162a15837a7e10e2b77bf7bbe91cb8b9b25f790ff15f3153647104e47afd4f33fd5c7b7277ed306b118 SHA512 0069f42378b0dfe03e6f86003b7927b099fd15be4d4b5eeba51958774380bf7a9ddbd8a83b30942d02e95b923f9ae0a1c1abf5bcda8ca8490671208e0ae8ecb4
-EBUILD patron-0.10.0.ebuild 1194 BLAKE2B 9c29851e6ff707c142500e3ca45472a8815e3eccea2529d3be08b065b7891ed5519918691618998f0bb76868a769f59eae937a71f31b7d8cf2edabdf067e8e17 SHA512 1f80c2d91e9af59a23610d34aebfa00509ea4dc20d451785b50450ae398985fecbbe35e467bd1ea447b5dcadfd8419b5ad8832e5be1a153097b4cd1448a37f48
-EBUILD patron-0.4.18-r2.ebuild 1014 BLAKE2B 7baf6a25d0c627b3fbbd3c29f0a752142480c5b4701a42e42e696e21cc6e083adfe94fe7e7ecce9d8c27ca97f7f3d7304cdf0547c2b6d21b4e62082382f8333d SHA512 75c6f465de351589c89bfc0df0b702fa4a3c1d8b305500b2e2c55dabcfe9738d8a55e28a07b6b6044082eb7ae91af17ec2ffd77c66d645583c325d8b7c816b9c
+EBUILD patron-0.10.0.ebuild 1193 BLAKE2B a18a6cef196b85099e550f6dbd7f572b18439c3a40e849827827557c4cc6f0428dc539ed51bdccc6c0501a2bef1233921e4262b307d53288407c72b4f209d899 SHA512 8f1e79bc3256b5383233956a8584f363ee84f619ca3d5d2dc0bb303e7655e5075744681e56f0f6ad57eea87b71cb4e98a2b6b397095b30ed874bf06388b30b21
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/patron/patron-0.10.0.ebuild b/dev-ruby/patron/patron-0.10.0.ebuild
index bc6943546a3d..4e7e3ff39b0e 100644
--- a/dev-ruby/patron/patron-0.10.0.ebuild
+++ b/dev-ruby/patron/patron-0.10.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://toland.github.com/patron/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND+=" net-misc/curl"
diff --git a/dev-ruby/patron/patron-0.4.18-r2.ebuild b/dev-ruby/patron/patron-0.4.18-r2.ebuild
deleted file mode 100644
index 7657ca907a8e..000000000000
--- a/dev-ruby/patron/patron-0.4.18-r2.ebuild
+++ /dev/null
@@ -1,40 +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_TEST="spec"
-RUBY_FAKEGEM_EXTRADOC="README.txt"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Patron is a Ruby HTTP client library based on libcurl"
-HOMEPAGE="https://toland.github.com/patron/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-#ruby_add_bdepend "test? ( dev-ruby/rspec:2 )"
-
-DEPEND+=" net-misc/curl"
-RDEPEND+=" net-misc/curl"
-
-# Tests require a live web service that is not included in the distribution.
-RESTRICT="test"
-
-all_ruby_prepare() {
-	# Fix rake deprecation
-	sed -i -e 's:rake/rdoctask:rdoc/task:' Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/patron extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/patron V=1
-	cp ext/patron/session_ext$(get_modname) lib/patron/ || die "Unable to cp shared object file"
-}
diff --git a/dev-ruby/pcaprub/Manifest b/dev-ruby/pcaprub/Manifest
index 81d2224fe03a..ec18b8a318e3 100644
--- a/dev-ruby/pcaprub/Manifest
+++ b/dev-ruby/pcaprub/Manifest
@@ -1,7 +1,5 @@
 DIST pcaprub-0.11.3.gem 32768 BLAKE2B 88ed94a8f767e25374fd1692007d5d2c3cee00bbcf12a911a7039ec60e8281c8329a02ac3fb8d5df03a1d9993e42b580fdcf59b8ce2e2220d981bf4afbb4940d SHA512 0ac8b5b2be85a2e17dd9f253ae3705a9faca390cefbaeae737ba20a23a3e2d95a6d492d5f7b3ecac611361a264db43cc79fddfbab58056e7de8e075fb1d1ef4f
-DIST pcaprub-0.12.1.gem 36352 BLAKE2B 259bd2c30595ea18d958e1939105148b7248a985ff67cb23ecc85c9e3147c55c5bae00b15b4427b24c540e06b7628ca3ac0d937da4f7b7e2ea732c3377e3b139 SHA512 afbffd6453339cc5208ed81db120b3a32e449fb73cbeaba5dde4acebcc9be853e73c7331f49ba8a1e0165ccff4fdb7d21ece5ed834eea6871607d19ca46be0df
 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.1.ebuild 775 BLAKE2B 19463a21fcff811efbee8f0cf92962dab848628c2eb03b93336e222c313e99c872cd31c07ce1e0eb73acb12cbbb8b7a36bfa30d93d6d5ec61084abeae06f8347 SHA512 4e0d0c31dffadc549e8642a598d2df6c5423a53bb1d85a362111603f448b208b3dd685517cd7e0b8f2cf164d6077e05b145eff576299c0f623fab8dea099fe1c
-EBUILD pcaprub-0.12.4.ebuild 775 BLAKE2B 19463a21fcff811efbee8f0cf92962dab848628c2eb03b93336e222c313e99c872cd31c07ce1e0eb73acb12cbbb8b7a36bfa30d93d6d5ec61084abeae06f8347 SHA512 4e0d0c31dffadc549e8642a598d2df6c5423a53bb1d85a362111603f448b208b3dd685517cd7e0b8f2cf164d6077e05b145eff576299c0f623fab8dea099fe1c
+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.12.1.ebuild b/dev-ruby/pcaprub/pcaprub-0.12.1.ebuild
deleted file mode 100644
index b97d9f2ab252..000000000000
--- a/dev-ruby/pcaprub/pcaprub-0.12.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_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/pcaprub_c extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/pcaprub_c V=1
-	cp ext/pcaprub_c/pcaprub_c$(get_modname) lib || die
-}
diff --git a/dev-ruby/pcaprub/pcaprub-0.12.4.ebuild b/dev-ruby/pcaprub/pcaprub-0.12.4.ebuild
index b97d9f2ab252..0583d22c61a2 100644
--- a/dev-ruby/pcaprub/pcaprub-0.12.4.ebuild
+++ b/dev-ruby/pcaprub/pcaprub-0.12.4.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 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="FAQ.rdoc README.rdoc USAGE.rdoc"
diff --git a/dev-ruby/pdf-core/Manifest b/dev-ruby/pdf-core/Manifest
index 180d12b8b50a..5fa81e4b76b3 100644
--- a/dev-ruby/pdf-core/Manifest
+++ b/dev-ruby/pdf-core/Manifest
@@ -1,6 +1,3 @@
-DIST pdf-core-0.6.1.gem 43008 BLAKE2B 886026bc56e808768bdd9a3926902c110b4e037e5d0e83b8ab660d0058333090c5e80b47e266b45c2097cdb031da0d9da688ea6abdda6be0c80de4e88d4d805c SHA512 dc9074658cb4037fc1ab4f51a19bd67396c31ef18ac5c89e94563711eced8a7a6ec642e907564c92453cac08cd7a09f6da6f6da87536475cce8238cef087467a
 DIST pdf-core-0.7.0.tar.gz 43382 BLAKE2B 55116d0d997d5e76d94fab0be9bbea273bcd677fee951a71e3209bd764560c4f14fcd55ccb11748041582a12d4a06819a6203453f0e440718533a92287dfcad7 SHA512 c99409284e9f7f929902d88ff7943b3dc6b37c32d67ceaa15ad79e1f9a02b561af59889dae4344a1a7749edbb6705e06f6ca356f08ca38742a2623168d53d29d
-EBUILD pdf-core-0.6.1-r1.ebuild 640 BLAKE2B b7ba72d5d2f4706ed41c2911e8fdda08b5845f2e5e1368052d2b6c1596cdb92cf57970a4597b13229ec9d39cd8cf622d00c3b0ceb92898decddfe633836e6831 SHA512 51f0334367c29045a814d32a436584c2b999e732f0983b973ccd846b9241fab380d9530eea781091914be54d6ce2c565280777d30a420edf5e7cf18d312b3ee2
-EBUILD pdf-core-0.6.1.ebuild 655 BLAKE2B d954e4c325b6f092a8d5b4d7c7f6abf3038024ee49c382de1ecdb285a6fc248da50b5244452d40ff288989105b40b87fd63414246967036efe429d8cd0578783 SHA512 eac8a193ee16cbaaca593930536c7644039de48a875c6d30c325fff865cdc91b300bc41a99ddf3947475376364eceb3ab701cb6eb24ca61756e37353688a213f
-EBUILD pdf-core-0.7.0.ebuild 768 BLAKE2B 6f808655bffa39a0c0568121462f002eae970c807ff855652f997afe821f6054b9e4623d3ae579b5af448929860b861bc759d52ed3cbe9696da98cc6cfb1e7d6 SHA512 4366f859eacdb0c3a218c5af164e2b7a58702e1370f67b59da2e50a9249ede7269caf9285e8b921754d8b16ddf1dbf78553991448f3ffd166220ea4375fe8348
+EBUILD pdf-core-0.7.0.ebuild 781 BLAKE2B f31e7d4da53405993432ad164ee20773c554dac7f978fd40111f6cecb741fe699ee611275dd11c4b0473b88c1ca56d888fb451806f9487c65fc8bf2014a4e981 SHA512 50566560de7c886a7d5d2dfd37c36863427adea65cd730579a5c4af511007b2e89d3199d00375e52fea038579de87464eddb8fa206c388889932ed3cd19ccad4
 MISC metadata.xml 343 BLAKE2B 1c70f6275d3aec7f1414e408ec97c954da1bc047b76c39efb2a4d984dd0af20a0410235c74615be73f33bb8018d244f3a267ec3897763632672216ed13a39ae8 SHA512 def6cce805afe3c3ebaa7db7003f7f4c62f9a7bdae71dbfb9f4ec7ee39947b85952a5a49b8dc473fddf03b26aeace6a0e711ae4d0bd94d2d9d49881ffc9086c9
diff --git a/dev-ruby/pdf-core/pdf-core-0.6.1-r1.ebuild b/dev-ruby/pdf-core/pdf-core-0.6.1-r1.ebuild
deleted file mode 100644
index 38f456979189..000000000000
--- a/dev-ruby/pdf-core/pdf-core-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements low level PDF features for Prawn"
-HOMEPAGE="https://github.com/prawnpdf/pdf-core/"
-
-LICENSE="|| ( Ruby GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( =dev-ruby/pdf-inspector-1*
-	>=dev-ruby/pdf-reader-1.2 =dev-ruby/pdf-reader-1* )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/pdf-core/pdf-core-0.6.1.ebuild b/dev-ruby/pdf-core/pdf-core-0.6.1.ebuild
deleted file mode 100644
index 98728e049c49..000000000000
--- a/dev-ruby/pdf-core/pdf-core-0.6.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements low level PDF features for Prawn"
-HOMEPAGE="https://github.com/prawnpdf/pdf-core/"
-
-LICENSE="|| ( Ruby GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( =dev-ruby/pdf-inspector-1.1*
-	>=dev-ruby/pdf-reader-1.2 =dev-ruby/pdf-reader-1* )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/pdf-core/pdf-core-0.7.0.ebuild b/dev-ruby/pdf-core/pdf-core-0.7.0.ebuild
index 2744a4634289..9ab89907a6d5 100644
--- a/dev-ruby/pdf-core/pdf-core-0.7.0.ebuild
+++ b/dev-ruby/pdf-core/pdf-core-0.7.0.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=5
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/prawnpdf/pdf-core/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="|| ( Ruby GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 ruby_add_bdepend "test? ( =dev-ruby/pdf-inspector-1*
diff --git a/dev-ruby/pdf-inspector/Manifest b/dev-ruby/pdf-inspector/Manifest
index 11d8aa38fa16..14769216cdba 100644
--- a/dev-ruby/pdf-inspector/Manifest
+++ b/dev-ruby/pdf-inspector/Manifest
@@ -1,8 +1,3 @@
-DIST pdf-inspector-1.1.0.gem 25600 BLAKE2B b7ffe20df96098c8be00021a067e228a432b4109e35557ed7535a26229f47666912a50d70a8b0631bb05fbc6b03c608829044df353b2c15cc68e44b4da44ac1e SHA512 71c8af4275421f952711bcc945c52adb6d19b153606fc067325951092cec58998e56373819aa55fa8c0e1cc4736204e3e11f03c3bc3ec121f5eb4e1327a48779
-DIST pdf-inspector-1.2.1.gem 26112 BLAKE2B 614365b2f6046b6aca1be8e75cf1d25fc5ae1479561c385f4ae36f52e81d5bbfa9c20c9e424dc076c080d61a33f4fadf807dd16371fa083b2942cb859928d45f SHA512 75a0bb0c18ecbfc944b958e50c4641ba8bd7e659e0655644c3deb84a116798089fcbc8fd6f7de96c8cd3485db45af0d2c6e9b1c5eef9420f1dc1a323c1203457
 DIST pdf-inspector-1.3.0.gem 30720 BLAKE2B b3c6b2a4085ebfcf64901a8a0edb8fe762b00db648c74c37ca3ca80b645ab65b006eaf875e1cee109f6a7d30f97617053d0f7c548360281d21acf316f496eb7a SHA512 7c89f8656908d70495fd03e3ab2faf9b133d34c607ea63978731088d8b954d29e1e6e907b1e0d81bfbc35ecfa394badbd0e2c996ff94d6bbc7e78f4d7082d115
-EBUILD pdf-inspector-1.1.0-r1.ebuild 528 BLAKE2B 9080770b90694d7790e6483adc5e328a556a4c53fb5c78b20bb7eb383994d57b4458d1a612bfa36dbe21295dbc20be308cb40dca95469a92bbb233af932bc6da SHA512 5bd0bc3ea587780a2f0d8639e3e56fa54c046514e90587601b4988de950ae65bb7ab226c96b1564cf7e3e6af820e33f8ef4f60f8a37295662f6ab9f08e5445a9
-EBUILD pdf-inspector-1.2.1-r1.ebuild 524 BLAKE2B 5e76dbda80b5a8c4bb51ea3591d0fd8c6289bf2e1e5a3087484e795fdf4dcae07f245127ba58112980670a9677a6e74acbb74292ac4dc6c5cec197d69dfcc2fd SHA512 89219e8250cbee31f380e90744158b163bdcba5324d2dab94a6564cbf04e4e647d1c54f9eadf580791310c69194aa0a6d6ff0a32f314643dfcc5f951ad321519
-EBUILD pdf-inspector-1.2.1.ebuild 531 BLAKE2B fe8d44193c384ce0ef573208b9624bc6031ad47ff00a2931cd7f7e3029a8c55026786ec664b7f15e70003acabdfda6cf5f387f9008f7bd268a40737c47728f2f SHA512 c8e5698bc26981970142b274e5ad0e341fbd814c3d14abe6c26f956932647a7174e5b850b143a3edf9475f84ccf06837addcb543460577cee5dedddde65137d8
-EBUILD pdf-inspector-1.3.0.ebuild 567 BLAKE2B 73c6c659d12d8752c117c035f3e3120f4854e67a645ee887bfdcc7c137dfdb421fb5628c9d0cbb88f72f00e36fa64d6e249264126562265d979e99c0e72a2486 SHA512 dc24f5df1edbe53e451324fdf04215b53ed51216ba299fc79269fccb81115744321d401730265ca6ff8ffe9cde471b9937cce8beddca6569802b75d9217f0b78
+EBUILD pdf-inspector-1.3.0.ebuild 574 BLAKE2B bf5ab57d15cc1e6c00e6c7ca32c875bc6bacd6035d3fe2b4a85d161da0683dd2320090ab8e16328e4d8899ecd57dba38eb17eb00b9eef49c12523b452827f4db SHA512 0376b688d7ff048ddf4822812d988bfa2df5e8859c03c1512be5f89028470c5e0cc43c17aac44e553f0f16a46a15d914fd292eae18f5c3085e4ebc231c6dac8b
 MISC metadata.xml 348 BLAKE2B b95aed5527a27abf9b1c2bbe3983352dd8dab98143efef18192cff25c3e918e72c73790f834585b821863fd6c8dc72d90fefc0eb6b7789612b4b4b10ca07e148 SHA512 3cccb98b2df5b3e0c8b8b35c21824537a4f355e7bd6d51aa40fbf5a9acb4cc8e7e73b22cd30a20bb6a26568280a4891fe4cc396b35ff29ec9755ba1b4946ba2b
diff --git a/dev-ruby/pdf-inspector/pdf-inspector-1.1.0-r1.ebuild b/dev-ruby/pdf-inspector/pdf-inspector-1.1.0-r1.ebuild
deleted file mode 100644
index 6dff48b225d7..000000000000
--- a/dev-ruby/pdf-inspector/pdf-inspector-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,23 +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_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A tool for analyzing PDF output"
-HOMEPAGE="https://github.com/prawnpdf/pdf-inspector"
-
-LICENSE="|| ( Ruby GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/pdf-reader-1.0"
diff --git a/dev-ruby/pdf-inspector/pdf-inspector-1.2.1-r1.ebuild b/dev-ruby/pdf-inspector/pdf-inspector-1.2.1-r1.ebuild
deleted file mode 100644
index 2942577dc38c..000000000000
--- a/dev-ruby/pdf-inspector/pdf-inspector-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A tool for analyzing PDF output"
-HOMEPAGE="https://github.com/prawnpdf/pdf-inspector"
-
-LICENSE="|| ( Ruby GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/pdf-reader-1.0"
diff --git a/dev-ruby/pdf-inspector/pdf-inspector-1.2.1.ebuild b/dev-ruby/pdf-inspector/pdf-inspector-1.2.1.ebuild
deleted file mode 100644
index 7bc10601c7ef..000000000000
--- a/dev-ruby/pdf-inspector/pdf-inspector-1.2.1.ebuild
+++ /dev/null
@@ -1,23 +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_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A tool for analyzing PDF output"
-HOMEPAGE="https://github.com/prawnpdf/pdf-inspector"
-
-LICENSE="|| ( Ruby GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/pdf-reader-1.0"
diff --git a/dev-ruby/pdf-inspector/pdf-inspector-1.3.0.ebuild b/dev-ruby/pdf-inspector/pdf-inspector-1.3.0.ebuild
index f0f2686e196c..2b5f7c6c48c4 100644
--- a/dev-ruby/pdf-inspector/pdf-inspector-1.3.0.ebuild
+++ b/dev-ruby/pdf-inspector/pdf-inspector-1.3.0.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
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/prawnpdf/pdf-inspector"
 
 LICENSE="|| ( Ruby GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/pdf-reader-1.0:* <dev-ruby/pdf-reader-3:*"
diff --git a/dev-ruby/pdf-reader/Manifest b/dev-ruby/pdf-reader/Manifest
index 2c8061fd6172..153533746e97 100644
--- a/dev-ruby/pdf-reader/Manifest
+++ b/dev-ruby/pdf-reader/Manifest
@@ -1,6 +1,5 @@
 DIST pdf-reader-1.4.1.tar.gz 10236680 BLAKE2B 86fb137c65b47717e758473b94ddbbf52def3ae0edaecd7b5eb3f0d880f664c9ff6097221f43d64247b006ed18220f4f9a469d6b8574592750a1d8a468ce7ddb SHA512 aaa53dafc2d58dc591f708941907ecf14b1ee73362a7bd6d34659103d51effa90888560733747ca1bfe3d217cb6834109e06b024f40a95214880ca42f54054e5
 DIST pdf-reader-2.0.0.tar.gz 10382893 BLAKE2B 2b3c6b6b43f6a100e0affb4593361b37c6ed1120d1a94ad408919a16d35c7065fb4f8bed851fefff3996ccb6ab5a49d26f557cbe48052e20584c427bb52c02b9 SHA512 29a0e4ad83f2ef603ac60e4bf2a2fdc71e816e9c5b4bac052bd47322bfb91b2da6fb97901fbf0318ffa5cb3b43161978ffd2c08e72c658ee36802b8f5bbf88bd
-EBUILD pdf-reader-1.4.1-r1.ebuild 1063 BLAKE2B 1f2f2fae3a83ef1cef1306a70da03111dcd490608d9bb67e167708739ecfcedba8507434ae6e96239ebd566f5a3803d120eb81c770267b4299f54d75109d64f6 SHA512 4818538cb54fa86d77db5183919eaba13c7f702d5c4e5f820c2a2c875c8814a68fb755f2b0ec325a3e855f8866f5c0228a9addf74e8f087bf8917d1fd9bb6c3b
-EBUILD pdf-reader-1.4.1.ebuild 1063 BLAKE2B 81b158f45b1fd1edd222738acfd88db404c188a2ef3938c6963e686da70af4e30923a7b7fb29654a10c0fc8f804bbfbb91b9061318aa701dfaed8fa3f3c76c49 SHA512 c09d9886f9d5ffb6dc4ec91e92515f8df1156ab790ddd18904399802d05461c84bc2822183a74b3c3b386a8ae8305815f288e4f5ffe399b346a7d773684552b0
-EBUILD pdf-reader-2.0.0.ebuild 1055 BLAKE2B 8c4be8f7f4c16ae5e7d3619b7544543501e7835e0849762e6b725a825917cec6c5732bca9578922cf1d62f4086a2e3ebe7393be8f0d81023068a6d60e26cc9a0 SHA512 ea089e8e2370b1a20c2ae913b8192b74e5b684dc17509fc3855e7a2e1bab5e42ce30fa3fb3ec9be89d9a6ae55dc5ff12234ea2a8e8741a5e41474f364c1396f6
+EBUILD pdf-reader-1.4.1-r1.ebuild 1070 BLAKE2B a546817d8e8c5dd8b9bc562463646fc4a24fb1e7545bbbdd17659ddf2e9c7fb325e09ac2d00f58fb4677bbe09254c2416289609bcf065314f8bda78f84e42539 SHA512 262276bb26d603b4766d19e599ae8cceb152265849dd7837ae89ea1d53cbc59dc840065d438dc2626a7d54a00b7115f827f5ddf30147fe2bac99f7046a5a33c9
+EBUILD pdf-reader-2.0.0.ebuild 1068 BLAKE2B 0e81fa21e1e3de743b70f8d77b4a58043ed533e367ca458be546853516fb5ffdf0be5e2408ec0c928ceb2f2f48feea176a2b4e5248c30ef98faae6940e08608c SHA512 dadf19bd996622f6c50a6466a88489cedc9b527daaff329bd1307d71430dd39abca3e6d02d1f9deb680d579213c975120279833fedefeac028d302e29de5df1a
 MISC metadata.xml 340 BLAKE2B 870883ff3971c347d1b9a28f228629d1c972c8a7e1695d77755316a864b74a8b65190d6b1cb07e55e8138321b91a6d9afca61872434ad9c13d081ce47e75d3b6 SHA512 8746d7bf7de89f49d161945c3dd434efa275799aac66d981edabec64ee789ca5864d69f3bae738b3c5ff26cc54b1d824f7aa35b2b9c9624e07339794b56d029b
diff --git a/dev-ruby/pdf-reader/pdf-reader-1.4.1-r1.ebuild b/dev-ruby/pdf-reader/pdf-reader-1.4.1-r1.ebuild
index 905e599d2b61..4fec367c7723 100644
--- a/dev-ruby/pdf-reader/pdf-reader-1.4.1-r1.ebuild
+++ b/dev-ruby/pdf-reader/pdf-reader-1.4.1-r1.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=5
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/afm-0.2.1
diff --git a/dev-ruby/pdf-reader/pdf-reader-1.4.1.ebuild b/dev-ruby/pdf-reader/pdf-reader-1.4.1.ebuild
deleted file mode 100644
index ce83fbe9ee2e..000000000000
--- a/dev-ruby/pdf-reader/pdf-reader-1.4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GITHUB_USER=yob
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc TODO"
-
-inherit ruby-fakegem
-
-DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
-HOMEPAGE="https://github.com/yob/pdf-reader/"
-
-# We cannot use the gem distributions because they don't contain the
-# tests' data, we have to rely on the git tags.
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/afm-0.2.1
-	=dev-ruby/ascii85-1*
-	=dev-ruby/hashery-2*
-	dev-ruby/ttfunk:*
-	dev-ruby/ruby-rc4"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/* || die
-}
diff --git a/dev-ruby/pdf-reader/pdf-reader-2.0.0.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.0.0.ebuild
index fa2ff90cf440..7f8d8bef0c3d 100644
--- a/dev-ruby/pdf-reader/pdf-reader-2.0.0.ebuild
+++ b/dev-ruby/pdf-reader/pdf-reader-2.0.0.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=5
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/afm-0.2.1
diff --git a/dev-ruby/poltergeist/Manifest b/dev-ruby/poltergeist/Manifest
index c82c854db01c..35fab2466de0 100644
--- a/dev-ruby/poltergeist/Manifest
+++ b/dev-ruby/poltergeist/Manifest
@@ -1,7 +1,3 @@
-DIST poltergeist-1.10.0.tar.gz 179598 BLAKE2B f4a65b567ef7969dc42971482542443438edac46ea8866ca5f856694146e2c4e3187d3e29b08fc7177f53cc8feeaa251a35ddc863270436b136c7323ff23eede SHA512 d81f06e45eb0fd8a7d89dea7799b6e2c85dbc34c6220f57acf9bfa4ade8ef464157204dfd76bbd53e65aa62edaecedc80f375de4c47ab9af2bab2a3b96c5fae8
 DIST poltergeist-1.14.0.tar.gz 185946 BLAKE2B 0f5d95437ad5c2509264ef0230624ac257e8901e98bd4494576c3dc6895fc38c64572b287eb9842c8af2ddbaf0b3c48ecb0a1fb4a2cb72711abba40646dcaeec SHA512 82ab8aec7e5e091fa2924765e077d8b9816319833d438d9246f8ef3d0045d158de6bce1d14e929cc5cb8d0970ea380d44a51511b17623479f3cd64853580ce71
-DIST poltergeist-1.9.0.tar.gz 175912 BLAKE2B 26635a1ed66742e07439a90019df92b72e7670242f2d9bd5883d66e051e365862e66be89c59052f78dd830f65ec5c28997d940d27a88321a215e2030a5219724 SHA512 667fab321bd8718f604496119efcdd6e3bd88da89b45afca13df53727a4b7a01ab2ca70710afdb3479d4c68ecb155f0136901aaf405bc26cb0430838558c69d1
-EBUILD poltergeist-1.10.0.ebuild 1345 BLAKE2B b49bd953eb43e099e781a58253ec60811ed07bc1985d0d7b38012e23a9c9a12c21b343e962a568e6c2092235174a0e2c886060f46b40571e64b1e768e6ab2012 SHA512 0f95dace8e145a6ecedbb97af04cf48d556467b66d322385b287b4d0ea4a9b6291542cd7508ed85dfa4bce72aba95470cc1a52d3e4aa5da35c9d9d756b388434
 EBUILD poltergeist-1.14.0.ebuild 1345 BLAKE2B b49bd953eb43e099e781a58253ec60811ed07bc1985d0d7b38012e23a9c9a12c21b343e962a568e6c2092235174a0e2c886060f46b40571e64b1e768e6ab2012 SHA512 0f95dace8e145a6ecedbb97af04cf48d556467b66d322385b287b4d0ea4a9b6291542cd7508ed85dfa4bce72aba95470cc1a52d3e4aa5da35c9d9d756b388434
-EBUILD poltergeist-1.9.0.ebuild 1231 BLAKE2B 17a3a4a873df6414a97eaaefeff718e9f8eec3c855c1af1337e93ded98f547706a65adb30a9fd3801ba278cbfbaa3d587b5c7b3f6ae9dc3759fdceed2f6faa30 SHA512 58cd33424283f0dada0116526739f39363f452cb0bcac0448751a74b7d1da9c1200b97ef3a65c97d2d2bb01329075e1b02a499fe376826a252c2966dd3cc4ab6
 MISC metadata.xml 349 BLAKE2B ba01777e28c1a91f01caba2ce123ed0f6fbd72ad3c97a750a2d88c558b18c8cbace1db9fce79748e0ba3670b47cadff8294344e15c428e28f290263bee293fb5 SHA512 c15725416d3f3cfce40980ed3eb7b39c4afc2dbb1cdeac0f612656cc387e55a3ec1756c9cb54b0162c5fdb6e51e91537d40df4a5e782b4ec38bccebff29964d0
diff --git a/dev-ruby/poltergeist/poltergeist-1.10.0.ebuild b/dev-ruby/poltergeist/poltergeist-1.10.0.ebuild
deleted file mode 100644
index 4dfa4cf7439d..000000000000
--- a/dev-ruby/poltergeist/poltergeist-1.10.0.ebuild
+++ /dev/null
@@ -1,46 +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"
-
-# There are tests but they require several unpackaged dependencies.
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A PhantomJS driver for Capybara"
-HOMEPAGE="https://github.com/jonleighton/poltergeist"
-SRC_URI="https://github.com/jonleighton/poltergeist/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND+=" www-client/phantomjs"
-
-ruby_add_rdepend ">=dev-ruby/cliver-0.3.1
-	>=dev-ruby/capybara-2.1
-	>=dev-ruby/websocket-driver-0.2.0"
-
-ruby_add_bdepend "test? ( dev-ruby/sinatra:0 )"
-
-all_ruby_prepare() {
-	# Fix cliver versioning to accept all 0.x versions
-	sed -i -e 's/0.3.1/0.3/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '2igem "sinatra", "~>1.0"; gem "rack", "~>1.5"' spec/spec_helper.rb || die
-
-	# Remove integration tests for now since they require additional dependencies.
-	rm -rf spec/integration
-
-	# Avoid a spec failing only in our ebuild test environment
-	sed -i -e '/can pause indefinitely/,/^      end/ s:^:#:' spec/unit/driver_spec.rb || die
-}
diff --git a/dev-ruby/poltergeist/poltergeist-1.9.0.ebuild b/dev-ruby/poltergeist/poltergeist-1.9.0.ebuild
deleted file mode 100644
index 173857eddbcd..000000000000
--- a/dev-ruby/poltergeist/poltergeist-1.9.0.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"
-
-# There are tests but they require several unpackaged dependencies.
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A PhantomJS driver for Capybara"
-HOMEPAGE="https://github.com/jonleighton/poltergeist"
-SRC_URI="https://github.com/jonleighton/poltergeist/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND+=" www-client/phantomjs"
-
-ruby_add_rdepend ">=dev-ruby/cliver-0.3.1
-	dev-ruby/multi_json
-	>=dev-ruby/capybara-2.1
-	>=dev-ruby/websocket-driver-0.2.0"
-
-all_ruby_prepare() {
-	# Fix cliver versioning to accept all 0.x versions
-	sed -i -e 's/0.3.1/0.3/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-
-	# Remove integration tests for now since they require additional dependencies.
-	rm -rf spec/integration
-
-	# Avoid a spec failing only in our ebuild test environment
-	sed -i -e '/can pause indefinitely/,/^      end/ s:^:#:' spec/unit/driver_spec.rb || die
-}
diff --git a/dev-ruby/prawn/Manifest b/dev-ruby/prawn/Manifest
index 04ec619c85af..0f34e758c7b6 100644
--- a/dev-ruby/prawn/Manifest
+++ b/dev-ruby/prawn/Manifest
@@ -1,5 +1,3 @@
-DIST prawn-2.1.0.tar.gz 4687290 BLAKE2B 25b544078fe540cc3cd7f223e15da92e2b8b3de6751821f24fb81547a49c1bda27a2b0403fd61747294229deb5a693695ceb1939c64dea9b9e1d59aaab2fdf0f SHA512 2fcc3261899e2c88a877901840e49261ff3da1924f3319cc65fa028ec0d550df595c98ae206fd645bcacd983cbd69cafa6ecd33f66f8a516c82ad13578a6796e
 DIST prawn-2.2.0.tar.gz 5215662 BLAKE2B 7130aaa4e9e9de2f15148f9c3a7a713ebb9808047e59fc156566f3a44705055b907284ce6690ff2e803702ddc3eb304b32e8f8c0049badda348bf4242df7e14c SHA512 a714f3cf47439d2603afda66cf4202ab9fdda0b6aaec120fd65df4e29d4b26155d95392487131c16d451ebe8f774aa6d64227670fad7b151cd0a514d3ed40b06
-EBUILD prawn-2.1.0.ebuild 1113 BLAKE2B 7abb58dcc56240ef7159a4f54ed50fcd438e69b494d3bb296eaf5699deeeba2f92bd39b53b6474becb83301670de7695d7553ed2274214886725ef80d46a6d74 SHA512 1f56d75f71137105aa93f4d6d57feda83f7692c34461a84f38715dcd4569567eba48464a785495cf951645f2c1405b0a0457201c45214d2582a3179a9e654b06
-EBUILD prawn-2.2.0.ebuild 899 BLAKE2B ee3d74cf15cc0a9092155130eb76608b0cb65a47e9268e8591a330d834b7e6449c728482e14124f8fe674b20581f5530c8f46899e71d7f97b84ef4ee21c1c40e SHA512 d4d47a782f99474a08ba4a3bff2af2ddc09baf356e3b6d6c2875144d424123a8d906d77ae8da48eed9de6a07f1baa98357e2d85b29c468a6ab2ea4c768ff5dc7
+EBUILD prawn-2.2.0.ebuild 912 BLAKE2B dec3d1149a87141adcdca8d062852eecec5e45c2d0ef8e4bdb3e5854b9f197d0db97a8619651faec78643c517913d92202a799d75a8ce9639df013c2e49e65f6 SHA512 a5b5013f1b818735b4fd080c7ec9d4f37f1430fb909a231f36f346e38bfef225a7790a19b1cec48eeb1134b873f13db74d91e6dea5941271e5a3575318f868ab
 MISC metadata.xml 340 BLAKE2B 4d87947e53d3063f83e9cd52f2c11eaee8b5460d3272302eaa91b93c572bd536e69c38d69dab0f94cef4507a6cadc48f4c81d2b98ca4787a02541657e3f370bd SHA512 ce287fd4dc9d9442611b519fa8c8607b37072965c8d1902f25e9444a375c9b6907850a9d9f3bb3ccae31a7994bae05a6235bada27837dc28fe045c12cde61358
diff --git a/dev-ruby/prawn/prawn-2.1.0.ebuild b/dev-ruby/prawn/prawn-2.1.0.ebuild
deleted file mode 100644
index 7ca5b1a6414c..000000000000
--- a/dev-ruby/prawn/prawn-2.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Fast, Nimble PDF Generation For Ruby"
-HOMEPAGE="http://prawn.majesticseacreature.com/"
-SRC_URI="https://github.com/prawnpdf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/pdf-core-0.6.1
-	>=dev-ruby/ttfunk-1.4.0"
-ruby_add_bdepend "test? ( dev-ruby/coderay
-	>=dev-ruby/pdf-inspector-1.2.1
-	>=dev-ruby/pdf-reader-1.2
-	)"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile spec/spec_helper.rb || die
-	# Remove failing tests
-	# https://github.com/prawnpdf/prawn/pull/693
-	# https://github.com/prawnpdf/prawn/issues/603
-	sed -i -e "/should process UTF-8 chars/,+9 s/^/#/" spec/line_wrap_spec.rb || die
-	sed -i -e "/shrink_to_fit with special utf-8 text/,+12 s/^/#/" spec/text_spec.rb || die
-}
diff --git a/dev-ruby/prawn/prawn-2.2.0.ebuild b/dev-ruby/prawn/prawn-2.2.0.ebuild
index b62d908568e7..e898bbb6be5e 100644
--- a/dev-ruby/prawn/prawn-2.2.0.ebuild
+++ b/dev-ruby/prawn/prawn-2.2.0.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
@@ -15,7 +15,7 @@ HOMEPAGE="http://prawn.majesticseacreature.com/"
 SRC_URI="https://github.com/prawnpdf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/pdf-core-0.7.0
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 0e0df88f4c3e..714817bb6f5d 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,7 +1,5 @@
-DIST puppetdb-termini_4.3.0-1puppetlabs1_all.deb 18522 BLAKE2B 399f67bae5de0ad601e22f952f7d4cbd169a8a3400a768ac4a00ab80eb15955e37267bce088d9573d0f0cfc253d9fe4ddf39c2f09cedfea7a64f10dc423b9515 SHA512 088ed402df9d8fed0827cdca47c782690a7ab767e2fc786dd94a1019cd84c5dd70168bddac43963031c89bc3a1a545d81554952c9fdc999f52d49e2b6212f9ef
 DIST puppetdb-termini_5.0.1-1puppetlabs1_all.deb 18888 BLAKE2B 9d1aaea64459d8e22ab293237fd1c3c1047dab4eb926f039b742aafe751a9f6eef60cc4ad784cf10f95dbfe278175aa69c56ca09f069aba9c642ff26bbc8b823 SHA512 513155a86b23b52b30eea49da49562bf1fce513f1fc58d4c026a61542e4c197d4806cc51548ceaf98bb5a9b88a6b0166575852858f0c7144437372644d32f962
 DIST puppetdb-termini_5.1.3-1xenial_all.deb 20458 BLAKE2B 1b8f4b26640cc06d0cd805bdc2900640de0b20d13e3137becf764340e71bd8b75944be5ad86573e7d78d89f69e08e3b9c3d2b2eab0d8110bf97beb34214ea0cc SHA512 37cfee272865fde1fa2bd8a66c6b64639df01ba34ba9b5903efed1d8b3c82c2658887f0dfe9e6b154f9b4cc16396d06ffdeab521d675864b259059fe53fe3304
-EBUILD puppetdb-termini-4.3.0.ebuild 655 BLAKE2B 2427c128c79dcd32a93bc69959db285e467697501a900896a7418f2e0b5c604760197462800978983c7b005ed044db7a1a54d965a34aca53edbcb984c9cb40ac SHA512 2edae70c952b13e7ccea10527657e3687fc14f2def16f288b90257817c3b0289578c3bce5b75ad3c546eaa5591b90a68cb23c6e869b66ba52186a7e444b0f3d7
 EBUILD puppetdb-termini-5.0.1.ebuild 666 BLAKE2B 395cd65740e6b3dd653b9b5d9b49ceba1e762c55c883add4b8d6bcb003ff11d3388ccecbac5a5ba7550e3c05479968f85952b2ed9d16dcaaffa32a549e515108 SHA512 443997fe58e91618ba56b3d53922d5fbca8f90593439db1ba786fa4afcb3a7268c9d878c54856b4abf5971d0c531456b86f68f50f86599b68773fe896206c6e3
 EBUILD puppetdb-termini-5.1.3.ebuild 657 BLAKE2B a2e0ab10e0149811b284b6d5e37660a79e7a09a54c5462ba912856d8cbc1bd6e47de5c3a4aff3b8cffb637fd460040835f113a61f4e0d1e743460b55f34faa00 SHA512 8afaf0f31dcdae4fda4dc81f5f7256dc2e3e1275f50b195698b7229a1c3264e7ed27211b043e33f8fbafd062a77f4b7742d1afa3a3d680f2ba4c95f79aa21b86
 MISC metadata.xml 459 BLAKE2B 90810b08bfad84e8e841bb1bbe1a2340f5f4a5b214642cef60a882dc8acf4f502d8e971dc04ab6a614e0437c8321c98c6a7566f0151475adaf8c0daa275c485f SHA512 122359cc00e8fa171933fb808692db59e25a4350a4efb72ca78dc5451e8b96f17fae32a8cd6e532f4c2fbaffc8b7d7bbb1ce141ce1e48d93c928cfb3ba3cfeb5
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-4.3.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-4.3.0.ebuild
deleted file mode 100644
index e3bb0af8b51e..000000000000
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-4.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22"
-
-inherit unpacker
-
-DESCRIPTION="Library needed to connect puppet to puppetdb"
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="http://apt.puppetlabs.com/pool/xenial/PC1/${PN:0:1}/puppetdb/${PN}_${PV}-1puppetlabs1_all.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND+=""
-DEPEND+=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
-	doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
-}
diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index 61969ab7f840..339ea88e54bd 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 1827 BLAKE2B 1cdcfc9468a2abcc1aceca319b6825946ebe518e8259fa567ae63c55a3ed3aaae60ecd6885f7ee7a1b06178deccdd8e8295599ce8cb89e19de4916161b71e9ac SHA512 4504b57d06984bad7069c431d9634c43adafbb93d3ec00b25d30aa643006439df0e918fdf71cb8cde4e7949e16acf9791e4ed0b0a2075f517f3215507c3ae8cd
-EBUILD racc-1.4.14.ebuild 1840 BLAKE2B 48473d5ff3e73cc20bdda0710fba6facdd9307052bed728a0b7dc9db83ea5328d58c804d75fa577f417a23b2d2a63882f34f9a165d4359ae1de844e036a597b7 SHA512 eee514f4ba5fb07bfe411724234f6873f353254fc8e43b3552022b60b308fa3e1824ccfa40879be77d17f2933c8d7bc2d2c6e60d7be962e3f4e588f14ba61575
+EBUILD racc-1.4.14.ebuild 1838 BLAKE2B cb0e8b539f1c2dd0c4068c16ad1ca644a604550b8b600882390f238412342bc8069295b263a743f6708015b8e55060ae558c4954986e499edc9b01b2761986eb SHA512 567b77d42645b98022a9cfb4d6bacc2bdbc5ff4ed5452c725612d10be5b3b95e3e11fc3ba4f6577bb885578e9064329c6f1c3fbba63f0155811b6a23a397a933
 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 a3b38186497a..bd74491651e2 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/rake/Manifest b/dev-ruby/rake/Manifest
index 10a6722325df..7c2264e8953a 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -1,12 +1,10 @@
 AUX rake.bash-completion 1335 BLAKE2B 5f4b81b850e3435246018d7bb420263647c11573657cb7362d95727800f4197a904003b5a967cf0df862edb36af02d640a052b5ad33218d3bd7a6945302ebf94 SHA512 bac238c0023e525570dcb93c2092059b8a952ed54bd97344db8011f89720af947b840564701b75e03f37a6994f27da95d8f44f1fc28839c8cb1d735cdedf07a4
-DIST rake-0.9.6.gem 123904 BLAKE2B 501823948aca339130fabc1cd303c8f30c5afa864fa4178def77514ffab1ed0a372284535324c8d66c331b60a2f1a6e74df2338312770974ef9cab8f5163fc54 SHA512 9ea3b7bd96db7e96f8bf5a00db710003d39ffeea6eabfde4b9a8afead0e6f6a8fa7740f42a61d77a4322f64ab0338b19af8c63d0178624dc7c0e787e11b0b6f3
 DIST rake-10.5.0.gem 130560 BLAKE2B 05ae87d68641d5afbdc16c36d33c5cef626c8290abe5131f93f84e85861f0175f0b72a62f1b42076dd42a546a08c6efaa9400cf46707a2d4adca6bbff407b769 SHA512 0c95921e00af8dbc51edf9fdb8a8d8b0cc68295894fd310b3c4e5aafef1d5d6f9819a9e8a9b4c854f54835115123411278992f6223e0fb18e2efa7fa58ab6fcf
 DIST rake-11.3.0.tar.gz 134863 BLAKE2B 0c4bccabdf98bd90c9121af20d892243ae283e8f15b6798cb0525d2c8a60d0cb796b94d7d673c4780b1f83f209fde136021b78b413ca670bba1b6744092ae47e SHA512 705c4b1979bdf8042acdc6cea403b2886ac9c589ed0eba7c258d0ce5c46104b7d6556415e82a26b5cd9559954ee53a0bd9f4e0373fd2601bb3b3338a426b3e5c
 DIST rake-12.0.0.tar.gz 117571 BLAKE2B 529dae3997b033aab8c117f02d41d2cd19df253b4b6dec391940e28b2849823976c3b0d5b302a3941c892354b14bebf10031c7eb63a05f0865bf928c8c0ca41b SHA512 2c8a0442b8c2f7755d8740f89d0772c646c87f64c04377955760c42a37ac25334628044ea37c09cd21e7372cab9e8f3d04b0076f0c34466eb4ea328c0bdcb01c
 DIST rake-12.1.0.tar.gz 118891 BLAKE2B 122aeaac6e5e5dc78ff5098a5f5001a747e72237286ecd3f9de5225139d9e7515ce1ac1cdb499d6acf6c6521af466811a6023b9c886b18131ac2dcf4346d7e56 SHA512 931161e9c220bb18b913c7a2aeff5bb4711cb6a4ff5ab1850aae307e6ab38ac0dd9d0aaaaba4510c27006def6734a8debf8e500a5de8d6f827c3c954832ff136
 DIST rake-12.2.1.tar.gz 119660 BLAKE2B 8807cb9c085cc61df6f6a88d4dcc2e3f21764aa9269d9667ea21baec7fa0f4331695fe985264fa08eadb5a7277a1d88ac9e18d8c319f141bfacf775031d80cbd SHA512 930e2d82f0b5a3250cc0e8357bad60a7ad5f01fed06884e746b72cab60065a326c84d78410943836a698ee8cac1b291d162350d8304a4abcb7e8c930c026af4f
 DIST rake-12.3.0.tar.gz 119742 BLAKE2B e8850fa4afe1c27f3502ec32738258823295bae992a7e6ee2d88fa53d13c9213509db48736874cc30f0610285272ace33c91a147a1891774f2f26b6b022dbbbd SHA512 a4768530d484dd2a1abd19c1d89b33ae31da54d59a8719f7559c586abb1c4eb7f6dc3cd05f85ad136137ad3395f57a121ebcc693da2d35e4cc1d70c1f64b666f
-EBUILD rake-0.9.6-r1.ebuild 1652 BLAKE2B 12d15696c6a7a96adffceccef1887362054e2d0e6efe1681f0e6e131b11813265861eaed2998df470dd785a13d843d91e05c7de3c3ce1d7498ca1fd1949c2b1f SHA512 2bade0e1137fcef57b593440604ddffa7cbf8ceb12c1f7eccc3f91abc05a01b86090dafcffc807dc47f46ab17b1fbdd68fde456cc7d8c06753efd79e50af7f97
 EBUILD rake-10.5.0.ebuild 1194 BLAKE2B f8d764db98d3c976571a492c59c420bee4a5a6b459b79938de3e8a63090e85234fffadc7bc8151a8fb8365bd2ffaed4df11029b7997961fc4bc878d272957d38 SHA512 c818bfed0c41931bbd39066dcb3a82e80c0f1c0e21752d038e9fe6c0059679176fc34e537f1458ac48252798496304a40c310648ead421fcbdab3ed0387aea61
 EBUILD rake-11.3.0.ebuild 1301 BLAKE2B d45fdbf2ade4b863f22caac24f2c946bf7fd71b847aaea3229064423969d33a1283d38e5b944e1d4a15be5d9e3ad60792ec565379770739159dc739b2500eae1 SHA512 99fee0adee74014b78392cfcad60ef753adac4e8fedafcada27b5429a3746b45f36caa854d4fbc4f888901b2d14604f427b0d0c99fd98a577c36efaa5488dfcd
 EBUILD rake-12.0.0.ebuild 1308 BLAKE2B 9d9cf580af743e4e9de4fe4e63d5ed9369048ea54c2188cffcaa8b6880ec883a2201679f6d88a70325431cf12183ca92c49533a103c138e52ed04805b70cc6bc SHA512 95125011cdd74c8b6b1befe9378e65b46d8c8af66776e427ab4f4b8f7dfe96059db06717b43911c066c35dce1607c58c739b72c409bbd0299bdb9885f27433ea
diff --git a/dev-ruby/rake/rake-0.9.6-r1.ebuild b/dev-ruby/rake/rake-0.9.6-r1.ebuild
deleted file mode 100644
index a5f937717f03..000000000000
--- a/dev-ruby/rake/rake-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,63 +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="CHANGES README.rdoc TODO"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Make-like scripting in Ruby"
-HOMEPAGE="https://github.com/jimweirich/rake"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND="${DEPEND} app-arch/gzip"
-RDEPEND="${RDEPEND}"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )
-	test? ( virtual/ruby-minitest )"
-
-all_ruby_prepare() {
-	# Comment out unimportant test which failes on ruby18 at least.
-	sed -i -e '/def test_classic_namespace/,/^  end/ s:^:#:' test/test_rake_application_options.rb || die
-
-	# Avoid tests which can't work in bootstrapping because the test runs
-	# in a directory that can't access the file being loaded.
-	rm test/test_rake_clean.rb || die
-	sed -i -e '/test_run_code_rake/,/^  end/ s:^:#:' test/test_rake_test_task.rb || die
-
-	# Decompress the file. The compressed version has errors, ignore them.
-	zcat doc/rake.1.gz > doc/rake.1
-}
-
-all_ruby_compile() {
-	if use doc; then
-		ruby -Ilib bin/rake rdoc || die "doc generation failed"
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -S testrb-2 test/test_*.rb || die
-}
-
-all_ruby_install() {
-	ruby_fakegem_binwrapper rake
-
-	if use doc; then
-		pushd html
-		dohtml -r *
-		popd
-	fi
-
-	doman doc/rake.1
-
-	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
-}
diff --git a/dev-ruby/rb-inotify/Manifest b/dev-ruby/rb-inotify/Manifest
index de6f22d53d86..efbe3d1921c1 100644
--- a/dev-ruby/rb-inotify/Manifest
+++ b/dev-ruby/rb-inotify/Manifest
@@ -1,5 +1,3 @@
 DIST rb-inotify-0.9.10.gem 14848 BLAKE2B 35eb00dfe1e7e76fddda080499275c053e82431af520170362354984cb2af3c90e3ba803ef82fe50f1451d3fdb0ddb7ef9c1dc648836403a6865396987d6d9c2 SHA512 ee1aecfebea11655450776013d8d2fa3fb2af784285db3c32b5a452241f9cd48a8f9a10cb2f1ff96b191c0dcd43ec4f78e8a363447abf97a8cd4ccb778de4889
-DIST rb-inotify-0.9.5.gem 14336 BLAKE2B ad43d1da83addc34128b324c2b190e30889ca3ae7cb04181c9cd67b716e1192e9b5e5fe648212e98f670cd953b700c3b5f704c989ac4ff38e6ceeb95f2521d51 SHA512 1ecc0142ed44358a2f51403736533e9854b5fc13cb81b552eb866310b60535b14e2ac6bfb6ee53bc1ee65ac14e51fc5a981e52f843607dbb3d8390c1d6c13e60
-EBUILD rb-inotify-0.9.10.ebuild 968 BLAKE2B 6d9884650f63f4531471b169d7a8716daedf140f70779762945562514468d4c9d81f561b83e467275bb7f197cfd985d80ee581302c8f81526216a619d63369f6 SHA512 2641b4443d151e13b11aab553482da732a6fc301d123331b428fc94939a8f26493c19e1fe3016693ad2c367fa86d4bf35b68ed8e3abeb5e997f04353f586f66e
-EBUILD rb-inotify-0.9.5-r1.ebuild 954 BLAKE2B 3cfd94029abfd7584575cb2019ff5efd634cdde007a9975c675b37ce19a3c1d0f4d777b08e29a5f20bb9f8eda1aaaaa02ac5e2bc33129b8a758a757f2d59cd21 SHA512 0678ff1fb02154d1a3a306f7c804de99090af0d2f19bac5b9bb17f6aa50771aec5be8cfc5ce381221e8734d999536506d9dda0efed1e5ab09bc7aa86bd1adef3
+EBUILD rb-inotify-0.9.10.ebuild 967 BLAKE2B 869f4bf9bd834357a60a38fd9089683a4156bbcb9373faaee043ffb399256347bbec07a9363d2540834a37e8d27235cbb49c464449c29fd9d7f40733b8f6c9fc SHA512 835e3be6628017ba94c7a22fda09429a4217cabd1b02550b4c28ad6f4d554f16bb18ab4a3a75be4a0267ea2473e8c4ec28b93050f8e41bcbd7c45fb1e254178b
 MISC metadata.xml 341 BLAKE2B 9b7d043d113a1bfd0bb07588615f04762e5d4334763055dcf818969aa98c543c19b1e1005d3f8e0ad5d6c0dfed342b3ee8f2bfd9a49eb133b34f5cafd6f7f91d SHA512 0449efdf61caad416c9b68e1b5de20c46d29a8961f462dd7f1971e3723b8b0b3567507cc99cfeb2151e0c8c14caa28947dc23906281b20771251b3b47823b4a4
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.9.10.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.9.10.ebuild
index 6e726129b110..cb297e346792 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.9.10.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.9.10.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=5
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/nex3/rb-inotify"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ffi"
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.9.5-r1.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.9.5-r1.ebuild
deleted file mode 100644
index fae330afc84c..000000000000
--- a/dev-ruby/rb-inotify/rb-inotify-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
-
-RUBY_FAKEGEM_GEMSPEC="rb-inotify.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A thorough inotify wrapper for Ruby using FFI"
-HOMEPAGE="https://github.com/nex3/rb-inotify"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ffi"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on jeweler.
-	sed -i -e '/:build/ s:^:#:' -e '/module Jeweler/,/^end/ s:^:#:' -e '/class Jeweler/,/^end/ s:^:#:' Rakefile || die
-
-	# Remove mandatory markup processor from yard options, bug 436112.
-	sed -i -e '/maruku/d' .yardopts || die
-}
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 48bf110ea2be..a6561f7a5faf 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 2795 BLAKE2B 16e9effdd9566dac3c83e730e28c9a0733c7c5bf6e88c8b01e9c8215185c1eeef7887772bf4497ac96312f1e6bafa8d9f536bda7224ff7da1435a5c1135a7754 SHA512 cab2ba0cd1eca5ebc32d5bf73d37afc19f12b3509f51286081fe733da8dfd18933acf494e9d6c9feabfe771aeb2ca11b72e5cc3f9218cc4d16d493e477226624
-EBUILD rdoc-4.3.0.ebuild 2706 BLAKE2B 34f70b6b4178a1f99542898714f04c3f34a9d5a6a1f4eda2361d3aa4bf023913999881bc026502fb59f2dd97a68ae75fcec7a846c5b859ac1d76eb121b9dc411 SHA512 9ab33c22b5bda724a2e8f207df7edc38b1add039a6599a5a1ae3aa47a8a8e592541bb126ed27c565ad72645b6ed420c68a656b4979c5636a5cf26d1454d65ea6
+EBUILD rdoc-4.3.0.ebuild 2704 BLAKE2B bbcd2708a52c49868c6718260b1dd90e8c26195effeef291ab1277f4ff456f785dedb1d2ebca8d84067c0c385e8ceac6079766dbf6dfb67832806c92abf33c95 SHA512 d51a9f66268f196e26eb2314d423f124503f78fd80986c5cf3cf7029c00f7600032c1fa480cdbf753cb3707ad20de0ac8ab4feb4342d94462697ecd67ebcea73
 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 23748ae36d77..49d59beed562 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/redcloth/Manifest b/dev-ruby/redcloth/Manifest
index 697b213ab872..630db77158ec 100644
--- a/dev-ruby/redcloth/Manifest
+++ b/dev-ruby/redcloth/Manifest
@@ -1,6 +1,4 @@
 AUX redcloth-4.2.9-cve-2012-6684.patch 1996 BLAKE2B 1f5a41654fb270de4769991c911c9a66c74fea59b55faff50216ea0d0c3b40050d57ce9484a564c40074bc43b56f70a3c451acef9381cdb1550879160cb7c395 SHA512 17ea6052abf651c41091df3a1799bb33ad2161abd5a78f2d6db4629eb57a0413f4341ad87ca065391e5cc3e083bd65000d3d68d1fa53d0d15e5a73f5962a1498
 DIST RedCloth-4.3.2.tar.gz 91880 BLAKE2B 0feac1ec59e23fcff39e2fdf9beff896be7949764e53a5a834c5f4e7d18813dc59bf354103d4fab82a709341a0f1b6919bbd3a463fd601564888672dbe73d343 SHA512 377fef21e646beb1658a4b8b8d0228e9730c6c8f33075a14137afcf80e8d37501ede8c05b720d0dfb36a680017f4dedd01565fe9b326ae06ead77afee6f122ca
-DIST RedCloth-git-4.2.9.tgz 96897 BLAKE2B e575c1fa247efb26265b44c50315d1449db3b84a1feaff349f2872c80b9abfc5fc767b09fbc741f9924f70901c73d9a7474b6d4fc3145d3e1842a34ea6e2be13 SHA512 646f7a1a88ab9b3ff078016df706a1c9d991bf21d86ef1dd4c0a0ee6b946f94276b52499218bca222461eb003510e84b81f44b08899c5b36ac115137193e968a
-EBUILD redcloth-4.2.9-r4.ebuild 1527 BLAKE2B b2cd7736fc902ae21dd7703f2a0447df44ab1030cc3d954669058c95b8eb1dc961a1f0f874c1eafb4fe7b06f4b271ceaf1bba75bf08b6163e9f98d9574dba7ee SHA512 2575190f72f7a0161bab7f142915b779594c822806a99c7d9253209dc9d61eb62f4c1ec828e07f9959af780c14869164b45defa43b14c6ba8dd39ace6a17351a
-EBUILD redcloth-4.3.2.ebuild 1475 BLAKE2B eac5dc18d169566a3f66d5850d7615d290656dba69c6e7d2dd44181190a2dc6129df9266bdd5523f236e700ea2de9e40cb475d4e451b337d193dc432cbbb85dc SHA512 1b7c2bc9b1d861a3e3de604a99d124c15df4d98e90696e0326f4b7f8ca148a0dac6bd8c4f5d9ee6a4c8bd062725bd99d5cc9f5289aeee0b1826420069929432a
+EBUILD redcloth-4.3.2.ebuild 1474 BLAKE2B 43418d646ecfd7b5e7e3fb20339fe60dc5190bd9c140602ae29ab7286089d91aa59ff6dfcb72f0881359fe8dea104134b762ae571a7dc81f61a33132edd1bbe1 SHA512 f3318341074ecca90684f87ad8163952c8e0d12d96d66b5ceefe3380cbea8fe8fadc3e0d448c24cb6c0b14b2777ca03edcfea54976aab65518d3893e824bdb4b
 MISC metadata.xml 342 BLAKE2B f28d0e6234cfbeb3d398315b38e8dcc614b32aed150b047e61e7d99b2f6083abbabc36515de2cd2aa4d451dd3372dfc15018c1d8ad02cf64ff8e87b147a441da SHA512 7a6f73a77cda62ea21a2d2fdfcf0bf848ffdd90e7272e0b06aef67a8147e5a6ae14e871d216750ce20d12e18823d3e3d36e60a99972019fde7195a2350480791
diff --git a/dev-ruby/redcloth/redcloth-4.2.9-r4.ebuild b/dev-ruby/redcloth/redcloth-4.2.9-r4.ebuild
deleted file mode 100644
index 58f1b6463547..000000000000
--- a/dev-ruby/redcloth/redcloth-4.2.9-r4.ebuild
+++ /dev/null
@@ -1,60 +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_NAME="RedCloth"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGELOG"
-
-RUBY_FAKEGEM_REQUIRE_PATHS="lib/case_sensitive_require"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="A module for using Textile in Ruby"
-HOMEPAGE="http://redcloth.org/"
-
-GITHUB_USER=jgarber
-SRC_URI="https://github.com/${GITHUB_USER}/redcloth/tarball/v${PV} -> ${RUBY_FAKEGEM_NAME}-git-${PV}.tgz"
-RUBY_S="${GITHUB_USER}-${PN}-*"
-
-LICENSE="MIT"
-SLOT="0"
-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=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "
-	>=dev-ruby/rake-0.8.7
-	>=dev-ruby/rake-compiler-0.7.1
-	test? ( >=dev-ruby/diff-lcs-1.1.2 )"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-
-	# Export the VERBOSE variable to avoid remapping of stdout and
-	# stderr, and that breaks because of bad interactions between
-	# echoe, Ruby and Gentoo.
-	export VERBOSE=1
-}
-
-RUBY_PATCHES=( ${P}-cve-2012-6684.patch )
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile ${PN}.gemspec || die
-	rm tasks/{release,gems,rspec}.rake || die
-}
-
-each_ruby_compile() {
-	# We cannot run this manually easily, because Ragel re-generation
-	# is a mess
-	${RUBY} -S rake compile || die "rake compile failed"
-}
diff --git a/dev-ruby/redcloth/redcloth-4.3.2.ebuild b/dev-ruby/redcloth/redcloth-4.3.2.ebuild
index 68aecf0095ac..d10c52cbb740 100644
--- a/dev-ruby/redcloth/redcloth-4.3.2.ebuild
+++ b/dev-ruby/redcloth/redcloth-4.3.2.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=5
@@ -26,7 +26,7 @@ SRC_URI="https://github.com/${GITHUB_USER}/redcloth/archive/v${PV}.tar.gz -> ${R
 
 LICENSE="MIT"
 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"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/right_http_connection/Manifest b/dev-ruby/right_http_connection/Manifest
index b303a7a2710b..47b5a7db9b28 100644
--- a/dev-ruby/right_http_connection/Manifest
+++ b/dev-ruby/right_http_connection/Manifest
@@ -1,5 +1,3 @@
-DIST right_http_connection-1.3.0.tgz 113955 BLAKE2B 3b734f84b973cbd683e291a27a1e75dbe7a1d926461761d1d2f5346553e785087c98ecb9614c313b9be9a7040b6f50ff8c2573493a7458e75556e14ef426aee8 SHA512 f119c23d815514ad1724581d150271128fdb603962961bcb637c3d16d157c9ecd588e1b1dfb51adb58108f72164dbefa2f59a408e5800654aa79cb30ebb868c4
 DIST right_http_connection-1.5.0.tgz 120451 BLAKE2B 83b44f205ee418548b6bc70342cf0cb0429a21d624d65ee5bffe447e1aef8e286ce634dfce3bda0c1f5e480bb98dfe1f061eff40ed8b8360bae3d864577c3ee7 SHA512 7db0e85ba8140343ef06bbfce2d9ee5f6ce6823fdcfee71875c74a609e77de043a0e5d6fced18ee2bd111ea6a8a592d3855e1547dc2bfec0e963e446c366aef7
-EBUILD right_http_connection-1.3.0-r1.ebuild 892 BLAKE2B 43f01a16b2c5b1ec19614da503baa98dfe967af03b17ddf762e2dca4b030e0b127697c2af52462b15cd33268975c38de872f5c61b15f3cba4a5932024b7b246e SHA512 0e6aeaacef2adb09810d97b7cdae9b7bf4988cacb73d8c26209ed1df83072eedb95581cac3f3cb153229a4e319e5b94693814f43ee88b051f99e0607add195c4
 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/right_http_connection-1.3.0-r1.ebuild b/dev-ruby/right_http_connection/right_http_connection-1.3.0-r1.ebuild
deleted file mode 100644
index 3d374267127a..000000000000
--- a/dev-ruby/right_http_connection/right_http_connection-1.3.0-r1.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_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="http://rightscale.rubyforge.org/"
-SRC_URI="https://github.com/rightscale/right_http_connection/tarball/v${PV} -> ${P}.tgz"
-RUBY_S="rightscale-${PN}-*"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RESTRICT="test"
-#USE_RUBY="ruby19" ruby_add_bdepend "test? ( dev-util/cucumber )"
-
-all_ruby_prepare() {
-	rm Gemfile Gemfile.lock || die
-	sed -i -e '/bundler/ s:^:#:' features/support/env.rb || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby19)
-			;;
-		*)
-			${RUBY} -S cucumber features || die
-			;;
-	esac
-}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 5e45182ecc75..bf0f904da80a 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,11 +1,9 @@
-DIST rspec-core-2.14.8-git.tgz 195949 BLAKE2B c249da4a6a46019a96cf67428bbf73d9033f98d8f3bae19f9cecc8fa183249e7987f52b01aed3e2b7067a6f7b671e1e23cf78922d0a0d827e4f537395dcdf9a9 SHA512 2be487f0a820cb959771b0c2a725aa7a43cd80a76f85ed42f3341420cefa4ba6413b5dbd86e8fba9f5515afef3e895e0f1f2f8239d50f0b764f037d5f0791095
 DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab63230ab07ea97928d6f66face8d07ab54d87f19535f5f235c441b2da6dec17ef2a889e9ccd7e83d987086e24afd1b82 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44
 DIST rspec-core-3.5.3-git.tgz 368960 BLAKE2B ba4db57ac16dbd98960f7e5bad4ae7382afc5caddfeebeea6e547554d240d030639f9edb00f5c101a843adb18992ed5cd9430a20e5a3d9783557ff62f1def6b2 SHA512 c8f983018e33bd111c75671d7208b38704dd0fddb22cca2b08a59a1e5ceb0939ed56ee4015df758f5d766fbe2390279c1d670f6fff4eef222f44621f48c581ef
 DIST rspec-core-3.5.4-git.tgz 369170 BLAKE2B c95fa7740bcc1b586b4e26be1db4cb52bb470cb23c9ef74dc644d0ea7c4ca769ab62e587ecff2a16cd6f656e9f3bbdc81b199765f9397dddbe28a8cdce6a1945 SHA512 c672381e9233b6f8c6e92ed70d084ff7a558edd6ca7d5a09a28fff1554975b952b6fab94483324b5bd6a62ff7aac576e7a216dbb3972749ef0210fe1cd05411d
 DIST rspec-core-3.6.0-git.tgz 375590 BLAKE2B e8b4987ea3d5cc3a403eaec98243e4c4be6c9eace798bc97599020543401ecd036c6121a6736995fb716aabd1a2016393506bee1e3076c61b0c49173d991d990 SHA512 cecd3885652e18ba1ffed45e40d12c932ba0d880e96b2f1d264709f55dbda8d6b0c78c3bf4bb940d246b84261d1b80038618735f65302ff62646165b2e932be1
 DIST rspec-core-3.7.0-git.tgz 376565 BLAKE2B 86b0584883047c83e4fddfd09924a5b68828f53e2018d2513cd79484a390d1b7b89e8176b0098b8869d5ed7206c132d77a0d8ef2ffb5447da317460b152e5e23 SHA512 071bd2a5c905d4ce621f2d7255b882a9d34cf42001cb2995fdb05a91387805929198c32e53cf4c2df2a43d179d2c49337214066be87eb50ab044b5f70aba8c54
 DIST rspec-core-3.7.1-git.tgz 376819 BLAKE2B 6747ffd8f2d426718376b51356d8838a7db0d0246ee619e8edef30bd9f7aeeb80bd0488e4fc73b0a00d119074c35055f6b9d0cbbe6160ae78d0727ce9848a710 SHA512 1561d044281c1b8b97cc89033ad991548fa74abbc5f20d3951d3f3de754c581a027f9ccb2bd0107c05e744d3b2804555cf4cf207e72adf365b28fc7ce052dab8
-EBUILD rspec-core-2.14.8-r4.ebuild 2764 BLAKE2B d8a6bda7260cf9657695ad47473edea4d49efb97dc8e591b7ae642b971c93d5df370a254e0831bd422cb80e10314e25169fc09ed82f601faa63fc5f11411a95c SHA512 3c53e284b1c11850a610dd956b31aa0e6cedaf7925d346c95198a1cd9cfdd3a2c23f9b14aef382d3b9c6551241b20980a2f563ce9f11264048daa649ded2e694
 EBUILD rspec-core-2.99.2-r2.ebuild 3049 BLAKE2B 1f226c2e6afc8a60409c1db0a9ec26cdda2573d5d6d2e6115cb04c7173e87ce3a0c75c91c331a3e3907aaa8c237a47e7fe11f1869c6d91f04e80a12d1ec0170b SHA512 7ece50dacf7e887c6a10ed2c143cdc05c41e5d70a6331dc1021dfc43acf97a73e93fd9b6393b0c923fa90f75f96d844fc493040bcdb4c3f77e3413f6c6eca23f
 EBUILD rspec-core-3.5.3.ebuild 3164 BLAKE2B 0eb341fc376171025a09bac586b90d4a1f16412bdb384df1d14b3dad7e4784ac4c456acb6dcc400fdeedcd1d9fbb2c6b098f60259bc179e8a9aae3cc4e36e2ae SHA512 fb8fc39c784cf66a63385d6e58abfe2e74833ea5594c0d01887e883003a67603dabea69a2c598bd38ab69a49938136c0462fa4a217363b1d4cd189a9e4946dbe
 EBUILD rspec-core-3.5.4.ebuild 3178 BLAKE2B 511992cfaa43a4fb51e907994c0edf0862d31f6f899c0cc04577d8fd31f48c450a1a82ebeabc5862d10e5a0793d266cabdffd94541ad3ff6016043029d07b1a6 SHA512 93b1179badab718a9ba151b489381a0892ab9975fbe405fcc99cf6b4725965d5aca29b25ec4bce93e2636a8d87ccdf427ad39ba468643f506d8aee4adea04b0f
diff --git a/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild b/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
deleted file mode 100644
index e06222659137..000000000000
--- a/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild
+++ /dev/null
@@ -1,80 +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_TASK_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="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_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		dev-ruby/syntax
-		>=dev-ruby/zentest-4.6.2
-		>=dev-ruby/rspec-expectations-2.14.0:2
-		>=dev-ruby/rspec-mocks-2.12.0:2
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Cover all released versions of ruby 2.1.x. This should be reported
-	# upstream since ruby 2.1.x uses semantic versioning and the file
-	# should not have the full version number.
-	cp spec/rspec/core/formatters/text_mate_formatted-2.1.0.html spec/rspec/core/formatters/text_mate_formatted-2.1.9.html|| die
-	cp spec/rspec/core/formatters/text_mate_formatted-2.1.0.html spec/rspec/core/formatters/text_mate_formatted-2.1.10.html|| die
-	cp spec/rspec/core/formatters/text_mate_formatted-2.1.0.html spec/rspec/core/formatters/text_mate_formatted-2.2.6.html|| die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e '/git ls-files/ s:^:#:' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/aruba/ s:^:#:' -e '104,106 s:^:#:' spec/spec_helper.rb || die
-	rm spec/command_line/order_spec.rb || die
-
-	# Avoid testing issues with rspec 3 installed
-	sed -i -e '2igem "rspec", "~> 2.0"' bin/rspec || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-2 'gem "rspec", "~>2.0"'
-}
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 709a62866153..bb8a0d3d857e 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -1,9 +1,7 @@
-DIST rspec-expectations-2.14.5-git.tgz 93680 BLAKE2B 124e33b9c3b2c9f872dd6e2bcde6fcf74a93c05a7dcce25c3de72f371c86469d2df277f2cc74e0f0aeec852b252698543177bf1b5d616378db926b9ed9884ebc SHA512 237ed56cd185bc5d0d60ed14e20ded1840ef10711693c43ffaa20ec65cdd6b891aba3a6f1f38bb6962c31d51364758d1898e3bcba14a95c4abc73dff4dac1b65
 DIST rspec-expectations-2.99.2-git.tgz 106884 BLAKE2B 5b31c8681306d5c688f62fc3fc6adf7be6cabad6df6fd16195c71787d73495924233d793633fa041a94d796f63c9ff97c58e6f4a75bdc09dfbe56e770bb6a5c9 SHA512 6042cafe225b2b16df458c7bf69e1694b637afcac6f6195e35a0be199432610457ccaa3e7e4bd114b27a7a6c3d530d94f4c0603c65f469cbadc55bd3f75b6f3a
 DIST rspec-expectations-3.5.0-git.tgz 187600 BLAKE2B 607dabc38e077ed82e18cdc690900f7fef86e6bb30a8004534992804717f8430a132b8f7d882226557e8c83832a1a8f43a32e9791b19869919c9b0aa8cfead8f SHA512 e6077549a028de0e34cdd50d93552ca3ee0f30bb550e9df20d391f287beb57070dcb3a5104627e7adb55689e7b102c91b7d3a3b944b8c4ff1235761140f2dce0
 DIST rspec-expectations-3.6.0-git.tgz 193897 BLAKE2B f3fc2b06a317e77838e2d483416ab0e05aefed8a129058ceaf1a80d3068b41e81abc9fd85576433fd1577e6114ccc65130734b850997f89310b80b549f80d679 SHA512 5c784eff2c076623f471bcfff6e014420782c8d52ff54a68adc9b4d6b60a91726da36e3989535f4ab7f1fcc6b1e2a3c3a63ee330f8ea55f475711741762c0f07
 DIST rspec-expectations-3.7.0-git.tgz 194071 BLAKE2B 67c8db15c43cc1141b19c6eb99390eaaf2535ec03f0fdc7b05576daa463d252f56ff251d40f5771726ee6451d57eef206c893f2593b01d413b5d96cdf21f0daf SHA512 bdd3222089299e9bfdd6f17a2b8af81d5e695290a3ce976630d586d51ff2df5baf76a3887b8adb31294bd6623ba85f8c2a4a31ac520046515aeeb81fa3a1bd5a
-EBUILD rspec-expectations-2.14.5-r1.ebuild 1297 BLAKE2B 44073a50314b9266ef24f132115479ee4f7ac0f019e5118e3a97ad90e324fe8f946d91df46547c6e146ae1b566c075a030f02191a50dadd4130c6166c269568b SHA512 63879f846e1c7066e242f3c90071997f835bd76dd6c9933a8eb7ba6d3e4f9a1316315e57ba0f5760783d265ec7ee101866cf1c5972d7ff23dbccd819f9340b28
 EBUILD rspec-expectations-2.99.2.ebuild 1689 BLAKE2B 2c072804b36d612a4e709b0bdf1c47cc11e51bf030be65f72a383d889649a841c5e8fa3c3ad79b517a4e026a1fbe9d1c3918952cfff4289cb876617d9c59c00b SHA512 080cd89e298abfdb613dc5d0209525a6604e71d19703218843baa2d929a40a0c4f8ca874919b3d091ad9f13ff19b5b4a774fd44e546ce3c952d9e51e2aff563c
 EBUILD rspec-expectations-3.5.0.ebuild 1322 BLAKE2B 79d4a73c87e4e93e1c165255ee391915c7b2252fcc7ed308994c170ce4f8e3a163a7df0ca59ef24952b53130dc5d0884dcfab319739d0cb1c026a7d26dfe86f1 SHA512 5a56eadd7f68b0b57eb153e5e14bdb2f2d653bad26d84a266dd3d2d34ffa8a2e9a97df5292fcb35cbadab5cec5e86fb6cbbe18c7810c7f1d976019c0dbcaf1b7
 EBUILD rspec-expectations-3.6.0.ebuild 1338 BLAKE2B d4765508dd978b7ea89b083e78edd24891c91c6172e6ec91615764b226866c3492f3e6e35b1b092e35c186fe4e2e7bfe1de8c38de82b50e003fa430ef66a1b5a SHA512 8bbe1d874c4b3132c9c3bfc2516857e5ed3330c7afae46b561c5ab5c0cf5b4f1a024958a76ae5fce112a5eb193c98b80c5f647792d0265a726e8320684be7ab3
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild
deleted file mode 100644
index 1480dd4b11dd..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.14.5-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="http://rspec.rubyforge.org/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="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_add_rdepend ">=dev-ruby/diff-lcs-1.1.3"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/rspec-core-2.11.0:2
-		>=dev-ruby/rspec-mocks-2.14.0:2
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	# fix up the gemspecs
-	sed -i \
-		-e '/git ls/d' \
-		-e '/add_development_dependency/d' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-}
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 5bc9b94c242d..821c1ba2deb1 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -1,9 +1,7 @@
-DIST rspec-mocks-2.14.6-git.tgz 94286 BLAKE2B ce41ac9aba47e94d00d4dd6583e6a8bfa06ee13918077860ca5babb3ebf850183a356af43e729db675082aa15b567e0330b5b4cc7b890173430aa8ff61c33ff7 SHA512 a079c0b860c7ca4b4da366fa131617ddcb636918cd0c065ef3d8d585938228f442bb58ab5fcd2cd84b590bf6ab468d637fa7ab0181864a59c131f0a890e46702
 DIST rspec-mocks-2.99.2-git.tgz 101731 BLAKE2B 27ae180381d427b642c53c351e7b53602caba4252ddf5393949d940be8474110eb0697901afaaa878cd8d368f081c6644c0fcbce86d9d14b9f93f48c027ae808 SHA512 dd3b9394d56de8d3089db7777cda1e1a5bbdc46486876a99a8a83b602b84ba0320913d8e8dabe5e0367645eb01b943607b93e67d87cc26e380c8db6e048e4e0d
 DIST rspec-mocks-3.5.0-git.tgz 186806 BLAKE2B e412feafba03cfe8c0efb68dc778885f0603c3b5fa415568c11e7b31168c57ea11245048fb78c34688b65d5cca95bc0a90aeb18afa19fef0a575219441fbaccd SHA512 b7dcb4ce0eac894d6652be45fea981cb7ade47a739ad926a87aa41d8a34fa9deffc45f5718d1634f03fbedaba82a77005466fa83155dc433fed6a19f8a897c4d
 DIST rspec-mocks-3.6.0-git.tgz 189000 BLAKE2B d8fcc25983eeeafdba69bce80bccac2ff9b1e269b739bbd41a87f4839468fe5e4bd3298d2a63aa315d87422a9f30aaf1a776cb9b90ee1fd58ca05b5a08ea032e SHA512 42cc4870fde8eba0a6da7df4ab07e4d59c6447bb8f52e0172e7f231d47304c20c6e2edfceee698d5d344bb78384acbe3df4bb67de784cc24a63fae02ed1d4a7b
 DIST rspec-mocks-3.7.0-git.tgz 189170 BLAKE2B a0a622ac593660c673cd80b3f3caddd2ac389000f42a7ed1745e1fcfd28d1986e61e83c265d736f3ad0649531973719bc9c5f6ab07e289cb2da89c4482e64184 SHA512 8673726571ccf8a901281e44faeb25ffcb59579dc380138f0557cd9310192cd340081e5e8ad65ae281777727b502cca2f6877134b0fb48f2e0ea40b133002aff
-EBUILD rspec-mocks-2.14.6-r1.ebuild 1285 BLAKE2B a404deaf1d6344bb9ef7b72bdcb1c82a81b7ad71973af40f0b8fe63f516cc9a133993b65763e080eb7da7a881d8d5e841a8206e60a91fc4290ea9652f7cf32a1 SHA512 f515fe9492f41766c77a8b57bb4bc37d60f2d7c053a877a9c497e49b80df61320b4f01dd6ede5fbe4e4686304327d9657518ed06d820becdac5e2d1234126e36
 EBUILD rspec-mocks-2.99.2.ebuild 1482 BLAKE2B 81bf6a7597f277ca89dd840351750a671ff63536ac419c8be339c6baac6a99e2d0e6ea940406fa6dedc8796c0e53f69c2603f64292e467a6344268c4ab845d1e SHA512 b2ecb999259c9fad854c785dc8f472e063f0e2ec5016ad934c30689480929a9ad8a0f701875e02db6562d46438a2f70ac0aa02dcb16c15be0515a64cfa0382c0
 EBUILD rspec-mocks-3.5.0.ebuild 1346 BLAKE2B 1799d6cba41bcc4cc28e1e1778020c52fafc6a16b7515f72cf31e7bb347007ab3a96c88aa71f121e31e3785fb63518324df72b90e6a0ac464727db2d3338e0b8 SHA512 40cae4ee52db2cfc0274c6961f32f654e9f09291c3a9410756f3dca4a1d42b32e0bf54cd8a83164b7f06cc57ba410aaef478390019e0d1d0b7a0630884cb2a48
 EBUILD rspec-mocks-3.6.0.ebuild 1362 BLAKE2B 3fc2e04dcdb7dbcacbd5b6f0981fe90e0d54c5f200ab7c8fb4239052aa1e22443dda36cba957e1b9d85883b0469a03c47694e7a18ac75ec06f205468ba59393a SHA512 f49e16adab91e07ce5b38a1efe4d85c4a510946807d169e004d741fa9094df240ad2dc2733e1811bfd33227d21119b196b9e5f6568a04ade81ca019f2e1f8066
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild
deleted file mode 100644
index e0b891c02b04..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="http://rspec.rubyforge.org/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="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_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-core-2.10.0:2
-		dev-ruby/rspec-expectations:2
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-}
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby22|*ruby23)
-			# Psych and Syck are not supported by default anymore on ruby22.
-			rm spec/rspec/mocks/serialization_spec.rb || die
-			;;
-	esac
-}
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index 064596f06604..79f87e0f25c1 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,13 +1,9 @@
 DIST rspec-rails-2.99.0.tar.gz 78448 BLAKE2B 242df5d1540de8516bec8f6fbf1c2072278489add524b526f6f125e55401c7fa6c80d8a6ef11faa7d908765b25c43ca826c8cc1aa71ed2599706ba8793105f6e SHA512 0453450cf5a5435dc4f870ae7a37a299c6b17a4df04de730c14ca3d070808c9a9a70a6f485a1d0c6f4f8ddf3def6e4710ae5842e9e8f0b59c10b2177299670f4
 DIST rspec-rails-3.5.2.tar.gz 123642 BLAKE2B 7580846be34bfdf542f2c15f83e4dcdea98929b5d2feb04c645b905497522f5ee050ada800ceab975204c9671e8833b9c3fb978e4b55d6cc75b2291a96a1fd60 SHA512 4f7f03c740d7215591f9ac4fc9fb77f8d747b6446a831580518db2974b07806eab8ed29ade78afbdd981236f3c64b0d933f04be7cccf72c5e57fb85795dc7df4
-DIST rspec-rails-3.6.0.tar.gz 127171 BLAKE2B 05a9e486840f724b15bf61bb72b870a27fca47ce28d242b9613e15f006293865d8c25e964896195b5fadbf7b73267ea7d1c6e6e3d17fb7016928b951dc28ae40 SHA512 f093c96d2d0c5b75ca055bfd1e7dfb990a66288a84293c6b3bd4622dfad52716b4b60553eb83878fb566c2e4d8b25b91da2071727ef54e6dd8aa11babeb80f81
 DIST rspec-rails-3.6.1.tar.gz 127123 BLAKE2B 9dd03d8483c1ef94ca7c7e561ca2a6aad82fb8400cfd5a48f40e3feff7597aaaf2a877d72d356ffca2455e6f3069a2d60c23ebf2ff3bdb8e95d954ff88832a3d SHA512 4d83f04ab640fdee6da5d6eab2c2a3bf8e04ad2f55e1a31f1dffc3a85ea3e731f1a0ffa586825e12972120568226d52fd6c26ce261412ad69dcc73ed879e763f
-DIST rspec-rails-3.7.1.tar.gz 128940 BLAKE2B 8a5f707ca83970cd6c97f80c945b7f297fc86ba4ccbf2390d00ec0f8f0a5bc11d7eee822bae333d33d3f6acc2de7dc23f100eb59015861cc7265b2426a054676 SHA512 080d26297d722baf796463ecbb1aec29c925eddcb1e09a82479090d5b1d64c0320b0f370e4c0063ae0bddc3f7bc377d8cc5764b0464a8bc65300ec7ed78202d6
 DIST rspec-rails-3.7.2.tar.gz 129851 BLAKE2B b37619b4a953fa44ef402a0dea1531837932dc7bc147c08b29bf85dcad61c7ca72b30f28edc391ae05d5040dcc902d6571342bb51559de84ed0c93244deffbec SHA512 a1dbbde3539b09c33d85c9307126df09c508fcf39abc25a6438fb0582ec19049ee1888d7d17d256d33bba08c29792a0ec30dabc37d870a369580a58cb7ef03df
 EBUILD rspec-rails-2.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.0.ebuild 1448 BLAKE2B ab0ecb95e96eedddf57dbc1e254df43b97cd3d9a0930942b3bdc3554b7b277e8823dd8dc77eb32b58f339736b0b71f0b307202996edbc9970233c44cb3fbc3e1 SHA512 4f28e6dbf5fb2f4e188eced4b308d470c8e4275154a20ac869e2c4b4539b83f4a56c80338376d4dc00f8d8c150011d9c2ede6ad3f849389bc528b63fe5a69694
 EBUILD rspec-rails-3.6.1.ebuild 1448 BLAKE2B ab0ecb95e96eedddf57dbc1e254df43b97cd3d9a0930942b3bdc3554b7b277e8823dd8dc77eb32b58f339736b0b71f0b307202996edbc9970233c44cb3fbc3e1 SHA512 4f28e6dbf5fb2f4e188eced4b308d470c8e4275154a20ac869e2c4b4539b83f4a56c80338376d4dc00f8d8c150011d9c2ede6ad3f849389bc528b63fe5a69694
-EBUILD rspec-rails-3.7.1.ebuild 1441 BLAKE2B 3cf794cb4a3501ed6882defcce32e0d3e9be1fd78ab5b13e20cb5e8fd67801697a61f730fb51fada29bbfae36fa552e2553a541e085d06a06bee619591ef7e0d SHA512 a416bfe0d389d18d8881cd0eec566e57325401929d8497194dda1ef31dd20905bb5000804c5f5baefdaffa3dd2dd90e15a09dd0ba99a814efe07c4635404d481
-EBUILD rspec-rails-3.7.2.ebuild 1441 BLAKE2B 3cf794cb4a3501ed6882defcce32e0d3e9be1fd78ab5b13e20cb5e8fd67801697a61f730fb51fada29bbfae36fa552e2553a541e085d06a06bee619591ef7e0d SHA512 a416bfe0d389d18d8881cd0eec566e57325401929d8497194dda1ef31dd20905bb5000804c5f5baefdaffa3dd2dd90e15a09dd0ba99a814efe07c4635404d481
+EBUILD rspec-rails-3.7.2.ebuild 1448 BLAKE2B edb9e628276bc97d90ee7f9272145da0f03fc50d3736362e45851b113dace36b93544fef8c8a4cefe68d93d265d2bd7bc4e4ab9c6f523147a19c265f20e60c40 SHA512 b8a8b28c585ea62e3d29c07b01e0758503647561b3f0b798354ff3097433890245baf3b4b83491620b1575d77f5941867adfc4c5bd27e0957cf224def09ab466
 MISC metadata.xml 343 BLAKE2B 3c1684a27906b05d1f72b32ec225db0fcd6e051bf9d6a3b4f83e3cc1ff63201410594a6b2a2664ca008b7756b6e98cbbcc3981136075dcc41a622f3ad3566b36 SHA512 bc9d8d9978e4bd845b10fabf5256e53a1a0c3835305f7e72502d1074e2692fdeaca15b2ecade251be8dbbae544167072a920db14a964644b70782f37b9d91369
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.6.0.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.6.0.ebuild
deleted file mode 100644
index 3bd3af117184..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-3.6.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="http://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
-	>=dev-ruby/actionpack-3.0:*
-	>=dev-ruby/railties-3.0:*
-	=dev-ruby/rspec-${SUBVERSION}*"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? (
-	>=dev-ruby/capybara-2.2.0
-	>=dev-ruby/ammeter-1.1.2
-	~dev-ruby/rspec-rails-${PV}
-)"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm -f .rspec || die
-
-	# Avoid bundler-specific specs.
-	rm -f spec/sanity_check_spec.rb || die
-
-	# Avoid broken controller generator specs for now.
-	rm -fr spec/generators/rspec || die
-
-	# Avoid loading rspec/rails explicitly since ammeter/init will also
-	# do this and loading it twice causes an error
-	sed -i -e '/rspec\/rails/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.7.1.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.7.1.ebuild
deleted file mode 100644
index 3ed686593009..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-3.7.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=6
-
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="http://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
-	>=dev-ruby/actionpack-3.0:*
-	>=dev-ruby/railties-3.0:*
-	=dev-ruby/rspec-${SUBVERSION}*"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? (
-	>=dev-ruby/capybara-2.2.0
-	>=dev-ruby/ammeter-1.1.2
-	~dev-ruby/rspec-rails-${PV}
-)"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm -f .rspec || die
-
-	# Avoid bundler-specific specs.
-	rm -f spec/sanity_check_spec.rb || die
-
-	# Avoid broken controller generator specs for now.
-	rm -fr spec/generators/rspec || die
-
-	# Avoid loading rspec/rails explicitly since ammeter/init will also
-	# do this and loading it twice causes an error
-	sed -i -e '/rspec\/rails/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.7.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.7.2.ebuild
index 3ed686593009..bb19436f8e13 100644
--- a/dev-ruby/rspec-rails/rspec-rails-3.7.2.ebuild
+++ b/dev-ruby/rspec-rails/rspec-rails-3.7.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=6
 
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 5da36533e2be..9b6c7c0793ee 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -1,9 +1,7 @@
-DIST rspec-2.14.1.gem 4608 BLAKE2B 99889bb3f46f2a337ba3fed678920f56583d75e873f80f97afc06bf6eea826994575fd8f1c25841089efde7e7c10d200cd6085d23c2fc8c47ab7d34954d418fb SHA512 cb5f7b720860c7a0f9f3aabf08b2b6ebf0a6cd220fb019c4b9a03368b9fd5b8049c3a374dff1251d261f6d0046f120e574f59b16f3775a478c04bb691785f720
 DIST rspec-2.99.0.gem 5632 BLAKE2B eba837aeebcb0d65dc18a644fd935f241a6703998885418460b2c0bb59574ef144c416518099a77905ca7676852903804169d1bafc2cf8b3f79654b669c43762 SHA512 bcdf5e86938b102200144c49370e0a0691e39a8720048df2eab1a55f95a5bc5e4ced84c7da86d0ddc83ee4ce0f40602c2ae7ee10e55dccf8bb8b769ab048ebb8
 DIST rspec-3.5.0.gem 10752 BLAKE2B 8c28574420f7beea0a8ff2a2c0237ea84c83dadee14edba229e8215e8620d801be941d5474cfd53357552f4210907cb15ba853bb88e3ad9b72d35b86c617c3f4 SHA512 0500f09e46244746967f5efebcfbc96d4cef14c5f68e6ad3d510e151ed83c865a3478ae6e42dec0f0793db7db52ae2394768b6b331ea5ca8d30bc19523cad5b0
 DIST rspec-3.6.0.gem 10240 BLAKE2B 334fb89dcc8926b264999dcdae231916dcf9c45515192b9a053a22a240a2da3830b46cb87430bc3f4a7368bbd0788e987f992e0f4dac3872233ad7d0e7f3fc6b SHA512 ff0208209fffe205038e75ea410d0a0c140d35f9dcf46b699d9359bb17b8d6e92c4c3643b8f99d741921dd4a4b9bc62e639f5d48f46e4e9c656dcab0f62fdbb2
 DIST rspec-3.7.0.gem 10752 BLAKE2B a0e15d557b0d9089a886d04c917feda80c7a8e5eb70a50f4635947689215c0c560d313a6728ccea751697ead97c01fa1e3b7217f202ad18d4ddecf62c4dfa4ab SHA512 5c10a878e9697030783c987ee9a6244b36cf85a2a3fb8c28bf9771900a3259da4f19c7f159180b5ff9140ab715b38b5d90cd5e0014ac1862f478c32a95e7edfd
-EBUILD rspec-2.14.1-r1.ebuild 783 BLAKE2B bb6ac53a0910d5a1da5d87e760d31692122803df0e04528f189355af98907f788c445f983fb0ae9fcda7f855c31708039c86230a51ae2c5f8a3bf4626fd0a13b SHA512 67fc73cd59e23f941fb56d27e03f800ccdd142bf52e27f8e5340843594f5855945de4a5ec11188e75786d35f8811c2e2105d8cb87727ec0e2dd7a31def01cb11
 EBUILD rspec-2.99.0.ebuild 797 BLAKE2B b868c665fca20f11f39eaf7a09afc7161e83ca3a8d437b2d809ede732a525d588da0673a5f99915162b7df54a98ddeac9ab13d41d00e9c4baeba303dd5538440 SHA512 74d8478777daf6cc609d632cc88b8f072ff5ddb5ec68286e84342c499b11d54494ead22d6a683ef09a10fe1ca976c1d9a28008db4a3fc1c5028f59871556f08a
 EBUILD rspec-3.5.0.ebuild 667 BLAKE2B 3df4ec8bc0263ff263cc1d938f614d62d1a27c45f3e1a8eb3fcc5dd1c3455dc8dfd026d9a3104813157c9f8fc29964962fbdf9a7b46d6c5acfaa6ad288dafdf2 SHA512 e10338a61d1af33eae298f1a663c93199b2d871cc2de1a2fc93299657d813b2137dc34f81027314f68de5f80fda2670cee851978f437ddeba1c9156cbeec9de1
 EBUILD rspec-3.6.0.ebuild 683 BLAKE2B ad7450fa20c0e8fd44ba9e63989c3bdc55ccbc945ca920c5f74aba3daf0ee836584781788f0ca8d0e7f0fc47341773fc55d379f4ffd7f242614866a93c0ac2d9 SHA512 2199c21070ef4dcff406764e7320a4e7fb1e4fe6c76c52e7486122ca3555931ccf108490cbc1abc928fc4c0d72830d2cbce0b5b41fe29f4ff2736880971046d2
diff --git a/dev-ruby/rspec/rspec-2.14.1-r1.ebuild b/dev-ruby/rspec/rspec-2.14.1-r1.ebuild
deleted file mode 100644
index 7181cfac6447..000000000000
--- a/dev-ruby/rspec/rspec-2.14.1-r1.ebuild
+++ /dev/null
@@ -1,27 +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=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="http://rspec.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="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=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-core-${SUBVERSION}*
-	=dev-ruby/rspec-expectations-${SUBVERSION}*
-	=dev-ruby/rspec-mocks-${SUBVERSION}*"
diff --git a/dev-ruby/rspectacular/Manifest b/dev-ruby/rspectacular/Manifest
index f184fe261232..09fe536eb47c 100644
--- a/dev-ruby/rspectacular/Manifest
+++ b/dev-ruby/rspectacular/Manifest
@@ -1,3 +1,3 @@
 DIST rspectacular-0.70.7.gem 16384 BLAKE2B 61783b9a6cfd4b8f190237590205e913074941ef65caa7a7f8e66e90ba7fd28553bc4168cc83fbe01ea526308b0adb8e885ee1786d6339d42e70406494cddf45 SHA512 dab67e89dd88cfb8741be10c385d58b3437245c623700f0d651dd4e96bcf28f063a9dd952098eb574bbadaeb077ebe7e0f9db7d6e83648c1de9a4f0c390fe567
-EBUILD rspectacular-0.70.7.ebuild 656 BLAKE2B 2f1246d3767f37eee9c7160f26b1a3b325b6829c9eb67f4f8e2d36fd324f565a82150021430f308e470fa8b7c33771c55319836dedc9658c1da5cbc5b0b23958 SHA512 bacba6d8faf53390753d1af1ad18348bdace0c3c94c4091c0f46c89fcac90cb49bf57874217f9d1d0db370e67274aedca6e3878b3aec882b9f3023c5aa94d53c
+EBUILD rspectacular-0.70.7.ebuild 649 BLAKE2B 10aa191b4587f8d171a3e4891af1620ae1c46f28802172957d3078545f622e13f7fb88d96c4ecc8b6ddf584cb85997da9c3f0a34316d4efbeef23932215ce5e4 SHA512 83e633aea3e32e53e1352a4c9075f5bd05bd4ce003248d4b413e76a06b4f76b01074cb9b4cfcb4e195ed3ceb99dd413dc7ac9448e3f814406bef6cc6ac6833e8
 MISC metadata.xml 350 BLAKE2B 478dd5a6b615f4a0ca0217d2fd4daca21b8421cc34c61d4c4356788ed059edf68a0c9b747076060415d7e9a62e17008560f44da4d0909d3f68c50ea77f5629ab SHA512 78e3ba17336c86b92811af99283d12b0bc191a2f06d907d0c792aedc17d5a39d81d00acb4b884f074103cbca587c3961dace871fc82e4a9a3fc6a9190c48b75d
diff --git a/dev-ruby/rspectacular/rspectacular-0.70.7.ebuild b/dev-ruby/rspectacular/rspectacular-0.70.7.ebuild
index 675f377b7356..bfd32a92abeb 100644
--- a/dev-ruby/rspectacular/rspectacular-0.70.7.ebuild
+++ b/dev-ruby/rspectacular/rspectacular-0.70.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="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/ruby-oci8/Manifest b/dev-ruby/ruby-oci8/Manifest
index 43842860fd56..8e051070f77c 100644
--- a/dev-ruby/ruby-oci8/Manifest
+++ b/dev-ruby/ruby-oci8/Manifest
@@ -1,7 +1,5 @@
-DIST ruby-oci8-2.1.8.gem 249856 BLAKE2B 7c75953da2b5418fe03ee6e576e94db0c58d18f2fb078ae30d29879befacb4357ea4153ec511dda3be1b5628353e32cffe903a57ca54f4ba80be27c840afe85e SHA512 897e5b86106b45e12bf359b8ed379a36a1c457daa1de9e7a8431f409ec25b12b20e30ed254a2bc77ab1abc0731f1c45e93860a36e0e6903c6fc7573a9ceeef9e
-DIST ruby-oci8-2.2.3.gem 317952 BLAKE2B 13d49364c6ee3f46dd8b54062584ca2bf32c236e2f4429f1fa1bec46c0ece220f3fbb214d739703565e0356581a6a9ee657d46413c14f76c97e10b22887b8ffa SHA512 67323ba01bb30f5e405f8b4b4e0d1749cb8c96a7b158cdd77079936e73ac651e27e1df2c0417cb20ec69fcd997a92113757c697b4e5e0b2f498c2a18da400fc4
 DIST ruby-oci8-2.2.4.1.gem 325120 BLAKE2B adb8eb38a1368b0ed305c9173c9e68f60845f454c618ba54b64c95bd6f7d1f9507c38419e5c334cbebca67ce38e7d4edba1dc4778a742147ff512bf32edf4d30 SHA512 54323843ebd3f7252b6d96cd1136752172f879bb6a67842c38e3a84effae18fddb2350be2ed4257c1db5ee54bf7678a098e2b1424508d3e597778e874bcbf20f
-EBUILD ruby-oci8-2.1.8.ebuild 974 BLAKE2B ac4a846c860d161d79ce5a57a909f4a9d82109a1512431db6c64e89308c8c4c5816bfe2e0ac6b9e9e500c2a65ebbd45d348003bc4c449af273da32eb38e1bc26 SHA512 c1f0583fe4cdf89b7b391b6a5f6fa4fdcd2374dbdeb38f161a2331a7446dde80fcd01ffcc122857e1284bd39ee01f061bc90a3366ecb49bf6abce37beb736cb6
-EBUILD ruby-oci8-2.2.3.ebuild 982 BLAKE2B 1768fc6d237e381ceb3b85a5eb0fb17917abb1cdde89db3d53e662388facce293ce943e424cba046662d55a40ea43fa91648ac4bc3f7929da957c8fd41504849 SHA512 4e4535bd56d1a3754287a784de43019788854274391828d04ecdcbdb41837c3e233879bbf19faa7b9caf8e95345fe67cbd3996d2e764f9863c8f343a8ee6ee8f
-EBUILD ruby-oci8-2.2.4.1.ebuild 982 BLAKE2B 05abf067285338211de9b2648cb1b66969300a6d7ddec9f3fa1e8a14a2497344366d2e5a28a99a09334b038885cc8f9b9fe8120d4b8071513347484c907696cf SHA512 9abef225cbea9efe169e1ee12f5709b43d9b77a3b76ac85e2778e93642c93f6defc5c22f6bd6a9d179bebf5ae728e2a92380f5ae80b86f87979b77f1e32005e6
+DIST ruby-oci8-2.2.5.1.gem 329728 BLAKE2B e235d2b252673962618d8a7840b10c62944407a08bef02a47cbd3fa091fc41404b682d9f89ff42592f16b990ff0e051d0a1b4c87409bbd2429ced488a8e67696 SHA512 e868fae291155f3fdeff2acd948fcf3e56d9dfc5ea9c60e40cc9c742a82fc924999f788b2765088d31fb680c9e192e37e6d12c6dcedd2ed1f6aeef4c8c9bfe7a
+EBUILD ruby-oci8-2.2.4.1.ebuild 981 BLAKE2B c694bdf96e4c931cd5795cb2643dea9824290ddd33663a8624dad91a88a602829e05c11eb7474b0063976f4ec26e476f8f3dd3f8a78504113730cc0e440a7e4a SHA512 fe5735116572e937e2520cbb71c9bff3a325c72f646993f5c793611ac9312944d2409c5ad156875c95f02a7b7436ba0dc8248c447034fdee16391ed8f6fa5f06
+EBUILD ruby-oci8-2.2.5.1.ebuild 975 BLAKE2B ddd511ccc9356d7a6d9a64f28702dcb9684562970213ca2a3f9dd5a8497cc2b3cc6ece84b920e062a78e5920c7d125b5542490f33ce61cf9b4644b9a0e403ba4 SHA512 d9dc71c3b3e2127dc72861c60ccb62c479effb179267f7ff41b5073656276199692a4da1d631687fa759f6d689df2243e3ff97e081e551114198cb42cd6ba313
 MISC metadata.xml 651 BLAKE2B 4ac983df534d442e63e0d6b9e664b51b2ebda1be8345721c684d683acf5a7cad953e73fc1064a7706cf43406e4439cb5f09f749a6e3efdf3face5edfae0fc61a SHA512 596959885bbdf6aa103b16ac124de1929f7d52a7df1bcbb9d28ea9442e693cf44780dcff0605d256461c70e7d2c183f5dbb930a2f9e498ed3602b3a0aa9151fc
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.1.8.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.1.8.ebuild
deleted file mode 100644
index 9988c947a842..000000000000
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.1.8.ebuild
+++ /dev/null
@@ -1,40 +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"
-
-inherit multilib ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="NEWS README.md ChangeLog"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-DESCRIPTION="A Ruby library for Oracle OCI8"
-HOMEPAGE="https://rubygems.org/gems/ruby-oci8/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-RDEPEND+=" dev-db/oracle-instantclient-basic"
-DEPEND+=" dev-db/oracle-instantclient-basic"
-
-EXT_DIR="ext/oci8"
-
-each_ruby_configure() {
-	# configure the native libraries
-	${RUBY} -C${EXT_DIR} extconf.rb --prefix="${D}/usr" || die "configure failed"
-}
-
-each_ruby_compile() {
-	# compile the native libraries
-	emake -C ${EXT_DIR} V=1 || die "could not compile native library"
-}
-
-each_ruby_install() {
-	# install the native libraries
-	emake -C ${EXT_DIR} install DESTDIR="${D}" || die "could not install native library"
-	# install the gem files
-	each_fakegem_install
-}
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.2.4.1.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.2.4.1.ebuild
index e46cef4cfdd8..9427db0ba0c0 100644
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.2.4.1.ebuild
+++ b/dev-ruby/ruby-oci8/ruby-oci8-2.2.4.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
@@ -14,7 +14,7 @@ HOMEPAGE="https://rubygems.org/gems/ruby-oci8/"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND+=" dev-db/oracle-instantclient-basic"
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.2.3.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.2.5.1.ebuild
index 34f8c9297913..6d4c7da62af7 100644
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.2.3.ebuild
+++ b/dev-ruby/ruby-oci8/ruby-oci8-2.2.5.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="ruby21 ruby22 ruby23 ruby24"
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
 
 inherit multilib ruby-fakegem
 
diff --git a/dev-ruby/ruby-progressbar/Manifest b/dev-ruby/ruby-progressbar/Manifest
index 5e690ec51c2d..4dee8a0dca40 100644
--- a/dev-ruby/ruby-progressbar/Manifest
+++ b/dev-ruby/ruby-progressbar/Manifest
@@ -1,9 +1,7 @@
 DIST ruby-progressbar-1.4.2.gem 24064 BLAKE2B 4c26f5c281129a7333c8a7a1f7738a094ec02d769293252c8fbc6df0bea99971cd0d235b6bbeba7e2e4fac10409028f7cdb15870484878c26d9ea9f709f0135b SHA512 443fc015b2dcabc76c685f1529a39ffba289cb00c3cee3992ef240fb9822729f9049db4d85c58ee1ab6cc17927cb325044ea45a968c755a9b5ad93f7b9999fbd
-DIST ruby-progressbar-1.7.5.gem 21504 BLAKE2B abb50406df3b952327bbacdb4600a66751772ab3c22053a172150618cfb36e9aa567461ea31772ae74372d9b3df4d13419994fd8597c9f0f10ea090251493e6d SHA512 1a5cb4b8ca9a9669bdaa60fcf3f01bec347b4ac1aefe737a7c6014bf40166c72d74ab0f489638c12ffd5245cc2b0a19186f7ab440bd7629579bf00d5155a8741
 DIST ruby-progressbar-1.8.1.gem 26112 BLAKE2B 2e4a8406328f07b2be0b59b5d08e8f56e17d4e5ae43325b4fadd563427aabde1e354fb05e6e67403c9f00c17e0f8e3239cdc3d0cb40d4c8cc6520306214289b3 SHA512 bded41f29ed3386b83b0c4fe208813de330cb6be527c4b91cbf436f44d0efe58cb717a783d104f32b697fe1d9b71eeec500c8a72a9a5b34fc416c86e7565bc01
 DIST ruby-progressbar-1.8.3.tar.gz 44706 BLAKE2B ef0b7bc2647da5af777e4ee88b85632ad47d7bee3a1b5f3ade57108362b663a66a78b023080039a94bb452694b41be3e6d52da1e322d1e6d86a2f28ff8aa7fc3 SHA512 c8394c9be76e00692e3e51b27be92b0aac9baede288ae514a2656a7880df61fde44f07cf16395c69a5215c3cdeb6474cce106af054be9c6ecdfd5887150c111b
 EBUILD ruby-progressbar-1.4.2-r1.ebuild 593 BLAKE2B b5d824fcbc3b51ed8b09b13290b89c3a5b09e885a605c4a7a82b1ba444362863f571b38259779cf4e6f7ff4b92b8918eb5f57fe30be725b0e58eb1e2a320cfc0 SHA512 638efd6eb6d6658f278f7d6232c913ce70782caa0e10bc44ea2c722d3e2b9cb14d6eb5787a2a958a128916c0a30713a0e8b5bcfb1ae5c3d528c6432f16c5926d
-EBUILD ruby-progressbar-1.7.5.ebuild 932 BLAKE2B 539600a2ddcb82f42e9b19c237d2eefa015f30217477ea483c95d57a5cf91205efd4babf342a907918a209295deadb462859f7375206dd661bd0eea8d95f21ca SHA512 4ec40d880be60ddd0e5df11342fa00b29b0fe97ad25d6c589a21357a53c3429df4f17be45e22b755f0646ac539baa57be000183958352c3344d082902c5c7ac9
 EBUILD ruby-progressbar-1.8.1.ebuild 723 BLAKE2B 32793da1bc5542cd0e22d250a37a9ac44310afb012a1a1c02a639d03c22a642462fc7fce55dd0024cf55d5b612a39348278ec038af36723ca2ac44e52d862d02 SHA512 c556256ab587d6f01eda25c6eb3cb48066ea15d82a35bca82d5fa36a98b2c75839da2f5a7d3e84ac0da30d81beef7f3eb80990e16e507bb8c3ac4b65a974e199
-EBUILD ruby-progressbar-1.8.3-r1.ebuild 885 BLAKE2B 41d8f0a6fa50c9cc2dde061e5064a4354fda3e1b75ea2d6df21b907aa1bd6c0340fbc19afd939eb0b254f4db214189ea6d404216fa004c7329d7515c5cdfc24f SHA512 e2ca16e101bf6e00d3111feb7eff7dba21e49ddd6920a0b97c549c15d751e685c64d643ed30a74e9cb8213d5c9829bda4f735974786250b6dae0111456431a30
+EBUILD ruby-progressbar-1.8.3-r1.ebuild 892 BLAKE2B eabe9a1b6cf1e6ab5fb51d460fd094e182e1510529905c515bd37bae25fc7ceeeea4c6b69c4d56f964e8846211ade9607535451aa1f75c79187940a0193bc020 SHA512 8a90c3af4c45e40d5d5820655ea4e0b73cf0056bc500b54878675625d56cdec9c2cffd91940c4ae793d3d656413929d1995fc772bc940ae31f8a610f4df8b233
 MISC metadata.xml 352 BLAKE2B a36b436c51b56ed96a170c6edaff16655ff0d3b42f2cc6b13e67c252f89e2d56c47ce0c69fd693acc9ddab9a755a5fbf5d72e360f2e6a16bc0117148eb7a25ef SHA512 a572b7825c4e778c503bfa3bb1b82d4d91c28285578c614a8a0c62bdf1967f307645c92f0101a4898baa0ebeac9a26455e459b2440db6989593c0cc4472df616
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.7.5.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.7.5.ebuild
deleted file mode 100644
index 3d5a68f380d9..000000000000
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-1.7.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_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Text Progress Bar Library for Ruby"
-HOMEPAGE="https://github.com/jfelchner/ruby-progressbar"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/rspectacular )"
-
-all_ruby_prepare() {
-	sed -i -e '/warning_filter/ s:^:#:' \
-		spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby20)
-			# Skip specs since rspectacular doesn't work with ruby 2.0:
-			# https://github.com/thekompanee/rspectacular/issues/4
-			;;
-		*)
-			RSPEC_VERSION=3 ruby-ng_rspec spec || die
-			;;
-	esac
-}
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.8.3-r1.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.8.3-r1.ebuild
index c18decbf5958..80a4fba0aa66 100644
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-1.8.3-r1.ebuild
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.8.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/sass-rails/Manifest b/dev-ruby/sass-rails/Manifest
index 8ce0667c8092..5dd998c61ec1 100644
--- a/dev-ruby/sass-rails/Manifest
+++ b/dev-ruby/sass-rails/Manifest
@@ -1,7 +1,5 @@
 DIST sass-rails-4.0.5.gem 92672 BLAKE2B a10dc27ff95122bb2e4518c927c5a81d4a5116bb70d60e68a6c697a7dc10d2781e2b2b702e8b0fe79d7b4562126c0f9d4c0172f5a8a604ea525027c1c8853465 SHA512 71515d2c16886d64af4c00bd78094691579bfbb3660ff9ba4d9f2807bcbedf104da2f7a321a3cc558f0e2420f702eb2bd2379cce30f1d21d8b09ab5fbc8347c5
-DIST sass-rails-5.0.6.tar.gz 89862 BLAKE2B 2626331eea22031d767b235d0187c3d8f4b12b0a74682bcab8fbeac46aa62d8021baca247442519056b6c0617a76b76f917dae38ec5026cb98e14d04ca61d6d2 SHA512 97b48e3b928c4323007b7df7f6e51d5a1c1f16c5f9276786bdb6b3a4f293ec73c4c18037cd3cd5d0bbdfa3ec92f44a8793606aba9cd23f5518b637cdee58c915
 DIST sass-rails-5.0.7.tar.gz 90425 BLAKE2B 8aceff670ba2e4993597858b74362a02307e39ac967a331005f21d384644d0dbdd414560abaa88e60d35358b47d65c146baa72f37c879a2f13178e187cc1f79b SHA512 491a1618a75becf6095b102c996e50d25fe701d3a6c1b6c6fadff81c6c09260c3ee6ff9c84abf7bc62779fa7034d54d7c0d9a7c4148d3cc741d83efda87ec0a0
 EBUILD sass-rails-4.0.5.ebuild 842 BLAKE2B c475aaaa4b5a5601639f79b1750c182e43246afff86e34043a324b172ccfe5a174e3b7ad08c0207c360951e771c371ba7721aa2532d1d95b850e523ae3c4d3db SHA512 39f80de84f307ebf5b2973e07ef994b07fe621a13123fa4ea61eb056ead7a0cb469e3b75766ec8d56ffcbe04d92bb28e0e3a6641cf6f053f73fced6765da10a6
-EBUILD sass-rails-5.0.6-r1.ebuild 1134 BLAKE2B f417c4833a1276539bd32164328f98271bec994d74021046ee4ae5b87459b525683dd36563e6dfff35e75302518e15f9da13bddb06ac0ad27786f2b1ebfcdd59 SHA512 9c11b70d9096f51f9c095c925f8e7c9f7ed9c0d726f789a5979169e6ab980dc7ebfdc75014bd737fc5a28cb6e8f1d5e0ab307a5faceffad6adec2e615c4535ee
 EBUILD sass-rails-5.0.7.ebuild 1127 BLAKE2B 5cc36c6263cb67f01e789166dcbe54d98e3f49f44099fb4af4b222b9e003d331e15198796384a0dea89c0017dded0b9b2a47294425ad3dbe6572514313c647fa SHA512 e7a209a46f779b5a662bde8c0e2abe8d4ba965387ea5a5ff02b543b5ed987b7ccdbdac56e0e5da165aab43f6097bfa23005b3f8684c99e9583405661490bde2a
 MISC metadata.xml 342 BLAKE2B ada4b20d7341b3ce1b6062b13b4e2e3bbeabd0d5c1532a1d488ba4d25b4de5b940e2632a84ba7a4fddaa02439308dd0c39d993991a3f29f45d4e6bb5a2c66a84 SHA512 92d0e35a64810351db2a1d71d32b1c93cefd2689eee3bc4eb275c9fd016aad8fdfaeb0ece230a5da7d2158f720d6715d2f15b14bf3c7e80c0211ffc895863920
diff --git a/dev-ruby/sass-rails/sass-rails-5.0.6-r1.ebuild b/dev-ruby/sass-rails/sass-rails-5.0.6-r1.ebuild
deleted file mode 100644
index bcdf529dc670..000000000000
--- a/dev-ruby/sass-rails/sass-rails-5.0.6-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Official Ruby-on-Rails Integration with Sass"
-HOMEPAGE="https://github.com/rails/sass-rails"
-SRC_URI="https://github.com/rails/sass-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
-
-IUSE=""
-
-# Restrict tests for now since it is hard to set up the right
-# environment with the correct ruby interpreter and Rails test
-# application.
-RESTRICT="test"
-
-#ruby_add_bdepend "test? ( dev-ruby/sfl dev-ruby/bundler )"
-
-ruby_add_rdepend ">=dev-ruby/sass-3.1:* =dev-ruby/sass-3*:*
-	>=dev-ruby/railties-4:* <dev-ruby/railties-6:*
-	>=dev-ruby/sprockets-rails-2.0:* <dev-ruby/sprockets-rails-4:*
-	>=dev-ruby/sprockets-2.8:* <dev-ruby/sprockets-4:*
-	>=dev-ruby/tilt-1.1:* <dev-ruby/tilt-3:*"
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rake test || die
-}
diff --git a/dev-ruby/sfl/Manifest b/dev-ruby/sfl/Manifest
index 3996c313a760..7aef3e9ef454 100644
--- a/dev-ruby/sfl/Manifest
+++ b/dev-ruby/sfl/Manifest
@@ -1,3 +1,3 @@
 DIST sfl-2.2.gem 8192 BLAKE2B 631712748d0f58a9d76087a194cd889c4cc95696df2ac755a13357e7055f0277a146f6f3df58e678f95134ec9fa1d5ecf720c702b2bf2c7e4385d443381b3cdb SHA512 9b64a966ec4125ae39d273e9ea1529f422dd17bfe2c4696574ab7725c0aad42f974febe7359dafa073c2291b47c6e351e1d549e145d247ed7c2ea6ebc5c73932
-EBUILD sfl-2.2-r1.ebuild 608 BLAKE2B 2d5d5ffbfed3191efe887cd2d2648ec6f259ce2b7d93afb07d2dec2e7d1eacaeb0b36e75be6de42f2afde5995913183deefa5569ca5f2adcd8ab4e46988b1143 SHA512 85435547215b50920ed7643e72a8a037d55672fbcb3198c38453befdd0337a31f552048271df916094f1b238a1300f99da649282590bc99558148f0b6d66251e
+EBUILD sfl-2.2-r1.ebuild 608 BLAKE2B 080f280d4ea39662e789caa9b1ccb3d0eaf877434a907355eb6de26d1770af35419c1b26ef0b0f318cd4e0067bb0f89a8b189befdf0f703aa41d3fa97c3ce425 SHA512 120c103ce8195837a26d7ebabf9ad143b67058eecf70a188a030d86f6be8837f4194fa60e534249b52c65c970da4a5c552d795cea6151f1e364108e29942195f
 MISC metadata.xml 350 BLAKE2B 1e4b5ed1332607b056a79f85f6929b2f5a7705055127e0d0de3cbdccb851cde6f9f4f4462285e4c22847dc6ac807a5a9269b8dc9d8af840ad4f1e59391e5c055 SHA512 91539030961ec4d6d9b70ac65fc3b8236521dec596bc06f865e07f2aab3b0ba80584a2a49d07d4b008a7c5ae41e9c17017a1a309bb08af5d72df15509cff8dbc
diff --git a/dev-ruby/sfl/sfl-2.2-r1.ebuild b/dev-ruby/sfl/sfl-2.2-r1.ebuild
index f98ac74dab1f..c7fb7102e591 100644
--- a/dev-ruby/sfl/sfl-2.2-r1.ebuild
+++ b/dev-ruby/sfl/sfl-2.2-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"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/simplecov/Manifest b/dev-ruby/simplecov/Manifest
index 6ee1360cb109..71399ce93253 100644
--- a/dev-ruby/simplecov/Manifest
+++ b/dev-ruby/simplecov/Manifest
@@ -1,7 +1,3 @@
-DIST simplecov-0.13.0.gem 55808 BLAKE2B eebc4d6dd7ecbe6ade922bcdf81b74a4c159f5987b46925f71a3dfdb17d11a228b6c97a4a0a4258be03163a16a1786949701d92904d58f580b613fb06c0710c4 SHA512 9cc7f88e1a8b793d69e4fc92610805202d68f1c883cdddc7ae9426d250ebd68d72b61879801897748e26750db04f51d3dd0332fe807dab6ec0b2c982b8693d69
-DIST simplecov-0.14.0.gem 58368 BLAKE2B c70c72b9a8275564427df0f7c9bf4590359ecb62ee53994c328facffbaf041548f78f02be28f556d5b815ddba52947d9eb355b54ef4f1be6b2528024a96ae22b SHA512 ce0c1960f65f15c6271d9ad75553332e3ae256ba4c28d5c4255eaf6ceb5f0222be1bd79b7773373ac30549fa9ee9fb7f471ff69eaa81359c019f96f525856cad
 DIST simplecov-0.14.1.gem 58880 BLAKE2B 61882c34341555ce47df82f8931a8c457d0c6d69a143fa4c9999ff0b3aafb8510d2957627e1dfa9e3819c1509670fdc0a062021eb6655914cc935f9abbd584a1 SHA512 7b62fef6df1d3b395b03a5444d65430ae645aca7c13e6694f4377b35a82c0b4503e5d53a94512ff06e634a6d81331a8bce31787dba793517ecd3e502220afbaf
-EBUILD simplecov-0.13.0.ebuild 1001 BLAKE2B 8235bcbac811160c312b1ce03f602af304e5e4449684e574a55e09fe2b1b13d9b7ad4e55499be1eea8deb51e02f549d15a7a1daadaec3d77e3a010af802da653 SHA512 ed3380810636d11f42f62889239a94678feb40fef3c63ec77f0c27e92a53baefff9f50debab0c99ac074f3787e7c33c24a880fa880890e210486c297483ccf00
-EBUILD simplecov-0.14.0.ebuild 1001 BLAKE2B 8235bcbac811160c312b1ce03f602af304e5e4449684e574a55e09fe2b1b13d9b7ad4e55499be1eea8deb51e02f549d15a7a1daadaec3d77e3a010af802da653 SHA512 ed3380810636d11f42f62889239a94678feb40fef3c63ec77f0c27e92a53baefff9f50debab0c99ac074f3787e7c33c24a880fa880890e210486c297483ccf00
-EBUILD simplecov-0.14.1.ebuild 1001 BLAKE2B 8235bcbac811160c312b1ce03f602af304e5e4449684e574a55e09fe2b1b13d9b7ad4e55499be1eea8deb51e02f549d15a7a1daadaec3d77e3a010af802da653 SHA512 ed3380810636d11f42f62889239a94678feb40fef3c63ec77f0c27e92a53baefff9f50debab0c99ac074f3787e7c33c24a880fa880890e210486c297483ccf00
+EBUILD simplecov-0.14.1.ebuild 999 BLAKE2B dfaad6b5f99b81d6f084baced7a1e663fbd355218ce2c5a73865ae8a43c227c8da1911520ce19c57f155ab5bb5a7fe11ebd5838a9212d82837b2bb9ba701e0bf SHA512 dcc3b1db6df4cec60c4fa9d1f61e57e95c19a5ae7361905577a84e50ce393b36a5616814b10bf164a228e72d8b2cf4b899fb34694b03d6f29ee33cb84205587d
 MISC metadata.xml 345 BLAKE2B b1b086ff87954b47674d7c4ea2e3179d43c10fab22383c937600b0b83675a9dba5434dc9425a1dd1bfff27c8bb81d36fc558523a0b80ed818a37ff9585dc094f SHA512 ca0ae8784caca2cc0091622a5bfa3796600239a0d81bc5338eb36f743db99f36ba7b50866b1de1cd2ae541f2c2dff96c648f5cdb0661ab766501f4c757d2ddd5
diff --git a/dev-ruby/simplecov/simplecov-0.13.0.ebuild b/dev-ruby/simplecov/simplecov-0.13.0.ebuild
deleted file mode 100644
index ec401c929eae..000000000000
--- a/dev-ruby/simplecov/simplecov-0.13.0.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="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Code coverage with a configuration library and merging across test suites"
-HOMEPAGE="https://www.ruby-toolbox.com/projects/simplecov https://github.com/colszowka/simplecov"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0.8"
-IUSE="doc"
-
-ruby_add_rdepend ">=dev-ruby/json-1.8:0 <dev-ruby/json-3:0
-	dev-ruby/simplecov-html:0.10
-	>=dev-ruby/docile-1.1.0"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	dev-ruby/test-unit:2
-)"
-
-# There are also cucumber tests that require poltergeist and unpackaged phantomjs gem.
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' spec/helper.rb features/support/env.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec spec/*spec.rb || die
-
-	#${RUBY} -S cucumber features || die
-}
diff --git a/dev-ruby/simplecov/simplecov-0.14.0.ebuild b/dev-ruby/simplecov/simplecov-0.14.0.ebuild
deleted file mode 100644
index ec401c929eae..000000000000
--- a/dev-ruby/simplecov/simplecov-0.14.0.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="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Code coverage with a configuration library and merging across test suites"
-HOMEPAGE="https://www.ruby-toolbox.com/projects/simplecov https://github.com/colszowka/simplecov"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0.8"
-IUSE="doc"
-
-ruby_add_rdepend ">=dev-ruby/json-1.8:0 <dev-ruby/json-3:0
-	dev-ruby/simplecov-html:0.10
-	>=dev-ruby/docile-1.1.0"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	dev-ruby/test-unit:2
-)"
-
-# There are also cucumber tests that require poltergeist and unpackaged phantomjs gem.
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' spec/helper.rb features/support/env.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec spec/*spec.rb || die
-
-	#${RUBY} -S cucumber features || die
-}
diff --git a/dev-ruby/simplecov/simplecov-0.14.1.ebuild b/dev-ruby/simplecov/simplecov-0.14.1.ebuild
index ec401c929eae..f654c61a46c8 100644
--- a/dev-ruby/simplecov/simplecov-0.14.1.ebuild
+++ b/dev-ruby/simplecov/simplecov-0.14.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="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
@@ -21,7 +21,7 @@ IUSE="doc"
 
 ruby_add_rdepend ">=dev-ruby/json-1.8:0 <dev-ruby/json-3:0
 	dev-ruby/simplecov-html:0.10
-	>=dev-ruby/docile-1.1.0"
+	=dev-ruby/docile-1.1*"
 
 ruby_add_bdepend "test? (
 	dev-ruby/rspec:3
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 561c87661dfb..6b9e6d5642d0 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -1,5 +1,5 @@
 DIST sinatra-1.4.7.gem 369664 BLAKE2B 6b397a440c0ba2016127c38534fc3dde2198d286b2627b8333024d6df10c2a0c28ae0c8b49ead224f0b473699d331fa8993ecaa022b372bb2710e33c4ee9b3db SHA512 f13531390af95e0bb42f7c5cc350e3aee7136c1bb81b487ef71cc194ed6675722a1c23ff6b65ac0e3b2c1a0986bfa733c4a0f24cf9bbe0168a18cd4d18d8a13a
 DIST sinatra-1.4.8.gem 369152 BLAKE2B 8a344f85c34dc8736180551690bc55ee615118a243c48421711339f2ef366e6c6facfecf914594f0440a825244e13f98648d11903fd9053054767a58a34aa285 SHA512 e56a5a6d7ceb0be4bc537feb6ada2956f1fd64b452dee347b259837aa02041dfa53d9808531cdd0a02a91093ba92f7c505c39f0dd990dfbc6e872681f40bc5e9
 EBUILD sinatra-1.4.7.ebuild 1144 BLAKE2B 762fdaa83a90765a87c265699daad1d2bb97aed7c20e996ebae625e38b0d72e9fea90e6e7e639ff418c7fa45ae03b51dc633f2a889a93decab1deb7e9758fe76 SHA512 13e8ed290ba2d06d6d2fa0cc60e6a51bdef831827b23ccd5e220f019adebaedfe39ea6f57487a1e3bff5286b479ea3890181e9cf62c1547295f9cc79a63e17b4
-EBUILD sinatra-1.4.8.ebuild 1272 BLAKE2B c1987fd4ca29272dde927759a6697fe70a7db4e40a6578bab8323dd20367f67f8e25a338bc01d39867e8ba3d1f7de7059edc0880d3471ed0c275dcbd636a79ec SHA512 1f43db891e4461f403937ee5ea807131060b7c92a65065b729fef267006fcf92cff4e071949f39a15e7eea93b0e6df4631fce9362b821d829c204b3a46777455
+EBUILD sinatra-1.4.8.ebuild 1271 BLAKE2B b1b32083183a8cbcf51c91fc6d152d8df6caab59c19e7437cddf378ad2bc4332e7f457b7ce390227a4d3191a204037f5abac6ec3ea4116f8953446cb66ea1fd3 SHA512 cdbe55ac9a8045233bbaceee9f004cdef4584195dd241db54be18360b39221c51a0e31f2ad02b5ef75ab4987b4b52b04e2727da93ed940efc4b900c2e286fb57
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sinatra/sinatra-1.4.8.ebuild b/dev-ruby/sinatra/sinatra-1.4.8.ebuild
index 81a2a696fb08..5375a143bc49 100644
--- a/dev-ruby/sinatra/sinatra-1.4.8.ebuild
+++ b/dev-ruby/sinatra/sinatra-1.4.8.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
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.sinatrarb.com/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~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-1*:* >=dev-ruby/rack-1.5:*
diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index 9907cbeef60a..71450dc1e1c5 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -1,7 +1,7 @@
 DIST slim-3.0.7.gem 97280 BLAKE2B 8346e2dd6330b597e0c1f0d4257978c1acbe38014c2fed249a9137b73ca8ee4945a63e2c1453144b7a9acc3f07a755e2ae31622c6b8d8e5554569a01d7d142cb SHA512 b410ed35941a3cfc68f8ab5649450381f830f94c8503e062afcd097f5a669df4cf8035d0baefd42bffaad5d12766baf70bad3eed82149fd861f615649ee469c0
 DIST slim-3.0.8.gem 99328 BLAKE2B a63191186223e32f36cc19b9513b22b2312c9d848aa39067d687cc92b46de9415c1d8cc618cf4b79547405b1899e4b5fe7bcb9b142d6e2a7a7cf101af2df618f SHA512 c9ed748c221f1bc25f3442900e93db6674520388c8d958bb40516172b97da042cd2e20fd924f9c85382b08eb39e399ae675c4d4e0b1d884ceef7339697345dd4
 DIST slim-3.0.9.gem 99840 BLAKE2B e449585fe5642c1980b4d8fb0c93979d8c16020c331f1bc2993c6f7b5bb3e55c1b85595711bf3acdc369c6a3fbfdc6873a8208c59aedaa49dead1cd9166347d4 SHA512 220dbcde230aab05e294022924346fbb02a1bf813a7c97910c2f60d7b3a7dd498d04f6f4f2883b895d2a3e6e9f526331914e3ab4560e748de2bd991358cca90d
-EBUILD slim-3.0.7-r1.ebuild 1683 BLAKE2B 401501c7654d2c142f2b01fb1e9e793a5fbdf5877e4fab97bc5453f6aa742b9bf45dcd4b5823c586c6b0f5702280c8281d62b51d5725e07b12afeba672d10a16 SHA512 e09662ee69c1ce793f0e13f764754a1158dd2ea1c5ec68a72df77d01bbdb145afbd969f79c38124c272e8ad183b80bb8c7bb048b9b936f5806bd0adc2ddb38fd
+EBUILD slim-3.0.7-r1.ebuild 1683 BLAKE2B 73f77c95d292b746257a97cbdf16a243825083e35465c046dd90a88885dde80d8165a3d03df9d2fab1c4f9736c774d1dab7f731217715bdad1c8718483794d3c SHA512 00d7b9b3052d361900dab3bca6ef0236a17c4b10b366ee1fe79a4f863689d008de7a37aa53a7c9dd5b8238157feb44194bfc5a1b5ef4182e62ac075ab7605a8f
 EBUILD slim-3.0.8.ebuild 1588 BLAKE2B e45ac0134d76e10ec6ef9f40575d2921ade3403759bf43902b098ed8c13bd95a152a6cc6d414d65344697ad9bf79b1ef7c1a7a7c3bfe55c57666ad8b64b20fbf SHA512 d784f569a9b17d934d7f1bc11ddf31af127c759812069acc4cd4186678ebcf27b90437f216b02487a91ad9be3301c1de94dd9c66d3f37f7f5d34af7a12158f43
 EBUILD slim-3.0.9.ebuild 1581 BLAKE2B 1a5bd8f0cc477c674f616cc1aafad073222f8266375bd79a04922679cadf609e4b89853bbe888809b7058cf073b5981a85ea7828b59eb3f4ca6afa61c2ca0d93 SHA512 9309a3192fc49b1514dc87c86bd3c7b1a97454f5387eb4804fc21f37d410fdffa638c60996622e310f30a9aa26dc2c4e7c7e3bc4e97124caa02d0ee826629c16
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/slim/slim-3.0.7-r1.ebuild b/dev-ruby/slim/slim-3.0.7-r1.ebuild
index 7b9a00738407..7d61c772992d 100644
--- a/dev-ruby/slim/slim-3.0.7-r1.ebuild
+++ b/dev-ruby/slim/slim-3.0.7-r1.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="CHANGES README.md"
 
diff --git a/dev-ruby/spreadsheet/Manifest b/dev-ruby/spreadsheet/Manifest
index a4e6b7c3f817..837485af1d62 100644
--- a/dev-ruby/spreadsheet/Manifest
+++ b/dev-ruby/spreadsheet/Manifest
@@ -1,5 +1,3 @@
-DIST spreadsheet-0.6.9.gem 160256 BLAKE2B e669e020e7df13ec9826b06e311d31ba13d000630185f98623cfe344fa2fdf515e0cfadd7c6a1e0def0f882c1498fc6c264df55ecc99d097f941eba8c642aa3e SHA512 9400908153a671cfcf17dd9dfa8db7de0a9c95281ba6dbee1ac8002e9f0058616e5887e36eb2e1e2c790516731117d5a0f7efdbadcaaea3c69a8f9aa8d3091ac
 DIST spreadsheet-1.1.3.tar.gz 4655837 BLAKE2B fdb28822c0d40eaceaeccd7ecb7861fa7ab9cf2f775aeca2f5fa00dc7932d17f1cbf5298aac4458109bada8e1d97a5a537f9054cc947aa4140dde3ae260556e3 SHA512 c1529318384c4e48abe20aad21aa80d652ab91bca505379c310707fa23382654252bfc04d1f8bdb7aa6ec00d0e064790e3ffdcf1c1089bd49010e79729a36690
-EBUILD spreadsheet-0.6.9.ebuild 768 BLAKE2B e8cbe6a6c44bac27a814fd44d4793c591bf26ab7c5d90e3a407907134b4339c9e2483cb2dbb09efc119d252c07a5d9aaa4603ca4ed161611658f4d96f8486895 SHA512 095f922312704beab8c4bcf17c48510b313810474fa9b0005a64a962fd8be62be88850dbf8d2b1d00bc11757062d36c97da933bb9771ed43ca709153238d5381
 EBUILD spreadsheet-1.1.3.ebuild 851 BLAKE2B 475e28dcb09dec4a4c2c3694f5a882a54b654fcd85b870ff0f0d83e115f8dccd51829aef5d5ce9ab169a6074ecc779632963154ce63069fa326a259348269678 SHA512 31cb85c7478832fa0beb9e4ff691583f91fec1852b80a78784011065f1c6ee1c65a2c61ce95a5586e9f77ca32142c6097479415b3c751eb5dcc70e5a9758995a
 MISC metadata.xml 452 BLAKE2B acebaf37b6e910c08eda195fab8eb473c2516d5a22d30b64cbb564d25e9c162d3f2a5918fe5ed208533fd847de10ba374c5647f18d33f2045ced2c0fc6158af8 SHA512 a0677ee7cb739f0108436f4021f487e59ad4d24af2d3e08c463b0042cc3016f02a025cbb558a68c04cb13fac2b099530fa3c17b29b473c9371b2243810664416
diff --git a/dev-ruby/spreadsheet/spreadsheet-0.6.9.ebuild b/dev-ruby/spreadsheet/spreadsheet-0.6.9.ebuild
deleted file mode 100644
index b49c5b4c3ec1..000000000000
--- a/dev-ruby/spreadsheet/spreadsheet-0.6.9.ebuild
+++ /dev/null
@@ -1,29 +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"
-
-# Avoid the complexity of the "rake" recipe and run testrb-2 manually.
-RUBY_FAKEGEM_RECIPE_TEST=none
-
-# Same thing for the docs whose rake target just calls rdoc.
-RUBY_FAKEGEM_RECIPE_DOC=rdoc
-RUBY_FAKEGEM_EXTRADOC="GUIDE.txt History.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby library to read and write spreadsheet documents"
-HOMEPAGE="https://rubygems.org/gems/spreadsheet"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-ruby_add_rdepend ">=dev-ruby/ruby-ole-1.0"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 --pattern='.+.rb' --exclude='suite\.rb' test/
-}
diff --git a/dev-ruby/sprockets/Manifest b/dev-ruby/sprockets/Manifest
index c140444a4f79..0743a7a8b8be 100644
--- a/dev-ruby/sprockets/Manifest
+++ b/dev-ruby/sprockets/Manifest
@@ -1,13 +1,5 @@
 DIST sprockets-2.12.3-git.tgz 195647 BLAKE2B 332855d9505456ddf2cc17e8027c1a048ff503c82deb4cb22d0df1d1711a88db11b2e9b3a102843e1affc8d4c676726344f5676248ea8a3e8de57746e4fba4e1 SHA512 fd9544ed946bdf95968f198e74a36b682613d68e29a46708fd46c8b58792bf52526936b4c8d9ec3acea8f7cce789a69bcf4da3269741d43e186001061cbed03a
-DIST sprockets-3.4.1-git.tgz 298315 BLAKE2B 4f904fc8f1a252f85495b09d8889a4fa61e7c2ece55e8f00fbe388793dd084ac7ececcf283b7d62c9c660ac427263c723af61d52f9aae560fac5cdef2e4066d7 SHA512 dd8bae1d922b662ef3215742731024d13b3fbc435124bb25351eeb6d33363383cb630ff60a8f6199205f31ed484e76c4a40d2c8a02b05e35bd9e73eb43a951bb
-DIST sprockets-3.5.2-git.tgz 302784 BLAKE2B 189d590ca7e36cebdde3e3a2497946f55ad620cfd74f7f92270438afb26745113936037bd684c1ae93d842ec0d09a2713e35353d2ba98122e935c33639343d43 SHA512 8e599cf646baf53650ecafc65923d7e92c0d04cbf7207f64a0aaa4098d068ce4a1c252c5ce879188cff9d9af6f88ba50fa39d7af643b2668f23b1b8535a284c2
-DIST sprockets-3.6.3-git.tgz 367032 BLAKE2B 0d8846cab53b2f3e89b08988f031e8331b958d5e6d6a6b13c18244f57e841d31ee0dbfe28346b898da04610926301ab0c5ff8b5eaad80c8b08a2351e9c9e81ab SHA512 4e497e87e0a5e93baa142071bf200810b47ad26dd9f431dbcda8e332629d971e94d43da2ebd04331d7be7f6807a4c707bdd0cf33303aa689da8996be26adbcac
-DIST sprockets-3.7.0-git.tgz 368648 BLAKE2B eea0843ec57712e330e137a52c949d74131bf72755c5531ae154c4def707a6557466fcdc64444ebdfc3f34bfe3418ac8fec6255e6b23a6ec20790661c04b8275 SHA512 ed9e2ee8515a69e56816701182502b09fcad25900a6f77696daa32e943d6ab0ec01cae9df2592373b00f2e28fbc63c7476ffff793702a9d6857f38ee913781f6
 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.4.1.ebuild 1612 BLAKE2B 0190f2871c0b110a8c6db7ecbd210d737743beb92bde9493a209fe60b69bb74022e03395f7757c1985699e1f0070010b98bc4c4c1776219779bf69aae733b101 SHA512 29a11f2a50e5ec7bd768b54221796eea8fe522a191794ce8d976ec5cdf42ae37d6a3935de2529a4c4804512d02d0cddf8f0695da9d91f0b701f5a8d7c06e8e25
-EBUILD sprockets-3.5.2.ebuild 1623 BLAKE2B 2fd21383b915bebc424d823a296e9fbfcc2ce019faf6e98aca1eddaac8e00bcadb466d600b5f9180ad5f6b59b760419a71fe750961231ed0f55660b4b3bf05f4 SHA512 a0f8082eb02853b9802817dd281421ca4979f94a3aed7052b9470fbc1527adb568a4ea645bcfe51fbf677a7b161578f913ddd159ef7ca9a816a39dd2044a6cd9
-EBUILD sprockets-3.6.3.ebuild 1689 BLAKE2B d95adfba0f54f800f6bedceac4db5b876e276947f1796eac8db7cb168c46a8d2e882ebf0b23f02702ac30abc286a52a755e49fe180c088130b05a5f3e2e563f7 SHA512 e661c692b0aebacc5f0fc5f75cccca4365acae44f8076b3b50c4a3a2438f075ae2bc959d8e93b37ac9713f74420654f741090e591877ed609411b6845891b812
-EBUILD sprockets-3.7.0.ebuild 1689 BLAKE2B d95adfba0f54f800f6bedceac4db5b876e276947f1796eac8db7cb168c46a8d2e882ebf0b23f02702ac30abc286a52a755e49fe180c088130b05a5f3e2e563f7 SHA512 e661c692b0aebacc5f0fc5f75cccca4365acae44f8076b3b50c4a3a2438f075ae2bc959d8e93b37ac9713f74420654f741090e591877ed609411b6845891b812
 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-3.4.1.ebuild b/dev-ruby/sprockets/sprockets-3.4.1.ebuild
deleted file mode 100644
index c16abcea54c2..000000000000
--- a/dev-ruby/sprockets/sprockets-3.4.1.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_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Ruby library for compiling and serving web assets"
-HOMEPAGE="https://github.com/rails/sprockets"
-SRC_URI="https://github.com/rails/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/rack-1*:*
-	!!<dev-ruby/sprockets-2.12.3-r1: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
-	sed -i -e '/.ejs/ s:^:#:' test/test_asset.rb || die
-	rm -f test/test_require.rb test/test_{closure,eco,ejs,yui}_{compressor,processor}.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
-
-	each_fakegem_test
-}
diff --git a/dev-ruby/sprockets/sprockets-3.5.2.ebuild b/dev-ruby/sprockets/sprockets-3.5.2.ebuild
deleted file mode 100644
index 34cc94d2929f..000000000000
--- a/dev-ruby/sprockets/sprockets-3.5.2.ebuild
+++ /dev/null
@@ -1,59 +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="sprockets.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Ruby library for compiling and serving web assets"
-HOMEPAGE="https://github.com/rails/sprockets"
-SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/concurrent-ruby:1
-	=dev-ruby/rack-1*:*
-	!!<dev-ruby/sprockets-2.12.3-r1: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
-	sed -i -e '/.ejs/ s:^:#:' test/test_asset.rb || die
-	rm -f test/test_require.rb test/test_{closure,eco,ejs,yui}_{compressor,processor}.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
-
-	each_fakegem_test
-}
diff --git a/dev-ruby/sprockets/sprockets-3.6.3.ebuild b/dev-ruby/sprockets/sprockets-3.6.3.ebuild
deleted file mode 100644
index 06204c4cbf44..000000000000
--- a/dev-ruby/sprockets/sprockets-3.6.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Ruby library for compiling and serving web assets"
-HOMEPAGE="https://github.com/rails/sprockets"
-SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/concurrent-ruby:1
-	>=dev-ruby/rack-1:* <dev-ruby/rack-3:*
-	!!<dev-ruby/sprockets-2.12.3-r1: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
-	sed -i -e '/.ejs/ s:^:#:' test/test_asset.rb || die
-	rm -f test/test_require.rb test/test_{closure,eco,ejs,yui}_{compressor,processor}.rb || die
-	sed -i -e "/bundler/d" Rakefile || 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
-
-	each_fakegem_test
-}
diff --git a/dev-ruby/sprockets/sprockets-3.7.0.ebuild b/dev-ruby/sprockets/sprockets-3.7.0.ebuild
deleted file mode 100644
index 06204c4cbf44..000000000000
--- a/dev-ruby/sprockets/sprockets-3.7.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Ruby library for compiling and serving web assets"
-HOMEPAGE="https://github.com/rails/sprockets"
-SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/concurrent-ruby:1
-	>=dev-ruby/rack-1:* <dev-ruby/rack-3:*
-	!!<dev-ruby/sprockets-2.12.3-r1: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
-	sed -i -e '/.ejs/ s:^:#:' test/test_asset.rb || die
-	rm -f test/test_require.rb test/test_{closure,eco,ejs,yui}_{compressor,processor}.rb || die
-	sed -i -e "/bundler/d" Rakefile || 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
-
-	each_fakegem_test
-}
diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index f7105fb30338..f13103fe99af 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -1,7 +1,3 @@
-DIST sshkit-1.13.1.gem 147456 BLAKE2B e77a88dc5fd09198a5e6def16947a3624fcb70cab8ea6be9ae66be6613d93da47e3c4cb4cb13fbdc7a4c620dd0065e54bb54135b3e44f41883ca2caaf40a5133 SHA512 da262cec2c32978a2f315d97ff174e47fbb131f26cbc06f894b3f3119797cd330c48aae1461176861c862b65504b9811fc492b2e162e9848fd09e62ef5ba8a5a
-DIST sshkit-1.14.0.gem 147456 BLAKE2B 0b5c5c157201ace57b3a107a24f08250c3906442eb55a0e698633a6114d643aa81e156dc8c5057c890bc78cf2c4c2ba8a142111c52dcfe5a51e1490df1df2304 SHA512 bb0934dc87e02813e24983aa21b9d508c612d3a84d9efdb342d4f73989e9ebf0177593b468391192223abb3930a1286040d996f4480385f129cf933feaa85d45
 DIST sshkit-1.15.1.gem 147968 BLAKE2B 52bde587de6a358174df6d79df8b8179960811d68ee933655f9df82e20e47481e9f32401276e613d97fc7327fce3891ccc70fe514ab8f5b2a30aff1f640ee139 SHA512 acac745b7ff1cfdd054b683219ca68233e1453430ec0bfc1efc96cb009ad257262c276857d9bc02854a6352a98feda845d728ae63e8b046a09210eebe8661665
-EBUILD sshkit-1.13.1.ebuild 1189 BLAKE2B 4af33f633865ba5c97ea7ef322b5c9279d5a9382a8d01ff037c68f09e4821211d80d4b335a5fdbf065131e54d34ae703ff4c88eb17ade22c2457dcd3b970d786 SHA512 889041cd10fcf37c1c3c7531d94e5a0f7aee2c894f902bc465b377630b16d6ff97ec199fcfe9fbc74377f6afafc08686d66fb16dbc3170e94faa8b89b31c6b03
-EBUILD sshkit-1.14.0.ebuild 1189 BLAKE2B 2a65b644bd1f7acf3831be2655cdff0283170f7ae1dbf97477c301c62dfffc696df16905ba9fb4e499674ff4e6b4e36552bd6d5b2084d95a24fc0a0f7fc4abe5 SHA512 2dfa73f0ccdd5205c0c7495cf36e49ee1e3a4a5b612d477e691d64cd4a058b192d9f08e5d54f997954ac366783bf71f90123a9a03cc7d5b8b917a1ee806ccd28
 EBUILD sshkit-1.15.1.ebuild 1182 BLAKE2B f8fa326ef24ef56145bab28a6c8de72a189adfe98b3fdfebc4ccd20820a6a0c2457528692206ac6b41f911fc271290dd9f81af6d190b65492cbba9a3ae689c65 SHA512 4f8ba190e3a1bb446b0ba8682efc4d8896b9fc72158491e463aaeaf6ab68f55a860af0fb50caa376a85d095ebc6d49bd6c716691b6a2715ab41b03614f0daf23
 MISC metadata.xml 343 BLAKE2B 0f8326d45916642aa200df9ede8640367ffbf73022b847f54f8869884a592489bc26a0da45406cd5409973e43290dafa3cb785460e7da61c20de3a796e025a03 SHA512 852971e242c5500cf6ce4fb0c2bc58560b96fdb8cc0f366fa41cac8e066f408330962cb86a35171c08bdea3493be81fbb10bb501ce207f7016a2a1b7c42d263b
diff --git a/dev-ruby/sshkit/sshkit-1.13.1.ebuild b/dev-ruby/sshkit/sshkit-1.13.1.ebuild
deleted file mode 100644
index 3a34397f996f..000000000000
--- a/dev-ruby/sshkit/sshkit-1.13.1.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="ruby21 ruby22 ruby23"
-
-# There are functional tests that require vagrant boxes to be set up.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
-HOMEPAGE="https://github.com/capistrano/sshkit"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/net-ssh-2.8.0:*
-	>=dev-ruby/net-scp-1.1.2
-"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
-	sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
-		-e '1irequire "set"; require "pathname"' test/helper.rb || die
-
-	# Fix assumption about parent directory name
-	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
-}
-
-each_ruby_test() {
-	# Run tests directly to avoid dependencies in the Rakefile
-	${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/sshkit/sshkit-1.14.0.ebuild b/dev-ruby/sshkit/sshkit-1.14.0.ebuild
deleted file mode 100644
index 1fee1e1dcde7..000000000000
--- a/dev-ruby/sshkit/sshkit-1.14.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23"
-
-# There are functional tests that require vagrant boxes to be set up.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
-HOMEPAGE="https://github.com/capistrano/sshkit"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/net-ssh-2.8.0:*
-	>=dev-ruby/net-scp-1.1.2
-"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
-	sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
-		-e '1irequire "set"; require "pathname"' test/helper.rb || die
-
-	# Fix assumption about parent directory name
-	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
-}
-
-each_ruby_test() {
-	# Run tests directly to avoid dependencies in the Rakefile
-	${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/test-unit-rr/Manifest b/dev-ruby/test-unit-rr/Manifest
index 6c461cbe5202..b330827fc8c0 100644
--- a/dev-ruby/test-unit-rr/Manifest
+++ b/dev-ruby/test-unit-rr/Manifest
@@ -1,5 +1,3 @@
-DIST test-unit-rr-1.0.3.gem 15360 BLAKE2B 9580cd202694638737e3107397ad2048366170b5cec5f230a2720cc0cfa74414cf454b8b0f14d3ac212f2636cf331d20cbdc3419c7657f370c4d6be7ceb29ae6 SHA512 211041b66b8187ea9bdcb5b79c753ef835f8837246bd35bf4293e998599fe6197054867295ba1c057723aff2367e43d68dc290f806e25f7149918702782c60d7
 DIST test-unit-rr-1.0.5.gem 16896 BLAKE2B e9424a29e5f23d11fc9daebe431e49945262633b5c4729a70b59b054e7a9d2373cc86d69dee86a82a39526ce506e21ff63dc0878313c72859cdd5ac28476aa2f SHA512 120c0c6d0b203a40062d61f3b9c915460660d1222b60878eb4bc30111d7aa51ec271d9dba138ba0b91eaa116ab07051323e1de365c6cd21f84c372748f89d36e
-EBUILD test-unit-rr-1.0.3-r1.ebuild 569 BLAKE2B 4c010927bada01f9170b94f216ade7f5f8ec49e8f5cb5c521cba1fc07ca9688c515959dcc6ca55d3e48a80357e15b4dfcf6aa38838111ab49b44cc5962a3d939 SHA512 0535b9c53ee6bbc57588adf9362a4da5c67f33485958860184345cfcbd1b5e681abf32731666dbebac13be19dde17cdd4b196c8ea45be7cc7627f682fc8b52c6
 EBUILD test-unit-rr-1.0.5.ebuild 583 BLAKE2B 8e62fe5a571cf1be0cf327b422ded596a9eb6cded49294e39fb901e88af740bd83a9ec1db5b98969b83f2bd7fd8e4def0119121f699561c295dd415b178c0ab1 SHA512 56ab2111bba9ab8ac2f82ba0b16bd221fc6fc44b4357c0beecd1e3dee3bd6aa16a899dd4a1797819f6d38c3659c42452dc31332139ce21571d2d52cef7a5e08f
 MISC metadata.xml 338 BLAKE2B 85bc12a3d50f4734ae4d5188230046205dda2e902291ea368f79a75cdc183f38329fff34b04e3b0455fc8c318c1f3cd3175a596bf93a40338f02ddc71ab7049d SHA512 4bd0e95ac4f05d5671716f6b416de5436728297faae0a32c0d2a4e0ee977066a77f70991de74d8dfe4627a13adecf50683265332023af423e4003250adaa22eb
diff --git a/dev-ruby/test-unit-rr/test-unit-rr-1.0.3-r1.ebuild b/dev-ruby/test-unit-rr/test-unit-rr-1.0.3-r1.ebuild
deleted file mode 100644
index 3e2faf448b73..000000000000
--- a/dev-ruby/test-unit-rr/test-unit-rr-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RR adapter for Test::Unit"
-HOMEPAGE="http://rubyforge.org/projects/test-unit/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rr-1.1.1 >=dev-ruby/test-unit-2.5.2"
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die
-}
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index c2254d2515e7..451357b3fdfd 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -1,14 +1,12 @@
 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-2.5.5.gem 111104 BLAKE2B c74aaffb3c7a4cee2d4bc31de9616918725af917aab507e175b16a92677ae6b83bf0c0453ce3c663ed0989c0c6e145476777750ff563280212312092058fca69 SHA512 4f710997d187011bc240ef869f5c86c11e01d9c7c8bee5fd938f194155137d7164e69bae6d63e41b90de8f7f6ab813a62131f2f9518d57b3913777923b491142
 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 812 BLAKE2B bbf4b93f0cf854f6c88dd88d1a0bf672087d520c35273e630dde345e63ad3f81d62967635d218c9adae8df2961b00916840c4f14b961d753a1bff4cb5dd637dd SHA512 3cfe35c894cf42716263cc7bddf8d2cb36d0ebe87f7b4c2bf0270f905a7b3d185055a8e423b412c6ada6b0af3c4c952ec6a89e54f83e739898570413797544f6
-EBUILD test-unit-2.5.5-r2.ebuild 729 BLAKE2B 6acc3dd37241489f366050d57ac19bb0a2d9557c339793da3f96e104398b6422d31485e7c85348a52c05687b7777da6984fbf293dc53af2186e9ba27e79ac7d0 SHA512 64939cff707ac0ea52a491015d017ac8ef6282e6c0b204ed86d980c6d27909d0a2211731bdc832305fa177fa2090c86c743d4deea794c6e3934cc6d242b01b31
 EBUILD test-unit-3.1.9.ebuild 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-2.5.5-r2.ebuild b/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild
deleted file mode 100644
index 2839444f6700..000000000000
--- a/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild
+++ /dev/null
@@ -1,29 +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"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="TODO README.textile"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An improved version of the Test::Unit framework from Ruby 1.8"
-HOMEPAGE="http://test-unit.rubyforge.org/"
-
-LICENSE="Ruby"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die "testsuite failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbin "${FILESDIR}"/testrb testrb-2
-}
diff --git a/dev-ruby/tidy_table/Manifest b/dev-ruby/tidy_table/Manifest
index 21a30c4072a2..5123934c07a3 100644
--- a/dev-ruby/tidy_table/Manifest
+++ b/dev-ruby/tidy_table/Manifest
@@ -1,3 +1,3 @@
 DIST tidy_table-0.0.5.gem 7168 BLAKE2B 7c00064c266bad9db6acf5066845cc6543c2d51fb5ac85240c9ac77d15004402588b992a0e56529123a1805e6c887ba23d135e801e07fcb918411d6706e7f596 SHA512 fbe9839587c3381ebabeb874b2460767491447b54501137f464c16bd251601670a6a260881792c117ee753e5b4d428f04295df041ffee56f109a1ff772346bcf
-EBUILD tidy_table-0.0.5-r4.ebuild 591 BLAKE2B d1aab93f2267e68fc6ce05555dd5f7bccddfe0fc3f90f7d32377bb641d27991275083d499a9edce9807c6b2b5fbe24121ff024c8cc3c707048d5a2e5c0ff789b SHA512 dc17c66d73841b870a7671dfa9c5f4e7e1f86766525f7d8fa020afed5ef2b8d929473efce183f0bc8983575b1fcbe70a5356614add5b5d23e37e2d34f9d69d7b
+EBUILD tidy_table-0.0.5-r4.ebuild 584 BLAKE2B f16a2a213b9db408044aa0d5a2ed47ea4ab18797913c37c24f362f867d404b842282177240ffdd2dea8a1eb4339ee8051054421bc29ad1ae2e8d4db6e8e42b38 SHA512 ea7ea2e2dafde42404a40b3924b0d4c360d6fb2b5ea0f45bd6ca551109aaecf66393a73cec24b39daf2513e5e1d8dceea0d89ecbd88fe449af9e63a32761d565
 MISC metadata.xml 345 BLAKE2B 3ab7b55523f2742cb7c66ba65825395616176dbc68de46e5d95e8830f34c6add52ea5f24e1b97ca5022b823b7e49985ff1eb9997209e5bee191fd1e6725aec9d SHA512 9bcbcffb393ad0e2bfc74a05ea31149e656fa947a650932b51bcef54f32ff52b576c025d073361df9ff71a5c150496cbe5d98b74b8c614466b849cf95fe7aff9
diff --git a/dev-ruby/tidy_table/tidy_table-0.0.5-r4.ebuild b/dev-ruby/tidy_table/tidy_table-0.0.5-r4.ebuild
index c39962905beb..d676c249fc01 100644
--- a/dev-ruby/tidy_table/tidy_table-0.0.5-r4.ebuild
+++ b/dev-ruby/tidy_table/tidy_table-0.0.5-r4.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="rdoc"
diff --git a/dev-ruby/uglifier/Manifest b/dev-ruby/uglifier/Manifest
index ab911c527b11..d33e18f3fa9c 100644
--- a/dev-ruby/uglifier/Manifest
+++ b/dev-ruby/uglifier/Manifest
@@ -1,15 +1,11 @@
 DIST uglifier-2.7.2.gem 84480 BLAKE2B a446f21f9b8682ba7ec020d355ec5b6eb573649116fddfe2d4d74849c59f6697065ca2837fb040a91a3f43264a71280660b947b138fd0fe67806f2c18631f498 SHA512 03c8fffbd385db9ee0fa8f422bf571ba99803f810828d536f1b00bc99a21108ac0ed232015d39f1ab88441fef0a3371df10944873fbadae6c8bd2624e3e1a65d
 DIST uglifier-3.2.0.tar.gz 169273 BLAKE2B b0263853c882859db8cc04c19e7f7f4bcbcef9d0b4080e414c9e1c86b691307c59d694abb33582485ea432b787f36445a49c39ece298d90806838bc56a4b7360 SHA512 5bc577753c175cddd7b3241f7343b75f593141c3bfa9ffa1325f7ade4a9acaf3b47e711007b5708f7cea1a7e9e768cbc3bc845d9eb362f877fe2fc83c047bb57
-DIST uglifier-4.0.0.tar.gz 183935 BLAKE2B 355081d2aebcd6e40081564397b7ae121922d33ead6942f15fc92b9743c575756513a1125810900edcc9a327ff3011e64e539d1bbadb02a06db5a5099dadf0d5 SHA512 b4bd78ea20ed3eefa9bb8d2645da9d3a1898c2715084c47ad8f3d5d0bbeae68ac84f59a449a68dee9c9eda158a2c3e8bff23507d06fc489f00ba53057911bcd1
-DIST uglifier-4.0.1.tar.gz 184457 BLAKE2B bc922057d42868f56d3755f51b9bc39460369ee32d76b97222ef3fb05dbf0c84752236a545ffe9fcd17c1a529a429b9591bcf7d4623255e85cc9ebeb693dd595 SHA512 966a7a5c0c15146feba8633f247b9ec5d7a895c8e2a993b784836c13f3d88077e4ba701c1809588463da78d894508cb35e4d958b86c4801782f9449a93963d05
 DIST uglifier-4.0.2.tar.gz 184915 BLAKE2B eaac0fae612f357a51332db420e31d568b120dfe199d4f838db92082af888085123f322c4666d9c7d350ef3a51dc2d09ef78d11887771e8c414c9211688f6bfa SHA512 77795a2b20ac6e5fc1c12cb95f868062e040988e1efc9cd7c13cd093f0ad5447fd09b1d88d5c1c53d69c9ea4e9fa22c9331df53421af5ecd3010138e91a9a87b
-DIST uglifier-4.1.0.tar.gz 189074 BLAKE2B b18e2661a1e87eaf2436d9ed89aebb05b164523bf478a3f0b5ec2587100621fa75eac38f0ac2ab724a10add7aff2a96947c32babdd246d0583f757682d704375 SHA512 46191a961471db2f515e28229e6febe3a1e448730eece965307e6993b3b0282e69ba1c6cb8cc232897b4e29eeaea4b2981af4cafa2d1afc384ad39a049c26f60
 DIST uglifier-4.1.2.tar.gz 190343 BLAKE2B 0f3b0052d7065f36dcf9c52c226d6ddd27bcafe5a85b1a1a56a9d1d31ce8e7e8986e68ff471aa33cc2dd46688bd579594bf370203bd2ace26554b5dc71764a33 SHA512 8b11b3f8dc9e6dd6d2fe856decf11a569bea2040f1443fe437759fe4d14c0410158ef40b2660f38cd548358e78f6ac27929712e8fbc5708dc215099e58de1f75
+DIST uglifier-4.1.3.tar.gz 193256 BLAKE2B c0337da0ba4b857b80b1573538ed7596950b3bc0c13661fa7f98ff96a80cc0b747ca5361fdf9e3bbbbe646ff1b476419342194386a2d66c468e5272d7200ae3c SHA512 5b0b1e5e4cd50ca2639b034ee6da672898da2dd16e226c5bf4bd706ef219d0a85f2c8a13b167766005a77207d5b32a6cfc62dce133d176d8bd37b77b27638062
 EBUILD uglifier-2.7.2.ebuild 598 BLAKE2B 866212993ed0781517edb9b12f37ec7c449f42dc7361aae98dd01ef31a40bd2936111446bfd17590a5b96f2a49d969641754b9aa7aff13d93d3e31614fc42fdf SHA512 6f6a691d0f60f9469080b8bf0840277424ea956b2cd509a1b7889c4798e90bd104a33c70c1511ea183391daa88f2a3cbc657614d1c9124d3e333e584d4a9a8de
 EBUILD uglifier-3.2.0.ebuild 800 BLAKE2B a19a8fe518ebeac3dd4854d7a1cfa86f04a03522ae79a4c5d211777dc3098f32e319923544ffd4f2220caf62cf828bd0c57ddada8abd9e8757e04131f4d7e013 SHA512 b0d20ca10593f7072a58a457fe7985f1e374936c96ff322df63688fbdaae167987132e5eb65aca13113c65d4448d39c94bef4b9eac5f342e6ee46245751db45e
-EBUILD uglifier-4.0.0.ebuild 788 BLAKE2B fa880d98f5e28680df44f3b2c92b5cf282037326d002772b4e881ab25a220848fc4b3a030fe70e20ac4a797f882ef71f63228b1ce393a309906be7db99418411 SHA512 e4c2855b456360ede9d3003f4f42fd65f5c3d2672628af5eeb1952fcd558785d48276c7d4cf3dd61679b4173ee3af998f26cd1a2fbef582d7a7b6514b797e4f1
-EBUILD uglifier-4.0.1.ebuild 788 BLAKE2B fa880d98f5e28680df44f3b2c92b5cf282037326d002772b4e881ab25a220848fc4b3a030fe70e20ac4a797f882ef71f63228b1ce393a309906be7db99418411 SHA512 e4c2855b456360ede9d3003f4f42fd65f5c3d2672628af5eeb1952fcd558785d48276c7d4cf3dd61679b4173ee3af998f26cd1a2fbef582d7a7b6514b797e4f1
 EBUILD uglifier-4.0.2.ebuild 788 BLAKE2B fa880d98f5e28680df44f3b2c92b5cf282037326d002772b4e881ab25a220848fc4b3a030fe70e20ac4a797f882ef71f63228b1ce393a309906be7db99418411 SHA512 e4c2855b456360ede9d3003f4f42fd65f5c3d2672628af5eeb1952fcd558785d48276c7d4cf3dd61679b4173ee3af998f26cd1a2fbef582d7a7b6514b797e4f1
-EBUILD uglifier-4.1.0.ebuild 788 BLAKE2B fa880d98f5e28680df44f3b2c92b5cf282037326d002772b4e881ab25a220848fc4b3a030fe70e20ac4a797f882ef71f63228b1ce393a309906be7db99418411 SHA512 e4c2855b456360ede9d3003f4f42fd65f5c3d2672628af5eeb1952fcd558785d48276c7d4cf3dd61679b4173ee3af998f26cd1a2fbef582d7a7b6514b797e4f1
 EBUILD uglifier-4.1.2.ebuild 788 BLAKE2B 7aecab5146fa68141aa804e5160d0b5d4ac64005c9bed58a4a73bbb4c134e7d1959df45b438dc346a2874df87b861a93041ad96e7e2096daf55e371e6bf393ff SHA512 8d543a8d122c3720d96e8c62b9ea251800eba48136c4561051a36483bf3d7aa77f01ef79ce3c6848a45ba637327654028675b429034e8f1d6227fc5b4481bd45
+EBUILD uglifier-4.1.3.ebuild 788 BLAKE2B 7aecab5146fa68141aa804e5160d0b5d4ac64005c9bed58a4a73bbb4c134e7d1959df45b438dc346a2874df87b861a93041ad96e7e2096daf55e371e6bf393ff SHA512 8d543a8d122c3720d96e8c62b9ea251800eba48136c4561051a36483bf3d7aa77f01ef79ce3c6848a45ba637327654028675b429034e8f1d6227fc5b4481bd45
 MISC metadata.xml 341 BLAKE2B 07cb7ce323751f520c38158ef006374652e317e5809b4fbc729c264f3b44e99fc8e1d75916d858ba50361c2d3cff389b33cba7c7f863300ae8da8002de4a8d24 SHA512 0747fa6ff0d695b149915495d5242dec8541231e0e72a2157e3b4412301d8f0767c1eab17ea72a0d9f8c1afc9107c4f55b261018744e43823c8140de38ebb0b4
diff --git a/dev-ruby/uglifier/uglifier-4.0.1.ebuild b/dev-ruby/uglifier/uglifier-4.0.1.ebuild
deleted file mode 100644
index 40301044c9ee..000000000000
--- a/dev-ruby/uglifier/uglifier-4.0.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=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby wrapper for UglifyJS JavaScript compressor"
-HOMEPAGE="https://github.com/lautis/uglifier"
-SRC_URI="https://github.com/lautis/uglifier/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
-
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/execjs-0.3.0:*"
-
-ruby_add_bdepend "test? ( dev-ruby/sourcemap )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/uglifier/uglifier-4.1.0.ebuild b/dev-ruby/uglifier/uglifier-4.1.0.ebuild
deleted file mode 100644
index 40301044c9ee..000000000000
--- a/dev-ruby/uglifier/uglifier-4.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby wrapper for UglifyJS JavaScript compressor"
-HOMEPAGE="https://github.com/lautis/uglifier"
-SRC_URI="https://github.com/lautis/uglifier/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
-
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/execjs-0.3.0:*"
-
-ruby_add_bdepend "test? ( dev-ruby/sourcemap )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/uglifier/uglifier-4.0.0.ebuild b/dev-ruby/uglifier/uglifier-4.1.3.ebuild
index 40301044c9ee..8451683993d3 100644
--- a/dev-ruby/uglifier/uglifier-4.0.0.ebuild
+++ b/dev-ruby/uglifier/uglifier-4.1.3.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
diff --git a/dev-ruby/web-console/Manifest b/dev-ruby/web-console/Manifest
index e8c0054e9b3d..e8de10cdcbb0 100644
--- a/dev-ruby/web-console/Manifest
+++ b/dev-ruby/web-console/Manifest
@@ -1,9 +1,5 @@
 DIST web-console-2.3.0.tar.gz 47641 BLAKE2B 2756f3958ea77df7dbdf7e7bd79f64711b4f958433f347175a29db2272ba549c79f1f94e2be18c17ceb8f4f1e8d281cf09995354f6ccd21da314df14dde886ec SHA512 36136242012053c2049b0faef682a8fe79f931904cd1007a6e08f36aca7a8923fc47fc058304f11cc0b205db876ca77b1cca65048c8ba4db401123ed9c05c834
-DIST web-console-3.3.1.tar.gz 46556 BLAKE2B 632c83c27b86e812c4a8c76a891bbaa9623e976a01796b40b272db3d77a756ba564a90a5dc3569b780383a8d0ce42e4e45090ba1b53c7361fcca328d93b04360 SHA512 8acb619b47c4b91fde647b83c01ae57f25a329b2597801e51c5e2d4dfec0a232e9335528672ff036a2391677ba88679ae69fc9aeebd960071b7a8541bfe9667f
-DIST web-console-3.4.0.tar.gz 51684 BLAKE2B 8fd4cd105472ec16b3ef12a25616f6c03b1555c1fc91de1c294f2cb731b3ceb40a42fcb8201052227f59ddbbc8911bee1c2d479ca812c7d9dd657d5211fb0447 SHA512 2373c1b79b6feff46fd0883cf2da6fd7eab2db0f5070c383635567a36d3979ddc50ca3b32887e96c003df8fb9ed32e636d55dd72ed06630fe534a0224d7ce74b
 DIST web-console-3.5.1.tar.gz 50779 BLAKE2B e94ebd0bb5ddea665849155bed0bf5a1c9025a48ebdf6a8ea7b032ee5397aa75d63a91e173ba03b49af7833d27950398f50fd189c20b8fdf53738ed4af7bf0cf SHA512 0a28744f8d138a8900f368884cb65a3ab147e3f3fbabe194b15def5f05098a519692155e13a15a758b95c943e861057018b60c75e664b7dc4991a6c3803d1290
-EBUILD web-console-2.3.0.ebuild 997 BLAKE2B 15d79c21b959f151725b4d378ce05071421c20d0004dd41dfe1b2ff7eaeba95d4752d4ad774bd10aca62cc2cb55cad864c087fbddda5a567001c1a132079dba5 SHA512 75eb9bacc1f4c4c172c25f8d0d4f7c08db226543974a4171443d7e9694bf5f541df8a7191e28523e07da5afff9c2c17d6c760c81dd82c38c2dfa83f538d11e91
-EBUILD web-console-3.3.1.ebuild 1046 BLAKE2B 15f9e6e860fe45b22bfcf8f05d5adfd0e32b11c9233ac5af1271a3a26b1f685e94da2199e531d361247dbc5b57f3c6f84ef6d1c6d155a8af680c4934c8682040 SHA512 e3c7a1b4b6c3f53c0b626fec31cb14c619a22c26fa8366334b5e40e28df477290bf4fd7cda97c82cff3ee8f6461a5b2aaed45fc6c408d8da66f6ab13f1891ae7
-EBUILD web-console-3.4.0.ebuild 1046 BLAKE2B 15f9e6e860fe45b22bfcf8f05d5adfd0e32b11c9233ac5af1271a3a26b1f685e94da2199e531d361247dbc5b57f3c6f84ef6d1c6d155a8af680c4934c8682040 SHA512 e3c7a1b4b6c3f53c0b626fec31cb14c619a22c26fa8366334b5e40e28df477290bf4fd7cda97c82cff3ee8f6461a5b2aaed45fc6c408d8da66f6ab13f1891ae7
-EBUILD web-console-3.5.1.ebuild 1045 BLAKE2B adeed74e2c91cd193b8adf2d335d93f3c8ec48e9418dea54b301c1b1ea5b45bc5a42f138430d069e224bf75b69829942dab4323419b2d429dbfd3ede426b30a6 SHA512 9219b71e943c4da2283de8b96e49e3afd927ebc7b39b3dd1da60d47e0788d3bd0a977fb20f4febc6febad54d7b2d0565f2196f15582edb386c3bb059a076cc65
+EBUILD web-console-2.3.0.ebuild 1114 BLAKE2B 2c55ccf94c8b85a8533b0391850c3391b7888aac29852e7d967aec03ac6e3377fb8867df38e85ede2d3e46ce9a0dabe24479723e0a971d25173dc00006308fc8 SHA512 add8e9f946da93d69f950e377d996b907662fe1eb17e89174d6e5af4945e7fbffae0742fd2f8ac20a56f96d6c4e9863c1a17a9725fe71d0d3298b6533bb302c3
+EBUILD web-console-3.5.1.ebuild 1070 BLAKE2B 0aa8ca647e60ae9b83a0c76115dda70369a7f72428a552f162e699a2e0d1d2dedc9c694d41c38806e934406460e2423ee3afa7ed42466ee55a69928fd605ff78 SHA512 22c2e274b4f16fdf12d1fd8f33f2cf84bdfcb1ef033a2ff2cb7047d9765008eb91a8effa119960e46e2e91d6a7e52475a74c428141afa2bd00e5c1152c9e462c
 MISC metadata.xml 343 BLAKE2B 8883d76dc0b31bd49361ba715fc9546328ba5a3fc734e8a2607547cfde3d8b48914231839f0ea3d4a59f005a5074770e1dcdccc6b5d629197c8f7f859453f178 SHA512 9116cd6bba4d0030e6f8cdf055fd66afed68c52d9f5382a8a9cd2cb28f84c3f397a3e793dfef3b5ee0fc9e1a4dcd1c2d6e6b285fd7fbb027e339e2d15a0381ad
diff --git a/dev-ruby/web-console/web-console-2.3.0.ebuild b/dev-ruby/web-console/web-console-2.3.0.ebuild
index d8e0f4072532..85f233836b9d 100644
--- a/dev-ruby/web-console/web-console-2.3.0.ebuild
+++ b/dev-ruby/web-console/web-console-2.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
@@ -29,7 +29,7 @@ ruby_add_rdepend "
 
 ruby_add_bdepend "test? (
 	dev-ruby/bundler
-	>=dev-ruby/rails-4.0
+	dev-ruby/rails:4.2
 	dev-ruby/sqlite3
 	dev-ruby/mocha
 	dev-ruby/simplecov
@@ -37,5 +37,8 @@ ruby_add_bdepend "test? (
 
 all_ruby_prepare() {
 	# Use an installed rails version rather than live source from github.
-	sed -i -e '/rails/ s/,/#/' Gemfile || die
+	sed -i -e "/'rails'/ s/,/, '~> 4.2' #/" \
+		-e "/'arel'/ s/,/#/" \
+		-e '/simplecov/ s:^:#:' Gemfile || die
+	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
 }
diff --git a/dev-ruby/web-console/web-console-3.3.1.ebuild b/dev-ruby/web-console/web-console-3.3.1.ebuild
deleted file mode 100644
index 8cd119d94ba9..000000000000
--- a/dev-ruby/web-console/web-console-3.3.1.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="ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
-
-RUBY_FAKEGEM_GEMSPEC="web-console.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A debugging tool for your Ruby on Rails applications"
-HOMEPAGE="https://github.com/rails/web-console"
-SRC_URI="https://github.com/rails/web-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/actionview-5.0:*
-	>=dev-ruby/activemodel-5.0:*
-	dev-ruby/debug_inspector
-	>=dev-ruby/railties-5.0:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	>=dev-ruby/rails-5.0
-	dev-ruby/sqlite3
-	dev-ruby/mocha
-	www-servers/puma
-)"
-
-all_ruby_prepare() {
-	# Use an installed rails version rather than live source from github.
-	sed -i -e '/\(rack\|rails\|simplecov\)/ s/,/#/'  \
-		-e '/simplecov/d' Gemfile || die
-
-	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/web-console/web-console-3.4.0.ebuild b/dev-ruby/web-console/web-console-3.4.0.ebuild
deleted file mode 100644
index 8cd119d94ba9..000000000000
--- a/dev-ruby/web-console/web-console-3.4.0.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="ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
-
-RUBY_FAKEGEM_GEMSPEC="web-console.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A debugging tool for your Ruby on Rails applications"
-HOMEPAGE="https://github.com/rails/web-console"
-SRC_URI="https://github.com/rails/web-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/actionview-5.0:*
-	>=dev-ruby/activemodel-5.0:*
-	dev-ruby/debug_inspector
-	>=dev-ruby/railties-5.0:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	>=dev-ruby/rails-5.0
-	dev-ruby/sqlite3
-	dev-ruby/mocha
-	www-servers/puma
-)"
-
-all_ruby_prepare() {
-	# Use an installed rails version rather than live source from github.
-	sed -i -e '/\(rack\|rails\|simplecov\)/ s/,/#/'  \
-		-e '/simplecov/d' Gemfile || die
-
-	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/web-console/web-console-3.5.1.ebuild b/dev-ruby/web-console/web-console-3.5.1.ebuild
index 081438ff720a..eee8ecae5741 100644
--- a/dev-ruby/web-console/web-console-3.5.1.ebuild
+++ b/dev-ruby/web-console/web-console-3.5.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_EXTRADOC="CHANGELOG.markdown README.markdown"
@@ -38,7 +38,7 @@ ruby_add_bdepend "test? (
 all_ruby_prepare() {
 	# Use an installed rails version rather than live source from github.
 	sed -i -e '/\(rack\|rails\|simplecov\)/ s/,/#/'  \
-		-e '/simplecov/d' Gemfile || die
+		-e '/\(byebug\|simplecov\)/ s:^:#:' Gemfile || die
 
 	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
 }
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index e86a3ef4c629..ef29a7906e04 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,13 +1,11 @@
 DIST webmock-1.20.3.gem 99840 BLAKE2B 97c03e0c6b87f23f321658f0cf0328bac3e44c3d3270770335ab4a8938282d9af3f378997c43501b589eaab2154bb31651d5a86ce590b645c25897532ca0f5b3 SHA512 db9d770636dabf95b3a03a6589a259c1d66d875dba0cbcd493acf6bb35649c885139528aa5a8976d7ef438bca761e1063ae0fcf1da5b799e8d45abf1986c000c
 DIST webmock-1.24.6.gem 111104 BLAKE2B 6574d398579dcafe6100d948b0c70fc8a1ca813339e2edb02177dfa0ad11472444d8aeb48b235caa4f85fb4cf4fe746aa77c3b64732ec861ae0d626bda78b8d3 SHA512 9319dcb3c29189403c79870dc8f91f27e099627a9fe5136a98193ee387a6dbcdf72eecb57ec4080faca9575461dfbf4ddecaaf5e1c75cfa60b08732a1d7248cc
-DIST webmock-2.1.0.gem 111616 BLAKE2B fd1583c5050052f234cacf7cba8d99b252b09d5ef777b46b158715d56bdebd94e77ae081e616a9fcaa84fe29115a8663b6ad06f7e6ed228882ef832e87a295a4 SHA512 604318766d1a23e76c03e0f39bcdc28aa0a23cba14bd8b5a3b33894aa30ece1d5ac56456500143745a2751ddc7bd0424ef195c82b78d66b5e28e10d5059facfa
-DIST webmock-2.3.1.gem 111616 BLAKE2B b957d86b4e1df68c62cbcedb87461e3a709c6ca229488a683f18e8bcc49412046c55d2829c319d1c98b2ee89cfa2f2856611cb366bb38ebfe67084c692479a93 SHA512 b51583a67da44a2aa0c616442f03d1066d9e9270b0cb0fbca48c30d06cef4c008c6fe29186951916afc2b8bccec92a510d34f7a537d4d6889b16e2ad779eb627
 DIST webmock-2.3.2.gem 112128 BLAKE2B ef0a722374057d7c5392924f68de8520f08cb0aa038fc0b8511e00bbd9dc13f6535955f77611e414a33dbf0ed7a519e9c18caf8517d10be7438e7360c3037a1e SHA512 bb61b645b287d15690aa81db4d4c937d3456e1911d394ef1fb31e8ff3530d47b865aa039c8aaa4d4b6a72132dfcdd06be66adf1b53793384dc27ac1c9f9c01e6
 DIST webmock-3.0.1.gem 112640 BLAKE2B 61d74bbc099bdec25e919c07a12824a3bc0761c2b4eaf1180c90bef64856882a69503f10ffc25f153b7d96d6fb2c1699eb0bde8fb94ce41ee0c25f5b47e68dda SHA512 a5924105744a0b09e38501f242f3c19a6c483acdea5792bbe4805d046a4748b9ce8390745837bbf8c8101b1713e62940bda1f9e6b3d63d37b007521c46c521d5
+DIST webmock-3.3.0.gem 114688 BLAKE2B 8306e96cfccbee598f275534effd119e75e3e1729b85936f29b4d4dc118f58c5ed39aa61553cb4c4a7389d704f57e55347d1f54f3cd392610a84683df993cd3b SHA512 589d96c21c1afd05e11f4adc6325d277bbc9a2d25f1ed6176a7b7db88cf94413f470b75fd245faa73ef0a9cb037f52751826b5047f77b41bd03ac72860277902
 EBUILD webmock-1.20.3.ebuild 1660 BLAKE2B b3767cb74310f20c353dc334db87ed92e1e493c253192eed2ff9b6fb6bd686f5f6414150f403a79d59a4ca27e46c151dc24b245a33fbb70035e0fef07cc8ec4b SHA512 37a6e9e64f09e4da7f0728ece05333d7f4f4f23e720b2c038ed0f5595ea8b2c5af5496c204566c543e8a7f4319aeb31e14839b9499e2c038910e6e88579f6eaf
 EBUILD webmock-1.24.6.ebuild 1456 BLAKE2B 1f12d2f7707e6101fce94d251f621c8dad5b6693c34baaba8d338e804cfc2335b4de7fe95fbc5dbe3bb2490245b04f86d239a1b5bd4b96ec759fbc1b5ee9ac8b SHA512 866f3cad0c9a574bfc21f05a87e48c06e4b6a0053e4809c027b392b3d77117af96ff8a9f6b35a71c14c85890442378045867bfb0b3c39cdebfd14175a2aaaea5
-EBUILD webmock-2.1.0.ebuild 1787 BLAKE2B db74f315fe3d4fe30317cb2e30397a838d65b4952d0b10ef5ed309bbaeed09d59811e1834c728d9dc2e2da645c8168c1b202855e3e6ed9078b30de2e7c515f81 SHA512 a32982f49769a09ab25a26264dbbe4eed1b91953d7341da4c8649b64e45c8cc333df255d2a4405d68200aabca2a2271aab1100b7f483e7cc901046d92b3cf494
-EBUILD webmock-2.3.1.ebuild 1873 BLAKE2B ec7ce5e279fcf889d97048f84e2c96c2afadcc18e3883cb4bb8343d3ac19f82df4b8825563792978cc5e19de287b78922521b43baded431cf4bcc82f98f1897a SHA512 592d886e33c19b031bd2ae07b606e3595acd30d163ef2cdb2ddbb2f6c9810d0474ac057a9a263f644884b5e50939a7d8772331903a2806705e13542f5c2646ed
 EBUILD webmock-2.3.2.ebuild 1866 BLAKE2B 2f574e1e4112eba2db2628352bd8c5329d79027c605a067b5912fac6cacc9cd4a947e107834e1b7eb5a496cb4ea8e9384827466f5e0792c86ba3f13810a186d9 SHA512 db08d6460f5dfd2169b9d4cb48a43763e487710460d6e8ae3d1a1e0609a1e33c2cb558bbadf61a72260d06f06337cef84f2250948de7438eca00c496fa6455f4
 EBUILD webmock-3.0.1.ebuild 1873 BLAKE2B 3862da4943bf189fcba2ee9c3aa5664de32f1a7aabe1ec79345e2a41be8c737fa420d020ece69d1f82bf34300cf7138a36d8a8178d18e082a2ffaeb3b8378683 SHA512 b372ef9e38fb810c123f87622c868bf2e586eb1bd627fa28164fd0c029fcf56f9c1b8062599802ed71d5fbac945845a1a511a32ddb0afc26f95c4fd2a2ba9991
+EBUILD webmock-3.3.0.ebuild 1873 BLAKE2B 3ed92b781db87b95d4d5649d12e9f996a824626b1c875136a0d6b18c02420cce10c1a06e66b486a9126e11a1484cd0ef8da9750043b54d8582ece2dc07f9c973 SHA512 60dd68a4523175bb6c830df1e14ccbbef87bce20e2fdec1d20b9b750cb2342a20651594cbf7b55b404e5c547ed434e97cf5f0bf1d4ed37f88738144e722be116
 MISC metadata.xml 341 BLAKE2B 75a7b957f0aa060ff3c632620c1b8eac9344b37566c9205bdfaff70fdcbc8cd391dc7296317bde0e8ce1e1ea3cb7540446267112eac00571beda686f5a592130 SHA512 66c55ee845168bbdd2b792d90cfbe116a09ff3bc00861164e82b68355ed585e87b58b7c0ab21da37dd984b680ea4841e7a2cd0c8bea1a081b1adb4c5b9885b73
diff --git a/dev-ruby/webmock/webmock-2.1.0.ebuild b/dev-ruby/webmock/webmock-2.1.0.ebuild
deleted file mode 100644
index 5c08f91a32e6..000000000000
--- a/dev-ruby/webmock/webmock-2.1.0.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 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
-HOMEPAGE="https://github.com/bblimke/webmock"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 dev-ruby/hashdiff"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/rspec:3
-	dev-ruby/rack
-	>=dev-ruby/httpclient-2.8.0
-	>=dev-ruby/patron-0.4.18
-	>=dev-ruby/http-0.8.0:0.8 )"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-
-	# There is now optional support for curb and typhoeus which we don't
-	# have in Gentoo yet. em_http_request is available in Gentoo but its
-	# version is too old.
-	sed -i -e '/\(curb\|typhoeus\|em-http\)/d' spec/spec_helper.rb || die
-	rm spec/acceptance/{typhoeus,curb,excon,em_http_request}/* || die
-
-	# Avoid httpclient specs that require network access, most likely
-	# because mocking does not fully work.
-	sed -i -e '/httpclient streams response/,/^  end/ s:^:#:' \
-		-e '/are detected when manually specifying Authorization header/,/^    end/ s:^:#:' \
-		spec/acceptance/httpclient/httpclient_spec.rb
-}
-
-each_ruby_test() {
-	${RUBY} -S rake test NO_CONNECTION=true || die
-	${RUBY} -S rspec-3 spec || die
-
-	einfo "Delay to allow the test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/webmock/webmock-2.3.1.ebuild b/dev-ruby/webmock/webmock-3.3.0.ebuild
index 1323145338f2..b71d7065dbe0 100644
--- a/dev-ruby/webmock/webmock-2.3.1.ebuild
+++ b/dev-ruby/webmock/webmock-3.3.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
+EAPI=6
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
 
@@ -16,7 +16,7 @@ DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requ
 HOMEPAGE="https://github.com/bblimke/webmock"
 
 LICENSE="GPL-2"
-SLOT="2"
+SLOT="3"
 KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
diff --git a/dev-ruby/webrobots/Manifest b/dev-ruby/webrobots/Manifest
index 5eb1811abfb7..63dfbd784f49 100644
--- a/dev-ruby/webrobots/Manifest
+++ b/dev-ruby/webrobots/Manifest
@@ -1,5 +1,3 @@
-DIST webrobots-0.1.1.gem 17408 BLAKE2B a6adccda1d69c095a3d240d79676f3955ba3cdcea74bb6b35e873eccf34aed101012650cfc553a250818611913dc699dc6883c2f678547884618aa5fe90515e1 SHA512 f303c238620d17cb64064d11eb352d2afb32529f7092609484e5e232ccbc903683f89116a0e5232605b6d0286a4a76b82e71e44884a7b77d12125f3b3c6c5a34
 DIST webrobots-0.1.2.gem 24064 BLAKE2B e77c7b83b16faa7c6d65f6133a5e2231a4e270d8463251c2e6a91a5bd1f11af431d4bca4f11bf40e2e84829c1b8256a39d048a371ce4a062af6bba9dafe25c49 SHA512 8b2a27a1758e613bced16b59a2b1708f468921388882d7ea483c7b6cbb5173fa24032f4db271734820225c5e90d3f30d07c5fb682d0d807c637f535ef7256097
-EBUILD webrobots-0.1.1-r2.ebuild 926 BLAKE2B f436d58e257d2a216b492ce379eac9a8ef111f6ea861a6a7e270c27a61a8309a214d1ecbc44d16e9dc2c9e06cade19cddf975aefafb32fea6f722fda36b9c71d SHA512 c0e7bb8b3945594d9270baf6e2b3620e396fcd29970f3ce1e16990a277710a3936c35872a1ec2f40dffe66a796c52329b025c3a5c42c0c21e7885954b9f6771e
-EBUILD webrobots-0.1.2.ebuild 938 BLAKE2B cea776d5385b06a617895bc101d84c7d5dcc92b07ac43573d0b48ffc95614ffb227410058227727f0cce65824f8bedf630fbdd7d144a14a1d099f31304410b5e SHA512 1872257b35933f9e50679e1b13e828a51cf0de55549722bd3c9b2f50d599e3fca2fa837524ede29824156be02a481649f8ae8d7318bb9eace5bb04dada490f5a
+EBUILD webrobots-0.1.2.ebuild 931 BLAKE2B bc6993fe90122b065a9788b281c3f53b6023ad07229fed779a754fc9a7b00bb55da1da16c51fe3de9ea85ec538190b2370ce308cbd636bf41437a6391416341a SHA512 95ec2362612f83afb0f7d2ab6959119c91b6acc103bcca2db36fc2b2563c38a56420f0ec30d408e7421fed6c57536ada26b9d8f2ee1ffb5ced9ca1a47614576f
 MISC metadata.xml 380 BLAKE2B 9be818846cc0906eb21d32c72ed1c129d65e10133d8303535c65b942ec24dfba85f422186b754d42dedc9a0a0cb5bd7c28b9099f17543b007f012aec123fbb90 SHA512 0c68a9a014ac9459f1ed9639517189109e50cd101e8bc7c21ed2a3631e22ee7a7fc31c7f4518463170a63d710cb4b1e03a1bffa1275ca8e6629afe89cfa31b44
diff --git a/dev-ruby/webrobots/webrobots-0.1.1-r2.ebuild b/dev-ruby/webrobots/webrobots-0.1.1-r2.ebuild
deleted file mode 100644
index 2fa1e1e8da14..000000000000
--- a/dev-ruby/webrobots/webrobots-0.1.1-r2.ebuild
+++ /dev/null
@@ -1,34 +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_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library to help write robots.txt compliant web robots"
-HOMEPAGE="http://rubygems.org/gems/webrobots"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.4.4"
-
-ruby_add_bdepend "test? ( dev-ruby/shoulda dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/d' Rakefile test/helper.rb || die
-
-	# Avoid tests for live websites requirering a network connection.
-	sed -i -e '/robots.txt in the real world/,/^  end/ s:^:#:' test/test_webrobots.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test_*.rb
-}
diff --git a/dev-ruby/webrobots/webrobots-0.1.2.ebuild b/dev-ruby/webrobots/webrobots-0.1.2.ebuild
index fc6b65152697..b62efc0f8035 100644
--- a/dev-ruby/webrobots/webrobots-0.1.2.ebuild
+++ b/dev-ruby/webrobots/webrobots-0.1.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=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="rdoc"
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index cd4675ee6ee7..15eb177c5ce1 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,7 +1,5 @@
 DIST yard-0.9.11-git.tgz 916355 BLAKE2B e9f27fe129cf93c51dbf83f4a7d5745d385252ba63c90f85223f2e9436c22a55aaba296f263072069d39e4beaca3e0830775a8be121c64cdc2a15afd3539a73f SHA512 375a4878e61888cf73aaa06e9300195ae48b9898d8cd639fa796a067e5fa0b89d6ef62d327a388ee83953e80177515f4d8c070042188e3a1e597f48b82b3a72e
 DIST yard-0.9.12-git.tgz 916462 BLAKE2B 905f0e4408f7829ca599b578344d695e4c7b68d46b982f39277dcd69ee726a9ac283910e1031d635917b149f182fb302cae537ff8a8a81960fa27965fda82a0c SHA512 f987da7e46bb3dafb9ba8c761b51345ee67102e21d05181c3090f31ff37179505134c93e83efdd39bb35cf6fe6dfa530d0017ce4680a08f858e78cbb073b239f
-DIST yard-0.9.4-git.tgz 884608 BLAKE2B 9d17d7cdfa0432d769026f6bc12354be236b5d07d65bc510bfd6bdd5add12d87f77808832f9f011d327f13b495d499e395c232a3d77c7e779dd0ed40a676d911 SHA512 2255c56498dc147ee5ede5e4898ce7aad78e9350f317e5d5c942f6b12262e9e1d0893ffd985a6bf3822d6af902e8ff555c489e1d847049ba51a472ad3c4aa140
-EBUILD yard-0.9.11.ebuild 1285 BLAKE2B ce2d077968538c51d4d800ab3cf90c40675eda7fa4e4e422cbf0e0feb758d66f102707d75b5648a55f0f8aa75c1c2dffdf34fcf6e9cca8827ab6a7204714241f SHA512 f80c2876ed53ca2d0b3a993a6493df16e1cc2c30f63a6ab233d283d9773574e64fb4a5e89b4780dde38413f69a073d120e93096a65a0cb526e2ccb41b8767005
-EBUILD yard-0.9.12.ebuild 1285 BLAKE2B 73feeb381e397653ebd2361ca4e4d3c1f7d056fc73059a691f7c166d8b7c8517d1c5fae67fed15646757460e9cc4984bb977fb06de93125b887bc8b3a96ad5ce SHA512 11950cd03ff8d582b6c8ea0ca82276ae35f4af83c1302d7c7f9fbfec9f240a3be4e92c23a39910d498473efc68b2916d77a1d3ff3fb932a00ec876991ffa7ae0
-EBUILD yard-0.9.4.ebuild 1316 BLAKE2B c1f9b2e880648300b34516c4a3ae7f63a51dcfb245be4237be7c4ec582a276f333231d79d50b5720c332d5d0c31f06ed3e4ae40c7c7fc700c3401788a5c26ed1 SHA512 999695d04608dd86062574814e1c02ddbf5c1a6ce3727c3da3c1137805e05a28c0b373f6c3eae13b94f398c99ac67978ae2f82a5d65550d27712755ffa0e14eb
+EBUILD yard-0.9.11.ebuild 1284 BLAKE2B 21f0de50c078a46539d23699455fd05567c9be2eeeeaf6a58a39a1e1baccde24a538820486d2e126fb8d4ccee15a0e6a85c2511f6f48f75164b966ab368ca07c SHA512 156aa3fc5bc269bcf3193ca6807ef445ab2f2e0a1ef6652e38943a95164379942f8f755fb487d2868690d987668443a025bd813a2ecc8f42d99cf4213ab6b9ed
+EBUILD yard-0.9.12.ebuild 1292 BLAKE2B ff7933232e57b12a163aa00165e6a6d97341a9188425434144d7378b061815d944e461cbb4822d745b05905bb577d094e5d5236e907223fc1c003f6bfd2f1c19 SHA512 d07dbfd2e440c410b5b6fc014259a80c10a3f0e43ea20074b4ac3f12cdb9b0da2692db36858019b5ce8b1ab3b63d9ff706761421a1879ef258db95bad652f377
 MISC metadata.xml 337 BLAKE2B 1aedede1271d1f9a566743dd25b1fd9961e429b78bb5f9f36bd6ea66f631f376a273d7a094fba7121d099f3a4a3f0e7738753078e2a1a554cfe6cf32acc6e2b6 SHA512 0de30cc9c4a9d08649f141cb6df0ee9c05703831603c77a0605f0bf8e2f49b8324a782d092aaa690581e23d6d948fda9781b98770a3ba89ed6bfc0de351c11bb
diff --git a/dev-ruby/yard/yard-0.9.11.ebuild b/dev-ruby/yard/yard-0.9.11.ebuild
index 313157ab8cd6..37f1408ab94c 100644
--- a/dev-ruby/yard/yard-0.9.11.ebuild
+++ b/dev-ruby/yard/yard-0.9.11.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
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
diff --git a/dev-ruby/yard/yard-0.9.12.ebuild b/dev-ruby/yard/yard-0.9.12.ebuild
index 37824a405d76..079217be5068 100644
--- a/dev-ruby/yard/yard-0.9.12.ebuild
+++ b/dev-ruby/yard/yard-0.9.12.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
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
diff --git a/dev-ruby/yard/yard-0.9.4.ebuild b/dev-ruby/yard/yard-0.9.4.ebuild
deleted file mode 100644
index 47c626701fa1..000000000000
--- a/dev-ruby/yard/yard-0.9.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_DOCDIR="doc docs"
-
-RUBY_FAKEGEM_EXTRAINSTALL="templates"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Documentation generation tool for the Ruby programming language"
-HOMEPAGE="http://yardoc.org/"
-
-# The gem lakes the gemspec file needed to pass tests.
-SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
-
-USE_RUBY="ruby20 ruby21 ruby22" ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid specs that make assumptions on load ordering that are not
-	# true for us. This may be related to how we install in Gentoo. This
-	# also drops a test requirement on dev-ruby/rack.
-	rm -f spec/cli/server_spec.rb || die
-}
author	V3n3RiX <venerix@redcorelinux.org>	2018-01-26 15:48:02 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-01-26 15:48:02 +0000
commit	38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch)
tree	6fce284d5bfddaf597a490ac66069d16c6a485db /dev-ruby
parent	0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff)