From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 074371382C5 for ; Sun, 1 Apr 2018 12:41:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 062BFE07BA; Sun, 1 Apr 2018 12:41:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B8422E07BA for ; Sun, 1 Apr 2018 12:41:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 050D4335D94 for ; Sun, 1 Apr 2018 12:41:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E8BF26A for ; Sun, 1 Apr 2018 12:41:02 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1522586445.b3c25c04dda2159f680d11962a6a3644e7fb3ef4.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/electrum/files/, net-misc/electrum/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/electrum/Manifest net-misc/electrum/electrum-3.1.2.ebuild net-misc/electrum/files/3.1.2-desktop.patch net-misc/electrum/files/3.1.2-no-user-root.patch net-misc/electrum/files/3.1.2-pip-optional-pkgs.patch X-VCS-Directories: net-misc/electrum/files/ net-misc/electrum/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: b3c25c04dda2159f680d11962a6a3644e7fb3ef4 X-VCS-Branch: master Date: Sun, 1 Apr 2018 12:41:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 97252c48-be79-4669-9684-44473730a000 X-Archives-Hash: 42eaf5e0ea664fa96cf7e438bf164e3e commit: b3c25c04dda2159f680d11962a6a3644e7fb3ef4 Author: Anthony G. Basile gentoo org> AuthorDate: Sun Apr 1 12:40:45 2018 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sun Apr 1 12:40:45 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3c25c04 net-misc/electrum: version bump to 3.1.2 Package-Manager: Portage-2.3.24, Repoman-2.3.6 net-misc/electrum/Manifest | 1 + net-misc/electrum/electrum-3.1.2.ebuild | 175 +++++++++++++++++++++ net-misc/electrum/files/3.1.2-desktop.patch | 21 +++ net-misc/electrum/files/3.1.2-no-user-root.patch | 17 ++ .../electrum/files/3.1.2-pip-optional-pkgs.patch | 13 ++ 5 files changed, 227 insertions(+) diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest index 97ca961e31a..8295aa7dba2 100644 --- a/net-misc/electrum/Manifest +++ b/net-misc/electrum/Manifest @@ -1,3 +1,4 @@ DIST Electrum-3.0.5.tar.gz 2639766 BLAKE2B 28587ca056247a5671d84c0b79824e8eea8df8ca2e3204333e6edd7db98ecbeebdf81f4ac819de8b87c7593e83f948d091d48d55cdff08af76322d94bacec0fd SHA512 27cfa44ce8eeb5eef8038f1f68b4a42d173daaf7a940ffc9e9b1dad16a8f7f49bd53d5eefdbaf242e5e09aa2f887bce536f17941c2250225cd92c78f62c52e39 DIST Electrum-3.0.6.tar.gz 2640475 BLAKE2B 2e10417fb59629b9e3af8ba10893fb85b3b0d0ed9f7d7226a58dc7a2f91ed682423168092101565b00824bc62cae60d878de0d78271b716c027c8616419037a8 SHA512 4df9d81d954a008c3a14a89a7191b8af94393701b55651ad19acc75addb70fea942876a45c545c89b290cbdd7adb41b2d36e3cbcf73449eaa5d0a39e1529b2ef DIST Electrum-3.1.1.tar.gz 2722902 BLAKE2B 31628d18a26f552469454c4f2712eee1aaba6ff5114a7cf0b7f261def5ed5731a267ae369ec3460c7f9bb5ad2b1713b2b464ef05fadb5e0e9ffd563adeee0ce8 SHA512 d7f987dde4a4fe5b2b0e576328c20b56ca650047321ac101dc6c3edd5bcbeedd569870d951262583a5ef1d1e40d6107ac46aa4fe031cc63d3a759d332db056cb +DIST Electrum-3.1.2.tar.gz 2800714 BLAKE2B 0932932125f1fd7099c090806c669a998c00a70a8f34b20d0afe4b1f6c5c24ced8743a60923e466c3507d29c75ac58e2e3e01b422701be76bbcd8abf54497276 SHA512 e4e6d674817bacefaf9c64acfdf16c4c215264e825dd8b1bcf1d99429963b0da18d442b966ba986cf0ad2d621543c3e0e68e8ba023cca23b6626781c2e69a61e diff --git a/net-misc/electrum/electrum-3.1.2.ebuild b/net-misc/electrum/electrum-3.1.2.ebuild new file mode 100644 index 00000000000..a336ee7a3d3 --- /dev/null +++ b/net-misc/electrum/electrum-3.1.2.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +PYTHON_COMPAT=( python3_{4,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/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}] + dev-libs/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 ) +" + +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.2-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 + + 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-desktop.patch b/net-misc/electrum/files/3.1.2-desktop.patch new file mode 100644 index 00000000000..2c271dd60d8 --- /dev/null +++ b/net-misc/electrum/files/3.1.2-desktop.patch @@ -0,0 +1,21 @@ +diff -Naur Electrum-3.1.2.orig/electrum.desktop Electrum-3.1.2/electrum.desktop +--- Electrum-3.1.2.orig/electrum.desktop 2018-03-24 06:42:16.000000000 -0400 ++++ Electrum-3.1.2/electrum.desktop 2018-04-01 08:37:43.362027638 -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 diff --git a/net-misc/electrum/files/3.1.2-no-user-root.patch b/net-misc/electrum/files/3.1.2-no-user-root.patch new file mode 100644 index 00000000000..0d478171771 --- /dev/null +++ b/net-misc/electrum/files/3.1.2-no-user-root.patch @@ -0,0 +1,17 @@ +diff -Naur Electrum-3.1.2.orig/setup.py Electrum-3.1.2/setup.py +--- Electrum-3.1.2.orig/setup.py 2018-03-28 04:51:11.000000000 -0400 ++++ Electrum-3.1.2/setup.py 2018-03-31 15:05:45.540757981 -0400 +@@ -28,13 +28,6 @@ + opts, _ = parser.parse_known_args(sys.argv[1:]) + usr_share = os.path.join(sys.prefix, "share") + icons_dirname = 'pixmaps' +- if not os.access(opts.root_path + usr_share, os.W_OK) and \ +- not os.access(opts.root_path, os.W_OK): +- icons_dirname = 'icons' +- 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']), + (os.path.join(usr_share, icons_dirname), ['icons/electrum.png']) 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 new file mode 100644 index 00000000000..f5e0015a7df --- /dev/null +++ b/net-misc/electrum/files/3.1.2-pip-optional-pkgs.patch @@ -0,0 +1,13 @@ +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',