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

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

4 files changed, 65 insertions, 11 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/Manifest b/net-p2p/mutella/Manifest
index e52c5f599353..1b3a4bf156c9 100644
--- a/net-p2p/mutella/Manifest
+++ b/net-p2p/mutella/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA1
 
 AUX mutella-0.4.5-gcc41.patch 259 RMD160 2b0db76de35594e31bf33a8278e14cee81092725 SHA1 7b256dfb1e519572aa5d12464cb82a966fb5a06c SHA256 ab18e4fde6e8687de9bf81d994b661e7d6b6e71b43dd9db29ae8f66609406d57
+AUX mutella-0.4.5-gcc43.patch 2050 RMD160 b0665376349edadeeed876bba1a900ff3e9e3592 SHA1 7673396bb8568e1688bb4463193c54674a009166 SHA256 91219265c6bf898fbb9ecef5699108a6564da8ee54bc0c7943f864a84c612be7
 DIST mutella-0.4.5.tar.gz 471839 RMD160 f870ba5ed5c3bf7b852fca49ef358a69bad4da74 SHA1 83a788d06eb24805605c46ff9ce14a5202ae38b8 SHA256 db99dd1fa52fae87290e367862cb051ee1072c88249e73fe25a933ea73030cc4
-EBUILD mutella-0.4.5.ebuild 780 RMD160 e27fe8d3ddffc32c16ddc84a81a5d22e514453c3 SHA1 578ac73cf0d69cb68b027b1acfd708f5c9596864 SHA256 ca275f5123b2e64e3d0ffbb55cc764f582e4cb7da4c905f25fb652184c7f658e
-MISC ChangeLog 3217 RMD160 ad6846438a04bbd721c2964d68316fbdd7462f71 SHA1 0a6e07eac10fe86c68014c7f4c21cbbb1ddb8325 SHA256 b27d6a6d1b4aabec672fdd099cc7b520898acfafacd012d1fa4f8238f6416538
+EBUILD mutella-0.4.5.ebuild 819 RMD160 ce4ab7f3bb23b1e370260d2ffb018c839b88ef12 SHA1 6182238259e928b5ab17ec0136d697e0e99a97b2 SHA256 75b706bcd7dfc81ddc54018729ba546a7e22aecd2b0ebbc61549b2881c5020ff
+MISC ChangeLog 3385 RMD160 3e8e563ae79e38e66749b5cf8d4684c8fa068ba4 SHA1 cb2b35f85639fd43c88fcc27a78ee0a52d6571a2 SHA256 c200425b06ef346ccf993b07db561bb9770349870cd78fceb41e6f98b1c12f2f
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkgCgJsACgkQcxLzpIGCsLScWwCfURUQRdcE6eY8qGi2rfxPRck/
-mFcAn0j1Xj0vPUGSdHhS06ysoBlWsoxS
-=sinO
+iEYEARECAAYFAkmjWe8ACgkQiqiDRvmkBmIqHQCfdaF0pDTNiKhGwK3r9oOO3unE
+JSoAn0qq/3psP1msZWxrY2/V+4oJNGGs
+=Eqz8
 -----END PGP SIGNATURE-----
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
 }