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 B6CAC1395E2 for ; Fri, 9 Dec 2016 06:41:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E7BB21C0A6; Fri, 9 Dec 2016 06:41:55 +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 DCAAA21C0A6 for ; Fri, 9 Dec 2016 06:41:54 +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 C15143415D2 for ; Fri, 9 Dec 2016 06:41:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F25A624C1 for ; Fri, 9 Dec 2016 06:41:51 +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: <1481265670.7bedfb2e98e5f1cf62e9baff82e9ea899d86ea9a.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/rspec-core/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild X-VCS-Directories: dev-ruby/rspec-core/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 7bedfb2e98e5f1cf62e9baff82e9ea899d86ea9a X-VCS-Branch: master Date: Fri, 9 Dec 2016 06:41:51 +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: 50232585-2941-4c1d-8220-eb086f0165de X-Archives-Hash: a8e5c80ac9d7ee1cac7caec38e5f6735 commit: 7bedfb2e98e5f1cf62e9baff82e9ea899d86ea9a Author: Hans de Graaff gentoo org> AuthorDate: Fri Dec 9 06:39:18 2016 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Fri Dec 9 06:41:10 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bedfb2e dev-ruby/rspec-core: add ruby22 Package-Manager: portage-2.3.0 dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild b/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild index f11c42b..375dd7b 100644 --- a/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild +++ b/dev-ruby/rspec-core/rspec-core-2.14.8-r4.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -USE_RUBY="ruby20 ruby21" +USE_RUBY="ruby20 ruby21 ruby22" RUBY_FAKEGEM_TASK_TEST="none" RUBY_FAKEGEM_TASK_DOC="none" @@ -20,7 +20,7 @@ RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec" inherit ruby-fakegem DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby" -HOMEPAGE="http://rspec.rubyforge.org/" +HOMEPAGE="https://github.com/rspec/rspec-core" SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz" LICENSE="MIT" @@ -49,7 +49,9 @@ all_ruby_prepare() { # Cover all released versions of ruby 2.1.x. This should be reported # upstream since ruby 2.1.x uses semantic versioning and the file # should not have the full version number. - cp spec/rspec/core/formatters/text_mate_formatted-2.1.0.html spec/rspec/core/formatters/text_mate_formatted-2.1.1.html|| die + cp spec/rspec/core/formatters/text_mate_formatted-2.1.0.html spec/rspec/core/formatters/text_mate_formatted-2.1.9.html|| die + cp spec/rspec/core/formatters/text_mate_formatted-2.1.0.html spec/rspec/core/formatters/text_mate_formatted-2.1.10.html|| die + cp spec/rspec/core/formatters/text_mate_formatted-2.1.0.html spec/rspec/core/formatters/text_mate_formatted-2.2.6.html|| die # Duplicate exe also in bin. We can't change it since internal stuff # also depends on this and fixing that is going to be fragile. This @@ -62,6 +64,9 @@ all_ruby_prepare() { # Avoid aruba dependency so that we don't end up in dependency hell. sed -i -e '/aruba/ s:^:#:' -e '104,106 s:^:#:' spec/spec_helper.rb || die rm spec/command_line/order_spec.rb || die + + # Avoid testing issues with rspec 3 installed + sed -i -e '2igem "rspec", "~> 2.0"' bin/rspec || die } each_ruby_prepare() {