Add patch to fix compilation with gcc-4.1 by Robert Marmorstein <rmmarm AT wm DOT edu>; bug #131985

Package-Manager: portage-2.1_pre10-r5

5 files changed, 127 insertions, 31 deletions

diff --git a/net-misc/aria/ChangeLog b/net-misc/aria/ChangeLog
index b29f40de2713..dc2e390430c7 100644
--- a/net-misc/aria/ChangeLog
+++ b/net-misc/aria/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/aria
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria/ChangeLog,v 1.19 2006/04/01 16:19:08 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria/ChangeLog,v 1.20 2006/05/11 01:39:59 halcy0n Exp $
+
+  11 May 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/aria-1.0.0-gcc41.patch, aria-1.0.0.ebuild:
+  Add patch to fix compilation with gcc-4.1 by Robert Marmorstein <rmmarm AT
+  wm DOT edu>; bug #131985
 
   01 Apr 2006; <nixnut@gentoo.org> aria-1.0.0.ebuild:
   Added ~ppc keyword. Bug #128064
diff --git a/net-misc/aria/Manifest b/net-misc/aria/Manifest
index 60f6f45962e6..f3ddb1e55c0d 100644
--- a/net-misc/aria/Manifest
+++ b/net-misc/aria/Manifest
@@ -1,43 +1,58 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 31ae9137e797702096985e6d9cda67b9 ChangeLog 2446
-RMD160 6c7534dbf7817329700fdbf8e4cb5a8c6c45f32d ChangeLog 2446
-SHA256 d136c90350e0502016f22a56619dd1b888f29d659b0f30a5ecc9de0c92653350 ChangeLog 2446
-MD5 d8998cc649683ff1cd49df55d91918f9 aria-0.10.0.ebuild 804
-RMD160 c5afe6221f7e6124f58f79ed038d9fad17c852ed aria-0.10.0.ebuild 804
-SHA256 46e54d986a0a96336b78dc89a47f36b75d3916a44b1f9e7a74f59015da1bdff5 aria-0.10.0.ebuild 804
-MD5 16373e087b195f970cebf5f8e42df7ad aria-0.10.2_beta7.ebuild 857
-RMD160 a78a73e3b728d2ee6c42d9c4dce9691496ac04fd aria-0.10.2_beta7.ebuild 857
-SHA256 881d8507ed503eaab0a77a71fcdd344b846b2ec25c1e6a0d67a8edda9121cb44 aria-0.10.2_beta7.ebuild 857
-MD5 17fec387c71f3c1770468190387bfb0b aria-1.0.0.ebuild 1180
-RMD160 073dd4ee31a5f628dcb7facb3f62910d0bcc5f8e aria-1.0.0.ebuild 1180
-SHA256 02e00f5874ab5d04d786aee9e44947341f17a67e1f2cbbb63ecc4d8c00e3edb6 aria-1.0.0.ebuild 1180
+AUX aria-1.0.0-bigendian.diff 684 RMD160 b4559dac5924b3d777ddd2b6f4e133901fe60543 SHA1 98111e192c95dbc8b8d3a51a6f1e213e2abe421e SHA256 890b212d7516b4963b174947743dc3cfc2cbc59aee556ed40d840f10064080de size 684
 MD5 6cf5cba54a93af546dd72d878553cf0d files/aria-1.0.0-bigendian.diff 684
 RMD160 b4559dac5924b3d777ddd2b6f4e133901fe60543 files/aria-1.0.0-bigendian.diff 684
 SHA256 890b212d7516b4963b174947743dc3cfc2cbc59aee556ed40d840f10064080de files/aria-1.0.0-bigendian.diff 684
+AUX aria-1.0.0-gcc41.patch 2602 RMD160 67e927cf5292fe79b8e2f29f5939a56ef7d3ccdc SHA1 b469db2b32af1abb281f71a44cbe27ac3b5d96c4 SHA256 e12e09288f6ee1ea720d13f5024099957f6120ba2e5180b5a3ea2e212b887731 size 2602
+MD5 cecd83dc5022b797c662ddd36e593b70 files/aria-1.0.0-gcc41.patch 2602
+RMD160 67e927cf5292fe79b8e2f29f5939a56ef7d3ccdc files/aria-1.0.0-gcc41.patch 2602
+SHA256 e12e09288f6ee1ea720d13f5024099957f6120ba2e5180b5a3ea2e212b887731 files/aria-1.0.0-gcc41.patch 2602
+AUX aria-1.0.0-savefiles-gentoo.diff 1005 RMD160 e5db1f3dc806626e81ae7f5ed0353e84d737beb7 SHA1 d645a49fc519acf88818d1a1e9a92d61ab5f0dbf SHA256 4c9168cce4804d1507e0b4273883a9b6b8478118244979ee3fd3ecff8496262f size 1005
 MD5 81f59c682ea25291338ad529d3e25472 files/aria-1.0.0-savefiles-gentoo.diff 1005
 RMD160 e5db1f3dc806626e81ae7f5ed0353e84d737beb7 files/aria-1.0.0-savefiles-gentoo.diff 1005
 SHA256 4c9168cce4804d1507e0b4273883a9b6b8478118244979ee3fd3ecff8496262f files/aria-1.0.0-savefiles-gentoo.diff 1005
