commit: 71b44ff96cc15bbc8d281cbe553c8d2022320f6c Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Sun Sep 10 16:56:55 2023 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> 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 <graaff <AT> 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() {
