[gentoo-commits] repo/gentoo:master commit in: net-misc/electrum/files/, net-misc/electrum/

[Michał Górny]

commit:     6b541d3102f0e6c4ecf9ffba66eeb841c16fa03d
Author:     Kristaps Kaupe <kristaps <AT> blogiem <DOT> lv>
AuthorDate: Wed Aug 14 20:16:40 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 20:34:15 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b541d31

net-misc/electrum: remove vulnerable 3.1.3

See https://github.com/spesmilo/electrum/issues/4968

Signed-off-by: Kristaps Kaupe <kristaps <AT> blogiem.lv>
Bug: https://bugs.gentoo.org/692164
Closes: https://github.com/gentoo/gentoo/pull/12709
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-misc/electrum/Manifest                         |   1 -
 net-misc/electrum/electrum-3.1.3-r1.ebuild         | 173 ---------------------
 .../electrum/files/3.1.2-pip-optional-pkgs.patch   |  13 --
 net-misc/electrum/files/3.1.3-desktop.patch        |  21 ---
 4 files changed, 208 deletions(-)

diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 70f1ee61f88..0652849671f 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,4 +1,3 @@
-DIST Electrum-3.1.3.tar.gz 2806178 BLAKE2B e03a6ee8d7b211b26d99adfbaf42a9d43317e5a4ca887f62f5ef0e57d8f990c18ff07e15d4ac8faea33322cd7ae25d7544e59e9ff1fbe883b3b7be138d990421 SHA512 745d00ec944e46040a4ae21d23c5919b943696a85baf84ee553616ca73cd21f2fa95999212a23f9a96ad5606def2890ee057e5f5f18e82591fd4a9e497ba5439
 DIST Electrum-3.3.4.tar.gz 8606286 BLAKE2B a815a577509cc7d31f02347b5ce52d0fe9fd52ddbe4b60200a02423f8e6bf43a6c24d3c1db6ab265a69f6f3891db63886fe6c138d601bc48c0c8fdb66191e941 SHA512 297eb757dccb166d40a652be2c1c058e42f16416b586b69f32223966ff1e92a34e5d01822d71bd063bfa72b7bbbcae4251a63f7373600d0eeb139e923d17a2b3
 DIST Electrum-3.3.6.tar.gz 8789792 BLAKE2B dcac9a317364780a7dc3ae1083e6ba7fd3a4559d0b7f6375197bdf639143ab9da2c5a001605af5a0590fb900de2e98999aea171c6dcec390a47beb610af3b490 SHA512 b25fc67883b7a90bf902f62d07574f283c4c04b3c6dfbb4e890448ddb938d477e036470f82b45e426aa581a1da2425e13e6974a730b18b130fd265b8d01d0d91
 DIST Electrum-3.3.8.tar.gz 8911228 BLAKE2B af24f44f5805a5722d0b9500776ae1ea4f70e0869045535ea3bf27d24a61013ba718230e6292061581f55a4fae655cbacae9024a321efe655eb9816bae11ae75 SHA512 5f756da4d2df59c69997925c69f651011def07bfbdbc582f492ecc19386eee7d79b9951732a792e6041da902d776052d6590cbd2d7004bc93c8406bcf9093fe6

diff --git a/net-misc/electrum/electrum-3.1.3-r1.ebuild b/net-misc/electrum/electrum-3.1.3-r1.ebuild
deleted file mode 100644
index 25eee433cc4..00000000000
--- a/net-misc/electrum/electrum-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 gnome2-utils xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
-	cosign? ( qt5 )
-	digitalbitbox? ( qt5 )
-	email? ( qt5 )
-	greenaddress_it? ( qt5 )
-	qrcode? ( qt5 )
-	sync? ( qt5 )
-	trustedcoin_com? ( qt5 )
-	vkb? ( qt5 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	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}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.1.2-pip-optional-pkgs.patch"
-	eapply "${FILESDIR}/3.1.3-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "lib/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-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/' electrum || 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       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex sync            '' labels               ) \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	xdg_environment_reset
-	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/electrum/files/3.1.2-pip-optional-pkgs.patch b/net-misc/electrum/files/3.1.2-pip-optional-pkgs.patch
deleted file mode 100644
index f5e0015a7df..00000000000
--- a/net-misc/electrum/files/3.1.2-pip-optional-pkgs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur Electrum-3.1.2.orig/setup.py Electrum-3.1.2/setup.py
---- Electrum-3.1.2.orig/setup.py	2018-03-31 15:08:48.919694817 -0400
-+++ Electrum-3.1.2/setup.py	2018-03-31 15:09:28.738594744 -0400
-@@ -37,9 +37,6 @@
-     name="Electrum",
-     version=version.ELECTRUM_VERSION,
-     install_requires=requirements,
--    extras_require={
--        'full': requirements_hw + ['pycryptodomex'],
--    },
-     packages=[
-         'electrum',
-         'electrum_gui',

diff --git a/net-misc/electrum/files/3.1.3-desktop.patch b/net-misc/electrum/files/3.1.3-desktop.patch
deleted file mode 100644
index beb4d598e45..00000000000
--- a/net-misc/electrum/files/3.1.3-desktop.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur Electrum-3.1.3.orig/electrum.desktop Electrum-3.1.3/electrum.desktop
---- Electrum-3.1.3.orig/electrum.desktop	2018-04-16 12:17:11.000000000 -0400
-+++ Electrum-3.1.3/electrum.desktop	2018-05-19 03:56:35.437735879 -0400
-@@ -3,7 +3,7 @@
- 
- [Desktop Entry]
- Comment=Lightweight Bitcoin Client
--Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\" electrum %u"
-+Exec=electrum %u
- GenericName[en_US]=Bitcoin Wallet
- GenericName=Bitcoin Wallet
- Icon=electrum
-@@ -14,8 +14,4 @@
- Terminal=false
- Type=Application
- MimeType=x-scheme-handler/bitcoin;
--Actions=Testnet;
- 
--[Desktop Action Testnet]
--Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\" electrum --testnet %u"
--Name=Testnet mode