gentoo resync : 15.01.2020

3 files changed, 22 insertions, 12 deletions

diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 7bba32f43dc2..e5d3a88f218c 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,7 +1,7 @@
 DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab63230ab07ea97928d6f66face8d07ab54d87f19535f5f235c441b2da6dec17ef2a889e9ccd7e83d987086e24afd1b82 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44
 DIST rspec-core-3.8.2-git.tgz 387788 BLAKE2B e6cf93f5cef70f53039b6c22fc875cff58eaff4c0c7d4e75d23dedfbe16081980c6fe575d3082dbe6ed9edc8e81f0cbb9e29618da78af40a94c517a859f9d793 SHA512 2fe88ee3d66ecf134562dfa7b1001f23a1a750640c4f65cdec64d85dd735e0fde9d91479286f8f9c38064746813f41632d12d21b3926724ccd7c9ded50d2a7c8
-DIST rspec-core-3.9.0-git.tgz 391483 BLAKE2B 0e25918f4df4123c9cc9b0b00e2df2d42e1bf9afb160840c2e1db5c5c9f8e1b46f147b66d7ba7d2b3d437d7e47bec8e321c9f9001c9e58d22173466762cd3215 SHA512 c4e1136ea671d51f00c6de3067a479b15785fcb0f580fbdc57a9d35f852f10ec4b86e842a534536cc520175510de559f4d03dbc3fbd34fb22df411e89d06d662
-EBUILD rspec-core-2.99.2-r2.ebuild 4264 BLAKE2B 80c057c80661ece49bcf32aa5a26cf7c35fc3c28faf7e88629ddc166775221db5be97a573ff1819d90c1ff685efc65dd9b27b635455c51ba9cb6d6dff3ad78b4 SHA512 fb90598eedaa211378ecf67a457266deb88ef4b86693247e825fa195daeedaef8456475c1a14bbea5f6f966eae7257bcd2b8f36bedd72aeb2a6e4a71d0e92004
+DIST rspec-core-3.9.1-git.tgz 392102 BLAKE2B e41d4d930201e854015b486eb97e32f356027a837930f061f6282215a0d7e80db99c30c8b537d10f9359380512b46a03fe10ec382f5403704cdc7f0c1796aeed SHA512 2da714ebf35e78be789758857efbebc69548df7a11fff8bcd74a854b61485ef726cf0cec781e27a97d20f4eac0010aad50656b6074248c94b1833d4cb267189a
+EBUILD rspec-core-2.99.2-r2.ebuild 5114 BLAKE2B f9cfd721c9e99addcc3d92bb9bf63e575686c94b045a7920c44ea5bcf8ef071d82d8fd1ab6558b76f19438bda0c6a52fdd4a35256ccecb59865ade4c19e98106 SHA512 7c4d48e2ea7780dfb56f38dd6aa5223964a9570e5009a34ebce09c904b65e7c34a5f4aa646c88db7d305aca7d37e8d7849abbde79d6af32b2ad35245dd348324
 EBUILD rspec-core-3.8.2.ebuild 3169 BLAKE2B 66a803f6cde8a21b49a53fdd21d29a9dd03bd37d65301bd4f63677cad5af301b825584c068f8fa2cd30a9888268271241dbc092356c226e198175bfc731b85ab SHA512 810e3448980b61cbfd6273b216a8fe480335774de82d50066af20b26bef570f6b4525be83af13eb96188e47f638e0611992fbbaa800f0950ce11a4fa1dd4bb50
-EBUILD rspec-core-3.9.0.ebuild 3138 BLAKE2B 92284ab8be4daa3bdc685a3cac1bd3da00d8b1d1676f06ab77b01a8c3de3d3f520bef42fad6e03b25dbeafaffc211c180f1c570f10a0d24007d7ec716ecf6777 SHA512 2e7b80a24f82eaf799610a77b39ce27ec7513a48f463dcf396a6de1bbd8afd88aeb1c7b52e44000a53b046257a8719daafae4e6e35743cca51b58fa33b156139
+EBUILD rspec-core-3.9.1.ebuild 3146 BLAKE2B 27080ded088528a1c53d252e67a66a513b60ba0247a7552663b26560bea55ea6939affe58d5f0a4fc667914b73dc0fe3081514fa047096b006f01b9c919461af SHA512 2d104cd46aba233c32f0c8a26dfbc65323e7a6e0e7560b56828a9a1fb48d77b4ef39d0cf7ff114fb448361f36fb75453413dfea6d13ecd83b970e7f9a47c9e98
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
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 185e565a5fc6..2f4744eb8f1a 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
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST="none"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -30,7 +30,6 @@ IUSE=""
 ruby_add_bdepend "test? (
 		>=dev-ruby/nokogiri-1.5.2
 		dev-ruby/syntax
-		>=dev-ruby/zentest-4.6.2
 		>=dev-ruby/rspec-expectations-2.14.0:2
 		>=dev-ruby/rspec-mocks-2.99.0:2
 		dev-ruby/rspec:2
@@ -60,15 +59,16 @@ all_ruby_prepare() {
 
 	# Remove minor functionality to remain compatible with rake 12
 	sed -i -e '/last_comment/ s:^:#:' lib/rspec/core/rake_task.rb || die
+
+	# Avoid autotest specs since this is no longer part of zentest
+	sed -i -e '/autotest/ s:^:#:' spec/spec_helper.rb || die
+	rm -rf spec/autotest || die
 }
 
 each_ruby_prepare() {
 	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
 
 	case ${RUBY} in
-		*ruby23)
-			sed -i -e 's/SAFE = 3/SAFE = 1/' spec/support/helper_methods.rb || die
-			;;
 		*ruby24)
 			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
@@ -92,6 +92,16 @@ each_ruby_prepare() {
 			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
 			;;
+		*ruby27)
+			sed -i -e 's/SAFE = 3/SAFE = 0/' 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
+			sed -i -e '/PROC_HEX_NUMBER =/ s/@//' lib/rspec/core/filter_manager.rb || die
+			;;
 	esac
 }
 
diff --git a/dev-ruby/rspec-core/rspec-core-3.9.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.9.1.ebuild
index fdb4d17576ec..4d2cc3665e6a 100644
--- a/dev-ruby/rspec-core/rspec-core-3.9.0.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.9.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST="none"
 
@@ -28,7 +28,6 @@ SUBVERSION="$(ver_cut 1-2)"
 
 ruby_add_rdepend "
 	=dev-ruby/rspec-support-${SUBVERSION}*
-	!!<dev-ruby/rspec-core-2.14.8-r4
 	highlight? ( >=dev-ruby/coderay-1.1.1 )
 "
 
@@ -39,6 +38,7 @@ ruby_add_bdepend "test? (
 		>=dev-ruby/thread_order-1.1.0
 		>=dev-ruby/rspec-expectations-3.8.0:3
 		>=dev-ruby/rspec-mocks-2.99.0:3
+		>=dev-ruby/rspec-support-3.9.1:3
 	)"
 
 all_ruby_prepare() {