| 1 |
commit: 3611a5f88e54519f2ae758102b39cdc5d32e7d0f |
| 2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 15 19:33:02 2018 +0000 |
| 4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 15 19:33:19 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3611a5f8 |
| 7 |
|
| 8 |
dev-ruby/yard: fix tests without redcarpet installed |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/660558 |
| 11 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 12 |
|
| 13 |
dev-ruby/yard/yard-0.9.11.ebuild | 5 ++++- |
| 14 |
dev-ruby/yard/yard-0.9.14.ebuild | 5 ++++- |
| 15 |
2 files changed, 8 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-ruby/yard/yard-0.9.11.ebuild b/dev-ruby/yard/yard-0.9.11.ebuild |
| 18 |
index b70b4dd17ad..7b65c6ec544 100644 |
| 19 |
--- a/dev-ruby/yard/yard-0.9.11.ebuild |
| 20 |
+++ b/dev-ruby/yard/yard-0.9.11.ebuild |
| 21 |
@@ -28,7 +28,7 @@ IUSE="" |
| 22 |
|
| 23 |
ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )" |
| 24 |
|
| 25 |
-ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack dev-ruby/redcloth )" |
| 26 |
+ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack )" |
| 27 |
|
| 28 |
all_ruby_prepare() { |
| 29 |
sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die |
| 30 |
@@ -37,4 +37,7 @@ all_ruby_prepare() { |
| 31 |
# true for us. This may be related to how we install in Gentoo. This |
| 32 |
# also drops a test requirement on dev-ruby/rack. |
| 33 |
rm -f spec/cli/server_spec.rb || die |
| 34 |
+ |
| 35 |
+ # Avoid redcarpet-specific spec that is not optional |
| 36 |
+ sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die |
| 37 |
} |
| 38 |
|
| 39 |
diff --git a/dev-ruby/yard/yard-0.9.14.ebuild b/dev-ruby/yard/yard-0.9.14.ebuild |
| 40 |
index 878b6265987..4270103786c 100644 |
| 41 |
--- a/dev-ruby/yard/yard-0.9.14.ebuild |
| 42 |
+++ b/dev-ruby/yard/yard-0.9.14.ebuild |
| 43 |
@@ -28,7 +28,7 @@ IUSE="" |
| 44 |
|
| 45 |
ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )" |
| 46 |
|
| 47 |
-ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack dev-ruby/redcloth )" |
| 48 |
+ruby_add_bdepend "test? ( >=dev-ruby/ruby-gettext-2.3.8 dev-ruby/rack )" |
| 49 |
|
| 50 |
all_ruby_prepare() { |
| 51 |
sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die |
| 52 |
@@ -40,4 +40,7 @@ all_ruby_prepare() { |
| 53 |
|
| 54 |
# Avoid specs that only work with bundler |
| 55 |
sed -i -e '/#initialize/,/^ end/ s:^:#:' spec/cli/yri_spec.rb || die |
| 56 |
+ |
| 57 |
+ # Avoid redcarpet-specific spec that is not optional |
| 58 |
+ sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die |
| 59 |
} |
Archives