gentoo resync : 10.04.2018

3 files changed, 2 insertions, 99 deletions

diff --git a/dev-ruby/gherkin/Manifest b/dev-ruby/gherkin/Manifest
index aa5ce676e0a5..ccafc72f20c0 100644
--- a/dev-ruby/gherkin/Manifest
+++ b/dev-ruby/gherkin/Manifest
@@ -1,11 +1,9 @@
 AUX gherkin-2.12.0-ruby21.patch 1451 BLAKE2B 4abe74fc78783ca56a6fc47a24b39fc96056964ea1956f693ab0856a0586ecccb6a189b503c45a31a4ceb805e5c27be0e88ba5f84d50409e255a6961c48835e3 SHA512 57d333b3be301c4e6ad3d14f24ec80bbeea373c5d7199adfa1554c6c221335ae1783e28af325f5757f31884140c278443e045befa15f65a91774e967ca8c3a23
 AUX gherkin-2.12.2-ruby21.patch 1485 BLAKE2B 99bd60c95f0cb38f5ece36329d10254b5961bed856131d0f615b4dc044f973346dcab68d53fb9df6f1cf5f0b12bcca8b43eaf45bdbc4acc1b6aae7c2dcfd9712 SHA512 5d5efcd50727072918c481a972546fc11b04685eb0ce4194ece9316bf100a004d24960d03531da7ee3ccbd7d7e56ea74e93a02400b1302c855bdcfc47b541d0c
-DIST gherkin-2.12.0-git.tgz 605964 BLAKE2B 035f3ce3541010d42351b728c4452befa4939da0216b059d3895f5677e4bffa2a40b389e21292d0051a3126064d137e5e0f2c7bd030e42a8c4ab38cbd4a7f7f2 SHA512 e86c2299bb3b41845bf8a3119b65ff855023510173b04c1e08e1105c03523e0e89ec45db4c7034e85fc20b7a9e1ce5a791aaf3f4793d44c0aa782ffd9fcee83a
 DIST gherkin-2.12.2-git.tgz 1764938 BLAKE2B b5cc7f063c8567df2dfe92fe805d5310feeba967865221ce69c8c24986ab786851885f4724b17a028daea298eea340b3bcd0c7296f05b02816c837ffdf8a41b5 SHA512 1030bcaf31791c7031f22b8e4c5d94ddbddf012b8686d06a7598fde99a28f8a1fda45dc66dbdefdb825a045730b077a10ca1134835630710551e20364886ce51
 DIST gherkin-4.1.3.gem 350208 BLAKE2B 3b0f54124c9f29c9216aaa9810526f1e11f6243b02143443d0ac18209320c14fda67f1c36d3056dbe5adbc18c36f72270054c17a011921eb87f8d21bc3e8c3c9 SHA512 7c113172ddf38ccf7e49eaac19355f3cb991f69d7499dba9189f375b75d3614f349fc6374e584a92c1223b0708cc8944859b4b38e28d79779a5091fa0c775e6e
 DIST gherkin-5.0.0.gem 340992 BLAKE2B a8292fde04c98c409423733791e78b9d6e40a7a60b59a1acd0a0e9c6df0be9185e90f1c5af6ce0ac39f352457c18094c495557fb05323eb7ea5ae8ce27008950 SHA512 cc782e37f5aea4ad0776f5336e6218b77e7fd8d193786acffaa44685de3a2592e4e6f37a3787add807654901afd12bc2d094a782b154bb2be9e2cd16e283df2a
-EBUILD gherkin-2.12.0-r3.ebuild 2701 BLAKE2B 2200f26428812a62bcc335eb45d8e717cdca9fcad4d6592d8fea2a0f952835ffc48e231af501b3d7e71150c51fb08bd1aab006ed5f17cb089173658bfb6ac6fa SHA512 86e0e25dbe9dbb6d7f51b54d22b6021e3e6fb128ae4e0eafc9cc33c126c0d6f11a946dfbedfac86bfc31085d2ff59de90214b982e2780630feb997108655e9c5
-EBUILD gherkin-2.12.2.ebuild 2616 BLAKE2B ea6d44a7d2581666b612e8900feeb6248e76d8f06a2321e02b092a221a326239827af6aa333abca8521c45d90d38e245f548b66ab6875f5dbdb39f544e5be01d SHA512 2e1fc5e3bc1429d806e7e6fdc5fda22998dc747382b8f30e5cb992dc16f9eea3e93a56e1adb6b8addae76344e2ddff67795e25f91b296af83bbfb2ace8e9da5f
+EBUILD gherkin-2.12.2.ebuild 2615 BLAKE2B b50787711a231ddea79841dd235ea076078f32a9bceb6ec32ba3f9d7164ef9eac34e2f3bf916aabb7839d8a0ed081206cd5b91fbc173f4085e1b6b3e6a918b7a SHA512 475270e4edef3ae3a115aab6dabe3f3c7e89539a92eaee529b54e78e58a90081019f8b501d83f836552536d2245f6d59c271ce3b861dc906138f98e03d72bcdc
 EBUILD gherkin-4.1.3.ebuild 577 BLAKE2B c0ee73611bfc3ba58edd1ddc36509e0fbb6a51defb1299568df5c08f7beb66b66f4a563551ef1f54213d1589227d1d67bb2c9efb8ad7e7e93a5adeb73aceed3c SHA512 d9fbfb514a83e9ecdd1592cdfac3a5ad761505b956cbc100cbf1374291fffd2908a51fd068cae2cc7138dd951e21329fc8063a95eeadf66b29b7a8ef1701e667
 EBUILD gherkin-5.0.0.ebuild 570 BLAKE2B befb2fe67dee3c7f0447de9fa7046422b5f53144142288d26af1112bacfd67fa30f74d54a74ae61430d9dadfba2bae7024318bd4ecf7b47679836752ed57e76b SHA512 2ff4378fb44a32d53f7f067d5ccc447f0e9647d9a7571fad93f843eb4458b0c66a3873dec55de533f947bb704a96729ccedaee038d4d0a65ae92ff9e8c24eb26
 MISC metadata.xml 342 BLAKE2B 9a34d41c97eea1996d1fabbee85346c55ab263b0f7087661038b42d2fb25d05f03ec46cf804f8972984200b9891c5ff8b77d26faf5edd8d3d63a76e25ec66b5e SHA512 83d54811e863b8af9f5ba53f081e140d12af0d20ba5ae7273317fd42aea5a5a0fca8f742352794dacbddcdca932dc2ea60e1201f3d6429315210da99578f844e
