gentoo resync : 15.09.2018

63 files changed, 160 insertions, 218 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index f50d7592ba7f..8fe14a9f54a5 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index aed5fe4a49b1..725e342e5dc9 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -3,9 +3,11 @@ DIST autoprefixer-rails-8.6.5.gem 208896 BLAKE2B 50e8b8ef3fec9a0bb8d68afa8950989
 DIST autoprefixer-rails-9.1.0.gem 204800 BLAKE2B 1aa4befa996db5f5e49637327d464816709cf30f816e1107a4916db272a9c7052a96f8cc3ab2b7259d01a0d9eeffab9fc7fd5a3fd7f6b372b6a18bb7fa1126a1 SHA512 aefa976523c6f71a918620803178b11700c8a5d40c32d2e714b085c090b710cf30a9bf9d45b1b6b16f0cf06c1abe219c99f81a7e5e18291e23ba36da50dbc430
 DIST autoprefixer-rails-9.1.1.gem 205824 BLAKE2B 6843495ec1c26ace2268b750d076612f3cdd0c0d7b6b16b0fab1f16cedb27417675e53d7aef126787d50b2ac69c5358a0011f2a5519036c6bc74aee44f63d577 SHA512 7b4a3a6bda8639dc7a3649fb00ba8b074855f9783f8de93c99c027af6494af62701d96b55d212fd34ab0461be8d7fa96b4769d6e1ce03ca4c40d2cd6b320cabe
 DIST autoprefixer-rails-9.1.3.gem 206336 BLAKE2B 57be8e5177d5ae49e39fd7e8ef0a01ef7af562e3da42c1ee05a6c710dc48fae4ba7ab6c9cab8710363d608dd2b5773625a8f46600ee45debd7fc6669697153c9 SHA512 f31b2480d44d2afc9c5a42521917887c167f9f193c07d6549441558f0ea3eb0e2b8eaa71578fbaa367098a027d46f517772666a03e41f1dc8983f3a7fe8654f2
+DIST autoprefixer-rails-9.1.4.gem 206336 BLAKE2B bea7ed6c4650fc9b5e647e186c1f27b229eb1cdfabe21d5d30abec50636252b87e59fe7fa08499d081508c57302816da589276548c9e90cdfda75e89d0643f50 SHA512 75e4fb7986e6f51f104c39f41fc61c991abb942444a78a7befd060c5e6454c4a1981685f93bfab0bfab8ed374b446eed8adb5279bfc627cee22a6a0c1bc7aa7e
 EBUILD autoprefixer-rails-7.2.6.ebuild 827 BLAKE2B fd6aef469bd1e07f5100e88ebe523da96383c721dfc2bee9b7babb7d11f3d710bbb6debf4cf9cd57702f81150c8b7c7ef9a0f3de4efc1e6325240fd1bf2e4bf0 SHA512 f17f3e58a7cf0a8d960d683d3cdc6ddae7065ce7d28d3284b45b169210a068a9ec0dafcee100fcbda098aab73c809f455908df069ba72e5536b95aa1ddac7ace
 EBUILD autoprefixer-rails-8.6.5.ebuild 827 BLAKE2B 4bce491c80db4a8eb1d77467167c3c290c0af5311f4395424f5f0c4e2b30e1474fed1746c3dc5127413d48b9e7031f8e782f7b5d1a1987550747c3900d8954cd SHA512 8bd8a32ceb04e688ec4d149a67b98905b2ec975684f3fb2fe3dddcc4ff0d8a04e7556b41a3a804a6b1dd2d4c46d4b5ab45c6ed45f300c7171bf2335f73d42768
 EBUILD autoprefixer-rails-9.1.0.ebuild 848 BLAKE2B 875ab493b7f7673729a6743fe86163786024b30fc3703fbba59f9bc1a7767afaecfe7768d33bda44deaac312547523f0c2a43b5b7e732130fb78201fdd662a71 SHA512 dc78cdf0a7de95cebcd20d3493fbd43a11aa4ae00f2ca51bd374837d8f030465c2048d5d7078680a0260084775613e167aebf808d5fce0bb4adebc4240cfc98c
 EBUILD autoprefixer-rails-9.1.1.ebuild 848 BLAKE2B 875ab493b7f7673729a6743fe86163786024b30fc3703fbba59f9bc1a7767afaecfe7768d33bda44deaac312547523f0c2a43b5b7e732130fb78201fdd662a71 SHA512 dc78cdf0a7de95cebcd20d3493fbd43a11aa4ae00f2ca51bd374837d8f030465c2048d5d7078680a0260084775613e167aebf808d5fce0bb4adebc4240cfc98c
 EBUILD autoprefixer-rails-9.1.3.ebuild 848 BLAKE2B 875ab493b7f7673729a6743fe86163786024b30fc3703fbba59f9bc1a7767afaecfe7768d33bda44deaac312547523f0c2a43b5b7e732130fb78201fdd662a71 SHA512 dc78cdf0a7de95cebcd20d3493fbd43a11aa4ae00f2ca51bd374837d8f030465c2048d5d7078680a0260084775613e167aebf808d5fce0bb4adebc4240cfc98c
+EBUILD autoprefixer-rails-9.1.4.ebuild 848 BLAKE2B 875ab493b7f7673729a6743fe86163786024b30fc3703fbba59f9bc1a7767afaecfe7768d33bda44deaac312547523f0c2a43b5b7e732130fb78201fdd662a71 SHA512 dc78cdf0a7de95cebcd20d3493fbd43a11aa4ae00f2ca51bd374837d8f030465c2048d5d7078680a0260084775613e167aebf808d5fce0bb4adebc4240cfc98c
 MISC metadata.xml 347 BLAKE2B 71b067345809944df1e70cdcaa44e44ae416d0c4ff80975aa796b8217170825e6be32a15d2549f464d9a65e8aa9ff1b2e9496989e66bce29d3dad672742495ec SHA512 b0985f41e9463a6c5bdbda0d5a84cc76cb6090614fa07395705b3207e0cd4fadbe9b1bb18fb7382f3c8bd00663db1232fd7107f6757bd20cfca0a0df99928426
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.1.4.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.1.4.ebuild
new file mode 100644
index 000000000000..ea1c27226645
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.1.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
+HOMEPAGE="https://github.com/ai/autoprefixer-rails"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/execjs:*"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rails
+	dev-ruby/rake
+	dev-ruby/rspec-rails
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+	sed -i -e "/Bundler/,+3d" spec/app/config/application.rb || die
+	rm spec/rails_spec.rb spec/compass_spec.rb || die
+}
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 82be44170691..c7240dfaa901 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,17 +1,13 @@
 DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca18ea85a7095d9e58625df6a59a349b60b462c5c4f403a6af955466bc46d82be6cd91724fc2b12cbe15ed74a4c SHA512 3bb994e022593d485a07296193a16cae7b45e96e87dd10b2bd4807ad2bc990801044c0493360598d1626c3e367e8de87e407f65c2c6f42674d5f1b9c0b5c1933
 DIST capybara-3.2.1.gem 284672 BLAKE2B 9da8f588049fab74c4e734626e42758cdd4baf555cfc64e7456bfab2cb4d5c90ed6bfc8ada7cc0d6323ef1113169aec70fd4254aa50c003408376ea4afe00a06 SHA512 50af1d4c49c200a4c08901d19b16826499abb8d19de8e059160c509afd555edbe620b6fd5d78f8c286feeb15a72e5a4b241cb1f14151b349fd94cdd3648b64b2
-DIST capybara-3.4.1.gem 292352 BLAKE2B baf07378ec9c932ca4fac4b9ce465b76704c5b17cea73db01d584dbf7076b2c6defe0170a0575691f6af5dcda2d8f97bd16a3901d36c8a9db63c72491fbfc962 SHA512 abd969af564a9b8a827493674d51e2cabbb57c47795ede260498f99600da0da9bf00c97e64ccd07cfdb1b630135714191f232f166e08856a4cb9fdff6c47fe1a
-DIST capybara-3.4.2.gem 292864 BLAKE2B f04bef4540df60eaaeab2cdf59577962493da34adae1abcb4fc23101244a522fa2bc80ad86ba906368a98e68d6918877a073be1e0068b4eb2ba44e0d060b40cd SHA512 e9415ce626a1391d9a0af944d9afaa536d98b6d44bb19d288e3b71399effa2fa8ffeef72a0fb2d786a3267f6809943f499f50f88f95c24552888db24888867e5
-DIST capybara-3.5.1.gem 294400 BLAKE2B 413281f52305c47cad34b6200e534798f05cf8a4257ca0f396dcb5c7f4d689d1c34463a99644ce8861cb12fe921918c6ddc503ffa3c4f00b04b6570ce1096dfb SHA512 c42c4492865f70fad30f9c554dfd4a5e435102d58c3934392d9e692638ace50dd7f3301628e45eee0ceb0e94f91b051341bdc9eb9a3f498aec7a477a866bc76c
 DIST capybara-3.6.0.gem 296448 BLAKE2B 4054aaac6b6e0d5f1f0c1adee1951dcac7fcb3b2061dfe9de261e6c8bb749d6c88eb2c5a635b683e9a02719870435d52546701f4f21f722068836d4acd78f3eb SHA512 d99e9aab306955e01c08f26e7e8e042019b30d97c106ce6e33c96d7277670b81a143312c06e89c2f6c5f959af461d219c213c3660e895bec1e8cfcae030728b4
 DIST capybara-3.7.0.gem 299008 BLAKE2B 79f08d71085e6fd42986da5cc69e9f2df21ad65eaad7bbc2d450815c5cd3f6ad38889739ddab7e2fa92548bbe4c23940f46e99a5633b3a6fe80988bd417d55ff SHA512 0c40bdaad6423fa86d1e41bc5c2e8ec8bdb90326631f464dd4ed759a28b9c6e03fd4f5292e11f05cf478c0a5ce19b2df628a259861fb80f94fde367d4f4dacde
 DIST capybara-3.7.1.gem 299008 BLAKE2B 0f90ee7266a360c0430e55a60f354f2cc079ce3ffa318a12eef1c8faf9637a1d0678f049fc1a921657ca557d99a30bad54ff51b00645eedbc4ecf9567f9d6a20 SHA512 6d5546607652439f7c487e60859803980e90a511acf43a3bb1b197d2f27a9edf50f95a77d4de2fd40570373c03a25b4a0450bc84d509abd264b926acdc1132f1
+DIST capybara-3.7.2.gem 299520 BLAKE2B eea9d0bc35483174ccedd9366c04484a5b819e40aa6f0d01ceefad1700b04ded446d2b14de826981296666fd5f7a5440f08dc2ee437ee3db8e7bcd70d6cde636 SHA512 980346ea0fd1c3cb6de2423707d8c8e637f64bde2c1ef48622a08d1fe2177e29eb5d7125a048ebafaf4ca1591c483d34a8b17ed7288985dad783023ed35305e0
 EBUILD capybara-2.18.0.ebuild 1525 BLAKE2B 17327933169f1c330a0f0580b8dfd00be4ae39e0fa94d62e172d6621a8a91189925acfca3730685ed80573e6eb456f731d8072fb1adb2653b6b646714a89bc5b SHA512 a6347a7b9014e3ca1bdeee9eed2a9e22d866dd831041e700086b00c4245d254ea3107c82b019f7550faa273777430898c571c837ac4202cdb2cfdf15068edd47
 EBUILD capybara-3.2.1.ebuild 1518 BLAKE2B af598a905b37db7eb77511372ace937bff702c2aa116afcdf4bb2d32bd99489e95a61ca442c8cf5c8174fe7f0021fb7aadb6fda65b2dd7ab41a1d8829bd3099f SHA512 9bcf03fa1561b95257a319825c5ae165914fac5ad4993e028f51d9b3d70bebc7e51203f30cf70d2a9b66a61a4b30dfe85d79037a5f19c3e61997f0e3f41f5372
