Remove ruby18 target. Cleanup old patches.

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

5 files changed, 13 insertions, 275 deletions

diff --git a/dev-ruby/oauth/ChangeLog b/dev-ruby/oauth/ChangeLog
index 9e46d9d70dea..4dfccb156b8b 100644
--- a/dev-ruby/oauth/ChangeLog
+++ b/dev-ruby/oauth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/oauth
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/ChangeLog,v 1.23 2014/03/25 10:54:42 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/ChangeLog,v 1.24 2014/05/21 02:24:22 mrueg Exp $
+
+*oauth-0.4.7-r1 (21 May 2014)
+
+  21 May 2014; Manuel Rüger <mrueg@gentoo.org> +oauth-0.4.7-r1.ebuild,
+  -files/oauth-0.4.1-optional-tests.patch,
+  -files/oauth-0.4.3-optional-tests.patch, -oauth-0.4.7.ebuild:
+  Remove ruby18 target. Cleanup old patches.
 
   25 Mar 2014; Hans de Graaff <graaff@gentoo.org> oauth-0.4.7.ebuild:
   Drop deprecated ree18.
@@ -103,4 +110,3 @@
   16 May 2009; Hans de Graaff <graaff@gentoo.org> +metadata.xml,
   +oauth-0.3.2.ebuild:
   Initial import. Dependency for dev-ruby/twitter.
-
diff --git a/dev-ruby/oauth/Manifest b/dev-ruby/oauth/Manifest
index 13441b47954a..b4d33eda48bb 100644
--- a/dev-ruby/oauth/Manifest
+++ b/dev-ruby/oauth/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX oauth-0.4.1-optional-tests.patch 3247 SHA256 efa33fb67f1835517c54c8021ccfa4c1e9019da8244c3e0e25ad60c8b214c545 SHA512 81a0ffd49f762348540dce46a506d9f7f7e532573b80cc8fd0bd864c3f04f16b6392649bf2f5cd8be3a06f18789dfdd776f16a0112c6490b13db844d77bf86b2 WHIRLPOOL 7d417840012f66b481a10c72fca38ccfd2ed75c0ab1f5c23370ac84e0905d8f0578f10ec9b91985acd2815dfb8bb5c09a23870a7f364192da550959e0db7f67e
-AUX oauth-0.4.3-optional-tests.patch 3502 SHA256 7b2160eb55d9f8e41757b7390a5b16c82649c28fd717775a7545419480361983 SHA512 d10018d666cc145be2afe0f43ab5e771b1d48d44cbed18a8ec4de616ec1613af24b063e1d60c04dfa9903268e8a3f433fa011a826f723d1d40edf8a042d465cb WHIRLPOOL 0205a58ab94db05cc5155e0a9a5754978bb1777444f91a8a1a7a18bec3759c10f919f3835320f7edc8cb397d829a21d5adfd4aea61cbea50d79c19be968b73d7
 DIST oauth-0.4.7.gem 50688 SHA256 bca47d77c946af466872269e37e470837858b1305d5143e5a56c50356e02b2cc SHA512 7d8df61574aaf53ffcb206c6a210546c36b67b2c545d6b31afef2961ee135050923f427dc4720379b7689eef9d921015c26fedd8b11bbd13761dd498155fc550 WHIRLPOOL 5a9dd0eeb2137db2b9810482dca116bf38c06ed75dff2df434118c147ed907d4fdad55dfd2e9c0751b42a110cd240c2ff70bfca75bcffc7f08dd454f65ca7591
