summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2009-12-20 22:20:30 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2009-12-20 22:20:30 +0000
commit80e3b875eab328a5a4705d1ebe53ad5c202c3f05 (patch)
tree0fc82ba905490fd7c47b9c8209847b159be8d5ba /dev-ruby/test-spec
parentcleanup ampache manifest (diff)
downloadgentoo-2-80e3b875eab328a5a4705d1ebe53ad5c202c3f05.tar.gz
gentoo-2-80e3b875eab328a5a4705d1ebe53ad5c202c3f05.tar.bz2
gentoo-2-80e3b875eab328a5a4705d1ebe53ad5c202c3f05.zip
Revert my previous change, as it breaks specrb.
(Portage version: 2.2_rc60/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/test-spec')
-rw-r--r--dev-ruby/test-spec/ChangeLog6
-rw-r--r--dev-ruby/test-spec/files/test-spec-0.10.0-test-unit.patch12
-rw-r--r--dev-ruby/test-spec/test-spec-0.10.0-r2.ebuild14
3 files changed, 7 insertions, 25 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/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