gentoo resync : 24.03.2018

2 files changed, 12 insertions, 13 deletions

diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 8ccb50f1a6bb..591a3a1d2b04 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -4,7 +4,7 @@ DIST rspec-core-3.5.4-git.tgz 369170 BLAKE2B c95fa7740bcc1b586b4e26be1db4cb52bb4
 DIST rspec-core-3.6.0-git.tgz 375590 BLAKE2B e8b4987ea3d5cc3a403eaec98243e4c4be6c9eace798bc97599020543401ecd036c6121a6736995fb716aabd1a2016393506bee1e3076c61b0c49173d991d990 SHA512 cecd3885652e18ba1ffed45e40d12c932ba0d880e96b2f1d264709f55dbda8d6b0c78c3bf4bb940d246b84261d1b80038618735f65302ff62646165b2e932be1
 DIST rspec-core-3.7.0-git.tgz 376565 BLAKE2B 86b0584883047c83e4fddfd09924a5b68828f53e2018d2513cd79484a390d1b7b89e8176b0098b8869d5ed7206c132d77a0d8ef2ffb5447da317460b152e5e23 SHA512 071bd2a5c905d4ce621f2d7255b882a9d34cf42001cb2995fdb05a91387805929198c32e53cf4c2df2a43d179d2c49337214066be87eb50ab044b5f70aba8c54
 DIST rspec-core-3.7.1-git.tgz 376819 BLAKE2B 6747ffd8f2d426718376b51356d8838a7db0d0246ee619e8edef30bd9f7aeeb80bd0488e4fc73b0a00d119074c35055f6b9d0cbbe6160ae78d0727ce9848a710 SHA512 1561d044281c1b8b97cc89033ad991548fa74abbc5f20d3951d3f3de754c581a027f9ccb2bd0107c05e744d3b2804555cf4cf207e72adf365b28fc7ce052dab8
-EBUILD rspec-core-2.99.2-r2.ebuild 3048 BLAKE2B b403ae9f6f1dbe8914a126c0f6d7987184cb5a61c76cdd9d4a325ce44a95bcce88ea66ab2df62d9679afee24b70f95e784499b2417d9c325929add3cc4239d24 SHA512 4133b0ee18f7c597b0271007fe46fe70b63e1959581c6468eb98b93e74c44ae4cf99b61dca9b5e1b50a42338ddf32a8c593be395a3f40b03101f499cd13899cd
+EBUILD rspec-core-2.99.2-r2.ebuild 3518 BLAKE2B 017a60ccb0ac017b08c4d97903a5bd59921fd0c0bc3b4322059d856bfee6eba2c026242bfda1e2083b043c190ad9160c6122ad62350b07aa0a486afbbb3089b6 SHA512 7b22027fa5ae71e80f071c4fc7cf3fa0e291ec42e06e0c07bcd0e94ab2782aa2dd79d4cba709751077b7c19cb0c5bc7a346c2c424cf9ffbbb62ed486776b6888
 EBUILD rspec-core-3.5.3.ebuild 3164 BLAKE2B 0eb341fc376171025a09bac586b90d4a1f16412bdb384df1d14b3dad7e4784ac4c456acb6dcc400fdeedcd1d9fbb2c6b098f60259bc179e8a9aae3cc4e36e2ae SHA512 fb8fc39c784cf66a63385d6e58abfe2e74833ea5594c0d01887e883003a67603dabea69a2c598bd38ab69a49938136c0462fa4a217363b1d4cd189a9e4946dbe
 EBUILD rspec-core-3.5.4.ebuild 3178 BLAKE2B 511992cfaa43a4fb51e907994c0edf0862d31f6f899c0cc04577d8fd31f48c450a1a82ebeabc5862d10e5a0793d266cabdffd94541ad3ff6016043029d07b1a6 SHA512 93b1179badab718a9ba151b489381a0892ab9975fbe405fcc99cf6b4725965d5aca29b25ec4bce93e2636a8d87ccdf427ad39ba468643f506d8aee4adea04b0f
 EBUILD rspec-core-3.6.0.ebuild 3253 BLAKE2B 26cf65b64b3f0f0d10c53ddf9a2e83b681eb2e6eea777fdf456239ab2cefed43908e10282410e8d775b199021a2806130f44ea55a83fb70cb4fdfdcc734b380d SHA512 776e4095374cfbcd0eb8d0595e5d270a2faf18c506f09dcc9fa531b894e9fcb81b028771a912fee2d4dc2745b6d65cb8e887a2a5d9109edc1cc2fd64e21e1392
diff --git a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
index e2f0bd872aac..cb87ef52d507 100644
--- a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
 
@@ -35,10 +35,6 @@ ruby_add_bdepend "test? (
 		>=dev-ruby/rspec-mocks-2.99.0:2
 	)"
 
-# Skip yard for ruby21 for now since we don't support ruby21 eselected
-# yet and we can't bootstrap otherwise.
-USE_RUBY=${USE_RUBY/ruby21 ruby22 ruby23 ruby24/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
 all_ruby_prepare() {
 	# Don't set up bundler: it doesn't understand our setup.
 	sed -i -e '/[Bb]undler/d' Rakefile || die
@@ -77,15 +73,18 @@ each_ruby_prepare() {
 			sed -i -e 's/Fixnum: 4/Integer: 4/' spec/rspec/core/memoized_helpers_spec.rb || die
 			sed -i -e '/warns when HOME env var is not set/,/^  end/ s:^:#:' spec/rspec/core/configuration_options_spec.rb || die
 			;;
+		*ruby25)
+			sed -i -e 's/SAFE = 3/SAFE = 1/' spec/support/helper_methods.rb || die
+			sed -i -e 's/Fixnum: 4/Integer: 4/' spec/rspec/core/memoized_helpers_spec.rb || die
+			sed -i -e '/warns when HOME env var is not set/,/^  end/ s:^:#:' spec/rspec/core/configuration_options_spec.rb || die
+			sed -i -e '/with mathn loaded/,/^          end/ s:^:#:' spec/rspec/core/formatters/html_formatter_spec.rb || die
+			sed -i -e '/with mathn loaded/,/^    end/ s:^:#:' spec/rspec/core/formatters/helpers_spec.rb || die
+			sed -i -e '/is still a private method/,/end/ s:^:#:' spec/rspec/core/memoized_helpers_spec.rb || die
+			sed -i -e '/leaves a raised exception unmodified/,/^      end/ s:^:#:' spec/rspec/core/example_spec.rb || die
+			;;
 	esac
 }
 
-all_ruby_compile() {
-	if use doc ; then
-		yardoc || die
-	fi
-}
-
 each_ruby_test() {
 	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
 }