o Re-enable the new NewRateLimiter.py algorithms

o Bump PORTREVISION

2 files changed, 1 insertions, 36 deletions

diff --git a/net-p2p/py-bittorrent-devel/Makefile b/net-p2p/py-bittorrent-devel/Makefile
index 8fe79dc..05a337c 100644
--- a/net-p2p/py-bittorrent-devel/Makefile
+++ b/net-p2p/py-bittorrent-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	BitTorrent
 PORTVERSION=	4.20.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES?=	net-p2p python
 MASTER_SITES=	http://download.bittorrent.com/dl/
@@ -23,7 +24,6 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dns/__init__.py:${PORTSDIR}/dns/py-dnspython
 USE_GETTEXT=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-USE_REINPLACE=	yes
 USE_TWISTED_RUN=	yes
 
 CONFLICTS=	py??-*[Bb]it[Tt]orrent* py??-*[Bb]it[Tt]ornado* btqueue*
diff --git a/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__NewRateLimiter.py b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__NewRateLimiter.py
deleted file mode 100644
index f972188..0000000
--- a/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__NewRateLimiter.py
+++ /dev/null
@@ -1,35 +0,0 @@
---- ./BitTorrent/NewRateLimiter.py.orig	Wed Jul 12 02:18:21 2006
-+++ ./BitTorrent/NewRateLimiter.py	Sat Jul 22 17:42:24 2006
-@@ -144,24 +144,14 @@
-     def restart_loop(self, t):
-         # check for pending loop event
-         if self.task and not self.task.called:
--            ## look at when it's scheduled to occur
--            # we can special case events which have a delta of 0, since they
--            # should occur asap. no need to check the time.
--            if self.task.delta == 0:
--                return
--            # use time.time since twisted does anyway
--            s = self.task.getTime() - time.time()
--            if s > t:
--                # if it would occur after the time we want, reset it
--                self.task.reset(t)
--                self.task.delta = t
--        else:
--            if t == 0:
--                # don't spin the event loop needlessly
--                self.run()
--            else:
--                self.task = self.add_task(t, self.run)
--                self.task.delta = t
-+            # look at when it's scheduled to occur
-+            s = self.task.getTime() - bttime()
-+            if s <= t:
-+                return 
-+            # if it would occur after the time we want, cancel it
-+            self.task.cancel()
-+
-+        self.task = self.add_task(t, self.run)
- 
-     def _write(self, to_write):
-         amount = 0