Fixed compile error with gcc-3.4. Closes bug #54454.

4 files changed, 32 insertions, 13 deletions

diff --git a/net-irc/bitchx/ChangeLog b/net-irc/bitchx/ChangeLog
index f2875c14cec6..7a84b66f56bd 100644
--- a/net-irc/bitchx/ChangeLog
+++ b/net-irc/bitchx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/bitchx
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.43 2004/06/08 02:15:31 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.44 2004/06/19 22:03:21 swegener Exp $
+
+  20 Jun 2004; Sven Wegener <swegener@gentoo.org>
+  +files/1.1/bitchx-1.1-gcc34.patch, bitchx-1.1.ebuild:
+  Fixed compile error with gcc-3.4. Closes bug #54454.
 
   07 Jun 2004; Chuck Short <zul@gentoo.org> bitchx-1.0.19-r5.ebuild,
   bitchx-1.0.19-r6.ebuild, bitchx-1.1.ebuild:
diff --git a/net-irc/bitchx/Manifest b/net-irc/bitchx/Manifest
index ac5faca153d1..68d4996c4f06 100644
--- a/net-irc/bitchx/Manifest
+++ b/net-irc/bitchx/Manifest
@@ -1,19 +1,20 @@
-MD5 9dcc4ebd07565c3e91fa71b7c8de4da6 bitchx-1.1.ebuild 3353
-MD5 f14b8798fe2395c9b0771c7143d959f2 bitchx-1.0.19-r6.ebuild 3393
-MD5 65026cc4632951f048d64b00227a407e ChangeLog 6978
+MD5 67f058a96aefa21a15564dd68c3f0cfe ChangeLog 7145
 MD5 8f636ff24ae83154570235da4b4f0f97 bitchx-1.0.19-r5.ebuild 3508
+MD5 f14b8798fe2395c9b0771c7143d959f2 bitchx-1.0.19-r6.ebuild 3393
+MD5 bd558975b7efd5d7d817840b89ce71fd bitchx-1.1.ebuild 3401
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 cbd7411b65cfa8370ea570ff3daa9ab9 files/digest-bitchx-1.0.19-r5 136
-MD5 3b4e5923d1c18b01092e2d43b2989d5f files/digest-bitchx-1.0.19-r6 70
+MD5 5d622c032159806be3bfc78640da3eb0 files/BitchX-64bit.patch 1135
 MD5 10a57b14bb58910e1f373fbc1b8b2197 files/bitchx-1.0.19-cjk.patch 7050
-MD5 2573358b54ae05f8c23a452f657493e3 files/bitchx-1.0.19-security.patch 332
-MD5 04374fc6080f46b1c3e9318e3ab657cf files/bitchx-1.0.19-security2.patch 5529
 MD5 d37e1625d80fafd8d98655472b706214 files/bitchx-1.0.19-freenode.patch 917
-MD5 5d622c032159806be3bfc78640da3eb0 files/BitchX-64bit.patch 1135
-MD5 553435cb4dc291a662cefb374ad57a1d files/bitchx-1.0.19-nickcomp-nocolor.patch 495
 MD5 6a18811962d6992f9175f98d771d3d30 files/bitchx-1.0.19-gcc-3.3.patch 472
 MD5 9230369276af6c8a1cdd7a584927cd47 files/bitchx-1.0.19-hebrew.patch 477
+MD5 553435cb4dc291a662cefb374ad57a1d files/bitchx-1.0.19-nickcomp-nocolor.patch 495
+MD5 2573358b54ae05f8c23a452f657493e3 files/bitchx-1.0.19-security.patch 332
+MD5 04374fc6080f46b1c3e9318e3ab657cf files/bitchx-1.0.19-security2.patch 5529
+MD5 cbd7411b65cfa8370ea570ff3daa9ab9 files/digest-bitchx-1.0.19-r5 136
+MD5 3b4e5923d1c18b01092e2d43b2989d5f files/digest-bitchx-1.0.19-r6 70
 MD5 9958cd92ed63cd29972e5c3465ab83aa files/digest-bitchx-1.1 73
-MD5 9230369276af6c8a1cdd7a584927cd47 files/1.1/bitchx-1.1-hebrew.patch 477
-MD5 0028e0211e23f927b0c03e6dba3ee8fd files/1.1/bitchx-1.1-freenode.patch 976
 MD5 10a57b14bb58910e1f373fbc1b8b2197 files/1.1/bitchx-1.1-cjk.patch 7050
+MD5 0028e0211e23f927b0c03e6dba3ee8fd files/1.1/bitchx-1.1-freenode.patch 976
+MD5 9230369276af6c8a1cdd7a584927cd47 files/1.1/bitchx-1.1-hebrew.patch 477
+MD5 95973485a5a745af87c7bdc9fb6ca0c6 files/1.1/bitchx-1.1-gcc34.patch 394
diff --git a/net-irc/bitchx/bitchx-1.1.ebuild b/net-irc/bitchx/bitchx-1.1.ebuild
index 0b4e1d9d26fd..0a1b9938d5d8 100644
--- a/net-irc/bitchx/bitchx-1.1.ebuild
+++ b/net-irc/bitchx/bitchx-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1.ebuild,v 1.10 2004/06/08 02:15:31 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1.ebuild,v 1.11 2004/06/19 22:03:21 swegener Exp $
 
 inherit flag-o-matic eutils
 
@@ -33,6 +33,7 @@ src_unpack() {
 	use cjk && epatch ${FILESDIR}/${PV}/${P}-cjk.patch
 	epatch ${FILESDIR}/${PV}/${P}-hebrew.patch
 	epatch ${FILESDIR}/${PV}/${P}-freenode.patch
+	epatch ${FILESDIR}/${PV}/${P}-gcc34.patch
 	use amd64 && epatch ${FILESDIR}/BitchX-64bit.patch
 }
 
diff --git a/net-irc/bitchx/files/1.1/bitchx-1.1-gcc34.patch b/net-irc/bitchx/files/1.1/bitchx-1.1-gcc34.patch
new file mode 100644
index 000000000000..642e9eed6920
--- /dev/null
+++ b/net-irc/bitchx/files/1.1/bitchx-1.1-gcc34.patch
@@ -0,0 +1,13 @@
+--- source/term.c.orig	2004-06-19 21:40:36.757653368 +0000
++++ source/term.c	2004-06-19 21:41:31.783563978 +0000
+@@ -91,8 +91,8 @@
+ #define Tgetflag(x) 	tgetflag(x.tname)
+ #endif
+ 
+-extern  char    *getenv();
+-extern	char	*tparm();
++extern  char    *getenv(const char *name);
++extern	char	*tparm(char *str, ...);
+ 
+ /*
+  * The old code assumed termcap. termcap is almost always present, but on