64-bit patch

svn path=/maintainer/; revision=35

4 files changed, 205 insertions, 15 deletions

diff --git a/dev-python/python-libtorrent/ChangeLog b/dev-python/python-libtorrent/ChangeLog
index eafca56..0511a10 100644
--- a/dev-python/python-libtorrent/ChangeLog
+++ b/dev-python/python-libtorrent/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-python/python-libtorrent
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Feb 2007; Daniel Gryniewicz <dang@gentoo.org>
+  python-libtorrent-0.4.0.ebuild,
+  +files/python-libtorrent-0.4.0-64-bit.patch:
+  64-bit patch
+
   28 Dec 2006; Daniel Gryniewicz <dang@gentoo.org>
   python-libtorrent-0.3.0.ebuild, +python-libtorrent-0.4.0.ebuild:
   Bump to 0.4.0
diff --git a/dev-python/python-libtorrent/Manifest b/dev-python/python-libtorrent/Manifest
index 45c4bba..aec2066 100644
--- a/dev-python/python-libtorrent/Manifest
+++ b/dev-python/python-libtorrent/Manifest
@@ -1,21 +1,21 @@
-AUX python-libtorrent-0.4.0-64-bit.patch 5459 RMD160 f3400d376a2b795185a0d4e7733b31027a20bc15 SHA1 42a9766a11152f8ef1d97e350b2d9012fb0c51f0 SHA256 b462bae562b967b4c34f4b790e76f92bada55031126d4c6897c8d2aac9e27444
-MD5 3cbf19cefff996129f0359c850f39ec5 files/python-libtorrent-0.4.0-64-bit.patch 5459
-RMD160 f3400d376a2b795185a0d4e7733b31027a20bc15 files/python-libtorrent-0.4.0-64-bit.patch 5459
-SHA256 b462bae562b967b4c34f4b790e76f92bada55031126d4c6897c8d2aac9e27444 files/python-libtorrent-0.4.0-64-bit.patch 5459
+AUX python-libtorrent-0.4.0-64-bit.patch 6880 RMD160 192bb7ba9b15b1d63cbbf624509d67b6c4b2e08c SHA1 1cce3f885517add12839ca01f9668a9784821752 SHA256 42a92c9e442d8199c6fed4d316aa9760ebd7a325c8216e22b21b3c6b46dfb262
+MD5 02b0ceeed1cf9bc23f24bc9707f7ed90 files/python-libtorrent-0.4.0-64-bit.patch 6880
+RMD160 192bb7ba9b15b1d63cbbf624509d67b6c4b2e08c files/python-libtorrent-0.4.0-64-bit.patch 6880
+SHA256 42a92c9e442d8199c6fed4d316aa9760ebd7a325c8216e22b21b3c6b46dfb262 files/python-libtorrent-0.4.0-64-bit.patch 6880
 DIST python-libtorrent_0.3.0.tar.gz 294960 RMD160 e45e8fd8cc8c360aec04aa3babf4a688555a95af SHA1 e287df1021ca838ed345d9222becdfe93cf6b4a0 SHA256 18e960a2e10943524b87402c0204f6aea567ad4f2adf5cf460abdbddd5810b97
 DIST python-libtorrent_0.4.0.tar.gz 344507 RMD160 ebbf5dbba7261575ff6bd1ea05eb98787b03ee81 SHA1 61d89637b09745e8dd1a6fdfceaf3983c2ded8ea SHA256 6df6a913b4d206b133bd0a80880c3f1830ecfcfc0b5bb6984b55ab2a61e8cc81
 EBUILD python-libtorrent-0.3.0.ebuild 683 RMD160 52432f72196f50086f4816bd8cc9c891d130a4f2 SHA1 35818f7c8686e0c9b2049166c334c777b0f5195c SHA256 5ddf5ac7ca440449c460c03a14f3a67a45846d511e3c28453e64a71a0fece398
 MD5 9e5fec632dfd326011ad8323951a3b4f python-libtorrent-0.3.0.ebuild 683
 RMD160 52432f72196f50086f4816bd8cc9c891d130a4f2 python-libtorrent-0.3.0.ebuild 683
 SHA256 5ddf5ac7ca440449c460c03a14f3a67a45846d511e3c28453e64a71a0fece398 python-libtorrent-0.3.0.ebuild 683
