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

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 0c937d52f425fc8b2f1783a3cf87d0632ca7ba4c..8c95a2ed7487a04c7e97755aaacdfbfc3a2d0f10 100644 (file)
--- 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 cc729f3fa43bbb7f69ec1d32822e7fd610a69f72..6c4ff090e3f74c253976fc629b1d2d1c26244d67 100644 (file)
--- 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 464be3781aaa9e02f26f53f7e7c31c365e2bf8e8..2d053a7ba98a3a6592ced1879f8604f6f6acfd2b 100644 (file)
--- 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."
 }