commit: 3611a5f88e54519f2ae758102b39cdc5d32e7d0f Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Sun Jul 15 19:33:02 2018 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Sun Jul 15 19:33:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3611a5f8
dev-ruby/yard: fix tests without redcarpet installed Closes: https://bugs.gentoo.org/660558 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-ruby/yard/yard-0.9.11.ebuild | 5 ++++- dev-ruby/yard/yard-0.9.14.ebuild | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dev-ruby/yard/yard-0.9.11.ebuild b/dev-ruby/yard/yard-0.9.11.ebuild index b70b4dd17ad..7b65c6ec544 100644 --- a/dev-ruby/yard/yard-0.9.11.ebuild +++ b/dev-ruby/yard/yard-0.9.11.ebuild @@ -28,7 +28,7 @@ IUSE="" ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )" -ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack dev-ruby/redcloth )" +ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack )" all_ruby_prepare() { sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die @@ -37,4 +37,7 @@ all_ruby_prepare() { # true for us. This may be related to how we install in Gentoo. This # also drops a test requirement on dev-ruby/rack. rm -f spec/cli/server_spec.rb || die + + # Avoid redcarpet-specific spec that is not optional + sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die } diff --git a/dev-ruby/yard/yard-0.9.14.ebuild b/dev-ruby/yard/yard-0.9.14.ebuild index 878b6265987..4270103786c 100644 --- a/dev-ruby/yard/yard-0.9.14.ebuild +++ b/dev-ruby/yard/yard-0.9.14.ebuild @@ -28,7 +28,7 @@ IUSE="" ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )" -ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack dev-ruby/redcloth )" +ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack )" all_ruby_prepare() { sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die @@ -40,4 +40,7 @@ all_ruby_prepare() { # Avoid specs that only work with bundler sed -i -e '/#initialize/,/^ end/ s:^:#:' spec/cli/yri_spec.rb || die + + # Avoid redcarpet-specific spec that is not optional + sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die }
