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 71155139694 for ; Sun, 23 Jul 2017 05:59:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9BD92E0DC8; Sun, 23 Jul 2017 05:59:17 +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 7AE08E0DC8 for ; Sun, 23 Jul 2017 05:59:17 +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 3B93D3418CB for ; Sun, 23 Jul 2017 05:59:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D7D3C74BC for ; Sun, 23 Jul 2017 05:59:14 +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: <1500789520.383e858a45d60e161d00afec4d749fe7d855f689.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/aruba/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/aruba/aruba-0.8.1.ebuild X-VCS-Directories: dev-util/aruba/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 383e858a45d60e161d00afec4d749fe7d855f689 X-VCS-Branch: master Date: Sun, 23 Jul 2017 05:59:14 +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: 78c221aa-912d-41b0-a995-552b7d722085 X-Archives-Hash: 16705ac20d60f8b40da4db6c70612e5e commit: 383e858a45d60e161d00afec4d749fe7d855f689 Author: Hans de Graaff gentoo org> AuthorDate: Sun Jul 23 05:58:40 2017 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sun Jul 23 05:58:40 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=383e858a dev-util/aruba: make childprocess dependency more lenient, bug 625964 Package-Manager: Portage-2.3.6, Repoman-2.3.2 dev-util/aruba/aruba-0.8.1.ebuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dev-util/aruba/aruba-0.8.1.ebuild b/dev-util/aruba/aruba-0.8.1.ebuild index cafdf8f3edf..63cae9d1a71 100644 --- a/dev-util/aruba/aruba-0.8.1.ebuild +++ b/dev-util/aruba/aruba-0.8.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -USE_RUBY="ruby20 ruby21 ruby22" +USE_RUBY="ruby21 ruby22" RUBY_FAKEGEM_TASK_DOC="" RUBY_FAKEGEM_RECIPE_TEST="cucumber" @@ -24,7 +24,7 @@ DEPEND="${DEPEND} test? ( sys-devel/bc )" RDEPEND="${RDEPEND}" ruby_add_rdepend " - >=dev-ruby/childprocess-0.5.6 =dev-ruby/childprocess-0.5* + >=dev-ruby/childprocess-0.5.6 =dev-ruby/childprocess-0* >=dev-ruby/contracts-0.9:0 >=dev-ruby/rspec-expectations-2.99:2 >=dev-util/cucumber-1.3.19" @@ -42,8 +42,10 @@ all_ruby_prepare() { rm -f features/support/simplecov_setup.rb || die sed -i -e '1i require "time"' spec/spec_helper.rb || die - # Remove references to git ls-files. - sed -i -e '/git ls-files/d' aruba.gemspec || die + # Remove references to git ls-files and fix childprocess dependency + sed -i -e '/git ls-files/d' \ + -e '/childprocess/ s/0.5.6/0.5/' \ + aruba.gemspec || die # Avoid scenarios making broken assumptions on ${HOME} sed -i -e '/Scenario: Use ~ in path/i @wip' \