Add patch by Philipp to build with GCC 4.3 (bug #212833).

Package-Manager: portage-2.1.5_rc5

4 files changed, 84 insertions, 4 deletions

diff --git a/net-p2p/rtorrent/ChangeLog b/net-p2p/rtorrent/ChangeLog
index d29503a5c116..b7e180653b4c 100644
--- a/net-p2p/rtorrent/ChangeLog
+++ b/net-p2p/rtorrent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/rtorrent
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.106 2008/03/01 11:17:24 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.107 2008/04/21 15:08:51 flameeyes Exp $
+
+  21 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/rtorrent-0.8.0+gcc-4.3.patch, rtorrent-0.8.0.ebuild:
+  Add patch by Philipp to build with GCC 4.3 (bug #212833).
 
 *rtorrent-0.8.0 (01 Mar 2008)
 
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index 6a5e48d82ddc..cfce0cb6a3c7 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX rtorrent-0.8.0+gcc-4.3.patch 1902 RMD160 36665695d0bfe42d3e90ebb2c803291cab28bd8c SHA1 aad5dec2a373b81bb0a72872c83c243dc1b680b3 SHA256 876478262f4d60263bb29f4ba1059570363b92615dac96093a49c966d166cb94
 DIST rtorrent-0.7.9.tar.gz 489174 RMD160 8cfee138c0142ad22830b3d518e198f163063a84 SHA1 0b53bd3b2c15f93352607ab3685916fe27033450 SHA256 f06f72b1fec94177147b1db0aab15be4f62d1b0354811a67ae74e0cd1e50a119
 DIST rtorrent-0.8.0.tar.gz 502896 RMD160 e0dc2bd9b3d26ce709663497d092ba31f36756bd SHA1 e2c26be93d58aef64ebd28fdb2c7c36e5b45d7ad SHA256 597cefac4535d7f3b752253e5997b3c851c261b26b966a39beb032dcf1d5baa7
 EBUILD rtorrent-0.7.9.ebuild 1321 RMD160 05dae6bd7b6c85a3a10f227db1461dd1fce65e46 SHA1 eeb3d6cca988d634a1db59d80271707c6630721b SHA256 1ea31a9d4ebb2a54ee6a287120d40415216d0703abf047013e17cf62f7bbdedc
-EBUILD rtorrent-0.8.0.ebuild 1354 RMD160 cafc3092056489abbdd7a26d518cced67f2d7e06 SHA1 a68454a63235487bc237231f9ae0e1f15534980d SHA256 ab3a29c3fe5778e0a9e9b99e08fcdf08a7c24ddc00bdff7d8b33d7617d5cfcaa
-MISC ChangeLog 14724 RMD160 ed725bd73900fc90190b8e4485de7fbc6a02f42a SHA1 127a95c864560d90054f0eee5adf351bca6495a1 SHA256 69b6dd79ead51632e3aeadaaa3491b9f069a5af4919c036433f76ac23f56c87e
+EBUILD rtorrent-0.8.0.ebuild 1441 RMD160 bb859a7dbc6ab6784f38082ab67afa3fe9e065e3 SHA1 a54a8460feb157bf678f44c023018a74cc9e93d7 SHA256 1708c9bb77d58a53ce08f64c625ba6b0633420b8499e85fbbced4c75f5405aa3
+MISC ChangeLog 14903 RMD160 4b357fc8bd59c37567c75a8a82a564dc4ff415aa SHA1 a913e1057e7f6d975272741412827e403f1fe774 SHA256 e9ac83f8e905f844b76b41350856bfd211cc09e2a462d3a1a774f8dd55e1204d
 MISC metadata.xml 424 RMD160 876cded3dbbceea6740eba9b76df952e4ccba094 SHA1 0840c9f44d278be83028950b8a0437ea8b81bcde SHA256 e5f66fec21c1690d34b2a562a6c7edced69477abc3996b9f35e611e31667ec17
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgMrgkACgkQAiZjviIA2XgvHgCg3oVHQOmvdjENLUc0tIGEzg8z
+HOAAn3FrjGHhPvzxGSHtRhMgP94cryhl
+=qEHi
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.0+gcc-4.3.patch b/net-p2p/rtorrent/files/rtorrent-0.8.0+gcc-4.3.patch
new file mode 100644
index 000000000000..d95e6d3e414c
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent-0.8.0+gcc-4.3.patch
@@ -0,0 +1,58 @@
+diff -Nurp rtorrent-0.8.0.old/rak/functional.h rtorrent-0.8.0/rak/functional.h
+--- rtorrent-0.8.0.old/rak/functional.h	2008-03-09 15:56:18.000000000 +0100
++++ rtorrent-0.8.0/rak/functional.h	2008-03-09 16:04:47.000000000 +0100
+@@ -37,6 +37,7 @@
+ #ifndef RAK_FUNCTIONAL_H
+ #define RAK_FUNCTIONAL_H
+ 
++#include <cstddef>
+ #include <functional>
+ 
+ namespace rak {
+diff -Nurp rtorrent-0.8.0.old/src/command_ui.cc rtorrent-0.8.0/src/command_ui.cc
+--- rtorrent-0.8.0.old/src/command_ui.cc	2008-03-09 15:56:18.000000000 +0100
++++ rtorrent-0.8.0/src/command_ui.cc	2008-03-09 16:05:36.000000000 +0100
+@@ -36,6 +36,8 @@
+ 
+ #include "config.h"
+ 
++#include <ctime>
++
+ #include <rak/functional.h>
+ #include <rak/functional_fun.h>
+ #include <sigc++/adaptors/bind.h>
+
+diff -Nurp rtorrent-0.8.0.old/src/display/text_element_value.cc rtorrent-0.8.0/src/display/text_element_value.cc
+--- rtorrent-0.8.0.old/src/display/text_element_value.cc	2008-03-09 15:56:18.000000000 +0100
++++ rtorrent-0.8.0/src/display/text_element_value.cc	2008-03-09 16:07:39.000000000 +0100
+@@ -36,6 +36,8 @@
+ 
+ #include "config.h"
+ 
++#include <ctime>
++
+ #include "globals.h"
+ #include "text_element_value.h"
+ 
+diff -Nurp rtorrent-0.8.0.old/src/rpc/exec_file.cc rtorrent-0.8.0/src/rpc/exec_file.cc
+--- rtorrent-0.8.0.old/src/rpc/exec_file.cc	2008-03-09 15:56:18.000000000 +0100
++++ rtorrent-0.8.0/src/rpc/exec_file.cc	2008-03-09 16:04:14.000000000 +0100
+@@ -36,6 +36,7 @@
+ 
+ #include "config.h"
+ 
++#include <cstring>
+ #include <string>
+ #include <unistd.h>
+ #include <rak/path.h>
+diff -Nurp rtorrent-0.8.0.old/src/rpc/parse.cc rtorrent-0.8.0/src/rpc/parse.cc
+--- rtorrent-0.8.0.old/src/rpc/parse.cc	2008-03-09 15:56:18.000000000 +0100
++++ rtorrent-0.8.0/src/rpc/parse.cc	2008-03-09 16:04:29.000000000 +0100
+@@ -36,6 +36,7 @@
+ 
+ #include "config.h"
+ 
++#include <cstring>
+ #include <locale>
+ #include <rak/path.h>
+ #include <torrent/exceptions.h>
diff --git a/net-p2p/rtorrent/rtorrent-0.8.0.ebuild b/net-p2p/rtorrent/rtorrent-0.8.0.ebuild
index a192fd249739..7ac0527fd3ef 100644
--- a/net-p2p/rtorrent/rtorrent-0.8.0.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.0.ebuild,v 1.1 2008/03/01 11:17:24 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.0.ebuild,v 1.2 2008/04/21 15:08:51 flameeyes Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -20,6 +20,13 @@ RDEPEND=">=net-libs/libtorrent-0.12.${PV##*.}
 	xmlrpc? ( dev-libs/xmlrpc-c )"
 DEPEND="${RDEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}+gcc-4.3.patch"
+}
+
 src_compile() {
 	replace-flags -Os -O2
 	append-flags -fno-strict-aliasing