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

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

6 files changed, 75 insertions, 71 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/Manifest b/dev-ruby/hashie/Manifest
index ee9295ccc334..0dc146c6e1dd 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -1,18 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-DIST hashie-0.1.8.gem 11264 RMD160 503cfceb868f8d82b1e0f323788117dd350de423 SHA1 a83bb83a90e7105bd88162b240cac43e2868b41b SHA256 25c894ae947edc5f94ca69eeb6ed79b659ba93ddf24515ad2ed2b4b3549be4aa
-DIST hashie-0.2.0.gem 12800 RMD160 5b1cbdea51cfd5f079743d6061f01663df419182 SHA1 249142d9b071886590f08b59337ab4c760fe3d0b SHA256 434149bfb26ddcf04b66a524de2aba17e728de5c48157d53cbff902379ce2f1a
+AUX hashie-0.2.1-gentoo.patch 2023 RMD160 b25c621dc8cfb7b20043ae68c2983ff405054b0d SHA1 f415575191164346a558f5ff8df6bd5dc5aa2a87 SHA256 be08eb45b311608f361769050df518804801a5b41b66ff98225af8f2a6902c67
 DIST hashie-0.2.1.gem 13312 RMD160 8e666b83c972b5eafd825d63cca88b2dea964a82 SHA1 f23a2bb6d05bff52d8b965d3fcf255e10d5b1ff0 SHA256 01919802f0294e190af5a2548622eb61e619b9c410c479bf00bf914f955ba26e
-EBUILD hashie-0.1.8.ebuild 710 RMD160 b1744381d3add028a0371467f2ee52e7a674474b SHA1 6e756b050c1b7805f7ee3e78e03b1693da4216ce SHA256 5e92abf79556e205f6f2e15892ad3ed55acb0cee649d5f7bda7ae58f76854977
-EBUILD hashie-0.2.0.ebuild 707 RMD160 00a7a062185e08f83ae465a1c2b9fa26f281008c SHA1 6654992774a1a5dba9a6726c7548c66645b1d94e SHA256 8e082e51bfb43cbefaee66d7c335f62835d0be0bc9269eabb6a4711dd6eca6b0
-EBUILD hashie-0.2.1.ebuild 707 RMD160 57d5330c9bd424a958ac95cdda4654e9a4f6cf09 SHA1 489030b12dd87ebded4703df08efff8f4469f892 SHA256 1258e8d42ccf26c10b4e586968d1a115373f698fb9dae582512f926b023ae2e5
-MISC ChangeLog 1047 RMD160 7a356f47f83c0adba02ad95e00bac4b2dda1c3da SHA1 b9d27b25c37fe220b192ae0a5f667e71b535a4a5 SHA256 1f0b3fd3ad1394f7ad95f2fe0c0501e9958e2a8ed06b973d03b643411e1af1cd
+EBUILD hashie-0.2.1.ebuild 694 RMD160 8b3ea35fc08542e73d0b5479bc213865b9b1ee46 SHA1 c177a5d5476c4e8524672668eae6cc5c5f09c212 SHA256 84e7b7ae01c2fab05b8772cedf517a454a2d60bce76cc2d2d6ff8ba9ad42256f
+MISC ChangeLog 1303 RMD160 8e77fd56c5dae3d26ed75f8f404fff4c60273c51 SHA1 3a4bb800d85856b4d0d0adfddd2fdb558fa71557 SHA256 8e321e49512831a101a5e5103f8baf941aad9a3d1cdcf2d324df210b9003ad27
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkwi63oACgkQZihJkut28Ss1yAD+Oz3Lhsie+oxeahMsyg1GE9Ge
-2msCBmt7TBjsc05dq30BAIVDseZ+SqbnBp4u1/qg++yNHJIj+8yDOH+svylPY3X7
-=DjGK
+iEYEARECAAYFAkxQw/AACgkQAiZjviIA2XhmzwCg84aygLCeV4G/+acf6hqNAkks
+lK8An2t4WnZSqrDpYDtpRLdojQmXJC7J
+=lHmZ
 -----END PGP SIGNATURE-----
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 )