o Update to 4.20.0

o launchmany-{console,curses} do not work on this release

13 files changed, 340 insertions, 154 deletions

diff --git a/net-p2p/py-bittorrent/Makefile b/net-p2p/py-bittorrent/Makefile
index 8cbb9f2e0a88..f5f08d818325 100644
--- a/net-p2p/py-bittorrent/Makefile
+++ b/net-p2p/py-bittorrent/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	BitTorrent
-PORTVERSION=	4.4.0
-PORTREVISION=	4
+PORTVERSION=	4.20.0
 PORTEPOCH=	1
 CATEGORIES?=	net-p2p python
 MASTER_SITES=	http://download.bittorrent.com/dl/
@@ -29,12 +28,12 @@ CONFLICTS=	py??-*[Bb]it[Tt]orrent* py??-*[Bb]it[Tt]ornado* btqueue*
 
 .ifndef(NOPORTDOCS)
 PORTDOCS=	\
+		INSTALL.unix.txt \
 		LICENSE.txt \
 		README.txt \
 		TRACKERLESS.txt \
 		credits.txt \
-		credits-l10n.txt \
-		redirdonate.html
+		credits-l10n.txt
 .else
 EXTRA_PATCHES+=	${FILESDIR}/extra-noportdocs-setup.py
 .endif
@@ -53,40 +52,110 @@ PLIST_FILES+=	\
 		bin/bittorrent \
 		bin/maketorrent \
 		share/pixmaps/BitTorrent/bittorrent.ico \
