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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F414815802F for ; Wed, 29 Mar 2023 09:15:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8AF832BC04E; Wed, 29 Mar 2023 08:49:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 736FF2BC04E for ; Wed, 29 Mar 2023 08:49:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5B9F2335CC1 for ; Wed, 29 Mar 2023 08:49:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA1B99C5 for ; Wed, 29 Mar 2023 08:49:10 +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: <1680079747.84e0c86bc1f5eed14458c8709848d54c47e54c21.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/rake-compiler/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/rake-compiler/rake-compiler-1.2.1.ebuild X-VCS-Directories: dev-ruby/rake-compiler/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 84e0c86bc1f5eed14458c8709848d54c47e54c21 X-VCS-Branch: master Date: Wed, 29 Mar 2023 08:49:10 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c4e14b88-65e2-45f1-a23f-458e0dbb9afd X-Archives-Hash: fff04a13c1b1bc9d85ae3b2241109a0f commit: 84e0c86bc1f5eed14458c8709848d54c47e54c21 Author: Hans de Graaff gentoo org> AuthorDate: Wed Mar 29 08:48:12 2023 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Wed Mar 29 08:49:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e0c86b dev-ruby/rake-compiler: fix cucumber features for rspec 3 This allows us to drop the last rspec:2 dependency. Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/rake-compiler/rake-compiler-1.2.1.ebuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-ruby/rake-compiler/rake-compiler-1.2.1.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.2.1.ebuild index f09f3ca19bdb..a98de583e37f 100644 --- a/dev-ruby/rake-compiler/rake-compiler-1.2.1.ebuild +++ b/dev-ruby/rake-compiler/rake-compiler-1.2.1.ebuild @@ -27,24 +27,24 @@ ruby_add_rdepend "dev-ruby/rake" ruby_add_bdepend "test? ( dev-ruby/rspec:3 )" -USE_RUBY="ruby26 ruby27" ruby_add_bdepend "test? ( dev-util/cucumber dev-ruby/rspec:2 )" +USE_RUBY="ruby27 ruby30 ruby31" ruby_add_bdepend "test? ( dev-util/cucumber )" all_ruby_prepare() { - # Make sure the right rspec version is used in cucumber. - sed -i -e "1igem 'rspec', '~>2.0'" features/support/env.rb || die - # Avoid failing features for native gems, this also fails with rubygems sed -i -e '/generate native gem/,$ s:^:#:' features/package.feature || die # Fix compatibility with newer cucumber versions. The not syntax has # been supported since cucumber 3.x. sed -i -e "s/~@java/'not @java'/" cucumber.yml || die + + # Fix compatibility with newer rspec versions. + sed -i -e 's/be_true/be true/ ; s/be_false/be false/' features/step_definitions/*.rb || die } each_ruby_test() { # Skip cucumber for new ruby versions (not ready yet due to rspec 2 usage) case ${RUBY} in - *ruby26|*ruby27) + *ruby27|*ruby30|*ruby31) RSPEC_VERSION=3 ruby-ng_rspec ruby-ng_cucumber ;;