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 3418C158094 for ; Fri, 29 Jul 2022 04:49:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3EB9E09BA; Fri, 29 Jul 2022 04:49:01 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6113FE09BA for ; Fri, 29 Jul 2022 04:49:01 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E1D53411BC for ; Fri, 29 Jul 2022 04:49:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1695E560 for ; Fri, 29 Jul 2022 04:48:58 +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: <1659070130.61cd85a5c6f9fbaa2d98c016329e50323b7fa61f.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/multi_json/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/multi_json/multi_json-1.15.0.ebuild X-VCS-Directories: dev-ruby/multi_json/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 61cd85a5c6f9fbaa2d98c016329e50323b7fa61f X-VCS-Branch: master Date: Fri, 29 Jul 2022 04:48:58 +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: dceeeca7-d108-40ce-9ddc-9acfb62a922b X-Archives-Hash: 7bec7718ea0d176a600f56d372c92e4b commit: 61cd85a5c6f9fbaa2d98c016329e50323b7fa61f Author: Hans de Graaff gentoo org> AuthorDate: Thu Jul 28 15:58:44 2022 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Fri Jul 29 04:48:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61cd85a5 dev-ruby/multi_json: enable ruby31, fix tests Closes: https://bugs.gentoo.org/835621 Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/multi_json/multi_json-1.15.0.ebuild | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dev-ruby/multi_json/multi_json-1.15.0.ebuild b/dev-ruby/multi_json/multi_json-1.15.0.ebuild index 8c7cefde22b4..45edc1cfd08d 100644 --- a/dev-ruby/multi_json/multi_json-1.15.0.ebuild +++ b/dev-ruby/multi_json/multi_json-1.15.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -USE_RUBY="ruby25 ruby26 ruby27 ruby30" +USE_RUBY="ruby26 ruby27 ruby30 ruby31" RUBY_FAKEGEM_RECIPE_TEST="rspec3" RUBY_FAKEGEM_TASK_DOC="yard" @@ -53,6 +53,15 @@ all_ruby_prepare() { # Avoid testing unpackaged adapters rm spec/{gson,nsjsonserialization,jr_jackson,oj}_adapter_spec.rb || die + + # Fix expectations confused by ruby30 kwargs + sed -e "/expect/ s/:foo => 'bar', :fizz => 'buzz'/{:foo => 'bar', :fizz => 'buzz'}/" \ + -e "/expect/ s/:bar => :baz/{:bar => :baz}/" \ + -i spec/shared/adapter.rb || die + sed -e '/expect/ s/:indent => "\\t"/{:indent => "\t"}/' \ + -e '/expect/ s/:quirks_mode => false, :create_additions => false/{:quirks_mode => false, :create_additions => false}/' \ + -i spec/shared/json_common_adapter.rb || die + sed -e "/expect/ s/:foo => 'bar'/{:foo => 'bar'}/" -i spec/multi_json_spec.rb || die } each_ruby_test() {