Version bump, patch merged upstream.

(Portage version: 2.2_rc62/cvs/Linux x86_64)

3 files changed, 9 insertions, 42 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/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
-}