Adding gcc-4.3 patch per bug 251448. Thanks to Gene Seto <geneseto@hotmail.com> for the patch.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

3 files changed, 149 insertions, 8 deletions

diff --git a/net-irc/quirc/ChangeLog b/net-irc/quirc/ChangeLog
index 5816d99c8598..f283607be00f 100644
--- a/net-irc/quirc/ChangeLog
+++ b/net-irc/quirc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.13 2007/03/14 11:56:29 armin76 Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/ChangeLog,v 1.14 2009/02/15 21:50:22 loki_val Exp $
+
+  15 Feb 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/quirc-0.9.84-gcc43.patch, quirc-0.9.84.ebuild:
+  Adding gcc-4.3 patch per bug 251448. Thanks to Gene Seto
+  <geneseto@hotmail.com> for the patch.
 
   14 Mar 2007; Raúl Porcel <armin76@gentoo.org> +files/0.9.84-gcc4.patch,
   quirc-0.9.84.ebuild:
diff --git a/net-irc/quirc/files/quirc-0.9.84-gcc43.patch b/net-irc/quirc/files/quirc-0.9.84-gcc43.patch
new file mode 100644
index 000000000000..1c3f59bfe15e
--- /dev/null
+++ b/net-irc/quirc/files/quirc-0.9.84-gcc43.patch
@@ -0,0 +1,135 @@
+diff -rupN quirc-0.9.84b/command.cc quirc-0.9.84/command.cc
+--- quirc-0.9.84b/command.cc	2009-01-22 01:48:42.000000000 -0400
++++ quirc-0.9.84/command.cc	2009-01-22 02:06:11.000000000 -0400
+@@ -8,10 +8,11 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <sys/socket.h>
++#include <cstring>
++#include <string>
+ 
+ #include "config.h"
+ 
+-#include <string>
+ #ifdef USING_STD_STRING
+ using std::string;
+ #endif
+diff -rupN quirc-0.9.84b/complete.cc quirc-0.9.84/complete.cc
+--- quirc-0.9.84b/complete.cc	2009-01-22 01:48:42.000000000 -0400
++++ quirc-0.9.84/complete.cc	2009-01-22 02:07:18.000000000 -0400
+@@ -2,6 +2,7 @@
+ #include <ctype.h>
+ #include <pwd.h>
+ #include <sys/types.h>
++#include <cstring>
+ 
+ #ifdef DMALLOC
+ #include <dmalloc.h>
+diff -rupN quirc-0.9.84b/dcc.cc quirc-0.9.84/dcc.cc
+--- quirc-0.9.84b/dcc.cc	2009-01-22 01:48:42.000000000 -0400
++++ quirc-0.9.84/dcc.cc	2009-01-22 02:03:46.000000000 -0400
+@@ -2,7 +2,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+-#include <strings.h>
++#include <cstring>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
+diff -rupN quirc-0.9.84b/format.cc quirc-0.9.84/format.cc
+--- quirc-0.9.84b/format.cc	2009-01-22 01:48:42.000000000 -0400
++++ quirc-0.9.84/format.cc	2009-01-22 02:07:41.000000000 -0400
+@@ -1,5 +1,6 @@
+ #include <stdarg.h>
+ #include <sys/types.h>
++#include <cstring>
+ 
+ #include "quirc.h"
+ #include "hash.h"
+diff -rupN quirc-0.9.84b/nick.h quirc-0.9.84/nick.h
+--- quirc-0.9.84b/nick.h	2009-01-22 01:48:42.000000000 -0400
++++ quirc-0.9.84/nick.h	2009-01-22 02:08:00.000000000 -0400
+@@ -5,6 +5,7 @@
+ #include <dmalloc.h>
+ #endif
+ 
++#include <cstring>
+ #include "support.h"
+ #include "defines.h"
+ 
+diff -rupN quirc-0.9.84b/query.h quirc-0.9.84/query.h
+--- quirc-0.9.84b/query.h	2009-01-22 01:48:42.000000000 -0400
++++ quirc-0.9.84/query.h	2009-01-22 02:08:26.000000000 -0400
+@@ -5,6 +5,7 @@
+ #include <dmalloc.h>
+ #endif
+ 
++#include <cstring>
+ #include "nick.h"
+ #include "defines.h"
+ 
+diff -rupN quirc-0.9.84b/quirc.cc quirc-0.9.84/quirc.cc
+--- quirc-0.9.84b/quirc.cc	2009-01-22 01:48:42.000000000 -0400
++++ quirc-0.9.84/quirc.cc	2009-01-22 02:04:31.000000000 -0400
+@@ -1,4 +1,4 @@
+-#include <stdio.h>
++#include <cstring>
+ 
+ #ifdef DMALLOC
+ #include <dmalloc.h>
+diff -rupN quirc-0.9.84b/server.cc quirc-0.9.84/server.cc
+--- quirc-0.9.84b/server.cc	2009-01-22 01:48:42.000000000 -0400
++++ quirc-0.9.84/server.cc	2009-01-22 02:07:01.000000000 -0400
+@@ -5,16 +5,16 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <fcntl.h>
+-#include <strings.h>
+ #include <sys/file.h>
+ #include <time.h>
+ #include <ctype.h>
+ #include <netdb.h> 
+ #include <stdarg.h>
++#include <cstring>
++#include <string>
+ 
+ #include "config.h"
+ 
+-#include <string>
+ #ifdef USING_STD_STRING
+ using std::string;
+ #endif
+diff -rupN quirc-0.9.84b/servertcl.cc quirc-0.9.84/servertcl.cc
+--- quirc-0.9.84b/servertcl.cc	2009-01-22 01:48:42.000000000 -0400
++++ quirc-0.9.84/servertcl.cc	2009-01-22 02:05:20.000000000 -0400
+@@ -2,6 +2,7 @@
+ #include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
++#include <cstring>
+ 
+ #ifdef DMALLOC
+ #include <dmalloc.h>
+diff -rupN quirc-0.9.84b/tcl.cc quirc-0.9.84/tcl.cc
+--- quirc-0.9.84b/tcl.cc	2009-01-22 01:48:42.000000000 -0400
++++ quirc-0.9.84/tcl.cc	2009-01-22 02:05:02.000000000 -0400
+@@ -2,6 +2,7 @@
+ #include <sys/time.h>
+ #include <unistd.h>
+ #include <sys/socket.h>
++#include <cstring>
+ 
+ #ifdef DMALLOC
+ #include <dmalloc.h>
+diff -rupN quirc-0.9.84b/window.cc quirc-0.9.84/window.cc
+--- quirc-0.9.84b/window.cc	2009-01-22 01:48:42.000000000 -0400
++++ quirc-0.9.84/window.cc	2009-01-22 02:08:10.000000000 -0400
+@@ -4,6 +4,7 @@
+ #include <dmalloc.h>
+ #endif
+ 
++#include <cstring>
+ #include "window.h"
+ 
+ int twindow::windowtype(char *pathname) {
diff --git a/net-irc/quirc/quirc-0.9.84.ebuild b/net-irc/quirc/quirc-0.9.84.ebuild
index f29eed8d69d8..de7454b92946 100644
--- a/net-irc/quirc/quirc-0.9.84.ebuild
+++ b/net-irc/quirc/quirc-0.9.84.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 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.4 2007/03/14 11:56:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quirc/quirc-0.9.84.ebuild,v 1.5 2009/02/15 21:50:22 loki_val Exp $
 
 inherit eutils
 
@@ -18,9 +18,10 @@ IUSE=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	epatch "${FILESDIR}"/${PV}-gcc4.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 }
 
 src_compile() {
@@ -39,12 +40,12 @@ src_install () {
 		|| die "doins failed"
 
 	insinto /usr/share/quirc/common
-	doins ${S}/data/common/*.tcl || die "doins failed"
+	doins "${S}"/data/common/*.tcl || die "doins failed"
 
 	insinto /usr/share/quirc/themes
-	doins ${S}/data/themes/*.tcl || die "doins failed"
+	doins "${S}"/data/themes/*.tcl || die "doins failed"
 
 	# this package installs docs, but we would rather do that ourselves
-	dodoc README NEWS INSTALL FAQ ChangeLog* COPYING AUTHORS doc/*.txt \
+	dodoc README NEWS INSTALL FAQ ChangeLog* AUTHORS doc/*.txt \
 		|| die "dodoc failed"
 }