+AUX aria-1.0.0-xgettext-gentoo.diff 956 RMD160 2f19bed0065c120cb0ceb45fa326896e5c9d5b9f SHA1 d1780c6d92f0a27890e86d6716afea35ad4864e1 SHA256 d118d3c7dfc5cdecfbb4fd008c455dad5de7084b332d2de9cd3bce31ae0f6cd1 size 956
 MD5 eecc0279096e5be08069f7e6e6d95665 files/aria-1.0.0-xgettext-gentoo.diff 956
 RMD160 2f19bed0065c120cb0ceb45fa326896e5c9d5b9f files/aria-1.0.0-xgettext-gentoo.diff 956
 SHA256 d118d3c7dfc5cdecfbb4fd008c455dad5de7084b332d2de9cd3bce31ae0f6cd1 files/aria-1.0.0-xgettext-gentoo.diff 956
+DIST aria-0.10.0.tar.bz2 352143 size 352143
+DIST aria-0.10.2test7.tar.bz2 479328 size 479328
+DIST aria-1.0.0.tar.bz2 477633 RMD160 7feefd647d1f9dad4a6f88e962f8c69e5842d8c6 SHA256 5a8a847a3036a99630fe466f11f3e242f1559f2f1900961472b781a4fab27e25 size 477633
+EBUILD aria-0.10.0.ebuild 804 RMD160 c5afe6221f7e6124f58f79ed038d9fad17c852ed SHA1 7a0bdfc4c2c6b5a9e419cfabe3aefd671853f1b8 SHA256 46e54d986a0a96336b78dc89a47f36b75d3916a44b1f9e7a74f59015da1bdff5 size 804
+MD5 d8998cc649683ff1cd49df55d91918f9 aria-0.10.0.ebuild 804
+RMD160 c5afe6221f7e6124f58f79ed038d9fad17c852ed aria-0.10.0.ebuild 804
+SHA256 46e54d986a0a96336b78dc89a47f36b75d3916a44b1f9e7a74f59015da1bdff5 aria-0.10.0.ebuild 804
+EBUILD aria-0.10.2_beta7.ebuild 857 RMD160 a78a73e3b728d2ee6c42d9c4dce9691496ac04fd SHA1 b2058a134d9ad561471f7128d45c0d8b5adcd8d1 SHA256 881d8507ed503eaab0a77a71fcdd344b846b2ec25c1e6a0d67a8edda9121cb44 size 857
+MD5 16373e087b195f970cebf5f8e42df7ad aria-0.10.2_beta7.ebuild 857
+RMD160 a78a73e3b728d2ee6c42d9c4dce9691496ac04fd aria-0.10.2_beta7.ebuild 857
+SHA256 881d8507ed503eaab0a77a71fcdd344b846b2ec25c1e6a0d67a8edda9121cb44 aria-0.10.2_beta7.ebuild 857
+EBUILD aria-1.0.0.ebuild 1216 RMD160 e7b65e7e747a618956368566c380ac309f829de4 SHA1 87e8a658e8ddd8507ff493ebaa1a8936318407b8 SHA256 265579e7c59f9a37f577c8a9c8aa527802512c4eb408c516722e4a89ef5b86f8 size 1216
+MD5 d0209b002bd5b4e938f731d5ea9647b4 aria-1.0.0.ebuild 1216
+RMD160 e7b65e7e747a618956368566c380ac309f829de4 aria-1.0.0.ebuild 1216
+SHA256 265579e7c59f9a37f577c8a9c8aa527802512c4eb408c516722e4a89ef5b86f8 aria-1.0.0.ebuild 1216
+MISC ChangeLog 2652 RMD160 2021456451d9533a400a892b3d0c31a7136b1fa5 SHA1 70323396deb6e9dfcb5605377a56c4ce6a42a959 SHA256 bf6e7a84171d625c918198382272bb06c850ca5c1800349dcf62a2df0da040fa size 2652
+MD5 72d6b4f44899cf4416b31c481dded049 ChangeLog 2652
+RMD160 2021456451d9533a400a892b3d0c31a7136b1fa5 ChangeLog 2652
+SHA256 bf6e7a84171d625c918198382272bb06c850ca5c1800349dcf62a2df0da040fa ChangeLog 2652
+MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e size 160
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
+SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e metadata.xml 160
 MD5 65d1ace3b41fe91a14721c69547c930b files/digest-aria-0.10.0 64
 RMD160 78704ee754a5f32bb422987187283adf56d6dea6 files/digest-aria-0.10.0 64
 SHA256 1fdddd53deefaf14baeb097fa26ebef49f21c5e2b3cdc69977d78530375806c4 files/digest-aria-0.10.0 64
 MD5 e49bd8fb946e7f696225f4fb9d6b7bca files/digest-aria-0.10.2_beta7 69
 RMD160 efe92cbfe48a78dfa6e52353bdaf11408f14638c files/digest-aria-0.10.2_beta7 69
 SHA256 1491b0d3cbab127208c6e3ddaa275469cfe8b39ed2051330887ef8a49260a896 files/digest-aria-0.10.2_beta7 69
