Bump to fix on MRI 1.8.6 where it failed before. Also drop hoe and rake dependencies for tests by running them manually instead.

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

4 files changed, 19 insertions, 12 deletions

diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index f6263c4569a2..a0ce809b4199 100644
--- a/dev-ruby/rubygems/ChangeLog
+++ b/dev-ruby/rubygems/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/rubygems
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.148 2010/08/03 16:07:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.149 2010/08/04 13:47:42 flameeyes Exp $
+
+*rubygems-1.3.7-r3 (04 Aug 2010)
+
+  04 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -rubygems-1.3.7-r2.ebuild, +rubygems-1.3.7-r3.ebuild,
+  files/gentoo-defaults.rb:
+  Bump to fix on MRI 1.8.6 where it failed before. Also drop hoe and rake
+  dependencies for tests by running them manually instead.
 
 *rubygems-1.3.7-r2 (03 Aug 2010)
 
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 21155439aef0..b70cbd64b062 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -5,7 +5,7 @@ AUX 10rubygems 21 RMD160 02441be7de6307bbb859fbc2bf5891809fe9ecf8 SHA1 3f98150bf
 AUX auto_gem.rb 159 RMD160 fbf261e5cf0a8450c51c33a7ad4dafbab21bd518 SHA1 8dde3d73f65998f4c5552924ad49e1441e1b211d SHA256 fe1efe24cd0ba36c55449e9623cd0be394980f37d12468624dad7ffdef72f4dc
 AUX auto_gem.rb.ruby19 509 RMD160 f8ffc36e384592956e6508b952ea80110f73efe3 SHA1 498f8963c27cad7e8334b2e797c51f6ac2101b1b SHA256 f0f7f61b110955325be52d278fcc1d3f3ea395cd9523dba33af37a44fd59666d
 AUX conf.d-gem_server 81 RMD160 8c5c57e989e009b87fcb345185f3f1e3acaf517d SHA1 4d43d760253a478adbce597148ff1c4e414e8eea SHA256 aa850780bebe0e31da9732d8707a748567ca72716fd91e294dc712e71f82db2f
-AUX gentoo-defaults.rb 820 RMD160 5a43a4ba4d46d729c84b0320548a987b3f7fda16 SHA1 43b1cd05fdfb053ac19148f1fd40848103ea58c1 SHA256 50b5166befc54454a0751fbefd828eca12484ed4deb44e5ae97f89d251bd47f4
+AUX gentoo-defaults.rb 850 RMD160 ee838c107d956c8899b4bba4ea805e765de75461 SHA1 ade6cccba1dc134b659b2b063382d35ef4414bc6 SHA256 9b4f44aa70dd58012bcfa2e6b175e1e6300ef31c8942f08f2d078d68b1882b60
 AUX init.d-gem_server2 502 RMD160 baf764bc5ad41adce73576b2376093744ddd3917 SHA1 ad332343eab53b4be8d796999063ec2018245a4b SHA256 b7f7d215bb3dba02150dbdc431a84308010515ad4c5d9776d0dd5b99bf9a2cee
 AUX rubygems-1.3.3-gentoo.patch 1422 RMD160 e39a2042170399d0e98c772b0572026d6057353d SHA1 11cb4656b77185c78df809d3180061e5fe41139b SHA256 95e6c7ea38177b0798562be5abaf040e72db4a27f851502d91c4453890e630b0
 AUX rubygems-1.3.5-setup.patch 942 RMD160 69e8714f72482387019bad7b9254110c6bb8b957 SHA1 ba58de08e29731de4ce820f7d8e4c60de2fcee6e SHA256 d3e7c43ff20a649d1c731e27b0791f110b920201a28607091da0166495709b97
@@ -16,14 +16,14 @@ DIST rubygems-1.3.7.tgz 290986 RMD160 2ea8e16d1535216045798258603d5f2f9e3dbfea S
 EBUILD rubygems-1.3.5-r1.ebuild 2809 RMD160 beafa61db1cc38a9ddfdb33ec70109bfbf1310c8 SHA1 1118c3f668f1fea1b4e6e74a051a668d8c78f42c SHA256 08cc7b6c18304a5a99d7527525ca8825b8828884a70a7d66325bf6bfa43ee089
 EBUILD rubygems-1.3.5.ebuild 3166 RMD160 95a7edee644212eabf8a86f1dc42d06c14a3deed SHA1 8c1b5af2fd039e655628a1884697883824b0bafc SHA256 14822c8c0b156a93a8ab2215b5502f7cea55c2cbce8a57b5ddd7eec2753338b1
 EBUILD rubygems-1.3.6-r2.ebuild 2997 RMD160 c8496bebae44151a36eb9f553ceca30c0a5e3acc SHA1 33702cadaeba81f923bee1a0202098fb7e4b61cd SHA256 81c1eec7512baa6f61ad060227604934f68b4b60b36c33c2eee7c569a980a9cc
