Remove another test for Ruby Enterprise; fix tests with Ruby 1.9.2; update dependencies to not require builder, to use minitest and not the virtual, and add virtual/ruby-rdoc to the list.

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

3 files changed, 25 insertions, 8 deletions

diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index 896b87cf1187..266a549bc9e2 100644
--- a/dev-ruby/rubygems/ChangeLog
+++ b/dev-ruby/rubygems/ChangeLog
@@ -1,6 +1,12 @@
 # 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.152 2010/08/18 04:37:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.153 2010/08/18 10:29:35 flameeyes Exp $
+
+  18 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  rubygems-1.3.7-r3.ebuild:
+  Remove another test for Ruby Enterprise; fix tests with Ruby 1.9.2; update
+  dependencies to not require builder, to use minitest and not the virtual,
+  and add virtual/ruby-rdoc to the list.
 
   18 Aug 2010; Jeroen Roovers <jer@gentoo.org> rubygems-1.3.7.ebuild:
   Stable for HPPA (bug #331059).
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index c572462e95ee..a53c73b96015 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 10rubygems 21 RMD160 02441be7de6307bbb859fbc2bf5891809fe9ecf8 SHA1 3f98150bfb39a3f3f1dfabcf2d9bf80051960d81 SHA256 8c30de9ba7f327237af47f85d8f7f6701d34c9a8780ff7303244667568ca5833
 AUX auto_gem.rb 159 RMD160 fbf261e5cf0a8450c51c33a7ad4dafbab21bd518 SHA1 8dde3d73f65998f4c5552924ad49e1441e1b211d SHA256 fe1efe24cd0ba36c55449e9623cd0be394980f37d12468624dad7ffdef72f4dc
 AUX auto_gem.rb.ruby19 509 RMD160 f8ffc36e384592956e6508b952ea80110f73efe3 SHA1 498f8963c27cad7e8334b2e797c51f6ac2101b1b SHA256 f0f7f61b110955325be52d278fcc1d3f3ea395cd9523dba33af37a44fd59666d
@@ -13,7 +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-r3.ebuild 3230 RMD160 04ca11dab77584701834fb28b61ac208da5f09dc SHA1 79d541dce680e3e59f925ee21a2b418778d06a5f SHA256 c23149a350520c46f338d1a3bfcc7c122707860f982f3c6a0e9760c814063643
+EBUILD rubygems-1.3.7-r3.ebuild 3295 RMD160 553b7e78c0429978f85af19c525616716d715daf SHA1 3c19b7f5a7a5aedeaf607a168c6d5585a370645d SHA256 8416729483c8ab0f83ff5c86f8fae5ef9cbc2b3553df3ff67d2802f6adbc7b64
 EBUILD rubygems-1.3.7.ebuild 2987 RMD160 603faf2df43cd6aab881c1a803f5deecfa44d382 SHA1 358a8ddaae8e300a1dedcfd6da352fa7bfca60ff SHA256 db1b221ffec1ea2912010fa896381ba0a4a3362a1adb8d3df8f3acaf05efa729
-MISC ChangeLog 24567 RMD160 1d82ee906591b243c0650b327c4ce91f00a3daa5 SHA1 2f82088fef207dee82493982a6b32372ee8bffc9 SHA256 7b61fe45c74e467d445dc6fe0579269e4cbe92e991972f3c16ff9d89e933e14a
+MISC ChangeLog 24852 RMD160 20bc5b536a2eff2550ce9b80f26a7e806758676e SHA1 d17046e943c781ccf4ecf10fe897447048e70cd1 SHA256 0fedd757bfcef82d1c59ae0ce858e732449469bbcb6b6bb11aad6b301b4c00d3
 MISC metadata.xml 247 RMD160 eb1d10b4366542ce2f232dcaf7317341b6b5608f SHA1 fcb6e2a1d6cda6d45640f9c5a5dfcc0fd4f3ab3b SHA256 633ae9912e8dd27f76b9cf53f5ad0d3222db85d9a19a76da7fd5e26f40b144e3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkxrthcACgkQAiZjviIA2XhDfgCdG3jJKWHGtI8PJ7WpLMCG6H9r
+AOMAniV1C6AmOCNUxQSFFn+WpqFdz+qN
+=QGm5
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/rubygems/rubygems-1.3.7-r3.ebuild b/dev-ruby/rubygems/rubygems-1.3.7-r3.ebuild
index 5dc274089b5f..c848f76fc53c 100644
--- a/dev-ruby/rubygems/rubygems-1.3.7-r3.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-r3.ebuild,v 1.2 2010/08/05 18:00:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.7-r3.ebuild,v 1.3 2010/08/18 10:29:35 flameeyes Exp $
 
 EAPI="3"
 
@@ -29,8 +29,8 @@ PDEPEND="server? ( dev-ruby/builder[ruby_targets_ruby18] )"
 # rdoc-related stuff, so it's not a mistake.
 ruby_add_bdepend "
 	test? (
-		virtual/ruby-minitest
-		dev-ruby/builder
+		dev-ruby/minitest
+		virtual/ruby-rdoc
 		!dev-ruby/yard
 		!dev-ruby/test-unit:2
 	)"
@@ -48,8 +48,9 @@ all_ruby_prepare() {
 
 	eprefixify lib/rubygems/defaults/operating_system.rb
 
-	# Disable broken tests when changing defaults:
+	# Disable broken tests when changing default values:
 	sed -i -e '/^  def test_self_bindir_default_dir/, /^  end/ s:^:#:' \
+		-e '/^  def test_self_default_dir/, /^  end/ s:^:#:' \
 		test/test_gem.rb || die
 }
 
@@ -63,7 +64,7 @@ each_ruby_test() {
 	unset RUBYOPT
 
 	RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -Ilib:test \
-		-e 'Dir["test/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+		-e 'Dir["./test/test_*.rb"].each { |tu| require tu }' || die "tests failed"
 }
 
 each_ruby_install() {