gentoo resync : 21.10.2017

2 files changed, 19 insertions, 10 deletions

diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index aa38ff994ece..7b8c8f7e0350 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,8 +1,9 @@
 DIST cucumber-1.3.20.gem 279040 SHA256 8720b60453866f3970d2743ccf62a503bc656a56c7077cb30a892011c248f080 SHA512 050573d2d7ea111dd9c8ec402321960203f7fd8d591be4f15b09fbd5bed89f3cb82104b8306f88f53bd92468ba689800707845f55785e6d20ed9f66f4b949050 WHIRLPOOL 72488e56a8e8c34cf35fcf8f3dae3b4d80baaa2b57d4e10207bfcdf93e2d7bc45cd13517c97aaf615049f0ee1e6f583db45473f6270f2db18455aa265eeb8ef1
 DIST cucumber-2.4.0.gem 250880 SHA256 307e87c24e250d015c1d9990a7d79f7bdd9b239aa25681fd861fe491541892cc SHA512 b7f9720e3f9e1f30aba9590ff92209073bdc028b880ac7a378f6dfe2a7f093c0521387cfc9319d7ed994c5e9de7106ccff23ba1f10c1cc5888785c69262c723e WHIRLPOOL 3a4fed0ea04a68732cf9d6177132e897e8de9de1b0cba225866e0657d1b798c53bc2139aba5fb1ac26990752595d3d92a524a1e3fdb04b26ffdf2eeeaffff141
+DIST cucumber-3.0.1.gem 265216 SHA256 bcd927f02c900178531d30714bdc3a5f201d0232a99565efbc65ad0c66ee16c9 SHA512 eee664d13dca5ce062f46a5d544ff43fc99bdc2ccd7c6d77d82380d8eb3c97a88305ba5a6052bfc8cee7fc59aa9d019116ef966d394b8b3d37d10fca122a2e7b WHIRLPOOL 0db85b2115e5c89667223f928fb4d433c5942c03327440e9e3fdb35ae5eb3a0ed40f3c91284b84131972f358f057d86f08b708427a4d8fca71beb1e4a7cd5344
 EBUILD cucumber-1.3.20-r1.ebuild 2171 SHA256 07616f8b8e2f1f50dd73e46aa44cbbe923fda76b6928e7db5b5d08d9892276c4 SHA512 5022e706aa004375adda2c7a180257d609b9a4c39ea7594a02b4ca57e85d97d7bd46d8b208e6e88a82c22da24776f5e1d68de31f3bdfba084f299d1c733ca4f1 WHIRLPOOL bf8cce41e530527fa85b0d51f4d1deec67b4a2ff45578b0bf83ef5ddd82fd52ac969b8c064308d81336b084662b62e4a1daa78fe826ae53c9bfbc381c9f402e2
 EBUILD cucumber-2.4.0-r1.ebuild 2243 SHA256 fc3fc51f38f0d61db6e0392cf18c775decd5a4e83748ff9be8e984c2db7db4cb SHA512 5d09f9b09b7a844c5475706db6ae5e9ac707599bb9a88d89ff8317a01b796dbba99cb7776e18627f768c15b29f7613890e74557fce0f51ee96eec393f5d28941 WHIRLPOOL 09c396cadf1646c391c6da9fc95df6737ca873e54a23ae916210acd1adb88b2db916757f22d0bbc566e9dc95c31801b9d3fac5bf467b0432ba9a63a81ed5352f