-EBUILD capybara-3.4.1.ebuild 1502 BLAKE2B 8aa63d3d3d39207e1884b05ba051ebabc8a5d65b472bbb57db356a7482efb91e3adb20ed7f7f06db3f609d50b456a0f1bad8b36d53880682742039b04826d9aa SHA512 9b5a5c6d9e8362eaf76aae52065706ea8192e59ead7acefe282023295f46c0d89d8548f955286bd3e240c8d20e39e1e0123c81d1054c91a37bade11f74d7f4c1
-EBUILD capybara-3.4.2.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
-EBUILD capybara-3.5.1.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
 EBUILD capybara-3.6.0.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
 EBUILD capybara-3.7.0.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
 EBUILD capybara-3.7.1.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
+EBUILD capybara-3.7.2.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.4.1.ebuild b/dev-ruby/capybara/capybara-3.4.1.ebuild
deleted file mode 100644
index e0cae11e9d06..000000000000
--- a/dev-ruby/capybara/capybara-3.4.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-# Rake tasks are not distributed in the gem.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit virtualx ruby-fakegem
-
-DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
-HOMEPAGE="https://github.com/jnicklas/capybara"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~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:2 )"
-
-ruby_add_rdepend "
-	dev-ruby/addressable
-	>=dev-ruby/mini_mime-0.1.3
-	>=dev-ruby/nokogiri-1.8:0
-	>=dev-ruby/rack-1.6.0:*
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/xpath-3.1:3"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' spec/spec_helper.rb || die
-
-	# Avoid window-manager specific tests (sizes are specific for fluxbox)
-	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
-
-	# Avoid spec that requires unpackaged geckodriver
-	sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
-
-	# Avoid test dependency on puma server for now
-	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
-}
diff --git a/dev-ruby/capybara/capybara-3.5.1.ebuild b/dev-ruby/capybara/capybara-3.5.1.ebuild
deleted file mode 100644
index da6c2de9e770..000000000000
--- a/dev-ruby/capybara/capybara-3.5.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-# Rake tasks are not distributed in the gem.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit virtualx ruby-fakegem
-
-DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
-HOMEPAGE="https://github.com/jnicklas/capybara"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="3"
-IUSE="test"
-
-DEPEND="${DEPEND} test? ( www-client/firefox )"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	>=dev-ruby/launchy-2.4.0
-	>=dev-ruby/selenium-webdriver-3.5:3
-	dev-ruby/sinatra:2
-	www-servers/puma
-)"
-
-ruby_add_rdepend "
-	dev-ruby/addressable
-	>=dev-ruby/mini_mime-0.1.3
-	>=dev-ruby/nokogiri-1.8:0
-	>=dev-ruby/rack-1.6.0:*
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/xpath-3.1:3"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' spec/spec_helper.rb || die
-
-	# Avoid window-manager specific tests (sizes are specific for fluxbox)
-	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
-
-	# Avoid spec that requires unpackaged geckodriver
-	sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
-
-	# Avoid test dependency on puma server for now
-	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
-}
diff --git a/dev-ruby/capybara/capybara-3.4.2.ebuild b/dev-ruby/capybara/capybara-3.7.2.ebuild
index da6c2de9e770..da6c2de9e770 100644
--- a/dev-ruby/capybara/capybara-3.4.2.ebuild
+++ b/dev-ruby/capybara/capybara-3.7.2.ebuild
diff --git a/dev-ruby/forgery/Manifest b/dev-ruby/forgery/Manifest
index 238365a6f895..fcda02d3314f 100644
--- a/dev-ruby/forgery/Manifest
+++ b/dev-ruby/forgery/Manifest
@@ -1,3 +1,3 @@
 DIST forgery-0.7.0.gem 47616 BLAKE2B 6f9a95770512213240659c55a8d9b72f4fbf9c39cd598253f151a5bf0d6e81604e279a5a47b41a8594ac42ab200238f6fafa19b8e9c7fdab74c10bf5d2855221 SHA512 c1f540f3640b99e2a574d0f677d2fe76b554e4ac0e15bd9c27c2648909e86ab972be0c65682e16db34abff576a6b1ac975ada8d39c87c57817e903aba36982d3
-EBUILD forgery-0.7.0.ebuild 522 BLAKE2B 7f713b3480ab7191685e07953117e06d55689d0a4795254b3f004e6d4c5b9f5bd60fae86c489af36935be0f6fac8ddf66882eb538c29e5b93eed917f7c7ea774 SHA512 26ed2fe474c1d08ebd6efbab56c4a21acd4bd4a46f2a9209b6e3ef97919574e61208c8cf6efd2bca2c6191b3e7b06667b117455c7130568fd745c02fd4e4d6bf
+EBUILD forgery-0.7.0.ebuild 522 BLAKE2B 8398e6a10ac43ee1453614d39606ccd163e4449f5d2da4efc3fea05706146a9672c9c30de35dd17a54a1cfda18f2a624c4d9cd6acd8d339d2623cace0aac942c SHA512 820203b3205fa8e3636213c68ad4f0b4a259f72ac6c53d822a3f3cdf23c1996143f4dfa70d11e6f7f58c97dd1ba2ac8adfe1215251c28da71f6064bc3d70cfa1
 MISC metadata.xml 343 BLAKE2B 47afb567985edec58caee293848ea44ba91dc53c3adf5cb19a2765c7bfea9c1391b2f75ba22c14e3a379cd4e1077c8cd32421ae27cb5a1149ef02bd85571d891 SHA512 a4a5d4c05618ee70f5aaf0a5f0050593482a441fbd2c6fd4ca4f2024228544dfba2da8e06c3b9b0b712adfa53c4928c5386c5b29fff7b74f272044efe06da94c
diff --git a/dev-ruby/forgery/forgery-0.7.0.ebuild b/dev-ruby/forgery/forgery-0.7.0.ebuild
index 26b092e650b6..0d297189b716 100644
--- a/dev-ruby/forgery/forgery-0.7.0.ebuild
+++ b/dev-ruby/forgery/forgery-0.7.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="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
diff --git a/dev-ruby/forwardable-extended/Manifest b/dev-ruby/forwardable-extended/Manifest
index 77aaf69369f7..1a01f97325be 100644
--- a/dev-ruby/forwardable-extended/Manifest
+++ b/dev-ruby/forwardable-extended/Manifest
@@ -1,3 +1,3 @@
 DIST forwardable-extended-2.6.0.tar.gz 6602 BLAKE2B 2ad027f671bb308a02de8b0620df9b9dfdf49d08e9f6fcc6bc60becc57e3e7d184d131a2acb689d08dec26c4ec004f5791b4630ab653f974a0accdbb5f46331c SHA512 23a682e06ee823b076d6b9925a1ef4ada4f1fc7fa63b02d1b9122485204b62f55c191866170b63b34891934c762ac903df46bf5a2b17055d7504ee7a70627a8b
-EBUILD forwardable-extended-2.6.0-r1.ebuild 753 BLAKE2B 23fe84008c7ec6269dda860ea82d1dcd4b5b813ef395e8a535e4a058678092490646b59734b6364285c24351c6df25effb5e7fdb58f5abae30ad25dfb0062d2f SHA512 019ea8b9cc4e26f5f5c0525bce5b8989af1be0f286e8525afa6d379a8046e8ae084bf44d1cba9f218f70cd5fea1b37eee141abf7c2c3b7497e3b40f8a25152fb
+EBUILD forwardable-extended-2.6.0-r1.ebuild 746 BLAKE2B 0da8eaa8db7c969669c9233a835cc4833fa55613af9254603b80206ef6dd3ab5dcc8deaef5538e71220dfbedeefdf34f8611bbc32ec6259f14e602d540adf314 SHA512 ae651a29dddcd8c23ca8206dffbd6cfdba27a2f3b4ba189f9dc51e0be33566bc7aa8571258494133b70ea445d2ecaa804e59b9fa0dd8213cb521c6e8536c74a6
 MISC metadata.xml 420 BLAKE2B a8eee09dc7ebf7ab036a2c90207ab3cf040d7022bb8b6786a915bb4a04b1e1885000c16ce20c81abf57253900495f63b46865cf418b2b4659553525f85e3b161 SHA512 79be9859ae890718b7b75b27279f1e7a2651b1f1b55c7ce6bde87605ff589afce1a6478e5411feaa305d4ee933a7d9545d718250d6e734615be703c333c917e8
diff --git a/dev-ruby/forwardable-extended/forwardable-extended-2.6.0-r1.ebuild b/dev-ruby/forwardable-extended/forwardable-extended-2.6.0-r1.ebuild
index 9344b479a9d8..a7ec6392431e 100644
--- a/dev-ruby/forwardable-extended/forwardable-extended-2.6.0-r1.ebuild
+++ b/dev-ruby/forwardable-extended/forwardable-extended-2.6.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/haml-rails/Manifest b/dev-ruby/haml-rails/Manifest
index ff5559118af0..d95887f0f25c 100644
--- a/dev-ruby/haml-rails/Manifest
+++ b/dev-ruby/haml-rails/Manifest
@@ -1,3 +1,3 @@
 DIST haml-rails-1.0.0.gem 13312 BLAKE2B 9bd863d693121f2bb42bc0dc292f647220a4ba0b152c2fe6b04fabc0a0b537e1d31c12b040841ea2ac51cbfa771bdf21a94c8e482978dd2294a709916ee3aa06 SHA512 92aca4aa20591e47830779ec9d7a04f67cbcfbdcea3cbf2cbe50862ee61d1e373db96dcdb9b187fce2a167132b8394dc738db09416492689fb138d60f537b593
-EBUILD haml-rails-1.0.0.ebuild 685 BLAKE2B cd35f4fda88b6041708ffe885511768ed31324d7043ace24f99712b392f84ea4d709f69cbc4e74963cf742de32dd6177683b8edaaeccb5f9e5b9aaa8fec46314 SHA512 900224c0b24110bcaf5736ca6750473e5e507725e99d963d57e999cbf299fef7e930ab5299e150c2b12bfff1971cf39d97a057258794f419f5fcb2881b5df1c4
+EBUILD haml-rails-1.0.0.ebuild 692 BLAKE2B 46b142c11a855fa6e05462a20061f408bd14341ddc002a66fdeb9133457d53234a43d5198705281939afa12a66c4e9749affa04d55698d6b84950c45580fd07c SHA512 b38a8be75b40b6690904b3e2c5c17b870e28f54325d017725dea945ed5679d2677e757ab0389acf950e0eee4249aa2e67eff646203eb5e824817ebc49d8623bf
 MISC metadata.xml 335 BLAKE2B a5cfc94870073cefe663542cff943ea70824dcddbcbc07d34ba6f1067caf922fbfba2a75cb7215c20271bdb7f3b7c16bdeb7ab3ca0d2adbc46a1756a2d079849 SHA512 25a5b3c96a272c61b756d168146ca0f3492d14b8672192afdcedcb3690de723ac0915a7120fb03db06fab6b701ebba205cbc57c49f681720fbbbe5a612d01e0b
diff --git a/dev-ruby/haml-rails/haml-rails-1.0.0.ebuild b/dev-ruby/haml-rails/haml-rails-1.0.0.ebuild
index d99497999a32..cb53792b5c2d 100644
--- a/dev-ruby/haml-rails/haml-rails-1.0.0.ebuild
+++ b/dev-ruby/haml-rails/haml-rails-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 
diff --git a/dev-ruby/hashr/Manifest b/dev-ruby/hashr/Manifest
index d6e8efeb31c0..186ed5fb78de 100644
--- a/dev-ruby/hashr/Manifest
+++ b/dev-ruby/hashr/Manifest
@@ -1,3 +1,3 @@
 DIST hashr-2.0.1.gem 10240 BLAKE2B 14455589acf3ffead6aa21ee9e789fe94c60f90beb5aeb451ac68bdf3637dc4f94c58d4b287aff5835a0bde7205172bffab26e86356105786994540138288e3a SHA512 0b79b32d857b4d6352de18ebfabf51b4af610f2a889088028d938afa8f38d4a3e91f285c3c39f120e31a92373d2eb2a92386331c082810c101fd035ac32c685d
