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 362DB158089 for ; Sun, 10 Sep 2023 16:57:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32DE92BC023; Sun, 10 Sep 2023 16:57:53 +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 161A02BC023 for ; Sun, 10 Sep 2023 16:57:53 +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 23174335C9F for ; Sun, 10 Sep 2023 16:57:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A030D116F for ; Sun, 10 Sep 2023 16:57:50 +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: <1694365058.71b44ff96cc15bbc8d281cbe553c8d2022320f6c.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/i18n/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/i18n/i18n-1.14.1.ebuild X-VCS-Directories: dev-ruby/i18n/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 71b44ff96cc15bbc8d281cbe553c8d2022320f6c X-VCS-Branch: master Date: Sun, 10 Sep 2023 16:57:50 +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: 04793145-d458-4bc9-ad98-cceaf09fc779 X-Archives-Hash: ba000d856335397473d5c2ea0acafb53 commit: 71b44ff96cc15bbc8d281cbe553c8d2022320f6c Author: Hans de Graaff gentoo org> AuthorDate: Sun Sep 10 16:56:55 2023 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sun Sep 10 16:57:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71b44ff9 dev-ruby/i18n: fix minitest deprecation Use mocha 2.x. Closes: https://bugs.gentoo.org/911952 Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/i18n/i18n-1.14.1.ebuild | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dev-ruby/i18n/i18n-1.14.1.ebuild b/dev-ruby/i18n/i18n-1.14.1.ebuild index 04fe9890e028..2365a2bde7a6 100644 --- a/dev-ruby/i18n/i18n-1.14.1.ebuild +++ b/dev-ruby/i18n/i18n-1.14.1.ebuild @@ -19,13 +19,12 @@ KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-l ruby_add_rdepend "dev-ruby/concurrent-ruby:1" -# We need mocha:1.0 which corresponds to the Gemfiles used in each_ruby_test ruby_add_bdepend " test? ( >=dev-ruby/activesupport-5.1 dev-ruby/bundler >=dev-ruby/minitest-5.14:5 - >=dev-ruby/mocha-1.7.0:1.0 + dev-ruby/mocha:2 dev-ruby/test_declarative ) " @@ -37,7 +36,10 @@ all_ruby_prepare() { sed -i -e '/oj/ s:^:#:' gemfiles/* || die # Update old test dependencies - sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' -e '3igem "json"' gemfiles/* || die + sed -i -e '/rake/ s/~>/>=/' -e '/mocha/ s/1.7.0/2.0/' -e '3igem "json"' gemfiles/* || die + + # Use mocha 2 to avoid minitest deprecation issues. + sed -i -e 's:mocha/setup:mocha/minitest:' test/test_helper.rb || die } each_ruby_test() {