gentoo resync : 13.05.2018

6 files changed, 11 insertions, 63 deletions

diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 91682eafac29..e7eae277df56 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,11 +1,9 @@
-DIST capybara-2.14.4.gem 265728 BLAKE2B 7b61fc7424b5e5aeec50e0695ef7719d23b594d3fe233c04443c37a5f06b0f1e7c440135c50225813d9da954c2efa0563488668202e09a4e3877f28708f9624e SHA512 d3ebbd8d96e4d2026327b1c70ff723225ce052fff510a909111b8cc7e02b12fec9e00acddc0bc2565371cc5eb0b590abef43d42a99c3938a929ea25930fdefd1
 DIST capybara-2.16.1.gem 273408 BLAKE2B 1d1a68427fcfed9a8153e409e17fc043dd8d926c3ebbab3560ae12454f3010c8b4569348c231e807d993263940b703dc5380a235da438eb5ac2f9d0bd3a66309 SHA512 921e05111278b7bff93fe805a29e7b2e0e78b36510db5dff1189e34c3cdeada52504a8e06534238e578c32e8e0efa8d99a0ffc8516d94e60c06e7fd2c4ecb174
 DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca18ea85a7095d9e58625df6a59a349b60b462c5c4f403a6af955466bc46d82be6cd91724fc2b12cbe15ed74a4c SHA512 3bb994e022593d485a07296193a16cae7b45e96e87dd10b2bd4807ad2bc990801044c0493360598d1626c3e367e8de87e407f65c2c6f42674d5f1b9c0b5c1933
-DIST capybara-3.0.2.gem 275456 BLAKE2B bcf2049193062b7d16e811807faf629379bc5a94bba771d442e9680e727d765703ad4c6cf8abd9d0bb22d1971f07d897f0fc8a572182302528961fcfe8b186fb SHA512 5f2611238a58184dcd57a5ca2fff786d4ecfdbb51815c3f6afdcabbb85087baf87fc601d1506a6b880d42af32e06a62e7757b1abf455325718258d3072616a49
 DIST capybara-3.0.3.gem 276480 BLAKE2B a1aa8e8ccc3846c87bdc989f456fdd0c09f41b2939cfe322faa6ae478bacdd1d6b4b13dba55fc74edd50fcfe28eb59eb8a2add8e3fc5ba948bcf8365c0ffbb96 SHA512 7af6c04304f3308322ec374d226b6cd874ba2068be5451da482a6bd2861e404b580e4c74604f0873cd91a52f1d95117efdf850cf19eb9c6265715cff5d503c47
