gentoo resync : 09.07.2022

5 files changed, 4 insertions, 129 deletions

diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index f115f18a1710..1a19b79155bf 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,9 +1,5 @@
-DIST capybara-3.35.3.gem 371712 BLAKE2B e50c892897cf2838cafb77cb7cfcb54e5fc52c3cdaf11489b60168511f3a213d2ad7f94c67ad236e6177b849f99445733aa4de9691755011bd32f524e5c440b3 SHA512 90507b2254fdd7aff375a305c1112b878d5f0a7c909e7d95b62c6728acc340f73d244304efc07c3dcc707825afcd9b23b088e5d889717efe4edc2dab4dd38d2a
 DIST capybara-3.36.0.gem 374272 BLAKE2B 51579941b95ab317fa0f7d9a21d3ad40a130a60c457f9a5d9921dac5b17bb339a423a21aa16d350da57602b22b0001c6ed2b1b5b038bb16cf56d268bd5a38ead SHA512 7ffc9d3e4058b08acd1cb223eb0313112354783cc4464f8f0747561caa45425f8623be7052f331677a66a7b9f5e645e48ae0118fe78c2d185408e5279e66f169
-DIST capybara-3.37.0.gem 376320 BLAKE2B 6e2a6f1d0edd9bc9111b4e7e3a9c32a8363b88934b47981a2d4e869700ffea2af0b90d217ab6e3f5115f168fda91498a75bb8c813986963043db3ce6dca51882 SHA512 1ba9c2bbc5082023982641eb831ebba5862396431f25b1f9fcc4e24289992980980806a7255cb08d94dafccacc6a17d047677b0411a700051b6c104eb79ac2ab
 DIST capybara-3.37.1.gem 376320 BLAKE2B 79a5f379d70d612402379ad8743384844e7ab85e40c96b8a10794d35f48f078b9e26eaef5f6311aa65b6fae1fe130436288fce2077309559703e46da9e5f12bd SHA512 6a602dfcd61529f6b89a0ad85cf567fcb952d0c8033bde605121ad867308b1a16c6b3d5bfd7f4c33c47c5616c365c6b034bdf8dca096a14b3447be6adc885111
-EBUILD capybara-3.35.3.ebuild 1833 BLAKE2B 5b8dfe1dc852eb6d4ce3ed2d1bae46bb00b1e1de163f578474dd4652c2eb2a856895ad5af9928f111cc7583504fe29786df27e79aef95b401061382282556f97 SHA512 0d3cdedacdb1e0611b45859cc76f2aa06be1d2f61b932c6e63c860b048f05b4ed408c797126fa296a811834e2fe66d1b3876c08df72aac21c33b46f9f1c09e12
-EBUILD capybara-3.36.0.ebuild 1891 BLAKE2B 0f29566d7d89a89eede7ac8efc82095e16d29498b22d7ca0150ac1e2e29ce117183f193add5888073bc66b943870ba2a700f7939b3bd422aa175325378fc0955 SHA512 c583ba58e03ffb442670616c93be20d40249edd7de873cf6b46c1565c3fc1b1666642d14dbd6a15fc7399c598989b54307e8e32263fc7b9a0feb88dad4b533ae
-EBUILD capybara-3.37.0.ebuild 1885 BLAKE2B 266f20b1fdb6f10b980fe0e4b9d119b8b942d8ab8b26a6f9cf075440da23e3dc3046c264204f3da51c91af569e8a80d225c127fe33794ff86671e1856629ab7f SHA512 9e48c7a88afb20b87a6b5c5c96e6d4f61a503e8144be5fdcf326c52f63e04b21abb151c9cc7bc6613393791eb5de28fddb587ee84f2e333784c112f282110816
-EBUILD capybara-3.37.1.ebuild 1885 BLAKE2B 266f20b1fdb6f10b980fe0e4b9d119b8b942d8ab8b26a6f9cf075440da23e3dc3046c264204f3da51c91af569e8a80d225c127fe33794ff86671e1856629ab7f SHA512 9e48c7a88afb20b87a6b5c5c96e6d4f61a503e8144be5fdcf326c52f63e04b21abb151c9cc7bc6613393791eb5de28fddb587ee84f2e333784c112f282110816
+EBUILD capybara-3.36.0.ebuild 1853 BLAKE2B ce172b8f2a02a121524f84b98977a0aa1ed0b5f4aa0f9d5c6e77ff82f66da92dd085bb7138bac5b8ac0ba8b900f68cac75a00a23fa7ae327ce8cc0f4f75a052f SHA512 666cd1e0b36b223d8916fef964585decf8ab9d435788f1db781d4511979e17c3001add78e13762e03e00f9c37c2638c0b79ba4be4bb662a0839aa995f3ac4824
+EBUILD capybara-3.37.1.ebuild 1847 BLAKE2B cbb1af0d5c35bf3c44db2a6da226c9f90e21cfc2aa4fac8902aa5e3e36bf91a2cbccd64c674119a3a9bb0d3d0c19f2adc68d4879464eb253a8d09fd32fb472bc SHA512 d08732ffd47c8db6a4ee20f6034152d32b95dc68ea26a5b230d123ce1695939b4882c0329e78084effa85251052aec945904f7a0b06923809a675168d443b3a6
 MISC metadata.xml 344 BLAKE2B cc8fd629cca0ed4f66836cefd43f13a45baa7bb13d157fa7f90c61cdd4a12d71ef773ef9daa8dc6e5b07dcadd1b52a258995136a0792ec1870eb93fbb90cd61d SHA512 dae769c0ee80ebfdbd8b86b471fc13c3ac656bf556e554d3d5ce80108f6f6ab79dfe7a54f51b78af3d29f22807fa5ac5be48bfcf8655c60309bef7e3f80cea5d