-		share/pixmaps/BitTorrent/icons/default/abort.png \
-		share/pixmaps/BitTorrent/icons/default/broken.png \
-		share/pixmaps/BitTorrent/icons/default/finished.png \
-		share/pixmaps/BitTorrent/icons/default/info.png \
-		share/pixmaps/BitTorrent/icons/default/pause.png \
-		share/pixmaps/BitTorrent/icons/default/paused.png \
-		share/pixmaps/BitTorrent/icons/default/play.png \
-		share/pixmaps/BitTorrent/icons/default/queued.png \
-		share/pixmaps/BitTorrent/icons/default/remove.png \
-		share/pixmaps/BitTorrent/icons/default/running.png \
-		share/pixmaps/BitTorrent/icons/default/status-broken.png \
-		share/pixmaps/BitTorrent/icons/default/status-natted.png \
-		share/pixmaps/BitTorrent/icons/default/status-pre-natted.png \
-		share/pixmaps/BitTorrent/icons/default/status-running.png \
-		share/pixmaps/BitTorrent/icons/default/status-starting.png \
-		share/pixmaps/BitTorrent/icons/default/status-stopped.png \
-		share/pixmaps/BitTorrent/icons/default/trashcan.png \
-		share/pixmaps/BitTorrent/icons/old/broken.png \
-		share/pixmaps/BitTorrent/icons/old/finished.png \
-		share/pixmaps/BitTorrent/icons/old/info.png \
-		share/pixmaps/BitTorrent/icons/old/pause.png \
-		share/pixmaps/BitTorrent/icons/old/paused.png \
-		share/pixmaps/BitTorrent/icons/old/play.png \
-		share/pixmaps/BitTorrent/icons/old/queued.png \
-		share/pixmaps/BitTorrent/icons/old/remove.png \
-		share/pixmaps/BitTorrent/icons/old/running.png \
-		share/pixmaps/BitTorrent/icons/old/status-broken.png \
-		share/pixmaps/BitTorrent/icons/old/status-natted.png \
-		share/pixmaps/BitTorrent/icons/old/status-pre-natted.png \
-		share/pixmaps/BitTorrent/icons/old/status-running.png \
-		share/pixmaps/BitTorrent/icons/old/status-starting.png \
-		share/pixmaps/BitTorrent/icons/old/status-stopped.png \
-		share/pixmaps/BitTorrent/logo/bittorrent_32.png \
-		share/pixmaps/BitTorrent/logo/bittorrent_96.png
+		share/pixmaps/BitTorrent/flags/AE.png \
+		share/pixmaps/BitTorrent/flags/AR.png \
+		share/pixmaps/BitTorrent/flags/AT.png \
+		share/pixmaps/BitTorrent/flags/AU.png \
+		share/pixmaps/BitTorrent/flags/BE.png \
+		share/pixmaps/BitTorrent/flags/BG.png \
+		share/pixmaps/BitTorrent/flags/BR.png \
+		share/pixmaps/BitTorrent/flags/CA.png \
+		share/pixmaps/BitTorrent/flags/CH.png \
+		share/pixmaps/BitTorrent/flags/CL.png \
+		share/pixmaps/BitTorrent/flags/CN.png \
+		share/pixmaps/BitTorrent/flags/CO.png \
+		share/pixmaps/BitTorrent/flags/CY.png \
+		share/pixmaps/BitTorrent/flags/CZ.png \
+		share/pixmaps/BitTorrent/flags/DE.png \
+		share/pixmaps/BitTorrent/flags/DK.png \
+		share/pixmaps/BitTorrent/flags/ES.png \
+		share/pixmaps/BitTorrent/flags/EU.png \
+		share/pixmaps/BitTorrent/flags/FI.png \
+		share/pixmaps/BitTorrent/flags/FR.png \
+		share/pixmaps/BitTorrent/flags/GB.png \
+		share/pixmaps/BitTorrent/flags/GR.png \
+		share/pixmaps/BitTorrent/flags/GT.png \
+		share/pixmaps/BitTorrent/flags/HK.png \
+		share/pixmaps/BitTorrent/flags/HU.png \
+		share/pixmaps/BitTorrent/flags/IT.png \
+		share/pixmaps/BitTorrent/flags/JP.png \
+		share/pixmaps/BitTorrent/flags/KR.png \
+		share/pixmaps/BitTorrent/flags/KW.png \
+		share/pixmaps/BitTorrent/flags/LT.png \
+		share/pixmaps/BitTorrent/flags/LV.png \
+		share/pixmaps/BitTorrent/flags/MX.png \
+		share/pixmaps/BitTorrent/flags/NA.png \
+		share/pixmaps/BitTorrent/flags/NL.png \
+		share/pixmaps/BitTorrent/flags/NO.png \
+		share/pixmaps/BitTorrent/flags/PR.png \
+		share/pixmaps/BitTorrent/flags/PT.png \
+		share/pixmaps/BitTorrent/flags/RU.png \
+		share/pixmaps/BitTorrent/flags/SE.png \
+		share/pixmaps/BitTorrent/flags/SG.png \
+		share/pixmaps/BitTorrent/flags/SI.png \
+		share/pixmaps/BitTorrent/flags/TW.png \
+		share/pixmaps/BitTorrent/flags/US.png \
+		share/pixmaps/BitTorrent/flags/YU.png \
+		share/pixmaps/BitTorrent/flags/ZA.png \
+		share/pixmaps/BitTorrent/flags/noimage.png \
+		share/pixmaps/BitTorrent/flags/unknown.png \
+		share/pixmaps/BitTorrent/logo/banner.png \
+		share/pixmaps/BitTorrent/logo/bittorrent_icon.png \
+		share/pixmaps/BitTorrent/logo/bittorrent_icon_16.png \
+		share/pixmaps/BitTorrent/logo/bittorrent_icon_24.png \
+		share/pixmaps/BitTorrent/logo/bittorrent_icon_32.png \
+		share/pixmaps/BitTorrent/logo/bittorrent_icon_48.png \
+		share/pixmaps/BitTorrent/themes/default/add_16.png \
+		share/pixmaps/BitTorrent/themes/default/add_24.png \
+		share/pixmaps/BitTorrent/themes/default/add_32.png \
+		share/pixmaps/BitTorrent/themes/default/fileops/first_16.png \
+		share/pixmaps/BitTorrent/themes/default/fileops/first_24.png \
+		share/pixmaps/BitTorrent/themes/default/fileops/first_32.png \
+		share/pixmaps/BitTorrent/themes/default/fileops/never_16.png \
+		share/pixmaps/BitTorrent/themes/default/fileops/never_24.png \
+		share/pixmaps/BitTorrent/themes/default/fileops/never_32.png \
+		share/pixmaps/BitTorrent/themes/default/fileops/normal_16.png \
+		share/pixmaps/BitTorrent/themes/default/fileops/normal_24.png \
+		share/pixmaps/BitTorrent/themes/default/fileops/normal_32.png \
+		share/pixmaps/BitTorrent/themes/default/progressbar.png \
+		share/pixmaps/BitTorrent/themes/default/search_16.png \
+		share/pixmaps/BitTorrent/themes/default/search_24.png \
+		share/pixmaps/BitTorrent/themes/default/search_32.png \
+		share/pixmaps/BitTorrent/themes/default/settings_16.png \
+		share/pixmaps/BitTorrent/themes/default/settings_24.png \
+		share/pixmaps/BitTorrent/themes/default/settings_32.png \
+		share/pixmaps/BitTorrent/themes/default/statuslight/broken.png \
+		share/pixmaps/BitTorrent/themes/default/statuslight/natted.png \
+		share/pixmaps/BitTorrent/themes/default/statuslight/pre-natted.png \
+		share/pixmaps/BitTorrent/themes/default/statuslight/running.png \
+		share/pixmaps/BitTorrent/themes/default/statuslight/starting.png \
+		share/pixmaps/BitTorrent/themes/default/statuslight/stopped.png \
+		share/pixmaps/BitTorrent/themes/default/torrentops/info_16.png \
+		share/pixmaps/BitTorrent/themes/default/torrentops/info_24.png \
+		share/pixmaps/BitTorrent/themes/default/torrentops/info_32.png \
+		share/pixmaps/BitTorrent/themes/default/torrentops/launch_16.png \
+		share/pixmaps/BitTorrent/themes/default/torrentops/launch_24.png \
+		share/pixmaps/BitTorrent/themes/default/torrentops/launch_32.png \
+		share/pixmaps/BitTorrent/themes/default/torrentops/remove_16.png \
+		share/pixmaps/BitTorrent/themes/default/torrentops/remove_24.png \
+		share/pixmaps/BitTorrent/themes/default/torrentops/remove_32.png \
+		share/pixmaps/BitTorrent/themes/default/torrentops/resume_16.png \
+		share/pixmaps/BitTorrent/themes/default/torrentops/resume_24.png \
+		share/pixmaps/BitTorrent/themes/default/torrentops/resume_32.png \
+		share/pixmaps/BitTorrent/themes/default/torrentops/stop_16.png \
+		share/pixmaps/BitTorrent/themes/default/torrentops/stop_24.png \
+		share/pixmaps/BitTorrent/themes/default/torrentops/stop_32.png \
+		share/pixmaps/BitTorrent/themes/default/torrentstate/complete.png \
+		share/pixmaps/BitTorrent/themes/default/torrentstate/created.png \
+		share/pixmaps/BitTorrent/themes/default/torrentstate/downloading.png \
+		share/pixmaps/BitTorrent/themes/default/torrentstate/error.png \
+		share/pixmaps/BitTorrent/themes/default/torrentstate/finishing.png \
+		share/pixmaps/BitTorrent/themes/default/torrentstate/force-seed.png \
+		share/pixmaps/BitTorrent/themes/default/torrentstate/paused.png \
+		share/pixmaps/BitTorrent/themes/default/torrentstate/seeding.png \
+		share/pixmaps/BitTorrent/themes/default/torrentstate/starting.png \
+		share/pixmaps/BitTorrent/themes/default/torrentstate/stopped.png \
+		share/pixmaps/BitTorrent/themes/default/torrentstate/unknown.png
 
 PLIST_SUB+=	\
 		GUI=""
