[gentoo-commits] repo/gentoo:master commit in: dev-ruby/web-console/

["Hans de Graaff" <graaff@gentoo.org>]

commit:     4167d3593fe78501b43fadaffd469224568a9cf6
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 06:35:39 2018 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 06:52:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4167d359

dev-ruby/web-console: add ruby24, fix tests

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-ruby/web-console/web-console-2.3.0.ebuild | 11 +++++++----
 dev-ruby/web-console/web-console-3.5.1.ebuild |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/dev-ruby/web-console/web-console-2.3.0.ebuild b/dev-ruby/web-console/web-console-2.3.0.ebuild
index d8e0f407253..85f233836b9 100644
--- a/dev-ruby/web-console/web-console-2.3.0.ebuild
+++ b/dev-ruby/web-console/web-console-2.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
@@ -29,7 +29,7 @@ ruby_add_rdepend "
 
 ruby_add_bdepend "test? (
 	dev-ruby/bundler
-	>=dev-ruby/rails-4.0
+	dev-ruby/rails:4.2
 	dev-ruby/sqlite3
 	dev-ruby/mocha
 	dev-ruby/simplecov
@@ -37,5 +37,8 @@ ruby_add_bdepend "test? (
 
 all_ruby_prepare() {
 	# Use an installed rails version rather than live source from github.
-	sed -i -e '/rails/ s/,/#/' Gemfile || die
+	sed -i -e "/'rails'/ s/,/, '~> 4.2' #/" \
+		-e "/'arel'/ s/,/#/" \
+		-e '/simplecov/ s:^:#:' Gemfile || die
+	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
 }

diff --git a/dev-ruby/web-console/web-console-3.5.1.ebuild b/dev-ruby/web-console/web-console-3.5.1.ebuild
index 081438ff720..eee8ecae574 100644
--- a/dev-ruby/web-console/web-console-3.5.1.ebuild
+++ b/dev-ruby/web-console/web-console-3.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
@@ -38,7 +38,7 @@ ruby_add_bdepend "test? (
 all_ruby_prepare() {
 	# Use an installed rails version rather than live source from github.
 	sed -i -e '/\(rack\|rails\|simplecov\)/ s/,/#/'  \
-		-e '/simplecov/d' Gemfile || die
+		-e '/\(byebug\|simplecov\)/ s:^:#:' Gemfile || die
 
 	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
 }