Revert my previous change, as it breaks specrb.

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

4 files changed, 12 insertions, 31 deletions

diff --git a/dev-ruby/test-spec/ChangeLog b/dev-ruby/test-spec/ChangeLog
index ca723a9894e8..1be3119784aa 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-spec/ChangeLog,v 1.7 2009/12/20 21:20:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-spec/ChangeLog,v 1.8 2009/12/20 22:20:30 flameeyes Exp $
+
+  20 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  test-spec-0.10.0-r2.ebuild, -files/test-spec-0.10.0-test-unit.patch:
+  Revert my previous change, as it breaks specrb.
 
 *test-spec-0.10.0-r2 (20 Dec 2009)
 
diff --git a/dev-ruby/test-spec/Manifest b/dev-ruby/test-spec/Manifest
index 1c41371fd15e..42cbd5f66316 100644
--- a/dev-ruby/test-spec/Manifest
+++ b/dev-ruby/test-spec/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX test-spec-0.10.0-test-unit.patch 356 RMD160 e3d65f8845afc14836cc8f5ce351b5207b16cc4c SHA1 6a5213222b4c79f5b56b250b3eaf9075e13570c3 SHA256 f415308952af7e3d44102d6c21b07d653277bfc418b732f8631cbadfb6b529fa
 DIST test-spec-0.10.0.gem 23040 RMD160 83ffab654c447d423ee7c6325eb09e779a88aa19 SHA1 ec7ea48707f247316a4556c3790d49e580c2e8c9 SHA256 73b9ec50f4dfdc4d730588466f1d3bf5b89cfb402176964d55a334f758514c99
-EBUILD test-spec-0.10.0-r2.ebuild 1012 RMD160 d4e5d51a8fac4e0266c7023905ed51320ce1683f SHA1 e29e48803d51d9a3cce379be374671f7e57eca85 SHA256 53a876ce44108b8db8004d73c76aa705418a69fc4a7c79017b47f3090f853ba3
+EBUILD test-spec-0.10.0-r2.ebuild 747 RMD160 e3de8ae0a9108128e6ac41a78ecc9c93a166fc63 SHA1 d803c0e9a89e0e9749ef129036d48a7514bb7ea6 SHA256 cd3281b40b4f118028a9aba8a1aeda91062b17144255f55f6a846c6f7a7c6b00
 EBUILD test-spec-0.10.0.ebuild 437 RMD160 7641c9edb8a3eae104a370cda1d8999b588d8607 SHA1 50efc428ae55f73941b13dee4998bf4c5340c955 SHA256 462c22364c18edafec094f3009039987a084a1231d5e6ddf999638c59c8a9e73
-MISC ChangeLog 1285 RMD160 7968a3eb742855b2185e67621deac1f1e022cbe9 SHA1 4742269744e436f96a11ca6c565b2ee1684a9bcb SHA256 5216d9ee32be22b107ff1f57259a9f17bc251e5a3b364611c07c52bf8a047b3d
+MISC ChangeLog 1463 RMD160 62d1de899bfcf7cc96d9efa91d6827fb50c375c6 SHA1 7b182fd013d6c41cac595bbef401db9176ac19d1 SHA256 38da63d4ae8994619176570010bf334938297849d4b8e22fa01f1bb519cb1c77
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksulSYACgkQAiZjviIA2XiUgACeK3mroNh6NOWRnsruGolUCAjA
-gk8AnR5WoMuA0bQlkf+JWrsWJvhL3bA8
-=JlmF
+iEYEARECAAYFAksuoysACgkQAiZjviIA2Xj8WwCg8//vq0XjJ1Q3ZSODpGFn5En8
+waIAnj/sBBFw2VePAXPrzPlm87+nAXvU
+=d/tP
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/test-spec/files/test-spec-0.10.0-test-unit.patch b/dev-ruby/test-spec/files/test-spec-0.10.0-test-unit.patch
deleted file mode 100644
index 366cb1de4ca4..000000000000
--- a/dev-ruby/test-spec/files/test-spec-0.10.0-test-unit.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: test-spec-0.10.0/lib/test/spec.rb
-===================================================================
---- test-spec-0.10.0.orig/lib/test/spec.rb
-+++ test-spec-0.10.0/lib/test/spec.rb
-@@ -6,6 +6,7 @@
- # This work is licensed under the same terms as Ruby itself.
- #
- 
-+gem 'test-unit'
- require 'test/unit'
- 
- class Test::Unit::AutoRunner    # :nodoc:
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 769d25381e29..eff7f378be00 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-2009 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.1 2009/12/20 21:20:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-spec/test-spec-0.10.0-r2.ebuild,v 1.2 2009/12/20 22:20:30 flameeyes Exp $
 
 EAPI="2"
 USE_RUBY="ruby18 ruby19"
@@ -18,19 +18,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-# This should in theory work with the test-unit from Ruby 1.8 as well,
-# but since mocha seem to prefer the gem, we're just going to depend
-# on the new version.
-#
-# And yes it's a runtime dependency.
-ruby_add_rdepend dev-ruby/test-unit
-
+ruby_add_rdepend virtual/ruby-test-unit
 ruby_add_bdepend test dev-ruby/mocha
 
-all_ruby_prepare() {
-	epatch "${FILESDIR}"/${P}-test-unit.patch
-}
-
 all_ruby_install() {
 	all_fakegem_install