From: Hans de Graaff <graaff@gentoo.org>
Date: Sun, 23 Jul 2017 05:58:40 +0000 (+0200)
Subject: dev-util/aruba: make childprocess dependency more lenient, bug 625964
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=383e858a45d60e161d00afec4d749fe7d855f689;p=gentoo.git

dev-util/aruba: make childprocess dependency more lenient, bug 625964

Package-Manager: Portage-2.3.6, Repoman-2.3.2
---

diff --git a/dev-util/aruba/aruba-0.8.1.ebuild b/dev-util/aruba/aruba-0.8.1.ebuild
index cafdf8f3edf5..63cae9d1a719 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' \