-EBUILD hashr-2.0.1.ebuild 549 BLAKE2B 595bfc5a56a8092436beff97c4efe34a9971b80c698c45b2790e6ce36acb795f810f6f68d0d84e15b1fff84fd565d5a7f8c9be8f1c6b86c562903bfe4892c392 SHA512 2166d00b9cde3fb65f605a433ab8d38ed8352bf4c8878d08d93dc49521fd14f464337606baede287f79b2809314a83a5e56e090f28fd7067fff8751826bfb9ee
+EBUILD hashr-2.0.1.ebuild 549 BLAKE2B 099359ecf53a4086a4a7871f5b951a7bd4c7e6d20b0e4756809109680241d1b044599bf08e14b3986ad15ad5f68b4b026e5ba92a92d18e7dd896bb46356bb198 SHA512 ef7ab1735d7f70bb1e810788127688b8bf7ad4785e7aef6d1afbb0dbc32983e4570396b7c3c4357bb7336888c095a78ab414806cfd32e6c0cec53ecf6552c073
 MISC metadata.xml 341 BLAKE2B c352c80b2c1c901813ec3134967762fe4ace93faf7df9f463a5f578fe4ac2e5333d02227ba90fdc80632e1738e71ee775b979c5327b402b561424492b9ca6be0 SHA512 d232e215ce6fac567bb951e321201d3af857999350dc4550e067d540ea93900fa5132efbec244f2109643dec807e93fd21ba35973eb77a3bdfad9ef18ba76c23
diff --git a/dev-ruby/hashr/hashr-2.0.1.ebuild b/dev-ruby/hashr/hashr-2.0.1.ebuild
index f313d1487bdb..85cf3d38ad0b 100644
--- a/dev-ruby/hashr/hashr-2.0.1.ebuild
+++ b/dev-ruby/hashr/hashr-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/html2haml/Manifest b/dev-ruby/html2haml/Manifest
index f616c5ef0e5c..93731adbfb8a 100644
--- a/dev-ruby/html2haml/Manifest
+++ b/dev-ruby/html2haml/Manifest
@@ -1,3 +1,3 @@
 DIST html2haml-2.2.0.gem 21504 BLAKE2B ead2c636baacb8dbba7bd650356da5e2ebfa8ab565edb38ab03df287d8d0709b9271ef3f46fae0f2d2b86d37dbf6a0212fbf6803aaf7757a9f2653b773e46482 SHA512 b6988182073f35d4d9b9f07f2cc2ba01c66679fa646fd2d1e3c8cf0643c88b04a2b1a36d584bdcca897f804e32486a618abc8fbd8db023ff9c22ee66d93ed9f0
-EBUILD html2haml-2.2.0.ebuild 779 BLAKE2B cf8b8151cd0161ae82b3faf3e1311fb8ee7109c675dfc5e74021f336c9c1a3ee52f9c19d9a6a66826b7db1fc036845b81e8a8ce5f0965a62638f5ab2844ecb3b SHA512 27d1d654baf0a310011cc9176824a63f4396df1c801b74049d7448e69354880b5ae36464345b3f75ae349307fa96e35a9c85b5cc1a198225be67952ee977a79e
+EBUILD html2haml-2.2.0.ebuild 779 BLAKE2B d02bb888c6125042b9f0758ff1e88751306126728bb7d7a29447750ab81d3b0e1ab1d1fe46bf695194772530514c5744581586e5a0b0498dbc0d4b92e0a2ad40 SHA512 276f1cb841d0c9b1191a932834901c17ee4379b5b746cb393e66495929f29cca8d68e139d4410e665acbf7d12d11f9d35110b19c7ed1988e17276fd65830de0d
 MISC metadata.xml 330 BLAKE2B 5f142ee3520e2700e3a51713054c5be0819c6f35d211580d56c8473edcc8f16e1a145bf617bd038bf8727f942b71c3b7e79d7c5cb1ed01b75d24bda2c1866b2c SHA512 b1a1422d9a51ba4512a0ca500213b5d26f6fc3403782a6adf2efa970407273b9ee9cbdde4a44775a9c72c5581df739c8ea8b8a8c77426358b9d5f9694e22800d
diff --git a/dev-ruby/html2haml/html2haml-2.2.0.ebuild b/dev-ruby/html2haml/html2haml-2.2.0.ebuild
index fd22986128c1..4dae4a3436d3 100644
--- a/dev-ruby/html2haml/html2haml-2.2.0.ebuild
+++ b/dev-ruby/html2haml/html2haml-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="README.md Changelog.markdown"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
@@ -21,7 +21,7 @@ IUSE=""
 ruby_add_rdepend ">=dev-ruby/nokogiri-1.6.0
 	>=dev-ruby/erubis-2.7.0
 	>=dev-ruby/ruby_parser-3.5
-	>=dev-ruby/haml-4.0.0 <dev-ruby/haml-6"
+	|| ( dev-ruby/haml:5 dev-ruby/haml:4 )"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:0 )"
 
diff --git a/dev-ruby/letter_opener/Manifest b/dev-ruby/letter_opener/Manifest
index 1e2b1bd50e59..aa3e3333df93 100644
--- a/dev-ruby/letter_opener/Manifest
+++ b/dev-ruby/letter_opener/Manifest
@@ -1,3 +1,3 @@
 DIST letter_opener-1.6.0.tar.gz 10457 BLAKE2B 6fbaaf60a8dcb939ab182767b1e44fa7c314c4320bb6989c8900b8caf496a04d73795f228be07be6676817b9641265cbf744720b3ef3223ad2d1d309a70cb463 SHA512 28418719b22e0e8138084544283f4b54912f7c5acb76881aa3cf60d4a004d2ea807cf17e139a2d28fc925129d5dae86b063a0ce141d2dfba8e2afb6577d61922
-EBUILD letter_opener-1.6.0.ebuild 801 BLAKE2B 943e4719222e839ee3973c5bc317f9fb46711cd1164b5c061bc18503421e0c7fc1245ae10b64d8fecd5e468acfff57d037bd51efa3ca1de903a9660bd1694bcf SHA512 2713f6dd0f5eff111c247a41674c43fb335bdfabef6d94618c242d2c7f2789d42454724067ab0ecc30ad6c02d9345c7a8534748fc5ac37183c3140e357ce28c4
+EBUILD letter_opener-1.6.0.ebuild 805 BLAKE2B 72f747f7366e270707a1caceb7e523f1c087c995f48aea6fccc6343e6c0934d9ce121cfeb6a56695c98f7505ae33f96b9e529be228aca14fcb760b1f1981f510 SHA512 bbe24f11805072be77825d0d99e3e5a49b1a591c68f5ece561cd8437213c9466fc53f6063ae18d923e1e630add4b393acf1fcc349e59cb01fb2d102ec93c538c
 MISC metadata.xml 345 BLAKE2B 5dfdcdc697b47d77410c7e338965e29ef16568489a51eccd05963f29191643938d1e548bf5b642198fabde5cd9ad2431cdfffaabc3b15e73fc7f7ad9e719b432 SHA512 cc99ba697977c098aeb242fa953214e819861cb43c12dd6c1f6f781af49150c4e58828f893561d92c0a3f33d8d93b57fe80147b19af02de34d791a4b8a3126f0
diff --git a/dev-ruby/letter_opener/letter_opener-1.6.0.ebuild b/dev-ruby/letter_opener/letter_opener-1.6.0.ebuild
index 2254f363346c..7dd51f4dbb3f 100644
--- a/dev-ruby/letter_opener/letter_opener-1.6.0.ebuild
+++ b/dev-ruby/letter_opener/letter_opener-1.6.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="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 RUBY_FAKEGEM_TASK_DOC=""
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-ruby_add_bdepend "test? ( dev-ruby/mail:2.6 )"
+ruby_add_bdepend "test? ( >=dev-ruby/mail-2.6:* )"
 ruby_add_rdepend ">=dev-ruby/launchy-2.2:0"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/levenshtein/Manifest b/dev-ruby/levenshtein/Manifest
index 5a7363d750a8..6ad7ccbc2f87 100644
--- a/dev-ruby/levenshtein/Manifest
+++ b/dev-ruby/levenshtein/Manifest
@@ -1,3 +1,3 @@
 DIST levenshtein-0.2.2.gem 7680 BLAKE2B f10a6b4079c74bfd5ade5113fc96e3551d7b78192aeb8ad68ef40e5813b3c00707614bab362d4cd9a7331be04f74611e016c2d95f7a82964cb2d4ef7ce813e8d SHA512 a84300b6590ab8c5fe2cc4e6f243ccec397cb97f7a241f635d2344433365b846701f9f4cccd7e574a1e50cf389ed03e3fe9992b6c2f21e12806a0c3ab08f03d0
-EBUILD levenshtein-0.2.2-r2.ebuild 714 BLAKE2B f386af58cd959492e1dc6816c82e51a94eb348bb77d5f1cf3c4c08793c24caff707c2571dabcd1119923e8ccfc7a82148cba7ee9b116cc0cb2358c591d5c8f69 SHA512 591644ef08503dc3bf52f94e8a4369858a36673553012508a7c63572fb9e9cd05284e7493659d15b0dabcbf3e77d3e6b348280a2b37634aa61d3e74eb34c34b0
+EBUILD levenshtein-0.2.2-r2.ebuild 715 BLAKE2B 21af6108398bc92b87f0063c4cc1bf0982bc0f31aa53552989af75efaaf1ff7f5217f607fdfe6b144168fd7eb37a51b61bc54a7bc574c2907aa2d14080bee028 SHA512 b77661e94f6c8e1d45a76418e99df3578fdd7f1e8d5ce9e15288dd8b7e50bbbf70dd116b6a44a613eccc077dc0121f13228173150555942da0788217d74e1abc
 MISC metadata.xml 338 BLAKE2B b97d8b2698a1bbffbcd29b4e9ee96bf8cbceee7b317adec462230d979ebeef2edc7865f336ffb2a9e712596cbcb8ac308f1d23aaffa774b43278442b7cddf1c0 SHA512 924a32d980f01b8a3da22f72fc87e799929dd8c8e13102189a348bfbe4fe8a03fb1f4028322771007f33ed9fc9ca8ed9b179d25f008a9da722640e6ac49659fd
diff --git a/dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild b/dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild
index efb97d045db3..a308d0b665da 100644
--- a/dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild
+++ b/dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
diff --git a/dev-ruby/liquid-c/Manifest b/dev-ruby/liquid-c/Manifest
index 7f14e093e68b..686cd90e249c 100644
--- a/dev-ruby/liquid-c/Manifest
+++ b/dev-ruby/liquid-c/Manifest
@@ -1,3 +1,3 @@
 DIST liquid-c-3.0.0.gem 15360 BLAKE2B 2fa64ede17b25fb7e83f6b1b74dfc9b2777eda51773e1efdda2fff921ec740f7628e1a87a73896f0adaea5abd48bdb04331fcccd122ac35db5e8ca0ce4092bd9 SHA512 500afb4669555b0e7c8ac2ab46b3bfdcf4db2e67fd89369669125e5d4598edad6dff5270599e659c64abe33c254dde556ff12e74fe35f7baae3bbd9bf9c60b36
-EBUILD liquid-c-3.0.0.ebuild 768 BLAKE2B 0d5815f03cd2b8bdacb51e6933a3a9f7f6cd77ae515b7dbc14cf7d91e3419615268ae65503b0a1daa07a910c73aa928bc0ce70fa7986f9c7102dccaf36eb60fa SHA512 9fe16736f61fb24e0fc0463b5a041d7526a0ed76e8e893b76836d8a72f19b571a059026e68c4c0febfd5b9a9d27bd35da555ab9b4d45b0bcd6a253a0d248bcdd
+EBUILD liquid-c-3.0.0.ebuild 768 BLAKE2B 47249dfa080689aaa2b15e9361e2bfd8bcd7a8b2a17d913f0fd0fe18ce48d6574b5a257c34efc971fc84294b27626dc74691f889abd7a23828344f5232a1e8e2 SHA512 2b1155f271afb0e567440c5756446fd416b02ac522f837cb928e4a1da4beed7f03c8442c54ce66328b697abec9c56d04c54dc200f2c2d27a830eda0dcac8bbdc
 MISC metadata.xml 342 BLAKE2B af634d72b014424082fb52a22cf6ab3d792ec115c9ed1e4acdcd6988202bfce3256abf592c84ef7f795502f40be4fb0bf730ddc0900c703c7d5081290fe09a70 SHA512 443cd881ba1a56967dc7ebbb41fc28e14b33fe44ecc40aa5e5c38d1abb786b15913a07404faccdd41213205171e5caf16cd771478a414d7f3e52dc70c777a0a3
