5 files changed, 207 insertions, 128 deletions

diff --git a/finance/electrum/Makefile b/finance/electrum/Makefile
index fc4236f2be67..f3e511bae4b2 100644
--- a/finance/electrum/Makefile
+++ b/finance/electrum/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	electrum
-PORTVERSION=	1.7.3
-PORTREVISION=	1
+PORTVERSION=	1.9.8
 CATEGORIES=	finance python
-MASTER_SITES=	http://download.electrum.org/download/
+MASTER_SITES=	http://download.electrum.org/
 DISTNAME=	Electrum-${PORTVERSION}
 
 MAINTAINER=	kyuupichan@gmail.com
@@ -15,13 +14,13 @@ LICENSE=	GPLv3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}slowaes>0:${PORTSDIR}/security/py-slowaes \
 		${PYTHON_PKGNAMEPREFIX}ecdsa>0:${PORTSDIR}/security/py-ecdsa \
-		${PYTHON_PKGNAMEPREFIX}qt4>=4.9:${PORTSDIR}/devel/py-qt4
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.10.3:${PORTSDIR}/x11-toolkits/py-qt4-gui
 
-USE_PYTHON=	2
+USE_PYTHON=	-2.7
 USE_PYDISTUTILS=yes
+USES=		desktop-file-utils gettext
 PYDISTUTILS_PKGNAME=	Electrum
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
 		${WRKSRC}/setup.py ${WRKSRC}/lib/util.py
diff --git a/finance/electrum/distinfo b/finance/electrum/distinfo
index cd58cc21b5c7..691c7a13986a 100644
--- a/finance/electrum/distinfo
+++ b/finance/electrum/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Electrum-1.7.3.tar.gz) = bd16afafa70c6c104eb82723bf4555405774c48f6723593e95ef49de0b8f3e51
-SIZE (Electrum-1.7.3.tar.gz) = 492076
+SHA256 (Electrum-1.9.8.tar.gz) = 8fc144a32013e4a747fea27fff981762a6b9e14cde9ffb405c4c721975d846ff
+SIZE (Electrum-1.9.8.tar.gz) = 860858
diff --git a/finance/electrum/files/patch-lib__util.py b/finance/electrum/files/patch-lib__util.py
index 2cbc66f006d6..a7087f7e0502 100644
--- a/finance/electrum/files/patch-lib__util.py
+++ b/finance/electrum/files/patch-lib__util.py
@@ -1,14 +1,15 @@
---- ./lib/util.py.orig	2013-04-07 21:30:06.000000000 +0900
-+++ ./lib/util.py	2013-06-09 19:36:01.945732000 +0900
-@@ -59,8 +59,10 @@
-         return os.path.join(os.environ["APPDATA"], "Electrum")
+--- lib/util.py.orig	2014-03-16 12:12:20.000000000 +0100
++++ lib/util.py	2014-06-03 11:13:22.956308357 +0200
+@@ -58,10 +58,11 @@
      elif platform.system() == "Linux":
          return os.path.join(sys.prefix, "share", "electrum")
-+    elif (sys.platform.startswith("dragonfly") or
-+          sys.platform.startswith("freebsd")):
-+	return os.path.join('%%PREFIX%%', "share", "electrum")
      elif (platform.system() == "Darwin" or
--          platform.system() == "DragonFly" or
++          platform.system() == "FreeBSD" or
+           platform.system() == "DragonFly" or
+           platform.system() == "OpenBSD" or
  	  platform.system() == "NetBSD"):
-         return "/Library/Application Support/Electrum"
+-        return "/Library/Application Support/Electrum"
++	return os.path.join('%%PREFIX%%', "share", "electrum")
      else:
