Add a ruby20 bootstrap revision without yard dependency for ruby20.

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

3 files changed, 80 insertions, 16 deletions

diff --git a/dev-ruby/test-unit/ChangeLog b/dev-ruby/test-unit/ChangeLog
index a5cfebfdbc22..dd255cee7e32 100644
--- a/dev-ruby/test-unit/ChangeLog
+++ b/dev-ruby/test-unit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/test-unit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/ChangeLog,v 1.85 2013/08/03 07:40:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/ChangeLog,v 1.86 2013/08/31 06:23:31 graaff Exp $
+
+*test-unit-2.5.5-r1 (31 Aug 2013)
+
+  31 Aug 2013; Hans de Graaff <graaff@gentoo.org> +test-unit-2.5.5-r1.ebuild:
+  Add a ruby20 bootstrap revision without yard dependency for ruby20.
 
   03 Aug 2013; Agostino Sarubbo <ago@gentoo.org> test-unit-1.2.3.ebuild:
   Stable for sparc, wrt bug #472910
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index d369b549fbe2..3efd8e5951d1 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX test-unit-2.3.0-jruby-tests.patch 675 SHA256 3128e5ab63dc21e1b7b8c2984b256499b3ac9566a463dd4408b4cb55b9493f26 SHA512 b2cdfac624f374a4566071cef1cb6e49ef9154e622069482e27d9194a13b74a01bdb4e935dba1d7c8e8dca336381451b946c638f1a9b6b62900344cfa4a85703 WHIRLPOOL 68f80892ae0a4a86180c851dff535dd9fa344459ab728c75ffe8ec04aaa3af9f0e310ed128ecd92dad78d41db8d79107d01fb9aeb83ae6b2fa17475a0922f1da
 AUX test-unit-2.3.0-ree18-tests.patch 791 SHA256 05f9259acf4633033a56980852f039c2cc66002a2458561a3ea9a226bacd51b8 SHA512 08df588c3b516481e846b7abc6d0f33a7100b281990ece91c5db738ccda586c8d9e7a26da2ecf8203abc8cecf3e83631f234344f1a063a63085d9b385a83287b WHIRLPOOL b43c290d04001a97c578141f238b649fa520f5abffc5e50d6b61bba66e9029a9ec439707e87be9f930224f6a6a5ce3184d881c7a5395d3c41501a341d6e3505b
@@ -13,23 +13,14 @@ EBUILD test-unit-1.2.3.ebuild 816 SHA256 82fd07a8829ef2ea058f9109d6cef4268833f1b
 EBUILD test-unit-2.1.2-r1.ebuild 1286 SHA256 8dce51bd6b8cec662455c60917a0c32f16dfb909f79fb6ba3abebcf828ca0b4b SHA512 8b0edb4f44e728a87f3f52c8362d1311c6b7f3d267ff3bde130b43232f965ec9bb02daa70c0122e83880acfe61254ba63c669668321e82b11a6c9eedd2d490b5 WHIRLPOOL edb64bd91fb124c66cf3d6299503161b7344a1982229a7ca4947bd510d1cdec1bd83d903ac20873d9bf4618abb93742dd23db4c00dafcd0447dd6fc2bbe7a159
 EBUILD test-unit-2.4.8.ebuild 1269 SHA256 94e3fbce9feef23926403b64b43ea3573c613cc306c4553248e35727f3d959f5 SHA512 4c2b1c152faa086efdc6bd3a87d5f60bdab1444d835e597c62ec33558ae3a580fba12e53fd3e40cdebdade25ab132622375ed27d292eac402f65add411bd037e WHIRLPOOL d59a4f69c0080a12974df0eb456b323e88a4bc7c680e5e7fe9ea127a81406c3b01a836452e2b3bdaefa50cff51e9f73e691f73849592f89aaf57c0a3068e5ed8
 EBUILD test-unit-2.5.3.ebuild 1546 SHA256 a1b6a6c02c5aafe7e5364d8a2e081c348086609c8b13495a199cc26a0d66ea6e SHA512 590d993cbb946f730e57d458d8c3545c65e9254672190ab3c1991e21617307cc80526a9299168c2ffb20e93599972039a539f1e934f4722a8cd738981c569613 WHIRLPOOL 4d33f484c5c4b4afe8ade03f9ceec7dc221e57a1be1b296164f24594257bd16dece3ec5adabcbd2f18e264d908c4274329cc47b4a66677559cd75f5123344abc
