Allow usage of minitest with Ruby 1.9 as well, as the interfaces are not the same.

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

5 files changed, 35 insertions, 15 deletions

diff --git a/dev-ruby/minitest/ChangeLog b/dev-ruby/minitest/ChangeLog
index 90668d005696..a730e62b2b5c 100644
--- a/dev-ruby/minitest/ChangeLog
+++ b/dev-ruby/minitest/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/minitest
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/ChangeLog,v 1.14 2010/05/22 22:57:28 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/ChangeLog,v 1.15 2010/05/25 10:27:34 flameeyes Exp $
+
+  25 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  minitest-1.4.2.ebuild, minitest-1.5.0.ebuild, minitest-1.6.0.ebuild:
+  Allow usage of minitest with Ruby 1.9 as well, as the interfaces are not
+  the same.
 
   22 May 2010; Alex Legler <a3li@gentoo.org> minitest-1.6.0.ebuild:
   Add REE18 support
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index feb7fc6a6269..528811367d5b 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -4,15 +4,15 @@ Hash: SHA1
 DIST minitest-1.4.2.gem 22016 RMD160 49aaa5190a0939cc3b8c284c815b29aaad301fa4 SHA1 5636995dfb7f0518c175b9f8462fcf0245925ac7 SHA256 f80732ca1a6fb5648ab3c04016b1230cceb468cda55aa7d4b3eea9b146a385e8
 DIST minitest-1.5.0.gem 22016 RMD160 b03a078ebce40ca49004755c5aa86284b5df4913 SHA1 a1ba12e983ded309951f8ce44f1ef4b6e5818525 SHA256 f34df58fdac0a9be80733151d94ee0e6d5483ab2a6eeec3915be5a9c54729d34
 DIST minitest-1.6.0.gem 24576 RMD160 eab397781add8f66c02adeb86ca6f8b26a1d9eb9 SHA1 854d49959239f910fe0ece868b50677eb9412e6b SHA256 33a15178c58ed6af7bc8ec9d7f84b0b07112327ce4957d56ea8420fc94736061
-EBUILD minitest-1.4.2.ebuild 850 RMD160 4fa37e406e3312fd103873bdb82bb29eaf12c6c4 SHA1 8b83dbf5de340a148b05c4ef5d391338eec7dc94 SHA256 c949ba7e35f62f23682811bfb2e341305989c6de172e383839ed086624b9bcd5
-EBUILD minitest-1.5.0.ebuild 811 RMD160 ba44f2a86f3858956afcbbd63cc56ae274fc5acb SHA1 a16cf8c0faab463b9fe8e3929de6861fb65b2883 SHA256 60c078b1b5562ca191c0a4c61deb685c78a9935a6abd30f4e52c1e66feec0670
-EBUILD minitest-1.6.0.ebuild 815 RMD160 12189d94ace4f7e79fb7b41fa82ea4b8e82581e3 SHA1 664f6d43f332b62a278267d89314713e48d5c946 SHA256 83eee8dc82e025c09616c26e165f7e7ec120dc07e15da4df92ecf013880950cb
-MISC ChangeLog 2110 RMD160 f4b39544be93d707a041d6ccc5eaa338d0cb92af SHA1 23c0e1b0ba00307b3e637daef288cc117361fbc8 SHA256 5627ee824ba535e9a262e300e499152fce74799ea28b067aeb784ad0b8953a5b
+EBUILD minitest-1.4.2.ebuild 888 RMD160 b9d0075c32ed1c939de79e017e5656e81e360370 SHA1 55e1f16e3bc6c43af9c98c1fe149bbc91b8a3de6 SHA256 45d340a5856bebcd0e090679a99b01dc3fe360d95bcb94150a54ee5a113991df
+EBUILD minitest-1.5.0.ebuild 849 RMD160 81dcbf71c8f85a21264d1935a128775b35c51ae7 SHA1 287dbafa55db28a0f01dc13ec6f6db98ca5801ba SHA256 61e4c2c043b42ce91318bdabd60b847e2f564ed9d63d167e5e6e1be9f3dd30e8
+EBUILD minitest-1.6.0.ebuild 862 RMD160 6243a0ad4e7bb31f92520e5718d7eb25c09a06d9 SHA1 a607cef03518109504fb9f8e935c3bd06eaa1d71 SHA256 efb5c2da6f9d23a1b277a1a10aaf70b18f08b050c942a7b0c73f67e951b7241a
+MISC ChangeLog 2330 RMD160 1d1c2bb425fa34ab57382572b0c347dbe04eba0f SHA1 04765a35779ef6571b22ef7f463f198a164b242c SHA256 56875181a97b3139205d055f3f023f5c64545eeb7c60610971eaf16c62b48efc
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv4YV8ACgkQ+tgfDpkAy6CG+QCfcEb37dF847p6lymFF6CGOHex
-7GMAoINvPDpiD5iki9/sdxYx9cmvBJei
-=CEWj
+iEYEARECAAYFAkv7pcwACgkQAiZjviIA2XigcACghmYS6eMsF+MQcsmXqSZ/cL0m
+2XYAoOkS2DTlzQPpW66u3WXjr9tqj3Pe
+=V1WB
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/minitest/minitest-1.4.2.ebuild b/dev-ruby/minitest/minitest-1.4.2.ebuild
index 1536fb454f58..da4ce8194443 100644
--- a/dev-ruby/minitest/minitest-1.4.2.ebuild
+++ b/dev-ruby/minitest/minitest-1.4.2.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/dev-ruby/minitest/minitest-1.4.2.ebuild,v 1.10 2010/01/13 16:22:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-1.4.2.ebuild,v 1.11 2010/05/25 10:27:34 flameeyes Exp $
 
 EAPI=2
 # jruby → tests fail, reported upstream
