Don't use -Werror during compilation. Fixes bug 369639.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 36 insertions, 7 deletions

diff --git a/dev-ruby/gherkin/ChangeLog b/dev-ruby/gherkin/ChangeLog
index 12bf48c01851..224aa6732e83 100644
--- a/dev-ruby/gherkin/ChangeLog
+++ b/dev-ruby/gherkin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/gherkin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/ChangeLog,v 1.21 2011/06/02 07:18:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/ChangeLog,v 1.22 2011/06/02 09:52:49 graaff Exp $
+
+  02 Jun 2011; Hans de Graaff <graaff@gentoo.org> gherkin-2.3.10.ebuild,
+  +files/gherkin-2.3.10-no-werror.patch:
+  Don't use -Werror during compilation. Fixes bug 369639.
 
 *gherkin-2.3.10 (02 Jun 2011)
 
diff --git a/dev-ruby/gherkin/Manifest b/dev-ruby/gherkin/Manifest
index d0cb2999b37e..2aaf2f6d33f5 100644
--- a/dev-ruby/gherkin/Manifest
+++ b/dev-ruby/gherkin/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gherkin-2.3.10-no-werror.patch 861 RMD160 81c533d7d8e52677ed5da6646a86b5ccb0c8df3e SHA1 ebfef57a378387b2dbfd5bfa2f5e646c8fad7107 SHA256 f430e369b9e5d2e740c040d7fa5410e7351b135722a8c6f18eaa695ac73017c4
 DIST gherkin-1.0.30.gem 583168 RMD160 433b82f49717137818261af7c1874a816b73b9dd SHA1 55d8007017ae2afe0906682d530298ec5ce8c3fe SHA256 0f8839fc096726ae149182dd8db54b65c7e70dc63f67ee24356288d03cd3b46d
 DIST gherkin-2.3.10.tgz 121534 RMD160 07b7c1286e394c03b6bdf2f3253a3221ab0ee950 SHA1 d2c4ebd1ffeef2ccad0e6df84e42b4a44e18ba8a SHA256 c46ceee2af6c552467a58ebe8945b09fa3d0ba19efd251f96202d20e6aa6e36f
 DIST gherkin-2.3.5.tgz 386427 RMD160 70ca5bb3e0fafc1d27580d77f557811209add907 SHA1 663752a638e7af36740083b70c2a8e5567a83087 SHA256 8461fdc89b33566c6346f68502d6df65de3b7f4479d9cf5428d5d992948a990b
@@ -8,17 +9,17 @@ DIST gherkin-2.3.6.tgz 121175 RMD160 83baea95ba2239f92c83022d851147978e8eb646 SH
 DIST gherkin-2.3.7.tgz 121322 RMD160 313016d7ca4b57b75f13a23049b17e7581b1751a SHA1 c25c732707adb25022f1588087a1de5a82da56e5 SHA256 ee45e032626176a3157d96d2bd44c33aed21bdbf857f058a5d62bb249d09c2e9
 DIST gherkin-2.3.9.tgz 121372 RMD160 9c45c7a46823eef15230db422470687d65f63acc SHA1 93117ba02253c67bad044c4d87692471b7ae8f1d SHA256 91987ce1ff060e20138e8c57b042ae1d3d01a72db12ead39503523fb97648732
 EBUILD gherkin-1.0.30-r1.ebuild 1226 RMD160 5bd392730927fddbfc84501bbc63178931c36b44 SHA1 13a55c48c6804cc467d749dca344d7038bcde5e4 SHA256 a27878b7b4670ae3eb61400d2516d2c8ba75472777a47aaa34cbf68e54c43cd3
-EBUILD gherkin-2.3.10.ebuild 2042 RMD160 c082d16c685e7de0e0fa9b016cab9101d0840a8b SHA1 56500c746e0a13015f33d478882e560ae8628ad4 SHA256 31ec05f8867f54ad79816c9d8b8c5884b3988659d0fb50771483001304df6b3d
+EBUILD gherkin-2.3.10.ebuild 2086 RMD160 312aad3b8eacc48e716eac97e7f559cad8f2ceec SHA1 e10d57ce412f4dde9c6b362672e9a37f91dfe50e SHA256 2d33797c39aca037a091cd0d1c8ea70238f86f6452a369f196d9b7d348cd8d70
 EBUILD gherkin-2.3.5.ebuild 2042 RMD160 f3a3e5481c2c87c4adfbce514b652be041be390c SHA1 f2aadd75f88ad546fa8e018988ab0b52d67380e6 SHA256 a30de910c0c46a4a4efef2ddfbaa55e2f792557db4abac176964d224e6d175de
 EBUILD gherkin-2.3.6.ebuild 2085 RMD160 7e19720e675e9edadfbbbbca2c79c6ff5ebb2af5 SHA1 8e89b2dfa2547134e9ab49aa4d0f18920b4d09c7 SHA256 70e4b4e7e238e8d56e251531d1bdb7491ddad30bb5842bde5b008d72643eb372
 EBUILD gherkin-2.3.7.ebuild 2085 RMD160 d0f88d67efca11a0d8fe4348bfef2cb51510d602 SHA1 c2a9fddcd0ed6e614df41aa918d1fddcda419b68 SHA256 c3e785e18d13dda70dad8f0cd439f4c514b1cbb80544e188f53b31dabcba3e30
 EBUILD gherkin-2.3.9.ebuild 2039 RMD160 7ace46ed9b7590b245f70b8df5764bdf471a2517 SHA1 1fd49782899259db134c7e5b5576d8376280ba26 SHA256 50aab3b28ab9151f6fdf2f835dccd132b61f8f2323c283f08542d1214616c6d8
