gentoo resync : 29.01.2021

3 files changed, 67 insertions, 5 deletions

diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index ca3233ca9f01..45a022be95fb 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,9 +1,11 @@
-DIST capybara-3.31.0.gem 363520 BLAKE2B 246a199d89f5120bd1be7b36b5aee5bd4143ee5d1c8953cc2e65e805c234d902c5d898f873c562b8457c6e09af507cf81ddc178bcb617f2730b5db1f9ddd97c8 SHA512 920dbd331eff5300cfa575689f7c62f502cea5782ad58eff168ffc274f2622a95869a7ab90e53fc010bc7f5c0847caa5dcf69cb74eecc2a82f0f449c11be3edb
 DIST capybara-3.32.2.gem 365056 BLAKE2B c193f188aec6089aabafb5d09cb540f914d8c257d3faafa0d59f674069a39c29a3750c80bb269bf2d010cc7608aec1699c7d75d96c7c85c201aaa0f99adddf83 SHA512 b1b21615b5f87012a71a7901a4f9bb9cda61f1a455299d4ad05b05e0281985a6c158a1549864e551c2ca4b97e921139b35843a1d23efc45557647328c0d1c2a3
 DIST capybara-3.33.0.gem 366592 BLAKE2B fb64b301051011aa82194480bb79a33d06345cbe250fd7a32d54cb32038651f8598e860269c67efc58a87410a213f07e8f7107b725bd6286ebb93e7fd6ff125a SHA512 b169a12f330fdc016dbba6c7478cf52a51006499197bba67e6953f36929099212e209d2803511ca623b7e2b1fc0288fad1975fd426047c95680309145abb9977
 DIST capybara-3.34.0.gem 369664 BLAKE2B 4f55388b809e5d808f4cc3a45690eedc86d2bacd30498af8c891757881c527b0142a8b6cf2d46302d400c77e75eee33b4206b8d01fa416211895bfcb6b5175d3 SHA512 ee722be02cc0b23b7b7c92b29c7eb702a035a95e21c10c237eb6922fbc285c43431deca8bc8e445948a767265f4e8b6ef451f46168f26f8ad6dc6e1c88966537
-EBUILD capybara-3.31.0.ebuild 1789 BLAKE2B 0144d4405f871d24f715b1ee0e8e6797b37178939ad921f64d83e033256aa8228900ace9df68358e1d1222ff0ae7adcae830e8cd9e8b6d4a5f521224c618ed71 SHA512 502598533960c4d2fb06e8bec9859067246321ea625c1961c7ef115c44664b3f9b533cedb6c630c9c7dd5093cf873e0d16ea80d3d2d704db950e22bd9a980601
+DIST capybara-3.35.0.gem 371712 BLAKE2B 5c9cc5bdaa1f536d3cba104b041b937830447176b2748ceac7a729130596492fcd8242bf3eea5f062f920db7b4b1cbb12301c30feff0c51496ae128a7e123f00 SHA512 a52e20e1bbd43eb0169caef5254e3ca45082ee142b754e0e7a6d3a5796b6835afe57ca8230ec4dc1ef87305be3993b58092322c8b1de89bc564d6d51836e2245
+DIST capybara-3.35.1.gem 371712 BLAKE2B 1c389896b3d5a4f188829ab43394ca5aab108aa895a0f98468c6491635341116c4d4478bfa9e67e59171698b7f2186c3165c83d08010de76828c3df405fea1ce SHA512 c3f56df9f2a439ab350b91edb5e2e62ea7e14d1ddf9083107ae37640455cc4dba5f164f26d2dc3e8643a0e4fce22fa4cabbc38b7d88571a75f5e690e03ff0e12
 EBUILD capybara-3.32.2.ebuild 1789 BLAKE2B 0144d4405f871d24f715b1ee0e8e6797b37178939ad921f64d83e033256aa8228900ace9df68358e1d1222ff0ae7adcae830e8cd9e8b6d4a5f521224c618ed71 SHA512 502598533960c4d2fb06e8bec9859067246321ea625c1961c7ef115c44664b3f9b533cedb6c630c9c7dd5093cf873e0d16ea80d3d2d704db950e22bd9a980601
 EBUILD capybara-3.33.0.ebuild 1783 BLAKE2B c9be1ebcbae6b2141e9c0f967d92284c736c57046a30eee07705567e16aa065033ee307ad722aafe07bbe8080e9bb56636f16b0596d8b7a03c48dfc4a091bb0e SHA512 83c5ba82043668977392824b28125859ccaf75fef8cd4dcf829cb163c09b3f5e7603def865ba66dcd2a5a88b7016146e819ab6df58316df11269f463bb95c92c
 EBUILD capybara-3.34.0.ebuild 1795 BLAKE2B f58693cdc2d74c42a46497a13691fba12c1bb909ed6ee5d62bab41651acf2c39bcc0ca80f361861cb838299228f849be80efe3407b979c2010893e854df7571a SHA512 fe7d6b9ddbc73e9c2d884c7942584596a7d010183e85747c250170d32dc6e3c4065a40a0cf83e3cca04bb18e994d1347550106f8d1533287bb1ded850db1f9ac
+EBUILD capybara-3.35.0.ebuild 1795 BLAKE2B 597cff05c9947dbdc205f1542be43773db1217868752c08ff8937b75df9b5f4141b4e76fdf6d4437216e330878765fdf3b73d7ab551f69637d31dbfaa36ec326 SHA512 190ce0d107f781e723cfe44e37eaac19b8d01c798e48c2adccd28869534086f018489639de1ac1b3fb2c4e8cc3ab7cfecc4a1dcacd6b84662f10e0ba83ef2157
+EBUILD capybara-3.35.1.ebuild 1795 BLAKE2B 597cff05c9947dbdc205f1542be43773db1217868752c08ff8937b75df9b5f4141b4e76fdf6d4437216e330878765fdf3b73d7ab551f69637d31dbfaa36ec326 SHA512 190ce0d107f781e723cfe44e37eaac19b8d01c798e48c2adccd28869534086f018489639de1ac1b3fb2c4e8cc3ab7cfecc4a1dcacd6b84662f10e0ba83ef2157
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.31.0.ebuild b/dev-ruby/capybara/capybara-3.35.0.ebuild
index fa400375c0b3..101193fb0c58 100644
--- a/dev-ruby/capybara/capybara-3.31.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.35.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="History.md README.md"
 
@@ -15,7 +15,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.35.1.ebuild b/dev-ruby/capybara/capybara-3.35.1.ebuild
new file mode 100644
index 000000000000..101193fb0c58
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.35.1.ebuild
@@ -0,0 +1,60 @@
+# 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 ~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-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
+}