Revert that one

svn path=/sunrise/; revision=2729

5 files changed, 11 insertions, 55 deletions

diff --git a/net-p2p/deluge/ChangeLog b/net-p2p/deluge/ChangeLog
index d3570388a..71c62ce5b 100644
--- a/net-p2p/deluge/ChangeLog
+++ b/net-p2p/deluge/ChangeLog
@@ -2,10 +2,6 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  11 Jan 2007; Markus Ullmann <jokey@gentoo.org> -deluge-0.4.1.ebuild,
-  +deluge-0.4.1-r1.ebuild, +files/deluge-0.4.1-64bit.patch:
-  Add 64bit support, patch contributed by muczy on irc
-
   04 Jan 2007; Raul Porcel (armin76) <armin76@gmail.com>
   deluge-0.4.1.ebuild:
   Fix SRC_URI
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 876e318a9..8d5a234dd 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,20 +1,16 @@
-AUX deluge-0.4.1-64bit.patch 815 RMD160 cfc7e33031eaace6d2503f109a030b17563c8f06 SHA1 3ea56cdbfe852bfb5389c605c60889c9a9a4690d SHA256 2b0bac5727c27f992de7c89f90afc2479f855bae76c4ec7ec571994e2e155380
-MD5 6e4d715070fc6ffbfc6a017925d36951 files/deluge-0.4.1-64bit.patch 815
-RMD160 cfc7e33031eaace6d2503f109a030b17563c8f06 files/deluge-0.4.1-64bit.patch 815
-SHA256 2b0bac5727c27f992de7c89f90afc2479f855bae76c4ec7ec571994e2e155380 files/deluge-0.4.1-64bit.patch 815
 DIST deluge-0.4.1.tar.gz 130209 RMD160 5d1a89b2e275d4f8fdba591979038d7993e8d29b SHA1 648eb77b2e644b1c881b9038977ef13f1464dbda SHA256 b1569479d48350126d0e77384cd3a0dc4bd78475d575cdbfcdcefec471e83354
-EBUILD deluge-0.4.1-r1.ebuild 1229 RMD160 1b014eff4aec2b546a4e1db10a78fa09ea7e01f0 SHA1 ca37c144efb2076693a09f6c4fdc6600b158757e SHA256 b31f31082b00ddd13ac44004aee046ba2371b7eb9c976a28416abfb459f2cd4d
-MD5 b92fe62ae0a4400520b93c0de73ad35c deluge-0.4.1-r1.ebuild 1229
-RMD160 1b014eff4aec2b546a4e1db10a78fa09ea7e01f0 deluge-0.4.1-r1.ebuild 1229
-SHA256 b31f31082b00ddd13ac44004aee046ba2371b7eb9c976a28416abfb459f2cd4d deluge-0.4.1-r1.ebuild 1229
-MISC ChangeLog 3021 RMD160 5a5e4e8105374c267d0d566fa9eb853faa95a495 SHA1 ec666ac5d82c8c5c8d7a713c7bf5ce8fbbabb306 SHA256 80f466775938da3a7cd6e30081cf35e0028f598a2caf81cdeb661d3eafaafbe2
-MD5 3146350873b80435684efc4ec68b6e97 ChangeLog 3021
-RMD160 5a5e4e8105374c267d0d566fa9eb853faa95a495 ChangeLog 3021
-SHA256 80f466775938da3a7cd6e30081cf35e0028f598a2caf81cdeb661d3eafaafbe2 ChangeLog 3021
+EBUILD deluge-0.4.1.ebuild 1105 RMD160 a929482a72086de0707388222dda15ffd2173475 SHA1 288626b13c7af4125be63db251cc6fae521a9aa1 SHA256 bf4d9420750af4ec1926fdfa5a139bee44dd6962bb1a9e532d1cf03b6080a5b2
+MD5 2c55ada345c3096405587b47b813f508 deluge-0.4.1.ebuild 1105
+RMD160 a929482a72086de0707388222dda15ffd2173475 deluge-0.4.1.ebuild 1105
+SHA256 bf4d9420750af4ec1926fdfa5a139bee44dd6962bb1a9e532d1cf03b6080a5b2 deluge-0.4.1.ebuild 1105
+MISC ChangeLog 2834 RMD160 1d2c614433673138f643c3c5ee1380eec4c46935 SHA1 73afa060d15751ec9125f3cb36d39508c2f38956 SHA256 d708b2fbdf775ce11ce02d38d067b66be806430aeefefd357d9166fd065ed0eb
+MD5 4a6c83cc8562a0627f35f06389687097 ChangeLog 2834
+RMD160 1d2c614433673138f643c3c5ee1380eec4c46935 ChangeLog 2834
+SHA256 d708b2fbdf775ce11ce02d38d067b66be806430aeefefd357d9166fd065ed0eb ChangeLog 2834
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
-MD5 688e5d804fc2cee9924f68f246db92ae files/digest-deluge-0.4.1-r1 238
-RMD160 934864fc2db4be570220e7629d2a6876ab9e8995 files/digest-deluge-0.4.1-r1 238
-SHA256 3da7951b5282c289c3e836787e07370f0569928a4481b221fa5eea5b7a126b51 files/digest-deluge-0.4.1-r1 238
+MD5 688e5d804fc2cee9924f68f246db92ae files/digest-deluge-0.4.1 238
+RMD160 934864fc2db4be570220e7629d2a6876ab9e8995 files/digest-deluge-0.4.1 238
+SHA256 3da7951b5282c289c3e836787e07370f0569928a4481b221fa5eea5b7a126b51 files/digest-deluge-0.4.1 238
diff --git a/net-p2p/deluge/deluge-0.4.1-r1.ebuild b/net-p2p/deluge/deluge-0.4.1.ebuild
index 5ac0eb788..58e3ceb04 100644
--- a/net-p2p/deluge/deluge-0.4.1-r1.ebuild
+++ b/net-p2p/deluge/deluge-0.4.1.ebuild
@@ -21,13 +21,6 @@ DEPEND=">=dev-lang/python-2.3
 	gnome? ( dev-python/notify-python )"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-        unpack ${A}
