gentoo resync : 02.06.2019

6 files changed, 16 insertions, 12 deletions

diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index e7527c8db33b..4672950ee754 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,17 +1,17 @@
 DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca18ea85a7095d9e58625df6a59a349b60b462c5c4f403a6af955466bc46d82be6cd91724fc2b12cbe15ed74a4c SHA512 3bb994e022593d485a07296193a16cae7b45e96e87dd10b2bd4807ad2bc990801044c0493360598d1626c3e367e8de87e407f65c2c6f42674d5f1b9c0b5c1933
-DIST capybara-3.15.0.gem 328192 BLAKE2B a70e77447c7fc2a52ec2f49377dffed167e6da21dfe3815122dcd2467c5d7022c40a320207de5d6e5bcde466d6605a0ddcf8596219519c77ff4c7e3042303476 SHA512 7d4aacfccead777f41e3acdabd642628e7e617e6c3df5078ba672c3cca5aa635b954cfc48601a5675afeeb3d4d161d70f5e0f24b413ab83c0dbde08cd2dda30b
 DIST capybara-3.16.2.gem 328704 BLAKE2B cec9871efe380b57b2dea54824e2032de5bbdc7bb49fbdb8c4f135ba4ae577431e9813a8532f37bff3616820916014a91fd5e558f4f0049a4718fc22e12f953d SHA512 9350fdffa5991aa680337a77ea5422adf0c9cce9c2c42a0e30b7994377cce827c971e4e34c4331b2e2bf7fd3036845416dbaa06ebeb2c6d40c89749fec3240cc
 DIST capybara-3.18.0.gem 331776 BLAKE2B 05d4368f570bbf74a3540fd7d7594cb95c602507f4ddbde437b702b6a280dce5bbf9d0412a1a6ce7888af3a72667e6e3efa7c83d50a8791670121673426c4de2 SHA512 5e9321eb2367bfb48f090868c944bf9920e6bd298e5663e0a820d63946a9cf320e5e3a9b95569779b7e6cdc361dded5ab12a8fce4a0df430c4768d8ce161d02c
-DIST capybara-3.19.0.gem 333312 BLAKE2B 31bd7caf2f9964d4baa37526dc8b0a4f734df16e340d66939d042779a75902be936fd0763661c312ab76e89f1d786e7baafe07280a24064d9282af2bf5ff49ae SHA512 4ddffef7d921d974beabb7a0ecc1bf68b262f9037323891cc1d60984789463d54a1a55522eed59ad7301164fb82e51c8e87b7ce7b298522c94b092d284f8d0cc
 DIST capybara-3.19.1.gem 333312 BLAKE2B ff0ea453066b2b11f417f9ea54af47ed9fb27847a09967a07c97196dda0e76e2c9862bea89c9ef7006bedc0dabe3b6e5cab19fa12f5b2e80f8872ca43b6dfdb0 SHA512 3098748e34ea794b13bfb62fc3a98c3cda8acfe1cfdfc9d816a4cf2c38aff6f1b9f23b4d84ca2cb8f0257a7bf1f5c368dcd40148354661687346ed30dd005b87
 DIST capybara-3.2.1.gem 284672 BLAKE2B 9da8f588049fab74c4e734626e42758cdd4baf555cfc64e7456bfab2cb4d5c90ed6bfc8ada7cc0d6323ef1113169aec70fd4254aa50c003408376ea4afe00a06 SHA512 50af1d4c49c200a4c08901d19b16826499abb8d19de8e059160c509afd555edbe620b6fd5d78f8c286feeb15a72e5a4b241cb1f14151b349fd94cdd3648b64b2