-MISC ChangeLog 3104 RMD160 3ef7862999425ee082f1750c6962596c243f9f2c SHA1 91e94c5512b6b9facc889d69a7c81796097ae418 SHA256 136967e1b1724698a714955b305e3e11ce84fc3aa3689f290f1c93757ab29c22
+MISC ChangeLog 3277 RMD160 7f6ba40a8e0cc0eb94924dda6a0dbc5af0762fd2 SHA1 0c379241f8f50f0992d2355fd3e8d3f39eb6ad7c SHA256 18bac0ea30eec6df45f1cb9a6d3c48ab701f7d00fee2f8f7b994a93e4382628c
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3nOVAACgkQrnu0mw69JkqIegD/bU/5wu8j5pQlwaWLp916pG3o
-h8p8Y9B0WovpctLBQIsA/1tjKxOAGDhMFYQv9AKqjGCWRUF5eCxbfpMC3duC6BQw
-=V3Vw
+iF4EAREIAAYFAk3nXXwACgkQrnu0mw69JkpJfAD/VDqmGh4WVlcDwH4zNVvQBsUF
+T4lZ3ZuFRFjMT8LdLykA/A5B1MsJBGxA7gc6aAHkvYJ7RibvFbJVznqexZ9hKwlT
+=mVIn
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/gherkin/files/gherkin-2.3.10-no-werror.patch b/dev-ruby/gherkin/files/gherkin-2.3.10-no-werror.patch
new file mode 100644
index 000000000000..644a46a388d7
--- /dev/null
+++ b/dev-ruby/gherkin/files/gherkin-2.3.10-no-werror.patch
@@ -0,0 +1,22 @@
+commit 1a46a428b4c92982124a8081623db9d56f6a28d7
+Author: Hans de Graaff <hans@degraaff.org>
+Date:   Thu Jun 2 11:46:22 2011 +0200
+
+    Don't use -Werror in production code.
+    
+    Using -Werror will break compilation when new versions of gcc are
+    introduced since new warnings are added for every new version.
+
+diff --git a/tasks/compile.rake b/tasks/compile.rake
+index 57cd90f..01e9b55 100755
+--- a/tasks/compile.rake
++++ b/tasks/compile.rake
+@@ -72,7 +72,7 @@ langs.each do |i18n|
+         io.write(<<-EOF)
+ require 'mkmf'
+ CONFIG['warnflags'].gsub!(/-Wshorten-64-to-32/, '') if CONFIG['warnflags']
+-$CFLAGS << ' -O0 -Wall -Werror' if CONFIG['CC'] =~ /gcc/
++$CFLAGS << ' -O0 -Wall' if CONFIG['CC'] =~ /gcc/
+ dir_config("gherkin_lexer_#{i18n.underscored_iso_code}")
+ have_library("c", "main")
+ create_makefile("gherkin_lexer_#{i18n.underscored_iso_code}")
diff --git a/dev-ruby/gherkin/gherkin-2.3.10.ebuild b/dev-ruby/gherkin/gherkin-2.3.10.ebuild
index c642a6ea08f6..a5353354163a 100644
--- a/dev-ruby/gherkin/gherkin-2.3.10.ebuild
+++ b/dev-ruby/gherkin/gherkin-2.3.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.3.10.ebuild,v 1.1 2011/06/02 07:18:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.3.10.ebuild,v 1.2 2011/06/02 09:52:49 graaff Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18"
@@ -40,6 +40,8 @@ ruby_add_bdepend "
 ruby_add_rdepend ">=dev-ruby/json-1.4.6"
 
 all_ruby_prepare() {
+	epatch "${FILESDIR}/${P}-no-werror.patch"
+
 	# Remove Bundler-related things.
 	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb features/support/env.rb || die
 	rm Gemfile || die