+         raise Exception("Unknown system")
+ 
diff --git a/finance/electrum/files/patch-setup.py b/finance/electrum/files/patch-setup.py
index b76cd3b68df8..0ea8735f3e17 100644
--- a/finance/electrum/files/patch-setup.py
+++ b/finance/electrum/files/patch-setup.py
@@ -1,20 +1,13 @@
---- ./setup.py.orig	2013-04-07 16:33:32.000000000 +0400
-+++ ./setup.py	2013-06-15 18:56:59.000000000 +0400
-@@ -15,14 +15,14 @@
- if (len(sys.argv) > 1 and (sys.argv[1] == "sdist")) or (platform.system() != 'Windows' and platform.system() != 'Darwin'):
-     print "Including all files"
-     data_files += [
--        ('/usr/share/applications/',['electrum.desktop']),
--        ('/usr/share/app-install/icons/',['icons/electrum.png'])
-+        (os.path.join('%%PREFIX%%', 'share', 'applications'),['electrum.desktop']),
-+        (os.path.join('%%PREFIX%%', 'share', 'app-install', 'icons'),['icons/electrum.png'])
-     ]
-     if not os.path.exists('locale'):
-         os.mkdir('locale')
-     for lang in os.listdir('locale'):
-         if os.path.exists('locale/%s/LC_MESSAGES/electrum.mo'%lang):
--            data_files.append(  ('/usr/share/locale/%s/LC_MESSAGES'%lang, ['locale/%s/LC_MESSAGES/electrum.mo'%lang]) )
-+            data_files.append( (os.path.join('%%PREFIX%%', 'share/locale/%s/LC_MESSAGES'%lang), ['locale/%s/LC_MESSAGES/electrum.mo'%lang]) )
+--- setup.py.orig	2014-03-16 14:01:35.000000000 +0100
++++ setup.py	2014-06-03 11:12:40.621312285 +0200
+@@ -15,9 +15,7 @@
+ if sys.version_info[:3] < (2, 6, 0):
+     sys.exit("Error: Electrum requires Python version >= 2.6.0...")
+ 
+-usr_share = '/usr/share'
+-if not os.access(usr_share, os.W_OK):
+-    usr_share = os.getenv("XDG_DATA_HOME", os.path.join(os.getenv("HOME"), ".local", "share"))
++usr_share = '%%PREFIX%%/share'
  