@@ -113,6 +182,12 @@ EXTRA_PATCHES+=	\
 		${FILESDIR}/extra-psyco-patch-torrentinfo-console.py
 .endif
 
+# public.key
+PLIST_DIRS+=	\
+		%%DATADIR%%
+PLIST_FILES+=	\
+		%%DATADIR%%/public.key
+
 pre-everything::
 .ifndef(WITHOUT_GUI)
 	@${ECHO_MSG} '===> Define WITHOUT_GUI to disable GUI installation'
@@ -136,9 +211,9 @@ post-patch:
 post-install:
 # set proper permissions
 	@${CHMOD} -R ${SHAREMODE} \
-		${PREFIX}/${PYTHON_SITELIBDIR:S|^${PYTHONBASE}/||}/BitTorrent
-	@${CHMOD} ${SHAREMODE} ${PREFIX}/${PYTHON_SITELIBDIR:S|^${PYTHONBASE}/||}/BitTorrent
-	@${CHMOD} a+x ${PREFIX}/${PYTHON_SITELIBDIR:S|^${PYTHONBASE}/||}/BitTorrent
+		${PYTHONPREFIX_SITELIBDIR}/BitTorrent
+	@${CHMOD} ${SHAREMODE} ${PYTHONPREFIX_SITELIBDIR}/BitTorrent
+	@${CHMOD} -R a+X ${PYTHONPREFIX_SITELIBDIR}/BitTorrent
 .ifndef(WITHOUT_GUI)
 # pixmaps
 	@${CHMOD} -R ${SHAREMODE} \
