| 1 |
commit: 383e858a45d60e161d00afec4d749fe7d855f689 |
| 2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 23 05:58:40 2017 +0000 |
| 4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 23 05:58:40 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=383e858a |
| 7 |
|
| 8 |
dev-util/aruba: make childprocess dependency more lenient, bug 625964 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
|
| 12 |
dev-util/aruba/aruba-0.8.1.ebuild | 10 ++++++---- |
| 13 |
1 file changed, 6 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-util/aruba/aruba-0.8.1.ebuild b/dev-util/aruba/aruba-0.8.1.ebuild |
| 16 |
index cafdf8f3edf..63cae9d1a71 100644 |
| 17 |
--- a/dev-util/aruba/aruba-0.8.1.ebuild |
| 18 |
+++ b/dev-util/aruba/aruba-0.8.1.ebuild |
| 19 |
@@ -2,7 +2,7 @@ |
| 20 |
# Distributed under the terms of the GNU General Public License v2 |
| 21 |
|
| 22 |
EAPI=5 |
| 23 |
-USE_RUBY="ruby20 ruby21 ruby22" |
| 24 |
+USE_RUBY="ruby21 ruby22" |
| 25 |
|
| 26 |
RUBY_FAKEGEM_TASK_DOC="" |
| 27 |
RUBY_FAKEGEM_RECIPE_TEST="cucumber" |
| 28 |
@@ -24,7 +24,7 @@ DEPEND="${DEPEND} test? ( sys-devel/bc )" |
| 29 |
RDEPEND="${RDEPEND}" |
| 30 |
|
| 31 |
ruby_add_rdepend " |
| 32 |
- >=dev-ruby/childprocess-0.5.6 =dev-ruby/childprocess-0.5* |
| 33 |
+ >=dev-ruby/childprocess-0.5.6 =dev-ruby/childprocess-0* |
| 34 |
>=dev-ruby/contracts-0.9:0 |
| 35 |
>=dev-ruby/rspec-expectations-2.99:2 |
| 36 |
>=dev-util/cucumber-1.3.19" |
| 37 |
@@ -42,8 +42,10 @@ all_ruby_prepare() { |
| 38 |
rm -f features/support/simplecov_setup.rb || die |
| 39 |
sed -i -e '1i require "time"' spec/spec_helper.rb || die |
| 40 |
|
| 41 |
- # Remove references to git ls-files. |
| 42 |
- sed -i -e '/git ls-files/d' aruba.gemspec || die |
| 43 |
+ # Remove references to git ls-files and fix childprocess dependency |
| 44 |
+ sed -i -e '/git ls-files/d' \ |
| 45 |
+ -e '/childprocess/ s/0.5.6/0.5/' \ |
| 46 |
+ aruba.gemspec || die |
| 47 |
|
| 48 |
# Avoid scenarios making broken assumptions on ${HOME} |
| 49 |
sed -i -e '/Scenario: Use ~ in path/i @wip' \ |
Archives