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/webmock/
Date: Sun, 26 Aug 2018 05:38:26
Message-Id: 1535261820.b3fa42914452f464925404459203cae94aac3e04.graaff@gentoo
1 commit: b3fa42914452f464925404459203cae94aac3e04
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 26 05:32:13 2018 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 26 05:37:00 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3fa4291
7
8 dev-ruby/webmock: amd64 stable
9
10 Also avoid test that requires network access
11
12 Package-Manager: Portage-2.3.40, Repoman-2.3.9
13
14 dev-ruby/webmock/webmock-2.3.2.ebuild | 7 +++++--
15 dev-ruby/webmock/webmock-3.4.1.ebuild | 3 +++
16 2 files changed, 8 insertions(+), 2 deletions(-)
17
18 diff --git a/dev-ruby/webmock/webmock-2.3.2.ebuild b/dev-ruby/webmock/webmock-2.3.2.ebuild
19 index e8260499166..cef9721304f 100644
20 --- a/dev-ruby/webmock/webmock-2.3.2.ebuild
21 +++ b/dev-ruby/webmock/webmock-2.3.2.ebuild
22 @@ -3,7 +3,7 @@
23
24 EAPI=5
25
26 -USE_RUBY="ruby22 ruby23 ruby24"
27 +USE_RUBY="ruby23 ruby24"
28
29 RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
30
31 @@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/bblimke/webmock"
32
33 LICENSE="GPL-2"
34 SLOT="2"
35 -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
36 +KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
37 IUSE=""
38
39 ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 dev-ruby/hashdiff"
40 @@ -49,6 +49,9 @@ all_ruby_prepare() {
41 sed -i -e '/httpclient streams response/,/^ end/ s:^:#:' \
42 -e '/are detected when manually specifying Authorization header/,/^ end/ s:^:#:' \
43 spec/acceptance/httpclient/httpclient_spec.rb
44 +
45 + # Avoid specs that require network access
46 + sed -i -e '/when request is not stubbed/,/^ end/ s:^:#:' spec/acceptance/shared/callbacks.rb
47 }
48
49 each_ruby_test() {
50
51 diff --git a/dev-ruby/webmock/webmock-3.4.1.ebuild b/dev-ruby/webmock/webmock-3.4.1.ebuild
52 index c5652a996a1..4f773cef98d 100644
53 --- a/dev-ruby/webmock/webmock-3.4.1.ebuild
54 +++ b/dev-ruby/webmock/webmock-3.4.1.ebuild
55 @@ -49,6 +49,9 @@ all_ruby_prepare() {
56 sed -i -e '/httpclient streams response/,/^ end/ s:^:#:' \
57 -e '/are detected when manually specifying Authorization header/,/^ end/ s:^:#:' \
58 spec/acceptance/httpclient/httpclient_spec.rb
59 +
60 + # Avoid specs that require network access
61 + sed -i -e '/when request is not stubbed/,/^ end/ s:^:#:' spec/acceptance/shared/callbacks.rb
62 }
63
64 each_ruby_test() {