Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/faraday/
Date: Sun, 16 Aug 2020 16:30:38
Message-Id: 1597595373.d63aef92083f63121dc50255d6251d08d71074fd.graaff@gentoo
1 commit: d63aef92083f63121dc50255d6251d08d71074fd
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 16 08:10:00 2020 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 16 16:29:33 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d63aef92
7
8 dev-ruby/faraday: allow all rack versions
9
10 Package-Manager: Portage-2.3.103, Repoman-2.3.23
11 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
12
13 dev-ruby/faraday/faraday-1.0.1.ebuild | 6 ++++--
14 1 file changed, 4 insertions(+), 2 deletions(-)
15
16 diff --git a/dev-ruby/faraday/faraday-1.0.1.ebuild b/dev-ruby/faraday/faraday-1.0.1.ebuild
17 index 4148d3eb78e..83b25512b43 100644
18 --- a/dev-ruby/faraday/faraday-1.0.1.ebuild
19 +++ b/dev-ruby/faraday/faraday-1.0.1.ebuild
20 @@ -29,7 +29,7 @@ ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3"
21 ruby_add_bdepend "test? (
22 >=dev-ruby/test-unit-2.4
23 >=dev-ruby/connection_pool-2.2.2
24 - || ( dev-ruby/rack:2.0 dev-ruby/rack:1.6 )
25 + dev-ruby/rack
26 )"
27
28 all_ruby_prepare() {
29 @@ -40,7 +40,6 @@ all_ruby_prepare() {
30 # Avoid loading all lib files since some of them require unpackaged dependencies.
31 sed -e '/[Cc]overall/ s:^:#:' \
32 -e '/lib\/\*\*/ s:^:#:' \
33 - -e '3igem "rack", "<2.1"' \
34 -e '/simplecov/ s:^:#:' \
35 -e '/SimpleCov/,/end/ s:^:#:' \
36 -e '/pry/ s:^:#:' \
37 @@ -65,6 +64,9 @@ all_ruby_prepare() {
38 if ! has_version "dev-ruby/typhoeus:1" ; then
39 rm -f spec/faraday/adapter/typhoeus_spec.rb || die
40 fi
41 +
42 + # Fix spec broken by newer rack versions, already fixed upstream
43 + sed -i -e 's/one, two/name=value/' spec/support/shared_examples/request_method.rb || die
44 }
45
46 each_ruby_prepare() {