Add patch for gcc-3.4, bug #224031. Thanks goes to Herbie Hopkins <herbie@hopkins.net>. Upstream http://libtorrent.rakshasa.no/ticket/1271 . Verified with Josef Drexler via IRC that this is the correct solution.

Package-Manager: portage-2.2_rc5/cvs/Linux 2.6.25.8 i686

4 files changed, 27 insertions, 4 deletions

diff --git a/net-p2p/rtorrent/ChangeLog b/net-p2p/rtorrent/ChangeLog
index abb456a5ab1f..8eace160f713 100644
--- a/net-p2p/rtorrent/ChangeLog
+++ b/net-p2p/rtorrent/ChangeLog
@@ -1,6 +1,12 @@
 # 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.113 2008/08/01 18:42:09 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.114 2008/08/01 21:16:53 loki_val Exp $
+
+  01 Aug 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/rtorrent-0.8.2-gcc34.patch, rtorrent-0.8.2-r3.ebuild:
+  Add patch for gcc-3.4, bug #224031. Thanks goes to Herbie Hopkins
+  <herbie@hopkins.net>. Upstream http://libtorrent.rakshasa.no/ticket/1271 .
+  Verified with Josef Drexler via IRC that this is the correct solution.
 
   01 Aug 2008; nixnut <nixnut@gentoo.org> rtorrent-0.8.2-r3.ebuild:
   Stable on ppc wrt bug 233122
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index f19398ef14f3..ca25be87cacb 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -2,9 +2,10 @@ AUX rtorrent-0.8.0+gcc-4.3.patch 1902 RMD160 36665695d0bfe42d3e90ebb2c803291cab2
 AUX rtorrent-0.8.2-fix_conn_type_seed.patch 872 RMD160 6d459a60e57702d83801c03a756db2adebbc25f3 SHA1 640231a849def797f07278aa1fc71a6f1164044d SHA256 0974025e834799c0d145673d14df4aa7cb1d7421f1a194304ca728d21abedd5b
 AUX rtorrent-0.8.2-fix_load_cache.patch 580 RMD160 a9c9804e37f4e242a68b60fa01eed52e981a6a2c SHA1 e3301560b70be479bbacb3f27e3d992d60dc8bb4 SHA256 7f7dac70d8e5f04248108f558959b49361d9f3598250fec2eadcf45cf0bce49b
 AUX rtorrent-0.8.2-fix_start_stop_filter.patch 701 RMD160 6b109e050cc1e66d2d9874bce0fdf599188978c9 SHA1 3289506a9c76d080edbeb3ef1a42694a64da6c4d SHA256 d422c5d9a82a0d799f3b949e4b0d2fd293d98baab1fb293642544895ece75926
+AUX rtorrent-0.8.2-gcc34.patch 659 RMD160 c89a0c7b2acb6db4ce19fbb7a75f1da65638cd2b SHA1 d1afe3ca20a9b9b60056b7941ae7f81dcee558a0 SHA256 a89b48546be2c0728129feff223ed4e03a7c40bbc37e9bead9c13cf20c5cd00d
 DIST rtorrent-0.7.9.tar.gz 489174 RMD160 8cfee138c0142ad22830b3d518e198f163063a84 SHA1 0b53bd3b2c15f93352607ab3685916fe27033450 SHA256 f06f72b1fec94177147b1db0aab15be4f62d1b0354811a67ae74e0cd1e50a119
 DIST rtorrent-0.8.2.tar.gz 506015 RMD160 e86b0082d1788e4e7cd8fcf631f7f857d642c799 SHA1 891093c5d600c2e3853eadbbec369a12dfe6ec11 SHA256 76135a63869e43fa0392829bb45d94c0aa55e94350dddc272685ccfac1bbb2ed
 EBUILD rtorrent-0.7.9.ebuild 1321 RMD160 05dae6bd7b6c85a3a10f227db1461dd1fce65e46 SHA1 eeb3d6cca988d634a1db59d80271707c6630721b SHA256 1ea31a9d4ebb2a54ee6a287120d40415216d0703abf047013e17cf62f7bbdedc
