Version bump, reduce patching to our tests' hacks.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 46 insertions, 135 deletions

diff --git a/dev-ruby/multi_json/ChangeLog b/dev-ruby/multi_json/ChangeLog
index 5e0574217e1d..1a98bc22183f 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.2 2010/06/19 11:55:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/ChangeLog,v 1.3 2010/06/19 17:33:02 flameeyes Exp $
+
+*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)
 
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index fd6e2a98cf43..95d933eff369 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 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-r1.ebuild 950 RMD160 715c3138cedd871c9f2427b77332752683bbe412 SHA1 53ad3aa3e0aeaf862473bd762c476f3e7805dce5 SHA256 9237e3c98c43ea9ac988445007c6b0b9981ee4da111372f3dd2308e3ff7e693a
-MISC ChangeLog 842 RMD160 9ed0468b7ff837c0920402361f2d4b1706381d28 SHA1 a150a0881de9627291d709cf243d82cf55286f08 SHA256 d89d4bee9d7e71d023f41b2288ca8398e545f62bdb4c0984b4235faba3d3601d
+AUX multi_json-0.0.4-gentoo.patch 793 RMD160 79493743ad347ac79c12c74dc7e4df60402e5398 SHA1 8e340bb1fa7b755a13bb494cf6e2a0a214ac775c SHA256 4bd5d5bed2847e1c4944757e5ba0ff27a994c6a8ef898bdeafeda9be542a08a1
+DIST multi_json-0.0.4.gem 8192 RMD160 d365b77b9f27dcec761864106c21fa460cb7939b SHA1 fc2563130692e3116ab47011a158e568014b6ec1 SHA256 9b5a5fb7cc91ef7e25eb788355d6976953b3d35e4729bdbb6e7f8d546afcc96d
+EBUILD multi_json-0.0.4.ebuild 947 RMD160 092ac4bb49fba83a49effda6c5aa15e6d423c0dc SHA1 e0858be782a36835e89c1bd9e54db8fb80e4619c SHA256 b8b218e9d6eab3efe483f840b8ce51409d93d00ebcd97a42a7855e522a222ae5
+MISC ChangeLog 1120 RMD160 d85ed35d76de4929d5dd57697580dead577f235d SHA1 cb213bbf5c0b85b9ac1f669d69a95c3125ab7cf9 SHA256 ebda0539e3875b678ad229bb57bae0bbd5dfbb55ea8231e84bcee412c05ddbc9
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwcr6oACgkQAiZjviIA2XjM/QCdGiMw3wDFU1nB2kjnGrHOKAzc
-V6gAoM2/Cja/fqGuj3KPzJGJPHMnTrZF
-=Tn43
+iEYEARECAAYFAkwc/rgACgkQAiZjviIA2Xgw3wCfUIdov4F5ehSWPX2fotvoZsni
+guEAnA+hX/wip88SN+bAbK1RvvGHJW0P
+=4NT0
 -----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
deleted file mode 100644
index 14b7a5cf66b3..000000000000
--- a/dev-ruby/multi_json/files/multi_json-0.0.3-gentoo.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff --git a/Rakefile b/Rakefile
-index fbf6a4a..3669b7b 100644
---- a/Rakefile
-+++ b/Rakefile
-@@ -14,10 +14,13 @@ begin
-     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-   end
-   Jeweler::GemcutterTasks.new
-+
-+  task :spec => :check_dependencies
- rescue LoadError
-   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
- end
- 
-+begin
- require 'spec/rake/spectask'
- Spec::Rake::SpecTask.new(:spec) do |spec|
-   spec.libs << 'lib' << 'spec'
-@@ -30,9 +33,10 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
-   spec.rcov = true
- end
- 
--task :spec => :check_dependencies
--
- task :default => :spec
-+rescue LoadError
-+  puts "RSpec (or a dependency) not available. Install it with: gem install rspec"
-+end
- 
- 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
-+++ b/spec/spec_helper.rb
-@@ -4,8 +4,12 @@ require 'multi_json'
- require 'spec'
- require 'spec/autorun'
- require 'rubygems'
-+begin
- require 'bundler'
- Bundler.setup
-+rescue LoadError
-+  $stderr.puts "Bundler (or a dependency) not available."
-+end
- 
- Spec::Runner.configure do |config|
-   
-diff --git a/spec/x_to_json_spec.rb b/spec/x_to_json_spec.rb
-index 69bffc8..9d2a376 100644
---- a/spec/x_to_json_spec.rb
-+++ b/spec/x_to_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
-@@ -31,7 +35,11 @@ describe "MultiJson" do
-   %w(active_support json_gem json_pure yajl).each do |engine|
-     context engine do
-       before do
-+        begin
-         MultiJson.engine = engine
-+        rescue LoadError
-+          pending "Engine #{engine} couldn't be loaded (not installed?)"
-+        end
-       end
-       
-       describe '.encode' do
diff --git a/dev-ruby/multi_json/files/multi_json-0.0.4-gentoo.patch b/dev-ruby/multi_json/files/multi_json-0.0.4-gentoo.patch
new file mode 100644
index 000000000000..8736809a97f9
--- /dev/null
+++ b/dev-ruby/multi_json/files/multi_json-0.0.4-gentoo.patch
@@ -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
diff --git a/dev-ruby/multi_json/multi_json-0.0.3-r1.ebuild b/dev-ruby/multi_json/multi_json-0.0.4.ebuild
index cc2c137ea7fa..8a31411bb468 100644
--- a/dev-ruby/multi_json/multi_json-0.0.3-r1.ebuild
+++ b/dev-ruby/multi_json/multi_json-0.0.4.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-r1.ebuild,v 1.1 2010/06/19 11:55:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-0.0.4.ebuild,v 1.1 2010/06/19 17:33:02 flameeyes Exp $
 
 EAPI=2
 
