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

[Hans de Graaff]

commit:     571b13cfb340a1b07fdde91ddd0d38a492dba0ef
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 06:13:59 2017 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 06:13:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=571b13cf

dev-ruby/rspec-support: fix tests

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-ruby/rspec-support/rspec-support-3.5.0.ebuild | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev-ruby/rspec-support/rspec-support-3.5.0.ebuild 
b/dev-ruby/rspec-support/rspec-support-3.5.0.ebuild
index 7ddbcdb768a..ca6568aa2b2 100644
--- a/dev-ruby/rspec-support/rspec-support-3.5.0.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.5.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -22,7 +22,7 @@ SLOT="3"
 KEYWORDS="alpha amd64 arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE=""
 
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.5.0:3 )"
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.5.0:3 dev-ruby/thread_order )"
 
 all_ruby_prepare() {
        sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
@@ -31,6 +31,9 @@ all_ruby_prepare() {
        # the whole filesystem.
        rm spec/rspec/support/caller_filter_spec.rb || die
 
+       # Avoid spec that requires a dependency on git
+       sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb 
|| die
+
        # Avoid a spec requiring a specific locale
        sed -i -e '/copes with encoded strings/ 
s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
 }