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 CFEAB139695 for ; Sun, 16 Apr 2017 06:18:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C84F0E0BDF; Sun, 16 Apr 2017 06:18:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A531BE0BDF for ; Sun, 16 Apr 2017 06:18:34 +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 51C8E34162D for ; Sun, 16 Apr 2017 06:18:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D9FC1B9B for ; Sun, 16 Apr 2017 06:18:31 +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: <1492323239.571b13cfb340a1b07fdde91ddd0d38a492dba0ef.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/rspec-support/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/rspec-support/rspec-support-3.5.0.ebuild X-VCS-Directories: dev-ruby/rspec-support/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 571b13cfb340a1b07fdde91ddd0d38a492dba0ef X-VCS-Branch: master Date: Sun, 16 Apr 2017 06:18:31 +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: 07e7fe47-6daf-4692-be38-6b3b4da06d3b X-Archives-Hash: d2ebb71f1df9fa9740df001f67158944 commit: 571b13cfb340a1b07fdde91ddd0d38a492dba0ef Author: Hans de Graaff gentoo org> AuthorDate: Sun Apr 16 06:13:59 2017 +0000 Commit: Hans de Graaff gentoo 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 }