diff --git a/dev-ruby/liquid-c/liquid-c-3.0.0.ebuild b/dev-ruby/liquid-c/liquid-c-3.0.0.ebuild
index de0cbfef506b..4054dcd847e9 100644
--- a/dev-ruby/liquid-c/liquid-c-3.0.0.ebuild
+++ b/dev-ruby/liquid-c/liquid-c-3.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/liquid/Manifest b/dev-ruby/liquid/Manifest
index c8d97da49069..723298099775 100644
--- a/dev-ruby/liquid/Manifest
+++ b/dev-ruby/liquid/Manifest
@@ -3,5 +3,5 @@ DIST liquid-3.0.6.tar.gz 88159 BLAKE2B 58cc0efbf45622470b3edb1e6e04af4014b670490
 DIST liquid-4.0.0.tar.gz 96077 BLAKE2B a13adae886346b0f7dfc7a5944d54eed9600b3bc390fd834a18a70c665cd090f8a114cc6499e134d6f5c27b8f7b0cb862e49a1a4cb757f8d09fc4a88ab5fa941 SHA512 3aa09813e2c6c3b75b9ab0eb1c11ae83f62e6d3dba19c91d8877bf8162edf867b06fbbc4fc3193116313ff98c1fa964b8a01f0cf58c9fb7ed89338f3bffb9cdb
 EBUILD liquid-2.6.2.ebuild 545 BLAKE2B 1b7a8747876c8635d5bfa1b8bebcdc42333b2643a2d425765aee2bf82539796dcade44e41552b8bafdded3c2f7650c2b6985ad73261855e4595add7eccffe97b SHA512 4e56c0aa411a2d9189eec1af667f762e6077454939f8e99b1b1df7c031326623a37cdb97bf1594ab38b61590b0ba271d4d97260e69efe679eb5e22b2f0464e1d
 EBUILD liquid-3.0.6.ebuild 512 BLAKE2B 94ddb1d260cd96362d9d96de465cca13603b030b0eafd1fb47c116ed2338404efa5ba398dc6b4d2844066cc0ec9170ea9fca698e6ecda27ed35f8f012f65e9aa SHA512 4530a6d42b7a474cd3d318adfd435be652ae8dcb4b575a3248c560219fd55434af3d92d9c2b42fcdb73f9b698306b2869506ef1c3574868621072647998ef333
-EBUILD liquid-4.0.0.ebuild 618 BLAKE2B a00a2a7b902ef743e2c7bb7a1dae7528a1ef96ed1fdfeffffceec515e2ace708a19aefc6c846ce01dd752daf17ab474e4339fa7e354b98210b7f2b1790d0e322 SHA512 2d1a0827dcc587758b7bbdd4567898b0755bf7980a7a819f64ef6a006ed012b435ed4bd3da94904de939bd6b2f0e8db290a01266413bc428cab0ec6608ac28ab
+EBUILD liquid-4.0.0.ebuild 611 BLAKE2B 1962f64c907020510b8a37c4d539d757a72aa3d3c3561cc30dcaa3ee0b437567b8b2b1d6383e798cbf4f01a9985e2d7fc8d81f956813cbef3a6f9b4038d2c271 SHA512 5cc5acab36ff54d6a81f5e2383cfb0fdf416953080a1c8b7e4e939d92a9d36e51358a2f4ca001824b92a89401b8b4b8ee624e45dd04243421f346f16560cc367
 MISC metadata.xml 340 BLAKE2B d7b2ddfc79a4db0e45aee4759b455288a423c1f2e7364a6184fc49ab939b1ec792cbcb9175b302299217f8dda55253985a03770290e825618fbc490f44facade SHA512 cae45b7e74c0400be7b37f2632f7221e776ec8edab030e6520d1b0109d0448c3d18bf8c9590cae14403acc3f5bb6ca2aa3d29289db3ae8e10915faed16ddd02a
diff --git a/dev-ruby/liquid/liquid-4.0.0.ebuild b/dev-ruby/liquid/liquid-4.0.0.ebuild
index 4b1f02b8f2ba..e275f714a225 100644
--- a/dev-ruby/liquid/liquid-4.0.0.ebuild
+++ b/dev-ruby/liquid/liquid-4.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="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="History.md README.md"
diff --git a/dev-ruby/litc/Manifest b/dev-ruby/litc/Manifest
index 9289213e32cd..150800c86d41 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 c1f0d82bf0c3f9c324274d0740e53c0ff4489d7650d1380718bdb505a0bf27a303e22a600ae166b99eee5d943f94ad522c0aebf65fbf5f2bab1225f01d08374b SHA512 bfc62d9d80709937e5ce0e2f3e1fff3952592587839e9d0f42fdff063bacceaee13608dd52800f58a6bf9b7e060e7e6d473bc191347a4275588946ff68c4535d
+EBUILD litc-1.0.3-r1.ebuild 786 BLAKE2B 5c0ae41a722be727663ecc631e1003e95bf30c1301f7d266cc9ce056750c56bf4a923e6f680d1984469ec0e448919e3fdd1f61e7a5b72eefe9c373fe4d798313 SHA512 3e7d05a7bead16238380b9e1ec27dcec743b37a01425fe9a1375677f2239f0fdcdcb448862a48b9c730fd06404e4d6fcf0dc0ea5492181a779c3f014204e7577
 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 39dbad172fe4..11587aedd582 100644
--- a/dev-ruby/litc/litc-1.0.3-r1.ebuild
+++ b/dev-ruby/litc/litc-1.0.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC="rerdoc"
 RUBY_FAKEGEM_DOCDIR="rdoc"
diff --git a/dev-ruby/log_buddy/Manifest b/dev-ruby/log_buddy/Manifest
index 59f249663a36..c05586763299 100644
--- a/dev-ruby/log_buddy/Manifest
+++ b/dev-ruby/log_buddy/Manifest
@@ -1,3 +1,3 @@
 DIST log_buddy-0.7.0.gem 11264 BLAKE2B 688d8545a57361ecdecef3021db69d285a040b6439b2391337b8842408ad5e6d4b79d0d9391db07172e0bde6e27f151f6b6f93a3e4d9448730c32e4cf21a2c56 SHA512 ce7d068157f2fc3513f330a8616dbf126f218f2f5166a91d3cd0179cd5899a696acc364001a677324581eefc0ebbe20d1e01413b1f363fd424c25232f4a791e2
-EBUILD log_buddy-0.7.0.ebuild 593 BLAKE2B 630eca07d43a98664ce010454e81aef069706b22ad189c47261ba8ad9d7e20e007c6995250281cf3f070be21fc1b127fee3bf52af59bf8a8e2fa47db24c6ece5 SHA512 2fb7c4ecf4446b81753073a1fdec823d8181d6e17140fea370001bf0e2dee9044194f52bc13e750926a274db1124fc8873f7267098c4d7f81604111d9ab97899
+EBUILD log_buddy-0.7.0.ebuild 593 BLAKE2B 3cb82acfac517304ccd43bbac25c9bbfa877afc579f61546bce33db2af6dfc9e573fe6340927eb010e1cef24b0c9a3cd895f4e43685065eec9ba8dc9e1179c52 SHA512 a150b16236f45e0ae0e52eea79f4899f9a05495eb04b04364fc00d603d5b7b8f02e5f723ea1f7027e5a0753f62fbdce791bcc79e9ef47e892a2a27b3eaee588f
 MISC metadata.xml 345 BLAKE2B bc478035d1ff17c8442d0faf2cc6c4caaf7a32f7041fa4643db1b251f5d87f096e2db222fdaf12e2142ca6f890d18b3bc7ab39491f9d9cbf56e51a0c5edddf70 SHA512 40edbc420994ed067c82fb6979f2648b3ec60ff0930b9800c779270bb05dce560b5ddaaaa5672d3621e4d71ec2a2ddfe2e33988042e2143a3786e24444d349df
diff --git a/dev-ruby/log_buddy/log_buddy-0.7.0.ebuild b/dev-ruby/log_buddy/log_buddy-0.7.0.ebuild
index 229755808e72..58a46afeb7f1 100644
--- a/dev-ruby/log_buddy/log_buddy-0.7.0.ebuild
+++ b/dev-ruby/log_buddy/log_buddy-0.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/maildir/Manifest b/dev-ruby/maildir/Manifest
index acd9865f9954..4192127d8deb 100644
--- a/dev-ruby/maildir/Manifest
+++ b/dev-ruby/maildir/Manifest
@@ -1,3 +1,3 @@
 DIST maildir-2.2.1.gem 15360 BLAKE2B d3ea037ba38e83bc7b21bde9ccb2296fc922c3f657a73ad3637faf708cfa16ac75c2e6535714ba18b00aafc5a94265c56f6e086d25de5810c0a0112d6c876e1f SHA512 4c366333c802bbe0cbd19e6abaef1fa31ad84596518d24ddcc33aa3afe39890896d107bc864c68787c90c3a38115979f6a4fe8b442aecaead39306122d560f18
-EBUILD maildir-2.2.1-r1.ebuild 961 BLAKE2B cdc5aa265df7cc7111587a7196e1a2225a6723619ad28646d409a0f775d2bb4a126b396aafc20fedcfcaf0c6fde1d2693ac569e02f22e05b98efda8f17d7c4fe SHA512 c1d4d90d6b83e00c1b0cd9bfebc136ec6407a4e975708acc589ef87302a18e1ccae497e34fb90c78a991f8220da7d4f8ce052bc8975bdc475e9263ae4848ed77
+EBUILD maildir-2.2.1-r1.ebuild 961 BLAKE2B da9a43959e1b8516f25439ddc696c2ad235885d46a101a92951173c5b7f1744190304b4454ca3870095230365d24747e110e2d1fd6411a307aa3e29d885f4f89 SHA512 3fb0fbbbaea5499ed709c26cec0538084ddf4d54c6693a90ce3fc323b17aba75052072f6631e3b3e36aeeea02c66f5b852bb2274ac13a7e3ce0e34a896da31c8
 MISC metadata.xml 341 BLAKE2B 6081100c628ae44a08e012674babbb174a563ffc3c9239bb4dc117e372af60d23a68f8666b4f79c2a17c0270a8df39efc0106a07bacf600b76b5d85dfe9facc3 SHA512 68ef596ba601b4886488bf164b786fc0deaca4a10441ac164bd6eef0502c12e380ca27215f6599660467fafcfc3b6183fb7ae0dd847888aa8919437896e6119b
diff --git a/dev-ruby/maildir/maildir-2.2.1-r1.ebuild b/dev-ruby/maildir/maildir-2.2.1-r1.ebuild
index 58a9690259b9..dd4a6ab3ed5e 100644
--- a/dev-ruby/maildir/maildir-2.2.1-r1.ebuild
+++ b/dev-ruby/maildir/maildir-2.2.1-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=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/mash/Manifest b/dev-ruby/mash/Manifest
index 68ee0b70d27a..8381253da3f3 100644
--- a/dev-ruby/mash/Manifest
+++ b/dev-ruby/mash/Manifest
@@ -1,3 +1,3 @@
 DIST mash-0.1.1.gem 8704 BLAKE2B 071559e64bc6b4be639f854405bed695a9e8136e9e20d2793a47336f4fc68acdf587051f920c3429b882c2941b9d0396adaf12352b4306d64af5cdefec3aae83 SHA512 5d3a0997b9a98e3228f6e838e449597f88c53f3f310b1c19b40dd1d5439887afc8e47710f0062b6bf0ab776aa6a9563b21b2fb402667701b215edd9d2ccb7e8e