diff --git a/dev-ruby/oauth2/Manifest b/dev-ruby/oauth2/Manifest
index 33133acb646b..a00b0f931207 100644
--- a/dev-ruby/oauth2/Manifest
+++ b/dev-ruby/oauth2/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX oauth2-0.0.8-gentoo.patch 840 RMD160 87ac5f69a73fa5d17cddce4d51015ba07e9b1862 SHA1 1df44f9e5b467b6834c4af8662885f7c75b6156d SHA256 519e317d4ea76568ff284ad366c064325cbc0c2ec647e24990391b0785bcdb08
-AUX oauth2-0.0.9-gentoo.patch 2372 RMD160 0e9eb8ad7b33384c189a8d836f719bd532ec1a89 SHA1 4ec53cc0d0fbdfecf6f89ebbe7b9b269cb501a5b SHA256 4a416c15e79c24c22e40e133b2d5fcf457ad2b9838a45382f50c53ae345db67f
-DIST oauth2-0.0.8.gem 10752 RMD160 343cbfb44fe8484b0941746cdfcca43eca78c2d7 SHA1 30108e2d9f47034992fc9df4ae9fb566b643a707 SHA256 d12a459e71d015707218f923c22aa654fcd2972e3f73d006a6b3710c0560cfcc
-DIST oauth2-0.0.9.gem 11264 RMD160 0a1534e5111a776eb6c949b9855fac0b439c73a6 SHA1 6aa4482dd8a2c94e0787648689acac7248fae84e SHA256 bf210a707ce83665083d573657dfaa60ef055e10d9353f3875fc68656fd8e350
-EBUILD oauth2-0.0.8.ebuild 789 RMD160 0de981d7d2ee1d3d3f1932cfbb3900d66e4bbcac SHA1 d4d74a51f66928b4bf2ea84f8fecad899b845805 SHA256 ffdec7c5ffd1ebe68fc004b465ca941592572e7d9e8fb6bb17e3afd513bbb701
-EBUILD oauth2-0.0.9.ebuild 806 RMD160 545922ad9628a8b9d9b7c48f3c6b6df4409ea5dc SHA1 ef2dc867f24a18d846071153bf9f44abecda91c6 SHA256 46759243eae8af2fea949515baadfad9f80e3d649f21899b3a1f02db4d46cd19
-MISC ChangeLog 1033 RMD160 aee0c8524683309df937a0d1320510fbafd5ea9f SHA1 c6309a05b340e55d7bd14b7d820123227a0d7793 SHA256 988f22c49dde83d1af06c0bceadc060185f5ec726f4629b922d2abe6920f4e6b
+DIST oauth2-0.0.10.gem 11264 RMD160 75278956e51e4fa286f1f5787f20adfc652e9aee SHA1 7294486e94c79c0acf0e94d2a05e92f5c82850e9 SHA256 0b9bd060b8b4e7d25ab95568cd8826b5fe4fa16ef5f538ed934225fa2c242ca4
+EBUILD oauth2-0.0.10.ebuild 754 RMD160 1401289ddf37c7c015f9f992f7363b17b326f9c8 SHA1 9bdce0c7461141ba586631d4d160ff9e9223f5e0 SHA256 f211774345828b4b3824c59bdb056c1d9b4de6b03e9197e79fead010e8c0d8b9
+MISC ChangeLog 1291 RMD160 92c5640afbcec1f62ffce12a6eb4dff6a526175d SHA1 2233aa9167921e843a5722148b796453d8553ed7 SHA256 eb8ddd10ca54b676207e4946f9e9c1dc317984b533131190dbb7cd1f2491df22
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwcuMYACgkQAiZjviIA2XhbowCgz2q2taSHYgQmyB+b+ezzgBT8
-9UEAnR4d2zreABOUOt421j2KMNGoiIJF
-=1GCr
+iEYEARECAAYFAkwc/vIACgkQAiZjviIA2XikGACg7Wm1dmPq5iS7bzo/F1j2mYb4
+25QAoKDGgFg07uslxkSP7r5riBFgRCEl
+=ro4k
 -----END PGP SIGNATURE-----