Version bump. Ebuild and patches by Peter Wilmott in the ruby overlay.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

5 files changed, 144 insertions, 7 deletions

diff --git a/dev-ruby/map/ChangeLog b/dev-ruby/map/ChangeLog
index 177b83947d20..e734f3ea3b10 100644
--- a/dev-ruby/map/ChangeLog
+++ b/dev-ruby/map/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/map
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/map/ChangeLog,v 1.10 2012/08/26 06:22:12 graaff Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/map/ChangeLog,v 1.11 2013/10/22 18:03:08 graaff Exp $
+
+*map-6.5.1 (22 Oct 2013)
+
+  22 Oct 2013; Hans de Graaff <graaff@gentoo.org> +map-6.5.1.ebuild,
+  +files/ruby18-failing-tests.patch,
+  +files/map-6.5.1-ruby18-failing-tests.patch:
+  Version bump. Ebuild and patches by Peter Wilmott in the ruby overlay.
 
   26 Aug 2012; Hans de Graaff <graaff@gentoo.org> -map-5.1.0.ebuild,
   -map-5.2.0.ebuild:
diff --git a/dev-ruby/map/Manifest b/dev-ruby/map/Manifest
index d46c8c0ded18..8badb1bb7b54 100644
--- a/dev-ruby/map/Manifest
+++ b/dev-ruby/map/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX map-6.5.1-ruby18-failing-tests.patch 2139 SHA256 dea7d8130acfa5acd5de0887d10ee3ff9e8eae4004f56bea2206a19b2a8c4ea1 SHA512 4f32708d5480d7d0c04da9efb278d7e38a14726e8b80bb30b8d8f893038b94247279b983a253724ac41da39c888a84da940b163672e8303aebddee8d2ce646be WHIRLPOOL 2fdc68572d53cc2f3c4941d5970db46342f06d8ed624e62e3d57c1873f8ac1535464fc7a1ab28734e4ed8302c2b47dadc677472737cf96a31d99d2d1fce464e1
+AUX ruby18-failing-tests.patch 575 SHA256 5348d9c4cca81ee7684545ee77a55fde1b46a4f6347124281ec07224cca4ed2b SHA512 c72991c0cbbc671a0aaf8f8cc9720262ad9b4529bbd36afa35326ff52c0b7d598cf67c8aa3350216e715da4d7331413b2b8df0ca44eea94aee7c25be6fa205bc WHIRLPOOL 7b0af4d1cab38c5a5467732c5e2beacd5e2e039a4161ee5e842d007c9f3263dfb7d20c62a1da207ba5c33cb3c0e05f66517a47896165e1bf7bdc1e3cabcdfcda
 DIST map-5.5.0.gem 20480 SHA256 26419306d9ff4b5f68d7b9502010fb8bee3fc5b5c3078922678dbe3a51dd9b08 SHA512 3578d9a3881b9773fdbf89bc4501628d258711eded54003f16e50141e631e78dd114fb8d81af624c13a5fa3cfe3712bd48a8da570fa18748b5889ab6c9ae4d3b WHIRLPOOL 5fa2f673b055f0900ab4e2d37bccce7213d52249a343abf8cc4726987c71e6028454a96cb0127fa6f1f13632e95ed9ebc07f8cc9f3fcae6037caf04a35d92372
+DIST map-6.5.1.gem 23040 SHA256 305f07f976adb57871fd453ed95ff3598ad1146f85e8c6c0df6f8241f187d54f SHA512 f2d05ab70e0b369e88fbf7235822e925b8f437d4f678e9d132cdb5db6cf81fe929305b2339cdc755c1f1d0d9c0e424a40c4d2f3373f82eba8af39d673d086e52 WHIRLPOOL 5bcbcdeb295efa59ec5ce4e52790e0dc42e57e3b277afc948791f8af8a3a589bb7a0f274e74e4d467e59438bb37b6293baf64ea50066cbf24593d17ec8ea61a4
 EBUILD map-5.5.0.ebuild 578 SHA256 429cf31f04f2e942769d2cbc7bd6bdf633b0b8545fd1d52360ca1065fa7bea1e SHA512 3dd5e5c7e13596ed440f9df71f1ea398f9a5415e8eebf8d139ba9aac73ab8c536a334a70dc639873e750656c8f255eaa7f66d64d506ae63de5012e9f39cd682c WHIRLPOOL 19eccb8816c2b75743e280886fb99263c64dc1f187111c011c191254683ff60d3f90561ded91bc88e09cee3fa72841cec9b717f8d5e140ff8db4f0eab28e74e4