-EBUILD rtorrent-0.8.2-r3.ebuild 1594 RMD160 1a9e549daeee9e82201a083344fb95a70e6a3493 SHA1 05449cf2b1c97b7c84acdd8174d5c8c1d73a2a21 SHA256 a515df8ef21260cce26c0f283be9dad0f2dcd3dfea75bd2cd39ffc4efd661409
-MISC ChangeLog 15923 RMD160 f2674c8efc6781b37c12dc61cddeebcabff2d8af SHA1 60f52f1a73e7191af226ea29afb59eaad4c3f4f5 SHA256 7f7739badb7c9265ecdbc4de5b9768f4bc900c6b6200294f174818b6faacc360
+EBUILD rtorrent-0.8.2-r3.ebuild 1635 RMD160 c227a51fb6f0261fed4c0c0f9c0d67a7e0fd5cb3 SHA1 cd18553c412a07c7ca33179f20c3c5a409a312ec SHA256 f2898ffc24d0275f43a5931b6bc56771760751d0a8e54635097cafe40d839890
+MISC ChangeLog 16260 RMD160 c1a989cd38c2b7df8157169f8967ad60936c3a84 SHA1 f92536733247da62a3bf7a6eb3c24abf177ead43 SHA256 e953c85737d77a9e4cc60d4dc66ddce84394b46981fdfbff2a70fe7fb5e605b3
 MISC metadata.xml 592 RMD160 e65e635c888aaa1932efb1d3684643f814f92710 SHA1 189fe22f0af84cc26784ee5b0e3390eac001d9df SHA256 d0659456da6746a9a6f0c7a10f5fad958d2c0bcf56750d18c26e3cfad5dd6560
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.2-gcc34.patch b/net-p2p/rtorrent/files/rtorrent-0.8.2-gcc34.patch
new file mode 100644
index 000000000000..1e761b2a6272
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent-0.8.2-gcc34.patch
@@ -0,0 +1,15 @@
+diff -rwud rtorrent-0.8.2/src/rpc/command.h rtorrent-0.8.2-my/src/rpc/command.h
+--- rtorrent-0.8.2/src/rpc/command.h	2008-05-07 14:19:10.000000000 +0200
++++ rtorrent-0.8.2-my/src/rpc/command.h	2008-06-09 02:23:34.000000000 +0200
+@@ -73,10 +73,8 @@
+   rt_triple(const T1& a, const T2& b, const T3& c) :
+     base_type(a, b), third(c) {}
+ 
+-  template <typename U1, typename U2>
+-  rt_triple(const std::pair<U1, U2>& b) : base_type(b), third() {}
++  rt_triple(const base_type& b) : base_type(b), third() {}
+ 
+-  template <typename U1, typename U2, typename U3>
+   rt_triple(const rt_triple& src) :
+     base_type(src.first, src.second), third(src.third) {}
+ };
diff --git a/net-p2p/rtorrent/rtorrent-0.8.2-r3.ebuild b/net-p2p/rtorrent/rtorrent-0.8.2-r3.ebuild
index 4d6d3a76a276..74be5a816602 100644
--- a/net-p2p/rtorrent/rtorrent-0.8.2-r3.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.8.2-r3.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.2-r3.ebuild,v 1.4 2008/08/01 18:42:09 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.2-r3.ebuild,v 1.5 2008/08/01 21:16:53 loki_val Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -26,6 +26,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-fix_start_stop_filter.patch
 	epatch "${FILESDIR}"/${P}-fix_conn_type_seed.patch
 	epatch "${FILESDIR}"/${P}-fix_load_cache.patch
+	epatch "${FILESDIR}"/${P}-gcc34.patch
 }
 
 src_compile() {