gentoo resync : 12.03.2021

4 files changed, 4 insertions, 97 deletions

diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index af72c3eb7bc0..e0ff7c82c502 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -2,12 +2,10 @@ DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab6
 DIST rspec-core-3.10.0-git.tgz 396978 BLAKE2B 6fb8947598234351595a8832e47baf941f2ca3e8bd39570fba79b9539a7af51144ef41a257d309eddab895ba1e8ba7fe1efb22c855aaab7f1556998d7024ef4a SHA512 f00531021e20fd389dd7a5129ff3bf338c3fa35dfa5e15b0b73ba16eb081d3d7ed2014b1b2ea4ad2682e06f2822c2b895736ac9e80d6af3fba1aecb5cfcea8a3
 DIST rspec-core-3.10.1-git.tgz 398302 BLAKE2B 3ecd2a93b77435ef44dd7e52e2987155f71de3b04376dfbfc9c831ce075b4105f6a23a210f8508784b66c46f1126c188a3bd0548cc4f24060373b9c7e0b79101 SHA512 2d134e742e36cfaac0a52fa7ebd949391cfe58419956536a65fa3aefa2c7f3638fe19f7324ca3e0d2642cc5a9d33de11b09bd571844f1cfae9c077e5f27563d5
 DIST rspec-core-3.8.2-git.tgz 387788 BLAKE2B e6cf93f5cef70f53039b6c22fc875cff58eaff4c0c7d4e75d23dedfbe16081980c6fe575d3082dbe6ed9edc8e81f0cbb9e29618da78af40a94c517a859f9d793 SHA512 2fe88ee3d66ecf134562dfa7b1001f23a1a750640c4f65cdec64d85dd735e0fde9d91479286f8f9c38064746813f41632d12d21b3926724ccd7c9ded50d2a7c8
-DIST rspec-core-3.9.1-git.tgz 392102 BLAKE2B e41d4d930201e854015b486eb97e32f356027a837930f061f6282215a0d7e80db99c30c8b537d10f9359380512b46a03fe10ec382f5403704cdc7f0c1796aeed SHA512 2da714ebf35e78be789758857efbebc69548df7a11fff8bcd74a854b61485ef726cf0cec781e27a97d20f4eac0010aad50656b6074248c94b1833d4cb267189a
 DIST rspec-core-3.9.3-git.tgz 396080 BLAKE2B ea52a33586dc32af49a72950c7dbf24eef52a74891b2d7004ec4c5083e2e6d63c602f5033fba3a8ec1dfe6e8da349208b468a79b4e16aa5150d2fc8e93055c0e SHA512 f821ae3017c0fd9ac7f3ced0e81d0ebc54f2c17261f426c58a46c0bf1debb20efca7acc4b751b671e160de72ce5790f897bcb55d5d276fab228a4ea8d388a046
 EBUILD rspec-core-2.99.2-r2.ebuild 5099 BLAKE2B 110fd632f3b1630b73eb41e876bad1817580fb36ba39726838a6e65039ae93c45f62e4ffc3bf263ce36c1904fd0c3401e29e3644ab44118a244316755f645421 SHA512 5f4f15f61efa55c4f3b250d9c39dbe2d2b5a7f4fa84d14c79cbfaf49dbd62503f1d219f221a6b337cc6b22cf62ffecef68bb1c5ad6147eec282e72588a80ab37
 EBUILD rspec-core-3.10.0.ebuild 3122 BLAKE2B 58bd8badcbb0964abb5423e670851cc5ef92a3a5fa9d6447d3e3aa956ed68663ceedad163cdee1b444d38c430951e13e3e1d8c36e602997b0f6b5390c6d9ddcd SHA512 6f3733d2bb0d380179660affa708431db24eee41d1893efcfde3e05ba7ebcda304aa1ddd96f34b4ce979e167e4dafc91e8545b01180f55718ba022f3c2b0a8b8
