Add patch to fix building with GCC 4.3 (taken from Debian). Closes bug #212824.

Package-Manager: portage-2.1.5_rc5

4 files changed, 100 insertions, 4 deletions

diff --git a/net-libs/libtorrent/ChangeLog b/net-libs/libtorrent/ChangeLog
index 3a7ddb95c804..1e702ead097c 100644
--- a/net-libs/libtorrent/ChangeLog
+++ b/net-libs/libtorrent/ChangeLog
@@ -1,6 +1,11 @@
 # 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.111 2008/03/01 11:12:42 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.112 2008/04/21 14:33:39 flameeyes Exp $
+
+  21 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libtorrent-0.11.9+gcc-4.3.patch, libtorrent-0.12.0.ebuild:
+  Add patch to fix building with GCC 4.3 (taken from Debian). Closes bug
+  #212824.
 
 *libtorrent-0.12.0 (01 Mar 2008)
 
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index 7de0d68c929b..1b540fbda7db 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX libtorrent-0.11.9+gcc-4.3.patch 1653 RMD160 44d395c4fde2bd27f4126ac3b995750e3261d5fb SHA1 a6acd5944d62e370b25bb50a85eb31aa774a3840 SHA256 1efb3e90a11fd041f41de51cabcfedb0341b04ce93376125701b05f3b369cf3e
 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 1097 RMD160 1067714151f8f0d701c85c8890c8307033a28731 SHA1 8c6ae1d3865da1955072646fca95d9600ad41089 SHA256 195aa0a7d59def49b0ddc5ea2d3079f629758dada8c3c4ec99ccf2f91e49fbe6
-MISC ChangeLog 16316 RMD160 ae55597ccb84d2b40749dae920d08d09baf1ccaa SHA1 6f7251b0d2a7879996f98e28c4d77deb31cd3888 SHA256 bca3dbac52ff51b3decdd5c599470cac05e5ddb74d18cd985f18120605acae05
+EBUILD libtorrent-0.12.0.ebuild 1220 RMD160 b73750e28a433932f1748db15b11426da1b67057 SHA1 6bbd2b886a1d17c42857b25754cad99fd554822f SHA256 9892a81076b359b900e8e19ee4f9723cc7a1d5324a5e2c80ef648fe0c25b54b6
+MISC ChangeLog 16525 RMD160 d44ba4b0bd9333cff7724fb3eb98616d9028ada2 SHA1 64a7f77f3296478a899ee16ffba7553fe7044d10 SHA256 079a72048617ddb0b49860ef16dcba8cd56a66bbee2ef94ea9088121a2679a05
 MISC metadata.xml 270 RMD160 9a699cc703b75fb74e7ace60db4a79cde05963cc SHA1 bf0d12318b4d7546d73a60285f72ad565fa06e84 SHA256 77331009c22893efde4e7135bb175b4d81249af695461da6be9097bfeba816d0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgMpcoACgkQAiZjviIA2Xg82gCeNPnyhmmKuB0kNMLMTk0jyem4
+bRwAn03hWqkDc9g3LHnRsQpW0PEg5iZS
+=d8tO
+-----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
new file mode 100644
index 000000000000..d7343c81ab03
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-0.11.9+gcc-4.3.patch
@@ -0,0 +1,72 @@
+--- libtorrent-0.11.9.orig/src/data/chunk.cc
++++ libtorrent-0.11.9/src/data/chunk.cc
+@@ -38,6 +38,7 @@
+ 
+ #include <algorithm>
+ #include <functional>
++#include <cstring>
+ 
+ #include "torrent/exceptions.h"
+ 
+--- libtorrent-0.11.9.orig/src/data/chunk_list.h
++++ libtorrent-0.11.9/src/data/chunk_list.h
+@@ -38,6 +38,7 @@
+ #define LIBTORRENT_DATA_CHUNK_LIST_H
+ 
+ #include <vector>
++#include <string>
+ #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 @@
+ 
+ #include <rak/functional.h>
+ 
++#include <algorithm>
++
+ #include "download/download_info.h"  // for SocketAddressCompact
+ 
+ #include "address_list.h"
+--- libtorrent-0.11.9.orig/src/torrent/exceptions.cc
++++ libtorrent-0.11.9/src/torrent/exceptions.cc
+@@ -37,6 +37,7 @@
+ #include "config.h"
+ 
+ #include <cerrno>
++#include <cstring>
+ 
+ #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 @@
+ #include <torrent/common.h>
+ #include <torrent/data/file_list.h>
+ 
++#include <cstdlib>
++
+ namespace torrent {
+ 
+ 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>
+ 
+ #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 {
diff --git a/net-libs/libtorrent/libtorrent-0.12.0.ebuild b/net-libs/libtorrent/libtorrent-0.12.0.ebuild
index 5cf019a725b7..0bdcea74eae2 100644
--- a/net-libs/libtorrent/libtorrent-0.12.0.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.12.0.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-libs/libtorrent/libtorrent-0.12.0.ebuild,v 1.1 2008/03/01 11:12:42 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/libtorrent-0.12.0.ebuild,v 1.2 2008/04/21 14:33:39 flameeyes Exp $
 
 inherit eutils toolchain-funcs flag-o-matic libtool
 
@@ -18,6 +18,14 @@ RDEPEND=">=dev-libs/libsigc++-2"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.11"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Patch taken from Debian.
+	epatch "${FILESDIR}/${PN}-0.11.9+gcc-4.3.patch"
+}
+
 src_compile() {
 	replace-flags -Os -O2