diff --git a/dev-ruby/gherkin/gherkin-2.12.0-r3.ebuild b/dev-ruby/gherkin/gherkin-2.12.0-r3.ebuild
deleted file mode 100644
index 77bb691d3a12..000000000000
--- a/dev-ruby/gherkin/gherkin-2.12.0-r3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Fast Gherkin lexer and parser based on Ragel"
-HOMEPAGE="https://github.com/cucumber/gherkin"
-LICENSE="MIT"
-SRC_URI="https://github.com/cucumber/gherkin/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
-SLOT="0"
-IUSE="doc test"
-
-DEPEND="${DEPEND} =dev-util/ragel-6*"
-RDEPEND="${RDEPEND}"
-
-ruby_add_bdepend "
-	dev-ruby/rake-compiler
-	test? (
-		>=dev-ruby/builder-2.1.2
-		>=dev-util/cucumber-1.1.3
-		>=dev-ruby/rspec-2.6.0:2
-		>=dev-ruby/term-ansicolor-1.0.5
-	)
-	doc? ( >=dev-ruby/yard-0.8.3 )"
-
-ruby_add_rdepend ">=dev-ruby/multi_json-1.3"
-
-RUBY_PATCHES=( ${P}-ruby21.patch )
-
-all_ruby_prepare() {
-	# Remove Bundler-related things.
-	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb features/support/env.rb || die
-	rm Gemfile || die
-
-	# Don't use compile dependencies to avoid building again for specs.
-	sed -i -e '/:compile/d' Rakefile
-
-	# Keep this hardcoded -O0 optimization level since
-	# https://github.com/cucumber/gherkin/issues/182#issuecomment-6945009
-	# hints at the fact that removing it might cause the mysterious
-	# Lexer errors that hapen intermittently.
-	# sed -ie -e 's/-O0//' tasks/compile.rake || die
-
-	# Remove feature that depends on direct access to the cucumber
-	# source. We could probably set this up by downloading the source
-	# and unpacking it, but skipping this now in the interest of time.
-	rm features/pretty_formatter.feature || die
-
-	# We need to remove these tasks during bootstrapping since it tries
-	# to load cucumber already but we can be sure it isn't installed
-	# yet. Also remove other rake tasks for which we may not yet have
-	# dependencies.
-	if ! use test ; then
-		rm tasks/cucumber.rake tasks/rspec.rake || die "Unable to remove rake tasks."
-	fi
-
-	# Avoid dependency on yard if USE=-doc
-	if ! use doc ; then
-		rm tasks/apidoc.rake || die
-	fi
-
-	# Avoid implicit dependency on git
-	sed -i -e 's/git ls-files/echo/' gherkin.gemspec || die
-
-	# Fix deprecated code removed in ruby22
-	sed -i -e 's/Config/RbConfig/' tasks/ragel_task.rb || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		yard || die
-	fi
-}
-
-each_ruby_compile() {
-	${RUBY} -I lib -S rake -rrake/clean -f tasks/compile.rake compile || die
-}
-
-each_ruby_test() {
-	${RUBY} -I lib -S rspec-2 spec || die "Specs failed"
-	CUCUMBER_HOME="${HOME}" RUBYLIB=lib ${RUBY} -S cucumber features || die "Cucumber features failed"
-}
diff --git a/dev-ruby/gherkin/gherkin-2.12.2.ebuild b/dev-ruby/gherkin/gherkin-2.12.2.ebuild
index fb6c427787f5..a0671caf9601 100644
--- a/dev-ruby/gherkin/gherkin-2.12.2.ebuild
+++ b/dev-ruby/gherkin/gherkin-2.12.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/cucumber/gherkin"
 LICENSE="MIT"
 SRC_URI="https://github.com/cucumber/gherkin/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
 SLOT="0"
 IUSE="doc test"