gentoo resync : 31.01.2021

4 files changed, 8 insertions, 92 deletions

diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 763589a99118..7d88fd28dd43 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,17 +1,13 @@
 DIST rspec-support-3.10.0-git.tgz 72853 BLAKE2B 59c585800013fff2dea15ad33dfeed430c9a932206623bb368f4f4660682f537391090cc8538f9052ebafcab336ebd2fdc79003844330adc447be6d977e5648b SHA512 f7183f01b7a7ad55360823617a88a46b2351063d85d81bbd722ecf8b4bb41d014c9ae0af6123caa9405374d484aa61971153f4c59d009986aa20e93afd4a177d
 DIST rspec-support-3.10.1-git.tgz 74378 BLAKE2B b0b077c50572b654a8aec6dbbacb77a5ccbb68772a1a33c59ce1b424f0bfb6b72d1d4770234a8dec23a4126dc825189f67811913580f94570af7b8c33e217ab3 SHA512 e7240e591b76dc714880dc91da1e755a0d44d81f0de6861858293f4132a353b3b41a96175a58d81813222f254e6dfaac92170ab2fd3a8bd8e73ce7ba924e614f
+DIST rspec-support-3.10.2-git.tgz 74812 BLAKE2B e6c7e768d0df05fa5e77055efcc69699192928a35029264300faccf500b1ce7367e74e9c2ae0f7f8f0a5e755692ac83b982d0a3dab3da3ab697ad2c5766aa30d SHA512 bd1fb5d737dfdbb7399d766854f0b173dad89675bac580cf65c5d42ab6cd04ad1773e7cfa875dfa4c6fac14f4ccbd6b48813bae5de26c931c804962d29b014be
 DIST rspec-support-3.8.2-git.tgz 69112 BLAKE2B 84600d3e2b4d847618f7f53efdf60be3836c7ba6c586de88cdf085e84749e616ad556683b1e7b588b9aec08adee10054e64ae1daf69c6ad58a00d1c2447171f7 SHA512 9fb9f8f2507edee5e7c414d32c1641803eed7a5e17fd300308449277ec6efb786f07207d8f28bcea0a669b8d76a2da53057488d149990ae973c0f7a0343180dc
 DIST rspec-support-3.8.3-git.tgz 69654 BLAKE2B 1ea3eed0602655fbf5f92cdc14217eb8377d980378c9835a342840bb7a00bb1cf095b6fe57a24f80c01ce1835b398ac3c1bd11ac1f95a90b501be6a000e8f6d2 SHA512 90d678e08ca93be30ace986a60aba4c4a81a58d7c56d34863aca70f91efe92480299970aa7eb158e3f8c4878b1ea3303aa0afabfc8c7782bc78f7f63b90b4f9a
