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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2B427158042 for ; Tue, 12 Nov 2024 14:55:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7AFF2E07F0; Tue, 12 Nov 2024 14:55:31 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5FE73E07F0 for ; Tue, 12 Nov 2024 14:55:31 +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 7C1C0335C7E for ; Tue, 12 Nov 2024 14:55:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E39AB18C4 for ; Tue, 12 Nov 2024 14:55:28 +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: <1731423319.0af3cacb3a39d116c7f64c1a2362122408cd2d5d.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-r1.ebuild X-VCS-Directories: dev-ruby/multi_json/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 0af3cacb3a39d116c7f64c1a2362122408cd2d5d X-VCS-Branch: master Date: Tue, 12 Nov 2024 14:55:28 +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: 9c5a04ac-bcf6-4dac-a71f-6ef0e3ad6163 X-Archives-Hash: 7f06a1470abd3d41b70c9bbbddbac2d4 commit: 0af3cacb3a39d116c7f64c1a2362122408cd2d5d Author: Hans de Graaff gentoo org> AuthorDate: Tue Nov 12 14:54:34 2024 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Tue Nov 12 14:55:19 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0af3cacb dev-ruby/multi_json: fix json/pure tests Closes: https://bugs.gentoo.org/943273 Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/multi_json/multi_json-1.15.0-r1.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-ruby/multi_json/multi_json-1.15.0-r1.ebuild b/dev-ruby/multi_json/multi_json-1.15.0-r1.ebuild index 1a1b7c67868e..053a6fea7259 100644 --- a/dev-ruby/multi_json/multi_json-1.15.0-r1.ebuild +++ b/dev-ruby/multi_json/multi_json-1.15.0-r1.ebuild @@ -43,6 +43,8 @@ all_ruby_prepare() { -e '/with Oj.default_settings/,/^ end/ s:^:#:' \ -e '/using one-shot parser/,/^ end/ s:^:#:' \ -e '/jrjackson/askip "unpackaged"' \ + -e '/\(when JSON pure is already loaded\|can set adapter for a block\)/askip "JSON pure no longer exists"' \ + -e '/require.*pure/ s:^:#:' \ spec/multi_json_spec.rb # Avoid simplecov which only works with ruby 1.9 @@ -52,7 +54,7 @@ all_ruby_prepare() { sed -i -e '/coveralls/d' spec/spec_helper.rb || die # Avoid testing unpackaged adapters - rm spec/{gson,nsjsonserialization,jr_jackson,oj}_adapter_spec.rb || die + rm spec/{gson,nsjsonserialization,jr_jackson,json_pure,oj}_adapter_spec.rb || die # Fix expectations confused by ruby30 kwargs sed -e "/expect/ s/:foo => 'bar', :fizz => 'buzz'/{:foo => 'bar', :fizz => 'buzz'}/" \