Update patch with the one from Philipp in bug #212824.

Package-Manager: portage-2.1.5_rc6

3 files changed, 65 insertions, 44 deletions

diff --git a/net-libs/libtorrent/ChangeLog b/net-libs/libtorrent/ChangeLog
index 1e702ead097c..463dc05cf328 100644
--- a/net-libs/libtorrent/ChangeLog
+++ b/net-libs/libtorrent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libtorrent
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.112 2008/04/21 14:33:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.113 2008/04/27 12:54:14 flameeyes Exp $
+
+  27 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+  files/libtorrent-0.11.9+gcc-4.3.patch:
+  Update patch with the one from Philipp in bug #212824.
 
   21 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
   +files/libtorrent-0.11.9+gcc-4.3.patch, libtorrent-0.12.0.ebuild:
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index 1b540fbda7db..730dab1f1136 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libtorrent-0.11.9+gcc-4.3.patch 1653 RMD160 44d395c4fde2bd27f4126ac3b995750e3261d5fb SHA1 a6acd5944d62e370b25bb50a85eb31aa774a3840 SHA256 1efb3e90a11fd041f41de51cabcfedb0341b04ce93376125701b05f3b369cf3e
+AUX libtorrent-0.11.9+gcc-4.3.patch 3283 RMD160 bb48b1a0de3101fdc74989efd997a33f57765430 SHA1 44baef27e8d2ff1c76402d351305b8c95de9c432 SHA256 9468cf97b56bbaf125bfb7de2b70b8b8b87ba9d5eb1acab272a5208669007d54
 DIST libtorrent-0.11.9.tar.gz 545210 RMD160 fb8de66d65791dab67c195356a98de7cf653d3c9 SHA1 d88e754d1c2ff7f8c5fb7544331264bd505870b8 SHA256 71f09218a7784b21ab53cdfcd8fa122da60352e5ca117fda7cd8d2763f908a08
 DIST libtorrent-0.12.0.tar.gz 583000 RMD160 22787944b19355d0d08c3bf7c0976463e8556959 SHA1 7ad7f9bd8883df112bbfb812e19bc1fad96ffaa0 SHA256 3287c9be61f9ec8ddab99f9b679bbf58610d024bce980307f88151a552ecd1e3
 EBUILD libtorrent-0.11.9.ebuild 1092 RMD160 da7b3481dc661adc564d9fe18b1af41bf9020ec0 SHA1 9d45afa155e37477e94dc9b8ff9d97e9f16a8260 SHA256 66270b7da8e7989c851b569e58f4a342d7080db6470be02998cb4c435120aabe
 EBUILD libtorrent-0.12.0.ebuild 1220 RMD160 b73750e28a433932f1748db15b11426da1b67057 SHA1 6bbd2b886a1d17c42857b25754cad99fd554822f SHA256 9892a81076b359b900e8e19ee4f9723cc7a1d5324a5e2c80ef648fe0c25b54b6
-MISC ChangeLog 16525 RMD160 d44ba4b0bd9333cff7724fb3eb98616d9028ada2 SHA1 64a7f77f3296478a899ee16ffba7553fe7044d10 SHA256 079a72048617ddb0b49860ef16dcba8cd56a66bbee2ef94ea9088121a2679a05
+MISC ChangeLog 16677 RMD160 5162ef2c037a1469832a15b1a553eeca4e146919 SHA1 bec4cb0230dbb5221d3a624a72ee5bf41f711bda SHA256 cfd5505d12d654d0ee3d6c9f11db7eda2d15e29de082d2780459c8d27a87bcc4
 MISC metadata.xml 270 RMD160 9a699cc703b75fb74e7ace60db4a79cde05963cc SHA1 bf0d12318b4d7546d73a60285f72ad565fa06e84 SHA256 77331009c22893efde4e7135bb175b4d81249af695461da6be9097bfeba816d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgMpcoACgkQAiZjviIA2Xg82gCeNPnyhmmKuB0kNMLMTk0jyem4
-bRwAn03hWqkDc9g3LHnRsQpW0PEg5iZS
-=d8tO
+iEYEARECAAYFAkgUd4MACgkQAiZjviIA2Xha8QCfeu1wpuCl9oH8/4NFBAIW2evY
+inkAnje89wU/lVnftvSIl+PjS16mBMTk
+=pDbS
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libtorrent/files/libtorrent-0.11.9+gcc-4.3.patch b/net-libs/libtorrent/files/libtorrent-0.11.9+gcc-4.3.patch
index d7343c81ab03..1090cf550149 100644
--- a/net-libs/libtorrent/files/libtorrent-0.11.9+gcc-4.3.patch
+++ b/net-libs/libtorrent/files/libtorrent-0.11.9+gcc-4.3.patch
@@ -1,15 +1,28 @@
---- libtorrent-0.11.9.orig/src/data/chunk.cc
-+++ libtorrent-0.11.9/src/data/chunk.cc
-@@ -38,6 +38,7 @@
+diff -Nurp libtorrent-0.12.0.old/rak/functional.h libtorrent-0.12.0/rak/functional.h
+--- libtorrent-0.12.0.old/rak/functional.h	2008-03-09 15:59:49.000000000 +0100
++++ libtorrent-0.12.0/rak/functional.h	2008-03-09 16:00:11.000000000 +0100
+@@ -37,6 +37,7 @@
+ #ifndef RAK_FUNCTIONAL_H
+ #define RAK_FUNCTIONAL_H
  
- #include <algorithm>
++#include <cstddef>
  #include <functional>
-+#include <cstring>
  