-DIST rspec-support-3.9.0-git.tgz 69705 BLAKE2B 96d5cea9c63e6ec2acdbbfc4b7253acc26dbf5202c3bafc4a461123380db7d56958d2bbc787eaf3f1c480801441f6a134e1f29b1d3ce23b1bd3225fe4d8f37a5 SHA512 10e8fa4af59097891219f00e2ced5940e7a5bc67d946fbd348683d2246a4a491e62f7bac6bb757e14d82bb0ba970fe5633609ca4ab2c97c4900719b8004cf4b5
-DIST rspec-support-3.9.1-git.tgz 70196 BLAKE2B 1edf8e64f6121cb5ed9f543c6ee1aac54f53dfa33e25caf278803a3284414e6d0aba69d1d137e0b80b482e798148ec865feb6e3ab0e9e5d86d13c9aa3754fe75 SHA512 d8267117c9e785766860d781d1e6190714f0d3bb378bf19def213d0807cdfa706f90ef54ff24e8e71ea1e14c6bfa175879250525d3baa7282d997bdc2aa13a0d
-DIST rspec-support-3.9.2-git.tgz 70021 BLAKE2B 410464836d322545a05277cda5cd5cca8b9d2dcb4bf4299850e089d7a169d05aa630395a7c6fc42dffa29d7c6739bcfbf734fa8b0bb69d15b03243534c8da67f SHA512 436a3400a354012b06f471a339386667ed4854814b780f9c21d71182b001b3b4ab45ade578b56e4f2dec81325de5d88baa783f7e56b27bb215cfdc58448b10f1
 DIST rspec-support-3.9.4-git.tgz 72490 BLAKE2B 03c3ba8316a2c6a79faf68db87adf193b684b82119dd9c5b67f2954f3ce72cf03e3e16898e2f5d57d76aef37bb8fb08ab8dacf8aaef6d1445a8257e2be14afe5 SHA512 95be2e03c37117d6bc132ce466779a8ac3c4fedadfb2a6dabb1fa11601aae908e341c87436dd526bbc8b02040b23200c95bd113d0475405afdb4acd099c67403
 EBUILD rspec-support-3.10.0.ebuild 1758 BLAKE2B 315cac626244c7ea99ade12401af0f8f808fea0262c671b1c36ef83e7c130b6bf82531cf09dbb46080b47faf3caeaf35ac24a77f8e36bb94c43cd56ed849f878 SHA512 9cbb32f50462e79f5cb6903683a732214ef2d337a88004143cb016042a5bba5332482c1586077407d29ea07d40f0ba9d4ab102f023ef631c12c5c55d6bf909bb
 EBUILD rspec-support-3.10.1.ebuild 1758 BLAKE2B 315cac626244c7ea99ade12401af0f8f808fea0262c671b1c36ef83e7c130b6bf82531cf09dbb46080b47faf3caeaf35ac24a77f8e36bb94c43cd56ed849f878 SHA512 9cbb32f50462e79f5cb6903683a732214ef2d337a88004143cb016042a5bba5332482c1586077407d29ea07d40f0ba9d4ab102f023ef631c12c5c55d6bf909bb
+EBUILD rspec-support-3.10.2.ebuild 1758 BLAKE2B 315cac626244c7ea99ade12401af0f8f808fea0262c671b1c36ef83e7c130b6bf82531cf09dbb46080b47faf3caeaf35ac24a77f8e36bb94c43cd56ed849f878 SHA512 9cbb32f50462e79f5cb6903683a732214ef2d337a88004143cb016042a5bba5332482c1586077407d29ea07d40f0ba9d4ab102f023ef631c12c5c55d6bf909bb
 EBUILD rspec-support-3.8.2.ebuild 1562 BLAKE2B f937ddd8e24d2c6207b1c4e96871d64d3c638c609364eb39f652f5036661f860d7c5038998ca6c6d9bea292d93c917aac4af099ab3519ac0d437580ab9a1fe77 SHA512 c53557a26f755767ce56ce3c041370845a282a3440b82e242e06c444ad971b3f7d6b21a4f3e7335f05e7fd44242e7289e4600a10c0c51d495b81f4fc4f48a468
 EBUILD rspec-support-3.8.3.ebuild 1540 BLAKE2B ee0b161150293923d5c1b068cfc6a27d46e99544902b2c8e582f4a7a63b85a94ec146e821a2706ec857e1b853f847ca2abf2e48a7f9b882ad5d428dc2cf97bc2 SHA512 cc2e2141826574d15a10b30604432d99de74ab5f639bf126b7690c35f14e378c1db7297bb055842f970b363980f7a111436dd65db2ece4845ce18f739614bcce
