From: Hans de Graaff <graaff@gentoo.org>
Date: Mon, 21 May 2018 14:12:10 +0000 (+0200)
Subject: dev-ruby/webmock: fix test failures with dev-ruby/http
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=516be86acc69c837fd79bcf20d1ecee6e1dad866;p=gentoo.git

dev-ruby/webmock: fix test failures with dev-ruby/http

Require a new enough version to pass all tests.

Closes: https://bugs.gentoo.org/646860
Package-Manager: Portage-2.3.36, Repoman-2.3.9
---

diff --git a/dev-ruby/webmock/webmock-3.3.0.ebuild b/dev-ruby/webmock/webmock-3.3.0.ebuild
index c8012a63170d..49c52edbb44b 100644
--- a/dev-ruby/webmock/webmock-3.3.0.ebuild
+++ b/dev-ruby/webmock/webmock-3.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
 
@@ -29,7 +29,7 @@ ruby_add_bdepend "test? (
 	dev-ruby/rack
 	>=dev-ruby/httpclient-2.8.0
 	>=dev-ruby/patron-0.4.18
-	>=dev-ruby/http-0.8.0:0.8 )"
+	|| ( dev-ruby/http:3 dev-ruby/http:2.0 ) )"
 
 all_ruby_prepare() {
 	# Remove bundler support
diff --git a/dev-ruby/webmock/webmock-3.4.0.ebuild b/dev-ruby/webmock/webmock-3.4.0.ebuild
index fd96b8784366..49c52edbb44b 100644
--- a/dev-ruby/webmock/webmock-3.4.0.ebuild
+++ b/dev-ruby/webmock/webmock-3.4.0.ebuild
@@ -29,7 +29,7 @@ ruby_add_bdepend "test? (
 	dev-ruby/rack
 	>=dev-ruby/httpclient-2.8.0
 	>=dev-ruby/patron-0.4.18
-	>=dev-ruby/http-0.8.0:0.8 )"
+	|| ( dev-ruby/http:3 dev-ruby/http:2.0 ) )"
 
 all_ruby_prepare() {
 	# Remove bundler support
diff --git a/dev-ruby/webmock/webmock-3.4.1.ebuild b/dev-ruby/webmock/webmock-3.4.1.ebuild
index fd96b8784366..49c52edbb44b 100644
--- a/dev-ruby/webmock/webmock-3.4.1.ebuild
+++ b/dev-ruby/webmock/webmock-3.4.1.ebuild
@@ -29,7 +29,7 @@ ruby_add_bdepend "test? (
 	dev-ruby/rack
 	>=dev-ruby/httpclient-2.8.0
 	>=dev-ruby/patron-0.4.18
-	>=dev-ruby/http-0.8.0:0.8 )"
+	|| ( dev-ruby/http:3 dev-ruby/http:2.0 ) )"
 
 all_ruby_prepare() {
 	# Remove bundler support