From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 79C9A1382C5 for ; Tue, 23 Jan 2018 06:53:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 773A7E0920; Tue, 23 Jan 2018 06:53:14 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5051AE0920 for ; Tue, 23 Jan 2018 06:53:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1F423335C43 for ; Tue, 23 Jan 2018 06:53:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64E9B1CA for ; Tue, 23 Jan 2018 06:53:11 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1516690361.4167d3593fe78501b43fadaffd469224568a9cf6.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/web-console/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/web-console/web-console-2.3.0.ebuild dev-ruby/web-console/web-console-3.5.1.ebuild X-VCS-Directories: dev-ruby/web-console/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 4167d3593fe78501b43fadaffd469224568a9cf6 X-VCS-Branch: master Date: Tue, 23 Jan 2018 06:53:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2baabeb2-f82b-421f-9b7c-d42ad6c56b44 X-Archives-Hash: d20c3d5d5f0e1430934777ab1f9c5331 commit: 4167d3593fe78501b43fadaffd469224568a9cf6 Author: Hans de Graaff gentoo org> AuthorDate: Tue Jan 23 06:35:39 2018 +0000 Commit: Hans de Graaff gentoo 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 }