[gentoo-commits] repo/gentoo:master commit in: dev-ruby/faraday/

["Hans de Graaff" <graaff@gentoo.org>]

commit:     d63aef92083f63121dc50255d6251d08d71074fd
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 08:10:00 2020 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 16:29:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d63aef92

dev-ruby/faraday: allow all rack versions

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 dev-ruby/faraday/faraday-1.0.1.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-ruby/faraday/faraday-1.0.1.ebuild b/dev-ruby/faraday/faraday-1.0.1.ebuild
index 4148d3eb78e..83b25512b43 100644
--- a/dev-ruby/faraday/faraday-1.0.1.ebuild
+++ b/dev-ruby/faraday/faraday-1.0.1.ebuild
@@ -29,7 +29,7 @@ ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3"
 ruby_add_bdepend "test? (
 		>=dev-ruby/test-unit-2.4
 		>=dev-ruby/connection_pool-2.2.2
-		|| ( dev-ruby/rack:2.0 dev-ruby/rack:1.6 )
+		dev-ruby/rack
 	)"
 
 all_ruby_prepare() {
@@ -40,7 +40,6 @@ all_ruby_prepare() {
 	# Avoid loading all lib files since some of them require unpackaged dependencies.
 	sed -e '/[Cc]overall/ s:^:#:' \
 		-e '/lib\/\*\*/ s:^:#:' \
-		-e '3igem "rack", "<2.1"' \
 		-e '/simplecov/ s:^:#:' \
 		-e '/SimpleCov/,/end/ s:^:#:' \
 		-e '/pry/ s:^:#:' \
@@ -65,6 +64,9 @@ all_ruby_prepare() {
 	if ! has_version "dev-ruby/typhoeus:1" ; then
 		rm -f  spec/faraday/adapter/typhoeus_spec.rb || die
 	fi
+
+	# Fix spec broken by newer rack versions, already fixed upstream
+	sed -i -e 's/one, two/name=value/' spec/support/shared_examples/request_method.rb || die
 }
 
 each_ruby_prepare() {