-EBUILD mash-0.1.1-r2.ebuild 460 BLAKE2B 5a908d272b852b260f617b9fd66439e5baf4fabad715ffd03db3045f505707c3b283124a63ebbada949d43904fb5f7431b3485df8fb791f838ab03a6d29ca836 SHA512 adf9c31f471e7dc15a404af6386cc74fe64f9f034b2d35421a555863c6ddbbd1f02adfb1285d3985301a2008e43b42105efac29e62e3cca53b8dc9bfcbca71d7
+EBUILD mash-0.1.1-r2.ebuild 460 BLAKE2B b4e3fbed1b6bd58e42474b32e7b4b51da03871ea89d1d3efeb9f9ac615c17f5ff621839f0f0c9c2da5c47338c3ff6ffc23e104406b2e23bc4c1fa5e29460e725 SHA512 6002288df6a87b1b3c45ac4b9fa647722314c0fb68035f367bb9bde0fd344c2fda9dd77f1df012434d1e06762ee720d06eb3260daf390cdd9f2839c0223b848e
 MISC metadata.xml 338 BLAKE2B b97d8b2698a1bbffbcd29b4e9ee96bf8cbceee7b317adec462230d979ebeef2edc7865f336ffb2a9e712596cbcb8ac308f1d23aaffa774b43278442b7cddf1c0 SHA512 924a32d980f01b8a3da22f72fc87e799929dd8c8e13102189a348bfbe4fe8a03fb1f4028322771007f33ed9fc9ca8ed9b179d25f008a9da722640e6ac49659fd
diff --git a/dev-ruby/mash/mash-0.1.1-r2.ebuild b/dev-ruby/mash/mash-0.1.1-r2.ebuild
index c5b58ef234f9..e8a4753a0c65 100644
--- a/dev-ruby/mash/mash-0.1.1-r2.ebuild
+++ b/dev-ruby/mash/mash-0.1.1-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/mechanize/Manifest b/dev-ruby/mechanize/Manifest
index 067fdef06239..2617d23bf80d 100644
--- a/dev-ruby/mechanize/Manifest
+++ b/dev-ruby/mechanize/Manifest
@@ -1,5 +1,5 @@
 DIST mechanize-2.7.5.gem 137216 BLAKE2B 696b0fbb84b8f25e3d52d9d9f20267d53a4294e15ed64f6cefc87dd6d2a279c6f3c7608bfdbdbfbe6fc188cb16b06e219067c97838db4249f233ae12f047b9b8 SHA512 0dfd000d8f58be3fc08e2d6e625128135d6fc2d22e899152f46f66c545c6ede0d1e7b798f4b7de2f96ccdcf7c47001a3946866d0d6a19f9faa946ade6a4bcf92
 DIST mechanize-2.7.6.gem 138752 BLAKE2B be4e8f53c3ad88ae5aac867f836a20b5bcd47aa61db07e2dfb7e2d0c72d368ddfa620411fdddd5c2a408eeceb3c4c1ed3a15f6086ec846cda3a3c3808977309d SHA512 e89eb75af169ba198e5a82ffe4ce3c0962bc3fb6793f88bc735b647b7816d0c78d8968c43d213071e017e7f836ab91ed0c546c9eb986647355a1d38b1ba18138
 EBUILD mechanize-2.7.5-r2.ebuild 955 BLAKE2B f1f80baa609ce3038103c528da7cb084707c7f55573102538195bffc00f1987e24a573b9f9f65a349c81cab9f81cf76dfabdc96b155d79e03d12505c959b9a68 SHA512 8447d414b6689ac54445071bf07a6542bfc7cd8109670c1633af8c8d058e649e3badf992e03dd56e74cea042e03359a4e1e95c1cef3b71950b77e0e4de96610d
-EBUILD mechanize-2.7.6.ebuild 949 BLAKE2B 3daa78bf712f02a6a8411ec7492ca99b3849fa25f4457d386d7ee2dc025e38cddbe80a37ffea22a814be981d0069afc4edfed2ba8dca0ead5876b627535fb79b SHA512 37bbde32b952328926fcad9cf917f41b4733f90fa2c206d72a5944f7e56beba6648bd945477132d3b2ccec522aabfd9dc05dffd0b243880634919695b6c71120
+EBUILD mechanize-2.7.6.ebuild 954 BLAKE2B 93d147519b04ee0ad53c7b2cf519e1c08beb6b27678b72120fb9e3dcf3bd3210e78d4b462216da75576d6dd624a57ec49763c4c3f91077987a5b1b68efe2166c SHA512 6a31c9e72c7458f7aa88a2173ab435b17e23e80c9c73cdc3758b526fc5c7d7364cc1ced63aefac4bb2ce750321393ea610f318bb197fc9767f53f1f16c0ebdee
 MISC metadata.xml 349 BLAKE2B 9d63a73c5a28fb2fcef06d4c7b8da3b24d108534b999e76d0d1df86bdfe615e53248deae3d9450824c700a0740b75d0f7c897c8a8c9e5b4339021e30edab51de SHA512 1bc38bd045fa219ec2c86bd942055c0188561fee4ec5e7e6ba4ad2268f653fdeaac40122ed0605af7d47f8dfceb0781d65aeb68bf2fd62e3b8ae5a939f61076a
diff --git a/dev-ruby/mechanize/mechanize-2.7.6.ebuild b/dev-ruby/mechanize/mechanize-2.7.6.ebuild
index b65435a33fc6..e72b9305f6d7 100644
--- a/dev-ruby/mechanize/mechanize-2.7.6.ebuild
+++ b/dev-ruby/mechanize/mechanize-2.7.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
@@ -23,7 +23,7 @@ ruby_add_bdepend ">=dev-ruby/hoe-3.7
 	test? ( dev-ruby/minitest:5 )"
 ruby_add_rdepend ">=dev-ruby/nokogiri-1.6
 	>=dev-ruby/net-http-digest_auth-1.1.1
-	>=dev-ruby/net-http-persistent-2.5.2:0
+	>=dev-ruby/net-http-persistent-2.5.2
 	>=dev-ruby/ntlm-http-0.1.1
 	>=dev-ruby/webrobots-0.0.9
 	>=dev-ruby/http-cookie-1.0.2
diff --git a/dev-ruby/metaid/Manifest b/dev-ruby/metaid/Manifest
index 662334a05481..bd89657395e9 100644
--- a/dev-ruby/metaid/Manifest
+++ b/dev-ruby/metaid/Manifest
@@ -1,3 +1,3 @@
 DIST metaid-1.0.gem 3072 BLAKE2B 56a316b1cd56d918e6feedfe7f5a946415ed32d1f2ff9d43ccc31f9ecd8d80755492a52c1ce5aa1e71b8fcb33a8edbe316eee000d18757e22ff0eeb684bea08c SHA512 3c841a759568b9273b1e8addbe58a23df643e93a9d1f24a75a5686e26b7f16de1ab0573fd9f5032451ef813ab29c0801442a8bc74df94fc1d58f09062569ba33
-EBUILD metaid-1.0-r3.ebuild 464 BLAKE2B c3bfc8ff01f3cb48373949cc79ba4892a0052eda8df7106d3faa4f4a37a070f1706efbb983a1317fd38fe263780e8b6fc07e98c390be17bc6ce3918aa716d907 SHA512 b39d3799d9aa5c5a0fe55d049f51bf5f47bf839b4bf639fdc6a988dfd1e70a5e5ca4c6255b69665f2251ca09d460f216bcb335cc2445ae054a0c9c62115dc1c7
+EBUILD metaid-1.0-r3.ebuild 464 BLAKE2B 0cb11a57bd455e4fdc9758bf57617021d65b2afc9a5ff4a2602e410cfa97c3e2d0df98ca670f1a55afb326d859327225de14bfbbea13cdf257cf98b764702027 SHA512 42fea685135b57c854606daedc1e8fac15e26b88796fa5a63f92fd8ad4fd7148da143f936cf4a5882b47d76102068814286d2bbc2dfa69f881c304d60dab16de
 MISC metadata.xml 324 BLAKE2B 015a12d37b040c5081a47bffc3a16a9656ef6c8f796bf0479d4e848806d4fe9fdd1c3b65d6342828e9c9ee939c310930fc3d2d137349a951967e911257f064c2 SHA512 16bfeb23347b5cf905934e59ef0e8dc54afe5cfff7e5f360701c6bdf87621e6cecf3a181ced5ef543580586b326d22a0cf717af237d5c141077fc4c28a2ea0d2
diff --git a/dev-ruby/metaid/metaid-1.0-r3.ebuild b/dev-ruby/metaid/metaid-1.0-r3.ebuild
index aaf15321692c..5a9091e803e2 100644
--- a/dev-ruby/metaid/metaid-1.0-r3.ebuild
+++ b/dev-ruby/metaid/metaid-1.0-r3.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 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/moneta/Manifest b/dev-ruby/moneta/Manifest
index eadd7a66554d..1c675ac5410d 100644
--- a/dev-ruby/moneta/Manifest
+++ b/dev-ruby/moneta/Manifest
@@ -1,3 +1,3 @@
 DIST moneta-1.0.0.tar.gz 174765 BLAKE2B 0f17b4c3a2ead8753a5285603df1df385f8150c4eb21e9c088647982c7eb9d8380cb53f8d9177712b0992a0d4472d0defdaba9bf117b767555960186c81cc323 SHA512 367207c693991a956d5454b3884b8504cc007cc247284ff00178c423167a403ac88e83bc510453daff76e52fe30e429714805c1fb716bea6a7eae7a3b3d965b4
-EBUILD moneta-1.0.0.ebuild 797 BLAKE2B abb619591533e708bfc2f77a192f5f67014958eb49fd6d6b934f7f6201236d0713ffbfe6f13fca2e6e5c2661e7b5fda03ab71eb7dffbbe1429c6d328b944730c SHA512 9d4a5c5513dc03196639447e8c7e587f77e10a34c96f3f076733a477ccc5bf80a697690b5dcd6c9d63cd37becc8e962baf89c1c41967f18ad4dc98639d6cb892
+EBUILD moneta-1.0.0.ebuild 790 BLAKE2B 153484effe93b11342db6c2df5bfd5d2170c6e29583a370bfd26e0b9afc599a4e4a1059cc7742f9d3d47cda757d7346bd9eda9389edbeef9168ec537ffd17902 SHA512 caa20926890e842e0a7a3d17252de2ae44e0a6464423c621effe2743c13daa66452eb166022eb4f3eca3ed144708c3c14ff29333442084a5ed353c94d120cda8
 MISC metadata.xml 338 BLAKE2B f4108feb99f75000aa42b1ce88a4b450234e83f66d275eed92f8ab8743dc8e9844171aae3da12b337533fd8bf4309c28031c845958b7726e09b6e931f55f4642 SHA512 93a165f2020451e5ebd0329021d4e6ad92bbe91f995e6b8a8542177090bdd6c475d71ab8ddc5ba13cc61788cc585ca98066c36d55cd7d6e648c5a0e09ad7b0d5
diff --git a/dev-ruby/moneta/moneta-1.0.0.ebuild b/dev-ruby/moneta/moneta-1.0.0.ebuild
index 5e3594c2191f..79f6dde4f992 100644
--- a/dev-ruby/moneta/moneta-1.0.0.ebuild
+++ b/dev-ruby/moneta/moneta-1.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="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/nagios_analyzer/Manifest b/dev-ruby/nagios_analyzer/Manifest
index 23bd9654c860..f7408b6dce43 100644
--- a/dev-ruby/nagios_analyzer/Manifest
+++ b/dev-ruby/nagios_analyzer/Manifest
@@ -1,3 +1,3 @@
 DIST nagios_analyzer-0.0.5.gem 11264 BLAKE2B 16e90e269f73e7f717fcde574fd729efd0ab5a0c1892ffe1692e5bb0c87ed6e6909f45381d8021b24540ef3f99d80d9564c37476bbbba7ed11743616b065c6b0 SHA512 052ad107bf39d35b0c21392f4d5905ddcf009e3fa4b780706c23b9d6a45bf6a7b0a64dad596c8a32aedb332ee069f062c30b47479289569fb5f13b5705b03303
