Fixed gcc-3.4 compile issues and ~amd64 keyworded, bug #68005

4 files changed, 29 insertions, 12 deletions

diff --git a/app-i18n/kon2/ChangeLog b/app-i18n/kon2/ChangeLog
index 946d95171ac3..77f6e1a0b053 100644
--- a/app-i18n/kon2/ChangeLog
+++ b/app-i18n/kon2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/kon2
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kon2/ChangeLog,v 1.7 2004/06/24 21:49:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kon2/ChangeLog,v 1.8 2004/11/19 23:26:08 sekretarz Exp $
+
+  20 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org> +files/kon2-0.3.9b-gcc34.patch,
+  kon2-0.3.9b-r1.ebuild:
+  Fixed gcc-3.4 compile issues and ~amd64 keyworded, bug #68005
 
   29 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> kon2-0.3.9b-r1.ebuild,
   files/kon2-0.3.9b-gentoo.patch:
diff --git a/app-i18n/kon2/Manifest b/app-i18n/kon2/Manifest
index e6e7db784a60..49e60ed0538f 100644
--- a/app-i18n/kon2/Manifest
+++ b/app-i18n/kon2/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5828c70ff5ad145dbc68e21648e09fb2 ChangeLog 1041
-MD5 aa73094364bbe225cbb2d0b29fdbe8d8 kon2-0.3.9b-r1.ebuild 927
+MD5 96130ef354d38ea2f80f0f48eacd2519 kon2-0.3.9b-r1.ebuild 974
+MD5 a7d0bf1a6e7fe5c519002ff90a658bd1 ChangeLog 1218
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 268b505189bf4dd55aff6e0b30dfeea3 files/digest-kon2-0.3.9b-r1 62
-MD5 9e4e986dd5532bde4b8217ed84c4436a files/kon2-0.3.9b-bufover-fix.patch 12484
-MD5 83430dbe7bd7d9f2f2d91339ce4b1045 files/kon2-0.3.9b-exec.patch 1299
+MD5 96f449ea2481d031b0028c0138ff3b95 files/kon2-0.3.9b-gcc34.patch 312
 MD5 8a4b1178e184ad64b33d3f376b6ad33e files/kon2-0.3.9b-racecondition-fix3.patch 1855
 MD5 8df98c680c022f4f44624702dbe8dc42 files/kon2-0.3.9b-gentoo.patch 1122
+MD5 9e4e986dd5532bde4b8217ed84c4436a files/kon2-0.3.9b-bufover-fix.patch 12484
+MD5 268b505189bf4dd55aff6e0b30dfeea3 files/digest-kon2-0.3.9b-r1 62
+MD5 83430dbe7bd7d9f2f2d91339ce4b1045 files/kon2-0.3.9b-exec.patch 1299
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFA33l6HTu7gpaalycRAh91AKDu83FupPMH8jy0t89RggNHtuVELACgoJRo
-ShSe6fJLZK82L10CQdLr9Nc=
-=P9Hs
+iD8DBQFBnoE0Z/iYVBmujdURAptQAKCQ413yDgEs0L0Y6YRWyOb6Ikk88wCgyOuU
+sVQV4Lt1omtt3iEw6owLAJw=
+=r3xQ
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/kon2/files/kon2-0.3.9b-gcc34.patch b/app-i18n/kon2/files/kon2-0.3.9b-gcc34.patch
new file mode 100644
index 000000000000..ea42ff94a947
--- /dev/null
+++ b/app-i18n/kon2/files/kon2-0.3.9b-gcc34.patch
@@ -0,0 +1,11 @@
+diff -Naur kon2-0.3.9b.orig/src/term.c kon2-0.3.9b/src/term.c
+--- kon2-0.3.9b.orig/src/term.c	2004-11-20 00:15:35.000000000 +0100
++++ kon2-0.3.9b/src/term.c	2004-11-20 00:16:21.888163632 +0100
+@@ -89,6 +89,7 @@
+ };
+ 
+ static struct initInfo init;
++static void ChangeNewConsole();
+ 
+ static void	CleanUp(void)
+ {
diff --git a/app-i18n/kon2/kon2-0.3.9b-r1.ebuild b/app-i18n/kon2/kon2-0.3.9b-r1.ebuild
index 719d2b8e9cc9..82c673c326d8 100644
--- a/app-i18n/kon2/kon2-0.3.9b-r1.ebuild
+++ b/app-i18n/kon2/kon2-0.3.9b-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kon2/kon2-0.3.9b-r1.ebuild,v 1.8 2004/06/28 01:50:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kon2/kon2-0.3.9b-r1.ebuild,v 1.9 2004/11/19 23:26:08 sekretarz Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.linet.gr.jp/pub/KON/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64"
 IUSE=""
 
 DEPEND="virtual/libc"
@@ -24,6 +24,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-exec.patch
 	epatch ${FILESDIR}/${P}-bufover-fix.patch
 	epatch ${FILESDIR}/${P}-racecondition-fix3.patch
+	epatch ${FILESDIR}/${P}-gcc34.patch
 }
 
 src_compile() {