-MD5 650691427e963c1e71e93aca6c62f0f4 files/digest-aria-1.0.0 63
-RMD160 fe7eb9fbb8b876ae5d9c61cbdf8991cd1426ef0f files/digest-aria-1.0.0 63
-SHA256 4ac4d82277f25213355879caebe5e6bcd4de51d89efc9ac5863f7e84d75ae898 files/digest-aria-1.0.0 63
-MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
-SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e metadata.xml 160
+MD5 af3633e0a9ccdc6777b134ddd53a5bc6 files/digest-aria-1.0.0 235
+RMD160 4b97d5fdee8d887ff63d13969b24df3f7e546aca files/digest-aria-1.0.0 235
+SHA256 d80b5fad27556b8a59f6c537f34fd552f36dca7954021b6522e6c6651614da23 files/digest-aria-1.0.0 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFELqfzoFw4q70f3SsRAksvAKCrAQK4dbgKsWwI3V8rPLFD1CcCjQCfXcwg
-zQOCvTXYnTich1LTlRvt3gE=
-=w2Ls
+iD8DBQFEYpX9CRZPokWLroQRAqybAJ0WeaFaz8VsKnVVgWa84g7a98nThACgvfGU
+MGHcbY+ovf3zn3nyFHzbonY=
+=ULWd
 -----END PGP SIGNATURE-----
diff --git a/net-misc/aria/aria-1.0.0.ebuild b/net-misc/aria/aria-1.0.0.ebuild
index 9cbd3c661b2f..421e7613d39f 100644
--- a/net-misc/aria/aria-1.0.0.ebuild
+++ b/net-misc/aria/aria-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria/aria-1.0.0.ebuild,v 1.10 2006/04/01 16:19:08 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria/aria-1.0.0.ebuild,v 1.11 2006/05/11 01:39:59 halcy0n Exp $
 
 inherit eutils
 
