From 749c7c6b59c07a488e39727e31eb5f0d56f5d36a Mon Sep 17 00:00:00 2001 From: Manuel Rüger Date: Wed, 21 May 2014 02:24:22 +0000 Subject: Remove ruby18 target. Cleanup old patches. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key ) --- dev-ruby/oauth/ChangeLog | 10 +- .../oauth/files/oauth-0.4.1-optional-tests.patch | 119 -------------------- .../oauth/files/oauth-0.4.3-optional-tests.patch | 123 --------------------- dev-ruby/oauth/oauth-0.4.7-r1.ebuild | 36 ++++++ dev-ruby/oauth/oauth-0.4.7.ebuild | 50 --------- 5 files changed, 44 insertions(+), 294 deletions(-) delete mode 100644 dev-ruby/oauth/files/oauth-0.4.1-optional-tests.patch delete mode 100644 dev-ruby/oauth/files/oauth-0.4.3-optional-tests.patch create mode 100644 dev-ruby/oauth/oauth-0.4.7-r1.ebuild delete mode 100644 dev-ruby/oauth/oauth-0.4.7.ebuild (limited to 'dev-ruby/oauth') 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 +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 oauth-0.4.7.ebuild: Drop deprecated ree18. @@ -103,4 +110,3 @@ 16 May 2009; Hans de Graaff +metadata.xml, +oauth-0.3.2.ebuild: Initial import. Dependency for dev-ruby/twitter. - 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 -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-r1.ebuild b/dev-ruby/oauth/oauth-0.4.7-r1.ebuild new file mode 100644 index 000000000000..741792746267 --- /dev/null +++ b/dev-ruby/oauth/oauth-0.4.7-r1.ebuild @@ -0,0 +1,36 @@ +# 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-r1.ebuild,v 1.1 2014/05/21 02:24:22 mrueg Exp $ + +EAPI=5 +USE_RUBY="ruby19 jruby" + +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 ~x86-macos" +IUSE="" + +ruby_add_bdepend "test? ( + dev-ruby/test-unit:2 + dev-ruby/mocha:0.12 + dev-ruby/webmock )" + +all_ruby_prepare() { + # Require a compatible version of mocha + sed -i -e '1igem "mocha", "~> 0.12.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 +} diff --git a/dev-ruby/oauth/oauth-0.4.7.ebuild b/dev-ruby/oauth/oauth-0.4.7.ebuild deleted file mode 100644 index 2a6bd40f2bbd..000000000000 --- a/dev-ruby/oauth/oauth-0.4.7.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# 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 $ - -EAPI=4 -USE_RUBY="ruby18 ruby19 jruby" - -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 ~x86-macos" -IUSE="" - -ruby_add_bdepend "test? ( - dev-ruby/test-unit:2 - dev-ruby/mocha:0.12 - dev-ruby/webmock )" - -all_ruby_prepare() { - # Require a compatible version of mocha - sed -i -e '1igem "mocha", "~> 0.12.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 -} - -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 -} -- cgit v1.2.3-65-gdbad