Remove test-unit as viable alternative for Ruby 1.8 and JRuby (slot 0 is not present, slot 2 does not always work). Add new virtual with ree18 support.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 38 insertions, 6 deletions

diff --git a/virtual/ruby-test-unit/ChangeLog b/virtual/ruby-test-unit/ChangeLog
index 68548477d267..f89b920725af 100644
--- a/virtual/ruby-test-unit/ChangeLog
+++ b/virtual/ruby-test-unit/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for virtual/ruby-test-unit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-test-unit/ChangeLog,v 1.9 2010/05/19 11:30:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-test-unit/ChangeLog,v 1.10 2010/05/22 03:02:14 flameeyes Exp $
+
+*ruby-test-unit-0-r2 (22 May 2010)
+
+  22 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  ruby-test-unit-0.ebuild, ruby-test-unit-0-r1.ebuild,
+  +ruby-test-unit-0-r2.ebuild:
+  Remove test-unit as viable alternative for Ruby 1.8 and JRuby (slot 0 is
+  not present, slot 2 does not always work). Add new virtual with ree18
+  support.
 
   19 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   ruby-test-unit-0-r1.ebuild:
diff --git a/virtual/ruby-test-unit/ruby-test-unit-0-r1.ebuild b/virtual/ruby-test-unit/ruby-test-unit-0-r1.ebuild
index 01a48dbd1d81..fbbce2afbff7 100644
--- a/virtual/ruby-test-unit/ruby-test-unit-0-r1.ebuild
+++ b/virtual/ruby-test-unit/ruby-test-unit-0-r1.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/virtual/ruby-test-unit/ruby-test-unit-0-r1.ebuild,v 1.2 2010/05/19 11:30:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-test-unit/ruby-test-unit-0-r1.ebuild,v 1.3 2010/05/22 03:02:14 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ruby19 jruby"
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="ruby_targets_ruby18? ( || ( dev-ruby/test-unit[ruby_targets_ruby18] dev-lang/ruby:1.8 ) )
+RDEPEND="ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
 	ruby_targets_ruby19? ( dev-ruby/test-unit:0[ruby_targets_ruby19] )
-	ruby_targets_jruby? ( || ( dev-ruby/test-unit[ruby_targets_jruby] dev-java/jruby ) )"
+	ruby_targets_jruby? ( dev-java/jruby )"
 DEPEND=""
diff --git a/virtual/ruby-test-unit/ruby-test-unit-0-r2.ebuild b/virtual/ruby-test-unit/ruby-test-unit-0-r2.ebuild
new file mode 100644
index 000000000000..f2d9973a21f7
--- /dev/null
+++ b/virtual/ruby-test-unit/ruby-test-unit-0-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-test-unit/ruby-test-unit-0-r2.ebuild,v 1.1 2010/05/22 03:02:14 flameeyes Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ruby19 jruby ree18"
+
+inherit ruby-ng
+
+DESCRIPTION="Virtual ebuild for the Ruby test/unit library"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
+	ruby_targets_ruby19? ( dev-ruby/test-unit:0[ruby_targets_ruby19] )
+	ruby_targets_jruby? ( dev-java/jruby )
+	ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 )"
+DEPEND=""
diff --git a/virtual/ruby-test-unit/ruby-test-unit-0.ebuild b/virtual/ruby-test-unit/ruby-test-unit-0.ebuild
index 14fc9bd21486..b575696389b0 100644
--- a/virtual/ruby-test-unit/ruby-test-unit-0.ebuild
+++ b/virtual/ruby-test-unit/ruby-test-unit-0.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/virtual/ruby-test-unit/ruby-test-unit-0.ebuild,v 1.8 2010/03/30 12:15:38 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-test-unit/ruby-test-unit-0.ebuild,v 1.9 2010/05/22 03:02:14 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18"
@@ -16,5 +16,5 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="ruby_targets_ruby18? ( || ( dev-ruby/test-unit[ruby_targets_ruby18] dev-lang/ruby:1.8 ) )"
+RDEPEND="ruby_targets_ruby18? ( dev-lang/ruby:1.8 )"
 DEPEND=""