From 3208d285218876d582b91b8775eca94739fb2eb2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Sat, 19 Jun 2010 11:55:40 +0000 Subject: [PATCH] Fix issue #1 from upstream, json engine failed to work as itnended. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-ruby/multi_json/ChangeLog | 9 +++++- dev-ruby/multi_json/Manifest | 12 +++---- .../files/multi_json-0.0.3-gentoo.patch | 32 +++++++++++++++++++ ....0.3.ebuild => multi_json-0.0.3-r1.ebuild} | 2 +- 4 files changed, 47 insertions(+), 8 deletions(-) rename dev-ruby/multi_json/{multi_json-0.0.3.ebuild => multi_json-0.0.3-r1.ebuild} (93%) diff --git a/dev-ruby/multi_json/ChangeLog b/dev-ruby/multi_json/ChangeLog index b3747efccfba..5e0574217e1d 100644 --- a/dev-ruby/multi_json/ChangeLog +++ b/dev-ruby/multi_json/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-ruby/multi_json # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/ChangeLog,v 1.1 2010/06/19 11:35:43 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/ChangeLog,v 1.2 2010/06/19 11:55:40 flameeyes Exp $ + +*multi_json-0.0.3-r1 (19 Jun 2010) + + 19 Jun 2010; Diego E. Pettenò + -multi_json-0.0.3.ebuild, +multi_json-0.0.3-r1.ebuild, + files/multi_json-0.0.3-gentoo.patch: + Fix issue #1 from upstream, json engine failed to work as itnended. *multi_json-0.0.3 (19 Jun 2010) diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest index 04153c2bb01e..fd6e2a98cf43 100644 --- a/dev-ruby/multi_json/Manifest +++ b/dev-ruby/multi_json/Manifest @@ -1,15 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX multi_json-0.0.3-gentoo.patch 2386 RMD160 b1dab58563b50da79961a8b833158aee91b4d691 SHA1 66e123c7e37a526800ec2c28d48006fc4ed9cf04 SHA256 7c4077c9ba056eed17f2cc03487df381d339464635fceca6fc48fcaab8fe2bfa +AUX multi_json-0.0.3-gentoo.patch 3313 RMD160 818c547fae1a84acef782ba6f3549fb53f855142 SHA1 2294ee4258c953a1ad8b6e70480b0c089b4d26cd SHA256 170bdd5a73a041a82af94e7c864aaf68f27783fc601ee7834275e8fdded0c1c3 DIST multi_json-0.0.3.gem 8192 RMD160 89494eddce10c3143c7688ce2662f04342d7a9c0 SHA1 1e63f1dc54eeb5a4c77069ae4c61291d3f6a7748 SHA256 4cf0cc7ff1fa3c064853b4d2a8467481189bc0b4407c15feeb0114799d55773c -EBUILD multi_json-0.0.3.ebuild 947 RMD160 36cdd89219c1c3e51ead04c9419417fc0dbaa005 SHA1 27205aceed8aa77e38dcc9550d1dd45068fda19f SHA256 4e6160e444fa99f2a9ba3496c92566073f68234782a88b7624a1ad00bbc6b3d0 -MISC ChangeLog 583 RMD160 a90493907d1483079ff5fc81757033e6a47c3f86 SHA1 437c694528f0e63474ede867acf65271516426a1 SHA256 ace69b20aab5b7d3fbe4200d240b6fd1366bc1072ef09224f5ed1d6ddc1b6263 +EBUILD multi_json-0.0.3-r1.ebuild 950 RMD160 715c3138cedd871c9f2427b77332752683bbe412 SHA1 53ad3aa3e0aeaf862473bd762c476f3e7805dce5 SHA256 9237e3c98c43ea9ac988445007c6b0b9981ee4da111372f3dd2308e3ff7e693a +MISC ChangeLog 842 RMD160 9ed0468b7ff837c0920402361f2d4b1706381d28 SHA1 a150a0881de9627291d709cf243d82cf55286f08 SHA256 d89d4bee9d7e71d023f41b2288ca8398e545f62bdb4c0984b4235faba3d3601d MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkwcqvwACgkQAiZjviIA2XgNBACfS+FnUFTyxbXlrm8AyE+O9NJe -TVYAoJVz+SFqm6VRhnVCUhulQ52vWcEM -=nrHN +iEYEARECAAYFAkwcr6oACgkQAiZjviIA2XjM/QCdGiMw3wDFU1nB2kjnGrHOKAzc +V6gAoM2/Cja/fqGuj3KPzJGJPHMnTrZF +=Tn43 -----END PGP SIGNATURE----- diff --git a/dev-ruby/multi_json/files/multi_json-0.0.3-gentoo.patch b/dev-ruby/multi_json/files/multi_json-0.0.3-gentoo.patch index f143b6afcc36..14b7a5cf66b3 100644 --- a/dev-ruby/multi_json/files/multi_json-0.0.3-gentoo.patch +++ b/dev-ruby/multi_json/files/multi_json-0.0.3-gentoo.patch @@ -29,6 +29,38 @@ index fbf6a4a..3669b7b 100644 require 'rake/rdoctask' Rake::RDocTask.new do |rdoc| +diff --git a/lib/multi_json.rb b/lib/multi_json.rb +index a1e7bb7..20c074a 100644 +--- a/lib/multi_json.rb ++++ b/lib/multi_json.rb +@@ -8,6 +8,13 @@ module MultiJson + @engine + end + ++ DefaultByRequire = { ++ "yajl" => :yajl, ++ "json" => :json_gem, ++ "active_support" => :active_support, ++ "json/pure" => :json_pure ++ } ++ + # The default engine based on what you currently + # have loaded and installed. First checks to see + # if any engines are already loaded, then checks +@@ -17,10 +24,10 @@ module MultiJson + return :json_gem if defined?(::JSON) + return :active_support if defined?(::ActiveSupport::JSON) + +- %w(yajl json active_support json/pure).each do |req| ++ DefaultByRequire.each_pair do |library, engine| + begin +- require req +- return req.sub('/','_').to_sym ++ require library ++ return engine + rescue LoadError + next + end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a198d34..c0338a1 100644 --- a/spec/spec_helper.rb diff --git a/dev-ruby/multi_json/multi_json-0.0.3.ebuild b/dev-ruby/multi_json/multi_json-0.0.3-r1.ebuild similarity index 93% rename from dev-ruby/multi_json/multi_json-0.0.3.ebuild rename to dev-ruby/multi_json/multi_json-0.0.3-r1.ebuild index 18c4e81fd28f..cc2c137ea7fa 100644 --- a/dev-ruby/multi_json/multi_json-0.0.3.ebuild +++ b/dev-ruby/multi_json/multi_json-0.0.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-0.0.3.ebuild,v 1.1 2010/06/19 11:35:43 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-0.0.3-r1.ebuild,v 1.1 2010/06/19 11:55:40 flameeyes Exp $ EAPI=2 -- 2.26.2