gentoo resync : 28.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-28 20:02:04 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-28 20:02:04 +0100
commit: a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch)
tree: 852c90a4bf354c30ea66504f70bfab5401fba18d /dev-ruby
parent: 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff)
213 files changed, 821 insertions, 2259 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 550e017db36a..63404f2b2886 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/actionpack-xml_parser/Manifest b/dev-ruby/actionpack-xml_parser/Manifest
index 7a09edab1369..f09072035294 100644
--- a/dev-ruby/actionpack-xml_parser/Manifest
+++ b/dev-ruby/actionpack-xml_parser/Manifest
@@ -1,7 +1,5 @@
 DIST actionpack-xml_parser-1.0.2.tar.gz 6623 BLAKE2B 4dc039b2db8397d41f7da5cc643e8e990b4a3a5a1e86e67657a6a59681688144562a66484d1bec49b7166b1df5d2e30ddd882dcb2448cd14e6b44580e2fc354c SHA512 6fb9323b2632059d6c253083dfe6a09c413d4a5f7d622457402db95529ccad6d28b0471b01f4555c4e448b65183e6d07ef639de994c47c4858d2bfe5318aaa0b
-DIST actionpack-xml_parser-2.0.0.tar.gz 6499 BLAKE2B 260cef14c65ae7b723c60f53206dc16eebec719c80147c353bf82124ca07db4afb59b2d4c7354b58746045b34c57b50826661b515ceff768608d1620e2d98f03 SHA512 fb1a9c551a3ff6751e0b9e95b1c667ef5dd6da50b4e5cf4d010468f76d022cb437b20a02e8ee795da757de98e3e45e8b71b9f37f2c0dc16f1a338f8d335d712f
 DIST actionpack-xml_parser-2.0.1.tar.gz 6494 BLAKE2B 271e1352085e7c75754253222c9f861f7ece9875102a0bb4c47e20311367fcc040c5680ad0406112f8e312c4a8ae1a3f9b6d33f3736db3614ca1c3584942f800 SHA512 a240e59178722025a0c967cfc2f63ca1ed8a2aff55ad913652f06018b712a7009eecd915f494dc4087de12ad5dbe5a0f3c7290fc530a2e475b39318520809112
-EBUILD actionpack-xml_parser-1.0.2.ebuild 833 BLAKE2B b221813f631864219e866e3b1a68203631bc75e5cb22158c0d4017abbfdf981457c88ee5a89a974c8d6faee92a0970dd0ba119851acf1f2b1fcb0c6f141ecbcc SHA512 05122ccb0a1c290339fff553743aacdbc766898b69fcc244a5e8378a6c37f5b08d96d6404f967cc2ce1b95128b144d0c0f908204489bb8c56aeb099defcc3aa4
-EBUILD actionpack-xml_parser-2.0.0.ebuild 764 BLAKE2B 51ecf1e58480e7538335baf0df5b33dca396ef7d79fb5d39860bb4722a29d832acbd2bdd344e37828717c470b84917c11ca810dfdd430fbb0225ab19a9c35632 SHA512 7a2df495fc38db4ececb516b2a159639f4180d7e453eeed86d2df044412bdb7ff0a526c1765158b115f0f549d312cbf11479c096dbe5a052c020a8dafa65d961
+EBUILD actionpack-xml_parser-1.0.2.ebuild 838 BLAKE2B d29970900fd94346b8d780ef35b50102c4d3c930cb0607de030e0f757b272c999a133ff0217517e66eaba1f7e3bdc6a7173d792fbb77ce6b35adc173ef1cdf2f SHA512 636f0991a94b457cc9f511f1a435894952772cb9470fa755065358c20268d4da25b7ad609289387e54cfe78a932df47d9f31edf7d933a985990a6542ff31b499
 EBUILD actionpack-xml_parser-2.0.1.ebuild 771 BLAKE2B ba4a5920a0f535489b6ae1db8407e3b27d7902444d9c02bf3184f990fa01721f724cfc235066339937648a2bb3f81cf973b64226fe26cc2356da3a16014bcad2 SHA512 3207765c4578bbd64d2f47209b1d0263b273bb3210352d80e60613de6223322ff3d2207874c48e116c518aa65fe68be5e930bb0e6070c2a6a860d52a3f188cf0
 MISC metadata.xml 343 BLAKE2B fae09bfee8e2838dae045fb6920229bf6d0d87affced294d61535b221af86767fc95fec8a7f5f87832d1948e50165369751b6450b84b31d0611e72cb0eafba19 SHA512 2e931999edbe73e74146107d2a75df2050649d682fcbba40cb877b742af15de0d0709a3acbee03722eff1bd1ddc3619a3c2a61e976a526f34f1bbc3bb0b87593
diff --git a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-1.0.2.ebuild b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-1.0.2.ebuild
index 58acb6a61502..5d0dbebe3ebc 100644
--- a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-1.0.2.ebuild
+++ b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-1.0.2.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="ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -27,5 +27,5 @@ all_ruby_prepare() {
 }
 
 each_ruby_test() {
-	${RUBY} -Ilib:test test/xml_params_parsing_test.rb || die
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:test test/xml_params_parsing_test.rb || die
 }
diff --git a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.0.ebuild b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.0.ebuild
deleted file mode 100644
index 3f42e2c7db62..000000000000
--- a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.0.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="ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="XML parameters parser for Action Pack (removed from core in Rails 4.0)"
-HOMEPAGE="https://github.com/rails/actionpack-xml_parser"
-SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="2"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/actionpack-5*:* =dev-ruby/railties-5*:*"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" Rakefile test/helper.rb || die
-	sed -i -e '1igem "actionpack", "~>5.0"' test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e "Dir['test/*_test.rb'].each{|f| require f}"
-}
diff --git a/dev-ruby/addressable/Manifest b/dev-ruby/addressable/Manifest
index f355b6150928..5f8f8e1fdb9c 100644
--- a/dev-ruby/addressable/Manifest
+++ b/dev-ruby/addressable/Manifest
@@ -1,7 +1,5 @@
 DIST addressable-2.4.0.gem 102400 BLAKE2B b03ab532b2c761b877973381d023c882d4d1e66372bb68425f45debfab3c546845b3535045f6b47d4f7be88c1a2e539b2c1429312147cb4fe3ebdaf90330c86b SHA512 b81fa48e7c4188827c03ac93960b6fd6fb9f5a438f5243cddea39d6820ef756ee7c0086ec330dc4a3538008b3b254757af7d30248624127649cc006a2793eda8
-DIST addressable-2.5.1.gem 103424 BLAKE2B c550bc45573c5f0de7398dc5ac1c32b1fe659b9d1395d5d9217583682657dff0c0da779a1113d19a4fe1b9bc381459278afefb753ee0e85cac843b8b6bed957b SHA512 ae7232dc6cbd1aa6405135c7916697a93286fcb223b14e2c30b5897aed6fe32529c94bfb84154e0cead5af9a282cc89442cbd3249b68abd7ffd67b6c4599bff3
 DIST addressable-2.5.2.gem 103936 BLAKE2B c6677a2b5e9a7a1b279b2e3f1816cda40c0797254970ecaed2350d4d4739dee5a51580a8e2f94fc6bb87b9fe2a535d0a68b62eb672f8e91ff4da02e15e8dffcc SHA512 ddd5aeb4b241efa897a636fd85bd227bd5c6a8ae56129b6bbbdfaad85cdbb74e3d0db4bb6693f7df148b66f68ca1f557ac17a1fb0ea7698d25d883ab0b690bc4
 EBUILD addressable-2.4.0-r1.ebuild 1326 BLAKE2B f6d9e7d1d0c1788ef93c1871eadccf43b2db7628e1606cd0f79f1ac54647d4770425b1bc32579280a7a3de70c93357e56ab4e60b5b14772b1b10f54f491493f6 SHA512 314eeced17e5ed33f52ac50b6326a2eac68c2335e65d9bf2bef4fd14fa7997ab42902d50bc2d8645210a11185dd16f4e3b06ffe07a6bfb23caeafe6584e6aaae
-EBUILD addressable-2.5.1.ebuild 1313 BLAKE2B 666605644067f0be102d7b3a8b740cfed830d5acbb52ecd22efbcfbe027f0b2a8f0aea5a69766cfd9b5c5ca1c46d94883c345d991b35f932cc6d981906ba408d SHA512 266d45b274895d7c9d1568b05d1073a26dc667d36fe5fea33d25314f0c4e0f7effa8dd2ab17f6d93232964539b51f8b63684072c8d0f6dea78edf8114b61dd05
 EBUILD addressable-2.5.2.ebuild 1345 BLAKE2B 38ed2f16e76c9fe64d44842603a39214c4b813bf440325c0dd754b03d02c4ad27270738b91e7815a42ba21938bfb1aeea6d733513b70621a68e3a4d741712ccf SHA512 c0c1a16efc0758fd5441733c2838a00049622d792c601c375bf968da59f5f74c24edcea056be5e6240ee7d400636ffed9c466d8313ae7b0459b79ecfeb0b73ef
 MISC metadata.xml 404 BLAKE2B 4362f3592286dd6cffae99340e1b4437af10ab4dbbe44585d3370b0970e7d02a881853329c9412bfc881c3f040995a204b758aead2c34cba4f9df8104f858479 SHA512 c335566562492b85e491233d4f908fe18c2713ed9ac3afe2cb4d9537d71bdfa1a10bf58f1ca9f29e5a695fde9a4ba0ff9b3c57122afe78907cc0b00b5c307351
diff --git a/dev-ruby/addressable/addressable-2.5.1.ebuild b/dev-ruby/addressable/addressable-2.5.1.ebuild
deleted file mode 100644
index d757e5a57f8b..000000000000
--- a/dev-ruby/addressable/addressable-2.5.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A replacement for the URI implementation that is part of Ruby's standard library"
-HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable"
-
-LICENSE="Apache-2.0"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend ">=dev-ruby/public_suffix-2.0.2:2"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
-
-all_ruby_prepare() {
-	# Remove spec-related tasks so that we don't need to require rspec
-	# just to build the documentation, bug 383611.
-	sed -i -e '/spectask/d' Rakefile || die
-	rm -f tasks/rspec.rake || die
-	sed -i -e '/bundler/ s:^:#:' \
-		-e '/^begin/,/^end/ s:^:#:' \
-		spec/spec_helper.rb || die
-
-	# Remove specs requiring network connectivity
-	rm -f spec/addressable/net_http_compat_spec.rb || die
-
-	# Remove spec that tests against an unreleased github fork
-	rm -f spec/addressable/rack_mount_compat_spec.rb || die
-}
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 7f321008a6ef..950227b28e0f 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -1,12 +1,8 @@
 DIST bundler-1.12.5.tar.gz 371552 BLAKE2B 0aca136308d9c393c945037dc18f7b8e7563017933aa5ef3cf14b50e095c200b82046a9d8cb00641e16507d588fe2aec8da59b22fc063bb4ecfb55b36627e981 SHA512 d42b2a10b97ab9724b9f3c6d1493a46ac212a918acc556ae90faed63b128190fd365cc0ba8c9ed9db30fc285e5c4d4183ddb698eee9a8607e9e40e860e78518d
-DIST bundler-1.12.6.tar.gz 371581 BLAKE2B 7dd5ae30bef1f2f551b83d10dc1bb70781072577eaa77889512c572c4b1891a56a31a7087eb021cab4c73f150943a958652bddcc9266b68fab794bc8547067bb SHA512 3015841ec31f06d4cc50d6fdca97efb429cd2ce552907f3e35f0f7b096da0d27752d4a9534dd77377d99e16859b8ef384015a1efe9127d66eccaeede86da3221
-DIST bundler-1.13.7.tar.gz 431233 BLAKE2B 643589d6fa41cd498070a1ee70e2ae064c2a92abe637cd34f8d07e20ef35345ffbfaaeb077f7a9e2f7271b1cafbe83840d1a4c72d8eabaf58f5d235ac3069bc8 SHA512 aa3984591049726f84ed79ca99aaedfa25df551d040d2245a6ecdcc5c3b809d7124ec587081e84cd87edf911744f4ee88c8cde0923a318cbaa2d514de38c85c8
 DIST bundler-1.14.6.gem 319488 BLAKE2B 5c6e51a2b1c817add90b88cb58cd4012ab8d2a11eaa7ac61c679515e06418fe564ed57c8a7438c1ab1ff4cbe92108806e91f44b24e1e17296c5e9588c29c7cb0 SHA512 cf333e266db0690582252a9248f3579a5be9e753c92c0b92e25d4542ddbbc15bfb7e1571fe9886264c0eba22c4510d118192e8f5f50f647b27eea83d68585238
 DIST bundler-1.15.4.gem 337408 BLAKE2B 348ddb218fa7ce1999ed428b4f742b3e2f692beb1c4ec757441d47a921340d7189a0db80a91e57900d81df976c997706d535c922b50c350d5d3a784078869fe2 SHA512 15736d6bbae792fc029f078705cb2a4eae5f9f78e1219eb3f2d0d0e2c3092df3da97abd3b107c9abbbe680ed99f11d450b0402ab9bf3313cb7aa60e3f631bed8
 DIST bundler-1.16.1.gem 349696 BLAKE2B 6057aed2e3bffdfa7f3ea8489c4ae79d9241b7b300fd35c4a2c14899ff306183165d1554be793a1856d9fd1c696161161049519fc8915800c68c60a9a5b116d8 SHA512 2cca87aa17b61df98ef98a648a7d7cfe0529015f1278e8cb2298bb12544157933d723bd666d945bcdbaceacbf97a092a3848e2a587bd01cffa73c662d37d4834
 EBUILD bundler-1.12.5.ebuild 2231 BLAKE2B a9d9fa0fd10df02af01ac5b8aecbe1507dcfa0d17db1393aacd5a85dab329313098b95ba6d5eb60614afe85d0fcd6cb8c0a054b8c098961342cde5ddf9b742de SHA512 ef0ca3ab2bf4cfd199926553f3b3d35096c91e3f6b8d32fa70414e2a4bb4a7f60f921e26d7d462e5deb512beb31f1fb74e76b2c8c34898aa87543a52950477ef
-EBUILD bundler-1.12.6.ebuild 2240 BLAKE2B 90a0f4d6470713841bb6b3baf431be33e57e6b99e99c65975b689924eebb5d9f61017e53874dd616e15053481975d129e6bf6cb7621a0dbe056c18e04d02fde4 SHA512 950bcb579f2f275651cf027ad190226b1ad217847fad00db3600034fe4c0c30f3d0fe47ab71437e84435a8446a44801315aa71c3cc364300a0a701523fd2ffc3
-EBUILD bundler-1.13.7.ebuild 2247 BLAKE2B 857270df538621f2c176617c4e4ced03faaa17f2a3081ba6e4f2e4ee137d59a76e84b3501984a29a60a5ef74561197905dacb176099ad867cd5233746813efa0 SHA512 b50b829b5660cac8e3ddfa550732da4208345c56d5c39b5dc037ad806e8d8e56b306863e8c3f6c23e2f42d9576ae322273ba9305026dc9fbe36663393e7cc884
 EBUILD bundler-1.14.6.ebuild 1048 BLAKE2B 5626e25d1221e8abcd305d15bda1a5dc7cca8ca36cf14adb09ac81291c069b780569c9c2ce01245c48e84d5ada13d4a0994caaa35508e880fefab321fb5d37c7 SHA512 db402572fe27778a6f085abc8689eb072ae004eaa4ac825462a0b4ce72635a25ede60225c3f1a937e67743d70d85b35df2c770bb193fed853a7c703fae9bbb30
 EBUILD bundler-1.15.4.ebuild 1031 BLAKE2B b3600f31e90ebafd1c9aad89f25d47edfbc7bd55eed6d0c7c1efeafa6fc5757eab454b5285f5e2fccc38de016f83b6ed6e0d60953cd27cb4eb0876c4ccff7e6b SHA512 2bfd35e1a9b84683c2bee05a302b23967c5a5dd051e468ecfe0d22c7aaf7851ec011b8d5a7f25ffa4170249d0be85a224a71e75a623eebcb339d07f598753adc
 EBUILD bundler-1.16.1.ebuild 957 BLAKE2B 95163ec2b6b9953d13dd959a6b070772f577f1ecc03e86b0351df82d6cc107b6be73932c40795c725dfb3cf62bd35916c82cbcf92c0bd53d7f91b8d3540b29bc SHA512 a6435e52e6b0d07fa2166f837c0bd285f86bbf770dee3364437476338b441651226870535b79f000c19d637fcacfbeaaf5c7f4f2cb70aa4ae9922d045116cbd7
diff --git a/dev-ruby/bundler/bundler-1.12.6.ebuild b/dev-ruby/bundler/bundler-1.12.6.ebuild
deleted file mode 100644
index 0eb339fecb6c..000000000000
--- a/dev-ruby/bundler/bundler-1.12.6.ebuild
+++ /dev/null
@@ -1,70 +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"
-
-# No documentation task
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md ISSUES.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
-SRC_URI="https://github.com/carlhuda/bundler/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-ruby_add_bdepend "doc? ( app-text/ronn )"
-
-# ruby_add_bdepend "test? ( app-text/ronn )"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. All tests should still
-# pass with network access.
-RESTRICT="test"
-
-RDEPEND+=" dev-vcs/git"
-
-all_ruby_prepare() {
-	# Bundler only supports running the specs from git:
-	# https://github.com/carlhuda/bundler/issues/issue/738
-	sed -i -e '/when Bundler is bundled/,/^  end/ s:^:#:' spec/runtime/setup_spec.rb || die
-
-	# Fails randomly and no clear cause can be found. Might be related
-	# to bug 346357. This was broken in previous releases without a
-	# failing spec, so patch out this spec for now since it is not a
-	# regression.
-	sed -i -e '/works when you bundle exec bundle/,/^  end/ s:^:#:' spec/install/deploy_spec.rb || die
-
-	# Remove unneeded git dependency from gemspec, which we need to use
-	# for bug 491826
-	sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid specs that are not compatible with all rspec versions.
-	sed -e '/has no malformed whitespace/,/^  end/ s:^:#:' \
-		-e '/uses double-quotes consistently/,/^  end/ s:^:#:' \
-		-i spec/quality_spec.rb || die
-
-	# Avoid spec failing with git 2.0.
-	sed -i -e '/on releasing/,/^        end/ s:^:#:' spec/bundler/gem_helper_spec.rb || die
-}
-
-each_ruby_compile() {
-	if use doc ; then
-		${RUBY} -S rake man:build || die
-	fi
-}
diff --git a/dev-ruby/bundler/bundler-1.13.7.ebuild b/dev-ruby/bundler/bundler-1.13.7.ebuild
deleted file mode 100644
index 1a0766770974..000000000000
--- a/dev-ruby/bundler/bundler-1.13.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-# No documentation task
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md ISSUES.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
-SRC_URI="https://github.com/carlhuda/bundler/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-ruby_add_bdepend "doc? ( app-text/ronn )"
-
-# ruby_add_bdepend "test? ( app-text/ronn )"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. All tests should still
-# pass with network access.
-RESTRICT="test"
-
-RDEPEND+=" dev-vcs/git"
-
-all_ruby_prepare() {
-	# Bundler only supports running the specs from git:
-	# https://github.com/carlhuda/bundler/issues/issue/738
-	sed -i -e '/when Bundler is bundled/,/^  end/ s:^:#:' spec/runtime/setup_spec.rb || die
-
-	# Fails randomly and no clear cause can be found. Might be related
-	# to bug 346357. This was broken in previous releases without a
-	# failing spec, so patch out this spec for now since it is not a
-	# regression.
-	sed -i -e '/works when you bundle exec bundle/,/^  end/ s:^:#:' spec/install/deploy_spec.rb || die
-
-	# Remove unneeded git dependency from gemspec, which we need to use
-	# for bug 491826
-	sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid specs that are not compatible with all rspec versions.
-	sed -e '/has no malformed whitespace/,/^  end/ s:^:#:' \
-		-e '/uses double-quotes consistently/,/^  end/ s:^:#:' \
-		-i spec/quality_spec.rb || die
-
-	# Avoid spec failing with git 2.0.
-	sed -i -e '/on releasing/,/^        end/ s:^:#:' spec/bundler/gem_helper_spec.rb || die
-}
-
-each_ruby_compile() {
-	if use doc ; then
-		${RUBY} -S rake man:build || die
-	fi
-}
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index 4e03ecaa2b65..9c5919ec69d2 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -5,7 +5,7 @@ DIST capistrano-3.10.1.gem 77824 BLAKE2B 548c86c0740703a5b0b92890806411221ea7a99
 DIST capistrano-3.10.2.gem 78336 BLAKE2B 782cf09f810fd91f4878e126c12d57d19b75c1ccdf3dfee7b2078904743bf51047d1f948e64e6c41460fdaf0a3a9e5a2b646bd6a797f8ce97bc29fab9ca9c533 SHA512 a7eadcd0b949baab2d6ad09c2243f71ec803f85b5c3cf455068d3b0889be30d0f6bbee4ef0bdf90b9c7ec6c3e01886d350fd8a70824366383f7dcc49f0a8c92e
 DIST capistrano-3.4.1.gem 46080 BLAKE2B 0e02a401b04733e7c55dae4397486ddeb518ba91fd9b543cb86c0398524471f1b8f00a41fb7ebae64e69bff806f1267fcd8a634c76f944dfccc10eb4118360cf SHA512 ef3b8735aa91137234937b5704a74b965be729581e71df9794324303dba60eacb91c66c1b38f8154f315cd4d17f98e8ab6f491cd1634b59b51b320f2244f6ae1
 DIST capistrano-3.9.1.gem 77312 BLAKE2B 1aedc4739451fb028fa0d91f1bb1c1501c373f971c6ae7f8e15f7cd3ee13483b7d8d05ee967a96f3efcf3021d112be40ccb562f0bccde273cc7b5e4bb78cada1 SHA512 b9dcb21c43ee03cb250a5d740a3fb1ccced720efecf5168a394e8dc0ea56130fd77255f0ead260a7b221d222d34361e99ee68f29cbf498e599e6e5c73c099907
-EBUILD capistrano-2.15.5-r2.ebuild 1242 BLAKE2B 59a5725d3bd77014247e2285bd24760fb48f01f52cb510749a239ff356a5c1c8c14bdfce636f760d55300a68f5bf56d211d959b617d5bdaeda9872ef0639b2bf SHA512 cc943bd80e4d1ac7408fb26c3e63590d891469452f7057c2b52ea2d7eaa68f827aabbc90ec76fac1d66aeaac69ffb398a07f1ed66a829dc2d43cbe6ddd6df7c2
+EBUILD capistrano-2.15.5-r2.ebuild 1246 BLAKE2B 68b68c43b731400c28bf0882f10f244bcff22c5c866688e4541426944c3ed3674e89cd4115b04a72ee8fd3a3eca0e189b7ff7fcc47dee3fd9c253441b9764c8e SHA512 40ed9abea01fdd7633de6a1adde01a85a45a429c823e592e000a6f209a126ebedb429c0e41fbcd4cf611ed26abec010e3336a7ba68edb81fd83b98c969cc73b1
 EBUILD capistrano-3.10.0.ebuild 1168 BLAKE2B a7e72d9183494a773255c082b8f77667e739d9310302527376e5e7f76d116b7305d140792e680fcf22b2501cb7e71f69b97ff4f498fe987f184fb87e0deae259 SHA512 033fbc88432314dc90936cc6b138874d6690d705f0e17ee5fe1066794bb11ee57af9bad69e953875d4520c1bbd00a2773015697fd08abd3747bfd52522008b1f
 EBUILD capistrano-3.10.1.ebuild 1175 BLAKE2B 0d2b3411fb577ab260e2fbd7c8a69dba1f6314e21f254fb02b7119f640ad79fd1a3078aa88d855be050d89883f027a7306d05f6851a7c5ff7ccd54fed60a3a8c SHA512 4fd4323826ca08915b3443fe147c200d2ff81f16566afef94beced1fa02f4e45dad3c21ea254a5b490dac0b02339eb32291b0939ba8d58b923e57765d578afab
 EBUILD capistrano-3.10.2.ebuild 1175 BLAKE2B 0d2b3411fb577ab260e2fbd7c8a69dba1f6314e21f254fb02b7119f640ad79fd1a3078aa88d855be050d89883f027a7306d05f6851a7c5ff7ccd54fed60a3a8c SHA512 4fd4323826ca08915b3443fe147c200d2ff81f16566afef94beced1fa02f4e45dad3c21ea254a5b490dac0b02339eb32291b0939ba8d58b923e57765d578afab
diff --git a/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild b/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild
index e21143a5f4de..34e487855213 100644
--- a/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild
+++ b/dev-ruby/capistrano/capistrano-2.15.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="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
@@ -20,10 +20,10 @@ KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~
 IUSE=""
 
 ruby_add_rdepend "
-	>=dev-ruby/net-ssh-2.0.14
+	>=dev-ruby/net-ssh-2.0.14:*
 	>=dev-ruby/net-sftp-2.0.2
 	>=dev-ruby/net-scp-1.0.2
-	>=dev-ruby/net-ssh-gateway-1.1.0
+	>=dev-ruby/net-ssh-gateway-1.1.0:*
 	>=dev-ruby/highline-1.2.7"
 ruby_add_bdepend "
 	test? (	dev-ruby/mocha:0.14 )"
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 3db54fb64fcd..e4904c470b4f 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,7 +1,9 @@
 DIST capybara-2.14.4.gem 265728 BLAKE2B 7b61fc7424b5e5aeec50e0695ef7719d23b594d3fe233c04443c37a5f06b0f1e7c440135c50225813d9da954c2efa0563488668202e09a4e3877f28708f9624e SHA512 d3ebbd8d96e4d2026327b1c70ff723225ce052fff510a909111b8cc7e02b12fec9e00acddc0bc2565371cc5eb0b590abef43d42a99c3938a929ea25930fdefd1
 DIST capybara-2.16.1.gem 273408 BLAKE2B 1d1a68427fcfed9a8153e409e17fc043dd8d926c3ebbab3560ae12454f3010c8b4569348c231e807d993263940b703dc5380a235da438eb5ac2f9d0bd3a66309 SHA512 921e05111278b7bff93fe805a29e7b2e0e78b36510db5dff1189e34c3cdeada52504a8e06534238e578c32e8e0efa8d99a0ffc8516d94e60c06e7fd2c4ecb174
 DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca18ea85a7095d9e58625df6a59a349b60b462c5c4f403a6af955466bc46d82be6cd91724fc2b12cbe15ed74a4c SHA512 3bb994e022593d485a07296193a16cae7b45e96e87dd10b2bd4807ad2bc990801044c0493360598d1626c3e367e8de87e407f65c2c6f42674d5f1b9c0b5c1933
+DIST capybara-3.0.2.gem 275456 BLAKE2B bcf2049193062b7d16e811807faf629379bc5a94bba771d442e9680e727d765703ad4c6cf8abd9d0bb22d1971f07d897f0fc8a572182302528961fcfe8b186fb SHA512 5f2611238a58184dcd57a5ca2fff786d4ecfdbb51815c3f6afdcabbb85087baf87fc601d1506a6b880d42af32e06a62e7757b1abf455325718258d3072616a49
 EBUILD capybara-2.14.4-r1.ebuild 1512 BLAKE2B 41759ee7879a50f7b270ad9fdfbb459b51c12b2ac6b5eff8613c9bc73c2f71f02a617056a70cb933fef7f0f4e9dd1f8f7313755a4660256343234e100496ee31 SHA512 4a6543d94133e2b0225e2bd4e031625aa58395b9293d67a6cfd9119e089b0b58c9010ee9442d8fe5afd3b99861745608c05e9f028bc0c0767cb09d44528b74b0
 EBUILD capybara-2.16.1.ebuild 1504 BLAKE2B 22cf066a75150f50d23c3761474076dcb9ca07381148aee813b0b3ff36d102a2bf316f3ecd1872306960eabbee179a4af1e136f2b98ae775eeae6d57b76400cf SHA512 c2fab8431816750ce63411a95333916c90fc50003df9cb2d47ba2a8964eb168edaad8bfb487db65daf0472fa598ea0e07e57f2a6b9cf266dba4d3450833b5799
 EBUILD capybara-2.18.0.ebuild 1521 BLAKE2B b2f2b42361100abf4384fc7dfd84d8588dd1ba261fbf14131eb8e8992c0896c7c3bafccfe3dca94c721a1b3cdfdfcab846e14cc85b893d532034e4962058abda SHA512 5d05806094a5ec44d86e5d4fac07b29e16280f2e0da6fd06436fa08dbd966eb18b5771c82981fdd34332e67f145654fad64532fa8d734dbe6498a3e705d6cc92
+EBUILD capybara-3.0.2.ebuild 1514 BLAKE2B 3a79eaa4545b934de0d9fa8396e0d18c858ffb590b2a531e2d2b93864bebe43ecd0c449919e4ac96f5b754bc8e083a7adf7b805ac7be04f8fba5c0e8902a9d4e SHA512 bde7046cc60a57c245493938e937edb919c203aa13ff026c9d00b5eccac6a27a933f9f25a2c0fb6e956581091f7d958814296c0a415ee4fa9b6c7557e0571bae
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.0.2.ebuild b/dev-ruby/capybara/capybara-3.0.2.ebuild
new file mode 100644
index 000000000000..dd698f232a22
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.0.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/jnicklas/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+SLOT="3"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( www-client/firefox )"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 dev-ruby/sinatra )"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	>=dev-ruby/mini_mime-0.1.3
+	>=dev-ruby/nokogiri-1.8:0
+	>=dev-ruby/rack-1.6.0:*
+	>=dev-ruby/rack-test-0.6.3:*
+	|| ( dev-ruby/xpath:3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' spec/spec_helper.rb || die
+
+	# Avoid window-manager specific tests (sizes are specific for fluxbox)
+	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+
+	# Avoid spec that requires unpackaged geckodriver
+	sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Avoid test dependency on puma server for now
+	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
+}
diff --git a/dev-ruby/childprocess/Manifest b/dev-ruby/childprocess/Manifest
index 01e81e8f9545..de6ec48f3358 100644
--- a/dev-ruby/childprocess/Manifest
+++ b/dev-ruby/childprocess/Manifest
@@ -2,8 +2,10 @@ DIST childprocess-0.6.3.gem 31744 BLAKE2B 18fedbe7fbfa1a3954e74206b1f6207351d430
 DIST childprocess-0.7.0.gem 32256 BLAKE2B 58654d088b2b45917ce279de5178b21694ddb32c2771eb04b2b9de2db5e1f4cfcd6250947a38f51332dbdde730118cd63cd5432f0d54138b795416bbc6589365 SHA512 f06203ffecc09f5ab2dd2fe003de0e1f96906b1c5966c2dd630cccae046fd4b4efc6f8c96d4c825af2b4ab2e0e8dd63f6dee97701627d0ad311f0d8395c89c8a
 DIST childprocess-0.7.1.gem 32256 BLAKE2B 428eef33c465e8805c855a9389fb0f393e04c48f0f30de4cd2f407cbf403fcfd621283cc9aafcc8336c19415245b180d46036c0e50910fcd8543ad346e0faec3 SHA512 c8e22a3244b5f6315ea003b20feb3f5a576c73938d8eb730f3aea99dc63662497a954531139983ffce74ebc089609e9ecc665144cfa6f05c699804615ca68902
 DIST childprocess-0.8.0.gem 32768 BLAKE2B c473da69bd38bda1e28e6adbac7b11597b05eafa58315996435052683f2e3ed500f3c83b27b17859115e1113e0da726007d0ccac3fee171b5338a9026482ac6f SHA512 7e10c15930012bf99ea28afa677a6f745d4e6ebfc21f21f7101111c5a2d35df4fb146bbddb4d1e7a6711324ee7604af50995960570e85ed3f8fe087c59fc02cf
+DIST childprocess-0.9.0.gem 32768 BLAKE2B cb836c2cc3f9d6bda1db88aec8692499dae2a325611dcdfae482fd6a7bbf065612f0efbe140c08447566b8759ce125968a153d6df38889403d98bc94fe397d7b SHA512 5a788556e14491b0801b8a533d8d8eebba726af6417c8c6c7146738fcae2f92e9faa090312e77d974852003f5a4d155d5307b0c9d1ff1d18173ad653d21f63d8
 EBUILD childprocess-0.6.3.ebuild 859 BLAKE2B 035d58cbcaccde7a7031adf1cce7874aff5de2e7c5ed3cd9eee1299bd9adefdc656cc5bcb711ed80931492906bf6a45606e3fea77b7eb1d616b3d56ced534156 SHA512 6477a2f5c1def70a61bdb6217a66e7c01d539c87432e4e201fd3676b609724307dfdd95ecdfc255b79bce53d93737e0397669da5909f00b73c26f89028a9a52e
 EBUILD childprocess-0.7.0.ebuild 827 BLAKE2B 459b53e470695788f860f6b6c4b3c51569cf65ef6ad6e5d9926af68296b9b52dd2a1805e1612046b7ff7de04e3e4e2fd12b19c590677ca77f9225a7249af3f18 SHA512 a701f8fdbb09fee21b6657873c6afaf8b6128c7183484eafe03477faa0751ad0d46fb338f2378782a4feb16d82c1104d8f6301ed8ecb54d11484845e897d2f41
 EBUILD childprocess-0.7.1.ebuild 982 BLAKE2B e308b59240cb57815e2138d9fb6e91a4c0a7d2212029cb5bc597e4041022b41124417f0a990485f56193fb937fe9655ea65976f049fe621ee85d4b889bcf28d4 SHA512 262d468770afc3288c6923090e8b0620c9d51e569e3eb823cc7d145dfd956756b678489f9976c4492f49f0ace0fe9137b5957440ce14fe52d184e398c64af37b
 EBUILD childprocess-0.8.0.ebuild 975 BLAKE2B ea1902170503fa521ec6fb176c56d8a1054076eba8cb5378d47b3d917ac7022e6889c22337606985f19212b15e6bc0dc0e8f2414a6dd00fcaea206838bec119f SHA512 e3200509ca42c07c6869ba859cf66aecb77433e37ea1631f2a87d9d5ec5fe4dd4b8d28d4629fce0d1b924fc790d08df32e3a80823b789263e972fede3e9e8505
+EBUILD childprocess-0.9.0.ebuild 980 BLAKE2B 2ff0634d17f123d672a1c5b78d79e41f955cd616bf1c2514093cb1767174ae1616389fd884ada0bd446442ce1b5bbb4bad9d2fea11b2c566f7e8aebe0c021172 SHA512 a003735773a12085409882169c976a124ec8cce2f9fc5e0210930f819f11d40cc7891cbdd61d517f6b56cebeaf35ca6033e31292649fd4951b70514df560128a
 MISC metadata.xml 344 BLAKE2B 3cbaf9e4992ca3e9fa2283451433e35247418e190a6447453848988e305a4f04583a3ee563149774c347dbd6bac2ebb0451c19fba1d5447162707783c02ff6b9 SHA512 2995953d3ac4c6cc924859dcc2910bd303262f86d5771368956cb0a3d26db031302547154bd98cdcf189aad39e132020c0c22510c65c7830f528cbf2265d871a
diff --git a/dev-ruby/childprocess/childprocess-0.9.0.ebuild b/dev-ruby/childprocess/childprocess-0.9.0.ebuild
new file mode 100644
index 000000000000..3fdfcee15242
--- /dev/null
+++ b/dev-ruby/childprocess/childprocess-0.9.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Solution for controlling external programs running in the background"
+HOMEPAGE="https://github.com/jarib/childprocess"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/ffi-1.0.11"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	rm Gemfile || die
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e "/[Cc]overalls/d" spec/spec_helper.rb || die
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+	sed -i -e "s:'ruby':'"${RUBY}"':" spec/childprocess_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB=lib RSPEC_VERSION=3 ruby-ng_rspec
+}
diff --git a/dev-ruby/cocaine/Manifest b/dev-ruby/cocaine/Manifest
index ef9bc8a97494..dae5846fcc41 100644
--- a/dev-ruby/cocaine/Manifest
+++ b/dev-ruby/cocaine/Manifest
@@ -1,3 +1,5 @@
 DIST cocaine-0.5.8.gem 17408 BLAKE2B bd425d9ceae81e1c29c0059d9296b9de392940ea301b2752cdeef6777ee942975c548e7018f5f2a66505c5ea836a1c2ed684b2d0756c6047a1ca7b825c0cb12e SHA512 0145c1731261db50c1855881da470dfeffdc3bee7cd6c800590507adc7204a31ec178ff6f655866b888eb87b47e1e454415181ec909f2dbe74f8f66277282d3f
+DIST cocaine-0.6.0.gem 12800 BLAKE2B fc401c0ca3dd4cf9dfe3c3877094e0ed0ca8b1ed8101cbb99b7637c268331bd380fde71a5f6a5f77104040d4e6ceb6dbe03874218a88c98edbdf525a05448db5 SHA512 da77d9f356c420517c45bef2c91722b260b071dce42c78f84c00527a0065f82f3e9a8d4a45a2ea4be99adf9f39326957afce6df8463586201bcf5a675b25707a
 EBUILD cocaine-0.5.8.ebuild 1086 BLAKE2B 75bfd02ecd8f988cba8eefe5bdf1b690ad7107f14c586882b27b2b2d3be723ec51d9c47bd6631234bcaa4e988471b4db56c8332df5bf9d7b4f798b475afb25b2 SHA512 4bfd0d2950fc813ffb966209eeab42922136dc20e6307e0e347b219ad2ce95a8b1509029a67dac532db8c7b3dfce470ce222a2d9208c8ebfd7e7badf0b503ec7
+EBUILD cocaine-0.6.0.ebuild 1070 BLAKE2B 0aa86c3a6403c9fd1a695afc2dee66aff6e875ba4b1eb6ae9add63afd99dd4fc1c2c4aa8f1d0477b638b676b257555872f560573c135e482fb68e90501fb9e46 SHA512 c099990b8d698612464df48db0d0adc09c9d0fb10a020c345692c9845295e13071a1a50acdf4f8f75df48014d887ac12414aff452fa6474855a16a4e8d5e9e4f
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/cocaine/cocaine-0.6.0.ebuild b/dev-ruby/cocaine/cocaine-0.6.0.ebuild
new file mode 100644
index 000000000000..c5cbc04f8138
--- /dev/null
+++ b/dev-ruby/cocaine/cocaine-0.6.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A small library for doing command lines"
+HOMEPAGE="http://www.thoughtbot.com/projects/cocaine"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "=dev-ruby/terrapin-0.6.0"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/activesupport-3  <dev-ruby/activesupport-5
+		dev-ruby/bourne
+		<dev-ruby/mocha-1.0.0
+		dev-ruby/posix-spawn
+	)"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/git ls-files/d' \
+		"${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	rm Gemfile* || die
+
+	sed -i -e '/bundler/d' Rakefile || die
+
+	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
+
+	# BufferedLogger is deprecated in activesupport-4.0, and removed in 4.1
+	# Require active_support not active_support/buffered_logger.
+	sed -i -e 's/\/buffered_logger//g' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/combustion/Manifest b/dev-ruby/combustion/Manifest
index ea0316827026..e3f85ef66f27 100644
--- a/dev-ruby/combustion/Manifest
+++ b/dev-ruby/combustion/Manifest
@@ -1,7 +1,7 @@
-DIST combustion-0.7.0.gem 16896 BLAKE2B 241a05ca36cb231deb8e4f0fe6f0e6dae06f8a01e30a4bc078e9e9b4263d614a924a487a5b81c27142de99c69f60590208242b29930819c516ad72b3a3823567 SHA512 77e2f7da100bffce5b3d8271ba4fd685839295d79a0738c02b5a47fb6cde3cebd1a5d6b9b8668f5b3eca5dd5397476d71c393d3e19429d47a77ddd731875f3dc
 DIST combustion-0.8.0.gem 17920 BLAKE2B f318b2a2a6f1ee2103d396f9da52f5aeecdcd76008a91613118732b7253625ef40994680400ce3b8a3f781b08366c8bc15d9288ff9e8d8bd8af8afceb9af9a28 SHA512 145aa927dbedf0f5e8207538f0c741ce7c9a03ae696ad6a525bfcb0d4a3c89ae6f9f1b4ffc384d6aa82e2fa3ad802902a29db2fee9803e7a05dd69ea59c24419
 DIST combustion-0.9.0.gem 17920 BLAKE2B ac5a1c41b5993614a0101427f0a8d7491736a98b3b7799ed9e638515ae0a9b3098eed5c77a5bbd1c02efe9b613b2d30aac0c446fefb16405c3bfed4d1d15d23f SHA512 6d82f96fe2f42e50065e3de4d0fb8b05fa8da9e63a77b29934db0600594d826eb2a3e36a14e7e18744fed233db769c12a7620b4ec98aa230a6973d07a142a364
-EBUILD combustion-0.7.0.ebuild 510 BLAKE2B af63b006c0c8710f495b1ee3e12bc1e43b710bd30de16e72fe80c4eb01137ce92f195568cdfb8b2d13573a6f279a3432049858e783182b71a773335889d556c4 SHA512 8b3236888ad7ecbf118a8229314dd0232f3e0ba0e86b1cc97f1cf261465acec1b1a508b8d426bf1ddfd891e88bd1720311a3396b54c816959109bf8a93114a1d
+DIST combustion-0.9.1.gem 18432 BLAKE2B db569f0e97c756b5ebbe9fe33186d793ea8be97c9a629db0f263576a15bad1deaa353e43afff0ec72807be7fc9fc87075696ce5fbd20abaa0dc064a9d448d4a1 SHA512 9a64b0cd440ea10f1318b24f7643303d9cd7d7ac6d8d2d16a5b7b6e656a6cbbc98684636520a12950ab038bc819ee817763e802996914cc7ee6ba0fb12ae9248
 EBUILD combustion-0.8.0.ebuild 503 BLAKE2B fd2f8df943e511330b6948903260d7ac5b0ebc7cb90d739e1f6fc3efd2c4cfa18b224b9f6580e420d009e8941027bd42a9c80863b9becd958a138aebdff1451d SHA512 39e410894963f8c9fafbc0ff472de26de768e7cad4ef011b6c669ef3eee233640b65aad938d246584d1aed42f059a6d79357f5f25a12dbe77f15e07b837000f6
 EBUILD combustion-0.9.0.ebuild 503 BLAKE2B fd2f8df943e511330b6948903260d7ac5b0ebc7cb90d739e1f6fc3efd2c4cfa18b224b9f6580e420d009e8941027bd42a9c80863b9becd958a138aebdff1451d SHA512 39e410894963f8c9fafbc0ff472de26de768e7cad4ef011b6c669ef3eee233640b65aad938d246584d1aed42f059a6d79357f5f25a12dbe77f15e07b837000f6
+EBUILD combustion-0.9.1.ebuild 509 BLAKE2B 0a105ad549619412e2eb4279d3ab5db7019684687cc7b6af477832ca2ad7ab16faed04bcc3283c8735957edc52382fa41719d123a70884ffec9f81c0c78436ee SHA512 0a255391ad936bdf9000ec61880166aeca389656e64dbc2c4b3976e98abc7c62ea3f06c1493e6685cf3e3c11f3e948b0176745c1a9a01a75d036a26a8b7137c4
 MISC metadata.xml 340 BLAKE2B 92307b9df9e0e099c9e38095e3fe14be95374db3313eff5357c57ea1c86cae77276f0a7fe828189402f69e1c29feefa17975d03c94694c59257be999c103a488 SHA512 85ab18259671a4c6f57a305fe992c5a0b078f6bc9f10d88662123def6b378340f5b2f62350a007dd1f62bb66766f1e7b6f3c2546042ff9e52f53332f66ff11bd
diff --git a/dev-ruby/combustion/combustion-0.7.0.ebuild b/dev-ruby/combustion/combustion-0.9.1.ebuild
index 72e8a734c5fe..31470caeb484 100644
--- a/dev-ruby/combustion/combustion-0.7.0.ebuild
+++ b/dev-ruby/combustion/combustion-0.9.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24"
 
-RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/cri/Manifest b/dev-ruby/cri/Manifest
index fa702eeb0c98..7a10419a83dc 100644
--- a/dev-ruby/cri/Manifest
+++ b/dev-ruby/cri/Manifest
@@ -1,5 +1,5 @@
 DIST cri-2.10.1.gem 28672 BLAKE2B fe6f78ec193298605995e00242a4f615159192b66900c111fa58252aea63c3a5515a0e7a9d7c5a1a0878a2e9c70a77023ee60be4d7b6c780d5f2d1300641e109 SHA512 f71cdd00613b226f916c9f45f9e8ce3a7c0c68bdb547de6df8b9457c018627c18ce978a13c971e0ef2cd24ec985f815df0389d0ddabd463eef93d5e2147e6101
 DIST cri-2.7.1.gem 25088 BLAKE2B 20317d886401d6d5f034c27396cad2fdaf322246c319ef3cadc3e38169dbc00c83771fdb2d564efd0ca386b916a0bc2d8cf283742ccd18ca390e491a84f5e31f SHA512 37d641390dc83550c254b3c48018f7f2c53f73161807c299cb78ef84b8625e5f00cd8c877ac464ece5c6623d7118872c45648ed56c2bd5f53ae62cd66b8e24d1
-EBUILD cri-2.10.1.ebuild 772 BLAKE2B 1c35ec63ef811714ac8a1859d5642f281d16c56a6e7b712f418b63b9db7b9c931170fa12d7a2afa4743ec56391ce7a3f3abf9dabeefe309e3034e7e96f3a9ef3 SHA512 ef696f8a982b80b764b370fb41a39e620810a728a5593017daa97fddcacddec8c625d2fcd1ceefd4aafd80886ef2d3a276f6c6f7d8fb98063949bb4e2866f888
-EBUILD cri-2.7.1.ebuild 779 BLAKE2B 5dd19956c21001cf4ff7a974ca8efce7bbf90fb0304fa3691c2f2eec76f053b15bacafc04be6a164da6f7cf99b75fdef7be37efba1b208d2aaa5c6a70659967d SHA512 d193a9208a8e02ab5f5c15cfb643d2cf7966e3c2679aef9c3a653c140906d7243c8e5237fdbdd1de872a8e4158e649aaf93dd2130ddba2a7ff56d538fec71ddf
+EBUILD cri-2.10.1.ebuild 772 BLAKE2B ce43c4c23ea400229c826bd18c7baa6a68f0749eb3507e927ccf79d89da6f9e9cc491e45e694c930d1fa78d64cb7560d282edf86424994c5adfbd6f7909e942a SHA512 1974af8955cb30a496a14066fab05a7ee499045e17fa6642d9e97904b6bd2700c5b06e7b81b882039a03cd03bc13bf5da9f61510beb40638f686d65e045254a4
+EBUILD cri-2.7.1.ebuild 772 BLAKE2B 3e09c46b3ec082da544c48c2a4c6a024ec45c83547bb3558a5b26c0399818a1fd9ee602155aeaea5e7a408fe4d3abc1294f03bd1d3d14af437a77ba125651e48 SHA512 29b1e00f40376ec04affde1d366437fb65bddab170bc6f4b66c3a4f42c560bd2970b923a2cfa17e62620170695c1929e6958b1f0da966e87280ada6c08b80ee8
 MISC metadata.xml 321 BLAKE2B 2bbd02b4b0f33bb2e3942b93c9af104fcafe960a59b2f109935f5121c2476635f1a3efb9ac092f4f5e6138df0398ea0ca874ee62390d20f3620d442d3502d42d SHA512 8e90f3ffd2b30ff9557e4c11bb31655cbd65498191288c68191f2e5f6d7bbdab6f1c22935f8d45fa95673582d1d0bf776055c0242cee2da27c9d3e71e2851f72
diff --git a/dev-ruby/cri/cri-2.10.1.ebuild b/dev-ruby/cri/cri-2.10.1.ebuild
index 01337421830f..92fbb3fd7839 100644
--- a/dev-ruby/cri/cri-2.10.1.ebuild
+++ b/dev-ruby/cri/cri-2.10.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.adoc"
 
diff --git a/dev-ruby/cri/cri-2.7.1.ebuild b/dev-ruby/cri/cri-2.7.1.ebuild
index f44edc8f80f2..0ac2af111595 100644
--- a/dev-ruby/cri/cri-2.7.1.ebuild
+++ b/dev-ruby/cri/cri-2.7.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.adoc"
 
diff --git a/dev-ruby/daemons/Manifest b/dev-ruby/daemons/Manifest
index 6d52c38a38c3..2b76c2583b7a 100644
--- a/dev-ruby/daemons/Manifest
+++ b/dev-ruby/daemons/Manifest
@@ -1,5 +1,3 @@
-DIST daemons-1.2.3.gem 24576 BLAKE2B 23cd623c2f9c84ba182b0d1eeb5bdccf9273dc5f0d41cd51377abe7fe1c29e6c7bd342afa9891a54638aefaa4bd1353a3183516bb4355eb93772de633e2db05a SHA512 05acecc07bc3f760472453dd11eb0231b9e7f2e04a783ab44dacecf9c666d01122d27fdb782d9973f475bc378e0e3e51795ad58e221f29b201b1ba5e0de1e277
 DIST daemons-1.2.6.tar.gz 27557 BLAKE2B 7c08b637ab37f764309fd260c4ea6c11402b89ea327eb47ea0af3860397ece795467a11c4ae5d8577972f5d8e2c6590f4d8112027f06db941b7181e33c158736 SHA512 8276685a684093252bf136c552a613a5208f4ab34f178be9425c62ea59fe1eebe671a7dd6c57d30744187b9ae58d7a7f1ebf58468e988565a30ca4417f2a90ea
-EBUILD daemons-1.2.3.ebuild 689 BLAKE2B b6481ed945f1d6d35089f5d0b630cae361da7e3bcf4ce39dca45540aef6ba93e87196abae160d7b9061d5d689270349b3de0260a6c0fbb194913287819e13383 SHA512 888620fe4d6e4d073b48028fae6d211e1c51fb81cb5556a8d49227f8d7fc42f21e77181da4b3396cf575cd90fea879416be3f773120df4c7a2a2d57e20a84e5d
-EBUILD daemons-1.2.6.ebuild 878 BLAKE2B 174a6a3afd4ecb7b06dd1ac4263c2280fcf5e628e101c08b78b3e8209e90dd84a20aedc38ac5bae2865bcb94e2201c363acf6bc8419da869ceabaecba42ee0c5 SHA512 74ca87134eb343313dc181f3c9f6a36c0431df04c0513d7291035970c724a099b8a65ac33ba22045c19c25bedbb3b10d1fd586a31e3057d7973c51c8674ec18c
+EBUILD daemons-1.2.6.ebuild 876 BLAKE2B 29c6127e572d9b263d6e35b79d668a192819f02455448a6f745378fe06d5797767a42952112f0a6ebc407b6e3319e180330e23b81b849b6051958e0d77c9da08 SHA512 d7dd2b9769c43114adfa0a0544eee1062941d4a5454df683e5dfcb6a7acf17080229364b13acc08e4556484c453a96cf0a34a192ae175f5b947b187432beab65
 MISC metadata.xml 345 BLAKE2B 7e783ce974aa702ba94e5d1d1b17646297e1db1c51d4dad02408e678092afb21647d8a21f0beca7d8e03f4c5271e3f63f643e3d113bd1d89ca927110b9d447f6 SHA512 c6e30f1117d3ebc21e91cf49a6e4952f3cadef673c1a624f9b5cdd4bcf036f1a4d25120799ff72896b2bd38386fe251e72b27028e2a31551716f21bc90217cec
diff --git a/dev-ruby/daemons/daemons-1.2.3.ebuild b/dev-ruby/daemons/daemons-1.2.3.ebuild
deleted file mode 100644
index 38e345251368..000000000000
--- a/dev-ruby/daemons/daemons-1.2.3.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"
-
-RUBY_FAKEGEM_EXTRADOC="Releases README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Wrap existing ruby scripts to be run as a daemon"
-HOMEPAGE="https://github.com/thuehlinger/daemons"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples"
-
-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 0ea5fdbae211..901f0ec74cac 100644
--- a/dev-ruby/daemons/daemons-1.2.6.ebuild
+++ b/dev-ruby/daemons/daemons-1.2.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="examples"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/dbf/Manifest b/dev-ruby/dbf/Manifest
index a0a3345dafc6..cd59f165ad1b 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -1,5 +1,7 @@
 DIST dbf-3.1.0.gem 126976 BLAKE2B 1ab65d152d7dfcb84a857c21fccc7162a0e35e51cff50f30972bcc109b9d574479507488538b825aa00e94010435494797a650aaa452ffd2c3fa69150328743f SHA512 d09c2c10a4d16774e8c72a3cb11ddbda6f302ed359b234b9d5698571bac4e10fde73d1200083c1cc7044b632ac196f0c59a94ff60c93e4953359030d74b26e3c
 DIST dbf-3.1.1.gem 126976 BLAKE2B 449b70abaa0bdcdf579ee78facbac46d2f97fb99e983b99ef7487c6a78f5d6f8f1c5257e1a490a169b8cb8e9581fb56827d86844d2d2ee9bc0b3326998206f6e SHA512 88aedb43858702ef2f24a2a751ceaeceba7d75ad58a6abdb314219cbb83551165aa7a1973a68e6b4c0da87c9f35c80b2e0650b25f570a76821bbdccb3dbaafb5
+DIST dbf-3.1.2.gem 127488 BLAKE2B c71089220f7b2d57b99ab27881c5f094a753c1a7c5378074f18d4a9fccba26d4ac7e8e563b84c0556aa50db7f39d03697957c10e6528ddaed8bef812cac662f5 SHA512 1e9c809cc03d4ecadaadd5cc754e4fa85961cf675465f950cda1c084e80c32e0a62223494f76b4ba8e26cde61eea8e43414d1b03c95fd36e8994222c3ffcab11
 EBUILD dbf-3.1.0.ebuild 489 BLAKE2B 1a5af7d1f9a99b112dba2f7730148ae8e23f6a348690c78a514f4a141b8aadaa4ef15f064029aad85083372434f7984e99ab9ab72680956b75e80d60ef4254d2 SHA512 06260e05926a1318440c173e76493f0c22d7d72f90ff8852af11b8d40f5f7c7d2bdb09eedba3860e434b2011d48cec8ccff36cb44823abb9690bf289dd9736c9
 EBUILD dbf-3.1.1.ebuild 484 BLAKE2B 51e1da411c6216ca678771c03f04d14cada1144ef79b6ccffc9c06554184906bff07b4aba16996a2d65e00ff754b133c90675efbc2cd32c155fdeb38a2fb634c SHA512 5ded71be147e6909f1c4dde67027e9f2410b997da26da017aa9572dfbc3339befce7f15e8829ac7a21a796c1774bc77fe61d979039daaaa809fac6e9c8d8bc3a
+EBUILD dbf-3.1.2.ebuild 491 BLAKE2B 99af868e61c34c2025a82e6b751888cf31505c892804b1f3af8e3675fb37fb57a84bd91ff2132d6cfe54db426299541186d65cc8b28df1f4675a660468605030 SHA512 ffe6b107766e9abfe7eb4cc705836ba3e42d85e7c6d1c54e631b4cb82131026ceee3cc1dfe38ed8f50fd4cd5af7d73872a4229cb7688e704f30f894343ffeb56
 MISC metadata.xml 473 BLAKE2B d563d50bcc5286aec5a86a72bd5224e9a08d3369030fcdaae80fd3380462cd00e93c613d17552aa35ccf23440e5fbb78ed8ceb9c4f9b3b97af8591a514d5ce9d SHA512 5e46d9be66b6236bacb4089909d40de9b2124dc5fd1e026807c4e6fdbb70e25aa32bfc3fd150b92168bfd7764fa8ff74314e48fa3bad897b34276d7f12722f90
diff --git a/dev-ruby/dbf/dbf-3.1.2.ebuild b/dev-ruby/dbf/dbf-3.1.2.ebuild
new file mode 100644
index 000000000000..228d72d6735d
--- /dev/null
+++ b/dev-ruby/dbf/dbf-3.1.2.ebuild
@@ -0,0 +1,22 @@
+# 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_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/*"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a small fast library for reading dBase, xBase, Clipper and FoxPro
+database files"
+HOMEPAGE="https://github.com/infused/dbf"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-ruby/ddmemoize/Manifest b/dev-ruby/ddmemoize/Manifest
new file mode 100644
index 000000000000..eb45ced754e7
--- /dev/null
+++ b/dev-ruby/ddmemoize/Manifest
@@ -0,0 +1,3 @@
+DIST ddmemoize-1.0.0.gem 11776 BLAKE2B 3acf18cc70aed6c35ee98f42e6004ae13c623299abb0e8a3c0dbe7e7908775b9b6e2f81cc2977e4ca04ad584e7b5c43219979187448e3c87e6abc2d78a1c8f15 SHA512 b0a4c825c789f578031d12ff38f204bb5256db769fe71fcda98f1ab23a3d61c9d9d6cc486a2bfa566c1ea1fc8617b2563e97f05eac40b7587f35c618fd495eb2
+EBUILD ddmemoize-1.0.0.ebuild 622 BLAKE2B 208f26191a1ff3ed2e67a5279a6b0837fa561441f3d7bac983ca6fef9a197dcf1fd5dcd6377e13dfc7da26686fbdfb53c45d155959ff30b01f0a5c4152a15ad7 SHA512 04f6fa0262e655a82e5129d0e4a43864b6a2bfab0992eeaf5e7df6c12b668baffc7d7c35ace1e4df392c9732995dee59fae96ab4bf18a65b6e4411128844838a
+MISC metadata.xml 344 BLAKE2B a50f37c694b950e729a6a5ef255c39047b9e0ed35bef76b6dc576d00caba00e9acf8f9df19a862a019ca2a101ecfc286d98f946d14c6fa16363bf151f924b089 SHA512 1e4be3617295a4aca46bd44b62a2cf768d6546d98d6fa064b6946a0afdfe1f0c45750b56a38471647eaa5a00e4d045f10d399737ded43e745615fde334f279f1
diff --git a/dev-ruby/ddmemoize/ddmemoize-1.0.0.ebuild b/dev-ruby/ddmemoize/ddmemoize-1.0.0.ebuild
new file mode 100644
index 000000000000..a7cf081b5e5d
--- /dev/null
+++ b/dev-ruby/ddmemoize/ddmemoize-1.0.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="ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Adds support for memoizing functions"
+HOMEPAGE="https://github.com/ddfreyne/ddmemoize/"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/ddmetrics:1
+	dev-ruby/ref:2
+"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/^SimpleCov.formatter/ s:^:#:' \
+		-e '/fuubar/,/^end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/ddmemoize/metadata.xml b/dev-ruby/ddmemoize/metadata.xml
new file mode 100644
index 000000000000..1531b69fc0be
--- /dev/null
+++ b/dev-ruby/ddmemoize/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ddfreyne/ddmemoize</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/dotenv/Manifest b/dev-ruby/dotenv/Manifest
index 4da28b7cb6e6..6581d263564b 100644
--- a/dev-ruby/dotenv/Manifest
+++ b/dev-ruby/dotenv/Manifest
@@ -1,5 +1,7 @@
 DIST dotenv-2.2.1.tar.gz 15855 BLAKE2B c970fbd30e3c616b9426f4f758e47c81cf54887de0a11560f4ed3aabda6b1b83f49849775d129658d3a2eb6ecdfe4fbea670d0a63443954ac1d53177125a895b SHA512 67e9cc5323d505f0b5a5a1278d0ce6c72a577fc096508b5a6de7b73f3c0fa2ca8144475783ab2b9ef04cf44d6e57ddb8e09f849c44729f7bb7c4bb7156baa443
 DIST dotenv-2.2.2.tar.gz 15856 BLAKE2B e27a2650c79aadb31545c3a02d698f5cc3c9e27ddf07aa853a1f776b467f3cb707dda4ee3a0c107fbeb4a5609ded993ab74c81721cab088239858c28bd8e3ded SHA512 6af4039cec9c4c85240dc01eee5e24cac6b762e2fcb0d371bbde4cf03743e1917436664d2ea2e59fa619fddce96c9d3848354d42c3a621556cb120ed1cd0cf2b
+DIST dotenv-2.4.0.tar.gz 16613 BLAKE2B e9f6a3bd08f610f829c09a250916d2b3194f699aa3b19c05e13ac77a4fdcf8a830ff43ddd6203d08fc96b70fc6b5d35b518ee2a640dd5a2b49886fac8a67fdb9 SHA512 59ae851ef6444dafa673549e84e9476c9ffb78ac6aa078be0fbdc0a1011e4df1dbbc664c612759c0932051bbe954a62679b4d9304dea0191469bf3d792943955
 EBUILD dotenv-2.2.1.ebuild 1015 BLAKE2B ef50cc86fde38714d1857ac8456c5e0ca6dc484363017d6b130c4bf55cfba5deff4b0cf94146c2d4e63c878e57d2107731ac218032756db455a18be463241919 SHA512 131dab1ecc531d581a5d8ab4a881200a7cb6444d8aa48e27acc6e615b1605fbc1ceced18de885be3d002966edab7181c1a4e4a59c5ba7470523c27826ab962e4
 EBUILD dotenv-2.2.2.ebuild 1015 BLAKE2B 51f9da2c9e17caae8864d7cc7f0b88ef8e16276db7ea73fdf83a11fa7ca88ccf4b9c0ceb50b9c6f2f5e2d885ea39391ec1c56e99c4d8af539d518425556d74d0 SHA512 bc5c272ec0931b0c75cc6d0c786a95562c3d6298e5b73353c2f9df98e72c1c566d4bfd2e3ef828d95080c67a89fedbab4c2f331ce166550ea796830b150d8947
+EBUILD dotenv-2.4.0.ebuild 1015 BLAKE2B 51f9da2c9e17caae8864d7cc7f0b88ef8e16276db7ea73fdf83a11fa7ca88ccf4b9c0ceb50b9c6f2f5e2d885ea39391ec1c56e99c4d8af539d518425556d74d0 SHA512 bc5c272ec0931b0c75cc6d0c786a95562c3d6298e5b73353c2f9df98e72c1c566d4bfd2e3ef828d95080c67a89fedbab4c2f331ce166550ea796830b150d8947
 MISC metadata.xml 341 BLAKE2B 4cc2ed329e48853a5939f5f7e41d2b6544d3d7d967563da065633826c3fb9d999815e8604fe4a897606f4ffe7be53f3e87c925120961050ce77f1fa573847f5a SHA512 72e21e93099953f1946b486fa8acdbd0b85ed139ef34d4ad9c7e3e89e2924ec598a662f72210d52efdb4cc2ed676962fc6d50c560b4b9c8a4ec849d75d5be2dc
diff --git a/dev-ruby/dotenv/dotenv-2.4.0.ebuild b/dev-ruby/dotenv/dotenv-2.4.0.ebuild
new file mode 100644
index 000000000000..f7b383c50174
--- /dev/null
+++ b/dev-ruby/dotenv/dotenv-2.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_EXTRADOC="README.md Changelog.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Loads environment variables from .env into ENV"
+HOMEPAGE="https://github.com/bkeepers/dotenv"
+SRC_URI="https://github.com/bkeepers/dotenv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="2"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/spring dev-ruby/rails )"
+
+all_ruby_prepare() {
+	sed -i -e '/:guard/,/end/ s:^:#:' \
+		-e '5igem "rspec", "~> 3.0"' Gemfile || die
+
+	sed -i -e '/rubocop/ s:^:#:' -e 's/git ls-files/find/' dotenv.gemspec || die
+}
+
+each_ruby_prepare() {
+	sed -i -e "s:ruby -v:${RUBY} -v:g" spec/dotenv/parser_spec.rb || die
+}
diff --git a/dev-ruby/eventmachine/Manifest b/dev-ruby/eventmachine/Manifest
index 013ece7badc9..66c2c7317438 100644
--- a/dev-ruby/eventmachine/Manifest
+++ b/dev-ruby/eventmachine/Manifest
@@ -1,5 +1,3 @@
-DIST eventmachine-1.0.9.1.gem 235008 BLAKE2B d19fea338daeebf1c7c4ca64de7643ff46e455feb500979c1de96d1806d379c337f70189039d700889eb2ef416b35cd45f298656abe6c5ef79ba2da4dba0ffb8 SHA512 5cbc178c604fe9a21850c298f7a5b6f904573f5e1db9e07fee599c5700841c52ec0311a6e50192eff9c1bb45cf30a9dd81d2150fe9d04cabd24cc7c9c32c5df0
 DIST eventmachine-1.2.0.1.gem 241152 BLAKE2B f7df9888ba9f3ef731099124ce7cf2b6b396f57dc948feb828f015f2b33426348c87f2443fc6f678e94550167241c2ae154f3679b13b3b7e1bdb6bcdae6cfaab SHA512 a861a2c5172b7cf2720bdb54f52ea96c311c10efdb2f54970054901674e044a72307a5b32210efbbdb78d0472a9b3fb6e898640e1c0b406bdad8b581970e30aa
-EBUILD eventmachine-1.0.9.1.ebuild 2439 BLAKE2B b18994687da59fc0ed75fb1e96463b10b671325960491d3fff8691f287fabe1a8fdd1604d7dcc5c0d14876aacfe778084f65d74bae83f3ad0d4b608aeab4b15f SHA512 a94a37275262e2b30a753e31fa5090bba3fd6ec1b05651fc6bd6e2a5ceb1d893c46d1643ce11dcf5ec1cd78be7616f4191d7e2e44f90d3183e8cd36d9d3d9379
-EBUILD eventmachine-1.2.0.1.ebuild 2775 BLAKE2B 8a4aa28d361184b996a1faf654a14ed96587101fe9d1687ba87d898df9877f25ce1a2cf3ab8b23af6d7290c9e79bc1a2916b1fc7b89d84daecca7ac3670820fc SHA512 595085177d653dc93d4a7a5a6e7a2aabb21d46497bff147d13d27fb1091e9068c01786533a8a00d5992c9d10a86b03fcd1eebb6b5c353749a70fb579373d25d8
+EBUILD eventmachine-1.2.0.1.ebuild 2774 BLAKE2B 49a46edecc1b6da43cf90d5da669818ecef2722450f5245651976421ba5c0ea77db4a7269df8c66d35ec780be4acdda49add7a0fdc6aff06fde47e6a5de08bb8 SHA512 9f8132929ec7ef0b4c121d0456baf88dcd3943aafda51cbeb5fb5214ddaa01423022250ed6aae6194358cd2215d1c51f3f1e3ee20034f63d86d890130ffd63b9
 MISC metadata.xml 523 BLAKE2B c8c4dc99c1560b2dc7233a194f0892bf86397594daf3896408d080632dda52cae3fef16654e2a35340bc0746befab669071ff9de7707fcbd92583472aa52f73d SHA512 622ac8cdd832ad49db828fefc3c9ab089e1d7e3795e369778591b4f572a647a99d4625fb9a3624189d0521a8daa9d2360bfe01fd905e8d106b83e244d900e509
diff --git a/dev-ruby/eventmachine/eventmachine-1.0.9.1.ebuild b/dev-ruby/eventmachine/eventmachine-1.0.9.1.ebuild
deleted file mode 100644
index 7f0b8880d3c2..000000000000
--- a/dev-ruby/eventmachine/eventmachine-1.0.9.1.ebuild
+++ /dev/null
@@ -1,81 +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="docs/*.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="EventMachine is a fast, simple event-processing library for Ruby programs"
-HOMEPAGE="http://rubyeventmachine.com"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="${DEPEND}
-	dev-libs/openssl:0"
-RDEPEND="${RDEPEND}
-	dev-libs/openssl:0"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Remove package tasks to avoid dependency on rake-compiler.
-	rm rakelib/package.rake || die
-
-	# fix test issue - upstream b96b736b39261f7d74f013633cc7cd619afa20c4
-	sed -i -e 's/DEBUG/BROADCAST/g' tests/test_set_sock_opt.rb || die
-	sed -i -e "/omit_/d" tests/test_*.rb || die
-	# Remove the resolver tests since they require network access and
-	# the localhost test fails with an IPv6 localhost.
-	rm tests/test_resolver.rb || die
-	# Needs a tty
-	rm tests/test_kb.rb || die
-	# Avoid tests that require network access
-	sed -i -e '/test_bind_connect/,/^  end/ s:^:#:' \
-		tests/test_basic.rb || die
-	sed -i -e '/test_\(cookie\|http_client\|version_1_0\)/,/^  end/ s:^:#:' \
-		tests/test_httpclient.rb || die
-	sed -i -e '/test_\(get\|https_get\)/,/^  end/ s:^:#:' \
-		tests/test_httpclient2.rb || die
-	sed -i -e '/test_connect_timeout/,/^  end/ s:^:#:' \
-		tests/test_unbind_reason.rb || die
-	sed -i -e '/test_for_real/,/^    end/ s:^:#:' \
-		tests/test_pending_connect_timeout.rb || die
-	rm -f tests/test_{get_sock_opt,set_sock_opt,idle_connection}.rb || die
-}
-
-each_ruby_configure() {
-	for extdir in ext ext/fastfilereader; do
-		pushd $extdir
-		${RUBY} extconf.rb || die "extconf.rb failed for ${extdir}"
-		popd
-	done
-}
-
-each_ruby_compile() {
-	for extdir in ext ext/fastfilereader; do
-		pushd $extdir
-		# both extensions use C++, so use the CXXFLAGS not the CFLAGS
-		emake V=1 CFLAGS="${CXXFLAGS} -fPIC" archflag="${LDFLAGS}" || die "emake failed for ${extdir}"
-		popd
-		cp $extdir/*.so lib/ || die "Unable to copy extensions for ${extdir}"
-	done
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S testrb tests/test_*.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}/
-	doins -r examples || die "Failed to install examples"
-}
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.0.1.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.0.1.ebuild
index af902ccb1330..600e79ac5697 100644
--- a/dev-ruby/eventmachine/eventmachine-1.2.0.1.ebuild
+++ b/dev-ruby/eventmachine/eventmachine-1.2.0.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://rubyeventmachine.com"
 
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="${DEPEND}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 9c99c383a298..2c7c7e81a633 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -10,7 +10,7 @@ EBUILD facter-2.4.6.ebuild 1913 BLAKE2B c05f0516f84135fac1d9b4b6a456045e4e593441
 EBUILD facter-2.5.1.ebuild 1918 BLAKE2B 303788746f2ba6e1385356526e17965528f10e06546c918f0aed7ecb884bd4e0386387ad01d9e59fd7cb9254d91b26c91ceec1fa9bd75dfd34bedb1d02df9115 SHA512 ed07f3b39a71b147a1a07ac161e1895a4e7380aa773c146d702f82eb5a6bf342aa8700f100c4c56ac2996a2d7fc82b5bd4af492c77aed4ba78d308c18a507ab6
 EBUILD facter-3.10.0.ebuild 2858 BLAKE2B 109339f25aad0509563fe4515440eb9cc05b70fc880e26fc3528c86daa4080c923acb2bdb6594de6470fa8b12fe64d2a83af3cfab55774a775a9ac275b9a7c8a SHA512 932183b19c54b30b99103a2cbcf2fe7822f783ea8b8802369efeaac53c82f872eeb7053475ca8a3b8379cade457625d2e019c6eb020704b45a8f3f18867d8fb5
 EBUILD facter-3.11.0.ebuild 2858 BLAKE2B 109339f25aad0509563fe4515440eb9cc05b70fc880e26fc3528c86daa4080c923acb2bdb6594de6470fa8b12fe64d2a83af3cfab55774a775a9ac275b9a7c8a SHA512 932183b19c54b30b99103a2cbcf2fe7822f783ea8b8802369efeaac53c82f872eeb7053475ca8a3b8379cade457625d2e019c6eb020704b45a8f3f18867d8fb5
-EBUILD facter-3.11.1.ebuild 2860 BLAKE2B 281388c538d03258b1ac0c6773c41a5face26dd3e380281b43093ef42e931e9f7cef0e33d336d986ec43d41647c92fbbecc7435248b85f677d8f359489c2f195 SHA512 79a214ee0a4dbcafa96e012b26fd1b1977d890cc956e18d892a359e9df2145a2f8776e9ebe35edaca6b411aba67d9275a8b8b87ed11d2cc3ac78266c1391e8fa
+EBUILD facter-3.11.1.ebuild 2853 BLAKE2B 2425736023bfe5ace9eff4381af0fcdfe5d5e5837955fbcbfff9ac0b8a1c44b92e249ee3e25b989b666263b15a57d9d752796db6831e84ea982b0d6984843fe4 SHA512 fcd5019219eec0c2dcd3eeedc1abe563c4e7ed36c85fd24ce5508d06503eaf6d25b37c027ea1319024edeb7fcc429f48bb9e712eca650f3c903da14bc08be23e
 EBUILD facter-3.9.2.ebuild 2106 BLAKE2B efcbbd0cfe6a71b1b1a08bbc1f7abe4b94845c9e13192deae811466211ab2ba533ae10732a4d72635609b9cb419051b7c4a39f248e9b06f7ec751cd893d28852 SHA512 5cfb67a3db8d288302f21bf0092c05ce19b40c8a2f00b4b9b63e3e02cd7d1af3dd20670b744520cb42db2b2ccd52e9153d86c0e1db7a36c4c7854c70d79149dc
 EBUILD facter-3.9.5.ebuild 2860 BLAKE2B 281388c538d03258b1ac0c6773c41a5face26dd3e380281b43093ef42e931e9f7cef0e33d336d986ec43d41647c92fbbecc7435248b85f677d8f359489c2f195 SHA512 79a214ee0a4dbcafa96e012b26fd1b1977d890cc956e18d892a359e9df2145a2f8776e9ebe35edaca6b411aba67d9275a8b8b87ed11d2cc3ac78266c1391e8fa
 EBUILD facter-9999.ebuild 2860 BLAKE2B 281388c538d03258b1ac0c6773c41a5face26dd3e380281b43093ef42e931e9f7cef0e33d336d986ec43d41647c92fbbecc7435248b85f677d8f359489c2f195 SHA512 79a214ee0a4dbcafa96e012b26fd1b1977d890cc956e18d892a359e9df2145a2f8776e9ebe35edaca6b411aba67d9275a8b8b87ed11d2cc3ac78266c1391e8fa
diff --git a/dev-ruby/facter/facter-3.11.1.ebuild b/dev-ruby/facter/facter-3.11.1.ebuild
index 921e49af4500..bfde41b21699 100644
--- a/dev-ruby/facter/facter-3.11.1.ebuild
+++ b/dev-ruby/facter/facter-3.11.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 # git-r3 goes after ruby-ng so that it overrides src_unpack properly
 inherit cmake-utils eutils multilib ruby-ng
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index f487648e4ce1..d04653b0840d 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -3,11 +3,9 @@ DIST fakefs-0.12.0.tar.gz 45573 BLAKE2B 8fabed4ae113da67a3e7b61c6b4c400d1e20509a
 DIST fakefs-0.13.0.tar.gz 45866 BLAKE2B 0c31b6672aed70d00b5372a6b43045ebc1037126b81fe8cae8b139c1298fe833b42b09255f3c64148a6073d0205759786e401c6c34cdb5054295a2f654ba2584 SHA512 9df14a3d7ec2cdd92126eedf7663460caf21ad017f5db8a941fe8489ca3e3d16b8dd5fcb41d92b45a2895d18e18c9dd705d70e9b2d7895edb2f4430be7e6a0fa
 DIST fakefs-0.13.2.tar.gz 45978 BLAKE2B 7657904f7732f398fbea8eaffc7fed375316be8827d015121215383f93524d683dd2f957b067e796a795b97e3c697b95ed1f317743d3b111e0ae9b6afe1d5740 SHA512 9d1aec7c750a70b8c27543481aa431c42df1436d1cd59af5feb0cde4bdb7491907ed856ffb991d4ca8a8147a521cb35910f8f9de9d80426ee4432a20090003b2
 DIST fakefs-0.13.3.tar.gz 46019 BLAKE2B 2ff858106a4d5b4f6859b806cc1aa54a08917ecf2d8794fc20ff372cc94f1817ffac3e070c1c2d96a2f145fd2d471399792b42a45c24ee61c309b5f8d0ee18e1 SHA512 c3cd74fd5914d75a4cd3b0edc661b70398c8970ab100e7103831c2d2b686a9f61036549cb21f53610eeb2416d1a49dc0e0a16e7c439c504d65b41a05c31dfad3
-DIST fakefs-0.9.2.tar.gz 42792 BLAKE2B dc2037960f9aa05f62e09f8fb98f7b115c6f63af56436573ce88bc66fee2cb42f1e362ceb2de7f17b21701b884ad8bc7c6ef5170a7441fcc16fb16977cbb1b4f SHA512 ba68f9d240d54379ba8b16dcb3e375b586c50f78a081a916151d21af2d6d8b61471fdc842ad91d1390e8dcf54b0744e95ba4794a5ebc915858886ec47f9dbb8a
-EBUILD fakefs-0.11.3.ebuild 1100 BLAKE2B 8002ba67cc7cf772b6febf163b93f26f0f63e835da14eeb8c2d6305fb218956688586156dd83adf9afcf3a1b3e47102925eeac5282006d3ccf7dd81b8bc04ca3 SHA512 1439e10d8c0a0c0e015e03526a02f2a4502857db6033844d0c9a1bd4a6427f1a71667bb5f8c44c8a2dfe7002efa4918e54256ea3518aa0bc4441f7dcf38292ac
+EBUILD fakefs-0.11.3.ebuild 1098 BLAKE2B d31a81a83d641186b7780447a291fab0812191766b5a6600ded1e365d3ffe1807df11ab4bb557d60782532a67cf13b05c5b892fcc8fadbe536eaf3cb9c3a6047 SHA512 52832e5b6530397c423f3ebfa64c7fb9b60e52acc9e5d84aec735a784130ecc75a604ded3cba48979c4e511624e90bbff8d9e3dea9df9dbde84a0bbb8c40f53b
 EBUILD fakefs-0.12.0.ebuild 1104 BLAKE2B d0a7970702ab9fef9e3666d69709e06c7241e0c9d81f4fde6533a44fe1e001bd97846646641c72f5b3e21f3e87d5b3abcf0d3ea8bcca6ca85c93ed3ce0a541b8 SHA512 9819ba0565b28adfc23239f4199a6643814fbef45f28f080e3d48e7cdd21f395dc84556265513f0e81dfe421ac0ff2852a422292f65d5b45bee814ae1f0cb69e
 EBUILD fakefs-0.13.0.ebuild 1104 BLAKE2B d0a7970702ab9fef9e3666d69709e06c7241e0c9d81f4fde6533a44fe1e001bd97846646641c72f5b3e21f3e87d5b3abcf0d3ea8bcca6ca85c93ed3ce0a541b8 SHA512 9819ba0565b28adfc23239f4199a6643814fbef45f28f080e3d48e7cdd21f395dc84556265513f0e81dfe421ac0ff2852a422292f65d5b45bee814ae1f0cb69e
 EBUILD fakefs-0.13.2.ebuild 1104 BLAKE2B d0a7970702ab9fef9e3666d69709e06c7241e0c9d81f4fde6533a44fe1e001bd97846646641c72f5b3e21f3e87d5b3abcf0d3ea8bcca6ca85c93ed3ce0a541b8 SHA512 9819ba0565b28adfc23239f4199a6643814fbef45f28f080e3d48e7cdd21f395dc84556265513f0e81dfe421ac0ff2852a422292f65d5b45bee814ae1f0cb69e
 EBUILD fakefs-0.13.3.ebuild 1111 BLAKE2B b1662f69aba52dbc1867e019631029a0e589e54ce3c253285e081342d77d3a6dd8a11e43c2f8a368c9fbbbdbd7ef1efe8f960a07b1d08aaffe01c92862201e01 SHA512 5131fbb7fe77ab2678b183e5492c38d96f3742eeebe7fdf7aa1a1ab09ceb5748446cc12aea77bf75361c40e1aa7e43214d9a571167db598750d15fe32945dad2
-EBUILD fakefs-0.9.2.ebuild 1098 BLAKE2B bac77ad94c7ab488f0f3dc7cb12a8f866b1df2054a0f8bb55491da01b98d2cac68a882d2652a46e7fa64ab993d41627180dfad9c1270d2ddac8c2dee45e36b00 SHA512 ce41610a34f6328f6ddca9777952059f791db5f1d3b52c094d36bb6e6671be64f8ab0cbc3290c7e3127786ec481810ecc238a656aff383dca291ca6945564fb3
 MISC metadata.xml 340 BLAKE2B a31a62212f53154af4d3dce332d30eab8433785cdcb07531f743a5d48f3e7d9dc55580651cdcc765d4dcea5d27e78902624d475f8ae052efc6d9c2eea8b57d0e SHA512 1369c8941ac7aad5dd54222a870a5d173194c4f241093864b25abc1ca97e9f55d8fe928157c11ed63d2281352bbdbf6779cbc00abaac206fd024385ed5eb8478
diff --git a/dev-ruby/fakefs/fakefs-0.11.3.ebuild b/dev-ruby/fakefs/fakefs-0.11.3.ebuild
index 49c3323e608c..bf597b109fbb 100644
--- a/dev-ruby/fakefs/fakefs-0.11.3.ebuild
+++ b/dev-ruby/fakefs/fakefs-0.11.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/fakefs/fakefs-0.9.2.ebuild b/dev-ruby/fakefs/fakefs-0.9.2.ebuild
deleted file mode 100644
index 636d6c0ff4d5..000000000000
--- a/dev-ruby/fakefs/fakefs-0.9.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="A fake filesystem. Use it in your tests"
-HOMEPAGE="https://github.com/defunkt/fakefs"
-SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-3.1:3
-		>=dev-ruby/minitest-5.5
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-
-	# Avoid unneeded minitest-rg dependency.
-	sed -i -e '1igem "minitest", "~>5.5"' \
-		-e '/bundler/ s:^:#:' \
-		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/fakeweb/Manifest b/dev-ruby/fakeweb/Manifest
index 53704e363da8..96dd4749445f 100644
--- a/dev-ruby/fakeweb/Manifest
+++ b/dev-ruby/fakeweb/Manifest
@@ -1,5 +1,7 @@
 AUX fakeweb-ruby22.patch 870 BLAKE2B e96c9c58c5973bb4b028bb2582b40b418723df5548446288cf9df843dbf39377bf48a38416183b627ff022c2ce06f0f42fd7aa77dcf1ca51243dc5e5720b4da4 SHA512 32c5c7e3b6e6e5402ffeb809b74036de854752eded5721ea778ecd9d83b19e992ff3091ac7608e49b0984f3c26b21c95ae52489a585bb862e03f1fc201e4fa89
 AUX fakeweb-ruby23.patch 1214 BLAKE2B 4fa44c8b30adb0ff76372d7d6581f8b326e020348c07b37daa24407a959da4fabe2e51eeec01ca81a1f5abafbd87b42132e5f9aa38fed70f872c1ee18b66ca03 SHA512 3384a8fb96b34f17f929ebfb0ceb01d1238a7333058954097985928ef8bd9d5ec31002a8f2d18b65133ea48cb4309e24222bc675f15f72d869dcea062164f3f9
 DIST fakeweb-1.3.0.20131201.tar.gz 60162 BLAKE2B 856c499041b122d84fde595343e0917a9ac47e81e50560be79a53def2099ea0ad05532bf3a7e3cd5e8dc668235c1ee75989b15465f397f56b7c0edd028bf980c SHA512 f3bd40680b7eefe90d3fee67f5282dbe4c67d46a1f1040d0d0d62c978b69d08987581a53495bb56e32ebcc6679c84f03c2e26c51d2bd98daa80554d3424c6603
+DIST fakeweb-1.3.0.20170806.tar.gz 61449 BLAKE2B f015f95897383e0b65ada5a7833f7bd3fd61ae77f4ab38bf6bb47f2eecef0c778928090302e46157ae4e2fc6c3df4559e9f5c8004a6474ad8852d157aa3af6da SHA512 1871b7c9f2e4f12cd1c434ef4f760828187078a951517fe3f7a6ca5c5d6f08e3056cae2bb012eca1ba556c2f4d369cb2716c637fefee67eb723428195c482edf
 EBUILD fakeweb-1.3.0.20131201-r1.ebuild 1531 BLAKE2B 5f74809778f489d609192d9c3d8ac98ebc9c38438afe7b8e317c312e506aae85b49a017c32a9506e6eb478d5a73eac670654cd3089b2584cf668044f5eb1ff1a SHA512 1f8f894770da7851958560caaf3adc3c3d8e17f2e8bcbe158785f199a8e1875e9f26b1b0c26d2c468122501f92ddba42329744d232a82f1099b507445d042d05
+EBUILD fakeweb-1.3.0.20170806.ebuild 1306 BLAKE2B b66d56e393c2ba8d8f5af99f2d543f4cdfafd2ff02f427b133f69be2ff25322fd913665b2d0739998a6921cd71e81338026430319a7547cefb479ca617c1ba0c SHA512 71698d6d27f02dce21180b86ba651c0ac9e4abaf2a7ab3f64653bbf37fb38117fc57dd805fa951410e221ef3639f5d1e46ca01500eaded18b91843db589591d7
 MISC metadata.xml 340 BLAKE2B 7058eef4592a28cd630ef9d8ccbd6920dae2909bb1740172464de06215a3a970e2291a855cbad1206205e90cb04bb711e4725b8d566e6388134501706168914b SHA512 4915509da84a354d665c9c59881e83356a8e8b2f7f09afdae68755484a6e575a7502f98ef8da1cffab96ff12264c048cda182f1c5042b95b058b731bf0395077
diff --git a/dev-ruby/fakeweb/fakeweb-1.3.0.20170806.ebuild b/dev-ruby/fakeweb/fakeweb-1.3.0.20170806.ebuild
new file mode 100644
index 000000000000..8c53e00193b5
--- /dev/null
+++ b/dev-ruby/fakeweb/fakeweb-1.3.0.20170806.ebuild
@@ -0,0 +1,48 @@
+# 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 README.rdoc"
+
+COMMIT=2b08c1ff2714ec13a12f3497d67fcefce95c2cbe
+
+inherit ruby-fakegem
+
+DESCRIPTION="Helper for faking web requests in Ruby"
+HOMEPAGE="https://github.com/chrisk/fakeweb"
+SRC_URI="https://github.com/chrisk/fakeweb/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		dev-ruby/test-unit
+	)"
+
+all_ruby_prepare() {
+	# The package bundles samuel and right_http_connection, remove
+	# them
+	rm -r test/vendor || die "failed to remove bundled gems"
+
+	# We don't package sdoc and we don't have the direct template.
+	sed -i -e 's/sdoc/rdoc/' -e '/template/d' Rakefile || die
+
+	# Use the test-unit gem to make jruby compatible with newer mocha.
+	sed -i -e '1igem "test-unit"' \
+		-e '/bundler/I s:^:#:' \
+		-e '/simplecov/ s:^:#:' test/test_helper.rb || die
+
+	# Avoid test dependencies on unmaintained packages that no longer work
+	rm test/test_other_net_http_libraries.rb || die
+
+	sed -i -e '/test:preflight/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index f2d62644708d..169a8d6ee8a6 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -2,10 +2,8 @@ DIST faraday-0.11.0.tar.gz 59736 BLAKE2B a4224ec6bf415bd535695561714f247ea9005db
 DIST faraday-0.12.2.tar.gz 62809 BLAKE2B 4dcd60192df36e1b9766eab3bcbacd729239b0e09d9e82a73d825c750fdbcfae8161cf803f078b841236a5e18b1849b4cdc34e6adebb9eaea0f0442cd65b2e74 SHA512 966fc419d529a8bba5caa6d3932ee94f7b248110edc880b532860c24abd70cb50182e40b94b4143e26575c6db7ce046fa71ac0d25010385d7f0c3dda87f39439
 DIST faraday-0.14.0.tar.gz 65105 BLAKE2B bf5101083bd828e2ea98dcd487c7c082f8b2d2eb4d03ac7ad04e1873666db9e2cec1e6eb9887364874ea5f32d0313019d1eada5e05e25e0415bdd5aa2bcfca97 SHA512 25bba07e76a2a8bf02b0c81c045329e72d5911a2aacae56611db33dc25c89bd48bb1b4de9b20c6edc1514d3ceae8b06fca6076c85580533047c222cb30ef8dc7
 DIST faraday-0.15.0.tar.gz 66086 BLAKE2B 5018d8e92b2988b08f4e7a5b0876ca6cd4049c74199ee0356adc48867611fd6d30d884bd3cf3e7703a02c7a6e967f9c47cdc44deb75045b8cee46992977fb834 SHA512 46602d89b1bbf5a41143a9a71fab193642e7c41db39dc1edc0efb99f4a7a924c5a698460a0a4f921f7ce1f73ee8eb12e6d79a08dea02c7142856d0aa1b95b521
-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.14.0.ebuild 1913 BLAKE2B 90c822920672463392a693df515f858879274a4478696dfe44c9065654e2da8fe30fb54f9c65d35f749a88a9f35216995f9f17d295b61c40bcf5384051ef42b7 SHA512 d4b2cf609bfac846889ac1c07ca816ddfa38236c90ab1e5a024cb06eacaf56ac074679e6b83d98f0a949a15c09f997294737cb4aa24f6e4b432562eae154c5de
 EBUILD faraday-0.15.0.ebuild 1913 BLAKE2B 90c822920672463392a693df515f858879274a4478696dfe44c9065654e2da8fe30fb54f9c65d35f749a88a9f35216995f9f17d295b61c40bcf5384051ef42b7 SHA512 d4b2cf609bfac846889ac1c07ca816ddfa38236c90ab1e5a024cb06eacaf56ac074679e6b83d98f0a949a15c09f997294737cb4aa24f6e4b432562eae154c5de
-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-r2.ebuild b/dev-ruby/faraday/faraday-0.9.2-r2.ebuild
deleted file mode 100644
index b30965657cf1..000000000000
--- a/dev-ruby/faraday/faraday-0.9.2-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_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_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index 25cba08665c4..fa947ba83586 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -5,5 +5,5 @@ DIST faraday_middleware-0.12.2.tar.gz 25041 BLAKE2B 0ce9750f9ce8394d1d926345c50c
 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
-EBUILD faraday_middleware-0.12.2.ebuild 1636 BLAKE2B 5af39ee600118af5981388488d9bb56a85ec5a6816ccc982e013f8ec8e47b411423c72372320323501b91d5f8f4ce70eaea0aac838843e5f27d6f92cd149cf20 SHA512 133c50770b3ca3c1a0845f18f47022af28b51ddbbd27f953ff4be7c97c3d83bb378da57750356487df7e28177a8d8251dc882adcc1ed42a84bd2ddbebfa2be81
+EBUILD faraday_middleware-0.12.2.ebuild 1669 BLAKE2B af68d72464cb45f92211f17de914e92f9582f83c7b6718b2b96b6b0033f71c933c417b887a66f4168ce74e651480f18fe65d91af46329ecbc2e9eb01e8ac2dbd SHA512 381911e5d37bccf5c2766b3fdc59cb9ac34be1b4de1dce01a0e55b042722063708da48647746389a010e3aa57305f730ee4b562831890827ddf11f1768ac952f
 MISC metadata.xml 823 BLAKE2B 3329517a3334e1d682430843b838b09e5deab6f87a485ce05245beccfdfb32c66ccc23cec648074f060162ff107a276007a343950b246140dfc9b1675d63f8ee SHA512 68204a852a7a6eb422d389fdbd15abf5aa2424707329b42d48c0c9aec407a30b9ed0567ae87deffdf1cdccc582c31f9b1fb83bf45569915ff72e351940ffe92f
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.12.2.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-0.12.2.ebuild
index 3f3eefd7c5d3..86278ad3138b 100644
--- a/dev-ruby/faraday_middleware/faraday_middleware-0.12.2.ebuild
+++ b/dev-ruby/faraday_middleware/faraday_middleware-0.12.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="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -36,7 +36,7 @@ ruby_add_bdepend "test? (
 	dev-ruby/bundler
 	dev-ruby/addressable
 	dev-ruby/rake
-	dev-ruby/webmock:0
+	dev-ruby/webmock:3
 	dev-ruby/json:0
 	>=dev-ruby/multi_xml-0.5.3
 	>=dev-ruby/rack-cache-1.1
@@ -50,7 +50,8 @@ all_ruby_prepare() {
 		-e "/addressable/ s/, '< 2.4'//" \
 		-e "/rake/ s/, '< 11'//" \
 		-e "/rack-cache/ s/, '< 1.3'//" \
-		-e "/simple_oauth/ s/, '< 0.3'//" Gemfile || die
+		-e "/simple_oauth/ s/, '< 0.3'//" \
+		-e "/webmock/ s/< 2/~> 3.0/" Gemfile || die
 
 	# Avoid unneeded dependency on git
 	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
diff --git a/dev-ruby/fuubar/Manifest b/dev-ruby/fuubar/Manifest
index d37231445918..0f9afed57b9c 100644
--- a/dev-ruby/fuubar/Manifest
+++ b/dev-ruby/fuubar/Manifest
@@ -1,5 +1,3 @@
-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 721 BLAKE2B 6ac9b1163002b467c692ecbe40286a3940e974ce030421ef788ad853ea3625d4560c3dbbe0e9a768328cd27b638fbca0852e1c1ce3ea09157a1e941ec0795af3 SHA512 f115a04ddb4c25ede44098bf74ac8301ea29c5990ccaaf1d9874cbb58b8b4f56d784801ef119aa9f3558bb351bbab2c55fb110e16716ff40b33210e3c7b11137
 EBUILD fuubar-2.3.1.ebuild 714 BLAKE2B 267b27b46b0e2e998b6ad52e711ceaf4cf004d81d8d94b2144b1db2661a2c575213853500b8593be0881c6bdabf4979c4632cb8abb64af759831d2a797a342e8 SHA512 f51acce57b6f848ae37c5483fbd230dd97003c67346100868aeee44585bb614f0bfbeaf5fdb746ee07feff1328c33b387e0e56871f766ae5c73e9c36550d6a63
 MISC metadata.xml 349 BLAKE2B a394e14e59c6aff0211e2b84c89f5d12b862cf44d604c6dec72d80ac8b52c6ad2333069fb04fd257d0d761283bd4aa041ff716f34576f46e455d075ce2ea2fab SHA512 0c974aa96afd7eab91e27ea72859e709fd5d8691055a06b57e2267e2ee36904b3f4b92b1b0d24659015f303017298cbb4373f225471a6350551d3d85574930f7
diff --git a/dev-ruby/fuubar/fuubar-2.2.0.ebuild b/dev-ruby/fuubar/fuubar-2.2.0.ebuild
deleted file mode 100644
index 29975500851c..000000000000
--- a/dev-ruby/fuubar/fuubar-2.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Instafailing RSpec progress bar formatter"
-HOMEPAGE="https://github.com/jeffkreeftmeijer/fuubar"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rspec:3 >=dev-ruby/ruby-progressbar-1.4"
-
-each_ruby_test() {
-	export CI=true
-	each_fakegem_test
-}
diff --git a/dev-ruby/gherkin/Manifest b/dev-ruby/gherkin/Manifest
index c0a40e287a36..e6f4b28ce908 100644
--- a/dev-ruby/gherkin/Manifest
+++ b/dev-ruby/gherkin/Manifest
@@ -4,5 +4,5 @@ DIST gherkin-4.1.3.gem 350208 BLAKE2B 3b0f54124c9f29c9216aaa9810526f1e11f6243b02
 DIST gherkin-5.0.0.gem 340992 BLAKE2B a8292fde04c98c409423733791e78b9d6e40a7a60b59a1acd0a0e9c6df0be9185e90f1c5af6ce0ac39f352457c18094c495557fb05323eb7ea5ae8ce27008950 SHA512 cc782e37f5aea4ad0776f5336e6218b77e7fd8d193786acffaa44685de3a2592e4e6f37a3787add807654901afd12bc2d094a782b154bb2be9e2cd16e283df2a
 EBUILD gherkin-2.12.2.ebuild 2615 BLAKE2B b50787711a231ddea79841dd235ea076078f32a9bceb6ec32ba3f9d7164ef9eac34e2f3bf916aabb7839d8a0ed081206cd5b91fbc173f4085e1b6b3e6a918b7a SHA512 475270e4edef3ae3a115aab6dabe3f3c7e89539a92eaee529b54e78e58a90081019f8b501d83f836552536d2245f6d59c271ce3b861dc906138f98e03d72bcdc
 EBUILD gherkin-4.1.3.ebuild 577 BLAKE2B c0ee73611bfc3ba58edd1ddc36509e0fbb6a51defb1299568df5c08f7beb66b66f4a563551ef1f54213d1589227d1d67bb2c9efb8ad7e7e93a5adeb73aceed3c SHA512 d9fbfb514a83e9ecdd1592cdfac3a5ad761505b956cbc100cbf1374291fffd2908a51fd068cae2cc7138dd951e21329fc8063a95eeadf66b29b7a8ef1701e667
-EBUILD gherkin-5.0.0.ebuild 570 BLAKE2B befb2fe67dee3c7f0447de9fa7046422b5f53144142288d26af1112bacfd67fa30f74d54a74ae61430d9dadfba2bae7024318bd4ecf7b47679836752ed57e76b SHA512 2ff4378fb44a32d53f7f067d5ccc447f0e9647d9a7571fad93f843eb4458b0c66a3873dec55de533f947bb704a96729ccedaee038d4d0a65ae92ff9e8c24eb26
+EBUILD gherkin-5.0.0.ebuild 570 BLAKE2B 123b9798a8f8798dcebceec2cc45b5d1888c36c9044aba95efc2a70b1e462cb4d769c0bcc373decfae1b683fe85c0b92f3c8da1e42695824f7f7e83212fbce9d SHA512 7ea2209ad7c942b049701d127fdaec66c13357fdf2f4fb4fbaa978bdeac1b1c75fdf50a699378df5cbbccc750c58f1edfb0a4100688f27c489e2a04ac7aba8b2
 MISC metadata.xml 342 BLAKE2B 9a34d41c97eea1996d1fabbee85346c55ab263b0f7087661038b42d2fb25d05f03ec46cf804f8972984200b9891c5ff8b77d26faf5edd8d3d63a76e25ec66b5e SHA512 83d54811e863b8af9f5ba53f081e140d12af0d20ba5ae7273317fd42aea5a5a0fca8f742352794dacbddcdca932dc2ea60e1201f3d6429315210da99578f844e
diff --git a/dev-ruby/gherkin/gherkin-5.0.0.ebuild b/dev-ruby/gherkin/gherkin-5.0.0.ebuild
index 8241679795e7..0d05aa78d10f 100644
--- a/dev-ruby/gherkin/gherkin-5.0.0.ebuild
+++ b/dev-ruby/gherkin/gherkin-5.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/gruff/Manifest b/dev-ruby/gruff/Manifest
index c4a01cb2652d..e08b907b2f39 100644
--- a/dev-ruby/gruff/Manifest
+++ b/dev-ruby/gruff/Manifest
@@ -1,6 +1,4 @@
 AUX gruff-0.3.6-spider.patch 521 BLAKE2B 8b966f23a41ee914c87b2a8f699b62d64e6a8d55dbe3526d633768ddb8ac7837a0bc90114a180006fc7dda695759bfe4938c7f1b57079333086b51737574f987 SHA512 5424d12f7801a572ee90eb0122db3fceca84ce481153f77eba60ee783655776cdc0531ccf1a25fc4794c094facdb2815e09841886179cce7ffbb5328a467e386
-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 1211 BLAKE2B b0d532dc0769a3491ae14db2a4d68f48980bfba708b2e2bda5d493a20fc3bb184a6073128efc34fbdb76b456734c2f233153db628eb43ed7f0a41f3d5481b593 SHA512 3ac24db828d0db612788567b19032c26d670057eb479f38112e522f831f636bb1bdb47dc526304202e781b436b8a91c7e65d181c8e8ac319ddeb7dc1eb82c901
+EBUILD gruff-0.7.0.ebuild 1210 BLAKE2B 9e4dcf88e9ec552666814597e6ba0453f3b07e1654172c39cd5d722ec699418518bbcdfbad23e93b671eb6336a9b1a24f34251d67b7ce3c642ae8b4003ee382a SHA512 879de2201909d6020ca781f7c8c20e66bf2a2ee50971113ac736a1d5bdd711631743dd01c8f7299e8324238b2306fef6adc5e89d5b5bad7fd1e81ca54f80d879
 MISC metadata.xml 340 BLAKE2B e3adfc25e09939c98ba4a4323afd0babccd4b0c11ea712e93a454ea4d3074f12a895d674735f8209598336a1d62ea61d6d00c8956a47cccd583857c36f261ab7 SHA512 1136e2805ed73f18bba2c981e2788fa635face71a9b1b384e3dc20680afd4fb354f33ac099077568f7fa1f3510e1c46771f663341153ae64ef961508243c16d6
diff --git a/dev-ruby/gruff/gruff-0.6.0.ebuild b/dev-ruby/gruff/gruff-0.6.0.ebuild
deleted file mode 100644
index 68b336db8811..000000000000
--- a/dev-ruby/gruff/gruff-0.6.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"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.md RELEASE.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Beautiful graphs for one or multiple datasets"
-HOMEPAGE="https://github.com/topfunky/gruff"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-macos"
-IUSE=""
-
-RUBY_PATCHES=(
-	${PN}-0.3.6-spider.patch
-)
-
-# imagemagick is an indirect dependency through rmagick. However, for
-# gruff to work properly imagemagick needs to be compiled with truetype
-# support and this cannot be expressed in the rmagick dependency. Tests
-# also require imagemagick to have jpeg and png support.
-DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
-RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
-
-ruby_add_rdepend ">=dev-ruby/rmagick-2.13.4"
-ruby_add_bdepend "
-	test? (
-		dev-ruby/hoe
-		dev-ruby/test-unit
-	)"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 test/test_*.rb
-}
diff --git a/dev-ruby/gruff/gruff-0.7.0.ebuild b/dev-ruby/gruff/gruff-0.7.0.ebuild
index 419121fabf44..6a6ca07ff84c 100644
--- a/dev-ruby/gruff/gruff-0.7.0.ebuild
+++ b/dev-ruby/gruff/gruff-0.7.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/topfunky/gruff"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-macos"
+KEYWORDS="amd64 x86 ~x86-macos"
 IUSE=""
 
 # imagemagick is an indirect dependency through rmagick. However, for
diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest
index 9138ade30957..f766ead7f32d 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -1,19 +1,11 @@
 DIST hiera-1.3.4.gem 30208 BLAKE2B c0f65db3807e645ec08d60447b3aa0ecd9e826afc730296743faf6cded31ac203fdbe369df0055dc68fbb90f453dad26e8f3679d0c707b14cdcb6ff67328229b SHA512 be3b702f0e3c2e61d8d6a8c1ff1280f9a1be3dc4adc2a605b4ee3b5db82d513bd58fb6b22ef546a625cf4eefa43d597365187b776ee92c2dd9946eaa4b147128
-DIST hiera-2.0.0.gem 35840 BLAKE2B 259e193f7072fefd35b39da2b7646ddeed136673bd727764fe1fb401c2a43a7316ddc040b0a41fd9a6c9263c28b7682ffc339ae909e4032e544809f9f69a7b9e SHA512 153f75d4c6dd45920841c065f3f4808b28a30d1e0370a8a96866d20451b225e9434017134c48d96fc244cfeca5fdbaa8f325225644d5b151933bb45383d64a23
 DIST hiera-3.2.2.gem 40448 BLAKE2B a94bebb0e3549a3bde83ef80db8c13af8bfb6dbf0f9f3efc244ddf211fed47c7f763e033c348d3a0fd20ad04c3de009b4d37fee0da080a77c4eac2a1439b8751 SHA512 5a341c47305592421945fee3ab3fbc2c39f3f847d1c45d9b6dc8cc90da8057c25b32abf127b667fc00071c1fa7809034a5dd1e640c49f4ba6c2ab3e5718753b1
-DIST hiera-3.3.0.gem 40448 BLAKE2B f8714d76a1e40c825fbdeeed003b56d3d36dba034b2af065e7d1629ff06768f10dae545281e6bd4833c25b24defeb8bd258d45d443340b2bfd63110d726e94c7 SHA512 ab546b25343e15955c6bb53d062d7ac342cca7064125c2b5b37f1019fd1d4864a08c564d96850257de761b007c935e207b1692260bb494c4cfd7789ef4d5197d
 DIST hiera-3.3.1.gem 40960 BLAKE2B 6bf380cd9a46c4b035578e576fc01af3e026a26c421c5d7745d5f1a62c143999faa466d8b15ed30621bba0ce13a5cf42a38e1f572993560019a73c717050cab7 SHA512 c9032fa0d01f43b22b5d59fa9e8f3b6353b2a91b4ddba9aa6f7c8debfbd2b1089f0b471be5cd0f864025aabeb3f117dabab0a342ae9f659d6dfc13480f27a7a5
-DIST hiera-3.4.0.gem 40960 BLAKE2B cf4c88b4193ed2da3df381425e55342b67267c098c93ab7685adc1d5722728854cb40ec6654f8c80ce7848d07b4c67fa316449f3b28fbd7031796ea0c7135877 SHA512 046e2af62a914563b141674f70f5dc9bc75c22f73e8fb1e1a5fd33b0d1c33ce3464327f7508d5f2f0af62261cbe6f4a3eee55646ff50fc768e325d3407111b11
-DIST hiera-3.4.1.gem 41472 BLAKE2B a3514107d9cbd344bc9ab789fe47b7ae9390df93fca9c3660e67dee9d57e30d2020a71ec97930c9ccb9ff5f14d5025ae8b4d20c6d27f2ddb52e3bb5c6b42437a SHA512 ce8d5ed3a2bb4a7180331f8d3020e76862643174caffd3b6a593f62363b9ddd9d9cf0761a2b05d9132ce296b36b2d9dc80376a67c6e63f14911b7a512629c8c1
 DIST hiera-3.4.2.gem 41472 BLAKE2B d4b1fd0432a4b8fffbf9e55118e93578226fd270ec11da4b999d1e1b7edc32fda70d7a7b84c016034d8028ae51d55d5076dc51780b10ff59af52077ddda6224d SHA512 33045e395fa06467ae61f42eeab5b48b76a03274243db52dff7dbf8a08052b8cd2e0dd609d6a13317efab485408c7351cc2553ba2e5a767afa09a8a21735852f
 DIST hiera-3.4.3.gem 40960 BLAKE2B a4747c6096065c1272bd3099893d27c53b5e869be16643fbd59fa0eead692e3bd082fcbf82463614336d00c3068244bd632fd6c3a87ba520566a8643f674bfc4 SHA512 126e626b9c9020f2b8565aaff35f30b35c73785120425d186c97186c5bdfafc4831216250f78fd33ffd5e1dde49646b262887747c0d73442a252c391329959e2
 EBUILD hiera-1.3.4-r1.ebuild 686 BLAKE2B 039904c7c8491bd47a2e628ddb710d94f50507f95abbbc697ccba743923ca68556c989e431b7a5bd8d62d78a12a285c05900117b21e3d8ab09ba9e339e3eb5d9 SHA512 f23c9077ab3542cabb12b797b971799dd0db0d18dff968467df28e8cbc7189b49ee6d90e2728a7d05957b4575fa7dbd5137c7db1bfefcfc834765255b51e0f16
-EBUILD hiera-2.0.0.ebuild 703 BLAKE2B a42195e99e72978d3cf1808e2baccb654631e8b93f9b0a5bbd5de87c01cd763faa77d6c86bbd81a16e2e912cc914372800ac8fee1628e245a01a1420a93bd1a4 SHA512 f87b017f67425bf9f993d1dd81678877c0a36d9f9fbe789dd3efaf7fc0b4c4912d3ba4b383cf9e95f870595494585f8b5bd4686f2b71638d32666b037e9e0ae5
 EBUILD hiera-3.2.2.ebuild 525 BLAKE2B 3c0b660c66ec6ad6129184715a91a98b6bb7bf3df7a9c3af8dfb338eef813c4fc9153f423ced5cb301dc567ec654d69b21b1724482e105de864fbb09e4e4651c SHA512 6b46a094ad8057bb99455ebf3368628b6e3c6deec83a7053b177ff996887cddfe0160dfa9ef118700397f2bbc4279e0625a9d6628cd02794b4f7007e1d3a6ac0
-EBUILD hiera-3.3.0.ebuild 523 BLAKE2B c7205cbabfb7414734a6cd88833a597ca68156773b6d0aeedb3744e5e01efb1d393bb65d145a25d178c1d81955b739402e24b04389a975a07210f44333d62de7 SHA512 8d289cbcd5a52a3dadee9a75f0264f70a188da63560d8536ac92e1f771be46476677555481d49d7e9153900fa28a466a8598ef9417bc515ee7aa97c499993764
-EBUILD hiera-3.3.1.ebuild 523 BLAKE2B c7205cbabfb7414734a6cd88833a597ca68156773b6d0aeedb3744e5e01efb1d393bb65d145a25d178c1d81955b739402e24b04389a975a07210f44333d62de7 SHA512 8d289cbcd5a52a3dadee9a75f0264f70a188da63560d8536ac92e1f771be46476677555481d49d7e9153900fa28a466a8598ef9417bc515ee7aa97c499993764
-EBUILD hiera-3.4.0.ebuild 542 BLAKE2B 2c9fa05460f8c14ce503f8ebd22f77e7350a5e25164c423579c5a912f11ecea570304bdab4d75716cff3240f2daac2d7a53cccfabd6df6a372cedf6f73b6cbfc SHA512 36b28f19bd13b9ba7e82fbde8e8ee3a8a6a4f54901f147394161af278e726d12d00a400681a5f1eaa1ff10550a52a0c0d1669c0164210a73533e0eeb0760cbfe
-EBUILD hiera-3.4.1.ebuild 535 BLAKE2B 68312a334c517de743d905127aff224a9f52593e2116cf517790a7ed9d9609324bf6e7bd097bec58c7e01dbc53e1f7cf3c2e9e0d3165b4ea9ff588ae0a9d846b SHA512 b80256249d86abe1d39977f0464af52e5a1eef3cb5e216357e1867ca09d895fea8ca4aa639b8803222a0f65783c0d07c4a0ab25c34e71c426936165685a680c7
+EBUILD hiera-3.3.1.ebuild 528 BLAKE2B 87e9a0828cfebd75ef3bc4f7e6681002d6efd91f03b2bcf25e7daac0e88ddc6032623cebd576ed899f1351616ea917ccc7c2e9a5b8e66cb395565f5ea6ea310e SHA512 e0062c4b39a2d2b702754fa7643756c46dd89110cdfad2df2abf3ebef673f1ddafc4bfacd8cf2572546a51a8a4cb36d4af51cd4da648a6b1bcd4c1643a237fc2
 EBUILD hiera-3.4.2.ebuild 540 BLAKE2B 69d22cb0744e1307ebee3daf2f525326063a088a1a635211b01f144ae32b35e66842d914160001d844bb005204e198fb2a837cb31c8eb12c276590bb73f9cc11 SHA512 9eadcea91a5f9cd2eb3d5841b53acda17af87e39fc57bb6d7aec2191c6afcf0c86582abe64d72aafba41910d4090d270ebc5abd83b2614ac19b37eb012828e60
-EBUILD hiera-3.4.3.ebuild 547 BLAKE2B 9c0e68abcbd5414d6132103eba8688db9c06255d386918025c3d233869904e189079a00c3d8854787acace8340a3ecc7f31ab8e40739b4d328e40c8fe94ff78c SHA512 dc4d70ce8651e4e6820f220bb4a74ec807533cb65411ab10f515689314865b8a662fefded0b54f10fe624424f07ab8b389da19d65fdf79887576231bd49dbeeb
+EBUILD hiera-3.4.3.ebuild 554 BLAKE2B c2707f5e1febb30009fcd3d06793e0f5169423124c53f0a2e1c1729f5a6830cdafe2f1f2817f97f6cbba03d885ace70f8d925a397cbcd10362fceecd462b82d7 SHA512 3312ffe19717edf678f384e6c6057431f3b9639705302f5463d41511ec99fdaffadea10dec3a717c54e03753d8f30811a9e02c9d67283955f7f7026bef697215
 MISC metadata.xml 441 BLAKE2B 45d0b18035001279a7fc0b362aa00ab9bea5282f35a2237bb72e84893d8a9ff4b575e43928d48aa9906def18e3fe1bdfb121e5411c46af7117b529f136224796 SHA512 795fc49e90529600ad3a950440f33c9dc60aee0f6ad134b682d8c8e80452f015fd2de5af77ed6ad58830e61b1ab7944dcb81629d75d4b09927e218f33aa948ae
diff --git a/dev-ruby/hiera/hiera-2.0.0.ebuild b/dev-ruby/hiera/hiera-2.0.0.ebuild
deleted file mode 100644
index a3a3f94cc843..000000000000
--- a/dev-ruby/hiera/hiera-2.0.0.ebuild
+++ /dev/null
@@ -1,31 +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="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple pluggable Hierarchical Database"
-HOMEPAGE="http://projects.puppetlabs.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-ruby_add_rdepend "dev-ruby/json"
-
-all_ruby_prepare() {
-	# Our json package is either the compiled version or the pure
-	# version. Fix gemspec accordingly.
-	sed -i -e 's/json_pure/json/' ../metadata || die
-}
diff --git a/dev-ruby/hiera/hiera-3.3.0.ebuild b/dev-ruby/hiera/hiera-3.3.0.ebuild
deleted file mode 100644
index 72878644a369..000000000000
--- a/dev-ruby/hiera/hiera-3.3.0.ebuild
+++ /dev/null
@@ -1,25 +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_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple pluggable Hierarchical Database"
-HOMEPAGE="https://docs.puppet.com/hiera/latest/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~hppa ~x86"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-ruby_add_rdepend "dev-ruby/deep_merge"
diff --git a/dev-ruby/hiera/hiera-3.3.1.ebuild b/dev-ruby/hiera/hiera-3.3.1.ebuild
index 72878644a369..1d8ee8a87cd9 100644
--- a/dev-ruby/hiera/hiera-3.3.1.ebuild
+++ b/dev-ruby/hiera/hiera-3.3.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=5
@@ -18,7 +18,7 @@ HOMEPAGE="https://docs.puppet.com/hiera/latest/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 
 ruby_add_bdepend "test? ( dev-ruby/mocha )"
 
diff --git a/dev-ruby/hiera/hiera-3.4.0.ebuild b/dev-ruby/hiera/hiera-3.4.0.ebuild
deleted file mode 100644
index ad93e106f0fe..000000000000
--- a/dev-ruby/hiera/hiera-3.4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple pluggable Hierarchical Database"
-HOMEPAGE="https://docs.puppet.com/hiera/latest/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-ruby_add_rdepend "dev-ruby/deep_merge"
diff --git a/dev-ruby/hiera/hiera-3.4.1.ebuild b/dev-ruby/hiera/hiera-3.4.1.ebuild
deleted file mode 100644
index 91b6811fbdba..000000000000
--- a/dev-ruby/hiera/hiera-3.4.1.ebuild
+++ /dev/null
@@ -1,25 +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_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple pluggable Hierarchical Database"
-HOMEPAGE="https://docs.puppet.com/hiera/latest/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-ruby_add_rdepend "dev-ruby/deep_merge"
diff --git a/dev-ruby/hiera/hiera-3.4.3.ebuild b/dev-ruby/hiera/hiera-3.4.3.ebuild
index 594558142a8d..9c3ab46930b0 100644
--- a/dev-ruby/hiera/hiera-3.4.3.ebuild
+++ b/dev-ruby/hiera/hiera-3.4.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://docs.puppet.com/hiera/latest/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 ruby_add_bdepend "test? ( dev-ruby/mocha )"
 
diff --git a/dev-ruby/http-form_data/Manifest b/dev-ruby/http-form_data/Manifest
index 9cefb3e32e45..24ebaafd0624 100644
--- a/dev-ruby/http-form_data/Manifest
+++ b/dev-ruby/http-form_data/Manifest
@@ -3,5 +3,5 @@ DIST http-form_data-2.0.0.gem 16384 BLAKE2B 813fb1d14074304786fbdb954141f914859b
 DIST http-form_data-2.1.0.gem 16384 BLAKE2B 7ea011ae83e6d5caedf127e55dd2ba4539e4c0d58a2182b7331b1aa1eba9d7e1886fce3d2fcab6d2b5fcb8ebbf56cc9bc3dafee5050238b4d765eb9238c10ff8 SHA512 ec01035d7bced9ad624019ae5d1290becabcb35670cba52b450f379aac3cc68b3c12ef0128930022e75d3c4de430e8595af0733dcce4a4a531898722fb0d34c3
 EBUILD http-form_data-1.0.3.ebuild 587 BLAKE2B 0f26ea6405c3af943933299ffce66cc16b2399e56ab9d115c218bbdc2ef8b0376db47226012de4c944fdc72e14e5dd962d4e123a4f821e961e502449f83f504b SHA512 329f084345e69ba9f2418d0781886e9823cef5521757f082c00531e459ac8364828d735345016ed0ab70f5dffd9569ce2ecb403cd0618e32eb4d2094ce567dcb
 EBUILD http-form_data-2.0.0.ebuild 579 BLAKE2B fde0c2c87fb47efdad817363b8f34366ab314736be93a87c2d9a8f81fe4cf8b495fe99065d69f05abe04ad93ad9e677007a471a5c7073a63888008801b8a4703 SHA512 6341421ece7510c632b89144c28f8fb5dbcd90f7c9cefed4208004c18a0399143968756222f9b73613df8680f4528d4bb2efed937a035b56e93cd262effb415c
-EBUILD http-form_data-2.1.0.ebuild 579 BLAKE2B fde0c2c87fb47efdad817363b8f34366ab314736be93a87c2d9a8f81fe4cf8b495fe99065d69f05abe04ad93ad9e677007a471a5c7073a63888008801b8a4703 SHA512 6341421ece7510c632b89144c28f8fb5dbcd90f7c9cefed4208004c18a0399143968756222f9b73613df8680f4528d4bb2efed937a035b56e93cd262effb415c
+EBUILD http-form_data-2.1.0.ebuild 586 BLAKE2B 79c7a4f2ab69aa94de0487d81f2da025d791632c4c00aab4485275380c50c8b93e10af9e831846b67113cad6909759bc007aa0e90f111d75b4bea450598ff289 SHA512 582d08016d0338812afb50f69c5fcdac11259a211bbfe4ddb7d46bfe47083c256d231c3d396436fe80ab4927626ec9568ab5ed8ab4a05f8edbb573a9f7432156
 MISC metadata.xml 345 BLAKE2B 6301add67db13bd0df4d236cfa4042737f0216c1255a92b10ee272a3b4bfeeaeb0d9541013a460a3be689058ba31683854b3f0308232cfeae7f4d560d207c10f SHA512 6d157ee3fe1a775733ea0a808a81d68c0061319b30c6062e181cc4a19d1a5142027ddb2145fcb78c44feddd4e36682ce39306f0ade0fb5c13436cd9351e45bd8
diff --git a/dev-ruby/http-form_data/http-form_data-2.1.0.ebuild b/dev-ruby/http-form_data/http-form_data-2.1.0.ebuild
index f5de94dc041c..6a3468acce8b 100644
--- a/dev-ruby/http-form_data/http-form_data-2.1.0.ebuild
+++ b/dev-ruby/http-form_data/http-form_data-2.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/http/Manifest b/dev-ruby/http/Manifest
index 50e0350a8abc..0ddd9ae2775d 100644
--- a/dev-ruby/http/Manifest
+++ b/dev-ruby/http/Manifest
@@ -1,14 +1,15 @@
 DIST http-0.6.3.gem 67072 BLAKE2B c61febdc1e25c5ad2a5ae61191a80d8c0395917962fecb8c7fca23190a33e5b49eeba2797939e5ae9be078ef645b48d66ac804a2c713a3c7a2308bf3b926ebc0 SHA512 e5fe784e833da30e5ef6bcdc43b45a04fcf03d827b8336853591c5ba67b5ccf45cc18849ec4a78f3a0526b05cc50da2a7aadd5ea211284fe73f8dddbe89c642b
 DIST http-0.9.8.gem 66560 BLAKE2B 15b6cc066d2b04c3c6df604787f69b5079dacd277dc95a74b56832fc26cd84d2b631b60a60baadaf46368e5dfda30152983c335faea636490000bc5153d11736 SHA512 bb89147a3c28ebd75d2453e51c0c422557907e055b9a20a560b803bc64edfcdfe96e997ff225a26c9ca278211b0f70faaccf2d18ce2cdc9fd95bc4048093ef68
 DIST http-1.0.2.gem 62464 BLAKE2B a7801cb8389473f5dee9761fffe510ed2228ecf01d75e61026a110ac8438c9344094a5f50868536f0641740a3663a6aebacdc2f3a8294fa49894549b7a6e3bf0 SHA512 fbfa76f588d46b10dfa0d3b319d0ca1a5a92749575cf27791febaf5d55f2e4458cf34f48d8b9792d4e220c89c702b75b039ca5b66d3c43d31bab982082312113
-DIST http-2.2.1.gem 66560 BLAKE2B f198fe9aa28e8302503de16422d0b129a89efdcd4f36ac1d4e5ea2f067cd682fdbaa45237e7d00f9993ae1348455401c494d7ad2425f6ca1ec2464e92b1a9db6 SHA512 e8edf381548c04d0fb2ea0f28104d85eda92d6de6686013190e84127c4ce118fe8b8a562267aed41ad23481ca54e21a215613d7e3d920d6c5ea9f9a3c4a2032c
 DIST http-2.2.2.gem 67072 BLAKE2B d2aa0f155085b60c3a65af6e5cda58632708f1aae000d9d52dcfa5fe3f6880000a4dff749810c7816bd1920597f456f7c9e7c080a4e524d578983944f0d49194 SHA512 9c22f7f4473e5cb0b605b9c8d25c1a93c34e7e440fb7cf4f3690cb9dd9e65ce3619d0575da3d97da6dfcf8e1560113b638bb447340605bebc160f589fb007bed
 DIST http-3.0.0.gem 69632 BLAKE2B e02ddc7e7f2747c2b20fc90b38c1c16c315eda8b800d93148aa0cb1ac0194c2fd5742fa346b18a8f60d4814db7d9e0200ad55c94fd2f8f2cb2bf29d50a22da8e SHA512 ef8c4148b68838e0669d5012c3548d373ef99d9273eb2ea25e7e0237027c766ffdbcdede766eb890f042b7211c2ed953688a372c46b120bf0bbd045c06b8aec3
+DIST http-3.2.0.gem 70656 BLAKE2B 9be294d425169318635db9236b3460e1a863e9e0ade07f1bfd97f6c12e75ea40c4c39ea5eda7c82017b78eb91c1c5703229022a9db20fed709149476a53e5936 SHA512 2766cb33d753ba641d9fc5de5c7e15790c6ce3d00f2065631b4e5006ca90f12b38257d8842c99f46f4dee527434c7b7cab2d99476b757937bd4fcd6d81b6cfb4
+DIST http-3.3.0.gem 70656 BLAKE2B 5c52864168663640389a0f107e1bf8a202654a8b479c92bf5126354d360adcae45a9b4596da7cff2e412fee88ed3622870c4e2bb18eca97466b4ede28baa2a08 SHA512 fcb2549c22974712e129306b472c1a32466c50add85eee9a558582697c7ece26cb7a1db6da6aaceedb8bfd134d1213090c158db510fe53ddbe201bba6bd22c68
 EBUILD http-0.6.3-r1.ebuild 669 BLAKE2B 3ad469ee00e4385526f74a1bcd4f885e9fe27080eb639e46f10336a9c19e2fd1e8c5d74d04e9e5e77e251f335ae19355d193b54502edcfde0693c1f1b092bec8 SHA512 5bb6b432c6aafcaef4175ea63cc7e7ddf957d841d5504a98f22f82247b5f5ec6e707ca8f0d93544793d7844c9ae40996547dad84b62bd397fff5618b1a2288b9
-EBUILD http-0.9.8-r1.ebuild 1080 BLAKE2B 07d3edeacac51f80a0d0c578069c8efc0d2c296564297a662a04fce5297bc74db8200cb229a3065c30e492cb38fb866a7b0ce900f9f39d9c5aac8cfbcb5174a6 SHA512 5356640951e4d5cc165269cc93f11dc487e41df050ced3381086db094f86685e9549fe3e39e46946e9bff1e6e03a11df35f15270d3e0cbf58b2c5bd30978845e
 EBUILD http-0.9.8-r2.ebuild 1079 BLAKE2B 0a6e4c30901542b3ca659b19a7308eab8b7dc6aa63dddaa111fe922b14c0db408d1c9c4d22c821038376100b329a3ac2c298e5ed6a036481464bbd49e8d6a715 SHA512 bf9e8e66f026a7fe1a82536fd21d3607d070e58c9d657bee9a3f58ce30b0e3f0aca3ad6445eac61128deafa3eae5a1a2452646cd3d66631769dd64f336172267
 EBUILD http-1.0.2.ebuild 1066 BLAKE2B 8254d2606eefeb6f3088fbcd8a3b40bf5c81f19b8e70c45ae246af3c517ae33041ebda64c7838186842f0ab3146e0d60f7e88abe70a4708dc97ea74eab6ed7c7 SHA512 61835402afb957f5e5d0659edbf7fd7457c2801cd2c9f151e87de4bf3ca57bd0a21729e1ba2ebf0490c8586c472311fe299d54f478d03cc6dfb9ee0f72d67a39
-EBUILD http-2.2.1.ebuild 1227 BLAKE2B e0ae3652c9754f7ade9fe1ef6f4b95efd1ef51c741a337eefbd200c264931963f11f0501400936eb11d7790866b67a1776d4b1e3975d2c9ae01c220f966a64ea SHA512 4aba63dd64f40a6e8a6dd2acf6030534941d04caee3e7758efd638cabd7b1fa3f23e98071d08b1ce7c9eb7ce2b90dc99a1708dd8f53e200b531ed82a9d7eafe0
 EBUILD http-2.2.2.ebuild 1232 BLAKE2B c15bb91342baa306872e609cae8546b30ebedaa8c0388859f94c597b3a3fdfb08f50cb60e14cbe8df34cb8c0389a283f60a0beaf303068fc38417e62ef2e7222 SHA512 e24e112a1ab81d744c8046561c1314b57439c67654250542cae7921e7fefbf716610e1bd3775936fdcfe8db0c9c72b56c8b12a4229c5ae342d1a916675c3d3a6
 EBUILD http-3.0.0.ebuild 1228 BLAKE2B 581bea6ff67449d0bacb2eb8038b38405ed97cebae6be2108a8194eec267932ee9f6014743eddfcc9138076bf507a36f0eca4d64577dda7100f83146697d3f52 SHA512 4ab960efe6d5b79b49af267d9a26e233d49d278fb3f839a9c9052ffe74bbfb96976bcdd5c00302b0c7cc4399a78c25867f4c7a548b8ad903c4700387d7ecc97d
+EBUILD http-3.2.0.ebuild 1232 BLAKE2B 09cd0bdc0adc6926e7f82a83886bad44fa04a51b726cf22e9a32a8ec9caae0c7d3e1d3a4007a125e08da6e8cbe6a382a2f391a11e9222d2b16f9de211c5176b7 SHA512 48910a29b81c2c2e3f608076823f3f76cc0eef2b910f36564a5466bf33e69975ac47a0b388fdd9930b2111993bdc1deb0af1e04e98f791990188bd3b8236193e
+EBUILD http-3.3.0.ebuild 1225 BLAKE2B 807e39fb714feb685fdac6920fe232706c915ef6ba5176cc7a46f29fc43950e9a7981bdda11114981e6f042f78106a0144e36ca41c97e200d070c82210d652e4 SHA512 6a8d7ad05c3126aed3d97db2f1c76253f463ac369d78f614f24b13028728ade06ebc01c317a6c0bf24720e4a45993d0e8a2a259acd70d87a581c3a3cb856c0a8
 MISC metadata.xml 339 BLAKE2B 2508769568914caafa01e9e8e6517a7cf9c1733c772b3c605c8dbb056efb8dca3be9525e1ba2ac610bd6d5b5dc02b7625f3569dce0597444240bc2ed8d8449c2 SHA512 9b43a2f61eea32941c251429694bcfe432f284527c332efdaf4187c9ad8c6f53cd924421ca9d56cefce75cbaff104d4f7579790fe09b45a4cced06bedc44d1c1
diff --git a/dev-ruby/http/http-0.9.8-r1.ebuild b/dev-ruby/http/http-3.2.0.ebuild
index 636df10e187a..adc8cb7d3193 100644
--- a/dev-ruby/http/http-0.9.8-r1.ebuild
+++ b/dev-ruby/http/http-3.2.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -15,13 +15,13 @@ DESCRIPTION="An easy-to-use client library for making requests from Ruby"
 HOMEPAGE="https://github.com/tarcieri/http"
 
 LICENSE="MIT"
-SLOT="0.8"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
-	>=dev-ruby/addressable-2.3
-	>=dev-ruby/http-cookie-1.0
+	>=dev-ruby/addressable-2.3:0
+	>=dev-ruby/http-cookie-1.0:0
 	>=dev-ruby/http-form_data-1.0.1:1.0
 	>=dev-ruby/http_parser_rb-0.6.0 =dev-ruby/http_parser_rb-0.6*"
 
@@ -37,4 +37,7 @@ all_ruby_prepare() {
 		spec/lib/http_spec.rb || die
 	sed -i -e '/with non-ASCII URLs/,/^    end/ s:^:#:' \
 		spec/lib/http/client_spec.rb || die
+
+	# Avoid spec that may fail with a running web server
+	sed -i -e '/unifies socket errors into HTTP::ConnectionError/,/^  end/ s:^:#:' spec/lib/http_spec.rb || die
 }
diff --git a/dev-ruby/http/http-2.2.1.ebuild b/dev-ruby/http/http-3.3.0.ebuild
index 14eb329cb4c0..99051aa01e39 100644
--- a/dev-ruby/http/http-2.2.1.ebuild
+++ b/dev-ruby/http/http-3.3.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
+EAPI=6
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -15,13 +15,13 @@ DESCRIPTION="An easy-to-use client library for making requests from Ruby"
 HOMEPAGE="https://github.com/tarcieri/http"
 
 LICENSE="MIT"
-SLOT="2.0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
-	>=dev-ruby/addressable-2.3
-	>=dev-ruby/http-cookie-1.0
+	>=dev-ruby/addressable-2.3:0
+	>=dev-ruby/http-cookie-1.0:0
 	>=dev-ruby/http-form_data-1.0.1:1.0
 	>=dev-ruby/http_parser_rb-0.6.0 =dev-ruby/http_parser_rb-0.6*"
 
@@ -39,5 +39,5 @@ all_ruby_prepare() {
 		spec/lib/http/client_spec.rb || die
 
 	# Avoid spec that may fail with a running web server
-	sed -i -e '/unifies socket errors into HTTP::ConnectionError/,/^    end/ s:^:#:' spec/lib/http_spec.rb || die
+	sed -i -e '/unifies socket errors into HTTP::ConnectionError/,/^  end/ s:^:#:' spec/lib/http_spec.rb || die
 }
diff --git a/dev-ruby/instantiator/Manifest b/dev-ruby/instantiator/Manifest
index 7ae6ba4dcb72..0a49ad140c77 100644
--- a/dev-ruby/instantiator/Manifest
+++ b/dev-ruby/instantiator/Manifest
@@ -1,5 +1,5 @@
 DIST instantiator-0.0.6.gem 6144 BLAKE2B 6add4d12cce98be209ac3d1073c17163c10c6c015eb40c9d8efcf3c4521e56c736618d11c4a06f52a0d16ffdf2b6815fb6e04ce823fc79febf997dec30aa1904 SHA512 0d24c804dd048c071e5ddd021a1adcb907eb642df16ce841fdca2efdfd5604f73d065ad4496cf6d63bdff73e7488391d7226bdc0d918d2813502ca3d4fc615a1
 DIST instantiator-0.0.7.gem 8192 BLAKE2B c1cc0bf4a3f2aaf9afd522e33fdd2b32d78ca114fc7b113f6ae297e825177827cb6aa5398917d6d05523f912bebf22e43709e53c0dfe4e1a941ebda4350d3098 SHA512 b37a9380d787252244d2b85bb99365f4a4ecdab58f76caf5e59df00b239f4981119eb5c2eb2fe6ddcf810bb0fb43695f8926370a101f4223fa28811953e6731d
 EBUILD instantiator-0.0.6.ebuild 572 BLAKE2B fa02578109dd6b75d2b729c55d1c5b1210b9e1467fb1460326177889b7e40f68e36dc7c09dc77469e3893ce9d160c09ec7e35adfde71a8d0f0ce1f5674f38f94 SHA512 e93542390c4e270377f28d9fa59a33d21396f3137128d23ffe909035e8adb6933e84342a1d8efe9c99703e26be1daf0e29c6ad1b63cdae0ed30ea6d7e7625284
-EBUILD instantiator-0.0.7.ebuild 573 BLAKE2B 434cd240c4991f8f4c0bb34d69f417215e39f6b51c335fb89700412dfb0992472d13d895aacd2e22a21287766338f9e0ac9707a6d72535d2f04ed7074c850524 SHA512 94f4a4727e40cc75e45c8753b825f02f970fe458315ae1a318e43d3af395a8efcec6366c0f013ea67d2b826cc607b22572344227c79e4304e8e644287e799044
+EBUILD instantiator-0.0.7.ebuild 573 BLAKE2B f66ac1d2a1851bd3efea4d55edf1fb36d7f3775ad079cca52af0992fccb7b217a0cd400e82aa510a400e064171bda4a5ec7a44b56e4aad38a5f2dcc03dd91040 SHA512 f02c6b38c04f27171dfd04b728cc94defff8b4904abf1978b3760f4aea02a6adb8f2be926eefa82670e5e8d765acb474334a6435fc4472c8027031473bb49088
 MISC metadata.xml 350 BLAKE2B 3a675060e310b02ef2d6408b7b7114651555ae65ed76f6311947a7c6b01e18c638775ae71c504892845b5f9fde2bf5560c3e267fa478bc105c3732a2ee821fc8 SHA512 48661d17e8297087c541040534f2c19ef983be797cd9feb5a9e7d80f8bfcfba027e8c2e42d8625a0a0f76bc60247372b2ae0f984b6ae8f635f28bac33156fe1d
diff --git a/dev-ruby/instantiator/instantiator-0.0.7.ebuild b/dev-ruby/instantiator/instantiator-0.0.7.ebuild
index 1d7f653b0218..37edee42c999 100644
--- a/dev-ruby/instantiator/instantiator-0.0.7.ebuild
+++ b/dev-ruby/instantiator/instantiator-0.0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/libxml/Manifest b/dev-ruby/libxml/Manifest
index 7c9642a34286..32e60446a6a1 100644
--- a/dev-ruby/libxml/Manifest
+++ b/dev-ruby/libxml/Manifest
@@ -1,3 +1,3 @@
 DIST libxml-ruby-2.9.0.gem 262144 BLAKE2B fb601a0be0aab7fdfd00ac7ef245e52413dbc6e4de71eecb4f0618843ee0621f96ef438df5ec20483a56686ec0ba7ed13fce29b13b779a04313337caa385ae8c SHA512 06ad42ce68c16715fc92a41439c3c27b49fc25b4f8829fac0a27f860d6c3df9a4cb964f1b4677d7587d31c0e5542c4d1c1c25ae3bcfcec889015618d22f6ff3c
-EBUILD libxml-2.9.0.ebuild 1387 BLAKE2B fe91433377574ca2e25974125e6b4e3d3e95d333e42b3f4a3bf2260c58ba5a0ad5985aa3f42a4e74b4ce858fbfe0f29ee26338d4bb5909763ffc16331d014fab SHA512 71b72b8cecdc4731585eedacda18318bad2eea728824223186c40087f69edc55b5fb247d3fb95f2e6f275e9feff1d84c8dd196e7c402f0944159058b14781ed8
+EBUILD libxml-2.9.0.ebuild 1373 BLAKE2B df740fc4678ba831e4a4cdea8f6c895e04a21558a7fbd5cabf902288855a20ed0d9cc30d2e882b91d0e62a92068c9676a1f9447915867c957ee836ff28ca3ebd SHA512 df955261996cd82603479907ae3d72e1cea6c736695ae29cdc810872e1c13635b973e292dfc10a26e977fa46e5c3d787d1e46debb1a812f0a399478d39c6534a
 MISC metadata.xml 343 BLAKE2B ab9720276d88ebdd8463243faaad691ef7f782984291ece318f16da272dbc24bc79082f556ffa37be664feee98a189a7d71e1925884a7b40e834c878ed61fa45 SHA512 fd2936253ab0f8f0e35b3c8e3b6a145eda17d8bf82badeaf78e20e1622c0aca323240227e4159991d6436c7473f96bf9960ce39a97513ff9610c13d9f5fda13e
diff --git a/dev-ruby/libxml/libxml-2.9.0.ebuild b/dev-ruby/libxml/libxml-2.9.0.ebuild
index 7aaf4739bd5e..0d60009df211 100644
--- a/dev-ruby/libxml/libxml-2.9.0.ebuild
+++ b/dev-ruby/libxml/libxml-2.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_NAME="libxml-ruby"
 
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index cac384df2a17..4cb1a38abc70 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -3,6 +3,5 @@ DIST listen-1.3.1-git.tgz 35521 BLAKE2B 6b93daff2b3ba221d0c0f196c67353963e983610
 DIST listen-3.1.5.tar.gz 51250 BLAKE2B 8ed941ed72293fad3327f2fb939920f82b02a9c0f25e8b1273961d9bff64830d619e9e97c184e353b69a78fe38be01a2fd2f0453cf94d3ca9fff66e40d18f59d SHA512 132266485d70002da5bd1e680530331db6b74e8ea12011d60a6ba7df0ec045459b5b3a6305bb2ea6a80ff6a4a1244ef935a4143f6c8709df7a176d6db69da08a
 EBUILD listen-0.7.3-r2.ebuild 900 BLAKE2B c31f15ac9a432bddf88e9520c056e8f934f0c5179842f316af808eb64928d25534fb39cf97308f7edec2cb991545482246adf184c2dd5891c2af7b72fa1d08af SHA512 5e0a224f8e5063de13511228857563e11ed3c15a62dccf2b0ce3d3115222e753e003dcd793c21969c4587ec1182c2c4e4fc1f46ea33908af9940f6e40b77c11e
 EBUILD listen-1.3.1-r4.ebuild 983 BLAKE2B 09cac0e3c1892b3c1dd8f3ce7f79390f5f40c7f208bdd92accd5f565ef6fabe36d4076a55bd3805bac6d24ffd6034e9d903eaa46e4433badc57050095f59758e SHA512 ac741414257a549dec77ef8778589ad2e6760eb2f78cb9a8aef885b7dba1aa5cf541eb488c6432b4ca73fa95d1439214a6012530f26c7728608cc828412aec0f
-EBUILD listen-3.1.5-r1.ebuild 1239 BLAKE2B 7b99f34669fbd30d271f16269f888cf50db70099b88739cf90256ac14b4daa3b3c9c510f491f17c08d6e09bf2114172c25372554060c4d9bbb6c5ed76fb39208 SHA512 b0e53cc835926b8a7dd3d78301193abbe653d1494e999e072fc56e8857f2a5f5c7971e6ff61aceeec1849f4e77b249792c7df761161d0580bcedccc2b3704144
-EBUILD listen-3.1.5.ebuild 1240 BLAKE2B 05dff2609fffff83d14cac7e29d0db5d766ccd2ee0d1d83d5b1164c8a743c120718167c921136fade76940dab1756acba6c310489c6ca632b0b158b1b74750ce SHA512 aa7a3d783f4a9b3df163a80c7ee957bcdf5d3e6c36b52d1091d1eb94f33729a5448777d7d7fd4f7eea48066bb2d4facc5e4de33236cf0ce01e453d01a8ef1d62
+EBUILD listen-3.1.5-r1.ebuild 1246 BLAKE2B 15a9056cf2c52b1272fd2bdb9cfd9b5c9b82121f585b66a82ebf1c6ba83de4a5101d2b0af11df6b38465f53f70fcc5bc7837ecc8c53b27954c555093e4831bc5 SHA512 6a30055ea52a830914bdb85c89ef9dd0cbe4770f0cafe1c48fd3beb6f4e6b3d95ff2f07c390d16995594fef35123d641f9565746e7d7b6d8ceadc45773d4675b
 MISC metadata.xml 338 BLAKE2B aa66734c1150c6a7b21e1c018d4303311955fb6e1eadcdfe16c3ca514b3aad663e4c16399a75b091e614ed87a86b6958577771e040700e01590447d33bd77dab SHA512 f4035107afc1bcbab797e116a0f39e49c9a4034f838878ad448efea9eba8d2fbc4db074db73871550a42c175c9e36a220877d2ed50580828c3180fcc50913288
diff --git a/dev-ruby/listen/listen-3.1.5-r1.ebuild b/dev-ruby/listen/listen-3.1.5-r1.ebuild
index eb1da42ebcaa..278eab60550c 100644
--- a/dev-ruby/listen/listen-3.1.5-r1.ebuild
+++ b/dev-ruby/listen/listen-3.1.5-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/guard/listen"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 # Block on other packages trying to install a /usr/bin/listen
diff --git a/dev-ruby/listen/listen-3.1.5.ebuild b/dev-ruby/listen/listen-3.1.5.ebuild
deleted file mode 100644
index 6a2a06830b3f..000000000000
--- a/dev-ruby/listen/listen-3.1.5.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="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Listens to file modifications and notifies you about the changes"
-HOMEPAGE="https://github.com/guard/listen"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-# Block on other packages trying to install a /usr/bin/listen
-RDEPEND+="!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2"
-
-ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.7 >=dev-ruby/ruby_dep-1.2:1"
-
-ruby_add_bdepend "test? ( dev-ruby/thor )"
-
-all_ruby_prepare() {
-	rm -f Gemfile || die
-	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
-	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
-	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
-}
-
-each_ruby_prepare() {
-	mkdir spec/.fixtures || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	rm -rf spec/.fixtures || die
-}
diff --git a/dev-ruby/litc/Manifest b/dev-ruby/litc/Manifest
index 1a01755f6d4a..9289213e32cd 100644
--- a/dev-ruby/litc/Manifest
+++ b/dev-ruby/litc/Manifest
@@ -1,3 +1,3 @@
 DIST litc-1.0.3.gem 9216 BLAKE2B b7ca4224e3a0fe0d5b109ed1b2dd07e93faacb13779ec245b1e6e2357cee54af137d5fee0685705efdb10c19131ff9eb8142fc8e9a77eedb7702ee441300035e SHA512 7fb36a051d0056a8ae2c7c48a404b8fc71b3e8f40d6487c7ba5c8d3896ff6c936604c47f8ccbe011c4ba7c1fc4ef863f9a551cdb06f40a93896692b1375b8b31
-EBUILD litc-1.0.3-r1.ebuild 786 BLAKE2B 87a2303866b6cc6fb16303b517cb9cfd44bfb06c3c9e05bcb61f7004a4f367b21a4c9838ce3d7d9541f3057d55a225e096295f524dffed9bbcdbcc2e75ec67a0 SHA512 bf734473d014046faf27fc21addccc88718042126fb45ff0fbc2a6122cb1a472f53e082a5822384b38aea4f5d9cc993dd8604c76edcdec2696e1c3f391c4eade
+EBUILD litc-1.0.3-r1.ebuild 786 BLAKE2B c1f0d82bf0c3f9c324274d0740e53c0ff4489d7650d1380718bdb505a0bf27a303e22a600ae166b99eee5d943f94ad522c0aebf65fbf5f2bab1225f01d08374b SHA512 bfc62d9d80709937e5ce0e2f3e1fff3952592587839e9d0f42fdff063bacceaee13608dd52800f58a6bf9b7e060e7e6d473bc191347a4275588946ff68c4535d
 MISC metadata.xml 337 BLAKE2B 5e6798687c120e4793e8f589c901afc1bc1e3e75d36b5894e4df1a9104e5fad3b33bb5888ae5a4e1725b458805139c9a570651ceb092b3339a35e642fb59a441 SHA512 ac749026093f65ce973b75cd1d9a0ec5c4d95d7b2966a2514251dba89cda3acfad5c12a18ffe97f7764afe0b160277517ab1b1b512a6fcd17c3db0dab6738014
diff --git a/dev-ruby/litc/litc-1.0.3-r1.ebuild b/dev-ruby/litc/litc-1.0.3-r1.ebuild
index f53b726136b4..39dbad172fe4 100644
--- a/dev-ruby/litc/litc-1.0.3-r1.ebuild
+++ b/dev-ruby/litc/litc-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="rerdoc"
 RUBY_FAKEGEM_DOCDIR="rdoc"
diff --git a/dev-ruby/logue/Manifest b/dev-ruby/logue/Manifest
index ca7ec3bf71c1..d1377dbe9fbe 100644
--- a/dev-ruby/logue/Manifest
+++ b/dev-ruby/logue/Manifest
@@ -1,7 +1,7 @@
 DIST logue-git-1.0.11.tgz 11535 BLAKE2B 6515efab4cb42fa7a787bded637ea6d21ff9d4f99acbc6f14334a0aa6b49c6b93b48f57c78e38b52761cd9e59e722b94b4992a0c585bad601a70b425d0abb165 SHA512 8a5793967eeed4df21439f55bb1bc33037d7c18e8b5f543bef7d6bb9e54e6c5acfb6302f754c7454ef0d8ddf5717563e136b45ee3c5e0c08d92fad15028220b9
+DIST logue-git-1.0.13.tgz 14389 BLAKE2B a6886989e561124904e6e6016c84b53abd1ea5be2f92958dffdc9b5ce9741728b9760034a9a7517ff35dfe0ebf10d6a6937aee426b85de3e71690098e9eec0ad SHA512 677ef2a8fecc50cb923dcf85ab0bdd984ea5806c31e11df9438af92912b94a4ce227837fac4baee05595f894f6a0fd4167f2984357628eb3e8036479103340c4
 DIST logue-git-1.0.4.tgz 17797 BLAKE2B be99a6c9ecc8bbde25d9a485d83b1d485e7afbe3e5fb8954dd6140881bff496c48185e15ad4596bcf7abba3a19e556da9ac6d44623be33887e32590cb35abd0f SHA512 e3d6ec6a8b302fbdf7a2b7842b31f88af4f0576166b632dd356a40902dc816bbfdaf18a170d5c8066fbfa97643d38d6c8137d4f435f478f04badae4a0120184b
-DIST logue-git-1.0.8.tgz 20017 BLAKE2B d82ae06314c6f0f9b66567e724697652c38221308adb86a917e5d4ed6015ce6ed03efeac30b53d3dd94022ceb2fbc30fca8d2429e0ebfc664635214a76b2fbae SHA512 792c74d6f42bd5252f368fc0c90c91bfd147cb7acc6fe70ccc70e7ad0aad04a76ea37f72a9a25379f9a6396e708dc111a0e43917f9f7e18efb1a9217e6527f1b
 EBUILD logue-1.0.11.ebuild 572 BLAKE2B 1449b5566d3c1d8aff61f2a39e4fb82d315b7a04d66c7e6daa3799e3739922db98c3c832a789bb6ff5915fb4661717cdddf375d08906d661728f895854d2f794 SHA512 011eda51afb2309e642f4cc1ecd60208a22654187e83728c6eb806ce61adf790dbe23815d3a92170e3265ba96928562af0f42482d89037c7e4c1a9060565c528
+EBUILD logue-1.0.13.ebuild 697 BLAKE2B 6a68148170451e1fdf815c64efb7b8a86081b922b4975e33f33d55049251b1ad9ac725284c80358ee043912c7a045c3c768d28544484ba54b7b69a4f820b0afb SHA512 6cd8082df74d258648e35a847bbbaa5ecb8ec2292aeeb107ad578d5e2a6df469fa733382b9f3a975a64b1e672b214762db4b232dd4da548d410d4a87666ff45b
 EBUILD logue-1.0.4.ebuild 601 BLAKE2B ce2b1f04851d4e26bff1a1bcc2385786c7ed3cf6bf3afad51bd4b6f7a451f322a7c89e37de17fd404ae14eaee066b99d959185dea984831c6483b663b1c4ffd5 SHA512 f3800e592f379b269bb25a2c6ab8ecf64fdbeedc91e7712989a2021181c3081231445c906f3303f0add37cc230e97227f44c8349e6afefa0d3ebf171e03d9770
-EBUILD logue-1.0.8.ebuild 603 BLAKE2B b5b3e5ccedbab710ccdcb261e9d7273af4d4b65b1429bce61c838c302983aef2c435b98ce8ff1c0b6da6dd7cda1b776048f8212f3642634651cda8f514a46d09 SHA512 8b0ffe38f3e5be947006ca2a45b099d959092166c806b54e1e4c7b543ae55ada5c5cea9d271c28b2d828908b52cdee73804a105d17ec34be44678b26ce7d134c
 MISC metadata.xml 337 BLAKE2B 045c92dadbdfb3a0c0506734134b5c62b6fc842e12cfbae746a6d9cf07dc65dd5d240575639ef8563baf4d201a43d1b3aed0f3ebf54f88a85e7cf8305926d29d SHA512 2d11804bc1d4e53888e62609677d7bc0c20882ed3cc779dfdf5733adf9cc94ba671af7e901724fe30159ebea1cdcb1039e5c83ead45ebff75b9ce64018bbc1f6
diff --git a/dev-ruby/logue/logue-1.0.8.ebuild b/dev-ruby/logue/logue-1.0.13.ebuild
index 309fa5981b39..0fd1d7449f23 100644
--- a/dev-ruby/logue/logue-1.0.8.ebuild
+++ b/dev-ruby/logue/logue-1.0.13.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="Features.txt History.txt README.md"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
 
 inherit ruby-fakegem
 
@@ -21,4 +22,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/rainbow-2.0.0"
+ruby_add_rdepend "dev-ruby/rainbow:3"
+
+all_ruby_prepare() {
+	# Fix path to match installed gem path
+	sed -i -e 's:logue/lib/logue:/lib/logue:' lib/logue/stack.rb || die
+}
diff --git a/dev-ruby/meterpreter_bins/Manifest b/dev-ruby/meterpreter_bins/Manifest
index 29634bd82df1..ab0640023742 100644
--- a/dev-ruby/meterpreter_bins/Manifest
+++ b/dev-ruby/meterpreter_bins/Manifest
@@ -1,3 +1,3 @@
 DIST meterpreter_bins-0.0.22.gem 3565568 BLAKE2B 9f3b73908220dafc7e5b41fa09e86317658191cfd20acee8247d13671ce378fecb566177ac7cdc6243caddd10767952002f90eb433b9f5b5f855824468fd191d SHA512 80b7856bdab0ec91f6adae5497f8d119f21e8f36a2c1750e50f2dda9323dbaf7ebccf6f1a8e57f2459d8a2e6ab7b718454d35a653da6ec03e1e01c1d04c9288d
-EBUILD meterpreter_bins-0.0.22.ebuild 554 BLAKE2B 49eaff32bb471e050472832dfd04acb2f67c7dc7f14d521c0d3d87ee1cc28677f8d8c3267736632ef829278c42f4634ac494ce59bce163a5afaea186712e9dc0 SHA512 3454b6083630a3a0d094bef40a1173adeeec15e2190afd06b101c9c51fa2b8e98d00dbe4ab7261bb069e24c9561b67941ff07e25bc36aede72b567116f730d42
+EBUILD meterpreter_bins-0.0.22.ebuild 547 BLAKE2B 591d967b5da9b817af25c550330f7e84a880f91d925addd01ea14012c54ef33057e8635cb5cf6df968770a2d11976dbdbfef0bffadf54d0a507e943e290c7bc7 SHA512 aa6dc7c5a917797b30a4c70f6b6da7fd1d817c56e2ac322cd164777bcd44f63e42b74149246956b42152305c3f47f57dbc3d4b0d244e0560417bb383cfe05266
 MISC metadata.xml 345 BLAKE2B 96db6272e5361992b21c63d1ad5ed08f2a606fcd2f0c45906cfe063ad29855daa76aacc80128d5de17ec94311685add5c059cd46a94c09f6ce0d2f7a42343847 SHA512 31f83a98f599245fc9866583490f5b0612e2bd65e63bfb6c7efc37f64ca8ed711c248f4ec34dc7f12650266faf163bca6995de85e3ad58c639bb537d5ea33fd2
diff --git a/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.22.ebuild b/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.22.ebuild
index 9b48b6a11057..4191029c5777 100644
--- a/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.22.ebuild
+++ b/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.22.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="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/mime-types/Manifest b/dev-ruby/mime-types/Manifest
index 99df10b1a4bb..9ff11227b84a 100644
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@@ -5,5 +5,5 @@ DIST mime-types-3.1.gem 42496 BLAKE2B a586c6264e46fd45c5fa7bf79b8ca79e086d4ed23c
 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 984 BLAKE2B 7c2e425aef1fa4aa0c664fafbf8337db9c335eff652bea011cb45a606f8df127276b1f672b40756d2651bacb05c9702723e9278aa520c6892c9ce2b55958bb25 SHA512 d04b92658c3b47d612d765a635eb251b99c489712d1a344e086e638aa5a48390645fa76bebb6f08b5ecba527e2a916b0263d1d833c8b72e777d101b7c1ad3dc9
-EBUILD mime-types-3.1.ebuild 913 BLAKE2B 7a87736d19fad34e55ff4fa94b3413d0d48fe2e2791374cc0dd4a658330a436cf67093c5794c12c40a5b7eaf68927cbbd6e06052d22a37398038e8e12e315642 SHA512 6cee43fedea9ea8a82bb3ab8c5f2c4161e2ff630c9069e985f18967b1fda4cdb5f215ecabacff4d6c1ce1d7750b988803deac4be7897e395b6c08444b199309a
+EBUILD mime-types-3.1.ebuild 906 BLAKE2B 0b08720bb71b60417b134c7713640a591c35d2da9654a2c977dc9773da9a30f785917e1910fe1d3547fa560c22e1251c5afb5a1fc231954663f235ee38d28fd8 SHA512 05b42ce6521fb4f7c031e9b19d379d1ecade2f513efa4e7a404d3475b69656f602bb432be2226c97a51fc36f501922bfcd0eb7ffc741cbd218d5869f9825496a
 MISC metadata.xml 352 BLAKE2B 6edd7bc99a1f3c2522e87695e078800275b4e9301597961b8e9ba3b920f7b75c92c8133860be4642995d2501e9bcc6f8f7cdbf611d85aa8ea23dfeda9353011c SHA512 01ae71ee2d991c0669ce4f9ac252f8edcdbe1df3f2510e5497f9a0fd0bcc1dc10a10259dc1b3dd14b73edd58895911d363b6a60105b619033a2bf09f987f4b5b
diff --git a/dev-ruby/mime-types/mime-types-3.1.ebuild b/dev-ruby/mime-types/mime-types-3.1.ebuild
index 2d68dc70082e..b9ad04f9f9f8 100644
--- a/dev-ruby/mime-types/mime-types-3.1.ebuild
+++ b/dev-ruby/mime-types/mime-types-3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index 12e6a2addcba..09fefdcc7d3d 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -1,17 +1,11 @@
 DIST minitest-4.7.5.gem 57856 BLAKE2B d0ecb0a0693c35ebbda52e9c755b72f07e38d6ccc266312a3426f9de3c40165d68bf07d5ed162ce51e31b1bb8502dc844fe61d9e93733108501f156c3096af23 SHA512 7ea0a52d37f4631fb8b11d4389da2123e4207093f7b34c497fced8729c9086faaa35e997debdb53b694e05eb52b16e843960f0b54515c32207f87161a76c3851
-DIST minitest-5.10.2.gem 75264 BLAKE2B a8967591bc590e839d1186e787c5d925b67d8a12f5b49dbcf04f653f53945aadae9b2bf93a432e67c3f7eb2c99d25d9730ee4530d189c059eeee9e46f4bc6ac8 SHA512 f2a0ee13166cd6cb2cebc1f075347f205ac14e03943b2cccff7eadd34d09f2fb8ea0a6c764f20a84efef6463f4101a998110809c81c385225b4f72eb5da687d2
 DIST minitest-5.10.3.gem 76288 BLAKE2B 2c4fa5bca17e8a6270923225cd91fa9b6374d2a00b278906faf4e3ead0baf5fb1572a3c75322befc35ad0016d86f49c905e7de0283b07c60585c4c0348d69701 SHA512 6a3b1c86471fd7bb6ca078de9f253aeb9533f8da027998c34cd7fb8165a1d3bb565c1f8df958bb0eef6b7e22658894175c5f54f475585f2c05bb667e812b7aa3
-DIST minitest-5.11.1.gem 79360 BLAKE2B 97066b398d04a840327bbcc0cfdf71d7945450f979ff70824f9d455de05a0931d8d4d6cdfd4a0ccb65443fba4a4e6378d74277748f4f41beb6e552b1caa83792 SHA512 b25a7f3952f546fe2ab7a87f3fa6d1980e3642b25e7c7b6bfbd94cf2063458613f0a73e71e773323e0277b375827ffe629701d0a17fbb30c6bd00095eda447c0
 DIST minitest-5.11.3.gem 79360 BLAKE2B c348957e094bd91e88c6dace522b8e88c37ec435d58b4f6f8c8b458cfd26b789cb00cd43fa9d515112a8f3c9a736756d59c46f4117d1c1948d08cab0a5eed6aa SHA512 387537aff51f8e8f9cc2feddadf6813d11f0ba623ae3d5929d7b7a88e180b60c961dfa1d2ba0f3a4ad7d2c1af250245376fa62b23f68c8b57812c7e86efba0c7
 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-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
-EBUILD minitest-5.11.1.ebuild 806 BLAKE2B 396d4f18c587cdfee04ba8092487f3e8f593bb994a4490827750e943f888b02a713ed34c0ee32488ceea6d77a682627032b3b1637d99bcab38a377881241ee8f SHA512 bbfa20031a7580e63616d78bbd2bbae0137b5478216e151f9d977aaf77ec797c74c3a3fcd318cd440849872665d16e89cd5112607691f0e92e38e7525a94d65e
 EBUILD minitest-5.11.3.ebuild 806 BLAKE2B 396d4f18c587cdfee04ba8092487f3e8f593bb994a4490827750e943f888b02a713ed34c0ee32488ceea6d77a682627032b3b1637d99bcab38a377881241ee8f SHA512 bbfa20031a7580e63616d78bbd2bbae0137b5478216e151f9d977aaf77ec797c74c3a3fcd318cd440849872665d16e89cd5112607691f0e92e38e7525a94d65e
 EBUILD minitest-5.3.3-r1.ebuild 817 BLAKE2B a2173c0cb66ae8fbce47f13b0afd04f78ffff56c246670462f7cee90a73b6f26435c4489f3dcc4a35bcacba892a752c8681341ad896425565890c21b2c162737 SHA512 b96a9b0b391626ec3579314fb4d5e4d2635a8b78bdc3acec904519c78c87b633e5ed015fed19f7bba04a47adb7d2808495354e7ae378847c88cd4fcff3d84c53
-EBUILD minitest-5.8.4.ebuild 797 BLAKE2B 3b9cd0b577f21c21ec180ad7e48a3dc73b585ca319a396fcf4fd98131c4309a3eb38856c53792a4a1895c3355feac2414803be081fe5f122ef825f17e9a4b7fb SHA512 ee2593712316571c86e9c6f3564c449af05126b2a58db37c1827fa532e63beb2887563d70b6e38036541e4ba0a28130bdb016c2f99975d570ef966ac4740438c
 EBUILD minitest-5.9.1.ebuild 797 BLAKE2B 3b9cd0b577f21c21ec180ad7e48a3dc73b585ca319a396fcf4fd98131c4309a3eb38856c53792a4a1895c3355feac2414803be081fe5f122ef825f17e9a4b7fb SHA512 ee2593712316571c86e9c6f3564c449af05126b2a58db37c1827fa532e63beb2887563d70b6e38036541e4ba0a28130bdb016c2f99975d570ef966ac4740438c
 MISC metadata.xml 344 BLAKE2B a719762acb7e752051fc25d212f40e610a1a00644f8a09a4122bd874ec15af826d9360697b8d63d68fafd6596a8ea34439540894d8b8b9606baf5ddd4573d152 SHA512 48a43ffed154ec65035a6e84ec7e7e9ec222698b4dd56a81b6ca84844d9835c087fd7972d38ecc40fdba7f74acfeb2004bd1084d2cd123ffd09906e644c59e00
diff --git a/dev-ruby/minitest/minitest-5.10.2.ebuild b/dev-ruby/minitest/minitest-5.10.2.ebuild
deleted file mode 100644
index 8a531e8dee73..000000000000
--- a/dev-ruby/minitest/minitest-5.10.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-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="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
-}
diff --git a/dev-ruby/minitest/minitest-5.11.1.ebuild b/dev-ruby/minitest/minitest-5.11.1.ebuild
deleted file mode 100644
index b79c3ae574c7..000000000000
--- a/dev-ruby/minitest/minitest-5.11.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-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="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
-}
diff --git a/dev-ruby/minitest/minitest-5.8.4.ebuild b/dev-ruby/minitest/minitest-5.8.4.ebuild
deleted file mode 100644
index a28e39d5bd01..000000000000
--- a/dev-ruby/minitest/minitest-5.8.4.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="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-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="5"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
-}
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index 7008b4c0ff6f..27be9be4703f 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -5,5 +5,5 @@ DIST multi_json-1.13.1.tar.gz 26098 BLAKE2B e82a08a747a092a9094cd7b35b4f933b5ac9
 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
+EBUILD multi_json-1.13.1.ebuild 1929 BLAKE2B a71552d761d98bc74496f05c9293003ec39aea8063ead81dd1411303a47783093221526ed5474082f11669d122df5ed021c2d61085c31a6e7b32ffbf69325ab7 SHA512 7215bd521e23b3b347f54cbfdcf05bcac763c7102b6fc2541c89bcf40ac830aa5c4959273606e3766c99e3bbb082ac2ab352179f60ac7d5fcfc06728c214885e
 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
index c6f124cf97f5..6f243d356a4a 100644
--- a/dev-ruby/multi_json/multi_json-1.13.1.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.13.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC="yard"
diff --git a/dev-ruby/multi_test/Manifest b/dev-ruby/multi_test/Manifest
index 3fc31ec6b439..1d53bcd838fb 100644
--- a/dev-ruby/multi_test/Manifest
+++ b/dev-ruby/multi_test/Manifest
@@ -1,3 +1,3 @@
 DIST multi_test-0.1.2.gem 9216 BLAKE2B 9a5888937c82f87822445855eb15406b4250b3b42f00116a2c54360ab35b923d08c4015d90b14003679aac5d674baec8756b74aae4a5246beeefbae262edcc1f SHA512 a0d59f51dc959b7febe9c32853b5ac5cbbb3215e8810de5e46fe10fa42931c1ea89df477155cc8124264d608c5928e54fd4e1949e7d0940f927e1430bfd60a2b
-EBUILD multi_test-0.1.2.ebuild 558 BLAKE2B 87b9f4917c292f72091ae1c4f44a7d9139912f8167fc7c63e134d80d85c84b651bd1bb4e4351901bdce753ce7be6074e892662cccbe5be9e71fb128d145e629a SHA512 3f42587dc5ff0f146ed09d356f30fd023861c6f785dcc3cc5e6c4d8a64366b7f831417d5a201bc323d4c6f3c3f340272989bdc55aa6c27d1c3fa728662045fe9
+EBUILD multi_test-0.1.2.ebuild 551 BLAKE2B cccfc8206cefb09ed66fe016140491b648fe754eab5357e30368fabf737e2f9e807d7de1ab3614b2c5d634b04bd822ca187d372cccd224ced22dd13337fc801c SHA512 91765c7961446e1a0a074e2dec706892695224273ab7e1ffb60c761b4fcaf1e3458bbfecc16a37873e168a45ad204ba7b6b653d02ba3c4996c8cd82b9727a6b9
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/multi_test/multi_test-0.1.2.ebuild b/dev-ruby/multi_test/multi_test-0.1.2.ebuild
index ad7564f7186c..1ac9ab817291 100644
--- a/dev-ruby/multi_test/multi_test-0.1.2.ebuild
+++ b/dev-ruby/multi_test/multi_test-0.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="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/narray/Manifest b/dev-ruby/narray/Manifest
index 55414f10a3e7..8e7c08779552 100644
--- a/dev-ruby/narray/Manifest
+++ b/dev-ruby/narray/Manifest
@@ -1,5 +1,3 @@
-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 1290 BLAKE2B 3a063e094aedc9fb947928e04134b0bf51784503fe67f03834c87426c17ede94556fce5458f1f578b6ff4f223c45128d819c429d6531b81e975aa13b4a77fbd0 SHA512 f3028484b14e79b886b848156cd046f4c67684a82d001baf6e159b44facb1c0db02e6c77caba358b0feb0984fef68c1ab7fcbed6676bcd22d8dee529e8844441
+EBUILD narray-0.6.1.2.ebuild 1289 BLAKE2B 8e100bbd20351ca5b973696d76c247c52c14a7eb4ae80037fc91093e109af3b2f90930d3a353ad24596a8828972582a7ea1d80baa026193058b010446992caf3 SHA512 b0368cbc286bc0b3437dd33f1d2145067b58942950531ee93d3a344439155d45d6e11edd772b66d677166b256631ea42756b1b26233a16841296ecfcac09ee4e
 MISC metadata.xml 339 BLAKE2B 9337a45d749879673fc180a12d5e7d27326fdfcf326f86ccc45fc2ad10b7eff1c4575c1379fb6b634f1482b7adb40531f78cc0b556148fdd622b9807e11122b6 SHA512 47c9372c3fa2a28f5d728cd9d3df7b030c2e0bb2378099c287018cd55324a188eb2ef8c901b52acfd87d278c4990752a4860a7281e062f4209bf92c10bdc36e2
diff --git a/dev-ruby/narray/narray-0.6.1.1.ebuild b/dev-ruby/narray/narray-0.6.1.1.ebuild
deleted file mode 100644
index 6ea4f1b4bc13..000000000000
--- a/dev-ruby/narray/narray-0.6.1.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# jruby → native extension
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md README.ja.md SPEC.en.txt SPEC.ja.txt"
-
-RUBY_FAKEGEM_VERSION="${PV/_p/.}"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Numerical N-dimensional Array class"
-HOMEPAGE="http://www.ir.isas.ac.jp/~masa/ruby/index-e.html"
-SRC_URI="https://github.com/masa16/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc ~ppc64 x86"
-
-IUSE=""
-
-all_ruby_prepare() {
-	# the tests aren't really written to be a testsuite, so the
-	# failure cases will literally fail; ignore all of those and
-	# instead expect that the rest won't fail.
-	sed -i -e '/[fF]ollowing will fail/,$ s:^:#:' \
-		-e '/next will fail/,$ s:^:#:' \
-		test/*.rb || die "sed failed"
-}
-
-each_ruby_configure() {
-	${RUBY} extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-	cp -l ${PN}$(get_modname) ${PN}.h ${PN}_config.h lib/ || die "copy of ${PN}$(get_modname) failed"
-}
-
-each_ruby_test() {
-	for unit in test/*; do
-		${RUBY} -Ilib ${unit} || die "test ${unit} failed"
-	done
-}
diff --git a/dev-ruby/narray/narray-0.6.1.2.ebuild b/dev-ruby/narray/narray-0.6.1.2.ebuild
index 6fee0ac67b1d..eeb30014535e 100644
--- a/dev-ruby/narray/narray-0.6.1.2.ebuild
+++ b/dev-ruby/narray/narray-0.6.1.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/masa16/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc ~ppc64 ~x86"
+KEYWORDS="amd64 hppa ~mips ppc ~ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-ruby/net-scp/Manifest b/dev-ruby/net-scp/Manifest
index db8583a8ad75..159da1ec7d62 100644
--- a/dev-ruby/net-scp/Manifest
+++ b/dev-ruby/net-scp/Manifest
@@ -9,5 +9,4 @@ DIST net-scp-1.1.2.gem 32256 BLAKE2B f855903ce626b370d9fedd9bf7ec4a39898fd2188b0
 DIST net-scp-1.2.1.gem 32768 BLAKE2B 67abf0b66aa6e8f28bdfa314a20f594eedafc5aeaf5d0ae8884cb7e27203699a791623968da98aaebda1630d47bf5859cc3e38875fe17dc8c7ce7926b50848a5 SHA512 64645a4517d6e408e3acfdb24576c8ded3b6ff981035ca10a2e081f9e3ab093f97b4848da4acca03ade364483766677e31296d09a31db4c81eb40123fc966829
 EBUILD net-scp-1.1.2-r1.ebuild 713 BLAKE2B 773b45ca7b3693804b11aba0a7affc3d87af112d9520103dc867994e4cf42c5696ae816caaaef6f7a7fc7d0316d692f64c29ab04d69b1b652db6fe641ae1e811 SHA512 684a857564e9c34ccd91586b5824c3d123b7f259892af320f693eaa72dd7cf09a41cf16547fc0b3d64c7ddfa84315334dfa03dda50f26c0ce8af3f85ac4c3d18
 EBUILD net-scp-1.2.1-r1.ebuild 1067 BLAKE2B d3798e26c7cd8d1b6a2b98da583a5f9ae61cf81350083de593244041a9d5496cf827db29d49f820e689d3b52bfe29933d1f40369e51cbe42ccca1750b9b1a9c6 SHA512 e35c2d81231bf1ce23fc50719ebd72332bc4ea436a20f7b199f4a17e7d1e94e3a373e269b879a9aec497ccac158eb42dcfa4e2e2e09c0da7550ef44f9291cedc
-EBUILD net-scp-1.2.1.ebuild 830 BLAKE2B fad9c860fad2167c37c90ea7bee052d02ef01190c7465b72e6cb30770f9a20aa921c56a3073795a1d130bd3e6d8a091bf62ac31c49b1702cc54b7fa89413b850 SHA512 ffa9c5defcabb146c710ad2b36e07926de1faf6c5cdc03c5534dfda36fe5f6f05dbe8e475551eb509ce30b05d57200cf989c778cad465c926387c40a7416576d
 MISC metadata.xml 341 BLAKE2B aec6f820a216a818e7f6a82ffe48f73a01cc662d9a5e10a5dee98885f564560644e377158ccd5c4cb6e914205fa5aa6753aaf5dcd52e1849437955553f3c268c SHA512 bbb71a6668f329ca9b1f5636aa71720a8234a7683fe374b2fde4113ff56d3a5c2242bcba7e3023090a7955870715e0040d990326942def6d3be7e31d5f07d39c
diff --git a/dev-ruby/net-scp/net-scp-1.2.1.ebuild b/dev-ruby/net-scp/net-scp-1.2.1.ebuild
deleted file mode 100644
index f317b12f2442..000000000000
--- a/dev-ruby/net-scp/net-scp-1.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby implementation of the SCP client protocol"
-HOMEPAGE="https://github.com/net-ssh/net-scp"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	doc? ( >=dev-ruby/net-ssh-2.6.5:2.6 )
-	test? (
-		>=dev-ruby/net-ssh-2.9.0:2.6
-		dev-ruby/mocha
-	)"
-
-ruby_add_rdepend ">=dev-ruby/net-ssh-2.6.5:2.6"
-
-all_ruby_prepare() {
-	sed -i -e 's/>= 2.0.0/~> 2.0/' test/common.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/test_all.rb || die
-}
diff --git a/dev-ruby/net-sftp/Manifest b/dev-ruby/net-sftp/Manifest
index 8ada9f2538a0..9399793fac67 100644
--- a/dev-ruby/net-sftp/Manifest
+++ b/dev-ruby/net-sftp/Manifest
@@ -1,3 +1,4 @@
+AUX net-sftp-2.1.2-net-ssh-4.patch 1628 BLAKE2B 1dc8caef775ca06c80f485732acdceeedc10aaa96e33c1c6c59ce5e1596a71a229aecb06092b3a265288ae46469d1c72b4a0de8ec3d50cba5fe0947158c3181e SHA512 dc4e99f13e32698bbcfe1b07e2ec4baa1ed9beec5bc3816c016f26b053f7134bb9646dc538a0d03f2f3bda4d8d51d9742a5be54dfc6f9340cf2861e296492855
 DIST net-sftp-2.1.2.gem 67584 BLAKE2B 6b8e15f42c7a18f8c9aa7118e5822281eda6505c34697282cc9c52375ea0e4042f3045f41c2e9a15b8fd20f02946bfe6f3ad557aa5859a8e54e4c0ae8bd1d53d SHA512 126a9537a4ac45150096db4d46ad19e0d8a1833fef3733a1b66ff01463c0d109415f0ef807706ff88be8c5c1395bbd4620e529f06e3c9f746a4ed6ec2cb7d18d
-EBUILD net-sftp-2.1.2-r2.ebuild 544 BLAKE2B d715d9129318dc1b600f58182c828af5a3e9ffab74c0377b9a4e213eddf4ae8961929dfec8db648a89b41672a32999f118c80e6bd47738d550f3c6447e3b2ec2 SHA512 6d5328ba493ba21d0334a09b2654dbc358a5c0330978157a1beff1767edfe8accf330a2e65f264401e4fc874c207b921d47bc0464f19a636619fcdfce3780af5
+EBUILD net-sftp-2.1.2-r2.ebuild 631 BLAKE2B 04775b002345417596c5da23372f04fbe74ee751a85659bec14fbc05178ea094a5b018309141ef92f6d4127353a396ad19d09d52cfde5eaecd3fec75bffef09d SHA512 38fbf6a9c76ee34c4967dd35e98842f7fd9e5756b1754fac19d0e74f2f826cb1417a79812c4a8ebbe34655f7e5ad4b56c937c776b513251c3a619828acaa4cf3
 MISC metadata.xml 342 BLAKE2B b52478d886842e044705cc42c177577f111b2c01140b58d322107ecaf20bc1b5db9763ec0f0e67397118515690f452b51c1e14dcf6bada17d7c5f18889571b07 SHA512 3ece29fffeee2912d0bc06514adca69c2bdfa95bd88173d4f42cf0aee00944adc71bfaec6df543f0c1fc1717b7a808459f30894977154f7acce289dfb491f6d9
diff --git a/dev-ruby/net-sftp/files/net-sftp-2.1.2-net-ssh-4.patch b/dev-ruby/net-sftp/files/net-sftp-2.1.2-net-ssh-4.patch
new file mode 100644
index 000000000000..d510153ba8d5
--- /dev/null
+++ b/dev-ruby/net-sftp/files/net-sftp-2.1.2-net-ssh-4.patch
@@ -0,0 +1,42 @@
+From 9870b32d31bbe5cddceead54c64f71e4fd91779e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Mon, 27 Feb 2017 15:00:30 +0100
+Subject: [PATCH] Fix compatiblity with net-ssh 4.0+
+
+---
+ test/test_download.rb | 4 +++-
+ test/test_session.rb  | 6 ++++--
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/test/test_download.rb b/test/test_download.rb
+index d4a5f0b..d9582b6 100644
+--- a/test/test_download.rb
++++ b/test/test_download.rb
+@@ -139,7 +139,9 @@ def test_download_file_should_transfer_remote_to_local_buffer
+ 
+   def test_download_directory_to_buffer_should_fail
+     expect_sftp_session :server_version => 3
+-    assert_raises(ArgumentError) { sftp.download("/path/to/remote", StringIO.new, :recursive => true) }
++    Net::SSH::Test::Extensions::IO.with_test_extension do
++      assert_raises(ArgumentError) { sftp.download("/path/to/remote", StringIO.new, :recursive => true) }
++    end
+   end
+ 
+   private
+diff --git a/test/test_session.rb b/test/test_session.rb
+index a59058a..c398436 100644
+--- a/test/test_session.rb
++++ b/test/test_session.rb
+@@ -660,8 +660,10 @@ def test_unblock_bang_should_block_and_return_response
+ 
+     def assert_not_implemented(server_version, command, *args)
+       expect_sftp_session :server_version => 1
+-      sftp.connect!
+-      assert_raises(NotImplementedError) { sftp.send(command, *args) }
++      Net::SSH::Test::Extensions::IO.with_test_extension do
++        sftp.connect!
++        assert_raises(NotImplementedError) { sftp.send(command, *args) }
++      end
+     end
+ 
+     def assert_command_with_callback(command, *args)
diff --git a/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild b/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild
index 0fea846c2c4a..355c2a819361 100644
--- a/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild
+++ b/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
 
@@ -16,7 +16,9 @@ SLOT="2"
 KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/net-ssh-2.6.5"
+RUBY_PATCHES=( "${FILESDIR}/${P}-net-ssh-4.patch" )
+
+ruby_add_rdepend "|| ( dev-ruby/net-ssh:4 dev-ruby/net-ssh:3 dev-ruby/net-ssh:2.6 )"
 
 ruby_add_bdepend "
 	test? (
diff --git a/dev-ruby/net-ssh-gateway/Manifest b/dev-ruby/net-ssh-gateway/Manifest
index c78a1fc7d137..017369149c1d 100644
--- a/dev-ruby/net-ssh-gateway/Manifest
+++ b/dev-ruby/net-ssh-gateway/Manifest
@@ -2,6 +2,6 @@ DIST net-ssh-gateway-1.2.0.gem 23552 BLAKE2B 9eb12c34b3c0980a9bc2058ab68b0511f96
 DIST net-ssh-gateway-1.3.0.tar.gz 7735 BLAKE2B bcf9b96e35377e8650e8c40fb28d248fc60f7c47e69657c324f58bf8f001f5d10400b983bcbe9529185b74de45a9f3e3f62e2bd14da46b6e4b1bf94f38dcf99a SHA512 6cac1b28fba648aa333824c056cf8183fedc82f45f7f380eceac7aa5a4e8c3d3ec0870915aa058b0500514cdc364d75045050e2f8fa6f0ddaf799b88ba2e57a9
 DIST net-ssh-gateway-2.0.0.tar.gz 7825 BLAKE2B 05ade5aac288ee634aea37acfc68c9781e8178bf0ef92abafac13858a86ff952a2b30b6f92dc08f3856d9dd02a9795e0b93c15543b932070b9ec3f6a50c03e52 SHA512 6595c2a2a25ca9bffb942497be984773c10746f34e1dbba3d72503cef3c88e5bb50bdc8713c246aa6e38272540fb0ced66a3909bc02df96f511b0dc9fc50d735
 EBUILD net-ssh-gateway-1.2.0-r1.ebuild 792 BLAKE2B 39f09f89025f9553ab988ebb36f8b02ded31e90e2fed363e65a7f3c3a0326cb933970f5349ef3293318ffb15ab5b5f78295ad6556953fba4530694c11489f3b2 SHA512 83726836f3f068ef1df4b291ec0968126edbc549d2a3f8d6554e96f5582a16531c4818a5bd19acbd8ad339439444a845ebbf0544e3b0476a99f774e0a826ab11
-EBUILD net-ssh-gateway-1.3.0.ebuild 837 BLAKE2B 2efb30d732e74bb7a9c077505782ed530ee4033856292e566e5aa8d4675df7de3a6568db3a26fe0477258f011ce68fa2c0864d8588ad43be7240686eaff729de SHA512 330ef36796bfa1badb6f80d39e217aa9c97ca8e18a1a9bc4f74e17a1a08fe44cb0ab4fef13d6275cb2adc03e78cef04c71d2e068702690f78e2656f2348c662b
+EBUILD net-ssh-gateway-1.3.0.ebuild 844 BLAKE2B fef9154db18e39fe1bc02b8f073589171b701bd59d5c4e53fec2a402ecaec3c980b5919e7283dc0f1440e9716b7a4188753e20b12fa011cbff9f0e526c4ea612 SHA512 7d77070fa0ace7779a4b32a2c409bd955a7c56b55db00f3f841d589b63bf7a29e65abcdb6364160c43c3f853244715a43ceb35f913f6ecf9dce0b1c49b4d8385
 EBUILD net-ssh-gateway-2.0.0.ebuild 752 BLAKE2B 7e15cbcfb357094628a8eb203925679687532b0e96e91f915a4366b27912fdf2c50b16cbcd73373cb9520eb04a8d56e3bb04fdb38f93c3f912fb26417bd99bb7 SHA512 e4dcde9b7b3907f21885c916600f686b7388cd30b7a5ba0f4663f5a01d6597c8dfb5d85645b4a0bed6c84cade81851fc3e06b654e06248a5d8e3cfed7a22797b
 MISC metadata.xml 331 BLAKE2B 1c926dbb5b9903bf35a96b839b8564de448a527cac952fa91c5df4c0df4f825eefc7a6bc1cac6c7da39a3127a2a0245b5e3b7d780009c3069bd72723f74c291e SHA512 a5ba1172a48f9aff250cb3cb9c6315a0ffd12595704a2bd5788ef59e73b9efc606d8d944ecc0f1346340a4a9e1caee2c6a1c30581d5d6a78bc26c751d4c6cf7e
diff --git a/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.3.0.ebuild b/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.3.0.ebuild
index 9d2a68eac427..4e1440f3800d 100644
--- a/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.3.0.ebuild
+++ b/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.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="ruby21 ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index a4dc7f7398c6..6a003201689f 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -3,7 +3,7 @@ DIST net-ssh-git-3.2.0.tgz 178267 BLAKE2B 37d9afe79bb39a714db8c5536ef86bf2a3d781
 DIST net-ssh-git-4.1.0.tgz 194968 BLAKE2B 58d25601959939e7d7ceb7bdd09d7b5f583513aa73d30763d62b4adfe1b56b9f790a4e853ad5f16505c8ab71d7222db7649f119cceab849e457db8c6fe50eddf SHA512 48ca2a9f26b1dd25ce6ce026eacac73d6032ee4ac8f33f03dc700321f4fa4e2ea397d657db190a85c309c6d80be575218cf36f23cf214d7b1efee4f7d8e6255e
 DIST net-ssh-git-4.2.0.tgz 197417 BLAKE2B 5714185d9b83d3010e6b9baa07ac541e9227379cbfecc3a506d870d8d9fa528f59b605df4ff02ae6bfc16893bfb22734395096a77fcbe19fb939ecc1a343a9b5 SHA512 0a3609590d797a8cb4732e8cf743606a4919f57475b6eb2447a3db0c28f1bd405804fdc47a4062e503acdd4b785a1de9794a6db433cabb884105166eff6a8c5b
 EBUILD net-ssh-2.10.0.ebuild 858 BLAKE2B c2780b2cdb45c313638ef427dbdfd588e121449df679d5f1b7423dc489964681cb440dd7e1b54bd5cc131eb9f40e8dae05095b82a3a73edb1dda884bec2dad3a SHA512 7b5630727ba7547c4a6f86e89547270064b77ec874eff574bb724ec8347994e3e4f38e01d1f981da67b187942e7cf648c09681d6a046b0a4a27fa623f2381087
-EBUILD net-ssh-3.2.0.ebuild 855 BLAKE2B 47c821c9730975e9bacbf1eb696280f95a0c66310537187daaff05aff3592b154cd35717929412b2b24c9ade83166fc5d9797795f3875263b06dcf5eefff0e1c SHA512 705aaf6f007dbead3c623ee7e8f889c56c378e494c029cfd717f979548a24587b5f0f77648626112c2c864dce951d24fe02e3fe230850fe58ff3d1c2088162dc
+EBUILD net-ssh-3.2.0.ebuild 874 BLAKE2B 19728a85a4be488e2dcbdee39202cfd7dfd2bc24fd63fe6edc568bbdb9214c4ed031cc8f835837873b3ae28e18233e3608fe899ac7f968738a3d7c0ca4c8b1ff SHA512 08f06237a9dfc57c2b3c9ae6cd5272b6bac2ff183566447dbba293372023ec1aa949c59f8a8ef17cec0260a23eed1c47f1bb2c798f17b7c353aa2a32e8edb3a2
 EBUILD net-ssh-4.1.0.ebuild 1082 BLAKE2B 7d6ccc6e862be5a220ededc31268a0d9ab48023a58751f83f395ae8c8beb72d3b42b2bc19319b092b042732eda5641870452638ddeaa6bf506c870118bce51e9 SHA512 af75f182c597752cce8b2bb13d8c19d7da52b6ddf6e9cf28509a10bec47d98e2741fbbba4da5b8ae36ed74a2df43698b9015f10c260a68af95065bfc2c7053a6
 EBUILD net-ssh-4.2.0.ebuild 973 BLAKE2B 8a968b9f245138543d31cc46c08257a445a203c4def4d1a60ca59047d4f5c7af66ab8ae60443b3058772d5aca9ee32df9eef71e4ad4f547ffc51e0266ef598fa SHA512 258d9c9f777f6815277bd464303d5101da406ddd370aee84710a066411761297a730af7d44b00ef774d276911c2674a3d8b28b08df939fb9ff59b4d4b8c75064
 MISC metadata.xml 460 BLAKE2B fcbb901a6f9f2c80489e28346a21ea7cf5dcf7eed49c72dcf8cad079fdb2f52969d03b619d4535206c078c9d2d3a6c0492b035919eef89b3eec8207ea7e3ecb6 SHA512 9e66fd4626a890ca908b35e1cba4b5712ceef882fd6dd1f72ef20e6b07ca0b32cd3fd92d84cd0816c38cbc1d3d76152fccdd1e90d901b3d0f8b096b3274b8cf4
diff --git a/dev-ruby/net-ssh/net-ssh-3.2.0.ebuild b/dev-ruby/net-ssh/net-ssh-3.2.0.ebuild
index 32e7dacf583d..4497d953188f 100644
--- a/dev-ruby/net-ssh/net-ssh-3.2.0.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-3.2.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+# ruby24: code is not compatible
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index 49d0d2709d7c..1e7357343b58 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,5 +1,7 @@
 DIST ox-2.8.2.tar.gz 193670 BLAKE2B 70e38754594a40ed35aa43aad32806d5c9eec7d3f60ee18a846a99f28b558173ea99b554f7f3a4f2b848686536d194035fd345ab33b9d7b5e12a246a472463d4 SHA512 18a887db70962a1dd1c6ea18461eca0efbcffdb231f934c3603e63537e9911e820465ce5e4ab86cbedd65b396a9a12b0ad7e60ea7ae687c4ebe8436e0c37988c
 DIST ox-2.9.0.tar.gz 197666 BLAKE2B 0bc211df2c3940c64df2b0e90991e828e7403c3a1f7eb885e9464659dd33930d881fdcb6443cf5b08b27f69388525c2da99d1bb686da66937f9b288ac21f7aaa SHA512 b681f3532f22e7111f693106728bcae19a7ed2eba058cfab62d73977281093cc64833460ff64fcfecc4f1bfc115c150d0712819345b0765c6dc4b4d0d67fd59c
+DIST ox-2.9.2.tar.gz 198295 BLAKE2B cc60a0382ebe3632296b9239b8e5101f3e5a08b434923982c54f453f4d95d37180dc938c6e577834721aada11d0d00bebc12776b04e28036ea067a3064e8eaa1 SHA512 4d77eea444fa6ce07e3b9d174745071fb1b7dd053e512255b9be73d6f528e590d614c86b4b61aa03163669bd5b637a60f7aef47f223e2dd719b2e5923712e95d
 EBUILD ox-2.8.2.ebuild 713 BLAKE2B d8d3bd205f3daf3e5169d9232b131f907cd9b948fab849dcc41ab2aaacf712b6a9aa10ca247345f847a8b2883562170d60f88ea39edaeffcb3f64c05a092e92b SHA512 4b85e25b89f8b8c024746a24b08d8ed6c626d62525b6e0a388078b0cb39caa4290d9517f379cbbca4df914f5e091b25e19f044806641bdc8ac110ccdb1e764e1
 EBUILD ox-2.9.0.ebuild 713 BLAKE2B 87c860a576d6203e9df168538a4f418ebb313795bf3565f70e2faee991730b3872b7a1e8c7917526511c1d78fdcb07733adbde8623217fb6ea96e80e9524fd4b SHA512 1a560e9c39b610c5d8fb9be08378f19babe4073baaaa0582454a6abdfbdc51921c45a8de4d7974805a4e6afe8e767db1f2464ded398d49504b53d2e9633c5a55
+EBUILD ox-2.9.2.ebuild 706 BLAKE2B ac8f3329a276431dff5156bed9aca0cc4ffaf56e82a6b4c20f09345082b71a428fe01142db9b509562673616fc546d7dddaa67a218c9d7b01763c27d3df79094 SHA512 48d3e77ca274280e240f78c910a57b6192ca15f48d32a1913796f1a84b3498d5bb6bbdcaddd2bef46a6aa3c87110d64675e0b6d6bccbb303d278e6727cdb6ad4
 MISC metadata.xml 336 BLAKE2B 7371e572c7bce86e0d3c2ac19ff7555b4bdf793d96377dcdbb810f8fc09feb597f4cc883a03e888c0c38c1a1d9ceb7ef150ac228db7300aea01238f497f0473d SHA512 43b8b42cb09fe73a49e0db49671effd91859d2b9001fc3e51761a1b51b245e83a719ddddd100ecfeb92910baa06690b2cc0bd52db0afc872e007c4be9616908e
diff --git a/dev-ruby/ox/ox-2.9.2.ebuild b/dev-ruby/ox/ox-2.9.2.ebuild
new file mode 100644
index 000000000000..f03cb3bed818
--- /dev/null
+++ b/dev-ruby/ox/ox-2.9.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast XML parser and Object marshaller"
+HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
+SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE=""
+
+each_ruby_configure() {
+	${RUBY} -Cext/ox extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/ox
+	cp ext/ox/ox$(get_modname) lib/ox/ || die
+}
+
+each_ruby_test() {
+	${RUBY} test/tests.rb || die
+}
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index 16d7e401dd06..0ec8d477e8ab 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -1,10 +1,8 @@
 AUX postgresql10-tests.patch 1747 BLAKE2B e0a992461221f31cca1f39453e077a1d04d3f436e0eba3b683ed42092d266a8edb8a46e61933ac41e94ead483bac325833f1c21bfc57cf7ebb160f046d80e1f6 SHA512 89a7937b0791307366fbc97549d48cb7bdf92b66895b1de7dd554a040ad6a08b4af69709bf1318df95cdaf9824415d76b5f6be98be48995b75909fbfeefb6295
-DIST pg-0.17.1.gem 142848 BLAKE2B 26715943ffc56d5377613d3dd56bc994696a812ccedf6415233781d6685ac34ddf25321f2f194880dd9df6715d43efef7eaeb00ed8ac594302c6e2e292b07cc8 SHA512 fb637256d084af3b41ba4130f866924df957a63c29d029b99995bf553e545b3d4064e682b00d0604bf495a853a8800b9c8eba34718e96c651c9a697281ae4a62
 DIST pg-0.18.4.gem 219648 BLAKE2B f6b957551b0b537dda5551bc8974f5bd2f8a4ee4ecf482a5d3dc3ede0ad610507029693fadbfe9d2e2940f63d82da61e535e802919a82f7e5ea23c1165b81847 SHA512 48e792756c7ee205164b59a9515ace6320150f0ce1907293f8c1a736300c62c0b38c1be49e8ad4f1a50f29abc7f72bb43e742a8e63d9606eff4c7d2191a4fb74
 DIST pg-0.21.0.gem 214016 BLAKE2B 9e27646cd85bc97dedfb980f4851b19a1ef2aad17f6a5c60726c1683642af5c4cf87d518b300fb4c894e1580f808f8af6158b57f1ac25971c1fc55818abee6f4 SHA512 590a8c34487d2cf030082cfff87b2cc83b636df06a931e394acfb098ecb5728e793d777f125b036ee9953bbd21ec5facf91c932930acccb507d3394f2fc4cc5b
 DIST pg-1.0.0.gem 213504 BLAKE2B eecaa632c7903f89c503ad92ccff058bbc6c2c80cbf83d656eeb9a5b919b84bb270671ad4e0fa08f55be1bcfc69eb8e13b815c37c601d300de503383f1ba5908 SHA512 1cac025ab8a95b4429534b98377eedeb1e3f8b2c4a859363c4174d477577caf39557b002cde4e745189fa9a29e9181ff9d564d822f15ff5c4f03f7389b0d0398
-EBUILD pg-0.17.1-r1.ebuild 1810 BLAKE2B b6ad39c3e9100ce6301499bc3f2d70bc10b1df16cbf6be7d9b76361a6b2d7d245822b77399bb0365c709b969fcd5b72cf8aa2e167474409f9a26c7887a6830e1 SHA512 b54df5663629584b1d19ab599a0d83ca5577d225aefe32f134f52c9869726934c8c606a25a4516f26ddc441488b79686e63c4484275b9c69135feb69fc2ed262
-EBUILD pg-0.18.4-r1.ebuild 1800 BLAKE2B 1d50881190b8207970f44b0b39ffa75f3d3c58dd5869ca96fa81b380994d3a6f887c1f5ddec1c0a0209bee264ff4e150f458e4adb074840ef3e6a149d06f3ee6 SHA512 4f20a832fbdfbaa8ce75378a1efd316fa57ffb158d097efefdd1b68c02e24f58a7082e7cbe0e61a0dbb8df2749738c67b4f4d64ca0f1201c79b783f53c421589
+EBUILD pg-0.18.4-r1.ebuild 1799 BLAKE2B 10a47c3c1a31f3c4c343d70e08be471d8e9dc4c7b8f4dd334324c0a3d568523553b07e8e29a20383583b6662db41c706cb55d3d36d632ad2866664d79c50508c SHA512 9bfe8233130cef910421d985ac0f432464613862116194124c0c1f3d214ddb9f56effa4fa8b19c522610f0460342ed4fb0b9571181d66d513f8440c01523b4bb
 EBUILD pg-0.21.0.ebuild 1707 BLAKE2B bbf0de90919975e2a210db855aaf6a661dfdf7c281da982d7035bd4f3db806332e71be3d3e6529a4428613471939d133042dd41205df0d07ed68137a88fdfbd9 SHA512 916cd04d5dcc699968dda2da31e8f12c096b3f7726f12a4122d540fbe73bf06cde9a202d387dc445d780182f94b79bebd17a0d237c26cdac507771ff07295313
 EBUILD pg-1.0.0.ebuild 1655 BLAKE2B 6427e234010712acd305575b7f08db4740547349823a2661984bcd058e38f461dc0ba4f33f728354108925d31384f9bd503394ad3457acdb3039b64bfd8e8b77 SHA512 277f349b3da11836fca7ddcd2d3961b1c83dcc099bc5c06b3af4fea2352585aae9f25330c3e3507f781800ec3d989bacd9316913dbfa4b578371cc2c596fb10e
 MISC metadata.xml 340 BLAKE2B 8ef2673e4dafd5495e2385e4216ae715d3334c170e81f45f823f8ef6942533ad088115e6f8e3c75b35e2af28cbbf1e3446cfb8b2eb084df7b9a3adc6c869c183 SHA512 76be8c407457ed3f1a8e2caaf5a10949a830d4033d8d18e88830f37d2b62d4ff9675367f123364041ca88f5af972d4d7152c1f2832a5c891b516a83f989e1598
diff --git a/dev-ruby/pg/pg-0.17.1-r1.ebuild b/dev-ruby/pg/pg-0.17.1-r1.ebuild
deleted file mode 100644
index e79f3407961b..000000000000
--- a/dev-ruby/pg/pg-0.17.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog Contributors.rdoc README.rdoc History.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
-HOMEPAGE="https://bitbucket.org/ged/ruby-pg/"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	dev-db/postgresql:*"
-DEPEND="${DEPEND}
-	dev-db/postgresql
-	test? ( dev-db/postgresql[server,threads] )"
-
-ruby_add_bdepend "
-	doc? (
-		dev-ruby/hoe
-		|| ( >=dev-ruby/yard-0.6.1 dev-ruby/rdoc ) )"
-
-all_ruby_prepare() {
-	# hack the Rakefile to make it sure that it doesn't load
-	# rake-compiler (so that we don't have to depend on it and it
-	# actually works when building with USE=doc).
-	sed -i \
-		-e '/Rakefile.cross/s:^:#:' \
-		-e '/ExtensionTask/,/^end$/ s:^:#:' \
-		Rakefile || die
-
-	sed -i -e '18i require "socket"' spec/pg/connection_spec.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -C ext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-	cp ext/*$(get_libname) lib || die
-}
-
-each_ruby_test() {
-	if [[ "${EUID}" -ne "0" ]]; then
-		# Make the rspec call explicit, this way we don't have to depend
-		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
-		# the whole extension from scratch.
-		ruby-ng_rspec
-	else
-		ewarn "The userpriv feature must be enabled to run tests."
-		eerror "Testsuite will not be run."
-	fi
-}
diff --git a/dev-ruby/pg/pg-0.18.4-r1.ebuild b/dev-ruby/pg/pg-0.18.4-r1.ebuild
index 76ca7c11e058..485cd64b28cd 100644
--- a/dev-ruby/pg/pg-0.18.4-r1.ebuild
+++ b/dev-ruby/pg/pg-0.18.4-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://bitbucket.org/ged/ruby-pg/"
 
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa 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 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND+=" dev-db/postgresql:*"
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index 1af5bab49bb7..1c5f1652e087 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -1,13 +1,5 @@
 DIST power_assert-0.3.1.gem 14336 BLAKE2B d29f8ffb84c1322610e1bfc819a599828a386abe2a21bf60d8e5a397dafbad52885c20899a78f713d39aedde992ac180138ed7fbd96ebf48d9bad753a51f0097 SHA512 0523c9c2f45ae60e93b491bed8ae3ff3bd83cfdf8c23d784ce19f87a52d90b94095d3e5ca38fbc2e4917a8895309194e06ec519099b69096bef69a4d9466da64
-DIST power_assert-0.4.1.gem 14848 BLAKE2B 8da24ce932c03263cd89eefa9939667cf34afb89d4befb0cb017e1e4016af81bf4233678ec87212a5e9f9c4d7c0d8b92d918b396c06bd09078c58ec37c443eff SHA512 18b55e841499be7827cdfbcca41fe786a4fd7d0ff2aed049c289b917ab4487e035cc4321f39ccab2dcc5967c668df36f0cfb96d8e799793c9cb8dfbf9b3622c9
-DIST power_assert-1.0.1.tar.gz 15376 BLAKE2B 69ae9378bce1ff73727e4eb6f7f5b7685f4949da7c656852ce178dcdf3c6a0b0b7784eef041e3b206c26ae45889910020c809e73ea4463300c63097d3ca85e85 SHA512 69370f69e7289c36a8d16a433e3629d25aa99049eec9b737af56d56c07ed5c4e72692c9fdc544cc76e7008babb2c7fd68c796e27e300268cd75b12cabe1d7403
-DIST power_assert-1.0.2.tar.gz 15381 BLAKE2B 8ee6db646f4d0f9d25b5faa9974dd6d30eefdad09a68d5cfc2c78fbb5df1b891671296357c6ab834813ebcfbe241c28053f458ef31503c90ccc9d0aa9441b4ae SHA512 31e1f0eb0b873b3ce05c72cd467e1928d53b028e1ec30314bd027d7402b5834442ff268d0263100d657cb485e67c64fae93996d08ba74d603b924c4526a7022f
-DIST power_assert-1.1.0.tar.gz 16184 BLAKE2B 49cc48c4ebf8108d4bb78573f298b88fed9622a3bc7e42c0a0d7aafb2d9c004671bc3491d3deac4955c82764cbcb6d7597bc9f7da1aa972f344c4b56f90ccef9 SHA512 271de1c87adb2a1e427329cba4f3e7ab15d17bde9afe4725de7b50f895fb4fd5b89bdd08694c84e1eac1183abbd53ffc56ad55216e0cd7841378e48393c885b0
 DIST power_assert-1.1.1.tar.gz 16799 BLAKE2B df5f688d4242373f1a5de95fcbcdd63d23a14314a890a32839ba88494d04a09ad6b9c1dedea23f43d53cb708b3e5eee8d0a2307be16a1c11cf3cbf22ea254344 SHA512 a33429bf918c71a5b75e56940d46dfd05ed3c87f909d6f09ebf2d8b2cd43a3c5c37b5ac13c334383f1b3f52817ecd4ccf68cd649c53bebdfbc464a18c88b702c
 EBUILD power_assert-0.3.1.ebuild 792 BLAKE2B 04dc6541c2f8ef2055d8c48190e39dd4caefb01a15bfdbdb9a390615bce66454e9cc2a1c277759f7d0d1fb7de6192dd56b93fa37b3cf0866dbb77f089aea0b7d SHA512 c455df2723fcb267cd3780ccc8b8d86569beeac449688740edf619215a4b2957271a58b697c10e198080a976ce3400de988a71d033dff9fa041de551f022464d
-EBUILD power_assert-0.4.1.ebuild 808 BLAKE2B 05a9b68383b4b11cebbc0d4aaed0254359d37120ce079bdfee31019cbcff01e9634ee27b8c1afbb76fbe8f416586b83d0fc9dddf9ce249833c005f25b214618d SHA512 bd5324d32bd8e296a7bd64856d615ae744ac983de3d99c0d97e81945894a052e466da11aed23d0495af89a4704da744dab89653ecaa60cff43ee548db165a9b1
-EBUILD power_assert-1.0.1-r1.ebuild 1338 BLAKE2B 5b7eb97146ceed908e05d4b11251b6975a8daf29a30205c4003aa72f244c012eaa935b3f7d35c623676c3072e93c1ea87608d30970070a00433bbb72b39fe4b0 SHA512 3d16f1eb1d5289b2eaa6e00618f02f237ea263e24b26546a9c288d31c297e3237fba68dd907a5f00eced3ece8fef9f9044240b44bf2114d6204056b2945983a8
-EBUILD power_assert-1.0.2.ebuild 1338 BLAKE2B 9b559c557516bf5d3e5501a17b086c6b162993a95c7490a99d4ace6c7337c8026072fbc587c2d383a56d26e0eec88872b0c723e1f8e51fd4924619721785a09f SHA512 d51eaa7a24fb5af4067cd8b6f32c0e08cef4b48a2c9f9bc3fac677e86e89b16e37f42c3f6fcd397a89f7c78a9fa33006b2511aa00e8b71a3d7a9d1e7b5d9473a
-EBUILD power_assert-1.1.0.ebuild 1338 BLAKE2B 9b559c557516bf5d3e5501a17b086c6b162993a95c7490a99d4ace6c7337c8026072fbc587c2d383a56d26e0eec88872b0c723e1f8e51fd4924619721785a09f SHA512 d51eaa7a24fb5af4067cd8b6f32c0e08cef4b48a2c9f9bc3fac677e86e89b16e37f42c3f6fcd397a89f7c78a9fa33006b2511aa00e8b71a3d7a9d1e7b5d9473a
 EBUILD power_assert-1.1.1.ebuild 1338 BLAKE2B 2524d9dba25bf5043ebaf19343427abda1d34869eae3e31133bcda0da76603cb0d5c3c37160b88410f2a1724269d215378a4ae972cd22dff4b6d3ba7ee7c22b8 SHA512 3e9dc2040fe1e3b321e669e060abcf50dfb5cd0abb22e942fcbdf67575bbf1f922985df80b83705bd160159ffa1baf8fa75a5fc540c7e1af81b7c33fe14e347d
 MISC metadata.xml 344 BLAKE2B d878cc041f73fcacc13fc94374eeb102440977f57c47880e9a597af3b4d3b20cd81e8bd0d367cd2abd7799a27b5aaac46611291ffaffb3298bb253d726e23726 SHA512 87e232c55b49880144aa509aaa79413864b3f575df07a559a9f1aa60909d4d8e01d1ce2e86542c847533eda2f233542deb36b1103b56d7c512f2385a6c8eb2fc
diff --git a/dev-ruby/power_assert/power_assert-0.4.1.ebuild b/dev-ruby/power_assert/power_assert-0.4.1.ebuild
deleted file mode 100644
index c51dc1e9f473..000000000000
--- a/dev-ruby/power_assert/power_assert-0.4.1.ebuild
+++ /dev/null
@@ -1,26 +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 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shows each value of variables and method calls in the expression"
-HOMEPAGE="https://github.com/k-tsj/power_assert"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' Rakefile || die
-	sed -i -e '1igem "test-unit"' test/helper.rb || die
-}
diff --git a/dev-ruby/power_assert/power_assert-1.0.1-r1.ebuild b/dev-ruby/power_assert/power_assert-1.0.1-r1.ebuild
deleted file mode 100644
index feba8d0eb4a3..000000000000
--- a/dev-ruby/power_assert/power_assert-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shows each value of variables and method calls in the expression"
-HOMEPAGE="https://github.com/k-tsj/power_assert"
-SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
-	sed -i -e '1igem "test-unit"' \
-		-e '/byebug/ s:^:#:' test/test_helper.rb || die
-
-	# Avoid circular dependency on byebug when bootstrapping ruby
-	sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' test/test_helper.rb || die
-	rm test/test_core_ext_helper.rb test/trace_test.rb || die
-
-	# Avoid circular dependency on pry when bootstrapping ruby
-	sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^    end/ s:^:#:' test/block_test.rb || die
-}
diff --git a/dev-ruby/power_assert/power_assert-1.0.2.ebuild b/dev-ruby/power_assert/power_assert-1.0.2.ebuild
deleted file mode 100644
index ad96c7dc4914..000000000000
--- a/dev-ruby/power_assert/power_assert-1.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shows each value of variables and method calls in the expression"
-HOMEPAGE="https://github.com/k-tsj/power_assert"
-SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
-	sed -i -e '1igem "test-unit"' \
-		-e '/byebug/ s:^:#:' test/test_helper.rb || die
-
-	# Avoid circular dependency on byebug when bootstrapping ruby
-	sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' test/test_helper.rb || die
-	rm test/test_core_ext_helper.rb test/trace_test.rb || die
-
-	# Avoid circular dependency on pry when bootstrapping ruby
-	sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^    end/ s:^:#:' test/block_test.rb || die
-}
diff --git a/dev-ruby/power_assert/power_assert-1.1.0.ebuild b/dev-ruby/power_assert/power_assert-1.1.0.ebuild
deleted file mode 100644
index ad96c7dc4914..000000000000
--- a/dev-ruby/power_assert/power_assert-1.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shows each value of variables and method calls in the expression"
-HOMEPAGE="https://github.com/k-tsj/power_assert"
-SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
-	sed -i -e '1igem "test-unit"' \
-		-e '/byebug/ s:^:#:' test/test_helper.rb || die
-
-	# Avoid circular dependency on byebug when bootstrapping ruby
-	sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' test/test_helper.rb || die
-	rm test/test_core_ext_helper.rb test/trace_test.rb || die
-
-	# Avoid circular dependency on pry when bootstrapping ruby
-	sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^    end/ s:^:#:' test/block_test.rb || die
-}
diff --git a/dev-ruby/rack-protection/Manifest b/dev-ruby/rack-protection/Manifest
index d807958a911c..acd379ad5634 100644
--- a/dev-ruby/rack-protection/Manifest
+++ b/dev-ruby/rack-protection/Manifest
@@ -1,7 +1,7 @@
 DIST rack-protection-1.5.3.gem 18432 BLAKE2B 96daf85f6b51b4a8c8992109ccb0821b9f713166965a6d1392f20a966e3502facc4294c0a824beaa395306e0ba3234902eef717ed839e3e3ca907deedf83370d SHA512 9f94f9f25197c3f8227f5c9c9fd2e896e35bfc08d4a20f4dded9c42772f348d16dceda6916429833b498b29c4dbba4dbb31b1a3cf90de597fb6df2de145d655a
 DIST rack-protection-2.0.0.gem 15872 BLAKE2B 706fba47a09565bc973a5dbae3369cb26d02839be92347bb153c5f12054ef605e8e025a0666cb0aa44aae316ba494fffdbb7bbc840dfefff9b3e0b0efd39817a SHA512 cce6a8a64c502e4cfec47ae3d76e71aef42b1eec5aa4802a6c443fcb7a8971a99ad9a5b34fea7ae878630faba10d4f5bde4d9a3eb66f63600fcaf02d9ecc0c2e
 DIST rack-protection-2.0.1.gem 15872 BLAKE2B bd2b17d21767f4f6772400168ddd53491693780b62359d526739580cca66b5b27d4f4c6f419a6ef695ffbef5ff9045bac683c78117765ff784fda136ec102090 SHA512 6dd525384a0027a1943741881168433c63dc2d18093833dffb3417f3f6ccc46d597435a880d297d07751db1c449f3e37942ae03e33d378dbc74caec38c5cf1df
-EBUILD rack-protection-1.5.3-r1.ebuild 726 BLAKE2B 5bccb05e1010544583a69f37038e4599288032951a95110347b8926a365bccdcf6a463a8ace8f8d912f6f0a16628e36e4902af7f7d95223c6d14ea5aa572637f SHA512 e10c28712b5323dc52471b16beeaaa77e624cbc2cc7be57c25e58dc0a96e9e52756a1ee678a790e3acf4e79e5d4ec8ad6223b6a3eb976c06a19dc254628dc99e
+EBUILD rack-protection-1.5.3-r1.ebuild 726 BLAKE2B f4edf631b7100e462ea90d33aaca1d20ad043adf01458032039d16b365806a0c91974c05f66780c24ab4d1246dbf779de9dbb760922bc1f40767324e632b10b8 SHA512 18b63b6719fc0c27cda9e5ce050e5932afbe30c0118aedd6a64d5d7338427b4faab755cc0e50b96588bf13db16abd752585e424fc682139ec6d007145ff8205e
 EBUILD rack-protection-2.0.0.ebuild 796 BLAKE2B 7103c44fe355976ed905a9f77e1d46882cfd67c51ce429265f7606d9422514df8eb18382ff5e42b8eb5aff0fcef21509f8248a0342ab2589ccff557a41490fff SHA512 5ee15793429e98cf67966e1a41d06e6c51cedaee4f24b2e0747a48f467122c2e17535ec83726b6b91a493adf6b79c887608112ea6fefcf8fc0b15bd1501dd1dc
 EBUILD rack-protection-2.0.1.ebuild 789 BLAKE2B 9ef3981b82f570cc2ee569661d05428ab10279afe7f4d6dce8003835002528308361194294adc22534d1caa12aa1c7919563a274e88f556cb3cc6e2a31253f36 SHA512 62650d79ddde05798cd042bf826dbc1522030b5dde936476dc78656d649ac7232cf5dc7aeaaa08232f8428a0f145d1ae6b2735c2d9e7282bfba69a4ec3f2d1f1
 MISC metadata.xml 488 BLAKE2B 1db94e175d1248a334fa9ff0b5936d0281a1ee2ef69974cc33ba65e19de9ae043e98599a52f5cc55d3e1ca3e5bef3e223cab7f3be0ad9b561b05d81da8c09687 SHA512 ad0122f6e0dde2c02a1af8b8e81a5aebb1a13e0f56dd8f222d6f051da55015a89db0430efa6c1e6b5e193a94ba69d0244498d7cc14f0212f8032393a7f5988b8
diff --git a/dev-ruby/rack-protection/rack-protection-1.5.3-r1.ebuild b/dev-ruby/rack-protection/rack-protection-1.5.3-r1.ebuild
index 99d1df173c9f..10a511702bf5 100644
--- a/dev-ruby/rack-protection/rack-protection-1.5.3-r1.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-1.5.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/rack-test/Manifest b/dev-ruby/rack-test/Manifest
index 289a0b266d0f..6c05762906d7 100644
--- a/dev-ruby/rack-test/Manifest
+++ b/dev-ruby/rack-test/Manifest
@@ -5,6 +5,6 @@ DIST rack-test-0.8.3.tar.gz 24842 BLAKE2B ea02ce5e5a460c43b0299e3b6e3412efb1be89
 EBUILD rack-test-0.6.3.ebuild 959 BLAKE2B 97f7f0ba6f376e50991dadf70c745069b295c03e0a2f139307b089d4287e9c2419d2c0e26f22b746c102efb229df4287c35db85e8020df69f8e9e5e067047fdc SHA512 732544b35298ca4b7a5124ef0ecb55a1df59ec39a4b7a60285f31744c2005156bb26243ee17bab495bd1d5887e652295bd0e6d348e05d79f128685b7e045056e
 EBUILD rack-test-0.7.1.ebuild 1059 BLAKE2B 9d13171c4cc3a4f5d991223278d96d194929b8af8dcf3208e624cbf20240cd5147f601beac94a8fbd4f5c1eb2c852b277b085296efbfba7fd24ef7e1bfc9d344 SHA512 f3e08c4654026b85322107f60a21197ff07cc4c67a498e03478f4a168e82fd58bd014fe5f0a176d30c0fbbbeac9033b9b992c4f9c5f6b470a36878bcd12a559c
 EBUILD rack-test-0.8.2.ebuild 1059 BLAKE2B 9d13171c4cc3a4f5d991223278d96d194929b8af8dcf3208e624cbf20240cd5147f601beac94a8fbd4f5c1eb2c852b277b085296efbfba7fd24ef7e1bfc9d344 SHA512 f3e08c4654026b85322107f60a21197ff07cc4c67a498e03478f4a168e82fd58bd014fe5f0a176d30c0fbbbeac9033b9b992c4f9c5f6b470a36878bcd12a559c
-EBUILD rack-test-0.8.3-r1.ebuild 1143 BLAKE2B d047b1d58f9f367ca9d0bb7c92e7acf80789a378368a81a447462ca9677b7abc49cec6edeb4c0adb175e01d29f3b1432161e1c2572c8b70265c8276e2c381e98 SHA512 e78c548a648d266c6058781c62c47dc42438fc9aff90e0371c16c15f3eaef9a8f5ba4b4753025ea7bb0684c97b2eba931631496af40f9af3dc4e004fcca9bb6b
+EBUILD rack-test-0.8.3-r1.ebuild 1150 BLAKE2B a243633049097f3d7ddb3054a4fe752d3a394dd32350e53de8889fedc158de5ebbd1e9bbcf016a683a6d4636e37a71f277b59f8aff3b8da6fbf85d8fc6455c23 SHA512 4d8d31998f3c42a2c2fe64fcbc1a2c328e0f0b068b5caa75c9a736f1eb2b991fe81ad98ac49d21f09edb97ec51f58d9a78b165bbd6fa1738ee189f152b0841b0
 EBUILD rack-test-0.8.3.ebuild 1059 BLAKE2B 9d13171c4cc3a4f5d991223278d96d194929b8af8dcf3208e624cbf20240cd5147f601beac94a8fbd4f5c1eb2c852b277b085296efbfba7fd24ef7e1bfc9d344 SHA512 f3e08c4654026b85322107f60a21197ff07cc4c67a498e03478f4a168e82fd58bd014fe5f0a176d30c0fbbbeac9033b9b992c4f9c5f6b470a36878bcd12a559c
 MISC metadata.xml 343 BLAKE2B 3d64a9d71f8ea0b1af70404e282f27ba4028ccada49dd94cc54f3517a939749d1d98cf1e08c85ce1e4481971b007f88dd40b7bb9609b4879cfcceb55519f97fa SHA512 8f9aa1b7be720aa89aff9ada3782e3b7098edd7181203d78a56fd6576ff3d2cfb812557158a30353eabff9084f6cd148222f4d7cd39b7cf0073c4f9da0aacd0d
diff --git a/dev-ruby/rack-test/rack-test-0.8.3-r1.ebuild b/dev-ruby/rack-test/rack-test-0.8.3-r1.ebuild
index 65c2dd58471c..f8ab6d41fc30 100644
--- a/dev-ruby/rack-test/rack-test-0.8.3-r1.ebuild
+++ b/dev-ruby/rack-test/rack-test-0.8.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 00f52c01f565..31338c3b5be4 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -3,7 +3,9 @@ AUX rack-1.6-rewindable-ruby23.patch 1360 BLAKE2B 062c4a474959c4dce61969583b6aec
 DIST rack-1.6.7.gem 229888 BLAKE2B b4ea51d9a0606c92c6cc199bcaf3f7068e6360dd972417af7fe8784a5b23a8de1288347431f08d9af1d19f1409f18035d668d6e80f0b2080d761a3e703259d0c SHA512 e1cc22d78a61998c034bbf9217cad5cc0e614697e787f58aed9cfb1c3a12f69b557c9e95a4b09fcc1509cb607332a8655a66159b2492ea6fdc2bda21f588a59e
 DIST rack-2.0.3.gem 254464 BLAKE2B c7052ae0210d2c8d9aeaa6e3b5b10b272ea48d6c2601aecd524eeab141d3987b7905d9511814d0ac7a62413ef5eb01e847168a278bafb5a0e8f882c526cdfcc9 SHA512 c48e6681544c2f37797ee697f5c4f0d4de6008a3df2506665b52c248fca1ef7321a892dd28475e4d7b461a0b2d12112903a67e1bed7c7397742833fce85167e1
 DIST rack-2.0.4.gem 254976 BLAKE2B e816bda9969117525d061b2de2e9172d831a1fd0654ee5f4ff0293a95c01b8451204cab034816f7b2382b77cae3c9a735184f3f1c8f5b9e8cb43963001f815da SHA512 d6624d52c456654ab4c98554d544c6cb0bd15fad5a494575ad329bd1892dca2ac612b5730f4e3f6eddf2c0496afc393f215fb7d60795c264d2251896c27f450a
-EBUILD rack-1.6.7.ebuild 1650 BLAKE2B 33d989d656b6b63de13a30e8ba021596107bb19457e3a04142d478a11bc1d45414e5adfcb7b1ce6164049cd3bac6736e59ee9d6d515be92cf4f119b44bc04f09 SHA512 19bf31a91818bb58322c68978825af255fc32a75aa81906de61f436f477b6ab75a96949079de2c68753fed5743b937d2190330fe19f1eaf16fa9d157709a0053
+DIST rack-2.0.5.gem 254464 BLAKE2B 91fdb183a7e79b853d5ff8ef0d95799fdcdcb92ae69406666a96742dfe9abf7211c0d3ee0ec21edfb01392006e30c146573acb532a83bbf807f743272fb77dd9 SHA512 ac820997ec5804816e26275630797d0c86e2dc04d43572e66e99a25067d531c8a6fcdfb7b5157ce44d039d1690bb015567d859a13a85dc7d22fa0f7454ea0aa2
+EBUILD rack-1.6.7.ebuild 1650 BLAKE2B 7c921e890048cc0f9db6fc066695dafbf1afdf816ed87aca9c9d1e713ed704a2335b40e7654f0f96a1f511232b30780c82a4ac6232f80f9a054a299bc307da3a SHA512 be28af8b62260dc820f1c52ae44d1e46fd416dad453a0ac03eef8cfbbcaffd056b7744d61e5b5b287de90d5ad745bac5225b6c58b9808e75058638a1f61b9360
 EBUILD rack-2.0.3.ebuild 1508 BLAKE2B f5f9bafb1ca637b1303cbf44a32b77b1969e8b773408141de007781524f40643fa59e9b37bb8feb92e950fecb7fa4b96f0d1fe4e8db2c9ab9e7cbf15f9dfd1b3 SHA512 e62cc26861382a150c813a39a5aef7d9e41858ba415f03f789333e4e9f64187b506df4bee860abfca3a2c120b2251b416c3058179be47ca58a4138437145895a
 EBUILD rack-2.0.4.ebuild 1466 BLAKE2B 8d95bf901666ae8b174dd8a7e689ce8687572a796d6a68106277de69507b203b06e6177fd1b531eceac21e86452e278b4df617def2e769b0857dd551d316bbc9 SHA512 e00386ebd69f3ab4a0c39d9507a6f32ee7214e4ca8e24cf9807644644cda7c7896251dc81f553f14655bc4c49ae7d19b31b58c0f64a3162a13e085c65e1f8cf1
+EBUILD rack-2.0.5.ebuild 1466 BLAKE2B 8d95bf901666ae8b174dd8a7e689ce8687572a796d6a68106277de69507b203b06e6177fd1b531eceac21e86452e278b4df617def2e769b0857dd551d316bbc9 SHA512 e00386ebd69f3ab4a0c39d9507a6f32ee7214e4ca8e24cf9807644644cda7c7896251dc81f553f14655bc4c49ae7d19b31b58c0f64a3162a13e085c65e1f8cf1
 MISC metadata.xml 391 BLAKE2B 5ed2f863a5fd68cf57f25afc2c2efa63df1eb25c4e01087130f70edbbd1b79c655ff7455b73ecdd31e083cd35381331fceef52856f946d24fc3d313705fbaef3 SHA512 7ffff4c4cc64855b0c95e2364fa9cfd1e3b06946155cc8244444f5f4e450abda8d8387aabddc224b94a55ff3d5e42391970e5541923e5aae24f408113a65a5c7
diff --git a/dev-ruby/rack/rack-1.6.7.ebuild b/dev-ruby/rack/rack-1.6.7.ebuild
index 74a13913f372..bb358d7038c6 100644
--- a/dev-ruby/rack/rack-1.6.7.ebuild
+++ b/dev-ruby/rack/rack-1.6.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=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="HISTORY.md KNOWN-ISSUES README.rdoc SPEC"
diff --git a/dev-ruby/rack/rack-2.0.5.ebuild b/dev-ruby/rack/rack-2.0.5.ebuild
new file mode 100644
index 000000000000..b8f6568045d8
--- /dev/null
+++ b/dev-ruby/rack/rack-2.0.5.ebuild
@@ -0,0 +1,42 @@
+# 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_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.rdoc SPEC"
+
+inherit ruby-fakegem eutils versionator
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="https://rack.github.com/"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/concurrent-ruby )"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all.
+
+# Block against versions in older slots that also try to install a binary.
+RDEPEND="${RDEPEND} !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6"
+
+all_ruby_prepare() {
+	# The build system tries to generate the ChangeLog from git. Create
+	# an empty file to avoid a needless dependency on git.
+	touch ChangeLog || die
+
+	# Avoid development dependency
+	sed -i -e '/minitest-sprint/ s:^:#:' rack.gemspec || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/rails-deprecated_sanitizer/Manifest b/dev-ruby/rails-deprecated_sanitizer/Manifest
index e9c61fb6a36b..c4f077b72597 100644
--- a/dev-ruby/rails-deprecated_sanitizer/Manifest
+++ b/dev-ruby/rails-deprecated_sanitizer/Manifest
@@ -1,4 +1,3 @@
 DIST rails-deprecated_sanitizer-1.0.3.gem 25600 BLAKE2B 2b97f2cc3e40b8e50d62dea51de340a2d6624fd89c5a8f9a9f60215604137b169c69834d5131212ad3a61b1902aab61d01b287b9b2394f5e24a1fefe79049500 SHA512 017ea5aac0ce1fe41e51e4e957c3ce0c4c44b92e50c81740529a86d915483b8755253138d918c556383ecf0469ac83a7d30aaf8947e4768be33c3695ef4afaf1
-EBUILD rails-deprecated_sanitizer-1.0.3-r1.ebuild 673 BLAKE2B 5a6c915fa797b48752ae4a143453e21c9f01979a3b77fcffd19267d8e4e27aa2db3bc2b9eaed04226da424020fdb433a28a450b26ae8775ae931ec9761a34664 SHA512 89d3117c23a7ef574a2e4fe5979ac87d83770ad7cc19a0747833181266af5a018d6776a212f96d4cb0f4fcb9fd96ee5c3460fce8163936e2b49ecf9227daff0d
 EBUILD rails-deprecated_sanitizer-1.0.3-r2.ebuild 673 BLAKE2B 2ebab61cdc83a3aa725dfe47911c4b6522d877cfb4d1effc9e5f26470af805510374725a981d79bc2f552615976fc1f1d3f20d19f297c06e352d130724eaf063 SHA512 0e713c5f70b63b364d5344da9744d930ef40af9798d710550ef90bf992140739b2fcd870fdad92d57e7db23e891c8dba4d1f6806058aa18801da696937d5b3a8
 MISC metadata.xml 358 BLAKE2B a75e0d9133997d19e61403d5a1f35fadf53897210f3ddcd69fe1e06fce8cf386acde94716cfd7b758f125ee110324e888e786017c5eced46b2de9359ff82e988 SHA512 ce4e694d08f3f1b89afc2dd3151c60bd331a564a7a93f4c552391fa676898f669fda4791fbaf999f8f70657cc982060f712eda5df5301436ffd692bbdbfd996d
diff --git a/dev-ruby/rails-deprecated_sanitizer/rails-deprecated_sanitizer-1.0.3-r1.ebuild b/dev-ruby/rails-deprecated_sanitizer/rails-deprecated_sanitizer-1.0.3-r1.ebuild
deleted file mode 100644
index 205a6ff825ae..000000000000
--- a/dev-ruby/rails-deprecated_sanitizer/rails-deprecated_sanitizer-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Deprecated sanitizer API extracted from Action View"
-HOMEPAGE="https://github.com/rails/rails-deprecated_sanitizer"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2"
-
-ruby_add_bdepend "test? ( >=dev-ruby/actionview-4.2 )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest
index 3338ec465b9d..75867d41371d 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -1,15 +1,11 @@
 AUX rake.bash-completion 1335 BLAKE2B 5f4b81b850e3435246018d7bb420263647c11573657cb7362d95727800f4197a904003b5a967cf0df862edb36af02d640a052b5ad33218d3bd7a6945302ebf94 SHA512 bac238c0023e525570dcb93c2092059b8a952ed54bd97344db8011f89720af947b840564701b75e03f37a6994f27da95d8f44f1fc28839c8cb1d735cdedf07a4
 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
 DIST rake-12.3.1.tar.gz 120170 BLAKE2B c0d087911f33ccd5256462501d175e1f92fa104a3c89b62a5bc434836d5abb277a61fb12269778d0a6e3b9b831e78c0a94d9d1cd885906980fdb55e0402e398b SHA512 49736059713d609b0786d4ea89866fd5d58076977aabeda3eeee0440f10edad708cc10ba91b5224f59a8ab87ee2ab8e2674e9115f90f035c16e1fa8cba3f7649
 EBUILD rake-10.5.0.ebuild 1195 BLAKE2B 21a3d9d9d09fc565347694c84799dcdc6a8f53348b5e90c97382d7c595d6231a2b45db9158db84f37a3d9db44bdb950b3343fa79ce0dba82ef76b1a8c8dc1549 SHA512 4e689f4db52872206700137ccdc3dbfbfa882d0371724cf5468b3f51559c08a0e3011d7aad68ad638448096da2bdb69530225f7aeab08e85cd33dba419ef2ad7
 EBUILD rake-11.3.0.ebuild 1301 BLAKE2B d45fdbf2ade4b863f22caac24f2c946bf7fd71b847aaea3229064423969d33a1283d38e5b944e1d4a15be5d9e3ad60792ec565379770739159dc739b2500eae1 SHA512 99fee0adee74014b78392cfcad60ef753adac4e8fedafcada27b5429a3746b45f36caa854d4fbc4f888901b2d14604f427b0d0c99fd98a577c36efaa5488dfcd
-EBUILD rake-12.0.0.ebuild 1308 BLAKE2B 9d9cf580af743e4e9de4fe4e63d5ed9369048ea54c2188cffcaa8b6880ec883a2201679f6d88a70325431cf12183ca92c49533a103c138e52ed04805b70cc6bc SHA512 95125011cdd74c8b6b1befe9378e65b46d8c8af66776e427ab4f4b8f7dfe96059db06717b43911c066c35dce1607c58c739b72c409bbd0299bdb9885f27433ea
-EBUILD rake-12.1.0.ebuild 1395 BLAKE2B 94ea9f18d6630daca91db006674d4bdbd158b80f12c96d16c290e9e6e40c4bdeead969bd2d4d0ca26ea6b85c6a8dc6cc5ff9e919879604b93524b6473e4e8d53 SHA512 d46d7e79b563a974e055ab02d4224d7b7110769133e6c837454b7e4372db202d293cace9afe4c6fd96c4950c003cefc726fc90267ac93bcf98e6b575662e377f
 EBUILD rake-12.2.1.ebuild 1395 BLAKE2B 94ea9f18d6630daca91db006674d4bdbd158b80f12c96d16c290e9e6e40c4bdeead969bd2d4d0ca26ea6b85c6a8dc6cc5ff9e919879604b93524b6473e4e8d53 SHA512 d46d7e79b563a974e055ab02d4224d7b7110769133e6c837454b7e4372db202d293cace9afe4c6fd96c4950c003cefc726fc90267ac93bcf98e6b575662e377f
 EBUILD rake-12.3.0.ebuild 1402 BLAKE2B 1a4bf9bafef2ebe7b0542e372f1e880ceb3a715ea08d8d3e3c9e54ed0239f1e357f2b3f602c98b41e5c00452a191e1e520d7893071311eb63a47429e2a46c011 SHA512 2fa261c039516cc2d87a6b7f770355dbb42cd97e8f24adc170b2bf59c31bbf26b98d82038ea44c6fb2c786bb7e578926043f926e73cbef8110456afa0f35e230
 EBUILD rake-12.3.1.ebuild 1402 BLAKE2B e021fccbc0f95eb9536ccecb68cef83458fb92abe891e80f2c5f21218b18b0e25a1499ace122abbf6a2fb65efc1c20deac87e60fe09b07fb3f75c88d9e6c28b4 SHA512 c47bd4c826fa80706f23c96033e019632105a49ca4e8ea3b8a5e4c60c330a9e5bea7e20d88eb4f17674dd6e749cd67e84f96fc4d2e65c33b9be81aa1c5525032
diff --git a/dev-ruby/rake/rake-12.0.0.ebuild b/dev-ruby/rake/rake-12.0.0.ebuild
deleted file mode 100644
index 2f9723c2fd52..000000000000
--- a/dev-ruby/rake/rake-12.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Make-like scripting in Ruby"
-HOMEPAGE="https://github.com/ruby/rake"
-SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND+=" app-arch/gzip"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.8 )"
-
-all_ruby_compile() {
-	if use doc; then
-		rdoc --title "Rake - Ruby Make" --main README.rdoc --out html lib *.rdoc doc/*/*.rdoc || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.8"; require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || 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/rake/rake-12.1.0.ebuild b/dev-ruby/rake/rake-12.1.0.ebuild
deleted file mode 100644
index 712e7522cf9e..000000000000
--- a/dev-ruby/rake/rake-12.1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Make-like scripting in Ruby"
-HOMEPAGE="https://github.com/ruby/rake"
-SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND+=" app-arch/gzip"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.8 )
-	doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	sed -i -e '/coverall/I s:^:#:' test/helper.rb || die
-}
-
-all_ruby_compile() {
-	if use doc; then
-		rdoc --title "Rake - Ruby Make" --main README.rdoc --out html lib *.rdoc doc/*/*.rdoc || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.8"; require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	ruby_fakegem_binwrapper rake
-
-	if use doc; then
-		pushd html
-		dodoc -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 efbe3d1921c1..53361da1aa79 100644
--- a/dev-ruby/rb-inotify/Manifest
+++ b/dev-ruby/rb-inotify/Manifest
@@ -1,3 +1,4 @@
 DIST rb-inotify-0.9.10.gem 14848 BLAKE2B 35eb00dfe1e7e76fddda080499275c053e82431af520170362354984cb2af3c90e3ba803ef82fe50f1451d3fdb0ddb7ef9c1dc648836403a6865396987d6d9c2 SHA512 ee1aecfebea11655450776013d8d2fa3fb2af784285db3c32b5a452241f9cd48a8f9a10cb2f1ff96b191c0dcd43ec4f78e8a363447abf97a8cd4ccb778de4889
+EBUILD rb-inotify-0.9.10-r1.ebuild 962 BLAKE2B f3af41066b3479cf6fbea4cd76a8afc60f5406bb27ab65278bdf8bce20a9baa904a20443b57c0026371e95241c1af55be887a1f9901fb0320cb4b061f5adaac9 SHA512 2548a6d1d7dc72c286fcda9bfb311a90209fbe254a97b096611b18cedbc7da2f7bd51ef6db837a16ee84b02180421a94e5b060cb62d144f7e28ed301cd1c057d
 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-r1.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.9.10-r1.ebuild
new file mode 100644
index 000000000000..b516935037a8
--- /dev/null
+++ b/dev-ruby/rb-inotify/rb-inotify-0.9.10-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A thorough inotify wrapper for Ruby using FFI"
+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"
+IUSE=""
+
+ruby_add_rdepend "dev-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
+
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 2d518ddfc58e..9f015b8207dc 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -2,7 +2,7 @@ AUX rdoc-3.0.1-bin-require.patch 632 BLAKE2B 9835233574b78ddf5c9e1d60aa4a7559288
 DIST rdoc-4.3.0.gem 738816 BLAKE2B f705b4fed5a9a7e3a850cacc17b7df3f8fdeb163938ed7d2d29979337cb24bca4a66695643ecc62f811d8e49a931296e1972d5d13366685315649e0ec44ebef7 SHA512 7ec5c8055262300c159ff2dbca3bcd09e169002acad8602db89086d2b9409a096209a1152dca68c79dcd1b5e3c1fdf55e7f89d82b33fa2ce65c816695350b029
 DIST rdoc-5.1.0.tar.gz 702376 BLAKE2B 733d77a341ddad10f5b648b6bb492e0f79daa392e2ca371d38236e4c85a1c409699e35dd3f5bc8bc48551b399603bb0a747cb3c5f7f1fbf4765aabffaad575aa SHA512 cd2ed37e8502a3e9093c88c258ac5e39542a23c3dcaedb9b5eb48ce391a694e5b35fbcfd62f01ec6353ac9c40a4b7043b2ff11bbc403d2e03de9a84c52bcefe7
 DIST rdoc-6.0.1.tar.gz 697323 BLAKE2B 7af4a3189c6680ae3d92b7a0b7764e73a104017b49442d89ffa0e2da2d504e7493b6842a3b5b60326e8f633a10447e2e6efb17ff61da7b6e4e55b52d973fa523 SHA512 43812f068b430d4462821098bca1a1f0fc2adc63c6f358a48b4af94aafb76d33eb494ef06f91aa72065f128fb0d34f53a05cb246f0c4fcc31ce9c1b31658d108
-EBUILD rdoc-4.3.0.ebuild 2698 BLAKE2B dc98a115a9f34d6784712247736be608df0d21edde3fc217fc676bb466d31cd4b48b53c8147f8c6c92ac44df47513e5b91ba8928aafbd3dad433ce2a0ffb029f SHA512 38579438fc366aceeaf79abd263b2f06b3f6ff6ab68a3121255d2b5b9a4e1730994d958dcb639537d027e73ad01bfe314fa96fc784cde5b05366e020a8fb909a
-EBUILD rdoc-5.1.0.ebuild 2575 BLAKE2B 3c3c26b0395e376710b616112c1e4fc476582fb6c1d01ab3aee9b3b316e76bf691a9acde559c26ce5b1b9d098c661999de883385a9e277a3531f8a036a7fa99f SHA512 3e2ad90adcd556d8c834878c2ae82de6b7a52c8849f74712fed888e2663c1285e32c25c025477e3cbd833e311c4705ac3c064371ebb8c2d51ed6e2bcf2f79881
-EBUILD rdoc-6.0.1.ebuild 2552 BLAKE2B 860afb1a772ef627268b8e5a14a4973aeec66177906d8e8df2a44330e8596b46d918efd2c47591315daab77f89d435afc2d3830bf8992b310b7dadbbb9274f9d SHA512 1095d207941d3c035bf0d70432703e8361b4ddf80d946fe5dafc8babc5ff72240e92d2a737bc75f967a1e479e4349d13464797d0397437e01676c8f281791c4a
+EBUILD rdoc-4.3.0.ebuild 2695 BLAKE2B 49ec379de4d303a230b37e7194d07f44c2036d1ffd612f0eee8c5e9877d1023eead430aea666f193509b87d675c89447948d9334c587c8169274ecc164ac56f3 SHA512 24aeb3c3ed906dab7d3c570cc825d1152a769f24c775e529c3ed66160f6a36f211e581dd86aa3efcad5c209e50263a536c0d84067e23e65057f38f975ee5c907
+EBUILD rdoc-5.1.0.ebuild 2568 BLAKE2B 2c2bc3d067b2a5eb6c3f0a176620297ec2409811258ab44dcd8912b9fc9d9dbb104bc7f2608bb33cfeb367a55a0b6aff5c0707fc85e8342bc276a89abcf5ce09 SHA512 445fffe0e53abed82e729ff5cdd322cbed1b485ddf419ced48c1b18035fa42dbb76cb5cceb8d1e604a4737fdab08866a6ffdb691c631c83b2fd58a4265534df3
+EBUILD rdoc-6.0.1.ebuild 2545 BLAKE2B abb535b4fe3a9436ab32a57e7a899301a04d53f6e10ad192f572960c76b9d9069d11e2150482ff18abca4561a4cc11cc4aad9ba4cd104aa486bb3d9d59e77884 SHA512 a12b4a21212b6da59473ccac8175e0e4b8063164b73d54fab60967ac916288d20c90d412dbcec936ab496834d654fc187171df02a0e7015cccb3d1467929f0ee
 MISC metadata.xml 335 BLAKE2B 835d498407155ac5295c70af8a671114c777e5f9371b3d47f9f92a6b102b8e1d58755df0737c34820630464772dc001163e83b5d319707a1c630f4cf2f9ef8de SHA512 3421081016cb99570f9ce9f775097669cd40a709efbbb3c76a20947717bc40d886195a5fda889407d1c436a387c126e07def1eeae01edff53c490ea9c630e992
diff --git a/dev-ruby/rdoc/rdoc-4.3.0.ebuild b/dev-ruby/rdoc/rdoc-4.3.0.ebuild
index ffdfb6f6e4e3..88259c168764 100644
--- a/dev-ruby/rdoc/rdoc-4.3.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-4.3.0.ebuild
@@ -77,7 +77,7 @@ all_ruby_install() {
 	for bin in rdoc ri; do
 		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
 
-		for version in 22 23; do
+		for version in 23; do
 			if use ruby_targets_ruby${version}; then
 				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
 				sed -i -e "1s/env ruby/ruby${version}/" \
diff --git a/dev-ruby/rdoc/rdoc-5.1.0.ebuild b/dev-ruby/rdoc/rdoc-5.1.0.ebuild
index f72e6914d377..b701fb53afb1 100644
--- a/dev-ruby/rdoc/rdoc-5.1.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-5.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/rdoc/rdoc-6.0.1.ebuild b/dev-ruby/rdoc/rdoc-6.0.1.ebuild
index 985257f279b4..ddbea7785806 100644
--- a/dev-ruby/rdoc/rdoc-6.0.1.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/redcloth/Manifest b/dev-ruby/redcloth/Manifest
index 6897d0760984..e38ad798b5bc 100644
--- a/dev-ruby/redcloth/Manifest
+++ b/dev-ruby/redcloth/Manifest
@@ -1,3 +1,3 @@
 DIST RedCloth-4.3.2.tar.gz 91880 BLAKE2B 0feac1ec59e23fcff39e2fdf9beff896be7949764e53a5a834c5f4e7d18813dc59bf354103d4fab82a709341a0f1b6919bbd3a463fd601564888672dbe73d343 SHA512 377fef21e646beb1658a4b8b8d0228e9730c6c8f33075a14137afcf80e8d37501ede8c05b720d0dfb36a680017f4dedd01565fe9b326ae06ead77afee6f122ca
-EBUILD redcloth-4.3.2.ebuild 1474 BLAKE2B 43418d646ecfd7b5e7e3fb20339fe60dc5190bd9c140602ae29ab7286089d91aa59ff6dfcb72f0881359fe8dea104134b762ae571a7dc81f61a33132edd1bbe1 SHA512 f3318341074ecca90684f87ad8163952c8e0d12d96d66b5ceefe3380cbea8fe8fadc3e0d448c24cb6c0b14b2777ca03edcfea54976aab65518d3893e824bdb4b
+EBUILD redcloth-4.3.2.ebuild 1492 BLAKE2B 54b4298a1cbc53654fc2267980862178f460cc8dae333a44f50ab3cfa260ca7771960f8250672c3265987c17ef801f5b3bca07ef4a2acd74ddf63d300fd5f4d3 SHA512 e0f9cec61de18d2276ed908f6fe275adaa373dc0ed57e1f3b18f89e04a773c2782231c0021c01616ed8f8383d768a1baaa4779d3e01ce98af3f20692c9709291
 MISC metadata.xml 342 BLAKE2B f28d0e6234cfbeb3d398315b38e8dcc614b32aed150b047e61e7d99b2f6083abbabc36515de2cd2aa4d451dd3372dfc15018c1d8ad02cf64ff8e87b147a441da SHA512 7a6f73a77cda62ea21a2d2fdfcf0bf848ffdd90e7272e0b06aef67a8147e5a6ae14e871d216750ce20d12e18823d3e3d36e60a99972019fde7195a2350480791
diff --git a/dev-ruby/redcloth/redcloth-4.3.2.ebuild b/dev-ruby/redcloth/redcloth-4.3.2.ebuild
index d10c52cbb740..6312493835c1 100644
--- a/dev-ruby/redcloth/redcloth-4.3.2.ebuild
+++ b/dev-ruby/redcloth/redcloth-4.3.2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+# ruby25: not compatible
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_NAME="RedCloth"
 
diff --git a/dev-ruby/ref/Manifest b/dev-ruby/ref/Manifest
index a1c8cfe49d90..8114f17a6bbe 100644
--- a/dev-ruby/ref/Manifest
+++ b/dev-ruby/ref/Manifest
@@ -1,3 +1,3 @@
 DIST ref-2.0.0.tar.gz 19043 BLAKE2B b5e90630451c8f6682c572f5115b8a3960a731197eff45963f2e0a538a74cf51e666ced5ba9fd2899c96bce3a2191f091139733b04d6e9dba940d8099b5dc62c SHA512 4407111b3f8497016b1935d3804d0f7d2d1284d31922dc7d1dfb6c5dbfcb994050a46950b0874c3b8f29bde8ac0d35f2edf1dbc711dc5d654d0680b4f94a5baf
-EBUILD ref-2.0.0.ebuild 673 BLAKE2B 9adbcbbec828f939caad1545d7286d5427fdb32450ed4932cafabb1206c4d8d2178438d667e12e32b5d7d07e683b105d28288648eeb42f2d5103efe5fb219764 SHA512 64ac8bb6d838a8d94db9286962f05d9c1989d20bde590d93a2773ee2578e5ab4f2d68ea6d38acf79ad841f509d5c6a1772d65e347984f3a6a7bdafa957e3f356
+EBUILD ref-2.0.0.ebuild 673 BLAKE2B 0a7301537e51782064f2969e19e6cb274c3593042a9fbb8f5cc182ec06dd5c58b21522a841e5725aec220a0150363de3e873b9a4cfda41868d31d24a83be611b SHA512 ab2ffab04d48485996c0d19705c52990890fc6b5f6815ece5d0c3eb57ccdcfc35377651ead8f3b7694c9530c1d04997adce2645377ecae9a66bc0c9c75618cce
 MISC metadata.xml 346 BLAKE2B 5f414987a0e4dfc05f303a1bb1ce66a750ea46cb3b788d8a498c7a649dcc353c09d95133825a2cf08a75990d01902b41c7a3226edd1f66c593550e1e2d2e88e0 SHA512 89af18c9b2e65388d2649e5eed851dde6cbe54847cef0b1ccd8bf3a8f632a54b2946f2974b87530e7d8926b72bbbb084ab84a0c9bbcca1af2d48fb02d41c98d2
diff --git a/dev-ruby/ref/ref-2.0.0.ebuild b/dev-ruby/ref/ref-2.0.0.ebuild
index e98a2397cd02..0afa9f998373 100644
--- a/dev-ruby/ref/ref-2.0.0.ebuild
+++ b/dev-ruby/ref/ref-2.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/rex-java/Manifest b/dev-ruby/rex-java/Manifest
index 7b295b753220..7b9b23e597c1 100644
--- a/dev-ruby/rex-java/Manifest
+++ b/dev-ruby/rex-java/Manifest
@@ -1,3 +1,5 @@
 DIST rex-java-0.1.2.gem 22016 BLAKE2B 44b326c3f016c1280b28e6653b402feb22f752b34240e1c4c4296188a5d6bf5b721247fb9d3721d68755c842204d3fbcc6eabbecfc30e77a9b509d68abec555d SHA512 a6676f5a0fd1df23419a0d20046a9ec1aebbbf7c10f5a8acca99e49a2586ec8f8e4414b7033454ff830f9c924aa0e805ed0f93770e0d6148e7a8c1d099875743
+DIST rex-java-0.1.5.gem 23040 BLAKE2B 27789a55c6922770211285ef665221c9619a956ea874534f029a450760fca8c5034a715d9aaf91864e624363efe5d9f966be7b00c5c7133284b0eb591034b36d SHA512 990f989a19cdb5c6f87ac5b57e500fa1bd7031dd867e43c6b451f538c1b581b57ee9908b40d8a37727c45883ba17f466272e739913ccc2406b69c1e818de5c7b
 EBUILD rex-java-0.1.2.ebuild 506 BLAKE2B e91a17b86d7c045a41aa1bc0cc430d80ed60f71bef40b4d17b48a96b88debb99a5713ef2d000d6d85a4e44b6fc2bbce44098ea057c7a3089dc83e296a452f7bb SHA512 02ecff70660e218eab7c46fabc5b4c76091ca3d87e1c484a7502627f4603cb260d6df81a1f1f23e5b6e7473386da0af21071f5f360fead4c793c211cd27b6370
+EBUILD rex-java-0.1.5.ebuild 441 BLAKE2B f5a83a481e9d865ed1120e8664345d0a9fde8571ee6da4d7d683e94c713d82100295cc07f5200d76771cd2812e472617dc5d82d99cfa28b0d765a074743ebec8 SHA512 455c6e61a39cddeabb5928f3b546f1c3f7d786ad3e76ec947c6778046bedf168a7a98bc07ee06b5a5d32dece113f03df0ff24fdeaab1b2d09086681d55f11e6e
 MISC metadata.xml 389 BLAKE2B bd09e6d2debc335faae3bb86ffb0f2cd04995182954de39f516b50237ab76fbf05269c2940c0814b65c067979b2095ab7712e8f83426e5381d951d0306a91f06 SHA512 ade2c3b7aa2a8162839d0d6adf1a5437559076611edf25d8bebb3d546e29873a79ec895dfc2615ad080d6e1728f20735a5718c49ae95bd18bb52dc7530cd43cd
diff --git a/dev-ruby/rex-java/rex-java-0.1.5.ebuild b/dev-ruby/rex-java/rex-java-0.1.5.ebuild
new file mode 100644
index 000000000000..5c4ad983f3fa
--- /dev/null
+++ b/dev-ruby/rex-java/rex-java-0.1.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby Exploitation(Rex) library for parsing Java serialized streams"
+HOMEPAGE="https://rubygems.org/gems/rex-java"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/dev-ruby/rex-ole/Manifest b/dev-ruby/rex-ole/Manifest
index 4e4a6081a2e3..db6415f99e7e 100644
--- a/dev-ruby/rex-ole/Manifest
+++ b/dev-ruby/rex-ole/Manifest
@@ -1,3 +1,5 @@
 DIST rex-ole-0.1.2.gem 26112 BLAKE2B 5147b52535211309cc46e0d364328416838ea9c403bcec2422c1f01c55189ea1d8f683c54203367dd5e7fae5f1d150cd5852ef3e74b972fb46386be959d041aa SHA512 efb8c5977d71e32e6e78edff42f6ef0bb1a7179b3309ad2a33f50958ba039c919967ce6b7161a3959088705e17ed6560aab8434ea593de39b41c5a30e04b6dbb
+DIST rex-ole-0.1.6.gem 26112 BLAKE2B 1812b3f3c9b0b4f115efd66d1fa29cb39370e58e780695127390987dbb4b87647f2e0744b88ba4ee7b9ed7857155c8f1d32dbe6d090a7d3166ae5928d18686e5 SHA512 5fae70ec85058e3dca08fdedd595fb27b46de263aa727fd291606d4f8f226bc0d9a2f135bf4673a8e389d6a2e932e7514eb97954f765c1ce9401233ac2cd7da1
 EBUILD rex-ole-0.1.2.ebuild 553 BLAKE2B c81f4d517144ed5016b1c435e6df6fce2f8524dda00b33db79a5c5a20bdd59344c63c49fb0849b6dca43b8c75db9bae01d1946ec2aaa134ccaeaed393df53b7a SHA512 f7a51c4d0d87d5b8a2d5385cb766fdfef78ebde73af9361eb63a19601a33758a1162629840afa1604f80ea21d53dc95472f511a194c698c0e8a8e00a8c6a8401
+EBUILD rex-ole-0.1.6.ebuild 488 BLAKE2B 388162d37f1ec07bf68a48b78cd6af18a33f709bf23195dc55c742e2674e45ba40c697c1d95a3e24e3ddab69b20678e42e0f34ca0f8cac72b163d6db9c9a10cd SHA512 fd80118aae489c1850834a1c5be7804ff59723bae97bb79df09c7b8bed907dad01194e209ac897be42a23e1d3f1fdaa201296cb36d4fd71ae6d766d63bdaa6a4
 MISC metadata.xml 387 BLAKE2B b888d7a5a8d64ced8d3357ff94fced377985149874143f636d22eaef6861f27444d49db5db80f3d0cb600e5cd316541b23a47b7a947be387a93c217c82aae7fb SHA512 d215a2f100976cc348cc12b109f564c1101ffc76826647a20ab5df0529dfacb5eccd81770bb716b509de7dd232faa2c5ad275bbf33607725a6dad3f83d6deac1
diff --git a/dev-ruby/rex-ole/rex-ole-0.1.6.ebuild b/dev-ruby/rex-ole/rex-ole-0.1.6.ebuild
new file mode 100644
index 000000000000..a0814d9c4bc3
--- /dev/null
+++ b/dev-ruby/rex-ole/rex-ole-0.1.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby Exploitation(Rex) library gem for reading/writing OLE files and streams"
+HOMEPAGE="https://rubygems.org/gems/rex-ole"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_bdepend "dev-ruby/rex-text"
diff --git a/dev-ruby/rex-powershell/Manifest b/dev-ruby/rex-powershell/Manifest
index 1bb8a5a37e3a..63c06b3f2a38 100644
--- a/dev-ruby/rex-powershell/Manifest
+++ b/dev-ruby/rex-powershell/Manifest
@@ -1,7 +1,5 @@
-DIST rex-powershell-0.1.1.gem 25088 BLAKE2B e9deb53f4dcdcc134de8738e25b6edaaf0e3ebdc3e1d4e88317c4abf17aa31fdf65020f0929b4d1155c299c9d93b20b96d906096a75bbdde377ae03d04d6f2f1 SHA512 f259acda2012da8f2d5e990786818997326c6cfdec2c388a340aa34cc0ca0233ba18e88a6efefd4ff735d5986011a12b06374ebee5324d0f89b2407a18574908
-DIST rex-powershell-0.1.64.gem 25088 BLAKE2B 6c1997d1cea8f60cd3766fd21695ac108ad4d9b3e11536862e40e8a2d87161a00f510e462ad1ec30ddad380d2d3a8efe9a5f26863d7bc361b93692398c2f8918 SHA512 669095c77637254dee109c0451bf547b3d3fca878c5b89c8eb7e6cd5ec6d43a8d842544ae9e5f9fec2af0aa1dba9ad20d059898a9457fdc34171a1d2e3d16cd1
 DIST rex-powershell-0.1.65.gem 27136 BLAKE2B d2488c42a29baba800cfc8c555195f4d9e3fa4ed376edd062134cb82f4f6b5cf1002734bf59905ac3337f741480f429bb48d0061b83c9b5205b61b105f5fee1e SHA512 7760137e074f319d0ccca827824a481b00f5a2b945f60638956f16d1b8a74f92479b7ac7fb5595cf297a3a394905bd7a8af62b9480b1835949843b2cf122dda6
-EBUILD rex-powershell-0.1.1-r1.ebuild 596 BLAKE2B e87f56b03ded7f06b19fa89eb16393fc1990db11b2499783f6843f7d825da40688d96b45dc408243f0971a3befbc6eb190c4849fc8ae8538146f3ffa8e6d0992 SHA512 488eb58f4cf302312da6770e85e093ebb94924aaf981b8f69a23d0b8cac9b4ee743b51657bba114869eea289f05a9701ec7a0cb5875b5f83e621f5583d801a75
-EBUILD rex-powershell-0.1.64.ebuild 635 BLAKE2B 7f96e4d4a069cf2af421b199adf3c99f194af0ce5aa0cb80958dbfa8b3fd1246f58b8499c97a3b376743f78647d24c49c6a175372cd4e843fc971703662e5a28 SHA512 43f2d926ce64ceecc2b228c838b3fe36522daac56e6be4fa26216fded7e1ecfa642d617793fb2fa6c3a736a93dfe696e15758f0afad00ccfc92f7c6f6093b519
+DIST rex-powershell-0.1.77.gem 28160 BLAKE2B d1fb9f6e9f66e6b55b09bdda329037ea7da135b9eaec9f1437ca374f3be5da1b5ee63f7c92d56447c88964a4c1a4bef68b2d6b64a4e507b7c2a7010f1ff09d40 SHA512 99e3a8394c580b07580f8c230f049b15fd80b02db4b940208a1086e1c3d679ab1b757fee56356d6b25a6876ccb21c50d1037b7bbadc486a7c38b10b9b81a09d3
 EBUILD rex-powershell-0.1.65.ebuild 635 BLAKE2B 7f96e4d4a069cf2af421b199adf3c99f194af0ce5aa0cb80958dbfa8b3fd1246f58b8499c97a3b376743f78647d24c49c6a175372cd4e843fc971703662e5a28 SHA512 43f2d926ce64ceecc2b228c838b3fe36522daac56e6be4fa26216fded7e1ecfa642d617793fb2fa6c3a736a93dfe696e15758f0afad00ccfc92f7c6f6093b519
+EBUILD rex-powershell-0.1.77.ebuild 537 BLAKE2B 3db094c5379606ab5db1b8e006f45ff14832611f640478af83e8620eecb6336f40c5de9547b1585f6d2a26b1a496452cd3549d0dd7be778bf466f28b01301047 SHA512 30f79caa12c09d40f493cba08cc85695a6d14d1bfad439cfeb7a81d7fab44f8145db7ef1a104b05880f14cdc3cd2c16f477a3e0736e7642864311fe07ef4f7eb
 MISC metadata.xml 401 BLAKE2B 9ced95a371f0f76b272ae92fdb6955e87481fe0e5054d87ead013f86a91e83573aac67611acb9da9c765b8e6970a71cc99714ce9e6b0a52d66f7da5f2a365134 SHA512 1960bdc2bd8ecd7b03969c7dc24374ea46e45a7b7218c7d5f0677aa6906e191908416919302f5d9082c35021d7be414040852c33e457eb6d8ad5030e95b4bb52
diff --git a/dev-ruby/rex-powershell/rex-powershell-0.1.1-r1.ebuild b/dev-ruby/rex-powershell/rex-powershell-0.1.1-r1.ebuild
deleted file mode 100644
index d9e7d3ab6f87..000000000000
--- a/dev-ruby/rex-powershell/rex-powershell-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,26 +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_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation(Rex) library for generating/manipulating Powershell scripts"
-HOMEPAGE="https://rubygems.org/gems/rex-powershell"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-# doesn't seem to actually run any tests
-RESTRICT=test
-
-ruby_add_bdepend "dev-ruby/rex-random_identifier
-		  dev-ruby/rex-text"
diff --git a/dev-ruby/rex-powershell/rex-powershell-0.1.64.ebuild b/dev-ruby/rex-powershell/rex-powershell-0.1.77.ebuild
index d42851954958..d44f1014de16 100644
--- a/dev-ruby/rex-powershell/rex-powershell-0.1.64.ebuild
+++ b/dev-ruby/rex-powershell/rex-powershell-0.1.77.ebuild
@@ -1,11 +1,11 @@
-# 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="ruby23 ruby24 ruby25"
 
-#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_BINWRAP=""
 
@@ -20,8 +20,5 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
-# Specs are not packaged in the gem and source is not tagged upstream.
-RESTRICT="test"
-
 ruby_add_bdepend "dev-ruby/rex-random_identifier
 		  dev-ruby/rex-text"
diff --git a/dev-ruby/rex-random_identifier/Manifest b/dev-ruby/rex-random_identifier/Manifest
index b1218594ed30..8ed7ba0d418d 100644
--- a/dev-ruby/rex-random_identifier/Manifest
+++ b/dev-ruby/rex-random_identifier/Manifest
@@ -1,3 +1,5 @@
 DIST rex-random_identifier-0.1.0.gem 15872 BLAKE2B f8afe34e9a33e08e04c7ebe5df47ce50a2cfea42359e517ab44ab3a8f96227f4ccbc532e0c0b284bcba2291ad9ed6f85064435522b58c17a98d78cbd6d75cdc4 SHA512 79439b80ad06c6c5c7854933eaa4129ff0b176144bebf68fdfe7250ab3242904bcae4a439d610f4710b6d48ee5405b0d5f79539c861511072fb628ee68afd21f
+DIST rex-random_identifier-0.1.4.gem 16896 BLAKE2B 37c1011b91dd16a82c0ee8ff1c96b0263c4842503826bae327d3a6d3b61dac77620cbd28cba350c0cf56bc5fc480bc37663a78674d0c7c8d8d6bb95e046e9559 SHA512 8e302a511a0540f826ddfa6e51c5b29da0c42ef6bd3dc433d6624688efba245c1df3903dbf37aacaecdd39b53f721e3d6b4fa8247f8cd31e7679ff96293094f7
 EBUILD rex-random_identifier-0.1.0-r1.ebuild 562 BLAKE2B 7e6370cca3bddcfc2e8d9bafb95dba9931b5ea078e7f0e51fa9d9d11920f7fb6ef976038a6c2c2d9055770028b8516877d88e4a9103e5c3871e889dc663ccd07 SHA512 c877e9dd4632c096ffb19395e632c09b55db238e9cd53c31e3cbafd0eea12117efb39996606ea6323f20597c76721c80641011a17302bd88bc53ad817d67631f
+EBUILD rex-random_identifier-0.1.4.ebuild 571 BLAKE2B 14fc1548b1c0284be4d5d162dc841bb6953c94e41d1f3c6fe83b43c5ed2dfd82784121cc60fc7b46ff1dd59ffc2317490edb84d4c74365d9c83459ffe2458462 SHA512 d9dfc852413874a5b54a5dfea67355283be4360a74a12ab7d4a443f6fdd96b1840bd8e420d06b2655d8f4a8ab3816727bda348db5d6680a09d398994494d4157
 MISC metadata.xml 415 BLAKE2B 4ad85703d580032450110f21f844d19374c9104ad88b215d70688e8bc6b175c5d706a1afd793196440a1ae39dedf9342c19d34a0c295604d3f15ef112261a9e3 SHA512 9da0baa565c2f611e562aa78eeae7755603721a3d934d63552b8858efda0d379b2a479735d256b318a440305363776b8f4f352ff10201be2dd0397bd38cf0abe
diff --git a/dev-ruby/rex-random_identifier/rex-random_identifier-0.1.4.ebuild b/dev-ruby/rex-random_identifier/rex-random_identifier-0.1.4.ebuild
new file mode 100644
index 000000000000..2f06cc7c2317
--- /dev/null
+++ b/dev-ruby/rex-random_identifier/rex-random_identifier-0.1.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# Upstream has specs but they are not released and upstream is not tagged
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby Exploitation(Rex) library for generating Random identifier strings"
+HOMEPAGE="https://rubygems.org/gems/rex-random_identifier"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_bdepend "dev-ruby/rex-text"
diff --git a/dev-ruby/rex-registry/Manifest b/dev-ruby/rex-registry/Manifest
index 14dc6c1fc81a..597d72107c5a 100644
--- a/dev-ruby/rex-registry/Manifest
+++ b/dev-ruby/rex-registry/Manifest
@@ -1,3 +1,5 @@
 DIST rex-registry-0.1.0.gem 16384 BLAKE2B 2974147178d757412f9912d5c19eea9532fc5da8e80063320f432a8f4f33f38833be147d761ca052f93e1a5f94d7bf76ebd6f564f21791cdfd9f2514d18363cd SHA512 341846551e0db7caa1259e6ae7931eedc063e4ec824b129ad4f53d82dead30f375f771cc81fc280d5d3a54685f96ca37ef4456fe04b70df1b9163b4556566cbb
+DIST rex-registry-0.1.3.gem 16384 BLAKE2B 9db5f9674b8d341797ea797f5c5a1e43900f6f4c4e563658fbe55fcf43ba1126067d0e822df3cf21695143bd70309d7499d708cf48b80e6c903e06e7d0e8acfc SHA512 cde5350945e8aa7cfa0dc01c78e7a375d1aa7174c2954b658ffeba39c81d638b1d614866cbd0f8f8f417f1831281cd43126cde158944903e36c8dc5ce79773e6
 EBUILD rex-registry-0.1.0-r1.ebuild 513 BLAKE2B 601c66f981c16ae7d4f65694fd060cca67903f3e4864e969feb403b4d6c643cd3db7822ac3ff696dc4f392d15b24011a018e9ef57445c0e1eef2012d19b864ca SHA512 f2c58c5cd26525c0a7d4561e6621acf1dc625f6b840457d491fa3354ac4fa7c674d8371c8c7f83064600ec3a27915088ad0ec9cf140f388a58105e393376b5e5
+EBUILD rex-registry-0.1.3.ebuild 528 BLAKE2B a1b5de87898e5fe2e387d56d0a09a980a62c2bd93952b6a6b0e6044d8ed4d6caec5f3de40b53bbf20c41b292dc1201566ceca8d317cfcc77d46a4979e3a1319d SHA512 79ea6b4091b5528e593ca66fafc73a48173449ebcdb0fcc1da76029b99b3318a5d0aa10a7e28cd576a3e2d42453d12ff76bbfb3bc027288664e1ab750b490fdf
 MISC metadata.xml 397 BLAKE2B 9f1313db54d7a221e512cc9c4d1d4f02f48017a2414bbafa03192638203c37fcb29a5e9b8c20f1ae79c3956a3d30813ea391ed463dc8f18aca014cced68b046e SHA512 e011f42529d96ffe371032139c75c3d5521d9500825862cc93430595a25d9ddf2971488101923993f179036d54cfd44ddf63da98c9eab3803fd27a4f4fe7b782
diff --git a/dev-ruby/rex-registry/rex-registry-0.1.3.ebuild b/dev-ruby/rex-registry/rex-registry-0.1.3.ebuild
new file mode 100644
index 000000000000..67eb86064708
--- /dev/null
+++ b/dev-ruby/rex-registry/rex-registry-0.1.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# Upstream has specs but they are not packaged and upstream is not tagged
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rex library for parsing offline registry files from a Windows machine"
+HOMEPAGE="https://rubygems.org/gems/rex-registry"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/dev-ruby/rex-zip/Manifest b/dev-ruby/rex-zip/Manifest
index a7e8e749907f..f5ffd6b6d22a 100644
--- a/dev-ruby/rex-zip/Manifest
+++ b/dev-ruby/rex-zip/Manifest
@@ -1,7 +1,3 @@
-DIST rex-zip-0.1.0.gem 23040 BLAKE2B 104ec3b735fb7c9b5982657cfc7527afe965707760778435c8bcbe5b30c9bb3fee5080f9e56abdeed1374f2ec62354451dd709903ef93d5daba60d9683a22e50 SHA512 402c16a814b497cf920b9d9637c77066dc30bbc5807e84edb939e8cbc034e5554a49e94ef86f93169872a4679e8118e785e037f5e820eae02c5921763947918a
-DIST rex-zip-0.1.1.gem 23040 BLAKE2B 23c26861b297c89fb2c68687b1b30a078f7b8bcd7699bdee1759e4b0dba389be20735db3d8d8a051e6a84141966ee8e1638158de9ed97d8a2f9ecf9c3e07c95a SHA512 720d148b4be55632a49755dfba58e840c6d03b4abc3ec7f2df64b677a78898c867e07f43be246f1dd2f8bbb861aacadcfd1b11c9848aec65233074f7a10cf402
 DIST rex-zip-0.1.3.gem 23040 BLAKE2B bc823e7d53c8a7245d568ee2cec013e7bf8b7c508409a0668481e323ea5343230c5bc64a7173f48a7ff966d6af5a9e50e3a0e2d64dec06a699923dc3182a89a1 SHA512 f92d64779ddf943ca4855c5b9c567a0d995ebb6ace93ac8da12a7f1dc3ea350d492d3d229d3950ffec32bbba29fcd226c27a5be81e3f45d6f0edaa35ebc70047
-EBUILD rex-zip-0.1.0-r1.ebuild 546 BLAKE2B 3d995f35ff9f01c21718b11e8a320d9e92e339c1e48bef52aaed7da7e74482b636e4fd54eb1cc61ce7abc1a199305d5a99640a50d3efcdcdc12af6608382851d SHA512 20fa75ef6f489d3adaaeecbbc62e3101183e021973c27e0572b9c97ef16c7a7756dfc93e15ccafca36c6c30a078b1603d1e1b68dcf8b4fed6c43602d13ab9a77
-EBUILD rex-zip-0.1.1.ebuild 546 BLAKE2B 5c2d1d638ecee1cc0912c9d13ba6106d3b3fc9b14a178e7f25453cbe2bb0f57ef2775e8d8aa153f548891786df696eb63aa04b801b2164efb52ef09fe8a50be2 SHA512 75420a2f5951e18fa780415218bbccf62ff44611b751384deca1d27e041ee5ea59304af58230507706b349e3d35ed82a7621c1dcfd4a8e376b220d8f493a8177
-EBUILD rex-zip-0.1.3.ebuild 564 BLAKE2B 05121e0eff6caced85a81d13ee5e4f4dbdd24dd884aa9fbb9f970d1bda0d5c5312c1a8a21246a4fa03831ee8ddaf52a4615816606e415c4cfef3fcd703c7755c SHA512 b7620df9461232253def9d914e7f8d7611e97523d92c808089afc5f4c6d654213d6f51875bb048674dc075ab4d60cf27d9a80f87ed70839278837a990a3f4b3e
+EBUILD rex-zip-0.1.3.ebuild 571 BLAKE2B cef84a6ee00dfead5f56369cb8e6ba7019c9d6fd9c47697e3df376181d3684d54fe17e805ca73ede31540752734d04da136a4348bb1f64e6c62a36d2ac5efa63 SHA512 aea72bb8c90447b35ac1985300a4531180dfa155dc437065addbff7a73b0d977b1ef3162ba240ca28ceae016d4f7aa1ebbdcfe2d6e6895f38331109d8ff63ade
 MISC metadata.xml 387 BLAKE2B 0e3ac5ec5b97816fe3a588ab5a4f19d8c456461c1cdae57b19c29cb58f49e2259dc7e2c708f4b7d9345e4c26d2b7e03648dd4fee009ca407ad5619fe72c53db6 SHA512 dd9953db84c05af8e5842ebac7f0419470d14fddd595175bc34467608f8d8fbf151f781c81455386718359e44a145f7d5def83b5e6ee7ae2d86cdaf580e701e5
diff --git a/dev-ruby/rex-zip/rex-zip-0.1.0-r1.ebuild b/dev-ruby/rex-zip/rex-zip-0.1.0-r1.ebuild
deleted file mode 100644
index 971132544059..000000000000
--- a/dev-ruby/rex-zip/rex-zip-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation(Rex) library for working with zip and related files"
-HOMEPAGE="https://rubygems.org/gems/rex-zip"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-# doesn't seem to actually run any tests
-RESTRICT=test
-
-ruby_add_bdepend "dev-ruby/rex-text"
diff --git a/dev-ruby/rex-zip/rex-zip-0.1.1.ebuild b/dev-ruby/rex-zip/rex-zip-0.1.1.ebuild
deleted file mode 100644
index 1f0be44812db..000000000000
--- a/dev-ruby/rex-zip/rex-zip-0.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation(Rex) library for working with zip and related files"
-HOMEPAGE="https://rubygems.org/gems/rex-zip"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-# doesn't seem to actually run any tests
-RESTRICT=test
-
-ruby_add_bdepend "dev-ruby/rex-text"
diff --git a/dev-ruby/rex-zip/rex-zip-0.1.3.ebuild b/dev-ruby/rex-zip/rex-zip-0.1.3.ebuild
index 0fec4e5d74ee..467f89a32453 100644
--- a/dev-ruby/rex-zip/rex-zip-0.1.3.ebuild
+++ b/dev-ruby/rex-zip/rex-zip-0.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 # Upstream has specs but they are not included in the gem or tagged upstream
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index c7f5500492a9..511afc511bf3 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,5 +1,3 @@
-DIST rmagick-2.15.4.gem 1545216 BLAKE2B d2924a7b928626eff30f0deff075fe8d668bd226b8fae9c9761a366c0a2047644d3b0b0701738824985123bc4f1b235856e8e31aeab192a9709b4eafa8da1ce8 SHA512 9cb43632e510e3592e3a643117d61020d6cbec932acecc19c1e977cca001ccc04bae46669895fa2f5f0e8d43c09f1c2c429595a9358a4a74cbdbb4ecd8957b80
 DIST rmagick-2.16.0.gem 1545728 BLAKE2B 2f5396b5d5c6a60fabf7f67d104e68443c038a8e9431fbc8252a3ca915b4fb353d6a0740f00fbaac91cf3bbaff84c0dfb45d4adca6a81622fc1d2e395ed04cac SHA512 e37fdd9c1e45d7ef7000602f495c3951ee2abcae83a87f68702a51a2183edb6fd8e576ca1a5ac8b64e05ae0287141137b505bf27fddc579e753f9310cb4d653c
-EBUILD rmagick-2.15.4.ebuild 1984 BLAKE2B 62426b077398bbe9aa24cac3ecc3b4e770dc8cb738afba5ca9bce9f6030f2010157d4ccb764a7d7300f44df57af61de449c875a5a5db05c1d19ef47a9f73206e SHA512 7ff0190946630cdf76ca996c85b457f241ad90ac717d4e05f498042ab2ced0f4f58daf4650c36cfddc62086c9d0916cd9f9132fa5d0baf3e84c578905d7c2c6c
-EBUILD rmagick-2.16.0.ebuild 2036 BLAKE2B 42a74ea6a03d155a8723068d46a7337f8e07eecbf254d31ccf326dfbf9594c5cd79a5e5a7df9034d6b7d0a60697fdd2618e5fdd9edab3a86abd5e939c8c94d5e SHA512 8a698ee01657b6bccd0768bafb5c8f07c9f87286d2f7f129e128fd90957d743b18391bcc4d4a4015645606591e907bceeaec9ff0872f990d527eb3798c735a59
+EBUILD rmagick-2.16.0.ebuild 2034 BLAKE2B 0ce3eff9602b4bb713d817e8c362e5c1850d9e56777f9412cf9a6f83392d168da85c9b57578fdc080ad194e3932dfce113ad456fb0e2189c878b86e227e8d885 SHA512 2cc267bbf285aa7259672fb38345b816de7565232a9826955e85b52ca0f0cbb9e1a95799f94de785eef73386e22d2831c63abed9cf84da70c24b59383824f050
 MISC metadata.xml 341 BLAKE2B 537583fa385971de2e8ae510c7d32f11bf7644b3aac908b482833d26a2d92060255c2f15afd229c6c50207e969cbd5857705850440949788a6fac7329f26c757 SHA512 84bb956a38056526fd173c3f4aa972ea121712c15111a35e19e1f27b0cc797ebda4550ada88a46de7e66e058a66bb92d2e715d646068779843133a66d7523683
diff --git a/dev-ruby/rmagick/rmagick-2.15.4.ebuild b/dev-ruby/rmagick/rmagick-2.15.4.ebuild
deleted file mode 100644
index 444a98a96ccd..000000000000
--- a/dev-ruby/rmagick/rmagick-2.15.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.textile"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
-HOMEPAGE="https://github.com/gemhome/rmagick"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-macos"
-IUSE="doc"
-
-RDEPEND+=" >=media-gfx/imagemagick-6.4.9:= =media-gfx/imagemagick-6*"
-DEPEND+=" >=media-gfx/imagemagick-6.4.9:=[jpeg] =media-gfx/imagemagick-6*"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	# Avoid unused dependency on rake-compiler. This also avoids an
-	# extra compile during tests.
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/end/ s:^:#:' \
-		-e '/compile/ s:^:#:' Rakefile || die
-
-	# Avoid simplecov dependency
-	sed -i -e '/simplecov/ s:^:#:' Rakefile test/test_all_basic.rb || die
-
-	# Squelch harmless warning about imagemagick installation.
-	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
-
-	# Avoid some tests that seem to be very dependent on specific
-	# imagemagick versions. color defs?
-	sed -i -e '/test_gray/,/^  end/ s:^:#:' test/Image2.rb || die
-	sed -i -e '/test_\(delete_if\|reject\)/,/^    end/ s:^:#:' test/ImageList1.rb || die
-	sed -i -e '/test_optimize_layers/,/^  end/ s:^:#:' test/ImageList2.rb || die
-	sed -i -e '/test_\(background\|border\)_color/,/^  end/ s:^:#:' test/Image_attributes.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/RMagick extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -Cext/RMagick V=1
-	cp ext/RMagick/RMagick2$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -S rake test || die
-	RSPEC_VERSION=3 ruby-ng_rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-
-	if use doc ; then
-		dohtml -r doc
-	fi
-}
diff --git a/dev-ruby/rmagick/rmagick-2.16.0.ebuild b/dev-ruby/rmagick/rmagick-2.16.0.ebuild
index b2278ca41038..1f4f12eba14e 100644
--- a/dev-ruby/rmagick/rmagick-2.16.0.ebuild
+++ b/dev-ruby/rmagick/rmagick-2.16.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/gemhome/rmagick"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~x86 ~x86-macos"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-macos"
 IUSE="doc"
 
 RDEPEND+=" >=media-gfx/imagemagick-6.4.9:= =media-gfx/imagemagick-6*"
diff --git a/dev-ruby/rspec-collection_matchers/Manifest b/dev-ruby/rspec-collection_matchers/Manifest
index 432074014cf0..5fb6d462b900 100644
--- a/dev-ruby/rspec-collection_matchers/Manifest
+++ b/dev-ruby/rspec-collection_matchers/Manifest
@@ -1,4 +1,3 @@
 DIST rspec-collection_matchers-1.1.3.gem 16896 BLAKE2B 76f020d986f7098b873c8d3c2d087a2399f863d6a2ebbc70c2b6cf38a120bd956b85e0c60ad736539972a3f5ad26095ec1bcebf9b6dacf0d2e8979bb84356a5c SHA512 3af81c016f259f363c126ac829c8bd51b9c67d54c5c8b2def317b430b852c27eabbd538b79f0a5a919d5edba66f9501c38de560a7ac26023fae7b5588b57439d
 EBUILD rspec-collection_matchers-1.1.3-r1.ebuild 591 BLAKE2B 91fe1b6d8f4be1191a3cbe458e5af6d987ce91662674b38e935686414b9491db9b7b0d5b07d075fc7554f2f00ba883c6207dbd42ea676420869f8721faf9503d SHA512 c0c0054386dba15d2b2024c420b23cb699e45438cadd33611992506ed2b71d176ebb5227255f2cbbb19376045846395a4b5c6224cc4de84ee1dd65b9fc53f59e
-EBUILD rspec-collection_matchers-1.1.3.ebuild 591 BLAKE2B bc27a0fff1556dca98b5da41e256fefa0fdeff9acf6189c282134f1f1eb44159e25a7447b41ac4d2b076d9c035b40f76c86abee6b5da86a770e81874299063e6 SHA512 c7e3e16ff1017fe6f2746e49a0695e83d232b2d379344032f4658cb5d436bdf8ce417636fdf4ca3e40942a7a0eb4896580688d26d57284020613e9af5cb47c19
 MISC metadata.xml 357 BLAKE2B 1c9db582a7501475800f309d82f162a893ba12f4156a137e4a2b0143448808d066a614d3bad0f23ba8525c658e624b2e105eaf2617114fe03205ecd567aaaac4 SHA512 410f3c228f598963f872d5701edc301479eefdafc8a58b00c0d287bb6c9ba542dbed4d7a31c569500225d1e47150b431d6de6b26b02c7e9d7a8882e3d475be0e
diff --git a/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.1.3.ebuild b/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.1.3.ebuild
deleted file mode 100644
index 2eedcfb47297..000000000000
--- a/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.1.3.ebuild
+++ /dev/null
@@ -1,24 +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_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-collection_matchers"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rspec-expectations-3.0.0"
-
-ruby_add_bdepend "test? ( >=dev-ruby/activemodel-3.0 )"
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index f54e42bb737f..f8ad7d067308 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,13 +1,11 @@
 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.99.2-r2.ebuild 3518 BLAKE2B 017a60ccb0ac017b08c4d97903a5bd59921fd0c0bc3b4322059d856bfee6eba2c026242bfda1e2083b043c190ad9160c6122ad62350b07aa0a486afbbb3089b6 SHA512 7b22027fa5ae71e80f071c4fc7cf3fa0e291ec42e06e0c07bcd0e94ab2782aa2dd79d4cba709751077b7c19cb0c5bc7a346c2c424cf9ffbbb62ed486776b6888
-EBUILD rspec-core-3.5.3.ebuild 3164 BLAKE2B 0eb341fc376171025a09bac586b90d4a1f16412bdb384df1d14b3dad7e4784ac4c456acb6dcc400fdeedcd1d9fbb2c6b098f60259bc179e8a9aae3cc4e36e2ae SHA512 fb8fc39c784cf66a63385d6e58abfe2e74833ea5594c0d01887e883003a67603dabea69a2c598bd38ab69a49938136c0462fa4a217363b1d4cd189a9e4946dbe
 EBUILD rspec-core-3.5.4.ebuild 3178 BLAKE2B 511992cfaa43a4fb51e907994c0edf0862d31f6f899c0cc04577d8fd31f48c450a1a82ebeabc5862d10e5a0793d266cabdffd94541ad3ff6016043029d07b1a6 SHA512 93b1179badab718a9ba151b489381a0892ab9975fbe405fcc99cf6b4725965d5aca29b25ec4bce93e2636a8d87ccdf427ad39ba468643f506d8aee4adea04b0f
-EBUILD rspec-core-3.6.0.ebuild 3252 BLAKE2B 4d2d1058f2036ed09e4cf0f23b68db9f4b29306b5124132f32300eaddfaa0a821f8094200b783bfedd683bec0514f96d82133ab9d71ca8cfe58ee69ba0df146b SHA512 575745f7130de9def74527388bd53f2c4b2d7feadbeb08ee4fdd6768e03070d09b544df718601457067f7257499942f71ae7e7d8e1813e126dd0b38f25876907
+EBUILD rspec-core-3.6.0.ebuild 3251 BLAKE2B 9526a5d794453801c4b28ab0109a89ef1953318277fcc62a54d7a14909d8f1674bebb4994d49ecc5d3dcdc05da9302839f296ad1e024bedea82c388468709ad1 SHA512 2a1df88e8ef875f4f8095812d3e098ddc983c410828a19cc3e1e12a1412c8a557439f304a70e8464a814110b97502dbc59e72a241cb4a0db3f3a2459a94c2194
 EBUILD rspec-core-3.7.0.ebuild 3239 BLAKE2B f894a7c9e1e777bef0bc6386ed876aca414642f2b2802b44fd86d145c2c5ad86701d402ba2c22a664ed796f9e4a04c8aa2b51b8bfe94d78202f0635b15bc9c79 SHA512 ba0dcccd775215fe8e61ea0b054636c62499c206f3bddd5302f771808f0dc386c270a2b821f6a1ad5ba9a2f6a3a4a6205c47227e35ef8798a569a35a7c171271
 EBUILD rspec-core-3.7.1.ebuild 3246 BLAKE2B c1e262b43546660140c3aee461f218d876e9f5b8d02b96342e88ab9a914a9b2135e6071f0883457fe9a8b4e14a5b1b219ca13e69e36f3afb3cdc848795bdadd6 SHA512 a16e64897f9e27e1298f2f36824786b2d24ef797107c2397221b2c4f5e0058000459e4cbaf3793374edda890022b2c6c9adf4d999201b457b9de67e8b7b389ea
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/rspec-core-3.5.3.ebuild b/dev-ruby/rspec-core/rspec-core-3.5.3.ebuild
deleted file mode 100644
index 1a4b90967844..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.5.3.ebuild
+++ /dev/null
@@ -1,99 +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="none"
-RUBY_FAKEGEM_TASK_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="highlight"
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	!!<dev-ruby/rspec-core-2.14.8-r4
-	highlight? ( >=dev-ruby/coderay-1.0.9 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.0.9
-		dev-ruby/syntax
-		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/rspec-expectations-3.3.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm spec/integration/{failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb spec/support/aruba_support.rb || die
-
-	# Avoid a spec failing due to path issues
-	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
-		spec/rspec/core/configuration_spec.rb || die
-
-	# Avoid specs for older coderay version which is no longer packaged
-	sed -i -e '/highlights the syntax of the provided lines/ s/do/,skip: true do/' \
-		-e '/dynamically adjusts to changing color config/ s/do/,skip: true do/' \
-		spec/rspec/core/source/syntax_highlighter_spec.rb
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-
-	# case ${RUBY} in
-	# 	*ruby22)
-	# 		# The rubygems version bundled with ruby 2.2 causes warnings.
-	# 		sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
-	# 		;;
-	# esac
-}
-
-all_ruby_compile() {
-	if use doc ; then
-		yardoc || die
-	fi
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild
index 12b61a638e7f..2a5ec9157860 100644
--- a/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index da0765d5d6ea..54ae56cb3196 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -5,6 +5,6 @@ DIST rspec-expectations-3.6.0-git.tgz 193897 BLAKE2B f3fc2b06a317e77838e2d483416
 DIST rspec-expectations-3.7.0-git.tgz 194071 BLAKE2B 67c8db15c43cc1141b19c6eb99390eaaf2535ec03f0fdc7b05576daa463d252f56ff251d40f5771726ee6451d57eef206c893f2593b01d413b5d96cdf21f0daf SHA512 bdd3222089299e9bfdd6f17a2b8af81d5e695290a3ce976630d586d51ff2df5baf76a3887b8adb31294bd6623ba85f8c2a4a31ac520046515aeeb81fa3a1bd5a
 EBUILD rspec-expectations-2.99.2.ebuild 1696 BLAKE2B c613aa21e9d76decaf26954bf8be2357a12dc92960ab966ac587883a91d023a79d5c9fd4e8e00ffdec9a647cf2483e2aeda03c3a851e2a43dcf5bb340caa7ec2 SHA512 54646cef1a0b856616797a8c11ae5bc684b3c3d9db2999f2a3e6e78b2254ae7efcbc22a924fa069d4b560c407a4cf010d4db3bfeb10851febb90d23d7f032ef4
 EBUILD rspec-expectations-3.5.0.ebuild 1322 BLAKE2B 79d4a73c87e4e93e1c165255ee391915c7b2252fcc7ed308994c170ce4f8e3a163a7df0ca59ef24952b53130dc5d0884dcfab319739d0cb1c026a7d26dfe86f1 SHA512 5a56eadd7f68b0b57eb153e5e14bdb2f2d653bad26d84a266dd3d2d34ffa8a2e9a97df5292fcb35cbadab5cec5e86fb6cbbe18c7810c7f1d976019c0dbcaf1b7
-EBUILD rspec-expectations-3.6.0.ebuild 1337 BLAKE2B 6372594e7dbcccd0fc6cad690bb42e530015fd1c8915fcb7c4b59cc2c4194ad8fafad6754c6565fc1ebd0c82e3fcd9580a7ebe6d94d1620281634f3f1cafaa7e SHA512 6b9da30ce16a9d4feed0f8a2b2822304249c21d3ed2b073a76d9e7aa189f49c4a1ccdc1eae14ebb2eb6478917352eedb6923a877f5f9002113a8692d901f3443
+EBUILD rspec-expectations-3.6.0.ebuild 1336 BLAKE2B 0ec4c51d5f2d066dae402c1be18f2bb54dfd8fde7464acc79ee50dfbb8a3f456a62abcfdb90a898ffa1db3e3812135b66ed61dd9ee108f8f14cb9e9d326002c6 SHA512 9328ddaba773703905f6a19cd5a456562016de9b0a4a146cb86769d2c945856f1a8ef803a12e895f11896e1329238f3892b4f23e1b9c0184c9f9eac3a987fe3c
 EBUILD rspec-expectations-3.7.0.ebuild 1376 BLAKE2B 1c49478e03eb5037247f7e624787302ba6827527f403b7edaa02497e315a367492a6bc3c4a8ac267cd6932c7b8477f7d8ab9d347c685c233df8a6042ed825551 SHA512 3a534370174f697e10bd4bc593564154539ac4e562c4fc9188c3ba032e4b17022d997e27f9b2e4f8258a4eb3f90b6d4df9c1ea31bf8ea5196da9e2757049132d
 MISC metadata.xml 350 BLAKE2B bd2aeaa98f6f5cdbdce70c0dd6eed61eee36323502021664e10356e0e558eb9fbf09f9b056944aaf13859c0f4f29603c5523584e4b823a9218fefb2824edcff6 SHA512 c0cbdb181bc5981daa6dea5ecb445cedbda6d6430218aad98a39b2db67074169305f3cba419fb1e24d79900be311619337a5421b75e0da6d2838a0ccb7de45b1
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild
index 9d8e78760372..0a4ff52e3b93 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 73588ca86876..cdab7fa2e9fb 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -6,6 +6,6 @@ DIST rspec-mocks-3.6.0-git.tgz 189000 BLAKE2B d8fcc25983eeeafdba69bce80bccac2ff9
 DIST rspec-mocks-3.7.0-git.tgz 189170 BLAKE2B a0a622ac593660c673cd80b3f3caddd2ac389000f42a7ed1745e1fcfd28d1986e61e83c265d736f3ad0649531973719bc9c5f6ab07e289cb2da89c4482e64184 SHA512 8673726571ccf8a901281e44faeb25ffcb59579dc380138f0557cd9310192cd340081e5e8ad65ae281777727b502cca2f6877134b0fb48f2e0ea40b133002aff
 EBUILD rspec-mocks-2.99.2.ebuild 1532 BLAKE2B b8cf9d6afcc3f38d304daf6abd0610f4fad1e21f1985a01c906e476a35f50f129175fbe7e457509a7eb65f6a09cbca301deb84c9c70abfec23b48016e52d0356 SHA512 98dadc99f3a3bd894ccca1d2763526acb9754646e5b13fc471672d86a96efc10921742f626ef1090d6285faaf6e7f047abdeaee3217d681e7f4583b19ca774f5
 EBUILD rspec-mocks-3.5.0.ebuild 1346 BLAKE2B 1799d6cba41bcc4cc28e1e1778020c52fafc6a16b7515f72cf31e7bb347007ab3a96c88aa71f121e31e3785fb63518324df72b90e6a0ac464727db2d3338e0b8 SHA512 40cae4ee52db2cfc0274c6961f32f654e9f09291c3a9410756f3dca4a1d42b32e0bf54cd8a83164b7f06cc57ba410aaef478390019e0d1d0b7a0630884cb2a48
-EBUILD rspec-mocks-3.6.0.ebuild 1361 BLAKE2B ce0f1e42593afc6e72e1492b1ddce1727b06536e9f3e88d3b643ace2880a70715f6265284054403e3ba7cece73e9e75d2255311c5eaa7370b6788507bd6ad009 SHA512 cc461d53442077b6e936fd89dbc0ffc9610175cdaf49f3669d1a4be35c33ab06623902be2b3f2c64b2b6f2bef8dda4972b91f716f6f7fa2e3a1c2e69cb2d9e47
+EBUILD rspec-mocks-3.6.0.ebuild 1360 BLAKE2B 87693213f5f557684fc80c15c0f07824f7f2c12d8ed4c1a058db81a6112f28354fdba90effd953d938a73a752b9a7d02ea3c989fb5c806df0bf0158e9bce2934 SHA512 0b88a0db43d8b2ea507e691d0433f613807ba7849e8af584fbd1e4cdf16e5af7a048ab1e7fd9199191cdd2ad02cff735db8f08e6c594ea5163018a01211f666e
 EBUILD rspec-mocks-3.7.0.ebuild 1436 BLAKE2B f25095d08605676528048e7f28c3e5f91872d1f49f3075b147cf01edad4d212c0e09da4eeab6e1554220a015d4e1bd67596d44e93240971372fdff84ac16e639 SHA512 99818678324074efd4a4f2f8132dc4cad1de97dc19fc05d4e967362b47111b98375601835e03deec41bd024b626aaafaf7b42aca7966117c11b9a1ccf3f50ad5
 MISC metadata.xml 343 BLAKE2B 87ebb52b322f698e5242c517ca646e64b3a9a33c6b76d968847b2224b4dd683a9eaae5d03470efe775d350c65e3bfbe16547d4b4b99e2744379fbb7c76cc5680 SHA512 c7956e0175d9fdbfd423140f3c757d4c9e1deb6089577f60d11111a93fde6a7c056dcbac8620c30c8c02693297402aa2f0710e43f60abc0878a51bcb8c624667
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild
index b28236a62938..975c97e8e849 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 913693de79ae..f776fb64b89c 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -3,7 +3,7 @@ DIST rspec-support-3.6.0-git.tgz 64987 BLAKE2B 9337da63047a1b33e8534a74a6dd40042
 DIST rspec-support-3.7.0-git.tgz 65675 BLAKE2B abc204f641014b16cbb433c10b5d5953c8fb1f94491bec359febb627ce1864776ab59e0b706ca908d00c79e75d8c95dc5c8673937c4bb24a2c7c90e6ec5f4e7e SHA512 a4a3fc705d4c31d760777513f86d8b0ca4c9e540b0a6f4b6d1152676f252e1276fedebe7cd259f0dbbb60b447cc179eea194f3a3e5bb023907923cbf16fc8033
 DIST rspec-support-3.7.1-git.tgz 65831 BLAKE2B 8595c496bc8d13e36fdfd4a8be8e055db4ac1e85af63f99158d191c9ef9e0a6ba0a2972ad7661a63eeda959e2969139a99ded71219777fd493544b711b6fea53 SHA512 a5760d696048897d76c665a756474bbb1a1995891e577c989cf68a205644c8608c538bf3d87c558428e2c412e02d3552d47567a0679cd4f8793c06f43eccf459
 EBUILD rspec-support-3.5.0.ebuild 1327 BLAKE2B 0573e7a4db15827ecb994b4f3cb1597b781e8e5faa9b6cbc1ab65ea6940b943f3cfa495d378e72b939472ec0481e014d69a222464aa8e7cb117877e620acf4ca SHA512 4d9e61775a435d1cd2af88e98257b13f21584368903cf3c941b29adcd265f49e5d840268d378fda884c30d7532e16975c7bdb009870abe96181e02a216978db5
-EBUILD rspec-support-3.6.0.ebuild 1349 BLAKE2B a69de0b14cb891a822489776f0782f32c3f5acb4189824f1bb3b17a9f3bfc2f70d5c1fe4929eaae401f0bd4d49dbb0a35ad0444078a60f42e121e933ebe34c73 SHA512 5d02da1b2f9bf202b8df29695d83157d431fcc5e323c98fd81de90cd8c1837509d34ebbc5e704fac627836090335aa1c0c8ee5d36ac0fab9a5cbf39ead7dc6ea
+EBUILD rspec-support-3.6.0.ebuild 1348 BLAKE2B 7c8b756b4c0670f1210e6056a3f0f0f55d6dc3e90b6639306d5038cde38b59ac082f4e0858d8d7a12514fc346d06a959d33a0b952f328b2bd5b2768ddd64638e SHA512 0ef5ada51f9269f8e1da2c9800e70a1e5a5db5a7b25b0ebaca62ae7b0a44763736c5b75b03ee16ef8f78e3f2933ae41a31d213e0d2e1d4206e44c0adc93d0e67
 EBUILD rspec-support-3.7.0.ebuild 1336 BLAKE2B 69fa85e41eb65bbeee3a4e3781d239d6fa489660f1aa8dc0326d4adb989ca8640ab11cea76730d2d707950e91f3616441720ba4c43d54a425c40e4b27fa0380a SHA512 143f1f5e7462a9cd2f61e690cce3bf6d228db73f3adcc9343032c8c88eb112831d993bac92a52571d0b2ca0ff1056c58a3d8c136a6cc1a2205c5aebd5885a1d0
 EBUILD rspec-support-3.7.1.ebuild 1343 BLAKE2B 951484a84844e5042cda10591933a2857b756ed93e45fa54adbd11f31bb8aec6c60748050f8a95034de08c83815a01be065b25a28d6c723c0a0b7436a88fa95f SHA512 d1afec7a788a72076737aea3cce0a4ca0ad0ee1f22d28936343c2ada2185db20ddc65f792e0bad5623fee5118c24455a074bae9ed8b35b84a137d7ce11cab48d
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild
index 391a4ecc2321..c20a74631574 100644
--- a/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.5.0:3 dev-ruby/thread_order )"
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index 462944d27415..b512f6dee48f 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,9 +1,5 @@
 DIST gettext-3.2.2.gem 283648 BLAKE2B d9095e11f3f92ac37f84aad9059e5740af07186caad963b6cbd6081329031122ed2acf402565b5e8bf7c6f51b18d045fab09e6d390effe2f0d7d66981f253efd SHA512 c6806a4f2b9c8519cccdf7651b3482e5938015323648cb1b82acd0632d88ea5c7cdabd925eecb2d4e17d0d396126d4e2ebaac26241c3c7b4f61e187cd4b3133f
-DIST gettext-3.2.3.gem 283648 BLAKE2B b746edbc9effd191a2abcff90f699d7a460845104b76410fab20bfef3294afc51951918441f0912fcadca4f59d810ffde9d5ac16c3de7adde6e5f7508c558bb3 SHA512 a7e6ca4e54a81eba7bd148849823ea480526f6d377d818f89aad28fc4cf79eb7e01dbbbbded441cad143ac806c73241173a1437deddb165ce7f178a9367bc4c5
-DIST gettext-3.2.6.gem 284672 BLAKE2B d431abb3b81e0293eca4b8d3f50fb5840d030aa0c61e2f8f1144680d1e69de4404760f4a0d2b48afbc3a2ca9a6a2a943cd3cf49b9784a33bdde6b0136cbef015 SHA512 8d8a820e9d22aae93de69573b4312f7490d0f494bdd27d6b920c29b5100620297d0622ea6dd693e3f7b0b4e1ebfd867de5e7fcfc04633c211ad2f414d23bb36a
 DIST gettext-3.2.9.gem 285696 BLAKE2B a7bc40b2102f5b937d5f0e407dbaa23ead1da59eb9284c10a249c59548d0e2ad5fcd56b8855439893d2d31b57e0109bb6a9d5cc2d24075f5e360dc16b9291137 SHA512 21496c38cfc16a2b280f30bb94ff4560007eaa7f02c2341cb26aca2969a663c0863cdb650b4eadfd262d8585111dfb572e2ebc66a7a879045de50bf9da80a501
 EBUILD ruby-gettext-3.2.2.ebuild 1655 BLAKE2B 7116c8fbe19549b5ff575f328994e768dcd2ee8b4677a7a5229157fe0e16f63b9f0b27171e4e8256a2ddf79afe7c4b1f51d2b5f15ba2abe6cfef59dcc8fc5c14 SHA512 826549c1ab3f856631b2ef339c920810f5644c31b64103e1668ec0d36ff0f88ed6b1de0654602a25c2df74c06444cfa6183515cde2eb54a80dfabd2f46816222
-EBUILD ruby-gettext-3.2.3.ebuild 1664 BLAKE2B ded260d3515874743b1c6f3aed8de9a5078dc8bc4d9d1521eaae6f00941b53cbfe8fddf04edc47af90a714d2a0f71b65660338170bc089b55268fbcca598f7d7 SHA512 24ef75a8416152521253c812d06cd211312d38eadcd99120965d9de112a988ace5c7fa3fc6d86d028f6df032cb81f5fcebfedb9fad897d46923c5b61ff70e3ad
-EBUILD ruby-gettext-3.2.6.ebuild 1657 BLAKE2B 29bc093dfb7fd29f34b5636337da7bd632027bbfdaf567bdc460710a68fd7724760e14cba19b74130efe7d777ff5fc31f38ab2a65c8f3449e27babd4b4c7f8ca SHA512 13087f1cb0633b0a6408766b44f33aa5f3cf4f49cddef549852c35f5cfe78bbbbf60f8ad726747fbbd9d37d285f4822c033d0f4dfe7b3221f5709d7fcbead8e3
 EBUILD ruby-gettext-3.2.9.ebuild 1664 BLAKE2B 83e39c72c1e61e8e174f2919f1d1e2c86951f150e0c49e9e848afb9c5de0a7f467ce83b577053864dea9f90756277eac33e799b10b802d695bde3ebdc1bef4c0 SHA512 39d385c3be7eb11d4e64b26a4b71a10ef4c7b4d870dde6595064c118e50a349eb2a0ce093bca81518a51c58c2ef0e021c6ee6e8d298cd4380fbe84b1e1f74668
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.2.3.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.2.3.ebuild
deleted file mode 100644
index ed01f2efcb18..000000000000
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.2.3.ebuild
+++ /dev/null
@@ -1,65 +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_NAME="${PN/ruby-/}"
-RUBY_FAKEGEM_VERSION="${PV%_*}"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locale po"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
-HOMEPAGE="https://ruby-gettext.github.io/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc test"
-SLOT="0"
-LICENSE="|| ( Ruby LGPL-3+ )"
-
-ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	dev-ruby/racc"
-ruby_add_bdepend "test? (
-	dev-ruby/test-unit:2
-	dev-ruby/test-unit-rr )"
-
-RDEPEND+=" sys-devel/gettext"
-DEPEND+=" sys-devel/gettext"
-
-all_ruby_prepare() {
-	# Fix broken racc invocation
-	sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
-
-	# Avoid bundler dependency
-	sed -i -e '/bundler/,/helper.install/ s:^:#:' \
-		-e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
-
-	# Avoid dependency on developer-specific tools.
-	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
-
-	# Avoid tests failing due to a missing test file.
-	#sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
-}
-
-each_ruby_test() {
-	# Upstream tries to daisy-chain rake calls but they fail badly
-	# with our setup, so run it manually.
-	${RUBY} test/run-test.rb || die "tests failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r samples
-}
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.2.6.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.2.6.ebuild
deleted file mode 100644
index 50931eb376e1..000000000000
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.2.6.ebuild
+++ /dev/null
@@ -1,65 +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_NAME="${PN/ruby-/}"
-RUBY_FAKEGEM_VERSION="${PV%_*}"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locale po"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
-HOMEPAGE="https://ruby-gettext.github.io/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-SLOT="0"
-LICENSE="|| ( Ruby LGPL-3+ )"
-
-ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	dev-ruby/racc"
-ruby_add_bdepend "test? (
-	dev-ruby/test-unit:2
-	dev-ruby/test-unit-rr )"
-
-RDEPEND+=" sys-devel/gettext"
-DEPEND+=" sys-devel/gettext"
-
-all_ruby_prepare() {
-	# Fix broken racc invocation
-	sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
-
-	# Avoid bundler dependency
-	sed -i -e '/bundler/,/helper.install/ s:^:#:' \
-		-e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
-
-	# Avoid dependency on developer-specific tools.
-	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
-
-	# Avoid tests failing due to a missing test file.
-	#sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
-}
-
-each_ruby_test() {
-	# Upstream tries to daisy-chain rake calls but they fail badly
-	# with our setup, so run it manually.
-	${RUBY} test/run-test.rb || die "tests failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r samples
-}
diff --git a/dev-ruby/ruby-odbc/Manifest b/dev-ruby/ruby-odbc/Manifest
index 6fcbb8f0deeb..51d2e9021bb0 100644
--- a/dev-ruby/ruby-odbc/Manifest
+++ b/dev-ruby/ruby-odbc/Manifest
@@ -1,7 +1,5 @@
 DIST ruby-odbc-0.99997.tar.gz 76708 BLAKE2B d122e7f2cccd305731ba598ca684761daab288903e0f3866735b2672f20a9c6b55ed74d768bd4f79a03e0d743b4dff4704f465e58ed331ce37762ba9f7c1e871 SHA512 15ea850efa9f65467ea829c93f7dc9ecbef9409876b19d0a309d085b20e711da2888b918f77fcd26e6a40096358eab836d6bc3000c534da88f4f3c2b60a8662a
-DIST ruby-odbc-0.99998.tar.gz 76810 BLAKE2B 97422dcd52bafad196fe9ccc7005c1ceae31649231fb62ccb00e45ccecbf46e9c679ff4ef905364b1fa05062aba9054d8c1b89025323b220a0c9893c22fd5fd0 SHA512 c983ca10cd21255d2a927deaac9c4689251f1149cc3c5b0b2a5578d5abdf2eb030a0bd726761eeb07abfb470e611316239de899d4739f4a380a598f4e0881f57
 DIST ruby-odbc-0.99999.tar.gz 76934 BLAKE2B 59de5a544b7eefe8e181f2c6a9a61915361743ef5f7554f778667b50ca0dc57fd0c4f71e406ad6f1d00fb2c6a6509030e61ad34dddecff61896f7bfe383d0a9b SHA512 05e3e67a895406e1a57fbea6f8ecd1c087d836794ea3245bd9eec888eb3c46fa2bf2607cc1b8fdc416d7bc531d783d621c03c9fde004db8c2e431fe838c531af
 EBUILD ruby-odbc-0.99997-r1.ebuild 1484 BLAKE2B 18d2e05bd4cc0eb7ad034edcf24439d35d08963e43f1c77869ae80adfa27485859dd48184e7d69fb58280263b101f133eaaee19d7f362f335da4931b9c8d2771 SHA512 7a36ff449684777faa4bd5ae3aee430f49c7c24619e494220a3c8c456bf01f9be3a35b9e74cb123acb1c5c615078aacd3bb1632e48870026f743d53229e9d568
-EBUILD ruby-odbc-0.99998.ebuild 1487 BLAKE2B ce0ed60d8ac931ea607c18dcd11219a407ea07e054049f9ab31c1ab75ccaf81c36b65f58f0d465bae22fcb840f1290057a622864e5cec77a1cd4d312fb19d28d SHA512 eca1f40cea78aa25a115073211f447cce5c3bb51145e6354679559d3a205d298c4ba230348258b1e56400a04978bcd5525a52cf6d52d31e647f05dbed260de84
 EBUILD ruby-odbc-0.99999.ebuild 1487 BLAKE2B 43317bed28ec3aeaa499b3cec92ef34ec3924925e56a489a84d9b8ce289f7a7cadbe62f7e493e1a1dcf70baf9d0d0d86695f9b28176f73cc1119011d13acd78f SHA512 a0f5727ff0056b9adeabf4431d6854df1ea052f021a43295f6e72ce14d49218be65c8470e85db3acac8b7e01580424de57099fc94b437771bbbcfafa74f3655b
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ruby-odbc/ruby-odbc-0.99998.ebuild b/dev-ruby/ruby-odbc/ruby-odbc-0.99998.ebuild
deleted file mode 100644
index 31c808eaa54d..000000000000
--- a/dev-ruby/ruby-odbc/ruby-odbc-0.99998.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README ChangeLog"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RubyODBC - For accessing ODBC data sources from the Ruby language"
-HOMEPAGE="http://www.ch-werner.de/rubyodbc/"
-SRC_URI="http://www.ch-werner.de/rubyodbc/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="${DEPEND} >=dev-db/unixODBC-2.0.6"
-RDEPEND="${RDEPEND} >=dev-db/unixODBC-2.0.6"
-
-# tests require to have an ODBC service enabled, so we can't run them
-# for now :(
-RESTRICT=test
-
-all_ruby_prepare() {
-	# Make sure that it doesn't try to use the absolute-local path for
-	# the extension as we'd be unable to run it properly otherwise.
-	sed -i -e 's:\./odbc:odbc:' test/{,utf8/}test.rb || die
-
-	# Since lib should not get installed avoid it entirely…
-	mv lib contrib || die
-}
-
-each_ruby_configure() {
-	for dir in ext ext/utf8; do
-		${RUBY} -C${dir} extconf.rb --disable-dlopen || die "extconf (${dir}) failed"
-	done
-}
-
-each_ruby_compile() {
-	for dir in ext ext/utf8; do
-		emake V=1 -C${dir} || die "emake (${dir}) failed"
-	done
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	ruby_fakegem_newins ext/odbc.so lib/odbc.so
-	ruby_fakegem_newins ext/utf8/odbc_utf8.so lib/odbc_utf8.so
-}
-
-all_ruby_install() {
-	all_fakegem_install
-	dohtml doc/*.html || die
-}
diff --git a/dev-ruby/ruby-oembed/Manifest b/dev-ruby/ruby-oembed/Manifest
index cdcac4f2714a..b0bbd4db3b57 100644
--- a/dev-ruby/ruby-oembed/Manifest
+++ b/dev-ruby/ruby-oembed/Manifest
@@ -1,3 +1,3 @@
 DIST ruby-oembed-0.12.0.gem 690688 BLAKE2B bda4cb7771c19861bcda4692d3cde80e51c0069ce5ee34986c6fbb0b90853646daf5be0277de819877e9163253da03bd7886acb7a717697bcf802a678fab3b72 SHA512 faaf7828641cf419b699ecbbd7a890304ee645faf13ca480c22afbec035687a730a8d53c7825312a4734dfc6633ec4b4c5790c4db18d584c344602310a7ebed9
-EBUILD ruby-oembed-0.12.0.ebuild 821 BLAKE2B e40e7985d83a822c591bca6b782079a5fa90dbe12dcee339b59f5c01f6bbaeaa0e72766df7998e69d16caab92af946b07d4434f99278a190f8530bb60b28f242 SHA512 7c28d03e558a9eeed98c1bac1b69b965c6637f918d2c7c2c221fa1e3dd9bac6f3d42dbc968f7f7b86fd59fce9326150697a339f141a876de4d5acc5a748569ed
+EBUILD ruby-oembed-0.12.0.ebuild 821 BLAKE2B e3ed37c6aeb74e94f063831b0c98caf42209cadf4ef0f30701772f644f4248c292e036afc1b2a7d64740b1794fd3401d85c88d38067cbf237ed81c2a039fc4f9 SHA512 447f1ff748dac3b04b168ac4768c09d2eeb85c9ee2657ed0851b78ada33e49ed75939658ea2bd509737cba8b3d61e923b3fa1ef70013985fa3a40b143be68171
 MISC metadata.xml 345 BLAKE2B 575c6ff6aaa60be02f4afbaa5b6855e9e0a8e24992c7ae7db0f3f23856403c3f223a4e6c861550a96b967585bc0f7aaf937b2a98c6fad69fd6ab69466e98613c SHA512 e0c3ea7c1c5057b74e8b03b5d314050ee21f8a235dafb981888ebec4d8cf866d13723ac1dd6a96a685380f9b30e61c513e1f83328c778a524ecb52f9adee8e03
diff --git a/dev-ruby/ruby-oembed/ruby-oembed-0.12.0.ebuild b/dev-ruby/ruby-oembed/ruby-oembed-0.12.0.ebuild
index 384a19e946f8..68343b8d5ee0 100644
--- a/dev-ruby/ruby-oembed/ruby-oembed-0.12.0.ebuild
+++ b/dev-ruby/ruby-oembed/ruby-oembed-0.12.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_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 74f6f3cd57c5..38d6e0fefd99 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -3,8 +3,6 @@ AUX auto_gem.rb.ruby19 509 BLAKE2B 3aeb669d0dc6c6016091375adf8df8f8a2b810d40e11b
 AUX conf.d-gem_server 81 BLAKE2B 2019f1b5085a824e1a9e0551a8b224391b1db777f15aea7fa613faa1c7a51f6c0015f92c16a95c0c368ad701c125307c0535ca1029891345476636fe45289fb8 SHA512 71630a0530ec62f4024d9bfc4e6afe1f409f3bcb5d71ee5876d1e190c9e69016571ca8f500fcc7ffea6cbc36a8dab5eef2d0c61f72de99f2776c9137010b9ccd
 AUX gentoo-defaults.rb 972 BLAKE2B 4353b782296ad04f400fbdbd67dcc2f26b23a9bc4a716d107a8f98c5058676c675eb42e1d5e0a7214cd74df9148d54220c0202189938c45f4000301e52a3a73f SHA512 fd5a33c433041efeefba4bb8d550b8db66f31d4c0966188f07943f4f575ee9e13da6ef6fd66f89a4b3b979c5b310d96e2876407b79aee6ed404ca3027859160c
 AUX init.d-gem_server2 503 BLAKE2B 7c602202ba101a5ed7e74a67bc4183085a98fdefb5528afbf975a9f834ce71eb1342bf2ff6206ec6fb8fbb893c908f1aa1cb7a067ec9f161a6205de220ee5259 SHA512 8b9386b93a8ef43fffba5a8c4c5232265a9b0d146d24839e75874721d3377ae0c3d0f52f14592e54c9ee94d26d7a81bb125b25f8c270253cc27e4a76dd64757d
-DIST rubygems-2.6.14.tgz 769418 BLAKE2B 13821b21c7ac4087667c45d7b7e515023e80552072e11bfaa98393f573f361c60bed07bf9aa69d31952deb66e75db3c9b616372203ee7d1fa98a7775eff4c1f5 SHA512 7743845bc5265df3782f85a23896cbb250d8a2bbc9934a27f274b001afa7aa62f7f00f616296f74747ea612d2cb37dd7f533c931aa72550d84c64d2a73d60daf
 DIST rubygems-2.7.6.tgz 852486 BLAKE2B b2c7cf7f2ce5a27beff846d85a3ca2867a4bbadd5bc76af0df76e774c239979bc4b3fac406a65c45444c9f401f92cd1058b45c8b3750c1ee5477cd2b4b513709 SHA512 bc168afc40c974dbc7c37eb5678432ba2ed7469c3f007a159699467ff2cff5205c508237193ee8becaa6eb555b043969cc5f92b2aaa6bf7c958dd7c187e258a7
-EBUILD rubygems-2.6.14.ebuild 4063 BLAKE2B 1ec9da0c225d24faec7dabe1055ead71a31625c7c71981b034761d5cccf4fed8053cbb87312afcb8c439fb805b75af306b7ed5f19d921084ce2616f1a99fc45e SHA512 40ae44ce042618b30297e2495ac5524ad58ab6b3d0b8081bf073707079c819915325940da9ca6ca7163e101b359dc19fee9637a684ca22ed2bb0b1a00d7d01a3
-EBUILD rubygems-2.7.6.ebuild 4403 BLAKE2B 42163f4400c655bdbf4241fc7916d2761a07717e33e29288f9aa206b59e7ad5743b1c682c3aae20128e1c0409b699e8b92780d503ae84e3c846d314d80fec455 SHA512 98e72f837f1a78d3a843f1296090d732947f49f30e7195f0dac3e947a959454f82e1663cd165c3963a3ee4f5f4afa2b46a9ce82f2975dfd67bf95a6bf4ea2915
+EBUILD rubygems-2.7.6.ebuild 4402 BLAKE2B 676944287a3dcc19d81fb767b230a81722458e3326ae45bf92dee940e665c737e14493ffb985eb946bd44d7cc74cb9a349c200976887722f96cd8646448adb52 SHA512 e0748516cb6effd9153a72490ca0e0660c0a27db18d10858cc0dcfa0380dba8be9c8824684f9b2077f52cc43a506c360935068380f6ab6392c9970015093341b
 MISC metadata.xml 335 BLAKE2B c86eaf3d37fad025b8f6ca0b03e65b1b472716b4fda4ca4d08b415b29a63405d8e7b2684d309091c90411c5fe809e5129c6e0c0c4e7a982b4aa062ffdd0ca7fb SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e
diff --git a/dev-ruby/rubygems/rubygems-2.6.14.ebuild b/dev-ruby/rubygems/rubygems-2.6.14.ebuild
deleted file mode 100644
index 8af386831de8..000000000000
--- a/dev-ruby/rubygems/rubygems-2.6.14.ebuild
+++ /dev/null
@@ -1,111 +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"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="https://rubygems.org/"
-LICENSE="|| ( Ruby MIT )"
-
-SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-
-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="server test"
-
-PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/minitest-4:0
-		dev-ruby/rdoc
-	)"
-
-all_ruby_prepare() {
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-
-	# Skip tests for default gems that all fail
-	sed -i -e '/test_default_gems_use_full_paths/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	sed -i -e '/test_execute_ignore_default_gem_verbose/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
-	sed -i -e '/test_execute_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
-	sed -i -e '/test_execute_\(default_details\|show_default_gems\)/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
-	sed -i -e '/test_execute_all/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
-	sed -i -e '/\(test_default_gem\|test_check_executable_overwrite\|test_require_works_after_cleanup\)/,/^  end/ s:^:#:' \
-		test/rubygems/test_{gem_installer,require}.rb || die
-	sed -i -e '/test_\(load_default_gem\|default_spec_stub\)/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
-	sed -i -e '/test_uninstall_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
-	rm -f test/rubygems/test_gem_indexer.rb || die
-	sed -i -e '/test_\(require_when_gem_defined\|realworld_default_gem\)/,/^  end/ s:^:#:' test/rubygems/test_require.rb || die
-
-	# Avoid tests playing tricks with ruby engine that don't seem to
-	# work for us.
-	rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
-
-	# Avoid test requiring network access
-	sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -I.:lib:test \
-			-e 'Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
-
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
-}
-
-all_ruby_install() {
-	dodoc History.txt README.rdoc
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(21|22|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-2.7.6.ebuild b/dev-ruby/rubygems/rubygems-2.7.6.ebuild
index 539794996ecb..58c82993295f 100644
--- a/dev-ruby/rubygems/rubygems-2.7.6.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.7.6.ebuild
@@ -13,7 +13,7 @@ LICENSE="|| ( Ruby MIT )"
 
 SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="server test"
 
diff --git a/dev-ruby/rubypants/Manifest b/dev-ruby/rubypants/Manifest
index 91ce3f4f076e..14f7f6f8033c 100644
--- a/dev-ruby/rubypants/Manifest
+++ b/dev-ruby/rubypants/Manifest
@@ -1,11 +1,5 @@
 DIST rubypants-0.2.0.gem 11264 BLAKE2B cb5e995a6739ea27c94173fc1fb5c525098d71a17a92d09c924cce6803b156a78097def230c9e935bb17d8dac35e86ccfcbbea0e94349804eec170b3646ae8e7 SHA512 f7efe237860e15b2ce164749973d5ef133dce1a6bc5e9429357703b321fb0af8ef4e849f8ed19ed498b6fff13e29da036bb8d379c1220d939c862aba0138a5d6
-DIST rubypants-0.5.0.gem 12288 BLAKE2B eca6f1f5a478659482a82704ebadd0e2d882c8468175e18c95f5e08dd2a720c3e883cf6053da07ae853c4afe16dd71e4ffcdccb63ddb89b7b34647dfb8870aad SHA512 4815439c085da5b219bb8a9542433a1d22d8678ac7b783aaab826fdf9ea57246d246e1d00a57524cba213d37a975a670612d3b7397f7a72b5d0c7a0c62bac441
-DIST rubypants-0.5.1.gem 13312 BLAKE2B a8e4e5ec2c0482a711c54041c3c8f04452fad5e26d7e1a827b22c567a7be7b01b84b0ccdc1572a3ef049b27dc936eb253d868aa58c59304fc1e616d848c8307a SHA512 50c22710628e0d9dca6b2aa51e17eaa0f63052290327b9e2401fca883300ae823442e7631bd6157c9c6cfa9f2328a97c2166f5595979ee53bd72d21b96d6b149
-DIST rubypants-0.6.0.gem 13824 BLAKE2B f05beb472c22da33462d0dc70b3b6b1038d2c3a2d06db8a62b3bce58091182f15f3f45604db3a25c36513d50d36369dad7cef7047191af9cea3c3f06313578a9 SHA512 5d998bc5b19682be5590ba022eb540ba1350f661120d2916b38523a741ec6aae3f6e20825f4e72b2b1cc8200751f55c69fcf9d6b5f1ee81f214f3fea80236c14
 DIST rubypants-0.7.0.gem 13824 BLAKE2B c132b3c60390b712c08ec54b10a14255e21d9622399b9ddba8d2359915411c604052569e5713fdb4b1a3fefcc3416f4d5af16baca19063a0b79203838b8f3066 SHA512 cacd05e0cc87389b5513c83fe085db39202c2789b882b564caaded6b84b1ecb1acbde8232462dadf501c68c1c881ee7b7f4e640feec47c9c0f7a08758b5f5724
 EBUILD rubypants-0.2.0-r5.ebuild 827 BLAKE2B 25ce25c6074acdb86a673517ffaa7f4a6f37d2cd7a11698b75b067d8f8fc6f8689397a1fe1ce417ba1ab0d4b7d238279b7fb15d21085196aaf1710e127b9e9ab SHA512 5096c7df18d37d5c95a2c67ea9e3ba676567925e539fae047cee752c2aa5ecd767b4d856756881c0535985f8bc613a5097f9b2b37483a45c04a22d816b033d96
-EBUILD rubypants-0.5.0.ebuild 524 BLAKE2B 006e16b8350e43f3689919365cf63b9a3befb50ff1ad50ac08d3176365787bfd95b984df78a81e7cba9511d3f24edd20b26a5c189ddb1f8ef7272fce8f31a63b SHA512 c2e3840dbea6e680edf9dc535bfef6fe16fef9df79645481482c313dbacba047302ca637be5dda3096e30e914da04808b9a216fed66dbb9cd07a8bdbf261453a
-EBUILD rubypants-0.5.1.ebuild 524 BLAKE2B 006e16b8350e43f3689919365cf63b9a3befb50ff1ad50ac08d3176365787bfd95b984df78a81e7cba9511d3f24edd20b26a5c189ddb1f8ef7272fce8f31a63b SHA512 c2e3840dbea6e680edf9dc535bfef6fe16fef9df79645481482c313dbacba047302ca637be5dda3096e30e914da04808b9a216fed66dbb9cd07a8bdbf261453a
-EBUILD rubypants-0.6.0.ebuild 598 BLAKE2B 2b713b427fef87bfebe6e392b14dead768bcfefe7f0e5127d895033fe91a5138964da7fc8858dfab3548bdcbea8e0a5aeab758e5e9f7d870a26662d8ead5d912 SHA512 6de6e3777adea013eeb11470af61409c9d901dbcb08ac379781be45f577da68e2891828ffa7a1dbe5d6f6d181bd726db30cd60cc59fbd5fc0bfb3cc92210d8a0
 EBUILD rubypants-0.7.0.ebuild 598 BLAKE2B fc2fde176947749ccdfc47c73ad19755490f791831964b92d14eecc27c31739deacdb47a70343062f80aa6664d34c5501261a55c4f23c57681e30b5e49f998c6 SHA512 7a0e6f7ed831623b871450725c6573b9860b85e69b3759e72a85840b8a26e05ebacbaeea84e2ad57a260070b33e0165dee0eb5fe80dd6cba823e899d4dbe72ca
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/rubypants/rubypants-0.5.0.ebuild b/dev-ruby/rubypants/rubypants-0.5.0.ebuild
deleted file mode 100644
index ef77584a1295..000000000000
--- a/dev-ruby/rubypants/rubypants-0.5.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby port of the SmartyPants PHP library"
-HOMEPAGE="http://chneukirchen.org/repos/rubypants/README"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-each_ruby_test() {
-	${RUBY} -I. test/rubypants_test.rb || die "tests failed"
-}
diff --git a/dev-ruby/rubypants/rubypants-0.5.1.ebuild b/dev-ruby/rubypants/rubypants-0.5.1.ebuild
deleted file mode 100644
index ef77584a1295..000000000000
--- a/dev-ruby/rubypants/rubypants-0.5.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby port of the SmartyPants PHP library"
-HOMEPAGE="http://chneukirchen.org/repos/rubypants/README"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-each_ruby_test() {
-	${RUBY} -I. test/rubypants_test.rb || die "tests failed"
-}
diff --git a/dev-ruby/rubypants/rubypants-0.6.0.ebuild b/dev-ruby/rubypants/rubypants-0.6.0.ebuild
deleted file mode 100644
index 232e56e44d10..000000000000
--- a/dev-ruby/rubypants/rubypants-0.6.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby port of the SmartyPants PHP library"
-HOMEPAGE="http://chneukirchen.org/repos/rubypants/README"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/ecov/I s:^:#:' test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -I. test/rubypants_test.rb || die "tests failed"
-}
diff --git a/dev-ruby/sdoc/Manifest b/dev-ruby/sdoc/Manifest
index b88b1abf5f8e..448b10c30df3 100644
--- a/dev-ruby/sdoc/Manifest
+++ b/dev-ruby/sdoc/Manifest
@@ -1,5 +1,3 @@
-DIST sdoc-0.4.2.gem 282112 BLAKE2B d3ea14735e35d9da6562e19f6b1b5bb3fad915ec235f64bce460d02d574d0da50d81d1e09a3b3753bbf199da5cde80f78ffff17a66f9a42f9b7925b9b1bc38f2 SHA512 2c3aef526b22fbcae1fc4911daca6499df677b4a22364f9ec5598ff3feb74242d0e00d93a16df741d2e383c297835a89ab4fa8122faef00492d7a97ae7e77b1b
 DIST sdoc-1.0.0.gem 268800 BLAKE2B 238b36af9909e7329f6b54e297b4e03f27e8850bee2cb65483c9b912b92c16933639fba5f085ae8c30f808cbd6a94d1b34b5bb45af3f1d9a7fc37a4ea45f32f8 SHA512 cee8be23a2bc53dc3e052e183405ae17546594e2b1b87b7d83c8dc527b2c4bd71a5f642f52ae489f4990ba5d3571c23b590b6a562d677b32597cdeeb08c63a38
-EBUILD sdoc-0.4.2.ebuild 598 BLAKE2B 496fc8d1641b0555bbcf779e6ca8c52074b40c43cd93bc2207f7cf81c40cf1f81f4b94156f4959abd6b8aea1dbcff62fd0d1ebc100460d075570b0c735e2d18a SHA512 5bc4f6d3b4f2177a85299880daef223eb2b63a5a0e5ded71370029abfb37b48b40978b9c86a1679474188b4a28e2371aa1c674424e6bda8593bb58ed58e9cfb5
 EBUILD sdoc-1.0.0.ebuild 603 BLAKE2B feae130f9a9f73d0ea4fe435c818945945bb6e91e0df98eee0e11c0b58c457ee851910d924e8e51df1b416d0086e8b14016da914565775e4f4c808e02f276db3 SHA512 dd57b35ab09df90357f260d3b48f4bae2822bee8ab103d91ca54bd325ebcb21cc5a5cb60dea3573617b3fdf49b320c967e86186448cf2b5b0459a5f946775a31
 MISC metadata.xml 430 BLAKE2B 0aef69f5cf64546a53d97f95bc931935c2e00a4dcec015467aebd1e100349c9808470b536583dd91ec53337202286c6b5837f0fe0571b0df732bab734d692a39 SHA512 abf1644b3da843261358135709a6f6895c34da54714a1d2e83fc6960e2228721e767b44c75e942af360242c9959619e7fd2323fbb96a46df2f652f6c9325d277
diff --git a/dev-ruby/sdoc/sdoc-0.4.2.ebuild b/dev-ruby/sdoc/sdoc-0.4.2.ebuild
deleted file mode 100644
index 162047e3096d..000000000000
--- a/dev-ruby/sdoc/sdoc-0.4.2.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 ruby23"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-DESCRIPTION="rdoc generator html with javascript search index"
-HOMEPAGE="https://rubygems.org/gems/sdoc"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/json-1.7:0
-	=dev-ruby/rdoc-4*"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/ s:^:#:' sdoc.gemspec || die
-}
diff --git a/dev-ruby/seed-fu/Manifest b/dev-ruby/seed-fu/Manifest
index 2b99a02a6dfe..fea7efe5834e 100644
--- a/dev-ruby/seed-fu/Manifest
+++ b/dev-ruby/seed-fu/Manifest
@@ -1,3 +1,5 @@
 DIST seed-fu-2.3.6.tar.gz 13177 BLAKE2B 8e07c0663789eb1859fb18a59a9105d917e8bfca50498062c0a7d9003f5331599722fe8c23269e2c8c0829062881781c9b3cae6de789d6d3ddf6b91cf23c4f05 SHA512 90affb04a0a9b6917501e4961888cba6a13b0b779ca9d11481bad2267db05666467448cc58df995da71718ad46c744301de3bbbaa3edce6b1eb8884207d54771
+DIST seed-fu-2.3.9.tar.gz 13392 BLAKE2B 7468c54013f6a51bcebf4b6ad1f2401d53ddd2a5f61eddc71d0edc088ea1296acf8012ae885036d5f11c5e9336e7dbf67f2508b3d89830647b36d6f7992d574d SHA512 bf5b7a472a5af6bd40f06f60c404c8893641b222d80469765a434a126e182ae6e7fd5281a0ba9d5d61bd89aa515ee0a3f244238108cd41fb15ced501c917b216
 EBUILD seed-fu-2.3.6.ebuild 790 BLAKE2B 4e89fa5cdb261715f8a0dc9f49df625c4f05cbad0340daa57090852aac554fd49e0a43a8942f5e1f74b9ae7e99e287c9bb97af275d99093aaad8dcf82d5993e6 SHA512 ec47083bf0b5ae2354dad3debfdcc7f8c0a858cc20f6afd11f251551de734ab941d7f1b13dc345ee3bf40d96b51325a89f03057c30c130cda2717ba56466258a
+EBUILD seed-fu-2.3.9.ebuild 896 BLAKE2B ad6bbedd881139c9e993a01febfc7c36885753645d32fdf2fcf9712fa0a117a244123d40877a754a9c577baccf905c40970e935db136bd10a89223d14d92cab5 SHA512 6dcbdb9a674aed7279e061512a20e4be68d6e8d8f75f58392891b56ca2c2f372ae891d73bfdb31887e0564a93a60a4d4d6dd90061e4460dab59ba6fd6607fa4a
 MISC metadata.xml 341 BLAKE2B 37740e606b574bc6f821753270b52b9d37ba2a0217f9daee63e8cf66dbf1492411f2efb3726532ac9e79583458c80222d607f260a4117692f94e82a086adbdeb SHA512 7c3ff85e84c8566c1605d41e6bf9767817e01eb198732cf0e0e2adc44b3c803db2d2144acd47426408c8829b08609fb1ed7bc6a9527b869cfa34a97f9538e1da
diff --git a/dev-ruby/seed-fu/seed-fu-2.3.9.ebuild b/dev-ruby/seed-fu/seed-fu-2.3.9.ebuild
new file mode 100644
index 000000000000..2340acd5f04f
--- /dev/null
+++ b/dev-ruby/seed-fu/seed-fu-2.3.9.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Advanced seed data handling for Rails"
+HOMEPAGE="https://github.com/mbleigh/seed-fu"
+SRC_URI="https://github.com/mbleigh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/activerecord-3.1:*
+	>=dev-ruby/activesupport-3.1:*"
+ruby_add_bdepend "test? ( dev-ruby/sqlite3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' spec/spec_helper.rb || die "sed failed"
+
+	# Avoid failing test that appears not be innocent
+	sed -i -e '/raise an ActiveRecord::RecordNotSaved/,/end/ s:^:#:' spec/seeder_spec.rb || die
+}
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index 5d66764f6ce6..2813134d390c 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -2,10 +2,8 @@ DIST selenium-webdriver-2.53.4.gem 897536 BLAKE2B 630b5e8cd5ce53de7a689135ce80e3
 DIST selenium-webdriver-3.10.0.gem 841728 BLAKE2B fb36121b835c7750595cd57c3217c234e12d9f78a29131a12148f464955b1bc3f5a9ef96b6bd8f8aaedd0fa9943bcc42c1f83a0d31ec6663664f6c4f0102b5a3 SHA512 ee1ccad5661f06b16c106b2515285f763baf2b66aefe4c20aed0521e602997af8b1b12640b1099ad0a64f18b01bcec7824dcdd20fe36d9176337f177b8417b2b
 DIST selenium-webdriver-3.11.0.gem 841728 BLAKE2B b3f069645fb166258aebb0f04c8d3f828413b2a1e2f818b7501118760ba79e812ce7d314b21076076f1e6c30590e0d38f026b32ede63ff08197c8f8fbaaefded SHA512 85488c257772a4628d19bd71e7993a82c2c5a9f6332d591b19507ca5e2a96c03fa5c351714a492915888510728f2e5eca28862c69e1ced43d8b56db128d7705e
 DIST selenium-webdriver-3.8.0.gem 840192 BLAKE2B 3f3871afed9734627757e58a211ad894fd45a49b73208b533fd39e0d99172536e7f2abdfbed1e0589c45aac6a26dd0c1ae0cf8f25053d44082957f7d07591d37 SHA512 c00c44786ecee4c02723b88c9ae5921d6a3f2d4c6c3bd043da1f524692c75a69357b752fc183c7881de0d0a6e6d6ddb03ca31e6a983afacdd06978bdd0797957
-DIST selenium-webdriver-3.9.0.gem 841216 BLAKE2B 611a8be3e8759609a792e4f92c73d3e7db6a209a9566fd4f6a7663b4111e5f856e138be83cdce07ceb28dcb23a49ed6d7f403927e96f53751302e73238b701d6 SHA512 5bf2a71322bedfe0e51cae1077886cf520e8cd9213d28dd3643ba78ff457e56649e95df6b09926c82bef98dae7d8c5b6eb676d60939108dd9ead79609cfd2acd
-EBUILD selenium-webdriver-2.53.4-r1.ebuild 1144 BLAKE2B d0ae3b22b1269512bf5011014c62665621d5a249a6fa87f8a53ddd49ce56fac7cbc546518950e3e6204599e85f033e36bd31b0b9c38697728d5225bf7f2ef3c0 SHA512 5bba7aaa5b01a04eb1d8ccd6daa5f431cd4c149b95fa550891dbec98598f3a32fce20c51f9c2ba42f5e9a035f8f40de56a21b6203c6b03b1d12a18a39022c77d
-EBUILD selenium-webdriver-3.10.0.ebuild 910 BLAKE2B 48ebabbf7e451b3099970a2df660ed8b978779d193ce37d46151b5cb27b707e8ea295252f3fdc7a3ba2f2a970d6b7c765de8348c66527b7983edd0f9ba0e06ae SHA512 1e56ed23163e2ac8edc78d3624a4af02df4e5143cb85af7b0b377e0385fa46518bb19d6989f38fb717964cdc339b338a1b6c60fd6a9c9be44c9ad82fa3cd58cc
-EBUILD selenium-webdriver-3.11.0.ebuild 910 BLAKE2B 48ebabbf7e451b3099970a2df660ed8b978779d193ce37d46151b5cb27b707e8ea295252f3fdc7a3ba2f2a970d6b7c765de8348c66527b7983edd0f9ba0e06ae SHA512 1e56ed23163e2ac8edc78d3624a4af02df4e5143cb85af7b0b377e0385fa46518bb19d6989f38fb717964cdc339b338a1b6c60fd6a9c9be44c9ad82fa3cd58cc
+EBUILD selenium-webdriver-2.53.4-r1.ebuild 1137 BLAKE2B c1686329733f5253efee815896b641a422b510d00ce379c14d87a68c487556bf64b0771dc73097bc483dd796e3e890c5fe74e6e4fa296e2a20b60ec8eac3ad7b SHA512 fd3f0c87afd1924a40ebf80ef783414cb6fc256db64e710b922e4b2834cefc2974d11e8a6c037b1d426f867459b4cf90a922f2a8c38ce0a1d426ccc990d1d268
+EBUILD selenium-webdriver-3.10.0.ebuild 909 BLAKE2B d2e55036612eec131dc8c2cb72c1c6f0c3a9aff238d1e3a5fe046a4d177ecf5ffbde9515f6a6fec35fa8dc4bb7175e3a095ad876747da479eff1ade787f76d4a SHA512 1b819c22107caeaba16bfd5f6c326dab4e933602ac5f4e5c3546c8a9051d6698594f3af0ed731f3cd163caafc368dda501169a0d95e9d8ba5d2c939d63f130f5
+EBUILD selenium-webdriver-3.11.0.ebuild 910 BLAKE2B 5e54683c36cf1ad30ea7df577abc0dbdb479ba95444e24fce04d82a43798a7ae90d229b7516fe839fab0d7f048e30a95e785f002100921688312324df783dc01 SHA512 f520e1491c92e14b92340e84f09ebd4b017d161e8adb6681ead3922dc82644a41b67ab0134c0616b9c2a475985a1e9d816e5a4b7ba1e3eafa8b9ad053775444e
 EBUILD selenium-webdriver-3.8.0.ebuild 903 BLAKE2B 6fcc42a6fcc196f662bcc1eba11a627c5e5add3d1f76cd3cdfdec1f451c6ba21b1eb07527a39edbbb386984e502ca749ea4dd9f14afe97902ff7f0e6cd0dabf5 SHA512 753b1db1cd486886846531b97fb0d0fcb08eafcdbe86bf960fe08471feb301d655460e110cf809a204bc3ac3068a1b39f96bf4c180b50408b3c9ab220747510b
-EBUILD selenium-webdriver-3.9.0.ebuild 910 BLAKE2B 48ebabbf7e451b3099970a2df660ed8b978779d193ce37d46151b5cb27b707e8ea295252f3fdc7a3ba2f2a970d6b7c765de8348c66527b7983edd0f9ba0e06ae SHA512 1e56ed23163e2ac8edc78d3624a4af02df4e5143cb85af7b0b377e0385fa46518bb19d6989f38fb717964cdc339b338a1b6c60fd6a9c9be44c9ad82fa3cd58cc
 MISC metadata.xml 335 BLAKE2B 374e7e6bdf450e60792ad3960c2c0fe8ab87f70c34ca76332bbbc632598354e2a774e4eba46434e9b7c85c7f5eee7086ac85268ae58bddea7d75713d9d2f014a SHA512 94e17dd297f6904f1b70709dba5f5612fcc42e9e0e57695df6d37344cc9a89c13b423e41d142631444990ff39367eb6132d6b070bcdbf256ae00e932cadc67e2
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-2.53.4-r1.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-2.53.4-r1.ebuild
index 5614803c6d6e..303687cb407c 100644
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-2.53.4-r1.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-2.53.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 ruby23"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 # NOTE: this package contains precompiled code. It appears that all
 # source code can be found at https://code.google.com/p/selenium/ but the
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.10.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.10.0.ebuild
index 67da404fd032..c07650ba818b 100644
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.10.0.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.10.0.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="https://github.com/seleniumhq/selenium"
 
 LICENSE="Apache-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.11.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.11.0.ebuild
index 67da404fd032..eb794075ddf1 100644
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.11.0.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 # NOTE: this package contains precompiled code. It appears that all
 # source code can be found at https://code.google.com/p/selenium/ but the
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.9.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.9.0.ebuild
deleted file mode 100644
index 67da404fd032..000000000000
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.9.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-# NOTE: this package contains precompiled code. It appears that all
-# source code can be found at https://code.google.com/p/selenium/ but the
-# repository is not organized in a way so that we can easily rebuild the
-# suited shared object. We'll just try our luck with the precompiled
-# objects for now.
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
-QA_PREBUILT="*/x_ignore_nofocus.so"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem provides Ruby bindings for WebDriver"
-HOMEPAGE="https://github.com/seleniumhq/selenium"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
-	>=dev-ruby/rubyzip-1.2:1"
diff --git a/dev-ruby/shoulda/Manifest b/dev-ruby/shoulda/Manifest
index f1811bf11bfe..c684e599c74b 100644
--- a/dev-ruby/shoulda/Manifest
+++ b/dev-ruby/shoulda/Manifest
@@ -1,5 +1,5 @@
 DIST shoulda-2.11.3.tar.gz 145068 BLAKE2B 5e6d9b78b255612ec18c78076f9c4d45265a3e02a8fd56a127ea8f235e3b344005942c4b6e53014e6328206501c178ce76e1554a9d995ba0de04f5afefe4a0f7 SHA512 0b347c4a8be177b5806364114c25dc786ca2ac95a11c93a723dbc9ea1f6d8ae62df7fb420a52d477cd1e10e8d894074072a040eef36ee8a43440e5256c8427e4
 DIST shoulda-3.5.0.tar.gz 7149 BLAKE2B 2944ac1b586d960dbe3706ca9fe8f3448ab15b23e5b6ed188cac1c4280f47fec1bd9c0f9231fc7003956eb45dbac49920d9195e5f648e6fc127b4c71e2ca79c6 SHA512 41fe41ab1fcd3dd1b2ebde1163cb0712f4cd2615fea9cd2ad6fbd6de46cca8039db94fb91ce1850e84632dbfc299692a728ec91e7c0fbf2d9050fa2c1ee98933
-EBUILD shoulda-2.11.3-r2.ebuild 911 BLAKE2B 50f3571be03bbe6a4d66414911c574d29c2d805400c6bd7c8c3ccc611e3aac69ff2458d580ce62440bd5cefe8dd6ce504cab811fab42621f24687f600e636411 SHA512 820af43c255edb5a33a18c3d22a69ea708526c1029f20ce25d29c6b80f84b07fb8fc47036c7a9ca981300f34d4ef100f3efb8f5e5b2a7b94e6c6a537e43229a3
+EBUILD shoulda-2.11.3-r2.ebuild 904 BLAKE2B 9b0f29da7c4ef2ac51d88be19f3ca85cd938be478d64f034b6bea0a6e1dfef3cf57d03f7fc627e118ac445264e817adf36e93472fdaf4c9b2c00c22c785ddc04 SHA512 d7a1ef6cbceff79c777d7654eae1ec0bada5647096d91b052cf34109da2aaa85fcc91449b274a1ce6d4778266fb3fc0f5425bf7c64c2cd4359eb6bd6aa9fd316
 EBUILD shoulda-3.5.0-r3.ebuild 868 BLAKE2B 4ea60ae851c1056da7f8d61ebced597b421679b97c994ac8ab73d5637c6ba1416263d68473cd5f01942a6490c8c3a68c721739f4fd812c1bf66802b96c945eb1 SHA512 a4067d7d4ee8e7a4017469eaa674733b587aaa0967f0d30f8ce36b98ef8468300e04c4344853c483e372fc22a84942753ed69d78841694b907b6cbdacaf02cf2
 MISC metadata.xml 344 BLAKE2B 4f4a9e5d5bc1e6a6a10552ef0285ca16024cdd9bc838a25397b23de1f873a3ca87194d0912f8d0a0c24158d4f10fdb92fcecb15f246e96dc12a95e56604770fd SHA512 b4fa8d5ce8421c5541cdaf288da9a8589ea6f4682470b376921e987d5a5344352afc2f20edbdf1f54ac46fe658f46c4863ec4dc5dc8eebe1c3223a15c72f450d
diff --git a/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild b/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
index 720b499efc31..97c76975b734 100644
--- a/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
+++ b/dev-ruby/shoulda/shoulda-2.11.3-r2.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="ruby23 ruby24 ruby25"
 
 # Use rdoc recipe to avoid obsolete Rakefile
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/sigar/Manifest b/dev-ruby/sigar/Manifest
index 91ab098bc455..22399e4e0327 100644
--- a/dev-ruby/sigar/Manifest
+++ b/dev-ruby/sigar/Manifest
@@ -1,3 +1,3 @@
 DIST sigar-0.7.3.gem 205312 BLAKE2B 1a1d526e2f60a4a91ef405bbb7bf6aede2d4707631108f2779dfd1533d345b9e2c1fb586aa748d13ff1f7cb0b228e34618a0e8d549a3b4b4dc44a37684f2e970 SHA512 cdab3ec8b9662bfa3a432f0206c34c99c6e6e0ac5c85a93cb472367a9f325a27d5232bf2166f5c2955817e3ab8bd1035db06aad709ce20cc261f1b15d89dea2a
-EBUILD sigar-0.7.3.ebuild 975 BLAKE2B d0c908a4f3b8c95935fecfde18e6228760c5ef628f3073080b1e388d02c69a0b1b301436a3ee4302f76ef87294f621c4a3546e1be3f8a6c4b2ced7d036c12ac4 SHA512 84d2c952c5d05b215dfa7ef4fcbb36c89cc5a263921dda077cf5b140635aad444286ec5be9faae471674d2f01d9c3046042a100171fce1bef49e148ff352024b
+EBUILD sigar-0.7.3.ebuild 968 BLAKE2B 3a9371ae40cc6788bbd164925094ed921f2829a7b9c389d82c78c3b562e41c9278ec655f2748a458c0c10921d78f3ed98134a38f0842b1473e6e31c1bcc96d3f SHA512 d0da69d9fe127c571379e3188bffe0372cc39c331684ec893e740f4671b4993a27c819f3fa2fc6e54fb7e853426652e61c1b2738971d20938780830b2b770e66
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sigar/sigar-0.7.3.ebuild b/dev-ruby/sigar/sigar-0.7.3.ebuild
index 116f75eba323..7045ab9949cb 100644
--- a/dev-ruby/sigar/sigar-0.7.3.ebuild
+++ b/dev-ruby/sigar/sigar-0.7.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index c3b83ded76d2..ea876f6d3fe7 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -1,5 +1,3 @@
-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 1150 BLAKE2B 06a69ab2376366675bb8fc69ff244e4873de29b1cab05e9e423b7776beebea74164d263f7e0d5b22ad9fa9cbf3597eed73cde8afe43e024e2dbb6153501a94e8 SHA512 bae583355cf7b1912ec15fa6fcc93b3e47abfe6a7ef9acffbc1461ac27d74b11a1ad748e6fe9b0851e54ac7b229a1c6dcf4ff04127b1f16de0829c367197e44f
-EBUILD sinatra-1.4.8.ebuild 1277 BLAKE2B ea105651157a50c9281b50c0b8684de23eb3f189b1013993e5354afe2050143bd506ac520743563f040d6d45ff5270772643ff4252f5aa6cbfd1380a86a5d2f8 SHA512 c68a5f96ea66382818bd56e76dec6bdb54b3625eeedbc76527f3cd201daf5ee180dc2c6bd03f5b9ded3c1fd8361aaa6268a58bdc06bc5955c3e7dc8932f70430
+EBUILD sinatra-1.4.8.ebuild 1326 BLAKE2B 4ad5b768c4cb9b61ce4f04bfb315ae65991d126e6a4ba42da2ed30c2cc77876cf0fc98c3e89f01550fe3ac60c36570c1a52af90ec44ae2acbcf71d90fb627f18 SHA512 7b91176276d8b5db61475df18ea2ede3b0fa197d2c7341e15ad8c71adf1f1d21c36161ab4523f8918f0ee6a71f5628a3e3b8021a1a4761db91fa0de39193f417
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sinatra/sinatra-1.4.7.ebuild b/dev-ruby/sinatra/sinatra-1.4.7.ebuild
deleted file mode 100644
index 0ac0235cb305..000000000000
--- a/dev-ruby/sinatra/sinatra-1.4.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-# no documentation is generable, it needs hanna, which is broken
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for quickly creating web applications in Ruby with minimal effort"
-HOMEPAGE="http://www.sinatrarb.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/rack-1*:* >=dev-ruby/rack-1.5:*
-	>=dev-ruby/rack-protection-1.4:1
-	>=dev-ruby/tilt-1.3.4:* <dev-ruby/tilt-3:*"
-ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder )"
-
-# haml tests are optional and not yet marked for ruby20.
-#USE_RUBY="ruby20" ruby_add_bdepend "test? ( >=dev-ruby/haml-3.0 )"
-
-all_ruby_prepare() {
-	# Remove implicit build dependency on git.
-	sed -i -e '/\(s.files\|s.test_files\|s.extra_rdoc_files\)/d' sinatra.gemspec || die
-}
diff --git a/dev-ruby/sinatra/sinatra-1.4.8.ebuild b/dev-ruby/sinatra/sinatra-1.4.8.ebuild
index 6a6b7c996db7..0d815fc809b6 100644
--- a/dev-ruby/sinatra/sinatra-1.4.8.ebuild
+++ b/dev-ruby/sinatra/sinatra-1.4.8.ebuild
@@ -2,10 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 # no documentation is generable, it needs hanna, which is broken
 RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test"
 
 RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"
 
diff --git a/dev-ruby/slow_enumerator_tools/Manifest b/dev-ruby/slow_enumerator_tools/Manifest
index 4632f0efe098..f22740703754 100644
--- a/dev-ruby/slow_enumerator_tools/Manifest
+++ b/dev-ruby/slow_enumerator_tools/Manifest
@@ -1,5 +1,5 @@
 DIST slow_enumerator_tools-1.0.0.gem 11264 BLAKE2B f9ff0dcf0fadea1897dbb3944afb29a0f28a9a963dc0e2c6ecf3a67087a7670baaf5054eef9e58feba96f481947fca9cb978572f053f1577eb1819652773f30f SHA512 d557d913e74f2120e9a91350b5a04314285771b7c943087f943bc6a00dd421e27bd4941052c3cd74e20995ddbaa22ca8e9eb60a240fff54dd66b8e2b16d8c2ce
 DIST slow_enumerator_tools-1.1.0.gem 12800 BLAKE2B f8566bd15b37496be4fb7613e97367e62329f53a9da1c5f6c9247cd6fee220063bb91dd77e137bf6e3b419e4e9d2878bbb85747e2f0a939b1fe6740acf87d81f SHA512 0ac2396980d461205d0a2daa41db15016dd8536994cca6599f1e3b7be9c758d51123eefce97f53aaeec06ee1a1f9302d714d113666dbf99ed65be070816f71a2
 EBUILD slow_enumerator_tools-1.0.0.ebuild 650 BLAKE2B 8f64273ae0ffb1b524b3b4b0ae34e577c06435cc7f8d34812411c62d211f99a09ead645ba2e6a4c8ca0622e03e79d2e144c68403449c11bbd8ebf2edf64c3342 SHA512 4887f13f22ab9b5ea05332e3c1a5817884378880c60b584315fcf7ee876ea8617435d44a72deb928e3f7c1d9600aeb6fe97d560f97d8aee717265dbd1d716271
-EBUILD slow_enumerator_tools-1.1.0.ebuild 650 BLAKE2B 8f64273ae0ffb1b524b3b4b0ae34e577c06435cc7f8d34812411c62d211f99a09ead645ba2e6a4c8ca0622e03e79d2e144c68403449c11bbd8ebf2edf64c3342 SHA512 4887f13f22ab9b5ea05332e3c1a5817884378880c60b584315fcf7ee876ea8617435d44a72deb928e3f7c1d9600aeb6fe97d560f97d8aee717265dbd1d716271
+EBUILD slow_enumerator_tools-1.1.0.ebuild 657 BLAKE2B dd078284e8e9d5b19d70d7f66a2cd5898c7217b9f2259ff0428e86eb00b422270054c36064d8ca38e64eaccf93d8c6f13b0ef2d03d17ebcd7d605b27b20f3d10 SHA512 cd51e6413c8ff01f45df64adb29064154329235232f0bfaf64b4623d985660a18adb21ef99d984a19b3d436a153af8af3db17d8282b299455023279d504baf79
 MISC metadata.xml 356 BLAKE2B 8db469c006212a228f58a66c94617f9a6de9ea31be7da210dbbc602a2ed75e2ca16cea4436e5e17375aefacb594ae2b6c5d7a60c96bd4aac49d8f7e5e06502d3 SHA512 741508a694bd3cc4c75e993cbedc01f2ae63355fc0e2872067ac0d2dd9251aba4718badfb967086a79955b37f12bdcd82946933421bfc8a99d7edf49386d6adb
diff --git a/dev-ruby/slow_enumerator_tools/slow_enumerator_tools-1.1.0.ebuild b/dev-ruby/slow_enumerator_tools/slow_enumerator_tools-1.1.0.ebuild
index 9c7b8a34053a..73789766c4f3 100644
--- a/dev-ruby/slow_enumerator_tools/slow_enumerator_tools-1.1.0.ebuild
+++ b/dev-ruby/slow_enumerator_tools/slow_enumerator_tools-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
diff --git a/dev-ruby/syntax/Manifest b/dev-ruby/syntax/Manifest
index 3e49d8a8e6f0..ded083ced8a2 100644
--- a/dev-ruby/syntax/Manifest
+++ b/dev-ruby/syntax/Manifest
@@ -1,8 +1,6 @@
 AUX syntax-1.2.0-require-set.patch 379 BLAKE2B 2f142dce82c2e802e8d8b665a8f547940663366bb27037fe9da8450eee8a633ca7a64687b96532ce4a428f05506fca3bb3cc612971c264e0c5eb8181e8c65d8d SHA512 18a8465164b52a0b39317b50fd69d08f5187f0bc25e709f3bc5ee5bc16a6d257e9e70763447c735615f3b01135c4e2095e0ae8194edf308edd78f4aae08f8d84
 DIST syntax-1.2.0.tar.gz 40797 BLAKE2B e12da53ce9d27b362d70f9074b1ef8f87afb95125f9861169dccc4ea200e5a4a765ec0de867a762eecd2240d773724df25bdac50e27136f35120e182203a34ca SHA512 69804ab94203e2260b4c585aacf68db6ad8e47cf2339ffeb1105ae39da5f1d456b1413eeeef29f1c450bff19780e815b9b1b966b171de3b24595f759b36e6548
-DIST syntax-1.2.1.tar.gz 40994 BLAKE2B f0c748d7ce618fd46a75e97e0c8fc3880e40e7781c9ac61fe4d9c1240a8bb9f2e89fdb4d3b1201a1eb84b11e7b1f169f2305d9532a5177c9a48a001aa1cf2073 SHA512 1b2369a5a71f1818f0074e47e56054707986fbfc14bc799e39925c919d3f00d008e102f11dfc7bbc30ea03c7fab9dddce76e5262bc3e85ce75bcd0550e793f13
 DIST syntax-1.2.2.tar.gz 41485 BLAKE2B 09a1fc9a4172ec8e6a748981a966c891038fe43303360a3e5f2302aa0fb370b1098c7fd7b8a1fc2f022365ac8491b3e9f9146f940dffc772fb68fa8be5245986 SHA512 a3be7ac736d6c77833aa532f17485c076d34e66c40426c9c6be2dbbde87b2adb7154c9b3bed3439cc12577dffc01c8148e0870a0d02b3a02ffbf9fb1d651433b
 EBUILD syntax-1.2.0-r1.ebuild 787 BLAKE2B caaf41ab28b5a03ff413b4d30f75a4496649e57aad4afc57b64bff7b7b1c8310ad5ee8279d105cabe6a17f26a543b8b1cd8b54849d5f426dcf48293a28208d81 SHA512 ca73b45d6f062110ed3f113249129911614e0ebc2e8a40d00235a7d346c709a128d1a0bcdd14c3c52498c2a0aa437f018a5e37f6d91fb8b7598395556eed3101
-EBUILD syntax-1.2.1.ebuild 918 BLAKE2B b0be7aee8bdf190d9022aa957e622e4d2bdfb218c51793d188303df4bc3baf62e519b62af2b7f6b4e86c126fe80e5ba0837f2b604d13d94bd522274fb92e6e0f SHA512 f209e06add7527ec1c5ede89149f406d8c04f8258ea2ff132e47f934bccdd9c51b95982d72aaabd6cc597c9b91af8a136c2c749d25ce47fc8418c8a35b950103
 EBUILD syntax-1.2.2.ebuild 911 BLAKE2B 1411b6ae193a0a02d6e84a83b0d658ba836fe8a9127faa4600480ac1e86723304cfb71ddab4d56c284af2fd62bfe5a894ed9895c76c28cb8cf8c72898900846a SHA512 cce555ad759eb9489ee0d07daa8a1c3409fa5b402a7dfb95b11c6d3043b8c67be7cb9b5781915ebfd723a07c11c0023af11b53200df5e99b8aca2b4406bff544
 MISC metadata.xml 339 BLAKE2B 007757aafebca384bbe340c653875cdfa7c36a40d0fcc948f28f2a1eae85265100d30442f1bc05af9b4286f88f969d54bcf001ad9156aa0bd3dbbbf999a3f129 SHA512 d3d2406f489b687ceb61d99a66ec5e0a4539491277a5c2b5006e03414d14fbd5a25d7de00d2983ab629a1c8efb3e4999681734d07df9ef67f6a01c6abe3f0608
diff --git a/dev-ruby/syntax/syntax-1.2.1.ebuild b/dev-ruby/syntax/syntax-1.2.1.ebuild
deleted file mode 100644
index 41f4003b936c..000000000000
--- a/dev-ruby/syntax/syntax-1.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Syntax highlighting for sourcecode and HTML"
-HOMEPAGE="https://github.com/dblock/syntax"
-SRC_URI="https://github.com/dblock/syntax/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test doc"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	# Remove manual doc since it can not longer be build and it blocks default rdoc recipe.
-	rm -rf doc || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/ALL-TESTS.rb || die
-}
diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index 80b3ec256f55..f50f56e3db17 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -1,7 +1,5 @@
-DIST thor-git-0.19.1.tgz 86389 BLAKE2B e5fdadf13639c93cf36d8ce3c0124eed5bdfc738534652df75863728fd91241362dd5bba57d7bbef087b6f28be6e14bcb361b7ecaeea180012140f433ac33e3d SHA512 67aeaa2822b462c59ea9fd1a197222ce997b0edd30eb714b0a303c816acff82f4fb10a650b8a3c508c796426517ba25a462551fbc73ed7b33d4e16207cad8991
 DIST thor-git-0.19.4.tgz 88733 BLAKE2B 8be54310cc4bf4a0308e6b103832831b89285003bb22a679986cd02636aaee57a25aa606f3e99bf532961a4e1d3625c46bfdb874a09f66cab85a21e5f7ed22d6 SHA512 a5cc52b23806e6104b12f924324960f2567bcd6c73b72ad47c33da222201b0377e7677b996698774de8adf3eff551926393785323ecf46cb59d72eb0e5b05aa0
 DIST thor-git-0.20.0.tgz 91758 BLAKE2B 86e4079a86a9c65852e710e40e49e915afe5522512f061ecc62aed48acc08a5397cc82d45cff7c4b1dd549ec57d8699b9afe7c391ac9ab838d1ba9100f1f058a SHA512 aa5344c94cad7c33dd0582409dbcf9bd109bf97b37131357a4cc8a66317acf8781460e8fe5532b301a74521010be59bb34ac1c68bc01ad3140bfe73fedc2a451
-EBUILD thor-0.19.1.ebuild 1667 BLAKE2B 0fc80a8a6951191c3c109f0bce1c9c1ac9ebc920f02d0749aa03e245100ce061c8aa4ec2e5cde3497ac8e351d092787b49a814624677ad943203e23689822441 SHA512 5c18689a805e35e6629bf4e1c8d02ce934502856f0a9d9ec4da166f14818880b28a83cb344805c25cea29c930cb22c6eda0224ce16fd50624dc727de7cc402eb
-EBUILD thor-0.19.4.ebuild 1148 BLAKE2B 4f305e138f028d7640fbd0c5bc3e6ca8eb3a281862e076cdb2e1af1857fec73a9b328912b85d84580994c307d740ad9be11a534d59c300e403ff67d153b8bc93 SHA512 61ed1d8bdbfbc3ddc2ee33956ab2f17cf262aa75983696248a39dbce50010c2efd161138a825d8f90d2f861c36c02d1b4f81a1f049f8ea703ae2a1d586296cee
+EBUILD thor-0.19.4.ebuild 1155 BLAKE2B db1b5e8f9f73f8638aea3ead1a1cc7e754a829c8be39d8179aa5a7b9af1ce50349191bff14e2a8c52d0f3e54e64cd60d7eb486c55b6316f951e4660c3f7826e9 SHA512 74b73fbce42e3fc78572b5d9723fdeb6d00fea7544583540bce034265ce27744c4cfa86b346331d1db051c6858a420afcac5ca027ed9d4fc987d7e9a424c47b6
 EBUILD thor-0.20.0.ebuild 1437 BLAKE2B 2402abd3eb5b17bbd577f0a77df7d95b51a38e023555b0f39136cc9e3d3a0e53b80ba375a3851c4ffd037d5341f1d6606583c7339429a436df2c140ca9b6d990 SHA512 90e2e05922022ed356d7c81812cfadef0ec1fff1f0f9680edf9c039d33cdebc44128f31408df83e1eee7cd1696cfa267ec239bfd9dd0941dd16d7daeb299fda6
 MISC metadata.xml 680 BLAKE2B d4b03ac058de229b055e01ee99da7745a8fc67200979f626b55d6156d573269bb260c42ef44d6dd3b391a3e06d46844ef3fcd7cdd1f0d4053957c00bcfb1fd27 SHA512 d4938ad6ec003fe17d09274f39a2526c84d69d447b1e8063e9301000b776496fb3f8fd6d7e596791d9f8d05714e856d6a6d8df2c5c4747420e3221edf48ab264
diff --git a/dev-ruby/thor/thor-0.19.1.ebuild b/dev-ruby/thor/thor-0.19.1.ebuild
deleted file mode 100644
index 5c4bcef80a7f..000000000000
--- a/dev-ruby/thor/thor-0.19.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_BINWRAP="thor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A scripting framework that replaces rake and sake"
-HOMEPAGE="http://whatisthor.com/"
-
-SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc"
-
-# fakeweb is not compatible with ruby22. Upstream has switched to
-# webmock but leads to circular dependencies via childlabor's
-# dependencies, so skip tests for ruby22 for now.
-USE_RUBY="ruby20 ruby21" ruby_add_bdepend "
-	test? (
-		>=dev-ruby/fakeweb-1.3
-		dev-ruby/childlabor
-	)"
-
-all_ruby_prepare() {
-	# Remove rspec default options (as we might not have the last
-	# rspec).
-	rm .rspec || die
-
-	# Remove Bundler
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Thorfile || die
-
-	# Remove mandatory coverage collection using simplecov which is not
-	# packaged.
-	sed -i -e '/require .simplecov/,/^end/ s:^:#:' spec/helper.rb || die
-
-	# Avoid a spec that requires UTF-8 support, so LANG=C still works,
-	# bug 430402
-	sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby23)
-			einfo "Skipping tests due to circular dependencies"
-			;;
-		*ruby22)
-			einfo "Skipping tests due to circular dependencies"
-			;;
-		*)
-			ruby-ng_rspec spec || die
-			;;
-	esac
-}
diff --git a/dev-ruby/thor/thor-0.19.4.ebuild b/dev-ruby/thor/thor-0.19.4.ebuild
index c1e11304fac7..f548e71b984e 100644
--- a/dev-ruby/thor/thor-0.19.4.ebuild
+++ b/dev-ruby/thor/thor-0.19.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="doc"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index 5a219b370a4a..dc7b377b14d3 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -3,5 +3,5 @@ DIST tilt-2.0.7.gem 54272 BLAKE2B ee532ce6e68937677f7d5c4ea763ba5bfc84d87a052e15
 DIST tilt-2.0.8.gem 54784 BLAKE2B 14b067227a1c81060b4627d39fadcae00300fa30c3b4741c2c07f0e69bbe62b1f1e8f3a165f43ff72c9788d3621a133375c3be72c9bf16f0c18686f550bc3c16 SHA512 1767f2e5ce45afe95d84d32de7c2b6fe24ff7cb6f7ee8485d84344820b2f6e969ae60a6fbaa7141f7fe135c6540d96fa5b27fd8010b95c0ded5d049a315001d5
 EBUILD tilt-2.0.5.ebuild 1476 BLAKE2B 06c6e022c0a989f69995a62e893b0a4abd25f03ed9dc5d8daaaa8a6f02aa9856ede7e4e6e49624f88a0a6a11cf45ba27e99b3b4576fbe6a1a0dead5440d787db SHA512 89e0fcaf8fa663e5868f36b2b85192b0922e27ca0c9a3c82ced87c8b31d8d456dc994f67304a2c2908e07062ee225527cbef2c79d83a3e7fbe3b865e875353bb
 EBUILD tilt-2.0.7.ebuild 1453 BLAKE2B 40f643f867244d0056b23bd20c6d438eefab81a076ac6a7880c1a863f0e2f9dde14f4a67603503bf7c25dd420b45c8399385de47ef606ea3a481aef4675d90f6 SHA512 a0cbaa9ab3c7eb7dbb0b184951b57c8b2c3e5c2dd9dbd60d66c8d5e2a95c5c56cde0f8dd336046d970cde62791a1364a087d48b0866d5b47e51bf7ad4a1e674e
-EBUILD tilt-2.0.8.ebuild 1459 BLAKE2B 332e313f432a8a62943dcf0d6c9625b5b4ef549194256f0406d7ebdb6ac0507327d71303f9c3cffca4279c305dd6bc915ad03996111abf680632d1597ba7a033 SHA512 b96b41ebe7f5596691319ae72379a7be8290b7fc99846097e960fa0cf2b803a58a1263fefe2a9adb8473595283b1209680d254b4a856167ab5baf3ef19cf3029
+EBUILD tilt-2.0.8.ebuild 1459 BLAKE2B 249675a6168a130385e08d0bf51760b99c53b63b39a61a3d800c3c0e11ddbcdca605f4f9d615b42da6611374d51f9cd2ba9f1c62d55e5087a09ff72570dbc0f0 SHA512 b7c940a530b0a7fd6471c868637da36434f51986997ad9e044ad1f610c72f6e8b1028a9ce984d3ef3d61473c45348eddf95928149792ae92c7f8b7b86b0eeebc
 MISC metadata.xml 339 BLAKE2B d8712c61994758c250248bbd14842a7b64d7808008e3d18fac9330bdc03dcbc6e721ffbb2cb813dea148036bcc40a60c4d8b1588b937a02712eb65c312ddb2db SHA512 f9ee61c88fa51f3fed6864d91c8f77bdcb492befce86f260a49faf141d6c11fc4563e57e1b35511571ec02a41cdb8f2111bb7ee76474d1bc65d81bbace15b730
diff --git a/dev-ruby/tilt/tilt-2.0.8.ebuild b/dev-ruby/tilt/tilt-2.0.8.ebuild
index 6aaa5457b1f9..283dbee57fb1 100644
--- a/dev-ruby/tilt/tilt-2.0.8.ebuild
+++ b/dev-ruby/tilt/tilt-2.0.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/TEMPLATES.md"
diff --git a/dev-ruby/tomlrb/Manifest b/dev-ruby/tomlrb/Manifest
new file mode 100644
index 000000000000..7a8bc0908833
--- /dev/null
+++ b/dev-ruby/tomlrb/Manifest
@@ -0,0 +1,3 @@
+DIST tomlrb-1.2.6.tar.gz 15642 BLAKE2B 4f9d19fd66a88a049360f6d3636fcaf6caa7164149a543db5a162ee48c8fb301a4a884dc77d183a9c9f190d6f9e9e92bca66179c250f240d7014791f11f7a600 SHA512 ada1d801ceda014d4ef9d3c973a14b970ad592323c259dfe0e851c00b554551d59010bb65ee64f8acbf5521132d2fdb4de14306c1a2dd6bf5307035bca100fcf
+EBUILD tomlrb-1.2.6.ebuild 581 BLAKE2B 61059027118b812396281212148a6afbc0fa38a2640d6a0497e9afe166e50d23b7bf6e579349f0c38ae289dcc127e74b8221c937238a86c22aca5a4e82fad79c SHA512 49d9b31b9fd777c564ba72470bc757b8c8223dfd75684b90e130d8e75fb248fae1ecf465ea08ff4e16d83f31bcaac6d866e22797bd2549809f2aab68544a18cb
+MISC metadata.xml 341 BLAKE2B c6a4acddf424e345fc8c0b852b8be8ebf595948ff538a2b6367aed370499c9b4caa963c3f077189c7cc10946bc32e71cf3cb8e4fe9ea7a274f888cb47880cf7d SHA512 3316b67122f7447128fb5aabb66af7f0fd1d7d3d896d8e27708c345297d41aee16383c6012ca3c6b3eb8e2ec78a6343b68cd082ab2db4fb54a5b09d10a39a3b2
diff --git a/dev-ruby/tomlrb/metadata.xml b/dev-ruby/tomlrb/metadata.xml
new file mode 100644
index 000000000000..069d509f369b
--- /dev/null
+++ b/dev-ruby/tomlrb/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">fbernier/tomlrb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/tomlrb/tomlrb-1.2.6.ebuild b/dev-ruby/tomlrb/tomlrb-1.2.6.ebuild
new file mode 100644
index 000000000000..62a611d08c6b
--- /dev/null
+++ b/dev-ruby/tomlrb/tomlrb-1.2.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A racc based toml parser"
+HOMEPAGE="https://github.com/fbernier/tomlrb/"
+SRC_URI="https://github.com/fbernier/tomlrb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/reporters/I s:^:#:' test/minitest_helper.rb || die
+}
diff --git a/dev-ruby/tzinfo/Manifest b/dev-ruby/tzinfo/Manifest
index 88c98b1bd860..a0f68f49fbec 100644
--- a/dev-ruby/tzinfo/Manifest
+++ b/dev-ruby/tzinfo/Manifest
@@ -1,7 +1,7 @@
 DIST tzinfo-0.3.53.gem 301056 BLAKE2B bc1c2da47f1acb1931ef578f757f1ce1d574ddb113f2967171e7f530781431ac11e47c2d02edeb5bf378b817f5e08fa1fde3e3bd36309c0887c45bcd271bc36a SHA512 f5a0119c04852845f1e4c8db36a2a374f2886ee5a14eee74ecacf19bc60bdf3e65197ee2ad1fe4fee56ac882b2e7cf17dcb4fef593767675e1fdb3da33b31b24
 DIST tzinfo-1.2.4.gem 152576 BLAKE2B c6815fc7277153c5e00ea2359845df25affab5a08f9274729254662e056de702613f4b8ca5b4f2ddcd756d86ae12e534a4e2a5a4661f361ef1d59cb3d7f07bfa SHA512 0b983aa6b4fdbb3c49329bb51394f1edbeb6f4d216d108448aa9dce751dbc2e348d58032cb41df78a3d249611770e9e345a4d0041597ceadf052b863c3e6d1ab
 DIST tzinfo-1.2.5.gem 153600 BLAKE2B 3df5625c61eabf94bb457381ac7d0cdebd5b55da3bb043fe58063cccccb623b502e026a71faef4f7d7efe75eae2fdfd0bf3e0b97a3763fec9a1018f0c6c2ae0f SHA512 87f7cd66d6e80d51d216cb993cc76fe7758db03ffd39dde96eb24a9d208699766a8dbff048485fb732ce125ee9f971e38ed9ee1197f3ee3fc3ee8a8da840dd45
-EBUILD tzinfo-0.3.53.ebuild 1037 BLAKE2B cc022bdfb10d40fd36342a251b1923841a0afcc075d8cac4171cf3993f1dcd48c22a2096beb2a508a51bd9308ea6d48333e1d801b560a6f5564f01a235f9b572 SHA512 47af77517243d7cbb6aabb5e7ae1ecddc56dc3c5e02c82895c602ea6dae0ae4ad8838830e870c6a171b2ae32eeb4acb950b8470b9138614f2898362c764c6d15
+EBUILD tzinfo-0.3.53.ebuild 1044 BLAKE2B 0084103aa27d956c27d918ccfa370165ec8ed06601d718cffcaa8b4973d8222df0dd8a7fc93ea9669231eca0bebc2f6a593cd2d64c3b8e4cd068491fe802dcc0 SHA512 11880c275fbc1866fc1d101d2a542198facb82574388dd8a98ab3b76968a719bfb75defd58f067729445754c2e519d38856d121652e47f34e8b51790150ce98b
 EBUILD tzinfo-1.2.4.ebuild 909 BLAKE2B 614ab3bd347a2449da37f4656f09e7c391f71327c419c56da37b95d4a86f73c7cceff175499e2e9d0f70abfe65541aa550b6a11d7eebe61c346151df1dc789fb SHA512 14e82f8882837aed51cad80c89a6c92ace4d9d8df3f3f164b40374f4bf793bf97e94be6dc8e16e0d430d0c920717804badeba7fdf1c57198fed24bd7f54dc5c6
 EBUILD tzinfo-1.2.5.ebuild 919 BLAKE2B 7467074806aefab30b16f6adf11a4f88baa34f1fede9af1d3f9111b7eb518f473c866976a63a98e871a7355feb963ec4b781d5643c58ff0e3d3d9aae42e4baa8 SHA512 8c1a91ea92bb1451d99fdf4978069acc0f688f7e4e55f13811cd2896972063298bf42139cea70ff3174ce572f69e4404dc708bdcf7ae14792228940be8583204
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/tzinfo/tzinfo-0.3.53.ebuild b/dev-ruby/tzinfo/tzinfo-0.3.53.ebuild
index 3e810347f76b..d7c3f12fed46 100644
--- a/dev-ruby/tzinfo/tzinfo-0.3.53.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-0.3.53.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # ruby23 -> fails tests
-USE_RUBY="ruby22"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/unf/Manifest b/dev-ruby/unf/Manifest
index 8142f2741050..3836ff467702 100644
--- a/dev-ruby/unf/Manifest
+++ b/dev-ruby/unf/Manifest
@@ -1,3 +1,3 @@
 DIST unf-0.1.4.gem 120320 BLAKE2B ab339ce957a1d3251d14944ccb4f68a9c7271f0f918f20b57c70824ded730fa18abb5078312d9820e7ef056163b5f1340c1cf72974b6c255279dcf572fb3e87a SHA512 a4784afa8b852497f758d1b6cdcf095eb9e5397a36c97b1f22b53cf8077cfedbf83fdcda36f359acf59ba61f1ab8b706ddd31d097afbc98a40d2dbd0f934292b
-EBUILD unf-0.1.4.ebuild 1196 BLAKE2B 71a379d3227a833d2ae724807ed7901e5e57571dc5b23e9684e1c9252e0d03ad41768c7576b036df370c99ac9ca117712a2cf169ceded036b3f53d19595530f5 SHA512 78dbfa20451f28bddd2250dda745e23e99ca601f841d68e4fd14d6eca97264b06492fea51e9be8e855f9fa15e1741a44691d1cc57ffe2695731d9c9bb6b544fb
+EBUILD unf-0.1.4.ebuild 1189 BLAKE2B 680a523df7d95b5facb908c06a3dfda1a08e76a7b14e58ce7de9286ec01c5530ca4319da00d34e25f0ce413879eea80a91e8759a69b546d5d2656a61fca3c6d8 SHA512 c30061cd255cbcd82f464287ab2d3eea24c2e72f53bb1767ee4925ed7564e745e2981e6b898d04f8a4e8d5d4fcf676df23b8f64ef4508b444baf6669592a6ef0
 MISC metadata.xml 338 BLAKE2B bb58c8e1fade253376d76c2d310ad6455b8495185859dc74605cc8455f7f738eedf03b2a7a092d0db4e9ac06f04e885ae154d06e599fe8720ad50c191e61d37d SHA512 a3be34f62ed4475626a8b984fb80cc1f502798913eedcce341951640e27ff408c0c915848b40c7ab692940e6696a37769389657cc6c996f161c0f75f42f75683
diff --git a/dev-ruby/unf/unf-0.1.4.ebuild b/dev-ruby/unf/unf-0.1.4.ebuild
index 8d25a7d3c31e..0d4fb46745c2 100644
--- a/dev-ruby/unf/unf-0.1.4.ebuild
+++ b/dev-ruby/unf/unf-0.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/virtus/Manifest b/dev-ruby/virtus/Manifest
index ecdb620901a2..2837ebec9ade 100644
--- a/dev-ruby/virtus/Manifest
+++ b/dev-ruby/virtus/Manifest
@@ -1,4 +1,4 @@
 AUX virtus-1.0.5-equalizer.patch 8422 BLAKE2B 939c71ea56a77c1a654e7baf11e0f2ee40b044ad0dde0c1689a0e8c50789b6adf2f8586467f662c3d20e2a9643cda21ff9af865ee19c40ccc3e48069d43e1932 SHA512 70db78b928e1dc23df126bdd081db2664dcf75379e92d3480ad0dad951df9a91d0feaa40de570a6116a71708342d891c073b07395180d85cad50e9e3dd509020
 DIST virtus-1.0.5.gem 49152 BLAKE2B 24f422d96b10c38f9599c48a2018dac5b5bb8979acce1ee206b11d64d74a852ffbd276b78bd55b3b184cc109eb00d27ff1347d143695a4e06edfb94a3e87fd5b SHA512 468b74d6a49410bb4e59c535b9f7736cd5e4743817f19f97483247b0d259e17b069044bd5ccc787d72df972d37903eb7c9a9d6ca0c6642c550f1c84a3bc71825
-EBUILD virtus-1.0.5.ebuild 847 BLAKE2B d98b45379fc864b79b1488accafb52b3b782239025f21311f8cda65e3125c68664abba531e564f5b0dd23611559d6ec30528e7aa02edfb39ec7a5a4efdf46b85 SHA512 dfff28be039371cf3d6e54ec0dab4fc1a20e6d3c61ac7e8c6a81568f5a0b1198f09a0f6f58920d8f2ead21bcbec178f7e5169e71bcf49a1eb74c59301f642ba7
+EBUILD virtus-1.0.5.ebuild 847 BLAKE2B 2f77089213e99544974a8742b2d19e96342a02b948a5beb3e796eb7558b9e7b5822d44274bf6cd44fc9228f061c1d9a7abbeff4762e8f5ef4986d1479ad5b1e7 SHA512 a0c00a9c32d9acfd803a55c5ab27a10df6185c8617b1daee90e5b63fdae1b4c50ed977c75e6a1728abc3d0202aa871d304bde8e28ddc00db27491f0356d86b4f
 MISC metadata.xml 389 BLAKE2B 19ea2d5c5c25b7fd2c9d4cc23141907def94233ae9d6e82cfa45817950fff4e8a927b361c46d1d370c6a418831f2ca8423d51fa29fd20d2929bb0efea283e996 SHA512 b8ce763b943ae56ae0ad2f49f87608d010a39f2a1bd8800572ca799d9ca28e419de8545bc5b3e813e10d0a352fb0e2253d2dd4d0ee601ecea0ec3a98e524c0e4
diff --git a/dev-ruby/virtus/virtus-1.0.5.ebuild b/dev-ruby/virtus/virtus-1.0.5.ebuild
index f08cac98e9eb..33a923897c78 100644
--- a/dev-ruby/virtus/virtus-1.0.5.ebuild
+++ b/dev-ruby/virtus/virtus-1.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_EXTRADOC="Changelog.md CONTRIBUTING.md README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index 00549fe5cb36..f87d620a0605 100644
--- a/dev-ruby/yajl-ruby/Manifest
+++ b/dev-ruby/yajl-ruby/Manifest
@@ -1,5 +1,5 @@
 DIST yajl-ruby-1.3.0.gem 550912 BLAKE2B 1fe5fd43809fec2bf06d8db14cb6cc6ac5fe59dea8afc12d4c8ca6d0ba7c1095f307575c86cdd6954ce0b5756de3fc2232fbd60398bdf1902da005c6d8242031 SHA512 351e46fb7037541096172bac5c3dcadaa6ac9650ac6aae46de2b4ba31b82427f596bade2b233d0d8e916927800e83b7930b5ceeb9d7340edd02c323f9c0b3116
 DIST yajl-ruby-1.3.1.gem 550912 BLAKE2B 809608b5c767c560cf40a0a8d4160f17092762788af9c66e729762ade50fbb0cccd266f1bbd411076ef4b2dc7a4cdfcdeeb552b6d86a58a0d9a38ebf1bad638c SHA512 f18b47f1fd0b039bfec01db0ee298296199fbf91b22a00042e1220a1d8471f72424c082b696829e48ce7dee7514510dd731c2bc36fe29bd08ba7246c820621f4
 EBUILD yajl-ruby-1.3.0.ebuild 1231 BLAKE2B 29060bac0d2f196a06fd38d0010e826b6dea1d2a9c32e11aecb115a314de02c411d9d30889cdd2a8666a2302bfb4ae79cacbc86b9310b9196b0b32aadaeab685 SHA512 c8c2c76ec2c322ab5126822cc75c50cb2005ebc3b1af0bc6ffc5ea9daa83b9a6e07ff40ab4d1f90c1f6cdd6d56d9aae563c05c00b7a3fe6801e8eff3a75c0c3d
-EBUILD yajl-ruby-1.3.1.ebuild 1242 BLAKE2B d9775567d32485a043cc52f5648c6dadb7ff239cbe64acdc51487a6c61365f8765702d2f3b07e0ac1efe00504f645dc42c5b73bb210db2a0d61a1afa3a6d9c67 SHA512 9fbd156cadcb997656d7c0ec110d85a172349cdbae0bcfebdd5cfcb3be10565664a0c24f6f038c428ec03b1e569dbaef39ce283900a8f151706f523b260a035f
+EBUILD yajl-ruby-1.3.1.ebuild 1241 BLAKE2B e01f9f7da0bcca2ab280ef639fbd7dc171c40e7a1a5799903e36c4113ddb207c60db453954e9942bbeccc9d40abdd049004fad2bac69fdb006939aac3362195c SHA512 b6692a2dd966de76148c2b2fdee312a230478a4e7e5e6532657daa93ab95cc8b3c95899d90040f3e24756bbcd8d1648c19bfb00ca6236c2d2293b803e5f291b5
 MISC metadata.xml 346 BLAKE2B 2fff8cc633fbc47874a3e5a9e567ef430dcdd4de90343c35f599b15a85e0601a5d4b3c5b650e3971dab90cd90f382505000b40092e57d05fdaf86536a02106ff SHA512 54921a3e3df293d819d020aa6671e7e33f9031b83d375d6f8423fd844cf757c20c2e6cafc9d5a8f2670e10bd286b4e29067a8d7176e7acafd3474578134a2aae
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild
index 765b4a3eabb5..62463b7a9440 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/yajl-ruby"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${RDEPEND} dev-libs/yajl"
diff --git a/dev-ruby/zentest/Manifest b/dev-ruby/zentest/Manifest
index c9b48ec39429..a2dccd58a562 100644
--- a/dev-ruby/zentest/Manifest
+++ b/dev-ruby/zentest/Manifest
@@ -1,5 +1,5 @@
 DIST ZenTest-4.11.0.gem 71680 BLAKE2B ae2d72ce5ff899dab0905eb7ed1bca0cf2158ec5044254cd7ebb86c59feb746bf18e6a0242f91c49803a062c5d94f5b1b0be4338cadef2a5afd116753259f51b SHA512 cb835ea2e937b7ea56084c138948acb1c2a96500e5b8bd54dd9d195e4005ebdce67b189cdf31a010135f55adb02f3bcf21ff663a26022eb759dd2126558c5c21
 DIST ZenTest-4.11.1.gem 71680 BLAKE2B 27bd94ca98a6739829526c06689ee5a890aa254bef3cb7b7b02d79d82a4fa96faa1853d36069aa801983b4927d44b2af2c852c111ece3b64459c99d63a7a072d SHA512 6f3b5dfb8cc8154856e94f20134e9a6bd2d54e052d05d3e7a250f831ee0a3d3196b497cf118322c51201fb8dd30a05b8a0a0462c58a8852354c4dee2a10d867b
 EBUILD zentest-4.11.0.ebuild 969 BLAKE2B 72c54b3845891c3bd8873fd3bad177c074972b9f8faa37c735cfa62d5a5b29736379e24a686927f3d363724c5df575d2164406b70f067828a4e03b5bb741e4ac SHA512 e0ccf05566fb8329d88e540ed4a6fbf34828d8c7c3108cae3e92dd21ea209349c149585973568e32b038c90247f3cb547e3fad42f38809b702ebc583eab5ec0e
-EBUILD zentest-4.11.1.ebuild 810 BLAKE2B 69ef544705cbc7eea423d3c57eeb151449b6d60ffd590c7367828743b59173e97352d584e2663ab6f0724bd77c2356d99594170b24dc9caa220fe711107c56ec SHA512 369106e50c01747558c311395ec94b3779f6d3e622f6988034c5f7a8b7036433cc82789734e44c779b76eb38f13da952e34a6840926744a04d834677fdf61908
+EBUILD zentest-4.11.1.ebuild 809 BLAKE2B 7d89cedf99bd4d1e4c51ce3a8840b185eda2bfb45f0155f87dd5cd33fa6cf3b5fb76e866f1dd29075625bb22407169a6386c1747ce5b154fa89b29e4d10e0c02 SHA512 73477ba7cc803e9fdc225bed9115fdd4e0931d7c1f3ed059e35feddf16982f0989dfc4601cb0102a3e91b098e2ef78800cd4aa81abc59c6c484120b905f49a1a
 MISC metadata.xml 333 BLAKE2B cf1ac3fbb6994dc96110bdb974b726f53fdfe34db473f272ba78ede47b65e26350b807bf291c65f8a8bcf9e12fc3366e431ca32a277d9ac38cf9d4ed7ea46e62 SHA512 d02fdcc6c8ef63d22d0df77a6c7c82ac1d629d29685e6fc653c70079d56fb1b28574bfc7c372a5298dd4a3e20061aecc705d6824c569ce0f99e3dea464f04fcb
diff --git a/dev-ruby/zentest/zentest-4.11.1.ebuild b/dev-ruby/zentest/zentest-4.11.1.ebuild
index 87f36c10376f..911694231f94 100644
--- a/dev-ruby/zentest/zentest-4.11.1.ebuild
+++ b/dev-ruby/zentest/zentest-4.11.1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::R
 HOMEPAGE="https://github.com/seattlerb/zentest"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-28 20:02:04 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-28 20:02:04 +0100
commit	a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch)
tree	852c90a4bf354c30ea66504f70bfab5401fba18d /dev-ruby
parent	5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff)