Version bump.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 137 insertions, 5 deletions

diff --git a/dev-ruby/multi_json/ChangeLog b/dev-ruby/multi_json/ChangeLog
index 3d808bde923b..cdb99512c68b 100644
--- a/dev-ruby/multi_json/ChangeLog
+++ b/dev-ruby/multi_json/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/multi_json
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/ChangeLog,v 1.5 2011/05/24 09:09:20 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/ChangeLog,v 1.6 2011/07/19 04:43:26 graaff Exp $
+
+*multi_json-1.0.3 (19 Jul 2011)
+
+  19 Jul 2011; Hans de Graaff <graaff@gentoo.org> +multi_json-1.0.3.ebuild,
+  +files/multi_json-1.0.3-gentoo.patch:
+  Version bump.
 
 *multi_json-1.0.2 (24 May 2011)
 
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index bce92dfc2c08..ace42f4149a5 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -2,16 +2,19 @@
 Hash: SHA256
 
 AUX multi_json-0.0.4-gentoo.patch 793 RMD160 79493743ad347ac79c12c74dc7e4df60402e5398 SHA1 8e340bb1fa7b755a13bb494cf6e2a0a214ac775c SHA256 4bd5d5bed2847e1c4944757e5ba0ff27a994c6a8ef898bdeafeda9be542a08a1
+AUX multi_json-1.0.3-gentoo.patch 1939 RMD160 8e1e9d1f5bea4aaaec4c2c8e1830803614b293a8 SHA1 688a51ef233de24ebb6d82fabdd6a22160a32253 SHA256 40eda804dfb648493959c18d34ec876f2fc71adcefda2bef19fc93673a2553d4
 DIST multi_json-0.0.4.gem 8192 RMD160 d365b77b9f27dcec761864106c21fa460cb7939b SHA1 fc2563130692e3116ab47011a158e568014b6ec1 SHA256 9b5a5fb7cc91ef7e25eb788355d6976953b3d35e4729bdbb6e7f8d546afcc96d
 DIST multi_json-1.0.2.gem 12800 RMD160 53225e9230a39e2a9519dde0165ca1f09ab24007 SHA1 acb3ad6a2754c7c7b51fc5deb823b4c60afcaa40 SHA256 de9307e647e4aea15b8c395d7ba7493620c96d099e6bbb84095f0873c9aa6b65
+DIST multi_json-1.0.3.gem 13312 RMD160 05eac0ab20b14c144d20828bd886ac4a3f5d0706 SHA1 76007bc5b36b04733756ca8d960dc5db4d7f8c6e SHA256 ab272b4669783a73efe194e080f3fc1a3d35fa3f69105b8ca0afb2d0d1808789
 EBUILD multi_json-0.0.4.ebuild 1052 RMD160 c1cb7aa055059069d8f1f10ad38bb365aadebff5 SHA1 a1c58ce1b8b867134d37d439c3eb5c16e25f589c SHA256 6255ccedfa1fadb18653f56b199851a1dd92a0e78f757f0fef3466590c28fa5a
 EBUILD multi_json-1.0.2.ebuild 1236 RMD160 21a2288bac2c1778efb6ca2a2f6a7dd54b8ec8ab SHA1 ba87f0911754517f2349fa3e334662c322e94163 SHA256 b7d5ccafeb0d95ce7769c9101413919ab9fa410403363c3d21676cbd3ce76581