-EBUILD rubygems-1.3.7-r2.ebuild 3205 RMD160 d46418f2eb975714370f88ddc12a8b0dcdb14488 SHA1 2eec9c4085ed1344c236c30b04cdcb89f96bc18f SHA256 e231e2c415f5d6f7f068563454e36e4a656aa6a88516850cd3d537144e30d523
+EBUILD rubygems-1.3.7-r3.ebuild 3228 RMD160 0a60aacdf8578d175dca330f251bd416fd12f01e SHA1 62b1c579624d69e2ce7716f88fd68e4c81c4076a SHA256 521358774b9dd0ba031a38f0be04f1cd28aaff8f9378302a2bdd589d71713a92
 EBUILD rubygems-1.3.7.ebuild 2995 RMD160 444255eabf7d6674b80b3c7cc28b5a4f2e47ef1a SHA1 3e9b0f936c8b78e0b1a7e69f8bd8f63df2843e03 SHA256 6b5d757fb5101cb255bb42a463bc65ad1c20486e758a58006cb4a1ae624b5199
-MISC ChangeLog 23951 RMD160 65564701d96536a5711ac9f77e814243fdbfd823 SHA1 97390dd6d916634826e773665bb32dcc2d07f985 SHA256 26332252388193a4f5fb6411107b41f198061f8191a944c89be459a7c22cd51b
+MISC ChangeLog 24259 RMD160 eca13f2c0f448b7a699b15af4268af51afca91e4 SHA1 d9cb193952e015a97dd25ead50db6a60733d8a68 SHA256 8cbfd9f85cea23249d9021cd5c65a4d2f0ffb7d0bc5d33d4f26b502e57714a2e
 MISC metadata.xml 247 RMD160 eb1d10b4366542ce2f232dcaf7317341b6b5608f SHA1 fcb6e2a1d6cda6d45640f9c5a5dfcc0fd4f3ab3b SHA256 633ae9912e8dd27f76b9cf53f5ad0d3222db85d9a19a76da7fd5e26f40b144e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxYPt4ACgkQAiZjviIA2XjWoACaAhM4zsT7TkciawRPLjpkMnIu
-lGQAoOdo122mjzhAThRCYHdPiOGIO3xl
-=Z46M
+iEYEARECAAYFAkxZb5QACgkQAiZjviIA2XgujQCgtCsg6zm7rejuCFmVs1zMV4gS
+46IAn3csDy8HluTCiatfXXcoCSR5MpIQ
+=SP7b
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rubygems/files/gentoo-defaults.rb b/dev-ruby/rubygems/files/gentoo-defaults.rb
index dba852e4203d..2f0bbae734f6 100644
--- a/dev-ruby/rubygems/files/gentoo-defaults.rb
+++ b/dev-ruby/rubygems/files/gentoo-defaults.rb
@@ -22,7 +22,7 @@ module Gem
 
     undef :ruby_engine
     def ruby_engine
-      if RUBY_DESCRIPTION =~ /Ruby Enterprise Edition/
+      if defined? RUBY_DESCRIPTION and RUBY_DESCRIPTION =~ /Ruby Enterprise Edition/
         "rubyee"
       else
         # Ruby 1.8 and Ruby 1.9.2_rc2 and later install here, and JRuby
diff --git a/dev-ruby/rubygems/rubygems-1.3.7-r2.ebuild b/dev-ruby/rubygems/rubygems-1.3.7-r3.ebuild
index fd464a176198..7a2dec84d3db 100644
--- a/dev-ruby/rubygems/rubygems-1.3.7-r2.ebuild
+++ b/dev-ruby/rubygems/rubygems-1.3.7-r3.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/rubygems/rubygems-1.3.7-r2.ebuild,v 1.1 2010/08/03 16:07:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.7-r3.ebuild,v 1.1 2010/08/04 13:47:42 flameeyes Exp $
 
 EAPI="3"
 
@@ -29,8 +29,6 @@ PDEPEND="server? ( dev-ruby/builder[ruby_targets_ruby18] )"
 # rdoc-related stuff, so it's not a mistake.
 ruby_add_bdepend "
 	test? (
-		dev-ruby/rake
-		dev-ruby/hoe
 		virtual/ruby-minitest
 		dev-ruby/builder
 		!dev-ruby/yard
@@ -64,7 +62,8 @@ each_ruby_test() {
 	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
 	unset RUBYOPT
 
-	RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -S rake test || die "tests failed"
+	RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -Ilib:test \
+		-e 'Dir["test/test_*.rb"].each { |tu| require tu }' || die "tests failed"
 }
 
 each_ruby_install() {