gentoo resync : 09.03.2018

3 files changed, 39 insertions, 3 deletions

diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index f52df05e8bad..cdd82ae04f93 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -1,3 +1,4 @@
+AUX rspec-expectations-3.7.0-ruby25.patch 1467 BLAKE2B 39968ab1201fcc0e69fc1cf023150bdc19b8df15324f8411c1094857541c54f935d95d74714a870e2eb3d7de6d9b94891838efe2ff765f83f2b5d38b0ccb9774 SHA512 87a92967764e4c9214e55133d8b792441449ca87140ff4c594ff0bc528078d05d5164958744d75d6a9e8309acec9905224c45d36d408a3cf705e3987aedc24f3
 DIST rspec-expectations-2.99.2-git.tgz 106884 BLAKE2B 5b31c8681306d5c688f62fc3fc6adf7be6cabad6df6fd16195c71787d73495924233d793633fa041a94d796f63c9ff97c58e6f4a75bdc09dfbe56e770bb6a5c9 SHA512 6042cafe225b2b16df458c7bf69e1694b637afcac6f6195e35a0be199432610457ccaa3e7e4bd114b27a7a6c3d530d94f4c0603c65f469cbadc55bd3f75b6f3a
 DIST rspec-expectations-3.5.0-git.tgz 187600 BLAKE2B 607dabc38e077ed82e18cdc690900f7fef86e6bb30a8004534992804717f8430a132b8f7d882226557e8c83832a1a8f43a32e9791b19869919c9b0aa8cfead8f SHA512 e6077549a028de0e34cdd50d93552ca3ee0f30bb550e9df20d391f287beb57070dcb3a5104627e7adb55689e7b102c91b7d3a3b944b8c4ff1235761140f2dce0
 DIST rspec-expectations-3.6.0-git.tgz 193897 BLAKE2B f3fc2b06a317e77838e2d483416ab0e05aefed8a129058ceaf1a80d3068b41e81abc9fd85576433fd1577e6114ccc65130734b850997f89310b80b549f80d679 SHA512 5c784eff2c076623f471bcfff6e014420782c8d52ff54a68adc9b4d6b60a91726da36e3989535f4ab7f1fcc6b1e2a3c3a63ee330f8ea55f475711741762c0f07
@@ -5,5 +6,5 @@ DIST rspec-expectations-3.7.0-git.tgz 194071 BLAKE2B 67c8db15c43cc1141b19c6eb993
 EBUILD rspec-expectations-2.99.2.ebuild 1688 BLAKE2B a32238f5c34f42b3c2653e557589c1856ddd04ef038d1d067ae5ac784baf77d855712a7393317090c8b981baa1d17ff1143032a96a13ce14343349e00d9502c9 SHA512 3b93fa69cc6e6f8ca6bf6ac8fd7a9ac9ece754e32bc70cfba3438d05f4737126eec491bca82d67bd6b608a693cbf5e742191b8afef8768f31dcc4091511536cb
 EBUILD rspec-expectations-3.5.0.ebuild 1322 BLAKE2B 79d4a73c87e4e93e1c165255ee391915c7b2252fcc7ed308994c170ce4f8e3a163a7df0ca59ef24952b53130dc5d0884dcfab319739d0cb1c026a7d26dfe86f1 SHA512 5a56eadd7f68b0b57eb153e5e14bdb2f2d653bad26d84a266dd3d2d34ffa8a2e9a97df5292fcb35cbadab5cec5e86fb6cbbe18c7810c7f1d976019c0dbcaf1b7
 EBUILD rspec-expectations-3.6.0.ebuild 1338 BLAKE2B d4765508dd978b7ea89b083e78edd24891c91c6172e6ec91615764b226866c3492f3e6e35b1b092e35c186fe4e2e7bfe1de8c38de82b50e003fa430ef66a1b5a SHA512 8bbe1d874c4b3132c9c3bfc2516857e5ed3330c7afae46b561c5ab5c0cf5b4f1a024958a76ae5fce112a5eb193c98b80c5f647792d0265a726e8320684be7ab3
