gentoo resync : 02.08.2019

5 files changed, 25 insertions, 15 deletions

diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 39bffafb7355..e5161d2d4030 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,15 +1,15 @@
 DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca18ea85a7095d9e58625df6a59a349b60b462c5c4f403a6af955466bc46d82be6cd91724fc2b12cbe15ed74a4c SHA512 3bb994e022593d485a07296193a16cae7b45e96e87dd10b2bd4807ad2bc990801044c0493360598d1626c3e367e8de87e407f65c2c6f42674d5f1b9c0b5c1933
 DIST capybara-3.18.0.gem 331776 BLAKE2B 05d4368f570bbf74a3540fd7d7594cb95c602507f4ddbde437b702b6a280dce5bbf9d0412a1a6ce7888af3a72667e6e3efa7c83d50a8791670121673426c4de2 SHA512 5e9321eb2367bfb48f090868c944bf9920e6bd298e5663e0a820d63946a9cf320e5e3a9b95569779b7e6cdc361dded5ab12a8fce4a0df430c4768d8ce161d02c
-DIST capybara-3.2.1.gem 284672 BLAKE2B 9da8f588049fab74c4e734626e42758cdd4baf555cfc64e7456bfab2cb4d5c90ed6bfc8ada7cc0d6323ef1113169aec70fd4254aa50c003408376ea4afe00a06 SHA512 50af1d4c49c200a4c08901d19b16826499abb8d19de8e059160c509afd555edbe620b6fd5d78f8c286feeb15a72e5a4b241cb1f14151b349fd94cdd3648b64b2
 DIST capybara-3.23.0.gem 349184 BLAKE2B 233b83fb88f106de8e25a1aa34d1082664824571eca2a79ad3de3b164e639b68173804bf2e871c3fde7fe2af54d64ee6ade90c4149807e04e844cbf5d61f24dc SHA512 53e0c6223e574960e136e7620d7d00a0e1479f9eb0fb70c7150bc60e20ed009d163dc29f7cee84acad43168cca230465490c9ca64b640fdebe9223ec62b6e4db
 DIST capybara-3.24.0.gem 349696 BLAKE2B 54447fc17169d953c43f31505a9267bebe6d093052cb553efa8eb65bf6e39fbb13fe02cb3b7252c4fe1f0554370266265eb759ad7f4dc5bab9299410e4f07e81 SHA512 32a19471d3f8d13871c40c28671125039b432065ab6ac1b31f38551f9e5c7d52c041ef9a56db853aeddd14d9411dec4e647336f6b78feb45c90a676ccdc606fe
 DIST capybara-3.25.0.gem 351744 BLAKE2B 12e8f483bca814fa826707895a6fc72a3d54df2e03c1175eb4be8e2f83afeda2466d70eab03c7700665d3f94bc7b3b8f85b2d2d6cf8242cad285d9350428cadc SHA512 1be454984862c314f0571ca68ed3858d241dc5f0709d155b1b7accd7fd81a1ab0bf0a5c6537c871989c9abc758d0e7fa5109c8b04be8b620137e129a5da13a68
 DIST capybara-3.26.0.gem 352256 BLAKE2B b6b71e163adfa2125d4e4a28fdaaf9feb725e874eab7180c0ece1166b2411ee0930244c79cac22f17e7c3ea8c1cb42b043d5bbd7321a3aa6460fbbfa775035b3 SHA512 31dabbb6ea77ed185d53b72e5f4ea89546f33b5c682d68692e4115bdec29c15d1f5f8bcab4f5256b76f6fbfadd5c638f8bf1d7b974dd3153d57521eb8c04a778
+DIST capybara-3.27.0.gem 353792 BLAKE2B 1ce648be67bbac74bb6c907ae34ceb67a7c4df40eb3cec91a423037dd2d5af9a7a603e750499d86dbb0997102682008831ec9abfa5846000f91d5abe60991f11 SHA512 3a6829906ceb5ea52a5c44515a79df6959559cca7e7e0c35e35550a376f79bfebf7cda229e5cc4aff5f69cffdb09c586961733d39c57b7dc89b293050f911ba3
 EBUILD capybara-2.18.0.ebuild 1552 BLAKE2B 7029dd19a177f4aebc1e78d83f9561ef4f3abdd41b0b8d77426e11bbaffc7865d746d4f3d3e6ed696c4414008648acc707f42e4a716681a2e331acae512ce8a6 SHA512 87dafa1f76c10eb0853eb7c8e3da36ff7c0b522b887c037ab9c3fdf12b29ec20d39a3638c4119225ab097dee44b878ed1ef0aa753d0d83f886c6d4c089a6c931
