gentoo resync : 03.11.2019

2 files changed, 17 insertions, 25 deletions

diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index b44c2cab938a..62e546b73164 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,8 +1,8 @@
 AUX rspec-core-3.8.0-ruby26.patch 894 BLAKE2B 7639c2836caa1602320288ff7662a40e3074aa82ffd9bc56639b1db9d618a81b6ad78bea5dbed09fe68455a446f06f2cc2276f3313650f9d8b58b2c5db01b4f3 SHA512 8aca41f68b16a8790c71e618e0ab18dc7e55651e4df91a92ba9089498c5995c36fefa09cd9532186882dd6a4194a21f7bb5f25e180151fde26c4616f60b5712f
 DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab63230ab07ea97928d6f66face8d07ab54d87f19535f5f235c441b2da6dec17ef2a889e9ccd7e83d987086e24afd1b82 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44
-DIST rspec-core-3.7.1-git.tgz 376819 BLAKE2B 6747ffd8f2d426718376b51356d8838a7db0d0246ee619e8edef30bd9f7aeeb80bd0488e4fc73b0a00d119074c35055f6b9d0cbbe6160ae78d0727ce9848a710 SHA512 1561d044281c1b8b97cc89033ad991548fa74abbc5f20d3951d3f3de754c581a027f9ccb2bd0107c05e744d3b2804555cf4cf207e72adf365b28fc7ce052dab8
 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
-EBUILD rspec-core-3.7.1.ebuild 3419 BLAKE2B 65b5734208e5d1c6d26c934ab92a1f15522f5305551bec461aa738c87a3680de10d780c12991dc5ce31bf5ee5afe45814e5e20011a63ec6f79a58825be4eb195 SHA512 8579d22bcca77c546cdb11d33262384a6d3a5115195869d74a99b46a0d7419ec4f74c5aa1a2f59067efec60b87fb626d621e5f4defaf62bb7d7b5ea502db3653
 EBUILD rspec-core-3.8.2.ebuild 3169 BLAKE2B 66a803f6cde8a21b49a53fdd21d29a9dd03bd37d65301bd4f63677cad5af301b825584c068f8fa2cd30a9888268271241dbc092356c226e198175bfc731b85ab SHA512 810e3448980b61cbfd6273b216a8fe480335774de82d50066af20b26bef570f6b4525be83af13eb96188e47f638e0611992fbbaa800f0950ce11a4fa1dd4bb50
+EBUILD rspec-core-3.9.0.ebuild 3138 BLAKE2B 92284ab8be4daa3bdc685a3cac1bd3da00d8b1d1676f06ab77b01a8c3de3d3f520bef42fad6e03b25dbeafaffc211c180f1c570f10a0d24007d7ec716ecf6777 SHA512 2e7b80a24f82eaf799610a77b39ce27ec7513a48f463dcf396a6de1bbd8afd88aeb1c7b52e44000a53b046257a8719daafae4e6e35743cca51b58fa33b156139
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.9.0.ebuild
index dcaf66c0833c..fdb4d17576ec 100644
--- a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.9.0.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
 
@@ -14,7 +13,7 @@ RUBY_FAKEGEM_EXTRAINSTALL="exe"
 
 RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
 
-inherit ruby-fakegem versionator
+inherit ruby-fakegem
 
 DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
 HOMEPAGE="https://github.com/rspec/rspec-core"
@@ -22,23 +21,23 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 
-SUBVERSION="$(get_version_component_range 1-2)"
+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.0.9 )
+	highlight? ( >=dev-ruby/coderay-1.1.1 )
 "
 
 ruby_add_bdepend "test? (
 		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.0.9
+		>=dev-ruby/coderay-1.1.1
 		dev-ruby/syntax
 		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/rspec-expectations-3.3.0:3
+		>=dev-ruby/rspec-expectations-3.8.0:3
 		>=dev-ruby/rspec-mocks-2.99.0:3
 	)"
 
@@ -60,32 +59,25 @@ all_ruby_prepare() {
 	# Avoid aruba dependency so that we don't end up in dependency hell.
 	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
 	rm -f spec/support/aruba_support.rb || die
-	rm -f spec/integration/{failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
+	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
 	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
 
 	# Avoid a spec failing due to path issues
 	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
 		spec/rspec/core/configuration_spec.rb || die
 
-	# Work around coderay incompatibilities
-	sed -i -e '/be_highlighted/,/end/ s/32/33/' \
-		-e '/highlights core RSpec keyword-like methods/,/^      end/ s:^:#:' \
-		spec/rspec/core/formatters/syntax_highlighter_spec.rb || die
-
-	# Avoid a spec that depens on dev-ruby/rspec to lessen circular
+	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
 	# dependencies, bug 662328
 	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
+
+	# Avoid a spec depending on specifics on local networks
+	# This fails when localhost resolves to ::1 which may be a
+	# ruby regression in the drb/acl code.
+	rm -f spec/rspec/core/bisect/server_spec.rb || die
 }
 
 each_ruby_prepare() {
 	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-
-	# case ${RUBY} in
-	# 	*ruby22)
-	# 		# The rubygems version bundled with ruby 2.2 causes warnings.
-	# 		sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
-	# 		;;
-	# esac
 }
 
 each_ruby_test() {