Revision bump again, add a patch to use test-unit directly, fix dependencies.

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

5 files changed, 69 insertions, 30 deletions

diff --git a/dev-ruby/test-spec/ChangeLog b/dev-ruby/test-spec/ChangeLog
index f149889c7bb7..ca723a9894e8 100644
--- a/dev-ruby/test-spec/ChangeLog
+++ b/dev-ruby/test-spec/ChangeLog
@@ -1,6 +1,14 @@
 # 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.6 2009/12/16 15:23:15 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-spec/ChangeLog,v 1.7 2009/12/20 21:20:41 flameeyes Exp $
+
+*test-spec-0.10.0-r2 (20 Dec 2009)
+
+  20 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -test-spec-0.10.0-r1.ebuild, +test-spec-0.10.0-r2.ebuild,
+  +files/test-spec-0.10.0-test-unit.patch:
+  Revision bump again, add a patch to use test-unit directly, fix
+  dependencies.
 
 *test-spec-0.10.0-r1 (16 Dec 2009)
 
diff --git a/dev-ruby/test-spec/Manifest b/dev-ruby/test-spec/Manifest
index 606cbb87e6c9..1c41371fd15e 100644
--- a/dev-ruby/test-spec/Manifest
+++ b/dev-ruby/test-spec/Manifest
@@ -1,15 +1,16 @@
 -----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-r1.ebuild 587 RMD160 17f548fa1d8758e3cabd6e2d74e244fef31075cf SHA1 cc5e4f73597918f72890052ac03ef678b1f056f4 SHA256 57be2e0fb20f0239dfcebe7e77a8f65e94afa7e198360fdec7a0ff3482504379
+EBUILD test-spec-0.10.0-r2.ebuild 1012 RMD160 d4e5d51a8fac4e0266c7023905ed51320ce1683f SHA1 e29e48803d51d9a3cce379be374671f7e57eca85 SHA256 53a876ce44108b8db8004d73c76aa705418a69fc4a7c79017b47f3090f853ba3
 EBUILD test-spec-0.10.0.ebuild 437 RMD160 7641c9edb8a3eae104a370cda1d8999b588d8607 SHA1 50efc428ae55f73941b13dee4998bf4c5340c955 SHA256 462c22364c18edafec094f3009039987a084a1231d5e6ddf999638c59c8a9e73
-MISC ChangeLog 1002 RMD160 cd0ae19a38bdb27f25bf763da84642bfc7d2ede3 SHA1 db5b3f8c97cdc2f4e9bf390fe5778d7ab0e95b0f SHA256 0759b08f453aae66ab6fe37ac036856fc4f2804b0e9ec9ad222940b44f1266ce
+MISC ChangeLog 1285 RMD160 7968a3eb742855b2185e67621deac1f1e022cbe9 SHA1 4742269744e436f96a11ca6c565b2ee1684a9bcb SHA256 5216d9ee32be22b107ff1f57259a9f17bc251e5a3b364611c07c52bf8a047b3d
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkso+20ACgkQTEkQYPgooqHyvwCeML2i/0F+OuiU54crYbtTuo82
-NEQAoM3uD7P0DCGzifATSt1iY98EBgWK
-=y5Jy
+iEYEARECAAYFAksulSYACgkQAiZjviIA2XiUgACeK3mroNh6NOWRnsruGolUCAjA
+gk8AnR5WoMuA0bQlkf+JWrsWJvhL3bA8
+=JlmF
 -----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
new file mode 100644
index 000000000000..366cb1de4ca4
--- /dev/null
+++ b/dev-ruby/test-spec/files/test-spec-0.10.0-test-unit.patch
@@ -0,0 +1,12 @@
+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-r1.ebuild b/dev-ruby/test-spec/test-spec-0.10.0-r1.ebuild
deleted file mode 100644
index 7bebd8be0862..000000000000
--- a/dev-ruby/test-spec/test-spec-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,24 +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/test-spec/test-spec-0.10.0-r1.ebuild,v 1.1 2009/12/16 15:23:15 a3li Exp $
-
-EAPI="2"
-USE_RUBY="ruby18 ruby19"
-inherit ruby-fakegem
-
-DESCRIPTION="A library to do Behavior Driven Development with Test::Unit"
-HOMEPAGE="http://chneukirchen.org/blog/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-all_ruby_install() {
-	ruby_fakegem_binwrapper specrb
-	dodoc README SPECS || die
-
-	if use doc; then
-		dodoc examples/* || die
-	fi
-}
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
new file mode 100644
index 000000000000..769d25381e29
--- /dev/null
+++ b/dev-ruby/test-spec/test-spec-0.10.0-r2.ebuild
@@ -0,0 +1,42 @@
+# 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 $
+
+EAPI="2"
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_EXTRADOC="README SPECS ROADMAP TODO"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="A library to do Behavior Driven Development with Test::Unit"
+HOMEPAGE="http://chneukirchen.org/blog/"
+
+LICENSE="MIT"
+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_bdepend test dev-ruby/mocha
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${P}-test-unit.patch
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper specrb
+
+	if use doc; then
+		dodoc examples/* || die
+	fi
+}