@@ -150,6 +225,8 @@ post-install:
 # docs
 	@${CHMOD} -R ${SHAREMODE} \
 		${DOCSDIR}/*
+# install missing doc
+	@${INSTALL_DATA} ${WRKSRC}/TRACKERLESS.txt ${DOCSDIR}
 .endif
 # public.key
 	@${MKDIR} ${DATADIR}
diff --git a/net-p2p/py-bittorrent/distinfo b/net-p2p/py-bittorrent/distinfo
index f6c54251b260..2207cb72233e 100644
--- a/net-p2p/py-bittorrent/distinfo
+++ b/net-p2p/py-bittorrent/distinfo
@@ -1,3 +1,3 @@
-MD5 (BitTorrent-4.4.0.tar.gz) = 74d4b48202c28f0b27e989b6d5f5b214
-SHA256 (BitTorrent-4.4.0.tar.gz) = 1c9338ed384240258b5733a814670e2dee8ca2fb65babf3f0ca07978707301e0
-SIZE (BitTorrent-4.4.0.tar.gz) = 1255281
+MD5 (BitTorrent-4.20.0.tar.gz) = eb4568ec465421b03827bd5665395a62
+SHA256 (BitTorrent-4.20.0.tar.gz) = 70a78b693336cca4723f3a10eedc97eb88be7b20320f90b3bfee640ea4c14970
+SIZE (BitTorrent-4.20.0.tar.gz) = 2372371
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 85e44986d566..d26926ac5560 100644
--- a/net-p2p/py-bittorrent/files/extra-nogui-patch-setup.py
+++ b/net-p2p/py-bittorrent/files/extra-nogui-patch-setup.py
@@ -1,23 +1,17 @@
---- setup.py.orig	Tue Jan 31 18:17:23 2006
-+++ setup.py	Wed Feb  1 21:41:07 2006
-@@ -38,8 +38,8 @@
- os.rmdir('FOO')
- # done detecting case-insensitive filesystem
- 
+--- setup.py.orig	Sat Jun 24 16:54:04 2006
++++ setup.py	Sat Jun 24 16:54:55 2006
+@@ -42,2 +42,2 @@
 -symlinks = ["bittorrent" , "bittorrent-curses", "bittorrent-console",
 -           "maketorrent",                      "maketorrent-console",
 +symlinks = ["bittorrent-curses", "bittorrent-console",
-+            "maketorrent-console",
-                           "launchmany-curses", "launchmany-console",
-                                                "changetracker-console",
-                                                "torrentinfo-console",
-@@ -68,7 +68,5 @@
-         translations.append((os.path.join(locale_root, l, 'LC_MESSAGES'), 
-                              [path,]))
- 
--data_files = [ (img_root        , glob.glob('images/*png')+['images/bittorrent.ico',]),
--               (img_root+'/logo', glob.glob('images/logo/bittorrent_[0-9]*.png'     )),
--               (img_root+'/icons/default', glob.glob('images/icons/default/*.png'   )),
--               (img_root+'/icons/old'    , glob.glob('images/icons/old/*.png'       )),
-+data_files = [ 
-+
++           "maketorrent-console",
+@@ -68,1 +68,0 @@
+-    (img_root, ['images/bittorrent.ico',]),
+@@ -74,7 +74,0 @@
+-for d in ('flags', 'logo', 'themes/default',
+-          'themes/default/statuslight', 'themes/default/torrentstate',
+-          'themes/default/torrentops' , 'themes/default/fileops'     ,):
+-    data_files.append(
+-        (os.path.join(img_root, d),
+-         glob.glob(os.path.join('images', d, '*.png')))
+-        )
diff --git a/net-p2p/py-bittorrent/files/extra-noportdocs-setup.py b/net-p2p/py-bittorrent/files/extra-noportdocs-setup.py
index 64e39642de55..8a4d838e55db 100644
--- a/net-p2p/py-bittorrent/files/extra-noportdocs-setup.py
+++ b/net-p2p/py-bittorrent/files/extra-noportdocs-setup.py
@@ -1,8 +1,6 @@
---- 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',
+--- setup.py.orig	Sat Jun 24 16:55:50 2006
++++ setup.py	Sat Jun 24 16:57:02 2006
+@@ -69,3 +69,0 @@
+-    (doc_root, ['credits.txt', 'credits-l10n.txt', 'LICENSE.txt', 'README.txt',
 -
--                                   ]       ),
+-                'INSTALL.unix.txt'] + extra_docs),
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 17e63fdd1a00..19a0d8acf7a7 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
@@ -1,5 +1,5 @@
---- bittorrent-console.py	Wed Oct 12 01:08:15 2005
-+++ bittorrent-console.py	Wed Oct 12 07:57:46 2005
+--- bittorrent-console.py.orig	Tue Jun  6 20:43:25 2006
++++ bittorrent-console.py	Thu Jun 15 14:44:32 2006
 @@ -14,6 +14,13 @@
  
  from __future__ import division
@@ -11,6 +11,6 @@
 +except:
 +  pass
 +
- from BitTorrent.platform import install_translation
- install_translation()
+ from BitTorrent.translation import _
  
+ import pdb
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 b46155e5bcb9..54df94ae3b13 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
@@ -1,5 +1,5 @@
---- bittorrent-curses.py	Wed Oct 12 01:08:15 2005
-+++ bittorrent-curses.py	Wed Oct 12 07:57:28 2005
+--- bittorrent-curses.py.orig	Tue Jun  6 20:43:25 2006
++++ bittorrent-curses.py	Thu Jun 15 14:45:05 2006
 @@ -15,6 +15,13 @@
  
  from __future__ import division
@@ -11,6 +11,6 @@
 +except:
 +  pass
 +
- from BitTorrent.platform import install_translation
- install_translation()
+ from BitTorrent.translation import _
  
+ SPEW_SCROLL_RATE = 1
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 d4d8ba81d578..1c705e8f7928 100644
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent.py
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent.py
@@ -1,5 +1,5 @@
---- bittorrent.py	Wed Oct 12 01:08:18 2005
-+++ bittorrent.py	Wed Oct 12 07:58:12 2005
+--- bittorrent.py.orig	Tue May 16 20:59:49 2006
++++ bittorrent.py	Thu May 18 23:04:01 2006
 @@ -14,6 +14,13 @@
  
  from __future__ import division
@@ -11,6 +11,6 @@
 +except:
 +  pass
 +
- from BitTorrent.platform import install_translation
- install_translation()
- 
+ 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 8e8ded07a1f0..7828bb958cc9 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
@@ -1,5 +1,5 @@
---- changetracker-console.py	Wed Oct 12 01:08:18 2005
-+++ changetracker-console.py	Wed Oct 12 07:58:18 2005
+--- changetracker-console.py.orig	Tue Jun  6 20:43:34 2006
++++ changetracker-console.py	Thu Jun 15 14:45:47 2006
 @@ -12,6 +12,13 @@
  
  # Written by Henry 'Pi' James and Bram Cohen
@@ -11,6 +11,6 @@
 +except:
 +  pass
 +
- from BitTorrent.platform import install_translation
- install_translation()
+ 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 6f73f927141b..5d5e66a64ae5 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,5 +1,5 @@
---- launchmany-curses.py	Wed Oct 12 01:08:27 2005
-+++ launchmany-curses.py	Wed Oct 12 07:58:27 2005
+--- 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 @@
  
  from __future__ import division
@@ -11,6 +11,6 @@
 +except:
 +  pass
 +
- from BitTorrent.platform import install_translation
- install_translation()
+ from BitTorrent.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 9675c99cda69..d2d3527d7479 100644
--- a/net-p2p/py-bittorrent/files/extra-psyco-patch-maketorrent.py
+++ b/net-p2p/py-bittorrent/files/extra-psyco-patch-maketorrent.py
@@ -1,5 +1,5 @@
---- maketorrent.py	Wed Oct 12 01:08:27 2005
-+++ maketorrent.py	Wed Oct 12 07:58:35 2005
+--- maketorrent.py.orig	Tue Jun  6 20:43:43 2006
++++ maketorrent.py	Thu Jun 15 14:46:45 2006
 @@ -14,6 +14,13 @@
  
  from __future__ import division
@@ -11,6 +11,6 @@
 +except:
 +  pass
 +
- from BitTorrent.platform import install_translation
- install_translation()
+ from BitTorrent.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 bf6128eb8b65..a78b3c2fb46d 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
@@ -1,5 +1,5 @@
---- torrentinfo-console.py	Wed Oct 12 01:08:50 2005
-+++ torrentinfo-console.py	Wed Oct 12 07:58:48 2005
+--- torrentinfo-console.py.orig	Tue Jun  6 20:44:39 2006
++++ torrentinfo-console.py	Thu Jun 15 14:47:13 2006
 @@ -12,6 +12,13 @@
  
  # Written by Henry 'Pi' James, Loring Holden and Matt Chisholm
@@ -11,6 +11,6 @@
 +except:
 +  pass
 +
- from BitTorrent.platform import install_translation
- install_translation()
+ from BitTorrent.translation import _
  
+ from sys import *
diff --git a/net-p2p/py-bittorrent/files/patch-BitTorrent::defaultargs.py b/net-p2p/py-bittorrent/files/patch-BitTorrent::defaultargs.py
index bd9e57ccacc6..3d8edc8c7559 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	Wed Jan 11 19:16:54 2006
-+++ BitTorrent/defaultargs.py	Wed Jan 11 19:17:16 2006
-@@ -33,6 +33,8 @@
+--- BitTorrent/defaultargs.py.orig	Sat Jun 24 15:17:24 2006
++++ BitTorrent/defaultargs.py	Sat Jun 24 15:17:33 2006
+@@ -20,6 +20,8 @@
  if os.name == 'posix':
      if os.uname()[0] in ['Darwin']:
-         BAD_LIBC_WORKAROUND_DEFAULT = MYTRUE
+         BAD_LIBC_WORKAROUND_DEFAULT = True
 +    if os.uname()[0] in ['FreeBSD']:
-+        BAD_LIBC_WORKAROUND_DEFAULT = MYTRUE
++        BAD_LIBC_WORKAROUND_DEFAULT = True
  
- MIN_INCOMPLETE = 100
- if os.name == 'nt':
+ MAX_INCOMPLETE = 100
+ MAX_FILES_OPEN = 50
diff --git a/net-p2p/py-bittorrent/pkg-plist b/net-p2p/py-bittorrent/pkg-plist
index 6186b365ba29..572137a43521 100644
--- a/net-p2p/py-bittorrent/pkg-plist
+++ b/net-p2p/py-bittorrent/pkg-plist
@@ -6,6 +6,12 @@ bin/launchmany-console
 bin/launchmany-curses
 bin/maketorrent-console
 bin/torrentinfo-console
+%%PYTHON_SITELIBDIR%%/BitTorrent/AutoUpdateButler.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/AutoUpdateButler.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/AutoUpdateButler.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/BandwidthManager.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/BandwidthManager.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/BandwidthManager.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/BeautifulSupe.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/BeautifulSupe.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/BeautifulSupe.pyo
@@ -15,69 +21,126 @@ bin/torrentinfo-console
 %%PYTHON_SITELIBDIR%%/BitTorrent/ClientIdentifier.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/ClientIdentifier.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/ClientIdentifier.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/ConnectionManager.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/ConnectionManager.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/ConnectionManager.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/ConnectionRateLimitReactor.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/ConnectionRateLimitReactor.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/ConnectionRateLimitReactor.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/Connector.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/Connector.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/Connector.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/ConvertedMetainfo.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/ConvertedMetainfo.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/ConvertedMetainfo.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Desktop.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Desktop.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Desktop.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Encoder.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Encoder.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Encoder.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/GUI.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/GUI.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/GUI.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/DictWithLists.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/DictWithLists.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/DictWithLists.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/Download.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/Download.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/Download.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/FeedManager.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/FeedManager.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/FeedManager.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/Bling.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/Bling.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/Bling.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/CustomWidgets.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/CustomWidgets.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/CustomWidgets.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/DownloadManager.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/DownloadManager.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/DownloadManager.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/LanguageSettings.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/LanguageSettings.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/LanguageSettings.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/ListCtrl.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/ListCtrl.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/ListCtrl.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/OpenDialog.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/OpenDialog.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/OpenDialog.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/SettingsWindow.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/SettingsWindow.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/SettingsWindow.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/StatusLight.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/StatusLight.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/StatusLight.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/ToolTip.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/ToolTip.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/ToolTip.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/__init__.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/__init__.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx/__init__.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/GetTorrent.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/GetTorrent.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/GetTorrent.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPConnector.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPConnector.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPConnector.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/HostIP.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/HostIP.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/HostIP.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/IPC.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/IPC.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/IPC.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/LaunchPath.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/LaunchPath.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/LaunchPath.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/Lists.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/Lists.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/Lists.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/LocalDiscovery.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/LocalDiscovery.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/LocalDiscovery.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/MultiDownload.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/MultiDownload.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/MultiDownload.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/MultiTorrent.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/MultiTorrent.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/MultiTorrent.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/NatTraversal.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/NatTraversal.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/NatTraversal.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/NewRateLimiter.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/NewRateLimiter.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/NewRateLimiter.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/NewVersion.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/NewVersion.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/NewVersion.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/OldTorrentQueue.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/OldTorrentQueue.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/OldTorrentQueue.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/PeerID.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/PeerID.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/PeerID.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/PieceSetBuckets.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/PieceSetBuckets.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/PieceSetBuckets.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/PluginSupport.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/PluginSupport.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/PluginSupport.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/RTTMonitor.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/RTTMonitor.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/RTTMonitor.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/RateLimiter.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/RateLimiter.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/RateLimiter.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.pyo
-%%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
@@ -93,18 +156,48 @@ bin/torrentinfo-console
 %%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/TorrentQueue.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/TorrentQueue.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/TorrentQueue.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/TrayIcon.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/TrayIcon.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/TrayIcon.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/Storage_IOCP.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/Storage_IOCP.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/Storage_IOCP.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/Storage_base.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/Storage_base.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/Storage_base.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/Storage_threadpool.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/Storage_threadpool.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/Storage_threadpool.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/ThreadProxy.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/ThreadProxy.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/ThreadProxy.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/Torrent.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/Torrent.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/Torrent.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/TorrentButler.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/TorrentButler.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/TorrentButler.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/TorrentPolicy.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/TorrentPolicy.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/TorrentPolicy.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/TorrentStats.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/TorrentStats.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/TorrentStats.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/UI.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/UI.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/UI.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/Upload.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/Upload.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/Upload.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/XMultiTorrent.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/XMultiTorrent.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/XMultiTorrent.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/XTorrentQueue.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/XTorrentQueue.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/XTorrentQueue.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/__init__.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/__init__.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/__init__.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/atexit_threads.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/atexit_threads.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/atexit_threads.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/bencode.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/bencode.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/bencode.pyo
@@ -123,9 +216,15 @@ bin/torrentinfo-console
 %%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
+%%PYTHON_SITELIBDIR%%/BitTorrent/flock_mutex.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/flock_mutex.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/flock_mutex.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/hash.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/hash.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/hash.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/ipfree.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/ipfree.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/ipfree.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/language.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/language.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/language.pyo
@@ -150,15 +249,30 @@ bin/torrentinfo-console
 %%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
+%%PYTHON_SITELIBDIR%%/BitTorrent/pykill.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/pykill.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/pykill.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/sparse_set.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/sparse_set.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/sparse_set.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/stackthreading.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/stackthreading.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/stackthreading.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/track.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/track.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/track.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/translation.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/translation.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/translation.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/yielddefer.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/yielddefer.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/yielddefer.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyo
+%%PYTHON_SITELIBDIR%%/Zeroconf.py
+%%PYTHON_SITELIBDIR%%/Zeroconf.pyc
+%%PYTHON_SITELIBDIR%%/Zeroconf.pyo
 %%PYTHON_SITELIBDIR%%/khashmir/KRateLimiter.py
 %%PYTHON_SITELIBDIR%%/khashmir/KRateLimiter.pyc
 %%PYTHON_SITELIBDIR%%/khashmir/KRateLimiter.pyo
@@ -228,7 +342,6 @@ bin/torrentinfo-console
 %%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/bg/LC_MESSAGES/bittorrent.mo
 share/locale/ca/LC_MESSAGES/bittorrent.mo
@@ -259,6 +372,16 @@ share/locale/tr/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/themes/default/torrentstate
+%%GUI%%@dirrm share/pixmaps/BitTorrent/themes/default/torrentops
+%%GUI%%@dirrm share/pixmaps/BitTorrent/themes/default/statuslight
+%%GUI%%@dirrm share/pixmaps/BitTorrent/themes/default/fileops
+%%GUI%%@dirrm share/pixmaps/BitTorrent/themes/default
+%%GUI%%@dirrm share/pixmaps/BitTorrent/themes
+%%GUI%%@dirrm share/pixmaps/BitTorrent/logo
+%%GUI%%@dirrm share/pixmaps/BitTorrent/flags
+%%GUI%%@dirrm share/pixmaps/BitTorrent
+%%GUI%%@dirrmtry share/pixmaps
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_CN/LC_MESSAGES
@@ -283,14 +406,8 @@ share/locale/zh_TW/LC_MESSAGES/bittorrent.mo
 @dirrmtry share/locale/cs
 @dirrmtry share/locale/ca/LC_MESSAGES
 @dirrmtry share/locale/ca
-%%GUI%%@dirrm share/pixmaps/BitTorrent/logo
-%%GUI%%@dirrm share/pixmaps/BitTorrent/icons/old
-%%GUI%%@dirrm share/pixmaps/BitTorrent/icons/default
-%%GUI%%@dirrm share/pixmaps/BitTorrent/icons
-%%GUI%%@dirrm share/pixmaps/BitTorrent
-%%GUI%%@dirrmtry share/pixmaps
-@dirrm %%DATADIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/khashmir
+@dirrm %%PYTHON_SITELIBDIR%%/BitTorrent/GUI_wx
 @dirrm %%PYTHON_SITELIBDIR%%/BitTorrent
 @dirrmtry %%PYTHON_SITELIBDIR%%
 @dirrmtry %%PYTHON_LIBDIR%%