11 files changed, 33 insertions, 17 deletions

diff --git a/net-p2p/py-bittorrent/Makefile b/net-p2p/py-bittorrent/Makefile
index b9dd136d13ab..e2c71dd5ba29 100644
--- a/net-p2p/py-bittorrent/Makefile
+++ b/net-p2p/py-bittorrent/Makefile
@@ -19,8 +19,6 @@ COMMENT?=	A peer-to-peer tool for distributing files written in Python
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dns/__init__.py:${PORTSDIR}/dns/py-dnspython \
 		${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto
 
-BROKEN=		Fails to patch
-
 USE_GETTEXT=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-console.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-console.py
index 19a0d8acf7a7..a6d876583792 100644
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-console.py
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-console.py
@@ -11,6 +11,6 @@
 +except:
 +  pass
 +
+ app_name = "BitTorrent"
  from BitTorrent.translation import _
- 
- import pdb
+ import sys
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-curses.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-curses.py
index 54df94ae3b13..ea30716563ae 100644
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-curses.py
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-curses.py
@@ -11,6 +11,6 @@
 +except:
 +  pass
 +
+ app_name = "BitTorrent"
  from BitTorrent.translation import _
  
- SPEW_SCROLL_RATE = 1
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-tracker.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-tracker.py
index d2e5b60d36d2..ba26249007ac 100644
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-tracker.py
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-tracker.py
@@ -11,6 +11,6 @@
 +except:
 +  pass
 +
+ app_name = "BitTorrent"
  if __name__ == '__main__':
-     from BitTorrent.platform import install_translation
-     install_translation()
+     from BitTorrent.translation import _
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent.py
index 1c705e8f7928..8d099f719d79 100644
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent.py
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent.py
@@ -11,6 +11,6 @@
 +except:
 +  pass
 +
+ app_name = "BitTorrent"
  import os
  import sys
- try:
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-changetracker-console.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-changetracker-console.py
index 7828bb958cc9..5e0f1ef7c276 100644
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-changetracker-console.py
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-changetracker-console.py
@@ -11,6 +11,6 @@
 +except:
 +  pass
 +
+ app_name = "BitTorrent"
  from BitTorrent.translation import _
  
- from os.path import basename
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-launchmany-curses.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-launchmany-curses.py
index 5d5e66a64ae5..e53896476ae4 100644
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-launchmany-curses.py
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-launchmany-curses.py
@@ -1,9 +1,9 @@
 --- launchmany-curses.py.orig	Tue Jun  6 20:43:42 2006
 +++ launchmany-curses.py	Thu Jun 15 14:46:16 2006
-@@ -14,6 +14,13 @@
+@@ -13,6 +13,14 @@
  
  from __future__ import division
- 
++
 +try:
 +  import psyco
 +  assert psyco.__version__ >= 0x010300f0
@@ -11,6 +11,6 @@
 +except:
 +  pass
 +
- from BitTorrent.translation import _
+ app_name = "BitTorrent"
+ from BTL.translation import _
  
- DOWNLOAD_SCROLL_RATE = 1
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-maketorrent.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-maketorrent.py
index d2d3527d7479..5eeefc4a53b6 100644
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-maketorrent.py
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-maketorrent.py
@@ -11,6 +11,6 @@
 +except:
 +  pass
 +
- from BitTorrent.translation import _
+ app_name = "BitTorrent"
+ from BTL.translation import _
  
- import os
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-torrentinfo-console.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-torrentinfo-console.py
index a78b3c2fb46d..9f137ce7c1dc 100644
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-torrentinfo-console.py
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-torrentinfo-console.py
@@ -11,6 +11,6 @@
 +except:
 +  pass
 +
- from BitTorrent.translation import _
+ app_name = "BitTorrent"
+ from BTL.translation import _
  
- from sys import *
diff --git a/net-p2p/py-bittorrent/files/patch-bittorrent-console.py b/net-p2p/py-bittorrent/files/patch-bittorrent-console.py
index 4fe33af95ffb..e331a4fe72e4 100644
--- a/net-p2p/py-bittorrent/files/patch-bittorrent-console.py
+++ b/net-p2p/py-bittorrent/files/patch-bittorrent-console.py
@@ -1,5 +1,14 @@
 --- bittorrent-console.py.orig	Sat Dec 16 08:54:46 2006
 +++ bittorrent-console.py	Sat Dec 16 08:55:07 2006
+@@ -39,7 +39,7 @@
+ from BTL import GetTorrent
+ from BTL.ConvertedMetainfo import ConvertedMetainfo
+ from BitTorrent.MultiTorrent import TorrentNotInitialized
+-from BitTorrent.RawServer_twisted import RawServer, task
++from BitTorrent.RawServer_twisted import RawServer
+ from BitTorrent.UI import Size, Duration
+ inject_main_logfile()
+ from BitTorrent import console
 @@ -326,12 +326,12 @@
              if config['save_in']:
                  raise BTFailure(_("You cannot specify both --save_as and "
diff --git a/net-p2p/py-bittorrent/files/patch-bittorrent-curses.py b/net-p2p/py-bittorrent/files/patch-bittorrent-curses.py
index 282639234174..1063ea243cf7 100644
--- a/net-p2p/py-bittorrent/files/patch-bittorrent-curses.py
+++ b/net-p2p/py-bittorrent/files/patch-bittorrent-curses.py
@@ -1,5 +1,14 @@
 --- bittorrent-curses.py.orig	Sat Dec 16 08:55:22 2006
 +++ bittorrent-curses.py	Sat Dec 16 08:55:49 2006
+@@ -42,7 +42,7 @@
+ from BitTorrent import BTFailure, UserFailure
+ from BitTorrent import version
+ from BTL import GetTorrent
+-from BitTorrent.RawServer_twisted import RawServer, task
++from BitTorrent.RawServer_twisted import RawServer
+ from BTL.ConvertedMetainfo import ConvertedMetainfo
+ from BTL.yielddefer import launch_coroutine, _wrap_task
+ from BitTorrent import inject_main_logfile
 @@ -498,12 +498,12 @@
              if config['save_in']:
                  raise BTFailure(_("You cannot specify both --save_as and "