Fix dos line-endings in patch. Bug 261253. Thanks to Aelia <diego.abelenda@gmail.com> for reporting.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

2 files changed, 111 insertions, 106 deletions

diff --git a/net-p2p/rtorrent/ChangeLog b/net-p2p/rtorrent/ChangeLog
index af6f17545e43..67e30b3146d1 100644
--- a/net-p2p/rtorrent/ChangeLog
+++ b/net-p2p/rtorrent/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/rtorrent
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.133 2009/03/04 14:39:44 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.134 2009/03/05 22:16:02 loki_val Exp $
+
+  05 Mar 2009; Peter Alfredsen <loki_val@gentoo.org>
+  files/rtorrent-0.8.4-gcc44.patch:
+  Fix dos line-endings in patch. Bug 261253. Thanks to Aelia
+  <diego.abelenda@gmail.com> for reporting.
 
   04 Mar 2009; Peter Alfredsen <loki_val@gentoo.org>
   +files/rtorrent-0.8.4-gcc44.patch, rtorrent-0.8.4-r1.ebuild:
diff --git a/net-p2p/rtorrent/files/rtorrent-0.8.4-gcc44.patch b/net-p2p/rtorrent/files/rtorrent-0.8.4-gcc44.patch
index fcb3ab58ecff..10dad5f608d1 100644
--- a/net-p2p/rtorrent/files/rtorrent-0.8.4-gcc44.patch
+++ b/net-p2p/rtorrent/files/rtorrent-0.8.4-gcc44.patch
@@ -1,105 +1,105 @@
-diff -Nurp rtorrent-0.8.4.old/src/rpc/scgi_task.cc rtorrent-0.8.4/src/rpc/scgi_task.cc

---- rtorrent-0.8.4.old/src/rpc/scgi_task.cc     2008-05-07 07:19:10.000000000 -0500

-+++ rtorrent-0.8.4/src/rpc/scgi_task.cc 2009-02-04 10:23:31.000000000 -0600

-@@ -36,6 +36,8 @@

-

- #include "config.h"

-

-+#include <cstdio>

-+

- #include <rak/error_number.h>

- #include <sys/types.h>

- #include <sys/socket.h>

-

-

-diff -Nurp rtorrent-0.8.4.old/src/command_peer.cc rtorrent-0.8.4/src/command_peer.cc

---- rtorrent-0.8.4.old/src/command_peer.cc      2008-05-07 07:19:11.000000000 -0500

-+++ rtorrent-0.8.4/src/command_peer.cc  2009-02-04 10:26:53.000000000 -0600

-@@ -36,6 +36,8 @@

-

- #include "config.h"

-

-+#include <cstdio>

-+

- #include <rak/error_number.h>

- #include <rak/path.h>

- #include <rak/socket_address.h>

-

-

-

-diff -Nurp rtorrent-0.8.4.old/src/display/utils.cc rtorrent-0.8.4/src/display/utils.cc

---- rtorrent-0.8.4.old/src/display/utils.cc     2008-08-27 03:25:01.000000000 -0500

-+++ rtorrent-0.8.4/src/display/utils.cc 2009-02-04 10:20:34.000000000 -0600

-@@ -36,6 +36,7 @@

-

- #include "config.h"

-

-+#include <cstdio>

- #include <cstring>

- #include <sstream>

- #include <iomanip>

-

-

-diff -Nurp rtorrent-0.8.4.old/src/rpc/parse.cc rtorrent-0.8.4/src/rpc/parse.cc

---- rtorrent-0.8.4.old/src/rpc/parse.cc 2008-08-26 15:14:33.000000000 -0500

-+++ rtorrent-0.8.4/src/rpc/parse.cc     2009-02-04 10:23:06.000000000 -0600

-@@ -37,6 +37,7 @@

- #include "config.h"

-

- #include <cstring>

-+#include <cstdio>

- #include <locale>

- #include <rak/path.h>

- #include <torrent/exceptions.h>

-

- diff -Nurp rtorrent-0.8.4.old/src/utils/lockfile.cc rtorrent-0.8.4/src/utils/lockfile.cc

---- rtorrent-0.8.4.old/src/utils/lockfile.cc    2008-05-07 07:19:11.000000000 -0500

-+++ rtorrent-0.8.4/src/utils/lockfile.cc        2009-02-04 10:25:10.000000000 -0600

-@@ -40,6 +40,7 @@

- #include <cctype>

- #include <cerrno>

- #include <cstring>

-+#include <cstdio>

- #include <sstream>

- #include <fcntl.h>

- #include <signal.h>

-

-diff -Nurp rtorrent-0.8.4.old/src/command_download.cc rtorrent-0.8.4/src/command_download.cc

---- rtorrent-0.8.4.old/src/command_download.cc  2008-11-19 11:01:20.000000000 -0600

-+++ rtorrent-0.8.4/src/command_download.cc      2009-02-04 10:25:32.000000000 -0600

-@@ -36,6 +36,8 @@

-

- #include "config.h"

-

-+#include <cstdio>

-+

- #include <functional>

- #include <unistd.h>

- #include <rak/file_stat.h>

-

-

-diff -Nurp rtorrent-0.8.4.old/src/command_events.cc rtorrent-0.8.4/src/command_events.cc

---- rtorrent-0.8.4.old/src/command_events.cc    2008-11-11 04:37:20.000000000 -0600

-+++ rtorrent-0.8.4/src/command_events.cc        2009-02-04 10:25:58.000000000 -0600