+EBUILD test-unit-2.5.5-r1.ebuild 2199 SHA256 892f89b2a5beaa647714921c46ac545a15469aa951ecb3e86fcfead9f2d5feb6 SHA512 612cce7e3f14c05de4c75498a727cf7e04a0d122bae0b47332152568252da0dec18a821dbf3405ee52001a898399dec79630eb82891852d950ffc6de2bebe644 WHIRLPOOL bba4df3fc1fa33888528453ebace49b7cfe81cded084d4ef3badd87ccabfc29388b2e240a793e61463a1b2aab12e7af2ca382b174cf0bf1c2b8eb5aa31e2a0b5
 EBUILD test-unit-2.5.5.ebuild 1939 SHA256 715b8957de8a3d7f2ae87dfdc745c8c3df331d048e7e2062d5bbfb0920df7643 SHA512 2bda7b30e274d4bb1d35b9baac61f43ee1d1abd05de47117a598d91d27b456504549f5b66156a2fdeac90fee59ee02c969ae1287e838dfc31df6bcc8eeeb960d WHIRLPOOL 8e712834985875d5ae307a6caa57fd7398f1f1827e28dbcd543603c9c3bcab36e10f48533d46cfe2fadf6ac3097b1a2532176c2b65bde3ce4248b3b5805f6843