-DIST capybara-3.20.1.gem 344064 BLAKE2B ba014545dc42d4e024de42b4d359fc6fbd799209836082e2e0c862057f620018d492c8e5537fe378d43c0f0b830b419e09352341ff24ef6dd3efc6ff1bf780a6 SHA512 473b8b177e75fecb4ef1b070cfb39618210a589603ed74290ff155c71ee4059ffbf0bb00541a2f4082a15e54c87ae1cc0700637c3dbbae0ecb5ee4130b3e9cce
+DIST capybara-3.20.2.gem 344064 BLAKE2B 6b0c8551c2cc88ddd201d416abea25b03c874ac65bc3d7abeda0990e03bed231493310dedd287be1c8961e1d38c7d4d0060698645223167113b86dc650dd6ec0 SHA512 f91902712c5140428260fde24643900c628c75de66752a655584c600c84bd55e9f5153c694c7b286d0c295f18bb459906bf5e68ca636bbabb29f84c4f82031c4
+DIST capybara-3.21.0.gem 345600 BLAKE2B e9a2ea78a9d0a3ec4fad7b61b82a527fdb9b1a5ad3a2bc5a3b294b90c6a6afb0c5ff00056371c1a70ef28d340a048073e713d0eade7db610bc256cf58e8456fd SHA512 e632eb75c13b1c13691fa7b7ee81372adcb205df7942593a7a7a45207068a043591c8cb50dfb1664d1d9206e610ab1107a2a4d3fcfd614be766207ea7a32fcab
+DIST capybara-3.22.0.gem 347648 BLAKE2B f1f50da92f62fc31231564500ae94ed7e5d07f4fcb04b68829dc538097f1bddb313fe9a8384772da24485879bb7c16caaa7dd2f4994d0bb95313fbbd5c79a3de SHA512 b77ad55bb35a3f62057a649e99086c322a3b3832f2c907f7abee46d694c5c189aff9f286590c8ab597bb767e56f3ec51911842146677545b99c44db27ca236c6
 EBUILD capybara-2.18.0.ebuild 1552 BLAKE2B 7029dd19a177f4aebc1e78d83f9561ef4f3abdd41b0b8d77426e11bbaffc7865d746d4f3d3e6ed696c4414008648acc707f42e4a716681a2e331acae512ce8a6 SHA512 87dafa1f76c10eb0853eb7c8e3da36ff7c0b522b887c037ab9c3fdf12b29ec20d39a3638c4119225ab097dee44b878ed1ef0aa753d0d83f886c6d4c089a6c931
-EBUILD capybara-3.15.0.ebuild 1612 BLAKE2B b0e1f6191969448419867f9059fe8982dd46caabec30c2d223445998721757b7c90424efefc68284c103a5d6a061033715d71766050557b99d888a62d5f459b0 SHA512 14fe1febda7cdb8a99af6c1881e3b8d8fbfc82743893fa34c8151aa23005a271d28a900a7dffce23aee433564628088429a23c537e7b5581732c6b059269ccc9
-EBUILD capybara-3.16.2.ebuild 1606 BLAKE2B 3d4903661b3928fb816e8d5f9336fbe638c3c37dc9692565823edcca4c4702692f83783033e5e75d48a4e7d41c731ac7a3ffc23485cdfcaf7b46bca4ed4870f7 SHA512 6a916003e05cda5f05f9e78ecf8211a38f8a94265f7759dfb84f90ee8fd68e1d24cf4ca21b94e6e763fc9efae948430446f2947453e2e6e660d61ac8f46a1b3e
-EBUILD capybara-3.18.0.ebuild 1805 BLAKE2B d0519f603a2ba92da76acf55461156da7a09d3ddfddb914e1328ce210593f1f587948c370f631daf9ff20a3bb094780a53da4c247e3872ff3b2fd84f5a2b1f83 SHA512 ee6e39820bc0031bc86cb905043018950984dc79bcd910d70a6f057ba018d97740ad1806c92f6723d180ec3717e9c12ccb6ba45ee1a1c403a5f8f15ec2a3a756
-EBUILD capybara-3.19.0.ebuild 1805 BLAKE2B d0519f603a2ba92da76acf55461156da7a09d3ddfddb914e1328ce210593f1f587948c370f631daf9ff20a3bb094780a53da4c247e3872ff3b2fd84f5a2b1f83 SHA512 ee6e39820bc0031bc86cb905043018950984dc79bcd910d70a6f057ba018d97740ad1806c92f6723d180ec3717e9c12ccb6ba45ee1a1c403a5f8f15ec2a3a756
+EBUILD capybara-3.16.2.ebuild 1605 BLAKE2B 9deecfdc08bd830d3c59787a6ee5e64df2da86ee381093b437df9c75763ca44116a1a2a9ba53e474211f77c6286059b5570ccc6f1573ae07599b17bf993dd7a5 SHA512 7317522977017cbe3d76c3437d860afa8d1ce5cd20682511bea5148391a29cb8efba1540a8567f4b29579c151d551bf4b6fecc1f03080205e432ef619be6be73
+EBUILD capybara-3.18.0.ebuild 1804 BLAKE2B 678dba02ba98f19bf4ef17086d3bab0f8216ba6e89d85ca0377a53a03c3b952443a29bd00d8cb0b85849516663958a315386c059fd4d0e119f4417b9550a9558 SHA512 8a1ab2c59dec10beafb8362ad7a58f5389d385ce98975e427f40cc8b464d095ffda7baeb44fc66a5b7ecdca86f181571d16af0000b74a8fc99b1d99118f22a30
 EBUILD capybara-3.19.1.ebuild 1805 BLAKE2B d0519f603a2ba92da76acf55461156da7a09d3ddfddb914e1328ce210593f1f587948c370f631daf9ff20a3bb094780a53da4c247e3872ff3b2fd84f5a2b1f83 SHA512 ee6e39820bc0031bc86cb905043018950984dc79bcd910d70a6f057ba018d97740ad1806c92f6723d180ec3717e9c12ccb6ba45ee1a1c403a5f8f15ec2a3a756
 EBUILD capybara-3.2.1.ebuild 1552 BLAKE2B 02cb90fc41a6c642bcb8c3efad2428e9d49cd5fe06a43217a4e67b2b9ec957e5038377cd8bfe957605d3f9bbf85765eb42f07a75b8b8534fc142bb6a71af4a03 SHA512 7ad2cdc611be697732243100756b0be1d66da2654c5f65102a9f258298d1220e21683f1eeeb82ac3f2bae0edcc844d94de2a23eae12e9e4235128df8d2df8d56
