diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2011-10-12 17:45:41 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2011-10-12 17:45:41 +0000 |
| commit | 916340a3f4e2ae101a79a25f9663a77da998f177 (patch) | |
| tree | a5da5817a0dc2d34fdfcaf57b3b8be009b1caa3b /dev-ruby/test-unit | |
| parent | Add ~s390/~sh wrt #324129 (diff) | |
| download | gentoo-2-916340a3f4e2ae101a79a25f9663a77da998f177.tar.gz gentoo-2-916340a3f4e2ae101a79a25f9663a77da998f177.tar.bz2 gentoo-2-916340a3f4e2ae101a79a25f9663a77da998f177.zip | |
Fix USE=-doc, based on fixes by Shunsuke Shimizu in bug 386849.
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/test-unit')
| -rw-r--r-- | dev-ruby/test-unit/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-ruby/test-unit/test-unit-2.4.0.ebuild | 13 |
2 files changed, 15 insertions, 3 deletions
diff --git a/dev-ruby/test-unit/ChangeLog b/dev-ruby/test-unit/ChangeLog index 827561b57e94..f9ecb22b2e34 100644 --- 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/test-unit-2.4.0.ebuild b/dev-ruby/test-unit/test-unit-2.4.0.ebuild index afb0e7852cbf..0d52cb9acb81 100644 --- 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() { |