[gentoo-commits] gentoo-x86 commit in dev-ruby/oauth: ChangeLog oauth-0.4.7-r2.ebuild

[Hans de Graaff (graaff)]

graaff      15/05/29 05:50:54

  Modified:             ChangeLog oauth-0.4.7-r2.ebuild
  Log:
  Avoid now-incomptaible typhoeus tests. Use a newer mocha version so ruby21 can be added. Add missing rack test dependency.
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)

Revision  Changes    Path
1.30                 dev-ruby/oauth/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/oauth/ChangeLog?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/oauth/ChangeLog?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/oauth/ChangeLog?r1=1.29&r2=1.30

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/oauth/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ChangeLog	16 Mar 2015 19:43:49 -0000	1.29
+++ ChangeLog	29 May 2015 05:50:54 -0000	1.30
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/oauth
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/ChangeLog,v 1.29 2015/03/16 19:43:49 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/ChangeLog,v 1.30 2015/05/29 05:50:54 graaff Exp $
+
+  29 May 2015; Hans de Graaff <graaff@g.o> oauth-0.4.7-r2.ebuild:
+  Avoid now-incomptaible typhoeus tests. Use a newer mocha version so ruby21
+  can be added. Add missing rack test dependency.
 
   16 Mar 2015; Hans de Graaff <graaff@g.o> -oauth-0.4.7-r1.ebuild:
   Cleanup.



1.5                  dev-ruby/oauth/oauth-0.4.7-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/oauth/oauth-0.4.7-r2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/oauth/oauth-0.4.7-r2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/oauth/oauth-0.4.7-r2.ebuild?r1=1.4&r2=1.5

Index: oauth-0.4.7-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/oauth/oauth-0.4.7-r2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- oauth-0.4.7-r2.ebuild	19 Dec 2014 13:27:33 -0000	1.4
+++ oauth-0.4.7-r2.ebuild	29 May 2015 05:50:54 -0000	1.5
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/oauth-0.4.7-r2.ebuild,v 1.4 2014/12/19 13:27:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/oauth-0.4.7-r2.ebuild,v 1.5 2015/05/29 05:50:54 graaff Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -21,16 +21,20 @@
 
 ruby_add_bdepend "test? (
 		dev-ruby/test-unit:2
-		dev-ruby/mocha:0.12
-		dev-ruby/webmock )"
+		dev-ruby/mocha:0.14
+		dev-ruby/webmock
+		dev-ruby/rack )"
 
 all_ruby_prepare() {
 	# Require a compatible version of mocha
-	sed -i -e '1igem "mocha", "~> 0.12.0"' test/test_helper.rb || die
+	sed -i -e '1igem "mocha", "~> 0.14.0"' test/test_helper.rb || die
 
 	# Ensure a consistent test order to avoid loading issues with e.g. rack
 	sed -i -e "s/.rb']/.rb'].sort/" Rakefile || die
 
 	# Remove tests that require Rails 2.3 since that is ruby18-only.
-	rm test/test_action_controller_request_proxy.rb || die
+	rm -f test/test_action_controller_request_proxy.rb || die
+
+	# Remove typhoeus tests since they require an old version.
+	rm -f test/test_typhoeus_request_proxy.rb || die
 }