Version bump. Update optional tests patch. Weaken rails requirement to fix bug 332913.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 170 insertions, 6 deletions

diff --git a/dev-ruby/oauth/ChangeLog b/dev-ruby/oauth/ChangeLog
index 9b73254c2e08..ac0a5995e87e 100644
--- a/dev-ruby/oauth/ChangeLog
+++ b/dev-ruby/oauth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/oauth
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/ChangeLog,v 1.10 2010/08/13 06:38:37 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/ChangeLog,v 1.11 2010/09/18 09:58:03 graaff Exp $
+
+*oauth-0.4.3 (18 Sep 2010)
+
+  18 Sep 2010; Hans de Graaff <graaff@gentoo.org> +oauth-0.4.3.ebuild,
+  +files/oauth-0.4.3-optional-tests.patch:
+  Version bump. Update optional tests patch. Weaken rails requirement to fix
+  bug 332913.
 
   13 Aug 2010; Hans de Graaff <graaff@gentoo.org> -oauth-0.3.6.ebuild,
   -oauth-0.3.6-r1.ebuild, -files/oauth-0.3.6-newgem.patch:
diff --git a/dev-ruby/oauth/Manifest b/dev-ruby/oauth/Manifest
index b1d7603913f7..fbeae7437630 100644
--- a/dev-ruby/oauth/Manifest
+++ b/dev-ruby/oauth/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA256
 
 AUX oauth-0.4.1-optional-tests.patch 3247 RMD160 e53bbc2029559a1f42533cdf3fa19c6d21923acd SHA1 e81c2c4fd7900795c7e2cd7b65e26985e10aea5e SHA256 efa33fb67f1835517c54c8021ccfa4c1e9019da8244c3e0e25ad60c8b214c545
+AUX oauth-0.4.3-optional-tests.patch 3502 RMD160 58c7cfa3564f18fd0fcc5b6c3b387376ec8d53b6 SHA1 caaf3c985d54c7227a5279930bfea91300ba6d67 SHA256 7b2160eb55d9f8e41757b7390a5b16c82649c28fd717775a7545419480361983
 DIST oauth-0.4.1.gem 47616 RMD160 7402596bd133287c8b58ff82c0a6bd8a93a826d8 SHA1 8d61542904a6b0abf36fced05141f73b1652f79f SHA256 7d2952ae955789184ff5507b6af31a3e443ad377f63e60a4a4504541c73880cc
+DIST oauth-0.4.3.gem 48640 RMD160 5dd5c5ae42dc05d82292502d51ecc83a85f0d360 SHA1 c103bca6aa3b191ec7c9ee492d3d7572ad5cc9cb SHA256 b219443d9eda81d8950a2765aa9b43a72a9ff68205d618b0165cb47d07ca5bda
 EBUILD oauth-0.4.1.ebuild 643 RMD160 45f5206faf302ceb8ec34e541b556f3a2c037d16 SHA1 91d0d7997aaf6c83d0b6a7bfcc751290ec7b570b SHA256 2de1dc6302c7c71c08a48abfe850e7da6e02515e3930b15138d1051714232545
