aboutsummaryrefslogtreecommitdiffstats
path: root/net-p2p
diff options
context:
space:
mode:
authorlioux <lioux@FreeBSD.org>2006-06-25 04:20:37 +0800
committerlioux <lioux@FreeBSD.org>2006-06-25 04:20:37 +0800
commit4c3d704d4600440e408addbf20a642dd00af44db (patch)
treed0d752dc65bc949f8817f7526bb56c70a3e7f722 /net-p2p
parent57b4467d022cfb4fbdb6f651f5c61a5dc7d8919c (diff)
downloadfreebsd-ports-graphics-4c3d704d4600440e408addbf20a642dd00af44db.tar.gz
freebsd-ports-graphics-4c3d704d4600440e408addbf20a642dd00af44db.tar.zst
freebsd-ports-graphics-4c3d704d4600440e408addbf20a642dd00af44db.zip
o Update to 4.20.0
o This version has been specially patched to enable launchmany-{console,curses}. This is experimental
Diffstat (limited to 'net-p2p')
-rw-r--r--net-p2p/py-bittorrent-devel/Makefile160
-rw-r--r--net-p2p/py-bittorrent-devel/distinfo6
-rw-r--r--net-p2p/py-bittorrent-devel/files/extra-nogui-patch-setup.py34
-rw-r--r--net-p2p/py-bittorrent-devel/files/extra-noportdocs-setup.py12
-rw-r--r--net-p2p/py-bittorrent-devel/files/extra-psyco-patch-bittorrent-console.py8
-rw-r--r--net-p2p/py-bittorrent-devel/files/extra-psyco-patch-bittorrent-curses.py8
-rw-r--r--net-p2p/py-bittorrent-devel/files/extra-psyco-patch-bittorrent.py10
-rw-r--r--net-p2p/py-bittorrent-devel/files/extra-psyco-patch-changetracker-console.py8
-rw-r--r--net-p2p/py-bittorrent-devel/files/extra-psyco-patch-launchmany-curses.py8
-rw-r--r--net-p2p/py-bittorrent-devel/files/extra-psyco-patch-maketorrent.py8
-rw-r--r--net-p2p/py-bittorrent-devel/files/extra-psyco-patch-torrentinfo-console.py8
-rw-r--r--net-p2p/py-bittorrent-devel/files/patch-BitTorrent::defaultargs.py11
-rw-r--r--net-p2p/py-bittorrent-devel/files/patch-BitTorrent__HTTPHandler.py11
-rw-r--r--net-p2p/py-bittorrent-devel/files/patch-BitTorrent__NewVersion.py8
-rw-r--r--net-p2p/py-bittorrent-devel/files/patch-BitTorrent__OldTorrentQueue.py11
-rw-r--r--net-p2p/py-bittorrent-devel/files/patch-BitTorrent__Rerequester.py22
-rw-r--r--net-p2p/py-bittorrent-devel/files/patch-BitTorrent__Torrent.py11
-rw-r--r--net-p2p/py-bittorrent-devel/files/patch-BitTorrent__defaultargs.py22
-rw-r--r--net-p2p/py-bittorrent-devel/files/patch-BitTorrent__launchmanycore.py276
-rw-r--r--net-p2p/py-bittorrent-devel/files/patch-BitTorrent__platform.py (renamed from net-p2p/py-bittorrent-devel/files/patch-BitTorrent::platform.py)8
-rw-r--r--net-p2p/py-bittorrent-devel/files/patch-launchmany-console.py16
-rw-r--r--net-p2p/py-bittorrent-devel/files/patch-launchmany-curses.py73
-rw-r--r--net-p2p/py-bittorrent-devel/pkg-plist211
23 files changed, 784 insertions, 166 deletions
diff --git a/net-p2p/py-bittorrent-devel/Makefile b/net-p2p/py-bittorrent-devel/Makefile
index c9d8abb7aea..b0933eb96a3 100644
--- a/net-p2p/py-bittorrent-devel/Makefile
+++ b/net-p2p/py-bittorrent-devel/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/
@@ -24,6 +23,7 @@ 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*
@@ -32,12 +32,12 @@ NO_LATEST_LINK= yes
.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
@@ -56,40 +56,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=""
@@ -116,6 +186,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'
@@ -139,9 +215,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} \
@@ -153,6 +229,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-devel/distinfo b/net-p2p/py-bittorrent-devel/distinfo
index f6c54251b26..2207cb72233 100644
--- a/net-p2p/py-bittorrent-devel/distinfo
+++ b/net-p2p/py-bittorrent-devel/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-devel/files/extra-nogui-patch-setup.py b/net-p2p/py-bittorrent-devel/files/extra-nogui-patch-setup.py
index 85e44986d56..d26926ac556 100644
--- a/net-p2p/py-bittorrent-devel/files/extra-nogui-patch-setup.py
+++ b/net-p2p/py-bittorrent-devel/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-devel/files/extra-noportdocs-setup.py b/net-p2p/py-bittorrent-devel/files/extra-noportdocs-setup.py
index 64e39642de5..8a4d838e55d 100644
--- a/net-p2p/py-bittorrent-devel/files/extra-noportdocs-setup.py
+++ b/net-p2p/py-bittorrent-devel/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-devel/files/extra-psyco-patch-bittorrent-console.py b/net-p2p/py-bittorrent-devel/files/extra-psyco-patch-bittorrent-console.py
index 17e63fdd1a0..19a0d8acf7a 100644
--- a/net-p2p/py-bittorrent-devel/files/extra-psyco-patch-bittorrent-console.py
+++ b/net-p2p/py-bittorrent-devel/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-devel/files/extra-psyco-patch-bittorrent-curses.py b/net-p2p/py-bittorrent-devel/files/extra-psyco-patch-bittorrent-curses.py
index b46155e5bcb..54df94ae3b1 100644
--- a/net-p2p/py-bittorrent-devel/files/extra-psyco-patch-bittorrent-curses.py
+++ b/net-p2p/py-bittorrent-devel/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-devel/files/extra-psyco-patch-bittorrent.py b/net-p2p/py-bittorrent-devel/files/extra-psyco-patch-bittorrent.py
index d4d8ba81d57..1c705e8f792 100644
--- a/net-p2p/py-bittorrent-devel/files/extra-psyco-patch-bittorrent.py
+++ b/net-p2p/py-bittorrent-devel/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-devel/files/extra-psyco-patch-changetracker-console.py b/net-p2p/py-bittorrent-devel/files/extra-psyco-patch-changetracker-console.py
index 8e8ded07a1f..7828bb958cc 100644
--- a/net-p2p/py-bittorrent-devel/files/extra-psyco-patch-changetracker-console.py
+++ b/net-p2p/py-bittorrent-devel/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-devel/files/extra-psyco-patch-launchmany-curses.py b/net-p2p/py-bittorrent-devel/files/extra-psyco-patch-launchmany-curses.py
index 6f73f927141..5d5e66a64ae 100644
--- a/net-p2p/py-bittorrent-devel/files/extra-psyco-patch-launchmany-curses.py
+++ b/net-p2p/py-bittorrent-devel/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-devel/files/extra-psyco-patch-maketorrent.py b/net-p2p/py-bittorrent-devel/files/extra-psyco-patch-maketorrent.py
index 9675c99cda6..d2d3527d747 100644
--- a/net-p2p/py-bittorrent-devel/files/extra-psyco-patch-maketorrent.py
+++ b/net-p2p/py-bittorrent-devel/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-devel/files/extra-psyco-patch-torrentinfo-console.py b/net-p2p/py-bittorrent-devel/files/extra-psyco-patch-torrentinfo-console.py
index bf6128eb8b6..a78b3c2fb46 100644
--- a/net-p2p/py-bittorrent-devel/files/extra-psyco-patch-torrentinfo-console.py
+++ b/net-p2p/py-bittorrent-devel/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-devel/files/patch-BitTorrent::defaultargs.py b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent::defaultargs.py
deleted file mode 100644
index bd9e57ccacc..00000000000
--- a/net-p2p/py-bittorrent-devel/files/patch-BitTorrent::defaultargs.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 @@
- if os.name == 'posix':
- if os.uname()[0] in ['Darwin']:
- BAD_LIBC_WORKAROUND_DEFAULT = MYTRUE
-+ if os.uname()[0] in ['FreeBSD']:
-+ BAD_LIBC_WORKAROUND_DEFAULT = MYTRUE
-
- MIN_INCOMPLETE = 100
- if os.name == 'nt':
diff --git a/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__HTTPHandler.py b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__HTTPHandler.py
new file mode 100644
index 00000000000..5d238869dd4
--- /dev/null
+++ b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__HTTPHandler.py
@@ -0,0 +1,11 @@
+--- ./BitTorrent/HTTPHandler.py.orig Mon Jun 12 22:45:48 2006
++++ ./BitTorrent/HTTPHandler.py Wed Jun 21 23:57:08 2006
+@@ -19,7 +19,7 @@
+
+
+
+-DEBUG = True
++DEBUG = False
+
+ weekdays = [_("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat"), _("Sun")]
+
diff --git a/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__NewVersion.py b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__NewVersion.py
index fcb590ce108..7834b546108 100644
--- a/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__NewVersion.py
+++ b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__NewVersion.py
@@ -1,7 +1,7 @@
---- 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))
+--- ./BitTorrent/NewVersion.py.orig Mon Jun 12 22:45:49 2006
++++ ./BitTorrent/NewVersion.py Wed Jun 21 23:57:08 2006
+@@ -170,7 +170,7 @@
+ self.threadwrap(self.errorfunc, logging.WARNING, '\n'.join(terrors))
if torrentfile and signature:
- public_key_file = open(os.path.join(doc_root, 'public.key'), 'rb')
diff --git a/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__OldTorrentQueue.py b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__OldTorrentQueue.py
new file mode 100644
index 00000000000..674116757c1
--- /dev/null
+++ b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__OldTorrentQueue.py
@@ -0,0 +1,11 @@
+--- ./BitTorrent/OldTorrentQueue.py.orig Mon Jun 12 22:45:49 2006
++++ ./BitTorrent/OldTorrentQueue.py Wed Jun 21 23:57:08 2006
+@@ -20,7 +20,7 @@
+
+
+ from BitTorrent.platform import bttime
+-from BitTorrent.download import Feedback, Multitorrent
++from BitTorrent.MultiTorrent import Feeback, MultiTorrent
+ from BitTorrent.bencode import bdecode
+ from BitTorrent.ConvertedMetainfo import ConvertedMetainfo
+ from BitTorrent.prefs import Preferences
diff --git a/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__Rerequester.py b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__Rerequester.py
new file mode 100644
index 00000000000..bb710766199
--- /dev/null
+++ b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__Rerequester.py
@@ -0,0 +1,22 @@
+--- BitTorrent/Rerequester.py.orig Sat Jun 24 08:14:52 2006
++++ BitTorrent/Rerequester.py Sat Jun 24 08:22:14 2006
+@@ -180,8 +180,8 @@
+ def _check(self):
+ assert thread.get_ident() == self.rawserver.ident
+ assert not self.dead
+- self.errorfunc(logging.INFO, 'check: ' + str(self.current_started))
+ if self.current_started is not None:
++ self.errorfunc(logging.INFO, 'check: ' + str(self.current_started))
+ if self.current_started <= bttime() - 58:
+ self.errorfunc(logging.WARNING,
+ _("Tracker announce still not complete "
+@@ -352,7 +352,8 @@
+ def _postrequest(self, data=None, errormsg=None, exc=None, peerid=None):
+ assert thread.get_ident() == self.rawserver.ident
+ self.current_started = None
+- self.errorfunc(logging.INFO, 'postrequest: ' + str(self.current_started))
++ if self.current_started is not None:
++ self.errorfunc(logging.INFO, 'postrequest: ' + str(self.current_started))
+ self.last_time = bttime()
+ if self.dead:
+ return
diff --git a/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__Torrent.py b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__Torrent.py
new file mode 100644
index 00000000000..dc31ea318eb
--- /dev/null
+++ b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__Torrent.py
@@ -0,0 +1,11 @@
+--- ./BitTorrent/Torrent.py.orig Mon Jun 12 22:45:53 2006
++++ ./BitTorrent/Torrent.py Wed Jun 21 23:57:08 2006
+@@ -234,6 +234,9 @@
+ def is_running(self):
+ return self.state == "running"
+
++ def is_seeding(self):
++ return self._activity == (_("seeding"), 1)
++
+ def is_context_valid(self):
+ return self.context_valid
diff --git a/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__defaultargs.py b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__defaultargs.py
new file mode 100644
index 00000000000..4d60a10a502
--- /dev/null
+++ b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__defaultargs.py
@@ -0,0 +1,22 @@
+--- ./BitTorrent/defaultargs.py.orig Mon Jun 12 22:45:58 2006
++++ ./BitTorrent/defaultargs.py Wed Jun 21 23:57:08 2006
+@@ -20,6 +20,8 @@
+ if os.name == 'posix':
+ if os.uname()[0] in ['Darwin']:
+ BAD_LIBC_WORKAROUND_DEFAULT = True
++ if os.uname()[0] in ['FreeBSD']:
++ BAD_LIBC_WORKAROUND_DEFAULT = True
+
+ MAX_INCOMPLETE = 100
+ MAX_FILES_OPEN = 50
+@@ -372,6 +374,10 @@
+ "name determined by --saveas_style. If this is left empty "
+ "each torrent will be saved under the directory of the "
+ "corresponding .torrent file")),
++ ('save_incomplete_in', '',
++ _("local directory where the incomplete torrent downloads will be "
++ "stored until completion. Upon completion, downloads will be "
++ "moved to the directory specified by --save_in.")),
+ ('parse_dir_interval', 60,
+ _("how often to rescan the torrent directory, in seconds") ),
+ ('launch_delay', 0,
diff --git a/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__launchmanycore.py b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__launchmanycore.py
new file mode 100644
index 00000000000..e28dd0ad0dd
--- /dev/null
+++ b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__launchmanycore.py
@@ -0,0 +1,276 @@
+--- BitTorrent/launchmanycore.py.orig Mon Jun 12 22:45:59 2006
++++ BitTorrent/launchmanycore.py Sat Jun 24 14:47:28 2006
+@@ -13,28 +13,33 @@
+ # Original version written by John Hoffman, heavily modified for different
+ # multitorrent architecture by Uoti Urpala (over 40% shorter than original)
+
+-raise ImportError("launchmanycore has not been ported to the 5.0 backend. Please look for it in a future release. Thanks for your patience.")
+-
+ import os
+ from cStringIO import StringIO
+ from traceback import print_exc
+ from BitTorrent.translation import _
+
++from BitTorrent import BTFailure
+ from BitTorrent import configfile
+-from BitTorrent.parsedir import parsedir
+-from BitTorrent.download import Multitorrent, Feedback
++from BitTorrent import zurllib
++from BitTorrent.AutoUpdateButler import AutoUpdateButler
+ from BitTorrent.ConvertedMetainfo import ConvertedMetainfo
+-from BitTorrent import BTFailure
++from BitTorrent.MultiTorrent import MultiTorrent, TorrentAlreadyRunning, TorrentAlreadyInQueue, TorrentNotInitialized
++from BitTorrent.RawServer_twisted import RawServer
++from BitTorrent.Torrent import Torrent
++from BitTorrent.TorrentPolicy import Policy
++from BitTorrent.defer import DeferredEvent
++from BitTorrent.parsedir import parsedir
++from BitTorrent.prefs import Preferences
+
+-from threading import Event
+ from time import time
+
+-
+-class LaunchMany(Feedback):
++class LaunchMany(Policy):
+
+ def __init__(self, config, output, configfile_key):
++ zurllib.add_unsafe_thread()
++
+ try:
+- self.config = config
++ self.config = Preferences().initWithDict(config)
+ self.output = output
+ self.configfile_key = configfile_key
+
+@@ -45,15 +50,30 @@
+
+ self.torrent_list = []
+ self.downloads = {}
+- self.doneflag = Event()
++
++ self.doneflag = DeferredEvent()
++ self.rawserver_doneflag = DeferredEvent()
+
+ self.hashcheck_queue = []
+ self.hashcheck_store = {}
+- self.hashcheck_current = None
+
+- self.multitorrent = MultiTorrent(config, self.doneflag,
+- self.global_error)
+- self.rawserver = self.multitorrent.rawserver
++ self.rawserver = RawServer(self.config)
++ zurllib.set_zurllib_rawserver(self.rawserver)
++ self.rawserver.associate_thread()
++
++ data_dir = self.config['data_dir']
++ self.multitorrent = \
++ MultiTorrent(self.config, self.doneflag, self.rawserver, data_dir)
++
++ # to handle the callbacks
++ self.multitorrent.add_policy(self)
++
++# auto_update_butler = AutoUpdateButler(self.multitorrent, self.rawserver,
++# test_new_version=self.config['new_version'],
++# test_current_version=self.config['current_version'])
++# self.multitorrent.add_auto_update_policy(auto_update_butler)
++# self.rawserver.add_task(0, auto_update_butler.check_version)
++
+
+ self.rawserver.add_task(0, self.scan)
+ self.rawserver.add_task(0, self.stats)
+@@ -63,23 +83,40 @@
+ def handler(signum, frame):
+ self.rawserver.external_add_task(0, self.read_config)
+ signal.signal(signal.SIGHUP, handler)
+- self.rawserver.install_sigint_handler()
++ self.rawserver.install_sigint_handler(self.doneflag)
+ except Exception, e:
+ self.output.message(_("Could not set signal handler: ") + str(e))
+
+- self.rawserver.listen_forever()
++ def shutdown():
++ self.output.message(_("shutting down"))
++ for infohash in self.torrent_list:
++ self.output.message(_('dropped "%s"') %
++ self.torrent_cache[infohash]['path'])
++ torrent = self.downloads[infohash]
++ if torrent is not None:
++ torrent.shutdown()
++ if self.multitorrent:
++ df = self.multitorrent.shutdown()
++ set_flag = lambda *a : self.rawserver_doneflag.set()
++ df.addCallbacks(set_flag, set_flag)
++
++ self.rawserver.add_task(0, self.doneflag.addCallback, \
++ lambda r: self.rawserver.external_add_task(0, shutdown))
++
++ try:
++ self.rawserver.listen_forever(self.rawserver_doneflag)
++ except AttributeError, e:
++ output.message(str(e))
++ raise
++ except KeyboardInterrupt:
++ raise
+
+- self.output.message(_("shutting down"))
+- for infohash in self.torrent_list:
+- self.output.message(_('dropped "%s"') %
+- self.torrent_cache[infohash]['path'])
+- torrent = self.downloads[infohash]
+- if torrent is not None:
+- torrent.shutdown()
+ except:
+ data = StringIO()
+ print_exc(file = data)
+ output.exception(data.getvalue())
++ self.doneflag.set()
++ self.rawserver_doneflag.set()
+
+ def scan(self):
+ self.rawserver.add_task(self.config['parse_dir_interval'], self.scan)
+@@ -122,17 +159,16 @@
+ upamt = 0
+ dnamt = 0
+ t = 0
+- msg = ''
+ if d is None:
+ status = _("waiting for hash check")
+ else:
+ stats = d.get_status()
+ status = stats['activity']
+ progress = '%.1f%%' % (int(stats['fractionDone']*1000)/10.0)
+- if d.started and not d.closed:
++ if d.is_running() and d.is_context_valid():
+ s = stats
+- dist = s['numCopies']
+- if d.is_seed:
++ dist = int(s['distributed_copies'])
++ if d.is_seeding():
+ seeds = 0 # s['numOldSeeds']
+ seedsmsg = "s"
+ else:
+@@ -152,11 +188,9 @@
+ uprate = stats['upRate']
+ upamt = s['upTotal']
+ dnamt = s['downTotal']
+- if d.errors and (d.closed or d.errors[-1][0] + 300 > time()):
+- msg = d.errors[-1][2]
+
+ data.append(( name, status, progress, peers, seeds, seedsmsg, dist,
+- uprate, dnrate, upamt, dnamt, size, t, msg ))
++ uprate, dnrate, upamt, dnamt, size, t ))
+ stop = self.output.display(data)
+ if stop:
+ self.doneflag.set()
+@@ -176,22 +210,55 @@
+ self.check_hashcheck_queue()
+
+ def check_hashcheck_queue(self):
+- if self.hashcheck_current is not None or not self.hashcheck_queue:
++ if not self.hashcheck_queue:
++ return
++ infohash = self.hashcheck_queue.pop(0)
++ x = self.hashcheck_store[infohash]
++ metainfo = ConvertedMetainfo(x)
++ del self.hashcheck_store[infohash]
++
++ if not self.torrent_cache[infohash] or self.torrent_cache[infohash] is None:
++ raise
++
++ if not self.multitorrent.torrent_known(infohash):
++ try:
++ (save_as, save_incomplete_as) = self.determine_filename(infohash)
++ df = self.multitorrent.create_torrent(metainfo, save_incomplete_as, save_as)
++ except (TorrentAlreadyRunning, TorrentAlreadyInQueue):
++ pass
++ except:
++ raise
++
++ try:
++ if not self.multitorrent.torrent_running(infohash):
++ df = self.multitorrent.start_torrent(infohash)
++ except TorrentAlreadyRunning:
++ pass
++ except TorrentNotInitialized:
++ # requeue
++ self.remove(infohash)
++ data = self.torrent_cache[infohash]
++ if self.config['launch_delay'] > 0:
++ self.rawserver.add_task(self.config['launch_delay'], self.add, infohash, data)
++ else:
++ # wait at least 1
++ self.rawserver.add_task(1, self.add, infohash, data)
+ return
+- self.hashcheck_current = self.hashcheck_queue.pop(0)
+- metainfo = self.hashcheck_store[self.hashcheck_current]
+- del self.hashcheck_store[self.hashcheck_current]
+- filename = self.determine_filename(self.hashcheck_current)
+- self.downloads[self.hashcheck_current] = self.multitorrent. \
+- start_torrent(ConvertedMetainfo(metainfo),
+- self.config, self, filename)
++ except:
++ raise
++
++ # record if everything has gone right
++ self.downloads[infohash] = \
++ self.multitorrent.get_torrent(infohash)
+
+ def determine_filename(self, infohash):
+ x = self.torrent_cache[infohash]
+ name = x['name']
+ savein = self.config['save_in']
++ saveincompletein = self.config['save_incomplete_in']
+ isdir = not x['metainfo']['info'].has_key('length')
+ style = self.config['saveas_style']
++
+ if style == 4:
+ torrentname = os.path.split(x['path'][:-8])[1]
+ suggestedname = name
+@@ -202,17 +269,27 @@
+
+ if style == 1 or style == 3:
+ if savein:
+- saveas = os.path.join(savein,x['file'][:-8]) # strip '.torrent'
++ saveas = os.path.join(savein, x['file'][:-8]) # strip '.torrent'
+ else:
+ saveas = x['path'][:-8] # strip '.torrent'
++ if saveincompletein:
++ saveincompleteas = os.path.join(saveincompletein, x['file'][:-8]) # strip '.torrent'
++ else:
++ saveincompleteas = x['path'][:-8] # strip '.torrent'
+ if style == 3 and not isdir:
+ saveas = os.path.join(saveas, name)
++ saveincompleteas = os.path.join(saveincompleteas, name)
+ else:
+ if savein:
+ saveas = os.path.join(savein, name)
+ else:
+ saveas = os.path.join(os.path.split(x['path'])[0], name)
+- return saveas
++ if saveincompletein:
++ saveincompleteas = os.path.join(saveincompletein, name)
++ else:
++ saveincompleteas = os.path.join(os.path.split(x['path'])[0], name)
++
++ return saveas, saveincompleteas
+
+ def was_stopped(self, infohash):
+ try:
+@@ -221,8 +298,6 @@
+ pass
+ else:
+ del self.hashcheck_store[infohash]
+- if self.hashcheck_current == infohash:
+- self.hashcheck_current = None
+ self.check_hashcheck_queue()
+
+ def global_error(self, level, text):
+@@ -253,7 +328,6 @@
+ # rest are callbacks from torrent instances
+
+ def started(self, torrent):
+- self.hashcheck_current = None
+ self.check_hashcheck_queue()
+
+ def failed(self, torrent):
diff --git a/net-p2p/py-bittorrent-devel/files/patch-BitTorrent::platform.py b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__platform.py
index bdacd753920..34e4cfc305d 100644
--- a/net-p2p/py-bittorrent-devel/files/patch-BitTorrent::platform.py
+++ b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__platform.py
@@ -1,7 +1,7 @@
---- 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
+--- ./BitTorrent/platform.py.orig Mon Jun 12 22:46:01 2006
++++ ./BitTorrent/platform.py Wed Jun 21 23:57:08 2006
+@@ -131,7 +131,7 @@
+
def calc_unix_dirs():
- appdir = '%s-%s'%(app_name, version)
diff --git a/net-p2p/py-bittorrent-devel/files/patch-launchmany-console.py b/net-p2p/py-bittorrent-devel/files/patch-launchmany-console.py
new file mode 100644
index 00000000000..ce739ea0e41
--- /dev/null
+++ b/net-p2p/py-bittorrent-devel/files/patch-launchmany-console.py
@@ -0,0 +1,16 @@
+--- ./launchmany-console.py.orig Mon Jun 12 22:46:19 2006
++++ ./launchmany-console.py Wed Jun 21 23:57:08 2006
+@@ -34,10 +34,10 @@
+ self.message(_("no torrents"))
+ for x in data:
+ ( name, status, progress, peers, seeds, seedsmsg, dist,
+- uprate, dnrate, upamt, dnamt, size, t, msg ) = x
+- print '"%s": "%s" (%s) - %sP%s%s%.3fD u%0.1fK/s-d%0.1fK/s u%dK-d%dK "%s"' % (
++ uprate, dnrate, upamt, dnamt, size, t ) = x
++ print '"%s": "%s" (%s) - %sP%s%s%.3fD u%0.1fK/s-d%0.1fK/s u%dK-d%dK' % (
+ name, status, progress, peers, seeds, seedsmsg, dist,
+- uprate/1000, dnrate/1000, upamt/1024, dnamt/1024, msg)
++ uprate/1000, dnrate/1000, upamt/1024, dnamt/1024)
+ return False
+
+ def message(self, s):
diff --git a/net-p2p/py-bittorrent-devel/files/patch-launchmany-curses.py b/net-p2p/py-bittorrent-devel/files/patch-launchmany-curses.py
new file mode 100644
index 00000000000..01d53f74b6e
--- /dev/null
+++ b/net-p2p/py-bittorrent-devel/files/patch-launchmany-curses.py
@@ -0,0 +1,73 @@
+--- ./launchmany-curses.py.orig Mon Jun 12 22:46:19 2006
++++ ./launchmany-curses.py Wed Jun 21 23:57:08 2006
+@@ -18,6 +18,7 @@
+
+ DOWNLOAD_SCROLL_RATE = 1
+
++import logging
+ import sys, os
+ from threading import Event
+ from time import time, localtime, strftime
+@@ -99,7 +100,7 @@
+ def winch_handler(self, signum, stackframe):
+ self.changeflag.set()
+ curses.endwin()
+- self.scrwin.refresh()
++ self.scrwin.noutrefresh()
+ self.scrwin = curses.newwin(0, 0, 0, 0)
+ self._remake_window()
+ self._display_messages()
+@@ -118,22 +119,26 @@
+ self.mainpan = curses.panel.new_panel(self.mainwin)
+ self.mainwin.scrollok(0)
+ self.mainwin.nodelay(1)
++ self.mainwin.clearok(1)
+
+ self.headerwin = curses.newwin(1, self.mainwinw+1,
+ 1, self.mainwinx)
+ self.headerpan = curses.panel.new_panel(self.headerwin)
+ self.headerwin.scrollok(0)
++ self.headerwin.clearok(0)
+
+ self.totalwin = curses.newwin(1, self.mainwinw+1,
+ self.mainwinh+1, self.mainwinx)
+ self.totalpan = curses.panel.new_panel(self.totalwin)
+ self.totalwin.scrollok(0)
++ self.totalwin.clearok(0)
+
+ self.statuswinh = self.scrh-4-self.mainwinh
+ self.statuswin = curses.newwin(self.statuswinh, self.mainwinw+1,
+ self.mainwinh+3, self.mainwinx)
+ self.statuspan = curses.panel.new_panel(self.statuswin)
+ self.statuswin.scrollok(0)
++ self.statuswin.clearok(1)
+
+ try:
+ self.scrwin.border(ord('|'),ord('|'),ord('-'),ord('-'),ord(' '),ord(' '),ord(' '),ord(' '))
+@@ -199,7 +204,7 @@
+ if self._display_line(''):
+ break
+ ( name, status, progress, peers, seeds, seedsmsg, dist,
+- uprate, dnrate, upamt, dnamt, size, t, msg ) = data[ii]
++ uprate, dnrate, upamt, dnamt, size, t ) = data[ii]
+ t = fmttime(t)
+ if t:
+ status = t
+@@ -216,7 +221,7 @@
+ else:
+ datastr = ' '+status+' ('+progress+')'
+ self._display_line(datastr)
+- self._display_line(' '+ljust(msg,self.mainwinw-4))
++# self._display_line(' '+ljust(msg,self.mainwinw-4))
+ i += 1
+
+ def display(self, data):
+@@ -236,7 +241,7 @@
+ totalup = 0
+ totaldn = 0
+ for ( name, status, progress, peers, seeds, seedsmsg, dist,
+- uprate, dnrate, upamt, dnamt, size, t, msg ) in data:
++ uprate, dnrate, upamt, dnamt, size, t ) in data:
+ totalup += uprate
+ totaldn += dnrate
+
diff --git a/net-p2p/py-bittorrent-devel/pkg-plist b/net-p2p/py-bittorrent-devel/pkg-plist
index 6186b365ba2..572137a4352 100644
--- a/net-p2p/py-bittorrent-devel/pkg-plist
+++ b/net-p2p/py-bittorrent-devel/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%%