gentoo resync : 03.11.2019

3 files changed, 69 insertions, 9 deletions

diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index a7a3e4153111..7952d52747ca 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,5 +1,7 @@
-DIST rspec-rails-3.7.2.tar.gz 129851 BLAKE2B b37619b4a953fa44ef402a0dea1531837932dc7bc147c08b29bf85dcad61c7ca72b30f28edc391ae05d5040dcc902d6571342bb51559de84ed0c93244deffbec SHA512 a1dbbde3539b09c33d85c9307126df09c508fcf39abc25a6438fb0582ec19049ee1888d7d17d256d33bba08c29792a0ec30dabc37d870a369580a58cb7ef03df
 DIST rspec-rails-3.8.2.tar.gz 135513 BLAKE2B deae49ce0ce97c78fafe910cb73a196a404711adadb896a13bb40c82ecd6f2fd28129c0267057ce739d648ffe19bdf61799512bac97e9da3be03e0f8dd43d130 SHA512 02d60a0135b4f4b52e2721f9a79363310b60acb8252d4bb44220d37dd346605a6cd3db6525d2d8d77b9471dd91888c9a3dd02e541012f39d0d47c33f38c98bbe
-EBUILD rspec-rails-3.7.2.ebuild 1448 BLAKE2B edb9e628276bc97d90ee7f9272145da0f03fc50d3736362e45851b113dace36b93544fef8c8a4cefe68d93d265d2bd7bc4e4ab9c6f523147a19c265f20e60c40 SHA512 b8a8b28c585ea62e3d29c07b01e0758503647561b3f0b798354ff3097433890245baf3b4b83491620b1575d77f5941867adfc4c5bd27e0957cf224def09ab466
+DIST rspec-rails-3.8.3.tar.gz 138053 BLAKE2B dab5764d65d484a8a808a2104a3ab093c2ef2e822cacd136996eddb767a972f89df9a459509e701e5541f6b9c42a3b700a4daa816c0391474e004b4558feb2a7 SHA512 210a278cf82c20c4f5ef7faa5e253b9e18609d34467e91cb8728e6116c7cfb15d17fe8941fc15b776bb169e0275df623535b86fc160afe3e49432948f246a165
+DIST rspec-rails-3.9.0.tar.gz 142966 BLAKE2B 2f75b1a2e666c8b790be4aeb3add3814558718049a818bdcbd8ff07b5f837727d34628fbba68fd9ff832b864261cac2e545991daa5ad3f3b72304b411801295c SHA512 f0130bbfcc8367a1ef6d8f259ab04a623720068f205c2454117f988c8405885fd19056692b46d0a04d7ba2d0d24692acf8283a77bb5292054f990002fae10af0
 EBUILD rspec-rails-3.8.2.ebuild 1431 BLAKE2B 7fc7098a39752a8243aa74197abbe1248c57764ef6a6d781eca82d10e1f6de42c83fc8da11d439f9525a6cb59ba63f0dc0ea5451ce46c9879eb76543ac5ec90d SHA512 45cb8ce308d0fa2d90e9b3b34d443bd60591f64e27a0f4f6a4a82c8489eb317fbc7774a0d39af318d10e8ca60949e1808b540c853c59307016359fc6110ce9a2
+EBUILD rspec-rails-3.8.3.ebuild 1459 BLAKE2B c31f9b9bba3e58b1a3e5cda4a7ca79ef70e4f3e22ae2b4058e1472cab069ab8f82c106959182e9d54dd1ad31b225ca3123fae7df87e0a7469dbcf995ddc2a068 SHA512 52ead09f8510a2cd7295df49c378d91d7171dfaec0a1f7335b1255128c8437c21e4815367f57dcebe0d47c43aa4bb88a6c0d37f1a7242c03472c6fabccf32a82
+EBUILD rspec-rails-3.9.0.ebuild 1459 BLAKE2B c31f9b9bba3e58b1a3e5cda4a7ca79ef70e4f3e22ae2b4058e1472cab069ab8f82c106959182e9d54dd1ad31b225ca3123fae7df87e0a7469dbcf995ddc2a068 SHA512 52ead09f8510a2cd7295df49c378d91d7171dfaec0a1f7335b1255128c8437c21e4815367f57dcebe0d47c43aa4bb88a6c0d37f1a7242c03472c6fabccf32a82
 MISC metadata.xml 343 BLAKE2B 3c1684a27906b05d1f72b32ec225db0fcd6e051bf9d6a3b4f83e3cc1ff63201410594a6b2a2664ca008b7756b6e98cbbcc3981136075dcc41a622f3ad3566b36 SHA512 bc9d8d9978e4bd845b10fabf5256e53a1a0c3835305f7e72502d1074e2692fdeaca15b2ecade251be8dbbae544167072a920db14a964644b70782f37b9d91369
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.7.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.8.3.ebuild
index bb19436f8e13..bc90364ea0a4 100644
--- a/dev-ruby/rspec-rails/rspec-rails-3.7.2.ebuild
+++ b/dev-ruby/rspec-rails/rspec-rails-3.8.3.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
-RUBY_FAKEGEM_TASK_DOC=""
+#RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
 
-inherit ruby-fakegem versionator
+RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
+
+inherit ruby-fakegem
 
 DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="http://rspec.info/"
+HOMEPAGE="https://rspec.info/"
 SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
@@ -21,7 +23,7 @@ SLOT="3"
 KEYWORDS="~amd64"
 IUSE=""
 
-SUBVERSION="$(get_version_component_range 1-2)"
+SUBVERSION="$(ver_cut 1-2)"
 
 ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
 	>=dev-ruby/actionpack-3.0:*
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.9.0.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.9.0.ebuild
new file mode 100644
index 000000000000..bc90364ea0a4
--- /dev/null
+++ b/dev-ruby/rspec-rails/rspec-rails-3.9.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+#RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="RSpec's official Ruby on Rails plugin"
+HOMEPAGE="https://rspec.info/"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
+	>=dev-ruby/actionpack-3.0:*
+	>=dev-ruby/railties-3.0:*
+	=dev-ruby/rspec-${SUBVERSION}*"
+
+# Depend on the package being already installed for tests, because
+# requiring ammeter will load it, and we need a consistent set of rspec
+# and rspec-rails for that to work.
+ruby_add_bdepend "test? (
+	>=dev-ruby/capybara-2.2.0
+	>=dev-ruby/ammeter-1.1.2
+	~dev-ruby/rspec-rails-${PV}
+)"
+
+all_ruby_prepare() {
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	rm -f .rspec || die
+
+	# Avoid bundler-specific specs.
+	rm -f spec/sanity_check_spec.rb || die
+
+	# Avoid broken controller generator specs for now.
+	rm -fr spec/generators/rspec || die
+
+	# Avoid loading rspec/rails explicitly since ammeter/init will also
+	# do this and loading it twice causes an error
+	sed -i -e '/rspec\/rails/ s:^:#:' spec/spec_helper.rb || die
+}