Updating liguros repo

8 files changed, 62 insertions, 109 deletions

diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 9f1fbc17c26f..662bd3e73a0a 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -1,6 +1,4 @@
 DIST bundler-2.1.4.gem 396800 BLAKE2B f770bd63255df09a20160369dc64e8923e996fb5ea4c11ee763d9a88e5fba142277ccd677861e3c0494b99a36261d5e7bdfb9c40c2abb76322061542f95b8505 SHA512 6c870061a78e17d97a9219433c7ef8fbf1112de17d0e0f3d8b6db1a518318528e3803184278412aabe65008e93f451ffa59465062856918ef488f9438399eff6
-DIST bundler-2.2.0.gem 400896 BLAKE2B a9d67d052bc6b7b8c09a6dbc249e348209a6a02bb3a43f9dbef29c3dce651974a4c9bde200085632cc7f4fb0957aae42a7cbaae28c8cab91986dacf1f52f1deb SHA512 bbee12a30362d1dfd8a7de4258d6623d08df91a38ba1e869f9a5878871d8fd145221f8eaa99fcb72e0c1404c9c31df37a5a1dbf4a94610cb3381566cc6c45516
-DIST bundler-2.2.3.gem 401408 BLAKE2B 7162444956c65d6684a299c7ce15f64a178dab40867315241eaa3cfcb51b6973a004980abef359c911de06ce2051e5ca98e68e3df388963f40378a6f5fabda62 SHA512 da1f1dfae51cdf3dd6792fc66c33389c113579b8a723fb204ae3b315dcd1d45aed65524469336934d7276be53b026952c944457e326c97b20d4c423dd44321ef
-DIST bundler-2.2.4.gem 386048 BLAKE2B 7a2cec046b75ff371df9b563a81f48c8a2a3782f75ec4868869b4b2fda5e117b6cd38daf6a566ec1201fe7a5f6b8b2c4dbe0cc552d2a63bcb4e5e9f53c710046 SHA512 f3c988278746896da276e5af5cf046c5910962c2022fc8d37ab00db1a81a69d77a1fd21fabd8a1d086891d18bfb4ac321dbb60f830b139aa7c3192ea879b4cf8
 DIST bundler-2.2.5.gem 386560 BLAKE2B 070f52338e9424e571ae40c01ba559158fd9938910be4d5b1d4c8990cdaac4f6a2cb7d2a554a2e7bbb35b18a31e9d1dba5c4e711556294496ac6978ae63a94f0 SHA512 d985168531ad7415841535a496717faff2cbdcff04c8b701c0e29533f3fe5c87cb5815e6b219ab1d536c29c8c8d80b051f4f05aeb2b6fe279dc12404bf824742
 DIST bundler-2.2.6.gem 386560 BLAKE2B e1e3f50425839bbb13360fc986f98588aa09643b6fb5b8c13911b5680ef0ae2ca0b19f71ffa99234f6f6a39ca6467564f25ac26874c67b493e028f086e89c211 SHA512 58e80bb313c132125e2b601113e6e262d00f768ca75adbacbff2e98cdcd83e40aa68a8f92aa56e477c66cd396687ad6d9f54f4df9366fd6b51424b6ff5429504
