Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-p2p
diff options
context:
space:
mode:
Diffstat (limited to 'net-p2p')
-rw-r--r--net-p2p/bittorrent/Manifest14
-rw-r--r--net-p2p/bittorrent/bittorrent-3.2.1.ebuild38
-rw-r--r--net-p2p/bittorrent/bittorrent-3.2.1b-r1.ebuild45
-rw-r--r--net-p2p/bittorrent/bittorrent-3.2.1b-r2.ebuild50
-rw-r--r--net-p2p/bittorrent/bittorrent-3.2.1b-r3.ebuild58
-rw-r--r--net-p2p/bittorrent/bittorrent-3.2.1b-r4.ebuild19
-rw-r--r--net-p2p/bittorrent/bittorrent-3.2.1b.ebuild39
-rw-r--r--net-p2p/bittorrent/bittorrent-3.3.0.ebuild (renamed from net-p2p/bittorrent/bittorrent-3.3.ebuild)22
-rw-r--r--net-p2p/bittorrent/files/bittorrent-3.2.1b.patch146
-rw-r--r--net-p2p/bittorrent/files/digest-bittorrent-3.2.11
-rw-r--r--net-p2p/bittorrent/files/digest-bittorrent-3.2.1b1
-rw-r--r--net-p2p/bittorrent/files/digest-bittorrent-3.2.1b-r11
-rw-r--r--net-p2p/bittorrent/files/digest-bittorrent-3.2.1b-r21
-rw-r--r--net-p2p/bittorrent/files/digest-bittorrent-3.2.1b-r31
-rw-r--r--net-p2p/bittorrent/files/digest-bittorrent-3.3.0 (renamed from net-p2p/bittorrent/files/digest-bittorrent-3.3)0
15 files changed, 27 insertions, 409 deletions
diff --git a/net-p2p/bittorrent/Manifest b/net-p2p/bittorrent/Manifest
index 8bc3a8b2d2fb..b0ba70a23c43 100644
--- a/net-p2p/bittorrent/Manifest
+++ b/net-p2p/bittorrent/Manifest
@@ -1,15 +1,7 @@
-MD5 81f32b72c9436c3029cbf4001a46175e ChangeLog 2645
-MD5 856c0e86e53b783f3cb37b635400d1bf bittorrent-3.3.0.ebuild 2132
-MD5 05cd017cf12e04e51351a7ad51f80995 bittorrent-3.3.0.ebuild~ 2129
-MD5 b8fa8756025a38ca20d6f6c196f7d8a2 bittorrent-3.2.1b-r4.ebuild 2108
+MD5 d4ff8bb4c5face440b216988f4fa123a ChangeLog 3095
+MD5 f7a0f9e73f3f616e43e6ec6626efefdb bittorrent-3.3.0.ebuild 2133
+MD5 bde68862e4c887d38342c515ecc5ece6 bittorrent-3.2.1b-r4.ebuild 2109
MD5 83f2b62b16904e997005968b8e7ea82a metadata.xml 222
-MD5 e7e7d0aa3c6c5d57b54db37b53ac066a files/digest-bittorrent-3.2.1 68
-MD5 18e4d423bad1434f67f294f131f2e181 files/digest-bittorrent-3.2.1b 69
-MD5 7bc9832711abd6cc2e334adca1335f74 files/bittorrent-3.2.1b.patch 6500
-MD5 18e4d423bad1434f67f294f131f2e181 files/digest-bittorrent-3.2.1b-r1 69
-MD5 18e4d423bad1434f67f294f131f2e181 files/digest-bittorrent-3.2.1b-r2 69
MD5 dfb7c0c50cc6abc6efd5cf380f4615a0 files/bittorrent-stats-3.2.1b.patch 26140
-MD5 18e4d423bad1434f67f294f131f2e181 files/digest-bittorrent-3.2.1b-r3 69
MD5 18e4d423bad1434f67f294f131f2e181 files/digest-bittorrent-3.2.1b-r4 69
-MD5 5552dfd01545331cd268d47a8a18165e files/digest-bittorrent-3.3 66
MD5 5552dfd01545331cd268d47a8a18165e files/digest-bittorrent-3.3.0 66
diff --git a/net-p2p/bittorrent/bittorrent-3.2.1.ebuild b/net-p2p/bittorrent/bittorrent-3.2.1.ebuild
deleted file mode 100644
index 565666418f32..000000000000
--- a/net-p2p/bittorrent/bittorrent-3.2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.2.1.ebuild,v 1.4 2003/09/08 07:06:22 msterret Exp $
-
-inherit distutils
-
-MY_P="${P/bittorrent/BitTorrent}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="BitTorrent is a tool for distributing files via a distributed network of nodes"
-SRC_URI="http://bitconjurer.org/BitTorrent/${MY_P}.tar.gz"
-HOMEPAGE="http://bitconjurer.org/BitTorrent"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="x86"
-
-IUSE=""
-
-RDEPEND=">=dev-python/wxPython-2.2
- >=dev-lang/python-2.1"
-DEPEND="${RDEPEND}
- >=sys-apps/sed-4.0.5"
-
-
-mydoc="FAQ.txt README.txt LICENSE.txt"
-
-pkg_postinst() {
- MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
-
- if [ -n "`grep 'application/x-bittorrent' /etc/mailcap`" ]; then
- # replace bittorrent entry if it already exists
- einfo "updating bittorrent mime info"
- sed -i "s,application/x-bittorrent;.*,${MAILCAP_STRING}," /etc/mailcap
- else
- # add bittorrent entry if it doesn't exist
- einfo "adding bittorrent mime info"
- echo "${MAILCAP_STRING}" >> /etc/mailcap
- fi
-}
diff --git a/net-p2p/bittorrent/bittorrent-3.2.1b-r1.ebuild b/net-p2p/bittorrent/bittorrent-3.2.1b-r1.ebuild
deleted file mode 100644
index bf63954f1f2c..000000000000
--- a/net-p2p/bittorrent/bittorrent-3.2.1b-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.2.1b-r1.ebuild,v 1.3 2003/09/08 07:06:22 msterret Exp $
-
-inherit distutils
-
-MY_P="${P/bittorrent/BitTorrent}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="BitTorrent is a tool for distributing files via a distributed network of nodes"
-SRC_URI="http://bitconjurer.org/BitTorrent/${MY_P}.tar.gz"
-HOMEPAGE="http://bitconjurer.org/BitTorrent"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="x86"
-
-IUSE=""
-
-RDEPEND=">=dev-python/wxPython-2.2
- >=dev-lang/python-2.1"
-DEPEND="${RDEPEND}
- >=sys-apps/sed-4.0.5"
-
-
-mydoc="FAQ.txt README.txt LICENSE.txt"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- patch -p0 < ${FILESDIR}/${P}.patch
-}
-
-pkg_postinst() {
- MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
-
- if [ -n "`grep 'application/x-bittorrent' /etc/mailcap`" ]; then
- # replace bittorrent entry if it already exists
- einfo "updating bittorrent mime info"
- sed -i "s,application/x-bittorrent;.*,${MAILCAP_STRING}," /etc/mailcap
- else
- # add bittorrent entry if it doesn't exist
- einfo "adding bittorrent mime info"
- echo "${MAILCAP_STRING}" >> /etc/mailcap
- fi
-}
-
diff --git a/net-p2p/bittorrent/bittorrent-3.2.1b-r2.ebuild b/net-p2p/bittorrent/bittorrent-3.2.1b-r2.ebuild
deleted file mode 100644
index a95939f50476..000000000000
--- a/net-p2p/bittorrent/bittorrent-3.2.1b-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.2.1b-r2.ebuild,v 1.5 2003/07/13 20:28:39 aliz Exp $
-
-inherit distutils
-
-MY_P="${P/bittorrent/BitTorrent}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="BitTorrent is a tool for distributing files via a distributed network of nodes"
-SRC_URI="http://bitconjurer.org/BitTorrent/${MY_P}.tar.gz"
-HOMEPAGE="http://bitconjurer.org/BitTorrent"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="x86 ~ppc ~alpha ~sparc"
-
-IUSE="X"
-
-RDEPEND="X? ( >=dev-python/wxPython-2.2 )
- >=dev-lang/python-2.1"
-DEPEND="${RDEPEND}
- >=sys-apps/sed-4.0.5"
-
-
-mydoc="FAQ.txt README.txt LICENSE.txt"
-
-src_install() {
- distutils_src_install
- if ! use X; then
- rm ${D}/usr/bin/*gui.py
- fi
-}
-
-pkg_postinst() {
- MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
-
- if use X; then
- if [ -n "`grep 'application/x-bittorrent' /etc/mailcap`" ]; then
- # replace bittorrent entry if it already exists
- einfo "updating bittorrent mime info"
- sed -i "s,application/x-bittorrent;.*,${MAILCAP_STRING}," /etc/mailcap
- else
- # add bittorrent entry if it doesn't exist
- einfo "adding bittorrent mime info"
- echo "${MAILCAP_STRING}" >> /etc/mailcap
- fi
- else
- # get rid of any reference to the not-installed gui version
- sed -i '/btdownloadgui/d' /etc/mailcap
- fi
-}
diff --git a/net-p2p/bittorrent/bittorrent-3.2.1b-r3.ebuild b/net-p2p/bittorrent/bittorrent-3.2.1b-r3.ebuild
deleted file mode 100644
index 70818dc967c6..000000000000
--- a/net-p2p/bittorrent/bittorrent-3.2.1b-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.2.1b-r3.ebuild,v 1.3 2003/08/01 22:25:43 taviso Exp $
-
-inherit distutils
-
-MY_P="${P/bittorrent/BitTorrent}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="BitTorrent is a tool for distributing files via a distributed network of nodes"
-SRC_URI="http://bitconjurer.org/BitTorrent/${MY_P}.tar.gz"
-HOMEPAGE="http://bitconjurer.org/BitTorrent"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="x86 ~ppc alpha ~sparc"
-
-IUSE="X"
-
-RDEPEND="X? ( >=dev-python/wxPython-2.2 )
- >=dev-lang/python-2.1"
-DEPEND="${RDEPEND}
- >=sys-apps/sed-4.0.5"
-
-
-mydoc="FAQ.txt README.txt LICENSE.txt"
-
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- patch -p1 < ${FILESDIR}/bittorrent-stats-${PV}.patch || die "patch failed"
-}
-
-src_install() {
- distutils_src_install
- if ! use X; then
- rm ${D}/usr/bin/*gui.py
- fi
- dodir etc
- cp -a /etc/mailcap ${D}/etc/
-
- MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
-
- if use X; then
- if [ -n "`grep 'application/x-bittorrent' ${D}/etc/mailcap`" ]; then
- # replace bittorrent entry if it already exists
- einfo "updating bittorrent mime info"
- sed -i "s,application/x-bittorrent;.*,${MAILCAP_STRING}," ${D}/etc/mailcap
- else
- # add bittorrent entry if it doesn't exist
- einfo "adding bittorrent mime info"
- echo "${MAILCAP_STRING}" >> ${D}/etc/mailcap
- fi
- else
- # get rid of any reference to the not-installed gui version
- sed -i '/btdownloadgui/d' ${D}/etc/mailcap
- fi
-}
-
diff --git a/net-p2p/bittorrent/bittorrent-3.2.1b-r4.ebuild b/net-p2p/bittorrent/bittorrent-3.2.1b-r4.ebuild
index 63df7ced7dfb..97b596b34534 100644
--- a/net-p2p/bittorrent/bittorrent-3.2.1b-r4.ebuild
+++ b/net-p2p/bittorrent/bittorrent-3.2.1b-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.2.1b-r4.ebuild,v 1.1 2003/08/10 21:38:18 luke-jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.2.1b-r4.ebuild,v 1.2 2003/12/17 18:35:13 luke-jr Exp $
inherit distutils
@@ -25,13 +25,6 @@ PROVIDE="virtual/bittorrent"
mydoc="FAQ.txt README.txt LICENSE.txt"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- patch -p1 < ${FILESDIR}/bittorrent-stats-${PV}.patch || die "patch failed"
-}
-
src_install() {
distutils_src_install
if ! use X; then
@@ -58,3 +51,13 @@ src_install() {
fi
}
+pkg_postinst() {
+ einfo "Please note that the net-p2p/bittorrent package no longer has"
+ einfo "unofficial feature additions. If you would like advanced features,"
+ einfo "please look into the other BitTorrent clients in Portage:"
+ einfo " net-p2p/bittorrent-stats - Only the -stats patch"
+ einfo " (formerly net-p2p/bittorrent)"
+ einfo " net-p2p/bittorrent-mxs - mxs's patched BT client"
+ einfo " net-p2p/bittorrent-theshadow - TheSHAD0W's client. Recommended."
+ einfo " net-p2p/azureus-bin - Java BT client"
+}
diff --git a/net-p2p/bittorrent/bittorrent-3.2.1b.ebuild b/net-p2p/bittorrent/bittorrent-3.2.1b.ebuild
deleted file mode 100644
index 795e54834a59..000000000000
--- a/net-p2p/bittorrent/bittorrent-3.2.1b.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.2.1b.ebuild,v 1.3 2003/09/08 07:06:22 msterret Exp $
-
-inherit distutils
-
-MY_P="${P/bittorrent/BitTorrent}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="BitTorrent is a tool for distributing files via a distributed network of nodes"
-SRC_URI="http://bitconjurer.org/BitTorrent/${MY_P}.tar.gz"
-HOMEPAGE="http://bitconjurer.org/BitTorrent"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="x86"
-
-IUSE=""
-
-RDEPEND=">=dev-python/wxPython-2.2
- >=dev-lang/python-2.1"
-DEPEND="${RDEPEND}
- >=sys-apps/sed-4.0.5"
-
-
-mydoc="FAQ.txt README.txt LICENSE.txt"
-
-pkg_postinst() {
- MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
-
- if [ -n "`grep 'application/x-bittorrent' /etc/mailcap`" ]; then
- # replace bittorrent entry if it already exists
- einfo "updating bittorrent mime info"
- sed -i "s,application/x-bittorrent;.*,${MAILCAP_STRING}," /etc/mailcap
- else
- # add bittorrent entry if it doesn't exist
- einfo "adding bittorrent mime info"
- echo "${MAILCAP_STRING}" >> /etc/mailcap
- fi
-}
-
diff --git a/net-p2p/bittorrent/bittorrent-3.3.ebuild b/net-p2p/bittorrent/bittorrent-3.3.0.ebuild
index 84841dee7bb2..4cf128a018e3 100644
--- a/net-p2p/bittorrent/bittorrent-3.3.ebuild
+++ b/net-p2p/bittorrent/bittorrent-3.3.0.ebuild
@@ -1,10 +1,11 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.3.ebuild,v 1.1 2003/09/25 07:37:57 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.3.0.ebuild,v 1.1 2003/12/17 18:35:13 luke-jr Exp $
inherit distutils
MY_P="${P/bittorrent/BitTorrent}"
+MY_P="${MY_P/\.0/}"
S=${WORKDIR}/${MY_P}
DESCRIPTION="BitTorrent is a tool for distributing files via a distributed network of nodes"
SRC_URI="http://bitconjurer.org/BitTorrent/${MY_P}.tar.gz"
@@ -25,14 +26,6 @@ PROVIDE="virtual/bittorrent"
DOCS="credits.txt"
-
-# Stats patch not yet available
-#src_unpack() {
-# unpack ${A}
-# cd ${S}
-# patch -p1 < ${FILESDIR}/bittorrent-stats-${PV}.patch || die "patch failed"
-#}
-
src_install() {
distutils_src_install
if ! use X; then
@@ -60,3 +53,14 @@ src_install() {
fi
}
+pkg_postinst() {
+ einfo "Please note that the net-p2p/bittorrent package no longer has"
+ einfo "unofficial feature additions. If you would like advanced features,"
+ einfo "please look into the other BitTorrent clients in Portage:"
+ einfo " net-p2p/bittorrent-stats - Only the -stats patch"
+ einfo " (formerly net-p2p/bittorrent)"
+ einfo " net-p2p/bittorrent-mxs - mxs's patched BT client"
+ einfo " net-p2p/bittorrent-theshadow - TheSHAD0W's client. Recommended."
+ einfo " net-p2p/azureus-bin - Java BT client"
+}
+
diff --git a/net-p2p/bittorrent/files/bittorrent-3.2.1b.patch b/net-p2p/bittorrent/files/bittorrent-3.2.1b.patch
deleted file mode 100644
index 07448836eac9..000000000000
--- a/net-p2p/bittorrent/files/bittorrent-3.2.1b.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- btdownloadgui.py 2003-05-06 12:44:32.000000000 +0200
-+++ /usr/bin/btdownloadgui.py 2003-05-06 10:31:18.000000000 +0200
-@@ -21,7 +21,7 @@
- return '<unknown>'
- if n == 0:
- return 'complete!'
-- n = int(n)
-+ n = int(long(n))
- h, r = divmod(n, 60 * 60)
- m, sec = divmod(r, 60)
- if h > 1000000:
-@@ -128,8 +128,8 @@
-
- def onUpdateStatus(self, fractionDone, timeEst, downRate, upRate, activity):
- if fractionDone is not None and not self.fin:
-- self.gauge.SetValue(int(fractionDone * 1000))
-- self.frame.SetTitle('%d%% %s - BitTorrent %s' % (int(fractionDone*100), self.filename, version))
-+ self.gauge.SetValue(int(long(fractionDone * 1000)))
-+ self.frame.SetTitle('%d%% %s - BitTorrent %s' % (int(long(fractionDone*100)), self.filename, version))
- if timeEst is not None:
- self.timeEstText.SetLabel(hours(timeEst))
- if activity is not None and not self.fin:
---- btdownloadheadless.py 2003-03-17 20:26:39.000000000 +0100
-+++ /usr/bin/btdownloadheadless.py 2003-05-06 10:32:01.000000000 +0200
-@@ -58,7 +59,7 @@
- def display(self, fractionDone = None, timeEst = None,
- downRate = None, upRate = None, activity = None):
- if fractionDone is not None:
-- self.percentDone = str(float(int(fractionDone * 1000)) / 10)
-+ self.percentDone = str(float(long(fractionDone * 1000)) / 10)
- if timeEst is not None:
- self.timeEst = hours(timeEst)
- if activity is not None and not self.done:
---- BitTorrent/Choker.py 2003-03-25 09:32:18.000000000 +0100
-+++ /usr/lib/python2.2/site-packages/BitTorrent/Choker.py 2003-05-06 10:33:58.000000000 +0200
-@@ -59,7 +59,7 @@
-
- def connection_made(self, connection, p = None):
- if p is None:
-- p = randrange(-2, len(self.connections) + 1)
-+ p = randrange(-2, len(self.connections) + 1, int=long)
- self.connections.insert(max(p, 0), connection)
- self._rechoke()
-
---- BitTorrent/track.py 2003-03-28 03:10:45.000000000 +0100
-+++ /usr/lib/python2.2/site-packages/BitTorrent/track.py 2003-05-06 10:34:24.000000000 +0200
-@@ -230,7 +230,7 @@
- if not value.get('nat'):
- cache.append({'peer id': key, 'ip': value['ip'],
- 'port': value['port']})
-- shuffle(cache)
-+ shuffle(cache, int=long)
- data['peers'] = cache[-rsize:]
- del cache[-rsize:]
- connection.answer((200, 'OK', {'Content-Type': 'text/plain', 'Pragma': 'no-cache'}, bencode(data)))
---- BitTorrent/EndgameDownloader.py 2002-12-27 11:06:55.000000000 +0100
-+++ /usr/lib/python2.2/site-packages/BitTorrent/EndgameDownloader.py 2003-05-06 10:35:59.000000000 +0200
-@@ -27,7 +27,7 @@
- self.interested = old.interested
- self.measure = old.measure
- self.last = old.last
-- shuffle(downloader.requests)
-+ shuffle(downloader.requests, int=long)
- for h in self.have:
- if h:
- self.unhave -= 1
-@@ -47,7 +47,7 @@
- def got_unchoke(self):
- if not self.choked or not self.interested:
- return
-- shuffle(self.downloader.requests)
-+ shuffle(self.downloader.requests, int=long)
- for (index, begin, length) in self.downloader.requests:
- if self.have[index]:
- self.connection.send_request(index, begin, length)
-@@ -89,7 +89,7 @@
- self.downloader.requests.append((index, a, b))
- for d in self.downloader.downloads:
- if not d.choked and d.have[index]:
-- shuffle(n)
-+ shuffle(n, int=long)
- for (a, b) in n:
- if a != begin or d is self:
- d.send_request(index, a, b)
-@@ -121,7 +121,7 @@
- self.unhave -= 1
- if self.downloader.storage.do_I_have(index):
- return
-- shuffle(self.downloader.requests)
-+ shuffle(self.downloader.requests, int=long)
- for i, begin, length in self.downloader.requests:
- if i == index:
- self.send_request(i, begin, length)
-@@ -133,7 +133,7 @@
- for h in self.have:
- if h:
- self.unhave -= 1
-- shuffle(self.downloader.requests)
-+ shuffle(self.downloader.requests, int=long)
- for i, begin, length in self.downloader.requests:
- if self.have[i]:
- self.send_request(i, begin, length)
---- BitTorrent/PiecePicker.py 2003-02-02 06:47:20.000000000 +0100
-+++ /usr/lib/python2.2/site-packages/BitTorrent/PiecePicker.py 2003-05-06 10:42:13.000000000 +0200
-@@ -27,7 +27,7 @@
- break
- self.num_done += 1
- y = len(interests) - self.num_done
-- x = randrange(y + 1)
-+ x = randrange(int(y + 1), int=long)
- last = interests[x]
- interests[x] = interests[y]
- interests[y] = last
-@@ -49,7 +49,7 @@
- self.l = []
- for x in self.picker.interests[1:]:
- self.l.extend(x)
-- shuffle(self.l)
-+ shuffle(self.l, int=long)
- if not self.l:
- raise StopIteration
- return self.l.pop()
---- BitTorrent/RawServer.py 2003-03-27 04:47:04.000000000 +0100
-+++ /usr/lib/python2.2/site-packages/BitTorrent/RawServer.py 2003-05-06 10:43:41.000000000 +0200
-@@ -187,7 +187,8 @@
- period = self.funcs[0][0] - time()
- if period < 0:
- period = 0
-- events = self.poll.poll(period * timemult)
-+ permult = period * timemult
-+ events = self.poll.poll(int(long(permult)))
- if self.doneflag.isSet():
- return
- while len(self.funcs) > 0 and self.funcs[0][0] <= time():
---- BitTorrent/StorageWrapper.py 2003-03-21 07:15:09.000000000 +0100
-+++ /usr/lib/python2.2/site-packages/BitTorrent/StorageWrapper.py 2003-05-06 10:44:52.000000000 +0200
-@@ -46,7 +46,8 @@
- self._check_single(i)
- if flag.isSet():
- return
-- statusfunc(fractionDone = float(i+1)/len(hashes))
-+ fractionDone = float(i+1)/len(hashes)
-+ statusfunc(fractionDone)
- else:
- for i in xrange(len(hashes)):
- self._check_single(i, false)
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-3.2.1 b/net-p2p/bittorrent/files/digest-bittorrent-3.2.1
deleted file mode 100644
index b99283f5c843..000000000000
--- a/net-p2p/bittorrent/files/digest-bittorrent-3.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 543f10069d25e9514c9d7b79e72ffde5 BitTorrent-3.2.1.tar.gz 144232
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-3.2.1b b/net-p2p/bittorrent/files/digest-bittorrent-3.2.1b
deleted file mode 100644
index cfa354976ae9..000000000000
--- a/net-p2p/bittorrent/files/digest-bittorrent-3.2.1b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9e0cc346a4bfa3904380ed119d8bac90 BitTorrent-3.2.1b.tar.gz 144420
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-3.2.1b-r1 b/net-p2p/bittorrent/files/digest-bittorrent-3.2.1b-r1
deleted file mode 100644
index cfa354976ae9..000000000000
--- a/net-p2p/bittorrent/files/digest-bittorrent-3.2.1b-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9e0cc346a4bfa3904380ed119d8bac90 BitTorrent-3.2.1b.tar.gz 144420
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-3.2.1b-r2 b/net-p2p/bittorrent/files/digest-bittorrent-3.2.1b-r2
deleted file mode 100644
index cfa354976ae9..000000000000
--- a/net-p2p/bittorrent/files/digest-bittorrent-3.2.1b-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9e0cc346a4bfa3904380ed119d8bac90 BitTorrent-3.2.1b.tar.gz 144420
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-3.2.1b-r3 b/net-p2p/bittorrent/files/digest-bittorrent-3.2.1b-r3
deleted file mode 100644
index cfa354976ae9..000000000000
--- a/net-p2p/bittorrent/files/digest-bittorrent-3.2.1b-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9e0cc346a4bfa3904380ed119d8bac90 BitTorrent-3.2.1b.tar.gz 144420
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-3.3 b/net-p2p/bittorrent/files/digest-bittorrent-3.3.0
index c5ce753910fb..c5ce753910fb 100644
--- a/net-p2p/bittorrent/files/digest-bittorrent-3.3
+++ b/net-p2p/bittorrent/files/digest-bittorrent-3.3.0