-EBUILD nagios_analyzer-0.0.5-r1.ebuild 438 BLAKE2B 3b5f0e5a8864d3c0e0dea32d9b378011289d73fbd2221b2c7d40a7c2952b0ca0b850f6d1323a0632c90706b7ba7d6eb7155b3ee01b467c7bbbb07da897025bc4 SHA512 cf53af5b75501a710771b27d4e7a0044596f7ea676bf2145cbc1b5218513a67e9c852d113270af8e7fd0e062c83a9a7b6b5d9c5afa1cf76fea0a91fff20dfcb2
+EBUILD nagios_analyzer-0.0.5-r1.ebuild 438 BLAKE2B 6d8f4b0e3a87d3cd7fe0e210c5616297e506115cb9ca3b571d9c2c899ae22285385033dde15af742fe510e116613230f3997053d466e9194c0610dd917f1501e SHA512 38d63408c14e58293cbaef687171bbdd4a282c83d5140afa03322f1055cd4ebccdf6481d4408a564284db5fd2fa61c8589086bc7e4867cdc1fb6a0eb04f3905a
 MISC metadata.xml 349 BLAKE2B b88a4828c225866c45ceb229b2f35956a16697e643404534e059db193440402561746ab56e5c50df43f413759a889f0c9e1ffe7cc4a017451b02bab72b1c69cc SHA512 3320e8d3b105a506254e3934a2bc29c816d1576d7f65396c7d44c709eedf4885d75ee4aac4bc050a231cff5cf6ebf6cee8b80a57d084436d1fc9f3c726c0d976
diff --git a/dev-ruby/nagios_analyzer/nagios_analyzer-0.0.5-r1.ebuild b/dev-ruby/nagios_analyzer/nagios_analyzer-0.0.5-r1.ebuild
index 891f0eff1f8b..800d7e25dbbe 100644
--- a/dev-ruby/nagios_analyzer/nagios_analyzer-0.0.5-r1.ebuild
+++ b/dev-ruby/nagios_analyzer/nagios_analyzer-0.0.5-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/network_interface/Manifest b/dev-ruby/network_interface/Manifest
index c4afccc87c42..b5b8915fe128 100644
--- a/dev-ruby/network_interface/Manifest
+++ b/dev-ruby/network_interface/Manifest
@@ -1,3 +1,3 @@
 DIST network_interface-0.0.2.gem 16896 BLAKE2B a0e7898aa5989ea38c8a9214f3aaf5f9d0dbdf39e86f7e9a4d62ec6c94f29f9612a08c1465513b62351a4c62ed776e427800eabe562062ce7c9b4b75ec757a3b SHA512 8850325e7e0c5ab51b060270220099c2c00cf7031083a511ae9f8dd6d1b9219b37169fa7620e9648eb071784a840e14ce965f8d1cf5d475ff82691bfba25a202
-EBUILD network_interface-0.0.2.ebuild 819 BLAKE2B 8577e2a19c0bac1a59c4d936bc5796f6913df38154b10d6f413a3cd01e24dd75448dcc5d78f5eef94b6700f9d462d4424eac82fc7507bc1cdb880c6911da51df SHA512 97cb9b56162928205787f136c2708147cd26c0ff41859ba60c1914c0740a7d17bf46b48d721f2e57f7213b0096627452977674ee436f7dc0dcec441483eab96a
+EBUILD network_interface-0.0.2.ebuild 819 BLAKE2B 9aa2193311e08ba37d53b5fdeee9916b6a01d8daea17d02aebdeb7d9359c39408e6efeaeb1ebcb4010bd5cc25d693d2aba2b8a7a06868c1c0c389e70a73062c5 SHA512 a610ce252167f143f7b1cba47544d465d68924dff453197e942122cfac32a9920654552808721ab34160cbd97a10fb2b93262f9b5a8ad3157c88ec742b331bbd
 MISC metadata.xml 346 BLAKE2B 37363f8c2d49a4d275b002b7e6664297dbd560cd2cffad001ec194e2181b302b68c3821cc1ce94bb708a0dde94342276a0013decb385667804cbbd44116b521e SHA512 4d29ede04b6944c1456d1309122fcbc42df1909aa8690bc767bce69749ec8bfcaa08cc51e6f686adb02d81b0eef39a4c78744d06ea130c4f55f66eba8a47cb57
diff --git a/dev-ruby/network_interface/network_interface-0.0.2.ebuild b/dev-ruby/network_interface/network_interface-0.0.2.ebuild
index 6c88677b9734..619438aba6d8 100644
--- a/dev-ruby/network_interface/network_interface-0.0.2.ebuild
+++ b/dev-ruby/network_interface/network_interface-0.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/nexpose/Manifest b/dev-ruby/nexpose/Manifest
index 084b2adc4b0b..6d94d34362c6 100644
--- a/dev-ruby/nexpose/Manifest
+++ b/dev-ruby/nexpose/Manifest
@@ -1,5 +1,3 @@
-DIST nexpose-5.3.2.tar.gz 111862 BLAKE2B 4d42038f8b4eb0444f54df3139e4533437c081521ae586f79baa80a812dbdac9c56bbfbcfb24f1f4fcfb5d854507374d9dbc5f600f79b09d918322132dd00a7f SHA512 7a79a796e853cfe0d5e3f61b969903f3ecf033914a8caaccb4ff175774ab2ec187a2b7c106f91d82e65edc35fab98621c1ae831017268fde2e8714c45346f4b6
 DIST nexpose-7.2.1.tar.gz 123143 BLAKE2B 2bf9a022c6695fa759c5193510c2cfa793b8014b36914c7806f1ee888ac8eb21466efa46539a9e9b7dab31454b8604b10b71d59faffd001254ee0561f456b707 SHA512 8c0d8b4537513396c9c7cb01330310ed30f8995890c60fdb956ad4760fda6e89a4d1d400e6b71cad1fd2d8c5f2176074c415d35597b1c8740233ebcccbc7d870
-EBUILD nexpose-5.3.2.ebuild 865 BLAKE2B 1e1cce7a2d790d57981109aa4bc18b1f46ca469ab29952430ef271da9871c0563d7d9322666fa8418d358a1dc5260b04fdb454086601dfa57f9de94bc29954a4 SHA512 8bcc237e7dfb47250bb628711d51e272b297825774adb266c628465192d3cbb56cecefdba7805d91ce9591c1200508687a0c766aa5ca335fe4d3157f45373ab6
 EBUILD nexpose-7.2.1.ebuild 856 BLAKE2B cfbbee796ff3216c10f1c9ba4184c34d0c838a335a70394fc2332dc4a1cd274595cab3f7567fdb00c49cb19014878b6c430166b7d7efa25c120c3189643306f2 SHA512 bdcde5f3f3591e2c22b22050bcf8a523f3b5c71600e0ce3bf968cb1a83a91361adf268ffbd8d86a55d5cc95baf65d0f6d8861103f2a0d8f4b26ef5e5c0ce627f
 MISC metadata.xml 386 BLAKE2B 38f2a377e32dca943f2ec8fed27ca520a9beb62e3bde0efe031eabddf4e2e82a85c48c20d66f7abc3e392306b2c31426e0f8235aea857d343546696436f6048a SHA512 eda3260ba0add70830dc9b03a10ee372363346646b2107e6187f4691ab9043eece8fd07f6a6c9c9fa9e87e4c63bb45b818fdb5ad7b663ccc1c5872c79ae6e2ea
diff --git a/dev-ruby/nexpose/nexpose-5.3.2.ebuild b/dev-ruby/nexpose/nexpose-5.3.2.ebuild
deleted file mode 100644
index 66d3512afc20..000000000000
--- a/dev-ruby/nexpose/nexpose-5.3.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="API client for Nexpose vulnerability managment product"
-HOMEPAGE="https://github.com/rapid7/nexpose-client https://rubygems.org/gems/nexpose"
-SRC_URI="https://github.com/rapid7/nexpose-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-client-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/vcr:2
-	dev-ruby/webmock:0
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/\(codeclimate\|simplecov\)/ s:^:#:' \
-		-e '/SimpleCov/,/^]/ s:^:#:' \
-		-e '1irequire "nexpose"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/niceogiri/Manifest b/dev-ruby/niceogiri/Manifest
index e5904b3777fb..2f9c6e6f67ec 100644
--- a/dev-ruby/niceogiri/Manifest
+++ b/dev-ruby/niceogiri/Manifest
@@ -1,3 +1,3 @@
 DIST niceogiri-1.1.2.gem 11264 BLAKE2B bc8ca43b5bae4630c8e52167ec22054bb95dbf8ccec8473d1223a0e3f6437b01268f26fb140414750f8c5109d1d2bd19e8bed4185c4fcff2b93a03a41159b0d7 SHA512 9a1905a6b3e558a0c522bf8e3a9e55737f4266c7f38ec8ca7789c21c83f12835ed6cdaf249a05377a1c558e5cec137929beeb1ca0a42f5eed43890accaa0e4cb
-EBUILD niceogiri-1.1.2.ebuild 655 BLAKE2B 9f87813e8ab624444199ecf4013ec936693663ab3c0f60ca8e50c1547f431b5f3f120cab390101684c5db915d06743e0ce91709420791df6465a3a390117d177 SHA512 94b5f1289f1ade14fb42f65677ae096856b8408042066d49f812b8ebc91f136eb411f99d651cbe337e1db88ef16ee7d748954a8ae0bd843b9d3950b8f29465e1
+EBUILD niceogiri-1.1.2.ebuild 649 BLAKE2B 2cc2dd2f3cb9b565a462eb69aa4676a765b9d059c076757646961f6a9124783de55018157a0ab460e3f37959fcf85f483200e200fc867b6a1fa1603ff956a9d9 SHA512 8adac52d98abfa83d35473f0543175946cd0b5e29b94902265444ffd0a72cb75efc385e77d421a2b7068756d8f6f3656a7cca965efa8110bd4cbbe6f93136b2a
 MISC metadata.xml 347 BLAKE2B 576d9e83ac287b001ba9564ec6d6aa1f64e6640c070722b1a23a4db105948806c23a346fc61860777b42a8d514a48146eda523675f09efe643054e7cc50ce18f SHA512 e1ebb935172380056b7bc385e135774db4bc60d751fb92158fffb93bcdd4435c4c7e0ec1d69b3cc9dcfa98e1c4d9422b31fb6671566463c6c86ab1ec7e349a8f
diff --git a/dev-ruby/niceogiri/niceogiri-1.1.2.ebuild b/dev-ruby/niceogiri/niceogiri-1.1.2.ebuild
index 6a4d3aa94761..a46f5d500d1f 100644
--- a/dev-ruby/niceogiri/niceogiri-1.1.2.ebuild
+++ b/dev-ruby/niceogiri/niceogiri-1.1.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC="doc"
 
 inherit ruby-fakegem
diff --git a/dev-ruby/omniauth/Manifest b/dev-ruby/omniauth/Manifest
index 1b9217b18709..ffa14e4a3148 100644
--- a/dev-ruby/omniauth/Manifest
+++ b/dev-ruby/omniauth/Manifest
@@ -1,3 +1,3 @@
 DIST omniauth-1.8.1.tar.gz 26016 BLAKE2B ad7f22a847bd91385ddce44efc89fb312b07ffe43d2b0fab3773e7c809959eb8a8b4567af5ba1a1e9fb9d559b692dec358bf16d6b1cb21b85f13521c20fa3415 SHA512 ad085d067971f3fef40e99be7f2e58a9bb006b404f8d7289c5c00be4ed7314ff9d40409053d2bda0a5072035d6e09295d22b8ae6b5d2a84384b245b5a0ae225a
