gentoo resync : 12.03.2021

3 files changed, 42 insertions, 3 deletions

diff --git a/dev-ruby/mustache/Manifest b/dev-ruby/mustache/Manifest
index 306b02cc12de..1f1e4ecacbcd 100644
--- a/dev-ruby/mustache/Manifest
+++ b/dev-ruby/mustache/Manifest
@@ -1,3 +1,4 @@
+AUX mustache-1.1.1-test-ordering.patch 1206 BLAKE2B 7797403a81ed860b9bc940d07196f235722e7dd83aa42c3a8ac9200f8179284c2a6a996621f2f6332ef53fa2654772eacdbd14ce5ca0019fca54bd082a3e0155 SHA512 bb122077fa486acd9b737dcf961baeae53b766a48bc635ac48b11e675923885c8110b0095a2600f1655adb034938b04c979c1f5a5d7064d040c207f47eb4d2cc
 DIST mustache-1.1.1.gem 42496 BLAKE2B bd1becb1c296abf03cdd6c7d5a6f29b71dc6328c126dbb27420872088b3b6988ac56d91c13f669cca94932f23f4290277d9ca6597ff842ff226e092c2532dccb SHA512 91a18a374a0348317d0801d6784fedd0782d7a08f128d3ab7050e631b34e45cecd49c4b1e2a9e17204f70bf169c107a92a1e210532bd3faa98edf8b1b5e8e43c
-EBUILD mustache-1.1.1.ebuild 899 BLAKE2B 8cbc40da227a450d20d0a5cd453b4adbbfe45955858d3766a2b686de90466ea429307bfc5d7308886b80d99840380f97d2863f593bce7ced48cdcc5b20b988cd SHA512 c0cc645fb6359a5a3425746be4f4d949e97df3fc03ba086472e78ce886ee6d1d176cae3306e61d0994d7c8c57151471d4d6696e0cb7b7690911aa76123cca467
+EBUILD mustache-1.1.1.ebuild 951 BLAKE2B 41acbcb45f7c3af8aecf39da814b30607649c5bb6da61155ce9993dd9df18caa76c85908e69e9cd9af2b61fdc17a904df7bac9984ef82655b847dd902b3853ee SHA512 419b86ef80da75039b1d1a34c0cad38637393effb7bd53a0511d0f9688be40f4bf87f6838a85ded55fd6539f04530ba1f685858f514e063fe4248b5a8e3ff685
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/mustache/files/mustache-1.1.1-test-ordering.patch b/dev-ruby/mustache/files/mustache-1.1.1-test-ordering.patch
new file mode 100644
index 000000000000..824825bacbd3
--- /dev/null
+++ b/dev-ruby/mustache/files/mustache-1.1.1-test-ordering.patch
@@ -0,0 +1,36 @@
+From 407c6a5db6c1f1cfb40bd6113f07f067d07885a4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Mon, 27 Apr 2020 11:16:17 +0200
+Subject: [PATCH] Fix test race condition.
+
+The test suite randomly fails with errors such as:
+
+~~~
+  1) Failure:
+AutoloadingTest#test_autoload_lowercase [/builddir/build/BUILD/mustache-1.1.1/usr/share/gems/gems/mustache-1.1.1/test/autoloading_test.rb:17]:
+Expected: Comments
+  Actual: nil
+~~~
+
+This happens when `test_namespaced*` test cases are executed earlier
+than the remaining test cases, because they are defining
+`view_namespace` but not cleaning up afterwards.
+---
+ test/autoloading_test.rb | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/test/autoloading_test.rb b/test/autoloading_test.rb
+index 0a7ad762..77eb3557 100644
+--- a/test/autoloading_test.rb
++++ b/test/autoloading_test.rb
+@@ -7,6 +7,10 @@ def setup
+     Mustache.view_path = File.dirname(__FILE__) + '/fixtures'
+   end
+ 
++  def teardown
++    Mustache.remove_instance_variable(:@view_namespace) if Mustache.instance_variable_defined?(:@view_namespace)
++  end
++
+   def test_autoload
+     klass = Mustache.view_class(:Comments)
+     assert_equal Comments, klass
diff --git a/dev-ruby/mustache/mustache-1.1.1.ebuild b/dev-ruby/mustache/mustache-1.1.1.ebuild
index 12424c6fe07f..20fc3ee3e78a 100644
--- a/dev-ruby/mustache/mustache-1.1.1.ebuild
+++ b/dev-ruby/mustache/mustache-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
@@ -20,6 +20,8 @@ SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
+PATCHES=( "${FILESDIR}/${P}-test-ordering.patch" )
+
 ruby_add_bdepend "doc? ( app-text/ronn )"
 
 all_ruby_prepare() {