-EBUILD cucumber-2.4.0.ebuild 2130 SHA256 8e2d8b65f98e36f78da213956362103e0a668fb160ca5674c082273af864e4e4 SHA512 7dcde7b5d11531ac87b93183b194fb60782298618334d021989bc7bd8b0c4c01e4dc1b3cd7ff9023b3ccac16f9190ee6058ad2187c472caf2a97e25dfb79213d WHIRLPOOL 3b969e823b66b3cf4b942c93998f38488168891df615fc96df08df1fc094df1c49edbfc8c554c1df9186d9c7b8016b654e977453b3ac8a4f2d23f1832237467f
+EBUILD cucumber-3.0.1.ebuild 2444 SHA256 9390dc29faa0106d498501587e1fd30072153cfa1c349a73d6b3905eaca73d1a SHA512 5a9479f04839f15ace8c1b4e2371ca54d2746dfac5944174feaf72b51d3f42faa8919a153a6f93e58ec88fbf603ebe79427288a15e14d4b5b984544597cfd364 WHIRLPOOL 873bbd50c6a07b895f88cff4bdb77c4587ac59d40839b3cca2e603ae0a02522f763c3005af0145ec96e536dcdc30e5e5cd8efb06ab1612b05c27e08014ef9568
 MISC ChangeLog 4604 SHA256 a884be66f9598d8153554cf8979b4ffadccc48aa10f46d385be85eb2e62f09da SHA512 3262f8ab69e8e4f919bfdcc1de7ad3155c36d0f701613077100719156ee0aecf7b52717ee31dbb22ba911f680578465b92975b77f1f69098d32e7c1ec656ba80 WHIRLPOOL 20bf26314df383700ee3fafc6114b61bda46077a0fb5b3868d0b4b311e074291c7edc56145af60d859e4720fa1335d6aac18b24402c4de691269a1ea96919ce3
 MISC ChangeLog-2015 14316 SHA256 2cbff183309915a9814ce1b89e41f632362f9bd5ef2054657bfbe052a8c3e08c SHA512 ea6db7424fb828881603e14ec992532c2fbff12e606d23f80890f52f26c5c29b98df1a25bb81e7f041e211e8a8b1093e6ef4533097050681405603d76a4868f0 WHIRLPOOL 503e2a3a7216829039a535095d43692dc5cd6c8fce8bcd34f1e77c006a457feb4475a4152c0e7a97dee44e7dad98a08748a0c801e56bcc9b81c5977276d25344
 MISC metadata.xml 304 SHA256 7f823b1d310a6e26f4e7bb4698b5f31f1935503b6dca00bdd209d2dcb66539b9 SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902 WHIRLPOOL 3d8b4bd989e56fc12449fd597c2749f05b3ecd6bb40604f72255cf51abe5141713ec097efd6914b6dba6b405ad13b9a3940170b13578ab74ee251d8229ac6df2
diff --git a/dev-util/cucumber/cucumber-2.4.0.ebuild b/dev-util/cucumber/cucumber-3.0.1.ebuild
index d82fce78bc62..afcae85754d7 100644
--- a/dev-util/cucumber/cucumber-2.4.0.ebuild
+++ b/dev-util/cucumber/cucumber-3.0.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
 
 # Documentation task depends on sdoc which we currently don't have.
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
 RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
 
@@ -17,7 +17,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64"
 SLOT="0"
 IUSE="examples test"
 
@@ -28,16 +28,17 @@ ruby_add_bdepend "
 		>=dev-ruby/syntax-1.0.0
 		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
 		>=dev-ruby/json-1.7
-		>=dev-util/cucumber-2
+		>=dev-util/cucumber-3
 		>=dev-ruby/mime-types-2.99:2
 	)"
 
 ruby_add_rdepend "
 	>=dev-ruby/builder-2.1.2:*
-	>=dev-util/cucumber-core-1.5.0:0
+	dev-util/cucumber-core:3.0
+	dev-util/cucumber-expressions:4.0
 	>=dev-util/cucumber-wire-0.0.1:0
 	>=dev-ruby/diff-lcs-1.1.3
-	>=dev-ruby/gherkin-4.0:4
+	dev-ruby/gherkin:4
 	>=dev-ruby/multi_json-1.7.5
 	>=dev-ruby/multi_test-0.1.2
 "
@@ -45,7 +46,7 @@ ruby_add_rdepend "
 all_ruby_prepare() {
 	# Remove development dependencies from the gemspec that we don't
 	# need or can't satisfy.
-	sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|rack-test\|ramaze\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
 
 	# Avoid dependency on unpackaged cucumber-pro
 	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
@@ -54,8 +55,15 @@ all_ruby_prepare() {
 	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
 		spec/cucumber/formatter/html_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 '/git ls-files/d' cucumber.gemspec || die
+	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
+		-e '/git ls-files/d' cucumber.gemspec || die
+
+	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
+
 }
 
 each_ruby_prepare() {