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 37A08138331 for ; Thu, 25 Jan 2018 06:34:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6DC7BE0931; Thu, 25 Jan 2018 06:34:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 50EA4E0931 for ; Thu, 25 Jan 2018 06:34:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 8D621335C2F for ; Thu, 25 Jan 2018 06:34:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F03C51CC for ; Thu, 25 Jan 2018 06:34:46 +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: <1516860807.2441b0f173fbfc3be56423c9823d13ee3b1c49b6.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/haml/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/haml/haml-4.0.7-r1.ebuild X-VCS-Directories: dev-ruby/haml/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 2441b0f173fbfc3be56423c9823d13ee3b1c49b6 X-VCS-Branch: master Date: Thu, 25 Jan 2018 06:34:46 +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: d07b1ba0-edf5-4840-b0e3-5e3baba5b175 X-Archives-Hash: f48cc26d3abedd21c2d24c10554d2739 commit: 2441b0f173fbfc3be56423c9823d13ee3b1c49b6 Author: Hans de Graaff gentoo org> AuthorDate: Thu Jan 25 06:13:27 2018 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Thu Jan 25 06:13:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2441b0f1 dev-ruby/haml: fix tests, add ruby24 Package-Manager: Portage-2.3.19, Repoman-2.3.6 dev-ruby/haml/haml-4.0.7-r1.ebuild | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dev-ruby/haml/haml-4.0.7-r1.ebuild b/dev-ruby/haml/haml-4.0.7-r1.ebuild index 14564a4e584..e57ebe24cda 100644 --- a/dev-ruby/haml/haml-4.0.7-r1.ebuild +++ b/dev-ruby/haml/haml-4.0.7-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -USE_RUBY="ruby22 ruby23" +USE_RUBY="ruby22 ruby23 ruby24" RUBY_FAKEGEM_TASK_TEST="test" RUBY_FAKEGEM_TASK_DOC="-Ilib doc" @@ -31,6 +31,7 @@ ruby_add_bdepend " dev-ruby/minitest:5 dev-ruby/nokogiri dev-ruby/rails:4.2 + dev-ruby/bundler ) doc? ( dev-ruby/yard @@ -38,13 +39,9 @@ ruby_add_bdepend " )" all_ruby_prepare() { - sed -i -e '/bundler/ s:^:#:' \ - -e 's/gem "minitest"/gem "minitest", "~>5.0"/'\ - -e '1igem "actionpack", "~>4.2"'\ - -e '1igem "activesupport", "~>4.2"'\ - -e '1igem "railties", "~>4.2"'\ - test/test_helper.rb || die # Remove test that fails when RedCloth is available sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,+9 s/^/#/"\ test/filters_test.rb || die + # Avoid tests that are fragile for whitespace + sed -i -e '/test_\(text_area\|partials_should_not_cause_textareas\)/,/^ end/ s:^:#:' test/helper_test.rb || die }