@@ -24,4 +24,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-ruby_add_bdepend test "virtual/ruby-test-unit dev-ruby/hoe"
+ruby_add_bdepend "
+	doc? ( dev-ruby/hoe )
+	test? (
+		virtual/ruby-test-unit
+		dev-ruby/hoe
+	)"
diff --git a/dev-ruby/minitest/minitest-1.5.0.ebuild b/dev-ruby/minitest/minitest-1.5.0.ebuild
index d14973ad1516..8ae2700d8971 100644
--- a/dev-ruby/minitest/minitest-1.5.0.ebuild
+++ b/dev-ruby/minitest/minitest-1.5.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/dev-ruby/minitest/minitest-1.5.0.ebuild,v 1.3 2010/05/01 08:06:20 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-1.5.0.ebuild,v 1.4 2010/05/25 10:27:34 flameeyes Exp $
 
 EAPI=2
 # jruby → tests fail, reported upstream
@@ -22,4 +22,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-ruby_add_bdepend test "virtual/ruby-test-unit dev-ruby/hoe"
+ruby_add_bdepend "
+	doc? ( dev-ruby/hoe )
+	test? (
+		virtual/ruby-test-unit
+		dev-ruby/hoe
+	)"
diff --git a/dev-ruby/minitest/minitest-1.6.0.ebuild b/dev-ruby/minitest/minitest-1.6.0.ebuild
index 9f61191ef2a3..7893b7335d1e 100644
--- a/dev-ruby/minitest/minitest-1.6.0.ebuild
+++ b/dev-ruby/minitest/minitest-1.6.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-1.6.0.ebuild,v 1.3 2010/05/22 22:57:28 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-1.6.0.ebuild,v 1.4 2010/05/25 10:27:34 flameeyes Exp $
 
 EAPI=2
 # jruby → tests fail, reported upstream
 # http://rubyforge.org/tracker/index.php?func=detail&aid=27657&group_id=1040&atid=4097
-USE_RUBY="ruby18 ree18 jruby"
+USE_RUBY="ruby18 ruby19 ree18 jruby"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 
@@ -22,4 +22,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-ruby_add_bdepend test "virtual/ruby-test-unit dev-ruby/hoe"
+ruby_add_bdepend "
+	doc? ( dev-ruby/hoe )
+	test? (
+		virtual/ruby-test-unit
+		dev-ruby/hoe
+	)"