-MISC ChangeLog 1335 SHA256 b10d2d5943d5fd6ce96037ca76709f1a440cf341aed250c9408a5f05c3ef077f SHA512 b4b5b32e26c2071568022a9debfb483692a7528e95ef8483b7ffa2236537ac7c4d1c132b3fdd4ddd8a10539bbd8adc20e2943b00c57e7022c58b31de221d236a WHIRLPOOL 879bc7cd16dd2b8dfc07e27055b0341531a1dcf14b6ebd5c7a23a15fb17c9e84097e9f1f3a2047cc19151e6a8dd703a95d1f948354b8e067a8bfbdc76a94cfa3
+EBUILD map-6.5.1.ebuild 830 SHA256 87775feaffc016cf4fbb4d52796edfd14cace10c6d5c60d77ce7ea9f756ec0f8 SHA512 1d372f00462094e9abc66bb69b9f52f892b9cb752f257b4f65df2fd131eca98f2196e8cde9298d051d3a1f0764f7374af1e6a52bda0edf13cc68910f7f06c610 WHIRLPOOL 35b6f024a95c2dd4d0de17826fbfca74e5bd4b98e90ab6184e38ae9078de077f537c4133cc921c5b49ac42dc89e060f3bd33fe8b861241dfb54858d46d5f4c8c
+MISC ChangeLog 1588 SHA256 e2cab3c5b093ca701eb0423ab25bfaf19b706e90e5e7f09654f24f0a01e022fd SHA512 4588844a37ce775fd3a97149ff54db45d4cd82746294c7b73d115c3a0700009273303742efba3dd5214273c7b029194d7d689fc277d65120ec5edd779fc69ada WHIRLPOOL 48daac6a283f09527844c527b8f08186e82cd50615a6612bb05775fdae7bf3bf3cd6c9e2fdcef06a7c3b25b03dedebe1ef680652dfb898b9423e21ddd743e0b2
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlA5wJoACgkQiIP6VqMIqNex7gEAicXd6sde8m5Y8qkUTeIbbS7v
-tPFNIJ5BH/6XvvHnp00A/jgF8PmGADM9uDy4GW9s3/9m9tkemQK9VcwYUS0rGab/
-=om5+
+iF4EAREIAAYFAlJmvd0ACgkQiIP6VqMIqNfabAD+KisBrGehsmxDy3cL7hD0ZRez
+vHWGElEn/ycsCFgo3R8A/RNWtu4vXGMQYBSnMWalroDiYT2UBs0FdIBc/umY+uqf
+=Up/3
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/map/files/map-6.5.1-ruby18-failing-tests.patch b/dev-ruby/map/files/map-6.5.1-ruby18-failing-tests.patch
new file mode 100644
index 000000000000..d33a5fa0fbe2
--- /dev/null
+++ b/dev-ruby/map/files/map-6.5.1-ruby18-failing-tests.patch
@@ -0,0 +1,75 @@
+--- test/map_test.rb.old	2013-10-14 17:23:08.612541725 +0100
++++ test/map_test.rb	2013-10-14 17:24:20.001644242 +0100
+@@ -405,47 +405,6 @@
+     assert{ m[:key][0].is_a?(Map) }
+   end
+ 
+-  testing 'that #add overlays the leaves of one hash onto another without nuking branches' do
+-    m = Map.new
+-
+-    assert do
+-      m.add(
+-        :comments => [
+-          { :body => 'a' },
+-          { :body => 'b' },
+-        ],
+-
+-        [:comments, 0] => {'title' => 'teh title', 'description' => 'description'},
+-        [:comments, 1] => {'description' => 'description'},
+-      )
+-    end
+-
+-    assert do
+-      m =~
+-        {"comments"=>
+-          [{"body"=>"a", "title"=>"teh title", "description"=>"description"},
+-             {"body"=>"b", "description"=>"description"}]}
+-    end
+-
+-    m = Map.new
+-
+-    assert do
+-      m.add(
+-        [:a, :b, :c] => 42,
+-
+-        [:a, :b] => {:d => 42.0}
+-      )
+-    end
+-
+-    assert do
+-      m =~
+-        {"a"=>{"b"=>{"c"=>42, "d"=>42.0}}}
+-    end
+-
+-    assert{ Map.new.tap{|i| i.add} =~ {} }
+-    assert{ Map.new.tap{|i| i.add({})} =~ {} }
+-  end
+-
+   testing 'that Map.combine is teh sweet' do
+     {
+       [{:a => {:b => 42}}, {:a => {:c => 42.0}}] =>
+@@ -734,24 +693,6 @@
+     assert{ map.list.class != Array }
+   end
+ 
+-  testing 'rack compatible params' do
+-    m = Map.for(:a => [{}, {:b => 42}], :x => [ nil, [ nil, {:y => 42}] ], :A => {:B => {:C => 42}})
+-
+-    assert{ m.param_for(:a, 1, :b) == 'map[a][][b]=42' }
+-    assert{ m.name_for(:a, 1, :b) == 'map[a][][b]' }
+-
+-    assert{ m.param_for(:x, 1, 1, :y) == 'map[x][][][y]=42' }
+-    assert{ m.name_for(:x, 1, 1, :y) == 'map[x][][][y]' }
+-
+-    assert{ m.param_for(:A, :B, :C) == 'map[A][B][C]=42' }
+-    assert{ m.name_for(:A, :B, :C) == 'map[A][B][C]' }
+-
+-    assert{ m.name_for(:A, :B, :C, :prefix => :foo) == 'foo[A][B][C]' }
+-
+-    m = Map.for({"a"=>{"b"=>42}, "x"=>{"y"=>42}, "foo"=>:bar, "array"=>[{"k"=>:v}]})
+-    assert{ m.to_params == "map[a][b]=42&map[x][y]=42&map[foo]=bar&map[array][][k]=v"  }
+-  end
+-
+   testing 'delete_if' do
+     m = Map.for(:k => :v)
+     assert{ m.delete_if{|k| k.to_s == 'k'} }
diff --git a/dev-ruby/map/files/ruby18-failing-tests.patch b/dev-ruby/map/files/ruby18-failing-tests.patch
new file mode 100644
index 000000000000..c0a608ff6aff
--- /dev/null
+++ b/dev-ruby/map/files/ruby18-failing-tests.patch
@@ -0,0 +1,15 @@
+--- test/map_test.rb.old	2013-10-14 15:37:25.639883829 +0000
++++ test/map_test.rb	2013-10-14 15:37:33.747781899 +0000
+@@ -651,12 +651,6 @@
+     assert{ all_args == [[1, 2], [3, 4]] }
+   end
+ 
+-  testing 'keeps every entry for which block is true and returns self' do
+-    m = Map.new( { :a => 1 , :b => 2 , :c => 3 , :d => 4 } )
+-    assert{ m.keep_if { |k,v| v % 2 == 0 }.object_id == m.object_id }
+-    assert{ m == Map.new( { :b => 2 , :d => 4 } ) }
+-  end
+-
+   testing 'it raises a RuntimeError if called on a frozen instance' do
+     m = Map.new( { :a => 1 } ).freeze
+ 
diff --git a/dev-ruby/map/map-6.5.1.ebuild b/dev-ruby/map/map-6.5.1.ebuild
new file mode 100644
index 000000000000..9fa5ecd4d29d
--- /dev/null
+++ b/dev-ruby/map/map-6.5.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/map/map-6.5.1.ebuild,v 1.1 2013/10/22 18:03:08 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ruby20 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README"
+
+RUBY_FAKEGEM_GEMSPEC="map.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A string/symbol indifferent ordered hash that works in all rubies."
+HOMEPAGE="http://github.com/ahoward/map"
+
+LICENSE="|| ( Ruby BSD-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby18)
+			epatch "${FILESDIR}/ruby18-failing-tests.patch"
+			epatch "${FILESDIR}/${P}-ruby18-failing-tests.patch"
+			;;
+		*jruby)
+			epatch "${FILESDIR}/${P}-ruby18-failing-tests.patch"
+			;;
+		*)
+			;;
+	esac
+}