Update to 4.2.1

31 files changed, 462 insertions, 288 deletions

diff --git a/net-p2p/py-bittorrent/Makefile b/net-p2p/py-bittorrent/Makefile
index 6235198..049d8dd 100644
--- a/net-p2p/py-bittorrent/Makefile
+++ b/net-p2p/py-bittorrent/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	BitTorrent
-PORTVERSION=	4.0.4
-PORTREVISION=	1
+PORTVERSION=	4.2.1
 PORTEPOCH=	1
 CATEGORIES?=	net python
 MASTER_SITES=	http://www.bittorrent.com/dl/ \
@@ -18,16 +17,25 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	lioux@FreeBSD.org
 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
+
+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*
 
 .ifndef(NOPORTDOCS)
-PORTDOCS=	LICENSE.txt \
-		redirdonate.html \
-		README.txt credits.txt
+PORTDOCS=	\
+		LICENSE.txt \
+		README.txt \
+		TRACKERLESS.txt \
+		credits.txt \
+		credits-l10n.txt \
+		redirdonate.html
 .else
 EXTRA_PATCHES+=	${FILESDIR}/extra-noportdocs-setup.py
 .endif
@@ -43,8 +51,8 @@ WITHOUT_PSYCO=	yes
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2
 
 PLIST_FILES+=	\
-		bin/btmaketorrentgui.py \
-		bin/btdownloadgui.py \
+		bin/bittorrent \
+		bin/maketorrent \
 		share/pixmaps/BitTorrent/bittorrent.ico \
 		share/pixmaps/BitTorrent/broken.png \
 		share/pixmaps/BitTorrent/finished.png \
@@ -56,7 +64,10 @@ PLIST_FILES+=	\
 		share/pixmaps/BitTorrent/play.png \
 		share/pixmaps/BitTorrent/queued.png \
 		share/pixmaps/BitTorrent/remove.png \
-		share/pixmaps/BitTorrent/running.png
+		share/pixmaps/BitTorrent/running.png \
+		share/pixmaps/BitTorrent/status-natted.png \
+		share/pixmaps/BitTorrent/status-running.png \
+		share/pixmaps/BitTorrent/status-stopped.png
 
 PLIST_SUB+=	GUI=""
 .else
@@ -68,23 +79,17 @@ PLIST_SUB+=	GUI="@comment "
 .ifndef(WITHOUT_PSYCO)
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
 
-EXTRA_PATCHES+= \
-		${FILESDIR}/extra-psyco-patch-btdownloadcurses.py \
-		${FILESDIR}/extra-psyco-patch-btdownloadgui.py \
-		${FILESDIR}/extra-psyco-patch-btdownloadheadless.py \
-		${FILESDIR}/extra-psyco-patch-btlaunchmany.py \
-		${FILESDIR}/extra-psyco-patch-btlaunchmanycurses.py \
-		${FILESDIR}/extra-psyco-patch-btmaketorrent.py \
-		${FILESDIR}/extra-psyco-patch-btmaketorrentgui.py \
-		${FILESDIR}/extra-psyco-patch-btreannouce.py \
-		${FILESDIR}/extra-psyco-patch-btrename.py \
-		${FILESDIR}/extra-psyco-patch-btshowmetainfo.py \
-		${FILESDIR}/extra-psyco-patch-bttrack.py
-
-PLIST_FILES+=	\
-		${PYTHON_SITELIBDIR:S|^${PYTHONBASE}/||}/BitTorrent/PSYCO.py \
-		${PYTHON_SITELIBDIR:S|^${PYTHONBASE}/||}/BitTorrent/PSYCO.pyc \
-		${PYTHON_SITELIBDIR:S|^${PYTHONBASE}/||}/BitTorrent/PSYCO.pyo
+EXTRA_PATCHES+=	\
+		${FILESDIR}/extra-psyco-patch-bittorrent-console.py \
+		${FILESDIR}/extra-psyco-patch-bittorrent-curses.py \
+		${FILESDIR}/extra-psyco-patch-bittorrent-tracker.py \
+		${FILESDIR}/extra-psyco-patch-bittorrent.py \
+		${FILESDIR}/extra-psyco-patch-changetracker-console.py \
+		${FILESDIR}/extra-psyco-patch-launchmany-console.py \
+		${FILESDIR}/extra-psyco-patch-launchmany-curses.py \
+		${FILESDIR}/extra-psyco-patch-maketorrent-console.py \
+		${FILESDIR}/extra-psyco-patch-maketorrent.py \
+		${FILESDIR}/extra-psyco-patch-torrentinfo-console.py
 .endif
 
 pre-everything::
@@ -95,15 +100,17 @@ pre-everything::
 	@${ECHO_MSG} '===> Define WITHOUT_PSYCO to disable devel/py-psyco optimization'
 .endif
 
+pre-patch:
+# do not install public.key, we will do it ourselves
+	@${REINPLACE_CMD} -E \
+		-e "s|^.*'public.key'.*$$||" \
+		${WRKSRC}/setup.py
+
 post-patch:
