5 files changed, 34 insertions, 57 deletions

diff --git a/net-p2p/py-bittorrent-devel/Makefile b/net-p2p/py-bittorrent-devel/Makefile
index 81f4f2183b52..79f735e963c1 100644
--- a/net-p2p/py-bittorrent-devel/Makefile
+++ b/net-p2p/py-bittorrent-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	BitTorrent
-PORTVERSION=	4.2.0
+PORTVERSION=	4.3.1
 PORTEPOCH=	1
 CATEGORIES?=	net python
 MASTER_SITES=	http://www.bittorrent.com/dl/ \
diff --git a/net-p2p/py-bittorrent-devel/distinfo b/net-p2p/py-bittorrent-devel/distinfo
index 57e6b7b67ce8..7951d3d78cae 100644
--- a/net-p2p/py-bittorrent-devel/distinfo
+++ b/net-p2p/py-bittorrent-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (BitTorrent-4.2.0.tar.gz) = a6a6d07a20e75da44c7dbe44ff7d5346
-SHA256 (BitTorrent-4.2.0.tar.gz) = 223d895b120ff53c46690b811654a993a64aa6b6484b06e9a383694a7538561e
-SIZE (BitTorrent-4.2.0.tar.gz) = 2185448
+MD5 (BitTorrent-4.3.1.tar.gz) = 41dda6b951b997ea9d51682beebb317e
+SHA256 (BitTorrent-4.3.1.tar.gz) = 0d3d198997c72aa1b973f3149a571d714b438b92605779479eea96241761f3f8
+SIZE (BitTorrent-4.3.1.tar.gz) = 2269731
diff --git a/net-p2p/py-bittorrent-devel/files/patch-BitTorrent::defaultargs.py b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent::defaultargs.py
index f25af4145ccc..dac462a467f5 100644
--- a/net-p2p/py-bittorrent-devel/files/patch-BitTorrent::defaultargs.py
+++ b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent::defaultargs.py
@@ -1,11 +1,11 @@
---- 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")),
+--- BitTorrent/defaultargs.py.orig	Thu Dec  8 14:52:02 2005
++++ BitTorrent/defaultargs.py	Thu Dec  8 14:52:22 2005
+@@ -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
+     
+ from BitTorrent import languages
+ 
diff --git a/net-p2p/py-bittorrent-devel/files/patch-BitTorrent____init__.py b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent____init__.py
deleted file mode 100644
index 69079192dc47..000000000000
--- a/net-p2p/py-bittorrent-devel/files/patch-BitTorrent____init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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'	తెలుగు'              ,
-     }
- 
--#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-devel/pkg-plist b/net-p2p/py-bittorrent-devel/pkg-plist
index 7127a0489c16..d460147cd899 100644
--- a/net-p2p/py-bittorrent-devel/pkg-plist
+++ b/net-p2p/py-bittorrent-devel/pkg-plist
@@ -6,6 +6,9 @@ bin/launchmany-console
 bin/launchmany-curses
 bin/maketorrent-console
 bin/torrentinfo-console
+%%PYTHON_SITELIBDIR%%/BitTorrent/BeautifulSupe.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/BeautifulSupe.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/BeautifulSupe.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/Choker.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyo
@@ -48,9 +51,15 @@ bin/torrentinfo-console
 %%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/NewVersion.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/NewVersion.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/NewVersion.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
@@ -81,6 +90,9 @@ bin/torrentinfo-console
 %%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
@@ -111,6 +123,9 @@ bin/torrentinfo-console
 %%PYTHON_SITELIBDIR%%/BitTorrent/download.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/download.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/download.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/language.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/language.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/language.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/launchmanycore.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/launchmanycore.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/launchmanycore.pyo
@@ -212,32 +227,19 @@ bin/torrentinfo-console
 %%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/el/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
@@ -247,26 +249,18 @@ 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
@@ -281,14 +275,8 @@ share/locale/zh_TW/LC_MESSAGES/bittorrent.mo
 @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/el/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/el 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