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 5B66B139087 for ; Sat, 14 Jan 2017 08:53:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9762E23400E; Sat, 14 Jan 2017 08:52:59 +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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6FC0B234007 for ; Sat, 14 Jan 2017 08:52:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3FBE1341839 for ; Sat, 14 Jan 2017 08:52:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5766D269B for ; Sat, 14 Jan 2017 08:52:56 +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: <1484383966.335b4e27754f922ef057ebbc45903d219148f80e.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/rspec-expectations/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild X-VCS-Directories: dev-ruby/rspec-expectations/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 335b4e27754f922ef057ebbc45903d219148f80e X-VCS-Branch: master Date: Sat, 14 Jan 2017 08:52:56 +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: 90964095-3f81-47bc-bbdd-6965f8cade40 X-Archives-Hash: 6c2143f464e7a5d0e08686129bac3f50 commit: 335b4e27754f922ef057ebbc45903d219148f80e Author: Hans de Graaff gentoo org> AuthorDate: Sat Jan 14 08:50:51 2017 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sat Jan 14 08:52:46 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335b4e27 dev-ruby/rspec-expectations: add ruby24 Package-Manager: portage-2.3.0 dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild index 8091225..660cade 100644 --- a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild +++ b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby20 ruby21 ruby22 ruby23" +USE_RUBY="ruby21 ruby22 ruby23 ruby24" RUBY_FAKEGEM_RECIPE_TEST="rspec" @@ -50,3 +50,11 @@ all_ruby_prepare() { # Avoid a weird, and failing, test testing already installed code. sed -e '/has an up-to-date caller_filter file/,/end/ s:^:#:' -i spec/rspec/expectations_spec.rb || die } + +each_ruby_prepare() { + case ${RUBY} in + *ruby24) + sed -i -e 's/of Fixnum/of Integer/' spec/rspec/expectations/expectation_target_spec.rb spec/rspec/matchers/be_instance_of_spec.rb || die + ;; + esac +}