gentoo resync : 28.04.2019

5 files changed, 188 insertions, 22 deletions

diff --git a/net-misc/electron-cash/Manifest b/net-misc/electron-cash/Manifest
index a1524d366637..320fe6171a75 100644
--- a/net-misc/electron-cash/Manifest
+++ b/net-misc/electron-cash/Manifest
@@ -1,4 +1,6 @@
-AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd
-DIST electron-cash-3.1.3.tar.gz 1643903 BLAKE2B ff7c4f8d10b680c9fe3fcb949349cdbc84acb49939b33af2816f8154c3675241e3637bc326af9c2a662588571aeab37de86eb89a627e934b824114c3907a8158 SHA512 267f434ef09bea23b79a9ad8cb8e734a7e1ece7d17d2e2cc91496af3d0fcb035256ec3977c2fbeff4c7ac16193a0a185041fd526c46129fcea62bcdfe043a208
-EBUILD electron-cash-3.1.3.ebuild 3573 BLAKE2B ddc223792ea38b6f671fb2383aeb44cd29eddef18588aa46a686de3b76d0a8a9bd89f0de8adca5e5585a8bed5d09a408fa6998c96d5c826d40bf3a3af2b63590 SHA512 367b18d0e8e8a9e73922af342947cef9e8c330bf86330371c062c7b9e502b155a360e6b5fa7955cfab353b64e7b7d8d45ff69bd30a803502cd152de1a4da2d85
+AUX 3.3.6-no-user-root.patch 1261 BLAKE2B 6035a47b73ce13a92ef66177d6131f5744a498bb4360aa289aca6a09c6ef3e7b663914590f4c9be635078fed0bc82ae706f0cb4c7280acab88bbb1f5211d6473 SHA512 bed6b2108b3a8c8960b43eff854b8292d5e6fbd0fdd8383e43e020cac51767cbd70a1c371a3dffe1bc51145f97f930cb966fd4eee1ecc3ca021cbcfac0ea1a81
+DIST electron-cash-3.3.6.tar.gz 8506610 BLAKE2B 85f61ec0c95e41c5fc170c3419317e077c3e871ee90db7f4e7ebbf6e931950746798efe9b4b6e7c6e0992a52165772a699d8220e1a21ff597f024084929afddc SHA512 993829ce29013e26f219bbd41d13c8d399920ee4c1e5fcae3c4fb298c766228766e93b559db1de3c14bd5add6f651c83655afb32bf173bacdaddf83a8a941f18
+DIST electron-cash-4.0.2.tar.gz 8967992 BLAKE2B 081546d148dbc7da5e192154818831e125437c00093e1fe434ef0a67f8c06ceb1d2b1f44de9e71aac5786f995aeffd8fb6b74c64f6aa249f5cc9c06c9a276845 SHA512 dad17906f1dc2e53d4c6bff15a38d3276d16377f71b4d4e260b7b667f2b045da49f504483606d4515cdf71300b67108301b6cce971d1cca16c3856023b3e3f3a
+EBUILD electron-cash-3.3.6.ebuild 3569 BLAKE2B 4d8ee7e498037ffb9e57cbf5456781c6708040af484a4cffc1b43918cfd3e48948f22c4b2385ebb42c3a962617785bdc8d5c9b9ff15da371f90e203e05951d68 SHA512 5605efc03b31a503be0d69299864615e5d153812180349ca594664933466c1878f006670e0860ae1b4277d2646c14cb99c2a9bb8e458bd05020041f5302e45ab
+EBUILD electron-cash-4.0.2.ebuild 3592 BLAKE2B 4512d46848d34b71e3f39767c189bccb39850c7dff5e794baca27ed14129a25ba71f82c3770cee979c50001b5d78efc475f26a776daf2d84571a3143ab49b69b SHA512 41a547787a5c428e458c6549e8530c7b1a12f2c034750fbfe8f7888ff2c2c351f5a32e5bfb128e286cf142a3fcedc9d423cbc3ecfaff4ae0a75e91bf2569a5bc
 MISC metadata.xml 976 BLAKE2B 991083b0233c11e6e5bbb3d7d560b20587332344fca7d3fad40cde8bc4bce1f3455172b7131451e034d0ab9722913667eb9739fe1bbd214354bf7cde974cecf6 SHA512 38383f6b7809ee97e33a777b5eab2593b22ce99d78442c40e9ff4654f350b6ad17da0c2e309b43fed517e2b384ab5f806a5ef60a71f887d72a4dcf06c9bbdede
