Fix install of testrb-2 wrapper, remove old versions.

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

6 files changed, 19 insertions, 145 deletions

diff --git a/dev-ruby/test-unit/ChangeLog b/dev-ruby/test-unit/ChangeLog
index af4cda853c9a..7655c0408f26 100644
--- a/dev-ruby/test-unit/ChangeLog
+++ b/dev-ruby/test-unit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/test-unit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/ChangeLog,v 1.22 2010/07/19 10:16:13 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/ChangeLog,v 1.23 2010/07/30 17:32:33 flameeyes Exp $
+
+*test-unit-2.1.0-r1 (30 Jul 2010)
+
+  30 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -test-unit-2.0.7.ebuild, -test-unit-2.0.9.ebuild,
+  -files/test-unit-2.0.9-disable-tests.patch, -test-unit-2.1.0.ebuild,
+  +test-unit-2.1.0-r1.ebuild:
+  Fix install of testrb-2 wrapper, remove old versions.
 
 *test-unit-2.1.0 (19 Jul 2010)
 
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index ab28c7b3ead1..e4dd08f8432c 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -1,21 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX test-unit-2.0.9-disable-tests.patch 1326 RMD160 f6d2f69247d7b03fd108190e83c5dc5542109705 SHA1 f4573fdf386b300c78bf67b67721c98be7a63bac SHA256 81b8d14d3188db30158386aa3eded6faf81d751edd8f532a2837d8769bb65354
 DIST test-unit-1.2.3.gem 40960 RMD160 c8926789f1f074b202142cd278d3d82fc041f6eb SHA1 9ad7eefe7d289713a072130d51312ebe0529d48b SHA256 a7551459c53b0d73ac8e3ad3624b88d211bc80bc41a8c1a57c9d4b422beea4b7
-DIST test-unit-2.0.7.tgz 132981 RMD160 e433507d969c9243eac4ba79888bf8c99d60fc74 SHA1 6d34515a65becf5ee24cd751f6ce384a70694138 SHA256 aeb905dfc4d499a4983b1daf8a0984019d0dcb742225c51fe7972ae47a771142
-DIST test-unit-2.0.9.tgz 137715 RMD160 ac7601f7dcf4678871a32e192a822195192919c1 SHA1 d77198b0107fc00e4770b785c38bb971a40a7413 SHA256 24adbce7fe26f5ade4a838efc66aed5e67ff0a1a0199e671823bbb1f1f022367
 DIST test-unit-2.1.0.tgz 194208 RMD160 87c4128cd2b756fded04bcf06918ce48875f67b1 SHA1 17c2b5607f999ad1800ca5f691ddc4ea82d9f2a7 SHA256 3e11ed5b30e8d952170a3a7feb287871ba0305cf596c02082d3b85ac9a812beb
 EBUILD test-unit-1.2.3.ebuild 804 RMD160 ab2f236ba566ff78b4de36daf86bd84032c7fe1d SHA1 180cd3d26032c0a68a88567c32106e0d19616357 SHA256 5918142f12fd36ecd8f86b24bacf19d3aedbf7d3076f309c97673552b1e42f94