diff --git a/dev-ruby/capybara/capybara-3.35.3.ebuild b/dev-ruby/capybara/capybara-3.35.3.ebuild
deleted file mode 100644
index f6810677bedb..000000000000
--- a/dev-ruby/capybara/capybara-3.35.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-# Rake tasks are not distributed in the gem.
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit virtualx ruby-fakegem
-
-DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
-HOMEPAGE="https://github.com/jnicklas/capybara"
-LICENSE="MIT"
-
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-SLOT="3"
-IUSE="test"
-
-DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	>=dev-ruby/launchy-2.4.0
-	>=dev-ruby/selenium-webdriver-3.5:3
-	dev-ruby/sinatra:2
-	www-servers/puma
-)"
-
-ruby_add_rdepend "
-	dev-ruby/addressable
-	>=dev-ruby/mini_mime-0.1.3
-	>=dev-ruby/nokogiri-1.8:0
-	>=dev-ruby/rack-1.6.0:*
-	>=dev-ruby/rack-test-0.6.3:*
-	|| ( dev-ruby/regexp_parser:2 >=dev-ruby/regexp_parser-1.5:1 )
-	>=dev-ruby/xpath-3.2:3"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die
-
-	# Avoid window-manager specific tests (sizes are specific for fluxbox)
-	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
-
-	# Avoid spec that requires unpackaged geckodriver
-	#sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
-
-	# Avoid test dependency on puma server for now
-	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
-
-	# Update spec to catch the right error code. This seems to have
-	# changed recently accross ruby versions.
-	sed -i -e '/raise_error/ s/EOFError/Net::ReadTimeout/' spec/server_spec.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} -Ilib -S rspec-3 spec
-}
diff --git a/dev-ruby/capybara/capybara-3.36.0.ebuild b/dev-ruby/capybara/capybara-3.36.0.ebuild
index 36fc914f1929..b0f5c72ac435 100644
--- a/dev-ruby/capybara/capybara-3.36.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.36.0.ebuild
@@ -36,7 +36,7 @@ ruby_add_rdepend "
 	>=dev-ruby/nokogiri-1.8:0
 	>=dev-ruby/rack-1.6.0:*
 	>=dev-ruby/rack-test-0.6.3:*
-	|| ( dev-ruby/regexp_parser:2 >=dev-ruby/regexp_parser-1.5:1 )
+	dev-ruby/regexp_parser:2
 	>=dev-ruby/xpath-3.2:3"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/capybara/capybara-3.37.0.ebuild b/dev-ruby/capybara/capybara-3.37.0.ebuild
deleted file mode 100644
index 0a7c16dcb371..000000000000
--- a/dev-ruby/capybara/capybara-3.37.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-# Rake tasks are not distributed in the gem.
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit virtualx ruby-fakegem
-
-DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
-HOMEPAGE="https://github.com/jnicklas/capybara"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-SLOT="3"
-IUSE="test"
-
-DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	>=dev-ruby/launchy-2.4.0
-	|| ( dev-ruby/selenium-webdriver:4 >=dev-ruby/selenium-webdriver-3.142.7:3 )
-	dev-ruby/sinatra:2
-	www-servers/puma
-)"
-
-ruby_add_rdepend "
-	dev-ruby/addressable
-	dev-ruby/matrix
-	>=dev-ruby/mini_mime-0.1.3
-	>=dev-ruby/nokogiri-1.8:0
-	>=dev-ruby/rack-1.6.0:*
-	>=dev-ruby/rack-test-0.6.3:*
-	|| ( dev-ruby/regexp_parser:2 >=dev-ruby/regexp_parser-1.5:1 )
-	>=dev-ruby/xpath-3.2:3"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die
-
-	# Avoid window-manager specific tests (sizes are specific for fluxbox)
-	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
-
-	# Avoid spec that requires unpackaged geckodriver
-	#sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
-
-	# Avoid test dependency on puma server for now
-	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
-
-	# Update spec to catch the right error code. This seems to have
-	# changed recently accross ruby versions.
-	sed -i -e '/raise_error/ s/EOFError/Net::ReadTimeout/' spec/server_spec.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} -Ilib -S rspec-3 spec
-}
diff --git a/dev-ruby/capybara/capybara-3.37.1.ebuild b/dev-ruby/capybara/capybara-3.37.1.ebuild
index 0a7c16dcb371..22d2b964ec34 100644
--- a/dev-ruby/capybara/capybara-3.37.1.ebuild
+++ b/dev-ruby/capybara/capybara-3.37.1.ebuild
@@ -36,7 +36,7 @@ ruby_add_rdepend "
 	>=dev-ruby/nokogiri-1.8:0
 	>=dev-ruby/rack-1.6.0:*
 	>=dev-ruby/rack-test-0.6.3:*
-	|| ( dev-ruby/regexp_parser:2 >=dev-ruby/regexp_parser-1.5:1 )
+	dev-ruby/regexp_parser:2
 	>=dev-ruby/xpath-3.2:3"
 
 all_ruby_prepare() {