- data_files += [
-     (util.appdata_dir(), ["data/README"]),
+ data_files = []
+ if (len(sys.argv) > 1 and (sys.argv[1] == "sdist")) or (platform.system() != 'Windows' and platform.system() != 'Darwin'):
diff --git a/finance/electrum/pkg-plist b/finance/electrum/pkg-plist
index 6509d5d6cb95..a7bd1b1dcfc8 100644
--- a/finance/electrum/pkg-plist
+++ b/finance/electrum/pkg-plist
@@ -1,146 +1,232 @@
-bin/electrum
 %%PYTHON_SITELIBDIR%%/electrum/__init__.py
+%%PYTHON_SITELIBDIR%%/electrum/account.py
+%%PYTHON_SITELIBDIR%%/electrum/bitcoin.py
+%%PYTHON_SITELIBDIR%%/electrum/blockchain.py
+%%PYTHON_SITELIBDIR%%/electrum/bmp.py
+%%PYTHON_SITELIBDIR%%/electrum/commands.py
+%%PYTHON_SITELIBDIR%%/electrum/daemon.py
+%%PYTHON_SITELIBDIR%%/electrum/i18n.py
+%%PYTHON_SITELIBDIR%%/electrum/interface.py
+%%PYTHON_SITELIBDIR%%/electrum/mnemonic.py
+%%PYTHON_SITELIBDIR%%/electrum/msqr.py
+%%PYTHON_SITELIBDIR%%/electrum/network.py
+%%PYTHON_SITELIBDIR%%/electrum/plugins.py
+%%PYTHON_SITELIBDIR%%/electrum/pyqrnative.py
+%%PYTHON_SITELIBDIR%%/electrum/simple_config.py
+%%PYTHON_SITELIBDIR%%/electrum/socks.py
+%%PYTHON_SITELIBDIR%%/electrum/transaction.py
+%%PYTHON_SITELIBDIR%%/electrum/util.py
+%%PYTHON_SITELIBDIR%%/electrum/verifier.py
+%%PYTHON_SITELIBDIR%%/electrum/version.py
+%%PYTHON_SITELIBDIR%%/electrum/wallet.py
+%%PYTHON_SITELIBDIR%%/electrum/wallet_bitkey.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/__init__.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/gtk.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/__init__.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/amountedit.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/console.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/history_widget.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/icons_rc.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/installwizard.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/lite_window.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/main_window.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/network_dialog.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/password_dialog.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/qrcodewidget.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/receiving_widget.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/seed_dialog.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/transaction_dialog.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/util.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/version_getter.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/stdio.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/text.py
+%%PYTHON_SITELIBDIR%%/electrum_plugins/__init__.py
+%%PYTHON_SITELIBDIR%%/electrum_plugins/aliases.py
+%%PYTHON_SITELIBDIR%%/electrum_plugins/coinbase_buyback.py
+%%PYTHON_SITELIBDIR%%/electrum_plugins/exchange_rate.py
+%%PYTHON_SITELIBDIR%%/electrum_plugins/labels.py
+%%PYTHON_SITELIBDIR%%/electrum_plugins/pointofsale.py
+%%PYTHON_SITELIBDIR%%/electrum_plugins/qrscanner.py
+%%PYTHON_SITELIBDIR%%/electrum_plugins/virtualkeyboard.py
 %%PYTHON_SITELIBDIR%%/electrum/__init__.pyc
 %%PYTHON_SITELIBDIR%%/electrum/__init__.pyo
-%%PYTHON_SITELIBDIR%%/electrum/bitcoin.py
+%%PYTHON_SITELIBDIR%%/electrum/account.pyc
+%%PYTHON_SITELIBDIR%%/electrum/account.pyo
 %%PYTHON_SITELIBDIR%%/electrum/bitcoin.pyc
 %%PYTHON_SITELIBDIR%%/electrum/bitcoin.pyo
-%%PYTHON_SITELIBDIR%%/electrum/commands.py
+%%PYTHON_SITELIBDIR%%/electrum/blockchain.pyc
+%%PYTHON_SITELIBDIR%%/electrum/blockchain.pyo
+%%PYTHON_SITELIBDIR%%/electrum/bmp.pyc
+%%PYTHON_SITELIBDIR%%/electrum/bmp.pyo
 %%PYTHON_SITELIBDIR%%/electrum/commands.pyc
 %%PYTHON_SITELIBDIR%%/electrum/commands.pyo
-%%PYTHON_SITELIBDIR%%/electrum/deserialize.py
-%%PYTHON_SITELIBDIR%%/electrum/deserialize.pyc
-%%PYTHON_SITELIBDIR%%/electrum/deserialize.pyo
-%%PYTHON_SITELIBDIR%%/electrum/interface.py
+%%PYTHON_SITELIBDIR%%/electrum/daemon.pyc
+%%PYTHON_SITELIBDIR%%/electrum/daemon.pyo
+%%PYTHON_SITELIBDIR%%/electrum/i18n.pyc
+%%PYTHON_SITELIBDIR%%/electrum/i18n.pyo
 %%PYTHON_SITELIBDIR%%/electrum/interface.pyc
 %%PYTHON_SITELIBDIR%%/electrum/interface.pyo
-%%PYTHON_SITELIBDIR%%/electrum/mnemonic.py
 %%PYTHON_SITELIBDIR%%/electrum/mnemonic.pyc
 %%PYTHON_SITELIBDIR%%/electrum/mnemonic.pyo
-%%PYTHON_SITELIBDIR%%/electrum/msqr.py
 %%PYTHON_SITELIBDIR%%/electrum/msqr.pyc
 %%PYTHON_SITELIBDIR%%/electrum/msqr.pyo
-%%PYTHON_SITELIBDIR%%/electrum/simple_config.py
+%%PYTHON_SITELIBDIR%%/electrum/network.pyc
+%%PYTHON_SITELIBDIR%%/electrum/network.pyo
+%%PYTHON_SITELIBDIR%%/electrum/plugins.pyc
+%%PYTHON_SITELIBDIR%%/electrum/plugins.pyo
+%%PYTHON_SITELIBDIR%%/electrum/pyqrnative.pyc
+%%PYTHON_SITELIBDIR%%/electrum/pyqrnative.pyo
 %%PYTHON_SITELIBDIR%%/electrum/simple_config.pyc
 %%PYTHON_SITELIBDIR%%/electrum/simple_config.pyo
-%%PYTHON_SITELIBDIR%%/electrum/socks.py
 %%PYTHON_SITELIBDIR%%/electrum/socks.pyc
 %%PYTHON_SITELIBDIR%%/electrum/socks.pyo
-%%PYTHON_SITELIBDIR%%/electrum/util.py
+%%PYTHON_SITELIBDIR%%/electrum/transaction.pyc
+%%PYTHON_SITELIBDIR%%/electrum/transaction.pyo
 %%PYTHON_SITELIBDIR%%/electrum/util.pyc
 %%PYTHON_SITELIBDIR%%/electrum/util.pyo
-%%PYTHON_SITELIBDIR%%/electrum/verifier.py
 %%PYTHON_SITELIBDIR%%/electrum/verifier.pyc
 %%PYTHON_SITELIBDIR%%/electrum/verifier.pyo
-%%PYTHON_SITELIBDIR%%/electrum/version.py
 %%PYTHON_SITELIBDIR%%/electrum/version.pyc
 %%PYTHON_SITELIBDIR%%/electrum/version.pyo
-%%PYTHON_SITELIBDIR%%/electrum/wallet.py
 %%PYTHON_SITELIBDIR%%/electrum/wallet.pyc
 %%PYTHON_SITELIBDIR%%/electrum/wallet.pyo
-%%PYTHON_SITELIBDIR%%/electrum/wallet_bitkey.py
 %%PYTHON_SITELIBDIR%%/electrum/wallet_bitkey.pyc
 %%PYTHON_SITELIBDIR%%/electrum/wallet_bitkey.pyo
-%%PYTHON_SITELIBDIR%%/electrum/wallet_factory.py
-%%PYTHON_SITELIBDIR%%/electrum/wallet_factory.pyc
-%%PYTHON_SITELIBDIR%%/electrum/wallet_factory.pyo
-%%PYTHON_SITELIBDIR%%/electrum_gui/__init__.py
 %%PYTHON_SITELIBDIR%%/electrum_gui/__init__.pyc
 %%PYTHON_SITELIBDIR%%/electrum_gui/__init__.pyo
-%%PYTHON_SITELIBDIR%%/electrum_gui/amountedit.py
-%%PYTHON_SITELIBDIR%%/electrum_gui/amountedit.pyc
-%%PYTHON_SITELIBDIR%%/electrum_gui/amountedit.pyo
-%%PYTHON_SITELIBDIR%%/electrum_gui/bmp.py
-%%PYTHON_SITELIBDIR%%/electrum_gui/bmp.pyc
-%%PYTHON_SITELIBDIR%%/electrum_gui/bmp.pyo
-%%PYTHON_SITELIBDIR%%/electrum_gui/exchange_rate.py
-%%PYTHON_SITELIBDIR%%/electrum_gui/exchange_rate.pyc
-%%PYTHON_SITELIBDIR%%/electrum_gui/exchange_rate.pyo
-%%PYTHON_SITELIBDIR%%/electrum_gui/gui_classic.py
-%%PYTHON_SITELIBDIR%%/electrum_gui/gui_classic.pyc
-%%PYTHON_SITELIBDIR%%/electrum_gui/gui_classic.pyo
-%%PYTHON_SITELIBDIR%%/electrum_gui/gui_gtk.py
-%%PYTHON_SITELIBDIR%%/electrum_gui/gui_gtk.pyc
-%%PYTHON_SITELIBDIR%%/electrum_gui/gui_gtk.pyo
-%%PYTHON_SITELIBDIR%%/electrum_gui/gui_lite.py
-%%PYTHON_SITELIBDIR%%/electrum_gui/gui_lite.pyc
-%%PYTHON_SITELIBDIR%%/electrum_gui/gui_lite.pyo
-%%PYTHON_SITELIBDIR%%/electrum_gui/gui_text.py
-%%PYTHON_SITELIBDIR%%/electrum_gui/gui_text.pyc
-%%PYTHON_SITELIBDIR%%/electrum_gui/gui_text.pyo
-%%PYTHON_SITELIBDIR%%/electrum_gui/history_widget.py
-%%PYTHON_SITELIBDIR%%/electrum_gui/history_widget.pyc
-%%PYTHON_SITELIBDIR%%/electrum_gui/history_widget.pyo
-%%PYTHON_SITELIBDIR%%/electrum_gui/i18n.py
-%%PYTHON_SITELIBDIR%%/electrum_gui/i18n.pyc
-%%PYTHON_SITELIBDIR%%/electrum_gui/i18n.pyo
-%%PYTHON_SITELIBDIR%%/electrum_gui/icons_rc.py
-%%PYTHON_SITELIBDIR%%/electrum_gui/icons_rc.pyc
-%%PYTHON_SITELIBDIR%%/electrum_gui/icons_rc.pyo
-%%PYTHON_SITELIBDIR%%/electrum_gui/plugins.py
-%%PYTHON_SITELIBDIR%%/electrum_gui/plugins.pyc
-%%PYTHON_SITELIBDIR%%/electrum_gui/plugins.pyo
-%%PYTHON_SITELIBDIR%%/electrum_gui/pyqrnative.py
-%%PYTHON_SITELIBDIR%%/electrum_gui/pyqrnative.pyc
-%%PYTHON_SITELIBDIR%%/electrum_gui/pyqrnative.pyo
-%%PYTHON_SITELIBDIR%%/electrum_gui/qrcodewidget.py
-%%PYTHON_SITELIBDIR%%/electrum_gui/qrcodewidget.pyc
-%%PYTHON_SITELIBDIR%%/electrum_gui/qrcodewidget.pyo
-%%PYTHON_SITELIBDIR%%/electrum_gui/qt_console.py
-%%PYTHON_SITELIBDIR%%/electrum_gui/qt_console.pyc
-%%PYTHON_SITELIBDIR%%/electrum_gui/qt_console.pyo
-%%PYTHON_SITELIBDIR%%/electrum_gui/receiving_widget.py
-%%PYTHON_SITELIBDIR%%/electrum_gui/receiving_widget.pyc
-%%PYTHON_SITELIBDIR%%/electrum_gui/receiving_widget.pyo
-%%PYTHON_SITELIBDIR%%/electrum_plugins/__init__.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/gtk.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/gtk.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/__init__.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/__init__.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/amountedit.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/amountedit.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/console.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/console.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/history_widget.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/history_widget.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/icons_rc.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/icons_rc.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/installwizard.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/installwizard.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/lite_window.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/lite_window.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/main_window.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/main_window.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/network_dialog.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/network_dialog.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/password_dialog.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/password_dialog.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/qrcodewidget.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/qrcodewidget.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/receiving_widget.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/receiving_widget.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/seed_dialog.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/seed_dialog.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/transaction_dialog.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/transaction_dialog.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/util.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/util.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/version_getter.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/version_getter.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/stdio.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/stdio.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/text.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/text.pyo
 %%PYTHON_SITELIBDIR%%/electrum_plugins/__init__.pyc
 %%PYTHON_SITELIBDIR%%/electrum_plugins/__init__.pyo
-%%PYTHON_SITELIBDIR%%/electrum_plugins/aliases.py
 %%PYTHON_SITELIBDIR%%/electrum_plugins/aliases.pyc
 %%PYTHON_SITELIBDIR%%/electrum_plugins/aliases.pyo
-%%PYTHON_SITELIBDIR%%/electrum_plugins/labels.py
+%%PYTHON_SITELIBDIR%%/electrum_plugins/coinbase_buyback.pyc
+%%PYTHON_SITELIBDIR%%/electrum_plugins/coinbase_buyback.pyo
+%%PYTHON_SITELIBDIR%%/electrum_plugins/exchange_rate.pyc
+%%PYTHON_SITELIBDIR%%/electrum_plugins/exchange_rate.pyo
 %%PYTHON_SITELIBDIR%%/electrum_plugins/labels.pyc
 %%PYTHON_SITELIBDIR%%/electrum_plugins/labels.pyo
-%%PYTHON_SITELIBDIR%%/electrum_plugins/pointofsale.py
 %%PYTHON_SITELIBDIR%%/electrum_plugins/pointofsale.pyc
 %%PYTHON_SITELIBDIR%%/electrum_plugins/pointofsale.pyo
-%%PYTHON_SITELIBDIR%%/electrum_plugins/qrscanner.py
 %%PYTHON_SITELIBDIR%%/electrum_plugins/qrscanner.pyc
 %%PYTHON_SITELIBDIR%%/electrum_plugins/qrscanner.pyo
-%%PYTHON_SITELIBDIR%%/electrum_plugins/virtualkeyboard.py
 %%PYTHON_SITELIBDIR%%/electrum_plugins/virtualkeyboard.pyc
 %%PYTHON_SITELIBDIR%%/electrum_plugins/virtualkeyboard.pyo
-share/app-install/icons/electrum.png
 share/applications/electrum.desktop
+share/app-install/icons/electrum.png
+share/locale/ja_JP/LC_MESSAGES/electrum.mo
+share/locale/eo_UY/LC_MESSAGES/electrum.mo
+share/locale/ta_IN/LC_MESSAGES/electrum.mo
+share/locale/ky_KG/LC_MESSAGES/electrum.mo
+share/locale/pl_PL/LC_MESSAGES/electrum.mo
+share/locale/it_IT/LC_MESSAGES/electrum.mo
+share/locale/hu_HU/LC_MESSAGES/electrum.mo
+share/locale/fr_FR/LC_MESSAGES/electrum.mo
+share/locale/pt_BR/LC_MESSAGES/electrum.mo
+share/locale/vi_VN/LC_MESSAGES/electrum.mo
+share/locale/nl_NL/LC_MESSAGES/electrum.mo
+share/locale/ru_RU/LC_MESSAGES/electrum.mo
+share/locale/es_ES/LC_MESSAGES/electrum.mo
+share/locale/pt_PT/LC_MESSAGES/electrum.mo
+share/locale/de_DE/LC_MESSAGES/electrum.mo
+share/locale/id_ID/LC_MESSAGES/electrum.mo
+share/locale/lv_LV/LC_MESSAGES/electrum.mo
+share/locale/ar_SA/LC_MESSAGES/electrum.mo
+share/locale/cs_CZ/LC_MESSAGES/electrum.mo
+share/locale/sl_SI/LC_MESSAGES/electrum.mo
+share/locale/zh_CN/LC_MESSAGES/electrum.mo
+share/locale/ro_RO/LC_MESSAGES/electrum.mo
+share/locale/sk_SK/LC_MESSAGES/electrum.mo
+share/locale/th_TH/LC_MESSAGES/electrum.mo
 share/electrum/README
 share/electrum/cleanlook/name.cfg
 share/electrum/cleanlook/style.css
-share/electrum/dark/background.png
-share/electrum/dark/name.cfg
-share/electrum/dark/style.css
 share/electrum/sahara/name.cfg
 share/electrum/sahara/style.css
-share/locale/br/LC_MESSAGES/electrum.mo
-share/locale/cs/LC_MESSAGES/electrum.mo
-share/locale/de/LC_MESSAGES/electrum.mo
-share/locale/eo/LC_MESSAGES/electrum.mo
-share/locale/es/LC_MESSAGES/electrum.mo
-share/locale/fr/LC_MESSAGES/electrum.mo
-share/locale/it/LC_MESSAGES/electrum.mo
-share/locale/ja/LC_MESSAGES/electrum.mo
-share/locale/lv/LC_MESSAGES/electrum.mo
-share/locale/nl/LC_MESSAGES/electrum.mo
-share/locale/ru/LC_MESSAGES/electrum.mo
-share/locale/sl/LC_MESSAGES/electrum.mo
-share/locale/ta/LC_MESSAGES/electrum.mo
-share/locale/vi/LC_MESSAGES/electrum.mo
-share/locale/zh/LC_MESSAGES/electrum.mo
+share/electrum/dark/name.cfg
+share/electrum/dark/style.css
+bin/electrum
 @dirrm share/electrum/sahara
 @dirrm share/electrum/dark
 @dirrm share/electrum/cleanlook
 @dirrm share/electrum
-@dirrmtry share/app-install/icons
-@dirrmtry share/app-install
 @dirrm %%PYTHON_SITELIBDIR%%/electrum_plugins
+@dirrm %%PYTHON_SITELIBDIR%%/electrum_gui/qt
 @dirrm %%PYTHON_SITELIBDIR%%/electrum_gui
 @dirrm %%PYTHON_SITELIBDIR%%/electrum
+@dirrmtry share/app-install/icons
+@dirrmtry share/app-install
+@dirrmtry share/locale/ar_SA/LC_MESSAGES
+@dirrmtry share/locale/ar_SA
+@dirrmtry share/locale/cs_CZ/LC_MESSAGES
+@dirrmtry share/locale/cs_CZ
+@dirrmtry share/locale/de_DE/LC_MESSAGES
+@dirrmtry share/locale/de_DE
+@dirrmtry share/locale/eo_UY/LC_MESSAGES
+@dirrmtry share/locale/eo_UY
+@dirrmtry share/locale/hu_HU/LC_MESSAGES
+@dirrmtry share/locale/hu_HU
+@dirrmtry share/locale/id_ID/LC_MESSAGES
+@dirrmtry share/locale/id_ID
+@dirrmtry share/locale/it_IT/LC_MESSAGES
+@dirrmtry share/locale/it_IT
+@dirrmtry share/locale/ja_JP/LC_MESSAGES
+@dirrmtry share/locale/ja_JP
+@dirrmtry share/locale/ky_KG/LC_MESSAGES
+@dirrmtry share/locale/ky_KG
+@dirrmtry share/locale/lv_LV/LC_MESSAGES
+@dirrmtry share/locale/lv_LV
+@dirrmtry share/locale/nl_NL/LC_MESSAGES
+@dirrmtry share/locale/nl_NL
+@dirrmtry share/locale/pl_PL/LC_MESSAGES
+@dirrmtry share/locale/pl_PL
+@dirrmtry share/locale/ro_RO/LC_MESSAGES
+@dirrmtry share/locale/ro_RO
+@dirrmtry share/locale/ru_RU/LC_MESSAGES
+@dirrmtry share/locale/ru_RU
+@dirrmtry share/locale/sk_SK/LC_MESSAGES
+@dirrmtry share/locale/sk_SK
+@dirrmtry share/locale/sl_SI/LC_MESSAGES
+@dirrmtry share/locale/sl_SI
+@dirrmtry share/locale/ta_IN/LC_MESSAGES
+@dirrmtry share/locale/ta_IN
+@dirrmtry share/locale/th_TH/LC_MESSAGES
+@dirrmtry share/locale/th_TH
+@dirrmtry share/locale/vi_VN/LC_MESSAGES
+@dirrmtry share/locale/vi_VN