Fix gcc-4.3 bug #251132

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-gentoo-r7 x86_64

6 files changed, 55 insertions, 9 deletions

diff --git a/games-engines/kwest/ChangeLog b/games-engines/kwest/ChangeLog
index 52a4e3dc2768..7fc55ef5b7ab 100644
--- a/games-engines/kwest/ChangeLog
+++ b/games-engines/kwest/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-engines/kwest
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/kwest/ChangeLog,v 1.12 2008/01/28 01:11:31 mr_bones_ Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/kwest/ChangeLog,v 1.13 2009/01/20 15:41:05 tupone Exp $
+
+  20 Jan 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/kwest-1.0-gcc43.patch, +files/kwest-1.1.1-gcc43.patch,
+  kwest-1.0.ebuild, kwest-1.1.1.ebuild:
+  Fix gcc-4.3 bug #251132 by flameeyes@gentoo.org
 
   28 Jan 2008; Michael Sterrett <mr_bones_@gentoo.org> kwest-1.0.ebuild,
   kwest-1.1.1.ebuild:
diff --git a/games-engines/kwest/Manifest b/games-engines/kwest/Manifest
index cb731bd5a9d6..52a7082a1759 100644
--- a/games-engines/kwest/Manifest
+++ b/games-engines/kwest/Manifest
@@ -1,6 +1,8 @@
+AUX kwest-1.0-gcc43.patch 555 RMD160 2ee0b408d67ab65cd751dea34c3a0d61b754e969 SHA1 1c0bced2d07d1a9d0b2c83630e78be56c2698806 SHA256 99b573bb1e141a7925ca2d7a009887315b58b631133e106a7ed12e7447d719a0
+AUX kwest-1.1.1-gcc43.patch 332 RMD160 8369a6418aabdfa981ccce5913f837e0f9307403 SHA1 10dfd9a7776c5aee35151fbc7b3cf91dab244d58 SHA256 b57f4f5f480a24ca5c8b7b454c96e24bba5bfbacaab73f06d256a652ef092033
 DIST kwest-1.0.tar.gz 570360 RMD160 e070ef30997a3dd4de31548d6310ba39166570fc SHA1 697e19270c7f0ddcb82d6f3aede5f753ca8df2a6 SHA256 6c29dca66de52e71917eec9287cd67825d047eaef747c051b3ecf1712e714f71
 DIST kwest-1.1.1.tar.gz 761465 RMD160 0d136e4e6432b1d12004abecd74428bb64ada4dc SHA1 d850ab08e225043072ac93c9dae235030121346e SHA256 8251b7fa92f1b44ee762f434a06d464cab2a3fb36111949190d5b85a5c1504f4