-EBUILD capybara-2.14.4-r1.ebuild 1512 BLAKE2B 41759ee7879a50f7b270ad9fdfbb459b51c12b2ac6b5eff8613c9bc73c2f71f02a617056a70cb933fef7f0f4e9dd1f8f7313755a4660256343234e100496ee31 SHA512 4a6543d94133e2b0225e2bd4e031625aa58395b9293d67a6cfd9119e089b0b58c9010ee9442d8fe5afd3b99861745608c05e9f028bc0c0767cb09d44528b74b0
-EBUILD capybara-2.16.1.ebuild 1504 BLAKE2B 22cf066a75150f50d23c3761474076dcb9ca07381148aee813b0b3ff36d102a2bf316f3ecd1872306960eabbee179a4af1e136f2b98ae775eeae6d57b76400cf SHA512 c2fab8431816750ce63411a95333916c90fc50003df9cb2d47ba2a8964eb168edaad8bfb487db65daf0472fa598ea0e07e57f2a6b9cf266dba4d3450833b5799
-EBUILD capybara-2.18.0.ebuild 1521 BLAKE2B b2f2b42361100abf4384fc7dfd84d8588dd1ba261fbf14131eb8e8992c0896c7c3bafccfe3dca94c721a1b3cdfdfcab846e14cc85b893d532034e4962058abda SHA512 5d05806094a5ec44d86e5d4fac07b29e16280f2e0da6fd06436fa08dbd966eb18b5771c82981fdd34332e67f145654fad64532fa8d734dbe6498a3e705d6cc92
-EBUILD capybara-3.0.2.ebuild 1514 BLAKE2B 3a79eaa4545b934de0d9fa8396e0d18c858ffb590b2a531e2d2b93864bebe43ecd0c449919e4ac96f5b754bc8e083a7adf7b805ac7be04f8fba5c0e8902a9d4e SHA512 bde7046cc60a57c245493938e937edb919c203aa13ff026c9d00b5eccac6a27a933f9f25a2c0fb6e956581091f7d958814296c0a415ee4fa9b6c7557e0571bae
-EBUILD capybara-3.0.3.ebuild 1507 BLAKE2B 835ae3c657427950f700cb405d406c17bd1a61e91268d34e0ebc530df5c423421506866a79e5cc54b272c74e36b41dc706dadb1757ccfce1a12abe4475425de3 SHA512 4eed108a9869d34373fff303af1f2cbc077a442d9c356d954bcdc0c1eddf15a88283d7be978f13adf59605c658283261957abe44ff279efd9728b3ce64b90bac
+DIST capybara-3.1.0.gem 282112 BLAKE2B 71b275c548e3327dcbad779d48563b6784cbfcc0e5c3ba5fa478488ef90276bab1aeeaecd229255047cd23e01be6923c68c1f753b9d76d3428cc0ce75ff3ede3 SHA512 64c7a22eb8d566b245084e7b95d79dec2c72162e003418c0367a46e1072ad83569e97702f61f9a87f996160a62df3a653543d33878c6d3a46ebc2c286fcfbfd7
+EBUILD capybara-2.16.1.ebuild 1509 BLAKE2B 8ff52d1240388337ea4eefc688caeddcb53f0c589ffc50d2cddfec130e6702b5ae3bee7ae8ca0dfd8c672867ecfb0347aa37e6961f3dbf185145600e493e0276 SHA512 2b9160aa85c4ac67c1756b385e3bd98951b83e114ea390d0c0243ddae60dfc0a56ad1126a841768c1956641be68c76b935f633509791aa1c07ddc1172cc66987
+EBUILD capybara-2.18.0.ebuild 1526 BLAKE2B 99b7a69cd33a583dec71b53e30483164ef4af7a3ddf30e2c0da933f727a3c43b8afa79f2fcc5d872ef2142e9392197804638d29f1c43f1b81cc6ad9e07c9a503 SHA512 65bb91eb8187990a85c58a4514c181bb5643c6a7219421e800934c80b5ed58951d3adc49e8bce0a9e1d63eb3082e54db1beb0b433b0da80ea009198dd79dc1d5
+EBUILD capybara-3.0.3.ebuild 1512 BLAKE2B d8c1dc1208dd7c7aedeb2f48ccaeb190dac1451e60feba70bd2cce2b3e7425f1179716e02792ecaf27b9301c560821d8bc322d2c56a5a92c3032f94303c5e268 SHA512 9f96398cd632b4b2aa5386d84c19bffc3c22cd416178e516a755412c9ecb75287dc089d88925354a6f6d1bae5d5109b4c0831b3b6edf3615deed6253aeb595bb
+EBUILD capybara-3.1.0.ebuild 1512 BLAKE2B d8c1dc1208dd7c7aedeb2f48ccaeb190dac1451e60feba70bd2cce2b3e7425f1179716e02792ecaf27b9301c560821d8bc322d2c56a5a92c3032f94303c5e268 SHA512 9f96398cd632b4b2aa5386d84c19bffc3c22cd416178e516a755412c9ecb75287dc089d88925354a6f6d1bae5d5109b4c0831b3b6edf3615deed6253aeb595bb
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-2.14.4-r1.ebuild b/dev-ruby/capybara/capybara-2.14.4-r1.ebuild
deleted file mode 100644
index 1826bfca2aec..000000000000
--- a/dev-ruby/capybara/capybara-2.14.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-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
-
-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"
-SLOT="2"
-IUSE="test"
-
-DEPEND="${DEPEND} test? ( www-client/firefox )"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 dev-ruby/sinatra )"
-
-ruby_add_rdepend "
-	dev-ruby/addressable
-	>=dev-ruby/mime-types-1.16:*
-	>=dev-ruby/nokogiri-1.3.3
-	>=dev-ruby/rack-1.0.0:*
-	>=dev-ruby/rack-test-0.5.4
-	>=dev-ruby/xpath-2.0.0:2"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' 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 '/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
-}
-
-each_ruby_test() {
-	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
-}
diff --git a/dev-ruby/capybara/capybara-2.16.1.ebuild b/dev-ruby/capybara/capybara-2.16.1.ebuild
index 4e09c2a00cb4..dbb9a2ddae2c 100644
--- a/dev-ruby/capybara/capybara-2.16.1.ebuild
+++ b/dev-ruby/capybara/capybara-2.16.1.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 ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86"
 SLOT="2"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-2.18.0.ebuild b/dev-ruby/capybara/capybara-2.18.0.ebuild
index e1d9d1221659..59f068429047 100644
--- a/dev-ruby/capybara/capybara-2.18.0.ebuild
+++ b/dev-ruby/capybara/capybara-2.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 ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 SLOT="2"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.0.3.ebuild b/dev-ruby/capybara/capybara-3.0.3.ebuild
index d9c1c90896ed..0ff180fb058e 100644
--- a/dev-ruby/capybara/capybara-3.0.3.ebuild
+++ b/dev-ruby/capybara/capybara-3.0.3.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 ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.0.2.ebuild b/dev-ruby/capybara/capybara-3.1.0.ebuild
index dd698f232a22..0ff180fb058e 100644
--- a/dev-ruby/capybara/capybara-3.0.2.ebuild
+++ b/dev-ruby/capybara/capybara-3.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 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 ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 SLOT="3"
 IUSE="test"
 
@@ -30,7 +30,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/xpath:3 )"
+	dev-ruby/xpath:3"
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' spec/spec_helper.rb || die