Add patch to fix compilation with gcc-4.3 by Peter Alfredsen <peter DOT alfredsen AT gmail DOT com>; bug #217606

Package-Manager: portage-2.1.5_rc7

4 files changed, 46 insertions, 6 deletions

diff --git a/app-accessibility/epos/ChangeLog b/app-accessibility/epos/ChangeLog
index 8ac0d1f663d3..c436b2408a85 100644
--- a/app-accessibility/epos/ChangeLog
+++ b/app-accessibility/epos/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/epos
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/epos/ChangeLog,v 1.24 2007/12/26 22:19:50 phreak Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/epos/ChangeLog,v 1.25 2008/05/10 03:27:27 halcy0n Exp $
+
+  10 May 2008; Mark Loeser <halcy0n@gentoo.org>
+  +files/epos-2.5.37-gcc43.patch, epos-2.5.37.ebuild:
+  Add patch to fix compilation with gcc-4.3 by Peter Alfredsen <peter DOT
+  alfredsen AT gmail DOT com>; bug #217606
 
   26 Dec 2007; Christian Heim <phreak@gentoo.org> epos-2.5.23-r1.ebuild:
   Fix the quotation.
diff --git a/app-accessibility/epos/Manifest b/app-accessibility/epos/Manifest
index e50339b04643..3349f8c13a09 100644
--- a/app-accessibility/epos/Manifest
+++ b/app-accessibility/epos/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX README.gentoo 108 RMD160 b76f95daf65ceb40fb435f11d5e46b2e8349f7e1 SHA1 e11e700d1c0fabb788ede1869fa9d6db003ec75a SHA256 7b3b19b2112b35f160af2a10de2fb9875419195946d174b22f980e975b03cefc
 AUX epos 546 RMD160 647a6e22b75a7d979ba33af129a7f8f919f61598 SHA1 f9b164e2b36c24ef3a774be7e9b691a6d93acaee SHA256 449061ab497555f3a4b31e7e088ae117bdd046d834b9b374a2271b42d6ee4b49
 AUX epos-2.5.35-destdir.patch 1038 RMD160 fcd9df83ca3e683e3953b904149fb66049752a5d SHA1 9e3d8fe06ea0bb2fbe97d4dbd5a4640b36dd53d3 SHA256 2a082308011a70ea01467eb13da4ca427d3f7c88a4537190385e69e2a6119980
 AUX epos-2.5.35-sysportaudio.patch 1517 RMD160 7fa55560f1efe1c9801d5c7edfc8154b2052a22d SHA1 1b3a7c769419bc48e079458f31a77f8224866f0b SHA256 31c22f8e338245ad3bf19b6de682a418fb70e8175450c13d305bf32f5a777182
+AUX epos-2.5.37-gcc43.patch 504 RMD160 3192e1eedf0d7afcfb0a90898c5afb4c95ac7460 SHA1 4a25ee786301270d261d681ffdd879bfbb3e3435 SHA256 92968fe28cff365e0ef25608b0f90dbb1139dec141fae4f720771abab6b36bc5
 AUX epos-waveform.patch 433 RMD160 9781969e5bb641c70bf0af92e65ae28cd825ecfd SHA1 17542377d4d599c4929871cf5fac84ff741375a4 SHA256 d62e42d2d635b0025de0335df840580003ca71b1655c1270a0d408309f282270
 AUX eposd 554 RMD160 1190b570a888cdb37711a4ff7051b7c3ab9f6dfa SHA1 2f91d387734f457d9bd55e4bd6ed030733c27c07 SHA256 2236cd515428e0ae10cb922ea4c6ffca15c525926d4d5b75e88d13dffd5c10a0
 DIST epos-2.5.23.tar.gz 784672 RMD160 a7faeadaff762572e98960bac55aa9916f698485 SHA1 8c9274020c940eb0021a7dc9a2ff39c089907bc0 SHA256 82a5ad44c82268ea9ac3c8a73bdf2c1fff3010ca86573900b9baf7da51b941d2
 DIST epos-2.5.37.tar.gz 976240 RMD160 d44ba2a7235e6cc26f61a9bf36ada27539813af4 SHA1 de99a63f6fdf2692497b0da38da14a09bbbf9bd7 SHA256 7b6e835d4db4f64cfdcf3359d84b6b0ed02e8fb89851aed7615768f7d07c8607
 EBUILD epos-2.5.23-r1.ebuild 747 RMD160 180c6896b641d6987671655cb51b47fcf925cff2 SHA1 98ac2d4284e066c90f7ddfca2982bf0b5559512a SHA256 9730e66f9fcb3b66898b8d1e7d92a866d23bbc0e84382117b7ebfca595d26958