-EBUILD rspec-expectations-3.7.0.ebuild 1324 BLAKE2B 3f81b93f4c96c108c48ce195c1b6ebea561aa37b06205c2c7d2d5d778263fcc8f9bba31b457d4d4cc449f82a7dcc6971c36755ddf7a1f5b3f518c489dee5a11f SHA512 c03be394692a773fe0ac6bd1816aa6ae3da84559226dfc29ddd7ff725b11e7af7f3b079ef992b68ea3e891b25ead9f30e1474e68583c9abdb0052238a335bac0
+EBUILD rspec-expectations-3.7.0.ebuild 1376 BLAKE2B 1c49478e03eb5037247f7e624787302ba6827527f403b7edaa02497e315a367492a6bc3c4a8ac267cd6932c7b8477f7d8ab9d347c685c233df8a6042ed825551 SHA512 3a534370174f697e10bd4bc593564154539ac4e562c4fc9188c3ba032e4b17022d997e27f9b2e4f8258a4eb3f90b6d4df9c1ea31bf8ea5196da9e2757049132d
 MISC metadata.xml 350 BLAKE2B bd2aeaa98f6f5cdbdce70c0dd6eed61eee36323502021664e10356e0e558eb9fbf09f9b056944aaf13859c0f4f29603c5523584e4b823a9218fefb2824edcff6 SHA512 c0cbdb181bc5981daa6dea5ecb445cedbda6d6430218aad98a39b2db67074169305f3cba419fb1e24d79900be311619337a5421b75e0da6d2838a0ccb7de45b1
diff --git a/dev-ruby/rspec-expectations/files/rspec-expectations-3.7.0-ruby25.patch b/dev-ruby/rspec-expectations/files/rspec-expectations-3.7.0-ruby25.patch
new file mode 100644
index 000000000000..feeddb0eff1b
--- /dev/null
+++ b/dev-ruby/rspec-expectations/files/rspec-expectations-3.7.0-ruby25.patch
@@ -0,0 +1,33 @@
+From 5999ad46df4782a3136c4bad0c2353daede2cbbd Mon Sep 17 00:00:00 2001
+From: Myron Marston <myron.marston@gmail.com>
+Date: Sat, 30 Dec 2017 17:36:55 -0800
+Subject: [PATCH] Disable Ruby 2.5 feature to avoid test failures on 2.5.
+
+---
+ spec/rspec/expectations/failure_aggregator_spec.rb | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/spec/rspec/expectations/failure_aggregator_spec.rb b/spec/rspec/expectations/failure_aggregator_spec.rb
+index 6628aa75..40a1ae35 100644
+--- a/spec/rspec/expectations/failure_aggregator_spec.rb
++++ b/spec/rspec/expectations/failure_aggregator_spec.rb
+@@ -216,6 +216,19 @@ def expect_error_included_in_aggregated_failure(error)
+     end
+ 
+     context "when an expectation failure happens in another thread" do
++      # On Ruby 2.5+, the new `report_on_exception` causes the errors in the threads
++      # to print warnings, which our rspec-support test harness converts into a test
++      # failure since we want to enforce warnings-free code. To prevent the warning,
++      # we need to disable the setting here.
++      if Thread.respond_to?(:report_on_exception)
++        around do |example|
++          orig = Thread.report_on_exception
++          Thread.report_on_exception = false
++          example.run
++          Thread.report_on_exception = orig
++        end
++      end
++
+       it "includes the failure in the failures array if there are other failures" do
+         expect {
+           aggregate_failures do
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.7.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.7.0.ebuild
index 39b3e3075673..a9e1c41d484a 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.7.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -24,6 +24,8 @@ IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
 
+PATCHES=( "${FILESDIR}/${P}-ruby25.patch" )
+
 ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 <dev-ruby/diff-lcs-2
 	=dev-ruby/rspec-support-${SUBVERSION}*"