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 B4EDA138AE9 for ; Fri, 29 Dec 2017 06:27:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F19B2BC008; Fri, 29 Dec 2017 06:27:12 +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 1EA252BC008 for ; Fri, 29 Dec 2017 06:27:09 +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 95B9E33BF51 for ; Fri, 29 Dec 2017 06:27:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE2AFA1A0 for ; Fri, 29 Dec 2017 06:27:06 +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: <1514525946.ce86d57b0a7fe880d5349cbd683fb1746d36ba62.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cucumber/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/cucumber/cucumber-2.4.0-r1.ebuild dev-util/cucumber/cucumber-3.0.2.ebuild X-VCS-Directories: dev-util/cucumber/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: ce86d57b0a7fe880d5349cbd683fb1746d36ba62 X-VCS-Branch: master Date: Fri, 29 Dec 2017 06:27:06 +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: 9e73ac12-3bc6-4b5e-baaa-548dc5b4d626 X-Archives-Hash: bb6127c703b64825debf0e4bf04f9507 commit: ce86d57b0a7fe880d5349cbd683fb1746d36ba62 Author: Hans de Graaff gentoo org> AuthorDate: Fri Dec 29 05:39:06 2017 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Fri Dec 29 05:39:06 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce86d57b dev-util/cucumber: fix tests, bug 642572 One feature using bundler still needed dev-ruby/pry as a dependency due to it being listed in the gemspec. Remove pry from the gemspec to avoid this failure without adding an additional dependency. Closed: https://bugs.gentoo.org/642572 Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-util/cucumber/cucumber-2.4.0-r1.ebuild | 3 +-- dev-util/cucumber/cucumber-3.0.2.ebuild | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dev-util/cucumber/cucumber-2.4.0-r1.ebuild b/dev-util/cucumber/cucumber-2.4.0-r1.ebuild index a5bf1f5deac..510dc75aa86 100644 --- a/dev-util/cucumber/cucumber-2.4.0-r1.ebuild +++ b/dev-util/cucumber/cucumber-2.4.0-r1.ebuild @@ -63,8 +63,7 @@ all_ruby_prepare() { sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \ -e '/git ls-files/d' cucumber.gemspec || die - sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die - + sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die } each_ruby_prepare() { diff --git a/dev-util/cucumber/cucumber-3.0.2.ebuild b/dev-util/cucumber/cucumber-3.0.2.ebuild index 4b4428203cf..70e3c8c04bc 100644 --- a/dev-util/cucumber/cucumber-3.0.2.ebuild +++ b/dev-util/cucumber/cucumber-3.0.2.ebuild @@ -64,7 +64,7 @@ all_ruby_prepare() { sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \ -e '/git ls-files/d' cucumber.gemspec || die - sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die + sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die rm -f Gemfile.lock || die }