@@ -20,9 +20,10 @@ DEPEND="nls? ( sys-devel/gettext dev-util/intltool )
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/aria-1.0.0-xgettext-gentoo.diff
-	epatch ${FILESDIR}/aria-1.0.0-savefiles-gentoo.diff
-	epatch ${FILESDIR}/aria-1.0.0-bigendian.diff
+	epatch "${FILESDIR}"/${P}-xgettext-gentoo.diff
+	epatch "${FILESDIR}"/${P}-savefiles-gentoo.diff
+	epatch "${FILESDIR}"/${P}-bigendian.diff
+	epatch "${FILESDIR}"/${P}-gcc41.patch
 }
 
 src_compile() {
@@ -38,8 +39,8 @@ src_install() {
 	einstall || die
 
 	dodoc AUTHORS README* NEWS ChangeLog TODO COPYING
-	touch ${D}/usr/share/aria/ftp_proxy.aria
-	touch ${D}/usr/share/aria/gui.aria
-	touch ${D}/usr/share/aria/history.aria
-	touch ${D}/usr/share/aria/http_proxy.aria
+	touch "${D}"/usr/share/aria/ftp_proxy.aria
+	touch "${D}"/usr/share/aria/gui.aria
+	touch "${D}"/usr/share/aria/history.aria
+	touch "${D}"/usr/share/aria/http_proxy.aria
 }
diff --git a/net-misc/aria/files/aria-1.0.0-gcc41.patch b/net-misc/aria/files/aria-1.0.0-gcc41.patch
new file mode 100644
index 000000000000..87ff0740f289
--- /dev/null
+++ b/net-misc/aria/files/aria-1.0.0-gcc41.patch
@@ -0,0 +1,73 @@
+diff -ur --exclude=.deps aria-1.0.0-orig/src/gui_download.cc aria-1.0.0/src/gui_download.cc
+--- aria-1.0.0-orig/src/gui_download.cc	2006-05-10 20:45:44.000000000 -0400
++++ aria-1.0.0/src/gui_download.cc	2006-05-10 20:46:50.000000000 -0400
+@@ -24,7 +24,7 @@
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-#include <pair.h>
++#include <utility>
+ #include <list>
+ #include <algorithm>
+ #include "aria.h"
+diff -ur --exclude=.deps aria-1.0.0-orig/src/gui_file.cc aria-1.0.0/src/gui_file.cc
+--- aria-1.0.0-orig/src/gui_file.cc	2006-05-10 20:45:44.000000000 -0400
++++ aria-1.0.0/src/gui_file.cc	2006-05-10 20:47:05.000000000 -0400
+@@ -19,7 +19,7 @@
+ 
+ // $Id: aria-1.0.0-gcc41.patch,v 1.1 2006/05/11 01:39:59 halcy0n Exp $
+ 
+-#include <fstream.h>
++#include <fstream>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <sys/time.h>
+diff -ur --exclude=.deps aria-1.0.0-orig/src/gui_popup.cc aria-1.0.0/src/gui_popup.cc
+--- aria-1.0.0-orig/src/gui_popup.cc	2006-05-10 20:45:44.000000000 -0400
++++ aria-1.0.0/src/gui_popup.cc	2006-05-10 20:47:16.000000000 -0400
+@@ -19,7 +19,7 @@
+ 
+ // $Id: aria-1.0.0-gcc41.patch,v 1.1 2006/05/11 01:39:59 halcy0n Exp $
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include "aria.h"
+ #include "gui_utils.h"
+ 
+diff -ur --exclude=.deps aria-1.0.0-orig/src/ItemCellPartial.h aria-1.0.0/src/ItemCellPartial.h
+--- aria-1.0.0-orig/src/ItemCellPartial.h	2006-05-10 20:45:44.000000000 -0400
++++ aria-1.0.0/src/ItemCellPartial.h	2006-05-10 20:46:08.000000000 -0400
+@@ -70,7 +70,7 @@
+   ItemCell *ret_Boss();
+ 
+   void WriteSplitInfo(const string& filename);
+-  ItemCell::DownloadStatusType ItemCellPartial::Download_Main();
++  ItemCell::DownloadStatusType Download_Main();
+ 
+   SplitStatusType SplitNumberChanged(const string& filename);
+ };
+diff -ur --exclude=.deps aria-1.0.0-orig/src/ItemList.h aria-1.0.0/src/ItemList.h
+--- aria-1.0.0-orig/src/ItemList.h	2006-05-10 20:45:44.000000000 -0400
++++ aria-1.0.0/src/ItemList.h	2006-05-10 20:46:20.000000000 -0400
+@@ -31,7 +31,7 @@
+ #include <string>
+ #include <fstream>
+ //#include <map>
+-#include <pair.h>
++#include <utility>
+ #include "aria.h"
+ #include "utils.h"
+ #include "ProxyList.h"
+diff -ur --exclude=.deps aria-1.0.0-orig/src/RetrieveFTP.h aria-1.0.0/src/RetrieveFTP.h
+--- aria-1.0.0-orig/src/RetrieveFTP.h	2006-05-10 20:45:44.000000000 -0400
++++ aria-1.0.0/src/RetrieveFTP.h	2006-05-10 20:46:34.000000000 -0400
+@@ -27,7 +27,7 @@
+ #include <arpa/inet.h>
+ #include <errno.h>
+ #include <fstream>
+-#include <pair.h>
++#include <utility>
+ #include "aria.h"
+ #include "FTPcontainer.h"
+ #include "ItemCell.h"
+
diff --git a/net-misc/aria/files/digest-aria-1.0.0 b/net-misc/aria/files/digest-aria-1.0.0
index 4a216ccda6a7..33e46b7a4726 100644
--- a/net-misc/aria/files/digest-aria-1.0.0
+++ b/net-misc/aria/files/digest-aria-1.0.0
@@ -1 +1,3 @@
 MD5 e4e968fd10f3beb2402b851f5dad74ff aria-1.0.0.tar.bz2 477633
+RMD160 7feefd647d1f9dad4a6f88e962f8c69e5842d8c6 aria-1.0.0.tar.bz2 477633
+SHA256 5a8a847a3036a99630fe466f11f3e242f1559f2f1900961472b781a4fab27e25 aria-1.0.0.tar.bz2 477633