Don't depend on test-unit-2 at runtime.

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

4 files changed, 24 insertions, 18 deletions

diff --git a/dev-ruby/test-spec/ChangeLog b/dev-ruby/test-spec/ChangeLog
index 73580cda1672..95562b6c7e58 100644
--- a/dev-ruby/test-spec/ChangeLog
+++ b/dev-ruby/test-spec/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/test-spec
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-spec/ChangeLog,v 1.14 2010/04/26 17:56:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-spec/ChangeLog,v 1.15 2010/05/01 10:41:40 flameeyes Exp $
+
+  01 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  test-spec-0.10.0-r2.ebuild:
+  Don't depend on test-unit-2 at runtime.
 
   26 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   test-spec-0.10.0-r2.ebuild:
diff --git a/dev-ruby/test-spec/Manifest b/dev-ruby/test-spec/Manifest
index f2da648e3215..32c59f58a31f 100644
--- a/dev-ruby/test-spec/Manifest
+++ b/dev-ruby/test-spec/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
 
 AUX test-spec-0.10.0-jruby.patch 1049 RMD160 601b2713659f334bd01e68c1306c35e3bbcafd78 SHA1 c4068cd4d13d6b66119b553ae49b1cca83b43c1a SHA256 8f475cb3a853abf2201fd8f69f251984d9415e1aec0a5454c9c0e3b71364976d
 DIST test-spec-0.10.0.gem 23040 RMD160 83ffab654c447d423ee7c6325eb09e779a88aa19 SHA1 ec7ea48707f247316a4556c3790d49e580c2e8c9 SHA256 73b9ec50f4dfdc4d730588466f1d3bf5b89cfb402176964d55a334f758514c99
-EBUILD test-spec-0.10.0-r2.ebuild 945 RMD160 c6aa111e99ab89316ce55e5f701c2b606617e750 SHA1 90fd0f34f970e8050f5f1de4878913c2a81c0e61 SHA256 7264392a497443dbeeedb90ef8f914934b3ac2e613b067b27a0259f01478352b
-MISC ChangeLog 2378 RMD160 b01d1750c39abaae70b17fbc02899ff61482d575 SHA1 27c1120e256e87e143fe07385bf2cb510ae3d066 SHA256 720c5771fe3ccfa4029ce8164b4fb05aa238cd2a88e55d9b21b4c6745b0ad7f8
+EBUILD test-spec-0.10.0-r2.ebuild 1131 RMD160 c307903d13bcfcc0d864d04debc341318cedc5dd SHA1 21316f394e18e90d1f9a9a8b23b41281fe4d851b SHA256 ae6a97852532b9eb5df08edd424f70cc98a164cec87f30ece3b58836fc1cfe45
+MISC ChangeLog 2507 RMD160 e2283413dc817405f579d9ed04ab248c71613994 SHA1 b432d83281017040a516f0062261e779ac9f7f92 SHA256 3c8b2a84bdc841f6fd118110780a5386d6a1731c7bdb2394a40c1b069d265922
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvV09IACgkQAiZjviIA2Xh7+QCePgzS0TAS0NPeRrrxTt0oqp51
-NLMAn2OGZGCBv0AHHlejOknlu6OdQGz9
-=NfFq
+iEYEARECAAYFAkvcBSsACgkQAiZjviIA2XigtQCfVEKISYZjU2mwRjA0UkwBiiOC
+0/MAnjnGLGMZIhdKk3wdpxg78r7LgNWt
+=5UNP
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/test-spec/test-spec-0.10.0-r2.ebuild b/dev-ruby/test-spec/test-spec-0.10.0-r2.ebuild
index 77c98fed71d0..94c2680b4afa 100644
--- a/dev-ruby/test-spec/test-spec-0.10.0-r2.ebuild
+++ b/dev-ruby/test-spec/test-spec-0.10.0-r2.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/test-spec/test-spec-0.10.0-r2.ebuild,v 1.8 2010/04/26 17:56:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-spec/test-spec-0.10.0-r2.ebuild,v 1.9 2010/05/01 10:41:40 flameeyes Exp $
 
 EAPI="2"
 
@@ -21,10 +21,14 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend virtual/ruby-test-unit
-USE_RUBY=ruby19 \
-	ruby_add_rdepend ruby_targets_ruby19 '>=dev-ruby/test-unit-2.0.6'
 ruby_add_bdepend test dev-ruby/mocha
 
