Use a gem-based test-unit version for consistency accross ruby versions to fix the tests.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

4 files changed, 22 insertions, 15 deletions

diff --git a/dev-ruby/jeweler/ChangeLog b/dev-ruby/jeweler/ChangeLog
index 96de3615744a..77d6f29577ef 100644
--- a/dev-ruby/jeweler/ChangeLog
+++ b/dev-ruby/jeweler/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/jeweler
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jeweler/ChangeLog,v 1.34 2015/06/07 06:50:29 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jeweler/ChangeLog,v 1.35 2015/06/07 07:09:46 graaff Exp $
+
+  07 Jun 2015; Hans de Graaff <graaff@gentoo.org> jeweler-2.0.1-r1.ebuild,
+  jeweler-2.0.1-r2.ebuild:
+  Use a gem-based test-unit version for consistency accross ruby versions to
+  fix the tests.
 
 *jeweler-2.0.1-r2 (07 Jun 2015)
 
diff --git a/dev-ruby/jeweler/Manifest b/dev-ruby/jeweler/Manifest
index 16478b5e11cd..36812c5c653c 100644
--- a/dev-ruby/jeweler/Manifest
+++ b/dev-ruby/jeweler/Manifest
@@ -4,14 +4,14 @@ Hash: SHA256
 DIST jeweler-1.8.4.gem 57344 SHA256 54efd74d68f69898a1674dbb410e5c27a5f7311b264531736f2c736cb87e043d SHA512 14f8a6853cc5593834e270d274404e6a7bbcb4542ef12297449cb10a7d8394131fa56acee1b2592871f237ceb9ab3fe1432a908d2dfa04e39e91d9c99a3c800e WHIRLPOOL a0f245ce50ec2bb162c3d034db93b3493a6446f65ead537c3cbe8c4890c8b3d3c795e8f6ba9856fa0b474d1dea565d689e27576b58dabc61fedac8d24dbae2e5
 DIST jeweler-2.0.1.gem 58368 SHA256 2f8c325789f9bf63d273cb040eae2f9ac4271789e5587edbc2d4d22de5ec2882 SHA512 296f661b0e782353bcd166be04501b9f792a9edbc72bddb21c6322e99b0d1da6a03b9f31a19b9daa6d26e18cdbb37cfd7856c91f6befbb920b633fa22d81c41c WHIRLPOOL 9406b5453eb95f14df0696df241e84d54fd80512e6cf7f62bf230bb958ac0bfcb762a1d811ddb35ea9942788cfdc692b0430269e5d378653b24e3c5072b24e8e
 EBUILD jeweler-1.8.4.ebuild 1553 SHA256 d37aa0d225b9e74448e21f20df559edd3a7f26decf50e5afc143c538145ca158 SHA512 f989a392a2ab598424552ee36d993f94bb84b19ac7eba7c26ad14a27a6cf0e4daa548ad3bee8c1b5553a7623dcd9c32eb3763c537370d363190cb882e922581b WHIRLPOOL 959c22088b7dc2a96a0dfdfa31e9a64cf64db85eba747000b612c8267b648f76a7782401feb011e20e82825216e6cdaeff0ae7ef70410c2670ee7382bf67a104
