Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Manuel Rueger (mrueg)" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-ruby/webmock: webmock-1.7.4.ebuild webmock-1.18.0.ebuild webmock-1.19.0.ebuild ChangeLog
Date: Wed, 26 Nov 2014 02:14:09
Message-Id: 20141126021404.85665AEBB@oystercatcher.gentoo.org
1 mrueg 14/11/26 02:14:04
2
3 Modified: webmock-1.7.4.ebuild webmock-1.18.0.ebuild
4 webmock-1.19.0.ebuild ChangeLog
5 Log:
6 Drop jruby. Fix deps for ruby21.
7
8 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key )
9
10 Revision Changes Path
11 1.6 dev-ruby/webmock/webmock-1.7.4.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/webmock-1.7.4.ebuild?rev=1.6&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/webmock-1.7.4.ebuild?rev=1.6&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/webmock-1.7.4.ebuild?r1=1.5&r2=1.6
16
17 Index: webmock-1.7.4.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.7.4.ebuild,v
20 retrieving revision 1.5
21 retrieving revision 1.6
22 diff -u -r1.5 -r1.6
23 --- webmock-1.7.4.ebuild 15 Aug 2014 14:32:50 -0000 1.5
24 +++ webmock-1.7.4.ebuild 26 Nov 2014 02:14:04 -0000 1.6
25 @@ -1,10 +1,10 @@
26 # Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.7.4.ebuild,v 1.5 2014/08/15 14:32:50 blueness Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.7.4.ebuild,v 1.6 2014/11/26 02:14:04 mrueg Exp $
30
31 EAPI=2
32
33 -USE_RUBY="ruby19 jruby"
34 +USE_RUBY="ruby19"
35
36 RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
37
38 @@ -28,8 +28,7 @@
39 >=dev-ruby/httpclient-2.1.5.2
40 )"
41
42 -# These are not supported for jruby.
43 -USE_RUBY="ruby19" ruby_add_bdepend "test? ( >=dev-ruby/patron-0.4.9-r1 >=dev-ruby/em-http-request-0.2.14 )"
44 +ruby_add_bdepend "test? ( >=dev-ruby/patron-0.4.9-r1 >=dev-ruby/em-http-request-0.2.14 )"
45
46 all_ruby_prepare() {
47 # Remove bundler support
48
49
50
51 1.4 dev-ruby/webmock/webmock-1.18.0.ebuild
52
53 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/webmock-1.18.0.ebuild?rev=1.4&view=markup
54 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/webmock-1.18.0.ebuild?rev=1.4&content-type=text/plain
55 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/webmock-1.18.0.ebuild?r1=1.3&r2=1.4
56
57 Index: webmock-1.18.0.ebuild
58 ===================================================================
59 RCS file: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.18.0.ebuild,v
60 retrieving revision 1.3
61 retrieving revision 1.4
62 diff -u -r1.3 -r1.4
63 --- webmock-1.18.0.ebuild 15 Aug 2014 14:32:50 -0000 1.3
64 +++ webmock-1.18.0.ebuild 26 Nov 2014 02:14:04 -0000 1.4
65 @@ -1,10 +1,10 @@
66 # Copyright 1999-2014 Gentoo Foundation
67 # Distributed under the terms of the GNU General Public License v2
68 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.18.0.ebuild,v 1.3 2014/08/15 14:32:50 blueness Exp $
69 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.18.0.ebuild,v 1.4 2014/11/26 02:14:04 mrueg Exp $
70
71 EAPI=5
72
73 -USE_RUBY="ruby19 ruby20 ruby21 jruby"
74 +USE_RUBY="ruby19 ruby20 ruby21"
75
76 RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
77
78 @@ -28,8 +28,7 @@
79 >=dev-ruby/httpclient-2.2.4
80 )"
81
82 -# These are not supported for jruby.
83 -USE_RUBY="ruby19 ruby20" ruby_add_bdepend "test? ( >=dev-ruby/patron-0.4.18 >=dev-ruby/http-0.5.0 )"
84 +ruby_add_bdepend "test? ( >=dev-ruby/patron-0.4.18 >=dev-ruby/http-0.5.0 )"
85
86 all_ruby_prepare() {
87 # Remove bundler support
88 @@ -43,15 +42,6 @@
89 rm spec/acceptance/{typhoeus,curb,excon,em_http_request}/* || die
90 }
91
92 -each_ruby_prepare() {
93 - case ${RUBY} in
94 - *jruby)
95 - sed -i -e '/http_gem/d' spec/spec_helper.rb || die
96 - rm spec/acceptance/http_gem/* || die
97 - ;;
98 - esac
99 -}
100 -
101 each_ruby_test() {
102 each_fakegem_test
103
104
105
106
107 1.2 dev-ruby/webmock/webmock-1.19.0.ebuild
108
109 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/webmock-1.19.0.ebuild?rev=1.2&view=markup
110 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/webmock-1.19.0.ebuild?rev=1.2&content-type=text/plain
111 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/webmock-1.19.0.ebuild?r1=1.1&r2=1.2
112
113 Index: webmock-1.19.0.ebuild
114 ===================================================================
115 RCS file: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.19.0.ebuild,v
116 retrieving revision 1.1
117 retrieving revision 1.2
118 diff -u -r1.1 -r1.2
119 --- webmock-1.19.0.ebuild 4 Oct 2014 06:58:47 -0000 1.1
120 +++ webmock-1.19.0.ebuild 26 Nov 2014 02:14:04 -0000 1.2
121 @@ -1,10 +1,10 @@
122 # Copyright 1999-2014 Gentoo Foundation
123 # Distributed under the terms of the GNU General Public License v2
124 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.19.0.ebuild,v 1.1 2014/10/04 06:58:47 graaff Exp $
125 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.19.0.ebuild,v 1.2 2014/11/26 02:14:04 mrueg Exp $
126
127 EAPI=5
128
129 -USE_RUBY="ruby19 ruby20 ruby21 jruby"
130 +USE_RUBY="ruby19 ruby20 ruby21"
131
132 RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
133
134 @@ -28,8 +28,7 @@
135 >=dev-ruby/httpclient-2.2.4
136 )"
137
138 -# These are not supported for jruby.
139 -USE_RUBY="ruby19 ruby20" ruby_add_bdepend "test? ( >=dev-ruby/patron-0.4.18 >=dev-ruby/http-0.5.0 )"
140 +ruby_add_bdepend "test? ( >=dev-ruby/patron-0.4.18 >=dev-ruby/http-0.5.0 )"
141
142 all_ruby_prepare() {
143 # Remove bundler support
144 @@ -43,15 +42,6 @@
145 rm spec/acceptance/{typhoeus,curb,excon,em_http_request}/* || die
146 }
147
148 -each_ruby_prepare() {
149 - case ${RUBY} in
150 - *jruby)
151 - sed -i -e '/http_gem/d' spec/spec_helper.rb || die
152 - rm spec/acceptance/http_gem/* || die
153 - ;;
154 - esac
155 -}
156 -
157 each_ruby_test() {
158 each_fakegem_test
159
160
161
162
163 1.33 dev-ruby/webmock/ChangeLog
164
165 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/ChangeLog?rev=1.33&view=markup
166 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/ChangeLog?rev=1.33&content-type=text/plain
167 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/ChangeLog?r1=1.32&r2=1.33
168
169 Index: ChangeLog
170 ===================================================================
171 RCS file: /var/cvsroot/gentoo-x86/dev-ruby/webmock/ChangeLog,v
172 retrieving revision 1.32
173 retrieving revision 1.33
174 diff -u -r1.32 -r1.33
175 --- ChangeLog 18 Nov 2014 14:05:02 -0000 1.32
176 +++ ChangeLog 26 Nov 2014 02:14:04 -0000 1.33
177 @@ -1,6 +1,10 @@
178 # ChangeLog for dev-ruby/webmock
179 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
180 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/ChangeLog,v 1.32 2014/11/18 14:05:02 mrueg Exp $
181 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/ChangeLog,v 1.33 2014/11/26 02:14:04 mrueg Exp $
182 +
183 + 26 Nov 2014; Manuel Rüger <mrueg@g.o> webmock-1.18.0.ebuild,
184 + webmock-1.19.0.ebuild, webmock-1.7.4.ebuild:
185 + Drop jruby. Fix deps for ruby21.
186
187 18 Nov 2014; Manuel Rüger <mrueg@g.o>
188 -files/webmock-1.4.0-network-specs.patch, -files/webmock-1.4.0-tmpdir.patch:
Report Message
Find on MARC Find on Google Groups