[gentoo-commits] repo/gentoo:master commit in: dev-ruby/rspec-core/

[Hans de Graaff]

commit:     ce4b916d16355bd4a0083528deddba485444b53f
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 24 07:44:56 2018 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 08:35:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce4b916d

dev-ruby/rspec-core: add ruby25

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
index e2f0bd872aa..cb87ef52d50 100644
--- a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 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"
 
@@ -35,10 +35,6 @@ ruby_add_bdepend "test? (
 		>=dev-ruby/rspec-mocks-2.99.0:2
 	)"
 
-# Skip yard for ruby21 for now since we don't support ruby21 eselected
-# yet and we can't bootstrap otherwise.
-USE_RUBY=${USE_RUBY/ruby21 ruby22 ruby23 ruby24/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
 all_ruby_prepare() {
 	# Don't set up bundler: it doesn't understand our setup.
 	sed -i -e '/[Bb]undler/d' Rakefile || die
@@ -77,15 +73,18 @@ each_ruby_prepare() {
 			sed -i -e 's/Fixnum: 4/Integer: 4/' spec/rspec/core/memoized_helpers_spec.rb || die
 			sed -i -e '/warns when HOME env var is not set/,/^  end/ s:^:#:' spec/rspec/core/configuration_options_spec.rb || die
 			;;
+		*ruby25)
+			sed -i -e 's/SAFE = 3/SAFE = 1/' spec/support/helper_methods.rb || die
+			sed -i -e 's/Fixnum: 4/Integer: 4/' spec/rspec/core/memoized_helpers_spec.rb || die
+			sed -i -e '/warns when HOME env var is not set/,/^  end/ s:^:#:' spec/rspec/core/configuration_options_spec.rb || die
+			sed -i -e '/with mathn loaded/,/^          end/ s:^:#:' spec/rspec/core/formatters/html_formatter_spec.rb || die
+			sed -i -e '/with mathn loaded/,/^    end/ s:^:#:' spec/rspec/core/formatters/helpers_spec.rb || die
+			sed -i -e '/is still a private method/,/end/ s:^:#:' spec/rspec/core/memoized_helpers_spec.rb || die
+			sed -i -e '/leaves a raised exception unmodified/,/^      end/ s:^:#:' spec/rspec/core/example_spec.rb || die
+			;;
 	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."
 }