Remove old version; fix testing (bug #321617); add support for Ruby 1.9, JRuby and REE18.

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

4 files changed, 19 insertions, 26 deletions

diff --git a/dev-ruby/hashie/ChangeLog b/dev-ruby/hashie/ChangeLog
index 4c836270ff09..52172c2c3765 100644
--- a/dev-ruby/hashie/ChangeLog
+++ b/dev-ruby/hashie/ChangeLog
@@ -1,6 +1,11 @@
 # 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.3 2010/01/15 07:59:11 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hashie/ChangeLog,v 1.4 2010/05/27 01:22:40 flameeyes Exp $
+
+  27 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -hashie-0.1.5.ebuild, hashie-0.1.8.ebuild:
+  Remove old version; fix testing (bug #321617); add support for Ruby 1.9,
+  JRuby and REE18.
 
 *hashie-0.1.8 (15 Jan 2010)
 
diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest
index a3bc4933a580..b0877c636335 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST hashie-0.1.5.gem 11264 RMD160 90795ea36c383f0ab7811f3e3e1939d348ec7340 SHA1 05a02ea69845c14c5e4713edbd626712a15cd347 SHA256 85d4bb6b54c4e210f6f32635964a0d76eadfbbf8474ae9474af6aae797728911
 DIST hashie-0.1.8.gem 11264 RMD160 503cfceb868f8d82b1e0f323788117dd350de423 SHA1 a83bb83a90e7105bd88162b240cac43e2868b41b SHA256 25c894ae947edc5f94ca69eeb6ed79b659ba93ddf24515ad2ed2b4b3549be4aa
-EBUILD hashie-0.1.5.ebuild 388 RMD160 255f5611bb37c9751f8b5a1c00b0196cf2d01def SHA1 ea5596063306c4e3354f064c624e168d16b5f6c4 SHA256 970fb0b86891bc927f57f7e74912e387a84b736cfdc6cc922eb17393604d8802
-EBUILD hashie-0.1.8.ebuild 601 RMD160 c52adc9c825a05bce1b2674bbcabd3543f1d512c SHA1 d5cd4a3b42e27c3aafd546fc9213cd8ace75fdb1 SHA256 c04b496e866ba8104f5d37452f3298d08777f5474c65e26b9fb0d725c41b4ff6
-MISC ChangeLog 615 RMD160 6f4c8a6690111cd9447cdf81a500c374bf84022e SHA1 ed59aaeb2125b8f7be1f6dde386c877984a4ed99 SHA256 7e29f077bf1a7cb3b778d73432d2d81e143b5ee88cf4e6d6b06f1d08a904e55c
+EBUILD hashie-0.1.8.ebuild 710 RMD160 b1744381d3add028a0371467f2ee52e7a674474b SHA1 6e756b050c1b7805f7ee3e78e03b1693da4216ce SHA256 5e92abf79556e205f6f2e15892ad3ed55acb0cee649d5f7bda7ae58f76854977
+MISC ChangeLog 814 RMD160 dda0476d62594083d57d6147aabfec1485b50c88 SHA1 886e08a9d7df1ecf00ef9f111ee34c81f7e66ac2 SHA256 10ebe43ca6727e70655324a4f50947f8d4886542932527c2d59c1a6e602624cf
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAktQIFoACgkQeM7EJeUH71ODuQCdGsPNwLoHptGJKrEWJjqOuPBU
-FjYAn16LD29CNlivonuri9CwBLik6/7N
-=Qn3o
+iEYEARECAAYFAkv9yQIACgkQAiZjviIA2Xh/ggCgptK1Zd6dgMyg2q4gmYczd0rg
+RsYAoPAC5kDmnm9TUFm8AkzIabe3Vxud
+=LhkQ
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/hashie/hashie-0.1.5.ebuild b/dev-ruby/hashie/hashie-0.1.5.ebuild
deleted file mode 100644
index 664753c4301b..000000000000
--- a/dev-ruby/hashie/hashie-0.1.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hashie/hashie-0.1.5.ebuild,v 1.2 2009/11/28 10:56:14 a3li Exp $
-
-inherit gems
-
-DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful."
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-USE_RUBY="ruby18"
diff --git a/dev-ruby/hashie/hashie-0.1.8.ebuild b/dev-ruby/hashie/hashie-0.1.8.ebuild
index 3f700fd46ff4..d6e8318bbb09 100644
--- a/dev-ruby/hashie/hashie-0.1.8.ebuild
+++ b/dev-ruby/hashie/hashie-0.1.8.ebuild
@@ -1,9 +1,9 @@
 # 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.1 2010/01/15 07:59:11 graaff Exp $
+# $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"
+USE_RUBY="ruby18 ruby19 jruby ree18"
 
 RUBY_FAKEGEM_TASK_TEST="spec"
 
@@ -20,4 +20,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-ruby_add_bdepend test dev-ruby/rspec
+ruby_add_bdepend "test? ( dev-ruby/rspec )"
+
+all_ruby_prepare() {
+	sed -i -e '/check_dependencies/s:^:#:' Rakefile || die
+}