Fix running tests on Ruby 1.9.2 (bug #330209), remove useless sed, cleanup old versions.

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

5 files changed, 67 insertions, 60 deletions

diff --git a/dev-ruby/hashie/ChangeLog b/dev-ruby/hashie/ChangeLog
index dda143c7b9d3..fbf10f97b090 100644
--- a/dev-ruby/hashie/ChangeLog
+++ b/dev-ruby/hashie/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/hashie
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hashie/ChangeLog,v 1.6 2010/06/24 05:21:49 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hashie/ChangeLog,v 1.7 2010/07/28 23:57:18 flameeyes Exp $
+
+  28 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -hashie-0.1.8.ebuild, -hashie-0.2.0.ebuild, hashie-0.2.1.ebuild,
+  +files/hashie-0.2.1-gentoo.patch:
+  Fix running tests on Ruby 1.9.2 (bug #330209), remove useless sed, cleanup
+  old versions.
 
 *hashie-0.2.1 (24 Jun 2010)
 
diff --git a/dev-ruby/hashie/files/hashie-0.2.1-gentoo.patch b/dev-ruby/hashie/files/hashie-0.2.1-gentoo.patch
new file mode 100644
index 000000000000..8bbe511d5178
--- /dev/null
+++ b/dev-ruby/hashie/files/hashie-0.2.1-gentoo.patch
@@ -0,0 +1,57 @@
+From a1ba968f8f93adf2922f7e84af1213e6fde5363c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Thu, 29 Jul 2010 01:48:24 +0200
+Subject: [PATCH] If possible, try to load simply spec_helper, the Rakefile will take care.
+
+If the file is loaded with relative paths it won't be able to load it
+properly.
+---
+ spec/hashie/clash_spec.rb |    2 +-
+ spec/hashie/dash_spec.rb  |    2 +-
+ spec/hashie/hash_spec.rb  |    2 +-
+ spec/hashie/mash_spec.rb  |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/spec/hashie/clash_spec.rb b/spec/hashie/clash_spec.rb
+index 6363d5d..8a8a909 100644
+--- a/spec/hashie/clash_spec.rb
++++ b/spec/hashie/clash_spec.rb
+@@ -1,4 +1,4 @@
+-require File.dirname(__FILE__) + '/../spec_helper'
++require 'spec_helper' rescue require File.dirname(__FILE__) + '/../spec_helper'
+ 
+ describe Hashie::Clash do
+   before do
+diff --git a/spec/hashie/dash_spec.rb b/spec/hashie/dash_spec.rb
+index b7971f9..8a6d466 100644
+--- a/spec/hashie/dash_spec.rb
++++ b/spec/hashie/dash_spec.rb
+@@ -1,4 +1,4 @@
+-require File.dirname(__FILE__) + '/../spec_helper'
++require 'spec_helper' rescue require File.dirname(__FILE__) + '/../spec_helper'
+ 
+ class DashTest < Hashie::Dash
+   property :first_name
+diff --git a/spec/hashie/hash_spec.rb b/spec/hashie/hash_spec.rb
+index 78d44be..69e43b5 100644
+--- a/spec/hashie/hash_spec.rb
++++ b/spec/hashie/hash_spec.rb
+@@ -1,4 +1,4 @@
+-require File.dirname(__FILE__) + '/../spec_helper'
++require 'spec_helper' rescue require File.dirname(__FILE__) + '/../spec_helper'
+ 
+ describe Hash do
+   it "should be convertible to a Hashie::Mash" do
+diff --git a/spec/hashie/mash_spec.rb b/spec/hashie/mash_spec.rb
+index 70d1f6f..080ade6 100644
+--- a/spec/hashie/mash_spec.rb
++++ b/spec/hashie/mash_spec.rb
+@@ -1,4 +1,4 @@
+-require File.dirname(__FILE__) + '/../spec_helper'
++require 'spec_helper' rescue require File.dirname(__FILE__) + '/../spec_helper'
+ 
+ describe Hashie::Mash do
+   before(:each) do
+-- 
+1.7.2
+
diff --git a/dev-ruby/hashie/hashie-0.1.8.ebuild b/dev-ruby/hashie/hashie-0.1.8.ebuild
deleted file mode 100644
index d6e8318bbb09..000000000000
--- a/dev-ruby/hashie/hashie-0.1.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hashie/hashie-0.1.8.ebuild,v 1.2 2010/05/27 01:22:40 flameeyes Exp $
-
-EAPI="2"
-USE_RUBY="ruby18 ruby19 jruby ree18"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful."
-HOMEPAGE="http://intridea.com/posts/hashie-the-hash-toolkit"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rspec )"
-
-all_ruby_prepare() {
-	sed -i -e '/check_dependencies/s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/hashie/hashie-0.2.0.ebuild b/dev-ruby/hashie/hashie-0.2.0.ebuild
deleted file mode 100644
index de71f3c072df..000000000000
--- a/dev-ruby/hashie/hashie-0.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hashie/hashie-0.2.0.ebuild,v 1.1 2010/06/07 05:55:00 graaff Exp $
-
-EAPI="2"
-USE_RUBY="ruby18 ruby19 jruby ree18"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful."
-HOMEPAGE="http://intridea.com/posts/hashie-the-hash-toolkit"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rspec )"
-
-all_ruby_prepare() {
-	sed -i -e '/check_dependencies/s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/hashie/hashie-0.2.1.ebuild b/dev-ruby/hashie/hashie-0.2.1.ebuild
index 037fe5afba06..adf6e36a0a3b 100644
--- a/dev-ruby/hashie/hashie-0.2.1.ebuild
+++ b/dev-ruby/hashie/hashie-0.2.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/hashie/hashie-0.2.1.ebuild,v 1.1 2010/06/24 05:21:49 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hashie/hashie-0.2.1.ebuild,v 1.2 2010/07/28 23:57:18 flameeyes Exp $
 
 EAPI="2"
 USE_RUBY="ruby18 ruby19 jruby ree18"
@@ -20,8 +20,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-ruby_add_bdepend "test? ( dev-ruby/rspec )"
+ruby_add_bdepend "test? ( dev-ruby/rspec dev-ruby/json )"
 
-all_ruby_prepare() {
-	sed -i -e '/check_dependencies/s:^:#:' Rakefile || die
-}
+RUBY_PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )