Add back -O0 optimization since this may fix crashes with the C-based lexers.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 102 insertions, 5 deletions

diff --git a/dev-ruby/gherkin/ChangeLog b/dev-ruby/gherkin/ChangeLog
index 07ae8b6240b1..7a1e9281c451 100644
--- a/dev-ruby/gherkin/ChangeLog
+++ b/dev-ruby/gherkin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/gherkin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/ChangeLog,v 1.57 2014/01/19 09:20:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/ChangeLog,v 1.58 2014/01/20 10:53:46 graaff Exp $
+
+*gherkin-2.12.0-r1 (20 Jan 2014)
+
+  20 Jan 2014; Hans de Graaff <graaff@gentoo.org> +gherkin-2.12.0-r1.ebuild:
+  Add back -O0 optimization since this may fix crashes with the C-based lexers.
 
   19 Jan 2014; Pacho Ramos <pacho@gentoo.org> gherkin-2.11.6.ebuild:
   amd64 stable, bug 493780
diff --git a/dev-ruby/gherkin/Manifest b/dev-ruby/gherkin/Manifest
index b654fe31045f..4fd7ad05ce88 100644
--- a/dev-ruby/gherkin/Manifest
+++ b/dev-ruby/gherkin/Manifest
@@ -5,13 +5,14 @@ AUX gherkin-2.3.10-no-werror.patch 861 SHA256 f430e369b9e5d2e740c040d7fa5410e735
 DIST gherkin-2.11.6-git.tgz 603165 SHA256 a52b0f1909aea52ea5644e0bf91008538d20d46e41a5a940b56b7e8066824a1e SHA512 92409f948d39fe4038016706fb5b8580ed9aeffac2b4b03dceb2759923010c33f4bc51b3dbb31a5108e2892c52276ceb0c3e14b3e6826193d4624c8b72c0845f WHIRLPOOL d1c7d13e4601fe345e13a04dc10eb2b7679f65eb99ed022cbeaa2479d9cbd8b91e1344f15c9c34ada3dcd4777870435663e433906175ef9654ea26d08522e0b1
 DIST gherkin-2.12.0-git.tgz 605964 SHA256 09206d66e437bfa2cb917a251899e3e95479c47d713a2b8de3e7dcbdd9982bfa SHA512 e86c2299bb3b41845bf8a3119b65ff855023510173b04c1e08e1105c03523e0e89ec45db4c7034e85fc20b7a9e1ce5a791aaf3f4793d44c0aa782ffd9fcee83a WHIRLPOOL dcfc5b5a0dcad7e401c2e0afb41e53593d095a44e97df8eadffa634b155ccb5a979f3e719e57c32d18afac0be49d31021276abc20010a6a9259ca041c155a390
 EBUILD gherkin-2.11.6.ebuild 2379 SHA256 7bfc15e30b3e0335c9b08e212bbabbfe1d96d2694c4a8b454440a4bf93ae423c SHA512 e777a85ab8ea4f0494ca6c3e60756a965eb01e38230a5414f81b6f82e9f749cae2f555432749c5f565d5691d1bc79894a4d6d491e588fa31e645599da4da677c WHIRLPOOL 4547008144e21301d7611e850c1a80e4c871b2e5a1a539e6248f2e8f2eea37456106cc24da8742f36b48e193faf6c3ebccd128f708d9140517e202b1fd19f282
+EBUILD gherkin-2.12.0-r1.ebuild 2655 SHA256 7ba13547d73b3085fc57b60ea807c8bedf2b7c88fefe6741b66cda1c60ae44df SHA512 05e97f9341f568eb58ce26a92ff6b8119322c7cc53bc1603e8ac00230331f9db1ea59828fd0c89c9d6a8ca60c34cdf7ae490547ec748b73ec458e9443648dd48 WHIRLPOOL 9a9c3dcb9c21e39a650c2d29f0872ccb2159abc1b99a1c2bd6e50a3e45bf5355bec9b785d24dcbf61f08325439f8d5324494bd52ba2959dc4671d18dc79e0cee
 EBUILD gherkin-2.12.0.ebuild 2456 SHA256 4bd513599e5f98030b64e299e54635cb383240b68e4b7594b76b9c4856453516 SHA512 83dfaafed92c5f51caaa9807bdd7290d4d313b70c1cd39d65d6176a879e002d50ba550caa3335d1dc708358bc591cac0fb18075e4e002e4dd0ca7ad41ce8e8ca WHIRLPOOL 27731106a9539cb8f1319704855835068a5f9fc723ea8b9a029fce0594ae842129532712be8c7a02a8841f0a0115203433b860a1cdfa5c0c1789a1426052e4c8
-MISC ChangeLog 7786 SHA256 4a74b07eeffc455109117ca1bbc6b3e812bd66b4009c19212109a09f4ccaddbf SHA512 ca13b671d75f12e5f88f4ded58a6c7fbc1359f57b62f3c6e77fd0fd6f49ab8ed6a1496131c13158f653813c70812c75c21eb7805bd84c9720ca9ceb49afec6f5 WHIRLPOOL fb010097fc90ea24ae2aa95e544eeefd2b8395ea9e1c0c45da53a009eb1eaff064139feab4b9077fbcac1481c7ec9abffb6bc653e527615ca3f796233e7f7c8c
+MISC ChangeLog 7979 SHA256 36ced61b22470f6495840ab583ba14402e5996a33bb4d6a7d0cc7cca21521d33 SHA512 fcafd794b603deb0450cb994cae74b8c97b2b4ca6a7e8e983dc85d194e604770e477dbbd8ca4bca85628e418379994ca7250679c090a0001b2458dd0d4139284 WHIRLPOOL f4638f1bcdfdf93baa57d279c31440211d6c15dd219d041f7926387b9c2f54ea90cb8cc1570cb04f4552fe2bd82818ad8db621cc8f7fa8e0dc9eae0b1dd9d862
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLbmOMACgkQCaWpQKGI+9TZWwCggX6dX85qXEuMqK9t/p6+OMHS
-D9IAoIBh4axl5PfOScQWlM6CfzsNHoyY
-=fg2m
+iF4EAREIAAYFAlLdAD8ACgkQiIP6VqMIqNerRwD8D3UupvwjWRkhxh+Mm6ZnAlEs
+dzZZNjLuIMXGU065ZZUA/RUq4QeACeQMoMr7He+7QxP1FmtepvfjUT15wp242cVW
+=iz8/
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/gherkin/gherkin-2.12.0-r1.ebuild b/dev-ruby/gherkin/gherkin-2.12.0-r1.ebuild
new file mode 100644
index 000000000000..2fc7f4b52d95
--- /dev/null
+++ b/dev-ruby/gherkin/gherkin-2.12.0-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.12.0-r1.ebuild,v 1.1 2014/01/20 10:53:46 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19"
+
+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="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE="doc test"
+
+DEPEND="${DEPEND} dev-util/ragel"
+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
+		>=dev-ruby/term-ansicolor-1.0.5
+	)
+	doc? ( >=dev-ruby/yard-0.8.3 )"
+
+ruby_add_rdepend ">=dev-ruby/multi_json-1.3"
+
+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
+}
+
+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 rake spec || die "Specs failed"
+	CUCUMBER_HOME="${HOME}" RUBYLIB=lib ${RUBY} -S cucumber features || die "Cucumber features failed"
+}