+# On Ruby 1.9, the tests only work with test-unit-2, but generally
+# speaking, test-spec should work fine with test-unit-1.2.3, and
+# indeed some testsuites only work with that.
+USE_RUBY=ruby19 \
+	ruby_add_bdepend "ruby_targets_ruby19 test" '>=dev-ruby/test-unit-2.0.6'
+
 all_ruby_prepare() {
 	epatch "${FILESDIR}"/${P}-jruby.patch
 }
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index fb8def47f482..ff70657aa183 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA1
 
 DIST test-unit-1.2.3.gem 40960 RMD160 c8926789f1f074b202142cd278d3d82fc041f6eb SHA1 9ad7eefe7d289713a072130d51312ebe0529d48b SHA256 a7551459c53b0d73ac8e3ad3624b88d211bc80bc41a8c1a57c9d4b422beea4b7
-DIST test-unit-2.0.5.tgz 131079 RMD160 60a1e9cd26622f862d1bf19ae14fb217a3dd34ef SHA1 6f3284f402f2eaacd04608c2a3e003ddb3fb81c0 SHA256 2a57ca7b1452efa11281a7f6d26248c38b562f8b7092f478374f147f59eb2a5e
-DIST test-unit-2.0.6.tgz 132453 RMD160 431aaec553620cc2ed7739e8890fd4e5ff927651 SHA1 d856ba8519b63fd7cb098df3aac223441ef82c2c SHA256 019a42f7f28db49df6edce27b741a16f0b5885e50437c0dc7ed850c9ebbda5bf
+DIST test-unit-2.0.7.tgz 132981 RMD160 e433507d969c9243eac4ba79888bf8c99d60fc74 SHA1 6d34515a65becf5ee24cd751f6ce384a70694138 SHA256 aeb905dfc4d499a4983b1daf8a0984019d0dcb742225c51fe7972ae47a771142
 EBUILD test-unit-1.2.3.ebuild 806 RMD160 b0f07b0f395686fcbdf0a7acea34d47baffc0b94 SHA1 ff261f85bad220722eba3234270708aa206e7cf0 SHA256 9ba5d66992ff6d44459eada269a0d6ae55561be0fa79383f88ecd686b2f65ffc
-EBUILD test-unit-2.0.5.ebuild 1126 RMD160 9604cb88e1211a5c992beb816c177e0aa852e0e5 SHA1 2187c4ee9da9a1c7e27b6b841afe2efa24d9a553 SHA256 ece6c8a8f16b38b87977cd30d8dd6cf546122144ea81b292bd7da34eec74e3a0
-EBUILD test-unit-2.0.6.ebuild 1304 RMD160 84f48e78da47a5d14477a4cd6b52954a143ad940 SHA1 d8f4cc2511fa72f726f85dee5820b43c73421db1 SHA256 fb9b594873a07d2f9a6751c91ef5d8975313f68e3bf2e826d3301dfd6d9b6849
-MISC ChangeLog 2814 RMD160 7dc69edcab18f3635f2cdf933f569b1e3a45b796 SHA1 dbc9519a34dcb00279e74edb4815c6b2db43ff64 SHA256 63284d978f1e7dd3941e7396180126cc37853144d96bf284d0de358f12c2a237
+EBUILD test-unit-2.0.7.ebuild 1304 RMD160 64bbbf4047fdacb69ee7c3f7529c04590585ba4f SHA1 48d7c971683a3358521866740b9a66822e20f1fe SHA256 596e222e9a6eb92680b06624b629f87a43495e1a10adfd67ed3490f690fff9d6
+MISC ChangeLog 3068 RMD160 312b4aa777b016f4c6dd976ea3a96eef55271077 SHA1 f81d8fd22546c7d896da6a6558c49fd1d747d413 SHA256 842f89b77a81b38146392ab7d54d72cef8a57db9cf910cf6833486a6ffc32008
 MISC metadata.xml 313 RMD160 64f35fe17cb231f17c18f4ace1656b2389eebd07 SHA1 b2de46ec2cf3be4a04d73fa7a43a704408e0d2be SHA256 70c196238b5e24846ee90d328200906af70156308716e4ec568ae3e148e43813
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAktPrTgACgkQAiZjviIA2Xi3igCg3CzYHNw8lR7AcNNIPCuZ+Gx7
-/6YAoMTGg0k5s4V5kgpmI9V9ap03AxE8
-=qwJr
+iEYEARECAAYFAkvcBd4ACgkQAiZjviIA2XjBSACghndWI7n4GWMQ13BFrZVVjDx8
+UXMAoOqI0hFuZtQVACvQxu50mfF8lXP/
+=dYGZ
 -----END PGP SIGNATURE-----