-EBUILD oauth-0.4.7.ebuild 1255 SHA256 7cb9fdeeff40126c6f8e755b69318814ce7b91cda83e380cba3ab7f647b40c35 SHA512 f9f2b8c7bd7150638c2cfb8483d8ed7dab21c4595ea475a8ef02d20d324ab5bdd766c76f2d06a007a9f484f66e5940164ae4e4f280643f93559bb1f5fafaeddb WHIRLPOOL 1ba63fefee4e72d75235553760e1e19cdf295bdba8ca91c2211b8f273ec5f46dec6f742e8be0b7b859078c282b01fcf437ca5cf7f82e7b5fd8fdae3b73bd71f5
-MISC ChangeLog 3280 SHA256 32117eb8f5507c5fd60dda45fe5323b58c01f57b9e9104aaeda885e953e3db97 SHA512 cebb314005636dcff103b2b020b49c5ace1796643f56af8ac83304f8582a017e9bec6f01c7d07b72518609da34c95d9d29eb953d06863b7f7b2397d8dfc0905d WHIRLPOOL 5b30d8823ea6fcd81c4366607d0d298257465b61700ada655f60def34d808577cbc3665bb206b81d53e6a0db16fe10dd9769555a8d37adbdd86b8417cdf926c0
+EBUILD oauth-0.4.7-r1.ebuild 998 SHA256 7a164dfe35082461a6755c6a5a7178068738f41a6494f0fae41bc4dfe98d246d SHA512 94aaf312a356000c22c4726a3e08bc735b21e41537a4d15687694d386f7c988dd29e3ba228c74e67527ca9f0a382a2b67c8ecdba2f016e31a611a354e9902172 WHIRLPOOL 1136cfb6a1ddddeb5e76a8a76bc953d06c545418666462ec632485a7c9b91f3511c2cb3b5b850bc2b4c92d996d0e65e1cc8cad71499f0aea9b73d36fa9bff1ae
+MISC ChangeLog 3534 SHA256 3b27a23e82d09b2857f1bf896cdae15090fdfecb8ff7937cc689b50da03b36c8 SHA512 6ba0862fd312cbe7e1c178c5a4e2864e422e90fc0c3e2219766612cbfa688e4907dc19ace9942e6211921d3670734f8a58a7227bf801d6522b0be9fcecf49616 WHIRLPOOL c0411353ab6770048b5edaf0f6ec211335fe796c6402e18d5553ae9931b9f91834b02c8e8f8f9ba3346534ce03734a463d2f6cb64a24b99a125d817790eb226f
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlMxYHgACgkQiIP6VqMIqNdpkQD/fXGLjkpDENYWFDD7gX+AqvMq
-EkelHdd8Q1L2PgQvQSgBAJT96cjpcPTiW3FpdHGbr5zCoZ07Bdn8nTsFzDZrkm7S
-=sFqu
------END PGP SIGNATURE-----
diff --git a/dev-ruby/oauth/files/oauth-0.4.1-optional-tests.patch b/dev-ruby/oauth/files/oauth-0.4.1-optional-tests.patch
deleted file mode 100644
index 175e6090abc1..000000000000
--- a/dev-ruby/oauth/files/oauth-0.4.1-optional-tests.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-Fix loading (or rather, not loading) of optional tests. Submitted upstream.
-http://github.com/graaff/oauth-ruby/commit/de7fd4a02edf236e74f4bb84eeafb02597500d79
-
-diff --git a/test/test_curb_request_proxy.rb b/test/test_curb_request_proxy.rb
-index ae5cb50..af15435 100644
---- a/test/test_curb_request_proxy.rb
-+++ b/test/test_curb_request_proxy.rb
-@@ -1,12 +1,9 @@
- require 'test_helper'
- 
- 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
-@@ -73,4 +70,8 @@ class CurbRequestProxyTest < Test::Unit::TestCase
-     assert_equal expected_parameters, request_proxy.parameters_for_signature
-     assert_equal 'http://example.com/test', request_proxy.normalized_uri
-   end
--end
-\ No newline at end of file
-+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 8b8642f..c3f97e5 100644
---- a/test/test_em_http_client.rb
-+++ b/test/test_em_http_client.rb
-@@ -1,10 +1,7 @@
- require 'test_helper'
- 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 055a95a..f0200a7 100644
---- a/test/test_em_http_request_proxy.rb
-+++ b/test/test_em_http_request_proxy.rb
-@@ -1,12 +1,9 @@
- require 'test_helper'
- 
- 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
-@@ -111,4 +108,8 @@ class EmHttpRequestProxyTest < Test::Unit::TestCase
-     OAuth::RequestProxy.proxy(create_client(opts), arguments)
-   end
-   
--end
-\ No newline at end of file
-+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 4044604..c54ad8e 100644
---- a/test/test_typhoeus_request_proxy.rb
-+++ b/test/test_typhoeus_request_proxy.rb
-@@ -1,13 +1,9 @@
- require 'test_helper'
- 
- 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/files/oauth-0.4.3-optional-tests.patch b/dev-ruby/oauth/files/oauth-0.4.3-optional-tests.patch
deleted file mode 100644
index 7a5b8b983d82..000000000000
--- a/dev-ruby/oauth/files/oauth-0.4.3-optional-tests.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-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.7.ebuild b/dev-ruby/oauth/oauth-0.4.7-r1.ebuild
index 2a6bd40f2bbd..741792746267 100644
--- a/dev-ruby/oauth/oauth-0.4.7.ebuild
+++ b/dev-ruby/oauth/oauth-0.4.7-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 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.ebuild,v 1.3 2014/03/25 10:54:43 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/oauth-0.4.7-r1.ebuild,v 1.1 2014/05/21 02:24:22 mrueg Exp $
 
-EAPI=4
-USE_RUBY="ruby18 ruby19 jruby"
+EAPI=5
+USE_RUBY="ruby19 jruby"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -34,17 +34,3 @@ all_ruby_prepare() {
 	# Remove tests that require Rails 2.3 since that is ruby18-only.
 	rm test/test_action_controller_request_proxy.rb || die
 }
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby18)
-			# Ignore hash ordering test failures
-			sed -i -e '183s:^:#:' -e '224s:^:#:' test/integration/consumer_test.rb || die
-			;;
-		*ruby19)
-			# Remove tests depending on rails.
-			;;
-		*)
-			;;
-	esac
-}