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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 113 insertions, 108 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/Manifest b/net-p2p/rtorrent/Manifest
index 7b2a8730788f..e33d0539a2c1 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -6,7 +6,7 @@ AUX rtorrent-0.8.2-fix_scgi_crash.patch 656 RMD160 24447e6dac267fb5f7a3d8837744a
 AUX rtorrent-0.8.2-fix_start_stop_filter.patch 701 RMD160 6b109e050cc1e66d2d9874bce0fdf599188978c9 SHA1 3289506a9c76d080edbeb3ef1a42694a64da6c4d SHA256 d422c5d9a82a0d799f3b949e4b0d2fd293d98baab1fb293642544895ece75926
 AUX rtorrent-0.8.2-fix_utf8_filenames.patch 8196 RMD160 80af83b87f3794a3e6d9c1216df3559c38f12df0 SHA1 d1e4615aaefab05731010dc05167e912974581bc SHA256 84df9c827d63b81387e7720bbc9436765a940c18f972e655ecc8bc562039c532
 AUX rtorrent-0.8.2-gcc34.patch 659 RMD160 c89a0c7b2acb6db4ce19fbb7a75f1da65638cd2b SHA1 d1afe3ca20a9b9b60056b7941ae7f81dcee558a0 SHA256 a89b48546be2c0728129feff223ed4e03a7c40bbc37e9bead9c13cf20c5cd00d
-AUX rtorrent-0.8.4-gcc44.patch 3252 RMD160 5cacbaaf5f1a627edd82c93ed61757f1893e55ef SHA1 92e6d7140cb908a270891bf235a7842b10fcd9df SHA256 0ac4e090bae9a309b1271008873ba85721dce73e26d8883d2521ffab1f4e54cc
+AUX rtorrent-0.8.4-gcc44.patch 3147 RMD160 39e39fab5e4d847c049bc44e2254dec941af61fc SHA1 b877e02cb0b7f486a432d3eee0073fbeb69b9abe SHA256 7f449b47580a5162204ec0fad039e15950995f00e75ea944b02c2c926390e4aa
 AUX rtorrentd.conf 13 RMD160 aafd4d8440f40ae380b482876968f80267dff3bd SHA1 8b50885e27a2ff85cd28fccb56c11ead26d0ba49 SHA256 6725e7a3ed74f1432bd6b317f2aec7f9609bc20dd81dbbfcc632342c9f99177b
 AUX rtorrentd.init 569 RMD160 592533e8909195854cce014d818fdc63ff8926ee SHA1 3feec5baca10bccbfb9b6658d3d1fc61f75ee593 SHA256 ae909789dceb1c620b2ba6587e2d661a6e8340e7cf98636b3c81a3db259b1170
 DIST rtorrent-0.7.9.tar.gz 489174 RMD160 8cfee138c0142ad22830b3d518e198f163063a84 SHA1 0b53bd3b2c15f93352607ab3685916fe27033450 SHA256 f06f72b1fec94177147b1db0aab15be4f62d1b0354811a67ae74e0cd1e50a119
@@ -18,5 +18,5 @@ EBUILD rtorrent-0.8.2-r3.ebuild 1982 RMD160 dfcabbfc847363ed2062b10048c0849c17d7
 EBUILD rtorrent-0.8.2-r5.ebuild 2154 RMD160 d0ed0b3fa51bbb6cdf9a25efbff1f7996afae0f9 SHA1 e2dd23117e4c1402d045e9ed7ba1082a12ef6c85 SHA256 4cf50345b785da5bd86e3e70256120f50ea42907d02aa052cdbc88932084a2fd
 EBUILD rtorrent-0.8.3.ebuild 1751 RMD160 64f0f649ce0fd9ae7f929acd93baa18c06abb7c2 SHA1 278a30c989a47df74e514ff78337ac87640031d1 SHA256 d48fac483a6a2d9f87c677ee7671feb284eb4f361156db12d8beadc25ebb43c7
 EBUILD rtorrent-0.8.4-r1.ebuild 2039 RMD160 d7f7295c958f3b6af40e0d04fa48ce95742a241c SHA1 60fa1aee64aac59a2d39f6b9eb5a203e58833373 SHA256 b3bd9d94ab7b8fab3111a50a5bff35047f6a04684337fcf8b455e29f9f399d1b
-MISC ChangeLog 19648 RMD160 6cf36896158c49fef12e072d80dd3a4c78e56543 SHA1 d50532ace7fe5b153eee16592a7e711e7c02da10 SHA256 2847b0142adf443f582e1bdecf72a77d615c2e88f6c37baa0171662087dc2c5d
+MISC ChangeLog 19843 RMD160 fd83bdc886e69d93dc6dc961afb48c03654a25d4 SHA1 74ed9e6cb097670941295ef5c2b7d556c9ec71f4 SHA256 6ca4ddaff17dbdb7e8c004589f53966b38dca4c0208041966e9dd823d6b49140
 MISC metadata.xml 834 RMD160 6dfc56bd58b08c2be67506de9f22e186de2abe81 SHA1 3aaf9f22e1697b291f9d7564b48416d4f9231057 SHA256 6b74449e8e0a52a8b36f82e855d52e14d47e7a7bd76a7f66b9da2a66ff981eda
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>