Added upstream patch to 0.7.0. Removed old stale patches.

(Portage version: 2.0.51.22-r2)

7 files changed, 34 insertions, 79 deletions

diff --git a/net-libs/libtorrent/ChangeLog b/net-libs/libtorrent/ChangeLog
index 35aeae34a0dc..ecba8144a4a2 100644
--- a/net-libs/libtorrent/ChangeLog
+++ b/net-libs/libtorrent/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/libtorrent
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.16 2005/07/19 21:18:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/ChangeLog,v 1.17 2005/07/27 07:54:34 flameeyes Exp $
+
+*libtorrent-0.7.0-r1 (27 Jul 2005)
+
+  27 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/libtorrent-0.6.2-fbsd.patch, -files/libtorrent-0.6.2-warns.patch,
+  +files/libtorrent-0.7.0-1.diff, -libtorrent-0.7.0.ebuild,
+  +libtorrent-0.7.0-r1.ebuild:
+  Added upstream patch to 0.7.0. Removed old stale patches.
 
 *libtorrent-0.7.0 (19 Jul 2005)
 
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index db73125cb439..809d0133ea61 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b59f615ff4e1c464f88d1667a66f6b5d metadata.xml 224
 MD5 295305d0012f84eab0ee9f46224d1cc7 libtorrent-0.6.4.ebuild 928
 MD5 b9c90950ad788c88bff449d9054879da libtorrent-0.6.5.ebuild 830
@@ -8,20 +5,12 @@ MD5 2c86535c6152637aea8ee02fa8c52e14 ChangeLog 3346
 MD5 58d41e282376808aba59ec326eeae34c libtorrent-0.6.6.ebuild 830
 MD5 f205658767263168b2cc47235c1aea80 libtorrent-0.6.7.ebuild 830
 MD5 e976800b4538efa7952cb9535fcff7ad libtorrent-0.6.7-r1.ebuild 926
-MD5 230fb195f8b88445bf9d5232162370d8 libtorrent-0.7.0.ebuild 923
-MD5 335ec65aa07b3ccf5efa7a7bc06ff4a5 files/libtorrent-0.6.2-fbsd.patch 1305
-MD5 fa7178b92b0fe229d3b56215dff10599 files/libtorrent-0.6.2-warns.patch 1166
+MD5 32f88ec7cbc320e2d1e4f2d6e7c1d51e libtorrent-0.7.0-r1.ebuild 1035
 MD5 bd8c220c5ca9e041d6702c2c6b3dd883 files/libtorrent-0.6.3-fbsd.patch 821
 MD5 da473a11734fc08492c4ecdb2ffe34cc files/digest-libtorrent-0.6.4 68
 MD5 97b33bdaf7e3f4491def6f86f2e3f986 files/digest-libtorrent-0.6.5 68
 MD5 8b387d5490785db7d0ac8bbfab60683c files/digest-libtorrent-0.6.6 68
 MD5 ba45569f9f0f9fb2d667c2b61e824d3f files/digest-libtorrent-0.6.7 68
 MD5 ba45569f9f0f9fb2d667c2b61e824d3f files/digest-libtorrent-0.6.7-r1 68
