commit: 0af3cacb3a39d116c7f64c1a2362122408cd2d5d Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Tue Nov 12 14:54:34 2024 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> 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 <graaff <AT> 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'}/" \
