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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 152 insertions, 10 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/Manifest b/net-irc/quirc/Manifest
index 6a8d0d46dba2..b867ba4fd6cc 100644
--- a/net-irc/quirc/Manifest
+++ b/net-irc/quirc/Manifest
@@ -1,5 +1,6 @@
 AUX 0.9.84-gcc4.patch 1579 RMD160 648cb0043648117c86ec82e774d1027a5dc526f0 SHA1 04dff5d9006f7a4529f65aa3fa57aa3643b08a35 SHA256 7fe22620c90b2e3905a56cc0daa718c3f09ae119b2f40bdb65f09308c96fe016
+AUX quirc-0.9.84-gcc43.patch 3786 RMD160 649a2346da972e8fe74e4a65f65ef3e689be065b SHA1 4a31c983e20aecbe7bab6bcb70652ec6206ec7bc SHA256 46cb9fa909051e724e2a3d86b66e58af3a07d10e28678aa2e0f765f42954b160
 DIST quirc-0.9.84.tar.gz 341962 RMD160 6fdacee28b63363c3276349c32bd7bfbd463ff19 SHA1 0d9aa3f35616c3d5e6835a318266f1c71232e4d1 SHA256 601e56b0a5190b94beee1448264070573b39b34a6051e3007ad81db38332bd44
-EBUILD quirc-0.9.84.ebuild 1149 RMD160 157f802450f57d5ed52d63469a9c7779a9869e89 SHA1 bbbe70055f0316a0e2b83f387f2529c93fef17f6 SHA256 88da73f145a66666e77043959ea65deb47e26a6f938341d8c401411c26a47bdd
-MISC ChangeLog 2133 RMD160 ee58715c6ac99d6541a567d8317bbf9df10449a0 SHA1 2a4a26777393843c338aa8a6745cffaf38ccc2fc SHA256 f03796b7ac3696f64fc2a735f82c1344ce99d24098687022ad60ef7953e4b0ca
+EBUILD quirc-0.9.84.ebuild 1187 RMD160 5acb96d65f9218f4fd706318aa731b014f9f4fda SHA1 d32f478f8cc72322c202bdf298081dce96cca524 SHA256 7a9321994a33703697fe438a32ba647cf6ed6d2291adbb1e4d2e50dc9594441f
+MISC ChangeLog 2343 RMD160 49910a5cb5a9a8853755f071b3b90c8c19677402 SHA1 e2f93d508cc1507eb85787d93593a4d042d186c9 SHA256 00292c3a2299413e23efdd73b8045964b7a74e4b183903eb479b8725277c68e3
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
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"
 }