-EBUILD python-libtorrent-0.4.0.ebuild 728 RMD160 d406f4a7b709551e045b7474de9f44675853e780 SHA1 4d4ba3b828f7be88c6d040632ed738642df808e7 SHA256 147e865ab7a7e23316fa00b65f793cb94e7ecb457cf5571558c53383d76db1ab
-MD5 f699d2d7914490ef23bcc7100d2cdec1 python-libtorrent-0.4.0.ebuild 728
-RMD160 d406f4a7b709551e045b7474de9f44675853e780 python-libtorrent-0.4.0.ebuild 728
-SHA256 147e865ab7a7e23316fa00b65f793cb94e7ecb457cf5571558c53383d76db1ab python-libtorrent-0.4.0.ebuild 728
-MISC ChangeLog 264 RMD160 fe17154d032d82f26c656017d1e6525563e92303 SHA1 3ec1529168dd0a5a2f8d90ed8c7543eccca200e4 SHA256 c71d40d03138a04dbc96fb0c3a2bef4463c91a0dbeeaad039aa2b3259a70911a
-MD5 c59b41791e96b9bd23a1a00fad142e2d ChangeLog 264
-RMD160 fe17154d032d82f26c656017d1e6525563e92303 ChangeLog 264
-SHA256 c71d40d03138a04dbc96fb0c3a2bef4463c91a0dbeeaad039aa2b3259a70911a ChangeLog 264
+EBUILD python-libtorrent-0.4.0.ebuild 723 RMD160 266d6db0d5386e68dc3c17c17a43e17d832dacf2 SHA1 956438b597bde5e738d84a5195974a94bb1d26f6 SHA256 46056217c74e71db1ab2c3fb1a5e1b9a0679f407b68ff048cf374abd1173551a
+MD5 f832e80c6fca8991cb8495b89069cb33 python-libtorrent-0.4.0.ebuild 723
+RMD160 266d6db0d5386e68dc3c17c17a43e17d832dacf2 python-libtorrent-0.4.0.ebuild 723
+SHA256 46056217c74e71db1ab2c3fb1a5e1b9a0679f407b68ff048cf374abd1173551a python-libtorrent-0.4.0.ebuild 723
+MISC ChangeLog 412 RMD160 c58a14541de5ef2f671ceb054087d73e19cda82f SHA1 e48cbb2c5d6a3de7e80c176a75daff98f2c52ed2 SHA256 fc8142af232a51349afa0dd6bb0e9d0afe24db295c824215a253eeb7a88efced
+MD5 fbe13ed7c9d67b40f811bef3e7cca09b ChangeLog 412
+RMD160 c58a14541de5ef2f671ceb054087d73e19cda82f ChangeLog 412
+SHA256 fc8142af232a51349afa0dd6bb0e9d0afe24db295c824215a253eeb7a88efced ChangeLog 412
 MD5 9bd329ba85d83fa0224c0be40aa89f0b files/digest-python-libtorrent-0.3.0 271
 RMD160 e70c71725c1b84d50e21f40a9aed735a309fc583 files/digest-python-libtorrent-0.3.0 271
 SHA256 35fa13d117d3e55863982d624cecd21292cf8b5754848f1bef47abf04bfa5514 files/digest-python-libtorrent-0.3.0 271
