gentoo resync : 30.12.2017

4 files changed, 5 insertions, 93 deletions

diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 600ae0290d35..b38d1a5e4ff8 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,9 +1,7 @@
 DIST cucumber-1.3.20.gem 279040 BLAKE2B 7615ab4041326b39193cdfc54c5016e5b9e87facb652d0cc17be3c7cfac5e38ee3558d06cbfe4167fb27f32a07eba92e9836100b236ed604c897c8af89349230 SHA512 050573d2d7ea111dd9c8ec402321960203f7fd8d591be4f15b09fbd5bed89f3cb82104b8306f88f53bd92468ba689800707845f55785e6d20ed9f66f4b949050
 DIST cucumber-2.4.0.gem 250880 BLAKE2B 2d0479695800639340332ab26b745a84cdbe7dfc575e652f6a94eca77b0c3397a48a2f3220a2a4eb164e9f0f747bf4866678b7927cd0ce47e5ce78ee057d273d SHA512 b7f9720e3f9e1f30aba9590ff92209073bdc028b880ac7a378f6dfe2a7f093c0521387cfc9319d7ed994c5e9de7106ccff23ba1f10c1cc5888785c69262c723e
-DIST cucumber-3.0.1.gem 265216 BLAKE2B 5bf7e2e28f268dde043a5b24ec18cac7ff1e00443d0aa80acb9ade5419c94c3854bfb58c24a88d7db7d9a00aa6576c5a2ff46c1092cd89629d73c6ed6f3c83ba SHA512 eee664d13dca5ce062f46a5d544ff43fc99bdc2ccd7c6d77d82380d8eb3c97a88305ba5a6052bfc8cee7fc59aa9d019116ef966d394b8b3d37d10fca122a2e7b
 DIST cucumber-3.0.2.tar.gz 267557 BLAKE2B 0ce098d9c747a6291e53c647f0e6da7adbcf4cd6f85953023f5fa0e14dc7186a706c43b81cf77a55ad56f932e60146e7e0ca7d4107f85e9c6bd46cbc8b2d1f7a SHA512 1506427fb6d9233231497f0e1396143cfb1495673113fbb26344b171413c1bc9d35fd8a8ca86aa14ffc279d1d9db05712618c3a0e96f2288056d76f39bbf2cf6
 EBUILD cucumber-1.3.20-r1.ebuild 2172 BLAKE2B c77fe5c6d6f6fee2edbf04758c1dacad34a7366d3b3c6db97b0c9c0ae08e1b05f12397db76f86cc2dac3c2f3ef5f46d779ef9d7e8051801b2cf425a75fbcba5e SHA512 b0fa2c24c9cb0ba916e9339f904a567562ab0d22337bfc0e92fcc0c28ab386780c689b5aeb5fa5bdb8fa8fb6054866d1f89573ebc0c20206dccc6dfebad8f28e
-EBUILD cucumber-2.4.0-r1.ebuild 2443 BLAKE2B 8a9743e011c5a6d4cc53f033284c0e764374fe10651dc11db899c575fc967564488d8e51f2dce8491e739942bc8f6ace4c37c1ead22654580c4494cada7ebc0d SHA512 61bd9f286c80a004d5cef046f4d510302563864712e3a70409ab8d998b31c5c0331795887b5020e58e645cf924706de31a51c6bdfe1d1186c4e5a4d124efb53d
-EBUILD cucumber-3.0.1.ebuild 2462 BLAKE2B 1da85d20495b7ed10cbacb2eb96c557aff56d95375c78458e98e5b549f5274f96050d0486c3639f37ada9f09b8d7a3934a767d54822bf53d97eb685fab21230d SHA512 781b54a7757bb5ebf95b91a81b97ff6236234f9f1bb7cf93cb36187c31dace53ef9409a4ce07556bb86fa1a83ef91f235053355e6543a9e51b4beb4dcc162d1f
-EBUILD cucumber-3.0.2.ebuild 2607 BLAKE2B 41708899dd89fdb08e9b5fa278e98453bef068bee4182d624de91bd8f83d99d93208c9631671102dd746e344dbc25f94ce9e75c7822586650c1565557d31099d SHA512 a81658edb50692c31ad7ea53b60db33108fc77cc31862d4b030d536d4fa5d4a885f7653e99f32fc9cb52b31cc46335057b45df4934c2406b58fa76d012624fa5
+EBUILD cucumber-2.4.0-r1.ebuild 2464 BLAKE2B dacfd4540ad642ff74ee7454b4d977250031cc8878ddac2ff6b359a9f7b78415b3771b71558554cc542c662c185ca010bd0cb819e31044b96995281b59f1d345 SHA512 5fed5eb20feaba66a5d000610a5f09b51bc7ec5654b68353b9da57395ed9aeca11c6385c43f0ad5923628de80e7a23aca19e2ec04cc4802f548aaf7a93f2a051
+EBUILD cucumber-3.0.2.ebuild 2624 BLAKE2B ce43a39f1b111e12fb0d0abf7505fd3821db8d33a6635a4a6c18fdf2df91f15caf32cc30b3bfc17388a6f35ea446d77187ddc46d5914ec18744d02639228dac9 SHA512 100846cdbed64964240dd750272a3316df3d16d5758cec396875e93fba8a747714d05a0e07bec599e7d3e4355232cf9eb571938f40b07627c48af668e73f122b
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-2.4.0-r1.ebuild b/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
index e2c35e97529b..b49386fcf48c 100644
--- a/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
+++ b/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 sparc x86"
 SLOT="0"
 IUSE="examples test"
 
@@ -63,8 +63,7 @@ all_ruby_prepare() {
 	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
 		-e '/git ls-files/d' cucumber.gemspec || die
 
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-
+	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
 }
 
 each_ruby_prepare() {
diff --git a/dev-util/cucumber/cucumber-3.0.1.ebuild b/dev-util/cucumber/cucumber-3.0.1.ebuild
deleted file mode 100644
index 2e2eea3c6d2d..000000000000
--- a/dev-util/cucumber/cucumber-3.0.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		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-1.7
-		>=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.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
-	>=dev-ruby/multi_json-1.7.5
-	>=dev-ruby/multi_test-0.1.2
-"
-
-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\|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
-
-	# 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 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
-
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || 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"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/cucumber/cucumber-3.0.2.ebuild b/dev-util/cucumber/cucumber-3.0.2.ebuild
index 4b4428203cf5..70e3c8c04bc0 100644
--- a/dev-util/cucumber/cucumber-3.0.2.ebuild
+++ b/dev-util/cucumber/cucumber-3.0.2.ebuild
@@ -64,7 +64,7 @@ all_ruby_prepare() {
 	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
 		-e '/git ls-files/d' cucumber.gemspec || die
 
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
 
 	rm -f Gemfile.lock || die
 }