Version bump, patch merged upstream.

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

4 files changed, 15 insertions, 49 deletions

diff --git a/dev-ruby/matchy/ChangeLog b/dev-ruby/matchy/ChangeLog
index b8f8f35213d3..a1f5bbbd9195 100644
--- a/dev-ruby/matchy/ChangeLog
+++ b/dev-ruby/matchy/ChangeLog
@@ -1,6 +1,13 @@
 # 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.2 2010/02/13 17:05:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/matchy/ChangeLog,v 1.3 2010/02/14 14:43:57 flameeyes Exp $
+
+*matchy-0.5.2 (14 Feb 2010)
+
+  14 Feb 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -matchy-0.5.1.ebuild, -files/matchy-0.5.1+jruby.patch,
+  +matchy-0.5.2.ebuild:
+  Version bump, patch merged upstream.
 
 *matchy-0.5.1 (13 Feb 2010)
 
diff --git a/dev-ruby/matchy/Manifest b/dev-ruby/matchy/Manifest
index c7921d33356b..82eebac7656c 100644
--- a/dev-ruby/matchy/Manifest
+++ b/dev-ruby/matchy/Manifest
@@ -1,15 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-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
+DIST mcmire-matchy-0.5.2.gem 16384 RMD160 d2787b00a3e2e15f847b35c90bb1243234fb5326 SHA1 30f37b1dca8aea5f762b2264ec1ac335f59b75c1 SHA256 9d43d0e31c6230202d08135006d6ad65bd403bf19c34dd108e471d01ed3a04ec
+EBUILD matchy-0.5.2.ebuild 542 RMD160 b8c154fcdd41f64287c0450dafc6cb251e5f670d SHA1 66a10a2c8c1a88919fd01ac76a59c489d444bdc3 SHA256 d998d29178b6228e612f7057d4e8f45e0b365ed36b80ace497a1462b07548a75
+MISC ChangeLog 945 RMD160 cd6ccd3c27224637e14299d54ab5ef56a11156ad SHA1 2e8ff79aebe07e9fd77da1006d9363722efbdc6a SHA256 4d4e10dfc08351d202294e48edc1a113b214b54299857caa45fa1db37a2365d3
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt224gACgkQAiZjviIA2XgPuACgo0UT2fAX+ML6Av0cPhga/lgd
-050AoL0GvOj0jSr6gPq8SMfjglHt0Dmn
-=85Zm
+iEYEARECAAYFAkt4DCgACgkQAiZjviIA2XhS3QCfbY9/lc1RjnGMosLVTf5EZ6gK
++QYAn0Igg882UYW8vaRDOnbdoA8M9xKZ
+=p8NB
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/matchy/files/matchy-0.5.1+jruby.patch b/dev-ruby/matchy/files/matchy-0.5.1+jruby.patch
deleted file mode 100644
index a5e1bbe067d5..000000000000
--- a/dev-ruby/matchy/files/matchy-0.5.1+jruby.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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.5.1.ebuild b/dev-ruby/matchy/matchy-0.5.2.ebuild
index 8663db18c0e1..97525daca694 100644
--- a/dev-ruby/matchy/matchy-0.5.1.ebuild
+++ b/dev-ruby/matchy/matchy-0.5.2.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.5.1.ebuild,v 1.1 2010/02/13 17:05:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/matchy/matchy-0.5.2.ebuild,v 1.1 2010/02/14 14:43:57 flameeyes Exp $
 
 EAPI="2"
 
@@ -22,8 +22,3 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
-
-all_ruby_prepare() {
-	# jruby compatibility, sent upstream
-	epatch "${FILESDIR}"/${P}+jruby.patch
-}