fix building in gcc4

Package-Manager: portage-2.1.2.2

4 files changed, 96 insertions, 21 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/Manifest b/net-irc/quirc/Manifest
index 8bb02aef0a7c..c4a4c15e3321 100644
--- a/net-irc/quirc/Manifest
+++ b/net-irc/quirc/Manifest
@@ -1,15 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 0.9.84-gcc4.patch 1579 RMD160 648cb0043648117c86ec82e774d1027a5dc526f0 SHA1 04dff5d9006f7a4529f65aa3fa57aa3643b08a35 SHA256 7fe22620c90b2e3905a56cc0daa718c3f09ae119b2f40bdb65f09308c96fe016
+MD5 ea6b71c07757f0a8d678e127aa0a6e73 files/0.9.84-gcc4.patch 1579
+RMD160 648cb0043648117c86ec82e774d1027a5dc526f0 files/0.9.84-gcc4.patch 1579
+SHA256 7fe22620c90b2e3905a56cc0daa718c3f09ae119b2f40bdb65f09308c96fe016 files/0.9.84-gcc4.patch 1579
 DIST quirc-0.9.84.tar.gz 341962 RMD160 6fdacee28b63363c3276349c32bd7bfbd463ff19 SHA1 0d9aa3f35616c3d5e6835a318266f1c71232e4d1 SHA256 601e56b0a5190b94beee1448264070573b39b34a6051e3007ad81db38332bd44
-EBUILD quirc-0.9.84.ebuild 1054 RMD160 55e3850638a9935131095e93271e7330ec76c3be SHA1 29dafd7815784b63d41faaa2565331b1a30cccd3 SHA256 c27e09b5329c785a70b4e4b004f9d2e2e99aa94798096d9146dd4c495f8864ec
-MD5 e199213b15a2ca3a070c390f59ff33b1 quirc-0.9.84.ebuild 1054
-RMD160 55e3850638a9935131095e93271e7330ec76c3be quirc-0.9.84.ebuild 1054
-SHA256 c27e09b5329c785a70b4e4b004f9d2e2e99aa94798096d9146dd4c495f8864ec quirc-0.9.84.ebuild 1054
-MISC ChangeLog 2013 RMD160 d0a927b25c346c25d9706f877b16202b34a002ab SHA1 35ade79bd5f3b5039295faea19146b617ecec185 SHA256 449ba62de7debc243b05f86be988c0d45a507cde35ffaf962329b7cdc0129c71
-MD5 2d180875a813d295c017d3f66404eb29 ChangeLog 2013
-RMD160 d0a927b25c346c25d9706f877b16202b34a002ab ChangeLog 2013
-SHA256 449ba62de7debc243b05f86be988c0d45a507cde35ffaf962329b7cdc0129c71 ChangeLog 2013
+EBUILD quirc-0.9.84.ebuild 1149 RMD160 157f802450f57d5ed52d63469a9c7779a9869e89 SHA1 bbbe70055f0316a0e2b83f387f2529c93fef17f6 SHA256 88da73f145a66666e77043959ea65deb47e26a6f938341d8c401411c26a47bdd
+MD5 3ad730cc90bfb57b17dc7fe0c9f75cb2 quirc-0.9.84.ebuild 1149
+RMD160 157f802450f57d5ed52d63469a9c7779a9869e89 quirc-0.9.84.ebuild 1149
+SHA256 88da73f145a66666e77043959ea65deb47e26a6f938341d8c401411c26a47bdd quirc-0.9.84.ebuild 1149
+MISC ChangeLog 2133 RMD160 ee58715c6ac99d6541a567d8317bbf9df10449a0 SHA1 2a4a26777393843c338aa8a6745cffaf38ccc2fc SHA256 f03796b7ac3696f64fc2a735f82c1344ce99d24098687022ad60ef7953e4b0ca
+MD5 0b7fae42193451401f9584eb04d9aee8 ChangeLog 2133
+RMD160 ee58715c6ac99d6541a567d8317bbf9df10449a0 ChangeLog 2133
+SHA256 f03796b7ac3696f64fc2a735f82c1344ce99d24098687022ad60ef7953e4b0ca ChangeLog 2133
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -17,10 +18,3 @@ SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata
 MD5 deaa3545ec913c77f71c219bd020a0e7 files/digest-quirc-0.9.84 238
 RMD160 a5f8b420dc916dc137ded5ca349be15fedbe0ac4 files/digest-quirc-0.9.84 238
 SHA256 94ffcdff8fa83ab43f97fce83e93eb4a085903be981c5433bdd4eee20a828374 files/digest-quirc-0.9.84 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFzCwYAiZjviIA2XgRAqJEAKC3MH1o3KyxGR/+gkYx1hVAC3C67QCeKmyS
-PkYFuREeFFgvZ93Pe9WIwXY=
-=hiMp
------END PGP SIGNATURE-----
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 \