-EBUILD jeweler-2.0.1-r1.ebuild 1755 SHA256 825b668a764e9db5c75eb9eaf6380a8e14900f3212cc3253041e917a8e9e5cfb SHA512 8b8307c4383c4412fb06c380075e2f48fe7ac074e97414ba71faf62e79c082e665f013467a8cbdaa58f0edd6dc053b510496208cf812a78324a9750f96e0e36d WHIRLPOOL 960c2d9d13a18bb6bdfc9dc3a97e73e76b75c27494ad9c27eae57db2ddad1546b074a30f8d467bd28c1a33337fe4d776e9f8ab93541124e4c7fe4c17a742c1b5
-EBUILD jeweler-2.0.1-r2.ebuild 1762 SHA256 ac165429b296c2a47046841e3d85ab79bad4352ca6139fd73a626cc5cae60127 SHA512 491726180fa0a5934fdb3f1f0a48dc3e03f939d3b4ea475f5d62814ae6607c368440157dc50ebd85dde3d91b7e3b1550e5ffc8463c7506b29b8722086ebf055a WHIRLPOOL 994d31fb74493cb9413fe166938bec8ab44524107dbb21a4f174b9858716b4742f89242d7c09d536ecd301273dbafb3dddb548b44564a8cc4f138b50c2c71761
-MISC ChangeLog 4598 SHA256 2105963e2e393aeecfd121d0d09789df3e01420c818c426d5589d53db49795b9 SHA512 4f2510ed96298cb75b5aa7ef78b336b4a7413769f385160273732f8519042412104c5aea22bdd0b6434a1bb869c6afca2088bcabc2a9cea0fe76aaf4c64f7c02 WHIRLPOOL d1d74770bc6087b2f698b0bf433223e5349f25516b851df5431b7d687dc5017065751921b7a87aa51ae3883d750d9025205c85bdb20007bc8fa84e3dd4819a1d
+EBUILD jeweler-2.0.1-r1.ebuild 1816 SHA256 7f3c4fc34e8831af58bb0545422b058dcd7186e82a9438276625870264ace1b5 SHA512 ede84355ec372690ef79293bfe02f386ae1a14832eaac821de6b9f23292b8eac533eb2c405822d40ab16fa8c6bc08c8049a2046233cc8c75d575b66d4872d46e WHIRLPOOL e2008adb5a1fe826ccab7795d1a1282511a149e0a9318f829f7bc4fe941721c5d3eac6d5b027daea8ee1641db3ac933617f450ea0d0b0d4c2b06d5aa73b6fbc5
+EBUILD jeweler-2.0.1-r2.ebuild 1823 SHA256 a4ff34ed6a5406f4f735245e01bdb4e61dd7259e4078e66b5df0d9510966637f SHA512 d12481d617efce7bf24d90771ce9576e5dfacc3e55f964896e013ea9cbb8e348654691c46f6440024b3bd8828c8b4b52d1cef623e0c1bfc8aeb746aa518fd763 WHIRLPOOL 6dca4afa19951ab6de09b17695d6e3e7c4dff6eea753a3dc7afe1611e0378c9b5004c369b7eb82a1db980723f88f11a372ff69983133aa582f16447b8f1647c5
+MISC ChangeLog 4795 SHA256 84fc23e90f09ca7436e531f9af2d7510af5f0aed8a48c95d20dcacbdf60d3801 SHA512 20edf7093056ec513dc85e81c5cd5498008916e762bd154031021b64ef70fbab87716b8efeb989416505a056844527ed5aacb376f4d0facff850563f5e131044 WHIRLPOOL d1db26a12051117d12d18facbe2aa6c77132084560d5e0296c3bfe6704726493f7853fa8284672244bd4ab5fc1a629c722f1044bd17aa1750aa310b57be33d08
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlVz6bYACgkQiIP6VqMIqNd3/wD/SCyYojM15kJQcABbiL6fPVTU
-Aansa6dQY4JUj+2e9REA/1tpW/f5JaOBpMXWkL+1aRDLA10F97A9GvMIJ63NKDwx
-=KyFl
+iF4EAREIAAYFAlVz7jsACgkQiIP6VqMIqNfmrAD/Z6mFf+co3Ma5fAt6zEdLuuGR
+/tOfnEAnsbmSg8UC4dwA/19xLpFBNJHxZJt7q/adDw107zqfpZ/mlHdwxsFfibt2
+=xawP
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/jeweler/jeweler-2.0.1-r1.ebuild b/dev-ruby/jeweler/jeweler-2.0.1-r1.ebuild
index e2b90babd829..3e8a5ca8af08 100644
--- a/dev-ruby/jeweler/jeweler-2.0.1-r1.ebuild
+++ b/dev-ruby/jeweler/jeweler-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jeweler/jeweler-2.0.1-r1.ebuild,v 1.6 2015/06/07 06:50:29 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jeweler/jeweler-2.0.1-r1.ebuild,v 1.7 2015/06/07 07:09:46 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -26,7 +26,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/shoulda dev-ruby/rr dev-ruby/test_construct )"
+	test? ( dev-ruby/shoulda dev-ruby/rr dev-ruby/test_construct dev-ruby/test-unit:0 )"
 
 ruby_add_rdepend "
 	dev-ruby/rake
@@ -36,7 +36,7 @@ ruby_add_rdepend "
 	>=dev-ruby/highline-1.6.15
 	>=dev-ruby/bundler-1.0
 	dev-ruby/rdoc
-	dev-ruby/builder
+	dev-ruby/builder:*
 "
 
 all_ruby_prepare() {
@@ -44,7 +44,8 @@ all_ruby_prepare() {
 	rm Gemfile || die
 	sed -i -e '/bundler/d' -e '/Bundler.setup/d' Rakefile test/test_helper.rb features/support/env.rb || die
 
-	sed -i -e '/coverall/I s:^:#:' test/test_helper.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '1i gem "test-unit", "~> 1.0"' test/test_helper.rb || die
 
 	# Avoid a test that only passes in the git repository.
 	sed -i -e '/find the base repo/,/^  end/ s:^:#:' test/test_jeweler.rb || die
diff --git a/dev-ruby/jeweler/jeweler-2.0.1-r2.ebuild b/dev-ruby/jeweler/jeweler-2.0.1-r2.ebuild
index 49d44e663b03..fac84cb6701c 100644
--- a/dev-ruby/jeweler/jeweler-2.0.1-r2.ebuild
+++ b/dev-ruby/jeweler/jeweler-2.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jeweler/jeweler-2.0.1-r2.ebuild,v 1.1 2015/06/07 06:50:29 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jeweler/jeweler-2.0.1-r2.ebuild,v 1.2 2015/06/07 07:09:46 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -26,7 +26,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/shoulda dev-ruby/rr dev-ruby/test_construct )"
+	test? ( dev-ruby/shoulda dev-ruby/rr dev-ruby/test_construct dev-ruby/test-unit:0 )"
 
 ruby_add_rdepend "
 	dev-ruby/rake
@@ -36,7 +36,7 @@ ruby_add_rdepend "
 	>=dev-ruby/highline-1.6.15
 	>=dev-ruby/bundler-1.0
 	dev-ruby/rdoc
-	dev-ruby/builder
+	dev-ruby/builder:*
 "
 
 all_ruby_prepare() {
@@ -44,7 +44,8 @@ all_ruby_prepare() {
 	rm Gemfile || die
 	sed -i -e '/bundler/d' -e '/Bundler.setup/d' Rakefile test/test_helper.rb features/support/env.rb || die
 
-	sed -i -e '/coverall/I s:^:#:' test/test_helper.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '1i gem "test-unit", "~> 1.0"' test/test_helper.rb || die
 
 	# Avoid a test that only passes in the git repository.
 	sed -i -e '/find the base repo/,/^  end/ s:^:#:' test/test_jeweler.rb || die