Update to 4.1.7 and remove BROKEN status

4 files changed, 8 insertions, 62 deletions

diff --git a/net-p2p/py-bittorrent-devel/Makefile b/net-p2p/py-bittorrent-devel/Makefile
index a63ba5192b1..88182c593a9 100644
--- a/net-p2p/py-bittorrent-devel/Makefile
+++ b/net-p2p/py-bittorrent-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	BitTorrent
-PORTVERSION=	4.1.6
-PORTREVISION=	2
+PORTVERSION=	4.1.7
 PORTEPOCH=	1
 CATEGORIES?=	net python
 MASTER_SITES=	http://www.bittorrent.com/dl/ \
@@ -23,8 +22,6 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dns/__init__.py:${PORTSDIR}/dns/py-dnspython
 		${PYTHON_SITELIBDIR}/twisted/plugins/__init__.py:${PORTSDIR}/devel/py-twistedCore \
 		${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto
 
-BROKEN=		Incomplete pkg-plist
-
 USE_GETTEXT=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/net-p2p/py-bittorrent-devel/distinfo b/net-p2p/py-bittorrent-devel/distinfo
index 0f52b8a6ea0..e7b03cb7276 100644
--- a/net-p2p/py-bittorrent-devel/distinfo
+++ b/net-p2p/py-bittorrent-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (BitTorrent-4.1.6.tar.gz) = ba371b39ee6bce98775e6c346d5e8b58
-SIZE (BitTorrent-4.1.6.tar.gz) = 2313097
+MD5 (BitTorrent-4.1.7.tar.gz) = b1912428950d1875ae674d324a302191
+SIZE (BitTorrent-4.1.7.tar.gz) = 2109030
diff --git a/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__RawServer_twisted.py b/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__RawServer_twisted.py
deleted file mode 100644
index 5802c6c50b0..00000000000
--- a/net-p2p/py-bittorrent-devel/files/patch-BitTorrent__RawServer_twisted.py
+++ /dev/null
@@ -1,38 +0,0 @@
---- BitTorrent/RawServer_twisted.py.orig	Wed Oct 12 18:24:39 2005
-+++ BitTorrent/RawServer_twisted.py	Wed Oct 12 18:24:59 2005
-@@ -465,8 +465,6 @@
-         s = SocketProxy(0, filename, True, 0, 'tcp')
-         s.factory = Factory()
-         
--        if s.reuse == False:
--            UnimplementedWarning("You asked for reuse to be off when binding. Sorry, I can't do that.")
- 
-         listening_port = reactor.listenUNIX(s.bind, s.factory)
-         listening_port.listening = 1
-@@ -479,8 +477,6 @@
-         s = SocketProxy(port, bind, reuse, tos, 'tcp')
-         s.factory = Factory()
-         
--        if s.reuse == False:
--            UnimplementedWarning("You asked for reuse to be off when binding. Sorry, I can't do that.")
- 
-         try:        
-             listening_port = reactor.listenTCP(s.port, s.factory, interface=s.bind)
-@@ -499,8 +495,6 @@
-         s.connection = c
-         s.protocol.connection = c
- 
--        if s.reuse == False:
--            UnimplementedWarning("You asked for reuse to be off when binding. Sorry, I can't do that.")
-                          
-         try:        
-             listening_port = reactor.listenUDP(s.port, s.protocol, interface=s.bind)
-@@ -565,7 +559,7 @@
-         bindaddr = None
-         if do_bind:
-             bindaddr = self.config['bind']
--            if bindaddr and len(binadder) >= 0:
-+            if bindaddr and len(bindaddr) >= 0:
-                 bindaddr = (bindaddr, 0)
-             else:
-                 bindaddr = None
diff --git a/net-p2p/py-bittorrent-devel/pkg-plist b/net-p2p/py-bittorrent-devel/pkg-plist
index 24432eb02bb..a5f47df67da 100644
--- a/net-p2p/py-bittorrent-devel/pkg-plist
+++ b/net-p2p/py-bittorrent-devel/pkg-plist
@@ -211,25 +211,17 @@ bin/torrentinfo-console
 %%PYTHON_SITELIBDIR%%/khashmir/utkhashmir.pyc
 %%PYTHON_SITELIBDIR%%/khashmir/utkhashmir.pyo
 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/es/LC_MESSAGES/bittorrent.mo
 share/locale/es_MX/LC_MESSAGES/bittorrent.mo
-share/locale/et/LC_MESSAGES/bittorrent.mo
-share/locale/fi/LC_MESSAGES/bittorrent.mo
 share/locale/fr/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/it/LC_MESSAGES/bittorrent.mo
-share/locale/ja/LC_MESSAGES/bittorrent.mo
-share/locale/ko/LC_MESSAGES/bittorrent.mo
-share/locale/lt/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
@@ -239,7 +231,6 @@ 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/tr/LC_MESSAGES/bittorrent.mo
 share/locale/vi/LC_MESSAGES/bittorrent.mo
@@ -262,18 +253,14 @@ share/locale/zh_TW/LC_MESSAGES/bittorrent.mo
 @unexec rmdir %D/share/locale/pt 2>/dev/null || true
 @unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/gr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/gr 2>/dev/null || true
 @unexec rmdir %D/share/locale/nb_NO/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/nb_NO 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-@unexec rmdir %D/share/locale/he_IL/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/he_IL 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/gr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/gr 2>/dev/null || true
 @unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/cs 2>/dev/null || true
+@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ca 2>/dev/null || true
 @dirrm %%PYTHON_SITELIBDIR%%/khashmir
 @dirrm %%PYTHON_SITELIBDIR%%/BitTorrent
 @unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true