Fix the testrb-2 wrapper to work with test-unit 3.x as well.

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

4 files changed, 78 insertions, 5 deletions

diff --git a/dev-ruby/test-unit/ChangeLog b/dev-ruby/test-unit/ChangeLog
index 6eff6e8dcd55..1e111ee6ae19 100644
--- a/dev-ruby/test-unit/ChangeLog
+++ b/dev-ruby/test-unit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/test-unit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/ChangeLog,v 1.107 2015/01/26 08:35:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/ChangeLog,v 1.108 2015/01/27 19:24:46 graaff Exp $
+
+*test-unit-3.0.9-r1 (27 Jan 2015)
+
+  27 Jan 2015; Hans de Graaff <graaff@gentoo.org> +test-unit-3.0.9-r1.ebuild,
+  +files/testrb-3:
+  Fix the testrb-2 wrapper to work with test-unit 3.x as well.
 
   26 Jan 2015; Jeroen Roovers <jer@gentoo.org> test-unit-3.0.9.ebuild:
   Marked ~hppa (bug #537838).
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index e28ff306102c..615e39ce6489 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX testrb 177 SHA256 1fcfa26db2460f84b489ba51ac577be03b9844d2d18ce00f042ca7c8f9de9cf4 SHA512 9de97bde52a1e5770a8dae8da3adcbde3b1dfa7cabc6d131159c8a688a7ad5b59dbb528ce9eef3346da12264c0d30415addd907bc66c1d7d90b1dbc4c605730b WHIRLPOOL bc6cb66bc8a15ae601de115c5786960cd94cbfbc11b5ed45c2cf790f0e3c27dad325630b101cddc400b205907a8328a5344b77d9885d145bb64e308142b97779
+AUX testrb-3 183 SHA256 1a7923c8dc5742001b438c5fe40313337fc66605d94f2d9f4fe04553683b43df SHA512 cff9584c54bb682f03a0253df953ea930053642e249a3c4573e34cc78f4b77ef943ca5a2c7d1869d926b4a8d9e173ebece69169d845724b03c03f00608bdbdfb WHIRLPOOL 9bd4006c6bae7a73b58b581b9e94ac53c11e8802c117dc415ee712fddb3af72c5656339f2b0602e54a57acfdc644065f3faa006610837b820ad95870bc00d72f
 DIST test-unit-1.2.3.gem 40960 SHA256 a7551459c53b0d73ac8e3ad3624b88d211bc80bc41a8c1a57c9d4b422beea4b7 SHA512 5e12a9691715a1e1afb53623867b77e2e06739929da5f0615c7341dc75f5feb281492bc0f6c55bdf1cc190f09a9a2c0f602638d5cad8a65682ba5f361bd22e57 WHIRLPOOL 2d459056aabf5804cc868d893060f6833570fbdd5c3d1d3fae09c2488909a55bdd340ab34297ac57298a03ff9c48a660705c1e28390e498aaef7ed40bf165205
 DIST test-unit-2.5.5.gem 111104 SHA256 3216d6584293964c438e0573fa8f0273d12df2abb1c32d7a6aa427d6e0779d47 SHA512 4f710997d187011bc240ef869f5c86c11e01d9c7c8bee5fd938f194155137d7164e69bae6d63e41b90de8f7f6ab813a62131f2f9518d57b3913777923b491142 WHIRLPOOL 8bcdd17b02162e73afe6a306fc34e7687db7c6abb38cd94c3e558c25d30db3dda1893a923d217d887af55ff64f88e6c14861de5c30786798d3c4cf99f2c26ce3
 DIST test-unit-3.0.9.gem 120320 SHA256 6be67fd305a9c6be94f4ce74c63df48528ef1e2dd165e835d8880a8788f3555d SHA512 0c7d1cfa0b6648e33c54d1a64c6345f9c24f309b78433f879e0e2fe94c3f7de22ee854026f653618c0102441e3c63f8c3de2ba1f0236b38b5a3e13714a2786ee WHIRLPOOL e8ad653ca5cd602ff8ae1f6f9f1366d62e289e9d7ea307d42647f7390324d2ee843227a76e6536ab40a7903fd516c87579dfb1e1f08fba1dfd9a20a3dd867c47
@@ -9,13 +10,14 @@ EBUILD test-unit-1.2.3-r1.ebuild 675 SHA256 db4d207702859be178508effa0f51ebf7e2d
 EBUILD test-unit-1.2.3.ebuild 818 SHA256 fa23de60049c58eb4d858c72a8dfe2d6fe817b573f8d61acfe5ac6554886782f SHA512 c1118421eedd4b0a00747a6deeaec5d5f1378cf582f8cec932d3a3cf467625ec346bf26dd7a1caddcb0015d440818971ddca6b47a91a4a771b8550a73a6ff464 WHIRLPOOL 2ae753b008228b4ec407f87018ed60a60181abf68ebf0fd616fc614101af9c08240ba5c3c7890b036d31267d60a4601f3c61a834e0e7468604eb8eddf160f5a4
 EBUILD test-unit-2.5.5-r1.ebuild 2191 SHA256 9911e973c183514c8897361bed80bec73addefb7930ac2eb80a3d383f9c08ad9 SHA512 0c66e6a426f60eabe8b46e97d4738f4ac30d63dc496707825dee1ea3e9abb3126a62810a91c4b8a543dc600b27f403e6f9a3851e4ef4d63ec721abe7ad9b5247 WHIRLPOOL a1734c5b61bdbe17211d6149c20f2d6c48b723db2f37ce3e7389a8070e82e3cc09e48c3286a802ca11866dbaa7f60a7e35c049963bdfb3d71758829ddade2584
 EBUILD test-unit-2.5.5-r2.ebuild 1575 SHA256 b7312eea9f167f87fa85cdce50a0680eb9eaafa5b240523bf3b5e08e604d80f4 SHA512 9a0de3aca79dc765f36492bd228b0a74cc4fda2c0ec7f332ec461372d0bb26b630adab3fafbd5e33606f0a2d7837e4a912d1c798413120c8fdb8537df42da354 WHIRLPOOL 58d6a34afbafada16e75bf11076bcbc5b7f2e30b8cc247ad95bd79649c104d67b2b5eacb3cf390292e2e0d53b36fa4309ef1cf5974fa69bf6aa3b94a41e6fff1
+EBUILD test-unit-3.0.9-r1.ebuild 1554 SHA256 1c9a0c9a70fe480087f6a272dd08c4d885748256a5eaa7a49f0fcd97adffbb69 SHA512 13353c7b7a239a1cc4d60f05d6a8f9d6486d7f70ca20f7065d35147484f2e222e3756ef33b44f57010a96593d376109c6b45fe2b1bb1ca3d0e8d3ee29d410c8a WHIRLPOOL 0f15dfd222ac3961e4edb9cf364402899ff59b950fc07454b15caf70da3be9107d7e5e7ef218ffeba40e28f72414ace8dbd12ea4b017b4f3813e188d7c760850
 EBUILD test-unit-3.0.9.ebuild 1546 SHA256 9635d4939654d063e9bb6d5f9b1eb1de2c64afd7c494e64b581252fca9253b24 SHA512 92be6b1796d6014c7a211352670dff49171fd7e0cbc39c310aa6b847a0d88fcae1878375f5b4031fe441d1014c7492ad81023e65f5bfbf6303e8674c1e4110d7 WHIRLPOOL 2f8a1479154dda571bc711081935589f8aedf29ae454ef9e10bcbc9993c8425e9cd2343ad968f4e44cb3575113d984ae3a13f3d33e48ea171b4a0dc8a55a1251
-MISC ChangeLog 15094 SHA256 92b35aaca3c8c2950aab99daa369a418e89da067a1f3813a4f23e06b89c401ba SHA512 334afe295c0712adf4dadb17ae3b6af5326a71544f40af7bcdcdff3cd916bc9b8d9c5190215e6a87ed20aed57c2e81e40f287b90b883ffef7a93521bc132b81a WHIRLPOOL bdaaab1bb986a1132c487273dc95bf8b89b7a011969d3acfcfdaecc26db1002e5db1a0690c7317c18fda89e760e8207b9a9082eefbceb18d4b9dec113b157aa2
+MISC ChangeLog 15293 SHA256 0c625b8b3547f50f9fe0bb947dbfd4fb0b9e92196012c351b2fe2a1d9fdad078 SHA512 8b5e3b89e41427f617f32a13351c8604aee32d69e11943b7c835c8eb481b6c53f76bf1d9082d8df0a02f0ccdb972092f91521a9565e6bf5a1f28b6f74bd0f574 WHIRLPOOL 9dde525faad7a3067a11e845316674baebd9b8d9b83df80a8f3b129cf769d6c7a55f9c911101e8f88a2aa6296f27bde4cda03ac7c72150a13656c6396bb1e167
 MISC metadata.xml 313 SHA256 70c196238b5e24846ee90d328200906af70156308716e4ec568ae3e148e43813 SHA512 eacfa0f6c0b4a854b3e1319c3aad730f29932bd182358968542a52a4084169d7f0a4442b3cd6e397b49179d1d808af56c8253406a2436b960b72c13bb7753642 WHIRLPOOL 402e63c2d8a10212afa77d204679ad63b1a245f83169fa10be6502944351d1b9276a78b6e240b55fd3d8b21ad75f2bc4b1604ce52daee5e078de418161796718
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTF/EMACgkQVWmRsqeSphO79wCfXaChJnesOQcXNrmsbVx047BD
-bJoAn0KyDWuI/5+iyvRwUe1a3CRVF0RL
-=s4j5
+iF4EAREIAAYFAlTH5f8ACgkQiIP6VqMIqNd+igD9EI7Uvj/UrYksz9CnR3KCyLmY
+EgPXtKOgzpJwj5QFwFoA/iRc+KOWtqq7cPYN+jDzhxMB7cf80qVE17tESuKoJrAp
+=5YQJ
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/test-unit/files/testrb-3 b/dev-ruby/test-unit/files/testrb-3
new file mode 100644
index 000000000000..4f5a8467f46d
--- /dev/null
+++ b/dev-ruby/test-unit/files/testrb-3
@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+gem 'test-unit', '>= 2.5', '<4'
+require 'test/unit'
+(r = Test::Unit::AutoRunner.new(true)).process_args(ARGV) or
+  abort r.options.banner + " tests..."
+exit r.run
diff --git a/dev-ruby/test-unit/test-unit-3.0.9-r1.ebuild b/dev-ruby/test-unit/test-unit-3.0.9-r1.ebuild
new file mode 100644
index 000000000000..e70327a74536
--- /dev/null
+++ b/dev-ruby/test-unit/test-unit-3.0.9-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/test-unit-3.0.9-r1.ebuild,v 1.1 2015/01/27 19:24:46 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="TODO README.md doc/text/news.md"
+
+inherit ruby-fakegem
+
+# Assume for now that ruby22 is not eselected yet and only depend on
+# yard for the other ruby implementations. Without this assumption
+# bootstrapping ruby22 won't be possible due to the yard dependency
+# tree.
+USE_RUBY="${USE_RUBY/ruby22/}" ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+DESCRIPTION="An xUnit family unit testing framework for Ruby"
+HOMEPAGE="https://rubygems.org/gems/test-unit"
+
+LICENSE="|| ( Ruby GPL-2 ) PSF-2"
+SLOT="2"
+KEYWORDS="~amd64 ~hppa"
+IUSE="doc test"
+
+# power_assert does not work with ruby19 but is not needed for backward
+# compatibility:
+# https://github.com/k-tsj/power_assert/issues/8#issuecomment-71363455
+USE_RUBY="${USE_RUBY/ruby19/}" ruby_add_rdepend "dev-ruby/power_assert"
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby19)
+			# Remove metadata to avoid registering the unsupported
+			# power_assert dependency.
+			rm ../metadata || die
+			;;
+	esac
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		yard doc --title ${PN} || die
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die "testsuite failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbin "${FILESDIR}"/testrb-3 testrb-2
+}