1 |
graaff 13/11/30 15:58:53 |
2 |
|
3 |
Modified: ChangeLog oauth-0.4.7.ebuild |
4 |
Log: |
5 |
Add jruby. Drop test dependency on dev-ruby/rails:3.2 altogether since it will be masked soon. |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.22 dev-ruby/oauth/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/oauth/ChangeLog?rev=1.22&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/oauth/ChangeLog?rev=1.22&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/oauth/ChangeLog?r1=1.21&r2=1.22 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/oauth/ChangeLog,v |
19 |
retrieving revision 1.21 |
20 |
retrieving revision 1.22 |
21 |
diff -u -r1.21 -r1.22 |
22 |
--- ChangeLog 11 Aug 2013 07:42:33 -0000 1.21 |
23 |
+++ ChangeLog 30 Nov 2013 15:58:53 -0000 1.22 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for dev-ruby/oauth |
26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/ChangeLog,v 1.21 2013/08/11 07:42:33 graaff Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/ChangeLog,v 1.22 2013/11/30 15:58:53 graaff Exp $ |
29 |
+ |
30 |
+ 30 Nov 2013; Hans de Graaff <graaff@g.o> oauth-0.4.7.ebuild: |
31 |
+ Add jruby. Drop test dependency on dev-ruby/rails:3.2 altogether since it |
32 |
+ will be masked soon. |
33 |
|
34 |
11 Aug 2013; Hans de Graaff <graaff@g.o> -oauth-0.4.6.ebuild: |
35 |
Cleanup. |
36 |
|
37 |
|
38 |
|
39 |
1.2 dev-ruby/oauth/oauth-0.4.7.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/oauth/oauth-0.4.7.ebuild?rev=1.2&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/oauth/oauth-0.4.7.ebuild?rev=1.2&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/oauth/oauth-0.4.7.ebuild?r1=1.1&r2=1.2 |
44 |
|
45 |
Index: oauth-0.4.7.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/oauth/oauth-0.4.7.ebuild,v |
48 |
retrieving revision 1.1 |
49 |
retrieving revision 1.2 |
50 |
diff -u -r1.1 -r1.2 |
51 |
--- oauth-0.4.7.ebuild 5 Oct 2012 10:33:57 -0000 1.1 |
52 |
+++ oauth-0.4.7.ebuild 30 Nov 2013 15:58:53 -0000 1.2 |
53 |
@@ -1,9 +1,9 @@ |
54 |
-# Copyright 1999-2012 Gentoo Foundation |
55 |
+# Copyright 1999-2013 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/oauth-0.4.7.ebuild,v 1.1 2012/10/05 10:33:57 graaff Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/oauth-0.4.7.ebuild,v 1.2 2013/11/30 15:58:53 graaff Exp $ |
59 |
|
60 |
EAPI=4 |
61 |
-USE_RUBY="ruby18 ree18 ruby19" |
62 |
+USE_RUBY="ruby18 ree18 ruby19 jruby" |
63 |
|
64 |
RUBY_FAKEGEM_TASK_DOC="" |
65 |
|
66 |
@@ -20,13 +20,19 @@ |
67 |
IUSE="" |
68 |
|
69 |
ruby_add_bdepend "test? ( |
70 |
- dev-ruby/mocha |
71 |
+ dev-ruby/test-unit:2 |
72 |
+ dev-ruby/mocha:0.12 |
73 |
dev-ruby/webmock )" |
74 |
-USE_RUBY="ruby18 ree18" ruby_add_bdepend "test? ( >=dev-ruby/actionpack-2.3.8:2.3 )" |
75 |
|
76 |
all_ruby_prepare() { |
77 |
+ # Require a compatible version of mocha |
78 |
+ sed -i -e '1igem "mocha", "~> 0.12.0"' test/test_helper.rb || die |
79 |
+ |
80 |
# Ensure a consistent test order to avoid loading issues with e.g. rack |
81 |
sed -i -e "s/.rb']/.rb'].sort/" Rakefile || die |
82 |
+ |
83 |
+ # Remove tests that require Rails 2.3 since that is ruby18-only. |
84 |
+ rm test/test_action_controller_request_proxy.rb || die |
85 |
} |
86 |
|
87 |
each_ruby_prepare() { |
88 |
@@ -41,7 +47,6 @@ |
89 |
;; |
90 |
*ruby19) |
91 |
# Remove tests depending on rails. |
92 |
- rm test/test_action_controller_request_proxy.rb || die |
93 |
;; |
94 |
*) |
95 |
;; |