gentoo resync : 17.07.2021

3 files changed, 26 insertions, 32 deletions

diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 0b2bc1bdf04b..db9b2deec57d 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,5 +1,5 @@
-DIST cucumber-3.1.2.tar.gz 267995 BLAKE2B a55d15d2c5746efd2e9f3518025b3b6d69e7712920b5731e1174ff429a9d6161d9aad7c0065c5ddf8b97fd87c9e658ff86b961b175db2c930bba52d1904d6b62 SHA512 abf0b562476653c393bc5a3c1f9669d91a2e312bcceb98bd20ac3771a61eeb696721cba76299d12871f7c61fdca176310e3a334b53d10c31ef3e201948c762d0
 DIST cucumber-3.2.0.tar.gz 271886 BLAKE2B 0945336e2a4d14c21d22b3af18fb140663fa0c5acd7d29540cb6755fcc50b020640ffc573f4d4ed17af2758df3df410f93cf5067b736cb8005d9a6ae7fa4d397 SHA512 927ca314c56f83e270284921131ec62aa05053d29a77b230799bd1949751f64c964c0f87525c776d7fe260506ddb632b5cc8939df841d131f6a0af8a82110441
-EBUILD cucumber-3.1.2.ebuild 2750 BLAKE2B a2098d1c0860e45a13a27badd5485ad0a2cc4743cae3585cc3832b6f8a04b82ac335a8853667384848ded290f74677548957e2b51198391f23a56ed1333a1bdc SHA512 5a851d7d42761cee2c48149c8fc65c2daddec95fc3a9940cd1661cf830248e450a903f4d9978900b82c750ce2bf63e24585e64f9e302133a523bad560a28a52a
-EBUILD cucumber-3.2.0.ebuild 2865 BLAKE2B 9c2d2d01edfff03b79c3b602faaf95ff6ffd8877b51691b1dfa66db409ddafc1de227d6517a6aeba9feea2e18c1cdb81860f28ab659faa12029350d0df67e61d SHA512 e3ccf6f584b8ecc7936feefc24684e7eda0510f1601d42b00b65318a50b32e9bcdb98de9c722dc05e5af5f859d2e4be354ff114901a93e49409e964b44424be5
+DIST cucumber-6.1.0.tar.gz 250437 BLAKE2B 64b2adfe5b9b78e70bdf6eea5bad4fe96b5598b686e27aee8635c84070c2e20bd8051217db9c79c9f0de62b6a8eed85c327f2adb9965d39f58f74359b935c013 SHA512 45b455f1c1728463a3e0dd9061d30e6438710e137e923d56cee90be4aac4b9f940a79aac60eca8cee3c4800831e7f57c1893276449e18a9f58c3f3664d810b08
+EBUILD cucumber-3.2.0.ebuild 2864 BLAKE2B ba02dcb6f95ec1f5bea0ead4f3751e5ef8239886639225bc8d7bf473a157f623edfab6562f8c59691d5fc2f301fd68178824968f66f514d57d1334c194e8268a SHA512 d95106aeb1be4f9e5e790f317571ad74a96a0a7ac6d3317ffb30485a99e0cbcdc28639e8cfdaf4586f09f2be7609d4d6855014bd6344234594c749bdf61966ce
+EBUILD cucumber-6.1.0.ebuild 2535 BLAKE2B cdb3792a43b3eb58bc23a142efd3a690d5bf0304fabf5872bcfb463dcf7cbbf42dc2d86057ad718a2339be20b96bfa87ff7a3c56529155508ff6bdacb8fa68c7 SHA512 d0ebc9cf6709217d995e141586bdebab08443d9c4155663def623dc5946229f469b21be942b76ce885b2c6d6fb16333d3caf0ce6e0aa11c7d7ae04461d564eb9
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.2.0.ebuild b/dev-util/cucumber/cucumber-3.2.0.ebuild
index 6899c1c9f403..0fd14e28e954 100644
--- a/dev-util/cucumber/cucumber-3.2.0.ebuild
+++ b/dev-util/cucumber/cucumber-3.2.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/cucumber/cucumber-3.1.2.ebuild b/dev-util/cucumber/cucumber-6.1.0.ebuild
index bffd18f6ac02..9901e0aa83cf 100644
--- a/dev-util/cucumber/cucumber-3.1.2.ebuild
+++ b/dev-util/cucumber/cucumber-6.1.0.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+EAPI=7
+USE_RUBY="ruby26 ruby27"
 
 # Documentation task depends on sdoc which we currently don't have.
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
+RUBY_FAKEGEM_BINWRAP="cucumber"
+
 RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
 
 inherit ruby-fakegem
@@ -19,7 +21,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~amd64"
 SLOT="0"
 IUSE="examples test"
 
@@ -29,21 +31,23 @@ ruby_add_bdepend "
 		dev-ruby/rspec:3
 		>=dev-ruby/nokogiri-1.5.2
 		>=dev-ruby/syntax-1.0.0
-		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
 		dev-ruby/json
 		>=dev-util/cucumber-3
-		>=dev-ruby/mime-types-2.99:2
 	)"
 
 ruby_add_rdepend "
-	>=dev-ruby/builder-2.1.2:*
-	dev-util/cucumber-core:3.2
-	>=dev-util/cucumber-expressions-6.0.1:6.0
-	>=dev-util/cucumber-wire-0.0.1:0
-	>=dev-ruby/diff-lcs-1.3:0
-	>=dev-ruby/gherkin-5.1.0:5
-	>=dev-ruby/multi_json-1.7.5
-	>=dev-ruby/multi_test-0.1.2
+	>=dev-ruby/builder-3.2.4:3.2
+	>=dev-util/cucumber-core-9.0.1:9
+	dev-util/cucumber-create-meta:4
+	>=dev-util/cucumber-cucumber-expressions-12.1.1:12
+	>=dev-util/cucumber-gherkin-18.1.0:18
+	>=dev-util/cucumber-html-formatter-13.0.0:13
+	>=dev-util/cucumber-messages-15.0.0:15
+	>=dev-util/cucumber-wire-5.0.1:5
+	>=dev-ruby/diff-lcs-1.4.4:0
+	>=dev-ruby/mime-types-3.3.1:3
+	>=dev-ruby/multi_test-0.1.2:0
+	>=dev-ruby/sys-uname-1.2.2:1
 "
 
 all_ruby_prepare() {
@@ -54,30 +58,20 @@ all_ruby_prepare() {
 		-e "/json/ s/, '~> 1.8.6'//" \
 		-i ${RUBY_FAKEGEM_GEMSPEC} || die
 
-	# Avoid dependency on unpackaged cucumber-pro
-	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
+	# Avoid dependency on unpackaged packages
+	sed -i -e '/\(cucumber-pro\|webrick\)/ s:^:#:' Gemfile || die
 
-	# Avoid harmless failing spec
-	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
-		spec/cucumber/formatter/html_spec.rb || die
+	# Avoid specs failing due to differing deprecation message
+	rm -f spec/cucumber/deprecate_spec.rb || die
 
 	# Avoid failing features on new delegate and forwardable behavior in ruby
-	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
-
-	# Avoid dependency on git
-	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
-		-e '/git ls-files/d' cucumber.gemspec || die
+#	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
 
 	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
 
 	rm -f Gemfile.lock || die
 }
 
-each_ruby_prepare() {
-	# Use the right interpreter
-	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
-}
-
 each_ruby_test() {
 	RSPEC_VERSION=3 ruby-ng_rspec
 	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"