diff --git a/net-misc/electron-cash/electron-cash-3.1.3.ebuild b/net-misc/electron-cash/electron-cash-3.3.6.ebuild
index cf6422809dd7..7c1417f11660 100644
--- a/net-misc/electron-cash/electron-cash-3.1.3.ebuild
+++ b/net-misc/electron-cash/electron-cash-3.3.6.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="ncurses?"
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
-MY_P="electrum-${PV}"
+MY_P="Electron-Cash-${PV}"
 DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)"
 HOMEPAGE="https://github.com/fyookball/electrum/"
 SRC_URI="https://github.com/fyookball/electrum/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -55,7 +55,7 @@ S="${WORKDIR}/${MY_P}"
 DOCS="RELEASE-NOTES"
 
 src_prepare() {
-	eapply "${FILESDIR}/2.8.0-no-user-root.patch"
+	eapply "${FILESDIR}/3.3.6-no-user-root.patch"
 
 	# Prevent icon from being installed in the wrong location
 	sed -i '/icons/d' setup.py || die
diff --git a/net-misc/electron-cash/electron-cash-4.0.2.ebuild b/net-misc/electron-cash/electron-cash-4.0.2.ebuild
new file mode 100644
index 000000000000..3b33abcf4173
--- /dev/null
+++ b/net-misc/electron-cash/electron-cash-4.0.2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="ncurses?"
+
+inherit distutils-r1 gnome2-utils xdg-utils
+
+MY_P="Electron-Cash-${PV}"
+DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)"
+HOMEPAGE="https://github.com/fyookball/electrum/"
+SRC_URI="https://github.com/fyookball/electrum/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
+	l10n_es l10n_ja l10n_pt l10n_zh-CN"
+
+REQUIRED_USE="
+	|| ( cli ncurses qt5 )
+	audio_modem? ( qt5 )
+	cosign? ( qt5 )
+	digitalbitbox? ( qt5 )
+	email? ( qt5 )
+	qrcode? ( qt5 )
+	sync? ( qt5 )
+	vkb? ( qt5 )
+"
+
+RDEPEND="
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/pyaes[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tlslite[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( dev-lang/python )
+	dev-libs/libsecp256k1
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+	eapply "${FILESDIR}/3.3.6-no-user-root.patch"
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons/d' setup.py || die
+
+	if use qt5; then
+		pyrcc5 icons.qrc -o gui/qt/icons_rc.py || die
+	else
+		sed "s|'electroncash_gui.qt',||" -i setup.py || die
+	fi
+
+	local wordlist=
+	for wordlist in  \
+		$(usex l10n_ja '' japanese) \
+		$(usex l10n_pt '' portuguese) \
+		$(usex l10n_es '' spanish) \
+		$(usex l10n_zh-CN '' chinese_simplified) \
+	; do
+		rm -f "lib/wordlist/${wordlist}.txt" || die
+		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
+	done
+
+	# Remove unrequested GUI implementations:
+	local gui setup_py_gui
+	for gui in  \
+		$(usex cli      '' stdio)  \
+		kivy \
+		$(usex qt5      '' qt   )  \
+		$(usex ncurses  '' text )  \
+	; do
+		rm gui/"${gui}"* -r || die
+	done
+
+	# And install requested ones...
+	for gui in  \
+		$(usex qt5      qt   '')  \
+	; do
+		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+	done
+
+	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' "${PN}" || die
+
+	local plugin
+	# trezor requires python trezorlib module
+	# keepkey requires trezor
+	for plugin in  \
+		$(usex audio_modem     '' audio_modem          ) \
+		$(usex cosign          '' cosigner_pool        ) \
+		$(usex digitalbitbox   '' digitalbitbox        ) \
+		$(usex email           '' email_requests       ) \
+		hw_wallet \
+		ledger \
+		keepkey \
+		$(usex sync            '' labels               ) \
+		trezor  \
+		$(usex vkb             '' virtualkeyboard      ) \
+	; do
+		rm -r plugins/"${plugin}"* || die
+		sed -i "/${plugin}/d" setup.py || die
+	done
+
+	eapply_user
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 icons/${PN}.png
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/electron-cash/files/2.8.0-no-user-root.patch b/net-misc/electron-cash/files/2.8.0-no-user-root.patch
deleted file mode 100644
index 2ca5363effe7..000000000000
--- a/net-misc/electron-cash/files/2.8.0-no-user-root.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./setup.py.orig	2017-01-06 19:17:44.294137848 +0000
-+++ ./setup.py	2017-01-06 19:17:50.093161327 +0000
-@@ -21,12 +21,6 @@
-     parser.add_argument('--root=', dest='root_path', metavar='dir', default='/')
-     opts, _ = parser.parse_known_args(sys.argv[1:])
-     usr_share = os.path.join(sys.prefix, "share")
--    if not os.access(opts.root_path + usr_share, os.W_OK) and \
--       not os.access(opts.root_path, os.W_OK):
--        if 'XDG_DATA_HOME' in os.environ.keys():
--            usr_share = os.environ['XDG_DATA_HOME']
--        else:
--            usr_share = os.path.expanduser('~/.local/share')
-     data_files += [
-         (os.path.join(usr_share, 'applications/'), ['electrum.desktop']),
-     ]
diff --git a/net-misc/electron-cash/files/3.3.6-no-user-root.patch b/net-misc/electron-cash/files/3.3.6-no-user-root.patch
new file mode 100644
index 000000000000..f5f0aecf382f
--- /dev/null
+++ b/net-misc/electron-cash/files/3.3.6-no-user-root.patch
@@ -0,0 +1,27 @@
+--- a/setup.py
++++ b/setup.py
+@@ -33,23 +33,7 @@
+     # Use per-user */share directory if the global one is not writable or if a per-user installation
+     # is attempted
+     user_share   = os.environ.get('XDG_DATA_HOME', os.path.expanduser('~/.local/share'))
+-    system_share = os.path.join(opts.prefix_path, "share")
+-    if not opts.is_user:
+-        # Not neccarily a per-user installation try system directories
+-        if os.access(opts.root_path + system_share, os.W_OK):
+-            # Global /usr/share is writable for us – so just use that
+-            share_dir = system_share
+-        elif not os.path.exists(opts.root_path + system_share) and os.access(opts.root_path, os.W_OK):
+-            # Global /usr/share does not exist, but / is writable – keep using the global directory
+-            # (happens during packaging)
+-            share_dir = system_share
+-        else:
+-            # Neither /usr/share (nor / if /usr/share doesn't exist) is writable, use the
+-            # per-user */share directory
+-            share_dir = user_share
+-    else:
+-        # Per-user installation
+-        share_dir = user_share
++    share_dir = os.path.join(opts.prefix_path, "share")
+     data_files += [
+         # Menu icon
+         # Menu entry