-        cd "${S}"
-        
-        use amd64 && epatch "${FILESDIR}"/${P}-64bit.patch
-}
-
 src_install() {
 	python_version
 	insinto "/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}"
diff --git a/net-p2p/deluge/files/deluge-0.4.1-64bit.patch b/net-p2p/deluge/files/deluge-0.4.1-64bit.patch
deleted file mode 100644
index 10eacf02a..000000000
--- a/net-p2p/deluge/files/deluge-0.4.1-64bit.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- python-libtorrent.cpp	2006-11-28 15:21:59.000000000 +0100
-+++ python-libtorrent/python-libtorrent.cpp	2007-01-11 19:28:22.000000000 +0100
-@@ -139,19 +139,19 @@
- 
- void print_uniqueIDs()
- {
--//#ifdef AMD64
--//	for (unsigned long i = 0; i < uniqueIDs->size(); i++)
--//		printf("--uniqueIDs[%ld] = %ld\r\n", i, (*uniqueIDs)[i]);
--//#endif
-+#ifdef AMD64
-+	for (unsigned long i = 0; i < uniqueIDs->size(); i++)
-+		printf("--uniqueIDs[%ld] = %ld\r\n", i, (*uniqueIDs)[i]);
-+#endif
- }
- 
- long get_index_from_unique(long uniqueID)
- {
- 	assert(handles->size() == uniqueIDs->size());
- 
--//#ifdef AMD64
--//	printf("Request for uniqueID: %ld\r\n", uniqueID);
--//#endif
-+#ifdef AMD64
-+	printf("Request for uniqueID: %ld\r\n", uniqueID);
-+#endif
- 	print_uniqueIDs();
- 
- 	for (unsigned long i = 0; i < uniqueIDs->size(); i++)
diff --git a/net-p2p/deluge/files/digest-deluge-0.4.1-r1 b/net-p2p/deluge/files/digest-deluge-0.4.1
index a1d7ecb17..a1d7ecb17 100644
--- a/net-p2p/deluge/files/digest-deluge-0.4.1-r1
+++ b/net-p2p/deluge/files/digest-deluge-0.4.1