net-p2p/deluge: update to 1.3.7

- update to 1.3.7
- add LICENSE_FILE
- convert to USES, sort knobs
- add patch that fix default upload speed rate [1]
- remove patch applied upstream
- add back missed i18n files

Submitted by:	T.J. <xtainted@gmail.com> [1]

7 files changed, 115 insertions, 46 deletions

diff --git a/net-p2p/deluge/Makefile b/net-p2p/deluge/Makefile
index c8690ca8aba9..74e84e8f0307 100644
--- a/net-p2p/deluge/Makefile
+++ b/net-p2p/deluge/Makefile
@@ -1,17 +1,17 @@
 # $FreeBSD$
 
 PORTNAME=	deluge
-PORTVERSION=	1.3.6
-PORTREVISION=	5
+PORTVERSION=	1.3.7
 PORTEPOCH=	1
 CATEGORIES=	net-p2p python
 MASTER_SITES=	http://download.deluge-torrent.org/source/
 EXTRACT_SUFX=	.tar.lzma
 
 MAINTAINER=	rm@FreeBSD.org
-COMMENT=	Bittorrent client using Python, GTK+2, and libtorrent-rasterbar
+COMMENT=	Bittorrent client using Python, GTK2, and libtorrent-rasterbar
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>=0.18:${PORTSDIR}/devel/py-xdg \
 		${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0:${PORTSDIR}/net-p2p/libtorrent-rasterbar-python \
@@ -21,14 +21,11 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>=0.18:${PORTSDIR}/devel/py-xdg \
 
 USE_RC_SUBR=	deluged deluge_web
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
-PLIST_SUB+=	PYTHON_VER=${PYTHON_VER}
 
-WANT_GNOME=		yes
-USES=			gettext tar:xz twisted:run,web
-USE_OPENSSL=		yes
-USE_PYTHON=		2
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		gettext tar:xz python:2 twisted:run,web
+USE_PYTHON=	autoplist distutils
+USE_OPENSSL=	yes
+WANT_GNOME=	yes
 
 OPTIONS_DEFINE=	GTK2
 OPTIONS_DEFAULT=GTK2
diff --git a/net-p2p/deluge/distinfo b/net-p2p/deluge/distinfo
index 8af9e3970cd3..8f452739ba9c 100644
--- a/net-p2p/deluge/distinfo
+++ b/net-p2p/deluge/distinfo
@@ -1,2 +1,2 @@
-SHA256 (deluge-1.3.6.tar.lzma) = 054f7b219ee24ea9c50fb1d4734a3cf6ef515d7e8dace00c14f45af07f9aa8fe
-SIZE (deluge-1.3.6.tar.lzma) = 1405564
+SHA256 (deluge-1.3.7.tar.lzma) = 5078f098ab0266f738045a8ac6dec1462a17e71287ebe6f941b434ec2082566a
+SIZE (deluge-1.3.7.tar.lzma) = 1425604
diff --git a/net-p2p/deluge/files/patch-deluge_core_core.py b/net-p2p/deluge/files/patch-deluge_core_core.py
new file mode 100644
index 000000000000..d7b2e29ba71c
--- /dev/null
+++ b/net-p2p/deluge/files/patch-deluge_core_core.py
@@ -0,0 +1,14 @@
+This patch fixes upload rate speed problem discussed here:
+http://forum.deluge-torrent.org/viewtopic.php?f=7&t=33839
+
+--- deluge/core/core.py.orig	2014-07-09 19:08:22 UTC
++++ deluge/core/core.py
+@@ -93,7 +93,7 @@
+         self.__load_session_state()
+ 
+         # Set the user agent
+-        self.settings = lt.session_settings()
++        self.settings = lt.high_performance_seed()
+         self.settings.user_agent = "Deluge %s" % deluge.common.get_version()
+         # Increase the alert queue size so that alerts don't get lost
+         self.settings.alert_queue_size = 10000
diff --git a/net-p2p/deluge/files/patch-deluge_httpdownloader.py b/net-p2p/deluge/files/patch-deluge_httpdownloader.py
deleted file mode 100644
index f1bb0a40c3ec..000000000000
--- a/net-p2p/deluge/files/patch-deluge_httpdownloader.py
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./deluge/httpdownloader.py.orig	2013-02-25 21:01:07.000000000 +0400
-+++ ./deluge/httpdownloader.py	2014-06-05 12:56:06.000000000 +0400
-@@ -192,7 +192,17 @@
-             headers = {}
-         headers["accept-encoding"] = "deflate, gzip, x-gzip"
- 
--    scheme, host, port, path = client._parse(url)
-+    # In twisted 13.1.0 the _parse() function was replaced by the _URI class 
-+    if hasattr(client, '_parse'):
-+        scheme, host, port, path = client._parse(url)
-+    else:
-+        from twisted.web.client import _URI
-+        uri = _URI.fromBytes(url)
-+        scheme = uri.scheme
-+        host = uri.host
-+        port = uri.port
-+        path = uri.path
-+
-     factory = HTTPDownloader(url, filename, callback, headers, force_filename, allow_compression)
-     if scheme == "https":
-         from twisted.internet import ssl
diff --git a/net-p2p/deluge/files/patch-setup.py b/net-p2p/deluge/files/patch-setup.py
index 36369b0b6f20..26d5a3d279e7 100644
--- a/net-p2p/deluge/files/patch-setup.py
+++ b/net-p2p/deluge/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2012-03-05 04:41:43.000000000 +0400
-+++ setup.py	2012-03-10 14:17:07.000000000 +0400
-@@ -206,7 +206,6 @@
+--- setup.py.orig	2014-07-09 19:08:22 UTC
++++ setup.py
+@@ -208,7 +208,6 @@
  _ext_modules = []
  
  # Check for a system libtorrent and if found, then do not build the libtorrent extension
@@ -8,7 +8,7 @@
  try:
      from deluge._libtorrent import lt
  except ImportError:
-@@ -214,6 +213,8 @@
+@@ -216,6 +215,8 @@
  else:
      build_libtorrent = False
  
@@ -17,11 +17,12 @@
  if build_libtorrent:
      got_libtorrent = False
      if not os.path.exists("libtorrent"):
-@@ -487,31 +488,8 @@
+@@ -488,31 +489,7 @@
+ }
  
  # Data files to be installed to the system
