Remove test-unit as viable alternative for Ruby 1.8 and JRuby (slot 0 is not present...

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

diff --git a/virtual/ruby-test-unit/ChangeLog b/virtual/ruby-test-unit/ChangeLog
index 68548477d2677a83b34aef90b0b6a1b73b6e3eb8..f89b920725af47400f05dab3b6ab7dae3a52bc7d 100644 (file)
--- 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/Manifest b/virtual/ruby-test-unit/Manifest
index 3c810f8b9d67b7a462bfff5bc78c12d874580a1b..ea44085b73da359759767b5d1ae53edf2048e75c 100644 (file)
--- a/virtual/ruby-test-unit/Manifest
+++ b/virtual/ruby-test-unit/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD ruby-test-unit-0-r1.ebuild 750 RMD160 2608da8537580278ea48d6178d40ab5f604dd8db SHA1 ec987106e93096b6e93007d320a01e86ae4faf42 SHA256 efe855f3931943dbc501f06ec79572f71b1147b753a8c2952f76326e33850aaf
-EBUILD ruby-test-unit-0.ebuild 567 RMD160 938198e5fa780017c083d4c07306425fa2c0c90f SHA1 aa6c2af3914a06c435dc0f5d4c6577d14dc1f8ac SHA256 6cd0402eb07cf78f2d9cb08bdea5c1223dbf4d253227125886113e1f43e0e05f
-MISC ChangeLog 1573 RMD160 5ce0036c6fdad6b852589833a1099daab64d7f50 SHA1 a381567de0ea1b2e75b876e85a42117ca94b08d9 SHA256 9789f9bc3aff5d2c30ee2d0fdf7ccffb5b15c4bdd6322fcb63aa4d9721d4ebf1
+EBUILD ruby-test-unit-0-r1.ebuild 657 RMD160 0236b96f536c565546a5b20cf47091d97ee98f95 SHA1 25425c39ae20295c7c79bfa212a6591d70c6609c SHA256 eb10af726e434c2a41aeccf9e55e22f545f511a923f49257f87202ef2e382337
+EBUILD ruby-test-unit-0-r2.ebuild 658 RMD160 25dafa23b6a1d1ae67e90a77a1881a7872aaa69e SHA1 b59daa94eb7d030a2d23e5dddc5d92b6772283d5 SHA256 301c2bf2f869c47f3a764ba9c9ee11b07f601166f66f7735c6b70e9a37d6f445
+EBUILD ruby-test-unit-0.ebuild 523 RMD160 aed37871431f21cd08a4e77edcbdb3a9c34ea5f0 SHA1 b0db9aca819e6eb7049b4a5458f365b238ed1188 SHA256 a032281cb677c64a57df614e34f55d54bb74fb80450a675aa600d99be02b8544
+MISC ChangeLog 1911 RMD160 37599ddbf4d0fea76b0a840bd106f9d7364ebe42 SHA1 3bb876b42a5a4becd700e1e9f80ea422745e3ff7 SHA256 10207e5c21a340862761a6f12eb5010e146bbd3cadf3b2c1e0277f8d744eeff3
 MISC metadata.xml 159 RMD160 eb364108353c7843cf1c01fba92129aaa46a0334 SHA1 0734f4c292968932afc57d0aa3a681c0b75b7bfc SHA256 abab7965b1f41e0acf6b54c554945c1c9fa35b5afab848d784dc58c298bc4679
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvzy74ACgkQAiZjviIA2Xj0EgCgueV7V2WSyR/1psL4mhr49rwt
-yTsAn1V63pcvyAHIaiUiAbrtqUCOC5+n
-=l8j2
+iEYEARECAAYFAkv3SQ0ACgkQAiZjviIA2XjmPQCfWupSEaLp9B/dicy3RquLbmFU
+UQEAn1KzJWXDSF7OekcmZxszkrwlsGng
+=RHOB
 -----END PGP SIGNATURE-----

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 01a48dbd1d81b4a86b57a666d679e7d84d11cb3a..fbbce2afbff7694576bd7b6cecb968aaa6994d45 100644 (file)
--- 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 (file)
index 0000000..f2d9973
--- /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 14fc9bd2148656957bfde1b7d9daaaaec05d6090..b575696389b02a83cde3e9143640a93857287993 100644 (file)
--- 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=""