Merge pull request #840 from cjkoenig/update_liburcu
[feed/packages.git] / lang / ruby / patches / 001-rdoc-remove_gems_dep.patch
1 References:
2
3 https://github.com/rdoc/rdoc/pull/340
4
5 --- ruby-2.1.2.orig/lib/rdoc.rb 2014-09-02 17:14:28.719224215 -0300
6 +++ ruby-2.1.2/lib/rdoc.rb 2014-09-02 17:14:28.762223911 -0300
7 @@ -109,6 +109,8 @@
8 def self.load_yaml
9 begin
10 gem 'psych'
11 + rescue NameError => e # --disable-gems
12 + raise unless e.name == :gem
13 rescue Gem::LoadError
14 end
15
16 --- ruby-2.1.2.orig/lib/rdoc/markdown.rb 2014-09-02 17:14:28.761223918 -0300
17 +++ ruby-2.1.2/lib/rdoc/markdown.rb 2014-09-02 17:14:28.805223607 -0300
18 @@ -525,7 +525,6 @@
19
20
21
22 - require 'rubygems'
23 require 'rdoc'
24 require 'rdoc/markup/to_joined_paragraph'
25 require 'rdoc/markdown/entities'
26 --- ruby-2.1.2.orig/lib/rdoc/text.rb 2014-09-02 17:14:28.721224201 -0300
27 +++ ruby-2.1.2/lib/rdoc/text.rb 2014-09-02 17:14:28.764223897 -0300
28 @@ -10,6 +10,8 @@
29
30 begin
31 gem 'json'
32 +rescue NameError => e # --disable-gems
33 + raise unless e.name == :gem
34 rescue Gem::LoadError
35 end
36