[gentoo-commits] repo/gentoo:master commit in: dev-util/cucumber/

[Hans de Graaff]

commit:     cb7ff57b28bebed89e0ecdf601b197d1fa7003bd
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  2 06:17:49 2017 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Apr  2 06:22:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb7ff57b

dev-util/cucumber: drop unused rubyzip:0 dependency, bug 611384

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-util/cucumber/cucumber-1.3.17.ebuild    | 3 +--
 dev-util/cucumber/cucumber-1.3.20-r1.ebuild | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dev-util/cucumber/cucumber-1.3.17.ebuild 
b/dev-util/cucumber/cucumber-1.3.17.ebuild
index beb6bc09881..ed981e017f1 100644
--- a/dev-util/cucumber/cucumber-1.3.17.ebuild
+++ b/dev-util/cucumber/cucumber-1.3.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -30,7 +30,6 @@ ruby_add_bdepend "
                >=dev-ruby/json-1.7
                dev-ruby/bundler
                >=dev-util/cucumber-1.3
-               dev-ruby/rubyzip:0
        )"
 
 ruby_add_rdepend "

diff --git a/dev-util/cucumber/cucumber-1.3.20-r1.ebuild 
b/dev-util/cucumber/cucumber-1.3.20-r1.ebuild
index 2b555a4d19c..77ea993fe07 100644
--- a/dev-util/cucumber/cucumber-1.3.20-r1.ebuild
+++ b/dev-util/cucumber/cucumber-1.3.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -30,7 +30,6 @@ ruby_add_bdepend "
                >=dev-ruby/json-1.7
                dev-ruby/bundler
                >=dev-util/cucumber-1.3
-               dev-ruby/rubyzip:0
        )"
 
 ruby_add_rdepend "
@@ -49,7 +48,7 @@ all_ruby_prepare() {
        # Fix too-strict test dependencies
        sed -e '/nokogiri/ s/~> 1.5.2/>= 1.5.2/' \
                -e '/aruba/ s/= 0.5.2/~> 0.5/' \
-               -e '/rake/ s/10.2/10.5/' -i ${RUBY_FAKEGEM_GEMSPEC} || die
+               -e '/rake/ s/10.2/13/' -i ${RUBY_FAKEGEM_GEMSPEC} || die
 
        # Make sure spork is run in the right interpreter
        sed -i -e 's/#{Spork::BINARY}/-S #{Spork::BINARY}/' 
features/support/env.rb || die