Fix USE=-doc, based on fixes by Shunsuke Shimizu in bug 386849.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/dev-ruby/test-unit/ChangeLog b/dev-ruby/test-unit/ChangeLog
index 827561b57e947f31220e9cefeba969f26ef54357..f9ecb22b2e346d5b5e58e0e38d108cf398cc99aa 100644 (file)
--- a/dev-ruby/test-unit/ChangeLog
+++ b/dev-ruby/test-unit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/test-unit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/ChangeLog,v 1.43 2011/09/19 05:59:30 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/ChangeLog,v 1.44 2011/10/12 17:45:41 graaff Exp $
+
+  12 Oct 2011; Hans de Graaff <graaff@gentoo.org> test-unit-2.4.0.ebuild:
+  Fix USE=-doc, based on fixes by Shunsuke Shimizu in bug 386849.
 
 *test-unit-2.4.0 (19 Sep 2011)
 

diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index 5cc2949c61ce2b7b2ebb91ad6d693422bb3f1cb2..8f4d2dfc335b5b953c648628c2a87af79bd3d0cd 100644 (file)
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -13,13 +13,13 @@ EBUILD test-unit-2.1.2-r1.ebuild 1279 RMD160 8f50738646ec2c866d820b40bfdab6cb594
 EBUILD test-unit-2.1.2.ebuild 1266 RMD160 14a50f505d1092715d9e4e35299156dfd5877af5 SHA1 2a0664f264b61a12765fd1e736b81b659bc1c982 SHA256 ebc1ebd082f9900f64b866cb56548602e076e53e642146e56dd22bcfc1136f19
 EBUILD test-unit-2.2.0.ebuild 1266 RMD160 91076f9df2bf431f301ec803db41e9e0e2a46f6e SHA1 fd17b8fb90f4f15c01120c078e6ad2be524d6bc8 SHA256 453993a64b2cf9a9915a1b6f7eaa0b427b04eb837ade64ced488bed2a94b698b
 EBUILD test-unit-2.3.0.ebuild 1348 RMD160 82eb0addf11ce472619877c03274a71d3125eef4 SHA1 3d47f40711e3b76eb82471c26a0f10b76890b428 SHA256 6e78d70fd73c9d88191fd7ec4443564a30a8d63169c89523d77b3eb4358dd4ad
-EBUILD test-unit-2.4.0.ebuild 1319 RMD160 a785462b8f17c0944a80fe95d7193c722036215e SHA1 641876ddb90f5933a1e083a0b53770d988c18776 SHA256 a1d9c0e042675911d11a116ab7825e4f92387f6438236b73d1a23317fb1149fb
-MISC ChangeLog 6795 RMD160 27894f14404b63ea557653c839fa2ad3ef6dbb8c SHA1 edfa08309b7e7ce233d37b84e3ceb5e5bb800ce2 SHA256 bfb4550839fa4af2f2356d746368aa4651f409ae87dd0599df687c6ada21b97b
+EBUILD test-unit-2.4.0.ebuild 1857 RMD160 cd93264e4ba24c9aa66b207d19b38c83e51a4066 SHA1 593086d0ecff22318cf3e08fbffd092508279e48 SHA256 bd3d64cdaad0dda25cac085a4311b72e24414e166dd227dd8abeb7a071d3eb30
+MISC ChangeLog 6936 RMD160 0b15ec837d855d966e1e818f22c9906ae0e245ff SHA1 bb5e1799e1faf4d7b532544156389d685f32d7e6 SHA256 0352cce1aef66973751d897b0e7c2837d1a8ed2a147291ac526ae08f8b5e173e
 MISC metadata.xml 313 RMD160 64f35fe17cb231f17c18f4ace1656b2389eebd07 SHA1 b2de46ec2cf3be4a04d73fa7a43a704408e0d2be SHA256 70c196238b5e24846ee90d328200906af70156308716e4ec568ae3e148e43813
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk522k4ACgkQiIP6VqMIqNc+OwD8CVuoVsA4I//HKmhWmHpqFggK
-AqYaLYegrnBlvLZeEkYA+gN3YQEQ7La0/hOJv/WMA7WqGNMuzo+AFm7xDHXFVZGS
-=4pf2
+iF4EAREIAAYFAk6V0lAACgkQiIP6VqMIqNcgyAD/U5U6D7y7tfcE16I42v4oeZVl
+3PmweAHqPXPIRj/fVN4BAIvZmXnree6ocFRpbELEr4nBXzbwmUpumpG3M6ovLBUZ
+=CbB7
 -----END PGP SIGNATURE-----

diff --git a/dev-ruby/test-unit/test-unit-2.4.0.ebuild b/dev-ruby/test-unit/test-unit-2.4.0.ebuild
index afb0e7852cbf1c2f4426a40f127fd8b4bf0d0b2b..0d52cb9acb8195efd21de6d56a2f909be5243af8 100644 (file)
--- a/dev-ruby/test-unit/test-unit-2.4.0.ebuild
+++ b/dev-ruby/test-unit/test-unit-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.4.0.ebuild,v 1.1 2011/09/19 05:59:30 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/test-unit-2.4.0.ebuild,v 1.2 2011/10/12 17:45:41 graaff Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ruby19 ree18 jruby"
@@ -15,6 +15,13 @@ RUBY_FAKEGEM_BINWRAP=""
 inherit ruby-fakegem
 
 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=ruby18 ruby_add_bdepend "ruby_targets_ruby18 doc" "( dev-ruby/redcloth )"
+USE_RUBY=ruby19 ruby_add_bdepend "ruby_targets_ruby19 doc" "( dev-ruby/redcloth )"
+USE_RUBY=ree18 ruby_add_bdepend "ruby_targets_ree18 doc" "( dev-ruby/redcloth )"
 
 DESCRIPTION="An improved version of the Test::Unit framework from Ruby 1.8"
 HOMEPAGE="http://test-unit.rubyforge.org/"
@@ -27,7 +34,9 @@ IUSE=""
 all_ruby_compile() {
        all_fakegem_compile
 
-       yard doc || die
+       if use doc; then
+               yard doc --title ${PN} || die
+       fi
 }
 
 each_ruby_test() {