Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/eventmachine/files/
Date: Mon, 31 Oct 2016 12:10:06
Message-Id: 1477915211.e7d2afd54a019937d7cb8dc263f6ad1f4013b18d.monsieurp@gentoo
1 commit: e7d2afd54a019937d7cb8dc263f6ad1f4013b18d
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Sep 26 16:18:01 2016 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 31 12:00:11 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7d2afd5
7
8 dev-ruby/eventmachine: remove unused patches.
9
10 Closes: https://github.com/gentoo/gentoo/pull/2417
11
12 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
13
14 .../files/eventmachine-0.12.10-gentoo.patch | 62 ----------------------
15 .../files/eventmachine-0.12.10-https-test.patch | 22 --------
16 2 files changed, 84 deletions(-)
17
18 diff --git a/dev-ruby/eventmachine/files/eventmachine-0.12.10-gentoo.patch b/dev-ruby/eventmachine/files/eventmachine-0.12.10-gentoo.patch
19 deleted file mode 100644
20 index 72b7b72..00000000
21 --- a/dev-ruby/eventmachine/files/eventmachine-0.12.10-gentoo.patch
22 +++ /dev/null
23 @@ -1,62 +0,0 @@
24 -unchanged:
25 ---- a/Rakefile
26 -+++ b/Rakefile
27 -@@ -86,7 +86,7 @@
28 - 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)
29 - s.extra_rdoc_files = Dir['README,docs/*']
30 -
31 -- s.files = `git ls-files`.split("\n")
32 -+ s.files = `git ls-files`.split("\n") rescue Errno::ENOENT
33 -
34 - s.require_path = 'lib'
35 -
36 -@@ -301,7 +301,7 @@ rescue LoadError
37 - require 'rake/rdoctask'
38 - Rake::RDocTask
39 - end
40 --df = begin; require 'rdoc/generator/darkfish'; true; rescue LoadError; end
41 -+df = begin; require 'rdoc/rdoc'; require 'rdoc/generator/darkfish'; true; rescue LoadError; end
42 - rdtask = rdoc_task_type.new do |rd|
43 - rd.title = Spec.name
44 - rd.rdoc_dir = 'rdoc'
45 -unchanged:
46 ---- a/tests/test_defer.rb
47 -+++ b/tests/test_defer.rb
48 -@@ -28,6 +28,7 @@ $:.unshift "../lib"
49 - require 'eventmachine'
50 - require 'test/unit'
51 -
52 -+unless RUBY_VERSION >= '1.9.0'
53 - class TestDeferUsage < Test::Unit::TestCase
54 -
55 - def test_defers
56 -@@ -41,7 +42,8 @@ class TestDeferUsage < Test::Unit::TestCase
57 - }
58 - }
59 - assert_equal( n, n_times )
60 -- end unless RUBY_VERSION >= '1.9.0'
61 -+ end
62 -
63 - end
64 -+end
65 -
66 -only in patch2:
67 -unchanged:
68 ---- a/tests/test_process_watch.rb
69 -+++ b/tests/test_process_watch.rb
70 -@@ -2,6 +2,7 @@ $:.unshift "../lib"
71 - require 'eventmachine'
72 - require 'test/unit'
73 -
74 -+if EM.kqueue?
75 - class TestProcessWatch < Test::Unit::TestCase
76 - module ParentProcessWatcher
77 - def process_forked
78 -@@ -45,4 +46,5 @@ class TestProcessWatch < Test::Unit::TestCase
79 - assert($exited)
80 - assert($unbind)
81 - end
82 --end
83 -\ No newline at end of file
84 -+end
85 -+end
86
87 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
88 deleted file mode 100644
89 index d589d71..00000000
90 --- a/dev-ruby/eventmachine/files/eventmachine-0.12.10-https-test.patch
91 +++ /dev/null
92 @@ -1,22 +0,0 @@
93 -commit 63f2debff906a0f51bb807ac8f67c749d72b492d
94 -Author: Michael S. Klishin <michael@×××××××××××.com>
95 -Date: Sun May 23 21:09:03 2010 +0400
96 -
97 - Makes HTTPS client tests pass
98 -
99 - https://www.amazon.com now redirects to http version. Switching site
100 - is enough to make the test pass.
101 -
102 -diff --git a/tests/test_httpclient2.rb b/tests/test_httpclient2.rb
103 -index ef72e7c..4705e42 100644
104 ---- a/tests/test_httpclient2.rb
105 -+++ b/tests/test_httpclient2.rb
106 -@@ -142,7 +142,7 @@ class TestHttpClient2 < Test::Unit::TestCase
107 - def test_https_get
108 - d = nil
109 - EM.run {
110 -- http = EM::P::HttpClient2.connect :host => 'www.amazon.com', :port => 443, :ssl => true
111 -+ http = EM::P::HttpClient2.connect :host => 'www.apple.com', :port => 443, :ssl => true
112 - d = http.get "/"
113 - d.callback {
114 - EM.stop