mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-05-09 04:51:27 +02:00
multi_json: keep the old 1.0.4 just in case
This commit is contained in:
Anton Bolshakov
parent
8549239377
commit
ed1a3f262d
6 changed files with 298 additions and 0 deletions
141
dev-ruby/multi_json/ChangeLog
Normal file
141
dev-ruby/multi_json/ChangeLog
Normal file
|
|
@ -0,0 +1,141 @@
|
|||
# ChangeLog for dev-ruby/multi_json
|
||||
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/ChangeLog,v 1.31 2013/08/23 22:44:24 zerochaos Exp $
|
||||
|
||||
*multi_json-1.0.4 (23 Aug 2013)
|
||||
|
||||
23 Aug 2013; Rick Farina <zerochaos@gentoo.org> +multi_json-1.0.4.ebuild:
|
||||
reintroducing 1.0.4, needed as a dep for metasploit
|
||||
|
||||
27 Jul 2013; Agostino Sarubbo <ago@gentoo.org> multi_json-1.5.0.ebuild:
|
||||
Stable for x86, wrt bug #477364
|
||||
|
||||
21 Jul 2013; Agostino Sarubbo <ago@gentoo.org> multi_json-1.5.0.ebuild:
|
||||
Stable for amd64, wrt bug #477364
|
||||
|
||||
19 Jul 2013; Hans de Graaff <graaff@gentoo.org> -multi_json-1.3.6.ebuild,
|
||||
-multi_json-1.3.7.ebuild, -multi_json-1.4.0.ebuild:
|
||||
Cleanup.
|
||||
|
||||
*multi_json-1.6.1 (18 Jul 2013)
|
||||
|
||||
18 Jul 2013; Hans de Graaff <graaff@gentoo.org> +multi_json-1.6.1.ebuild:
|
||||
Version bump.
|
||||
|
||||
16 Jan 2013; Rick Farina <zerochaos@gentoo.org> multi_json-1.3.6.ebuild,
|
||||
multi_json-1.3.7.ebuild, multi_json-1.4.0.ebuild, multi_json-1.5.0.ebuild:
|
||||
adding ~arm keywords to net-analyzer/metasploit rdeps
|
||||
|
||||
*multi_json-1.5.0 (25 Dec 2012)
|
||||
|
||||
25 Dec 2012; Hans de Graaff <graaff@gentoo.org> +multi_json-1.5.0.ebuild:
|
||||
Version bump.
|
||||
|
||||
*multi_json-1.4.0 (01 Dec 2012)
|
||||
|
||||
01 Dec 2012; Hans de Graaff <graaff@gentoo.org> +multi_json-1.4.0.ebuild:
|
||||
Version bump.
|
||||
|
||||
*multi_json-1.3.7 (11 Nov 2012)
|
||||
|
||||
11 Nov 2012; Hans de Graaff <graaff@gentoo.org> +multi_json-1.3.7.ebuild:
|
||||
Version bump.
|
||||
|
||||
28 Aug 2012; Hans de Graaff <graaff@gentoo.org> -multi_json-1.0.4.ebuild,
|
||||
-multi_json-1.2.0.ebuild, -multi_json-1.3.4.ebuild, -multi_json-1.3.5.ebuild:
|
||||
Cleanup.
|
||||
|
||||
*multi_json-1.3.6 (05 Jul 2012)
|
||||
|
||||
05 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> +multi_json-1.3.6.ebuild:
|
||||
Version bump, use the new rspec support.
|
||||
|
||||
*multi_json-1.3.5 (17 May 2012)
|
||||
|
||||
17 May 2012; Hans de Graaff <graaff@gentoo.org> +multi_json-1.3.5.ebuild:
|
||||
Version bump.
|
||||
|
||||
*multi_json-1.3.4 (07 May 2012)
|
||||
|
||||
07 May 2012; Hans de Graaff <graaff@gentoo.org> +multi_json-1.3.4.ebuild:
|
||||
Version bump.
|
||||
|
||||
01 May 2012; Raúl Porcel <armin76@gentoo.org> multi_json-1.0.4.ebuild,
|
||||
multi_json-1.2.0.ebuild:
|
||||
Drop ia64/sparc keywords
|
||||
|
||||
*multi_json-1.2.0 (09 Apr 2012)
|
||||
|
||||
09 Apr 2012; Hans de Graaff <graaff@gentoo.org> +multi_json-1.2.0.ebuild:
|
||||
Version bump.
|
||||
|
||||
09 Apr 2012; Hans de Graaff <graaff@gentoo.org> -multi_json-0.0.4.ebuild,
|
||||
-multi_json-1.0.2.ebuild, -multi_json-1.0.3.ebuild:
|
||||
Remove old versions.
|
||||
|
||||
11 Mar 2012; Brent Baude <ranger@gentoo.org> multi_json-1.0.4.ebuild:
|
||||
Marking multi_json-1.0.4 ~ppc64 for bug 396043
|
||||
|
||||
07 Mar 2012; Naohiro Aota <naota@gentoo.org> multi_json-1.0.4.ebuild:
|
||||
Add ~x86-fbsd.
|
||||
|
||||
06 Feb 2012; Brent Baude <ranger@gentoo.org> multi_json-1.0.4.ebuild:
|
||||
Marking multi_json-1.0.4 ~ppc for bug 396043
|
||||
|
||||
19 Jan 2012; Jeroen Roovers <jer@gentoo.org> multi_json-1.0.4.ebuild:
|
||||
Marked ~hppa (bug #396043).
|
||||
|
||||
08 Jan 2012; Fabian Groffen <grobian@gentoo.org> multi_json-1.0.4.ebuild:
|
||||
Added Prefix keywords
|
||||
|
||||
27 Dec 2011; Hans de Graaff <graaff@gentoo.org> multi_json-1.0.4.ebuild:
|
||||
Also require rspec:2 with USE=doc since it is required for the Rakefile.
|
||||
|
||||
26 Dec 2011; Fabian Groffen <grobian@gentoo.org> multi_json-1.0.4.ebuild:
|
||||
Add Prefix keywords, bug #396043
|
||||
|
||||
*multi_json-1.0.4 (01 Dec 2011)
|
||||
|
||||
01 Dec 2011; Hans de Graaff <graaff@gentoo.org> +multi_json-1.0.4.ebuild:
|
||||
Version bump.
|
||||
|
||||
05 Nov 2011; Hans de Graaff <graaff@gentoo.org> multi_json-1.0.3.ebuild:
|
||||
dev-ruby/yajl-ruby is mandatory when testing for all targets except jruby.
|
||||
|
||||
*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)
|
||||
|
||||
24 May 2011; Hans de Graaff <graaff@gentoo.org> +multi_json-1.0.2.ebuild:
|
||||
Version bump.
|
||||
|
||||
02 Oct 2010; Hans de Graaff <graaff@gentoo.org> multi_json-0.0.4.ebuild:
|
||||
Remove bundler code because it requires all optional dependencies to be
|
||||
installed. Fix RSpec dependency.
|
||||
|
||||
*multi_json-0.0.4 (19 Jun 2010)
|
||||
|
||||
19 Jun 2010; Diego E. Pettenò <flameeyes@gentoo.org>
|
||||
-multi_json-0.0.3-r1.ebuild, -files/multi_json-0.0.3-gentoo.patch,
|
||||
+multi_json-0.0.4.ebuild, +files/multi_json-0.0.4-gentoo.patch:
|
||||
Version bump, reduce patching to our tests' hacks.
|
||||
|
||||
*multi_json-0.0.3-r1 (19 Jun 2010)
|
||||
|
||||
19 Jun 2010; Diego E. Pettenò <flameeyes@gentoo.org>
|
||||
-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)
|
||||
|
||||
19 Jun 2010; Diego E. Pettenò <flameeyes@gentoo.org>
|
||||
+multi_json-0.0.3.ebuild, +files/multi_json-0.0.3-gentoo.patch,
|
||||
+metadata.xml:
|
||||
Initial import of multi_json needed for the new version of oauth2. The
|
||||
tests are particularly patched (and not all of it is upstreamed yet) so
|
||||
that they pass on Ruby 1.9 and JRuby properly.
|
||||
6
dev-ruby/multi_json/Manifest
Normal file
6
dev-ruby/multi_json/Manifest
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
AUX multi_json-0.0.4-gentoo.patch 793 SHA256 4bd5d5bed2847e1c4944757e5ba0ff27a994c6a8ef898bdeafeda9be542a08a1 SHA512 70e469ea7f9e312872452aede73e9847e831b5e77ff13bbb07e8a11e9eb747fe5481a15f02a876d2256ce7e2df4912958d6ad52adb0c1318127ba32524723ef7 WHIRLPOOL 2bb2d46e3565fa2a3d74d0f7ad4a5c799f04ef4c4673ac2ad4c22d9da28a0c49b3b5516d597a1a695e801f665b45535a93e27e08f82ce7df4a1a58e527f4c897
|
||||
AUX multi_json-1.0.3-gentoo.patch 1939 SHA256 40eda804dfb648493959c18d34ec876f2fc71adcefda2bef19fc93673a2553d4 SHA512 ba1d21d8eace96aebd2d8357392330da242e7e861a8add475d12bb745dc3852228ec6e1b540be506fcce8c585e8f713d0a22df4d89ca2dd0717f687720c1f133 WHIRLPOOL f9c3e3800c02b49172c8f7a36b02e03c4c04501640461438d08d9dd1760c188c38ba40fca24ef34cb548fc9eb3982155c4604d20844807c17850a986066ec518
|
||||
DIST multi_json-1.0.4.gem 14336 SHA256 996d3a3349b7d944e259da33df67e44650de621337044cea9cbac1c63acd5e38 SHA512 c42049d581e5bf3f53a02a5d6fcde82134d5702f25e9be4584c0ddef76ca957fcd3a05804d9dee8e3a20f13631382413b41878facd23b76bbcf3595d0f56d8e9 WHIRLPOOL aeeb82f2d54a9a8e961ef6c35d1eab0a676baf45bc3aef547f1818d0f9b29262d388b8083aaf74af2158086a993e33353ae110f1233c11f045d8b399d13bff1e
|
||||
EBUILD multi_json-1.0.4.ebuild 1607 SHA256 c075ca5f47faf994d97390560f3bfe99705ea6445d55e6485665ddb2cbb15fd3 SHA512 d47588ae4a9e999423e68b14c3ebd616ff5ab4926b3d359c40e524e570b1ba5b29f59e5510acbbd21c5caec5c986db016e87e7c882f3548ddc590984393d83a9 WHIRLPOOL 49ae80bdeb40671f4acc29de03fbc2ae0abe23f5f320de9c803d90d72668ef5012e15eb60b16bf0176885ff4a0a04163f5b441e7bf011549b8fe110f7f78d93e
|
||||
MISC ChangeLog 4902 SHA256 869b1b6fdb10d9ef6d385c169ea9c855999c8d49f5b34965c1d19e26fa0083ff SHA512 0495a26f48c953522441c1dcbb5d2973d32ada5943e692146604f122471da02f558fbcd39745c5289ade023bfb5fe5bfb4c023fdde598eaa0b2b7c22b976b425 WHIRLPOOL 7f2560ae7eb1d36ec162d93dec9893c018e0d15a3bb3e2ac001b6cc371beb3b05f615c63bb9e1fd5101dd236f08f42ae8c381f254d2fbae7f9f22ebfef2370c3
|
||||
MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
|
||||
24
dev-ruby/multi_json/files/multi_json-0.0.4-gentoo.patch
Normal file
24
dev-ruby/multi_json/files/multi_json-0.0.4-gentoo.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
diff --git a/spec/multi_json_spec.rb b/spec/multi_json_spec.rb
|
||||
index 2df3350..9d2a376 100644
|
||||
--- a/spec/multi_json_spec.rb
|
||||
+++ b/spec/multi_json_spec.rb
|
||||
@@ -13,13 +13,17 @@ end
|
||||
describe "MultiJson" do
|
||||
context 'engines' do
|
||||
it 'should default to the best available gem' do
|
||||
+ begin
|
||||
require 'yajl'
|
||||
MultiJson.engine.name.should == 'MultiJson::Engines::Yajl'
|
||||
+ rescue LoadError
|
||||
+ pending "YAJL (or a dependency) not available."
|
||||
+ end
|
||||
end
|
||||
|
||||
it 'should be settable via a symbol' do
|
||||
- MultiJson.engine = :yajl
|
||||
- MultiJson.engine.name.should == 'MultiJson::Engines::Yajl'
|
||||
+ MultiJson.engine = :json_pure
|
||||
+ MultiJson.engine.name.should == 'MultiJson::Engines::JsonPure'
|
||||
end
|
||||
|
||||
it 'should be settable via a class' do
|
||||
75
dev-ruby/multi_json/files/multi_json-1.0.3-gentoo.patch
Normal file
75
dev-ruby/multi_json/files/multi_json-1.0.3-gentoo.patch
Normal file
|
|
@ -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
|
||||
5
dev-ruby/multi_json/metadata.xml
Normal file
5
dev-ruby/multi_json/metadata.xml
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>ruby</herd>
|
||||
</pkgmetadata>
|
||||
47
dev-ruby/multi_json/multi_json-1.0.4.ebuild
Normal file
47
dev-ruby/multi_json/multi_json-1.0.4.ebuild
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
# Copyright 1999-2013 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.4.ebuild,v 1.10 2013/08/23 22:44:24 zerochaos Exp $
|
||||
|
||||
EAPI=2
|
||||
|
||||
USE_RUBY="ruby18 ruby19 ree18 jruby"
|
||||
|
||||
RUBY_FAKEGEM_TASK_TEST="spec"
|
||||
RUBY_FAKEGEM_TASK_DOC="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 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
ruby_add_rdepend "|| ( >=dev-ruby/json-1.4 >=dev-ruby/yajl-ruby-0.7 =dev-ruby/activesupport-3* )"
|
||||
|
||||
ruby_add_bdepend "doc? ( dev-ruby/rspec:2 )"
|
||||
|
||||
ruby_add_bdepend "test? ( dev-ruby/rspec:2 dev-ruby/json )"
|
||||
|
||||
USE_RUBY=ruby18 ruby_add_bdepend "test? ( dev-ruby/yajl-ruby )"
|
||||
USE_RUBY=ruby19 ruby_add_bdepend "test? ( dev-ruby/yajl-ruby )"
|
||||
USE_RUBY=ree18 ruby_add_bdepend "test? ( dev-ruby/yajl-ruby )"
|
||||
|
||||
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
|
||||
}
|
||||
Loading…
Reference in a new issue