Revision bump to update patchset with newest fixes from Josef Drexler.

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

5 files changed, 46 insertions, 6 deletions

diff --git a/net-p2p/rtorrent/ChangeLog b/net-p2p/rtorrent/ChangeLog
index eabbcefca6df..227361ac728d 100644
--- a/net-p2p/rtorrent/ChangeLog
+++ b/net-p2p/rtorrent/ChangeLog
@@ -1,6 +1,14 @@
 # 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.109 2008/06/05 06:43:54 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.110 2008/06/28 11:35:00 loki_val Exp $
+
+*rtorrent-0.8.2-r3 (28 Jun 2008)
+
+  28 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/rtorrent-0.8.2-fix_conn_type_seed.patch,
+  +files/rtorrent-0.8.2-fix_load_cache.patch, -rtorrent-0.8.2-r2.ebuild,
+  +rtorrent-0.8.2-r3.ebuild:
+  Revision bump to update patchset with newest fixes from Josef Drexler.
 
 *rtorrent-0.8.2-r2 (05 Jun 2008)
 
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index f116164a34e0..5e039ed97d8e 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -1,8 +1,10 @@
 AUX rtorrent-0.8.0+gcc-4.3.patch 1902 RMD160 36665695d0bfe42d3e90ebb2c803291cab28bd8c SHA1 aad5dec2a373b81bb0a72872c83c243dc1b680b3 SHA256 876478262f4d60263bb29f4ba1059570363b92615dac96093a49c966d166cb94
+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
 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-r2.ebuild 1481 RMD160 536bedcd0ba22d42a1d21a7ad01c2f32c4ce51c0 SHA1 ee09fe6d615e167daad876b71c8036e57ebacc19 SHA256 02afed452e35ba72f978e41ffaed1058343fd799cdd5122c142efee1e096e554
-MISC ChangeLog 15302 RMD160 c7815375ddf43573f95154d4e8b70b04099ca147 SHA1 a9dd70750b1ae7aa85667ecdd822330a8c155373 SHA256 7781ffa3aec7a8b097204392a9ef2d5ae9f53b909919ec3a95b138db43892542
+EBUILD rtorrent-0.8.2-r3.ebuild 1599 RMD160 5db9a359e30cb20392dff98a68874dba8e8ece2d SHA1 659049e0fe538c4740ff2bdb67fb4df87133ffea SHA256 8016d07e11d5255cb9af672f3d204e2b0f65291c608b1c4ca2e3e6606c543982
+MISC ChangeLog 15615 RMD160 29fd515fab85f1d0b3c85ca52ed6f0fd06690b46 SHA1 224592d63e9ba00408b960b2ab70c302e2cd1c9f SHA256 95803ac9cc2dbd8458155fd40a9ce552d391cb385ad93d7dd1f3c847a2f290cb
 MISC metadata.xml 592 RMD160 e65e635c888aaa1932efb1d3684643f814f92710 SHA1 189fe22f0af84cc26784ee5b0e3390eac001d9df SHA256 d0659456da6746a9a6f0c7a10f5fad958d2c0bcf56750d18c26e3cfad5dd6560
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_conn_type_seed.patch b/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_conn_type_seed.patch
new file mode 100644
index 000000000000..6b050f8b5766
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_conn_type_seed.patch
@@ -0,0 +1,13 @@
+Index: rtorrent/src/core/download_list.cc
+===================================================================
+--- rtorrent/src/core/download_list.cc	(revision 1060)
++++ rtorrent/src/core/download_list.cc	(working copy)
+@@ -399,7 +399,7 @@
+     rpc::call_command("d.set_state_counter", rpc::call_command_value("d.get_state_counter", rpc::make_target(download)), rpc::make_target(download));
+ 
+     // If initial seeding is complete, don't try it again when restarting.
+-    if (download->is_done())
++    if (download->is_done() && rpc::call_command_void("d.get_connection_current", rpc::make_target(download)).as_string() == "initial_seed")
+       rpc::call_command("d.set_connection_seed", rpc::call_command_void("d.get_connection_current", rpc::make_target(download)), rpc::make_target(download));
+ 
+     // Save the state after all the slots, etc have been called so we
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_load_cache.patch b/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_load_cache.patch
new file mode 100644
index 000000000000..3d37ca47e5e8
--- /dev/null
+++ b/net-p2p/rtorrent/files/rtorrent-0.8.2-fix_load_cache.patch
@@ -0,0 +1,14 @@
+Index: rtorrent/src/core/manager.cc
+===================================================================
+--- rtorrent/src/core/manager.cc	(revision 1060)
++++ rtorrent/src/core/manager.cc	(working copy)
+@@ -383,7 +383,8 @@
+ void
+ Manager::try_create_download(const std::string& uri, int flags, const command_list_type& commands) {
+   // If the path was attempted loaded before, skip it.
+-  if (!(flags & create_raw_data) &&
++  if ((flags & create_tied) &&
++      !(flags & create_raw_data) &&
+       !is_network_uri(uri) &&
+       !file_status_cache()->insert(uri, 0))
+     return;
diff --git a/net-p2p/rtorrent/rtorrent-0.8.2-r2.ebuild b/net-p2p/rtorrent/rtorrent-0.8.2-r3.ebuild
index 9b8f7549db40..3a584b1f8cfa 100644
--- a/net-p2p/rtorrent/rtorrent-0.8.2-r2.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-r2.ebuild,v 1.1 2008/06/05 06:43:55 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.2-r3.ebuild,v 1.1 2008/06/28 11:35:00 loki_val Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -15,7 +15,7 @@ IUSE="debug ipv6 xmlrpc"
 
 DEPEND=">=net-libs/libtorrent-0.12.${PV##*.}
 	>=dev-libs/libsigc++-2
-	>=net-misc/curl-7.15
+	>=net-misc/curl-7.18
 	sys-libs/ncurses
 	xmlrpc? ( dev-libs/xmlrpc-c )"
 
@@ -24,6 +24,8 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-0.8.0+gcc-4.3.patch
 	epatch "${FILESDIR}"/${P}-fix_start_stop_filter.patch
+	epatch "${FILESDIR}"/${P}-fix_conn_type_seed.patch
+	epatch "${FILESDIR}"/${P}-fix_load_cache.patch
 }
 
 src_compile() {
@@ -39,6 +41,7 @@ src_compile() {
 		$(use_enable ipv6) \
 		$(use_with xmlrpc xmlrpc-c) \
 		--disable-dependency-tracking \
+		--enable-aligned \
 		|| die "econf failed"
 
 	emake || die "emake failed"
@@ -46,7 +49,7 @@ src_compile() {
 
 pkg_postinst() {
 	elog "rtorrent now supports a configuration file."
-	elog "A sample configuration file for rtorrent is can be found"
+	elog "A sample configuration file for rtorrent can be found"
 	elog "in ${ROOT}usr/share/doc/${PF}/rtorrent.rc.gz."
 }