+DIST bundler-2.2.7.gem 386560 BLAKE2B 30d2f113f30cf4cff2d85ce06b36b947fd2d3cc0b1f03f1a0eae023babaa43820249f6b727095c5590e96adfd9914922454dbf0a2a42b8d8a6b0c75adcc5c04b SHA512 bd2fe4d7ad10fa98004514a93e2e5634bf0ca16a41410d01ed78e320d53923c6690c4564b70e5efcaf21636ef860ef56c425ce0a8e4b240fd97e05efae48c089
diff --git a/dev-ruby/bundler/bundler-2.2.0.ebuild b/dev-ruby/bundler/bundler-2.2.0.ebuild
deleted file mode 100644
index ab24df09b499..000000000000
--- a/dev-ruby/bundler/bundler-2.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. They also don't work
-# when run with a path that contains "-".
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# No documentation task
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_EXTRAINSTALL="man"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/bundler/bundler-2.2.3.ebuild b/dev-ruby/bundler/bundler-2.2.3.ebuild
deleted file mode 100644
index 751a48996017..000000000000
--- a/dev-ruby/bundler/bundler-2.2.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. They also don't work
-# when run with a path that contains "-".
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# No documentation task
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_EXTRAINSTALL="man"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/bundler/bundler-2.2.4.ebuild b/dev-ruby/bundler/bundler-2.2.7.ebuild
index 8256c6960865..8256c6960865 100644
--- a/dev-ruby/bundler/bundler-2.2.4.ebuild
+++ b/dev-ruby/bundler/bundler-2.2.7.ebuild
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 204db0d5fe4b..5347b565913e 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -2,3 +2,4 @@ DIST capybara-3.32.2.gem 365056 BLAKE2B c193f188aec6089aabafb5d09cb540f914d8c257
 DIST capybara-3.33.0.gem 366592 BLAKE2B fb64b301051011aa82194480bb79a33d06345cbe250fd7a32d54cb32038651f8598e860269c67efc58a87410a213f07e8f7107b725bd6286ebb93e7fd6ff125a SHA512 b169a12f330fdc016dbba6c7478cf52a51006499197bba67e6953f36929099212e209d2803511ca623b7e2b1fc0288fad1975fd426047c95680309145abb9977
 DIST capybara-3.34.0.gem 369664 BLAKE2B 4f55388b809e5d808f4cc3a45690eedc86d2bacd30498af8c891757881c527b0142a8b6cf2d46302d400c77e75eee33b4206b8d01fa416211895bfcb6b5175d3 SHA512 ee722be02cc0b23b7b7c92b29c7eb702a035a95e21c10c237eb6922fbc285c43431deca8bc8e445948a767265f4e8b6ef451f46168f26f8ad6dc6e1c88966537
 DIST capybara-3.35.0.gem 371712 BLAKE2B 5c9cc5bdaa1f536d3cba104b041b937830447176b2748ceac7a729130596492fcd8242bf3eea5f062f920db7b4b1cbb12301c30feff0c51496ae128a7e123f00 SHA512 a52e20e1bbd43eb0169caef5254e3ca45082ee142b754e0e7a6d3a5796b6835afe57ca8230ec4dc1ef87305be3993b58092322c8b1de89bc564d6d51836e2245
+DIST capybara-3.35.1.gem 371712 BLAKE2B 1c389896b3d5a4f188829ab43394ca5aab108aa895a0f98468c6491635341116c4d4478bfa9e67e59171698b7f2186c3165c83d08010de76828c3df405fea1ce SHA512 c3f56df9f2a439ab350b91edb5e2e62ea7e14d1ddf9083107ae37640455cc4dba5f164f26d2dc3e8643a0e4fce22fa4cabbc38b7d88571a75f5e690e03ff0e12
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
+}
diff --git a/dev-ruby/redcarpet/Manifest b/dev-ruby/redcarpet/Manifest
index 2f347bb5bc0c..a0a34baf2c31 100644
--- a/dev-ruby/redcarpet/Manifest
+++ b/dev-ruby/redcarpet/Manifest
@@ -1,2 +1 @@
-DIST redcarpet-3.4.0.tar.gz 105525 BLAKE2B 38b28f400b7300ea49cebda9b4739193b54c322c1c20ecba50938893286ad87e44ba9e9da83eab8433af0790d76bc0db4189fc0b70a4438480fe784570809e1a SHA512 25ed1fd35ebf815f396ed819baec69aae366bafab3983a53d364b1ef0d3f18cecaa523953d12cb0e5b896c30ac86e000318f33c633047bd271362474b9b8f877
 DIST redcarpet-3.5.1.tar.gz 106950 BLAKE2B 2f84e0dbadaa79827d9d244988b19161996e249e493208b20b6339f0eccf73160fe84d79f11a23419573693bbc9c1faae61e690ffe5ec133f8a0baddb69d92b5 SHA512 348ee8fc56b89bb1b9fe0b004cab08e9542f3806a885fb5fb0ff58c9a0fa704ad37611484e071951ad00d1d337988d5dae6d240cd65df890f8fe0865e242608d
diff --git a/dev-ruby/redcarpet/redcarpet-3.4.0.ebuild b/dev-ruby/redcarpet/redcarpet-3.4.0.ebuild
deleted file mode 100644
index 4f82bacf9d85..000000000000
--- a/dev-ruby/redcarpet/redcarpet-3.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOCS="README.markdown CONTRIBUTING.md CHANGELOG.md doc"
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-inherit multilib ruby-fakegem
-
-SRC_URI="https://github.com/vmg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A Ruby wrapper for Upskirt"
-HOMEPAGE="https://github.com/vmg/redcarpet"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e 's/=> :compile//'  Rakefile || die
-
-	# Avoid unneeded dependency on rake-compiler
-	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s#ruby#${RUBY}#" bin/redcarpet || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/redcarpet extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/*$(get_modname) lib || die
-}