From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1036593-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 45D92138334
for <garchives@archives.gentoo.org>; Sun, 15 Jul 2018 19:33:38 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D50BAE0802;
Sun, 15 Jul 2018 19:33:36 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id AB271E0802
for <gentoo-commits@lists.gentoo.org>; Sun, 15 Jul 2018 19:33:36 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 490FC335C9A
for <gentoo-commits@lists.gentoo.org>; Sun, 15 Jul 2018 19:33:33 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id EDBBE353
for <gentoo-commits@lists.gentoo.org>; Sun, 15 Jul 2018 19:33:30 +0000 (UTC)
From: "Hans de Graaff" <graaff@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" <graaff@gentoo.org>
Message-ID: <1531683199.3611a5f88e54519f2ae758102b39cdc5d32e7d0f.graaff@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/yard/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-ruby/yard/yard-0.9.11.ebuild dev-ruby/yard/yard-0.9.14.ebuild
X-VCS-Directories: dev-ruby/yard/
X-VCS-Committer: graaff
X-VCS-Committer-Name: Hans de Graaff
X-VCS-Revision: 3611a5f88e54519f2ae758102b39cdc5d32e7d0f
X-VCS-Branch: master
Date: Sun, 15 Jul 2018 19:33:30 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: ed52385f-dc4d-436d-ad4a-8ea39cc902e7
X-Archives-Hash: 66b51741d05c3ed04143ea3e2d418c82
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
}