- #include "torrent/exceptions.h"
+ namespace rak {
+diff -Nurp libtorrent-0.12.0.old/src/data/chunk.cc libtorrent-0.12.0/src/data/chunk.cc
+--- libtorrent-0.12.0.old/src/data/chunk.cc	2008-03-09 15:59:49.000000000 +0100
++++ libtorrent-0.12.0/src/data/chunk.cc	2008-03-09 16:00:11.000000000 +0100
+@@ -36,6 +36,7 @@
+ 
+ #include "config.h"
  
---- libtorrent-0.11.9.orig/src/data/chunk_list.h
-+++ libtorrent-0.11.9/src/data/chunk_list.h
++#include <cstring>
+ #include <algorithm>
+ #include <functional>
+ 
+diff -Nurp libtorrent-0.12.0.old/src/data/chunk_list.h libtorrent-0.12.0/src/data/chunk_list.h
+--- libtorrent-0.12.0.old/src/data/chunk_list.h	2008-03-09 15:59:49.000000000 +0100
++++ libtorrent-0.12.0/src/data/chunk_list.h	2008-03-09 16:00:11.000000000 +0100
 @@ -38,6 +38,7 @@
  #define LIBTORRENT_DATA_CHUNK_LIST_H
  
@@ -18,19 +31,32 @@
  #include <rak/error_number.h>
  #include <rak/functional.h>
  
---- libtorrent-0.11.9.orig/src/net/address_list.cc
-+++ libtorrent-0.11.9/src/net/address_list.cc
-@@ -38,6 +38,8 @@
+diff -Nurp libtorrent-0.12.0.old/src/net/address_list.cc libtorrent-0.12.0/src/net/address_list.cc
+--- libtorrent-0.12.0.old/src/net/address_list.cc	2008-03-09 15:59:49.000000000 +0100
++++ libtorrent-0.12.0/src/net/address_list.cc	2008-03-09 16:00:11.000000000 +0100
+@@ -36,6 +36,8 @@
  
- #include <rak/functional.h>
+ #include "config.h"
  
 +#include <algorithm>
 +
+ #include <rak/functional.h>
+ 
  #include "download/download_info.h"  // for SocketAddressCompact
+diff -Nurp libtorrent-0.12.0.old/src/torrent/data/file_list_iterator.h libtorrent-0.12.0/src/torrent/data/file_list_iterator.h
+--- libtorrent-0.12.0.old/src/torrent/data/file_list_iterator.h	2008-03-09 15:59:49.000000000 +0100
++++ libtorrent-0.12.0/src/torrent/data/file_list_iterator.h	2008-03-09 16:00:11.000000000 +0100
+@@ -37,6 +37,7 @@
+ #ifndef LIBTORRENT_FILE_LIST_ITERATOR_H
+ #define LIBTORRENT_FILE_LIST_ITERATOR_H
  
- #include "address_list.h"
---- libtorrent-0.11.9.orig/src/torrent/exceptions.cc
-+++ libtorrent-0.11.9/src/torrent/exceptions.cc
++#include <cstdlib>
+ #include <torrent/common.h>
+ #include <torrent/data/file_list.h>
+ 
+diff -Nurp libtorrent-0.12.0.old/src/torrent/exceptions.cc libtorrent-0.12.0/src/torrent/exceptions.cc
+--- libtorrent-0.12.0.old/src/torrent/exceptions.cc	2008-03-09 15:59:49.000000000 +0100
++++ libtorrent-0.12.0/src/torrent/exceptions.cc	2008-03-09 16:00:11.000000000 +0100
 @@ -37,6 +37,7 @@
  #include "config.h"
  
@@ -39,34 +65,25 @@
  
  #include "exceptions.h"
  
---- libtorrent-0.11.9.orig/src/torrent/data/file_list_iterator.h
-+++ libtorrent-0.11.9/src/torrent/data/file_list_iterator.h
-@@ -40,6 +40,8 @@
+diff -Nurp libtorrent-0.12.0.old/src/torrent/tracker_list.h libtorrent-0.12.0/src/torrent/tracker_list.h
+--- libtorrent-0.12.0.old/src/torrent/tracker_list.h	2008-03-09 15:59:49.000000000 +0100
++++ libtorrent-0.12.0/src/torrent/tracker_list.h	2008-03-09 16:01:01.000000000 +0100
+@@ -38,6 +38,7 @@
+ #define LIBTORRENT_TRACKER_LIST_H
+ 
+ #include <algorithm>
++#include <string>
+ #include <vector>
  #include <torrent/common.h>
- #include <torrent/data/file_list.h>
  
-+#include <cstdlib>
-+
- namespace torrent {
+diff -Nurp libtorrent-0.12.0.old/src/utils/diffie_hellman.cc libtorrent-0.12.0/src/utils/diffie_hellman.cc
+--- libtorrent-0.12.0.old/src/utils/diffie_hellman.cc	2008-03-09 15:59:49.000000000 +0100
++++ libtorrent-0.12.0/src/utils/diffie_hellman.cc	2008-03-09 16:00:11.000000000 +0100
+@@ -36,6 +36,7 @@
  
- class File;
---- libtorrent-0.11.9.orig/src/utils/diffie_hellman.cc
-+++ libtorrent-0.11.9/src/utils/diffie_hellman.cc
-@@ -37,6 +37,7 @@
  #include "config.h"
  
- #include <string>
 +#include <cstring>
+ #include <string>
  
  #ifdef USE_OPENSSL
- #include <openssl/bn.h>
---- libtorrent-0.11.9.orig/rak/functional.h
-+++ libtorrent-0.11.9/rak/functional.h
-@@ -37,6 +37,7 @@
- #ifndef RAK_FUNCTIONAL_H
- #define RAK_FUNCTIONAL_H
- 
-+#include <cstdlib>
- #include <functional>
- 
- namespace rak {