-EBUILD kwest-1.0.ebuild 534 RMD160 d476e6786453b4d40e0d6c9962ee657b2d533307 SHA1 cd3f2df22e20a61d97292a73b3a79e36fea3c91b SHA256 4af297f34a14b20b1a6fa45ee6267f4cca15f057e31ccab590ee204a992ee69e
-EBUILD kwest-1.1.1.ebuild 522 RMD160 1fc4d70046cfbcf7d3ad95269dd0a0689cd59dec SHA1 c34fb35f1a08fb7ba86290ba3a84797ce71ae232 SHA256 24fc6177dd1a612b3049cc3476762ef3fd6405fcc18bd4325329ec7945d31cea
-MISC ChangeLog 1541 RMD160 395d84949bc76d69d865fce2e30acaf9575c0d4c SHA1 b7f547459455b46c79dbbf8c6e26ec68337f5290 SHA256 6a67b60ba814330f65e69ab709b3b768244ae25d484ad78e8183d2e353c78b52
+EBUILD kwest-1.0.ebuild 575 RMD160 2ef14cc5303bdf26e1676487860101abb07bfc22 SHA1 48ac62ce65214d1c7f64a66d9f7740094bbcc8fa SHA256 628691ae34c92f9827ad110a5e386625ce3635370860664ab27888708469d0f1
+EBUILD kwest-1.1.1.ebuild 563 RMD160 5279e45509acc7ff83e053abeafa35d01ebaed59 SHA1 fcc39b5a08e24501129c9903ae7545b2a3da1fdc SHA256 3bb289e3a09d488584320f1b05b28e018f941cdd2fdeb9e1273fcfd6177cab7f
+MISC ChangeLog 1743 RMD160 c35042c8647a2b35968617c0006c2474b0363da2 SHA1 ecbb66e25dac333b58ef2c93ed78b322fe02ea84 SHA256 3a17931d372951549a5e1c2a6866b9e3ea56da8ea8efac9fd75f55fcd5aeb7a9
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-engines/kwest/files/kwest-1.0-gcc43.patch b/games-engines/kwest/files/kwest-1.0-gcc43.patch
new file mode 100644
index 000000000000..58841c3f309f
--- /dev/null
+++ b/games-engines/kwest/files/kwest-1.0-gcc43.patch
@@ -0,0 +1,23 @@
+--- kwest/kwestview.cpp.old     2009-01-20 15:29:26.000000000 +0100
++++ kwest/kwestview.cpp 2009-01-20 15:29:41.000000000 +0100
+@@ -26,7 +26,7 @@
+ #include "frotz.h"
+ #include "k_frotz.h"
+
+-#include <iostream.h>
++#include <iostream>
+
+ extern "C" bool is_terminator(zchar);
+ extern "C" int completion(const zchar *, zchar *);
+--- kwest/k_init.cpp.old        2009-01-20 15:37:26.000000000 +0100
++++ kwest/k_init.cpp    2009-01-20 15:38:04.000000000 +0100
+@@ -154,7 +154,7 @@
+  *
+  */
+
+-#include <iostream.h>
++#include <iostream>
+
+ void os_init_screen()
+ {
+
diff --git a/games-engines/kwest/files/kwest-1.1.1-gcc43.patch b/games-engines/kwest/files/kwest-1.1.1-gcc43.patch
new file mode 100644
index 000000000000..13654fbe190e
--- /dev/null
+++ b/games-engines/kwest/files/kwest-1.1.1-gcc43.patch
@@ -0,0 +1,12 @@
+--- src/kwestview.cpp.old       2009-01-20 16:19:46.000000000 +0100
++++ src/kwestview.cpp   2009-01-20 16:19:58.000000000 +0100
+@@ -26,7 +26,7 @@
+ #include "frotz/frotz.h"
+ #include "k_frotz.h"
+
+-#include <iostream.h>
++#include <iostream>
+
+ extern "C" bool is_terminator(zchar);
+ extern "C" int completion(const zchar *, zchar *);
+
diff --git a/games-engines/kwest/kwest-1.0.ebuild b/games-engines/kwest/kwest-1.0.ebuild
index db7221c98f5a..c3d7a312dcf4 100644
--- a/games-engines/kwest/kwest-1.0.ebuild
+++ b/games-engines/kwest/kwest-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/kwest/kwest-1.0.ebuild,v 1.11 2008/01/28 01:11:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/kwest/kwest-1.0.ebuild,v 1.12 2009/01/20 15:41:05 tupone Exp $
 
 ARTS_REQUIRED=yes #bug #207816
 inherit kde
@@ -14,3 +14,5 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 amd64 ppc ~sparc"
 IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-gcc43.patch )
diff --git a/games-engines/kwest/kwest-1.1.1.ebuild b/games-engines/kwest/kwest-1.1.1.ebuild
index 52b6c5e1925b..96e64e690f03 100644
--- a/games-engines/kwest/kwest-1.1.1.ebuild
+++ b/games-engines/kwest/kwest-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/kwest/kwest-1.1.1.ebuild,v 1.2 2008/01/28 01:11:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/kwest/kwest-1.1.1.ebuild,v 1.3 2009/01/20 15:41:05 tupone Exp $
 
 ARTS_REQUIRED=yes #bug #207816
 inherit kde
@@ -16,3 +16,5 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 S=${WORKDIR}/${PN}
+
+PATCHES=( "${FILESDIR}"/${P}-gcc43.patch )