* Updated to 3.3.8.7

* Reworked PKGBUILD
* Removed references to Python 2

2 files changed, 40 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6b27eeb33280..803f332f6e11 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 pkgbase = electrum-dash
 	pkgdesc = Lightweight Bitcoin wallet, fork for DASH
-	pkgver = 3.3.8.6
+	pkgver = 3.3.8.7
 	pkgrel = 1
 	url = https://electrum-dash.org
 	arch = any
 	license = MIT
-	makedepends = python-pyqt4
+	makedepends = python-setuptools
 	depends = python-pyaes
 	depends = python-ecdsa
 	depends = python-pbkdf2
@@ -14,14 +14,25 @@ pkgbase = electrum-dash
 	depends = python-protobuf
 	depends = python-dnspython
 	depends = python-jsonrpclib-pelix
-	depends = python-trezor
-	depends = python-btchip
+	depends = python-pysocks
+	depends = python-pyqt5
+	depends = python-pycryptodomex
+	depends = python-websocket-client
+	depends = python-certifi
+	depends = python-aiorpcx
+	depends = python-aiohttp
+	depends = python-aiohttp-socks
 	depends = python-x11_hash
-	depends = python-pyqt4
+	depends = python-bls
+	optdepends = python-btchip: BTChip hardware wallet support
+	optdepends = python-hidapi: Digital Bitbox hardware wallet support
 	optdepends = python-matplotlib: plot transaction history in graphical mode
 	optdepends = zbar: QR code reading support
-	source = https://github.com/akhavr/electrum-dash/releases/download/3.3.8.6/Dash-Electrum-3.3.8.6.tar.gz
-	sha256sums = 71d0387a208bc45eeec08a7c779993ff841562613b11f6107f79e540dc1f7282
+	optdepends = python-rpyc: send commands to Electrum Python console from an external script
+	optdepends = python-qdarkstyle: optional dark theme in graphical mode
+	optdepends = python-pycryptodomex: use PyCryptodome AES implementation instead of pyaes
+	source = https://github.com/akhavr/electrum-dash/releases/download/3.3.8.7/Dash-Electrum-3.3.8.7.tar.gz
+	sha256sums = b5c2ad070864041b194da9dbbb0d112fa2296d2386abafd2672546d68e9d13d0
 
 pkgname = electrum-dash
 
diff --git a/PKGBUILD b/PKGBUILD
index a4cd9278a4c9..bf4fe43cc9a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,58 +6,35 @@
 
 pkgname=electrum-dash
 _pkgname=Dash-Electrum
-pkgver=3.3.8.6
-pkgrel=1
 pkgdesc="Lightweight Bitcoin wallet, fork for DASH"
-arch=('any')
-depends=(
-    'python-pyaes'
-    'python-ecdsa'
-    'python-pbkdf2'
-    'python-requests'
-    'python-qrcode'
-    'python-protobuf'
-    'python-dnspython'
-    'python-jsonrpclib-pelix'
-    'python-trezor'
-    'python-btchip'
-    'python-x11_hash'
-    'python-pyqt4'
-    # 'python2-pysocks'
-    # 'python2-pycryptodomex'
-)
-makedepends=(
-    'python-pyqt4'
-    # 'gettext'
-    # 'python2-setuptools'
-    # 'desktop-file-utils'
-)
-optdepends=(
-    'python-matplotlib: plot transaction history in graphical mode'
-    'zbar: QR code reading support'
-)
+pkgver=3.3.8.7
+pkgrel=1
 url="https://electrum-dash.org"
-license=(MIT)
-source=("https://github.com/akhavr/electrum-dash/releases/download/${pkgver}/${_pkgname}-${pkgver}.tar.gz")
-sha256sums=('71d0387a208bc45eeec08a7c779993ff841562613b11f6107f79e540dc1f7282')
+arch=('any')
+license=('MIT')
 
-prepare() {
-  cd ${_pkgname}-${pkgver}
+depends=('python-pyaes' 'python-ecdsa' 'python-pbkdf2' 'python-requests' 'python-qrcode'
+         'python-protobuf' 'python-dnspython' 'python-jsonrpclib-pelix' 'python-pysocks'
+         'python-pyqt5' 'python-pycryptodomex' 'python-websocket-client' 'python-certifi'
+         'python-aiorpcx' 'python-aiohttp' 'python-aiohttp-socks' 'python-x11_hash' 'python-bls')
+optdepends=('python-btchip: BTChip hardware wallet support'
+            'python-hidapi: Digital Bitbox hardware wallet support'
+            'python-matplotlib: plot transaction history in graphical mode'
+            'zbar: QR code reading support'
+            'python-rpyc: send commands to Electrum Python console from an external script'
+            'python-qdarkstyle: optional dark theme in graphical mode'
+            'python-pycryptodomex: use PyCryptodome AES implementation instead of pyaes')
+makedepends=('python-setuptools')
 
-  find . -type f -exec sed -i 's#/usr/bin/python$#/usr/bin/python3#g' {} +
-  find . -type f -exec sed -i 's#/usr/bin/env python$#/usr/bin/env python3#g' {} +
-}
+source=("https://github.com/akhavr/electrum-dash/releases/download/${pkgver}/${_pkgname}-${pkgver}.tar.gz")
+sha256sums=('b5c2ad070864041b194da9dbbb0d112fa2296d2386abafd2672546d68e9d13d0')
 
 build() {
-  cd ${_pkgname}-${pkgver}
-
-  pyrcc5 icons.qrc -o gui/qt/icons_rc.py
-  python3 setup.py build
+	cd ${_pkgname}-${pkgver}
+	python setup.py build
 }
 
 package() {
-  ls -lah
-  cd ${_pkgname}-${pkgver}
-
-  python3 setup.py install --root="${pkgdir}" --optimize=1
+	cd ${pkgname}-${pkgver}
+	python setup.py install --root="${pkgdir}" --optimize=1
 }