-EBUILD test-unit-2.0.7.ebuild 1324 RMD160 7a0908eb0c3515f796139837f96d019e80e9ba88 SHA1 166a9cf238c7134d9ed125f69d7a0db81c8ff162 SHA256 787d44b06d8490ef1c066e59a99e7f386a0d15eac76c74d6a867907b2d696cad
-EBUILD test-unit-2.0.9.ebuild 1445 RMD160 e92e292698271fb9441df3a827c89d5593be84dc SHA1 7a579b72a9630b8ad6cf181ef317de3345c7a094 SHA256 8127fcc2db88231493bc52025330c569229ca96656b5591e07934f7e15a4ce63
-EBUILD test-unit-2.1.0.ebuild 1262 RMD160 b3dba9418eca8069aec286d98cee3ae602a47ea8 SHA1 77514cd39c4614bd7b8e373ef33c65126bc1d898 SHA256 93208f04e93f0ba3b795cfe75fca25dedf96c6e1aeb3de73aad1f8a6b410ec98
-MISC ChangeLog 4083 RMD160 bc27a5b18a9680971bf9c041629d9d64a7f7c32c SHA1 0363650f600743c23f0936ab8076b0bf0e064604 SHA256 b560f2cf6b77ecaf84e39a681dee73436240d620b3eb3b4b1a854bf455c21636
+EBUILD test-unit-2.1.0-r1.ebuild 1269 RMD160 92d29d75d2a967b1d7d68c7929595b23cbe942c4 SHA1 915c957d7e344c7e19a5f8d19a573d7598e90ec4 SHA256 b75ab0cc61b317df92c1061bf47a8a72d6003cbdbd56e4e6f8c51f6cb1b854e7
+MISC ChangeLog 4387 RMD160 3a919b3c1245669692fcd76dda9c095e0e786fb2 SHA1 a72962e85c3b70edff43ba9574390dc11b85ab10 SHA256 acdd1ab59bdfb2b3f421bb52e5640b4dd8e2e319b9eebfdf51aff49f18bb3b2c
 MISC metadata.xml 313 RMD160 64f35fe17cb231f17c18f4ace1656b2389eebd07 SHA1 b2de46ec2cf3be4a04d73fa7a43a704408e0d2be SHA256 70c196238b5e24846ee90d328200906af70156308716e4ec568ae3e148e43813
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkxEJfMACgkQZihJkut28St2LQD/YEqr18gP6u1RrfKrlIEiOTNG
-FiCRlS5i4mrCdckpKZQA/2/CIIvXS9y4JPU/FtVxO6QytKIZLjH8jA6xY8u+f1DF
-=6U9A
+iEYEARECAAYFAkxTDK4ACgkQAiZjviIA2XhVrwCfVb7Gva3bT8MT+bC+77JUsn3Y
+R9AAoM9B0ccmf7d5ehUVi3HNUL9XXuqq
+=MiJ8
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/test-unit/files/test-unit-2.0.9-disable-tests.patch b/dev-ruby/test-unit/files/test-unit-2.0.9-disable-tests.patch
deleted file mode 100644
index d6dd98fb75e2..000000000000
--- a/dev-ruby/test-unit/files/test-unit-2.0.9-disable-tests.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- test/test_assertions.rb.~1~	2010-05-24 06:46:35.000000000 +0200
-+++ test/test_assertions.rb	2010-06-20 20:49:19.344683987 +0200
-@@ -837,12 +837,6 @@
-           assert_in_delta(0.5, 0.4, 0.05, "message")
-         }
-         object = Object.new
--        check_fails("The arguments must respond to to_f; " +
--                    "the first float did not.\n" +
--                    "<#{object.inspect}>.respond_to?(:to_f) expected\n" +
--                    "(Class: <Object>)") {
--          assert_in_delta(object, 0.4, 0.1)
--        }
-         check_fails("The delta should not be negative.\n" +
-                     "<-0.1> expected to be\n>=\n<0.0>.") {
-           assert_in_delta(0.5, 0.4, -0.1, "message")
-@@ -1142,16 +1136,6 @@
-                     "<#{object.method(:original_method).inspect}> expected") do
-           assert_alias_method(object, :other, :original_method)
-         end
--
--        check_fails("<#{object.inspect}>.nonexistent doesn't exist\n" +
--                    "(Class: <Object>)") do
--          assert_alias_method(object, :nonexistent, :original_method)
--        end
--
--        check_fails("<#{object.inspect}>.nonexistent doesn't exist\n" +
--                    "(Class: <Object>)") do
--          assert_alias_method(object, :alias_method, :nonexistent)
--        end
-       end
- 
-       private
diff --git a/dev-ruby/test-unit/test-unit-2.0.7.ebuild b/dev-ruby/test-unit/test-unit-2.0.7.ebuild
deleted file mode 100644
index 5655d6e18bed..000000000000
--- a/dev-ruby/test-unit/test-unit-2.0.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/test-unit-2.0.7.ebuild,v 1.3 2010/05/22 16:01:22 flameeyes Exp $
-
-EAPI=2
-# One test fails on jruby, might be a jruby bug
-# When enabled on ruby18 it breaks too many things, so don't enable it for that just yet
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="TODO README.txt History.txt"
-
-# Disable default binwraps
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-ruby_add_bdepend "doc? ( dev-ruby/hoe )"
-
-DESCRIPTION="An improved version of the Test::Unit framework from Ruby 1.8"
-HOMEPAGE="http://test-unit.rubyforge.org/"
-SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS=""
-IUSE=""
-
-each_ruby_test() {
-	# the rake audit using dev-ruby/zentest currently fails, and we
-	# just need to call the testsuite directly.
-	# rake audit || die "rake audit failed"
-	local rubyflags
-
-	[[ $(basename ${RUBY}) == jruby ]] && rubyflags="-X+O"
-
-	${RUBY} ${rubyflags} test/run-test.rb || die "testsuite failed"
-}
-
-all_ruby_intall() {
-	all_fakegem_install
-
-	# Create a testrb2 wrapper similarly to the rdoc2 wrapper for
-	# rdoc-2* series.
-	ruby_fakegem_binwrapper testrb /usr/bint/testrb2
-}
diff --git a/dev-ruby/test-unit/test-unit-2.0.9.ebuild b/dev-ruby/test-unit/test-unit-2.0.9.ebuild
deleted file mode 100644
index f376b2a740d2..000000000000
--- a/dev-ruby/test-unit/test-unit-2.0.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/test-unit-2.0.9.ebuild,v 1.3 2010/07/03 16:40:09 armin76 Exp $
-
-EAPI=2
-# One test fails on jruby, might be a jruby bug
-USE_RUBY="ruby18 ruby19 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="TODO README.txt History.txt"
-
-# Disable default binwraps
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-ruby_add_bdepend "doc? ( dev-ruby/hoe )"
-
-DESCRIPTION="An improved version of the Test::Unit framework from Ruby 1.8"
-HOMEPAGE="http://test-unit.rubyforge.org/"
-SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
-IUSE=""
-
-# Two tests for jruby currently fail. This has been reported upstream:
-# http://rubyforge.org/tracker/index.php?group_id=5650&atid=21856
-RUBY_PATCHES=( "${P}-disable-tests.patch" )
-
-each_ruby_test() {
-	# the rake audit using dev-ruby/zentest currently fails, and we
-	# just need to call the testsuite directly.
-	# rake audit || die "rake audit failed"
-	local rubyflags
-
-	[[ $(basename ${RUBY}) == jruby ]] && rubyflags="-X+O"
-
-	${RUBY} ${rubyflags} test/run-test.rb || die "testsuite failed"
-}
-
-all_ruby_intall() {
-	all_fakegem_install
-
-	# Create a testrb2 wrapper similarly to the rdoc2 wrapper for
-	# rdoc-2* series.
-	ruby_fakegem_binwrapper testrb /usr/bint/testrb2
-}
diff --git a/dev-ruby/test-unit/test-unit-2.1.0.ebuild b/dev-ruby/test-unit/test-unit-2.1.0-r1.ebuild
index 51702cf21759..d2f50743ea53 100644
--- a/dev-ruby/test-unit/test-unit-2.1.0.ebuild
+++ b/dev-ruby/test-unit/test-unit-2.1.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/dev-ruby/test-unit/test-unit-2.1.0.ebuild,v 1.1 2010/07/19 10:16:13 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/test-unit-2.1.0-r1.ebuild,v 1.1 2010/07/30 17:32:33 flameeyes Exp $
 
 EAPI=2
 # One test fails on jruby, might be a jruby bug
@@ -37,10 +37,10 @@ each_ruby_test() {
 	${RUBY} ${rubyflags} test/run-test.rb || die "testsuite failed"
 }
 
-all_ruby_intall() {
+all_ruby_install() {
 	all_fakegem_install
 
 	# Create a testrb2 wrapper similarly to the rdoc2 wrapper for
 	# rdoc-2* series.
-	ruby_fakegem_binwrapper testrb /usr/bint/testrb2
+	ruby_fakegem_binwrapper testrb /usr/bin/testrb-2
 }