-MISC ChangeLog 1590 RMD160 1fdded1c0d5c763dc1a6a1625094617148972184 SHA1 626b96818b95e6c7ede9dbddc8b76f0d18278a9b SHA256 0c19c2917c7fa1cfeaae3a21d5f0c4b623f05c07481f892cd2b0559a8aacde2f
+EBUILD oauth-0.4.3.ebuild 826 RMD160 6699c0098c09bec306eefedf761457aebd704e70 SHA1 fd7b73233341ee53ea6cadc5056c2f0f683166ac SHA256 591ff69a8ce16c82fbb7d0ffcea0d95d5e09d8b1b3f76720a2719d8055502d0d
+MISC ChangeLog 1824 RMD160 d21866ba8f3c1dd59bf3538c2f3ca2df3c2cafcc SHA1 6b623be3b77888db5cfaa431ca25dabb696f212e SHA256 e78068376e1c67b55a5686acf9d5215875775024ff265fe5e7fae40d49df9565
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkxk6HMACgkQZihJkut28SsPmAD/eTjD8AuMDVDfVHX1hmLGlYA+
-CIM/xrBrsP/BwtzNLCUA/i4+cdIxWNjc3ozZRgbwHr7L1Pv+l8hfoHXkg+wXlXXp
-=fUg7
+iF4EAREIAAYFAkyUjTEACgkQZihJkut28SstXQEAtxm/KPR8odLg/6FBi23n6D7l
+7yYxyl9s34eV2mt1qSgA/3Ujl2VbAjSt/ZyXUhcxMlwWNNfJ8SbDNtGnjR8ooSxx
+=mOGb
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/oauth/files/oauth-0.4.3-optional-tests.patch b/dev-ruby/oauth/files/oauth-0.4.3-optional-tests.patch
new file mode 100644
index 000000000000..7a5b8b983d82
--- /dev/null
+++ b/dev-ruby/oauth/files/oauth-0.4.3-optional-tests.patch
@@ -0,0 +1,123 @@
+commit d71057125981d613aa77100cbd1edd278257aa40
+Author: Hans de Graaff <hans@degraaff.org>
+Date:   Fri Jun 25 22:53:36 2010 +0200
+
+    Fix LoadError rescue: return can't be used in this context.
+    
+    Using return leads to this error:
+    ./test/test_curb_request_proxy.rb:8: unexpected return (LocalJumpError)
+    
+    Without using return the rescue needs to be placed at the end.
+
+diff --git a/test/test_curb_request_proxy.rb b/test/test_curb_request_proxy.rb
+index 582b18f..8abf245 100644
+--- a/test/test_curb_request_proxy.rb
++++ b/test/test_curb_request_proxy.rb
+@@ -1,12 +1,9 @@
+ require File.expand_path('../test_helper', __FILE__)
+ 
+ begin
+-  require 'oauth/request_proxy/curb_request'
+-  require 'curb'
+-rescue LoadError => e
+-  warn "! problems loading curb, skipping these tests: #{e}"
+-  return
+-end
++
++require 'oauth/request_proxy/curb_request'
++require 'curb'
+ 
+ 
+ class CurbRequestProxyTest < Test::Unit::TestCase
+@@ -74,3 +71,7 @@ class CurbRequestProxyTest < Test::Unit::TestCase
+     assert_equal 'http://example.com/test', request_proxy.normalized_uri
+   end
+ end
++
++rescue LoadError => e
++  warn "! problems loading curb, skipping these tests: #{e}"
++end
+diff --git a/test/test_em_http_client.rb b/test/test_em_http_client.rb
+index 9d0994f..603fd8b 100644
+--- a/test/test_em_http_client.rb
++++ b/test/test_em_http_client.rb
+@@ -1,10 +1,7 @@
+ require File.expand_path('../test_helper', __FILE__)
+ begin
+-  require 'oauth/client/em_http'
+-rescue LoadError => e
+-  warn "! problem loading em-http, skipping these tests: #{e}"
+-  return
+-end
++
++require 'oauth/client/em_http'
+ 
+ class EmHttpClientTest < Test::Unit::TestCase
+ 
+@@ -77,3 +74,7 @@ class EmHttpClientTest < Test::Unit::TestCase
+   end
+ 
+ end
++
++rescue LoadError => e
++  warn "! problem loading em-http, skipping these tests: #{e}"
++end
+diff --git a/test/test_em_http_request_proxy.rb b/test/test_em_http_request_proxy.rb
+index 7b9b12b..ab0b5a5 100644
+--- a/test/test_em_http_request_proxy.rb
++++ b/test/test_em_http_request_proxy.rb
+@@ -1,12 +1,9 @@
+ require File.expand_path('../test_helper', __FILE__)
+ 
+ begin
+-  require 'em-http'
+-  require 'oauth/request_proxy/em_http_request'
+-rescue LoadError => e
+-  warn "! problem loading em-http, skipping these tests: #{e}"
+-  return
+-end
++
++require 'em-http'
++require 'oauth/request_proxy/em_http_request'
+ 
+ 
+ class EmHttpRequestProxyTest < Test::Unit::TestCase
+@@ -110,5 +107,9 @@ class EmHttpRequestProxyTest < Test::Unit::TestCase
+     arguments = opts.delete(:proxy_options) || {}
+     OAuth::RequestProxy.proxy(create_client(opts), arguments)
+   end
++  
++end
+ 
++rescue LoadError => e
++  warn "! problem loading em-http, skipping these tests: #{e}"
+ end
+diff --git a/test/test_typhoeus_request_proxy.rb b/test/test_typhoeus_request_proxy.rb
+index ce69fb2..c809a6f 100644
+--- a/test/test_typhoeus_request_proxy.rb
++++ b/test/test_typhoeus_request_proxy.rb
+@@ -1,13 +1,9 @@
+ require File.expand_path('../test_helper', __FILE__)
+ 
+ begin
+-  require 'oauth/request_proxy/typhoeus_request'
+-  require 'typhoeus'
+-rescue LoadError => e
+-  warn "! problem loading typhoeus, skipping these tests: #{e}"
+-  return
+-end
+ 
++require 'oauth/request_proxy/typhoeus_request'
++require 'typhoeus'
+ 
+ class TyphoeusRequestProxyTest < Test::Unit::TestCase
+ 
+@@ -78,3 +74,8 @@ class TyphoeusRequestProxyTest < Test::Unit::TestCase
+     assert_equal 'POST', request_proxy.method
+   end
+ end
++
++rescue LoadError => e
++  warn "! problem loading typhoeus, skipping these tests: #{e}"
++end
++
diff --git a/dev-ruby/oauth/oauth-0.4.3.ebuild b/dev-ruby/oauth/oauth-0.4.3.ebuild
new file mode 100644
index 000000000000..6a7498653a94
--- /dev/null
+++ b/dev-ruby/oauth/oauth-0.4.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/oauth-0.4.3.ebuild,v 1.1 2010/09/18 09:58:03 graaff Exp $
+
+EAPI="2"
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="HISTORY README.rdoc TODO"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A RubyGem for implementing both OAuth clients and servers."
+HOMEPAGE="http://oauth.rubyforge.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RUBY_PATCHES=( "${P}-optional-tests.patch" )
+
+ruby_add_bdepend "test? ( virtual/ruby-test-unit
+		>=dev-ruby/actionpack-2.3.8:2.3
+		dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	# Let this test work with a wider range of rails versions.
+	sed -i "s/'2.3.8'/'~>2.3.8'/" test/test_action_controller_request_proxy.rb || die
+}