-EBUILD omniauth-1.8.1.ebuild 1227 BLAKE2B 3a016d30560b34e6104c14c7b6fcd174562b3c3fe544355edf579d0fdacc6634b4833cbccd352454a2ee7556e9dfd7fa4fc3b0495f3e240e1c0370478955a148 SHA512 6af2a8c090c162199aba4d81a990fb2686b970ad48ddf083e9c263a7e0c3d45476a0d60088567659ef75b741b16e9fd81a2caf59e71a74a5673676d6ad4cf129
+EBUILD omniauth-1.8.1.ebuild 1227 BLAKE2B 1a61d55acf1e78b601c1b62db4a6d0f7c572df3e5f76677eb12031b138cd1ae2d0375c6abd198dc0970e7c382322db99e9c38c314d3c622730f886e6e2b1ef1b SHA512 804a7406a1534c51593025d6c42b83f3850037468fbd7bdb326ed8c7989f79ad07e30623d1af2a62c8f2d6bd5dcc4065693889304b2629005f8cc32e98b52848
 MISC metadata.xml 343 BLAKE2B eca1c20d937a878552be8bffd3394dc6a5b472b87a88f1ef2a096fd2ee75fe4feb343990c8e021bcc1144b6257175e2f8119ee374b6b551ebf19bcfc7860dd9d SHA512 189a7a11a84b2fa108299499e9f867768246b34237b74029eba64a0895d5c95d39544e340c4340cf50644f602411dfad991ff460c0269f1956061641e3cba130
diff --git a/dev-ruby/omniauth/omniauth-1.8.1.ebuild b/dev-ruby/omniauth/omniauth-1.8.1.ebuild
index 2c597ca30306..6292d39c3831 100644
--- a/dev-ruby/omniauth/omniauth-1.8.1.ebuild
+++ b/dev-ruby/omniauth/omniauth-1.8.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="README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/optionable/Manifest b/dev-ruby/optionable/Manifest
index ca31084a09cd..28c7ffa5717d 100644
--- a/dev-ruby/optionable/Manifest
+++ b/dev-ruby/optionable/Manifest
@@ -1,3 +1,3 @@
 DIST optionable-0.2.0.gem 9216 BLAKE2B 4d77994fc4a5b800d03f1fa675760f4755b5b0ed6ff18e79e15cb918129261a37bf09807bca504a0caba4eae8037b688933b7bf62b2770e8e451e7f4ef94980c SHA512 4c633c83cd51fb2f1771f5f842cc8024d769f644d513a8d4486c7960d2bdda81be44746a7bb4604bb458cd58c3bbb5db28cb426d25cded6098263798f7daa465
-EBUILD optionable-0.2.0.ebuild 399 BLAKE2B 25dfc38d56480487b04955bbf15ec572747b0aa020c2744b70d95ac7ff1aa57cc0b5efbb19aa9cfef0ef87dccdaed520f8020272c04f2745fb337ea1c1192a11 SHA512 f94c1098e8663f495fbbe00b5cdeaf0889e04a5d04c0247ed6cd98ed45db6afabe0ab4dbb01dcc8845b7245969bc7f29499b88e08d68f31cf311c34ec4562a63
+EBUILD optionable-0.2.0.ebuild 392 BLAKE2B df9e426863cfac86d31f02b4e1b968391f87ea6e9325dbb5651836a6fe912f7382e238ed30670330c5c32b027d9e982c400e46bbe17124ba25086a6ca609d10e SHA512 9c1b544a114fa348312c0138a7da1b33c7e362bfa7577ea8afa97873570b137d9b0476cd29129c64492d04948ce2625700fe638fa62328a872d59a73f5efcc26
 MISC metadata.xml 343 BLAKE2B dadca36b1b953dffb43438426b7c4a6848636a892a5964d9777b3c4de7acb12f78b4bd9f76aaef3bd4a09c2cfe1a4579d8f656262c59c28702d753b4fff3598d SHA512 0d809b55d6aa2e967ac7b85e0222365053e0876566ddb5554561289992da0945bd143f94f3ecf75e578a497ab4c341793a26f4815159ec4c0cb91439cd05cb01
diff --git a/dev-ruby/optionable/optionable-0.2.0.ebuild b/dev-ruby/optionable/optionable-0.2.0.ebuild
index 2c4a9de82cac..bf83794dbad8 100644
--- a/dev-ruby/optionable/optionable-0.2.0.ebuild
+++ b/dev-ruby/optionable/optionable-0.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/org-ruby/Manifest b/dev-ruby/org-ruby/Manifest
index 6736d306d907..76f217453ca6 100644
--- a/dev-ruby/org-ruby/Manifest
+++ b/dev-ruby/org-ruby/Manifest
@@ -1,3 +1,3 @@
 DIST org-ruby-0.9.12.tar.gz 143472 BLAKE2B c90e0f664f64be0449e63d717441f3c8aac9957c3b892392c8425847ea42dd23e3b7a598f57969432601ba9c6208633c7aa6e101a4684db2f68c07511bcb0458 SHA512 040c7bc9d9727fcec9bbd7ed4994ca489121c103d58242f98d340b4149f94cb97fc0bbc670bbd5dfba5a11de53930b579a33b6b1ffa343c7f2602674ec65aa07
-EBUILD org-ruby-0.9.12.ebuild 831 BLAKE2B cc82d31be93c9fe63e8662641bdc726c2cbe6034d131a44d55706dd6173e56afa19588e31f547afde0276a773eff4016435b5eb035118d497910a897955435f2 SHA512 6ad29a02cd09f23e46be076bd6e568cecfd043fa9ecd5d3854f5c1cc402aa80148904b2a72c000d0d74823d4235404ef21aadc5526b73eea49e293e029b3e6ea
+EBUILD org-ruby-0.9.12.ebuild 831 BLAKE2B dda0ce16fd4640bfa3663b74faf7fb198cc58c22c91df818e78f234a8726aeda747e61e122a26e4691b9920cc08d53a91a35d8545c9eead3dffbb69a3dcbcf98 SHA512 7f9f3e687a6d10cc21941d75747625569bba066637b22eece73dfec27fdb477f0897afc5a7d2d2b6f4ad3b163702e27faaab2b537718c14c2a55ef53cd02f7a4
 MISC metadata.xml 342 BLAKE2B 84af0d7e7af39798323a672b3318def4306872b215b8ca84b5f44bb74109ef1f82bfe81dc366cf55db1d54e33bcb414b1d70ed0938ac0e5a1194335fcae06c3c SHA512 427978e7f1422a295b8f7115f57b6a432c5ffb5d5d8671082298b3a52c8f175fa63de13d2a3dfcf59b506f6407cea0e6e9a1b54e2de4b1b2bb7337dfb07c90e4
diff --git a/dev-ruby/org-ruby/org-ruby-0.9.12.ebuild b/dev-ruby/org-ruby/org-ruby-0.9.12.ebuild
index ab67c4933d9f..5b45699d350e 100644
--- a/dev-ruby/org-ruby/org-ruby-0.9.12.ebuild
+++ b/dev-ruby/org-ruby/org-ruby-0.9.12.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_RECIPE_DOC="none"
diff --git a/dev-ruby/paint/Manifest b/dev-ruby/paint/Manifest
index fcf620534182..3402f69bb3ee 100644
--- a/dev-ruby/paint/Manifest
+++ b/dev-ruby/paint/Manifest
@@ -1,3 +1,3 @@
 DIST paint-2.0.1.tar.gz 21724 BLAKE2B 771a832465a48f9230d4687f28aaa852ace02831a72134c75b732dc446750650fb122a6bbac110d70aa586257f907642cfbfdb2a4c8b95e3358f1e1b7344664c SHA512 49db2bdca0b3b6236669219dadb8b72fb0f68102c6f93658e9b032d1da8e5be154458979425a793355efcfc90968c9cca7a1caacd087a67a5c486cd7495235ff
-EBUILD paint-2.0.1.ebuild 517 BLAKE2B 9b417f1ff5b355408da1f49a8f583df80ea3aa8cbfa809710c109a457464dcaf512edc8f80bcf1143dc52983a8dbd5aab2453c176718d9ef556311010344b8f5 SHA512 ec1c9d5033befb4a79e39d2d2b514a431c0579bc353633ccd4edddcbe3a61fefaaaabd924bf8abac3102f1996a65c08d7293262efccb20609e2a95d2e26086ea
+EBUILD paint-2.0.1.ebuild 517 BLAKE2B e031f59e263dcfcea65b45456514a3ba1ab6d89957f3b4b06a4ff02481b6a13060b6f03b1d9d9004edb3b8849f6eab063b088eb3974a9c5bb8f032543e78a62e SHA512 b67d618b479ddfcd652f64e38582827a19599b13f011319e46bebf10c30c9bf1b890ecea28e1f723f2f9a31a1346763d89fb76d62b3b4cf0c4b4d11e642c3e23
 MISC metadata.xml 340 BLAKE2B 732eb269ab350d7a6a922cb7bcfde4e68f7c7bd89b857a44719fcbc3e8ad72e35be71aaa9badc3a438e6f7ca2eb82cfd6bdc70cfcbea5a277f64e6ed0439270c SHA512 da77f9b9bc4d1f82a8c0934106888bc66e3e53cc30123ccd3fc7c74c19c514547e4159f5ad0a7dedc850da19c7fa86e6f0978c1fb0493feda9a3220f385a4a65
diff --git a/dev-ruby/paint/paint-2.0.1.ebuild b/dev-ruby/paint/paint-2.0.1.ebuild
index f7167d3e99f5..aebec5054eac 100644
--- a/dev-ruby/paint/paint-2.0.1.ebuild
+++ b/dev-ruby/paint/paint-2.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=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index cca498f45798..c84a2d2d6569 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,5 +1,5 @@
 DIST puppetdb-termini_5.2.2-1xenial_all.deb 20540 BLAKE2B 2aa48a9de8e512d81fd2e38fff4664bf3ccc69d4fdc6558edf1838171dbc01f3e87186a84a3308c33955336ba3b7d0d70dee640da0cf145ed1624d2341f7614b SHA512 7ac62306b16af0ebd9423a66ac911d35ac11403f45b03d2efe0a4d7c2aec3572670abd0c8930bd3b141c8d4a3aaf1c0b849535e74361b0b1f273b93a6bd855e8
 DIST puppetdb-termini_5.2.4-1xenial_all.deb 20538 BLAKE2B aad000bc0e13e3c97f4428bca88653cbfd76db2e5499f2acad90afcff58847e1dbaec9bc9ae8ec30e21c9b5c8308061b7d51058f0a17e2936d6dfd05ccc650f4 SHA512 98e871a4867735a8ca677ee3fbb6ab5e8718e78623fe6d497a3c680e090b86a0cefc35ee318f6f5abb45ebfd02d9bf75a04f0f1fc48ba654443c5c4ca99f3180
 EBUILD puppetdb-termini-5.2.2.ebuild 658 BLAKE2B 94ce86150e8228a994207160c454fa5d2adec923000e3056c8c94af52be9e970ae143e1c5f885adbd0aa2a17fbdb5f59eab9465c9beec94d98949a6eb652284d SHA512 44ad07412a536aaeea6bbc9e73c9beecb68df91e12f5b5818c3a2fcc7f472bca9e08853b2b1f7f6412e91a0c65bcd4da11a81da73471f75c7eb79ca3df8e9757
