Version bump, exchange a patch for another, thanks to enebo from JRuby for the solution to our problem.

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

5 files changed, 54 insertions, 37 deletions

diff --git a/dev-ruby/matchy/ChangeLog b/dev-ruby/matchy/ChangeLog
index a01b9ad29f4e..b8f8f35213d3 100644
--- a/dev-ruby/matchy/ChangeLog
+++ b/dev-ruby/matchy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/matchy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/matchy/ChangeLog,v 1.1 2010/01/28 01:15:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/matchy/ChangeLog,v 1.2 2010/02/13 17:05:10 flameeyes Exp $
+
+*matchy-0.5.1 (13 Feb 2010)
+
+  13 Feb 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -matchy-0.4.2.ebuild, -files/matchy-0.4.2-order.patch,
+  +matchy-0.5.1.ebuild, +files/matchy-0.5.1+jruby.patch:
+  Version bump, exchange a patch for another, thanks to enebo from JRuby for
+  the solution to our problem.
 
 *matchy-0.4.2 (28 Jan 2010)
 
diff --git a/dev-ruby/matchy/Manifest b/dev-ruby/matchy/Manifest
index 2a90765912c3..c7921d33356b 100644
--- a/dev-ruby/matchy/Manifest
+++ b/dev-ruby/matchy/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX matchy-0.4.2-order.patch 863 RMD160 14dc47ff96f82a24e9f3e9a196a63efdfc7ac504 SHA1 100c9e3acfdfecaadbfc56ee791a84b0127f7055 SHA256 cc012dd522c0c7fd8daa68be1790d8b973ba1a63a28e13fa08d7acabbe4da6ff
-DIST mcmire-matchy-0.4.2.gem 28160 RMD160 6af59f094bce7e6a80b85480813c21ec6ad3ccc8 SHA1 4bfc486f3589a7b5ad566c281e9bdf7f64e7f736 SHA256 cf11fe6fbb1d2c7577a6b9a7669eaa77591f25bbe702f7cb833964e235805fae
-EBUILD matchy-0.4.2.ebuild 784 RMD160 4b4a1d1c587ebcd16d09e45825c2f068dd7ad4fd SHA1 d843c2fecd6002d62c6668096c958e8a134bf785 SHA256 fc4ca13cc7e26116100d8a5d144af44fafda285dcb6cf04ffc5be274257c850f
-MISC ChangeLog 431 RMD160 46838d5d5373d9330d339be83e014fa9d3c3a536 SHA1 c9910192ac7b66591dd3cb5eb041e939ac733b24 SHA256 fb55df7852a90b288b5a8b67504ff60d6b4a10d80a3d0c645c63a474cc9e1fca
+AUX matchy-0.5.1+jruby.patch 1189 RMD160 73a866b20d7c6fa452cc16cd29886da8764911dd SHA1 7114714f2fdfa622c3c654d2a630df9898294daa SHA256 1eb247381b258542f25164d7fbd6039ebc06d91162b0fe6557c14fb561c25217
+DIST mcmire-matchy-0.5.1.gem 16384 RMD160 48316e7015fe1d459b6f695a915f2ceb1986c34f SHA1 c6a40263bcfe986edcc114dc7c2d2a9e30ad0830 SHA256 d30482978c2f9f10d2dc4a69e8ca3b2203c54e9ebd0650180dc401f099864bd2
+EBUILD matchy-0.5.1.ebuild 643 RMD160 919a207bfe4056c14f0ac6b75ffc00bb7cab72a5 SHA1 a7eb0f26df936f846827249efa168c613b3a59be SHA256 e199a6b3800d1ba660b76e0d34f3fc3e23706ee72abc56aaf7556fe84c953aa4
+MISC ChangeLog 739 RMD160 4c101ba28b7eab860b0991385dc2fcbc9855de37 SHA1 3a96854a151ccd3ff493f9cf8a2f87cb41b4a903 SHA256 ba7266ea2112f2365b877284331b7a8b2dba19fc3ad3bd42d2eb6d0ec37c3e1c
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktg5O4ACgkQAiZjviIA2XhfTwCaAmpL8tao1wAtIa+jwQGqvLTf
-LCMAnRRz3JsxEsdfHgVU3i1YuKrT/mCe
-=uIJd
+iEYEARECAAYFAkt224gACgkQAiZjviIA2XgPuACgo0UT2fAX+ML6Av0cPhga/lgd
+050AoL0GvOj0jSr6gPq8SMfjglHt0Dmn
+=85Zm
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/matchy/files/matchy-0.4.2-order.patch b/dev-ruby/matchy/files/matchy-0.4.2-order.patch
deleted file mode 100644
index 5550c892b2e3..000000000000
--- a/dev-ruby/matchy/files/matchy-0.4.2-order.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: matchy-0.4.2/test/test_operator_expectations.rb
-===================================================================
---- matchy-0.4.2.orig/test/test_operator_expectations.rb
-+++ matchy-0.4.2/test/test_operator_expectations.rb
-@@ -156,12 +156,13 @@ class TestOperatorExpectations < Test::U
-   end
-   
-   def test_fail_message_for_hash
--    obj = Matchy::Expectations::OperatorExpectation.new({:foo => 'bar', :baz => 'quux'}, true)
-+    hash = {:foo => 'bar', :baz => 'quux'}
-+    obj = Matchy::Expectations::OperatorExpectation.new(hash, true)
-     
-     def obj.flunk(msg)
-       msg
-     end
-     
--    (obj == {:foo => 'bar'}).should == "Expected {:baz=>\"quux\", :foo=>\"bar\"} to == {:foo=>\"bar\"} (diff: {:baz=>\"quux\"})."
-+    (obj == {:foo => 'bar'}).should == "Expected #{hash.inspect} to == {:foo=>\"bar\"} (diff: {:baz=>\"quux\"})."
-   end
- end
diff --git a/dev-ruby/matchy/files/matchy-0.5.1+jruby.patch b/dev-ruby/matchy/files/matchy-0.5.1+jruby.patch
new file mode 100644
index 000000000000..a5e1bbe067d5
--- /dev/null
+++ b/dev-ruby/matchy/files/matchy-0.5.1+jruby.patch
@@ -0,0 +1,35 @@
+From 0c043d82dc3cba0a4e1c8048e50adf8a1af511fd Mon Sep 17 00:00:00 2001
+From: Thomas E Enebo <tom.enebo@gmail.com>
+Date: Sat, 13 Feb 2010 17:27:06 +0100
+Subject: [PATCH] Use define_method rather than class_eval for adapter-specific method.
+
+With this change, the code works correctly even on JRuby, while the
+previous code failed for a difference of implementation with MRI (see JRuby
+bug http://jira.codehaus.org/browse/JRUBY-4556 for details about the
+problem).
+---
+ lib/matchy.rb |    8 +++-----
+ 1 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/lib/matchy.rb b/lib/matchy.rb
+index 7c36838..868aeb7 100644
+--- a/lib/matchy.rb
++++ b/lib/matchy.rb
+@@ -66,11 +66,9 @@ module Matchy
+     end
+     
+     %w(assertions_module test_case_class assertion_failed_error).each do |method|
+-      class_eval <<-EOT, __FILE__, __LINE__
+-        def #{method}
+-          @@current_adapter ? @@current_adapter.#{method} : raise(LoadError, Matchy.adapter_not_found_msg)
+-        end
+-      EOT
++      define_method(method) do
++        @@current_adapter ? @@current_adapter.__send__(method) : raise(LoadError, Matchy.adapter_not_found_msg)
++      end
+     end
+   
+     def init
+-- 
+1.6.6.1
+
diff --git a/dev-ruby/matchy/matchy-0.4.2.ebuild b/dev-ruby/matchy/matchy-0.5.1.ebuild
index 48578a173859..8663db18c0e1 100644
--- a/dev-ruby/matchy/matchy-0.4.2.ebuild
+++ b/dev-ruby/matchy/matchy-0.5.1.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/matchy/matchy-0.4.2.ebuild,v 1.1 2010/01/28 01:15:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/matchy/matchy-0.5.1.ebuild,v 1.1 2010/02/13 17:05:10 flameeyes Exp $
 
 EAPI="2"
 
@@ -24,12 +24,6 @@ KEYWORDS="~amd64"
 IUSE=""
 
 all_ruby_prepare() {
-	# Don't force us to use Jeweler, disable check_dependency task
-	# dependency.
-	sed -i \
-		-e '/check_dependencies/s:^:#:' \
-		Rakefile || die
-
-	# ordering problem, sent upstream
-	epatch "${FILESDIR}"/${P}-order.patch
+	# jruby compatibility, sent upstream
+	epatch "${FILESDIR}"/${P}+jruby.patch
 }