commit: e7d2afd54a019937d7cb8dc263f6ad1f4013b18d Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Mon Sep 26 16:18:01 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Mon Oct 31 12:00:11 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7d2afd5
dev-ruby/eventmachine: remove unused patches. Closes: https://github.com/gentoo/gentoo/pull/2417 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> .../files/eventmachine-0.12.10-gentoo.patch | 62 ---------------------- .../files/eventmachine-0.12.10-https-test.patch | 22 -------- 2 files changed, 84 deletions(-) diff --git a/dev-ruby/eventmachine/files/eventmachine-0.12.10-gentoo.patch b/dev-ruby/eventmachine/files/eventmachine-0.12.10-gentoo.patch deleted file mode 100644 index 72b7b72..00000000 --- a/dev-ruby/eventmachine/files/eventmachine-0.12.10-gentoo.patch +++ /dev/null @@ -1,62 +0,0 @@ -unchanged: ---- a/Rakefile -+++ b/Rakefile -@@ -86,7 +86,7 @@ - s.rdoc_options = %w(--title EventMachine --main README --line-numbers -x lib/em/version -x lib/emva -x lib/evma/ -x lib/pr_eventmachine -x lib/jeventmachine) - s.extra_rdoc_files = Dir['README,docs/*'] - -- s.files = `git ls-files`.split("\n") -+ s.files = `git ls-files`.split("\n") rescue Errno::ENOENT - - s.require_path = 'lib' - -@@ -301,7 +301,7 @@ rescue LoadError - require 'rake/rdoctask' - Rake::RDocTask - end --df = begin; require 'rdoc/generator/darkfish'; true; rescue LoadError; end -+df = begin; require 'rdoc/rdoc'; require 'rdoc/generator/darkfish'; true; rescue LoadError; end - rdtask = rdoc_task_type.new do |rd| - rd.title = Spec.name - rd.rdoc_dir = 'rdoc' -unchanged: ---- a/tests/test_defer.rb -+++ b/tests/test_defer.rb -@@ -28,6 +28,7 @@ $:.unshift "../lib" - require 'eventmachine' - require 'test/unit' - -+unless RUBY_VERSION >= '1.9.0' - class TestDeferUsage < Test::Unit::TestCase - - def test_defers -@@ -41,7 +42,8 @@ class TestDeferUsage < Test::Unit::TestCase - } - } - assert_equal( n, n_times ) -- end unless RUBY_VERSION >= '1.9.0' -+ end - - end -+end - -only in patch2: -unchanged: ---- a/tests/test_process_watch.rb -+++ b/tests/test_process_watch.rb -@@ -2,6 +2,7 @@ $:.unshift "../lib" - require 'eventmachine' - require 'test/unit' - -+if EM.kqueue? - class TestProcessWatch < Test::Unit::TestCase - module ParentProcessWatcher - def process_forked -@@ -45,4 +46,5 @@ class TestProcessWatch < Test::Unit::TestCase - assert($exited) - assert($unbind) - end --end -\ No newline at end of file -+end -+end diff --git a/dev-ruby/eventmachine/files/eventmachine-0.12.10-https-test.patch b/dev-ruby/eventmachine/files/eventmachine-0.12.10-https-test.patch deleted file mode 100644 index d589d71..00000000 --- a/dev-ruby/eventmachine/files/eventmachine-0.12.10-https-test.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 63f2debff906a0f51bb807ac8f67c749d72b492d -Author: Michael S. Klishin <[email protected]> -Date: Sun May 23 21:09:03 2010 +0400 - - Makes HTTPS client tests pass - - https://www.amazon.com now redirects to http version. Switching site - is enough to make the test pass. - -diff --git a/tests/test_httpclient2.rb b/tests/test_httpclient2.rb -index ef72e7c..4705e42 100644 ---- a/tests/test_httpclient2.rb -+++ b/tests/test_httpclient2.rb -@@ -142,7 +142,7 @@ class TestHttpClient2 < Test::Unit::TestCase - def test_https_get - d = nil - EM.run { -- http = EM::P::HttpClient2.connect :host => 'www.amazon.com', :port => 443, :ssl => true -+ http = EM::P::HttpClient2.connect :host => 'www.apple.com', :port => 443, :ssl => true - d = http.get "/" - d.callback { - EM.stop
