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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 94C341581C1 for ; Thu, 11 Jul 2024 09:50:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA4162BC016; Thu, 11 Jul 2024 09:50:38 +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 A55292BC016 for ; Thu, 11 Jul 2024 09:50:38 +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 91B3733BF28 for ; Thu, 11 Jul 2024 09:50:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C23261DD0 for ; Thu, 11 Jul 2024 09:50:35 +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: <1720691426.18aa7508521c59baa3077119b3903e0d2b129e39.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: 18aa7508521c59baa3077119b3903e0d2b129e39 X-VCS-Branch: master Date: Thu, 11 Jul 2024 09:50:35 +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: fcb28d40-12ab-4668-802c-c148c57cbbed X-Archives-Hash: c1ba12dcc3bc08a686192401b83c363f commit: 18aa7508521c59baa3077119b3903e0d2b129e39 Author: Hans de Graaff gentoo org> AuthorDate: Thu Jul 11 09:49:36 2024 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Thu Jul 11 09:50:26 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18aa7508 dev-ruby/multi_json: update EAPI 7 -> 8, add ruby33 Also avoid a test broken by dev-ruby/json changes. Closes: https://bugs.gentoo.org/923587 Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/multi_json/multi_json-1.15.0-r1.ebuild | 75 +++++++++++++++++++++++++ 1 file changed, 75 insertions(+) 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 new file mode 100644 index 000000000000..fa3188b909fe --- /dev/null +++ b/dev-ruby/multi_json/multi_json-1.15.0-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +USE_RUBY="ruby31 ruby32 ruby33" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" +RUBY_FAKEGEM_TASK_DOC="yard" + +RUBY_FAKEGEM_DOCDIR="rdoc" +RUBY_FAKEGEM_EXTRADOC="README.md" + +RUBY_FAKEGEM_GEMSPEC="multi_json.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="A gem to provide swappable JSON backends" +HOMEPAGE="https://github.com/intridea/multi_json" +SRC_URI="https://github.com/intridea/multi_json/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="MIT" + +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc test" + +ruby_add_rdepend "|| ( >=dev-ruby/json-1.4:* >=dev-ruby/yajl-ruby-1.0 )" + +ruby_add_bdepend "doc? ( dev-ruby/rspec:3 dev-ruby/yard )" + +ruby_add_bdepend "test? ( dev-ruby/json + dev-ruby/yajl-ruby )" + +all_ruby_prepare() { + sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die "Unable to remove bundler." + + # Remove unimportant rspec options not supported by rspec 2.6. + rm .rspec || die + + # Remove specs specific to oj since we don't package oj yet. + sed -i -e '/defaults to the best available gem/,/^ end/ s:^:#:' \ + -e '/Oj does not create symbols on parse/,/^ end/ s:^:#:' \ + -e '/with Oj.default_settings/,/^ end/ s:^:#:' \ + -e '/using one-shot parser/,/^ end/ s:^:#:' \ + -e '/jrjackson/askip "unpackaged"' \ + spec/multi_json_spec.rb + + # Avoid simplecov which only works with ruby 1.9 + sed -i -e '/simplecov/d' -e '/SimpleCov.formatter/,/SimpleCov.start/ d' spec/spec_helper.rb || die + + # Remove unpackaged and for our purposes unneeded coveralls + 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 + + # 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 + + # Avoid spec failing due to an issue in dev-ruby/json, + # https://github.com/intridea/multi_json/commit/70cc6e4a64152e5fc29c4a1109209cef25a6c073 + sed -e '/dumps time in correct format/ s/it/xit/' -i spec/shared/adapter.rb || die +} + +each_ruby_test() { + for t in spec/*_spec.rb; do + ${RUBY} -S rspec-3 ${t} || die + done +}