-EBUILD puppetdb-termini-5.2.4.ebuild 658 BLAKE2B 94ce86150e8228a994207160c454fa5d2adec923000e3056c8c94af52be9e970ae143e1c5f885adbd0aa2a17fbdb5f59eab9465c9beec94d98949a6eb652284d SHA512 44ad07412a536aaeea6bbc9e73c9beecb68df91e12f5b5818c3a2fcc7f472bca9e08853b2b1f7f6412e91a0c65bcd4da11a81da73471f75c7eb79ca3df8e9757
+EBUILD puppetdb-termini-5.2.4.ebuild 658 BLAKE2B ae9429d33a65439a01c830746c723aa118126782ae587adbd8c2614292309be0e981b117b2057ccdbea1a3a9f545bdfd1722ce43eed7520288a646d4c70e0711 SHA512 ce99726c37ab4e7435b649e74def768077ea61c49dc0971bafe7e9fdf8e0a0a6942ca64c12937ea6625194a0ff8dbabd4181bcbd6b6654b68ab395c4dc62d203
 MISC metadata.xml 459 BLAKE2B 90810b08bfad84e8e841bb1bbe1a2340f5f4a5b214642cef60a882dc8acf4f502d8e971dc04ab6a614e0437c8321c98c6a7566f0151475adaf8c0daa275c485f SHA512 122359cc00e8fa171933fb808692db59e25a4350a4efb72ca78dc5451e8b96f17fae32a8cd6e532f4c2fbaffc8b7d7bbb1ce141ce1e48d93c928cfb3ba3cfeb5
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-5.2.4.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-5.2.4.ebuild
index ebd00d8d8025..a4b1fa6cd9cb 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-5.2.4.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-5.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 inherit unpacker
 
diff --git a/dev-ruby/pygments_rb/Manifest b/dev-ruby/pygments_rb/Manifest
index 69e6b0df137a..d832ebf09ebf 100644
--- a/dev-ruby/pygments_rb/Manifest
+++ b/dev-ruby/pygments_rb/Manifest
@@ -1,5 +1,5 @@
 DIST pygments.rb-1.1.2.gem 1169920 BLAKE2B 3a864349dfb93f0a54cbe31c21afc1a8a4123f7e1e8e498f92ee19a6367d4dad318e07cd78d6e9aa74834c77e4e0bd6e9c8f12519e0ca2ef104099bc3960e0d5 SHA512 dee41bf20142b6a63396504b734c183049f84629e7a943bfb361458f6f8d55e9f84ac6c28bac069d839c519eaf562bd73c74e422ebaf750a7430690a8fad043c
 DIST pygments.rb-1.2.1.gem 1176064 BLAKE2B 7a6651606a433a9f15853ee06c3fe9a02d266f9441a08cc92c0db4ba679a97a2a25aaa4e96a621fbda0553e9b0c995ce53c6f828793f4937de12b3089f12963c SHA512 f0fc63ec028169872e28e2181c6a10c8a3f5e7f07074ba9f43475a0b5aa403a03d7045abb03433b600ef3d74c460556355b4ee64be598d3b93ddb1e0bb306259
 EBUILD pygments_rb-1.1.2.ebuild 1540 BLAKE2B 7364bb2605c53dd1300ebee9a9dd6c2ff23a12c80a1cd9eedd56d2e37dbeb72781f5b865ae22bc94ff987c85db42b8ae8d740569baf03f285a405fe3f5183f1c SHA512 ef10529d30e8038e8aea59c93d86c932bfda000eb8236bc52b4f8ff51b8054b523ca13f7966031b4aea2116a056acfd314e2f8b29a24711dde11237591eca4d9
-EBUILD pygments_rb-1.2.1.ebuild 1533 BLAKE2B 1a9bffb7f2042f1a8b758639ac731395a4deea22a49a16f92ea5873b3cdae46bb36492f6524ae992a96a9acd86a3b692d20725ab117801235b7c4cb2ac7f431d SHA512 8ab1a4067c73962e193e0a1bd7cdccb629ca9f9bc13d29a9e795fa2fe84985410810bbacecbbdd6414688ab843a5ed93b1b066d613f70e2230bee94f6bfa165a
+EBUILD pygments_rb-1.2.1.ebuild 1533 BLAKE2B f272b37494aae4228ded5ef6853eca4e4720ce190fb1e6d3124eab6a2d912551f7aa67aeb1d3dfb1c811b989fffa416e4b3cda3e1308b71ac1fde3432367ebe7 SHA512 964f32c1d43ec1654f971add27ecffc6d916df5454af61b89aa52400547bdee72238dff57690dab5f6a45e2f980ee7107ee10f726512201bad9db247eb751741
 MISC metadata.xml 342 BLAKE2B c4cab71f5d398ab14a8e95598f510c092fa2cb34fd6facf4c59289c8f78f601d585207eba1ba4822ac6552ae12375e4e786873a55d2a34d2e36c02fa72ab5b02 SHA512 aa104434e5ba9d5a27409be91ee791f898e72aa38632b3c185c09071632915686dd5a3ccb46c24c911468d29cdfed6c6421bdfb0119c28bd5c404be4b55bf789
diff --git a/dev-ruby/pygments_rb/pygments_rb-1.2.1.ebuild b/dev-ruby/pygments_rb/pygments_rb-1.2.1.ebuild
index 0f9ba513dcd7..6dff83c2e598 100644
--- a/dev-ruby/pygments_rb/pygments_rb-1.2.1.ebuild
+++ b/dev-ruby/pygments_rb/pygments_rb-1.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 PYTHON_COMPAT=( python2_7 )
 
 RUBY_FAKEGEM_NAME="pygments.rb"
diff --git a/dev-ruby/rbst/Manifest b/dev-ruby/rbst/Manifest
index 432b37d7db1e..42911b779e4b 100644
--- a/dev-ruby/rbst/Manifest
+++ b/dev-ruby/rbst/Manifest
@@ -1,3 +1,3 @@
 DIST rbst-0.5.1.tar.gz 14039 BLAKE2B 7399e92f98c650842464ea9240775ad776ec8d574c578d8da764778bbe8050be429e2521df82b3b04a0bf9cd18bef4f114890d54ef8d6f34c797f0f2f2e35bc2 SHA512 a7fffc1ccf495c1858d6d9fadd38a4d6a2c27a2da8eda8dad038f4ab881f4521223a35f97d4018d25b32c2621132a623040ba930494b36e1385356ecb87fecdc
-EBUILD rbst-0.5.1.ebuild 1162 BLAKE2B c6a7a848d0e28af6bc2fcf02cdcc083e10df4064c18d59a8b909e03124d0c3d9342bc4cb5f976b790597351fa7bb22a76681fefc712e4bbe6302e3fbe6428861 SHA512 a0c99ed97a85b110836a6114a4c035c51e090a0f26a2a22c63198fb40dc12b5677d85e7895222c9dba7c04006e5a4ef48ee5d0fe0c11da88d596d58ec2e0a6c4
+EBUILD rbst-0.5.1.ebuild 1162 BLAKE2B 71ce6f8e5b45e193d2e36f415597ff0f851cb80b49cb2510e05caaeef7f7d46c24daa6add0447c398bf6a98960aaadbeb3695ad0192adb6d2b168ed12a194c98 SHA512 1408a979589c69e7589e0539b0c46a8f80aa95b6941aa4c32c15331ee0b4bcdd280c4889958752692afd1b13a23374ccbede6bdda00d92b4cc9aaf81931fdbd2
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-ruby/rbst/rbst-0.5.1.ebuild b/dev-ruby/rbst/rbst-0.5.1.ebuild
index 845a17891ac9..bf6b4137a919 100644
--- a/dev-ruby/rbst/rbst-0.5.1.ebuild
+++ b/dev-ruby/rbst/rbst-0.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_NAME="RbST"
 RUBY_FAKEGEM_GEMSPEC="RbST.gemspec"
diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index 3eca8c4586b1..83ee2d6d2f89 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -1,5 +1,7 @@
 DIST slim-3.0.7.gem 97280 BLAKE2B 8346e2dd6330b597e0c1f0d4257978c1acbe38014c2fed249a9137b73ca8ee4945a63e2c1453144b7a9acc3f07a755e2ae31622c6b8d8e5554569a01d7d142cb SHA512 b410ed35941a3cfc68f8ab5649450381f830f94c8503e062afcd097f5a669df4cf8035d0baefd42bffaad5d12766baf70bad3eed82149fd861f615649ee469c0
 DIST slim-3.0.9.gem 99840 BLAKE2B e449585fe5642c1980b4d8fb0c93979d8c16020c331f1bc2993c6f7b5bb3e55c1b85595711bf3acdc369c6a3fbfdc6873a8208c59aedaa49dead1cd9166347d4 SHA512 220dbcde230aab05e294022924346fbb02a1bf813a7c97910c2f60d7b3a7dd498d04f6f4f2883b895d2a3e6e9f526331914e3ab4560e748de2bd991358cca90d
+DIST slim-4.0.1.gem 103424 BLAKE2B cf3629e6bb5254082ee3596dc4ddd05921186071823cfe6c423d3f173f80c46ca874e3cfa9a795ce4d564da2c7aa42a422513677978a6e79545a918ef3b9fb6f SHA512 afdaf01ce8372e270c00bc3fd863b9c2f7d26c851ed032374e648f069e6591e9522d4490f57350d4f13b85c68e6a9038111ad03a644a8e89894dca4ebffa0c90
 EBUILD slim-3.0.7-r1.ebuild 1689 BLAKE2B 0e89951b909fb7db81b261d78e88798f4f3f7e493ef80973bbc9a55db9fb4813a14a8555cfc2a438467648e1777cd8acd59340682164d1a3f1f9ed6e967cbb6a SHA512 35305de1f03ebc7b1eaefae992bbb73d41e6f3938bfe670a045c810b71e92a6c741fdfdc35b9e67288543701ac0b10bcc48d0b6317ac0752dfbfe69d160538c9
 EBUILD slim-3.0.9.ebuild 1604 BLAKE2B 6c1fad6f4335d23c7f104344a414d0da423dcb9c8d80dcc6ea7c605c578e26a17dee2764b959e3225c9d0de588fb5176bc79c52f15b78b398d1075e2b1b28a96 SHA512 f4bcca1ff439af9ca723e7d572bfbca224842da932f91c1dcf39339f32a7c106fc42f4a6aa807fed4d9860b57fb76874bf3fb4bd45af49d5739a39b9ccd3f1ed
+EBUILD slim-4.0.1.ebuild 1628 BLAKE2B 4c09c4a8b8f88c96f9d43737f11b3cf7a2b49fa50d012dfbb921bab4496971232c1e6eba39833fb30df36ea682e92e7a2646bc5d2023f175387139b780111052 SHA512 3221aa7d46df29362c1ba996b4420dc94636cfe8dd9aa8ca525b728fc4eec69faeaec7607e35ec99ce8f7c0969d9e88f086437a71b0c44635d107bbcca36435a
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/slim/slim-4.0.1.ebuild b/dev-ruby/slim/slim-4.0.1.ebuild
new file mode 100644
index 000000000000..b937613fc0fa
--- /dev/null
+++ b/dev-ruby/slim/slim-4.0.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit eapi7-ver ruby-fakegem
+
+DESCRIPTION="A template language aiming to reduce the syntax to the essential parts"
+HOMEPAGE="http://slim-lang.com/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+SLOT="$(ver_cut 1)"
+IUSE="doc"
+
+ruby_add_rdepend ">=dev-ruby/tilt-2.0.6:* =dev-ruby/tilt-2.0*:*
+	>=dev-ruby/temple-0.7.6:0.7"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/redcarpet )"
+
+ruby_add_bdepend "test? ( dev-ruby/redcarpet dev-ruby/sass )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# This sinatra code expects tests to be installed but we strip those.
+	sed -i -e "s/require 'sinatra'/require 'bogussinatra'/" Rakefile || die
+
+	# Avoid tests for things we don't have. The builder test does not pass with tilt 2.x
+	sed -i -e '/test_wip_render_with_asciidoc/,/^  end/ s:^:#:' \
+		-e '/test_render_with_wiki/,/^  end/ s:^:#:' \
+		-e '/test_render_with_creole/,/^  end/ s:^:#:' \
+		-e '/test_render_with_builder/,/^  end/ s:^:#:' \
+		-e '/test_render_with_org/,/^  end/ s:^:#:' test/core/test_embedded_engines.rb || die
+
+	sed -i -e '/s\.files/ s/git ls-files/find . -type f -print/' \
+		-e '/s\.executables/ s:git ls-files -- bin/\*:find bin -type f -print:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+	sed -i -e '/Open3/ s:ruby:'${RUBY}':' test/core/test_commands.rb || die
+}