Fix building with GCC 4.5+ wrt #318585 by Kacper Kowalik.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 29 insertions, 7 deletions

diff --git a/app-accessibility/epos/ChangeLog b/app-accessibility/epos/ChangeLog
index dfa3543470d6..7ac2e498d1de 100644
--- a/app-accessibility/epos/ChangeLog
+++ b/app-accessibility/epos/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/epos
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/epos/ChangeLog,v 1.39 2010/01/19 01:40:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/epos/ChangeLog,v 1.40 2010/05/06 11:28:21 ssuominen Exp $
+
+  06 May 2010; Samuli Suominen <ssuominen@gentoo.org> epos-2.5.37-r1.ebuild,
+  +files/epos-2.5.37-gcc45.patch:
+  Fix building with GCC 4.5+ wrt #318585 by Kacper Kowalik.
 
   19 Jan 2010; Jeroen Roovers <jer@gentoo.org> epos-2.5.37-r1.ebuild:
   Stable for HPPA too.
diff --git a/app-accessibility/epos/Manifest b/app-accessibility/epos/Manifest
index d6b1fa5db52a..81dface0a223 100644
--- a/app-accessibility/epos/Manifest
+++ b/app-accessibility/epos/Manifest
@@ -1,7 +1,8 @@
 AUX README.gentoo 108 RMD160 b76f95daf65ceb40fb435f11d5e46b2e8349f7e1 SHA1 e11e700d1c0fabb788ede1869fa9d6db003ec75a SHA256 7b3b19b2112b35f160af2a10de2fb9875419195946d174b22f980e975b03cefc
 AUX epos-2.5.37-gcc43.patch 504 RMD160 3192e1eedf0d7afcfb0a90898c5afb4c95ac7460 SHA1 4a25ee786301270d261d681ffdd879bfbb3e3435 SHA256 92968fe28cff365e0ef25608b0f90dbb1139dec141fae4f720771abab6b36bc5
+AUX epos-2.5.37-gcc45.patch 503 RMD160 a27306b3797ef0fe461bf9ab68809d8acc4c44ba SHA1 413111a33b99bd26152bc809ed122af819a95413 SHA256 55924fc73ed5e95a3839d753c467093494ecff4e81a3062fb99425fedd9ea877
 AUX eposd 547 RMD160 6598339265ef23130ad36616f94c6e9714f6485d SHA1 d9ff81698c9ec9e7f4969d805dc46a9712f9123e SHA256 f5298a96fd40c960759d191184a1238f22ac30821130b5f0a1eb7abc53ec22f5
 DIST epos-2.5.37.tar.gz 976240 RMD160 d44ba2a7235e6cc26f61a9bf36ada27539813af4 SHA1 de99a63f6fdf2692497b0da38da14a09bbbf9bd7 SHA256 7b6e835d4db4f64cfdcf3359d84b6b0ed02e8fb89851aed7615768f7d07c8607
-EBUILD epos-2.5.37-r1.ebuild 933 RMD160 22ca4dfa462a8befd20f31a92bacab1c7eeeedc4 SHA1 47376c2aea8bdf5d463c4107dfb91d96a6372129 SHA256 fd8acd994da16db2ff29e74c085f2d61eac7d807e7250d12b1f11148d6b5f0a4
-MISC ChangeLog 5059 RMD160 33413ea272f9c0376bf9a984dc544893a7c63933 SHA1 cb6efcd836967913c6bf35930283fdd831ca65b0 SHA256 5b6e5be6f2b8d469569ce20431c7bdef493e15ac177f8fd1d3ec931a1cb2a36c
+EBUILD epos-2.5.37-r1.ebuild 982 RMD160 ddce387d5e9e0e6c0d0c1a97153cdc7a624fc732 SHA1 1d71baa657fca9853e7984a33e757fbe543a9ad7 SHA256 38f8bccb1a81fdcb1508d754e291777fc443ac2e1473ca79dfe42b08d46f803a
+MISC ChangeLog 5237 RMD160 ed8356f019c5840a2946502797cb64a08f6f12f1 SHA1 fd65242f1d15b504a9d9c4b49d8ee372f1505492 SHA256 0c06b57160fae571232bb4fc340d6f62cdce843ee221a106dcf282c393a27169
 MISC metadata.xml 167 RMD160 748756d87964a656252634c3b174df2cf3d6feb0 SHA1 f15052c659417013d87758244f8f0dbf3edf0e11 SHA256 faea5d20797fb2bd27f84fe03dd6f85939e51c0f2c467676ea62bab4041bf7f5
diff --git a/app-accessibility/epos/epos-2.5.37-r1.ebuild b/app-accessibility/epos/epos-2.5.37-r1.ebuild
index a30b6cb0bf71..7fc77faa709e 100644
--- a/app-accessibility/epos/epos-2.5.37-r1.ebuild
+++ b/app-accessibility/epos/epos-2.5.37-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/epos/epos-2.5.37-r1.ebuild,v 1.13 2010/01/19 01:40:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/epos/epos-2.5.37-r1.ebuild,v 1.14 2010/05/06 11:28:20 ssuominen Exp $
 
 inherit eutils autotools
 
@@ -18,10 +18,12 @@ RDEPEND=""
 
 src_unpack() {
 	unpack ${A}
-
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-	sed -i -e "s/CCC/#CCC/" configure.ac
+
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc45.patch
+
+	sed -i -e "s/CCC/#CCC/" configure.ac || die
 
 	eautoreconf
 }
diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc45.patch b/app-accessibility/epos/files/epos-2.5.37-gcc45.patch
new file mode 100644
index 000000000000..70af1db94407
--- /dev/null
+++ b/app-accessibility/epos/files/epos-2.5.37-gcc45.patch
@@ -0,0 +1,15 @@
+Fixing build with gcc 4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=318585
+
+--- src/nnet/neural_parse.yy
++++ src/nnet/neural_parse.yy
+@@ -255,7 +255,7 @@
+ 
+ int yyerror (char *s)
+ {
+-	shriek (812, fmt ("BISON:yyerror:bison_nnet parser: bison_row %i (not counting empty rows) '%s' is erroneous. %s\n", row_num, bison_row_buf, s));
++	shriek (812, fmt ("BISON:yyerror:bison_nnet parser: bison_row %i (not counting empty rows) '%s' is erroneous. %s\n", row_num, bison_row_buf.c_str(), s));
+ 	return -1;
+ }
+