gentoo resync : 12.01.2019

3 files changed, 119 insertions, 0 deletions

diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 002f27b23faa..31ebe92c85db 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,7 +1,9 @@
+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.0-git.tgz 386022 BLAKE2B e827f006fe9f05f93b741d021bbb108ae3e98cd23f3388c1fdf2a87d8be349c04e91c810cbb7c47cc99ce99a00f62e13eb01a927b8b89d54dfa437ed46b1d24f SHA512 6d3f431a1f9485009f5029bea967f36cb789be8cf33722b36c40df44e12a2284674c6c8af333bfe8ba8825e032576569fd42c92f798988faad732ac3a720c5e6
 EBUILD rspec-core-2.99.2-r2.ebuild 3518 BLAKE2B 017a60ccb0ac017b08c4d97903a5bd59921fd0c0bc3b4322059d856bfee6eba2c026242bfda1e2083b043c190ad9160c6122ad62350b07aa0a486afbbb3089b6 SHA512 7b22027fa5ae71e80f071c4fc7cf3fa0e291ec42e06e0c07bcd0e94ab2782aa2dd79d4cba709751077b7c19cb0c5bc7a346c2c424cf9ffbbb62ed486776b6888
 EBUILD rspec-core-3.7.1.ebuild 3402 BLAKE2B d3ebf847041e8de5c38b7aae8be737bebfd0657a4871cf3c64c1e959e8626836da02b03d66d8bd63f90b6796253a5f33477fce89a69f2110576450d696a2d217 SHA512 2049e15d68ef34b2512daca6f8bcdca929a066cb186ff5ab8e9c84c2a8d82596a89eed13568b6be55f47f67c8dbc11b8e695eea6537d30745e64dea1f050df7d
+EBUILD rspec-core-3.8.0-r1.ebuild 3226 BLAKE2B 2fa01c60ed69e102482822ab0f5eedffc4758e2b8ee1cf8752139d217c305827500c5d63b0fa4c81a25ea15cb91affc204f38ccfe7403b71a7acbd6213a76d9b SHA512 2481f89ccc98aa346a45f38063f938ef7b7f5526ed87e9157730bc3c9d8424b95a92521472f419dba3dda51476eafa45ca10fa55aa551e9693ae2e425e90d9ed
 EBUILD rspec-core-3.8.0.ebuild 2965 BLAKE2B cb76ba83dce43eda2f511949f085697c832142a34c611d6ec845d7da73801aba37136d392fceacbb3241a69e63f1148631eb2bd584db2d611eb38e52fe5c4004 SHA512 175a24dd2d96a60a39d185aa855b6a1c771d1cf996e5b3898878e86e65fefcb81b399b24f9339c27815268e083bd5f9ce47e1828178818d0fa7e33134a3be837
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/files/rspec-core-3.8.0-ruby26.patch b/dev-ruby/rspec-core/files/rspec-core-3.8.0-ruby26.patch
new file mode 100644
index 000000000000..7c4bc9f7e50d
--- /dev/null
+++ b/dev-ruby/rspec-core/files/rspec-core-3.8.0-ruby26.patch
@@ -0,0 +1,23 @@
+From 5e6171ee7dadd520991153009eb01d7be3c82e7e Mon Sep 17 00:00:00 2001
+From: "Keiji, Yoshimi" <walf443@gmail.com>
+Date: Mon, 10 Dec 2018 22:40:16 +0900
+Subject: [PATCH] Fixed warnings: lib/rspec/core/metadata.rb:172: warning:
+ Object#=~ is deprecated; it always returns nil (#2582)
+
+---
+ lib/rspec/core/metadata.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/rspec/core/metadata.rb b/lib/rspec/core/metadata.rb
+index 094a7a3b3..c68627ac5 100644
+--- a/lib/rspec/core/metadata.rb
++++ b/lib/rspec/core/metadata.rb
+@@ -169,7 +169,7 @@ def file_path_and_line_number_from(backtrace)
+         end
+ 
+         def description_separator(parent_part, child_part)
+-          if parent_part.is_a?(Module) && child_part =~ /^(#|::|\.)/
++          if parent_part.is_a?(Module) && /^(?:#|::|\.)/.match(child_part.to_s)
+             ''.freeze
+           else
+             ' '.freeze
diff --git a/dev-ruby/rspec-core/rspec-core-3.8.0-r1.ebuild b/dev-ruby/rspec-core/rspec-core-3.8.0-r1.ebuild
new file mode 100644
index 000000000000..37a30a9087f9
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.8.0-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core"
+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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="highlight"
+
+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 )
+"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/coderay-1.1.1
+		dev-ruby/syntax
+		>=dev-ruby/thread_order-1.1.0
+		>=dev-ruby/rspec-expectations-3.8.0:3
+		>=dev-ruby/rspec-mocks-2.99.0:3
+	)"
+
+PATCHES=( "${FILESDIR}/${P}-ruby26.patch" )
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Avoid dependency on cucumber since we can't run the features anyway.
+	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+	# Duplicate exe also in bin. We can't change it since internal stuff
+	# also depends on this and fixing that is going to be fragile. This
+	# way we can at least install proper bin scripts.
+	cp -R exe bin || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
+
+	# 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/{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
+
+	# 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
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}