-EBUILD capybara-3.20.1.ebuild 1826 BLAKE2B fb4e93b36a5aabde81799dfdb42aeff00ae4b5e3133f4033f22e0b46ab3e0fbc029fca8485f3361b0bb1ced40250336063e864bfbeeeda6bb941f0e602829b3f SHA512 e4d8b1713e6e09e936ae0359879eecb6d9d07eca6e6defa86b4ade8c1ff8062d7c0978f234db50c6522326933e5a79217752d4a13f95d726d3fce774b2efb617
+EBUILD capybara-3.20.2.ebuild 1826 BLAKE2B fb4e93b36a5aabde81799dfdb42aeff00ae4b5e3133f4033f22e0b46ab3e0fbc029fca8485f3361b0bb1ced40250336063e864bfbeeeda6bb941f0e602829b3f SHA512 e4d8b1713e6e09e936ae0359879eecb6d9d07eca6e6defa86b4ade8c1ff8062d7c0978f234db50c6522326933e5a79217752d4a13f95d726d3fce774b2efb617
+EBUILD capybara-3.21.0.ebuild 1805 BLAKE2B d0519f603a2ba92da76acf55461156da7a09d3ddfddb914e1328ce210593f1f587948c370f631daf9ff20a3bb094780a53da4c247e3872ff3b2fd84f5a2b1f83 SHA512 ee6e39820bc0031bc86cb905043018950984dc79bcd910d70a6f057ba018d97740ad1806c92f6723d180ec3717e9c12ccb6ba45ee1a1c403a5f8f15ec2a3a756
+EBUILD capybara-3.22.0.ebuild 1810 BLAKE2B 8f86264bfa40ebbd169e78ca2fd0324b69d9a46cc52e895790ba11dcfc46eec4557da91a8827ec7cdb0b683fac7f35b8e323b0219ec42d3fcb720f343ecb1616 SHA512 d69eedebe35e30b7773bbfae074b4ea09b75929c8350547e35dcef268e8a94f713c6baff74bb73ebb3b79dd35734acceb967728c725554e7450e0b17a4fdebef
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.16.2.ebuild b/dev-ruby/capybara/capybara-3.16.2.ebuild
index afdd54d05cc6..d22b2b7118b6 100644
--- a/dev-ruby/capybara/capybara-3.16.2.ebuild
+++ b/dev-ruby/capybara/capybara-3.16.2.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 ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.18.0.ebuild b/dev-ruby/capybara/capybara-3.18.0.ebuild
index 6d4f00d22fbe..593a3ac94ef0 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 ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.20.1.ebuild b/dev-ruby/capybara/capybara-3.20.2.ebuild
index bbbfa3a36f7f..bbbfa3a36f7f 100644
--- a/dev-ruby/capybara/capybara-3.20.1.ebuild
+++ b/dev-ruby/capybara/capybara-3.20.2.ebuild
diff --git a/dev-ruby/capybara/capybara-3.19.0.ebuild b/dev-ruby/capybara/capybara-3.21.0.ebuild
index 6d4f00d22fbe..6d4f00d22fbe 100644
--- a/dev-ruby/capybara/capybara-3.19.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.21.0.ebuild
diff --git a/dev-ruby/capybara/capybara-3.15.0.ebuild b/dev-ruby/capybara/capybara-3.22.0.ebuild
index fb436b473689..b6b0785652ad 100644
--- a/dev-ruby/capybara/capybara-3.15.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.22.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_EXTRADOC="History.md README.md"
 
@@ -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 ~arm ~x86"
 SLOT="3"
 IUSE="test"
 
@@ -50,6 +50,10 @@ all_ruby_prepare() {
 
 	# 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() {