-MD5 b6bdcc98c0629e31fa94fb37e01a3926 files/digest-libtorrent-0.7.0 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC3W5Wj5H05b2HAEkRAnYpAJ9+Se3CFP58nKkS3LEAdBK2FS0GqgCfRNHi
-8mqJ8Fn480E23XrMB8zlfP8=
-=tOx6
------END PGP SIGNATURE-----
+MD5 78f5b0b99807bf88fcc027062fd2572d files/libtorrent-0.7.0-1.diff 579
+MD5 b6bdcc98c0629e31fa94fb37e01a3926 files/digest-libtorrent-0.7.0-r1 68
diff --git a/net-libs/libtorrent/files/digest-libtorrent-0.7.0 b/net-libs/libtorrent/files/digest-libtorrent-0.7.0-r1
index c6eeb32c2fca..c6eeb32c2fca 100644
--- a/net-libs/libtorrent/files/digest-libtorrent-0.7.0
+++ b/net-libs/libtorrent/files/digest-libtorrent-0.7.0-r1
diff --git a/net-libs/libtorrent/files/libtorrent-0.6.2-fbsd.patch b/net-libs/libtorrent/files/libtorrent-0.6.2-fbsd.patch
deleted file mode 100644
index e3929feb6843..000000000000
--- a/net-libs/libtorrent/files/libtorrent-0.6.2-fbsd.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur libtorrent-0.6.2/configure.ac libtorrent-0.6.2-fbsd/configure.ac
---- libtorrent-0.6.2/configure.ac	2005-04-27 20:38:53.000000000 +0200
-+++ libtorrent-0.6.2-fbsd/configure.ac	2005-05-25 13:41:39.581095808 +0200
-@@ -71,6 +71,8 @@
- 
- AC_DEFINE(HAVE_CONFIG_H, 1, true if config.h was included)
- 
-+AC_CHECK_HEADERS([malloc.h])
-+
- AC_OUTPUT([
- 	libtorrent.pc
- 	Makefile
-Only in libtorrent-0.6.2-fbsd/: configure.ac~
-diff -ur libtorrent-0.6.2/src/net/socket_fd.cc libtorrent-0.6.2-fbsd/src/net/socket_fd.cc
---- libtorrent-0.6.2/src/net/socket_fd.cc	2005-04-22 00:51:43.000000000 +0200
-+++ libtorrent-0.6.2-fbsd/src/net/socket_fd.cc	2005-05-25 13:21:56.969880040 +0200
-@@ -28,6 +28,7 @@
- #include <sys/socket.h>
- #include <arpa/inet.h>
- #include <netinet/in.h>
-+#include <netinet/in_systm.h>
- #include <netinet/ip.h>
- 
- #include "torrent/exceptions.h"
-diff -ur libtorrent-0.6.2/src/utils/sha_fast.cc libtorrent-0.6.2-fbsd/src/utils/sha_fast.cc
---- libtorrent-0.6.2/src/utils/sha_fast.cc	2005-04-14 14:47:42.000000000 +0200
-+++ libtorrent-0.6.2-fbsd/src/utils/sha_fast.cc	2005-05-25 13:39:46.289318776 +0200
-@@ -35,7 +35,10 @@
- 
- #include "config.h"
- 
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
-+#endif
-+
- #include <memory.h>
- #include "sha_fast.h"
- 
-Only in libtorrent-0.6.2-fbsd/src/utils: sha_fast.cc~
diff --git a/net-libs/libtorrent/files/libtorrent-0.6.2-warns.patch b/net-libs/libtorrent/files/libtorrent-0.6.2-warns.patch
deleted file mode 100644
index a87ac23cff64..000000000000
--- a/net-libs/libtorrent/files/libtorrent-0.6.2-warns.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -x '*~' -ur libtorrent-0.6.2/src/data/file.cc libtorrent-0.6.2-gcc4/src/data/file.cc
---- libtorrent-0.6.2/src/data/file.cc	2005-04-21 20:39:39.000000000 +0200
-+++ libtorrent-0.6.2-gcc4/src/data/file.cc	2005-05-30 00:08:45.358865976 +0200
-@@ -102,7 +102,7 @@
- 
-   if (((prot & MemoryChunk::prot_read) && !is_readable()) ||
-       ((prot & MemoryChunk::prot_write) && !is_writable())) {
--    int buf = get_size();
-+    off_t buf = get_size();
- 
-     throw internal_error(std::string((char*)buf, 4));
-     //    throw internal_error("File::get_chunk() permission denied");
-diff -x '*~' -ur libtorrent-0.6.2/src/data/memory_chunk.cc libtorrent-0.6.2-gcc4/src/data/memory_chunk.cc
---- libtorrent-0.6.2/src/data/memory_chunk.cc	2005-04-14 21:45:04.000000000 +0200
-+++ libtorrent-0.6.2-gcc4/src/data/memory_chunk.cc	2005-05-29 23:51:27.853590752 +0200
-@@ -53,7 +53,7 @@
-   if (page_align() >= m_pagesize)
-     throw internal_error("MemoryChunk::MemoryChunk(...) received an page alignment >= page size");
- 
--  if ((uint32_t)ptr % m_pagesize)
-+  if ((ptrdiff_t)ptr % m_pagesize)
-     throw internal_error("MemoryChunk::MemoryChunk(...) is not aligned to a page");
- }
- 
diff --git a/net-libs/libtorrent/files/libtorrent-0.7.0-1.diff b/net-libs/libtorrent/files/libtorrent-0.7.0-1.diff
new file mode 100644
index 000000000000..533f334ca6c8
--- /dev/null
+++ b/net-libs/libtorrent/files/libtorrent-0.7.0-1.diff
@@ -0,0 +1,13 @@
+Index: libtorrent-0.7.0-1/src/tracker/tracker_http.cc
+===================================================================
+--- libtorrent-0.7.0-1/src/tracker/tracker_http.cc	(revision 509)
++++ libtorrent-0.7.0-1/src/tracker/tracker_http.cc	(working copy)
+@@ -94,7 +94,7 @@
+   s << "&peer_id=";
+   escape_string(m_info->get_me()->get_id(), s);
+ 
+-  s << "&key=" << std::hex << std::setw(8) << m_info->get_key() << std::dec;
++  s << "&key=" << std::hex << std::setw(8) << std::setfill('0') << m_info->get_key() << std::dec;
+ 
+   if (!m_trackerId.empty()) {
+     s << "&trackerid=";
diff --git a/net-libs/libtorrent/libtorrent-0.7.0.ebuild b/net-libs/libtorrent/libtorrent-0.7.0-r1.ebuild
index c49f228a37e3..54dacceff5e1 100644
--- a/net-libs/libtorrent/libtorrent-0.7.0.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/libtorrent-0.7.0.ebuild,v 1.1 2005/07/19 21:18:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libtorrent/libtorrent-0.7.0-r1.ebuild,v 1.1 2005/07/27 07:54:34 flameeyes Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -18,6 +18,14 @@ RDEPEND=">=dev-libs/libsigc++-2"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.11"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Upstream patch for 0.7.0-1 version
+	epatch ${FILESDIR}/${P}-1.diff
+}
+
 src_compile() {
 	[[ $(tc-arch) = "x86" ]] && filter-flags -fomit-frame-pointer