-@@ -36,6 +36,8 @@

-

- #include "config.h"

-

-+#include <cstdio>

-+

- #include <functional>

- #include <rak/file_stat.h>

- #include <rak/path.h>

-

-diff -Nurp rtorrent-0.8.4.old/src/command_network.cc rtorrent-0.8.4/src/command_network.cc

---- rtorrent-0.8.4.old/src/command_network.cc   2008-08-27 03:25:01.000000000 -0500

-+++ rtorrent-0.8.4/src/command_network.cc       2009-02-04 10:26:22.000000000 -0600

-@@ -36,6 +36,8 @@

-

- #include "config.h"

-

-+#include <cstdio>

-+

- #include <functional>

- #include <rak/address_info.h>

- #include <rak/path.h>

+diff -Nurp rtorrent-0.8.4.old/src/rpc/scgi_task.cc rtorrent-0.8.4/src/rpc/scgi_task.cc
+--- rtorrent-0.8.4.old/src/rpc/scgi_task.cc     2008-05-07 07:19:10.000000000 -0500
++++ rtorrent-0.8.4/src/rpc/scgi_task.cc 2009-02-04 10:23:31.000000000 -0600
+@@ -36,6 +36,8 @@
+
+ #include "config.h"
+
++#include <cstdio>
++
+ #include <rak/error_number.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+
+
+diff -Nurp rtorrent-0.8.4.old/src/command_peer.cc rtorrent-0.8.4/src/command_peer.cc
+--- rtorrent-0.8.4.old/src/command_peer.cc      2008-05-07 07:19:11.000000000 -0500
++++ rtorrent-0.8.4/src/command_peer.cc  2009-02-04 10:26:53.000000000 -0600
+@@ -36,6 +36,8 @@
+
+ #include "config.h"
+
++#include <cstdio>
++
+ #include <rak/error_number.h>
+ #include <rak/path.h>
+ #include <rak/socket_address.h>
+
+
+
+diff -Nurp rtorrent-0.8.4.old/src/display/utils.cc rtorrent-0.8.4/src/display/utils.cc
+--- rtorrent-0.8.4.old/src/display/utils.cc     2008-08-27 03:25:01.000000000 -0500
++++ rtorrent-0.8.4/src/display/utils.cc 2009-02-04 10:20:34.000000000 -0600
+@@ -36,6 +36,7 @@
+
+ #include "config.h"
+
++#include <cstdio>
+ #include <cstring>
+ #include <sstream>
+ #include <iomanip>
+
+
+diff -Nurp rtorrent-0.8.4.old/src/rpc/parse.cc rtorrent-0.8.4/src/rpc/parse.cc
+--- rtorrent-0.8.4.old/src/rpc/parse.cc 2008-08-26 15:14:33.000000000 -0500
++++ rtorrent-0.8.4/src/rpc/parse.cc     2009-02-04 10:23:06.000000000 -0600
+@@ -37,6 +37,7 @@
+ #include "config.h"
+
+ #include <cstring>
++#include <cstdio>
+ #include <locale>
+ #include <rak/path.h>
+ #include <torrent/exceptions.h>
+
+ diff -Nurp rtorrent-0.8.4.old/src/utils/lockfile.cc rtorrent-0.8.4/src/utils/lockfile.cc
+--- rtorrent-0.8.4.old/src/utils/lockfile.cc    2008-05-07 07:19:11.000000000 -0500
++++ rtorrent-0.8.4/src/utils/lockfile.cc        2009-02-04 10:25:10.000000000 -0600
+@@ -40,6 +40,7 @@
+ #include <cctype>
+ #include <cerrno>
+ #include <cstring>
++#include <cstdio>
+ #include <sstream>
+ #include <fcntl.h>
+ #include <signal.h>
+
+diff -Nurp rtorrent-0.8.4.old/src/command_download.cc rtorrent-0.8.4/src/command_download.cc
+--- rtorrent-0.8.4.old/src/command_download.cc  2008-11-19 11:01:20.000000000 -0600
++++ rtorrent-0.8.4/src/command_download.cc      2009-02-04 10:25:32.000000000 -0600
+@@ -36,6 +36,8 @@
+
+ #include "config.h"
+
++#include <cstdio>
++
+ #include <functional>
+ #include <unistd.h>
+ #include <rak/file_stat.h>
+
+
+diff -Nurp rtorrent-0.8.4.old/src/command_events.cc rtorrent-0.8.4/src/command_events.cc
+--- rtorrent-0.8.4.old/src/command_events.cc    2008-11-11 04:37:20.000000000 -0600
++++ rtorrent-0.8.4/src/command_events.cc        2009-02-04 10:25:58.000000000 -0600
+@@ -36,6 +36,8 @@
+
+ #include "config.h"
+
++#include <cstdio>
++
+ #include <functional>
+ #include <rak/file_stat.h>
+ #include <rak/path.h>
+
+diff -Nurp rtorrent-0.8.4.old/src/command_network.cc rtorrent-0.8.4/src/command_network.cc
+--- rtorrent-0.8.4.old/src/command_network.cc   2008-08-27 03:25:01.000000000 -0500
++++ rtorrent-0.8.4/src/command_network.cc       2009-02-04 10:26:22.000000000 -0600
+@@ -36,6 +36,8 @@
+
+ #include "config.h"
+
++#include <cstdio>
++
+ #include <functional>
+ #include <rak/address_info.h>
+ #include <rak/path.h>