-MISC ChangeLog 12312 SHA256 4c0b57a52007b46b0711cd7deb6324b381274a57812d3f83e47353f3acc6fb1d SHA512 d88e6c2e281cd7a223a96f189c05dfd9ec0b69ba58a2b76fedefe34b2420ba10d291a0e0c200c8878d89c416b4bb7c638cc65fef53deb980e37eb5c855a05754 WHIRLPOOL b2f5d53f6e11f15fe6174353c3d48fcd23a2bdf05f66650e07a76e96f9f80878dd4d41a9912da07906ef01020bfdbe90830479058f09c9646a41e711602ff114
+MISC ChangeLog 12499 SHA256 892885bf70ef402bf6e2f0421a5ca5132489de96df513097c172df10d87d7fad SHA512 b6b307b1aa2510f5990c1332c163db4f40f3cab8a9088a8a8611b4c57b93dbadec4e78e6bdbbe6984d3307692b9ac53495d7da8b282ad11fc14d23996b271982 WHIRLPOOL a96ef09b0bd4e08c7226f788c47a9230ecaef4857b3ec4f80ad7bb3f428f36f49133ca539692dd16080a993aae0822de5424e48c153eef729202fa1cfb3c2ff9
 MISC metadata.xml 313 SHA256 70c196238b5e24846ee90d328200906af70156308716e4ec568ae3e148e43813 SHA512 eacfa0f6c0b4a854b3e1319c3aad730f29932bd182358968542a52a4084169d7f0a4442b3cd6e397b49179d1d808af56c8253406a2436b960b72c13bb7753642 WHIRLPOOL 402e63c2d8a10212afa77d204679ad63b1a245f83169fa10be6502944351d1b9276a78b6e240b55fd3d8b21ad75f2bc4b1604ce52daee5e078de418161796718
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR/LMdAAoJELp701BxlEWfHf0QALmJpQiXDgfU+8wTfz5SbX8Y
-Z+t+VQjtslc/W9bFRkGeQTjSaj3wgrvqLCvKIF9MAlxxwZCMu3EcY0V4h+Tfzo0x
-q1SZb7S6myClbXt6Fz3eVvfVnTEByVA8u+joZcvroAdk3nm5Fef/27njr5is+wmT
-KN67GbHg6AjBfz5+mxdJi3yeYCGhEOQy8WjCFPIVl+I3HHvRlGjjqXa9FW0MJasg
-+dZt8DQnyzsjbZ2BCKDQ6wfyP1OyEfecE96GyMHG0Rn6F6rYYmR/B9fvm+h7HLMw
-Nmlig4PpWX4oLi/QVW+twakcD9u3kFO7vpKEyMR6ljW4/touNMOHLqgJZQFpY+Ub
-6cXWX1XLW2cwQq2eL919ebG35n9ydBPbTjCvn5q4iGaC1AL968R5vhjRkfCRUnF2
-Vr+XHUvvpGm586euzK7mQZ2M6pSaNShhIA1MpQvrbd1Y8z25ndcb4zshmUZ4Wvqx
-nL9IktY7uj5IjrdPm/TLA4StA00p136UILFO1ObuA8UeifcUfJBlcKbqRUr/ryTh
-GnCYuEAE082MZq+tVdp2UkZjmm+iydM+wTkIL1R6SWyxLOBBZjgv6KKeNknoOz76
-+wdHlLV7p1c6qepnhUZ2g4FIfTrT/dmkJAQJwlt3Gu+141Zun4aPVDAl2yKhHUrz
-1GOrW1wCBeLCI/SsW4+f
-=CHog
+iF4EAREIAAYFAlIhi+oACgkQiIP6VqMIqNcV1wEAgwVawjJDfVN+wA2jrDhyZFaJ
+WCmLy5F2QrDw3pctPHMBAIm3vY85mhkY+FJjGT6pxSducLE4ZjfaeQLmzmJ40YO0
+=/OD4
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/test-unit/test-unit-2.5.5-r1.ebuild b/dev-ruby/test-unit/test-unit-2.5.5-r1.ebuild
new file mode 100644
index 000000000000..842f038d592f
--- /dev/null
+++ b/dev-ruby/test-unit/test-unit-2.5.5-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 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.5.5-r1.ebuild,v 1.1 2013/08/31 06:23:31 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ruby20 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="TODO README.textile"
+
+inherit ruby-fakegem
+
+# Assume for now that ruby20 is not eselected yet and only depend on
+# yard for the other ruby implementations. Without this assumption
+# bootstrapping ruby20 won't be possible due to the yard dependency
+# tree.
+USE_RUBY="${USE_RUBY/ruby20/}" ruby_add_bdepend "doc? ( dev-ruby/yard )"
+# redcloth is also needed to build documentation, but not available for
+# jruby. Since we build documentation with the main ruby implementation
+# only we skip the dependency for jruby in this roundabout way, assuming
+# that jruby won't be the main ruby.
+USE_RUBY="${USE_RUBY/ruby20 jruby/}" ruby_add_bdepend "doc? ( dev-ruby/redcloth )"
+
+DESCRIPTION="An improved version of the Test::Unit framework from Ruby 1.8"
+HOMEPAGE="http://test-unit.rubyforge.org/"
+
+LICENSE="Ruby"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*jruby)
+			# Avoid tests with slightly different output for jruby
+			sed -i -e '/test_assert_nothing_thrown/,/^      end/ s:^:#:' \
+				-e '/test_assert_throw/,/^      end/ s:^:#:' test/test-assertions.rb || die
+			# And fix missing testunit exposed by it
+			sed -i -e "9irequire 'testunit-test-util'" test/test-assertions.rb || die
+			;;
+	esac
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc; then
+		yard doc --title ${PN} || die
+	fi
+}
+
+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
+
+	[[ ${RUBY} == */jruby ]] && rubyflags="-X+O"
+
+	${RUBY} ${rubyflags} test/run-test.rb || die "testsuite failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbin "${FILESDIR}"/testrb testrb-2
+}