-EBUILD rspec-support-3.9.0.ebuild 1540 BLAKE2B ee0b161150293923d5c1b068cfc6a27d46e99544902b2c8e582f4a7a63b85a94ec146e821a2706ec857e1b853f847ca2abf2e48a7f9b882ad5d428dc2cf97bc2 SHA512 cc2e2141826574d15a10b30604432d99de74ab5f639bf126b7690c35f14e378c1db7297bb055842f970b363980f7a111436dd65db2ece4845ce18f739614bcce
-EBUILD rspec-support-3.9.1.ebuild 1540 BLAKE2B ee0b161150293923d5c1b068cfc6a27d46e99544902b2c8e582f4a7a63b85a94ec146e821a2706ec857e1b853f847ca2abf2e48a7f9b882ad5d428dc2cf97bc2 SHA512 cc2e2141826574d15a10b30604432d99de74ab5f639bf126b7690c35f14e378c1db7297bb055842f970b363980f7a111436dd65db2ece4845ce18f739614bcce
-EBUILD rspec-support-3.9.2.ebuild 1701 BLAKE2B 3c3e4caf9d03642d48f3ad41db681caa7f035e81874ab0839991a7cafc089b8f5881d069b852bfb6e2121ec4d3474d9f728e643f3d414d94afa9e57881e4812a SHA512 1d82297a1fd689805322ecc9ab43876cd7dcae5018ede1b685b5710c6142625a7184e426e41b851604c811eb4c40e441b5ba5d67fda2bf90659804196fb72e05
 EBUILD rspec-support-3.9.4.ebuild 1758 BLAKE2B 315cac626244c7ea99ade12401af0f8f808fea0262c671b1c36ef83e7c130b6bf82531cf09dbb46080b47faf3caeaf35ac24a77f8e36bb94c43cd56ed849f878 SHA512 9cbb32f50462e79f5cb6903683a732214ef2d337a88004143cb016042a5bba5332482c1586077407d29ea07d40f0ba9d4ab102f023ef631c12c5c55d6bf909bb
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.9.2.ebuild b/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
index 592e2b508da5..6b2a13cb99da 100644
--- a/dev-ruby/rspec-support/rspec-support-3.9.2.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -21,7 +21,7 @@ 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=""
 
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.8.0:3 >=dev-ruby/thread_order-1.1.0 )"
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
 
 all_ruby_prepare() {
 	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
@@ -45,3 +45,7 @@ each_ruby_prepare() {
 	# Use the ruby version being tested
 	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
 }
+
+each_ruby_test() {
+	RUBYLIB=lib ${RUBY} -S rspec spec || die
+}
diff --git a/dev-ruby/rspec-support/rspec-support-3.9.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.9.0.ebuild
deleted file mode 100644
index e941c51e7378..000000000000
--- a/dev-ruby/rspec-support/rspec-support-3.9.0.ebuild
+++ /dev/null
@@ -1,42 +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"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-support"
-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=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.8.0:3 >=dev-ruby/thread_order-1.1.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove spec that, by following symlinks, tries to scan pretty much
-	# the whole filesystem.
-	rm spec/rspec/support/caller_filter_spec.rb || die
-
-	# Avoid spec that requires a dependency on git
-	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
-
-	# Avoid a spec requiring a specific locale
-	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
-
-	# Avoid a brittle spec depending on ruby implementation details
-	# should be fixed upstream in next version
-	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
-}
diff --git a/dev-ruby/rspec-support/rspec-support-3.9.1.ebuild b/dev-ruby/rspec-support/rspec-support-3.9.1.ebuild
deleted file mode 100644
index e941c51e7378..000000000000
--- a/dev-ruby/rspec-support/rspec-support-3.9.1.ebuild
+++ /dev/null
@@ -1,42 +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"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-support"
-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=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.8.0:3 >=dev-ruby/thread_order-1.1.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove spec that, by following symlinks, tries to scan pretty much
-	# the whole filesystem.
-	rm spec/rspec/support/caller_filter_spec.rb || die
-
-	# Avoid spec that requires a dependency on git
-	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
-
-	# Avoid a spec requiring a specific locale
-	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
-
-	# Avoid a brittle spec depending on ruby implementation details
-	# should be fixed upstream in next version
-	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
-}