ruby-2.2.2-1.parabola1: updating version

3 files changed, 98 insertions, 98 deletions

diff --git a/libre/ruby/PKGBUILD b/libre/ruby/PKGBUILD
index 1910090ff..d9a5b6890 100644
--- a/libre/ruby/PKGBUILD
+++ b/libre/ruby/PKGBUILD
@@ -6,7 +6,7 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=(ruby ruby-docs)
-pkgver=2.2.1
+pkgver=2.2.2
 _jsonver=1.8.1
 pkgrel=1.parabola1
 arch=(i686 x86_64)
@@ -20,12 +20,12 @@ mksource=(http://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.x
           libre.patch)
 source=(https://repo.parabola.nu/other/ruby-libre/ruby-libre-${pkgver}.tar.xz
         gemrc)
-mksha1sums=('31bbdb17237863bd26b3aa32c613fe42c95ccd60'
+mksha1sums=('58cfec8db9b51ad1ff3bd2b9065da087913a6268'
             '043ed2df4b0ce2174c9c020ffcb4ec31f9fde560'
             '2cd288d00c5211e4c9d9338080b30af65cbb143a'
-            '66e71a368eb174976fd23af9f9bca4faa4462273')
-sha1sums=('8a47cbc1a07270c1c7c7edd612da466bd1dcab59'
-          'de4b760b7e2cd9af88ca67536ce37b950f1ee514')
+            '5595b4eeb67ac5f63d13630932b44bf2a8ed9197')
+sha1sums=('194cabc318c0ed63042059c5f60376f254c5b626'
+          'dc536754c8fac2c3d82965c5a708cd8f79562d98')
 
 mksource() {
   rm -rv ruby-${pkgver}/ext/json
diff --git a/libre/ruby/gemrc b/libre/ruby/gemrc
index 3d11de1ec..65163119a 100644
--- a/libre/ruby/gemrc
+++ b/libre/ruby/gemrc
@@ -1,4 +1,4 @@
-# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11
+# Read about the gemrc format at http://guides.rubygems.org/command-reference/#gem-environment
 
 # --user-install is used to install to $HOME/.gem/ by default since we want to separate
 #                pacman installed gems and gem installed gems
diff --git a/libre/ruby/libre.patch b/libre/ruby/libre.patch
index aea91b9ad..ea530d38d 100644
--- a/libre/ruby/libre.patch
+++ b/libre/ruby/libre.patch
@@ -1,77 +1,6 @@
-diff -Nur json-1.8.1.orig/json.gemspec json-1.8.1/json.gemspec
---- json-1.8.1.orig/json.gemspec	2015-02-23 12:54:11.994572025 +0100
-+++ json-1.8.1/json.gemspec	2015-02-23 19:37:45.962313149 +0100
-@@ -8,11 +8,10 @@
-   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-   s.authors = ["Florian Frank"]
-   s.date = "2013-10-17"
--  s.description = "This is a JSON implementation as a Ruby extension in C."
-+  s.description = "This is a JSON implementation in pure Ruby."
-   s.email = "flori@ping.de"
--  s.extensions = ["ext/json/ext/generator/extconf.rb", "ext/json/ext/parser/extconf.rb"]
-   s.extra_rdoc_files = ["README.rdoc"]
--  s.files = [".gitignore", ".travis.yml", "CHANGES", "COPYING", "COPYING-json-jruby", "GPL", "Gemfile", "README-json-jruby.markdown", "README.rdoc", "Rakefile", "TODO", "VERSION", "data/example.json", "data/index.html", "data/prototype.js", "diagrams/.keep", "ext/json/ext/fbuffer/fbuffer.h", "ext/json/ext/generator/depend", "ext/json/ext/generator/extconf.rb", "ext/json/ext/generator/generator.c", "ext/json/ext/generator/generator.h", "ext/json/ext/parser/depend", "ext/json/ext/parser/extconf.rb", "ext/json/ext/parser/parser.c", "ext/json/ext/parser/parser.h", "ext/json/ext/parser/parser.rl", "install.rb", "java/src/json/ext/ByteListTranscoder.java", "java/src/json/ext/Generator.java", "java/src/json/ext/GeneratorMethods.java", "java/src/json/ext/GeneratorService.java", "java/src/json/ext/GeneratorState.java", "java/src/json/ext/OptionsReader.java", "java/src/json/ext/Parser.java", "java/src/json/ext/Parser.rl", "java/src/json/ext/ParserService.java", "java/src/json/ext/RuntimeInfo.java", "java/src/json/ext/StringDecoder.java", "java/src/json/ext/StringEncoder.java", "java/src/json/ext/Utils.java", "json-java.gemspec", "json.gemspec", "json_pure.gemspec", "lib/json.rb", "lib/json/add/bigdecimal.rb", "lib/json/add/complex.rb", "lib/json/add/core.rb", "lib/json/add/date.rb", "lib/json/add/date_time.rb", "lib/json/add/exception.rb", "lib/json/add/ostruct.rb", "lib/json/add/range.rb", "lib/json/add/rational.rb", "lib/json/add/regexp.rb", "lib/json/add/struct.rb", "lib/json/add/symbol.rb", "lib/json/add/time.rb", "lib/json/common.rb", "lib/json/ext.rb", "lib/json/ext/.keep", "lib/json/generic_object.rb", "lib/json/pure.rb", "lib/json/pure/generator.rb", "lib/json/pure/parser.rb", "lib/json/version.rb", "tests/fixtures/fail1.json", "tests/fixtures/fail10.json", "tests/fixtures/fail11.json", "tests/fixtures/fail12.json", "tests/fixtures/fail13.json", "tests/fixtures/fail14.json", "tests/fixtures/fail18.json", "tests/fixtures/fail19.json", "tests/fixtures/fail2.json", "tests/fixtures/fail20.json", "tests/fixtures/fail21.json", "tests/fixtures/fail22.json", "tests/fixtures/fail23.json", "tests/fixtures/fail24.json", "tests/fixtures/fail25.json", "tests/fixtures/fail27.json", "tests/fixtures/fail28.json", "tests/fixtures/fail3.json", "tests/fixtures/fail4.json", "tests/fixtures/fail5.json", "tests/fixtures/fail6.json", "tests/fixtures/fail7.json", "tests/fixtures/fail8.json", "tests/fixtures/fail9.json", "tests/fixtures/pass1.json", "tests/fixtures/pass15.json", "tests/fixtures/pass16.json", "tests/fixtures/pass17.json", "tests/fixtures/pass2.json", "tests/fixtures/pass26.json", "tests/fixtures/pass3.json", "tests/setup_variant.rb", "tests/test_json.rb", "tests/test_json_addition.rb", "tests/test_json_encoding.rb", "tests/test_json_fixtures.rb", "tests/test_json_generate.rb", "tests/test_json_generic_object.rb", "tests/test_json_string_matching.rb", "tests/test_json_unicode.rb", "tools/fuzz.rb", "tools/server.rb", "./tests/test_json.rb", "./tests/test_json_addition.rb", "./tests/test_json_encoding.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_generate.rb", "./tests/test_json_generic_object.rb", "./tests/test_json_string_matching.rb", "./tests/test_json_unicode.rb"]
-+  s.files = [".gitignore", ".travis.yml", "CHANGES", "COPYING", "COPYING-json-jruby", "GPL", "Gemfile", "README-json-jruby.markdown", "README.rdoc", "Rakefile", "TODO", "VERSION", "data/example.json", "data/index.html", "data/prototype.js", "diagrams/.keep", "install.rb", "java/src/json/ext/ByteListTranscoder.java", "java/src/json/ext/Generator.java", "java/src/json/ext/GeneratorMethods.java", "java/src/json/ext/GeneratorService.java", "java/src/json/ext/GeneratorState.java", "java/src/json/ext/OptionsReader.java", "java/src/json/ext/Parser.java", "java/src/json/ext/Parser.rl", "java/src/json/ext/ParserService.java", "java/src/json/ext/RuntimeInfo.java", "java/src/json/ext/StringDecoder.java", "java/src/json/ext/StringEncoder.java", "java/src/json/ext/Utils.java", "json-java.gemspec", "json.gemspec", "json_pure.gemspec", "lib/json.rb", "lib/json/add/bigdecimal.rb", "lib/json/add/complex.rb", "lib/json/add/core.rb", "lib/json/add/date.rb", "lib/json/add/date_time.rb", "lib/json/add/exception.rb", "lib/json/add/ostruct.rb", "lib/json/add/range.rb", "lib/json/add/rational.rb", "lib/json/add/regexp.rb", "lib/json/add/struct.rb", "lib/json/add/symbol.rb", "lib/json/add/time.rb", "lib/json/common.rb", "lib/json/ext.rb", "lib/json/ext/.keep", "lib/json/generic_object.rb", "lib/json/pure.rb", "lib/json/pure/generator.rb", "lib/json/pure/parser.rb", "lib/json/version.rb", "tests/fixtures/fail1.json", "tests/fixtures/fail10.json", "tests/fixtures/fail11.json", "tests/fixtures/fail12.json", "tests/fixtures/fail13.json", "tests/fixtures/fail14.json", "tests/fixtures/fail18.json", "tests/fixtures/fail19.json", "tests/fixtures/fail2.json", "tests/fixtures/fail20.json", "tests/fixtures/fail21.json", "tests/fixtures/fail22.json", "tests/fixtures/fail23.json", "tests/fixtures/fail24.json", "tests/fixtures/fail25.json", "tests/fixtures/fail27.json", "tests/fixtures/fail28.json", "tests/fixtures/fail3.json", "tests/fixtures/fail4.json", "tests/fixtures/fail5.json", "tests/fixtures/fail6.json", "tests/fixtures/fail7.json", "tests/fixtures/fail8.json", "tests/fixtures/fail9.json", "tests/fixtures/pass1.json", "tests/fixtures/pass15.json", "tests/fixtures/pass16.json", "tests/fixtures/pass17.json", "tests/fixtures/pass2.json", "tests/fixtures/pass26.json", "tests/fixtures/pass3.json", "tests/setup_variant.rb", "tests/test_json.rb", "tests/test_json_addition.rb", "tests/test_json_encoding.rb", "tests/test_json_fixtures.rb", "tests/test_json_generate.rb", "tests/test_json_generic_object.rb", "tests/test_json_string_matching.rb", "tests/test_json_unicode.rb", "tools/fuzz.rb", "tools/server.rb", "./tests/test_json.rb", "./tests/test_json_addition.rb", "./tests/test_json_encoding.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_generate.rb", "./tests/test_json_generic_object.rb", "./tests/test_json_string_matching.rb", "./tests/test_json_unicode.rb"]
-   s.homepage = "http://flori.github.com/json"
-   s.licenses = ["Ruby"]
-   s.rdoc_options = ["--title", "JSON implemention for Ruby", "--main", "README.rdoc"]
-diff -Nur json-1.8.1.orig/json_pure.gemspec json-1.8.1/json_pure.gemspec
---- json-1.8.1.orig/json_pure.gemspec	2015-02-23 12:54:11.994572025 +0100
-+++ json-1.8.1/json_pure.gemspec	2015-02-23 19:35:30.316391313 +0100
-@@ -11,7 +11,7 @@
-   s.description = "This is a JSON implementation in pure Ruby."
-   s.email = "flori@ping.de"
-   s.extra_rdoc_files = ["README.rdoc"]
--  s.files = [".gitignore", ".travis.yml", "CHANGES", "COPYING", "COPYING-json-jruby", "GPL", "Gemfile", "README-json-jruby.markdown", "README.rdoc", "Rakefile", "TODO", "VERSION", "data/example.json", "data/index.html", "data/prototype.js", "diagrams/.keep", "ext/json/ext/fbuffer/fbuffer.h", "ext/json/ext/generator/depend", "ext/json/ext/generator/extconf.rb", "ext/json/ext/generator/generator.c", "ext/json/ext/generator/generator.h", "ext/json/ext/parser/depend", "ext/json/ext/parser/extconf.rb", "ext/json/ext/parser/parser.c", "ext/json/ext/parser/parser.h", "ext/json/ext/parser/parser.rl", "install.rb", "java/src/json/ext/ByteListTranscoder.java", "java/src/json/ext/Generator.java", "java/src/json/ext/GeneratorMethods.java", "java/src/json/ext/GeneratorService.java", "java/src/json/ext/GeneratorState.java", "java/src/json/ext/OptionsReader.java", "java/src/json/ext/Parser.java", "java/src/json/ext/Parser.rl", "java/src/json/ext/ParserService.java", "java/src/json/ext/RuntimeInfo.java", "java/src/json/ext/StringDecoder.java", "java/src/json/ext/StringEncoder.java", "java/src/json/ext/Utils.java", "json-java.gemspec", "json.gemspec", "json_pure.gemspec", "lib/json.rb", "lib/json/add/bigdecimal.rb", "lib/json/add/complex.rb", "lib/json/add/core.rb", "lib/json/add/date.rb", "lib/json/add/date_time.rb", "lib/json/add/exception.rb", "lib/json/add/ostruct.rb", "lib/json/add/range.rb", "lib/json/add/rational.rb", "lib/json/add/regexp.rb", "lib/json/add/struct.rb", "lib/json/add/symbol.rb", "lib/json/add/time.rb", "lib/json/common.rb", "lib/json/ext.rb", "lib/json/ext/.keep", "lib/json/generic_object.rb", "lib/json/pure.rb", "lib/json/pure/generator.rb", "lib/json/pure/parser.rb", "lib/json/version.rb", "tests/fixtures/fail1.json", "tests/fixtures/fail10.json", "tests/fixtures/fail11.json", "tests/fixtures/fail12.json", "tests/fixtures/fail13.json", "tests/fixtures/fail14.json", "tests/fixtures/fail18.json", "tests/fixtures/fail19.json", "tests/fixtures/fail2.json", "tests/fixtures/fail20.json", "tests/fixtures/fail21.json", "tests/fixtures/fail22.json", "tests/fixtures/fail23.json", "tests/fixtures/fail24.json", "tests/fixtures/fail25.json", "tests/fixtures/fail27.json", "tests/fixtures/fail28.json", "tests/fixtures/fail3.json", "tests/fixtures/fail4.json", "tests/fixtures/fail5.json", "tests/fixtures/fail6.json", "tests/fixtures/fail7.json", "tests/fixtures/fail8.json", "tests/fixtures/fail9.json", "tests/fixtures/pass1.json", "tests/fixtures/pass15.json", "tests/fixtures/pass16.json", "tests/fixtures/pass17.json", "tests/fixtures/pass2.json", "tests/fixtures/pass26.json", "tests/fixtures/pass3.json", "tests/setup_variant.rb", "tests/test_json.rb", "tests/test_json_addition.rb", "tests/test_json_encoding.rb", "tests/test_json_fixtures.rb", "tests/test_json_generate.rb", "tests/test_json_generic_object.rb", "tests/test_json_string_matching.rb", "tests/test_json_unicode.rb", "tools/fuzz.rb", "tools/server.rb", "./tests/test_json.rb", "./tests/test_json_addition.rb", "./tests/test_json_encoding.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_generate.rb", "./tests/test_json_generic_object.rb", "./tests/test_json_string_matching.rb", "./tests/test_json_unicode.rb"]
-+  s.files = [".gitignore", ".travis.yml", "CHANGES", "COPYING", "COPYING-json-jruby", "GPL", "Gemfile", "README-json-jruby.markdown", "README.rdoc", "Rakefile", "TODO", "VERSION", "data/example.json", "data/index.html", "data/prototype.js", "diagrams/.keep", "install.rb", "java/src/json/ext/ByteListTranscoder.java", "java/src/json/ext/Generator.java", "java/src/json/ext/GeneratorMethods.java", "java/src/json/ext/GeneratorService.java", "java/src/json/ext/GeneratorState.java", "java/src/json/ext/OptionsReader.java", "java/src/json/ext/Parser.java", "java/src/json/ext/Parser.rl", "java/src/json/ext/ParserService.java", "java/src/json/ext/RuntimeInfo.java", "java/src/json/ext/StringDecoder.java", "java/src/json/ext/StringEncoder.java", "java/src/json/ext/Utils.java", "json-java.gemspec", "json.gemspec", "json_pure.gemspec", "lib/json.rb", "lib/json/add/bigdecimal.rb", "lib/json/add/complex.rb", "lib/json/add/core.rb", "lib/json/add/date.rb", "lib/json/add/date_time.rb", "lib/json/add/exception.rb", "lib/json/add/ostruct.rb", "lib/json/add/range.rb", "lib/json/add/rational.rb", "lib/json/add/regexp.rb", "lib/json/add/struct.rb", "lib/json/add/symbol.rb", "lib/json/add/time.rb", "lib/json/common.rb", "lib/json/ext.rb", "lib/json/ext/.keep", "lib/json/generic_object.rb", "lib/json/pure.rb", "lib/json/pure/generator.rb", "lib/json/pure/parser.rb", "lib/json/version.rb", "tests/fixtures/fail1.json", "tests/fixtures/fail10.json", "tests/fixtures/fail11.json", "tests/fixtures/fail12.json", "tests/fixtures/fail13.json", "tests/fixtures/fail14.json", "tests/fixtures/fail18.json", "tests/fixtures/fail19.json", "tests/fixtures/fail2.json", "tests/fixtures/fail20.json", "tests/fixtures/fail21.json", "tests/fixtures/fail22.json", "tests/fixtures/fail23.json", "tests/fixtures/fail24.json", "tests/fixtures/fail25.json", "tests/fixtures/fail27.json", "tests/fixtures/fail28.json", "tests/fixtures/fail3.json", "tests/fixtures/fail4.json", "tests/fixtures/fail5.json", "tests/fixtures/fail6.json", "tests/fixtures/fail7.json", "tests/fixtures/fail8.json", "tests/fixtures/fail9.json", "tests/fixtures/pass1.json", "tests/fixtures/pass15.json", "tests/fixtures/pass16.json", "tests/fixtures/pass17.json", "tests/fixtures/pass2.json", "tests/fixtures/pass26.json", "tests/fixtures/pass3.json", "tests/setup_variant.rb", "tests/test_json.rb", "tests/test_json_addition.rb", "tests/test_json_encoding.rb", "tests/test_json_fixtures.rb", "tests/test_json_generate.rb", "tests/test_json_generic_object.rb", "tests/test_json_string_matching.rb", "tests/test_json_unicode.rb", "tools/fuzz.rb", "tools/server.rb", "./tests/test_json.rb", "./tests/test_json_addition.rb", "./tests/test_json_encoding.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_generate.rb", "./tests/test_json_generic_object.rb", "./tests/test_json_string_matching.rb", "./tests/test_json_unicode.rb"]
-   s.homepage = "http://flori.github.com/json"
-   s.licenses = ["Ruby"]
-   s.rdoc_options = ["--title", "JSON implemention for ruby", "--main", "README.rdoc"]
-diff -Nur json-1.8.1.orig/lib/json/ext.rb json-1.8.1/lib/json/ext.rb
---- json-1.8.1.orig/lib/json/ext.rb	2015-02-23 12:52:09.528940268 +0100
-+++ json-1.8.1/lib/json/ext.rb	2015-02-23 18:42:16.798987287 +0100
-@@ -5,16 +5,18 @@
-   end
- end
- require 'json/common'
-+require 'json/pure/parser'
-+require 'json/pure/generator'
- 
- module JSON
-   # This module holds all the modules/classes that implement JSON's
--  # functionality as C extensions.
-+  # functionality in pure ruby.
-+  Ext = Pure
-+
-   module Ext
--    require 'json/ext/parser'
--    require 'json/ext/generator'
--    $DEBUG and warn "Using Ext extension for JSON."
--    JSON.parser = Parser
--    JSON.generator = Generator
-+    $DEBUG and warn "Using Pure library for JSON."
-+    JSON.parser = Pure::Parser
-+    JSON.generator = Pure::Generator
-   end
- 
-   JSON_LOADED = true unless defined?(::JSON::JSON_LOADED)
-diff -Nur json-1.8.1.orig/lib/json.rb json-1.8.1/lib/json.rb
---- json-1.8.1.orig/lib/json.rb	2015-02-23 12:52:09.528940268 +0100
-+++ json-1.8.1/lib/json.rb	2015-02-23 18:35:44.611444858 +0100
-@@ -54,9 +54,5 @@
- module JSON
-   require 'json/version'
- 
--  begin
--    require 'json/ext'
--  rescue LoadError
--    require 'json/pure'
--  end
-+  require 'json/pure'
- end
 diff -Nur json-1.8.1.orig/Rakefile json-1.8.1/Rakefile
---- json-1.8.1.orig/Rakefile	2015-02-23 12:52:09.522273476 +0100
-+++ json-1.8.1/Rakefile	2015-02-24 13:28:31.162031258 +0100
+--- json-1.8.1.orig/Rakefile	2013-10-17 09:53:47.000000000 -0200
++++ json-1.8.1/Rakefile	2015-04-14 15:33:02.055063119 -0300
 @@ -14,8 +14,7 @@
  require 'rake/clean'
  CLOBBER.include 'doc', 'Gemfile.lock'
@@ -236,19 +165,90 @@ diff -Nur json-1.8.1.orig/Rakefile json-1.8.1/Rakefile
    desc "Build all gems and archives for a new release of json and json_pure."
    task :build => [ :clean, :gemspec, :package ]
  
-diff -Nur ruby-2.2.1.orig/common.mk ruby-2.2.1/common.mk
---- ruby-2.2.1.orig/common.mk	2014-12-24 03:56:32.000000000 +0100
-+++ ruby-2.2.1/common.mk	2015-02-25 11:22:17.000768687 +0100
-@@ -14,7 +14,7 @@
+diff -Nur json-1.8.1.orig/json.gemspec json-1.8.1/json.gemspec
+--- json-1.8.1.orig/json.gemspec	2013-10-17 09:53:47.000000000 -0200
++++ json-1.8.1/json.gemspec	2015-04-14 15:33:02.055063119 -0300
+@@ -8,11 +8,10 @@
+   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+   s.authors = ["Florian Frank"]
+   s.date = "2013-10-17"
+-  s.description = "This is a JSON implementation as a Ruby extension in C."
++  s.description = "This is a JSON implementation in pure Ruby."
+   s.email = "flori@ping.de"
+-  s.extensions = ["ext/json/ext/generator/extconf.rb", "ext/json/ext/parser/extconf.rb"]
+   s.extra_rdoc_files = ["README.rdoc"]
+-  s.files = [".gitignore", ".travis.yml", "CHANGES", "COPYING", "COPYING-json-jruby", "GPL", "Gemfile", "README-json-jruby.markdown", "README.rdoc", "Rakefile", "TODO", "VERSION", "data/example.json", "data/index.html", "data/prototype.js", "diagrams/.keep", "ext/json/ext/fbuffer/fbuffer.h", "ext/json/ext/generator/depend", "ext/json/ext/generator/extconf.rb", "ext/json/ext/generator/generator.c", "ext/json/ext/generator/generator.h", "ext/json/ext/parser/depend", "ext/json/ext/parser/extconf.rb", "ext/json/ext/parser/parser.c", "ext/json/ext/parser/parser.h", "ext/json/ext/parser/parser.rl", "install.rb", "java/src/json/ext/ByteListTranscoder.java", "java/src/json/ext/Generator.java", "java/src/json/ext/GeneratorMethods.java", "java/src/json/ext/GeneratorService.java", "java/src/json/ext/GeneratorState.java", "java/src/json/ext/OptionsReader.java", "java/src/json/ext/Parser.java", "java/src/json/ext/Parser.rl", "java/src/json/ext/ParserService.java", "java/src/json/ext/RuntimeInfo.java", "java/src/json/ext/StringDecoder.java", "java/src/json/ext/StringEncoder.java", "java/src/json/ext/Utils.java", "json-java.gemspec", "json.gemspec", "json_pure.gemspec", "lib/json.rb", "lib/json/add/bigdecimal.rb", "lib/json/add/complex.rb", "lib/json/add/core.rb", "lib/json/add/date.rb", "lib/json/add/date_time.rb", "lib/json/add/exception.rb", "lib/json/add/ostruct.rb", "lib/json/add/range.rb", "lib/json/add/rational.rb", "lib/json/add/regexp.rb", "lib/json/add/struct.rb", "lib/json/add/symbol.rb", "lib/json/add/time.rb", "lib/json/common.rb", "lib/json/ext.rb", "lib/json/ext/.keep", "lib/json/generic_object.rb", "lib/json/pure.rb", "lib/json/pure/generator.rb", "lib/json/pure/parser.rb", "lib/json/version.rb", "tests/fixtures/fail1.json", "tests/fixtures/fail10.json", "tests/fixtures/fail11.json", "tests/fixtures/fail12.json", "tests/fixtures/fail13.json", "tests/fixtures/fail14.json", "tests/fixtures/fail18.json", "tests/fixtures/fail19.json", "tests/fixtures/fail2.json", "tests/fixtures/fail20.json", "tests/fixtures/fail21.json", "tests/fixtures/fail22.json", "tests/fixtures/fail23.json", "tests/fixtures/fail24.json", "tests/fixtures/fail25.json", "tests/fixtures/fail27.json", "tests/fixtures/fail28.json", "tests/fixtures/fail3.json", "tests/fixtures/fail4.json", "tests/fixtures/fail5.json", "tests/fixtures/fail6.json", "tests/fixtures/fail7.json", "tests/fixtures/fail8.json", "tests/fixtures/fail9.json", "tests/fixtures/pass1.json", "tests/fixtures/pass15.json", "tests/fixtures/pass16.json", "tests/fixtures/pass17.json", "tests/fixtures/pass2.json", "tests/fixtures/pass26.json", "tests/fixtures/pass3.json", "tests/setup_variant.rb", "tests/test_json.rb", "tests/test_json_addition.rb", "tests/test_json_encoding.rb", "tests/test_json_fixtures.rb", "tests/test_json_generate.rb", "tests/test_json_generic_object.rb", "tests/test_json_string_matching.rb", "tests/test_json_unicode.rb", "tools/fuzz.rb", "tools/server.rb", "./tests/test_json.rb", "./tests/test_json_addition.rb", "./tests/test_json_encoding.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_generate.rb", "./tests/test_json_generic_object.rb", "./tests/test_json_string_matching.rb", "./tests/test_json_unicode.rb"]
++  s.files = [".gitignore", ".travis.yml", "CHANGES", "COPYING", "COPYING-json-jruby", "GPL", "Gemfile", "README-json-jruby.markdown", "README.rdoc", "Rakefile", "TODO", "VERSION", "data/example.json", "data/index.html", "data/prototype.js", "diagrams/.keep", "install.rb", "java/src/json/ext/ByteListTranscoder.java", "java/src/json/ext/Generator.java", "java/src/json/ext/GeneratorMethods.java", "java/src/json/ext/GeneratorService.java", "java/src/json/ext/GeneratorState.java", "java/src/json/ext/OptionsReader.java", "java/src/json/ext/Parser.java", "java/src/json/ext/Parser.rl", "java/src/json/ext/ParserService.java", "java/src/json/ext/RuntimeInfo.java", "java/src/json/ext/StringDecoder.java", "java/src/json/ext/StringEncoder.java", "java/src/json/ext/Utils.java", "json-java.gemspec", "json.gemspec", "json_pure.gemspec", "lib/json.rb", "lib/json/add/bigdecimal.rb", "lib/json/add/complex.rb", "lib/json/add/core.rb", "lib/json/add/date.rb", "lib/json/add/date_time.rb", "lib/json/add/exception.rb", "lib/json/add/ostruct.rb", "lib/json/add/range.rb", "lib/json/add/rational.rb", "lib/json/add/regexp.rb", "lib/json/add/struct.rb", "lib/json/add/symbol.rb", "lib/json/add/time.rb", "lib/json/common.rb", "lib/json/ext.rb", "lib/json/ext/.keep", "lib/json/generic_object.rb", "lib/json/pure.rb", "lib/json/pure/generator.rb", "lib/json/pure/parser.rb", "lib/json/version.rb", "tests/fixtures/fail1.json", "tests/fixtures/fail10.json", "tests/fixtures/fail11.json", "tests/fixtures/fail12.json", "tests/fixtures/fail13.json", "tests/fixtures/fail14.json", "tests/fixtures/fail18.json", "tests/fixtures/fail19.json", "tests/fixtures/fail2.json", "tests/fixtures/fail20.json", "tests/fixtures/fail21.json", "tests/fixtures/fail22.json", "tests/fixtures/fail23.json", "tests/fixtures/fail24.json", "tests/fixtures/fail25.json", "tests/fixtures/fail27.json", "tests/fixtures/fail28.json", "tests/fixtures/fail3.json", "tests/fixtures/fail4.json", "tests/fixtures/fail5.json", "tests/fixtures/fail6.json", "tests/fixtures/fail7.json", "tests/fixtures/fail8.json", "tests/fixtures/fail9.json", "tests/fixtures/pass1.json", "tests/fixtures/pass15.json", "tests/fixtures/pass16.json", "tests/fixtures/pass17.json", "tests/fixtures/pass2.json", "tests/fixtures/pass26.json", "tests/fixtures/pass3.json", "tests/setup_variant.rb", "tests/test_json.rb", "tests/test_json_addition.rb", "tests/test_json_encoding.rb", "tests/test_json_fixtures.rb", "tests/test_json_generate.rb", "tests/test_json_generic_object.rb", "tests/test_json_string_matching.rb", "tests/test_json_unicode.rb", "tools/fuzz.rb", "tools/server.rb", "./tests/test_json.rb", "./tests/test_json_addition.rb", "./tests/test_json_encoding.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_generate.rb", "./tests/test_json_generic_object.rb", "./tests/test_json_string_matching.rb", "./tests/test_json_unicode.rb"]
+   s.homepage = "http://flori.github.com/json"
+   s.licenses = ["Ruby"]
+   s.rdoc_options = ["--title", "JSON implemention for Ruby", "--main", "README.rdoc"]
+diff -Nur json-1.8.1.orig/json_pure.gemspec json-1.8.1/json_pure.gemspec
+--- json-1.8.1.orig/json_pure.gemspec	2013-10-17 09:53:47.000000000 -0200
++++ json-1.8.1/json_pure.gemspec	2015-04-14 15:33:02.055063119 -0300
+@@ -11,7 +11,7 @@
+   s.description = "This is a JSON implementation in pure Ruby."
+   s.email = "flori@ping.de"
+   s.extra_rdoc_files = ["README.rdoc"]
+-  s.files = [".gitignore", ".travis.yml", "CHANGES", "COPYING", "COPYING-json-jruby", "GPL", "Gemfile", "README-json-jruby.markdown", "README.rdoc", "Rakefile", "TODO", "VERSION", "data/example.json", "data/index.html", "data/prototype.js", "diagrams/.keep", "ext/json/ext/fbuffer/fbuffer.h", "ext/json/ext/generator/depend", "ext/json/ext/generator/extconf.rb", "ext/json/ext/generator/generator.c", "ext/json/ext/generator/generator.h", "ext/json/ext/parser/depend", "ext/json/ext/parser/extconf.rb", "ext/json/ext/parser/parser.c", "ext/json/ext/parser/parser.h", "ext/json/ext/parser/parser.rl", "install.rb", "java/src/json/ext/ByteListTranscoder.java", "java/src/json/ext/Generator.java", "java/src/json/ext/GeneratorMethods.java", "java/src/json/ext/GeneratorService.java", "java/src/json/ext/GeneratorState.java", "java/src/json/ext/OptionsReader.java", "java/src/json/ext/Parser.java", "java/src/json/ext/Parser.rl", "java/src/json/ext/ParserService.java", "java/src/json/ext/RuntimeInfo.java", "java/src/json/ext/StringDecoder.java", "java/src/json/ext/StringEncoder.java", "java/src/json/ext/Utils.java", "json-java.gemspec", "json.gemspec", "json_pure.gemspec", "lib/json.rb", "lib/json/add/bigdecimal.rb", "lib/json/add/complex.rb", "lib/json/add/core.rb", "lib/json/add/date.rb", "lib/json/add/date_time.rb", "lib/json/add/exception.rb", "lib/json/add/ostruct.rb", "lib/json/add/range.rb", "lib/json/add/rational.rb", "lib/json/add/regexp.rb", "lib/json/add/struct.rb", "lib/json/add/symbol.rb", "lib/json/add/time.rb", "lib/json/common.rb", "lib/json/ext.rb", "lib/json/ext/.keep", "lib/json/generic_object.rb", "lib/json/pure.rb", "lib/json/pure/generator.rb", "lib/json/pure/parser.rb", "lib/json/version.rb", "tests/fixtures/fail1.json", "tests/fixtures/fail10.json", "tests/fixtures/fail11.json", "tests/fixtures/fail12.json", "tests/fixtures/fail13.json", "tests/fixtures/fail14.json", "tests/fixtures/fail18.json", "tests/fixtures/fail19.json", "tests/fixtures/fail2.json", "tests/fixtures/fail20.json", "tests/fixtures/fail21.json", "tests/fixtures/fail22.json", "tests/fixtures/fail23.json", "tests/fixtures/fail24.json", "tests/fixtures/fail25.json", "tests/fixtures/fail27.json", "tests/fixtures/fail28.json", "tests/fixtures/fail3.json", "tests/fixtures/fail4.json", "tests/fixtures/fail5.json", "tests/fixtures/fail6.json", "tests/fixtures/fail7.json", "tests/fixtures/fail8.json", "tests/fixtures/fail9.json", "tests/fixtures/pass1.json", "tests/fixtures/pass15.json", "tests/fixtures/pass16.json", "tests/fixtures/pass17.json", "tests/fixtures/pass2.json", "tests/fixtures/pass26.json", "tests/fixtures/pass3.json", "tests/setup_variant.rb", "tests/test_json.rb", "tests/test_json_addition.rb", "tests/test_json_encoding.rb", "tests/test_json_fixtures.rb", "tests/test_json_generate.rb", "tests/test_json_generic_object.rb", "tests/test_json_string_matching.rb", "tests/test_json_unicode.rb", "tools/fuzz.rb", "tools/server.rb", "./tests/test_json.rb", "./tests/test_json_addition.rb", "./tests/test_json_encoding.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_generate.rb", "./tests/test_json_generic_object.rb", "./tests/test_json_string_matching.rb", "./tests/test_json_unicode.rb"]
++  s.files = [".gitignore", ".travis.yml", "CHANGES", "COPYING", "COPYING-json-jruby", "GPL", "Gemfile", "README-json-jruby.markdown", "README.rdoc", "Rakefile", "TODO", "VERSION", "data/example.json", "data/index.html", "data/prototype.js", "diagrams/.keep", "install.rb", "java/src/json/ext/ByteListTranscoder.java", "java/src/json/ext/Generator.java", "java/src/json/ext/GeneratorMethods.java", "java/src/json/ext/GeneratorService.java", "java/src/json/ext/GeneratorState.java", "java/src/json/ext/OptionsReader.java", "java/src/json/ext/Parser.java", "java/src/json/ext/Parser.rl", "java/src/json/ext/ParserService.java", "java/src/json/ext/RuntimeInfo.java", "java/src/json/ext/StringDecoder.java", "java/src/json/ext/StringEncoder.java", "java/src/json/ext/Utils.java", "json-java.gemspec", "json.gemspec", "json_pure.gemspec", "lib/json.rb", "lib/json/add/bigdecimal.rb", "lib/json/add/complex.rb", "lib/json/add/core.rb", "lib/json/add/date.rb", "lib/json/add/date_time.rb", "lib/json/add/exception.rb", "lib/json/add/ostruct.rb", "lib/json/add/range.rb", "lib/json/add/rational.rb", "lib/json/add/regexp.rb", "lib/json/add/struct.rb", "lib/json/add/symbol.rb", "lib/json/add/time.rb", "lib/json/common.rb", "lib/json/ext.rb", "lib/json/ext/.keep", "lib/json/generic_object.rb", "lib/json/pure.rb", "lib/json/pure/generator.rb", "lib/json/pure/parser.rb", "lib/json/version.rb", "tests/fixtures/fail1.json", "tests/fixtures/fail10.json", "tests/fixtures/fail11.json", "tests/fixtures/fail12.json", "tests/fixtures/fail13.json", "tests/fixtures/fail14.json", "tests/fixtures/fail18.json", "tests/fixtures/fail19.json", "tests/fixtures/fail2.json", "tests/fixtures/fail20.json", "tests/fixtures/fail21.json", "tests/fixtures/fail22.json", "tests/fixtures/fail23.json", "tests/fixtures/fail24.json", "tests/fixtures/fail25.json", "tests/fixtures/fail27.json", "tests/fixtures/fail28.json", "tests/fixtures/fail3.json", "tests/fixtures/fail4.json", "tests/fixtures/fail5.json", "tests/fixtures/fail6.json", "tests/fixtures/fail7.json", "tests/fixtures/fail8.json", "tests/fixtures/fail9.json", "tests/fixtures/pass1.json", "tests/fixtures/pass15.json", "tests/fixtures/pass16.json", "tests/fixtures/pass17.json", "tests/fixtures/pass2.json", "tests/fixtures/pass26.json", "tests/fixtures/pass3.json", "tests/setup_variant.rb", "tests/test_json.rb", "tests/test_json_addition.rb", "tests/test_json_encoding.rb", "tests/test_json_fixtures.rb", "tests/test_json_generate.rb", "tests/test_json_generic_object.rb", "tests/test_json_string_matching.rb", "tests/test_json_unicode.rb", "tools/fuzz.rb", "tools/server.rb", "./tests/test_json.rb", "./tests/test_json_addition.rb", "./tests/test_json_encoding.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_generate.rb", "./tests/test_json_generic_object.rb", "./tests/test_json_string_matching.rb", "./tests/test_json_unicode.rb"]
+   s.homepage = "http://flori.github.com/json"
+   s.licenses = ["Ruby"]
+   s.rdoc_options = ["--title", "JSON implemention for ruby", "--main", "README.rdoc"]
+diff -Nur json-1.8.1.orig/lib/json/ext.rb json-1.8.1/lib/json/ext.rb
+--- json-1.8.1.orig/lib/json/ext.rb	2013-10-17 09:53:47.000000000 -0200
++++ json-1.8.1/lib/json/ext.rb	2015-04-14 15:33:02.055063119 -0300
+@@ -5,16 +5,18 @@
+   end
+ end
+ require 'json/common'
++require 'json/pure/parser'
++require 'json/pure/generator'
+ 
+ module JSON
+   # This module holds all the modules/classes that implement JSON's
+-  # functionality as C extensions.
++  # functionality in pure ruby.
++  Ext = Pure
++
+   module Ext
+-    require 'json/ext/parser'
+-    require 'json/ext/generator'
+-    $DEBUG and warn "Using Ext extension for JSON."
+-    JSON.parser = Parser
+-    JSON.generator = Generator
++    $DEBUG and warn "Using Pure library for JSON."
++    JSON.parser = Pure::Parser
++    JSON.generator = Pure::Generator
+   end
+ 
+   JSON_LOADED = true unless defined?(::JSON::JSON_LOADED)
+diff -Nur json-1.8.1.orig/lib/json.rb json-1.8.1/lib/json.rb
+--- json-1.8.1.orig/lib/json.rb	2013-10-17 09:53:47.000000000 -0200
++++ json-1.8.1/lib/json.rb	2015-04-14 15:33:02.055063119 -0300
+@@ -54,9 +54,5 @@
+ module JSON
+   require 'json/version'
+ 
+-  begin
+-    require 'json/ext'
+-  rescue LoadError
+-    require 'json/pure'
+-  end
++  require 'json/pure'
+ end
+diff -Nur ruby-2.2.2.orig/common.mk ruby-2.2.2/common.mk
+--- ruby-2.2.2.orig/common.mk	2015-03-22 00:39:38.000000000 -0300
++++ ruby-2.2.2/common.mk	2015-04-14 15:33:02.058396283 -0300
+@@ -15,7 +15,7 @@
  
  RUBYLIB       = $(PATH_SEPARATOR)
  RUBYOPT       = -
 -RUN_OPTS      = --disable-gems
 +RUN_OPTS      = --disable-gems -I$(srcdir)/../json-1.8.1/lib
  
- SPEC_GIT_BASE = git://github.com/nurse
+ SPEC_GIT_BASE = git://github.com/ruby
  MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
-@@ -738,8 +738,6 @@
+@@ -728,8 +728,6 @@
  
  srcs-ext: $(EXT_SRCS)
  
@@ -257,7 +257,7 @@ diff -Nur ruby-2.2.1.orig/common.mk ruby-2.2.1/common.mk
  LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb
  
  srcs-lib: $(LIB_SRCS)
-@@ -826,11 +824,6 @@
+@@ -816,11 +814,6 @@
  		top_srcdir=../.. srcdir=. \
  		RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
  
@@ -269,17 +269,17 @@ diff -Nur ruby-2.2.1.orig/common.mk ruby-2.2.1/common.mk
  $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \
  		$(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in
  	$(ECHO) generating $@
-diff -Nur ruby-2.2.1.orig/defs/default_gems ruby-2.2.1/defs/default_gems
---- ruby-2.2.1.orig/defs/default_gems	2014-07-15 05:43:04.000000000 +0200
-+++ ruby-2.2.1/defs/default_gems	2015-02-20 11:59:51.350361114 +0100
+diff -Nur ruby-2.2.2.orig/defs/default_gems ruby-2.2.2/defs/default_gems
+--- ruby-2.2.2.orig/defs/default_gems	2014-07-15 00:43:04.000000000 -0300
++++ ruby-2.2.2/defs/default_gems	2015-04-14 15:33:02.058396283 -0300
 @@ -1,4 +1,3 @@
  # gem		base directory		versioning file			[executable files under bin]
  rake		lib/rake		lib/rake.rb			[rake]
  rdoc		lib/rdoc		lib/rdoc.rb			[rdoc ri]
 -json		ext/json		ext/json/lib/json/version.rb
-diff -Nur ruby-2.2.1.orig/ext/.document ruby-2.2.1/ext/.document
---- ruby-2.2.1.orig/ext/.document	2014-08-02 16:55:36.000000000 +0200
-+++ ruby-2.2.1/ext/.document	2015-02-20 12:01:52.622203345 +0100
+diff -Nur ruby-2.2.2.orig/ext/.document ruby-2.2.2/ext/.document
+--- ruby-2.2.2.orig/ext/.document	2014-08-02 11:55:36.000000000 -0300
++++ ruby-2.2.2/ext/.document	2015-04-14 15:33:02.058396283 -0300
 @@ -35,9 +35,6 @@
  io/nonblock/nonblock.c
  io/wait/lib
@@ -290,17 +290,17 @@ diff -Nur ruby-2.2.1.orig/ext/.document ruby-2.2.1/ext/.document
  mathn/complex/complex.c
  mathn/rational/rational.c
  nkf/lib
-diff -Nur ruby-2.2.1.orig/gems/bundled_gems ruby-2.2.1/gems/bundled_gems
---- ruby-2.2.1.orig/gems/bundled_gems	2014-12-12 14:00:15.000000000 +0100
-+++ ruby-2.2.1/gems/bundled_gems	2015-02-25 11:22:54.678004585 +0100
+diff -Nur ruby-2.2.2.orig/gems/bundled_gems ruby-2.2.2/gems/bundled_gems
+--- ruby-2.2.2.orig/gems/bundled_gems	2014-12-12 11:00:15.000000000 -0200
++++ ruby-2.2.2/gems/bundled_gems	2015-04-14 15:33:02.058396283 -0300
 @@ -1,3 +1,4 @@
  power_assert 0.2.2
  test-unit 3.0.8
  minitest 5.4.3
 +json 1.8.1
-diff -Nur ruby-2.2.1.orig/test/ruby/test_module.rb ruby-2.2.1/test/ruby/test_module.rb
---- ruby-2.2.1.orig/test/ruby/test_module.rb	2014-11-18 02:38:50.000000000 +0100
-+++ ruby-2.2.1/test/ruby/test_module.rb	2015-02-20 12:18:38.270980662 +0100
+diff -Nur ruby-2.2.2.orig/test/ruby/test_module.rb ruby-2.2.2/test/ruby/test_module.rb
+--- ruby-2.2.2.orig/test/ruby/test_module.rb	2015-04-12 12:41:32.000000000 -0300
++++ ruby-2.2.2/test/ruby/test_module.rb	2015-04-14 15:33:02.058396283 -0300
 @@ -202,7 +202,6 @@
  
      ancestors = Object.ancestors