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

(Portage version: 2.1_pre10-r5)

4 files changed, 90 insertions, 9 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/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