From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 416F3138334 for ; Fri, 20 Jul 2018 05:21:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10588E09B5; Fri, 20 Jul 2018 05:21:03 +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 BC835E09B5 for ; Fri, 20 Jul 2018 05:21:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 550EA335CA8 for ; Fri, 20 Jul 2018 05:20:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8312737A for ; Fri, 20 Jul 2018 05:20:57 +0000 (UTC) From: "Hans de Graaff" 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" Message-ID: <1532064039.ffa3cc8f51bc4cc89df692fd47de2ba4f26b8844.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/rspec-core/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/rspec-core/rspec-core-3.5.4.ebuild dev-ruby/rspec-core/rspec-core-3.6.0.ebuild dev-ruby/rspec-core/rspec-core-3.7.1.ebuild X-VCS-Directories: dev-ruby/rspec-core/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: ffa3cc8f51bc4cc89df692fd47de2ba4f26b8844 X-VCS-Branch: master Date: Fri, 20 Jul 2018 05:20:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0fafac97-79a3-41e1-b896-3c7ae47f269d X-Archives-Hash: eb373f0b6e06c8f10dcf224ae8162862 commit: ffa3cc8f51bc4cc89df692fd47de2ba4f26b8844 Author: Hans de Graaff gentoo org> AuthorDate: Fri Jul 20 05:20:19 2018 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Fri Jul 20 05:20:39 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffa3cc8f dev-ruby/rspec-core: fix dep issue with USE=doc With USE=doc documentation is built with yardoc but dev-ruby/yard is not listed as a dependency. Adding yard as a dependency will lead to a very large and difficult to resolve circular dependency, so switch to the new default rdoc recipe instead. Closes: https://bugs.gentoo.org/636930 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-ruby/rspec-core/rspec-core-3.5.4.ebuild | 12 +++--------- dev-ruby/rspec-core/rspec-core-3.6.0.ebuild | 10 ++-------- dev-ruby/rspec-core/rspec-core-3.7.1.ebuild | 10 ++-------- 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild b/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild index 0c937d52f42..8c95a2ed748 100644 --- a/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild +++ b/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -USE_RUBY="ruby20 ruby21 ruby22 ruby23" +USE_RUBY="ruby23" RUBY_FAKEGEM_TASK_TEST="none" -RUBY_FAKEGEM_TASK_DOC="none" +RUBY_FAKEGEM_RECIPE_DOC="rdoc" RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md" @@ -82,12 +82,6 @@ each_ruby_prepare() { # esac } -all_ruby_compile() { - if use doc ; then - yardoc || die - fi -} - each_ruby_test() { PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed." } diff --git a/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild index cc729f3fa43..6c4ff090e3f 100644 --- a/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild +++ b/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild @@ -2,10 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby21 ruby22 ruby23 ruby24" +USE_RUBY="ruby22 ruby23 ruby24" RUBY_FAKEGEM_TASK_TEST="none" -RUBY_FAKEGEM_TASK_DOC="none" +RUBY_FAKEGEM_RECIPE_DOC="rdoc" RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md" @@ -84,12 +84,6 @@ each_ruby_prepare() { # esac } -all_ruby_compile() { - if use doc ; then - yardoc || die - fi -} - each_ruby_test() { PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed." } diff --git a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild index 464be3781aa..2d053a7ba98 100644 --- a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild +++ b/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild @@ -2,10 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_RUBY="ruby22 ruby23 ruby24 ruby25" +USE_RUBY="ruby23 ruby24 ruby25" RUBY_FAKEGEM_TASK_TEST="none" -RUBY_FAKEGEM_TASK_DOC="none" +RUBY_FAKEGEM_RECIPE_DOC="rdoc" RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md" @@ -84,12 +84,6 @@ each_ruby_prepare() { # esac } -all_ruby_compile() { - if use doc ; then - yardoc || die - fi -} - each_ruby_test() { PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed." }