diff --git a/dev-python/python-libtorrent/files/python-libtorrent-0.4.0-64-bit.patch b/dev-python/python-libtorrent/files/python-libtorrent-0.4.0-64-bit.patch
new file mode 100644
index 0000000..8e45537
--- /dev/null
+++ b/dev-python/python-libtorrent/files/python-libtorrent-0.4.0-64-bit.patch
@@ -0,0 +1,185 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN python-libtorrent.orig/python-libtorrent.cpp python-libtorrent/python-libtorrent.cpp
+--- python-libtorrent.orig/python-libtorrent.cpp	2006-11-28 09:21:59.000000000 -0500
++++ python-libtorrent/python-libtorrent.cpp	2007-02-22 20:54:49.000000000 -0500
+@@ -306,7 +306,7 @@ static PyObject *torrent_init(PyObject *
+ 	char *clientID, *userAgent;
+ 	pythonLong v1,v2,v3,v4;
+ 
+-	PyArg_ParseTuple(args, "siiiis", &clientID, &v1, &v2, &v3, &v4, &userAgent);
++	PyArg_ParseTuple(args, "slllls", &clientID, &v1, &v2, &v3, &v4, &userAgent);
+ 
+ 	settings   		= new session_settings;
+ 	ses        		= new session(libtorrent::fingerprint(clientID, v1, v2, v3, v4));
+@@ -418,7 +418,7 @@ static PyObject *torrent_quit(PyObject *
+ static PyObject *torrent_setMaxHalfOpenConnections(PyObject *self, PyObject *args)
+ {
+ 	pythonLong arg;
+-	PyArg_ParseTuple(args, "i", &arg);
++	PyArg_ParseTuple(args, "l", &arg);
+ 
+ 	ses->set_max_half_open_connections(arg);
+ 
+@@ -428,7 +428,7 @@ static PyObject *torrent_setMaxHalfOpenC
+ static PyObject *torrent_setDownloadRateLimit(PyObject *self, PyObject *args)
+ {
+ 	pythonLong arg;
+-	PyArg_ParseTuple(args, "i", &arg);
++	PyArg_ParseTuple(args, "l", &arg);
+ printf("Capping download to %d bytes per second\r\n", (int)arg);
+ 	ses->set_download_rate_limit(arg);
+ 
+@@ -438,7 +438,7 @@ printf("Capping download to %d bytes per
+ static PyObject *torrent_setUploadRateLimit(PyObject *self, PyObject *args)
+ {
+ 	pythonLong arg;
+-	PyArg_ParseTuple(args, "i", &arg);
++	PyArg_ParseTuple(args, "l", &arg);
+ printf("Capping upload to %d bytes per second\r\n", (int)arg);
+ 	ses->set_upload_rate_limit(arg);
+ 
+@@ -448,7 +448,7 @@ printf("Capping upload to %d bytes per s
+ static PyObject *torrent_setListenOn(PyObject *self, PyObject *args)
+ {
+ 	pythonLong portStart, portEnd;
+-	PyArg_ParseTuple(args, "ii", &portStart, &portEnd);
++	PyArg_ParseTuple(args, "ll", &portStart, &portEnd);
+ 
+ 	ses->listen_on(std::make_pair(portStart, portEnd), "");
+ 
+@@ -459,18 +459,18 @@ static PyObject *torrent_isListening(PyO
+ {
+ 	long ret = (ses->is_listening() != 0);
+ 
+-	return Py_BuildValue("i", ret);
++	return Py_BuildValue("l", ret);
+ }
+ 
+ static PyObject *torrent_listeningPort(PyObject *self, PyObject *args)
+ {
+-	return Py_BuildValue("i", (pythonLong)ses->listen_port());
++	return Py_BuildValue("h", (pythonLong)ses->listen_port());
+ }
+ 
+ static PyObject *torrent_setMaxUploads(PyObject *self, PyObject *args)
+ {
+ 	pythonLong max_up;
+-	PyArg_ParseTuple(args, "i", &max_up);
++	PyArg_ParseTuple(args, "l", &max_up);
+ 
+ 	ses->set_max_uploads(max_up);
+ 
+@@ -480,7 +480,7 @@ static PyObject *torrent_setMaxUploads(P
+ static PyObject *torrent_setMaxConnections(PyObject *self, PyObject *args)
+ {
+ 	pythonLong max_conn;
+-	PyArg_ParseTuple(args, "i", &max_conn);
++	PyArg_ParseTuple(args, "l", &max_conn);
+ 
+ //	printf("Setting max connections: %d\r\n", max_conn);
+ 	ses->set_max_connections(max_conn);
+@@ -492,13 +492,13 @@ static PyObject *torrent_addTorrent(PyOb
+ {
+ 	const char *name, *saveDir;
+ 	pythonLong compact;
+-	PyArg_ParseTuple(args, "ssi", &name, &saveDir, &compact);
++	PyArg_ParseTuple(args, "ssl", &name, &saveDir, &compact);
+ 
+ 	path saveDir_2	(saveDir, empty_name_check);
+ 
+ 	try
+ 	{
+-		return Py_BuildValue("i", internal_add_torrent(name, 0, compact, saveDir_2));
++		return Py_BuildValue("l", internal_add_torrent(name, 0, compact, saveDir_2));
+ 	}
+ 	catch (invalid_encoding&)
+ 	{
+@@ -521,7 +521,7 @@ static PyObject *torrent_addTorrent(PyOb
+ static PyObject *torrent_removeTorrent(PyObject *self, PyObject *args)
+ {
+ 	pythonLong uniqueID;
+-	PyArg_ParseTuple(args, "i", &uniqueID);
++	PyArg_ParseTuple(args, "l", &uniqueID);
+ 	long index = get_index_from_unique(uniqueID);
+ 
+ 	internal_remove_torrent(index);
+@@ -537,7 +537,7 @@ static PyObject *torrent_getNumTorrents(
+ static PyObject *torrent_reannounce(PyObject *self, PyObject *args)
+ {
+ 	pythonLong uniqueID;
+-	PyArg_ParseTuple(args, "i", &uniqueID);
++	PyArg_ParseTuple(args, "l", &uniqueID);
+ 	long index = get_index_from_unique(uniqueID);
+ 
+ 	handles->at(index).force_reannounce();
+@@ -548,7 +548,7 @@ static PyObject *torrent_reannounce(PyOb
+ static PyObject *torrent_pause(PyObject *self, PyObject *args)
+ {
+ 	pythonLong uniqueID;
+-	PyArg_ParseTuple(args, "i", &uniqueID);
++	PyArg_ParseTuple(args, "l", &uniqueID);
+ 	long index = get_index_from_unique(uniqueID);
+ 
+ 	handles->at(index).pause();
+@@ -559,7 +559,7 @@ static PyObject *torrent_pause(PyObject 
+ static PyObject *torrent_resume(PyObject *self, PyObject *args)
+ {
+ 	pythonLong uniqueID;
+-	PyArg_ParseTuple(args, "i", &uniqueID);
++	PyArg_ParseTuple(args, "l", &uniqueID);
+ 	long index = get_index_from_unique(uniqueID);
+ 
+ 	handles->at(index).resume();
+@@ -570,7 +570,7 @@ static PyObject *torrent_resume(PyObject
+ static PyObject *torrent_getName(PyObject *self, PyObject *args)
+ {
+ 	pythonLong uniqueID;
+-	PyArg_ParseTuple(args, "i", &uniqueID);
++	PyArg_ParseTuple(args, "l", &uniqueID);
+ 	long index = get_index_from_unique(uniqueID);
+ 
+ 	return Py_BuildValue("s", handles->at(index).get_torrent_info().name().c_str());
+@@ -579,7 +579,7 @@ static PyObject *torrent_getName(PyObjec
+ static PyObject *torrent_getState(PyObject *self, PyObject *args)
+ {
+ 	pythonLong uniqueID;
+-	PyArg_ParseTuple(args, "i", &uniqueID);
++	PyArg_ParseTuple(args, "l", &uniqueID);
+ 	long index = get_index_from_unique(uniqueID);
+ 
+ 	torrent_status			 s = handles->at(index).status();
+@@ -773,7 +773,7 @@ static PyObject *torrent_getSessionInfo(
+ static PyObject *torrent_getPeerInfo(PyObject *self, PyObject *args)
+ {
+ 	pythonLong uniqueID;
+-	PyArg_ParseTuple(args, "i", &uniqueID);
++	PyArg_ParseTuple(args, "l", &uniqueID);
+ 	long index = get_index_from_unique(uniqueID);
+ 
+ 	std::vector<peer_info> peers;
+@@ -824,7 +824,7 @@ static PyObject *torrent_getPeerInfo(PyO
+ static PyObject *torrent_getFileInfo(PyObject *self, PyObject *args)
+ {
+ 	pythonLong uniqueID;
+-	PyArg_ParseTuple(args, "i", &uniqueID);
++	PyArg_ParseTuple(args, "l", &uniqueID);
+ 	long index = get_index_from_unique(uniqueID);
+ 
+ 	std::vector<PyObject *> tempFiles;
+@@ -872,7 +872,7 @@ static PyObject *torrent_setFilterOut(Py
+ {
+ 	pythonLong uniqueID;
+ 	PyObject *filterOutObject;
+-	PyArg_ParseTuple(args, "iO", &uniqueID, &filterOutObject);
++	PyArg_ParseTuple(args, "lO", &uniqueID, &filterOutObject);
+ 	long index = get_index_from_unique(uniqueID);
+ 
+ 	long numFiles = handles->at(index).get_torrent_info().num_files();
+@@ -979,7 +979,7 @@ static PyObject *torrent_createTorrent(P
+ {
+ 	char *destination, *comment, *creator_str, *input, *trackers;
+ 	pythonLong piece_size;
+-	PyArg_ParseTuple(args, "ssssis", &destination, &input, &trackers, &comment, &piece_size, 													&creator_str);
++	PyArg_ParseTuple(args, "ssssls", &destination, &input, &trackers, &comment, &piece_size, 													&creator_str);
+ 
+ 	piece_size = piece_size * 1024;
+ 
diff --git a/dev-python/python-libtorrent/python-libtorrent-0.4.0.ebuild b/dev-python/python-libtorrent/python-libtorrent-0.4.0.ebuild
index 919ef1d..153bd45 100644
--- a/dev-python/python-libtorrent/python-libtorrent-0.4.0.ebuild
+++ b/dev-python/python-libtorrent/python-libtorrent-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,7 +6,7 @@ inherit eutils distutils
 
 DESCRIPTION="GTK Bittorrent Client"
 HOMEPAGE="http://deluge-torrent.org"
-SRC_URI="http://deluge.mynimalistic.net/downloads/${PN}_${PV}.tar.gz"
+SRC_URI="http://deluge-torrent.org/downloads/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"