-EBUILD rspec-core-3.10.1.ebuild 3122 BLAKE2B 58bd8badcbb0964abb5423e670851cc5ef92a3a5fa9d6447d3e3aa956ed68663ceedad163cdee1b444d38c430951e13e3e1d8c36e602997b0f6b5390c6d9ddcd SHA512 6f3733d2bb0d380179660affa708431db24eee41d1893efcfde3e05ba7ebcda304aa1ddd96f34b4ce979e167e4dafc91e8545b01180f55718ba022f3c2b0a8b8
+EBUILD rspec-core-3.10.1.ebuild 3129 BLAKE2B 2ec064d95a419e5b85ef02891a610a3866c3f6f63aa5b3088c933eccd05fee80b2eab641eb62dea411649e361fc5acfbacb35297bdda4a6cda025055c3ce61fb SHA512 56b35b1a76c2857ea957e354d742d1b8368244c4cd4cb509c8f50b77b4849755f0e9fd3837172b5b6a59838fe86fdc9c9586aece51065f53feb7df85c5919c2e
 EBUILD rspec-core-3.8.2.ebuild 3154 BLAKE2B 18a751083c7e36cf7fef603b15c948ea70a6db4c480cfcd199e09dbe98ba7a9050235d1b9881365ed66855ed1d5899d8743f48bde7510aadb0d5d8107de1768a SHA512 a3a55302597ed4059ebc648fd21d708c8681c8ac5601cd32cefa8f629ce16925a3b1c10d3681776b902d1d924632e92b88b9929d9bcaabb71203d0686cd31007
-EBUILD rspec-core-3.9.1.ebuild 3129 BLAKE2B 685f8ea50718637f1407d5d982340fe5bd80aa860e73c5c4b8bdfbe9540d73109a456921769a5f4dda64f59b2d6bbf3789d7a95e62b337a5b3c8c7045d740173 SHA512 79131c570ca03eaff7aa94a4d6cae829954792e041411db08dbfeeff7b5d08cf766d663f46bd798a46f55e738cf2f0055d2faaf50238baecc1d5c420f068fb62
-EBUILD rspec-core-3.9.3.ebuild 3129 BLAKE2B 685f8ea50718637f1407d5d982340fe5bd80aa860e73c5c4b8bdfbe9540d73109a456921769a5f4dda64f59b2d6bbf3789d7a95e62b337a5b3c8c7045d740173 SHA512 79131c570ca03eaff7aa94a4d6cae829954792e041411db08dbfeeff7b5d08cf766d663f46bd798a46f55e738cf2f0055d2faaf50238baecc1d5c420f068fb62
+EBUILD rspec-core-3.9.3.ebuild 3125 BLAKE2B 04538d73efafec6786cb10a7b837c9389bc9e7552ca1f78987476fc9defde6b1ffe21b83aa1d3b81dddc4b51f3ba263ad860197326dcc8483831ebd4cea8da13 SHA512 aea9d141a9ebdddde385127a3d01df837903d571582f091d98831348803c7fabd86d52cd4665adc19e4184003f3c629685f5b98ae7c20cf09dd69e662b716dc9
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
index 540f58d9c7a9..deb0b8bb5638 100644
--- a/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_TEST="none"
 
diff --git a/dev-ruby/rspec-core/rspec-core-3.9.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.9.1.ebuild
deleted file mode 100644
index da92ce03633b..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.9.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-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
-
-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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="highlight"
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	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
-		>=dev-ruby/rspec-support-3.9.1:3
-	)"
-
-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"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.9.3.ebuild b/dev-ruby/rspec-core/rspec-core-3.9.3.ebuild
index da92ce03633b..23c73a66d3ab 100644
--- a/dev-ruby/rspec-core/rspec-core-3.9.3.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.9.3.ebuild
@@ -21,7 +21,7 @@ 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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 
 SUBVERSION="$(ver_cut 1-2)"