-MISC ChangeLog 1428 RMD160 72a9209c86f37942f243ab53171db8862e3b5825 SHA1 37e54343b7dd1b8ac82024924b8edc21230d7446 SHA256 93b9056d5387229de0b8f2ae3e05acd0cab3f8b4afb47d061501c600594d1c22
+EBUILD multi_json-1.0.3.ebuild 1559 RMD160 a5b43b24ff0b6ccec902389cd0b9a711e6e776ba SHA1 dbcdec2debc9092992d6d1064863b6b80a42543e SHA256 feff160b9203483221bf93a3b8b03e641472388f478f0d6fae4d98ee4d6e58da
+MISC ChangeLog 1594 RMD160 519a850b49e01132c763203557a09b490b26047d SHA1 9fa0f0b0df8fc7f3353d765a9918d201a2a0d42f SHA256 4db34a602cb50b2e037daafa1727fb05566ae91f897a67eed9eba41bfcb1954f
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3bdcYACgkQrnu0mw69Jkq5XwD+LtcBv6/ghVFxYJyzaJaWzS54
-QkG6nSeQof2LvHhSYC0A/1lVMiLKYD/cHcm3M4REQsFh/cpehuXzRIyIXlP39uD3
-=w54/
+iF4EAREIAAYFAk4lC3QACgkQiIP6VqMIqNduiwD5AamRVlOHBpnrhBOnFC982pgh
+1BAclx0gXDDlwb73zxoA/j0dfQlphb6otiPHTtct3THPDu0q429SAzmT4cDaejSS
+=U39K
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/multi_json/files/multi_json-1.0.3-gentoo.patch b/dev-ruby/multi_json/files/multi_json-1.0.3-gentoo.patch
new file mode 100644
index 000000000000..2e031e0c01a4
--- /dev/null
+++ b/dev-ruby/multi_json/files/multi_json-1.0.3-gentoo.patch
@@ -0,0 +1,75 @@
+A small part of 
+
+commit d83002691a34a32b6d6d181817af7f8e68524638
+Author: Erik Michaels-Ober <sferik@gmail.com>
+Date:   Sat May 14 09:26:31 2011 -0700
+
+    Cleanup
+
+diff --git a/spec/multi_json_spec.rb b/spec/multi_json_spec.rb
+index 9be78f4..55238c9 100644
+--- b/spec/multi_json_spec.rb
++++ a/spec/multi_json_spec.rb
+@@ -1,9 +1,9 @@
+-require 'helper'
++require 'spec_helper'
+ require 'stringio'
+-
++          
+ class MockDecoder
+   def self.decode(string, options = {})
+-    {'abc' => 'def'}
++    { 'abc' => 'def' }
+   end
+ 
+   def self.encode(string)
+@@ -26,10 +26,16 @@
+         end
+       end
+     end
+-
++    
+     it 'defaults to the best available gem' do
+-      require 'yajl'
+-      MultiJson.engine.name.should == 'MultiJson::Engines::Yajl'
++      # the yajl-ruby gem does not work on jruby, so the best engine is the JsonGem engine
++      if jruby?
++        require 'json'
++        MultiJson.engine.name.should == 'MultiJson::Engines::JsonGem'
++      else
++        require 'yajl'
++        MultiJson.engine.name.should == 'MultiJson::Engines::Yajl'
++      end
+     end
+ 
+     it 'is settable via a symbol' do
+@@ -89,7 +95,7 @@
+           encoded_json = MultiJson.encode(:a => 1, :b => {:c => 2})
+           MultiJson.decode(encoded_json).should == { "a" => 1, "b" => { "c" => 2 } }
+         end
+-
++        
+         it "properly decodes valid JSON in StringIOs" do
+           json = StringIO.new('{"abc":"def"}')
+           MultiJson.decode(json).should == { 'abc' => 'def' }
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+deleted file mode 100644
+index a9b66e6..0000000
+--- /dev/null
++++ a/spec/spec_helper.rb
+@@ -0,0 +1,15 @@
++begin
++  require 'bundler'
++rescue LoadError
++  puts "although not required, it's recommended that you use bundler during development"
++end
++
++require 'rspec'
++require 'rspec/autorun'
++
++$VERBOSE = true
++require 'multi_json'
++
++def jruby?
++  defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
++end
diff --git a/dev-ruby/multi_json/multi_json-1.0.3.ebuild b/dev-ruby/multi_json/multi_json-1.0.3.ebuild
new file mode 100644
index 000000000000..9772aa8d861f
--- /dev/null
+++ b/dev-ruby/multi_json/multi_json-1.0.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.0.3.ebuild,v 1.1 2011/07/19 04:43:26 graaff Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_TASK_DOC="rdoc"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="multi_json.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A gem to provide swappable JSON backends"
+HOMEPAGE="http://github.com/intridea/multi_json"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "|| ( >=dev-ruby/json-1.4 >=dev-ruby/yajl-ruby-0.7 =dev-ruby/activesupport-3* )"
+
+# I've switched one of the tests from requiring yajl to requiring
+# json-pure since it's the only implementation that is available for all
+# the Ruby interpreters we support. This is fixed upstream in 1.0.2 but
+# got broken again in 1.0.3:
+# https://github.com/intridea/multi_json/issues/18
+RUBY_PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:2 dev-ruby/json )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile spec/helper.rb || die "Unable to remove bundler."
+	rm Gemfile || die "Unable to remove bundler Gemfile."
+
+	# Remove simplecov support since we only care about the test results
+	# and this avoids another dependency.
+	sed -i -e '/[Ss]imple[Cc]ov/d' spec/helper.rb || die
+
+	# Provide version otherwise provided by bundler.
+	sed -i -e "s/#{MultiJson::VERSION}/${PV}/" Rakefile || die
+}