Fix building w/ gcc-4.3 (bug #251555). Patch from Gene Seto

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

3 files changed, 58 insertions, 5 deletions

diff --git a/net-p2p/mutella/ChangeLog b/net-p2p/mutella/ChangeLog
index 08ada139089c..cae0e352a54d 100644
--- a/net-p2p/mutella/ChangeLog
+++ b/net-p2p/mutella/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/mutella
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mutella/ChangeLog,v 1.24 2008/04/13 21:52:25 betelgeuse Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mutella/ChangeLog,v 1.25 2009/02/24 02:21:11 dirtyepic Exp $
+
+  24 Feb 2009; Ryan Hill <dirtyepic@gentoo.org>
+  +files/mutella-0.4.5-gcc43.patch, mutella-0.4.5.ebuild:
+  Fix building w/ gcc-4.3 (bug #251555). Patch from Gene Seto
 
   13 Apr 2008; Petteri Räty <betelgeuse@gentoo.org> mutella-0.4.5.ebuild:
   Remove DEPEND on virtual/libc.
diff --git a/net-p2p/mutella/files/mutella-0.4.5-gcc43.patch b/net-p2p/mutella/files/mutella-0.4.5-gcc43.patch
new file mode 100644
index 000000000000..47ee8a155c59
--- /dev/null
+++ b/net-p2p/mutella/files/mutella-0.4.5-gcc43.patch
@@ -0,0 +1,48 @@
+diff -rupN mutella-0.4.5b/mutella/common.h mutella-0.4.5/mutella/common.h
+--- mutella-0.4.5b/mutella/common.h	2009-01-26 02:01:11.000000000 -0400
++++ mutella-0.4.5/mutella/common.h	2009-01-26 02:05:37.000000000 -0400
+@@ -50,7 +50,7 @@ CString restore_string(CString s, bool b
+ bool QueryMatch(CString Result, const CString& Query);
+ // fast functions which do not copy the string
+ void MakeWordList(LPSTR szQuery, vector<char*>& QWords);
+-void MakeWordList(LPSTR szQuery, vector<char*>& QWords, vector<char*>& QWords);
++void MakeWordList(LPSTR szQuery, vector<char*>& QWordsInc, vector<char*>& QWords);
+ bool MatchWordList(const CString& ResultLower, const vector<char*>& QWords, bool bMatchAll = true);
+ 
+ // slower but 'storage-independent' versions
+diff -rupN mutella-0.4.5b/mutella/tstring.h mutella-0.4.5/mutella/tstring.h
+--- mutella-0.4.5b/mutella/tstring.h	2009-01-26 02:01:11.000000000 -0400
++++ mutella-0.4.5/mutella/tstring.h	2009-01-26 02:04:00.000000000 -0400
+@@ -23,6 +23,7 @@
+ 
+ #include <stdarg.h>
+ #include <iostream>
++#include <climits>
+ 
+ #ifdef TSTRING_DEBUG
+ 
+diff -rupN mutella-0.4.5b/mutella/conversions.h mutella-0.4.5/mutella/conversions.h
+--- mutella-0.4.5b/mutella/conversions.h	2009-01-26 02:17:42.000000000 -0400
++++ mutella-0.4.5/mutella/conversions.h	2009-01-26 02:18:25.000000000 -0400
+@@ -19,9 +19,9 @@
+     copyright            : (C) 2001 by

+     email                : maksik@gmx.co.uk

+  ***************************************************************************/

+-

+ #if !defined(__CONVERSIONS_H_INCLUDED__)

+ #define __CONVERSIONS_H_INCLUDED__

++#include <cstring>

+ 

+ CString DWrdtoStr(DWORD);     // Convert DWORD to a CString

+ 

+diff -rupN mutella-0.4.5b/mutella/gnumarkedfiles.cpp mutella-0.4.5/mutella/gnumarkedfiles.cpp
+--- mutella-0.4.5b/mutella/gnumarkedfiles.cpp	2009-01-26 02:17:42.000000000 -0400
++++ mutella-0.4.5/mutella/gnumarkedfiles.cpp	2009-01-26 02:18:46.000000000 -0400
+@@ -10,6 +10,7 @@
+ #include "config.h"
+ #endif
+ 
++#include <cstring>
+ #include "mutella.h"
+ #include "structures.h"
+ 
diff --git a/net-p2p/mutella/mutella-0.4.5.ebuild b/net-p2p/mutella/mutella-0.4.5.ebuild
index d93da58dc596..1a2dc9bd6f7d 100644
--- a/net-p2p/mutella/mutella-0.4.5.ebuild
+++ b/net-p2p/mutella/mutella-0.4.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mutella/mutella-0.4.5.ebuild,v 1.7 2008/04/13 21:52:25 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mutella/mutella-0.4.5.ebuild,v 1.8 2009/02/24 02:21:11 dirtyepic Exp $
 
 inherit eutils
 
@@ -18,6 +18,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-gcc41.patch"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 }
 
 src_compile() {
@@ -27,6 +28,6 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog COPYING INSTALL LICENSE KNOWN-BUGS README TODO
 }