fix building in gcc4

(Portage version: 2.1.2.2)

3 files changed, 84 insertions, 3 deletions

diff --git a/net-irc/quirc/ChangeLog b/net-irc/quirc/ChangeLog
index 2019568a79e9..5816d99c8598 100644
--- a/net-irc/quirc/ChangeLog
+++ b/net-irc/quirc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/quirc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/ChangeLog,v 1.12 2007/02/09 08:08:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/ChangeLog,v 1.13 2007/03/14 11:56:29 armin76 Exp $
+
+  14 Mar 2007; Raúl Porcel <armin76@gentoo.org> +files/0.9.84-gcc4.patch,
+  quirc-0.9.84.ebuild:
+  fix building in gcc4
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/net-irc/quirc/files/0.9.84-gcc4.patch b/net-irc/quirc/files/0.9.84-gcc4.patch
new file mode 100644
index 000000000000..db8b749076ac
--- /dev/null
+++ b/net-irc/quirc/files/0.9.84-gcc4.patch
@@ -0,0 +1,68 @@
+--- tcl.cc.orig	Thu May 22 14:09:11 2003
++++ tcl.cc	Thu May 22 14:09:21 2003
+@@ -1,3 +1,4 @@
++#include <ctype.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+ #include <sys/socket.h>
+--- servertcl.cc.orig	Thu May 22 14:12:56 2003
++++ servertcl.cc	Thu May 22 14:13:04 2003
+@@ -1,3 +1,4 @@
++#include <ctype.h>
+ #include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+--- channel.cc.orig	Mon Jan 12 18:16:50 2004
++++ channel.cc	Tue Feb  3 23:17:24 2004
+@@ -1,5 +1,6 @@
+ #include <string.h>
+ #include <assert.h>
++#include <sys/types.h>
+ 
+ #ifdef DMALLOC
+ #include <dmalloc.h>
+--- configure.orig	Sat Dec 16 23:22:21 2006
++++ configure	Sat Dec 16 23:22:37 2006
+@@ -10496,7 +10496,6 @@
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define socklen_t int
+ _ACEOF
+ 
+ echo "$as_me:$LINENO: result: no" >&5
+--- format.cc.orig	Mon Jan 12 18:32:01 2004
++++ format.cc	Tue Feb  3 23:19:28 2004
+@@ -1,4 +1,5 @@
+ #include <stdarg.h>
++#include <sys/types.h>
+ 
+ #include "quirc.h"
+ #include "hash.h"
+--- hash.cc.orig	Mon Jan 12 17:53:35 2004
++++ hash.cc	Tue Feb  3 23:19:58 2004
+@@ -1,5 +1,6 @@
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/types.h>
+ 
+ #ifdef DMALLOC
+ #include <dmalloc.h>
+--- tcltk.cc.orig	Mon Jan 12 18:25:11 2004
++++ tcltk.cc	Tue Feb  3 23:18:41 2004
+@@ -1,6 +1,7 @@
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <string.h>
++#include <sys/types.h>
+ 
+ #ifdef DMALLOC
+ #include <dmalloc.h>
+--- window.cc.orig	Sat May 15 14:20:48 1999
++++ window.cc	Tue Feb  3 23:20:36 2004
+@@ -1,3 +1,5 @@
++#include <sys/types.h>
++
+ #ifdef DMALLOC
+ #include <dmalloc.h>
+ #endif
diff --git a/net-irc/quirc/quirc-0.9.84.ebuild b/net-irc/quirc/quirc-0.9.84.ebuild
index 1cdc3d5b9da8..f29eed8d69d8 100644
--- a/net-irc/quirc/quirc-0.9.84.ebuild
+++ b/net-irc/quirc/quirc-0.9.84.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/quirc-0.9.84.ebuild,v 1.3 2004/11/13 00:23:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/quirc-0.9.84.ebuild,v 1.4 2007/03/14 11:56:29 armin76 Exp $
+
+inherit eutils
 
 DESCRIPTION="A GUI IRC client scriptable in Tcl/Tk"
 SRC_URI="http://quirc.org/${P}.tar.gz"
@@ -14,6 +16,13 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc"
 IUSE=""
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}"/${PV}-gcc4.patch
+}
+
 src_compile() {
 	econf \
 		--datadir=/usr/share/quirc \