gentoo auto-resync : 22:03:2023 - 12:42:36

3 files changed, 29 insertions, 6 deletions

diff --git a/dev-ruby/simplecov/Manifest b/dev-ruby/simplecov/Manifest
index 20373cbaea05..15cb0721f687 100644
--- a/dev-ruby/simplecov/Manifest
+++ b/dev-ruby/simplecov/Manifest
@@ -1,7 +1,8 @@
+AUX simplecov-0.22.0-ruby32-gentoo.patch 737 BLAKE2B 489c7214f3286ad79a5998d74565a1e2466dc32c39a5e7a2e5506a29cd1d4c33633b292934460e2392c23656e204ff38fc8fea6925a39a5950ebfcab6919520c SHA512 01269b4a5de13d6f5d2c4703134da43b17b35ee26b274e4aa3a17c92a48e1ea21b712cdf37a7a9fcee1a35d3b4826dd06202304bd1bd791fbb2361ffed6e9036
 DIST simplecov-0.19.1.tar.gz 107430 BLAKE2B 0f18cd4c8ddfd324f4e3326ad8503530862f0ae67658865183984b81a59ad9aa5fcf650fa9f64fa6841ea23afa07d25e38443a79ad0be26b966fa99b6805a090 SHA512 2d781008769abd79020be96f7c1f91cfb9f27d51d00436f737c408a9b9d57a82955cbe5ba5ee5a628b9a7e8835d9b3e1542b67499355373c4f9b2638bee83235
 DIST simplecov-0.21.2.tar.gz 114080 BLAKE2B b1bdfd45a39f97072d871a6d4ba4a2d9f2b94642cbbe329fba91b53b1d6a9b024e224e822ca49c28c4849b7bc3ade19027c6aab739d3acf28c09cd3c773ce4eb SHA512 68e9a901b2ecef07aebad214ea86a092871b0ebf5b62881ca97ca0033c1ee5b9ba395116f9960e69cd88b90f569a3b573a3879178e9ccfa06d28c94de8b4f918
 DIST simplecov-0.22.0.tar.gz 115236 BLAKE2B d013f254d534ddd1ad273e2a6990c7ec96710cef106c73ecaba18c04ac5922bad52e086f11bf019abb21dd6cfc2f4b02e058b5042029716c6e3ed64e1c35993a SHA512 ba7e1a29a219337c1e00d055408d825b20a7b81ec4768612d9d5e8a18af08d47d86a42cee78c64ae0f431196136b5dd522364882d83e5210366d8aa03d5c54b4
 EBUILD simplecov-0.19.1.ebuild 1210 BLAKE2B f8e14f56877213b223cdfa25d8434be88f9caa108e5c1e18ceb4c716b4fc96ac8b046771eb8c1bae7b97bbbbc190efaec43185b702582b86d22a1c01951631f7 SHA512 40e3195c466478136a62cb8e8c380cc6cca67a137465809ae3eba6c83892d7203028b76e01d0a3586f605ab8c7d85730d6ad68d8aa2929e500a7808d81dcfc6c
 EBUILD simplecov-0.21.2.ebuild 1507 BLAKE2B f1f14844ddcadbb1d70929b66ef826131cf7b66d82464eac5cc1d2eed7161c9fd4a9deac77a915e38eada3e8b0669893ffbdf17232f68f8964314bcc76462416 SHA512 be39f2cb8069dec199a2df6b6593cbd31bd96acceeefd0cac7102efd28149d640348d282c4de37acee9566456ecedd48bc51aaad6b49d3f5cce759b6385286e8
-EBUILD simplecov-0.22.0.ebuild 1500 BLAKE2B 91a308e8ee36db74f1a92a0498c38dcba559d76a1eb74cab5063493a1e9bfe727c4d6c21f5bca1e19b199e752fb4f24e75254e2f8e71443c0e66d1f7521167a7 SHA512 1c32e067b09e02e2705cf76b31abdde3e5b6739ffb2438a11a8ef1c719fa0189e9750de318227105117348d96196fc7716da221c70d9d02812d759ac789c2706
+EBUILD simplecov-0.22.0.ebuild 1597 BLAKE2B be28130e9f85fd1bafa5c56390a947679505a02e86ae69430633385ffdd48d524a45eac32f361f6b33aadb84cb90c2be517f7b9a8a5b11df7d8cf927fb6ad836 SHA512 a06ff35708a4945036b0f777404225ea1ec855c00e060f4b7f6c6aeada876358c3520f0b94cb3ad8dcbf8db761f2afcb02288ef719ccdeb272c12ab77d2896fd
 MISC metadata.xml 351 BLAKE2B deddbf1938c6ddb07d6e018eea6972ef42c29cbd593f830363da799cf521f90dbb286fdccd0b01ec0d50392589f7ee40275ee67b871c827b24c4ccfa46b0889c SHA512 2cb0486e6184c2e1f27275c09434035a88209adba52b677dd436d422b4efc838b430dc436a67507b85ddfa4c98e1fde1f0475f6b0d1d42aae22bd984f7934c55
diff --git a/dev-ruby/simplecov/files/simplecov-0.22.0-ruby32-gentoo.patch b/dev-ruby/simplecov/files/simplecov-0.22.0-ruby32-gentoo.patch
new file mode 100644
index 000000000000..293fbe51d747
--- /dev/null
+++ b/dev-ruby/simplecov/files/simplecov-0.22.0-ruby32-gentoo.patch
@@ -0,0 +1,19 @@
+This test is only activated for >= ruby32 because ruby32 adds support
+for assessing coverage within an eval. But the failure isn't anything
+to do with eval.
+
+The test tries to call 'ruby' which in Gentoo isn't (yet!) wrapped,
+so it ends up calling an older Ruby which then results in 0 coverage
+being found. Replace it with a string we can safely sed with the
+correct Ruby per-test.
+--- a/spec/coverage_for_eval_spec.rb
++++ b/spec/coverage_for_eval_spec.rb
+@@ -16,7 +16,7 @@ RSpec.describe "coverage for eval" do
+     end
+ 
+     context "foo" do
+-      let(:command) { "ruby eval_test.rb" }
++      let(:command) { "@GENTOO_RUBY@ eval_test.rb" }
+ 
+       it "records coverage for erb" do
+         expect(@stdout).to include(" 2 / 3 LOC")
diff --git a/dev-ruby/simplecov/simplecov-0.22.0.ebuild b/dev-ruby/simplecov/simplecov-0.22.0.ebuild
index 1f2ded59ddcd..22e7cc4d0130 100644
--- a/dev-ruby/simplecov/simplecov-0.22.0.ebuild
+++ b/dev-ruby/simplecov/simplecov-0.22.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
@@ -36,6 +36,10 @@ ruby_add_bdepend "test? (
 
 # There are also cucumber tests that require poltergeist and unpackaged phantomjs gem.
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.22.0-ruby32-gentoo.patch
+)
+
 all_ruby_prepare() {
 	# Avoid test depending on spawning ruby and having timing issues
 	sed -i -e '/blocks other processes/askip "gentoo"' spec/result_merger_spec.rb || die
@@ -48,7 +52,6 @@ all_ruby_prepare() {
 }
 
 each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec spec/*spec.rb || die
-
-	#${RUBY} -S cucumber features || die
+	sed -i -e "s:@GENTOO_RUBY@:${RUBY}:" spec/coverage_for_eval_spec.rb || die
+	RSPEC_VERSION=3 ruby-ng_rspec spec/ || die
 }