gentoo resync : 12.03.2021

3 files changed, 57 insertions, 2 deletions

diff --git a/dev-ruby/coderay/Manifest b/dev-ruby/coderay/Manifest
index c9ea5cba9f4a..088d102a965f 100644
--- a/dev-ruby/coderay/Manifest
+++ b/dev-ruby/coderay/Manifest
@@ -1,5 +1,6 @@
+AUX coderay-1.1.3-ruby30.patch 1472 BLAKE2B c04f821cc2768c50fbc5ddd998c37878fb57ec34b6db64407850aca55d705bb8f40dcf931b97c5e849fc186295ef99530eecedab531681b3cd196b366fe6dd57 SHA512 de06cb33137899001171f2a2fce9e7e54eaa80321df1522df318e91411e6e03990e07485b250fa9b925049069a9549abaeac814501b234b3c1761932d7ca6681
 DIST coderay-1.1.2.tar.gz 220645 BLAKE2B 85405da2b148ae23573abf2c3fcf94a643024756308e83c4cecf0a5edae2fedc4ca7c7bdf8fb5936310f6699ca8f06f91cceb475e00511a54af0a96dd517c234 SHA512 cfce5e9f0a0d988e7920912e064ecbef3b54200a08ca2e07453452edd7f382a1eb9292bc566e069f5d1b784033e816f13d9ddfb39520e8e44a8d1e898aa33591
 DIST coderay-1.1.3.tar.gz 229139 BLAKE2B a900cc5fbac950f66814d9300876d6a273b296d07139297d5344d26c5710d23c37761e5743ef972f523afa20fa663f239c03d9d2ad47232b77e53fe5053736f0 SHA512 a5208965e8dbad53d179fdc1c57df59ba4e13522a1a57c371ccd3f9369408a1c7d878867df48b201a1d590b46ef0f9bada3f3e7810866f17d244b5b370aba3fb
 EBUILD coderay-1.1.2.ebuild 1348 BLAKE2B e7c43e28b7a76ba163f1888f1f51cca9f5b1ad33e797826f023d250aab270f0ab284a06fb95625e0e26c2e53f4f4174e37161e6061ae36afc1e74d1f72509dae SHA512 4b49f01229efbc326adcccec819ece3fb26e4cc0571e978af149206af6697b9afbd7697c9d3f3ee101f6d79a31808007b7861789bec6f212269dc87006335388
-EBUILD coderay-1.1.3-r1.ebuild 1465 BLAKE2B 068dddb8435b3b67b6a741e36d028a75cf005c035f9d0adf240e8c539b25b47adff6e4ba5768ab87dadb87ea351983d48d824c7942528b5a555c5a1e130d0f98 SHA512 717fb0fd7f4417fd46706e0986d2cc1515a0329fe4a4bade723f1788678df6c1c23b6d3314b192299382bac416a66c57ee7edc0c905a826f653c154dac93e3a2
+EBUILD coderay-1.1.3-r1.ebuild 1579 BLAKE2B b0326abc1a498f1a42419bc916f3b4ba5aaea6fc66a78b93fd0485fafbc2cebe0def9097f1ec880e180d058ecf2bc282fe0b36b27b571c343a4d984cd5a1c5ce SHA512 a093f2755c71cc4dd1b48c87920347f706ae2536c9874e3333ea47aaf91114f11b9b6ad64532292c27d74bb62b0ab81ce4772d731abf91b43330a2253b54e50d
 MISC metadata.xml 342 BLAKE2B b907829065b996e9bf467150216ce92b7fa4bedef8dbe9b9d79a1ba6831c706c312ce0d1cbb418df6c5b43dad59509c132187637025d4c49e9b29e21fa68a107 SHA512 13f33c6d77b3297dab6c125c2ebc9a1f7584dd5374e7f13d416d5a80ffe04e39ecdddd93de30fceed22e110e1c68e4b853fdd5b6ab5ec4d254c05b17f624ca4f
diff --git a/dev-ruby/coderay/coderay-1.1.3-r1.ebuild b/dev-ruby/coderay/coderay-1.1.3-r1.ebuild
index d940e89b4842..3481d92b38b6 100644
--- a/dev-ruby/coderay/coderay-1.1.3-r1.ebuild
+++ b/dev-ruby/coderay/coderay-1.1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 # The test target also contains test:exe but that requires
 # shoulda-context which we do not have packaged yet.
@@ -27,6 +27,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
+PATCHES=("${FILESDIR}/${P}-ruby30.patch")
+
 # Redcloth is an optional but automagically tested dependency. This
 # requires redcloth-4.2.2. We don't depend on this version to make
 # bootstrapping rspec with new versions easier, since redcloth depends
@@ -37,6 +39,7 @@ ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
 all_ruby_prepare() {
 	sed -i -e "/[Bb]undler/d" Rakefile || die
 	sed -i -e '/git ls-files/ s:^:#:' -e 's/.rc.*"/"/' coderay.gemspec || die
+	sed -i -e '/simplecov/ s:^:#:' spec/spec_helper.rb test/*/*.rb || die
 
 	# Fix failing tests for lazy evaluation in ruby26
 	sed -i -e 's/\.filter$/.filter.to_a/' test/unit/filter.rb || die
diff --git a/dev-ruby/coderay/files/coderay-1.1.3-ruby30.patch b/dev-ruby/coderay/files/coderay-1.1.3-ruby30.patch
new file mode 100644
index 000000000000..99ce3053a1d7
--- /dev/null
+++ b/dev-ruby/coderay/files/coderay-1.1.3-ruby30.patch
@@ -0,0 +1,51 @@
+From c1c15034749684fcad91ad2bcb2fcd2056faf18d Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka@fedoraproject.org>
+Date: Sun, 21 Feb 2021 23:04:03 +0900
+Subject: [PATCH] Fix test suite for ruby 3.0 change for methods on subclass of
+ Array
+
+With ruby 3.0, especially with https://github.com/ruby/ruby/pull/3690 ,
+for subclass of Array, `flatten` method now returns the instance of Array,
+not of the subclass.
+
+To keep the object instance of the subclass, use `flatten!` instead.
+---
+ test/unit/debug.rb     | 3 ++-
+ test/unit/statistic.rb | 5 +++--
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/test/unit/debug.rb b/test/unit/debug.rb
+index 88baf563..b694f21e 100644
+--- a/test/unit/debug.rb
++++ b/test/unit/debug.rb
+@@ -24,7 +24,8 @@ def test_creation
+     ["   \n", :space],
+     ["[]", :method],
+     [:end_line, :head],
+-  ].flatten
++  ]
++  TEST_INPUT.flatten!
+   TEST_OUTPUT = <<-'DEBUG'.chomp
+ integer(10)operator((\\\))string<content(test)>head[
+ 
+diff --git a/test/unit/statistic.rb b/test/unit/statistic.rb
+index 1326dca6..776774d4 100644
+--- a/test/unit/statistic.rb
++++ b/test/unit/statistic.rb
+@@ -24,7 +24,8 @@ def test_creation
+     ["   \n", :space],
+     ["[]", :method],
+     [:end_line, :test],
+-  ].flatten
++  ]
++  TEST_INPUT.flatten!
+   TEST_OUTPUT = <<-'DEBUG'
+ 
+ Code Statistics
+@@ -56,4 +57,4 @@ def test_filtering_text_tokens
+     assert_equal TEST_OUTPUT, TEST_INPUT.statistic
+   end
+   
+-end
+\ No newline at end of file
++end