- _data_files = [
--    ('share/icons/scalable/apps', ['deluge/data/icons/scalable/apps/deluge.svg']),
+-_data_files = [
+-    ('share/icons/hicolor/scalable/apps', ['deluge/data/icons/scalable/apps/deluge.svg']),
 -    ('share/icons/hicolor/128x128/apps', ['deluge/data/icons/hicolor/128x128/apps/deluge.png']),
 -    ('share/icons/hicolor/16x16/apps', ['deluge/data/icons/hicolor/16x16/apps/deluge.png']),
 -    ('share/icons/hicolor/192x192/apps', ['deluge/data/icons/hicolor/192x192/apps/deluge.png']),
@@ -41,11 +42,11 @@
 -        'docs/man/deluge-gtk.1',
 -        'docs/man/deluge-web.1',
 -        'docs/man/deluge-console.1'])
- ]
- 
+-]
+-
 -if not windows_check() and os.path.exists(desktop_data):
 -    _data_files.append(('share/applications', [desktop_data]))
--
++_data_files = []
+ 
  entry_points = {
      "console_scripts": [
-         "deluge-console = deluge.ui.console:start",
diff --git a/net-p2p/deluge/pkg-descr b/net-p2p/deluge/pkg-descr
index fc985d391ad1..e006cdc2016c 100644
--- a/net-p2p/deluge/pkg-descr
+++ b/net-p2p/deluge/pkg-descr
@@ -1,6 +1,6 @@
 Deluge is a Bittorrent client written in Python and GTK+. Deluge is intended
-to bring a native, full-featured client to Linux, BSD, and other *NIX GTK
-desktop environments such as Gnome and XFCE.
+to bring a native, full-featured client to Linux, BSD, and other *nix GTK
+desktop environments such as Gnome and Xfce.
 
 Deluge uses Rasterbar's version of libtorrent as the main ingredient in its
 bittorrent protocol backend.
diff --git a/net-p2p/deluge/pkg-plist b/net-p2p/deluge/pkg-plist
index 331149815022..470712530d5a 100644
--- a/net-p2p/deluge/pkg-plist
+++ b/net-p2p/deluge/pkg-plist
@@ -1,3 +1,81 @@
+%%PYTHON_SITELIBDIR%%/deluge/i18n/af/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/ar/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/ast/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/be/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/bg/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/bn/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/bs/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/ca/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/cs/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/cy/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/da/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/de/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/el/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/en_AU/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/en_CA/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/en_GB/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/eo/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/es/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/et/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/eu/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/fa/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/fi/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/fo/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/fr/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/fy/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/ga/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/gl/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/he/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/hi/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/hr/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/hu/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/id/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/is/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/it/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/iu/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/ja/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/ka/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/kk/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/km/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/kn/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/ko/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/ku/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/ky/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/la/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/lb/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/lt/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/lv/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/mk/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/ml/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/ms/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/nb/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/nds/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/nl/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/nn/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/oc/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/pl/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/pms/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/pt/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/pt_BR/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/ro/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/ru/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/si/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/sk/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/sl/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/sr/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/sv/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/ta/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/te/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/th/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/tl/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/tlh/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/tr/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/uk/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/ur/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/vi/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/zh_CN/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/zh_HK/LC_MESSAGES/deluge.mo
+%%PYTHON_SITELIBDIR%%/deluge/i18n/zh_TW/LC_MESSAGES/deluge.mo
 man/man1/deluge.1.gz
 man/man1/deluge-console.1.gz
 man/man1/deluge-gtk.1.gz