mrueg 14/11/26 02:14:04
Modified: webmock-1.7.4.ebuild webmock-1.18.0.ebuild
webmock-1.19.0.ebuild ChangeLog
Log:
Drop jruby. Fix deps for ruby21.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key )
Revision Changes Path
1.6 dev-ruby/webmock/webmock-1.7.4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/webmock-1.7.4.ebuild?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/webmock-1.7.4.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/webmock-1.7.4.ebuild?r1=1.5&r2=1.6
Index: webmock-1.7.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.7.4.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- webmock-1.7.4.ebuild 15 Aug 2014 14:32:50 -0000 1.5
+++ webmock-1.7.4.ebuild 26 Nov 2014 02:14:04 -0000 1.6
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.7.4.ebuild,v 1.5
2014/08/15 14:32:50 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.7.4.ebuild,v 1.6
2014/11/26 02:14:04 mrueg Exp $
EAPI=2
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
@@ -28,8 +28,7 @@
>=dev-ruby/httpclient-2.1.5.2
)"
-# These are not supported for jruby.
-USE_RUBY="ruby19" ruby_add_bdepend "test? ( >=dev-ruby/patron-0.4.9-r1
>=dev-ruby/em-http-request-0.2.14 )"
+ruby_add_bdepend "test? ( >=dev-ruby/patron-0.4.9-r1
>=dev-ruby/em-http-request-0.2.14 )"
all_ruby_prepare() {
# Remove bundler support
1.4 dev-ruby/webmock/webmock-1.18.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/webmock-1.18.0.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/webmock-1.18.0.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/webmock-1.18.0.ebuild?r1=1.3&r2=1.4
Index: webmock-1.18.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.18.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- webmock-1.18.0.ebuild 15 Aug 2014 14:32:50 -0000 1.3
+++ webmock-1.18.0.ebuild 26 Nov 2014 02:14:04 -0000 1.4
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.18.0.ebuild,v
1.3 2014/08/15 14:32:50 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.18.0.ebuild,v
1.4 2014/11/26 02:14:04 mrueg Exp $
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
@@ -28,8 +28,7 @@
>=dev-ruby/httpclient-2.2.4
)"
-# These are not supported for jruby.
-USE_RUBY="ruby19 ruby20" ruby_add_bdepend "test? ( >=dev-ruby/patron-0.4.18
>=dev-ruby/http-0.5.0 )"
+ruby_add_bdepend "test? ( >=dev-ruby/patron-0.4.18 >=dev-ruby/http-0.5.0 )"
all_ruby_prepare() {
# Remove bundler support
@@ -43,15 +42,6 @@
rm spec/acceptance/{typhoeus,curb,excon,em_http_request}/* || die
}
-each_ruby_prepare() {
- case ${RUBY} in
- *jruby)
- sed -i -e '/http_gem/d' spec/spec_helper.rb || die
- rm spec/acceptance/http_gem/* || die
- ;;
- esac
-}
-
each_ruby_test() {
each_fakegem_test
1.2 dev-ruby/webmock/webmock-1.19.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/webmock-1.19.0.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/webmock-1.19.0.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/webmock-1.19.0.ebuild?r1=1.1&r2=1.2
Index: webmock-1.19.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.19.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- webmock-1.19.0.ebuild 4 Oct 2014 06:58:47 -0000 1.1
+++ webmock-1.19.0.ebuild 26 Nov 2014 02:14:04 -0000 1.2
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.19.0.ebuild,v
1.1 2014/10/04 06:58:47 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/webmock-1.19.0.ebuild,v
1.2 2014/11/26 02:14:04 mrueg Exp $
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
@@ -28,8 +28,7 @@
>=dev-ruby/httpclient-2.2.4
)"
-# These are not supported for jruby.
-USE_RUBY="ruby19 ruby20" ruby_add_bdepend "test? ( >=dev-ruby/patron-0.4.18
>=dev-ruby/http-0.5.0 )"
+ruby_add_bdepend "test? ( >=dev-ruby/patron-0.4.18 >=dev-ruby/http-0.5.0 )"
all_ruby_prepare() {
# Remove bundler support
@@ -43,15 +42,6 @@
rm spec/acceptance/{typhoeus,curb,excon,em_http_request}/* || die
}
-each_ruby_prepare() {
- case ${RUBY} in
- *jruby)
- sed -i -e '/http_gem/d' spec/spec_helper.rb || die
- rm spec/acceptance/http_gem/* || die
- ;;
- esac
-}
-
each_ruby_test() {
each_fakegem_test
1.33 dev-ruby/webmock/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/ChangeLog?rev=1.33&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/ChangeLog?rev=1.33&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/webmock/ChangeLog?r1=1.32&r2=1.33
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/webmock/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ChangeLog 18 Nov 2014 14:05:02 -0000 1.32
+++ ChangeLog 26 Nov 2014 02:14:04 -0000 1.33
@@ -1,6 +1,10 @@
# ChangeLog for dev-ruby/webmock
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/ChangeLog,v 1.32
2014/11/18 14:05:02 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webmock/ChangeLog,v 1.33
2014/11/26 02:14:04 mrueg Exp $
+
+ 26 Nov 2014; Manuel Rüger <[email protected]> webmock-1.18.0.ebuild,
+ webmock-1.19.0.ebuild, webmock-1.7.4.ebuild:
+ Drop jruby. Fix deps for ruby21.
18 Nov 2014; Manuel Rüger <[email protected]>
-files/webmock-1.4.0-network-specs.patch, -files/webmock-1.4.0-tmpdir.patch:
