gentoo resync : 04.08.2018

3 files changed, 60 insertions, 2 deletions

diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 92329ce4878b..3bd95a7b595c 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -3,9 +3,11 @@ DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca1
 DIST capybara-3.1.1.gem 282112 BLAKE2B 82740933a34bc80ff4901fdf538b9d48d3ae8b5d9c906f462a964104ee1312a74697528f1803eeead0a250823baaedb1f2d4839053b26e4a9ed0fccbc224a137 SHA512 955918a004f11af93caecf964738108edd31ebfb239d6af752bc48ac74b754320014b997d01b8cd12bec5aeef27c88b6737cf7d0ba7dfdb4ce983939ae534546
 DIST capybara-3.2.1.gem 284672 BLAKE2B 9da8f588049fab74c4e734626e42758cdd4baf555cfc64e7456bfab2cb4d5c90ed6bfc8ada7cc0d6323ef1113169aec70fd4254aa50c003408376ea4afe00a06 SHA512 50af1d4c49c200a4c08901d19b16826499abb8d19de8e059160c509afd555edbe620b6fd5d78f8c286feeb15a72e5a4b241cb1f14151b349fd94cdd3648b64b2
 DIST capybara-3.4.1.gem 292352 BLAKE2B baf07378ec9c932ca4fac4b9ce465b76704c5b17cea73db01d584dbf7076b2c6defe0170a0575691f6af5dcda2d8f97bd16a3901d36c8a9db63c72491fbfc962 SHA512 abd969af564a9b8a827493674d51e2cabbb57c47795ede260498f99600da0da9bf00c97e64ccd07cfdb1b630135714191f232f166e08856a4cb9fdff6c47fe1a
+DIST capybara-3.4.2.gem 292864 BLAKE2B f04bef4540df60eaaeab2cdf59577962493da34adae1abcb4fc23101244a522fa2bc80ad86ba906368a98e68d6918877a073be1e0068b4eb2ba44e0d060b40cd SHA512 e9415ce626a1391d9a0af944d9afaa536d98b6d44bb19d288e3b71399effa2fa8ffeef72a0fb2d786a3267f6809943f499f50f88f95c24552888db24888867e5
 EBUILD capybara-2.16.1.ebuild 1509 BLAKE2B 8ff52d1240388337ea4eefc688caeddcb53f0c589ffc50d2cddfec130e6702b5ae3bee7ae8ca0dfd8c672867ecfb0347aa37e6961f3dbf185145600e493e0276 SHA512 2b9160aa85c4ac67c1756b385e3bd98951b83e114ea390d0c0243ddae60dfc0a56ad1126a841768c1956641be68c76b935f633509791aa1c07ddc1172cc66987
 EBUILD capybara-2.18.0.ebuild 1525 BLAKE2B 17327933169f1c330a0f0580b8dfd00be4ae39e0fa94d62e172d6621a8a91189925acfca3730685ed80573e6eb456f731d8072fb1adb2653b6b646714a89bc5b SHA512 a6347a7b9014e3ca1bdeee9eed2a9e22d866dd831041e700086b00c4245d254ea3107c82b019f7550faa273777430898c571c837ac4202cdb2cfdf15068edd47
 EBUILD capybara-3.1.1.ebuild 1512 BLAKE2B d8c1dc1208dd7c7aedeb2f48ccaeb190dac1451e60feba70bd2cce2b3e7425f1179716e02792ecaf27b9301c560821d8bc322d2c56a5a92c3032f94303c5e268 SHA512 9f96398cd632b4b2aa5386d84c19bffc3c22cd416178e516a755412c9ecb75287dc089d88925354a6f6d1bae5d5109b4c0831b3b6edf3615deed6253aeb595bb
 EBUILD capybara-3.2.1.ebuild 1518 BLAKE2B af598a905b37db7eb77511372ace937bff702c2aa116afcdf4bb2d32bd99489e95a61ca442c8cf5c8174fe7f0021fb7aadb6fda65b2dd7ab41a1d8829bd3099f SHA512 9bcf03fa1561b95257a319825c5ae165914fac5ad4993e028f51d9b3d70bebc7e51203f30cf70d2a9b66a61a4b30dfe85d79037a5f19c3e61997f0e3f41f5372
-EBUILD capybara-3.4.1.ebuild 1497 BLAKE2B d6e23247a1af0d26fbc832e9747f14c9efb963c65ccf8dceea02d1d5b01a639757543af1cda60464cdd7a5adf639057fabfb8ac198e3d7939fb9d51d6afbc4f2 SHA512 93888436e322a879a1effd6f3e56ff5ddac73f7d73860cb6021fec5869ebdcca744359f90b6c833de63e2d63ceaa48dc1801b9fd3cc4e93c8f5b605031f9db88
+EBUILD capybara-3.4.1.ebuild 1502 BLAKE2B 8aa63d3d3d39207e1884b05ba051ebabc8a5d65b472bbb57db356a7482efb91e3adb20ed7f7f06db3f609d50b456a0f1bad8b36d53880682742039b04826d9aa SHA512 9b5a5c6d9e8362eaf76aae52065706ea8192e59ead7acefe282023295f46c0d89d8548f955286bd3e240c8d20e39e1e0123c81d1054c91a37bade11f74d7f4c1
+EBUILD capybara-3.4.2.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.4.1.ebuild b/dev-ruby/capybara/capybara-3.4.1.ebuild
index 27821bfea232..e0cae11e9d06 100644
--- a/dev-ruby/capybara/capybara-3.4.1.ebuild
+++ b/dev-ruby/capybara/capybara-3.4.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"
+KEYWORDS="~amd64 ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.4.2.ebuild b/dev-ruby/capybara/capybara-3.4.2.ebuild
new file mode 100644
index 000000000000..da6c2de9e770
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.4.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+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 ~x86"
+SLOT="3"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( www-client/firefox )"
+
+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/xpath-3.1:3"
+
+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 '/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
+}
+
+each_ruby_test() {
+	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
+}