-	@${FIND} ${WRKSRC} -type f | \
-		${XARGS} -x -n 10 \
-		${REINPLACE_CMD} -E \
-		-e 's|/usr/bin/env python.*|${LOCALBASE}/bin/python|'
-.ifndef(WITHOUT_PSYCO)
-# activate psyco optimization
-	@${ECHO_CMD} 'psyco = 1' > ${WRKSRC}/BitTorrent/PSYCO.py
-.endif
+# public.key will be located under ${DATADIR} not ${DOCSDIR}
+	@${REINPLACE_CMD} -E \
+		-e "s|%%DATADIR%%|'${DATADIR}/'|" \
+		${WRKSRC}/BitTorrent/NewVersion.py
 
 post-install:
 # set proper permissions
@@ -115,7 +122,7 @@ post-install:
 # pixmaps
 	@${CHMOD} -R ${SHAREMODE} \
 		${PREFIX}/share/pixmaps/${PORTNAME}/*
-	@${CHMOD} a+x \
+	@${CHMOD} a+X \
 		${PREFIX}/share/pixmaps/${PORTNAME}/logo
 .endif
 .ifndef(NOPORTDOCS)
@@ -123,5 +130,8 @@ post-install:
 	@${CHMOD} -R ${SHAREMODE} \
 		${DOCSDIR}/*
 .endif
+# public.key
+	@${MKDIR} ${DATADIR}
+	@${INSTALL_DATA} ${WRKSRC}/public.key ${DATADIR}
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/py-bittorrent/distinfo b/net-p2p/py-bittorrent/distinfo
index 87c4aa9..5d03a95 100644
--- a/net-p2p/py-bittorrent/distinfo
+++ b/net-p2p/py-bittorrent/distinfo
@@ -1,3 +1,3 @@
-MD5 (BitTorrent-4.0.4.tar.gz) = 7f03514dd4d684728a4e54c6ffce7d1f
-SHA256 (BitTorrent-4.0.4.tar.gz) = 2a2822cac01b60445cb657fd9778be69634eabd644702593f23633e4f4bfb8e3
-SIZE (BitTorrent-4.0.4.tar.gz) = 153911
+MD5 (BitTorrent-4.2.1.tar.gz) = 0deb2e083e95206a9e601ff6ca35b826
+SHA256 (BitTorrent-4.2.1.tar.gz) = fa7fd760f57dc342fa623cedb805be22fb5a944d498677e65abd7083e6a88c6a
+SIZE (BitTorrent-4.2.1.tar.gz) = 2245310
diff --git a/net-p2p/py-bittorrent/files/extra-nogui-patch-setup.py b/net-p2p/py-bittorrent/files/extra-nogui-patch-setup.py
index bdfd37a..edffccf 100644
--- a/net-p2p/py-bittorrent/files/extra-nogui-patch-setup.py
+++ b/net-p2p/py-bittorrent/files/extra-nogui-patch-setup.py
@@ -1,18 +1,21 @@
---- setup.py.orig	Sat Mar 12 10:01:45 2005
-+++ setup.py	Sat Mar 12 10:14:21 2005
-@@ -19,7 +19,7 @@
+--- setup.py.orig	Tue Aug 23 22:58:45 2005
++++ setup.py	Tue Aug 23 23:09:21 2005
+@@ -25,8 +25,8 @@
  
  import glob
  
--scripts = ["btdownloadgui.py", "btdownloadcurses.py", "btdownloadheadless.py",
--           "btmaketorrentgui.py", "btmaketorrent.py",
-+scripts = ["btdownloadcurses.py", "btdownloadheadless.py",
-+           "btmaketorrent.py",
-            "btlaunchmany.py", "btlaunchmanycurses.py", 
-            "bttrack.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py"]
-@@ -27,4 +27,3 @@
- img_root, doc_root = BitTorrent.calc_unix_dirs()
+-symlinks = ["bittorrent" , "bittorrent-curses", "bittorrent-console",
+-           "maketorrent",                      "maketorrent-console",
++symlinks = ["bittorrent-curses", "bittorrent-console",
++            "maketorrent-console",
+                           "launchmany-curses", "launchmany-console",
+                                                "changetracker-console",
+                                                "torrentinfo-console",
+@@ -53,5 +53,5 @@
+     translations.append (("%s/%s/LC_MESSAGES"          % (locale_root, l),
+                           ["locale/%s/LC_MESSAGES/bittorrent.mo" % l]))
  
 -data_files = [ (img_root        , glob.glob('images/*png')+['images/bittorrent.ico',]),
 -               (img_root+'/logo', glob.glob('images/logo/bittorrent_[0-9]*.png')     ),
 +data_files = [ 
++               
diff --git a/net-p2p/py-bittorrent/files/extra-noportdocs-setup.py b/net-p2p/py-bittorrent/files/extra-noportdocs-setup.py
index 6e2d5fb..64e3964 100644
--- a/net-p2p/py-bittorrent/files/extra-noportdocs-setup.py
+++ b/net-p2p/py-bittorrent/files/extra-noportdocs-setup.py
@@ -1,8 +1,8 @@
---- setup.py.bak	Mon Mar  7 00:55:50 2005
-+++ setup.py	Fri Mar 11 22:55:38 2005
-@@ -31,5 +31,3 @@
--               (doc_root        , ['credits.txt', 'LICENSE.txt',
--                                   'README.txt', 'redirdonate.html']       ),
-                ]
- 
- setup(
+--- setup.py.orig	Mon Nov 21 00:10:24 2005
++++ setup.py	Mon Nov 21 00:10:33 2005
+@@ -72,5 +72,0 @@
+-               (doc_root        , ['credits.txt', 'credits-l10n.txt',
+-                                   'LICENSE.txt', 'README.txt',
+-                                   'TRACKERLESS.txt', 'redirdonate.html',
+-
+-                                   ]       ),
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
new file mode 100644
index 0000000..17e63fd
--- /dev/null
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-console.py
@@ -0,0 +1,16 @@
+--- bittorrent-console.py	Wed Oct 12 01:08:15 2005
++++ bittorrent-console.py	Wed Oct 12 07:57:46 2005
+@@ -14,6 +14,13 @@
+ 
+ from __future__ import division
+ 
++try:
++  import psyco
++  assert psyco.__version__ >= 0x010300f0
++  psyco.full()
++except:
++  pass
++
+ from BitTorrent.platform import install_translation
+ install_translation()
+ 
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
new file mode 100644
index 0000000..b46155e
--- /dev/null
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-curses.py
@@ -0,0 +1,16 @@
+--- bittorrent-curses.py	Wed Oct 12 01:08:15 2005
++++ bittorrent-curses.py	Wed Oct 12 07:57:28 2005
+@@ -15,6 +15,13 @@
+ 
+ from __future__ import division
+ 
++try:
++  import psyco
++  assert psyco.__version__ >= 0x010300f0
++  psyco.full()
++except:
++  pass
++
+ from BitTorrent.platform import install_translation
+ install_translation()
+ 
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
new file mode 100644
index 0000000..d2e5b60
--- /dev/null
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-tracker.py
@@ -0,0 +1,16 @@
+--- bittorrent-tracker.py	Wed Oct 12 01:08:15 2005
++++ bittorrent-tracker.py	Wed Oct 12 07:57:55 2005
+@@ -12,6 +12,13 @@
+ 
+ # Written by Bram Cohen
+ 
++try:
++  import psyco
++  assert psyco.__version__ >= 0x010300f0
++  psyco.full()
++except:
++  pass
++
+ if __name__ == '__main__':
+     from BitTorrent.platform import install_translation
+     install_translation()
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent.py
new file mode 100644
index 0000000..d4d8ba8
--- /dev/null
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent.py
@@ -0,0 +1,16 @@
+--- bittorrent.py	Wed Oct 12 01:08:18 2005
++++ bittorrent.py	Wed Oct 12 07:58:12 2005
+@@ -14,6 +14,13 @@
+ 
+ from __future__ import division
+ 
++try:
++  import psyco
++  assert psyco.__version__ >= 0x010300f0
++  psyco.full()
++except:
++  pass
++
+ from BitTorrent.platform import install_translation
+ install_translation()
+ 
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-btdownloadcurses.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-btdownloadcurses.py
deleted file mode 100644
index dadec7b..0000000
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-btdownloadcurses.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- btdownloadcurses.py.orig	Fri Mar 11 23:12:10 2005
-+++ btdownloadcurses.py	Fri Mar 11 23:13:08 2005
-@@ -15,6 +15,15 @@
- 
- from __future__ import division
- 
-+from BitTorrent import PSYCO
-+if PSYCO.psyco:
-+    try:
-+       import psyco
-+       assert psyco.__version__ >= 0x010300f0
-+       psyco.full()
-+    except:
-+       pass
-+
- SPEW_SCROLL_RATE = 1
- 
- import sys
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-btdownloadgui.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-btdownloadgui.py
deleted file mode 100644
index d6af343..0000000
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-btdownloadgui.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- btdownloadgui.py.orig	Mon May 30 00:19:57 2005
-+++ btdownloadgui.py	Mon May 30 00:20:19 2005
-@@ -14,6 +14,15 @@
- 
- from __future__ import division
- 
-+from BitTorrent import PSYCO
-+if PSYCO.psyco:
-+    try:
-+       import psyco
-+       assert psyco.__version__ >= 0x010300f0
-+       psyco.full()
-+    except:
-+       pass
-+
- import sys
- 
- assert sys.version_info >= (2, 3), "Install Python 2.3 or greater"
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-btdownloadheadless.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-btdownloadheadless.py
deleted file mode 100644
index 93d08d1..0000000
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-btdownloadheadless.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- btdownloadheadless.py.orig	Fri Mar 11 23:14:21 2005
-+++ btdownloadheadless.py	Fri Mar 11 23:14:28 2005
-@@ -14,6 +14,15 @@
- 
- from __future__ import division
- 
-+from BitTorrent import PSYCO
-+if PSYCO.psyco:
-+    try:
-+       import psyco
-+       assert psyco.__version__ >= 0x010300f0
-+       psyco.full()
-+    except:
-+       pass
-+
- import sys
- import os
- import threading
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-btlaunchmany.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-btlaunchmany.py
deleted file mode 100644
index d1d47a7..0000000
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-btlaunchmany.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- btlaunchmany.py.orig	Fri Mar 11 23:14:47 2005
-+++ btlaunchmany.py	Fri Mar 11 23:14:54 2005
-@@ -12,6 +12,15 @@
- 
- # Written by John Hoffman
- 
-+from BitTorrent import PSYCO
-+if PSYCO.psyco:
-+    try:
-+       import psyco
-+       assert psyco.__version__ >= 0x010300f0
-+       psyco.full()
-+    except:
-+       pass
-+
- import sys
- import os
- 
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-btlaunchmanycurses.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-btlaunchmanycurses.py
deleted file mode 100644
index a6fc2f1..0000000
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-btlaunchmanycurses.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- btlaunchmanycurses.py.orig	Fri Mar 11 23:15:15 2005
-+++ btlaunchmanycurses.py	Fri Mar 11 23:15:22 2005
-@@ -14,6 +14,15 @@
- 
- from __future__ import division
- 
-+from BitTorrent import PSYCO
-+if PSYCO.psyco:
-+    try:
-+       import psyco
-+       assert psyco.__version__ >= 0x010300f0
-+       psyco.full()
-+    except:
-+       pass
-+
- DOWNLOAD_SCROLL_RATE = 1
- 
- import sys, os
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-btmaketorrent.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-btmaketorrent.py
deleted file mode 100644
index 89e4cb1..0000000
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-btmaketorrent.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- btmaketorrent.py.orig	Fri Mar 11 23:15:38 2005
-+++ btmaketorrent.py	Fri Mar 11 23:15:43 2005
-@@ -12,6 +12,15 @@
- 
- # Written by Bram Cohen
- 
-+from BitTorrent import PSYCO
-+if PSYCO.psyco:
-+    try:
-+       import psyco
-+       assert psyco.__version__ >= 0x010300f0
-+       psyco.full()
-+    except:
-+       pass
-+
- import sys
- from BitTorrent.makemetafile import make_meta_files
- from BitTorrent.parseargs import parseargs, printHelp
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-btmaketorrentgui.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-btmaketorrentgui.py
deleted file mode 100644
index a635ddf..0000000
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-btmaketorrentgui.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- btmaketorrentgui.py.orig	Mon May 30 00:20:48 2005
-+++ btmaketorrentgui.py	Mon May 30 00:21:00 2005
-@@ -14,6 +14,15 @@
- 
- from __future__ import division
- 
-+from BitTorrent import PSYCO
-+if PSYCO.psyco:
-+    try:
-+       import psyco
-+       assert psyco.__version__ >= 0x010300f0
-+       psyco.full()
-+    except:
-+       pass
-+
- import os
- import sys
- 
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-btreannouce.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-btreannouce.py
deleted file mode 100644
index ba827e7..0000000
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-btreannouce.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- btreannounce.py.orig	Wed Aug 17 15:24:19 2005
-+++ btreannounce.py	Mon Aug 22 23:06:19 2005
-@@ -12,6 +12,15 @@
- 
- # Written by Henry 'Pi' James and Bram Cohen
- 
-+from BitTorrent import PSYCO
-+if PSYCO.psyco:
-+    try:
-+       import psyco
-+       assert psyco.__version__ >= 0x010300f0
-+       psyco.full()
-+    except:
-+       pass
-+
- from os.path import basename
- from sys import argv, exit
- from BitTorrent.bencode import bencode, bdecode
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-btrename.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-btrename.py
deleted file mode 100644
index 6bcd10f..0000000
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-btrename.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- btrename.py.orig	Fri Mar 11 23:16:21 2005
-+++ btrename.py	Fri Mar 11 23:16:28 2005
-@@ -12,6 +12,15 @@
- 
- # Written by Henry 'Pi' James
- 
-+from BitTorrent import PSYCO
-+if PSYCO.psyco:
-+    try:
-+       import psyco
-+       assert psyco.__version__ >= 0x010300f0
-+       psyco.full()
-+    except:
-+       pass
-+
- from sys import *
- from os.path import *
- from sha import *
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-btshowmetainfo.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-btshowmetainfo.py
deleted file mode 100644
index a9f1be8..0000000
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-btshowmetainfo.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- btshowmetainfo.py.orig	Fri Mar 11 23:16:39 2005
-+++ btshowmetainfo.py	Fri Mar 11 23:16:48 2005
-@@ -12,6 +12,15 @@
- 
- # Written by Henry 'Pi' James and Loring Holden
- 
-+from BitTorrent import PSYCO
-+if PSYCO.psyco:
-+    try:
-+       import psyco
-+       assert psyco.__version__ >= 0x010300f0
-+       psyco.full()
-+    except:
-+       pass
-+
- from sys import *
- from os.path import *
- from sha import *
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-bttrack.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-bttrack.py
deleted file mode 100644
index 2102a91..0000000
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-bttrack.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- bttrack.py.orig	Fri Mar 11 23:17:26 2005
-+++ bttrack.py	Fri Mar 11 23:17:31 2005
-@@ -12,6 +12,15 @@
- 
- # Written by Bram Cohen
- 
-+from BitTorrent import PSYCO
-+if PSYCO.psyco:
-+    try:
-+       import psyco
-+       assert psyco.__version__ >= 0x010300f0
-+       psyco.full()
-+    except:
-+       pass
-+
- from sys import argv
- from BitTorrent.track import track
- 
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
new file mode 100644
index 0000000..8e8ded0
--- /dev/null
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-changetracker-console.py
@@ -0,0 +1,16 @@
+--- changetracker-console.py	Wed Oct 12 01:08:18 2005
++++ changetracker-console.py	Wed Oct 12 07:58:18 2005
+@@ -12,6 +12,13 @@
+ 
+ # Written by Henry 'Pi' James and Bram Cohen
+ 
++try:
++  import psyco
++  assert psyco.__version__ >= 0x010300f0
++  psyco.full()
++except:
++  pass
++
+ from BitTorrent.platform import install_translation
+ install_translation()
+ 
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-launchmany-console.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-launchmany-console.py
new file mode 100644
index 0000000..0a885f9
--- /dev/null
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-launchmany-console.py
@@ -0,0 +1,16 @@
+--- launchmany-console.py	Wed Oct 12 01:08:27 2005
++++ launchmany-console.py	Wed Oct 12 07:58:23 2005
+@@ -12,6 +12,13 @@
+ 
+ # Written by John Hoffman
+ 
++try:
++  import psyco
++  assert psyco.__version__ >= 0x010300f0
++  psyco.full()
++except:
++  pass
++
+ if __name__ == '__main__':
+     from BitTorrent.platform import install_translation
+     install_translation()
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
new file mode 100644
index 0000000..6f73f92
--- /dev/null
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-launchmany-curses.py
@@ -0,0 +1,16 @@
+--- launchmany-curses.py	Wed Oct 12 01:08:27 2005
++++ launchmany-curses.py	Wed Oct 12 07:58:27 2005
+@@ -14,6 +14,13 @@
+ 
+ from __future__ import division
+ 
++try:
++  import psyco
++  assert psyco.__version__ >= 0x010300f0
++  psyco.full()
++except:
++  pass
++
+ from BitTorrent.platform import install_translation
+ install_translation()
+ 
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-maketorrent-console.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-maketorrent-console.py
new file mode 100644
index 0000000..476f365
--- /dev/null
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-maketorrent-console.py
@@ -0,0 +1,16 @@
+--- maketorrent-console.py	Wed Oct 12 01:08:27 2005
++++ maketorrent-console.py	Wed Oct 12 07:58:31 2005
+@@ -12,6 +12,13 @@
+ 
+ # Written by Bram Cohen
+ 
++try:
++  import psyco
++  assert psyco.__version__ >= 0x010300f0
++  psyco.full()
++except:
++  pass
++
+ if __name__ == '__main__':
+     from BitTorrent.platform import install_translation
+     install_translation()
diff --git a/net-p2p/py-bittorrent/files/extra-psyco-patch-maketorrent.py b/net-p2p/py-bittorrent/files/extra-psyco-patch-maketorrent.py
new file mode 100644
index 0000000..9675c99
--- /dev/null
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-maketorrent.py
@@ -0,0 +1,16 @@
+--- maketorrent.py	Wed Oct 12 01:08:27 2005
++++ maketorrent.py	Wed Oct 12 07:58:35 2005
+@@ -14,6 +14,13 @@
+ 
+ from __future__ import division
+ 
++try:
++  import psyco
++  assert psyco.__version__ >= 0x010300f0
++  psyco.full()
++except:
++  pass
++
+ from BitTorrent.platform import install_translation
+ install_translation()
+ 
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
new file mode 100644
index 0000000..bf6128e
--- /dev/null
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-torrentinfo-console.py
@@ -0,0 +1,16 @@
+--- torrentinfo-console.py	Wed Oct 12 01:08:50 2005
++++ torrentinfo-console.py	Wed Oct 12 07:58:48 2005
+@@ -12,6 +12,13 @@
+ 
+ # Written by Henry 'Pi' James, Loring Holden and Matt Chisholm
+ 
++try:
++  import psyco
++  assert psyco.__version__ >= 0x010300f0
++  psyco.full()
++except:
++  pass
++
+ from BitTorrent.platform import install_translation
+ install_translation()
+ 
diff --git a/net-p2p/py-bittorrent/files/patch-BitTorrent::__init__.py b/net-p2p/py-bittorrent/files/patch-BitTorrent::__init__.py
index 5c34141..6907919 100644
--- a/net-p2p/py-bittorrent/files/patch-BitTorrent::__init__.py
+++ b/net-p2p/py-bittorrent/files/patch-BitTorrent::__init__.py
@@ -1,11 +1,11 @@
---- BitTorrent/__init__.py.orig	Fri Mar 11 22:53:12 2005
-+++ BitTorrent/__init__.py	Fri Mar 11 22:53:27 2005
-@@ -21,7 +21,7 @@
- import os
+--- BitTorrent/__init__.py.orig	Sun Nov 20 23:18:59 2005
++++ BitTorrent/__init__.py	Sun Nov 20 23:19:07 2005
+@@ -64,7 +64,7 @@
+     'te'   :u'	తెలుగు'              ,
+     }
  
- def calc_unix_dirs():
--    appdir = '%s-%s'%(app_name, version)
-+    appdir = '%s'%(app_name)
-     ip = os.path.join('share', 'pixmaps', appdir)
-     dp = os.path.join('share', 'doc'    , appdir)
-     return ip, dp
+-#language_names.update(unfinished_language_names)
++language_names.update(unfinished_language_names)
+ 
+ languages = language_names.keys()
+ languages.sort()
diff --git a/net-p2p/py-bittorrent/files/patch-BitTorrent::defaultargs.py b/net-p2p/py-bittorrent/files/patch-BitTorrent::defaultargs.py
index d0fa6f8..f25af41 100644
--- a/net-p2p/py-bittorrent/files/patch-BitTorrent::defaultargs.py
+++ b/net-p2p/py-bittorrent/files/patch-BitTorrent::defaultargs.py
@@ -1,11 +1,11 @@
---- BitTorrent/defaultargs.py.orig	Sun Dec 26 08:41:09 2004
-+++ BitTorrent/defaultargs.py	Sun Dec 26 08:41:16 2004
-@@ -83,7 +83,7 @@
-      'if nonzero, set the TOS option for peer connections to this value'),
-     ('filesystem_encoding', '',
-      "character encoding used on the local filesystem. If left empty, autodetected. Autodetection doesn't work under python versions older than 2.3"),
--    ('enable_bad_libc_workaround', 0,
-+    ('enable_bad_libc_workaround', 1,
-      'enable workaround for a bug in BSD libc that makes file reads very slow.'),
-     ]
- 
+--- BitTorrent/defaultargs.py.orig	Tue May 24 03:01:06 2005
++++ BitTorrent/defaultargs.py	Sun May 29 22:48:48 2005
+@@ -110,7 +110,7 @@
+      _("do not connect to several peers that have the same IP address")),
+     ('peer_socket_tos', 8,
+      _("if nonzero, set the TOS option for peer connections to this value")),
+-    ('bad_libc_workaround', MYFALSE,
++    ('bad_libc_workaround', MYTRUE,
+      _("enable workaround for a bug in BSD libc that makes file reads very slow.")),
+     ('tracker_proxy', '',
+      _("address of HTTP proxy to use for tracker connections")),
diff --git a/net-p2p/py-bittorrent/files/patch-BitTorrent__NewVersion.py b/net-p2p/py-bittorrent/files/patch-BitTorrent__NewVersion.py
new file mode 100644
index 0000000..fcb590c
--- /dev/null
+++ b/net-p2p/py-bittorrent/files/patch-BitTorrent__NewVersion.py
@@ -0,0 +1,11 @@
+--- BitTorrent/NewVersion.py.orig	Sun Nov 20 23:10:09 2005
++++ BitTorrent/NewVersion.py	Sun Nov 20 23:10:37 2005
+@@ -127,7 +127,7 @@
+             self.threadwrap(self.errorfunc, WARNING, '\n'.join(terrors))
+ 
+         if torrentfile and signature:
+-            public_key_file = open(os.path.join(doc_root, 'public.key'), 'rb')
++            public_key_file = open(os.path.join(%%DATADIR%%, 'public.key'), 'rb')
+             public_key = pickle.load(public_key_file)
+             h = sha(torrentfile).digest()
+             if public_key.verify(h, signature):
diff --git a/net-p2p/py-bittorrent/files/patch-BitTorrent__platform.py b/net-p2p/py-bittorrent/files/patch-BitTorrent__platform.py
new file mode 100644
index 0000000..bdacd75
--- /dev/null
+++ b/net-p2p/py-bittorrent/files/patch-BitTorrent__platform.py
@@ -0,0 +1,11 @@
+--- BitTorrent/platform.py.orig	Mon Aug 15 20:06:05 2005
++++ BitTorrent/platform.py	Wed Aug 24 00:12:59 2005
+@@ -41,7 +41,7 @@
+     del wh, wv
+ 
+ def calc_unix_dirs():
+-    appdir = '%s-%s'%(app_name, version)
++    appdir = '%s'%(app_name)
+     ip = os.path.join('share', 'pixmaps', appdir)
+     dp = os.path.join('share', 'doc'    , appdir)
+     lp = os.path.join('share', 'locale')
diff --git a/net-p2p/py-bittorrent/files/patch-makei18n.sh b/net-p2p/py-bittorrent/files/patch-makei18n.sh
new file mode 100644
index 0000000..90b32d2
--- /dev/null
+++ b/net-p2p/py-bittorrent/files/patch-makei18n.sh
@@ -0,0 +1,9 @@
+--- makei18n.sh.orig	Sun Nov 20 23:17:39 2005
++++ makei18n.sh	Sun Nov 20 23:18:34 2005
+@@ -1,5 +1,5 @@
+ APP_NAME="bittorrent"
+-LANGUAGES=`python language_codes.py`
++LANGUAGES=`cd po; ls *.po | sed -e 's/\.po//'`
+ MESSAGES_PO="messages.pot"
+ 
+ rm -f $APP_NAME.lis
diff --git a/net-p2p/py-bittorrent/pkg-plist b/net-p2p/py-bittorrent/pkg-plist
index 9f94dc3..7127a04 100644
--- a/net-p2p/py-bittorrent/pkg-plist
+++ b/net-p2p/py-bittorrent/pkg-plist
@@ -1,12 +1,11 @@
-bin/btdownloadcurses.py
-bin/btdownloadheadless.py
-bin/btlaunchmany.py
-bin/btlaunchmanycurses.py
-bin/btmaketorrent.py
-bin/btreannounce.py
-bin/btrename.py
-bin/btshowmetainfo.py
-bin/bttrack.py
+bin/bittorrent-console
+bin/bittorrent-curses
+bin/bittorrent-tracker
+bin/changetracker-console
+bin/launchmany-console
+bin/launchmany-curses
+bin/maketorrent-console
+bin/torrentinfo-console
 %%PYTHON_SITELIBDIR%%/BitTorrent/Choker.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyo
@@ -37,15 +36,21 @@ bin/bttrack.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/GUI.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/GUI.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/GUI.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/GetTorrent.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/GetTorrent.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/GetTorrent.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/LaunchPath.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/LaunchPath.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/LaunchPath.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/OpenPath.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/OpenPath.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/OpenPath.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/NewVersion.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/NewVersion.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/NewVersion.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyo
@@ -58,6 +63,12 @@ bin/bttrack.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer_magic.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer_magic.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer_magic.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer_twisted.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer_twisted.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer_twisted.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.pyo
@@ -94,6 +105,9 @@ bin/bttrack.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/defaultargs.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/defaultargs.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/defaultargs.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/defer.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/defer.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/defer.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/download.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/download.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/download.pyo
@@ -115,6 +129,9 @@ bin/bttrack.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/platform.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/platform.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/platform.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/prefs.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/prefs.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/prefs.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyo
@@ -124,9 +141,160 @@ bin/bttrack.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/KRateLimiter.py
+%%PYTHON_SITELIBDIR%%/khashmir/KRateLimiter.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/KRateLimiter.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/__init__.py
+%%PYTHON_SITELIBDIR%%/khashmir/__init__.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/__init__.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/actions.py
+%%PYTHON_SITELIBDIR%%/khashmir/actions.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/actions.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/cache.py
+%%PYTHON_SITELIBDIR%%/khashmir/cache.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/cache.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/const.py
+%%PYTHON_SITELIBDIR%%/khashmir/const.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/const.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/hammerlock.py
+%%PYTHON_SITELIBDIR%%/khashmir/hammerlock.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/hammerlock.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/inserter.py
+%%PYTHON_SITELIBDIR%%/khashmir/inserter.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/inserter.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/khash.py
+%%PYTHON_SITELIBDIR%%/khashmir/khash.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/khash.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/khashmir.py
+%%PYTHON_SITELIBDIR%%/khashmir/khashmir.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/khashmir.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/knet.py
+%%PYTHON_SITELIBDIR%%/khashmir/knet.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/knet.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/knode.py
+%%PYTHON_SITELIBDIR%%/khashmir/knode.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/knode.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/krpc.py
+%%PYTHON_SITELIBDIR%%/khashmir/krpc.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/krpc.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/kstore.py
+%%PYTHON_SITELIBDIR%%/khashmir/kstore.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/kstore.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/ktable.py
+%%PYTHON_SITELIBDIR%%/khashmir/ktable.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/ktable.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/node.py
+%%PYTHON_SITELIBDIR%%/khashmir/node.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/node.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/setup.py
+%%PYTHON_SITELIBDIR%%/khashmir/setup.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/setup.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/test.py
+%%PYTHON_SITELIBDIR%%/khashmir/test.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/test.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/test_khashmir.py
+%%PYTHON_SITELIBDIR%%/khashmir/test_khashmir.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/test_khashmir.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/test_krpc.py
+%%PYTHON_SITELIBDIR%%/khashmir/test_krpc.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/test_krpc.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/test_kstore.py
+%%PYTHON_SITELIBDIR%%/khashmir/test_kstore.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/test_kstore.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/unet.py
+%%PYTHON_SITELIBDIR%%/khashmir/unet.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/unet.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/util.py
+%%PYTHON_SITELIBDIR%%/khashmir/util.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/util.pyo
+%%PYTHON_SITELIBDIR%%/khashmir/utkhashmir.py
+%%PYTHON_SITELIBDIR%%/khashmir/utkhashmir.pyc
+%%PYTHON_SITELIBDIR%%/khashmir/utkhashmir.pyo
+%%DATADIR%%/public.key
+share/locale/af/LC_MESSAGES/bittorrent.mo
+share/locale/ar/LC_MESSAGES/bittorrent.mo
+share/locale/bg/LC_MESSAGES/bittorrent.mo
+share/locale/ca/LC_MESSAGES/bittorrent.mo
+share/locale/cs/LC_MESSAGES/bittorrent.mo
+share/locale/da/LC_MESSAGES/bittorrent.mo
+share/locale/de/LC_MESSAGES/bittorrent.mo
+share/locale/eo/LC_MESSAGES/bittorrent.mo
+share/locale/es/LC_MESSAGES/bittorrent.mo
+share/locale/es_MX/LC_MESSAGES/bittorrent.mo
+share/locale/et/LC_MESSAGES/bittorrent.mo
+share/locale/eu/LC_MESSAGES/bittorrent.mo
+share/locale/fi/LC_MESSAGES/bittorrent.mo
+share/locale/fr/LC_MESSAGES/bittorrent.mo
+share/locale/ga/LC_MESSAGES/bittorrent.mo
+share/locale/gr/LC_MESSAGES/bittorrent.mo
+share/locale/he_IL/LC_MESSAGES/bittorrent.mo
+share/locale/hr/LC_MESSAGES/bittorrent.mo
+share/locale/hu/LC_MESSAGES/bittorrent.mo
+share/locale/hy/LC_MESSAGES/bittorrent.mo
+share/locale/it/LC_MESSAGES/bittorrent.mo
+share/locale/ja/LC_MESSAGES/bittorrent.mo
+share/locale/ka/LC_MESSAGES/bittorrent.mo
+share/locale/ko/LC_MESSAGES/bittorrent.mo
+share/locale/lt/LC_MESSAGES/bittorrent.mo
+share/locale/ml/LC_MESSAGES/bittorrent.mo
+share/locale/ms/LC_MESSAGES/bittorrent.mo
+share/locale/nb_NO/LC_MESSAGES/bittorrent.mo
+share/locale/nl/LC_MESSAGES/bittorrent.mo
+share/locale/pl/LC_MESSAGES/bittorrent.mo
+share/locale/pt/LC_MESSAGES/bittorrent.mo
+share/locale/pt_BR/LC_MESSAGES/bittorrent.mo
+share/locale/ro/LC_MESSAGES/bittorrent.mo
+share/locale/ru/LC_MESSAGES/bittorrent.mo
+share/locale/sk/LC_MESSAGES/bittorrent.mo
+share/locale/sl/LC_MESSAGES/bittorrent.mo
+share/locale/sq/LC_MESSAGES/bittorrent.mo
+share/locale/sv/LC_MESSAGES/bittorrent.mo
+share/locale/th/LC_MESSAGES/bittorrent.mo
+share/locale/tlh/LC_MESSAGES/bittorrent.mo
+share/locale/tr/LC_MESSAGES/bittorrent.mo
+share/locale/uk/LC_MESSAGES/bittorrent.mo
+share/locale/vi/LC_MESSAGES/bittorrent.mo
+share/locale/zh_CN/LC_MESSAGES/bittorrent.mo
+share/locale/zh_TW/LC_MESSAGES/bittorrent.mo
 %%GUI%%@dirrm share/pixmaps/BitTorrent/logo
-%%GUI%%@dirrm share/pixmaps/BitTorrent
+%%GUI%%@dirrm share/pixmaps/BitTorrent       
 %%GUI%%@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
+@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/uk 2>/dev/null || true
+@unexec rmdir %D/share/locale/tlh/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/tlh 2>/dev/null || true
+@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sl 2>/dev/null || true
+@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sk 2>/dev/null || true
+@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ro 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl 2>/dev/null || true
+@unexec rmdir %D/share/locale/nb_NO/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/nb_NO 2>/dev/null || true
+@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ko 2>/dev/null || true
+@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/hy 2>/dev/null || true
+@unexec rmdir %D/share/locale/he_IL/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/he_IL 2>/dev/null || true
+@unexec rmdir %D/share/locale/gr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/gr 2>/dev/null || true
+@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/fi 2>/dev/null || true
+@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ca 2>/dev/null || true
+@dirrm %%DATADIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/khashmir
 @dirrm %%PYTHON_SITELIBDIR%%/BitTorrent
 @unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
 @unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true