-EBUILD epos-2.5.37.ebuild 1110 RMD160 0a571fa6b9b0e927333acefdad2008dffcc85a53 SHA1 807c949fd6378dc893ef889dece1bce87b46dedc SHA256 bea6da04842bbe59918346704f4eca3b36b84aa33d159446d4a2bf1de5a72d16
-MISC ChangeLog 3435 RMD160 9b5158e3acc2a7310d3851774b3321c316853792 SHA1 3a713a55c2ca804006ea23a930f9a61a15333c63 SHA256 8108df1738a3d52b5a826d5b7d906e796847ec88a21dfbafe055fd315521355a
+EBUILD epos-2.5.37.ebuild 1148 RMD160 78ccf469c46bfb01b65fa796c53f692dbb4ca605 SHA1 d13a5dce935f0ebc5b2853b05993bc7505222ab4 SHA256 31bc9157ee96cf644cf54254ce5f81a1c330ffe09aa2e2416b3366257aea00d8
+MISC ChangeLog 3656 RMD160 325677c42b0e1c9207409fa4a221d1a8992a1f2b SHA1 f182ec3e24cfd0a9d3accd7757f58c3cc4428b82 SHA256 a77783bc852edb7f66fd30709ac87a3297e99506d93490d037b48c8eabb7bf25
 MISC metadata.xml 167 RMD160 748756d87964a656252634c3b174df2cf3d6feb0 SHA1 f15052c659417013d87758244f8f0dbf3edf0e11 SHA256 faea5d20797fb2bd27f84fe03dd6f85939e51c0f2c467676ea62bab4041bf7f5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkglFmMACgkQCRZPokWLroQqswCcCBkOj56o5TOM3ABHrFT63TmF
+cbYAoKX8Ygjzx+uvxaGQQMUfdi3Cn0wO
+=N1lN
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/epos/epos-2.5.37.ebuild b/app-accessibility/epos/epos-2.5.37.ebuild
index b1e1407db989..92e0d8c996a5 100644
--- a/app-accessibility/epos/epos-2.5.37.ebuild
+++ b/app-accessibility/epos/epos-2.5.37.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.ebuild,v 1.4 2007/09/13 13:31:14 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/epos/epos-2.5.37.ebuild,v 1.5 2008/05/10 03:27:27 halcy0n Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -29,6 +29,7 @@ src_unpack() {
 
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-2.5.35-sysportaudio.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
 	sed -i -e "s/CCC/#CCC/" configure.ac
 
 	eautoreconf
diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc43.patch b/app-accessibility/epos/files/epos-2.5.37-gcc43.patch
new file mode 100644
index 000000000000..4a61b5ffd04b
--- /dev/null
+++ b/app-accessibility/epos/files/epos-2.5.37-gcc43.patch
@@ -0,0 +1,23 @@
+--- epos-2.5.37.orig/src/nnet/neural.cc
++++ epos-2.5.37/src/nnet/neural.cc
+@@ -38,7 +38,7 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <stdlib.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <time.h>
+ 
+ /*
+--- epos-2.5.37.orig/arch/win/service/install.cpp
++++ epos-2.5.37/arch/win/service/install.cpp
+@@ -23,7 +23,7 @@
+ #include <winsvc.h>
+ #include "service.h"
+ #include <stdio.h>		//sprintf & fopen
+-#include <iostream.h>
++#include <iostream>
+ #include "Shlwapi.h"
+ 
+ SC_HANDLE	scm;
+