-EBUILD capybara-3.18.0.ebuild 1804 BLAKE2B 678dba02ba98f19bf4ef17086d3bab0f8216ba6e89d85ca0377a53a03c3b952443a29bd00d8cb0b85849516663958a315386c059fd4d0e119f4417b9550a9558 SHA512 8a1ab2c59dec10beafb8362ad7a58f5389d385ce98975e427f40cc8b464d095ffda7baeb44fc66a5b7ecdca86f181571d16af0000b74a8fc99b1d99118f22a30
-EBUILD capybara-3.2.1.ebuild 1552 BLAKE2B 02cb90fc41a6c642bcb8c3efad2428e9d49cd5fe06a43217a4e67b2b9ec957e5038377cd8bfe957605d3f9bbf85765eb42f07a75b8b8534fc142bb6a71af4a03 SHA512 7ad2cdc611be697732243100756b0be1d66da2654c5f65102a9f258298d1220e21683f1eeeb82ac3f2bae0edcc844d94de2a23eae12e9e4235128df8d2df8d56
+EBUILD capybara-3.18.0.ebuild 1811 BLAKE2B 735139e0a2246c63aea1af6a9390e0c1683d5039cecb8e20e99d2f51e0603669b2599305c7ce6d5d39647e3a609b55b50e3296187eb90112ccb69b5ded210115 SHA512 ce2652102c27e9c0449f692da878c1096e470fac9d6c2207b3e1974ec6ed6cfb47e8d996f6099a7ff2eb546d1b884f40cff1c1bf42fadc6d518ce586c5269ebc
 EBUILD capybara-3.23.0.ebuild 1809 BLAKE2B f0a9ba37b66a1d4c26c4c9a42c0f9bf3cac9e11e6d1233749695d61e28a93b349079d7ba10f792b788e4f6d3628a7905ee46e291f51e601f51a4a31e35dd52de SHA512 059cf4bb8b3efa8a9fbfa2671fa7c7f01e1d2aac54a3130db45d27aa46a669c20c4593e1b0db9116dddb98049f6afcc448c7473b2d96608dfb619994a1075723
 EBUILD capybara-3.24.0.ebuild 1810 BLAKE2B 76b7c0221fb17244acec192dae6d061ff8b4f77f41847cf9f97cd9f82b19726193230ea9ca36c5b88a870e3de10899274214542573a36dd6c3c4c3411cb634cb SHA512 11eb703b46cc0d42678414716856b732e9a5a455deeb124219e45d415dffef379db2a668de5520e80ab934c453628228cff3a28458cd4f305142f1bd57dcd611
-EBUILD capybara-3.25.0.ebuild 1816 BLAKE2B b871088425490133c4d5a0cb370be3436ac9309303ac75265b5d91d86468c581d9d39b8886014111a5583348ea88c619662fabe854ddac1b3aa5e0d8f18d4011 SHA512 a86389cd5de999ac8668cb7e977d26612b7933b331e46a1b0fa5550f52f56b8c6908145abc0c4aa6046e8e1279130a2c285736a4ead82fb50e5eb70505209fbc
-EBUILD capybara-3.26.0.ebuild 1816 BLAKE2B b871088425490133c4d5a0cb370be3436ac9309303ac75265b5d91d86468c581d9d39b8886014111a5583348ea88c619662fabe854ddac1b3aa5e0d8f18d4011 SHA512 a86389cd5de999ac8668cb7e977d26612b7933b331e46a1b0fa5550f52f56b8c6908145abc0c4aa6046e8e1279130a2c285736a4ead82fb50e5eb70505209fbc
+EBUILD capybara-3.25.0.ebuild 1823 BLAKE2B e2cd9a5ad86be57b55ba1e261bf79d0b98f3161e6b2c692d8194d78c8c76ff42e1c9ea6d7eeef67ec77cd2a41cde3a0d98e56592a34ec08b03bb6ea3b52bf1ee SHA512 e475b776f26107beb0125050b9db7361075ed063f2c0db3e94d14a87a7b9d547526f936613b2646e3bdd4f0825b47300882f171bb6791abcbf0c4392f2c216b9
+EBUILD capybara-3.26.0.ebuild 1823 BLAKE2B e2cd9a5ad86be57b55ba1e261bf79d0b98f3161e6b2c692d8194d78c8c76ff42e1c9ea6d7eeef67ec77cd2a41cde3a0d98e56592a34ec08b03bb6ea3b52bf1ee SHA512 e475b776f26107beb0125050b9db7361075ed063f2c0db3e94d14a87a7b9d547526f936613b2646e3bdd4f0825b47300882f171bb6791abcbf0c4392f2c216b9
+EBUILD capybara-3.27.0.ebuild 1799 BLAKE2B bf1a7248c481db4c950e7b3571f857ac04c4aa5be7a43d79b66e9727a77911f19aef2eea21fcb627340e896814a8c8cf2b574bd9c16d73100dc9267a0172c12a SHA512 a506bb0f2961369bf071aa93748f6767f230142bc21e0631b62201d37e03f46782b971c0c3bffd7ab02f7c281524edd9eff85e6784490a7003eea19810c69b0b
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.18.0.ebuild b/dev-ruby/capybara/capybara-3.18.0.ebuild
index 593a3ac94ef0..528036025297 100644
--- a/dev-ruby/capybara/capybara-3.18.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.18.0.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.25.0.ebuild b/dev-ruby/capybara/capybara-3.25.0.ebuild
index c4deaaa1b6c7..d4c4662717ae 100644
--- a/dev-ruby/capybara/capybara-3.25.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.25.0.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.26.0.ebuild b/dev-ruby/capybara/capybara-3.26.0.ebuild
index c4deaaa1b6c7..d4c4662717ae 100644
--- a/dev-ruby/capybara/capybara-3.26.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.26.0.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.2.1.ebuild b/dev-ruby/capybara/capybara-3.27.0.ebuild
index 3fcf61fd97f9..0cae33b1ec47 100644
--- a/dev-ruby/capybara/capybara-3.2.1.ebuild
+++ b/dev-ruby/capybara/capybara-3.27.0.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_EXTRADOC="History.md README.md"
 
 # Rake tasks are not distributed in the gem.
-RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
 
 inherit virtualx ruby-fakegem
@@ -22,7 +21,13 @@ IUSE="test"
 
 DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
 
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 dev-ruby/sinatra )"
+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
@@ -30,19 +35,24 @@ ruby_add_rdepend "
 	>=dev-ruby/nokogiri-1.8:0
 	>=dev-ruby/rack-1.6.0:*
 	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/xpath-3.1:3"
+	>=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"' spec/spec_helper.rb || die
+	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
+	#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() {